aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Pfeiffer2005-05-29 08:01:17 +0000
committerDaniel Pfeiffer2005-05-29 08:01:17 +0000
commitd85d15c8ee97f2159bcd0eb2cfa35bbe61a290ad (patch)
treeebd4ac8d6c72bd9e41359e3436509e0cf07041a3
parentadde76933c7fd17301782f3dbe8e74e473148ea8 (diff)
downloademacs-d85d15c8ee97f2159bcd0eb2cfa35bbe61a290ad.tar.gz
emacs-d85d15c8ee97f2159bcd0eb2cfa35bbe61a290ad.zip
(makefile-makepp-mode, makefile-bsdmake-mode): Continuation lines may be empty.
-rw-r--r--lisp/ChangeLog3
-rw-r--r--lisp/progmodes/make-mode.el4
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 @@
12005-05-29 Daniel Pfeiffer <occitan@esperanto.org> 12005-05-29 Daniel Pfeiffer <occitan@esperanto.org>
2 2
3 * progmodes/make-mode.el (makefile-rule-action-regex) 3 * progmodes/make-mode.el (makefile-rule-action-regex)
4 (makefile-macroassign-regex): Continuation lines may be empty. 4 (makefile-macroassign-regex, makefile-makepp-mode)
5 (makefile-bsdmake-mode): Continuation lines may be empty.
5 Reported by Joshua Varner. 6 Reported by Joshua Varner.
6 (makefile-makepp-font-lock-keywords): Add $(stem). 7 (makefile-makepp-font-lock-keywords): Add $(stem).
7 8
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:
851 "An adapted `makefile-mode' that knows about makepp." 851 "An adapted `makefile-mode' that knows about makepp."
852 (set (make-local-variable 'makefile-rule-action-regex) 852 (set (make-local-variable 'makefile-rule-action-regex)
853 ;; Don't care about initial tab, but I don't know how to font-lock correctly without. 853 ;; Don't care about initial tab, but I don't know how to font-lock correctly without.
854 "^\t[ \t]*\\(\\(?:\\(?:noecho\\|ignore[-_]error\\|[-@]+\\)[ \t]*\\)*\\)\\(\\(&\\S +\\)?\\(?:.+\\\\\n\\)*.+\\)") 854 "^\t[ \t]*\\(\\(?:\\(?:noecho\\|ignore[-_]error\\|[-@]+\\)[ \t]*\\)*\\)\\(\\(&\\S +\\)?\\(?:.*\\\\\n\\)*.*\\)")
855 855
856 (setq font-lock-defaults 856 (setq font-lock-defaults
857 `(makefile-makepp-font-lock-keywords ,@(cdr font-lock-defaults)) 857 `(makefile-makepp-font-lock-keywords ,@(cdr font-lock-defaults))
@@ -867,7 +867,7 @@ Makefile mode can be configured by modifying the following variables:
867 "^ *\\(\\(?: *\\$\\(?:[({]\\(?:\\$\\(?:[({]\\(?:\\$\\(?:[^({]\\|.[^\n$#})]+?[})]\\)\\|[^\n$#)}]\\)+?[})]\\|[^({]\\)\\|[^\n$#)}]\\)+?[})]\\|[^({]\\)\\| *[^ \n$#:=]+\\)+?\\)[ \t]*\\([:!]\\)\\(?:[ \t]*$\\|[^=\n]\\(?:[^#\n]*?;[ \t]*\\(.+\\)\\)?\\)") 867 "^ *\\(\\(?: *\\$\\(?:[({]\\(?:\\$\\(?:[({]\\(?:\\$\\(?:[^({]\\|.[^\n$#})]+?[})]\\)\\|[^\n$#)}]\\)+?[})]\\|[^({]\\)\\|[^\n$#)}]\\)+?[})]\\|[^({]\\)\\| *[^ \n$#:=]+\\)+?\\)[ \t]*\\([:!]\\)\\(?:[ \t]*$\\|[^=\n]\\(?:[^#\n]*?;[ \t]*\\(.+\\)\\)?\\)")
868 (set (make-local-variable 'makefile-dependency-skip) "^:!") 868 (set (make-local-variable 'makefile-dependency-skip) "^:!")
869 (set (make-local-variable 'makefile-rule-action-regex) 869 (set (make-local-variable 'makefile-rule-action-regex)
870 "^\t[ \t]*\\([-+@]*\\)[ \t]*\\(\\(?:.+\\\\\n\\)*.+\\)") 870 "^\t[ \t]*\\([-+@]*\\)[ \t]*\\(\\(?:.*\\\\\n\\)*.*\\)")
871 (setq font-lock-defaults 871 (setq font-lock-defaults
872 `(makefile-bsdmake-font-lock-keywords ,@(cdr font-lock-defaults)))) 872 `(makefile-bsdmake-font-lock-keywords ,@(cdr font-lock-defaults))))
873 873