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

[Helmut Eller]

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

Modified Files:
	slime.el 
Log Message:
(slime-with-chosen-connection): Bind slime-dispatching-connection and
not slime-buffer-connection.  slime-buffer-connection is a buffer
local variable not a dynamic variable.

(slime-find-connection-by-type-name)
(slime-read-lisp-implementation-type-name): Where lost during the merge.
Date: Wed Feb 25 02:27:02 2004
Author: heller

Index: slime/slime.el
diff -u slime/slime.el:1.217 slime/slime.el:1.218
--- slime/slime.el:1.217	Tue Feb 24 18:31:34 2004
+++ slime/slime.el	Wed Feb 25 02:27:01 2004
@@ -638,9 +638,10 @@
                                          &body body)
   "Make the connection choosen by PREFIX-ARG current.
 
-(slime-with-chosen-connection (&optional (PREFIX-ARG 'current-prefix-arg))
+\(slime-with-chosen-connection (&optional (PREFIX-ARG 'current-prefix-arg))
   &body BODY)"
-  `(let ((slime-buffer-connection (slime-get-named-connection ,prefix-arg)))
+  `(let ((slime-dispatching-connection 
+          (slime-get-named-connection ,prefix-arg)))
      , at body))
 
 (put 'slime-with-chosen-connection 'lisp-indent-function 1)
@@ -1020,13 +1021,14 @@
                        (y-or-n-p "Close old connections first? "))))
   (when kill-old-p (slime-disconnect))
   (message "Connecting to Swank on port %S.." port)
-  (slime-init-connection (slime-net-connect host port))
-  (when-let (buffer (get-buffer "*inferior-lisp*"))
-    (delete-windows-on buffer)
-    (bury-buffer buffer))
-  (slime-init-output-buffer)
-  (message "Connected to Swank server on port %S. %s"
-           port (slime-random-words-of-encouragement)))
+  (let ((process (slime-net-connect host port)))
+    (slime-init-connection process)
+    (when-let (buffer (get-buffer "*inferior-lisp*"))
+      (delete-windows-on buffer)
+      (bury-buffer buffer))
+    (slime-init-output-buffer process)
+    (message "Connected to Swank server on port %S. %s"
+             port (slime-random-words-of-encouragement))))
 
 (defun slime-changelog-date ()
   "Return the datestring of the latest entry in the ChangeLog file.
@@ -1243,6 +1245,8 @@
                            (error "No connection")))
      , at body))
 
+(put 'slime-with-connection-buffer 'lisp-indent-function 1)
+
 (defun slime-select-connection (process)
   (setq slime-default-connection process))
 
@@ -1283,8 +1287,22 @@
                    (slime-connection-number)
                    (slime-lisp-implementation-type-name))))
 
-
-(put 'slime-with-connection-buffer 'lisp-indent-function 1)
+(defun slime-find-connection-by-type-name (name)
+  (find name slime-net-processes
+        :test #'string=
+        :key #'slime-lisp-implementation-type-name))
+
+(defun slime-read-lisp-implementation-type-name ()
+  (let ((default (slime-lisp-implementation-type-name)))
+    (completing-read
+     (format "Name (default %s): " default)
+     (slime-bogus-completion-alist
+      (mapcar #'slime-lisp-implementation-type-name slime-net-processes))
+     nil
+     t
+     nil
+     nil
+     default)))
 
 
 ;;;;; Connection-local variables
@@ -1430,20 +1448,15 @@
   (when (equal slime-net-processes (list proc))
     (setq slime-connection-counter 0))
   (slime-with-connection-buffer ()
-    (setq slime-connection-number (incf slime-connection-counter))
-    (setf (slime-pid) (slime-eval '(swank:getpid)))
-    (setf (slime-lisp-implementation-type) 
-          (slime-eval '(cl:lisp-implementation-type)))
-    (setf (slime-lisp-implementation-type-name) 
-          (slime-eval '(swank:lisp-implementation-type-name)))
-    (setq slime-state-name "")
-    (when-let (repl-buffer (slime-repl-buffer))
-      ;; REPL buffer already exists - update its local
-      ;; `slime-connection' binding.
-      (with-current-buffer repl-buffer
-        (setq slime-buffer-connection proc)))
-    (when slime-global-debugger-hook
-      (slime-eval '(swank:install-global-debugger-hook) "COMMON-LISP-USER"))))
+    (setq slime-connection-number (incf slime-connection-counter)))
+  (setf (slime-pid) (slime-eval '(swank:getpid)))
+  (setf (slime-lisp-implementation-type) 
+        (slime-eval '(cl:lisp-implementation-type)))
+  (setf (slime-lisp-implementation-type-name) 
+        (slime-eval '(swank:lisp-implementation-type-name)))
+  (setq slime-state-name "")
+  (when slime-global-debugger-hook
+    (slime-eval '(swank:install-global-debugger-hook) "COMMON-LISP-USER")))
 
 (defun slime-busy-p ()
   slime-rex-continuations)
@@ -1628,8 +1641,9 @@
           (unless noprompt (slime-repl-insert-prompt "" 0))
           (current-buffer)))))
 
-(defun slime-init-output-buffer ()
+(defun slime-init-output-buffer (connection)
   (with-current-buffer (slime-output-buffer t)
+    (set (make-local-variable 'slime-buffer-connection) connection)
     (let ((banner (format "%s  Port: %s  Pid: %s"
                           (slime-lisp-implementation-type)
                           (if (featurep 'xemacs)