aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2008-01-15 03:54:51 +0000
committerGlenn Morris2008-01-15 03:54:51 +0000
commitc422d9f0ffe2b176f732c545a5c3e3af32a0a4e8 (patch)
treecc9aecabc89ee9d081608ea33d9dcba4dff30d4a
parent9292328f935f06cdb014c572e9a7dd44875421a2 (diff)
downloademacs-c422d9f0ffe2b176f732c545a5c3e3af32a0a4e8.tar.gz
emacs-c422d9f0ffe2b176f732c545a5c3e3af32a0a4e8.zip
(diff-end-of-hunk): Revert 2008-01-08 change.
-rw-r--r--lisp/diff-mode.el6
1 files changed, 1 insertions, 5 deletions
diff --git a/lisp/diff-mode.el b/lisp/diff-mode.el
index 6291453ba17..b8b6a009e2b 100644
--- a/lisp/diff-mode.el
+++ b/lisp/diff-mode.el
@@ -401,13 +401,9 @@ when editing big diffs)."
401(defun diff-end-of-hunk (&optional style) 401(defun diff-end-of-hunk (&optional style)
402 ;; Especially important for unified (because headers are ambiguous). 402 ;; Especially important for unified (because headers are ambiguous).
403 (setq style (diff-hunk-style style)) 403 (setq style (diff-hunk-style style))
404 ;; Some versions of diff replace all-blank context lines in unified
405 ;; format with empty lines. The use of \n below avoids matching such
406 ;; lines as headers.
407 ;; http://lists.gnu.org/archive/html/emacs-devel/2007-11/msg01990.html
408 (let ((end (and (re-search-forward (case style 404 (let ((end (and (re-search-forward (case style
409 ;; A `unified' header is ambiguous. 405 ;; A `unified' header is ambiguous.
410 (unified (concat "^[^-+# \\\n]\\|" 406 (unified (concat "^[^-+# \\]\\|"
411 diff-file-header-re)) 407 diff-file-header-re))
412 (context "^[^-+#! \\]") 408 (context "^[^-+#! \\]")
413 (normal "^[^<>#\\]") 409 (normal "^[^<>#\\]")