Mercurial > emacs
changeset 62446:c03004f09a28
(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.
| author | Daniel Pfeiffer <occitan@esperanto.org> |
|---|---|
| date | Tue, 17 May 2005 21:36:49 +0000 |
| parents | 2dafef83855c |
| children | edcf33fbbd3b |
| files | lisp/progmodes/make-mode.el |
| diffstat | 1 files changed, 6 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/progmodes/make-mode.el Tue May 17 20:45:26 2005 +0000 +++ b/lisp/progmodes/make-mode.el Tue May 17 21:36:49 2005 +0000 @@ -273,7 +273,7 @@ ;; 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 @@ (,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 @@ 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)