[Emacs-diffs] /srv/bzr/emacs/trunk r102776: * w32-fns.el (w32-shell-name): Use `shell-file-name' instead of

[Sam Steingold]

------------------------------------------------------------
revno: 102776
committer: Sam Steingold <address@hidden>
branch nick: trunk
timestamp: Fri 2011-01-07 14:07:29 -0500
message:
  * w32-fns.el (w32-shell-name): Use `shell-file-name' instead of
  the `explicit-shell-file-name' because that is the non-interactive shell.
modified:
  lisp/ChangeLog
  lisp/w32-fns.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-01-07 17:34:02 +0000
+++ b/lisp/ChangeLog    2011-01-07 19:07:29 +0000
@@ -1,3 +1,9 @@
+2011-01-07  Sam Steingold  <address@hidden>
+
+       * 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  <address@hidden>
 
        * subr.el (y-or-n-p): Accept format string args.

=== modified file 'lisp/w32-fns.el'
--- a/lisp/w32-fns.el   2010-10-24 22:04:45 +0000
+++ b/lisp/w32-fns.el   2011-01-07 19:07:29 +0000
@@ -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")