From 2c6a94c5b8df86c04479dd725dcfbb86ef8e6c2b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=A0t=C4=9Bp=C3=A1n=20N=C4=9Bmec?= Date: Fri, 29 Jul 2022 09:37:50 +0200 Subject: [PATCH 1/2] ; Correct the meaning of "cf." in tips.texi Cf. e.g. https://en.wiktionary.org/wiki/cf. * doc/lispref/tips.texi (Documentation Tips): Correct the meaning of "cf.". --- doc/lispref/tips.texi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/lispref/tips.texi b/doc/lispref/tips.texi index a3f49c19bce..eddbbfe8b90 100644 --- a/doc/lispref/tips.texi +++ b/doc/lispref/tips.texi @@ -845,7 +845,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.} From e0f54c62ecb72c41a9afc6d6c3e22b1a0b113f11 Mon Sep 17 00:00:00 2001 From: Alan Mackenzie Date: Fri, 29 Jul 2022 20:18:58 +0000 Subject: [PATCH 2/2] CC Mode: fontify variables/functions after line comments ending in spaces * lisp/progmodes/cc-engine.el (c-forward-comment-minus-1): Take account of spaces preceding a linefeed when scanning a putative line comment end. --- lisp/progmodes/cc-engine.el | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/lisp/progmodes/cc-engine.el b/lisp/progmodes/cc-engine.el index 3068c41a57e..80ac496749c 100644 --- a/lisp/progmodes/cc-engine.el +++ b/lisp/progmodes/cc-engine.el @@ -1668,9 +1668,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))) ?\\))