# HG changeset patch
# User Sam Steingold <sds@gnu.org>
# Date 1294427249 18000
# Node ID ce394dc068a8657bf7c2e4bf0aa8ac840ed9173d
# Parent  8d03223bf479965a6282fbc7d5f05673192af3b3
* 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 -r 8d03223bf479 -r ce394dc068a8 lisp/ChangeLog
--- a/lisp/ChangeLog	Fri Jan 07 12:34:02 2011 -0500
+++ b/lisp/ChangeLog	Fri Jan 07 14:07:29 2011 -0500
@@ -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 -r 8d03223bf479 -r ce394dc068a8 lisp/w32-fns.el
--- a/lisp/w32-fns.el	Fri Jan 07 12:34:02 2011 -0500
+++ b/lisp/w32-fns.el	Fri Jan 07 14:07:29 2011 -0500
@@ -57,7 +57,7 @@
 
 (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")