Mercurial > emacs
changeset 45284:723fdd614e34
(shell-mode): Make second part of initialisation
depend on whether comint-input-ring is empty, rather than depend
on it being nil.
| author | Francesco Potortì <pot@gnu.org> |
|---|---|
| date | Tue, 14 May 2002 08:42:48 +0000 |
| parents | 8de10249c048 |
| children | dc0eece6818b |
| files | lisp/shell.el |
| diffstat | 1 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/shell.el Tue May 14 08:41:37 2002 +0000 +++ b/lisp/shell.el Tue May 14 08:42:48 2002 +0000 @@ -314,7 +314,7 @@ (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 @@ (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