mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-26 07:33:47 +00:00
Code Issues Releases Activity

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

Browse Source 
"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
This commit is contained in:
Juri Linkov 2013-05-01 11:05:05 +03:00
parent 0fb0a4f376
commit 9e9be37c18
2 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lisp/ChangeLog
View File

@ -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

10
lisp/comint.el
View File

@ -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.