* lisp/comint.el (comint-previous-matching-input): Don't print message

"History item: %d" when `isearch-mode' is active.
(comint-history-isearch-message): Print message "History item: %d"
when `comint-input-ring-index' is not empty and this function is
called from `isearch-update' with a nil `ellipsis'.

Fixes: debbugs:13223

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index edc75c736ad6152b73d64348a33f14062a9df825..cf2ac52dcbb630122c9518f25ec6bc40ef64ec78 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,11 @@
+2013-05-01  Juri Linkov  <juri@jurta.org>
+
+       * comint.el (comint-previous-matching-input): Don't print message
+       "History item: %d" when `isearch-mode' is active.
+       (comint-history-isearch-message): Print message "History item: %d"
+       when `comint-input-ring-index' is not empty and this function is
+       called from `isearch-update' with a nil `ellipsis'.  (Bug#13223)
+
 2013-05-01  Leo Liu  <sdl.web@gmail.com>
 
        * progmodes/octave.el (octave-abbrev-table): Remove abbrev

diff --git a/lisp/comint.el b/lisp/comint.el
index d5d95f8cbc0c221adefaf5e2db50c94acc045f0a..d0c2e477d5add6b12fb236d2f57621906b397027 100644 (file)
--- a/lisp/comint.el
+++ b/lisp/comint.el
@@ -1191,7 +1191,8 @@ If N is negative, find the next or Nth next match."
          (setq comint-stored-incomplete-input
                (funcall comint-get-old-input)))
       (setq comint-input-ring-index pos)
-      (message "History item: %d" (1+ pos))
+      (unless isearch-mode
+       (message "History item: %d" (1+ pos)))
       (comint-delete-input)
       (insert (ring-ref comint-input-ring pos)))))
 
@@ -1540,8 +1541,11 @@ the function `isearch-message'."
       (overlay-put comint-history-isearch-message-overlay 'evaporate t))
     (overlay-put comint-history-isearch-message-overlay
                 'display (isearch-message-prefix c-q-hack ellipsis))
-    ;; And clear any previous isearch message.
-    (message "")))
+    (if (and comint-input-ring-index (not ellipsis))
+       ;; Display the current history index.
+       (message "History item: %d" (1+ comint-input-ring-index))
+      ;; Or clear a previous isearch message.
+      (message ""))))
 
 (defun comint-history-isearch-wrap ()
   "Wrap the input history search when search fails.