mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-04-06 22:31:13 -07:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs

Browse source
This commit is contained in:
Eli Zaretskii 2022-10-04 19:25:18 +03:00
commit d543fdcb21
2 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lisp/progmodes/cc-defs.el
View file

@ -125,7 +125,7 @@ The result of the body appears to the compiler as a quoted constant.
This variant works around bugs in `eval-when-compile' in various
\(X)Emacs versions. See cc-defs.el for details."
(declare (indent 0) (debug t))
(declare (indent 0) (debug (&rest def-form)))
(if c-inside-eval-when-compile
;; XEmacs 21.4.6 has a bug in `eval-when-compile' in that it
;; evaluates its body at macro expansion time if it's nested

8
lisp/progmodes/cc-fonts.el
View file

@ -2479,8 +2479,12 @@ higher."
(widen)
(goto-char (point-min))
(while (re-search-forward target-re nil t)
(put-text-property (match-beginning 0) (match-end 0)
'fontified nil)
(when (and
(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))
(dolist (win-boundary window-boundaries)
(when (and (< (match-beginning 0) (cdr win-boundary))
(> (match-end 0) (car win-boundary))