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

[Peter Seibel]

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

Modified Files:
	slime.el 
Log Message:
Tweaks to new symbolic lisp names.

Date: Wed Mar  9 18:57:46 2005
Author: pseibel

Index: slime/slime.el
diff -u slime/slime.el:1.465 slime/slime.el:1.466
--- slime/slime.el:1.465	Wed Mar  9 17:18:45 2005
+++ slime/slime.el	Wed Mar  9 18:57:44 2005
@@ -1183,19 +1183,18 @@
                      (if (eq 16 (prefix-numeric-value current-prefix-arg))
                          (read-coding-system "set slime-coding-system: "
                                              slime-net-coding-system))))
-  (let ((symbolic-lisp-name
-         (if (slime-symbolic-lisp-name-p command) command nil))
-        (command (or (slime-find-lisp-implementation command)
+  (let ((command (or (slime-find-lisp-implementation command)
                      inferior-lisp-program))
         (buffer (or buffer "*inferior-lisp*"))
         (coding-system (or coding-system slime-net-coding-system)))
-    (slime-check-coding-system coding-system)
-    (setq slime-net-coding-system coding-system)
-    (when (or (not (slime-bytecode-stale-p))
-              (slime-urge-bytecode-recompile))
-      (let ((proc (slime-maybe-start-lisp command buffer)))
-        (slime-inferior-connect proc nil symbolic-lisp-name)
-        (pop-to-buffer (process-buffer proc))))))
+    (let ((symbolic-lisp-name (slime-symbolic-lisp-name-p command)))
+      (slime-check-coding-system coding-system)
+      (setq slime-net-coding-system coding-system)
+      (when (or (not (slime-bytecode-stale-p))
+                (slime-urge-bytecode-recompile))
+        (let ((proc (slime-maybe-start-lisp command buffer)))
+          (slime-inferior-connect proc nil symbolic-lisp-name)
+          (pop-to-buffer (process-buffer proc)))))))
 
 (defun slime-connect (host port &optional kill-old-p symbolic-lisp-name)
   "Connect to a running Swank server."
@@ -1880,11 +1879,12 @@
         finally (return name)))
 
 (defun slime-generate-symbolic-lisp-name (lisp-name)
-  (loop for i from 1
-        for name = lisp-name then (format "%s<%d>" lisp-name i)
-        while (find name slime-net-processes 
-                    :key #'slime-symbolic-lisp-name :test #'equal)
-        finally (return name)))
+  (if lisp-name
+    (loop for i from 1
+       for name = lisp-name then (format "%s<%d>" lisp-name i)
+       while (find name slime-net-processes 
+                   :key #'slime-symbolic-lisp-name :test #'equal)
+       finally (return name))))
 
 
 (defun slime-connection-close-hook (process)
@@ -7020,7 +7020,9 @@
   (cdr (rassoc command slime-registered-lisp-implementations)))
 
 (defun slime-symbolic-lisp-name-p (name)
-  (assoc name slime-registered-lisp-implementations))
+  (let ((cons (or (assoc name slime-registered-lisp-implementations)
+                  (rassoc name slime-registered-lisp-implementations))))
+    (if cons (car cons))))
 
 
 (define-derived-mode slime-connection-list-mode fundamental-mode