procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

(diff-end-of-hunk): Don't match empty lines in unified format.

Browse source
This commit is contained in:
Glenn Morris 2008-01-08 05:19:13 +00:00
parent d1050c6987
commit 1c6aa2f55f
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lisp/diff-mode.el
View file

@ -391,9 +391,13 @@ when editing big diffs)."
;; 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 "^[^-+# \\]\\|"
(unified (concat "^[^-+# \\\n]\\|"
diff-file-header-re))
(context "^[^-+#! \\]")
(normal "^[^<>#\\]")