Mercurial > emacs
comparison lisp/w32-fns.el @ 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 | 6cf6c01cf9bf |
| children | 417b1e4d63cd |
comparison
equal
deleted
inserted
replaced
| 112139:8d03223bf479 | 112142:ce394dc068a8 |
|---|---|
| 55 That includes all Windows systems except for 9X/Me." | 55 That includes all Windows systems except for 9X/Me." |
| 56 (and (eq system-type 'windows-nt) (getenv "SystemRoot"))) | 56 (and (eq system-type 'windows-nt) (getenv "SystemRoot"))) |
| 57 | 57 |
| 58 (defun w32-shell-name () | 58 (defun w32-shell-name () |
| 59 "Return the name of the shell being used." | 59 "Return the name of the shell being used." |
| 60 (or (bound-and-true-p explicit-shell-file-name) | 60 (or (bound-and-true-p shell-file-name) |
| 61 (getenv "ESHELL") | 61 (getenv "ESHELL") |
| 62 (getenv "SHELL") | 62 (getenv "SHELL") |
| 63 (and (w32-using-nt) "cmd.exe") | 63 (and (w32-using-nt) "cmd.exe") |
| 64 "command.com")) | 64 "command.com")) |
| 65 | 65 |