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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8d688e59af9345cdbbddf25f15901c7c8c8c2ab5..1fcdcde0a971cccd445951fa410a75b08d1b7343 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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).
 

diff --git a/lisp/progmodes/make-mode.el b/lisp/progmodes/make-mode.el
index a8090657b2a84afc39343eb0ad34cae8d223ee4e..055cdf7fc7ddd7b39ff37ef0adc54106fba3cbc6 100644 (file)
--- a/lisp/progmodes/make-mode.el
+++ b/lisp/progmodes/make-mode.el
@@ -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))))