diff options
| author | Richard M. Stallman | 2006-10-09 15:08:50 +0000 |
|---|---|---|
| committer | Richard M. Stallman | 2006-10-09 15:08:50 +0000 |
| commit | 491bf4bcf4eb49af35d1d7c91296f4584c854094 (patch) | |
| tree | 08fde68ac5e96f581d55c1f5357b48cd635ec9e5 /lisp/shell.el | |
| parent | 02de2661d88dd99c71d97978f00690112c0e402d (diff) | |
| download | emacs-491bf4bcf4eb49af35d1d7c91296f4584c854094.tar.gz emacs-491bf4bcf4eb49af35d1d7c91296f4584c854094.zip | |
Comment change.
Diffstat (limited to 'lisp/shell.el')
| -rw-r--r-- | lisp/shell.el | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lisp/shell.el b/lisp/shell.el index 316ba0ab244..2adfc79618a 100644 --- a/lisp/shell.el +++ b/lisp/shell.el | |||
| @@ -288,11 +288,12 @@ Value is a list of strings, which may be nil." | |||
| 288 | ;; Note: There are no explicit references to the variable `explicit-bash-args'. | 288 | ;; Note: There are no explicit references to the variable `explicit-bash-args'. |
| 289 | ;; It is used implicitly by M-x shell when the interactive shell is `bash'. | 289 | ;; It is used implicitly by M-x shell when the interactive shell is `bash'. |
| 290 | (defcustom explicit-bash-args | 290 | (defcustom explicit-bash-args |
| 291 | ;; Tell bash not to use readline, except for bash 1.x which doesn't grook --noediting. | ||
| 292 | ;; Bash 1.x has -nolineediting, but process-send-eof cannot terminate bash if we use it. | ||
| 293 | (let* ((prog (or (and (boundp 'explicit-shell-file-name) explicit-shell-file-name) | 291 | (let* ((prog (or (and (boundp 'explicit-shell-file-name) explicit-shell-file-name) |
| 294 | (getenv "ESHELL") shell-file-name)) | 292 | (getenv "ESHELL") shell-file-name)) |
| 295 | (name (file-name-nondirectory prog))) | 293 | (name (file-name-nondirectory prog))) |
| 294 | ;; Tell bash not to use readline, except for bash 1.x which | ||
| 295 | ;; doesn't grook --noediting. Bash 1.x has -nolineediting, but | ||
| 296 | ;; process-send-eof cannot terminate bash if we use it. | ||
| 296 | (if (and (not purify-flag) | 297 | (if (and (not purify-flag) |
| 297 | (equal name "bash") | 298 | (equal name "bash") |
| 298 | (file-executable-p prog) | 299 | (file-executable-p prog) |