diff options
| author | Francesco Potortì <pot@gnu.org> | 2002-05-14 08:42:48 +0000 |
|---|---|---|
| committer | Francesco Potortì <pot@gnu.org> | 2002-05-14 08:42:48 +0000 |
| commit | f19be1633866a52c0e139887b81d51056a8d5236 (patch) | |
| tree | bbce5166cd20e47f103d35c95907d34ef03707e9 /lisp/shell.el | |
| parent | 42fe2ab9fed5d5fcbcafe0466e7da017b01b34e6 (diff) | |
| download | emacs-f19be1633866a52c0e139887b81d51056a8d5236.tar.gz | |
(shell-mode): Make second part of initialisation
depend on whether comint-input-ring is empty, rather than depend
on it being nil.
Diffstat (limited to 'lisp/shell.el')
| -rw-r--r-- | lisp/shell.el | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/shell.el b/lisp/shell.el index 0b2b7543218..c93cc77b673 100644 --- a/lisp/shell.el +++ b/lisp/shell.el @@ -314,7 +314,7 @@ Thus, this does not include the shell's current directory.") (define-key shell-mode-map "\M-?" 'comint-dynamic-list-filename-completions) (define-key shell-mode-map [menu-bar completion] - (cons "Complete" + (cons "Complete" (copy-keymap (lookup-key comint-mode-map [menu-bar completion])))) (define-key-after (lookup-key shell-mode-map [menu-bar completion]) [complete-env-variable] '("Complete Env. Variable Name" . @@ -415,7 +415,7 @@ buffer." (make-local-variable 'list-buffers-directory) (setq list-buffers-directory (expand-file-name default-directory)) ;; shell-dependent assignments. - (unless comint-input-ring + (when (zerop (ring-length comint-input-ring)) (let ((shell (file-name-nondirectory (car (process-command (get-buffer-process (current-buffer))))))) (setq comint-input-ring-file-name |