diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2010-03-24 11:57:16 -0400 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2010-03-24 11:57:16 -0400 |
| commit | efee6a6d9cec2af824b8355c93d8f47b72a685a8 (patch) | |
| tree | 889b0993666766b1ade051b3ca06269ace082d6e /lisp/progmodes/make-mode.el | |
| parent | 6d98672d243832fcfb090f54c86eaccb924a86d2 (diff) | |
| download | emacs-efee6a6d9cec2af824b8355c93d8f47b72a685a8.tar.gz | |
(makefile-rule-action-regex): Backtrack less.
(makefile-make-font-lock-keywords): Adjust rule since submatch 1 may
not be present any more.
Diffstat (limited to 'lisp/progmodes/make-mode.el')
| -rw-r--r-- | lisp/progmodes/make-mode.el | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lisp/progmodes/make-mode.el b/lisp/progmodes/make-mode.el index c94d750823d..594462d5125 100644 --- a/lisp/progmodes/make-mode.el +++ b/lisp/progmodes/make-mode.el @@ -272,7 +272,7 @@ not be enclosed in { } or ( )." "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.") (defconst makefile-makepp-rule-action-regex @@ -355,8 +355,9 @@ not be enclosed in { } or ( )." (3 'font-lock-string-face prepend t)) ;; Rule actions. + ;; FIXME: When this spans multiple lines we need font-lock-multiline. (makefile-match-action - (1 font-lock-type-face) + (1 font-lock-type-face nil t) (2 'makefile-shell prepend) ;; Only makepp has builtin commands. (3 font-lock-builtin-face prepend t)) |