[slime-cvs] CVS slime/contrib

[CVS User sboukarev]

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

Modified Files:
	ChangeLog slime-asdf.el 
Log Message:
* slime-asdf.el (slime-determine-asdf-system): Don't call
slime-to-lisp-filename on NIL.
Reported by Tamas Papp.


--- /project/slime/cvsroot/slime/contrib/ChangeLog	2013/02/01 10:03:41	1.566
+++ /project/slime/cvsroot/slime/contrib/ChangeLog	2013/02/01 20:43:13	1.567
@@ -1,5 +1,9 @@
 2013-02-01  Stas Boukarev  <stassats at gmail.com>
 
+	* slime-asdf.el (slime-determine-asdf-system): Don't call
+	slime-to-lisp-filename on NIL.
+	Reported by Tamas Papp.
+
 	* swank-asdf.lisp (asdf-determine-system): Return the name of a
 	system.
 	Reported by Tamas Papp.
--- /project/slime/cvsroot/slime/contrib/slime-asdf.el	2011/12/06 18:57:18	1.33
+++ /project/slime/cvsroot/slime/contrib/slime-asdf.el	2013/02/01 20:43:13	1.34
@@ -36,13 +36,14 @@
   (let* ((completion-ignore-case nil)
          (prompt (or prompt "System"))
          (system-names (slime-eval `(swank:list-asdf-systems)))
-         (default-value (or default-value 
-                            (if determine-default-accurately
-                                (slime-determine-asdf-system (buffer-file-name)
-                                                             (slime-current-package))
-                                (slime-find-asd-file (or default-directory
-                                                         (buffer-file-name))
-                                                     system-names))))
+         (default-value
+           (or default-value 
+               (if determine-default-accurately
+                   (slime-determine-asdf-system (buffer-file-name)
+                                                (slime-current-package))
+                   (slime-find-asd-file (or default-directory
+                                            (buffer-file-name))
+                                        system-names))))
          (prompt (concat prompt (if default-value
                                     (format " (default `%s'): " default-value)
                                     ": "))))
@@ -64,8 +65,10 @@
 
 (defun slime-determine-asdf-system (filename buffer-package)
   "Try to determine the asdf system that `filename' belongs to."
-  (slime-eval `(swank:asdf-determine-system ,(slime-to-lisp-filename filename)
-                                            ,buffer-package)))
+  (slime-eval
+   `(swank:asdf-determine-system ,(and filename
+                                       (slime-to-lisp-filename filename))
+                                 ,buffer-package)))
 
 (defun slime-who-depends-on-rpc (system)
   (slime-eval `(swank:who-depends-on ,system)))