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#21663: 25.0.50; isearch-edit-string dont resume multi-isearch-files Date: Mon, 12 Oct 2015 23:17:15 +0300 Organization: LINKOV.NET Message-ID: <87io6b6dva.fsf@mail.linkov.net> References: NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Trace: ger.gmane.org 1444681764 7354 80.91.229.3 (12 Oct 2015 20:29:24 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 12 Oct 2015 20:29:24 +0000 (UTC) Cc: 21663@debbugs.gnu.org To: Tino Calancha Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Mon Oct 12 22:29:13 2015 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1Zljia-00053V-Aj for geb-bug-gnu-emacs@m.gmane.org; Mon, 12 Oct 2015 22:29:12 +0200 Original-Received: from localhost ([::1]:58655 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZljiZ-0007Sd-UR for geb-bug-gnu-emacs@m.gmane.org; Mon, 12 Oct 2015 16:29:11 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:34744) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZljiU-0007Ox-H6 for bug-gnu-emacs@gnu.org; Mon, 12 Oct 2015 16:29:07 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZljiQ-0002OZ-Qy for bug-gnu-emacs@gnu.org; Mon, 12 Oct 2015 16:29:06 -0400 Original-Received: from debbugs.gnu.org ([208.118.235.43]:48572) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZljiQ-0002ON-Oe for bug-gnu-emacs@gnu.org; Mon, 12 Oct 2015 16:29:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.80) (envelope-from ) id 1ZljiQ-0004TG-Ig for bug-gnu-emacs@gnu.org; Mon, 12 Oct 2015 16:29:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Juri Linkov Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Mon, 12 Oct 2015 20:29:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 21663 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: Original-Received: via spool by 21663-submit@debbugs.gnu.org id=B21663.144468170817121 (code B ref 21663); Mon, 12 Oct 2015 20:29:02 +0000 Original-Received: (at 21663) by debbugs.gnu.org; 12 Oct 2015 20:28:28 +0000 Original-Received: from localhost ([127.0.0.1]:37539 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Zljhr-0004S5-Iv for submit@debbugs.gnu.org; Mon, 12 Oct 2015 16:28:27 -0400 Original-Received: from sub3.mail.dreamhost.com ([69.163.253.7]:42015 helo=homiemail-a20.g.dreamhost.com) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Zljhq-0004Rx-6y for 21663@debbugs.gnu.org; Mon, 12 Oct 2015 16:28:26 -0400 Original-Received: from homiemail-a20.g.dreamhost.com (localhost [127.0.0.1]) by homiemail-a20.g.dreamhost.com (Postfix) with ESMTP id 406D17EC063; Mon, 12 Oct 2015 13:28:25 -0700 (PDT) Original-Received: from localhost.linkov.net (m212-53-111-171.cust.tele2.ee [212.53.111.171]) (Authenticated sender: jurta@jurta.org) by homiemail-a20.g.dreamhost.com (Postfix) with ESMTPA id 4F4D17EC060; Mon, 12 Oct 2015 13:28:24 -0700 (PDT) In-Reply-To: (Tino Calancha's message of "Tue, 13 Oct 2015 00:25:12 +0900 (JST)") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.0.50 (x86_64-pc-linux-gnu) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 208.118.235.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:107547 Archived-At: >> Start fresh session: >> emacs -Q >> >> C-x C-b >> M-x multi-isearch-buffer RET *scratch* RET *Buffer List* RET RET s >> (Using C-s several times will search "s" on the two buffers). >> >> M-s e >> (Now C-s should keep searching the same string "s" in the two buffers, >> but the string is searched just in the current buffer). > > Previous patch would not work for `multi-isearch-files' > because it is not checking `multi-isearch-file-list', so that > `multi-isearch-end' would be called. > > We may replace > (if (and nopush edit multi-isearch-buffer-list) > with > (if (and nopush edit (or multi-isearch-buffer-list multi-isearch-file-l= ist)) > but just > (if (and nopush edit) > wold work in any situation and its shorter. I wonder why =E2=80=98isearch-mode-end-hook-quit=E2=80=99 is not initiali= zed as =E2=80=98(and nopush edit)=E2=80=99 in the first place? If it was so, th= en you could just check for it in =E2=80=98multi-isearch-end=E2=80=99. But please note that not finishing multi-isearch correctly has such side effects as e.g. after =E2=80=98M-s e=E2=80=99 switching from the min= ibuffer to another buffer and starting another ordinary search in it will still use multi-isearch, etc. Instead of not finishing multi-isearch, have you tried to re-initialize multi-isearch on resuming isearch after exiting from the minibuffer? (This could be achieved by remembering its state variables).