From: Alan Mackenzie Date: Fri, 28 Oct 2011 14:02:04 +0000 (+0000) Subject: Merge X-Git-Tag: emacs-pretest-24.0.91~37^2 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=bc97a826f8ea89a269f6043be3148930f023e2b2;p=emacs.git Merge --- bc97a826f8ea89a269f6043be3148930f023e2b2 diff --cc lisp/ChangeLog index 6aa1bddb9f3,be55e8410bf..bf4d87d3405 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@@ -1,3 -1,19 +1,57 @@@ ++2011-10-28 Alan Mackenzie ++ ++ 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 + + * 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 (tiny change) + + * mail/rmail.el (rmail-mode-map): Add M-C-f as in rmailsum (bug#9802). + + 2011-10-28 Stefan Monnier + + * 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 * emacs-lisp/cl-extra.el (most-positive-float, most-negative-float)