summaryrefslogtreecommitdiff
path: root/lisp/progmodes/make-mode.el
diff options
context:
space:
mode:
authorJohn F. Trudeau <JFTrudeau@aetna.com>2016-02-24 12:21:06 +1100
committerLars Ingebrigtsen <larsi@gnus.org>2016-02-24 12:21:06 +1100
commitbbd86c5642bd62c43d72391669f28eaa14459fd5 (patch)
tree404806fd2d67f6ae432d69185d809b3ef1a3e4bf /lisp/progmodes/make-mode.el
parent354f9f0fc6cc05ed98883447f9b2f37943d79160 (diff)
downloademacs-bbd86c5642bd62c43d72391669f28eaa14459fd5.tar.gz
emacs-bbd86c5642bd62c43d72391669f28eaa14459fd5.tar.bz2
emacs-bbd86c5642bd62c43d72391669f28eaa14459fd5.zip
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
Diffstat (limited to 'lisp/progmodes/make-mode.el')
-rw-r--r--lisp/progmodes/make-mode.el2
1 files changed, 1 insertions, 1 deletions
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