--- a/SyntaxHighlighter2.st	Mon Jun 24 03:25:37 2013 +0000
+++ b/SyntaxHighlighter2.st	Mon Jun 24 15:41:58 2013 +0200
@@ -679,6 +679,13 @@
 
 !SyntaxHighlighter2 methodsFor:'syntax detection'!
 
+markAssignedVariable:v from:pos to:endPos
+    super markAssignedVariable:v from:pos to:endPos.
+    (v type == #GlobalVariable) ifTrue:[^self].
+
+    self rememberVariableElementFor:v name type:v type from:pos to:endPos assigned:true
+!
+
 markGlobalClassIdentifierFrom:pos1 to:pos2
 
     | name env cls |
@@ -747,8 +754,9 @@
 markVariable:v from:pos1 to:pos2 assigned:assigned
     super markVariable:v from:pos1 to:pos2 assigned:assigned.
     (v type == #GlobalVariable) ifTrue:[^self].
+    assigned ifTrue:[^ self].       "/ already done in redefined markAssignedVariable...
 
-    self rememberVariableElementFor:v name type:v type from:pos1 to:pos2 assigned:assigned
+    self rememberVariableElementFor:v name type:v type from:pos1 to:pos2 assigned:false
 
     "Created: / 25-06-2010 / 13:03:37 / Jan Vrany <jan.vrany@fit.cvut.cz>"
     "Modified: / 25-06-2010 / 14:23:03 / Jan Vrany <jan.vrany@fit.cvut.cz>"
@@ -777,11 +785,15 @@
 
 !SyntaxHighlighter2 class methodsFor:'documentation'!
 
+version
+    ^ '$Header: /cvs/stx/stx/libtool/SyntaxHighlighter2.st,v 1.16 2013-06-24 13:41:58 cg Exp $'
+!
+
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libtool/SyntaxHighlighter2.st,v 1.15 2013-06-23 10:44:44 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/SyntaxHighlighter2.st,v 1.16 2013-06-24 13:41:58 cg Exp $'
 !
 
 version_SVN
-    ^ '$Id: SyntaxHighlighter2.st,v 1.15 2013-06-23 10:44:44 cg Exp $'
+    ^ '$Id: SyntaxHighlighter2.st,v 1.16 2013-06-24 13:41:58 cg Exp $'
 ! !