summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Mackenzie <acm@muc.de>2022-07-29 20:18:58 +0000
committerAlan Mackenzie <acm@muc.de>2022-07-29 20:18:58 +0000
commite0f54c62ecb72c41a9afc6d6c3e22b1a0b113f11 (patch)
treeab9371d1d9a082296e1750d5c9f2065f28f1d5de
parent2c6a94c5b8df86c04479dd725dcfbb86ef8e6c2b (diff)
downloademacs-e0f54c62ecb72c41a9afc6d6c3e22b1a0b113f11.tar.gz
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.
-rw-r--r--lisp/progmodes/cc-engine.el10
1 files 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))) ?\\))