Mercurial > emacs
changeset 112142:ce394dc068a8
* w32-fns.el (w32-shell-name): Use `shell-file-name' instead of
the `explicit-shell-file-name' because that is the non-interactive shell.
| author | Sam Steingold <sds@gnu.org> |
|---|---|
| date | Fri, 07 Jan 2011 14:07:29 -0500 |
| parents | 8d03223bf479 |
| children | 07c4df54f7b7 |
| files | lisp/ChangeLog lisp/w32-fns.el |
| diffstat | 2 files changed, 7 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- 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.
--- 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")