summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndy Wingo <wingo@pobox.com>2010-06-19 15:20:02 +0200
committerAndy Wingo <wingo@pobox.com>2010-06-19 15:20:02 +0200
commit0feb833d22d4998773fe045f04cfbe1afebf82b9 (patch)
tree73fb7360b43b02e67aa659fd5fef8713948f63e1
parentc4a8200fa0f28ac9bab80ee6c2ab93fbd818c33f (diff)
downloadguile-0feb833d22d4998773fe045f04cfbe1afebf82b9.tar.gz
don't unconditionally restore signals in ensure-batch-mode!
* module/ice-9/boot-9.scm (ensure-batch-mode!): Remove comment about restoring signals, and that behavior, as it was making popen.test hang. I should investigate further, but instead I'm just going to hope that this fixes it.
-rw-r--r--module/ice-9/boot-9.scm8
1 files changed, 3 insertions, 5 deletions
diff --git a/module/ice-9/boot-9.scm b/module/ice-9/boot-9.scm
index 3928d1ec8..89abc3664 100644
--- a/module/ice-9/boot-9.scm
+++ b/module/ice-9/boot-9.scm
@@ -2677,15 +2677,13 @@ module '(ice-9 q) '(make-q q-length))}."
;; `batch-mode?' returns #f during their extent.
;;
;; Programs can re-enter batch mode, for example after a fork, by calling
-;; `ensure-batch-mode!'. This will also restore signal handlers. It's not a
-;; great interface, though; it would be better to abort to the outermost prompt,
-;; and call a thunk there.
+;; `ensure-batch-mode!'. It's not a great interface, though; it would be better
+;; to abort to the outermost prompt, and call a thunk there.
(define *repl-level* (make-fluid))
(define (batch-mode?)
(negative? (or (fluid-ref *repl-level*) -1)))
(define (ensure-batch-mode!)
- (fluid-set! *repl-level* #f)
- (restore-signals))
+ (fluid-set! *repl-level* #f))
(define (quit . args)
(apply throw 'quit args))