Mercurial > emacs
changeset 65786:87a76ede9b30
(ediff-fixup-patch-map): Handle file names without
directory component in the session info.
| author | Andreas Schwab <schwab@suse.de> |
|---|---|
| date | Sun, 02 Oct 2005 09:35:20 +0000 |
| parents | a7f09d5b1ed0 |
| children | 7a79db995674 |
| files | lisp/ediff-ptch.el |
| diffstat | 1 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ediff-ptch.el Sun Oct 02 03:36:42 2005 +0000 +++ b/lisp/ediff-ptch.el Sun Oct 02 09:35:20 2005 +0000 @@ -305,8 +305,8 @@ ;; 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")