Commit 1c6aa2f5 authored by Glenn Morris's avatar Glenn Morris
Browse files

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

parent d1050c69
......@@ -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 "^[^<>#\\]")
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment