# HG changeset patch
# User Oleksandr Gavenko <gavenkoa@gmail.com>
# Date 1262077038 -7200
# Node ID 9bbf7d3d45b312ae6fdefa0b46fc94c738c3afae
# Parent  e8dde6202139b3a22acb82b55382251bd1252398# Parent  39054eb39d27d05bb0b73873ce24ef3508fa39c1
merged

diff -r e8dde6202139 -r 9bbf7d3d45b3 .emacs-my
--- a/.emacs-my	Mon Dec 28 20:01:27 2009 +0200
+++ b/.emacs-my	Tue Dec 29 10:57:18 2009 +0200
@@ -545,6 +545,11 @@
   ;; (setq shell-file-name "bash")
   (setq explicit-bash-args '("-i"))
   (setq explicit-sh-args '("-i"))
+  ;; Here is workaround: when explicit-shell-file-name is "bash" and shell-file-name is "cmdproxy.exe"
+  ;; find-dired incorrect quote args (in shell-quote-argument (w32-shell-name) return "bash", but
+  ;; shell-command used shell-file-name which value "cmdproxy.exe"). So I put additional space in pattern to
+  ;; prevent quoting.
+  (setq find-ls-option '("-exec ls -ld {}  ;" . "-ld"))
   )
 
 ;; ======================================================================
diff -r e8dde6202139 -r 9bbf7d3d45b3 template-pre/iar4-linker-config-mode.el
--- a/template-pre/iar4-linker-config-mode.el	Mon Dec 28 20:01:27 2009 +0200
+++ b/template-pre/iar4-linker-config-mode.el	Tue Dec 29 10:57:18 2009 +0200
@@ -14,11 +14,11 @@
      (1 font-lock-keyword-face)
      (2 font-lock-variable-name-face)
      (3 font-lock-variable-name-face) )
-    ("^\\(-Z\\)(\\([_a-zA-Z]+\\))\\([_a-zA-Z]+\\)="
+    ("^\\(-Z\\|-P\\|-b\\)(\\([_a-zA-Z]+\\))\\([_a-zA-Z]+\\)="
      (1 font-lock-keyword-face)
      (2 font-lock-variable-name-face)
      (3 font-lock-variable-name-face) )
-    ("^\\(-Z\\)(\\([_a-zA-Z]+\\))\\([_a-zA-Z]+\\)\\+\\([_a-zA-Z]+\\)="
+    ("^\\(-Z\\|-P\\|-b\\)(\\([_a-zA-Z]+\\))\\([_a-zA-Z]+\\)\\+\\([_a-zA-Z]+\\)="
      (1 font-lock-keyword-face)
      (2 font-lock-variable-name-face)
      (3 font-lock-variable-name-face)