--- a/.emacs-my	Thu Jan 28 20:24:42 2010 +0200
+++ b/.emacs-my	Thu Jan 28 21:26:06 2010 +0200
@@ -855,6 +855,16 @@
 ;; (add-hook 'asm-mode-hook '(lambda () (local-set-key ":" ":")))
 
 ;; ----------------------------------------------------------------------
+;; linker
+
+(when (fboundp 'iar-linker-config-mode)
+  (add-to-list 'auto-mode-alist '("\\.icf\\'" . iar-linker-config-mode))
+  )
+(when (fboundp 'iar4-linker-config-mode)
+  (add-to-list 'auto-mode-alist '("\\.xcl\\'" . iar4-linker-config-mode))
+  )
+
+;; ----------------------------------------------------------------------
 ;; lisp
 (setq list-command-history-max 256)
 
@@ -919,11 +929,17 @@
 ;; ----------------------------------------------------------------------
 ;; bat file, batch
 
-(when (featurep 'bat-mode)
-  (progn
-    (add-to-list 'auto-mode-alist '("\\.[bB][aA][tT]\\'" . bat-mode))
-    (add-to-list 'auto-mode-alist '("\\.[cC][mM][dD]\\'" . bat-mode))
-    ))
+(when (fboundp 'bat-file-mode)
+  (add-to-list 'auto-mode-alist '("\\.[bB][aA][tT]\\'" . bat-file-mode))
+  (add-to-list 'auto-mode-alist '("\\.[cC][mM][dD]\\'" . bat-file-mode))
+  )
+
+;; ----------------------------------------------------------------------
+;; nsis-mode
+
+(when (fboundp 'nsis-mode)
+  (add-to-list 'auto-mode-alist '("\\.\\(nsi\\|nsh\\)\\'" . nsis-mode))
+  )
 
 ;; ----------------------------------------------------------------------
 ;; *csharp*, c-sharp