From: Sam Steingold Date: Fri, 7 Jan 2011 19:07:29 +0000 (-0500) Subject: * w32-fns.el (w32-shell-name): Use `shell-file-name' instead of X-Git-Tag: emacs-pretest-24.0.90~104^2~618^2~1322^2~276 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=d43bb7d3128da73785cf9a887d0910520dfb7052;p=emacs.git * 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 22b0818b2bb..a40900bd5a4 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2011-01-07 Sam Steingold + + * 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 * subr.el (y-or-n-p): Accept format string args. diff --git a/lisp/w32-fns.el b/lisp/w32-fns.el index 0c6c56f84fb..e5be023ad44 100644 --- 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")