# HG changeset patch
# User Juri Linkov <juri@jurta.org>
# Date 1205689451 0
# Node ID 5af8822703daa719249533dc7a1daae058a0b55c
# Parent  d90ba9c4c0937bd18619f0f32f47254d0b1cfb16
(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 -r d90ba9c4c093 -r 5af8822703da lisp/isearch.el
--- a/lisp/isearch.el	Sun Mar 16 17:02:40 2008 +0000
+++ b/lisp/isearch.el	Sun Mar 16 17:44:11 2008 +0000
@@ -1055,7 +1055,11 @@
                        (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