# HG changeset patch
# User Oleksandr Gavenko <gavenkoa@gmail.com>
# Date 1277061374 -10800
# Node ID 9bc8199793b119465d060de81e7a275955016b00
# Parent  d589dce9a738f5e83ccd2d08a160dbc2296e0a6a# Parent  b8fe73dd1ab5e35cac9af303be0387042184ba33
Automated merge with file:///cygdrive/e/srv/hg/dot-emacs

diff -r b8fe73dd1ab5 -r 9bc8199793b1 .emacs-my
--- a/.emacs-my	Sun Jun 20 22:15:45 2010 +0300
+++ b/.emacs-my	Sun Jun 20 22:16:14 2010 +0300
@@ -223,7 +223,6 @@
           "^\*Help\*"
           "^\*Quail Completions\*"
           "^\*Disabled Command\*"
-          "^\*vc\*"
           ))
 
 (require 'uniquify)
@@ -827,7 +826,8 @@
 (if (equal window-system 'w32)
     (progn
       (modify-coding-system-alist 'process "cvs" '(cp1251-dos . cp1251-dos))
-      (modify-coding-system-alist 'process "svn" '(cp866-dos . cp1251-dos))
+      (modify-coding-system-alist 'process "svn" '(cp1251 . cp1251))
+      (setq vc-svn-checkin-switches '("--encoding" "utf-8"))
       ))
 
 ;; (setq-default vc-svn-register-switches "--encoding cp1251")