Mercurial > emacs

changeset 87761:74f3c7c77fbe

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(diff-end-of-hunk): Revert 2008-01-08 change.
author Glenn Morris <rgm@gnu.org>
date Tue, 15 Jan 2008 03:54:51 +0000
parents 163e8bf7a33a
children 9759bfb65382
files lisp/diff-mode.el
diffstat 1 files changed, 1 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/diff-mode.el	Tue Jan 15 03:54:28 2008 +0000
+++ b/lisp/diff-mode.el	Tue Jan 15 03:54:51 2008 +0000
@@ -401,13 +401,9 @@
 (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 "^[^<>#\\]")