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

[Stefan Monnier]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Stefan Monnier <monnier>        08/02/08 16:00:56

Index: diff-mode.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/diff-mode.el,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -b -r1.126 -r1.127
--- diff-mode.el        5 Feb 2008 02:14:09 -0000       1.126
+++ diff-mode.el        8 Feb 2008 16:00:54 -0000       1.127
@@ -1750,7 +1750,14 @@
                    ;; Move to where the changes are,
                    ;; `add-change-log-entry-other-window' works better in
                    ;; that case.
-                   (re-search-forward "\n[!+-<>]" nil t))
+                   (re-search-forward
+                    (concat "\n[!+-<>]"
+                            ;; If the hunk is a context hunk with an empty 
first
+                            ;; half, recognize the "--- NNN,MMM ----" line
+                            "\\(-- [0-9]+\\(,[0-9]+\\)? ----\n"
+                            ;; and skip to the next non-context line.
+                            "\\( .*\n\\)*[+]\\)?")
+                    nil t))
             (save-excursion
               (add-change-log-entry-other-window)
               ;; Insert a "." so that the entries created don't get