update break-quit for gcl-top-restart - gcl.git - GNU Common Lisp

diff --git a/gcl/clcs/gcl_clcs_restart.lisp b/gcl/clcs/gcl_clcs_restart.lisp
index 05e135f6e..49f16e824 100755
--- a/gcl/clcs/gcl_clcs_restart.lisp
+++ b/gcl/clcs/gcl_clcs_restart.lisp

@@ -64,7 +64,7 @@

(defvar *kcl-top-restarts* nil)

(defun make-kcl-top-restart (quit-tag)

- (make-restart :name 'abort

+ (make-restart :name 'gcl-top-restart

:function #'(lambda () (throw (car (list quit-tag)) quit-tag))

:report-function

#'(lambda (stream)

diff --git a/gcl/clcs/gcl_clcs_top_patches.lisp b/gcl/clcs/gcl_clcs_top_patches.lisp
index c5b4e99f4..a08474c6b 100755
--- a/gcl/clcs/gcl_clcs_top_patches.lisp
+++ b/gcl/clcs/gcl_clcs_top_patches.lisp

@@ -124,8 +124,13 @@

(error "Console interrupt -- cannot continue.")))

(defun clcs-break-quit (&optional (level 0))

- (let ((abort (nth level (reverse *abort-restarts*))))

- (when abort (invoke-restart-interactively abort)))

+ (let* ((ar (reverse *abort-restarts*))

+ (tr (find-restart 'conditions::gcl-top-restart))

+ (ar (if tr (cons tr ar) ar))

+ (abort (nth level ar)))

+ (if abort

+ (invoke-restart-interactively abort)

+ (format *debug-io* "No abort restart is active.~%")))

(break-current))

(setq conditions::*debugger-function* 'break-level)