Mercurial > emacs
comparison lisp/ediff-ptch.el @ 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 | ed770a0a7846 |
| children | d64aeb0dc54e |
comparison
equal
deleted
inserted
replaced
| 65785:a7f09d5b1ed0 | 65786:87a76ede9b30 |
|---|---|
| 303 ) | 303 ) |
| 304 ;; If both base-dir1 and base-dir2 are relative, assume that | 304 ;; If both base-dir1 and base-dir2 are relative, assume that |
| 305 ;; these dirs lead to the actual files starting at the present | 305 ;; these dirs lead to the actual files starting at the present |
| 306 ;; directory. So, we don't strip these relative dirs from the | 306 ;; directory. So, we don't strip these relative dirs from the |
| 307 ;; file names. This is a heuristic intended to improve guessing | 307 ;; file names. This is a heuristic intended to improve guessing |
| 308 (unless (or (file-name-absolute-p base-dir1) | 308 (unless (or (and base-dir1 (file-name-absolute-p base-dir1)) |
| 309 (file-name-absolute-p base-dir2)) | 309 (and base-dir2 (file-name-absolute-p base-dir2))) |
| 310 (setq base-dir1 "" | 310 (setq base-dir1 "" |
| 311 base-dir2 "")) | 311 base-dir2 "")) |
| 312 (or (string= (car proposed-file-names) "/dev/null") | 312 (or (string= (car proposed-file-names) "/dev/null") |
| 313 (setcar proposed-file-names | 313 (setcar proposed-file-names |
| 314 (ediff-file-name-sans-prefix | 314 (ediff-file-name-sans-prefix |