--- a/TerminalView.st	Thu Apr 29 11:45:36 1999 +0200
+++ b/TerminalView.st	Thu Apr 29 14:42:37 1999 +0200
@@ -446,7 +446,7 @@
 
     Transcript show:'unhandled: '; showCR:rawKey.
 
-    "Modified: / 28.4.1999 / 14:11:42 / cg"
+    "Modified: / 29.4.1999 / 14:04:02 / cg"
 !
 
 shellTerminated
@@ -931,19 +931,23 @@
 !
 
 initializeKeyboardMap
-    |ctrlKeys cmdKeys|
+    |keys ctrlKeys cmdKeys|
 
-    "/ setup my own keyboardMap, where control-keys are
-    "/ not translated.
+    "/ setup my own keyboardMap, where control-keys 
+    "/ (and some Cmd-keys) are not translated.
     kbdMap := device keyboardMap copy.
+    keys := kbdMap keys.
 
-    ctrlKeys := kbdMap keys select:[:key | key startsWith:'Ctrl'].
+    ctrlKeys := keys select:[:key | key startsWith:'Ctrl'].
     ctrlKeys do:[:key | kbdMap removeKey:key].
 
-    cmdKeys := kbdMap keys select:[:key | key startsWith:'Cmd'].
-    cmdKeys do:[:key | 
-        (#(Copy Paste SaveAs Print) includes:(kbdMap at:key)) ifFalse:[
-            kbdMap removeKey:key
+    cmdKeys := keys select:[:key | key startsWith:'Cmd'].
+    cmdKeys do:[:key | |val|
+        val := kbdMap at:key.
+        val isSymbol ifTrue:[
+            (#(Copy Paste SaveAs Print) includes:val) ifFalse:[
+                kbdMap removeKey:key
+            ]
         ]
     ].
 
@@ -954,7 +958,7 @@
      VT52TerminalView openShell
     "
 
-    "Modified: / 12.6.1998 / 22:18:23 / cg"
+    "Modified: / 29.4.1999 / 14:25:24 / cg"
 !
 
 initializeKeyboardSequences
@@ -1410,5 +1414,5 @@
 !TerminalView class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libwidg2/TerminalView.st,v 1.75 1999-04-29 09:29:30 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libwidg2/TerminalView.st,v 1.76 1999-04-29 12:42:37 cg Exp $'
 ! !