Mercurial Mercurial > dot-emacs / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Automated merge with file:///d:\srv\hg-home\dot-emacs
authorOleksandr Gavenko <gavenkoa@gmail.com>
Tue, 08 Dec 2009 15:03:25 +0200
changeset 213 97807e9a6224
parent 211 a07b53a7b415 (current diff)
parent 212 4618907607b5 (diff)
child 214 f4234e15d891
child 216 ccc50f3ab69a
Automated merge with file:///d:\srv\hg-home\dot-emacs
--- a/template-pre/iar-linker-config-mode.el	Sat Dec 05 22:31:26 2009 +0200
+++ b/template-pre/iar-linker-config-mode.el	Tue Dec 08 15:03:25 2009 +0200
@@ -12,15 +12,15 @@
      (2 font-lock-variable-name-face)
      (3 font-lock-keyword-face)
      (4 font-lock-constant-face) )
-    ("\\(from\\) +\\([_a-zA-Z0-9]+\\) +\\(to\\|size\\) +\\([_a-zA-Z0-9]+\\)"
+    ("\\([_a-zA-Z]+\\):\\[\\(from\\) +\\([_a-zA-Z0-9]+\\) +\\(to\\|size\\) +\\([_a-zA-Z0-9]+\\)\\]"
+     (1 font-lock-variable-name-face)
+     (2 font-lock-keyword-face)
+     (3 font-lock-variable-name-face)
+     (4 font-lock-keyword-face)
+     (5 font-lock-variable-name-face) )
+    ("\\(define +region\\) +\\([_a-zA-Z]+\\) *="
      (1 font-lock-keyword-face)
-     (2 font-lock-variable-name-face)
-     (3 font-lock-keyword-face)
-     (4 font-lock-variable-name-face) )
-    ("\\(define +region\\) +\\([_a-zA-Z]+\\) *= *\\([_a-zA-Z]+\\):\\[.*\\];"
-     (1 font-lock-keyword-face)
-     (2 font-lock-variable-name-face)
-     (3 font-lock-variable-name-face) )
+     (2 font-lock-variable-name-face) )
     ("\\(define +block\\) +\\([_a-zA-Z]+\\) +\\(with +alignment\\) *= *[0-9]+, *\\(size\\) *= *\\([_a-zA-Z]+\\).*;"
      (1 font-lock-keyword-face)
      (2 font-lock-variable-name-face)
dot-emacs