Mercurial > emacs
diff lisp/shell.el @ 90645:7eeafaaa9eab
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 476-489)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 153-160)
- Merge from emacs--devo--0
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-127
author | Miles Bader <miles@gnu.org> |
---|---|
date | Mon, 30 Oct 2006 08:54:41 +0000 |
parents | 8dd8c8286063 b6d2149f9903 |
children | f1d13e615070 |
line wrap: on
line diff
--- a/lisp/shell.el Mon Oct 30 06:52:47 2006 +0000 +++ b/lisp/shell.el Mon Oct 30 08:54:41 2006 +0000 @@ -298,7 +298,9 @@ (equal name "bash") (file-executable-p prog) (string-match "bad option" - (shell-command-to-string (concat prog " --noediting")))) + (shell-command-to-string + (concat (shell-quote-argument prog) + " --noediting")))) '("-i") '("--noediting" "-i"))) "Args passed to inferior shell by \\[shell], if the shell is bash.