mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-03 14:10:47 -08:00
Code Issues Projects Releases Wiki Activity

More fixes to support multi-line search in comint

Browse source 
* lisp/comint.el (comint-history-isearch-message): Use field-beginning
instead of comint-line-beginning-position - that's more fixes for
http://lists.gnu.org/archive/html/emacs-devel/2014-12/msg00305.html
(comint-history-isearch-message): Fix args of isearch-message-prefix.

[backport from trunk]
This commit is contained in:
Juri Linkov 2014-12-29 02:52:38 +02:00 • committed by João Távora
parent 18a89a069c
commit 67edddfce6
2 changed files with 17 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lisp/ChangeLog
View file

@ -6,6 +6,12 @@
(comint-send-input): Go to the end of the field instead of the end
of the line to accept whole multi-line input.
http://lists.gnu.org/archive/html/emacs-devel/2014-12/msg00305.html
(comint-history-isearch-message): Use field-beginning
instead of comint-line-beginning-position - that's more fixes for
http://lists.gnu.org/archive/html/emacs-devel/2014-12/msg00305.html
(comint-history-isearch-message): Fix args of isearch-message-prefix.
[Backport]
2015-01-09 Eli Zaretskii <eliz@gnu.org>

16
lisp/comint.el
View file

@ -1532,14 +1532,20 @@ the function `isearch-message'."
;; the initial comint prompt.
(if (overlayp comint-history-isearch-message-overlay)
(move-overlay comint-history-isearch-message-overlay
(save-excursion (forward-line 0) (point))
(comint-line-beginning-position))
(save-excursion
(goto-char (field-beginning))
(forward-line 0)
(point))
(field-beginning))
(setq comint-history-isearch-message-overlay
(make-overlay (save-excursion (forward-line 0) (point))
(comint-line-beginning-position)))
(make-overlay (save-excursion
(goto-char (field-beginning))
(forward-line 0)
(point))
(field-beginning)))
(overlay-put comint-history-isearch-message-overlay 'evaporate t))
(overlay-put comint-history-isearch-message-overlay
'display (isearch-message-prefix c-q-hack ellipsis))
'display (isearch-message-prefix ellipsis isearch-nonincremental))
(if (and comint-input-ring-index (not ellipsis))
;; Display the current history index.
(message "History item: %d" (1+ comint-input-ring-index))