* w32-fns.el (w32-shell-name): Use `shell-file-name' instead of

the `explicit-shell-file-name' because that is the non-interactive shell.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 22b0818b2bb9f8b9d6a99c938546647d17edb1b5..a40900bd5a4247aee99479bfa78decc7e2cac774 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2011-01-07  Sam Steingold  <sds@gnu.org>
+
+       * w32-fns.el (w32-shell-name): Use `shell-file-name' instead of
+       the `explicit-shell-file-name' because that is the
+       non-interactive shell.
+
 2011-01-07  Chong Yidong  <cyd@stupidchicken.com>
 
        * subr.el (y-or-n-p): Accept format string args.

diff --git a/lisp/w32-fns.el b/lisp/w32-fns.el
index 0c6c56f84fbe12a01811ba5a994e8d941eced7eb..e5be023ad44462e58e302fa40119017d2cb934f0 100644 (file)
--- a/lisp/w32-fns.el
+++ b/lisp/w32-fns.el
@@ -57,7 +57,7 @@ That includes all Windows systems except for 9X/Me."
 
 (defun w32-shell-name ()
   "Return the name of the shell being used."
-  (or (bound-and-true-p explicit-shell-file-name)
+  (or (bound-and-true-p shell-file-name)
       (getenv "ESHELL")
       (getenv "SHELL")
       (and (w32-using-nt) "cmd.exe")