From unknown Fri Jun 13 11:26:59 2025 X-Loop: help-debbugs@gnu.org Subject: bug#37287: 26.3.50; query-replace-regexp undo does not update next-replacement Resent-From: Tino Calancha Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Mon, 02 Sep 2019 20:02:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 37287 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: To: 37287@debbugs.gnu.org X-Debbugs-Original-To: bug-gnu-emacs@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.15674544645745 (code B ref -1); Mon, 02 Sep 2019 20:02:02 +0000 Received: (at submit) by debbugs.gnu.org; 2 Sep 2019 20:01:04 +0000 Received: from localhost ([127.0.0.1]:59006 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i4sVb-0001Ua-KB for submit@debbugs.gnu.org; Mon, 02 Sep 2019 16:01:04 -0400 Received: from lists.gnu.org ([209.51.188.17]:47300) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i4sVa-0001UG-02 for submit@debbugs.gnu.org; Mon, 02 Sep 2019 16:01:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55345) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i4sVX-0004VS-Tn for bug-gnu-emacs@gnu.org; Mon, 02 Sep 2019 16:01:01 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=BAYES_40,FREEMAIL_FROM, URIBL_BLOCKED autolearn=disabled version=3.3.2 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i4sVV-000779-W4 for bug-gnu-emacs@gnu.org; Mon, 02 Sep 2019 16:00:59 -0400 Received: from mail-wr1-x435.google.com ([2a00:1450:4864:20::435]:45323) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i4sVV-00076J-Nd for bug-gnu-emacs@gnu.org; Mon, 02 Sep 2019 16:00:57 -0400 Received: by mail-wr1-x435.google.com with SMTP id q12so15042636wrj.12 for ; Mon, 02 Sep 2019 13:00:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:mime-version; bh=pn3ljksHLZ+orkY3OaI/5o2HrFtu6Awe3qSGUvfVZC4=; b=RyuUflWxm/neP3i2it3nklt7O6n+HlWEsLuI1K61skLqhW3fOEq+W4XBmbRYEpzg6K CV/6XH7bWYhuljSN6o8dGR1W3YM9CB+SfTvlBBAzMZtqV6ukBt3MnVhCsKmOKpEndAqy b5STQDpbhXlMziB1VHKE1+0ykLvCJkIHL71dDGP1pRNSzC25P9PXXimGDGSehRQpCa+3 ZvsclkZ+cUON9abnc1Z9RtPNpaXggfSX+4vUORARZ/EzFeF7SRXP0TV/0Zhc1gTulQVB RquyT9jQilEek18R+8Wwp1vIMproJs/qVbDq6vPhPoqK79ZvguHtA59gYgwr8FB7Nit9 350A== 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:date:message-id:mime-version; bh=pn3ljksHLZ+orkY3OaI/5o2HrFtu6Awe3qSGUvfVZC4=; b=hgPvu9EAmME+EHWgdIkXgY7d9jYnNsBPZnpZVu1svwbPRr4CjfcCjn2ywggfjprZjG KF+pDuoFz61HBZMTkOQEvD+ql/hQXa1M8fkCuNmxVdsILDw7b6hwP4UJGD6qlKwrqd3y mb2P6VRafTNUQVOV3DDgn5KcG1VTWnR+4NhmVp0VjGuFrSpTAmIHlj5oBt8Wmaw3GU1Y vi/5s62vrcx7s1btHXcFmI1vkpJKwRqVL9bkgoT/Mi28odA7216IoSCkM2Pcs7tH11uV 02ouqldu9JEiGsIctEbWx57HyyFjGCbKenUTTY1AI8IONZvNCSgBW5zw8Yrt4gUic/pH Vm6g== X-Gm-Message-State: APjAAAWE9NIY5ULffaT14Fz2RPu1O1eBc/GxG/cAa8Q/qfs+2oRQvKje eG/E7atj73o/jxdw6Q2RSz38QHXL X-Google-Smtp-Source: APXvYqxnCQkOm8h/dODj00Lwj88KY+V0BniSfnxfAZG2jVRBvW3YrEzIJBzEbP2DC4yZl8DMgcWOUA== X-Received: by 2002:a5d:5049:: with SMTP id h9mr21408661wrt.101.1567454455913; Mon, 02 Sep 2019 13:00:55 -0700 (PDT) Received: from calancha-pc.dy.bbexcite.jp ([2a02:8308:70c5:4d00:a2fc:1435:82df:8682]) by smtp.gmail.com with ESMTPSA id f13sm14050221wrr.5.2019.09.02.13.00.54 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Sep 2019 13:00:55 -0700 (PDT) From: Tino Calancha Date: Mon, 02 Sep 2019 22:00:44 +0200 Message-ID: <87zhjmo4cz.fsf@calancha-pc.dy.bbexcite.jp> MIME-Version: 1.0 Content-Type: text/plain X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::435 X-Spam-Score: -1.3 (-) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) emacs -Q C-x b foo RET M-: (insert "foo-1\nfoo-2\nfoo-3") RET M-< C-M-% \([0-9]\) RET \,(format "%d" (1+ (string-to-number \1))) RET SPC SPC U SPC q ;; buffer contains "foo-4\nfoo-2\nfoo-3" ;; expected "foo-2\nfoo-2\nfoo-3" --8<-----------------------------cut here---------------start------------->8--- commit ff57cbdde0ae9382e043bf335a52ed91ba1b205e Author: Tino Calancha Date: Mon Sep 2 21:58:04 2019 +0200 query-replace-regexp undo: Update next-replacement after undo * lisp/replace.el (perform-replace): Use last-replacement for the local binding to not shadow next-replacement. Update next-replacement after undo (Bug#37287). * test/lisp/replace-tests.el (query-replace-undo-bug37287): Add test. (query-replace-undo-bug37073): Tweak this test. diff --git a/lisp/replace.el b/lisp/replace.el index 0ddebb1270..dd24d8ba92 100644 --- a/lisp/replace.el +++ b/lisp/replace.el @@ -2584,7 +2584,7 @@ perform-replace (num-replacements 0) (nocasify t) ; Undo must preserve case (Bug#31073). search-string - next-replacement) + last-replacement) (while (and (< stack-idx stack-len) stack (or (null replaced) last-was-act-and-show)) @@ -2595,9 +2595,9 @@ perform-replace ;; Bind swapped values ;; (search-string <--> replacement) search-string (nth (if replaced 4 3) elt) - next-replacement (nth (if replaced 3 4) elt) + last-replacement (nth (if replaced 3 4) elt) search-string-replaced search-string - next-replacement-replaced next-replacement + last-replacement-replaced last-replacement last-was-act-and-show nil) (when (and (= stack-idx stack-len) @@ -2619,16 +2619,18 @@ perform-replace (match-data t (nth 2 elt))) noedit (replace-match-maybe-edit - next-replacement nocasify literal + last-replacement nocasify literal noedit real-match-data backward) replace-count (1- replace-count) real-match-data (save-excursion (goto-char (match-beginning 0)) (if regexp-flag - (looking-at next-replacement) - (looking-at (regexp-quote next-replacement))) + (looking-at last-replacement) + (looking-at (regexp-quote last-replacement))) (match-data t (nth 2 elt)))) + (when regexp-flag + (setq next-replacement (nth 4 elt))) ;; Set replaced nil to keep in loop (when (eq def 'undo-all) (setq replaced nil diff --git a/test/lisp/replace-tests.el b/test/lisp/replace-tests.el index cd08a522e3..2a3f207e47 100644 --- a/test/lisp/replace-tests.el +++ b/test/lisp/replace-tests.el @@ -463,7 +463,9 @@ replace-tests--query-replace-undo (should (replace-tests-with-undo input "theorem \\([0-9]+\\)" - "theorem \\\\ref{theo_\\1}" + '(replace-eval-replacement + replace-quote + (format "theorem \\\\ref{theo_%d}" (1+ (string-to-number (match-string 1))))) ((?\s . (1 2)) (?U . (3))) ?q (string= input (buffer-string))))) @@ -479,4 +481,18 @@ replace-tests--query-replace-undo ?q (string= expected (buffer-string)))))) +(ert-deftest query-replace-undo-bug37287 () + "Test for https://debbugs.gnu.org/37287 ." + (let ((input "foo-1\nfoo-2\nfoo-3") + (expected "foo-2\nfoo-2\nfoo-3")) + (should + (replace-tests-with-undo + input "\\([0-9]\\)" + '(replace-eval-replacement + replace-quote + (format "%d" (1+ (string-to-number (match-string 1))))) + ((?\s . (1 2 4)) (?U . (3))) + ?q + (string= expected (buffer-string)))))) + ;;; replace-tests.el ends here --8<-----------------------------cut here---------------end--------------->8--- In GNU Emacs 26.3.50 (build 4, x86_64-pc-linux-gnu, GTK+ Version 3.24.5) of 2019-09-02 built on calancha-pc.dy.bbexcite.jp Repository revision: 7e527af72cae65fdb3f61c7d92907cfdfd1e6ea3 Windowing system distributor 'The X.Org Foundation', version 11.0.12004000 System Description: Debian GNU/Linux 10 (buster) From debbugs-submit-bounces@debbugs.gnu.org Mon Sep 02 16:03:31 2019 Received: (at control) by debbugs.gnu.org; 2 Sep 2019 20:03:31 +0000 Received: from localhost ([127.0.0.1]:59011 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i4sXz-0001Yu-9h for submit@debbugs.gnu.org; Mon, 02 Sep 2019 16:03:31 -0400 Received: from mail-wr1-f52.google.com ([209.85.221.52]:41978) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i4sXw-0001Yb-DB for control@debbugs.gnu.org; Mon, 02 Sep 2019 16:03:29 -0400 Received: by mail-wr1-f52.google.com with SMTP id j16so15081353wrr.8 for ; Mon, 02 Sep 2019 13:03:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:message-id:to:from:subject; bh=/kXKltzjU5QSLjonVIa9KpaFVogLnVY+oalkttuIqBY=; b=BFxyAcoSgrFnh7qaNJUnB/AL++xjN+tbxgiXEAzlC1RN/lMVHmZ8MCyNdZeWGjE+Hi xdMKkS9wa0UXe78+l0wn0sDW3QhTYvXdGRPlvLKJcCr92/s4B9+9kEA4xkjmMDBPgzKg LHBI+HSySn0K/n6GhJfFGZYuwNG2cwNmxbtQLwirFMpXpUatEUsrE9C7gFBJkGXhKEdv iOoeQgUt1qtn0XS93AHm+UFxZzMY/9NZbYu4MqYs/tiI8AjT7B2XXPu6HA2B8mrsgKSY cPaEsA/g/n8538zYsotgWG1yAtznwMPHGCudTclXWC2dYHHqLysqiTuko7viBPRgm2up gyuA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:message-id:to:from:subject; bh=/kXKltzjU5QSLjonVIa9KpaFVogLnVY+oalkttuIqBY=; b=rf56cbGqRHqJqHVHVPp0yAn/1S/6Sv2TnI3KJKLi43G6Ie6ZhoAaY5yFN2mpMCrjIT fF6ZyR00dD3d40zvSE7BfmMFw98h9Ir4LY13vOHZA4jtVPb05O1mjG0EqE+2j52oijuE /cH8bOY6csch8dBnB+ziOS56TqJ9MXMoWiMKsXpws0yjkiKbFtxrD1d4uPEQRIcLPV91 7IZph1vCRTa6A+7fHsek2q7ObiSeUb7z5PtdQqvW6J36GoReLvIsXi1SvVQarIsOFp0G z8KRcyQkx7WPVCKJ3lOUz5O81YjnvqrZeADQMXFrvHrgxUBlS892rhBDkKFfF0qI+Cgv rA1g== X-Gm-Message-State: APjAAAWW7sKFBXOiDlFyCMWEEIHP5vjOBkJok67PROmXqekUAoDp/rYw APqsGDxrRzbFYsQzM79e9IVNPj4Z X-Google-Smtp-Source: APXvYqzdt9MZfUumalI9Dp8/n5ctsSRdfvFmSbu1DMcP9s+N54knEswPRqihockgGA9Vm/D6sZig6Q== X-Received: by 2002:a05:6000:2:: with SMTP id h2mr16163315wrx.309.1567454602067; Mon, 02 Sep 2019 13:03:22 -0700 (PDT) Received: from calancha-pc.dy.bbexcite.jp ([2a02:8308:70c5:4d00:a2fc:1435:82df:8682]) by smtp.gmail.com with ESMTPSA id l62sm36976010wml.13.2019.09.02.13.03.21 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Sep 2019 13:03:21 -0700 (PDT) Date: Mon, 02 Sep 2019 22:03:20 +0200 Message-Id: <87y2z6o48n.fsf@calancha-pc.dy.bbexcite.jp> To: control@debbugs.gnu.org From: Tino Calancha Subject: control message for bug #37287 X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: control X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) tags 37287 + patch quit From unknown Fri Jun 13 11:26:59 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Tino Calancha Subject: bug#37287: closed (Re: bug#37287: 26.3.50; query-replace-regexp undo does not update next-replacement) Message-ID: References: <87v9u2htnp.fsf@calancha-pc.dy.bbexcite.jp> <87zhjmo4cz.fsf@calancha-pc.dy.bbexcite.jp> X-Gnu-PR-Message: they-closed 37287 X-Gnu-PR-Package: emacs X-Gnu-PR-Keywords: patch Reply-To: 37287@debbugs.gnu.org Date: Mon, 09 Sep 2019 06:27:01 +0000 Content-Type: multipart/mixed; boundary="----------=_1568010421-3919-1" This is a multi-part message in MIME format... ------------=_1568010421-3919-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #37287: 26.3.50; query-replace-regexp undo does not update next-replacement which was filed against the emacs package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 37287@debbugs.gnu.org. --=20 37287: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D37287 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1568010421-3919-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 37287-done) by debbugs.gnu.org; 9 Sep 2019 06:26:51 +0000 Received: from localhost ([127.0.0.1]:39468 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i7D8U-00010k-SO for submit@debbugs.gnu.org; Mon, 09 Sep 2019 02:26:51 -0400 Received: from mail-wr1-f49.google.com ([209.85.221.49]:44623) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i7D8S-00010X-9I for 37287-done@debbugs.gnu.org; Mon, 09 Sep 2019 02:26:49 -0400 Received: by mail-wr1-f49.google.com with SMTP id k6so274559wrn.11 for <37287-done@debbugs.gnu.org>; Sun, 08 Sep 2019 23:26:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:in-reply-to:message-id:mime-version; bh=hTtiaLcDUqVtGgVI/eXm2rWQmz00/x5h5eXbyNejBsA=; b=G52m7rVSYFJPeS9Gbq9ZPiMSgeFjNOn5lsGfzPMsRhA/5OVugeemhVDo4tFhSkrDyf grmbg1AqmCmUfNvPRMN5k8oeTOYMNfTZ2de+NVn23554LZhcA1srJP3myHNRyGcUgjaV zJ5fYGV/7Y+Ki6nhYY6SqOZxP/6zgWTWuKdK/HB6hO9d1nv4uUlLC0IKb7nHo+BsoZDC EAZEddYN23V5zOUFA5/kbzx1ETFfvKrK0rBYmjliFwdU1caGbUBrKvJA006R+AGrtVWc KGg0T+zYpLI/wBtJZNks3mii17VPwON0cqgbxvu2gNDpGr9jVtomW8a3kDvLPjLXdpfy JYyQ== 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:date:in-reply-to:message-id :mime-version; bh=hTtiaLcDUqVtGgVI/eXm2rWQmz00/x5h5eXbyNejBsA=; b=AkKfRarT47pCVxO4NSCNluhECoE+R+yEtn7L1tiPbV9l5iklF513zblccbmUkLkQAE RurTKp7Dmj96vSk26HMHoqZfl0ot+CeeAs7dQKfuAhr4rUMvP9A7tPl1d/doW9QiakgW EHnk/EzsVgCR093NCJToeqba14fJN7MVfHmXSll6oEEgghmbP9C1BEhCJT2CMJ7/U9X5 5EsdwWSYxIXfe9QT8Z1N0cThajgHlXroUrceFvbxbaXzfi0r4mnBivitiW3T6kvcj5mF dc/HPj2c/jLyyrb84Mx0qyhvL+2ZBnNFCKLvqprIs59RrVJjomnWL+SEE4dpKI06n0/a g/IQ== X-Gm-Message-State: APjAAAXa0L39vU4ChEdBmbWkPQhVVSRCKvdtrVcP/WwdEiZxMvsS2ikm DYVJ2vUbUBg07/6X9zi2Q0DLQ/aHbsk= X-Google-Smtp-Source: APXvYqxtRW5vX98uq0lPB9cJ/6qOvowqzPJtBqmLOCe8bi7mpRNl+Gik1l9EVG+clLkMfvOd9ChI5A== X-Received: by 2002:adf:ed05:: with SMTP id a5mr8859334wro.35.1568010402147; Sun, 08 Sep 2019 23:26:42 -0700 (PDT) Received: from calancha-pc.dy.bbexcite.jp ([2a02:8308:70c5:4d00:a2fc:1435:82df:8682]) by smtp.gmail.com with ESMTPSA id m17sm14405630wrs.9.2019.09.08.23.26.40 for <37287-done@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 08 Sep 2019 23:26:41 -0700 (PDT) From: Tino Calancha To: 37287-done@debbugs.gnu.org Subject: Re: bug#37287: 26.3.50; query-replace-regexp undo does not update next-replacement Date: Mon, 09 Sep 2019 08:26:34 +0200 In-Reply-To: Tino Calancha's message of "Mon\, 02 Sep 2019 22\:00\:44 +0200 \(6 days\, 10 hours\, 19 minutes ago\)" Message-ID: <87v9u2htnp.fsf@calancha-pc.dy.bbexcite.jp> MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 37287-done X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) > emacs -Q > C-x b foo RET > M-: (insert "foo-1\nfoo-2\nfoo-3") RET > M-< > C-M-% \([0-9]\) RET > \,(format "%d" (1+ (string-to-number \1))) RET > SPC > SPC > U > SPC > q > > ;; buffer contains > "foo-4\nfoo-2\nfoo-3" > ;; expected > "foo-2\nfoo-2\nfoo-3" Fixed in emacs-26 branch with commit 'query-replace-regexp undo: Update next-replacement after undo' (30c4f35a6fc8a6507930923766c3126ac1c2063f) ------------=_1568010421-3919-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 2 Sep 2019 20:01:04 +0000 Received: from localhost ([127.0.0.1]:59006 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i4sVb-0001Ua-KB for submit@debbugs.gnu.org; Mon, 02 Sep 2019 16:01:04 -0400 Received: from lists.gnu.org ([209.51.188.17]:47300) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i4sVa-0001UG-02 for submit@debbugs.gnu.org; Mon, 02 Sep 2019 16:01:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55345) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i4sVX-0004VS-Tn for bug-gnu-emacs@gnu.org; Mon, 02 Sep 2019 16:01:01 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=BAYES_40,FREEMAIL_FROM, URIBL_BLOCKED autolearn=disabled version=3.3.2 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i4sVV-000779-W4 for bug-gnu-emacs@gnu.org; Mon, 02 Sep 2019 16:00:59 -0400 Received: from mail-wr1-x435.google.com ([2a00:1450:4864:20::435]:45323) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i4sVV-00076J-Nd for bug-gnu-emacs@gnu.org; Mon, 02 Sep 2019 16:00:57 -0400 Received: by mail-wr1-x435.google.com with SMTP id q12so15042636wrj.12 for ; Mon, 02 Sep 2019 13:00:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:mime-version; bh=pn3ljksHLZ+orkY3OaI/5o2HrFtu6Awe3qSGUvfVZC4=; b=RyuUflWxm/neP3i2it3nklt7O6n+HlWEsLuI1K61skLqhW3fOEq+W4XBmbRYEpzg6K CV/6XH7bWYhuljSN6o8dGR1W3YM9CB+SfTvlBBAzMZtqV6ukBt3MnVhCsKmOKpEndAqy b5STQDpbhXlMziB1VHKE1+0ykLvCJkIHL71dDGP1pRNSzC25P9PXXimGDGSehRQpCa+3 ZvsclkZ+cUON9abnc1Z9RtPNpaXggfSX+4vUORARZ/EzFeF7SRXP0TV/0Zhc1gTulQVB RquyT9jQilEek18R+8Wwp1vIMproJs/qVbDq6vPhPoqK79ZvguHtA59gYgwr8FB7Nit9 350A== 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:date:message-id:mime-version; bh=pn3ljksHLZ+orkY3OaI/5o2HrFtu6Awe3qSGUvfVZC4=; b=hgPvu9EAmME+EHWgdIkXgY7d9jYnNsBPZnpZVu1svwbPRr4CjfcCjn2ywggfjprZjG KF+pDuoFz61HBZMTkOQEvD+ql/hQXa1M8fkCuNmxVdsILDw7b6hwP4UJGD6qlKwrqd3y mb2P6VRafTNUQVOV3DDgn5KcG1VTWnR+4NhmVp0VjGuFrSpTAmIHlj5oBt8Wmaw3GU1Y vi/5s62vrcx7s1btHXcFmI1vkpJKwRqVL9bkgoT/Mi28odA7216IoSCkM2Pcs7tH11uV 02ouqldu9JEiGsIctEbWx57HyyFjGCbKenUTTY1AI8IONZvNCSgBW5zw8Yrt4gUic/pH Vm6g== X-Gm-Message-State: APjAAAWE9NIY5ULffaT14Fz2RPu1O1eBc/GxG/cAa8Q/qfs+2oRQvKje eG/E7atj73o/jxdw6Q2RSz38QHXL X-Google-Smtp-Source: APXvYqxnCQkOm8h/dODj00Lwj88KY+V0BniSfnxfAZG2jVRBvW3YrEzIJBzEbP2DC4yZl8DMgcWOUA== X-Received: by 2002:a5d:5049:: with SMTP id h9mr21408661wrt.101.1567454455913; Mon, 02 Sep 2019 13:00:55 -0700 (PDT) Received: from calancha-pc.dy.bbexcite.jp ([2a02:8308:70c5:4d00:a2fc:1435:82df:8682]) by smtp.gmail.com with ESMTPSA id f13sm14050221wrr.5.2019.09.02.13.00.54 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Sep 2019 13:00:55 -0700 (PDT) From: Tino Calancha To: bug-gnu-emacs@gnu.org Subject: 26.3.50; query-replace-regexp undo does not update next-replacement Date: Mon, 02 Sep 2019 22:00:44 +0200 Message-ID: <87zhjmo4cz.fsf@calancha-pc.dy.bbexcite.jp> MIME-Version: 1.0 Content-Type: text/plain X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::435 X-Spam-Score: -1.3 (-) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) emacs -Q C-x b foo RET M-: (insert "foo-1\nfoo-2\nfoo-3") RET M-< C-M-% \([0-9]\) RET \,(format "%d" (1+ (string-to-number \1))) RET SPC SPC U SPC q ;; buffer contains "foo-4\nfoo-2\nfoo-3" ;; expected "foo-2\nfoo-2\nfoo-3" --8<-----------------------------cut here---------------start------------->8--- commit ff57cbdde0ae9382e043bf335a52ed91ba1b205e Author: Tino Calancha Date: Mon Sep 2 21:58:04 2019 +0200 query-replace-regexp undo: Update next-replacement after undo * lisp/replace.el (perform-replace): Use last-replacement for the local binding to not shadow next-replacement. Update next-replacement after undo (Bug#37287). * test/lisp/replace-tests.el (query-replace-undo-bug37287): Add test. (query-replace-undo-bug37073): Tweak this test. diff --git a/lisp/replace.el b/lisp/replace.el index 0ddebb1270..dd24d8ba92 100644 --- a/lisp/replace.el +++ b/lisp/replace.el @@ -2584,7 +2584,7 @@ perform-replace (num-replacements 0) (nocasify t) ; Undo must preserve case (Bug#31073). search-string - next-replacement) + last-replacement) (while (and (< stack-idx stack-len) stack (or (null replaced) last-was-act-and-show)) @@ -2595,9 +2595,9 @@ perform-replace ;; Bind swapped values ;; (search-string <--> replacement) search-string (nth (if replaced 4 3) elt) - next-replacement (nth (if replaced 3 4) elt) + last-replacement (nth (if replaced 3 4) elt) search-string-replaced search-string - next-replacement-replaced next-replacement + last-replacement-replaced last-replacement last-was-act-and-show nil) (when (and (= stack-idx stack-len) @@ -2619,16 +2619,18 @@ perform-replace (match-data t (nth 2 elt))) noedit (replace-match-maybe-edit - next-replacement nocasify literal + last-replacement nocasify literal noedit real-match-data backward) replace-count (1- replace-count) real-match-data (save-excursion (goto-char (match-beginning 0)) (if regexp-flag - (looking-at next-replacement) - (looking-at (regexp-quote next-replacement))) + (looking-at last-replacement) + (looking-at (regexp-quote last-replacement))) (match-data t (nth 2 elt)))) + (when regexp-flag + (setq next-replacement (nth 4 elt))) ;; Set replaced nil to keep in loop (when (eq def 'undo-all) (setq replaced nil diff --git a/test/lisp/replace-tests.el b/test/lisp/replace-tests.el index cd08a522e3..2a3f207e47 100644 --- a/test/lisp/replace-tests.el +++ b/test/lisp/replace-tests.el @@ -463,7 +463,9 @@ replace-tests--query-replace-undo (should (replace-tests-with-undo input "theorem \\([0-9]+\\)" - "theorem \\\\ref{theo_\\1}" + '(replace-eval-replacement + replace-quote + (format "theorem \\\\ref{theo_%d}" (1+ (string-to-number (match-string 1))))) ((?\s . (1 2)) (?U . (3))) ?q (string= input (buffer-string))))) @@ -479,4 +481,18 @@ replace-tests--query-replace-undo ?q (string= expected (buffer-string)))))) +(ert-deftest query-replace-undo-bug37287 () + "Test for https://debbugs.gnu.org/37287 ." + (let ((input "foo-1\nfoo-2\nfoo-3") + (expected "foo-2\nfoo-2\nfoo-3")) + (should + (replace-tests-with-undo + input "\\([0-9]\\)" + '(replace-eval-replacement + replace-quote + (format "%d" (1+ (string-to-number (match-string 1))))) + ((?\s . (1 2 4)) (?U . (3))) + ?q + (string= expected (buffer-string)))))) + ;;; replace-tests.el ends here --8<-----------------------------cut here---------------end--------------->8--- In GNU Emacs 26.3.50 (build 4, x86_64-pc-linux-gnu, GTK+ Version 3.24.5) of 2019-09-02 built on calancha-pc.dy.bbexcite.jp Repository revision: 7e527af72cae65fdb3f61c7d92907cfdfd1e6ea3 Windowing system distributor 'The X.Org Foundation', version 11.0.12004000 System Description: Debian GNU/Linux 10 (buster) ------------=_1568010421-3919-1--