From 2e49672561238acbceaa5e6e32e43d7202c50dff Mon Sep 17 00:00:00 2001 From: Robby Findler Date: Fri, 6 Sep 2013 15:35:38 -0500 Subject: [PATCH] adjust racket mode to restore the wordbreak map when it is removed --- pkgs/gui-pkgs/gui-lib/framework/private/mode.rkt | 6 +++--- pkgs/gui-pkgs/gui-lib/framework/private/racket.rkt | 7 +++++-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/gui-pkgs/gui-lib/framework/private/mode.rkt b/pkgs/gui-pkgs/gui-lib/framework/private/mode.rkt index 052524785e..6256536a5c 100644 --- a/pkgs/gui-pkgs/gui-lib/framework/private/mode.rkt +++ b/pkgs/gui-pkgs/gui-lib/framework/private/mode.rkt @@ -1,7 +1,7 @@ -#lang scheme/base +#lang racket/base -(require (for-syntax scheme/base) - scheme/unit +(require (for-syntax racket/base) + racket/unit racket/class racket/surrogate "sig.rkt") diff --git a/pkgs/gui-pkgs/gui-lib/framework/private/racket.rkt b/pkgs/gui-pkgs/gui-lib/framework/private/racket.rkt index 930e900575..962f4f7703 100644 --- a/pkgs/gui-pkgs/gui-lib/framework/private/racket.rkt +++ b/pkgs/gui-pkgs/gui-lib/framework/private/racket.rkt @@ -1283,8 +1283,11 @@ (define text-mode-mixin (mixin (color:text-mode<%> mode:surrogate-text<%>) (-text-mode<%>) + (define saved-wordbreak-map #f) + (define/override (on-disable-surrogate text) (keymap:remove-chained-keymap text keymap) + (send text set-wordbreak-map saved-wordbreak-map) (super on-disable-surrogate text)) (define/override (on-enable-surrogate text) @@ -1292,8 +1295,8 @@ (super on-enable-surrogate text) (send (send text get-private-racket-container-keymap) chain-to-keymap keymap #f) - ;; I don't know about these editor flag settings. - ;; maybe they belong in drracket? + (set! saved-wordbreak-map (send text get-wordbreak-map)) + (send text set-load-overwrites-styles #f) (send text set-wordbreak-map wordbreak-map) (let ([bw (box 0)]