andros/emacs-gpu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

(makefile-rule-action-regex): Backtrack less.

Browse source 
(makefile-make-font-lock-keywords): Adjust rule since submatch 1 may
not be present any more.
This commit is contained in:
Stefan Monnier 2010-03-24 11:57:16 -04:00
parent 6d98672d24
commit efee6a6d9c
2 changed files with 16 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
lisp/ChangeLog
View file

@ -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

5
lisp/progmodes/make-mode.el
View file

@ -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))