[Emacs-diffs] Changes to emacs/lisp/shell.el

[Francesco Potortì]

Index: emacs/lisp/shell.el
diff -c emacs/lisp/shell.el:1.111 emacs/lisp/shell.el:1.112
*** emacs/lisp/shell.el:1.111   Thu May  9 20:58:27 2002
--- emacs/lisp/shell.el Tue May 14 04:42:48 2002
***************
*** 314,320 ****
         (define-key shell-mode-map "\M-?"
         'comint-dynamic-list-filename-completions)
         (define-key shell-mode-map [menu-bar completion]
!        (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" .
--- 314,320 ----
         (define-key shell-mode-map "\M-?"
         'comint-dynamic-list-filename-completions)
         (define-key shell-mode-map [menu-bar completion]
!        (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,421 ****
    (make-local-variable 'list-buffers-directory)
    (setq list-buffers-directory (expand-file-name default-directory))
    ;; shell-dependent assignments.
!   (unless comint-input-ring
      (let ((shell (file-name-nondirectory (car
                   (process-command (get-buffer-process (current-buffer)))))))
        (setq comint-input-ring-file-name
--- 415,421 ----
    (make-local-variable 'list-buffers-directory)
    (setq list-buffers-directory (expand-file-name default-directory))
    ;; shell-dependent assignments.
!   (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