From aae3725f5fc8c2d9bbc6edad2ee12826e0b48068 Mon Sep 17 00:00:00 2001 From: Andreas Schwab Date: Sun, 2 Oct 2005 09:35:32 +0000 Subject: [PATCH] (ediff-fixup-patch-map): Handle file names without directory component in the session info. --- lisp/ChangeLog | 5 +++++ lisp/ediff-ptch.el | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 9375c31b815..47f9a9b7946 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2005-10-02 Andreas Schwab + + * ediff-ptch.el (ediff-fixup-patch-map): Handle file names without + directory component in the session info. + 2005-10-01 Richard M. Stallman * comint.el (comint-redirect-subvert-readonly): Doc fix. diff --git a/lisp/ediff-ptch.el b/lisp/ediff-ptch.el index ec0e26e7d5c..78bad19bab8 100644 --- 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") -- 2.39.5