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#21684: 25.0.50; undo in query-replace w/o exit Date: Wed, 14 Oct 2015 22:26:22 +0900 (JST) Message-ID: NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: multipart/mixed; BOUNDARY="1468197610-1120540184-1444829183=:16988" X-Trace: ger.gmane.org 1444829158 29997 80.91.229.3 (14 Oct 2015 13:25:58 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 14 Oct 2015 13:25:58 +0000 (UTC) To: 21684@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Wed Oct 14 15:25:41 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 1ZmM3i-0005H8-0U for geb-bug-gnu-emacs@m.gmane.org; Wed, 14 Oct 2015 15:25:34 +0200 Original-Received: from localhost ([::1]:42323 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZmM3h-00040R-48 for geb-bug-gnu-emacs@m.gmane.org; Wed, 14 Oct 2015 09:25:33 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:37613) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZmM2I-0003bR-UB for bug-gnu-emacs@gnu.org; Wed, 14 Oct 2015 09:24:08 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZmM2E-0006tG-T6 for bug-gnu-emacs@gnu.org; Wed, 14 Oct 2015 09:24:06 -0400 Original-Received: from debbugs.gnu.org ([208.118.235.43]:50644) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZmM2E-0006tB-FY for bug-gnu-emacs@gnu.org; Wed, 14 Oct 2015 09:24:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.80) (envelope-from ) id 1ZmM2E-0007rC-3h for bug-gnu-emacs@gnu.org; Wed, 14 Oct 2015 09:24: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 13:24:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 21684 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: X-Debbugs-Original-To: bug-gnu-emacs@gnu.org Original-Received: via spool by submit@debbugs.gnu.org id=B.144482901430164 (code B ref -1); Wed, 14 Oct 2015 13:24:01 +0000 Original-Received: (at submit) by debbugs.gnu.org; 14 Oct 2015 13:23:34 +0000 Original-Received: from localhost ([127.0.0.1]:39615 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1ZmM1l-0007qS-E2 for submit@debbugs.gnu.org; Wed, 14 Oct 2015 09:23:33 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:55627) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1ZmM1j-0007qK-GH for submit@debbugs.gnu.org; Wed, 14 Oct 2015 09:23:32 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZmM1d-0006gQ-Nv for submit@debbugs.gnu.org; Wed, 14 Oct 2015 09:23:31 -0400 Original-Received: from lists.gnu.org ([2001:4830:134:3::11]:39399) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZmM1d-0006gK-3r for submit@debbugs.gnu.org; Wed, 14 Oct 2015 09:23:25 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:37338) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZmM1b-0002pk-SW for bug-gnu-emacs@gnu.org; Wed, 14 Oct 2015 09:23:24 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZmM1W-0006dk-0T for bug-gnu-emacs@gnu.org; Wed, 14 Oct 2015 09:23:23 -0400 Original-Received: from calancha-ilc.kek.jp ([130.87.234.234]:51686) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZmM1V-0006cu-Ek for bug-gnu-emacs@gnu.org; Wed, 14 Oct 2015 09:23:17 -0400 Original-Received: by calancha-ilc.kek.jp (Postfix, from userid 500) id 19BBDB0F1; Wed, 14 Oct 2015 22:26:23 +0900 (JST) Original-Received: from localhost (localhost [127.0.0.1]) by calancha-ilc.kek.jp (Postfix) with ESMTP id 001058E0A for ; Wed, 14 Oct 2015 22:26:22 +0900 (JST) X-X-Sender: calancha@calancha-ilc.kek.jp User-Agent: Alpine 2.20 (LRH 67 2015-01-07) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). 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:107603 Archived-At: --1468197610-1120540184-1444829183=:16988 Content-Type: text/plain; format=flowed; charset=US-ASCII In GNU Emacs 25.0.50.1 (x86_64-unknown-linux-gnu, GTK+ Version 2.24.23) of 2015-10-14 Repository revision: 38f99a02b83e9e408970cb7abdb685725b2004f9 Quite often, performing query-replace, i just hit the [space] quicky with no much attention. If i replace one string by mistake, i can comeback to it with "^", but if i edit the string with "E" to reset it to its original value, the interactive query-replace session ends. I found useful if we can undo such replacements without exiting the query-replace. The attached patch implement such behaviour for `query-replace'. Having this also working for `query-replace-regexp' would be very nice, but harder to implement. --1468197610-1120540184-1444829183=:16988 Content-Type: text/plain; charset=US-ASCII; name=replace.patch Content-Transfer-Encoding: BASE64 Content-ID: Content-Description: Content-Disposition: attachment; filename=replace.patch ZGlmZiAtLWdpdCBhL2xpc3AvcmVwbGFjZS5lbCBiL2xpc3AvcmVwbGFjZS5l bA0KaW5kZXggM2E5MDhhYy4uZTNjOTA2YiAxMDA2NDQNCi0tLSBhL2xpc3Av cmVwbGFjZS5lbA0KKysrIGIvbGlzcC9yZXBsYWNlLmVsDQpAQCAtMTgwMiw2 ICsxODAyLDcgQEAgcXVlcnktcmVwbGFjZS1oZWxwDQogQy1sIHRvIGNsZWFy IHRoZSBzY3JlZW4sIHJlZGlzcGxheSwgYW5kIG9mZmVyIHNhbWUgcmVwbGFj ZW1lbnQgYWdhaW4sDQogISB0byByZXBsYWNlIGFsbCByZW1haW5pbmcgbWF0 Y2hlcyBpbiB0aGlzIGJ1ZmZlciB3aXRoIG5vIG1vcmUgcXVlc3Rpb25zLA0K IF4gdG8gbW92ZSBwb2ludCBiYWNrIHRvIHByZXZpb3VzIG1hdGNoLA0KK1Ug dG8gdW5kbyBwcmV2aW91cyByZXBsYWNlbWVudCAocXVlcmllcyB3LyByZWdl eHAgbm90IHN1cHBvcnRlZCksDQogRSB0byBlZGl0IHRoZSByZXBsYWNlbWVu dCBzdHJpbmcuDQogSW4gbXVsdGktYnVmZmVyIHJlcGxhY2VtZW50cyB0eXBl IGBZJyB0byByZXBsYWNlIGFsbCByZW1haW5pbmcNCiBtYXRjaGVzIGluIGFs bCByZW1haW5pbmcgYnVmZmVycyB3aXRoIG5vIG1vcmUgcXVlc3Rpb25zLA0K QEAgLTE4MzEsNiArMTgzMiw4IEBAIHF1ZXJ5LXJlcGxhY2UtbWFwDQogICAg IChkZWZpbmUta2V5IG1hcCAiXEMtbCIgJ3JlY2VudGVyKQ0KICAgICAoZGVm aW5lLWtleSBtYXAgIiEiICdhdXRvbWF0aWMpDQogICAgIChkZWZpbmUta2V5 IG1hcCAiXiIgJ2JhY2t1cCkNCisgICAgKGRlZmluZS1rZXkgbWFwICJ1IiAn dW5kbykNCisgICAgKGRlZmluZS1rZXkgbWFwICJVIiAndW5kbykNCiAgICAg KGRlZmluZS1rZXkgbWFwICJcQy1oIiAnaGVscCkNCiAgICAgKGRlZmluZS1r ZXkgbWFwIFtmMV0gJ2hlbHApDQogICAgIChkZWZpbmUta2V5IG1hcCBbaGVs cF0gJ2hlbHApDQpAQCAtMTg1Niw3ICsxODU5LDcgQEAgcXVlcnktcmVwbGFj ZS1tYXANCiBgYWN0LWFuZC1leGl0JywgYGV4aXQnLCBgZXhpdC1wcmVmaXgn LCBgcmVjZW50ZXInLCBgc2Nyb2xsLXVwJywNCiBgc2Nyb2xsLWRvd24nLCBg c2Nyb2xsLW90aGVyLXdpbmRvdycsIGBzY3JvbGwtb3RoZXItd2luZG93LWRv d24nLA0KIGBlZGl0JywgYGVkaXQtcmVwbGFjZW1lbnQnLCBgZGVsZXRlLWFu ZC1lZGl0JywgYGF1dG9tYXRpYycsDQotYGJhY2t1cCcsIGBxdWl0JywgYW5k IGBoZWxwJy4NCitgYmFja3VwJywgYHVuZG8nLCBgcXVpdCcsIGFuZCBgaGVs cCcuDQogDQogVGhpcyBrZXltYXAgaXMgdXNlZCBieSBgeS1vci1uLXAnIGFz IHdlbGwgYXMgYHF1ZXJ5LXJlcGxhY2UnLiIpDQogDQpAQCAtMjMzMiw2ICsy MzM1LDMyIEBAIHBlcmZvcm0tcmVwbGFjZQ0KIAkJCSAgIChtZXNzYWdlICJO byBwcmV2aW91cyBtYXRjaCIpDQogCQkJICAgKGRpbmcgJ25vLXRlcm1pbmF0 ZSkNCiAJCQkgICAoc2l0LWZvciAxKSkpDQorCQkJKChlcSBkZWYgJ3VuZG8p DQorCQkJIChjb25kIChyZWdleHAtZmxhZw0KKwkJCQkJKG1lc3NhZ2UgIlVu ZG8gbm90IHN1cHBvcnRlZCBpbiBxdWVyaWVzIHdpdGggcmVnZXhwIikNCisJ CQkJCShkaW5nICduby10ZXJtaW5hdGUpDQorCQkJCQkoc2l0LWZvciAxKSkN CisJCQkJICAgKHQNCisJCQkJCSA7OyBiaW5kIGxvY2FsbHkgc3dhcHBlZCB2 YWx1ZXMgKHNlYXJjaC1zdHJpbmcvcmVwbGFjZW1lbnQpDQorCQkJCQkobGV0 KiAoKHNlYXJjaC1zdHJpbmctMSAgIG5leHQtcmVwbGFjZW1lbnQpDQorCQkJ CQkgICAgICAgKG5leHQtcmVwbGFjZW1lbnQgIHNlYXJjaC1zdHJpbmcpDQor ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAoc2VhcmNoLXN0cmluZyAgICAgc2VhcmNoLXN0cmluZy0xKQ0KKyAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKGVs dCAgICAgICAgICAgICAgIChpZiBzdGFjayAocG9wIHN0YWNrKSAobWF0Y2gt ZGF0YSkpKSkNCisJCQkJCSAgKGdvdG8tY2hhciAobnRoIDAgZWx0KSkNCisJ CQkJCSAgKHNldHEgcmVwbGFjZWQgKG50aCAxIGVsdCkpDQorCQkJCQkgIChh bmQgcmVwbGFjZWQgKGdvdG8tY2hhciAoLSAocG9pbnQpIChsZW5ndGggbmV4 dC1yZXBsYWNlbWVudCkpKSkNCisNCisJCQkJCSAgKHJlcGxhY2UtbWF0Y2gt bWF5YmUtZWRpdA0KKwkJCQkJICAgbmV4dC1yZXBsYWNlbWVudCBub2Nhc2lm eSBsaXRlcmFsDQorCQkJCQkgICBub2VkaXQgcmVhbC1tYXRjaC1kYXRhIGJh Y2t3YXJkKQ0KKw0KKwkJCQkJICAoc2V0cSBub2VkaXQgbmlsDQorICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIHJlcGxhY2UtY291bnQgKDEtIHJlcGxhY2UtY291bnQpDQorICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIHJlcGxhY2VkIG5pbA0KKyAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICByZWFsLW1hdGNoLWRhdGEN CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgKHJlcGxhY2UtbWF0Y2gtZGF0YQ0KKyAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg dCByZWFsLW1hdGNoLWRhdGENCisgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIChudGggMiBlbHQpKSkp KSkpDQogCQkJKChlcSBkZWYgJ2FjdCkNCiAJCQkgKG9yIHJlcGxhY2VkDQog CQkJICAgICAoc2V0cSBub2VkaXQNCg== --1468197610-1120540184-1444829183=:16988--