mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-15 10:30:25 -08:00
Code Issues Projects Releases Wiki Activity

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

Browse source
This commit is contained in:
Glenn Morris 2008-01-15 03:54:51 +00:00
parent 9292328f93
commit c422d9f0ff
1 changed files with 1 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lisp/diff-mode.el
View file

@ -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 "^[^<>#\\]")