[slime-cvs] CVS slime

heller heller at common-lisp.net
Thu Oct 19 12:12:58 UTC 2006


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

Modified Files:
	swank.lisp 
Log Message:
(guess-package-from-string): Remove special case for "#.". parse-package
will handle that just fine.


--- /project/slime/cvsroot/slime/swank.lisp	2006/10/17 10:48:54	1.406
+++ /project/slime/cvsroot/slime/swank.lisp	2006/10/19 12:12:58	1.407
@@ -1364,18 +1364,16 @@
   (multiple-value-bind (name pos) 
       (if (zerop (length string))
           (values :|| 0)
-          (let ((*package* keyword-package))
+          (let ((*package* *swank-io-package*))
             (ignore-errors (read-from-string string))))
-    (if (and (or (keywordp name) (stringp name))
-             (= (length string) pos))
-        (find-package name))))
+    (and name
+         (or (symbolp name) 
+             (stringp name))
+         (= (length string) pos)
+         (find-package name))))
 
 (defun guess-package-from-string (name &optional (default-package *package*))
-  (or (and (> (length name) 2)
-              (equal "#." (subseq name 0 2))
-              (ignore-errors
-                (find-package (read-from-string name))))
-      (and name
+  (or (and name
            (or (parse-package name)
                (find-package (string-upcase name))
                (parse-package (substitute #\- #\! name))))




More information about the slime-cvs mailing list