]> git.eshelyaron.com Git - emacs.git/commitdiff
(diff-end-of-hunk): Revert 2008-01-08 change.
authorGlenn Morris <rgm@gnu.org>
Tue, 15 Jan 2008 03:54:51 +0000 (03:54 +0000)
committerGlenn Morris <rgm@gnu.org>
Tue, 15 Jan 2008 03:54:51 +0000 (03:54 +0000)
lisp/diff-mode.el

index 6291453ba1764ad53fc5a0ca435c0acb410078fe..b8b6a009e2bf497cd6847f493120eaa2c0077605 100644 (file)
@@ -401,13 +401,9 @@ when editing big diffs)."
 (defun diff-end-of-hunk (&optional style)
   ;; Especially important for unified (because headers are ambiguous).
   (setq style (diff-hunk-style style))
-  ;; Some versions of diff replace all-blank context lines in unified
-  ;; format with empty lines. The use of \n below avoids matching such
-  ;; lines as headers.
-  ;; http://lists.gnu.org/archive/html/emacs-devel/2007-11/msg01990.html
   (let ((end (and (re-search-forward (case style
                                       ;; A `unified' header is ambiguous.
-                                      (unified (concat "^[^-+# \\\n]\\|"
+                                      (unified (concat "^[^-+# \\]\\|"
                                                        diff-file-header-re))
                                       (context "^[^-+#! \\]")
                                       (normal "^[^<>#\\]")