From: Dan Nicolaescu <dann@ics.uci.edu>
Date: Fri, 4 Apr 2008 22:34:35 +0000 (+0000)
Subject: (diff-file-junk-re): Recognize the git format for
X-Git-Tag: emacs-pretest-23.0.90~6572
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=19446c41b170a489d00d551914b781b9e74c54bb;p=emacs.git

(diff-file-junk-re): Recognize the git format for
new files.
(diff-mode): Set beginning-of-defun-function and
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 866d101c41e..923010c1fdb 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,10 @@
 2008-04-04  Dan Nicolaescu  <dann@ics.uci.edu>
 
+	* diff-mode.el (diff-file-junk-re): Recognize the git format for
+	new files.
+	(diff-mode): Set beginning-of-defun-function and
+	end-of-defun-function.
+
 	* vc-bzr.el (vc-bzr-state): Use when instead of if.
 
 	* vc.el (vc-default-status-fileinfo-extra): New function.
diff --git a/lisp/diff-mode.el b/lisp/diff-mode.el
index e89aa0e3334..48b8f18a132 100644
--- a/lisp/diff-mode.el
+++ b/lisp/diff-mode.el
@@ -556,7 +556,8 @@ If the prefix ARG is given, restrict the view to the current file instead."
       (diff-end-of-hunk)
       (kill-region start (point)))))
 
-(defconst diff-file-junk-re "diff \\|index ") ; "index " is output by git-diff.
+;; "index " and "new file mode" are output by git-diff.
+(defconst diff-file-junk-re "diff \\|index \\|new file mode")
 
 (defun diff-beginning-of-file-and-junk ()
   "Go to the beginning of file-related diff-info.
@@ -1237,6 +1238,11 @@ a diff with \\[diff-reverse-direction].
   ;; compile support
   (set (make-local-variable 'next-error-function) 'diff-next-error)
 
+  (set (make-local-variable 'beginning-of-defun-function)
+       'diff-beginning-of-file-and-junk)
+  (set (make-local-variable 'end-of-defun-function)
+       'diff-end-of-file)
+
   (setq buffer-read-only diff-default-read-only)
   ;; setup change hooks
   (if (not diff-update-on-the-fly)