# HG changeset patch
# User Andreas Schwab <schwab@suse.de>
# Date 1128245720 0
# Node ID 87a76ede9b3047d1d1f5c109ba83e888b4fc7766
# Parent  a7f09d5b1ed0b7d22a5f2bce78305cfce5dd92b4
(ediff-fixup-patch-map): Handle file names without
directory component in the session info.

diff -r a7f09d5b1ed0 -r 87a76ede9b30 lisp/ediff-ptch.el
--- 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")