procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Glenn Morris 2008-01-15 03:46:59 +00:00
parent 11a609d13f
commit 858fd4a4b4
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lisp/ChangeLog
View file

@ -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

6
lisp/diff-mode.el
View file

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