[Emacs-diffs] emacs-24 67edddf 2/2: More fixes to support multi-line search in comint

[João Távora]

branch: emacs-24
commit 67edddfce60169c0d0e2d6d3dce1408f04febbf1
Author: Juri Linkov <address@hidden>
Commit: João Távora <address@hidden>

    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.
    
    [backport from trunk]
---
 lisp/ChangeLog |    6 ++++++
 lisp/comint.el |   16 +++++++++++-----
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ff384a4..fb8dfba0 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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  <address@hidden>
 
diff --git a/lisp/comint.el b/lisp/comint.el
index cd6ecb4..f33034b 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))