diff options
| author | Juri Linkov <juri@linkov.net> | 2014-12-29 02:52:38 +0200 |
|---|---|---|
| committer | Juri Linkov <juri@linkov.net> | 2014-12-29 02:52:38 +0200 |
| commit | a0ae3d7331f6126941f90c6b80c293685004e165 (patch) | |
| tree | a333d8c13e0f7cbef21ed5e919f99fa601c128bd | |
| parent | df0f2a5f3b6c4e439215245d19f9e9cadb742581 (diff) | |
| download | emacs-a0ae3d7331f6126941f90c6b80c293685004e165.tar.gz emacs-a0ae3d7331f6126941f90c6b80c293685004e165.tar.bz2 emacs-a0ae3d7331f6126941f90c6b80c293685004e165.zip | |
More fixes to support multi-line search in comint
* 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.
| -rw-r--r-- | lisp/ChangeLog | 7 | ||||
| -rw-r--r-- | lisp/comint.el | 16 |
2 files changed, 18 insertions, 5 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 6982ee9a3dd..37f3892e2cb 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,12 @@ 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). (vc-dir-mode-map): Bind it to "\C-o". (vc-dir-menu-map): Add it to menu. diff --git a/lisp/comint.el b/lisp/comint.el index 3085052087c..4acaa30db91 100644 --- a/lisp/comint.el +++ b/lisp/comint.el @@ -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)) |