diff options
| author | Daniel Pfeiffer <occitan@esperanto.org> | 2005-05-17 21:37:59 +0000 |
|---|---|---|
| committer | Daniel Pfeiffer <occitan@esperanto.org> | 2005-05-17 21:37:59 +0000 |
| commit | 8ade3c25b7e1e6b742393a89c6d718d0790e2e1a (patch) | |
| tree | d16b2f0b30b5661e57bd2db1fd4616e3f3dd23dd /lisp/progmodes/make-mode.el | |
| parent | 0b11ce59ee4b7635e207466badfcbff97da80848 (diff) | |
| download | emacs-8ade3c25b7e1e6b742393a89c6d718d0790e2e1a.tar.gz emacs-8ade3c25b7e1e6b742393a89c6d718d0790e2e1a.tar.bz2 emacs-8ade3c25b7e1e6b742393a89c6d718d0790e2e1a.zip | |
(makefile-macroassign-regex, makefile-make-font-lock-keywords): Also fontify plain strings assigned to variables, mostly so that a colon has a face and is thus not taken as a dependency separator.
(makefile-mode): Cancel `font-lock-support-mode', because blocks to be fontified in one piece can be too long for JIT. Makefiles are never *that* big.
Diffstat (limited to 'lisp/progmodes/make-mode.el')
| -rw-r--r-- | lisp/progmodes/make-mode.el | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/lisp/progmodes/make-mode.el b/lisp/progmodes/make-mode.el index 399f5376d58..fddb6a6cb20 100644 --- a/lisp/progmodes/make-mode.el +++ b/lisp/progmodes/make-mode.el @@ -273,7 +273,7 @@ not be enclosed in { } or ( )." ;; that if you change this regexp you might have to fix the imenu index in ;; makefile-imenu-generic-expression. (defconst makefile-macroassign-regex - "^ *\\([^ \n\t][^:#= \t\n]*\\)[ \t]*\\(?:!=[ \t]*\\(\\(?:.+\\\\\n\\)*.+\\)\\|[*:+]?[:?]?=\\)" + "^ *\\([^ \n\t][^:#= \t\n]*\\)[ \t]*\\(?:!=[ \t]*\\(\\(?:.+\\\\\n\\)*.+\\)\\|[*:+]?[:?]?=[ \t]*\\(\\(?:.+\\\\\n\\)*.+\\)\\)" "Regex used to find macro assignment lines in a makefile.") (defconst makefile-var-use-regex @@ -331,7 +331,9 @@ not be enclosed in { } or ( )." (,makefile-macroassign-regex (1 font-lock-variable-name-face) ;; This is for after != - (2 'makefile-shell-face prepend t)) + (2 'makefile-shell-face prepend t) + ;; This is for after normal assignment + (3 'font-lock-string-face prepend t)) ;; Rule actions. (makefile-match-action @@ -787,7 +789,8 @@ Makefile mode can be configured by modifying the following variables: nil nil ((?$ . ".")) backward-paragraph - (font-lock-syntactic-keywords . makefile-font-lock-syntactic-keywords))) + (font-lock-syntactic-keywords . makefile-font-lock-syntactic-keywords) + (font-lock-support-mode))) ; JIT breaks on long series of continuation lines. ;; Add-log. (make-local-variable 'add-log-current-defun-function) |