comparison lisp/diff-mode.el @ 87761:74f3c7c77fbe

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

87760:163e8bf7a33a

  style)

(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]\\|"
							diff-file-header-re))
				       (context "^[^-+#! \\]")
				       (normal "^[^<>#\\]")
				       (t "^[^-+#!<> \\]"))
				     nil t)

87761:74f3c7c77fbe

  style)

(defun diff-end-of-hunk (&optional style)
  ;; Especially important for unified (because headers are ambiguous).
  (setq style (diff-hunk-style style))
  (let ((end (and (re-search-forward (case style
				       ;; A `unified' header is ambiguous.
				       (unified (concat "^[^-+# \\]\\|"
							diff-file-header-re))
				       (context "^[^-+#! \\]")
				       (normal "^[^<>#\\]")
				       (t "^[^-+#!<> \\]"))
				     nil t)