From: Daniel Pfeiffer <occitan@esperanto.org>
Date: Sun, 29 May 2005 08:01:17 +0000 (+0000)
Subject: (makefile-makepp-mode, makefile-bsdmake-mode): Continuation lines may be empty.
X-Git-Tag: emacs-pretest-22.0.90~9453
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=d85d15c8ee97f2159bcd0eb2cfa35bbe61a290ad;p=emacs.git

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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8d688e59af9..1fcdcde0a97 100644
--- 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 a8090657b2a..055cdf7fc7d 100644
--- 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))))