diff options
| author | John F. Trudeau <JFTrudeau@aetna.com> | 2016-02-24 12:21:06 +1100 |
|---|---|---|
| committer | Lars Ingebrigtsen <larsi@gnus.org> | 2016-02-24 12:22:15 +1100 |
| commit | ce4bdd77b028bf95dae0730d7a9369d676e5efa0 (patch) | |
| tree | dacaeba2d836a3e0349d0acc30d23fe9952d0cef /lisp/progmodes/make-mode.el | |
| parent | bd58c136d6ef33a24423720b5cf3c4e8c03fd4a9 (diff) | |
| download | emacs-ce4bdd77b028bf95dae0730d7a9369d676e5efa0.tar.gz | |
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)
Diffstat (limited to 'lisp/progmodes/make-mode.el')
| -rw-r--r-- | lisp/progmodes/make-mode.el | 2 |
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 |