Merge

1 files changed, 56 insertions, 2 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 6aa1bddb9f3..bf4d87d3405 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,57 @@
+2011-10-28  Alan Mackenzie  <acm@muc.de>
+
+        Amend to indent and fontify macros "which include their own semicolon"
+        correctly, using the "virtual semicolon" mechanism.
+
+        * cc-defs.el: Update "virtual semicolon" comments.
+
+        * cc-engine.el (c-crosses-statement-barrier-p): Recoded to scan one line at
+        at time rather than having \n and \r explicitly in c-stmt-delim-chars
+        (for some modes, e.g. AWK).
+        (c-forward-label): Amend for virtual semicolons.
+        (c-at-macro-vsemi-p, c-macro-vsemi-status-unknown-p): New functions
+
+        * cc-fonts.el (c-font-lock-declarations): Take account of the new C macros.
+
+        * cc-langs.el (c-at-vsemi-p-fn, c-vsemi-status-unknown-p-fn): move to
+        earlier in the file.
+        (c-opt-cpp-symbol, c-line-comment-start-regexp): New language variables.
+        (c-opt-cpp-macro-define): Make into a full language variable.
+        (c-stmt-delim-chars, c-stmt-delim-chars-with-comma): Special value for
+        AWK Mode (including \n, \r) removed, no longer needed.
+
+        * cc-mode.el (c-mode, c++-mode, objc-mode): Invoke
+        c-make-macro-with-semi-re.  (Erroneously committed early, in previous
+        version, 5.259.)
+
+        * cc-vars.el (c-macro-with-semi-re, c-macro-names-with-semicolon): New
+        variables.
+        (c-make-macro-with-semi-re): New function
+
+        * cc-mode.texi (Indentation Commands): Mention "macros with semicolons".
+        (Other Special Indentations): Add an xref to "Macros with ;".
+        (Customizing Macros): Add stuff about syntax in macros.  Add an xref to
+        "Macros with ;".
+        (Macros with ;): New page.
+
+
+
+2011-10-28  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * vc/log-edit.el: Fill empty field rather than adding new one.
+        (log-edit-add-field): New function.
+        (log-edit-insert-changelog): Use it.
+
+2011-10-28  Mark Lillibridge  <mark.lillibridge@hp.com>  (tiny change)
+
+        * mail/rmail.el (rmail-mode-map): Add M-C-f as in rmailsum (bug#9802).
+
+2011-10-28  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * progmodes/gdb-mi.el: Warn the user when -i=mi is missing.
+        (gdb--check-interpreter): New function.
+        (gdb): Use it.
+
 2011-10-27  Glenn Morris  <rgm@gnu.org>
 
         * emacs-lisp/cl-extra.el (most-positive-float, most-negative-float)
@@ -21,8 +75,8 @@
         * subr.el (change-major-mode-after-body-hook): New hook.
         (run-mode-hooks): Run it.
 
-        * emacs-lisp/easy-mmode.el (define-globalized-minor-mode): Use
-        change-major-mode-before-body-hook.
+        * emacs-lisp/easy-mmode.el (define-globalized-minor-mode):
+        Use change-major-mode-before-body-hook.
 
         * simple.el (fundamental-mode):
         * emacs-lisp/derived.el (define-derived-mode): Revert 2010-04-28