[slime-cvs] CVS slime

[CVS User trittweiler]

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

Modified Files:
	ChangeLog slime.el 
Log Message:
	* slime.el (sldb-restartable-frame-line-face): Set a default value.
	(sldb-frame-restartable-p): New.
	(sldb-compute-frame-face): Use it.
	(sldb-show-frame-details): Use it, too.


--- /project/slime/cvsroot/slime/ChangeLog	2009/05/19 10:51:38	1.1767
+++ /project/slime/cvsroot/slime/ChangeLog	2009/05/19 20:42:22	1.1768
@@ -1,3 +1,10 @@
+2009-05-19  Tobias C. Rittweiler  <tcr at freebits.de>
+
+	* slime.el (sldb-restartable-frame-line-face): Set a default value.
+	(sldb-frame-restartable-p): New.
+	(sldb-compute-frame-face): Use it.
+	(sldb-show-frame-details): Use it, too.
+
 2009-05-19  Nikodemus Siivola  <nikodemus at random-state.net>
 
 	* swank-source-path-parser.lisp (read-and-record-source-map):
--- /project/slime/cvsroot/slime/slime.el	2009/05/18 12:54:08	1.1175
+++ /project/slime/cvsroot/slime/slime.el	2009/05/19 20:42:22	1.1176
@@ -327,7 +327,8 @@
                   '(:bold t))
   (frame-line     "function names and arguments in the backtrace")
   (restartable-frame-line
-   "frames which are surely restartable")
+   "frames which are surely restartable"
+   '(:foreground "lime green"))
   (non-restartable-frame-line
    "frames which are surely not restartable")
   (detailed-frame-line
@@ -5520,6 +5521,9 @@
 (defun sldb-frame.plist (frame)
   (destructuring-bind (_ _ &optional plist) frame plist))
 
+(defun sldb-frame-restartable-p (frame)
+  (and (plist-get (sldb-frame.plist frame) :restartable) t))
+
 (defun sldb-prune-initial-frames (frames)
   "Return the prefix of FRAMES to initially present to the user.
 Regexp heuristics are used to avoid showing SWANK-internal frames."
@@ -5547,9 +5551,9 @@
     (insert "\n")))
 
 (defun sldb-compute-frame-face (frame)
-  (ecase (plist-get (sldb-frame.plist frame) :restartable)
-    ((nil) 'sldb-frame-line-face)
-    ((t) 'sldb-restartable-frame-line-face)))
+  (if (sldb-frame-restartable-p frame)
+      'sldb-restartable-frame-line-face
+      'sldb-frame-line-face))
 
 (defun sldb-insert-frame (frame &optional face)
   "Insert FRAME with FACE at point.
@@ -5802,7 +5806,10 @@
     (slime-save-coordinates start
       (delete-region start end)
       (slime-propertize-region `(frame ,frame details-visible-p t)
-        (sldb-insert-frame frame 'sldb-detailed-frame-line-face)
+        (sldb-insert-frame frame (if (sldb-frame-restartable-p frame)
+                                     'sldb-restartable-frame-line-face
+                                     ;; FIXME: can we somehow merge the two?
+                                     'sldb-detailed-frame-line-face))
         (let ((indent1 "      ")
               (indent2 "        "))
           (insert indent1 (in-sldb-face section