# HG changeset patch # User Oleksandr Gavenko # Date 1260277405 -7200 # Node ID 97807e9a62248e74a870180f018b399095cc2d5d # Parent a07b53a7b4155547ca8863fd8a20599e74662078# Parent 4618907607b50300e11c64ed2c1a71bb2305fbc4 Automated merge with file:///d:\srv\hg-home\dot-emacs diff -r 4618907607b5 -r 97807e9a6224 .emacs-my --- a/.emacs-my Fri Dec 04 14:24:23 2009 +0200 +++ b/.emacs-my Tue Dec 08 15:03:25 2009 +0200 @@ -551,8 +551,9 @@ (when (eq window-system 'w32) ; may require Cygwin or MSYS (setq explicit-shell-file-name "bash") - (setq explicit-bash-args '("-login" "-i")) - (setq explicit-sh-args '("-login" "-i")) ) + (setq explicit-bash-args '("-i")) + (setq explicit-sh-args '("-i")) + ) ;; ====================================================================== ;; spell, ispall, aspell