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

[Luke Gorrie]

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

Modified Files:
	slime.el 
Log Message:
* slime.el (package-updating): Expected package is now a list (can
be any), since the shortest nickname is not
standardized. e.g. USER or CL-USER for COMMON-LISP-USER.

Date: Sat Jan 10 01:43:53 2004
Author: lgorrie

Index: slime/slime.el
diff -u slime/slime.el:1.171 slime/slime.el:1.172
--- slime/slime.el:1.171	Fri Jan  9 19:15:50 2004
+++ slime/slime.el	Sat Jan 10 01:43:52 2004
@@ -5022,14 +5022,15 @@
       (slime-test-state-stack '(slime-evaluating-state slime-idle-state)))
     (slime-interrupt)
     (slime-sync-state-stack '(slime-idle-state) 5)
-    (slime-check "Automaton is back in idle state.")))
+    (slime-check "Automaton is back in idle state."
+      (slime-test-state-stack '(slime-idle-state)))))
 
-(def-slime-test package-updateing
-    (package-name nickname)
+(def-slime-test package-updating
+    (package-name nicknames)
     "Test if slime-lisp-package is updated."
-    '(("COMMON-LISP" "CL")
-      ("KEYWORD" "KEYWORD")
-      ("COMMON-LISP-USER" "CL-USER"))
+    '(("COMMON-LISP" ("CL"))
+      ("KEYWORD" ("" "KEYWORD"))
+      ("COMMON-LISP-USER" ("CL-USER" "USER")))
   (with-current-buffer (slime-output-buffer)
     (let ((p (slime-eval 
               `(swank:listener-eval 
@@ -5039,8 +5040,8 @@
               (slime-lisp-package))))
       (slime-check ("In %s package." package-name)
         (equal (format "\"%s\"" package-name) p))
-      (slime-check ("slime-lisp-package is %s." nickname)
-        (equal (slime-lisp-package) nickname)))))
+      (slime-check ("slime-lisp-package is in %S." nicknames)
+        (member (slime-lisp-package) nicknames)))))
   
 
 ;;; Portability library