From: Glenn Morris <rgm@gnu.org>
Date: Tue, 15 Jan 2008 03:54:51 +0000 (+0000)
Subject: (diff-end-of-hunk): Revert 2008-01-08 change.
X-Git-Tag: emacs-pretest-23.0.90~8563
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=c422d9f0ffe2b176f732c545a5c3e3af32a0a4e8;p=emacs.git

(diff-end-of-hunk): Revert 2008-01-08 change.
---

diff --git a/lisp/diff-mode.el b/lisp/diff-mode.el
index 6291453ba17..b8b6a009e2b 100644
--- a/lisp/diff-mode.el
+++ b/lisp/diff-mode.el
@@ -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 "^[^<>#\\]")