(makefile-font-lock-keywords): Simplify last change.

diff --git a/lisp/progmodes/make-mode.el b/lisp/progmodes/make-mode.el
index 98a3d46088416746375b34c4cf10db72519ab88e..dcab340ec8246db90701b3c9b8a585e99427a3fa 100644 (file)
--- a/lisp/progmodes/make-mode.el
+++ b/lisp/progmodes/make-mode.el
@@ -269,11 +269,11 @@ not be enclosed in { } or ( )."
    (list makefile-dependency-regex 1 'font-lock-function-name-face)
 
    ;; Variable references even in targets/strings/comments.
-   '("\\$[({]\\([-a-zA-Z0-9_.]+\\)[}):]" 1 font-lock-constant-face prepend)
+   '("\\$[({]\\([-a-zA-Z0-9_.]+\\|[@%<?^+*][FD]?\\)[}):]"
+     1 font-lock-constant-face prepend)
 
    ;; Automatic variable references and single character variable references...
-   '("\\$\\([@%<?^+*_]\\|[a-zA-Z0-9]\\>\\)" 1 font-lock-reference-face prepend)
-   '("\\$[({]\\([@%<?^+*][FD]?\\)[}):]" 1 font-lock-reference-face prepend)
+   '("\\$\\([@%<?^+*_]\\|[a-zA-Z0-9]\\>\\)" 1 font-lock-constant-face prepend)
 
    ;; ...but not shell variables references.
    '("\\$\\$\\(\\sw+\\)" 1 'default t)