(isearch-edit-string): Use search-ring-yank-pointer

and regexp-search-ring-yank-pointer for the HISTPOS argument of
read-from-minibuffer to provide the correct initial minibuffer
history position in isearch-edit-string when it is called from
isearch-ring-adjust.

diff --git a/lisp/isearch.el b/lisp/isearch.el
index c115193d394d18c6392fb9c0782e9e149fc5b068..036a0acf3736884ce96c7768d94a6cae7944735a 100644 (file)
--- a/lisp/isearch.el
+++ b/lisp/isearch.el
@@ -1055,7 +1055,11 @@ If first char entered is \\[isearch-yank-word-or-char], then do word search inst
                        (isearch-message-prefix nil nil isearch-nonincremental)
                        isearch-string
                        minibuffer-local-isearch-map nil
-                       (if isearch-regexp 'regexp-search-ring 'search-ring)
+                       (if isearch-regexp
+                          (cons 'regexp-search-ring
+                                (1+ (or regexp-search-ring-yank-pointer -1)))
+                        (cons 'search-ring
+                              (1+ (or search-ring-yank-pointer -1))))
                        nil t)
                      isearch-new-message
                      (mapconcat 'isearch-text-char-description