From: John F. Trudeau <JFTrudeau@aetna.com>
Date: Wed, 24 Feb 2016 01:21:06 +0000 (+1100)
Subject: Highlight assignments in Makefiles more correctly
X-Git-Tag: emacs-25.0.92~50
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=ce4bdd77b028bf95dae0730d7a9369d676e5efa0;p=emacs.git

Highlight assignments in Makefiles more correctly

* lisp/progmodes/make-mode.el (makefile-macroassign-regex):
Highlight assignments preceded by a TAB character correctly
(bug#20787).

Copyright-paperwork-exempt: yes

Backport:

(cherry picked from commit bbd86c5642bd62c43d72391669f28eaa14459fd5)
---

diff --git a/lisp/progmodes/make-mode.el b/lisp/progmodes/make-mode.el
index 5cc6321e1ba..ee4b1040566 100644
--- a/lisp/progmodes/make-mode.el
+++ b/lisp/progmodes/make-mode.el
@@ -291,7 +291,7 @@ not be enclosed in { } or ( )."
   ;; (spanning potentially several lines).
   ;; "^ *\\([^ \n\t][^:#= \t\n]*\\)[ \t]*\\(?:!=[ \t]*\\(\\(?:.+\\\\\n\\)*.+\\)\\|[*:+]?[:?]?=[ \t]*\\(\\(?:.*\\\\\n\\)*.*\\)\\)"
   ;; What about the define statement?  What about differentiating this for makepp?
-  "\\(?:^\\|^export\\|^override\\|:\\|: *override\\) *\\([^ \n\t][^:#= \t\n]*\\)[ \t]*\\(?:!=\\|[*:+]?[:?]?=\\)"
+  "\\(?:^\\|^export\\|^override\\|:\\|:[ \t]*override\\)[ \t]*\\([^ \n\t][^:#= \t\n]*\\)[ \t]*\\(?:!=\\|[*:+]?[:?]?=\\)"
   "Regex used to find macro assignment lines in a makefile.")
 
 (defconst makefile-var-use-regex