[racket-dev] please merge to release: Fwd: [plt] Push #24173: master branch updated

Sorry, should have put this in the commit messages: please merge both of these to the release branch.

John


Begin forwarded message:

> From: clements at racket-lang.org
> Date: January 18, 2012 2:51:50 PM PST
> To: dev at racket-lang.org
> Subject: [plt] Push #24173: master branch updated
> 
> clements has updated `master' from 276cb4150d to 481bc2f00f.
>  http://git.racket-lang.org/plt/276cb4150d..481bc2f00f
> 
> =====[ 2 Commits ]======================================================
> 
> Directory summary:
> 100.0% collects/stepper/private/
> 
> ~~~~~~~~~~
> 
> 758523b John Clements <clements at racket-lang.org> 2012-01-18 13:08
> :
> | put status bar update on stepper frame eventspace
> :
>  M collects/stepper/private/view-controller.rkt |   19 ++++++++++---------
> 
> ~~~~~~~~~~
> 
> 481bc2f John Clements <clements at racket-lang.org> 2012-01-18 14:51
> :
> | make sure initial update goes on eventspace thread
> :
>  M collects/stepper/private/view-controller.rkt |   11 ++++++++---
> 
> =====[ Overall Diff ]===================================================
> 
> collects/stepper/private/view-controller.rkt
> ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> --- OLD/collects/stepper/private/view-controller.rkt
> +++ NEW/collects/stepper/private/view-controller.rkt
> @@ -79,19 +79,20 @@
>   (define view #f)
> 
>   ;; wait for steps to show up on the channel.  When they do, add them to the list.
> -  (define (start-listener-thread)
> +  (define (start-listener-thread stepper-frame-eventspace)
>     (thread
>      (lambda ()
>        (let loop ()
>          (define new-result (async-channel-get view-channel))
>          (define new-step (format-result new-result))
> -         (queue-callback
> -          (lambda ()
> -            (set! view-history (append view-history (list new-step)))
> -            (set! num-steps-available (length view-history))
> -            ;; this is only necessary the first time, but it's cheap:
> -            (semaphore-post first-step-sema)
> -            (update-status-bar)))
> +         (parameterize ([current-eventspace stepper-frame-eventspace])
> +           (queue-callback
> +            (lambda ()
> +              (set! view-history (append view-history (list new-step)))
> +              (set! num-steps-available (length view-history))
> +              ;; this is only necessary the first time, but it's cheap:
> +              (semaphore-post first-step-sema)
> +              (update-status-bar))))
>          (loop)))))
> 
> 
> @@ -374,8 +375,9 @@
>   (send (send s-frame edit-menu:get-undo-item) enable #f)
>   (send (send s-frame edit-menu:get-redo-item) enable #f)
> 
> +  (define stepper-frame-eventspace (send s-frame get-eventspace))
>   ;; START THE MODEL
> -  (start-listener-thread)
> +  (start-listener-thread stepper-frame-eventspace)
>   (model:go
>    program-expander-prime 
>    ;; what do do with the results:
> @@ -392,8 +394,12 @@
>   (thread
>    (lambda ()
>      (semaphore-wait first-step-sema)
> -     (jump-to-beginning)
> -     (enable-all-buttons)))
> +     (parameterize
> +         ([current-eventspace stepper-frame-eventspace])
> +       (queue-callback
> +        (lambda ()
> +          (jump-to-beginning)
> +          (enable-all-buttons))))))
> 
>   s-frame)
> 

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.racket-lang.org/dev/archive/attachments/20120118/f957d0e6/attachment.html>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: smime.p7s
Type: application/pkcs7-signature
Size: 4624 bytes
Desc: not available
URL: <http://lists.racket-lang.org/dev/archive/attachments/20120118/f957d0e6/attachment.p7s>