mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-25 07:28:20 +00:00
Code Issues Releases 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.
This commit is contained in:
Juri Linkov 2014-12-29 02:52:38 +02:00
parent df0f2a5f3b
commit a0ae3d7331
2 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lisp/ChangeLog
View File

@ -1,3 +1,10 @@
2014-12-29 Juri Linkov <juri@linkov.net>
* 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.
2014-12-29 Juri Linkov <juri@linkov.net>
* vc/vc-dir.el (vc-dir-display-file): New command (bug#19450).

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