# HG changeset patch
# User Oleksandr Gavenko <gavenkoa@gmail.com>
# Date 1260277405 -7200
# Node ID 97807e9a62248e74a870180f018b399095cc2d5d
# Parent  a07b53a7b4155547ca8863fd8a20599e74662078# Parent  4618907607b50300e11c64ed2c1a71bb2305fbc4
Automated merge with file:///d:\srv\hg-home\dot-emacs

diff -r a07b53a7b415 -r 97807e9a6224 template-pre/iar-linker-config-mode.el
--- 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)