--- a/.emacs-my	Mon Nov 23 15:24:04 2009 +0200
+++ b/.emacs-my	Wed Dec 02 23:27:00 2009 +0200
@@ -579,28 +579,16 @@
 ;;
 ;; SHELL
 
-;; If you plan to use the bash shell, add the following lines to your .emacs file:
+;; Setup Emacs to run bash as its primary shell.
 ;; (setq binary-process-input t)
-;; (setq w32-quote-process-args ?\")
-;; (setq shell-file-name "bash") ;; or sh if you rename your bash executable to sh.
-;; (setenv "SHELL" shell-file-name)
-;; (setq explicit-shell-file-name shell-file-name)
-;; (setq explicit-sh-args '("-login" "-i"))
-
-;; Include the following only if you want to run
-;; bash as your shell.
-
-;; Setup Emacs to run bash as its primary shell.
 ;; (setq shell-file-name "bash")
 ;; (setq shell-command-switch "-c")
 ;; (setq explicit-shell-file-name shell-file-name)
 ;; (setenv "SHELL" shell-file-name)
-;; (setq explicit-sh-args '("-login" "-i"))
 ;; (if (boundp 'w32-quote-process-args)
 ;;     (setq w32-quote-process-args ?\")) ;; Include only for MS Windows.
 
-;; (setq sh-shell-file "D:\\home\\cygwin\\bin\\sh.exe")
-;; (setq sh-shell-arg (quote ((bash) (csh . "-f") (pdksh) (ksh88) (rc . "-p") (wksh) (zsh . "-f") (sh . "-i"))))
+(setq explicit-sh-args '("-login" "-i"))
 (setq explicit-bash-args (quote ("-login" "-i")))
 
 (when (provide 'bat-mode)