diff options
| author | Glenn Morris <rgm@gnu.org> | 2008-01-15 03:54:51 +0000 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2008-01-15 03:54:51 +0000 |
| commit | c422d9f0ffe2b176f732c545a5c3e3af32a0a4e8 (patch) | |
| tree | cc9aecabc89ee9d081608ea33d9dcba4dff30d4a | |
| parent | 9292328f935f06cdb014c572e9a7dd44875421a2 (diff) | |
| download | emacs-c422d9f0ffe2b176f732c545a5c3e3af32a0a4e8.tar.gz | |
(diff-end-of-hunk): Revert 2008-01-08 change.
| -rw-r--r-- | lisp/diff-mode.el | 6 |
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)." (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 "^[^<>#\\]") |