master 76bcbe5f93: Merge from origin/emacs-28

[Stefan Kangas]

branch: master
commit 76bcbe5f930f16014343ae75e92df94c727f30af
Merge: 40c0124816 e0f54c62ec
Author: Stefan Kangas <stefan@marxist.se>
Commit: Stefan Kangas <stefan@marxist.se>

    Merge from origin/emacs-28
    
    e0f54c62ec CC Mode: fontify variables/functions after line comments e...
    2c6a94c5b8 ; Correct the meaning of "cf." in tips.texi
---
 doc/lispref/tips.texi       |  2 +-
 lisp/progmodes/cc-engine.el | 10 +++++++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/doc/lispref/tips.texi b/doc/lispref/tips.texi
index 9faf3f33ba..3a1f6de12b 100644
--- a/doc/lispref/tips.texi
+++ b/doc/lispref/tips.texi
@@ -868,7 +868,7 @@ find an alternate phrasing that conveys the meaning.
 @item
 Try to avoid using abbreviations such as ``e.g.'' (for ``for
 example''), ``i.e.'' (for ``that is''), ``no.'' (for ``number''),
-``cf.'' (for ``in contrast to'') and ``w.r.t.'' (for ``with respect
+``cf.'' (for ``compare''/``see also'') and ``w.r.t.'' (for ``with respect
 to'') as much as possible.  It is almost always clearer and easier to
 read the expanded version.@footnote{We do use these occasionally, but
 try not to overdo it.}
diff --git a/lisp/progmodes/cc-engine.el b/lisp/progmodes/cc-engine.el
index cfbb668bae..bc6155dd66 100644
--- a/lisp/progmodes/cc-engine.el
+++ b/lisp/progmodes/cc-engine.el
@@ -1672,9 +1672,13 @@ comment at the start of cc-engine.el for more info."
 Return the result of `forward-comment' if it gets called, nil otherwise."
   `(if (not comment-end-can-be-escaped)
        (forward-comment -1)
-     (when (and (< (skip-syntax-backward " >") 0)
-               (eq (char-after) ?\n))
-       (forward-char))
+     (let ((dist (skip-syntax-backward " >")))
+       (when (and
+             (< dist 0)
+             (progn
+               (skip-syntax-forward " " (- (point) dist 1))
+               (eq (char-after) ?\n)))
+        (forward-char)))
      (cond
       ((and (eq (char-before) ?\n)
            (eq (char-before (1- (point))) ?\\))