[Emacs-diffs] Changes to emacs/lisp/diff-mode.el,v

[Dan Nicolaescu]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Dan Nicolaescu <dann>   08/04/04 22:34:35

Index: diff-mode.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/diff-mode.el,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -b -r1.135 -r1.136
--- diff-mode.el        25 Mar 2008 04:01:48 -0000      1.135
+++ diff-mode.el        4 Apr 2008 22:34:35 -0000       1.136
@@ -556,7 +556,8 @@
       (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 @@
   ;; 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)