[Emacs-diffs] scratch/gnus-cloud 0703c56 55/61: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs

[Teodor Zlatanov]

branch: scratch/gnus-cloud
commit 0703c562d5cc041be0cb8a1a9f045dfc22dc9401
Merge: 1bf1008 681d3f1
Author: Ted Zlatanov <address@hidden>
Commit: Ted Zlatanov <address@hidden>

    Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
---
 doc/misc/cc-mode.texi       |    6 ++++--
 lisp/progmodes/cc-engine.el |    3 ++-
 lisp/progmodes/cc-vars.el   |    5 +----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/doc/misc/cc-mode.texi b/doc/misc/cc-mode.texi
index 82f8cbc..f311ec8 100644
--- a/doc/misc/cc-mode.texi
+++ b/doc/misc/cc-mode.texi
@@ -6727,9 +6727,11 @@ Macros which needn't (or mustn't) be followed by a 
semicolon when you
 invoke them, @dfn{macros with semicolons}, are very common.  These can
 cause @ccmode{} to parse the next line wrongly as a
 @code{statement-cont} (@pxref{Function Symbols}) and thus mis-indent
-it.
+it.  At the top level, a macro invocation before a defun start can
+cause, for example, @code{c-beginning-of-defun} (@kbd{C-M-a}) not to
+find the correct start of the current function.
 
-You can prevent this by specifying which macros have semicolons.  It
+You can prevent these by specifying which macros have semicolons.  It
 doesn't matter whether or not such a macro has a parameter list:
 
 @defopt c-macro-names-with-semicolon
diff --git a/lisp/progmodes/cc-engine.el b/lisp/progmodes/cc-engine.el
index 4bc4056..75f07e3 100644
--- a/lisp/progmodes/cc-engine.el
+++ b/lisp/progmodes/cc-engine.el
@@ -9298,7 +9298,8 @@ comment at the start of cc-engine.el for more info."
                (/= last-stmt-start (point))
                (progn
                  (c-backward-syntactic-ws lim)
-                 (not (memq (char-before) '(?\; ?} ?: nil))))
+                 (not (or (memq (char-before) '(?\; ?} ?: nil))
+                          (c-at-vsemi-p))))
                (save-excursion
                  (backward-char)
                  (not (looking-at "\\s(")))
diff --git a/lisp/progmodes/cc-vars.el b/lisp/progmodes/cc-vars.el
index f03aec2..7a6f4ba 100644
--- a/lisp/progmodes/cc-vars.el
+++ b/lisp/progmodes/cc-vars.el
@@ -1702,10 +1702,7 @@ the regular expression must match only valid identifiers.
 
 If you change this variable's value, call the function
 `c-make-macros-with-semi-re' to set the necessary internal
-variables.
-
-Note that currently \(2008-11-04) this variable is a prototype,
-and is likely to disappear or change its form soon.")
+variables.")
 (make-variable-buffer-local 'c-macro-names-with-semicolon)
 (put 'c-macro-names-with-semicolon 'safe-local-variable
      #'c-string-or-string-list-p)