--- a/Text.st	Fri Apr 01 23:54:32 2016 +0200
+++ b/Text.st	Sat Apr 02 16:29:22 2016 +0200
@@ -1639,12 +1639,12 @@
 emphasisAtPoint:aPoint on:aGC
     "return the emphasis at a given point, or nil if there is none"
 
-    |pointX savedFont boldFont italicFont bold italic wasItalic pos f l device posX|
+    |pointX savedFont boldFont italicFont bold italic wasItalic pos f l gcDevice posX|
 
     pointX := aPoint x.
-    device := aGC graphicsDevice.
+    gcDevice := aGC graphicsDevice.
 
-    savedFont := aGC basicFont onDevice:device.
+    savedFont := aGC basicFont onDevice:gcDevice.
 
     pos := 1.
     posX := 0.
@@ -1667,20 +1667,20 @@
 
         bold ifTrue:[
             boldFont isNil ifTrue:[
-                boldFont := savedFont asBold onDevice:device
+                boldFont := savedFont asBold onDevice:gcDevice
             ].
             f := boldFont.
         ] ifFalse:[
             italic ifTrue:[
                 italicFont isNil ifTrue:[
-                    italicFont := savedFont asItalic onDevice:device
+                    italicFont := savedFont asItalic onDevice:gcDevice
                 ].
                 f := italicFont
             ] ifFalse:[
                 f := savedFont
             ]
         ].
-        f := f onDevice:device.
+        f := f onDevice:gcDevice.
 "/ disabled - it is too ugly (and not handled correctly, anyway).
 "/        wasItalic ~~ italic ifTrue:[
 "/            italic ifFalse:[
@@ -1823,11 +1823,11 @@
 widthOn:aGC
     "return the number of device units, required on aGC's device"
 
-    |savedFont boldFont italicFont bold italic wasItalic pos f l device|
+    |savedFont boldFont italicFont bold italic wasItalic pos f l gcDevice|
 
-    device := aGC graphicsDevice.
+    gcDevice := aGC graphicsDevice.
 
-    savedFont := aGC basicFont onDevice:device.
+    savedFont := aGC basicFont onDevice:gcDevice.
 
     pos := 1.
     l := 0.
@@ -1849,20 +1849,20 @@
 
         bold ifTrue:[
             boldFont isNil ifTrue:[
-                boldFont := savedFont asBold onDevice:device
+                boldFont := savedFont asBold onDevice:gcDevice
             ].
             f := boldFont.
         ] ifFalse:[
             italic ifTrue:[
                 italicFont isNil ifTrue:[
-                    italicFont := savedFont asItalic onDevice:device
+                    italicFont := savedFont asItalic onDevice:gcDevice
                 ].
                 f := italicFont
             ] ifFalse:[
                 f := savedFont
             ]
         ].
-        f := f onDevice:device.
+        f := f onDevice:gcDevice.
 "/ disabled - it is too ugly (and not handled correctly, anyway).
 "/        wasItalic ~~ italic ifTrue:[
 "/            italic ifFalse:[