Mercurial > emacs
changeset 93678:a89d44b9b107
* diff-mode.el (diff-file-junk-re): Recognize the git format for
new files and for changing permissions.
| author | Dan Nicolaescu <dann@ics.uci.edu> |
|---|---|
| date | Sat, 05 Apr 2008 00:35:46 +0000 |
| parents | 112903000f93 |
| children | 3636fd479ab3 |
| files | lisp/ChangeLog lisp/diff-mode.el |
| diffstat | 2 files changed, 4 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Sat Apr 05 00:15:13 2008 +0000 +++ b/lisp/ChangeLog Sat Apr 05 00:35:46 2008 +0000 @@ -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.
--- a/lisp/diff-mode.el Sat Apr 05 00:15:13 2008 +0000 +++ b/lisp/diff-mode.el Sat Apr 05 00:35:46 2008 +0000 @@ -556,8 +556,9 @@ (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.