[slime-cvs] CVS update: slime/slime.el slime/ChangeLog

[Marco Baringer]

Update of /project/slime/cvsroot/slime
In directory common-lisp.net:/tmp/cvs-serv4525

Modified Files:
	slime.el ChangeLog 
Log Message:
2004-06-29  Thomas Burdick  <tfb at OCF.Berkeley.EDU>

	* slime.el: Indicate when the REPL is in the debugger's context
	(slime-debug-level): new connection var
	(slime-dispatch-event): set slime-debug-level to match *sldb-level*
	(slime-repl-insert-prompt): show debug-level in prompt when > 0

Date: Wed Jun 30 00:24:20 2004
Author: mbaringer

Index: slime/slime.el
diff -u slime/slime.el:1.346 slime/slime.el:1.347
--- slime/slime.el:1.346	Tue Jun 29 13:17:05 2004
+++ slime/slime.el	Wed Jun 30 00:24:20 2004
@@ -1256,6 +1256,9 @@
     (string-match "^[^ ]*" name)
     (capitalize (match-string 0 name))))
 
+(slime-def-connection-var slime-debug-level 0
+  "The current level of recursive debugging.")
+
 
 (defvar slime-words-of-encouragement
   `("Let the hacking commence!"
@@ -1602,9 +1605,11 @@
        (sldb-activate thread level))
       ((:debug thread level condition restarts frames)
        (assert thread)
+       (setf (slime-debug-level) level)
        (sldb-setup thread level condition restarts frames))
       ((:debug-return thread level)
        (assert thread)
+       (setf (slime-debug-level) (1- level))
        (sldb-exit thread level))
       ((:emacs-interrupt thread)
        (cond ((slime-use-sigint-for-interrupt) (slime-send-sigint))
@@ -2168,7 +2173,9 @@
     (slime-insert-propertized '(face slime-repl-result-face) result)
     (unless (bolp) (insert "\n"))
     (let ((prompt-start (point))
-          (prompt (format "%s> "  (slime-lisp-package))))
+          (prompt (if (> (slime-debug-level) 0)
+                      (format "%s [%d]> " (slime-lisp-package) (slime-debug-level))
+                      (format "%s> "  (slime-lisp-package)))))
       (slime-propertize-region
           '(face slime-repl-prompt-face
                  read-only t


Index: slime/ChangeLog
diff -u slime/ChangeLog:1.443 slime/ChangeLog:1.444
--- slime/ChangeLog:1.443	Tue Jun 29 15:07:00 2004
+++ slime/ChangeLog	Wed Jun 30 00:24:20 2004
@@ -1,3 +1,10 @@
+2004-06-29  Thomas Burdick  <tfb at OCF.Berkeley.EDU>
+
+	* slime.el: Indicate when the REPL is in the debugger's context
+	(slime-debug-level): new connection var
+	(slime-dispatch-event): set slime-debug-level to match *sldb-level*
+	(slime-repl-insert-prompt): show debug-level in prompt when > 0 
+
 2004-06-30  Luke Gorrie  <luke at bluetail.com>
 
 	* NEWS: Wrote preliminary release notes for alpha-1.