From a53d477f69493b93a882e38f019f56196aef2753 Mon Sep 17 00:00:00 2001 From: Robby Findler Date: Tue, 12 Aug 2003 21:59:13 +0000 Subject: [PATCH] .. original commit: 06e37245c60352bd19d85323640f7b6a2152cdbd --- .../framework/private/gen-standard-menus.ss | 3 --- collects/framework/private/scheme.ss | 22 +++++++++++++------ 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/collects/framework/private/gen-standard-menus.ss b/collects/framework/private/gen-standard-menus.ss index bf7da6ca..0c7ba208 100644 --- a/collects/framework/private/gen-standard-menus.ss +++ b/collects/framework/private/gen-standard-menus.ss @@ -145,9 +145,6 @@ (mixin (basic<%>) (standard-menus<%>) (inherit on-menu-char on-traverse-char) - (set! t (current-milliseconds)) - (set! g (current-gc-milliseconds)) - (define remove-prefs-callback (preferences:add-callback 'framework:menu-bindings diff --git a/collects/framework/private/scheme.ss b/collects/framework/private/scheme.ss index f7bf73d1..713ac9bd 100644 --- a/collects/framework/private/scheme.ss +++ b/collects/framework/private/scheme.ss @@ -1153,18 +1153,26 @@ (rename [super-on-enable-surrogate on-enable-surrogate]) (define/override (on-enable-surrogate text) - (super-on-enable-surrogate text) - (send (send text get-keymap) chain-to-keymap keymap #t) - (unless (send text local-edit-sequence?) - (when (send text has-focus?) - (send text highlight-parens))) + (send text begin-edit-sequence) + (super-on-enable-surrogate text) + (send (send text get-keymap) chain-to-keymap keymap #t) + (unless (send text local-edit-sequence?) + (when (send text has-focus?) + (send text highlight-parens))) ;; I don't know about these editor flag settings. ;; maybe they belong in drscheme? (send text set-load-overwrites-styles #f) (send text set-wordbreak-map wordbreak-map) - (send text set-tabs null (send text get-tab-size) #f) - (send text set-styles-fixed #t)) + (let ([bw (box 0)] + [bu (box #f)] + [tab-size (send text get-tab-size)]) + (unless (and (null? (send text get-tabs #f bw bu)) + (= tab-size (unbox bw)) + (not (unbox bu))) + (send text set-tabs null (send text get-tab-size) #f))) + (send text set-styles-fixed #t) + (send text end-edit-sequence)) (super-instantiate ())))