From 9f465c4eef0f855bdb7be79968de275f65428604 Mon Sep 17 00:00:00 2001
From: Robby Findler <robby@racket-lang.org>
Date: Sat, 21 Sep 2013 13:15:23 -0500
Subject: [PATCH] Fix a bug in color scheme setup

---
 .../gui-lib/framework/private/color-prefs.rkt      | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/gui-pkgs/gui-lib/framework/private/color-prefs.rkt b/pkgs/gui-pkgs/gui-lib/framework/private/color-prefs.rkt
index f9548d3805..48834ffb2c 100644
--- a/pkgs/gui-pkgs/gui-lib/framework/private/color-prefs.rkt
+++ b/pkgs/gui-pkgs/gui-lib/framework/private/color-prefs.rkt
@@ -628,6 +628,7 @@
    "color-names: ~a\nstyle-names:\n~a\n" 
    (sort (set->list known-color-names) symbol<?)
    (sort (set->list known-style-names) symbol<?))
+  (define preferred-color-scheme (preferences:get 'framework:color-scheme))
   (for ([dir (in-list (find-relevant-directories '(framework:color-schemes)))])
     (define info (get-info/full dir))
     (when info
@@ -658,7 +659,11 @@
             "expected something matching:\n~a\nfor framework:color-schemes in ~a, got\n~a"
             (pretty-format (contract-name info-file-result-check?))
             dir
-            (pretty-format cs-info)))]))))
+            (pretty-format cs-info)))])))
+  ;; the color-scheme saved in the user's preferences may not be known
+  ;; until after the code above executes, which would mean that the 
+  ;; color scheme in effect up to that point may be wrong. So fix that here:
+  (set-current-color-scheme preferred-color-scheme #t))
 
 
 ;; register-color-scheme : string boolean? (listof (cons/c symbol? (listof props)) -> void
@@ -693,12 +698,7 @@
                               (props->color (cdr line))]
                              [(set-member? known-style-names name)
                               (props->style-delta (cdr line))]))))
-                  example))))
-  
-  ;; the color-scheme saved in the user's preferences may not be known
-  ;; until after the code above executes, which would mean that the 
-  ;; color scheme in effect up to that point may be wrong. So fix that here:
-  (set-current-color-scheme (preferences:get 'framework:color-scheme) #t))
+                  example)))))
 
 (define valid-props? 
   (listof (or/c 'bold 'italic 'underline