[slime-cvs] CVS slime

[mbaringer]

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

Modified Files:
	slime.el 
Log Message:
(slime-global-variable-name-regexp): New variable.
(slime-global-variable-name-p): Use
slime-global-variable-name-regexp.
("swank-version"): Load swank-version.el to get the wire protocol
version.
(slime-set-connection-info): Check the wire protocol version.


--- /project/slime/cvsroot/slime/slime.el	2006/10/30 14:59:25	1.682
+++ /project/slime/cvsroot/slime/slime.el	2006/10/30 16:24:49	1.683
@@ -64,6 +64,8 @@
   (require 'overlay))
 (require 'easymenu)
 
+(load "swank-version")
+
 (defvar slime-use-autodoc-mode nil
   "When non-nil always enable slime-autodoc-mode in slime-mode.")
 
@@ -2254,7 +2256,12 @@
   "Initialize CONNECTION with INFO received from Lisp."
   (let ((slime-dispatching-connection connection))
     (destructuring-bind (&key pid style lisp-implementation machine
-                              features package) info
+                              features package wire-protocol-version)
+        info
+      (assert (eql wire-protocol-version *swank-wire-protocol-version*)
+              nil
+              "Version mismatch. slime.el expects %S but swank.lisp uses %S, please reload."
+              *swank-wire-protocol-version* wire-protocol-version)
       (setf (slime-pid) pid
             (slime-communication-style) style
             (slime-lisp-features) features)