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

[Peter Seibel]

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

Modified Files:
	swank.lisp slime.el ChangeLog 
Log Message:
Trying to restore sanity to SLIME's notion of the lisp package.

Date: Wed Jul 14 22:02:32 2004
Author: pseibel

Index: slime/swank.lisp
diff -u slime/swank.lisp:1.213 slime/swank.lisp:1.214
--- slime/swank.lisp:1.213	Tue Jul 13 11:14:03 2004
+++ slime/swank.lisp	Wed Jul 14 22:02:32 2004
@@ -1323,7 +1323,7 @@
                            (return (values values -)))))
       (when (and package-update-p (not (eq *package* *buffer-package*)))
         (send-to-emacs 
-         (list :new-package (package-string-for-prompt *package*)))))))
+         (list :new-package (package-name *package*) (package-string-for-prompt *package*)))))))
 
 (defun package-string-for-prompt (package)
   "Return the shortest nickname (or canonical name) of PACKAGE."


Index: slime/slime.el
diff -u slime/slime.el:1.362 slime/slime.el:1.363
--- slime/slime.el:1.362	Tue Jul 13 11:38:26 2004
+++ slime/slime.el	Wed Jul 14 22:02:32 2004
@@ -1563,6 +1563,11 @@
 This is automatically synchronized from Lisp.")
 
 (slime-def-connection-var slime-lisp-package
+    "COMMON-LISP-USER"
+  "The current package name of the Superior lisp.
+This is automatically synchronized from Lisp.")
+
+(slime-def-connection-var slime-lisp-package-prompt-string
     "CL-USER"
   "The current package name of the Superior lisp.
 This is automatically synchronized from Lisp.")
@@ -1639,8 +1644,9 @@
       ((:emacs-return-string thread tag string)
        (slime-send `(:emacs-return-string ,thread ,tag ,string)))
       ;;
-      ((:new-package package)
-       (setf (slime-lisp-package) package))
+      ((:new-package package prompt-string)
+       (setf (slime-lisp-package) package)
+       (setf (slime-lisp-package-prompt-string) prompt-string))
       ((:new-features features)
        (setf (slime-lisp-features) features))
       ((:indentation-update info)
@@ -2188,7 +2194,7 @@
     (slime-insert-propertized '(face slime-repl-result-face) result)
     (unless (bolp) (insert "\n"))
     (let ((prompt-start (point))
-          (prompt (format "%s> "  (slime-lisp-package))))
+          (prompt (format "%s> " (slime-lisp-package-prompt-string))))
       (slime-propertize-region
           '(face slime-repl-prompt-face
                  read-only t
@@ -2464,9 +2470,10 @@
 					      (slime-find-buffer-package))))
   (with-current-buffer (slime-output-buffer)
     (let ((unfinished-input (slime-repl-current-input)))
-      (destructuring-bind (name nickname)
+      (destructuring-bind (name prompt-string)
           (slime-eval `(swank:set-package ,package))
-        (setf (slime-lisp-package) nickname)
+        (setf (slime-lisp-package) name)
+        (setf (slime-lisp-package-prompt-string) prompt-string)
         (slime-repl-insert-prompt "" 0)
         (insert unfinished-input)))))
 


Index: slime/ChangeLog
diff -u slime/ChangeLog:1.469 slime/ChangeLog:1.470
--- slime/ChangeLog:1.469	Tue Jul 13 11:42:36 2004
+++ slime/ChangeLog	Wed Jul 14 22:02:32 2004
@@ -1,3 +1,10 @@
+2004-07-14  Peter Seibel  <peter at javamonkey.com>
+
+	* slime.el (slime-lisp-package-prompt-string): Separate SLIME's
+	notion of package into two parts, an actual package name and the
+	name used in the prompt since the latter isn't necessarily an
+	actual package nickname any more.
+
 2004-07-13  Luke Gorrie  <luke at bluetail.com>
 
 	* slime.el (slime-restart-inferior-lisp): Renamed shortcut to