Mercurial > emacs

comparison lisp/diff-mode.el @ 91015:b83d0dadb2a7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from emacs--devo--0 Patches applied: * emacs--devo--0 (patch 857-865) - Update from CVS - Merge from emacs--rel--22 - Update from CVS: lisp/emacs-lisp/avl-tree.el: New file. - Remove RCS keywords * emacs--rel--22 (patch 97-100) - Update from CVS - Merge from gnus--rel--5.10 * gnus--rel--5.10 (patch 246-247) - Update from CVS Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-252
author Miles Bader <miles@gnu.org>
date Wed, 29 Aug 2007 05:03:40 +0000
parents 424b655804ca 292ec9e3a20c
children 14c4a6aac623
comparison
equal deleted inserted replaced
91014:2392e6a45952 91015:b83d0dadb2a7
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))))