From f18a4ef632ed2a6b21d6bf5a9405edbc0ddd6362 Mon Sep 17 00:00:00 2001
From: Scott Owens <sowens@cs.utah.edu>
Date: Thu, 22 Jan 2004 22:47:27 +0000
Subject: [PATCH] *** empty log message ***

original commit: ee6c2c4fd477a60e305ef7b7f0e0f80e71b7d69f
---
 collects/framework/private/color.ss  | 5 +++--
 collects/framework/private/scheme.ss | 8 ++++----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/collects/framework/private/color.ss b/collects/framework/private/color.ss
index 44b2597d..3f03c0ab 100644
--- a/collects/framework/private/color.ss
+++ b/collects/framework/private/color.ss
@@ -174,7 +174,7 @@
           ;; breaks disabled re-tokenize should be called when lock is not
           ;; held.  When it exits, the lock will be held.
           (define/private (re-tokenize in in-start-pos)
-            (let-values (((type data new-token-start new-token-end) (get-token in)))
+            (let-values (((lexeme type data new-token-start new-token-end) (get-token in)))
               ;; breaks must be disabled before the semaphore wait so we can't be
               ;; broken out of the critical section
               (break-enabled #f)
@@ -289,7 +289,8 @@
                 (break-enabled #t)
                 (with-handlers ((not-break-exn?
                                  (lambda (exn)
-                                   (printf "colorer thread: ~s\n" exn)
+                                   (parameterize ((print-struct #t))
+                                     (printf "colorer thread: ~s\n" exn))
                                    (break-enabled #f)
                                    (semaphore-wait mutex-lock))))
                   (re-tokenize (open-input-text-editor this current-pos end-pos
diff --git a/collects/framework/private/scheme.ss b/collects/framework/private/scheme.ss
index 2d3116ea..28290f9d 100644
--- a/collects/framework/private/scheme.ss
+++ b/collects/framework/private/scheme.ss
@@ -947,15 +947,15 @@
                                 (|{| |}|))))))
       
       (define (scheme-lexer-wrapper in)
-        (let-values (((type lex start end) (scheme-lexer in)))
+        (let-values (((lexeme type paren start end) (scheme-lexer in)))
           (cond
             ((and (eq? type 'symbol)
                   (hash-table-get (preferences:get 'framework:tabify)
-                                  (string->symbol lex)
+                                  (string->symbol lexeme)
                                   (lambda () #f)))
-             (values 'keyword lex start end))
+             (values lexeme 'keyword paren start end))
             (else
-             (values type lex start end)))))
+             (values lexeme type paren start end)))))
       
       (define set-mode-mixin
         (mixin (-text<%> mode:host-text<%>) ()