From e6d54fe08243554f8d3942136b561bad8f7fce5b Mon Sep 17 00:00:00 2001
From: Robby Findler <robby@racket-lang.org>
Date: Mon, 8 Oct 2007 23:48:56 +0000
Subject: [PATCH] attempt to fix one part of PR 8967

svn: r7458
---
 collects/drscheme/private/app.ss           |  4 ++++
 collects/drscheme/private/rep.ss           | 23 ----------------------
 collects/drscheme/private/stick-figures.ss |  2 +-
 collects/drscheme/private/unit.ss          | 12 ++++++++++-
 4 files changed, 16 insertions(+), 25 deletions(-)

diff --git a/collects/drscheme/private/app.ss b/collects/drscheme/private/app.ss
index 3fade10f40..927df50ee7 100644
--- a/collects/drscheme/private/app.ss
+++ b/collects/drscheme/private/app.ss
@@ -337,6 +337,10 @@
         (scroll-to-position 0)
         (lock #t))
       
+      (when (eq? (system-type) 'macosx)
+        ;; otherwise, the focus is the tour button, as above
+        (send editor-canvas focus))
+      
       (send f show #t)
       f))
   
diff --git a/collects/drscheme/private/rep.ss b/collects/drscheme/private/rep.ss
index bb1a5401a9..7238c64964 100644
--- a/collects/drscheme/private/rep.ss
+++ b/collects/drscheme/private/rep.ss
@@ -282,28 +282,6 @@ TODO
                          (and (equal? (path-element->bytes name) (car pieces))
                               (loop base (cdr pieces))))]))))))
     
-    ;; drscheme-error-value->string-handler : TST number -> string
-    (define (drscheme-error-value->string-handler x n)
-      (let ([port (open-output-string)])
-        
-        ;; using a string port here means no snips allowed,
-        ;; even though this string may eventually end up
-        ;; displayed in a place where snips are allowed.
-        (print x port)
-        
-        (let* ([long-string (get-output-string port)])
-          (close-output-port port)
-          (if (<= (string-length long-string) n)
-              long-string
-              (let ([short-string (substring long-string 0 n)]
-                    [trim 3])
-                (unless (n . <= . trim)
-                  (let loop ([i trim])
-                    (unless (i . <= . 0)
-                      (string-set! short-string (- n i) #\.)
-                      (loop (sub1 i)))))
-                short-string)))))
-    
     (define drs-bindings-keymap (make-object keymap:aug-keymap%))
     
     (send drs-bindings-keymap add-function
@@ -1364,7 +1342,6 @@ TODO
         (define/private (initialize-parameters snip-classes) ; =User=
           
           (current-language-settings user-language-settings)
-          (error-value->string-handler drscheme-error-value->string-handler)
           (error-print-source-location #f)
           (error-display-handler drscheme-error-display-handler)
           (current-load-relative-directory #f)
diff --git a/collects/drscheme/private/stick-figures.ss b/collects/drscheme/private/stick-figures.ss
index 58856fedec..91d23e94ae 100644
--- a/collects/drscheme/private/stick-figures.ss
+++ b/collects/drscheme/private/stick-figures.ss
@@ -365,4 +365,4 @@
     (send f show #t))
   
   #;(edit-points waiting-points)
-  #;(edit-points running-points/2))
+  #;(edit-points running-points))
diff --git a/collects/drscheme/private/unit.ss b/collects/drscheme/private/unit.ss
index 7387e80abc..806a555f98 100644
--- a/collects/drscheme/private/unit.ss
+++ b/collects/drscheme/private/unit.ss
@@ -2077,8 +2077,18 @@ module browser threading seems wrong.
           (preferences:set 'drscheme:unit-window-max? (is-maximized?))
           (super on-size w h))
         
+        (define on-move-callback-waiting #f)
         (define/override (on-move x y)
-          (preferences:set 'drscheme:frame:initial-position (cons x y)))
+          (cond
+            [on-move-callback-waiting
+             (set! on-move-callback-waiting (cons x y))]
+            [else
+             (set! on-move-callback-waiting (cons x y))
+             (queue-callback
+              (λ ()
+                (preferences:set 'drscheme:frame:initial-position on-move-callback-waiting)
+                (set! on-move-callback-waiting #f))
+              #f)]))
         
         (define/override (get-editor) definitions-text)
         (define/override (get-canvas)