fixed a bug in preferences reading

svn: r5158

collects/framework/private/finder.ss

@@ -94,6 +94,7 @@
 
       (define -put-file
 	(λ args
+          (printf "put-file ~s\n" (preferences:get 'framework:file-dialogs))
           (apply (case (preferences:get 'framework:file-dialogs)
                    [(std) std-put-file]
                    [(common) common-put-file])

collects/framework/private/handler.ss

@@ -377,8 +377,7 @@
            (set-to-default)
            (super-new))))
   
-      (define open-file
-	(λ ()
+  (define (open-file)
     (let* ([parent (and (or (not (eq? 'macosx (system-type)))
                             (preferences:get 'framework:open-here?))
                         (get-top-level-focus-window))]
@@ -390,4 +389,4 @@
         (send *open-directory*
               set-from-file! file))
       (and file
-		 (edit-file file))))))
+           (edit-file file)))))

collects/framework/private/preferences.ss

@@ -101,7 +101,9 @@ the state transitions / contracts are:
        
        ;; unmarshall, if required
        (when (hash-table-bound? marshalled p)
-         (hash-table-put! preferences p (unmarshall-pref p (hash-table-get marshalled p)))
+         ;; if `preferences' is already bound, that means the unmarshalled value isn't useful.
+         (unless (hash-table-bound? preferences p)
+           (hash-table-put! preferences p (unmarshall-pref p (hash-table-get marshalled p))))
          (hash-table-remove! marshalled p))
        
        ;; if there is no value in the preferences table, but there is one

collects/framework/private/text.ss

@@ -24,7 +24,8 @@ WARNING: printf is rebound in the body of the unit to always
           [prefix color-model: framework:color-model^]
           [prefix frame: framework:frame^]
           [prefix scheme: framework:scheme^]
-          [prefix number-snip: framework:number-snip^])
+          [prefix number-snip: framework:number-snip^]
+          [prefix finder: framework:finder^])
   (export (rename framework:text^
                   [-keymap% keymap%]))
   (init-depend framework:editor^)
@@ -52,7 +53,7 @@ WARNING: printf is rebound in the body of the unit to always
       
       (define basic-mixin
         (mixin (editor:basic<%> (class->interface text%)) (basic<%>)
-          (inherit get-canvases get-admin split-snip get-snip-position
+          (inherit get-canvas get-canvases get-admin split-snip get-snip-position
                    begin-edit-sequence end-edit-sequence
                    set-autowrap-bitmap
                    delete find-snip invalidate-bitmap-cache
@@ -350,7 +351,18 @@ WARNING: printf is rebound in the body of the unit to always
           (public initial-autowrap-bitmap)
           (define (initial-autowrap-bitmap) (icon:get-autowrap-bitmap))
           
-          (super-instantiate ())
+          (define/override (put-file directory default-name)
+            (let* ([canvas (get-canvas)]
+                   [parent (and canvas (send canvas get-top-level-window))])
+              (finder:put-file default-name
+                               directory
+                               #f
+                               (string-constant select-file)
+                               #f
+                               ""
+                               parent)))
+          
+          (super-new)
           (set-autowrap-bitmap (initial-autowrap-bitmap))))
       
       (define foreground-color<%>