diff options
| author | John F. Trudeau | 2016-02-24 12:21:06 +1100 |
|---|---|---|
| committer | Lars Ingebrigtsen | 2016-02-24 12:22:15 +1100 |
| commit | ce4bdd77b028bf95dae0730d7a9369d676e5efa0 (patch) | |
| tree | dacaeba2d836a3e0349d0acc30d23fe9952d0cef | |
| parent | bd58c136d6ef33a24423720b5cf3c4e8c03fd4a9 (diff) | |
| download | emacs-ce4bdd77b028bf95dae0730d7a9369d676e5efa0.tar.gz emacs-ce4bdd77b028bf95dae0730d7a9369d676e5efa0.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
Backport:
(cherry picked from commit bbd86c5642bd62c43d72391669f28eaa14459fd5)
| -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 ( )." | |||
| 291 | ;; (spanning potentially several lines). | 291 | ;; (spanning potentially several lines). |
| 292 | ;; "^ *\\([^ \n\t][^:#= \t\n]*\\)[ \t]*\\(?:!=[ \t]*\\(\\(?:.+\\\\\n\\)*.+\\)\\|[*:+]?[:?]?=[ \t]*\\(\\(?:.*\\\\\n\\)*.*\\)\\)" | 292 | ;; "^ *\\([^ \n\t][^:#= \t\n]*\\)[ \t]*\\(?:!=[ \t]*\\(\\(?:.+\\\\\n\\)*.+\\)\\|[*:+]?[:?]?=[ \t]*\\(\\(?:.*\\\\\n\\)*.*\\)\\)" |
| 293 | ;; What about the define statement? What about differentiating this for makepp? | 293 | ;; What about the define statement? What about differentiating this for makepp? |
| 294 | "\\(?:^\\|^export\\|^override\\|:\\|: *override\\) *\\([^ \n\t][^:#= \t\n]*\\)[ \t]*\\(?:!=\\|[*:+]?[:?]?=\\)" | 294 | "\\(?:^\\|^export\\|^override\\|:\\|:[ \t]*override\\)[ \t]*\\([^ \n\t][^:#= \t\n]*\\)[ \t]*\\(?:!=\\|[*:+]?[:?]?=\\)" |
| 295 | "Regex used to find macro assignment lines in a makefile.") | 295 | "Regex used to find macro assignment lines in a makefile.") |
| 296 | 296 | ||
| 297 | (defconst makefile-var-use-regex | 297 | (defconst makefile-var-use-regex |