[slime-cvs] CVS slime

[trittweiler]

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

Modified Files:
	slime.el 
Log Message:

* slime.el (slime-maybe-warn-for-different-source-root): Catch
  returned NIL from `slime-file-name-merge-source-root' if the two
  filenames don't share a common source root. 
  Reported by Frank Goenninger.


--- /project/slime/cvsroot/slime/slime.el	2007/09/15 12:52:01	1.861
+++ /project/slime/cvsroot/slime/slime.el	2007/09/15 14:23:43	1.862
@@ -4546,6 +4546,8 @@
   "Returns a filename where the source root directory of TARGET-FILENAME
 is replaced with the source root directory of BUFFER-FILENAME.
 
+If no common source root could be determined, return NIL.
+
 E.g. (slime-file-name-merge-source-root
        \"/usr/local/src/joe/upstream/sbcl/code/late-extensions.lisp\"
        \"/usr/local/src/joe/hacked/sbcl/compiler/deftype.lisp\")
@@ -4622,7 +4624,8 @@
   (when slime-warn-when-possibly-tricked-by-M-.
     (let ((guessed-target (slime-file-name-merge-source-root target-filename
                                                              buffer-filename)))
-      (when (and (not (equal guessed-target target-filename))
+      (when (and guessed-target
+                 (not (equal guessed-target target-filename))
                  (or t (file-exists-p guessed-target)))
         (slime-message "Attention: This is `%s'."
                        (concat (slime-highlight-differences-in-dirname