Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

370p2 fix

svn: r6843
  • Loading branch information...
commit 42b178c415ff4fbacea49617432a67954b693223 1 parent 048f001
@elibarzilay elibarzilay authored
Showing with 34 additions and 24 deletions.
  1. +26 −21 collects/drscheme/private/unit.ss
  2. +8 −3 collects/version/patchlevel.ss
View
47 collects/drscheme/private/unit.ss
@@ -458,10 +458,12 @@ module browser threading seems wrong.
(let-values ([(creator type) (file-creator-and-type filename)])
(file-creator-and-type filename #"DrSc" type))))))
(when save-file-metadata
- (delete 0 (string-length save-file-metadata))
- (set! save-file-metadata #f)
- (end-edit-sequence)
- (set-modified #f))
+ (let ([modified? (is-modified?)])
+ (delete 0 (string-length save-file-metadata))
+ (set! save-file-metadata #f)
+ (end-edit-sequence)
+ ;; restore modification status to where it was before the metadata is removed
+ (set-modified modified?)))
(inner (void) after-save-file success?))
(define/augment (on-load-file filename format)
@@ -3474,24 +3476,27 @@ module browser threading seems wrong.
[marshalled-settings (cdr name/settings)]
[lang (ormap
(λ (l) (and (equal? (send l get-language-name) name) l))
- (drscheme:language-configuration:get-languages))]
- [settings (send lang unmarshall-settings marshalled-settings)])
+ (drscheme:language-configuration:get-languages))])
(when lang
- (set! added-one? #t)
- (new menu-item%
- [parent menu]
- [label (string-append " "
- (send lang get-language-name)
- (if (send lang default-settings? settings)
- ""
- (string-append " " (string-constant custom))))]
- [callback
- (λ (x y)
- (send (send frame get-definitions-text)
- set-next-settings
- (drscheme:language-configuration:make-language-settings
- lang
- settings)))]))))
+ ;; this test can fail when a language has been added wrongly via the tools interface
+ ;; just ignore that menu item, in that case.
+ (let ([settings (send lang unmarshall-settings marshalled-settings)])
+ (when lang
+ (set! added-one? #t)
+ (new menu-item%
+ [parent menu]
+ [label (string-append " "
+ (send lang get-language-name)
+ (if (send lang default-settings? settings)
+ ""
+ (string-append " " (string-constant custom))))]
+ [callback
+ (λ (x y)
+ (send (send frame get-definitions-text)
+ set-next-settings
+ (drscheme:language-configuration:make-language-settings
+ lang
+ settings)))]))))))
(preferences:get 'drscheme:recent-language-names))
(unless added-one?
(send (new menu-item%
View
11 collects/version/patchlevel.ss
@@ -1,15 +1,20 @@
;; this file contains the current patch level of DrScheme
;; it is usually `0' in the repository, and changed only when a patch is made.
-;; This PLT installation has a patch applied (v370), which fixes the use of
-;; teachpacks that contain images. Files that were patched:
+;; This PLT installation has a patch applied (v370p2), which fixes
+;; * teachpacks that contain images
+;; * picts in DrScheme's repl
+;; * the "autosave disabled" bug
+;; * a bug in the recently used language menu
+;; Files that were patched:
;; collects/version/patchlevel.ss
;; collects/drscheme/private/module-language.ss
;; collects/framework/private/scheme.ss
;; collects/slideshow/tool.ss
;; collects/lang/htdp-langs.ss
;; collects/tests/drscheme/module-lang-test.ss
+;; collects/drscheme/private/unit.ss
(module patchlevel mzscheme
- (define patchlevel 1)
+ (define patchlevel 2)
(provide patchlevel))
Please sign in to comment.
Something went wrong with that request. Please try again.