--- a/Workspace.st	Fri Jul 16 18:49:54 1999 +0200
+++ b/Workspace.st	Fri Jul 16 18:51:31 1999 +0200
@@ -571,7 +571,7 @@
 
     <resource: #keyboard (#DoIt #InspectIt #PrintIt #'CmdF*' #'CtrlF*')>
 
-    |cmd commands fKey|
+    |cmd fKey|
 
     (key == #DoIt)      ifTrue:[^ self doIt].
     (key == #InspectIt) ifTrue:[^ self inspectIt].
@@ -593,21 +593,18 @@
     ].
     fKey notNil ifTrue:[
         fKey := fKey asSymbol.
-        commands := Smalltalk at:#FunctionKeySequences ifAbsent:[nil].
-        commands notNil ifTrue:[
-            cmd := commands at:fKey ifAbsent:[nil].
-            cmd notNil ifTrue:[
-                AbortSignal "ErrorSignal" handle:[:ex |
-                    self warn:'error occurred in keyboard macro'.
-                    ex return.
-                ] do:[
-                    Parser evaluate:cmd asString
-                           receiver:self
-                          notifying:nil
-                            compile:false.
-                ].
-                ^ self
-            ]
+        cmd := UserPreferences current functionKeySequences at:fKey ifAbsent:nil.
+        cmd notNil ifTrue:[
+            AbortSignal "ErrorSignal" handle:[:ex |
+                self warn:'error occurred in keyboard macro'.
+                ex return.
+            ] do:[
+                Parser evaluate:cmd asString
+                       receiver:self
+                      notifying:nil
+                        compile:false.
+            ].
+            ^ self
         ]
     ].
 
@@ -908,5 +905,5 @@
 !Workspace class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libwidg/Workspace.st,v 1.72 1999-06-26 14:31:52 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libwidg/Workspace.st,v 1.73 1999-07-16 16:51:31 cg Exp $'
 ! !