From 3b6bcc5e54399ca3cc88b6c30c4ca44914848b27 Mon Sep 17 00:00:00 2001
From: Robby Findler <robby@racket-lang.org>
Date: Mon, 21 May 2001 02:01:45 +0000
Subject: [PATCH] no message

original commit: 160b5e3024bb0d01b78007a5c27cbfa1a27cf2f1
---
 collects/framework/private/scheme.ss | 16 +++++++++-------
 collects/framework/private/text.ss   | 26 ++++++++------------------
 2 files changed, 17 insertions(+), 25 deletions(-)

diff --git a/collects/framework/private/scheme.ss b/collects/framework/private/scheme.ss
index f4dd3c6a..6b6af18a 100644
--- a/collects/framework/private/scheme.ss
+++ b/collects/framework/private/scheme.ss
@@ -24,6 +24,7 @@
 	  [icon : framework:icon^]
 	  [keymap : framework:keymap^]
 	  [text : framework:text^]
+          [editor : framework:editor^]
 	  [frame : framework:frame^])
   
   (rename [-text% text%]
@@ -97,7 +98,7 @@
   (define mismatch-color (make-object color% "PINK"))
   
   (define text-mixin 
-    (mixin (text:basic<%>) (-text<%>) args
+    (mixin (text:basic<%> editor:keymap<%>) (-text<%>) args
       (inherit begin-edit-sequence
 	       delete
 	       end-edit-sequence
@@ -812,6 +813,12 @@
 	[get-tab-size (lambda () tab-size)]
 	[set-tab-size (lambda (s) (set! tab-size s))])
 
+      (rename [super-get-keymaps get-keymaps])
+      (override
+        [get-keymaps
+         (lambda ()
+           (cons keymap (super-get-keymaps)))])
+      
       (sequence
 	(apply super-init args)
 	
@@ -820,12 +827,7 @@
 	(set-wordbreak-map wordbreak-map)
 	(set-tabs null tab-size #f)
 	(set-style-list style-list)
-	(set-styles-fixed #t)
-	(let ([k (or (get-keymap)
-		     (let ([k (make-object keymap%)])
-		       (set-keymap k)
-		       k))])
-	  (send k chain-to-keymap keymap #t)))))
+	(set-styles-fixed #t))))
 
   (define -text% (text-mixin text:info%))
 
diff --git a/collects/framework/private/text.ss b/collects/framework/private/text.ss
index 31ee8e22..b69700e8 100644
--- a/collects/framework/private/text.ss
+++ b/collects/framework/private/text.ss
@@ -349,24 +349,14 @@
   (define searching<%> (interface (editor:keymap<%> basic<%>)))
   (define searching-mixin
     (mixin (editor:keymap<%> basic<%>) (searching<%>) args
-	   (inherit get-end-position get-start-position last-position 
-		    find-string get-snip-position get-admin find-snip)
-	   ;(rename [super-on-new-box on-new-box])
-	   ;(override
-	   ; [on-new-box
-	   ;  (lambda (type)
-	   ;    (if (eq? type 'text)
-	;	   (make-object editor-snip% (make-object searching%))
-	;	   (super-on-new-box)))])
-	   
-	   (rename [super-get-keymaps get-keymaps])
-	   (override
-	    [get-keymaps
-	     (lambda ()
-	       (cons (keymap:get-search) (super-get-keymaps)))])
-	   
-	   (sequence
-	     (apply super-init args))))
+      (rename [super-get-keymaps get-keymaps])
+      (override
+        [get-keymaps
+         (lambda ()
+           (cons (keymap:get-search) (super-get-keymaps)))])
+      
+      (sequence
+        (apply super-init args))))
   
   (define return<%> (interface ((class->interface text%))))