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: Tue, 13 Oct 2015 14:18:25 +0900 (JST) Message-ID: References: NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: multipart/mixed; BOUNDARY="1468197610-1159872123-1444713505=:28366" X-Trace: ger.gmane.org 1444713383 30549 80.91.229.3 (13 Oct 2015 05:16:23 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 13 Oct 2015 05:16:23 +0000 (UTC) Cc: Tino Calancha To: 21663@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Tue Oct 13 07:16:14 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 1Zlrwa-0000gY-4p for geb-bug-gnu-emacs@m.gmane.org; Tue, 13 Oct 2015 07:16:12 +0200 Original-Received: from localhost ([::1]:60642 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZlrwZ-00018D-KE for geb-bug-gnu-emacs@m.gmane.org; Tue, 13 Oct 2015 01:16:11 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:34385) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZlrwU-000187-NM for bug-gnu-emacs@gnu.org; Tue, 13 Oct 2015 01:16:07 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZlrwR-0003uh-BX for bug-gnu-emacs@gnu.org; Tue, 13 Oct 2015 01:16:06 -0400 Original-Received: from debbugs.gnu.org ([208.118.235.43]:48706) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZlrwR-0003uW-7z for bug-gnu-emacs@gnu.org; Tue, 13 Oct 2015 01:16:03 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.80) (envelope-from ) id 1ZlrwQ-00020b-Hi for bug-gnu-emacs@gnu.org; Tue, 13 Oct 2015 01:16: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: Tue, 13 Oct 2015 05:16: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.14447133237630 (code B ref 21663); Tue, 13 Oct 2015 05:16:02 +0000 Original-Received: (at 21663) by debbugs.gnu.org; 13 Oct 2015 05:15:23 +0000 Original-Received: from localhost ([127.0.0.1]:37677 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Zlrvm-0001yz-HL for submit@debbugs.gnu.org; Tue, 13 Oct 2015 01:15:23 -0400 Original-Received: from calancha-ilc.kek.jp ([130.87.234.234]:59477) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Zlrvi-0001yf-8O for 21663@debbugs.gnu.org; Tue, 13 Oct 2015 01:15:19 -0400 Original-Received: by calancha-ilc.kek.jp (Postfix, from userid 500) id 2E23E864B; Tue, 13 Oct 2015 14:18:25 +0900 (JST) Original-Received: from localhost (localhost [127.0.0.1]) by calancha-ilc.kek.jp (Postfix) with ESMTP id 18F638643; Tue, 13 Oct 2015 14:18:25 +0900 (JST) X-X-Sender: calancha@calancha-ilc.kek.jp In-Reply-To: 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:107561 Archived-At: --1468197610-1159872123-1444713505=:28366 Content-Type: text/plain; format=flowed; charset=US-ASCII In previous patch (isearch_3.patch) the variables are not restored because they were bind to the same symbol name, and multi-isearch-end will set them to nil. In addition, multi-isearch-end need to be added again to isearch-mode-end-hook, otherwise, even after exiting with C-g, C-s will start a multisearch instead of a normal isearch in the current buffer. See attached patch: isearch_4.patch --1468197610-1159872123-1444713505=:28366 Content-Type: text/plain; charset=US-ASCII; name=isearch_4.patch Content-Transfer-Encoding: BASE64 Content-ID: Content-Description: Content-Disposition: attachment; filename=isearch_4.patch ZGlmZiAtLWdpdCBhL2xpc3AvaXNlYXJjaC5lbCBiL2xpc3AvaXNlYXJjaC5l bA0KaW5kZXggNGZjOWIzOC4uNjE3ZjNlNyAxMDA2NDQNCi0tLSBhL2xpc3Av aXNlYXJjaC5lbA0KKysrIGIvbGlzcC9pc2VhcmNoLmVsDQpAQCAtMTI0Miw2 ICsxMjQyLDE1IEBAIHdpdGgtaXNlYXJjaC1zdXNwZW5kZWQNCiAJICAgICAg KGlzZWFyY2gtYWRqdXN0ZWQgaXNlYXJjaC1hZGp1c3RlZCkNCiAJICAgICAg KGlzZWFyY2gteWFuay1mbGFnIGlzZWFyY2gteWFuay1mbGFnKQ0KIAkgICAg ICAoaXNlYXJjaC1lcnJvciBpc2VhcmNoLWVycm9yKQ0KKyAgICAgICAgICAg ICAgOzsgbXVsdGkgaXNlYXJjaCB2YXJpYWJsZXMNCisgICAgICAgICAgICAg IChpcy1tdWx0aS1pc2VhcmNoIChvciBtdWx0aS1pc2VhcmNoLWJ1ZmZlci1s aXN0IG11bHRpLWlzZWFyY2gtZmlsZS1saXN0KSkNCisJICAgICAgKG11bHRp LWlzZWFyY2gtZmlsZS1saXN0LW5ldyBtdWx0aS1pc2VhcmNoLWZpbGUtbGlz dCkNCisJICAgICAgKG11bHRpLWlzZWFyY2gtYnVmZmVyLWxpc3QtbmV3IG11 bHRpLWlzZWFyY2gtYnVmZmVyLWxpc3QpDQorIAkgICAgICAobXVsdGktaXNl YXJjaC1uZXh0LWJ1ZmZlci1jdXJyZW50LWZ1bmN0aW9uLW5ldyBtdWx0aS1p c2VhcmNoLW5leHQtYnVmZmVyLWN1cnJlbnQtZnVuY3Rpb24pDQorCSAgICAg IChtdWx0aS1pc2VhcmNoLWN1cnJlbnQtYnVmZmVyLW5ldyBtdWx0aS1pc2Vh cmNoLWN1cnJlbnQtYnVmZmVyKQ0KKwkgICAgICAoaXNlYXJjaC1wdXNoLXN0 YXRlLWZ1bmN0aW9uIGlzZWFyY2gtcHVzaC1zdGF0ZS1mdW5jdGlvbikNCisJ ICAgICAgKGlzZWFyY2gtd3JhcC1mdW5jdGlvbiBpc2VhcmNoLXdyYXAtZnVu Y3Rpb24pDQorCSAgICAgIChpc2VhcmNoLXNlYXJjaC1mdW4tZnVuY3Rpb24g aXNlYXJjaC1zZWFyY2gtZnVuLWZ1bmN0aW9uKQ0KICAgOzs7IERvbid0IGJp bmQgdGhpcy4gIFdlIHdhbnQgaXNlYXJjaC1zZWFyY2gsIGJlbG93LCB0byBz ZXQgaXQuDQogICA7OzsgQW5kIHRoZSBvbGQgdmFsdWUgd29uJ3QgbWF0dGVy IGFmdGVyIHRoYXQuDQogICA7OzsJICAgIChpc2VhcmNoLW90aGVyLWVuZCBp c2VhcmNoLW90aGVyLWVuZCkNCkBAIC0xMjk4LDEyICsxMzA3LDE3IEBAIHdp dGgtaXNlYXJjaC1zdXNwZW5kZWQNCiAJCQkgIG5pbA0KIAkJCSAgaXNlYXJj aC13b3JkKQ0KIA0KKyAgICAgICAgICAgICh3aGVuIGlzLW11bHRpLWlzZWFy Y2ggKGFkZC1ob29rICdpc2VhcmNoLW1vZGUtZW5kLWhvb2sgICdtdWx0aS1p c2VhcmNoLWVuZCkpDQogCSAgICA7OyBDb3B5IG5ldyBsb2NhbCB2YWx1ZXMg dG8gaXNlYXJjaCBnbG9iYWxzDQogCSAgICAoc2V0cSBpc2VhcmNoLXN0cmlu ZyBpc2VhcmNoLW5ldy1zdHJpbmcNCiAJCSAgaXNlYXJjaC1tZXNzYWdlIGlz ZWFyY2gtbmV3LW1lc3NhZ2UNCiAJCSAgaXNlYXJjaC1mb3J3YXJkIGlzZWFy Y2gtbmV3LWZvcndhcmQNCiAJCSAgaXNlYXJjaC13b3JkIGlzZWFyY2gtbmV3 LXdvcmQNCi0JCSAgaXNlYXJjaC1jYXNlLWZvbGQtc2VhcmNoIGlzZWFyY2gt bmV3LWNhc2UtZm9sZCkpDQorCQkgIGlzZWFyY2gtY2FzZS1mb2xkLXNlYXJj aCBpc2VhcmNoLW5ldy1jYXNlLWZvbGQNCisgICAgICAgICAgICAgICAgICBt dWx0aS1pc2VhcmNoLWZpbGUtbGlzdCBtdWx0aS1pc2VhcmNoLWZpbGUtbGlz dC1uZXcNCisgICAgICAgICAgICAgICAgICBtdWx0aS1pc2VhcmNoLWJ1ZmZl ci1saXN0IG11bHRpLWlzZWFyY2gtYnVmZmVyLWxpc3QtbmV3DQorICAgICAg ICAgICAgICAgICAgbXVsdGktaXNlYXJjaC1jdXJyZW50LWJ1ZmZlciBtdWx0 aS1pc2VhcmNoLWN1cnJlbnQtYnVmZmVyLW5ldw0KKyAgICAgICAgICAgICAg ICAgIG11bHRpLWlzZWFyY2gtbmV4dC1idWZmZXItY3VycmVudC1mdW5jdGlv biBtdWx0aS1pc2VhcmNoLW5leHQtYnVmZmVyLWN1cnJlbnQtZnVuY3Rpb24t bmV3KSkNCiANCiAJICA7OyBFbXB0eSBpc2VhcmNoLXN0cmluZyBtZWFucyB1 c2UgZGVmYXVsdC4NCiAJICAod2hlbiAoPSAwIChsZW5ndGggaXNlYXJjaC1z dHJpbmcpKQ0K --1468197610-1159872123-1444713505=:28366--