[Emacs-diffs] Changes to emacs/lisp/eshell/em-hist.el

[Miles Bader]

Index: emacs/lisp/eshell/em-hist.el
diff -c emacs/lisp/eshell/em-hist.el:1.11 emacs/lisp/eshell/em-hist.el:1.12
*** emacs/lisp/eshell/em-hist.el:1.11   Fri Aug  9 20:18:18 2002
--- emacs/lisp/eshell/em-hist.el        Wed Jan 15 11:06:49 2003
***************
*** 104,120 ****
    :type 'boolean
    :group 'eshell-hist)
  
! (defcustom eshell-ask-to-save-history t
    "*Determine if history should be automatically saved.
  History is always preserved after sanely exiting an Eshell buffer.
  However, when Emacs is being shut down, this variable determines
  whether to prompt the user.
! If set to nil, it means never ask whether history should be saved.
! If set to t, always ask if any Eshell buffers are open at exit time.
! If set to `always', history will always be saved, silently."
    :type '(choice (const :tag "Never" nil)
!                (const :tag "Ask" t)
!                (const :tag "Always save" always))
    :group 'eshell-hist)
  
  (defcustom eshell-input-filter
--- 104,120 ----
    :type 'boolean
    :group 'eshell-hist)
  
! (defcustom eshell-save-history-on-exit 'ask
    "*Determine if history should be automatically saved.
  History is always preserved after sanely exiting an Eshell buffer.
  However, when Emacs is being shut down, this variable determines
  whether to prompt the user.
! If set to nil, it means never save history on termination of Emacs.
! If set to `ask', ask if any Eshell buffers are open at exit time.
! If set to t, history will always be saved, silently."
    :type '(choice (const :tag "Never" nil)
!                (const :tag "Ask" ask)
!                (const :tag "Always save" t))
    :group 'eshell-hist)
  
  (defcustom eshell-input-filter
***************
*** 269,275 ****
    (make-local-variable 'eshell-save-history-index)
  
    (if (minibuffer-window-active-p (selected-window))
!       (set (make-local-variable 'eshell-ask-to-save-history) nil)
      (set (make-local-variable 'eshell-history-ring) nil)
      (if eshell-history-file-name
        (eshell-read-history nil t))
--- 269,275 ----
    (make-local-variable 'eshell-save-history-index)
  
    (if (minibuffer-window-active-p (selected-window))
!       (set (make-local-variable 'eshell-save-history-on-exit) nil)
      (set (make-local-variable 'eshell-history-ring) nil)
      (if eshell-history-file-name
        (eshell-read-history nil t))
***************
*** 296,303 ****
        (with-current-buffer buf
          (if (and eshell-mode
                   eshell-history-file-name
!                  eshell-ask-to-save-history
!                  (or (eq eshell-ask-to-save-history 'always)
                       (y-or-n-p
                        (format "Save input history for Eshell buffer `%s'? "
                                (buffer-name buf)))))
--- 296,303 ----
        (with-current-buffer buf
          (if (and eshell-mode
                   eshell-history-file-name
!                  eshell-save-history-on-exit
!                  (or (eq eshell-save-history-on-exit t)
                       (y-or-n-p
                        (format "Save input history for Eshell buffer `%s'? "
                                (buffer-name buf)))))