(ediff-fixup-patch-map): Handle file names without

directory component in the session info.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9375c31b815d142e62d0acd7e10142f7ff63297c..47f9a9b79461e067b3898c41681aa6709901b4a9 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2005-10-02  Andreas Schwab  <schwab@suse.de>
+
+       * ediff-ptch.el (ediff-fixup-patch-map): Handle file names without
+       directory component in the session info.
+
 2005-10-01  Richard M. Stallman  <rms@gnu.org>
 
        * comint.el (comint-redirect-subvert-readonly): Doc fix.

diff --git a/lisp/ediff-ptch.el b/lisp/ediff-ptch.el
index ec0e26e7d5c8e6a386e3dfd58b091cf5b671a857..78bad19bab8cf539731e2337cc611c6305fc741d 100644 (file)
--- a/lisp/ediff-ptch.el
+++ b/lisp/ediff-ptch.el
@@ -305,8 +305,8 @@ program."
                ;; these dirs lead to the actual files starting at the present
                ;; directory. So, we don't strip these relative dirs from the
                ;; file names. This is a heuristic intended to improve guessing
-               (unless (or (file-name-absolute-p base-dir1)
-                           (file-name-absolute-p base-dir2))
+               (unless (or (and base-dir1 (file-name-absolute-p base-dir1))
+                           (and base-dir2 (file-name-absolute-p base-dir2)))
                  (setq base-dir1 ""
                        base-dir2 ""))
                (or (string= (car proposed-file-names) "/dev/null")