# HG changeset patch # User Daniel Pfeiffer # Date 1117353175 0 # Node ID dbba3c92fc76c716204b7bbb2e69fcf162249e45 # Parent 75c92461a7451b251b181a0682c5f813a05751c8 (makefile-rule-action-regex, makefile-macroassign-regex): Continuation lines may be empty. Reported by Joshua Varner. (makefile-makepp-font-lock-keywords): Add $(stem). diff -r 75c92461a745 -r dbba3c92fc76 lisp/progmodes/make-mode.el --- a/lisp/progmodes/make-mode.el Sun May 29 02:58:17 2005 +0000 +++ b/lisp/progmodes/make-mode.el Sun May 29 07:52:55 2005 +0000 @@ -266,14 +266,14 @@ "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 @@ 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.