From: Glenn Morris <rgm@gnu.org>
Date: Mon, 16 Aug 2021 15:01:03 +0000 (-0700)
Subject: Merge from origin/emacs-27
X-Git-Tag: emacs-28.0.90~1479
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=958f5915672f77f2b98c425fae4035dea5dc5116;p=emacs.git

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
---

958f5915672f77f2b98c425fae4035dea5dc5116
diff --cc lisp/progmodes/cc-fonts.el
index 3c429155abb,5f3e2eaaf80..7e7053b98e1
--- a/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