aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Nicolaescu2008-04-05 00:56:31 +0000
committerDan Nicolaescu2008-04-05 00:56:31 +0000
commit8d73b84e3b45f2312510ce3f78be258ea0834f87 (patch)
tree1f4da7f77b30ba2e90e1705f2a24329cc5b7b595
parent2f745f7fa46ec76d8f616c19ccb8c2eeef9a76d4 (diff)
downloademacs-8d73b84e3b45f2312510ce3f78be258ea0834f87.tar.gz
emacs-8d73b84e3b45f2312510ce3f78be258ea0834f87.zip
* diff-mode.el (diff-file-junk-re): Recognize the git format for
new files, deleted files and for changing permissions.
-rw-r--r--lisp/ChangeLog2
-rw-r--r--lisp/diff-mode.el5
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 @@
13 * textmodes/nroff-mode.el (nroff-mode-map): Add menus. 13 * textmodes/nroff-mode.el (nroff-mode-map): Add menus.
14 14
15 * diff-mode.el (diff-file-junk-re): Recognize the git format for 15 * diff-mode.el (diff-file-junk-re): Recognize the git format for
16 new files and for changing permissions. 16 new files, deleted files and for changing permissions.
17 (diff-mode): Set beginning-of-defun-function and 17 (diff-mode): Set beginning-of-defun-function and
18 end-of-defun-function. 18 end-of-defun-function.
19 19
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."
556 (diff-end-of-hunk) 556 (diff-end-of-hunk)
557 (kill-region start (point))))) 557 (kill-region start (point)))))
558 558
559;; "index ", "old mode", "new mode" and "new file mode" are output by git-diff. 559;; "index ", "old mode", "new mode", "new file mode" and
560;; "deleted file mode" are output by git-diff.
560(defconst diff-file-junk-re 561(defconst diff-file-junk-re
561 "diff \\|index \\|\\(?:new\\(?: file\\)?\\|old\\) mode ") 562 "diff \\|index \\|\\(?:deleted file\\|new\\(?: file\\)?\\|old\\) mode")
562 563
563(defun diff-beginning-of-file-and-junk () 564(defun diff-beginning-of-file-and-junk ()
564 "Go to the beginning of file-related diff-info. 565 "Go to the beginning of file-related diff-info.