From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Tino Calancha Newsgroups: gmane.emacs.bugs Subject: bug#21663: 25.0.50; isearch-edit-string dont resume multi isearches Date: Wed, 14 Oct 2015 15:48:22 +0900 (JST) Message-ID: References: <87y4f64e8i.fsf@mail.linkov.net> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: multipart/mixed; BOUNDARY="1468197610-1993860880-1444805302=:1128" X-Trace: ger.gmane.org 1444805223 30603 80.91.229.3 (14 Oct 2015 06:47:03 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 14 Oct 2015 06:47:03 +0000 (UTC) To: 21663@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Wed Oct 14 08:46:54 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 1ZmFps-0000nx-Hx for geb-bug-gnu-emacs@m.gmane.org; Wed, 14 Oct 2015 08:46:52 +0200 Original-Received: from localhost ([::1]:40778 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZmFpr-0002MC-S3 for geb-bug-gnu-emacs@m.gmane.org; Wed, 14 Oct 2015 02:46:51 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:38371) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZmFp8-0002Le-Qv for bug-gnu-emacs@gnu.org; Wed, 14 Oct 2015 02:46:07 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZmFp4-0003TV-Bz for bug-gnu-emacs@gnu.org; Wed, 14 Oct 2015 02:46:06 -0400 Original-Received: from debbugs.gnu.org ([208.118.235.43]:50386) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZmFp4-0003TR-8T for bug-gnu-emacs@gnu.org; Wed, 14 Oct 2015 02:46:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.80) (envelope-from ) id 1ZmFp4-0005ED-4G for bug-gnu-emacs@gnu.org; Wed, 14 Oct 2015 02:46:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Tino Calancha Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Wed, 14 Oct 2015 06:46: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.144480511720041 (code B ref 21663); Wed, 14 Oct 2015 06:46:02 +0000 Original-Received: (at 21663) by debbugs.gnu.org; 14 Oct 2015 06:45:17 +0000 Original-Received: from localhost ([127.0.0.1]:39354 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1ZmFoK-0005D9-RO for submit@debbugs.gnu.org; Wed, 14 Oct 2015 02:45:17 -0400 Original-Received: from calancha-ilc.kek.jp ([130.87.234.234]:38826) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1ZmFoI-0005Cn-Im for 21663@debbugs.gnu.org; Wed, 14 Oct 2015 02:45:15 -0400 Original-Received: by calancha-ilc.kek.jp (Postfix, from userid 500) id 350498D16; Wed, 14 Oct 2015 15:48:22 +0900 (JST) Original-Received: from localhost (localhost [127.0.0.1]) by calancha-ilc.kek.jp (Postfix) with ESMTP id 1E4088D0B for <21663@debbugs.gnu.org>; Wed, 14 Oct 2015 15:48:22 +0900 (JST) X-X-Sender: calancha@calancha-ilc.kek.jp In-Reply-To: <87y4f64e8i.fsf@mail.linkov.net> User-Agent: Alpine 2.20 (LRH 67 2015-01-07) 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:107596 Archived-At: --1468197610-1993860880-1444805302=:1128 Content-Type: text/plain; format=flowed; charset=US-ASCII Thank you Juri for your help on this. I have tested the attached patch (isearch-5.patch) with `multi-isearch-buffers'/`multi-isearch-files': it seems OK now. < To avoid the need to add multi-isearch-end to isearch-mode-end-hook, < you could try to restore saved variables before calling isearch-mode. < Then multi-isearch-setup called from isearch-mode should take care of < adding multi-isearch-end to isearch-mode-end-hook when necessary < variables are already restored, i.e. when you save the variable < multi-isearch-next-buffer-function instead of < multi-isearch-next-buffer-current-function. I got the point. Actually I bind multi-isearch-next-buffer-function to multi-isearch-next-buffer-current-function, because the former was nil and multi-isearch-setup makes a non-nil test for this variable at the beginning < multi-isearch-current-buffer still needs to be restored after < isearch-mode in the same place where you already added it in your patch. OK. --1468197610-1993860880-1444805302=:1128 Content-Type: text/plain; charset=US-ASCII; name=isearch-5.patch Content-Transfer-Encoding: BASE64 Content-ID: Content-Description: Content-Disposition: attachment; filename=isearch-5.patch ZGlmZiAtLWdpdCBhL2xpc3AvaXNlYXJjaC5lbCBiL2xpc3AvaXNlYXJjaC5l bA0KaW5kZXggNGZjOWIzOC4uNGM3MTg3YiAxMDA2NDQNCi0tLSBhL2xpc3Av aXNlYXJjaC5lbA0KKysrIGIvbGlzcC9pc2VhcmNoLmVsDQpAQCAtMTI0Miw2 ICsxMjQyLDExIEBAIHdpdGgtaXNlYXJjaC1zdXNwZW5kZWQNCiAJICAgICAg KGlzZWFyY2gtYWRqdXN0ZWQgaXNlYXJjaC1hZGp1c3RlZCkNCiAJICAgICAg KGlzZWFyY2gteWFuay1mbGFnIGlzZWFyY2gteWFuay1mbGFnKQ0KIAkgICAg ICAoaXNlYXJjaC1lcnJvciBpc2VhcmNoLWVycm9yKQ0KKw0KKwkgICAgICAo bXVsdGktaXNlYXJjaC1maWxlLWxpc3QtbmV3IG11bHRpLWlzZWFyY2gtZmls ZS1saXN0KQ0KKwkgICAgICAobXVsdGktaXNlYXJjaC1idWZmZXItbGlzdC1u ZXcgbXVsdGktaXNlYXJjaC1idWZmZXItbGlzdCkNCisgICAgICAgICAgICAg IChtdWx0aS1pc2VhcmNoLW5leHQtYnVmZmVyLWZ1bmN0aW9uIG11bHRpLWlz ZWFyY2gtbmV4dC1idWZmZXItY3VycmVudC1mdW5jdGlvbikNCisJICAgICAg KG11bHRpLWlzZWFyY2gtY3VycmVudC1idWZmZXItbmV3IG11bHRpLWlzZWFy Y2gtY3VycmVudC1idWZmZXIpDQogICA7OzsgRG9uJ3QgYmluZCB0aGlzLiAg V2Ugd2FudCBpc2VhcmNoLXNlYXJjaCwgYmVsb3csIHRvIHNldCBpdC4NCiAg IDs7OyBBbmQgdGhlIG9sZCB2YWx1ZSB3b24ndCBtYXR0ZXIgYWZ0ZXIgdGhh dC4NCiAgIDs7OwkgICAgKGlzZWFyY2gtb3RoZXItZW5kIGlzZWFyY2gtb3Ro ZXItZW5kKQ0KQEAgLTEzMDMsNyArMTMwOCwxMCBAQCB3aXRoLWlzZWFyY2gt c3VzcGVuZGVkDQogCQkgIGlzZWFyY2gtbWVzc2FnZSBpc2VhcmNoLW5ldy1t ZXNzYWdlDQogCQkgIGlzZWFyY2gtZm9yd2FyZCBpc2VhcmNoLW5ldy1mb3J3 YXJkDQogCQkgIGlzZWFyY2gtd29yZCBpc2VhcmNoLW5ldy13b3JkDQotCQkg IGlzZWFyY2gtY2FzZS1mb2xkLXNlYXJjaCBpc2VhcmNoLW5ldy1jYXNlLWZv bGQpKQ0KKwkJICBpc2VhcmNoLWNhc2UtZm9sZC1zZWFyY2ggaXNlYXJjaC1u ZXctY2FzZS1mb2xkDQorICAgICAgICAgICAgICAgICAgbXVsdGktaXNlYXJj aC1jdXJyZW50LWJ1ZmZlciBtdWx0aS1pc2VhcmNoLWN1cnJlbnQtYnVmZmVy LW5ldw0KKyAgICAgICAgICAgICAgICAgIG11bHRpLWlzZWFyY2gtZmlsZS1s aXN0IG11bHRpLWlzZWFyY2gtZmlsZS1saXN0LW5ldw0KKyAgICAgICAgICAg ICAgICAgIG11bHRpLWlzZWFyY2gtYnVmZmVyLWxpc3QgbXVsdGktaXNlYXJj aC1idWZmZXItbGlzdC1uZXcpKQ0KIA0KIAkgIDs7IEVtcHR5IGlzZWFyY2gt c3RyaW5nIG1lYW5zIHVzZSBkZWZhdWx0Lg0KIAkgICh3aGVuICg9IDAgKGxl bmd0aCBpc2VhcmNoLXN0cmluZykpDQo= --1468197610-1993860880-1444805302=:1128--