[slime-cvs] CVS slime

[heller]

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

Modified Files:
	ChangeLog slime.el 
Log Message:
* slime.el (slime-check-version): New function.  Make the
prompt fit in a single line.

--- /project/slime/cvsroot/slime/ChangeLog	2008/03/26 15:59:30	1.1337
+++ /project/slime/cvsroot/slime/ChangeLog	2008/03/27 11:46:33	1.1338
@@ -25,6 +25,11 @@
 	(def-slime-test locally-bound-debugger-hook): New test case; tests
 	that a locally-bound *DEBUGGER-HOOK* is adhered, and not skipped.
 	
+2008-03-24  Helmut Eller  <heller at common-lisp.net>
+
+	* slime.el (slime-check-version): New function.  Make the
+	prompt fit in a single line.
+
 2008-03-24  Tobias C. Rittweiler  <tcr at freebits.de>
 
 	* HACKING: Updated due to broken links. 
--- /project/slime/cvsroot/slime/slime.el	2008/03/26 15:58:24	1.933
+++ /project/slime/cvsroot/slime/slime.el	2008/03/27 11:46:34	1.934
@@ -1900,13 +1900,7 @@
     (destructuring-bind (&key pid style lisp-implementation machine
                               features package version modules
                               &allow-other-keys) info
-      (or (equal version slime-protocol-version)
-          (yes-or-no-p
-	    (format "Protocol version mismatch: SLIME `%s' vs. SWANK `%s'. Continue anyway? "
-		    slime-protocol-version
-		    version))
-          (slime-net-close connection)
-          (top-level))
+      (slime-check-version version connection)
       (setf (slime-pid) pid
             (slime-communication-style) style
             (slime-lisp-features) features
@@ -1936,6 +1930,14 @@
         (funcall fun)))
     (message "Connected. %s" (slime-random-words-of-encouragement))))
 
+(defun slime-check-version (version conn)
+  (or (equal version slime-protocol-version)
+      (equal slime-protocol-version 'ignore)
+      (yes-or-no-p (format "Version mismatch: %S vs. %S.  Continue? "
+                           slime-protocol-version version))
+      (slime-net-close conn)
+      (top-level)))
+
 (defun slime-generate-connection-name (lisp-name)
   (loop for i from 1
         for name = lisp-name then (format "%s<%d>" lisp-name i)