Merge from origin/emacs-27

9664ee182c (origin/emacs-27) C++ Mode: Don't confuse the pointer oper...
b3aec9ee48 CC Mode: Fix unstable fontification of doc strings.

# Conflicts:
#	lisp/progmodes/cc-fonts.el

diff --cc lisp/progmodes/cc-engine.el
Simple merge

diff --cc lisp/progmodes/cc-fonts.el
index 3c429155abbe977aebd0dfbd2d0f3cd3076e64f9,5f3e2eaaf80fcfec35dbc1e2f94a7c665f1b9634..7e7053b98e1e3cd32e52e6e811247b8ccd703a97
--- 1/lisp/progmodes/cc-fonts.el
--- 2/lisp/progmodes/cc-fonts.el
+++ b/lisp/progmodes/cc-fonts.el
@@@ -2796,8 -2732,8 +2796,8 @@@ need for `pike-font-lock-extra-types'."
    ;; is used as a flag in other code to skip comments.
    ;;
    ;; This function might do hidden buffer changes.
 -
 +  (declare (indent 2))
-   (let (comment-beg region-beg)
+   (let (comment-beg region-beg comment-mid)
      (if (memq (get-text-property (point) 'face)
              '(font-lock-comment-face font-lock-comment-delimiter-face))
        ;; Handle the case when the fontified region starts inside a