summaryrefslogtreecommitdiff
path: root/lisp/diff-mode.el
diff options
context:
space:
mode:
Diffstat (limited to 'lisp/diff-mode.el')
-rw-r--r--lisp/diff-mode.el5
1 files changed, 3 insertions, 2 deletions
diff --git a/lisp/diff-mode.el b/lisp/diff-mode.el
index 48b8f18a132..dd4615dc2ce 100644
--- a/lisp/diff-mode.el
+++ b/lisp/diff-mode.el
@@ -556,8 +556,9 @@ If the prefix ARG is given, restrict the view to the current file instead."
(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.