From adde76933c7fd17301782f3dbe8e74e473148ea8 Mon Sep 17 00:00:00 2001 From: Daniel Pfeiffer Date: Sun, 29 May 2005 07:54:07 +0000 Subject: [PATCH] (makefile-rule-action-regex, makefile-macroassign-regex): Continuation lines may be empty. Reported by Joshua Varner. (makefile-makepp-font-lock-keywords): Add $(stem). --- lisp/ChangeLog | 7 +++++++ lisp/progmodes/make-mode.el | 6 +++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 839f7783404..8d688e59af9 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,10 @@ +2005-05-29 Daniel Pfeiffer + + * progmodes/make-mode.el (makefile-rule-action-regex) + (makefile-macroassign-regex): Continuation lines may be empty. + Reported by Joshua Varner. + (makefile-makepp-font-lock-keywords): Add $(stem). + 2005-05-28 Karl Berry * textmodes/tex-mode.el: now that tex-send-command calls diff --git a/lisp/progmodes/make-mode.el b/lisp/progmodes/make-mode.el index 05c3ac50787..a8090657b2a 100644 --- a/lisp/progmodes/make-mode.el +++ b/lisp/progmodes/make-mode.el @@ -266,14 +266,14 @@ not be enclosed in { } or ( )." "Characters to skip to find a line that might be a dependency.") (defvar makefile-rule-action-regex - "^\t[ \t]*\\([-@]*\\)[ \t]*\\(\\(?:.+\\\\\n\\)*.+\\)" + "^\t[ \t]*\\([-@]*\\)[ \t]*\\(\\(?:.*\\\\\n\\)*.*\\)" "Regex used to highlight rule action lines in font lock mode.") ;; Note that the first and second subexpression is used by font lock. Note ;; 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\\)*.+\\)\\|[*:+]?[:?]?=[ \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 @@ -420,7 +420,7 @@ not be enclosed in { } or ( )." nil "^\\(?: [ \t]*\\)?\\(?:and[ \t]+\\|else[ \t]+\\|or[ \t]+\\)?if\\(n\\)\\(?:def\\|eq\\|sys\\)\\>" - '("[^$]\\(\\$[({]\\(?:target\\|output\\)s?\\_>.*?[})]\\)" + '("[^$]\\(\\$[({]\\(?:output\\|stem\\|target\\)s?\\_>.*?[})]\\)" 1 'makefile-targets-face prepend) ;; Colon modifier keywords. -- 2.39.2