diff -r b7d0989d9472 -r 8b03fb0a188d .emacs-my
--- a/.emacs-my	Sun Mar 14 21:42:36 2010 +0200
+++ b/.emacs-my	Wed Mar 17 10:54:06 2010 +0200
@@ -563,6 +563,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"))