]> git.eshelyaron.com Git - emacs.git/commitdiff
CC Mode: partially revert commit from 2022-10-04
authorAlan Mackenzie <acm@muc.de>
Tue, 10 Jan 2023 20:29:37 +0000 (20:29 +0000)
committerAlan Mackenzie <acm@muc.de>
Tue, 10 Jan 2023 20:29:37 +0000 (20:29 +0000)
This reversion is of an ill-advised optimization, which resulted in non-type
identifiers getting fontified as types.

* lisp/progmodes/cc-fonts.el (c-fontify-new-found-type): Rather than writing
the expected face directly to the text, instead remove the `fontified'
property.  This allows the full font-lock mechanism to fontify the buffer
correctly.

lisp/progmodes/cc-fonts.el

index d84c4f8ad8aff6d25348d3a13d93e711dd760ee1..4dcc3e0ade9a710afdacfccf6c44c50ab7d77231 100644 (file)
@@ -2530,8 +2530,8 @@ higher."
                   (get-text-property (match-beginning 0) 'fontified)
                   (not (memq (c-get-char-property (match-beginning 0) 'face)
                              c-literal-faces)))
-             (c-put-font-lock-face (match-beginning 0) (match-end 0)
-                                   font-lock-type-face))
+             (put-text-property (match-beginning 0) (match-end 0)
+                                'fontified nil))
            (dolist (win-boundary window-boundaries)
              (when (and (< (match-beginning 0) (cdr win-boundary))
                         (> (match-end 0) (car win-boundary))