...

original commit: b55205a8e550cdad640417bd0cae48703136cc02

collects/framework/keymap.ss

@@ -28,9 +28,7 @@
   
   (define send-map-function-meta
     (lambda (keymap key func)
-      (for-each (lambda (key)
-		  ;(printf "mapping ~a to ~a~n" key func)
-		  (send keymap map-function key func))
+      (for-each (lambda (key) (send keymap map-function key func))
 		(make-meta-prefix-list key))))
   
   (define setup-global

collects/framework/pasteboard.ss

@@ -2,8 +2,10 @@
   (import mred-interfaces^
 	  [editor : framework:editor^])
 
+  (rename [-keymap% keymap%])
+
   (define basic% (editor:basic-mixin pasteboard%))
-  (define keymap% (editor:keymap-mixin basic%))
-  (define file% (editor:file-mixin keymap%))
+  (define -keymap% (editor:keymap-mixin basic%))
+  (define file% (editor:file-mixin -keymap%))
   (define backup-autosave% (editor:backup-autosave-mixin file%))
   (define info% (editor:info-mixin backup-autosave%)))

collects/framework/text.ss

@@ -6,6 +6,8 @@
 	  [gui-utils : framework:gui-utils^]
 	  [mzlib:function : mzlib:function^])
 
+  (rename [-keymap% keymap%])
+
   (define-struct range (start end b/w-bitmap color caret-space?))
   (define-struct rectangle (left top right bottom b/w-bitmap color))
 
@@ -516,9 +518,9 @@
       (sequence (apply super-init args))))
 
   (define basic% (basic-mixin (editor:basic-mixin text%)))
-  (define keymap% (editor:keymap-mixin basic))
-  (define return% (return-mixin keymap%))
-  (define file% (editor:file-mixin keymap%))
+  (define -keymap% (editor:keymap-mixin basic%))
+  (define return% (return-mixin -keymap%))
+  (define file% (editor:file-mixin -keymap%))
   (define clever-file-format% (clever-file-format-mixin file%))
   (define backup-autosave% (editor:backup-autosave-mixin clever-file-format%))
   (define searching% (searching-mixin backup-autosave%))