diff options
| author | Richard M. Stallman <[email protected]> | 1998-07-03 21:37:22 +0000 |
|---|---|---|
| committer | Richard M. Stallman <[email protected]> | 1998-07-03 21:37:22 +0000 |
| commit | 39e7e36ac559499d2a9ee91fe6b3099d1759911b (patch) | |
| tree | ea0379f0010b8ea5d822147c15171a37dcc5b48f | |
| parent | 249d440df95b3c0219d128a5fdf266522f91a9cb (diff) | |
(makefile-font-lock-keywords): Recognize automatic variable references.
(makefile-dependency-regex): Don't be fooled by colons in deps.
| -rw-r--r-- | lisp/progmodes/make-mode.el | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/lisp/progmodes/make-mode.el b/lisp/progmodes/make-mode.el index 54fd598302..e5d7028e40 100644 --- a/lisp/progmodes/make-mode.el +++ b/lisp/progmodes/make-mode.el @@ -234,7 +234,7 @@ not be enclosed in { } or ( )." ;; that if you change this regexp you must fix the imenu index ;; function defined at the end of the file. (defconst makefile-dependency-regex - "^ *\\([^ \n\t#:=]+\\([ \t]+[^ \t\n#:=]+\\)*\\)[ \t]*:\\([ \t]*$\\|\\([^=\n].*$\\)\\)" + "^ *\\([^ \n\t#:=]+\\([ \t]+\\([^ \t\n#:=]+\\|\\$[({][^ \t\n#})]+[})]\\)\\)*\\)[ \t]*:\\([ \t]*$\\|\\([^=\n].*$\\)\\)" "Regex used to find dependency lines in a makefile.") ;; Note that the first subexpression is used by font lock. Note that @@ -264,7 +264,10 @@ not be enclosed in { } or ( )." ;; ;; Variable references even in targets/strings/comments: '("\\$[({]\\([-a-zA-Z0-9_.]+\\)[}):]" 1 font-lock-constant-face prepend) - + ;; + ;; Automatic variable references. + '("\\$\\([@%<?^+*]\\)" 1 font-lock-reference-face prepend) + ;; ;; Highlight lines that contain just whitespace. ;; They can cause trouble, especially if they start with a tab. '("^[ \t]+$" . makefile-space-face) |