Mercurial > emacs
changeset 112144:125330ad5eb6
Merge from mainline.
| author | Paul Eggert <eggert@cs.ucla.edu> |
|---|---|
| date | Fri, 07 Jan 2011 11:29:06 -0800 |
| parents | b82158d91482 (current diff) 07c4df54f7b7 (diff) |
| children | 663605a4c7f4 |
| files | |
| diffstat | 2 files changed, 7 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Fri Jan 07 11:23:35 2011 -0800 +++ b/lisp/ChangeLog Fri Jan 07 11:29:06 2011 -0800 @@ -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 11:23:35 2011 -0800 +++ b/lisp/w32-fns.el Fri Jan 07 11:29:06 2011 -0800 @@ -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")