# HG changeset patch
# User Oleksandr Gavenko <gavenkoa@gmail.com>
# Date 1229788165 -7200
# Node ID 817be82fdfc9e2fd49fc9b6b2f44fa30285ffd4e
# Parent  0591d06cf752a43f79cd79ca6f8852ff42ad2c62# Parent  52a334c6c9084a896ee519f37503bb610bb8805a
Automated merge with file:///home/sasha/site/hg/dot-emacs

diff -r 52a334c6c908 -r 817be82fdfc9 .emacs-my
--- a/.emacs-my	Sat Dec 20 17:49:22 2008 +0200
+++ b/.emacs-my	Sat Dec 20 17:49:25 2008 +0200
@@ -223,22 +223,28 @@
 (prefer-coding-system 'cp866-dos)
 
 (modify-coding-system-alist 'file "\\.el" 'iso-2022-7bit)
-(if (equal window-system 'w32)          ; also (string-equal system-type "windows-nt")
-    (progn
-      (set-selection-coding-system   'cp1251)
-      (prefer-coding-system 'utf-8-unix)
-      (prefer-coding-system 'cp1251-dos)
-      (modify-coding-system-alist 'file "\\.[ch]$" 'cp1251)
-      (modify-coding-system-alist 'file "[Mm]akefile.*$" 'cp1251)
-      )
+(cond 
+ ((equal window-system 'w32)          ; also (string-equal system-type "windows-nt")
   (progn
-    (set-selection-coding-system   'utf-8-unix)
+    (set-selection-coding-system   'cp1251)
+    (prefer-coding-system 'utf-8-unix)
+    (prefer-coding-system 'cp1251-dos)
+    ))
+ ((equal window-system 'x)
+  (progn
     (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)
+    (setq selection-coding-system 'ctext-with-extensions)
+    (setq x-select-request-type '(UTF8_STRING COMPOUND_TEXT TEXT STRING))
     (modify-coding-system-alist 'process ".*" 'utf-8-unix)
-    )
+    ))
+ (t
+  (progn
+    ;; (set-selection-coding-system   'utf-8-unix)
+    (prefer-coding-system 'cp1251-dos)
+    (prefer-coding-system 'utf-8-unix)
+    (modify-coding-system-alist 'process ".*" 'utf-8-unix)
+    ))
   )
 
 ;; XXXXXXXXXXXXXXXXXXXXXXXX