[slime-cvs] CVS slime

[CVS User trittweiler]

Update of /project/slime/cvsroot/slime
In directory cl-net:/tmp/cvs-serv13483

Modified Files:
	slime.el ChangeLog 
Log Message:

      * slime.el (slime-compute-modeline-connection-state): Print the
      number of debugged requests if non-zero.
      (slime-connection-state-as-string): Removed unused branches.
      (slime-compute-connection-state): Removed :debugged branch making
      most likely return :connected instead.


--- /project/slime/cvsroot/slime/slime.el	2008/12/02 21:14:13	1.1066
+++ /project/slime/cvsroot/slime/slime.el	2008/12/02 21:41:05	1.1067
@@ -479,12 +479,17 @@
         (slime-connection-name conn))))
 
 (defun slime-compute-modeline-connection-state ()
-  (let ((new-state (slime-compute-connection-state (slime-current-connection))))
+  (let* ((conn (slime-current-connection))
+         (new-state (slime-compute-connection-state conn)))
     (if (eq new-state :connected)
-        (let ((n (length (slime-rex-continuations))))
-          (if (= n 0)
-              nil
-            n))
+        (let ((n (length (slime-rex-continuations)))
+              (m (length (sldb-debugged-continuations conn))))
+          (cond ((= n 0)
+                 nil)
+                ((= m 0)
+                 n)
+                (t
+                 (format "%s/%s" (- n m) m))))
       (slime-connection-state-as-string new-state))))
 
 (defun slime-compute-modeline-string (conn state pkg)
@@ -1929,21 +1934,17 @@
 (defun slime-compute-connection-state (conn)
   (cond ((null conn) :disconnected) 
         ((slime-stale-connection-p conn) :stale)
-        ((slime-debugged-connection-p conn) :debugged)
-        ((and (slime-use-sigint-for-interrupt conn) 
+        ((and (slime-use-sigint-for-interrupt conn)
               (slime-busy-p conn)) :busy)
         ((eq slime-buffer-connection conn) :local)
         (t :connected)))
 
 (defun slime-connection-state-as-string (state)
   (case state
-    (:connected       "")
     (:disconnected    "not connected")
     (:busy            "busy..")
-    (:debugged        "debugged..")
     (:stale           "stale")
-    (:local           "local")
-    ))
+    (:local           "local")))
 
 ;;; Connection-local variables:
 
--- /project/slime/cvsroot/slime/ChangeLog	2008/12/02 21:14:13	1.1588
+++ /project/slime/cvsroot/slime/ChangeLog	2008/12/02 21:41:05	1.1589
@@ -1,3 +1,11 @@
+2008-11-30  Gábor Melis  <mega at retes.hu>
+
+      * slime.el (slime-compute-modeline-connection-state): Print the
+      number of debugged requests if non-zero.
+      (slime-connection-state-as-string): Removed unused branches.
+      (slime-compute-connection-state): Removed :debugged branch making
+      most likely return :connected instead.
+
 2008-12-02  Tobias C. Rittweiler  <tcr at freebits.de>
 
 	Modeline wouldn't display {debugged..} after `slime-interrupt'.