[Emacs-diffs] /srv/bzr/emacs/emacs-23 r99670: (makefile-rule-action-regex): Backtrack less.

[Stefan Monnier]

------------------------------------------------------------
revno: 99670
committer: Stefan Monnier <address@hidden>
branch nick: emacs-23
timestamp: Wed 2010-03-24 11:57:16 -0400
message:
  (makefile-rule-action-regex): Backtrack less.
  (makefile-make-font-lock-keywords): Adjust rule since submatch 1 may
  not be present any more.
modified:
  lisp/ChangeLog
  lisp/progmodes/make-mode.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-03-24 00:17:31 +0000
+++ b/lisp/ChangeLog    2010-03-24 15:57:16 +0000
@@ -1,3 +1,9 @@
+2010-03-24  Stefan Monnier  <address@hidden>
+
+       * 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  <address@hidden>
 
        * faces.el (set-face-attribute): Fix typo in docstring.
@@ -7,7 +13,7 @@
 
 2010-03-23  Glenn Morris  <address@hidden>
 
-       * 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  <address@hidden>
 
@@ -15,16 +21,16 @@
 
 2010-03-22  Alan Mackenzie  <address@hidden>
 
-       * 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  <address@hidden>
 
        * 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  <address@hidden>
 
-       * 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

=== modified file 'lisp/progmodes/make-mode.el'
--- a/lisp/progmodes/make-mode.el       2010-01-13 08:35:10 +0000
+++ b/lisp/progmodes/make-mode.el       2010-03-24 15:57:16 +0000
@@ -272,7 +272,7 @@
   "Characters to skip to find a line that might be a dependency.")
 
 (defvar makefile-rule-action-regex
-  "^\t[ \t]*\\(address@hidden)[ \t]*\\(\\(?:.*\\\\\n\\)*.*\\)"
+  "^\t[ \t]*\\(?:\\(address@hidden)[ \t]*\\)\\(.*\\(?:\\\\\n.*\\)*\\)"
   "Regex used to highlight rule action lines in font lock mode.")
 
 (defconst makefile-makepp-rule-action-regex
@@ -355,8 +355,9 @@
      (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))