From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Wed, 24 Mar 2010 15:57:16 +0000 (-0400)
Subject: (makefile-rule-action-regex): Backtrack less.
X-Git-Tag: emacs-pretest-23.1.95~44
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=efee6a6d9cec2af824b8355c93d8f47b72a685a8;p=emacs.git

(makefile-rule-action-regex): Backtrack less.
(makefile-make-font-lock-keywords): Adjust rule since submatch 1 may
not be present any more.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8ec78196095..a83786a5927 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2010-03-24  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* progmodes/make-mode.el (makefile-rule-action-regex): Backtrack less.
+	(makefile-make-font-lock-keywords): Adjust rule since submatch 1 may
+	not be present any more.
+
 2010-03-24  Juanma Barranquero  <lekktu@gmail.com>
 
 	* faces.el (set-face-attribute): Fix typo in docstring.
@@ -7,7 +13,7 @@
 
 2010-03-23  Glenn Morris  <rgm@gnu.org>
 
-	* textmodes/flyspell.el (sgml-lexical-context): Autoload it.  (Bug#5752)
+	* textmodes/flyspell.el (sgml-lexical-context): Autoload it (Bug#5752).
 
 2010-03-21  Chong Yidong  <cyd@stupidchicken.com>
 
@@ -15,16 +21,16 @@
 
 2010-03-22  Alan Mackenzie  <acm@muc.de>
 
-	* progmodes/cc-engine.el (c-remove-stale-state-cache): Fix
-	off-by-one error.  Fixes bug #5747.
+	* progmodes/cc-engine.el (c-remove-stale-state-cache):
+	Fix off-by-one error.  Fixes bug #5747.
 
 2010-03-22  Juanma Barranquero  <lekktu@gmail.com>
 
 	* image-dired.el (image-dired-display-thumbs): Fix typo in docstring.
 	(image-dired-read-comment): Doc fix.
 
-	* json.el (json-object-type, json-array-type, json-key-type, json-false)
-	(json-null, json-read-number):
+	* json.el (json-object-type, json-array-type, json-key-type)
+	(json-false, json-null, json-read-number):
 	* minibuffer.el (completion-in-region-functions):
 	* calendar/cal-tex.el (cal-tex-daily-end, cal-tex-number-weeks)
 	(cal-tex-cursor-week):
@@ -70,8 +76,8 @@
 
 2010-03-13  Michael Albinus  <michael.albinus@gmx.de>
 
-	* net/tramp.el (tramp-find-executable): Use
-	`tramp-get-connection-buffer'.  Make the regexp for checking
+	* net/tramp.el (tramp-find-executable):
+	Use `tramp-get-connection-buffer'.  Make the regexp for checking
 	output of "wc -l" more robust.
 	(tramp-find-shell): Use another shell but /bin/sh on OpenSolaris.
 	(tramp-open-connection-setup-interactive-shell): Remove workaround
diff --git a/lisp/progmodes/make-mode.el b/lisp/progmodes/make-mode.el
index c94d750823d..594462d5125 100644
--- a/lisp/progmodes/make-mode.el
+++ b/lisp/progmodes/make-mode.el
@@ -272,7 +272,7 @@ not be enclosed in { } or ( )."
   "Characters to skip to find a line that might be a dependency.")
 
 (defvar makefile-rule-action-regex
-  "^\t[ \t]*\\([-@]*\\)[ \t]*\\(\\(?:.*\\\\\n\\)*.*\\)"
+  "^\t[ \t]*\\(?:\\([-@]+\\)[ \t]*\\)\\(.*\\(?:\\\\\n.*\\)*\\)"
   "Regex used to highlight rule action lines in font lock mode.")
 
 (defconst makefile-makepp-rule-action-regex
@@ -355,8 +355,9 @@ not be enclosed in { } or ( )."
      (3 'font-lock-string-face prepend t))
 
     ;; Rule actions.
+    ;; FIXME: When this spans multiple lines we need font-lock-multiline.
     (makefile-match-action
-     (1 font-lock-type-face)
+     (1 font-lock-type-face nil t)
      (2 'makefile-shell prepend)
      ;; Only makepp has builtin commands.
      (3 font-lock-builtin-face prepend t))