[Emacs-diffs] master 3aa22e6 3/3: Merge from origin/emacs-26

[Glenn Morris]

branch: master
commit 3aa22e6ec615c5dadb134f1e45ee9bb3034518b7
Merge: 0525b49 9877c03
Author: Glenn Morris <address@hidden>
Commit: Glenn Morris <address@hidden>

    Merge from origin/emacs-26
    
    9877c03 (origin/emacs-26) Fix bug #33416, where typing a ) in a comme...
---
 lisp/progmodes/cc-mode.el | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lisp/progmodes/cc-mode.el b/lisp/progmodes/cc-mode.el
index cc1991a..4dd8f51 100644
--- a/lisp/progmodes/cc-mode.el
+++ b/lisp/progmodes/cc-mode.el
@@ -1804,7 +1804,10 @@ Note that this is a strict tail, so won't match, e.g. 
\"0x....\".")
         (c-syntactic-skip-backward "^;{}" bod-lim t)
         (> (point) bod-lim)
         (progn (c-forward-syntactic-ws)
-               (setq bo-decl (point))
+               ;; Have we got stuck in a comment at EOB?
+               (not (and (eobp)
+                         (c-literal-start))))
+        (progn (setq bo-decl (point))
                (or (not (looking-at c-protection-key))
                    (c-forward-keyword-clause 1)))
         (progn