# HG changeset patch
# User Dan Nicolaescu <dann@ics.uci.edu>
# Date 1207355746 0
# Node ID a89d44b9b10792f34fa6ee7f3be6fb87410a1654
# Parent  112903000f93a88e2f48622fffd5ce6f5ae14a6f
* diff-mode.el (diff-file-junk-re): Recognize the git format for
new files and for changing permissions.

diff -r 112903000f93 -r a89d44b9b107 lisp/ChangeLog
--- a/lisp/ChangeLog	Sat Apr 05 00:15:13 2008 +0000
+++ b/lisp/ChangeLog	Sat Apr 05 00:35:46 2008 +0000
@@ -13,7 +13,7 @@
 	* textmodes/nroff-mode.el (nroff-mode-map): Add menus.
 
 	* diff-mode.el (diff-file-junk-re): Recognize the git format for
-	new files.
+	new files and for changing permissions.
 	(diff-mode): Set beginning-of-defun-function and
 	end-of-defun-function.
 
diff -r 112903000f93 -r a89d44b9b107 lisp/diff-mode.el
--- 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.