diff options
| author | Dan Nicolaescu <[email protected]> | 2008-04-05 00:35:46 +0000 |
|---|---|---|
| committer | Dan Nicolaescu <[email protected]> | 2008-04-05 00:35:46 +0000 |
| commit | 2f745f7fa46ec76d8f616c19ccb8c2eeef9a76d4 (patch) | |
| tree | e7c9cdad0c71fa4dc8eecf12a8a1e746f597e199 | |
| parent | 90e9ca17a7b50e827171708901f0d38fbd53ed6b (diff) | |
* diff-mode.el (diff-file-junk-re): Recognize the git format for
new files and for changing permissions.
| -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 cb09facc26..8664a042f2 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. + new 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 48b8f18a13..dd4615dc2c 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. |