[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r112433: * lisp/comint.el (comint-pre
From: |
Juri Linkov |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r112433: * lisp/comint.el (comint-previous-matching-input): Don't print message |
Date: |
Wed, 01 May 2013 11:05:05 +0300 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 112433
fixes bug: http://debbugs.gnu.org/13223
committer: Juri Linkov <address@hidden>
branch nick: trunk
timestamp: Wed 2013-05-01 11:05:05 +0300
message:
* 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'.
modified:
lisp/ChangeLog
lisp/comint.el
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2013-05-01 06:13:20 +0000
+++ b/lisp/ChangeLog 2013-05-01 08:05:05 +0000
@@ -1,3 +1,11 @@
+2013-05-01 Juri Linkov <address@hidden>
+
+ * 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 <address@hidden>
* progmodes/octave.el (octave-abbrev-table): Remove abbrev
=== modified file 'lisp/comint.el'
--- a/lisp/comint.el 2013-04-21 03:13:04 +0000
+++ b/lisp/comint.el 2013-05-01 08:05:05 +0000
@@ -1191,7 +1191,8 @@
(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 @@
(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.
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r112433: * lisp/comint.el (comint-previous-matching-input): Don't print message,
Juri Linkov <=