Mercurial > emacs
comparison lisp/diff-mode.el @ 82910:292ec9e3a20c
(diff-find-file-name): Only accept regular files, to rule out
/dev/null, directories, etc.
| author | Glenn Morris <rgm@gnu.org> |
|---|---|
| date | Mon, 27 Aug 2007 07:11:32 +0000 |
| parents | e5a68f18fcb9 |
| children | f3735c349e01 b83d0dadb2a7 |
comparison
equal
deleted
inserted
replaced
| 82909:01df6fb7c1e7 | 82910:292ec9e3a20c |
|---|---|
| 680 (do* ((files fs (delq nil (mapcar 'diff-filename-drop-dir files))) | 680 (do* ((files fs (delq nil (mapcar 'diff-filename-drop-dir files))) |
| 681 (file nil nil)) | 681 (file nil nil)) |
| 682 ((or (null files) | 682 ((or (null files) |
| 683 (setq file (do* ((files files (cdr files)) | 683 (setq file (do* ((files files (cdr files)) |
| 684 (file (car files) (car files))) | 684 (file (car files) (car files))) |
| 685 ((or (null file) (file-exists-p file)) | 685 ;; Use file-regular-p to avoid |
| 686 ;; /dev/null, directories, etc. | |
| 687 ((or (null file) (file-regular-p file)) | |
| 686 file)))) | 688 file)))) |
| 687 file)) | 689 file)) |
| 688 ;; <foo>.rej patches implicitly apply to <foo> | 690 ;; <foo>.rej patches implicitly apply to <foo> |
| 689 (and (string-match "\\.rej\\'" (or buffer-file-name "")) | 691 (and (string-match "\\.rej\\'" (or buffer-file-name "")) |
| 690 (let ((file (substring buffer-file-name 0 (match-beginning 0)))) | 692 (let ((file (substring buffer-file-name 0 (match-beginning 0)))) |