..

original commit: 968ad03a861729fc05db380baecf486693ec5b14

collects/framework/private/mode.ss

@@ -9,7 +9,7 @@
     (unit/sig framework:mode^
       (import)
       
-      (define-values (host-text-mixin surrogate-text% surrogate-text<%>)
+      (define-values (host-text-mixin host-text<%> surrogate-text% surrogate-text<%>)
         (surrogate
          (on-change ())
          (on-char (event))
@@ -50,4 +50,4 @@
          (can-set-size-constraint? ())
          (can-do-edit-operation? (op) (op recursive?))
          (can-load-file? (filename format))
-         (can-save-file? (filename format)))))))
+         (can-save-file? (filename format)))))))

collects/framework/private/scheme.ss

@@ -318,7 +318,7 @@
           (send style-list find-named-style "Matching Parenthesis Style")))
 
       (define text-mixin
-        (mixin (text:basic<%> host<%>) (-text<%>)
+        (mixin (text:basic<%> mode:host-text<%>) (-text<%>)
           (inherit begin-edit-sequence
                    delete
                    end-edit-sequence
@@ -1166,7 +1166,17 @@
           
           (super-instantiate ())))
 
-      (define -text% (text-mixin (mode:host-text-mixin text:info%)))
+      (define set-mode-mixin
+        (mixin (-text<%> mode:host-text<%>) ()
+	  (super-new)
+	  (inherit set-surrogate)
+	  (set-surrogate (new text-mode%))))
+
+      (define -text% (set-mode-mixin
+		      (text-mixin
+		       (mode:host-text-mixin
+			text:info%))))
+
       (define text-mode% (text-mode-mixin mode:surrogate-text%))
     
                                                                                            

collects/framework/private/sig.ss

@@ -502,6 +502,8 @@
      text-mode-mixin
      text-mode%
      
+     set-mode-mixin
+
      sexp-snip%
      sexp-snip<%>))
   (define-signature framework:scheme-fun^
@@ -533,6 +535,7 @@
 
   (define-signature framework:mode-class^ 
     (host-text-mixin
+     host-text<%>
      surrogate-text%
      surrogate-text<%>))
   (define-signature framework:mode-fun^ ())