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

[Peter Seibel]

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

Modified Files:
	ChangeLog slime.el 
Log Message:
Fixing tests I broke the other day. Sorry.

Date: Fri Jul 16 10:56:37 2004
Author: pseibel

Index: slime/ChangeLog
diff -u slime/ChangeLog:1.471 slime/ChangeLog:1.472
--- slime/ChangeLog:1.471	Fri Jul 16 10:12:58 2004
+++ slime/ChangeLog	Fri Jul 16 10:56:37 2004
@@ -1,3 +1,9 @@
+2004-07-16  Peter Seibel  <peter at javamonkey.com>
+
+	* slime.el (package-updating): Fixing this and other tests I broke
+	with my change to how emacs keeps track of the package prompt
+	string.
+
 2004-07-16  Luke Gorrie  <luke at bluetail.com>
 
 	* slime.el (slime-setup): New function for installing a


Index: slime/slime.el
diff -u slime/slime.el:1.366 slime/slime.el:1.367
--- slime/slime.el:1.366	Fri Jul 16 10:11:25 2004
+++ slime/slime.el	Fri Jul 16 10:56:37 2004
@@ -7210,7 +7210,7 @@
     "Test if slime-lisp-package is updated."
     '(("COMMON-LISP" ("CL"))
       ("KEYWORD" ("" "KEYWORD"))
-      ("COMMON-LISP-USER" ("CL-USER" "USER")))
+      ("COMMON-LISP-USER" ("CL-USER")))
   (with-current-buffer (slime-output-buffer)
     (let ((p (slime-eval 
               `(swank:listener-eval 
@@ -7220,8 +7220,10 @@
               (slime-lisp-package))))
       (slime-check ("In %s package." package-name)
         (equal (format "\"%s\"" package-name) p))
-      (slime-check ("slime-lisp-package is in %S." nicknames)
-        (member (slime-lisp-package) nicknames)))))
+      (slime-check ("slime-lisp-package is %S." package-name)
+        (equal (slime-lisp-package) package-name))
+      (slime-check ("slime-lisp-package-prompt-string is in %S." nicknames)
+        (member (slime-lisp-package-prompt-string) nicknames)))))
 
 (def-slime-test repl-test
     (input result-contents)
@@ -7256,7 +7258,7 @@
       )
       )
   (with-current-buffer (slime-output-buffer)
-    (setf (slime-lisp-package) "SWANK"))
+    (setf (slime-lisp-package-prompt-string) "SWANK"))
   (kill-buffer (slime-output-buffer))
   (with-current-buffer (slime-output-buffer)
     (insert input)
@@ -7286,7 +7288,7 @@
 
 )
   (with-current-buffer (slime-output-buffer)
-    (setf (slime-lisp-package) "SWANK"))
+    (setf (slime-lisp-package-prompt-string) "SWANK"))
   (kill-buffer (slime-output-buffer))
   (with-current-buffer (slime-output-buffer)
     (insert before)
@@ -7318,7 +7320,7 @@
 SWANK> ")
       )
   (with-current-buffer (slime-output-buffer)
-    (setf (slime-lisp-package) "SWANK"))
+    (setf (slime-lisp-package-prompt-string) "SWANK"))
   (kill-buffer (slime-output-buffer))
   (with-current-buffer (slime-output-buffer)
     (insert (format "(values %s)" prompt))
@@ -7344,7 +7346,7 @@
   (when (slime-output-buffer)
     (kill-buffer (slime-output-buffer)))
   (with-current-buffer (slime-output-buffer)
-    (setf (slime-lisp-package) "SWANK")
+    (setf (slime-lisp-package-prompt-string) "SWANK")
     (insert command)
     (call-interactively 'slime-repl-return)
     (dolist (input inputs) 
@@ -7364,7 +7366,7 @@
 10
 SWANK> " t))
   (with-current-buffer (slime-output-buffer)
-    (setf (slime-lisp-package) "SWANK"))
+    (setf (slime-lisp-package-prompt-string) "SWANK"))
   (kill-buffer (slime-output-buffer))
   (with-current-buffer (slime-output-buffer)
     (slime-interactive-eval input)