[slime-cvs] CVS slime

[CVS User sboukarev]

Update of /project/slime/cvsroot/slime
In directory cl-net:/tmp/cvs-serv18228

Modified Files:
	ChangeLog swank-loader.lisp 
Log Message:
* swank-loader.lisp (ecl-version-string): In
#+(or) (progn #+#.(cl:print cl:nil) 1) PRINT does run on SBCL, which
breaks #+#.(cl:if (cl:find-symbol "SYMBOL" :ext) ...) here, guard it with
(find-package :ext) until further investigations.


--- /project/slime/cvsroot/slime/ChangeLog	2010/02/25 16:35:22	1.1999
+++ /project/slime/cvsroot/slime/ChangeLog	2010/02/25 22:35:50	1.2000
@@ -1,3 +1,10 @@
+2010-02-25  Stas Boukarev  <stassats at gmail.com>
+
+	* swank-loader.lisp (ecl-version-string): In
+	#+(or) (progn #+#.(cl:print cl:nil) 1) PRINT does run on SBCL, which
+	breaks #+#.(cl:if (cl:find-symbol "SYMBOL" :ext) ...) here, guard it with
+	(find-package :ext) until further investigations.
+
 2010-02-25  Tobias C. Rittweiler <tcr at freebits.de>
 
 	* swank-loader.lisp (lisp-version-string): Add git-commit ids for
--- /project/slime/cvsroot/slime/swank-loader.lisp	2010/02/25 16:35:23	1.101
+++ /project/slime/cvsroot/slime/swank-loader.lisp	2010/02/25 22:35:50	1.102
@@ -61,11 +61,15 @@
 
 #+ecl
 (defun ecl-version-string ()
-  #+#.(cl:if (cl:find-symbol "LISP-IMPLEMENTATION-VCS-ID" :ext) '(:and) '(:or))
+  #+#.(cl:if (cl:and
+              (cl:find-package :ext)
+              (cl:find-symbol "LISP-IMPLEMENTATION-VCS-ID" :ext)) '(:and) '(:or))
   (format nil "~A-~A"
           (lisp-implementation-version) 
           (subseq (ext:lisp-implementation-vcs-id) 0 8))
-  #-#.(cl:if (cl:find-symbol "LISP-IMPLEMENTATION-VCS-ID" :ext) '(:and) '(:or))
+  #-#.(cl:if (cl:and
+              (cl:find-package :ext)
+              (cl:find-symbol "LISP-IMPLEMENTATION-VCS-ID" :ext)) '(:and) '(:or))
   (lisp-implementation-version))
 
 (defun lisp-version-string ()