From 8ade3c25b7e1e6b742393a89c6d718d0790e2e1a Mon Sep 17 00:00:00 2001 From: Daniel Pfeiffer Date: Tue, 17 May 2005 21:37:59 +0000 Subject: [PATCH] (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. --- lisp/ChangeLog | 6 ++++++ lisp/progmodes/make-mode.el | 9 ++++++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index e9b5ddc832d..1ec0bb0a459 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,12 +1,18 @@ 2005-05-17 Daniel Pfeiffer * progmodes/make-mode.el (makefile-dependency-skip): New variable. + (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-previous-dependency): Inline the new matcher, because it is too complex to work in both directions. (makefile-match-dependency): Eliminate `backward' arg (see above). Completely reimplemented so as to not sometimes go into an endless loop. It should also be more efficient, because first it only searches for `:', instead of applying the very complex regexp. + (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. 2005-05-17 Reiner Steib 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) -- 2.39.5