From: Francesco Potortì <pot@gnu.org>
Date: Tue, 14 May 2002 08:42:48 +0000 (+0000)
Subject: (shell-mode): Make second part of initialisation
X-Git-Tag: ttn-vms-21-2-B4~15066
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=f19be1633866a52c0e139887b81d51056a8d5236;p=emacs.git

(shell-mode): Make second part of initialisation
depend on whether comint-input-ring is empty, rather than depend
on it being nil.
---

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