Mercurial > emacs

changeset 93009:5af8822703da

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(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.
author Juri Linkov <juri@jurta.org>
date Sun, 16 Mar 2008 17:44:11 +0000
parents d90ba9c4c093
children 6bc37f1965b5
files lisp/isearch.el
diffstat 1 files changed, 5 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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