The FSF has a new address.

[bpt/guile.git] / ice-9 / debugger.scm

diff --git a/ice-9/debugger.scm b/ice-9/debugger.scm
index 891e0bc..99f2d50 100644 (file)
--- a/ice-9/debugger.scm
+++ b/ice-9/debugger.scm
@@ -14,14 +14,14 @@
 ;; 
 ;; You should have received a copy of the GNU Lesser General Public
 ;; License along with this library; if not, write to the Free Software
-;; Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+;; Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
 (define-module (ice-9 debugger)
   #:use-module (ice-9 debugger command-loop)
   #:use-module (ice-9 debugger state)
-  #:use-module (ice-9 debugger ui-client)
   #:use-module (ice-9 debugger utils)
   #:use-module (ice-9 format)
+  #:use-module (emacs gds-client)
   #:export (debug-stack
            debug
            debug-last-error
@@ -121,8 +121,8 @@ Indicates that the debugger should display an introductory message.
                        (display "There is 1 frame on the stack.\n\n")
                        (format #t "There are ~A frames on the stack.\n\n" ssize))))
              (write-state-short state)
-             (if (ui-connected?)
-                 (ui-command-loop state)
+             (if (gds-connected?)
+                 (gds-command-loop state)
                  (debugger-command-loop state)))))))))
 
 (define (debug)
@@ -163,10 +163,12 @@ Indicates that the debugger should display an introductory message.
   (set! lazy-handler-dispatch
        (if syms
            (lambda (key . args)
-             (or (memq key syms)
-                 (debug-stack (make-stack #t lazy-handler-dispatch)
-                              #:with-introduction
-                              #:continuable))
+             (if (memq key syms)
+                 (begin
+                   (debug-stack (make-stack #t lazy-handler-dispatch)
+                                #:with-introduction
+                                #:continuable)
+                   (throw 'abort key)))
              (apply default-lazy-handler key args))
            default-lazy-handler)))