From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED.blaine.gmane.org!not-for-mail From: Tino Calancha Newsgroups: gmane.emacs.bugs Subject: bug#37287: 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 Injection-Info: blaine.gmane.org; posting-host="blaine.gmane.org:195.159.176.226"; logging-data="189324"; mail-complaints-to="usenet@blaine.gmane.org" To: 37287@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Mon Sep 02 22:02:13 2019 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([209.51.188.17]) by blaine.gmane.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1i4sWj-000n9M-1r for geb-bug-gnu-emacs@m.gmane.org; Mon, 02 Sep 2019 22:02:13 +0200 Original-Received: from localhost ([::1]:39698 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i4sWh-0004ie-Vz for geb-bug-gnu-emacs@m.gmane.org; Mon, 02 Sep 2019 16:02:12 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:55448) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i4sWa-0004hL-Td for bug-gnu-emacs@gnu.org; Mon, 02 Sep 2019 16:02:06 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i4sWY-0007k2-Vv for bug-gnu-emacs@gnu.org; Mon, 02 Sep 2019 16:02:04 -0400 Original-Received: from debbugs.gnu.org ([209.51.188.43]:50185) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i4sWY-0007jy-Si for bug-gnu-emacs@gnu.org; Mon, 02 Sep 2019 16:02:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1i4sWY-0001W8-N8 for bug-gnu-emacs@gnu.org; Mon, 02 Sep 2019 16:02: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: 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-Debbugs-Original-To: bug-gnu-emacs@gnu.org Original-Received: via spool by submit@debbugs.gnu.org id=B.15674544645745 (code B ref -1); Mon, 02 Sep 2019 20:02:02 +0000 Original-Received: (at submit) by debbugs.gnu.org; 2 Sep 2019 20:01:04 +0000 Original-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 Original-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 Original-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 Original-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 Original-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 Original-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) Original-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) X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. 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: 209.51.188.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:166164 Archived-At: 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)