Mercurial > emacs
changeset 93679:3636fd479ab3
* diff-mode.el (diff-file-junk-re): Recognize the git format for
new files, deleted files and for changing permissions.
| author | Dan Nicolaescu <dann@ics.uci.edu> |
|---|---|
| date | Sat, 05 Apr 2008 00:56:31 +0000 |
| parents | a89d44b9b107 |
| children | 5dee8473f368 |
| 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:35:46 2008 +0000 +++ b/lisp/ChangeLog Sat Apr 05 00:56:31 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 and for changing permissions. + new files, deleted 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:35:46 2008 +0000 +++ b/lisp/diff-mode.el Sat Apr 05 00:56:31 2008 +0000 @@ -556,9 +556,10 @@ (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.