diff options
| author | John Wiegley | 2001-04-11 15:49:31 +0000 |
|---|---|---|
| committer | John Wiegley | 2001-04-11 15:49:31 +0000 |
| commit | 3f75af1b60a0ec9ba85a24eb59210b93967d28b4 (patch) | |
| tree | b55d45c59fe3185f7b239a21064c4f782f042234 | |
| parent | 00fbbecd9663910bd85b9efb818103c545b101bb (diff) | |
| download | emacs-3f75af1b60a0ec9ba85a24eb59210b93967d28b4.tar.gz emacs-3f75af1b60a0ec9ba85a24eb59210b93967d28b4.zip | |
(eshell-previous-matching-input): Don't display "History item" if the
the minibuffer is active.
| -rw-r--r-- | lisp/eshell/em-hist.el | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lisp/eshell/em-hist.el b/lisp/eshell/em-hist.el index 985e3e11cb0..72dfd449763 100644 --- a/lisp/eshell/em-hist.el +++ b/lisp/eshell/em-hist.el | |||
| @@ -816,7 +816,8 @@ If N is negative, find the next or Nth next match." | |||
| 816 | (if (null pos) | 816 | (if (null pos) |
| 817 | (error "Not found") | 817 | (error "Not found") |
| 818 | (setq eshell-history-index pos) | 818 | (setq eshell-history-index pos) |
| 819 | (message "History item: %d" (- (ring-length eshell-history-ring) pos)) | 819 | (unless (minibuffer-window-active-p (selected-window)) |
| 820 | (message "History item: %d" (- (ring-length eshell-history-ring) pos))) | ||
| 820 | ;; Can't use kill-region as it sets this-command | 821 | ;; Can't use kill-region as it sets this-command |
| 821 | (delete-region (save-excursion (eshell-bol) (point)) (point)) | 822 | (delete-region (save-excursion (eshell-bol) (point)) (point)) |
| 822 | (insert-and-inherit (eshell-get-history pos))))) | 823 | (insert-and-inherit (eshell-get-history pos))))) |