Mercurial > emacs

diff lisp/diff-mode.el @ 93678:a89d44b9b107

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* diff-mode.el (diff-file-junk-re): Recognize the git format for new files and for changing permissions.
author Dan Nicolaescu <dann@ics.uci.edu>
date Sat, 05 Apr 2008 00:35:46 +0000
parents 928315b10669
children 3636fd479ab3
line wrap: on
line diff
--- a/lisp/diff-mode.el	Sat Apr 05 00:15:13 2008 +0000
+++ b/lisp/diff-mode.el	Sat Apr 05 00:35:46 2008 +0000
@@ -556,8 +556,9 @@
       (diff-end-of-hunk)
       (kill-region start (point)))))
 
-;; "index " and "new file mode" are output by git-diff.
-(defconst diff-file-junk-re "diff \\|index \\|new file mode")
+;; "index ", "old mode", "new mode" and "new file mode" are output by git-diff.
+(defconst diff-file-junk-re 
+  "diff \\|index \\|\\(?:new\\(?: file\\)?\\|old\\) mode ")
 
 (defun diff-beginning-of-file-and-junk ()
   "Go to the beginning of file-related diff-info.