PR 9387
svn: r9841
This commit is contained in:
parent
a2c4f5851b
commit
0dbc57a309
|
@ -2,7 +2,7 @@
|
||||||
(require "modes.ss"
|
(require "modes.ss"
|
||||||
"font.ss"
|
"font.ss"
|
||||||
"eval.ss"
|
"eval.ss"
|
||||||
"module-overview.ss"
|
"module-browser.ss"
|
||||||
"multi-file-search.ss"
|
"multi-file-search.ss"
|
||||||
"debug.ss"
|
"debug.ss"
|
||||||
"module-language.ss"
|
"module-language.ss"
|
||||||
|
|
|
@ -740,7 +740,15 @@
|
||||||
[(eof-object? sexp)
|
[(eof-object? sexp)
|
||||||
(custodian-shutdown-all user-custodian)]
|
(custodian-shutdown-all user-custodian)]
|
||||||
[else
|
[else
|
||||||
(add-connections sexp)
|
;; instead of escaping when there's an error on the user thread,
|
||||||
|
;; we just shut it all down. This kills the event handling loop
|
||||||
|
;; for the eventspace and wakes up the thread below
|
||||||
|
;; NOTE: we cannot set this in `init' since the call to `init'
|
||||||
|
;; is wrapped in a parameterize of the error-escape-handler
|
||||||
|
(parameterize ([error-escape-handler
|
||||||
|
(λ ()
|
||||||
|
(custodian-shutdown-all user-custodian))])
|
||||||
|
(add-connections sexp))
|
||||||
(continue)]))
|
(continue)]))
|
||||||
(define init-complete (make-semaphore 0))
|
(define init-complete (make-semaphore 0))
|
||||||
|
|
||||||
|
@ -774,15 +782,11 @@
|
||||||
p))))
|
p))))
|
||||||
(current-load-relative-directory init-dir)
|
(current-load-relative-directory init-dir)
|
||||||
(current-directory init-dir)
|
(current-directory init-dir)
|
||||||
#;
|
(error-display-handler (λ (str exn) (set! error-str str)))
|
||||||
(error-display-handler
|
|
||||||
(λ (str exn)
|
|
||||||
(set! error-str str)
|
|
||||||
(custodian-shutdown-all user-custodian)))
|
|
||||||
(semaphore-post init-complete))
|
(semaphore-post init-complete))
|
||||||
(define (kill-termination) (void))
|
(define (kill-termination) (void))
|
||||||
(define complete-program? #t)
|
(define complete-program? #t)
|
||||||
|
|
||||||
(define stupid-internal-define-syntax1
|
(define stupid-internal-define-syntax1
|
||||||
((drscheme:eval:traverse-program/multiple
|
((drscheme:eval:traverse-program/multiple
|
||||||
(preferences:get (drscheme:language-configuration:get-settings-preferences-symbol))
|
(preferences:get (drscheme:language-configuration:get-settings-preferences-symbol))
|
Loading…
Reference in New Issue
Block a user