Delete the autoloads for functions defined with ibuffer-specific commands.

[gnu-emacs] / lisp / eshell / em-hist.el

diff --git a/lisp/eshell/em-hist.el b/lisp/eshell/em-hist.el
index 1213dfcc2915a0f5e4f04b7efdc274561c4a77bf..a5426f530011ff30591f770e840384bd92a984b4 100644 (file)
--- a/lisp/eshell/em-hist.el
+++ b/lisp/eshell/em-hist.el
@@ -1,7 +1,9 @@
-;;; em-hist --- history list management
+;;; em-hist.el --- history list management
 
 ;; Copyright (C) 1999, 2000 Free Software Foundation
 
+;; Author: John Wiegley <johnw@gnu.org>
+
 ;; This file is part of GNU Emacs.
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
@@ -372,7 +374,7 @@ input."
                   (ring-empty-p eshell-history-ring)
                   (not (string-equal (eshell-get-history 0) input))))
          (eshell-put-history input))
-      (setq eshell-save-history-index eshell-history-ring)
+      (setq eshell-save-history-index eshell-history-index)
       (setq eshell-history-index nil))))
 
 (defun eshell-read-history (&optional filename silent)
@@ -814,7 +816,8 @@ If N is negative, find the next or Nth next match."
     (if (null pos)
        (error "Not found")
       (setq eshell-history-index pos)
-      (message "History item: %d" (- (ring-length eshell-history-ring) pos))
+      (unless (minibuffer-window-active-p (selected-window))
+       (message "History item: %d" (- (ring-length eshell-history-ring) pos)))
        ;; Can't use kill-region as it sets this-command
       (delete-region (save-excursion (eshell-bol) (point)) (point))
       (insert-and-inherit (eshell-get-history pos)))))