Mercurial > emacs
comparison 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 |
comparison
equal
deleted
inserted
replaced
| 90644:9b62e05dedf6 | 90645:7eeafaaa9eab |
|---|---|
| 296 ;; process-send-eof cannot terminate bash if we use it. | 296 ;; process-send-eof cannot terminate bash if we use it. |
| 297 (if (and (not purify-flag) | 297 (if (and (not purify-flag) |
| 298 (equal name "bash") | 298 (equal name "bash") |
| 299 (file-executable-p prog) | 299 (file-executable-p prog) |
| 300 (string-match "bad option" | 300 (string-match "bad option" |
| 301 (shell-command-to-string (concat prog " --noediting")))) | 301 (shell-command-to-string |
| 302 (concat (shell-quote-argument prog) | |
| 303 " --noediting")))) | |
| 302 '("-i") | 304 '("-i") |
| 303 '("--noediting" "-i"))) | 305 '("--noediting" "-i"))) |
| 304 "Args passed to inferior shell by \\[shell], if the shell is bash. | 306 "Args passed to inferior shell by \\[shell], if the shell is bash. |
| 305 Value is a list of strings, which may be nil." | 307 Value is a list of strings, which may be nil." |
| 306 :type '(repeat (string :tag "Argument")) | 308 :type '(repeat (string :tag "Argument")) |