procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

modula2.el: Avoid font-lock-*-face variables

Browse source 
* lisp/progmodes/modula2.el (m3-font-lock-keywords-1)
(m3-font-lock-keywords-2): Refer to the font-lock faces directly
This commit is contained in:
Stefan Monnier 2024-02-09 14:22:14 -05:00
parent 3c3702b9bb
commit efedb8f479
1 changed files with 25 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
lisp/progmodes/modula2.el
View file

@ -325,20 +325,20 @@ followed by the first character of the construct.
;;
;; Module definitions.
("\\<\\(INTERFACE\\|MODULE\\|PROCEDURE\\)\\>[ \t]*\\(\\sw+\\)?"
(1 font-lock-keyword-face) (2 font-lock-function-name-face nil t))
(1 'font-lock-keyword-face) (2 'font-lock-function-name-face nil t))
;;
;; Import directives.
("\\<\\(EXPORTS\\|FROM\\|IMPORT\\)\\>"
(1 font-lock-keyword-face)
(1 'font-lock-keyword-face)
(font-lock-match-c-style-declaration-item-and-skip-to-next
nil (goto-char (match-end 0))
(1 font-lock-constant-face)))
(1 'font-lock-constant-face)))
;;
;; Pragmas as warnings.
;; Spencer Allain <sallain@teknowledge.com> says do them as comments...
;; ("<\\*.*\\*>" . font-lock-warning-face)
;; ... but instead we fontify the first word.
("<\\*[ \t]*\\(\\sw+\\)" 1 font-lock-warning-face prepend)
("<\\*[ \t]*\\(\\sw+\\)" 1 'font-lock-warning-face prepend)
)
"Subdued level highlighting for Modula-3 modes.")
@ -366,26 +366,29 @@ followed by the first character of the construct.
"LOOPHOLE" "MAX" "MIN" "NARROW" "NEW" "NUMBER" "ORD"
"ROUND" "SUBARRAY" "TRUNC" "TYPECODE" "VAL")))
)
(list
;;
;; Keywords except those fontified elsewhere.
(concat "\\<\\(" m3-keywords "\\)\\>")
;;
;; Builtins.
(cons (concat "\\<\\(" m3-builtins "\\)\\>") 'font-lock-builtin-face)
;;
;; Type names.
(cons (concat "\\<\\(" m3-types "\\)\\>") 'font-lock-type-face)
;;
;; Fontify tokens as function names.
'("\\<\\(END\\|EXCEPTION\\|RAISES?\\)\\>[ \t{]*"
(1 font-lock-keyword-face)
`(
;;
;; Keywords except those fontified elsewhere.
,(concat "\\<\\(" m3-keywords "\\)\\>")
;;
;; Builtins.
(,(concat "\\<\\(" m3-builtins "\\)\\>")
(0 'font-lock-builtin-face))
;;
;; Type names.
(,(concat "\\<\\(" m3-types "\\)\\>")
(0 'font-lock-type-face))
;;
;; Fontify tokens as function names.
("\\<\\(END\\|EXCEPTION\\|RAISES?\\)\\>[ \t{]*"
(1 'font-lock-keyword-face)
(font-lock-match-c-style-declaration-item-and-skip-to-next
nil (goto-char (match-end 0))
(1 font-lock-function-name-face)))
;;
;; Fontify constants as references.
'("\\<\\(FALSE\\|NIL\\|NULL\\|TRUE\\)\\>" . font-lock-constant-face)
(1 'font-lock-function-name-face)))
;;
;; Fontify constants as references.
("\\<\\(FALSE\\|NIL\\|NULL\\|TRUE\\)\\>"
(0 'font-lock-constant-face))
))))
"Gaudy level highlighting for Modula-3 modes.")