# HG changeset patch
# User Oleksandr Gavenko <gavenkoa@gmail.com>
# Date 1268898303 -7200
# Node ID 5d61f5f5c0e702b616a589bf8ae349de53405647
# Parent  b0997da7a8134e80c9f32258cdc1285f946dc53b# Parent  8b03fb0a188d1e530e042f324d3c2722f99d729e
merged

diff -r b0997da7a813 -r 5d61f5f5c0e7 .emacs-my
--- a/.emacs-my	Wed Mar 17 23:27:26 2010 +0200
+++ b/.emacs-my	Thu Mar 18 09:45:03 2010 +0200
@@ -561,6 +561,8 @@
 
 (when (eq window-system 'w32)           ; may require Cygwin or MSYS
   (setenv "ESHELL" "bash")
+  ;; Restore shell name if user set SHELL env var for Cygwin/MSYS.
+  (setq shell-file-name (concat exec-directory "cmdproxy.exe"))
   ;; (setq explicit-shell-file-name "bash")
   ;; (setq shell-file-name "bash")
   (setq explicit-bash-args '("-i"))