--- a/Tools__TagList.st	Tue May 28 22:46:27 2013 +0100
+++ b/Tools__TagList.st	Fri May 31 00:35:44 2013 +0100
@@ -2477,7 +2477,7 @@
                                         and:[ (w size > 1) 
                                         and:[ ((w copyFrom:2 to:(w size-1)) conform:[:c | c isDigit])
                                      ]]]) ifFalse:[
-                                        nm := w copyWithoutLast:1.
+                                        nm := w copyButLast:1.
                                         targets add:(Tag::TLabel 
                                                         label:nm 
                                                         pattern:nil
@@ -2918,7 +2918,7 @@
         ].
     ].
     (nm endsWith:')') ifTrue:[
-        nm := nm copyWithoutLast:1
+        nm := nm copyButLast:1
     ].
 
     def = 'defun' ifTrue:[
@@ -3532,7 +3532,7 @@
             words size >= 1 ifTrue:[
                 w := words first.
                 (w endsWith:$:) ifTrue:[
-                    nm := w copyWithoutLast:1.
+                    nm := w copyButLast:1.
 
                     lineNr := s lineNumber - 1.
                     targets add:(Tag::TLabel
@@ -3570,7 +3570,7 @@
             l := line withoutSeparators.
 
             (l startsWith:'proc ') ifTrue:[
-                nm := l copyFrom:6.
+                nm := l withoutPrefix:'proc '.
                 targets add:(Tag::TFunction 
                                 label:nm 
                                 pattern:nil
@@ -3579,7 +3579,7 @@
             ] ifFalse:[ (l startsWith:'tixWidgetClass ') ifTrue:[
                 nm := l copyFrom:'tixWidgetClass ' size + 1.
                 (nm endsWith:'{') ifTrue:[
-                    nm := (nm copyWithoutLast:1) withoutSeparators.
+                    nm := (nm copyButLast:1) withoutSeparators.
                 ].
                 targets add:(Tag::TClass 
                                 label:nm 
@@ -3602,11 +3602,6 @@
         s close
     ].
     ^ targets
-
-
-
-
-
 !
 
 yaccTagsInFile:aFilePath
@@ -3664,11 +3659,11 @@
 !TagList class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/Tools__TagList.st,v 1.25 2013-01-29 11:10:00 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/Tools__TagList.st,v 1.27 2013-05-07 15:28:52 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libtool/Tools__TagList.st,v 1.25 2013-01-29 11:10:00 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/Tools__TagList.st,v 1.27 2013-05-07 15:28:52 cg Exp $'
 !
 
 version_HG
@@ -3677,6 +3672,6 @@
 !
 
 version_SVN
-    ^ '§Id§'
+    ^ '$Id: Tools__TagList.st,v 1.27 2013-05-07 15:28:52 cg Exp $'
 ! !