finish deprecating pre-unwind-handler-dispatch

* module/ice-9/boot-9.scm:
* module/ice-9/deprecated.scm (pre-unwind-handler-dispatch): Properly
  deprecate.

* module/ice-9/debugger.scm (debug-on-error):
* module/ice-9/debugging/traps.scm (on-pre-unwind-handler-dispatch):
  Update remaining pre-unwind-handler-dispatch uses.

diff --git a/module/ice-9/boot-9.scm b/module/ice-9/boot-9.scm
index 579c4fc..3cc4115 100644 (file)
--- a/module/ice-9/boot-9.scm
+++ b/module/ice-9/boot-9.scm
@@ -2679,10 +2679,6 @@ module '(ice-9 q) '(make-q q-length))}."
   (save-stack 2)
   (apply throw key args))
 
-(begin-deprecated
- (define (pre-unwind-handler-dispatch key . args)
-   (apply default-pre-unwind-handler key args)))
-
 (define abort-hook (make-hook))
 
 ;; Programs can call `batch-mode?' to see if they are running as part of a

diff --git a/module/ice-9/debugger.scm b/module/ice-9/debugger.scm
index d6fe299..3a6c081 100644 (file)
--- a/module/ice-9/debugger.scm
+++ b/module/ice-9/debugger.scm
@@ -1,6 +1,6 @@
 ;;;; Guile Debugger
 
-;;; Copyright (C) 1999, 2001, 2002, 2006 Free Software Foundation, Inc.
+;;; Copyright (C) 1999, 2001, 2002, 2006, 2010 Free Software Foundation, Inc.
 ;;;
 ;;;; This library is free software; you can redistribute it and/or
 ;;;; modify it under the terms of the GNU Lesser General Public
@@ -132,12 +132,12 @@ Indicates that the debugger should display an introductory message.
 
 (define (debug-on-error syms)
   "Enable or disable debug on error."
-  (set! pre-unwind-handler-dispatch
-       (if syms
+  (set! default-pre-unwind-handler
+        (if syms
            (lambda (key . args)
              (if (memq key syms)
                  (begin
-                   (debug-stack (make-stack #t pre-unwind-handler-dispatch)
+                   (debug-stack (make-stack #t default-pre-unwind-handler)
                                 #:with-introduction
                                 #:continuable)
                    (throw 'abort key)))

diff --git a/module/ice-9/debugging/traps.scm b/module/ice-9/debugging/traps.scm
index 1d509f4..3df939c 100755 (executable)
--- a/module/ice-9/debugging/traps.scm
+++ b/module/ice-9/debugging/traps.scm
@@ -494,7 +494,7 @@ it twice."
              (or (memq key ignored-keys)
                  (behaviour (throw->trap-context key
                                                  args
-                                                 pre-unwind-handler-dispatch)))
+                                                 default-pre-unwind-handler)))
              (apply default-default-pre-unwind-handler key args))
            default-default-pre-unwind-handler)))
 

diff --git a/module/ice-9/deprecated.scm b/module/ice-9/deprecated.scm
index 710d40c..97e9eb2 100644 (file)
--- a/module/ice-9/deprecated.scm
+++ b/module/ice-9/deprecated.scm
@@ -56,7 +56,8 @@
             assert-repl-verbosity
             set-repl-prompt!
             set-batch-mode?!
-            repl)
+            repl
+            pre-unwind-handler-dispatch)
 
   #:replace (module-ref-submodule module-define-submodule!))
 
@@ -616,3 +617,9 @@ the `(system repl common)' module.")
   (let loop ((source (read (current-input-port))))
     (print (evaler source))
     (loop (read (current-input-port)))))
+
+(define (pre-unwind-handler-dispatch key . args)
+  (issue-deprecation-warning
+   "`pre-unwind-handler-dispatch' is deprecated. Use
+`default-pre-unwind-handler' directly.")
+  (apply default-pre-unwind-handler key args))