Mercurial > emacs

changeset 79843:8ac943071f87

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:46:44 +0000
parents b42de16944ab
children 20dfc58f9051
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:45:18 2008 +0000
+++ b/lisp/diff-mode.el	Tue Jan 15 03:46:44 2008 +0000
@@ -391,13 +391,9 @@
       ;; Especially important for unified (because headers are ambiguous).
       (setq style (cdr (assq (char-after) '((?@ . unified) (?* . context))))))
     (goto-char (match-end 0)))
-  ;; 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 "^[^<>#\\]")