[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master 639adf26a1: CC Mode: Fix the "asymmetry rule" for fontifying a ty
From: |
Alan Mackenzie |
Subject: |
master 639adf26a1: CC Mode: Fix the "asymmetry rule" for fontifying a type followed by * |
Date: |
Fri, 25 Nov 2022 04:50:57 -0500 (EST) |
branch: master
commit 639adf26a1b43445eaf52e4246cf1f5b46b5e12d
Author: Alan Mackenzie <acm@muc.de>
Commit: Alan Mackenzie <acm@muc.de>
CC Mode: Fix the "asymmetry rule" for fontifying a type followed by *
This fixes bug #59427. We now handle correctly the case when a parenthesis
follows the * which is ambiguously a multiplication or indirection operator.
Also, we don't recognise a type thus found as a found type - the evidence is
too weak.
* lisp/progmodes/cc-engine.el (c-forward-decl-or-cast-1): Fix CASE 17.5 as
above.
---
lisp/progmodes/cc-engine.el | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/lisp/progmodes/cc-engine.el b/lisp/progmodes/cc-engine.el
index 9e09e5150d..11ddb39ed9 100644
--- a/lisp/progmodes/cc-engine.el
+++ b/lisp/progmodes/cc-engine.el
@@ -11077,8 +11077,9 @@ This function might do hidden buffer changes."
at-decl-start))
(let ((space-before-id
(save-excursion
- (goto-char name-start)
- (or (bolp) (memq (char-before) '(?\ ?\t)))))
+ (goto-char id-start) ; Position of "*".
+ (and (> (skip-chars-forward "* \t\n\r") 0)
+ (memq (char-before) '(?\ ?\t ?\n ?\r)))))
(space-after-type
(save-excursion
(goto-char type-start)
@@ -11088,6 +11089,8 @@ This function might do hidden buffer changes."
(memq (char-after) '(?\ ?\t)))))))
(when (not (eq (not space-before-id)
(not space-after-type)))
+ (when (eq at-type 'maybe)
+ (setq unsafe-maybe t))
(setq maybe-expression t)
(throw 'at-decl-or-cast t)))))
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- master 639adf26a1: CC Mode: Fix the "asymmetry rule" for fontifying a type followed by *,
Alan Mackenzie <=