From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Juri Linkov Newsgroups: gmane.emacs.bugs Subject: bug#9185: 24.0.50; "C-s M-p" does not bring the tip of the search ring Date: Wed, 24 Aug 2011 21:28:09 +0300 Organization: JURTA Message-ID: <878vqid5qe.fsf@mail.jurta.org> References: <87r55aenuc.fsf@mail.jurta.org> <87oc0c176d.fsf@mail.jurta.org> <87fwkuppz3.fsf@mail.jurta.org> <8739gtg0wp.fsf@mail.jurta.org> <87liukxxtj.fsf@mail.jurta.org> <87ei0aizl8.fsf@mail.jurta.org> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Transfer-Encoding: quoted-printable X-Trace: dough.gmane.org 1314211013 16461 80.91.229.12 (24 Aug 2011 18:36:53 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Wed, 24 Aug 2011 18:36:53 +0000 (UTC) Cc: 9185@debbugs.gnu.org To: Dani Moncayo Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Wed Aug 24 20:36:49 2011 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([140.186.70.17]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1QwIJb-0001lS-SK for geb-bug-gnu-emacs@m.gmane.org; Wed, 24 Aug 2011 20:36:49 +0200 Original-Received: from localhost ([::1]:48013 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QwIJX-0002Jp-SW for geb-bug-gnu-emacs@m.gmane.org; Wed, 24 Aug 2011 14:36:35 -0400 Original-Received: from eggs.gnu.org ([140.186.70.92]:42622) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QwIJR-0001MO-MX for bug-gnu-emacs@gnu.org; Wed, 24 Aug 2011 14:36:33 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QwICe-0002ak-1W for bug-gnu-emacs@gnu.org; Wed, 24 Aug 2011 14:29:28 -0400 Original-Received: from debbugs.gnu.org ([140.186.70.43]:52773) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QwICd-0002af-T2 for bug-gnu-emacs@gnu.org; Wed, 24 Aug 2011 14:29:28 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.69) (envelope-from ) id 1QwIF7-0000rd-S4; Wed, 24 Aug 2011 14:32:01 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Juri Linkov Original-Sender: debbugs-submit-bounces@debbugs.gnu.org Resent-To: owner@debbugs.gnu.org Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Wed, 24 Aug 2011 18:32:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 9185 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: Original-Received: via spool by 9185-submit@debbugs.gnu.org id=B9185.13142107013280 (code B ref 9185); Wed, 24 Aug 2011 18:32:01 +0000 Original-Received: (at 9185) by debbugs.gnu.org; 24 Aug 2011 18:31:41 +0000 Original-Received: from localhost ([127.0.0.1] helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1QwIEn-0000qr-PC for submit@debbugs.gnu.org; Wed, 24 Aug 2011 14:31:41 -0400 Original-Received: from smarty.dreamhost.com ([208.113.175.8]) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1QwIEl-0000qk-R6 for 9185@debbugs.gnu.org; Wed, 24 Aug 2011 14:31:40 -0400 Original-Received: from ps18281.dreamhostps.com (ps18281.dreamhost.com [69.163.218.105]) by smarty.dreamhost.com (Postfix) with ESMTP id 70A746E8068; Wed, 24 Aug 2011 11:29:04 -0700 (PDT) Original-Received: from localhost (ps18281.dreamhostps.com [69.163.218.105]) by ps18281.dreamhostps.com (Postfix) with ESMTP id 702DC451C28D; Wed, 24 Aug 2011 11:29:03 -0700 (PDT) In-Reply-To: (Dani Moncayo's message of "Wed, 24 Aug 2011 18:18:04 +0200") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.0.50 (x86_64-pc-linux-gnu) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.11 Precedence: list Resent-Date: Wed, 24 Aug 2011 14:32:01 -0400 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 1) X-Received-From: 140.186.70.43 X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:50306 Archived-At: > However, on further testing, I've found still another misbehavior: > 0. C-s a C-s b C-s c > 1. C-s C-s =A0 =A0 --> "c" is selected, OK. > 2. M-e =A0 --> "c" remains selected (the search ring is unchanged= : > "a;b;c"), OK. > 3. M-p =A0 =A0 =A0 =A0 --> Now "b" (the previous used entry) should hav= e been > selected, but I see that "c" (the current entry) remains selected > instead. So you are asking that after `isearch-edit-string' indexes of the search ring should remain unchanged. This is accomplished by this patch: =3D=3D=3D modified file 'lisp/isearch.el' --- lisp/isearch.el 2011-07-15 13:33:07 +0000 +++ lisp/isearch.el 2011-08-24 18:27:33 +0000 @@ -1131,6 +1140,9 @@ (defun isearch-edit-string () (isearch-recursive-edit isearch-recursive-edit) ;; Save current configuration so we can restore it here. (isearch-window-configuration (current-window-configuration)) + ;; Save index of the search ring. + (search-ring-yank-pointer search-ring-yank-pointer) + (regexp-search-ring-yank-pointer regexp-search-ring-yank-pointer) =20 ;; Temporarily restore `minibuffer-message-timeout'. (minibuffer-message-timeout @@ -1152,9 +1164,14 @@ (defun isearch-edit-string () =20 (unwind-protect (let* ((message-log-max nil) + ;; Protect the global search ring from updating + ;; by read-from-minibuffer. It should be updated only + ;; by isearch-update-ring in isearch-done. + (search-ring search-ring) + (regexp-search-ring regexp-search-ring) ;; Binding minibuffer-history-symbol to nil is a work-around ;; for some incompatibility with gmhist. (minibuffer-history-symbol)) (setq isearch-new-string (read-from-minibuffer (isearch-message-prefix nil nil isearch-nonincrem= ental) (cons isearch-string (1+ (isearch-fail-pos))) minibuffer-local-isearch-map nil (if isearch-regexp (cons 'regexp-search-ring