procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

(makefile-makepp-mode, makefile-bsdmake-mode): Continuation lines may be empty.

Browse source
This commit is contained in:
Daniel Pfeiffer 2005-05-29 08:01:17 +00:00
parent adde76933c
commit d85d15c8ee
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lisp/ChangeLog
View file

@ -1,7 +1,8 @@
2005-05-29 Daniel Pfeiffer <occitan@esperanto.org>
* progmodes/make-mode.el (makefile-rule-action-regex)
(makefile-macroassign-regex): Continuation lines may be empty.
(makefile-macroassign-regex, makefile-makepp-mode)
(makefile-bsdmake-mode): Continuation lines may be empty.
Reported by Joshua Varner.
(makefile-makepp-font-lock-keywords): Add $(stem).

4
lisp/progmodes/make-mode.el
View file

@ -851,7 +851,7 @@ Makefile mode can be configured by modifying the following variables:
"An adapted `makefile-mode' that knows about makepp."
(set (make-local-variable 'makefile-rule-action-regex)
;; Don't care about initial tab, but I don't know how to font-lock correctly without.
"^\t[ \t]*\\(\\(?:\\(?:noecho\\|ignore[-_]error\\|[-@]+\\)[ \t]*\\)*\\)\\(\\(&\\S +\\)?\\(?:.+\\\\\n\\)*.+\\)")
"^\t[ \t]*\\(\\(?:\\(?:noecho\\|ignore[-_]error\\|[-@]+\\)[ \t]*\\)*\\)\\(\\(&\\S +\\)?\\(?:.*\\\\\n\\)*.*\\)")
(setq font-lock-defaults
`(makefile-makepp-font-lock-keywords ,@(cdr font-lock-defaults))
@ -867,7 +867,7 @@ Makefile mode can be configured by modifying the following variables:
"^ *\\(\\(?: *\\$\\(?:[({]\\(?:\\$\\(?:[({]\\(?:\\$\\(?:[^({]\\|.[^\n$#})]+?[})]\\)\\|[^\n$#)}]\\)+?[})]\\|[^({]\\)\\|[^\n$#)}]\\)+?[})]\\|[^({]\\)\\| *[^ \n$#:=]+\\)+?\\)[ \t]*\\([:!]\\)\\(?:[ \t]*$\\|[^=\n]\\(?:[^#\n]*?;[ \t]*\\(.+\\)\\)?\\)")
(set (make-local-variable 'makefile-dependency-skip) "^:!")
(set (make-local-variable 'makefile-rule-action-regex)
"^\t[ \t]*\\([-+@]*\\)[ \t]*\\(\\(?:.+\\\\\n\\)*.+\\)")
"^\t[ \t]*\\([-+@]*\\)[ \t]*\\(\\(?:.*\\\\\n\\)*.*\\)")
(setq font-lock-defaults
`(makefile-bsdmake-font-lock-keywords ,@(cdr font-lock-defaults))))