From fb5f0c2d475c072ea31eb50f9260da6017d056a7 Mon Sep 17 00:00:00 2001 From: Matthew Flatt Date: Sun, 14 Mar 2004 19:27:23 +0000 Subject: [PATCH] . original commit: e8b1a97158ca6a6720423c96888191da08c51303 --- collects/hierlist/hierlist-unit.ss | 12 ++++++------ collects/mred/mred.ss | 8 ++++---- collects/mrlib/include-bitmap.ss | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/collects/hierlist/hierlist-unit.ss b/collects/hierlist/hierlist-unit.ss index 5e3340ef..053c7269 100644 --- a/collects/hierlist/hierlist-unit.ss +++ b/collects/hierlist/hierlist-unit.ss @@ -27,12 +27,12 @@ (define arrow-cursor (make-object cursor% 'arrow)) (define-values (up-bitmap down-bitmap up-click-bitmap down-click-bitmap) - (with-handlers ([not-break-exn? (lambda (x) - (values - (make-object bitmap% 10 10) - (make-object bitmap% 10 10) - (make-object bitmap% 10 10) - (make-object bitmap% 10 10)))]) + (with-handlers ([exn:fail? (lambda (x) + (values + (make-object bitmap% 10 10) + (make-object bitmap% 10 10) + (make-object bitmap% 10 10) + (make-object bitmap% 10 10)))]) (values (make-object bitmap% (build-path (collection-path "icons") "turn-up.gif")) (make-object bitmap% (build-path (collection-path "icons") "turn-down.gif")) diff --git a/collects/mred/mred.ss b/collects/mred/mred.ss index c41c415b..3798c139 100644 --- a/collects/mred/mred.ss +++ b/collects/mred/mred.ss @@ -1454,7 +1454,7 @@ (let ([t (wx:eventspace-handler-thread e)]) (or t ;; eventspace dead, or just no thread, yet? - (with-handlers ([not-break-exn? + (with-handlers ([exn:fail? (lambda (x) (if (wx:eventspace-shutdown? e) (raise-mismatch-error @@ -7588,12 +7588,12 @@ (lambda (file line col ppos) (if (is-a? the-snip wx:snip%) (if (is-a? the-snip readable-snip<%>) - (with-handlers ([exn:special-comment? + (with-handlers ([special-comment? (lambda (exn) ;; implies "done" (next-snip empty-string) (raise exn))] - [not-break-exn? + [void (lambda (exn) ;; Give up after an exception (next-snip empty-string) @@ -7691,7 +7691,7 @@ (let loop () ;; Wrap regexp check with `with-handlers' in case the file ;; starts with non-text input - (when (with-handlers ([not-break-exn? (lambda (x) #f)]) + (when (with-handlers ([exn:fail? (lambda (x) #f)]) (regexp-match-peek #rx"^#!" p)) ;; Throw away chars/specials up to eol, ;; and continue if line ends in backslash diff --git a/collects/mrlib/include-bitmap.ss b/collects/mrlib/include-bitmap.ss index f6435385..6b7d07f3 100644 --- a/collects/mrlib/include-bitmap.ss +++ b/collects/mrlib/include-bitmap.ss @@ -13,7 +13,7 @@ [(_ orig-stx source path-spec) (let* ([c-file (resolve-path-spec #'path-spec #'source #'orig-stx #'build-path)] [content - (with-handlers ([not-break-exn? + (with-handlers ([exn:fail? (lambda (exn) (error 'include-bitmap "could not load ~e: ~a"