From e69b11ffc03770f001a48aa2cf07568a11ee0829 Mon Sep 17 00:00:00 2001
From: Robby Findler <robby@racket-lang.org>
Date: Thu, 24 Jan 2002 20:31:16 +0000
Subject: [PATCH] ...

original commit: 7503b43eb32f84ddf7fc9d433ae323e14117587b
---
 collects/framework/private/editor.ss      | 17 +--------
 collects/framework/private/frame.ss       |  4 +-
 collects/framework/private/preferences.ss | 46 +++++++++++++++--------
 3 files changed, 35 insertions(+), 32 deletions(-)

diff --git a/collects/framework/private/editor.ss b/collects/framework/private/editor.ss
index b3568ec6..ecadb338 100644
--- a/collects/framework/private/editor.ss
+++ b/collects/framework/private/editor.ss
@@ -266,26 +266,11 @@
       (define autowrap<%> (interface (basic<%>)))
       (define autowrap-mixin
 	(mixin (basic<%>) (autowrap<%>)
-	  
-	  (rename [super-on-close on-close])
-	  (override on-close)
-          [define on-close
-	    (lambda ()
-	      (remove-callback)
-	      (super-on-close))]
-	  
 	  (inherit auto-wrap)
           (super-instantiate ())
           (auto-wrap 
            (preferences:get
-            'framework:auto-set-wrap?))
-          [define remove-callback
-            (preferences:add-callback
-             'framework:auto-set-wrap?
-             (let ([autowrap-mixin-pref-callback
-                    (lambda (p v)
-                      (auto-wrap v))])
-               autowrap-mixin-pref-callback))]))
+            'framework:auto-set-wrap?))))
       
       (define file<%> (interface (-keymap<%>)))
       (define file-mixin
diff --git a/collects/framework/private/frame.ss b/collects/framework/private/frame.ss
index 554998cf..cdbf8ea2 100644
--- a/collects/framework/private/frame.ss
+++ b/collects/framework/private/frame.ss
@@ -814,7 +814,9 @@
                        (let ([edit (get-edit-target-object)])
                          (when (and edit
                                     (is-a? edit editor<%>))
-                           (send edit auto-wrap (not (send edit auto-wrap))))))])
+                           (let ([new-pref (not (send edit auto-wrap))])
+                             (preferences:set 'framework:auto-set-wrap? new-pref)
+                             (send edit auto-wrap new-pref)))))])
                (make-object c% (string-constant wrap-text-item)
                  edit-menu callback #f #f on-demand))
              
diff --git a/collects/framework/private/preferences.ss b/collects/framework/private/preferences.ss
index 747ef5ea..e9e44588 100644
--- a/collects/framework/private/preferences.ss
+++ b/collects/framework/private/preferences.ss
@@ -269,8 +269,9 @@
           (let loop ([input input])
             (when (pair? input)
               (let ([pre-pref (car input)])
-                (if (and (list? pre-pref)
-                         (= 2 (length pre-pref)))
+                (if (and (pair? pre-pref)
+                         (pair? (cdr pre-pref))
+                         (null? (cddr pre-pref)))
                     (parse-pref (car pre-pref) (cadr pre-pref))
                     (begin (read-err input (string-constant expected-list-of-length2))
                            (k #f))))
@@ -302,16 +303,30 @@
       (define (-read)
         (let/ec k
           (let ([sexp (get-preference main-preferences-symbol (lambda () (k #f)))])
-            (for-each-pref-in-sexp 
-             sexp
-             (lambda (p marshalled)
-               (add-raw-pref-to-ht preferences p marshalled))))))
-            
-      ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-      ;;;                                                 ;;;
-      ;;;               preferences dialog                ;;;
-      ;;;                                                 ;;;
-      ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+            (install-stashed-preferences sexp))))
+      
+      ;; install-stashed-preferences : sexp -> void
+      ;; ensure that `prefs' is actuall a well-formed preferences
+      ;; table and installs them as the current preferences.
+      (define (install-stashed-preferences prefs)
+        (for-each-pref-in-sexp 
+         prefs
+         (lambda (p marshalled)
+           (add-raw-pref-to-ht preferences p marshalled))))
+ 
+                                          
+    ;;    ;           ;;;                 
+     ;                  ;                 
+     ;                  ;                 
+  ;;;;  ;;;    ;;;;     ;     ;;;    ;;; ;
+ ;   ;    ;        ;    ;    ;   ;  ;   ; 
+ ;   ;    ;     ;;;;    ;    ;   ;  ;   ; 
+ ;   ;    ;    ;   ;    ;    ;   ;  ;   ; 
+ ;   ;    ;    ;   ;    ;    ;   ;  ;   ; 
+  ;;; ; ;;;;;   ;;; ; ;;;;;;  ;;;    ;;;; 
+                                        ; 
+                                        ; 
+                                     ;;;  
       
       
       (define-struct ppanel (title container panel))
@@ -583,7 +598,8 @@
       
       (define make-preferences-dialog
         (lambda ()
-          (letrec ([frame 
+          (letrec ([stashed-prefs (get-preference main-preferences-symbol (lambda () null))]
+                   [frame 
                     (make-object (class100 frame% args
                                    (public
                                      [added-pane
@@ -648,9 +664,9 @@
                                   (hide-dialog))]
                    [ok-button (make-object button% (string-constant ok)
                                 bottom-panel ok-callback '(border))]
-                   [cancel-callback (lambda args
+                   [cancel-callback (lambda (_1 _2)
                                       (hide-dialog)
-                                      (-read))]
+                                      (install-stashed-preferences stashed-prefs))]
                    [cancel-button (make-object button% (string-constant cancel)
                                     bottom-panel cancel-callback)]
                    [grow-box-space (make-object grow-box-spacer-pane% bottom-panel)])