diff options
| author | Karoly Lorentey <lorentey@elte.hu> | 2006-12-03 12:15:03 +0000 |
|---|---|---|
| committer | Karoly Lorentey <lorentey@elte.hu> | 2006-12-03 12:15:03 +0000 |
| commit | 14bcc1e098410087a837313e2fc822319ff2e8ca (patch) | |
| tree | e468aebbb8d84438d81eb08bf6b77bfeaf664ea7 /lisp/shell.el | |
| parent | 5665a02fd1d009506f246d5f77896e3995127954 (diff) | |
| parent | 704ec54b3f2a40026ea7835b76e040c7335a56c1 (diff) | |
| download | emacs-14bcc1e098410087a837313e2fc822319ff2e8ca.tar.gz | |
Merged from emacs@sv.gnu.org.
Patches applied:
* emacs@sv.gnu.org/emacs--devo--0--patch-474
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-475
Merge from gnus--rel--5.10
* emacs@sv.gnu.org/emacs--devo--0--patch-476
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-477
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-478
Update from CVS
* emacs@sv.gnu.org/gnus--rel--5.10--patch-150
Update from CVS
* emacs@sv.gnu.org/gnus--rel--5.10--patch-151
Update from CVS
* emacs@sv.gnu.org/gnus--rel--5.10--patch-152
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-584
Diffstat (limited to 'lisp/shell.el')
| -rw-r--r-- | lisp/shell.el | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lisp/shell.el b/lisp/shell.el index 2adfc79618a..d3e23251a1f 100644 --- a/lisp/shell.el +++ b/lisp/shell.el @@ -298,7 +298,9 @@ Value is a list of strings, which may be nil." (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. |