From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Tino Calancha Newsgroups: gmane.emacs.bugs Subject: bug#31538: 26.1; query-replace undo fails if user edits the replacement string Date: Sun, 20 May 2018 21:39:26 +0900 Message-ID: <87o9hawlfl.fsf@gmail.com> References: <87r2m6wmod.fsf@gmail.com> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: blaine.gmane.org 1526819885 6408 195.159.176.226 (20 May 2018 12:38:05 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Sun, 20 May 2018 12:38:05 +0000 (UTC) User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.0.50 (gnu/linux) To: 31538@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Sun May 20 14:38:01 2018 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by blaine.gmane.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fKNb7-0001Yw-5S for geb-bug-gnu-emacs@m.gmane.org; Sun, 20 May 2018 14:38:01 +0200 Original-Received: from localhost ([::1]:46479 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fKNdE-0006m2-Ab for geb-bug-gnu-emacs@m.gmane.org; Sun, 20 May 2018 08:40:12 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:58712) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fKNd7-0006l1-8s for bug-gnu-emacs@gnu.org; Sun, 20 May 2018 08:40:06 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fKNd4-0000DS-6c for bug-gnu-emacs@gnu.org; Sun, 20 May 2018 08:40:05 -0400 Original-Received: from debbugs.gnu.org ([208.118.235.43]:33816) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fKNd4-0000CS-2T for bug-gnu-emacs@gnu.org; Sun, 20 May 2018 08:40:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1fKNd3-0001jW-KR for bug-gnu-emacs@gnu.org; Sun, 20 May 2018 08:40:01 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Tino Calancha Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sun, 20 May 2018 12:40:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 31538 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: Original-Received: via spool by 31538-submit@debbugs.gnu.org id=B31538.15268199786616 (code B ref 31538); Sun, 20 May 2018 12:40:01 +0000 Original-Received: (at 31538) by debbugs.gnu.org; 20 May 2018 12:39:38 +0000 Original-Received: from localhost ([127.0.0.1]:41710 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fKNcf-0001id-Q5 for submit@debbugs.gnu.org; Sun, 20 May 2018 08:39:37 -0400 Original-Received: from mail-pl0-f47.google.com ([209.85.160.47]:37180) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fKNcd-0001iM-MQ for 31538@debbugs.gnu.org; Sun, 20 May 2018 08:39:36 -0400 Original-Received: by mail-pl0-f47.google.com with SMTP id w19-v6so7174125plq.4 for <31538@debbugs.gnu.org>; Sun, 20 May 2018 05:39:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:references:date:in-reply-to:message-id:user-agent :mime-version; bh=9pGlBWjihmatiXa2pudB4QmQ598ZPx5gp3qllkN4/H0=; b=CFwC7ZT9ahLphWnXbQppj8S8hnaMgSny3m4MDjUHr7UjRaFjvVeyB0u/fDgk2+T1kD B6Q1RVBpGojCoApOc3AZOZlO+3PriMA1XFbJFrut6TCD7l4pydhT4yKU4yVeUnOthXQs DYcZw/cP2RCWZQqoKPI1rnoxHpZow/is7eLkIY4AamKCQxyFqpmHnAuZvPZHmRluN3O9 W34XZLdXmaqpVmVqXNLyhwCUJ2km0JhDJ/3IILAurM+tnPYX+eh8125yX7Nf2grdwTVt u4qbKdLEWcJyb+H8/d1jZC2iSww1vu2qPqCvwXgtNc/1z5i0ZsZPr8qaIWL9mk95gS74 54rw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:references:date:in-reply-to :message-id:user-agent:mime-version; bh=9pGlBWjihmatiXa2pudB4QmQ598ZPx5gp3qllkN4/H0=; b=emMDu12H+t2pFuyMZPN2IuIX5RtUxtG9XUyLHcfODmAceiFxtrFI2Vc4HoohcYeN1a vGIHJuvhDe7StQk5qcRFA9PK6rxUoxWUyhQi6Npa94ZmVMTv3tqUEtibdNxjGukADq0+ eQWvVq/Hnc+hp7iIcR2FQ7Zv2TgBEu56VRjWFCG6tPtqHFHyHbywYU34xWP6f2cm/lf6 vqjzX0xpwOjwBX+KxMLMqdBqpqlcFDsxr4DJR6uAl7vOyW5y2N5wLrc/hHo5LKUnXlbs OKgERdx6GkPeVXRh1Fk2Gp7u849Ua52DLUJ5Lck1z+zzGUouR3Mo0eE0kCc24D2H5tWl gigw== X-Gm-Message-State: ALKqPwclQE4mIhrfVlN07PkExkgeo8dku6JA3ClpizzXjeITdHL/+ocK ghPvtQRVo3yjB0gv1GKafE5hFw== X-Google-Smtp-Source: AB8JxZppE3oPFn5dLV7s4ivUEB63AUDXv31bK7f1HNJHEcrN4VLV80Onnb0xyRRAHzIWYT01/tHKaQ== X-Received: by 2002:a17:902:5409:: with SMTP id d9-v6mr8677030pli.1.1526819969652; Sun, 20 May 2018 05:39:29 -0700 (PDT) Original-Received: from calancha-pc (228.225.128.101.dy.bbexcite.jp. [101.128.225.228]) by smtp.gmail.com with ESMTPSA id q68-v6sm21064402pfb.182.2018.05.20.05.39.28 for <31538@debbugs.gnu.org> (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sun, 20 May 2018 05:39:29 -0700 (PDT) In-Reply-To: <87r2m6wmod.fsf@gmail.com> (Tino Calancha's message of "Sun, 20 May 2018 21:12:34 +0900") X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] 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" Xref: news.gmane.org gmane.emacs.bugs:146321 Archived-At: Tino Calancha writes: > M-< > M-% is RET foo RET SPC E bar RET U > ;; Just drop 'foo' but keeps 'bar'. Update the replacement string after the user has input the new value. --8<-----------------------------cut here---------------start------------->8--- commit 5655739cedb02946dd16071a64e51fcab08abf8b Author: Tino Calancha Date: Sun May 20 21:32:55 2018 +0900 Fix Bug#31538 * lisp/replace.el (perform-replace): Update the replacement string after the user edit it. diff --git a/lisp/replace.el b/lisp/replace.el index 3503b656d9..8605577066 100644 --- a/lisp/replace.el +++ b/lisp/replace.el @@ -2801,7 +2801,8 @@ perform-replace (replace-match-maybe-edit next-replacement nocasify literal noedit real-match-data backward) - replaced t)) + replaced t) + (setq next-replacement-replaced next-replacement)) (setq done t)) ((eq def 'delete-and-edit) --8<-----------------------------cut here---------------end--------------->8---