From d85d15c8ee97f2159bcd0eb2cfa35bbe61a290ad Mon Sep 17 00:00:00 2001 From: Daniel Pfeiffer Date: Sun, 29 May 2005 08:01:17 +0000 Subject: [PATCH] (makefile-makepp-mode, makefile-bsdmake-mode): Continuation lines may be empty. --- lisp/ChangeLog | 3 ++- lisp/progmodes/make-mode.el | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) 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 * 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)))) -- 2.39.2