1
0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-01-27 19:31:38 +00:00

(makefile-font-lock-keywords):

Rationalize the rules for includes and conditionals and use the
keyword face for them.
This commit is contained in:
Stefan Monnier 2001-04-25 15:52:45 +00:00
parent 7cd512f22f
commit 1dc64fca5b
2 changed files with 10 additions and 15 deletions

View File

@ -1,5 +1,9 @@
2001-04-25 Stefan Monnier <monnier@cs.yale.edu>
* progmodes/make-mode.el (makefile-font-lock-keywords):
Rationalize the rules for includes and conditionals and use the
keyword face for them.
* faces.el (modify-face): Add compatibility for non-interactive use.
2001-04-24 John Wiegley <johnw@gnu.org>

View File

@ -278,21 +278,12 @@ not be enclosed in { } or ( )."
;; Fontify conditionals and includes.
;; Note that plain `if' is an automake conditional, and not a bug.
'("^[ \t]*\\(-?include\\|if\\(n?eq\\|n?def\\)?\\)[ \t]+\\([^: \t\n#]+\\)"
(1 font-lock-warning-face) (3 font-lock-variable-name-face))
;; Fontify endif and else.
'("^[ \t]*\\(else\\|endif\\)[ \t]*\\(#.*$\\)?"
(1 font-lock-warning-face))
;; Fontify conditionals and includes.
;; Note that plain `if' is an automake conditional, and not a bug.
'("^[ \t]*\\(-?include\\|if\\(n?eq\\|n?def\\)?\\)[ \t]+\\([^: \t\n#]+\\)"
(1 font-lock-reference-face) (3 font-lock-variable-name-face))
;; Fontify endif and else.
'("^[ \t]*\\(else\\|endif\\)[ \t]*\\(#.*$\\)?"
(1 font-lock-reference-face))
(list
(concat "^\\(?: [ \t]*\\)?"
(regexp-opt '("-include" "-sinclude" "include" "sinclude" "ifeq"
"if" "ifneq" "ifdef" "ifndef" "endif" "else") t)
"\\>[ \t]*\\([^: \t\n#]*\\)")
'(1 font-lock-keyword-face) '(2 font-lock-variable-name-face))
;; Highlight lines that contain just whitespace.
;; They can cause trouble, especially if they start with a tab.