(makefile-font-lock-keywords): Improve highlighting

of variable references inside other highlighted regions.

diff --git a/lisp/progmodes/make-mode.el b/lisp/progmodes/make-mode.el
index cabc112e9341f86971c0f8de4f171103f23c0e85..3a4ddff5bf8bcebd7f19f68a6a506d7031977669 100644 (file)
--- a/lisp/progmodes/make-mode.el
+++ b/lisp/progmodes/make-mode.el
@@ -214,10 +214,10 @@ not be enclosed in { } or ( ).")
    (list makefile-macroassign-regex 1 'font-lock-variable-name-face)
    ;;
    ;; Variable references even in targets/strings/comments:
-   '("\\$[({]\\([a-zA-Z0-9_]+\\)[})]" 1 font-lock-reference-face t)
+   '("\\$[({]\\([a-zA-Z0-9_]+\\)[})]" 1 font-lock-reference-face prepend)
    ;;
    ;; Do dependencies.  These get the function name face.
-   (list makefile-dependency-regex 1 'font-lock-function-name-face)
+   (list makefile-dependency-regex 1 'font-lock-function-name-face 'prepend)
 
    ;; Highlight lines that contain just whitespace.
    ;; They can cause trouble, especially if they start with a tab.