aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/progmodes/make-mode.el
diff options
context:
space:
mode:
Diffstat (limited to 'lisp/progmodes/make-mode.el')
-rw-r--r--lisp/progmodes/make-mode.el18
1 files changed, 9 insertions, 9 deletions
diff --git a/lisp/progmodes/make-mode.el b/lisp/progmodes/make-mode.el
index 8856856100e..e34eaba3150 100644
--- a/lisp/progmodes/make-mode.el
+++ b/lisp/progmodes/make-mode.el
@@ -331,7 +331,7 @@ not be enclosed in { } or ( )."
331 &rest fl-keywords) 331 &rest fl-keywords)
332 `(;; Do macro assignments. These get the "variable-name" face. 332 `(;; Do macro assignments. These get the "variable-name" face.
333 (,makefile-macroassign-regex 333 (,makefile-macroassign-regex
334 (1 font-lock-variable-name-face) 334 (1 'font-lock-variable-name-face)
335 ;; This is for after != 335 ;; This is for after !=
336 (2 'makefile-shell prepend t) 336 (2 'makefile-shell prepend t)
337 ;; This is for after normal assignment 337 ;; This is for after normal assignment
@@ -340,10 +340,10 @@ not be enclosed in { } or ( )."
340 ;; Rule actions. 340 ;; Rule actions.
341 ;; FIXME: When this spans multiple lines we need font-lock-multiline. 341 ;; FIXME: When this spans multiple lines we need font-lock-multiline.
342 (makefile-match-action 342 (makefile-match-action
343 (1 font-lock-type-face nil t) 343 (1 'font-lock-type-face nil t)
344 (2 'makefile-shell prepend) 344 (2 'makefile-shell prepend)
345 ;; Only makepp has builtin commands. 345 ;; Only makepp has builtin commands.
346 (3 font-lock-builtin-face prepend t)) 346 (3 'font-lock-builtin-face prepend t))
347 347
348 ;; Variable references even in targets/strings/comments. 348 ;; Variable references even in targets/strings/comments.
349 (,var 2 font-lock-variable-name-face prepend) 349 (,var 2 font-lock-variable-name-face prepend)
@@ -364,11 +364,11 @@ not be enclosed in { } or ( )."
364 (string-replace "-" "[_-]" (regexp-opt (cdr keywords) t)) 364 (string-replace "-" "[_-]" (regexp-opt (cdr keywords) t))
365 (regexp-opt keywords t))) 365 (regexp-opt keywords t)))
366 "\\>[ \t]*\\([^: \t\n#]*\\)") 366 "\\>[ \t]*\\([^: \t\n#]*\\)")
367 (1 font-lock-keyword-face) (2 font-lock-variable-name-face)))) 367 (1 'font-lock-keyword-face) (2 'font-lock-variable-name-face))))
368 368
369 ,@(if negation 369 ,@(if negation
370 `((,negation (1 font-lock-negation-char-face prepend) 370 `((,negation (1 'font-lock-negation-char-face prepend)
371 (2 font-lock-negation-char-face prepend t)))) 371 (2 'font-lock-negation-char-face prepend t))))
372 372
373 ,@(if space 373 ,@(if space
374 '(;; Highlight lines that contain just whitespace. 374 '(;; Highlight lines that contain just whitespace.
@@ -436,9 +436,9 @@ not be enclosed in { } or ( )."
436 436
437 ;; Colon modifier keywords. 437 ;; Colon modifier keywords.
438 '("\\(:\\s *\\)\\(build_c\\(?:ache\\|heck\\)\\|env\\(?:ironment\\)?\\|foreach\\|signature\\|scanner\\|quickscan\\|smartscan\\)\\>\\([^:\n]*\\)" 438 '("\\(:\\s *\\)\\(build_c\\(?:ache\\|heck\\)\\|env\\(?:ironment\\)?\\|foreach\\|signature\\|scanner\\|quickscan\\|smartscan\\)\\>\\([^:\n]*\\)"
439 (1 font-lock-type-face t) 439 (1 'font-lock-type-face t)
440 (2 font-lock-keyword-face t) 440 (2 'font-lock-keyword-face t)
441 (3 font-lock-variable-name-face t)) 441 (3 'font-lock-variable-name-face t))
442 442
443 ;; $(function ...) $((function ...)) ${...} ${{...}} $[...] $[[...]] 443 ;; $(function ...) $((function ...)) ${...} ${{...}} $[...] $[[...]]
444 '("[^$]\\$\\(?:((?\\|{{?\\|\\[\\[?\\)\\([-a-zA-Z0-9_.]+\\s \\)" 444 '("[^$]\\$\\(?:((?\\|{{?\\|\\[\\[?\\)\\([-a-zA-Z0-9_.]+\\s \\)"