[slime-cvs] CVS slime

[trittweiler]

Update of /project/slime/cvsroot/slime
In directory clnet:/tmp/cvs-serv26546

Modified Files:
	slime.el ChangeLog 
Log Message:

* slime.el (slime-compute-modeline-package): Used `when-let' before its definition.
  (slime-compute-modeline-string): Display "PKG:" before "CON:".


--- /project/slime/cvsroot/slime/slime.el	2008/08/22 21:15:35	1.1004
+++ /project/slime/cvsroot/slime/slime.el	2008/08/25 15:29:48	1.1005
@@ -448,8 +448,10 @@
 
 (defun slime-compute-modeline-package ()
   (when (memq major-mode slime-lisp-modes)
-    (when-let (package (slime-current-package))
-      (slime-pretty-package-name package))))
+    ;; WHEN-LET is defined later.
+    (let ((package (slime-current-package)))
+      (when package
+        (slime-pretty-package-name package)))))
 
 (defun slime-pretty-package-name (name)
   "Return a pretty version of a package name NAME."
@@ -474,10 +476,10 @@
 
 (defun slime-compute-modeline-string (conn state pkg)
   (concat (when (or conn pkg)             "[")
+          (when pkg                       (format "PKG:%s" pkg))
+          (when (and (or conn state) pkg) ", ")
           (when conn                      (format "CON:%s" conn))
           (when state                     (format "{%s}" state))
-          (when (and (or conn state) pkg) ", ")
-          (when pkg                       (format "PKG:%s" pkg))
           (when (or conn pkg)             "]")))
 
 (defun slime-update-modeline-string ()
--- /project/slime/cvsroot/slime/ChangeLog	2008/08/22 22:58:18	1.1473
+++ /project/slime/cvsroot/slime/ChangeLog	2008/08/25 15:29:49	1.1474
@@ -1,3 +1,8 @@
+2008-08-25  Tobias C. Rittweiler  <tcr at freebits.de>
+
+	* slime.el (slime-compute-modeline-package): Used `when-let' before its definition.
+	(slime-compute-modeline-string): Display "PKG:" before "CON:".
+
 2008-08-22  Helmut Eller  <heller at common-lisp.net>
 
 	Some focus handling in multiframe setups.