[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/diff-mode.el,v [EMACS_22_BASE]
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/diff-mode.el,v [EMACS_22_BASE] |
Date: |
Tue, 15 Jan 2008 03:46:45 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Branch: EMACS_22_BASE
Changes by: Glenn Morris <gm> 08/01/15 03:46:45
Index: diff-mode.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/diff-mode.el,v
retrieving revision 1.99.2.8
retrieving revision 1.99.2.9
diff -u -b -r1.99.2.8 -r1.99.2.9
--- diff-mode.el 8 Jan 2008 05:19:13 -0000 1.99.2.8
+++ diff-mode.el 15 Jan 2008 03:46:44 -0000 1.99.2.9
@@ -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 "^[^<>#\\]")