From b0ed2f5bc248c7f3c1dac2452068214634cc3ac1 Mon Sep 17 00:00:00 2001 From: Matthew Flatt Date: Tue, 4 Jan 2011 06:11:46 -0700 Subject: [PATCH] fix result of editor<%> `load-file' when the editor is locked relevant to PR 11590 --- collects/mred/private/wxme/pasteboard.rkt | 2 +- collects/mred/private/wxme/text.rkt | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/collects/mred/private/wxme/pasteboard.rkt b/collects/mred/private/wxme/pasteboard.rkt index e3134c9820..8b50e2e1d3 100644 --- a/collects/mred/private/wxme/pasteboard.rkt +++ b/collects/mred/private/wxme/pasteboard.rkt @@ -1907,7 +1907,7 @@ [any? [replace-styles? #f]]) (if (or s-user-locked? (not (zero? write-locked))) - 'guess ;; FIXME: docs say that this is more specific + 'standard (do-insert-file (method-name 'pasteboard% 'insert-file) f replace-styles?))) (define/private (do-insert-file who f clear-styles?) diff --git a/collects/mred/private/wxme/text.rkt b/collects/mred/private/wxme/text.rkt index 5f07b57d5c..3dab7618ce 100644 --- a/collects/mred/private/wxme/text.rkt +++ b/collects/mred/private/wxme/text.rkt @@ -2592,7 +2592,9 @@ [(symbol-in guess same copy standard text text-force-cr) [format 'guess]] [any? [replace-styles? #t]]) (if (or write-locked? s-user-locked?) - 'guess ;; FIXME: docs say that this is more specific + (if (not (detect-wxme-file (method-name 'text% 'insert-file) f #t)) + 'text + 'standard) (do-insert-file (method-name 'text% 'insert-file) f format replace-styles?))) (define/private (do-insert-file who f fmt clear-styles?)