diff options
| -rw-r--r-- | lisp/ChangeLog | 2 | ||||
| -rw-r--r-- | lisp/diff-mode.el | 5 |
2 files changed, 4 insertions, 3 deletions
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. |