From: Dan Nicolaescu <dann@ics.uci.edu>
Date: Sat, 5 Apr 2008 00:56:31 +0000 (+0000)
Subject: * diff-mode.el (diff-file-junk-re): Recognize the git format for
X-Git-Tag: emacs-pretest-23.0.90~6566
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=8d73b84e3b45f2312510ce3f78be258ea0834f87;p=emacs.git

* diff-mode.el (diff-file-junk-re): Recognize the git format for
new files, deleted files and for changing permissions.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8664a042f22..c6535b7f8dc 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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 and for changing permissions.
+	new files, deleted files and for changing permissions.
 	(diff-mode): Set beginning-of-defun-function and
 	end-of-defun-function.
 
diff --git a/lisp/diff-mode.el b/lisp/diff-mode.el
index dd4615dc2ce..151811c037c 100644
--- a/lisp/diff-mode.el
+++ b/lisp/diff-mode.el
@@ -556,9 +556,10 @@ If the prefix ARG is given, restrict the view to the current file instead."
       (diff-end-of-hunk)
       (kill-region start (point)))))
 
-;; "index ", "old mode", "new mode" and "new file mode" are output by git-diff.
+;; "index ", "old mode", "new mode", "new file mode" and
+;; "deleted file mode" are output by git-diff.
 (defconst diff-file-junk-re 
-  "diff \\|index \\|\\(?:new\\(?: file\\)?\\|old\\) mode ")
+  "diff \\|index \\|\\(?:deleted file\\|new\\(?: file\\)?\\|old\\) mode")
 
 (defun diff-beginning-of-file-and-junk ()
   "Go to the beginning of file-related diff-info.