diff options
| author | Dan Nicolaescu <dann@ics.uci.edu> | 2008-04-05 00:56:31 +0000 |
|---|---|---|
| committer | Dan Nicolaescu <dann@ics.uci.edu> | 2008-04-05 00:56:31 +0000 |
| commit | 8d73b84e3b45f2312510ce3f78be258ea0834f87 (patch) | |
| tree | 1f4da7f77b30ba2e90e1705f2a24329cc5b7b595 /lisp/diff-mode.el | |
| parent | 2f745f7fa46ec76d8f616c19ccb8c2eeef9a76d4 (diff) | |
| download | emacs-8d73b84e3b45f2312510ce3f78be258ea0834f87.tar.gz | |
* diff-mode.el (diff-file-junk-re): Recognize the git format for
new files, deleted files and for changing permissions.
Diffstat (limited to 'lisp/diff-mode.el')
| -rw-r--r-- | lisp/diff-mode.el | 5 |
1 files changed, 3 insertions, 2 deletions
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. |