diff options
| author | Glenn Morris <rgm@gnu.org> | 2008-01-15 03:46:59 +0000 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2008-01-15 03:46:59 +0000 |
| commit | 858fd4a4b4cbe0ff031621097c4500f4f977cba8 (patch) | |
| tree | 1e5839ff2e5b3f9892f6e713374868f9cfdc211d | |
| parent | 11a609d13fcbe36e89c8727be97654eb5dc0f86a (diff) | |
| download | emacs-858fd4a4b4cbe0ff031621097c4500f4f977cba8.tar.gz | |
(diff-end-of-hunk): Revert 2008-01-08 change.
| -rw-r--r-- | lisp/ChangeLog | 6 | ||||
| -rw-r--r-- | lisp/diff-mode.el | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index cca899e3354..91d3a778f24 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2008-01-15 Glenn Morris <rgm@gnu.org> + + * diff-mode.el (diff-end-of-hunk): Revert 2008-01-08 change. + 2008-01-14 Alan Mackenzie <acm@muc.de> * progmodes/cc-vars.el (c-constant-symbol): New function which @@ -8,7 +12,7 @@ * progmodes/cc-vars.el (c-hanging-braces-alist): Remove the obscure non-working fragment ":value c-". - + 2008-01-14 Alan Mackenzie <acm@muc.de> * progmodes/cc-engine.el (c-guess-basic-syntax): prevent a macro diff --git a/lisp/diff-mode.el b/lisp/diff-mode.el index a088cd6ccba..4c566b344a9 100644 --- a/lisp/diff-mode.el +++ b/lisp/diff-mode.el @@ -391,13 +391,9 @@ 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 "^[^-+# \\\n]\\|" + (unified (concat "^[^-+# \\]\\|" diff-file-header-re)) (context "^[^-+#! \\]") (normal "^[^<>#\\]") |