--- a/.emacs	Thu Apr 17 23:58:09 2008 +0300
+++ b/.emacs	Thu Apr 17 23:58:10 2008 +0300
@@ -204,18 +204,29 @@
 ;; (setq locale-coding-system  'cp1251-dos)
 ;; (set-terminal-coding-system 'cp1251)
 ;; (set-keyboard-coding-system 'cp1251)
-(set-selection-coding-system   'cp1251) ; utf-8-unix
-
-;; (modify-coding-system-alist 'file "\.*" 'cp1251-dos)
-;; (modify-coding-system-alist 'file "\.utf8?$" 'utf-8)
-(modify-coding-system-alist 'file "\\.el\\'" 'iso-2022-7bit)
-(modify-coding-system-alist 'file ".*\\.[ch]" 'cp1251-dos)
-(modify-coding-system-alist 'file "[Mm]akefile.*" 'cp1251-dos)
 
 (prefer-coding-system 'koi8-r-dos)
 (prefer-coding-system 'utf-16-le)
 (prefer-coding-system 'cp866-dos)
-(prefer-coding-system 'cp1251-dos)
+
+(modify-coding-system-alist 'file "\\.el" 'iso-2022-7bit)
+(if (equal window-system 'w32)
+    (progn
+      (set-selection-coding-system   'cp1251)
+      (prefer-coding-system 'utf-8-unix)
+      (prefer-coding-system 'cp1251-dos)
+      (modify-coding-system-alist 'file "\\.[ch]" 'cp1251-dos)
+      (modify-coding-system-alist 'file "[Mm]akefile.*" 'cp1251-dos)
+      )
+  (progn
+    (set-selection-coding-system   'utf-8-unix)
+    (prefer-coding-system 'cp1251-dos)
+    (prefer-coding-system 'utf-8-unix)
+    (modify-coding-system-alist 'file "\\.[ch]" 'cp1251-unix)
+    (modify-coding-system-alist 'file "[Mm]akefile.*" 'cp1251-unix)
+    (modify-coding-system-alist 'process ".*" 'utf-8-unix)
+    )
+  )
 
 ;; XXXXXXXXXXXXXXXXXXXXXXXX
 
@@ -550,16 +561,19 @@
 ;; (setq sh-shell-arg (quote ((bash) (csh . "-f") (pdksh) (ksh88) (rc . "-p") (wksh) (zsh . "-f") (sh . "-i"))))
 (setq explicit-bash-args (quote ("-login" "-i")))
 
-(setq auto-mode-alist
-      (append
-       (list (cons "\\.[bB][aA][tT]$" 'bat-mode))
-       ;; For DOS init files
-       (list (cons "CONFIG\\."   'bat-mode))
-       (list (cons "AUTOEXEC\\." 'bat-mode))
-       auto-mode-alist))
 
 (if (equal window-system 'w32)
-    (require 'bat-mode))
+    (progn
+      (setq auto-mode-alist
+            (append
+             (list (cons "\\.[bB][aA][tT]$" 'bat-mode))
+             ;; For DOS init files
+             (list (cons "CONFIG\\."   'bat-mode))
+             (list (cons "AUTOEXEC\\." 'bat-mode))
+             auto-mode-alist))
+      (require 'bat-mode)
+      )
+  )
 
 ;; ======================================================================
 ;;