[Emacs-diffs] Changes to emacs/lisp/ediff-ptch.el

[Andreas Schwab]

Index: emacs/lisp/ediff-ptch.el
diff -c emacs/lisp/ediff-ptch.el:1.27 emacs/lisp/ediff-ptch.el:1.28
*** emacs/lisp/ediff-ptch.el:1.27       Sat Sep 24 13:44:02 2005
--- emacs/lisp/ediff-ptch.el    Sun Oct  2 09:35:20 2005
***************
*** 305,312 ****
                ;; 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))
                  (setq base-dir1 ""
                        base-dir2 ""))
                (or (string= (car proposed-file-names) "/dev/null")
--- 305,312 ----
                ;; 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 (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")