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#37073: 26.2.90; query-replace-regexp undo feature missing quote the regexps Date: Sun, 18 Aug 2019 16:04:00 +0200 Message-ID: <87h86elgdr.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="74474"; mail-complaints-to="usenet@blaine.gmane.org" To: 37073@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Sun Aug 18 16:05:11 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 1hzLnz-000JGO-CE for geb-bug-gnu-emacs@m.gmane.org; Sun, 18 Aug 2019 16:05:11 +0200 Original-Received: from localhost ([::1]:41290 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1hzLnx-0005Z0-PA for geb-bug-gnu-emacs@m.gmane.org; Sun, 18 Aug 2019 10:05:09 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:52705) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1hzLnr-0005Xg-IA for bug-gnu-emacs@gnu.org; Sun, 18 Aug 2019 10:05:04 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hzLnq-0003mX-Di for bug-gnu-emacs@gnu.org; Sun, 18 Aug 2019 10:05:03 -0400 Original-Received: from debbugs.gnu.org ([209.51.188.43]:49496) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hzLnq-0003mR-Aj for bug-gnu-emacs@gnu.org; Sun, 18 Aug 2019 10:05:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hzLnq-0002o2-3F for bug-gnu-emacs@gnu.org; Sun, 18 Aug 2019 10:05: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: Sun, 18 Aug 2019 14:05:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 37073 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch X-Debbugs-Original-To: bug-gnu-emacs@gnu.org Original-Received: via spool by submit@debbugs.gnu.org id=B.156613706610734 (code B ref -1); Sun, 18 Aug 2019 14:05:01 +0000 Original-Received: (at submit) by debbugs.gnu.org; 18 Aug 2019 14:04:26 +0000 Original-Received: from localhost ([127.0.0.1]:58317 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hzLnF-0002n3-Mo for submit@debbugs.gnu.org; Sun, 18 Aug 2019 10:04:25 -0400 Original-Received: from lists.gnu.org ([209.51.188.17]:49768) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hzLnD-0002mv-Bk for submit@debbugs.gnu.org; Sun, 18 Aug 2019 10:04:24 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:52646) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1hzLnC-0005Sr-96 for bug-gnu-emacs@gnu.org; Sun, 18 Aug 2019 10:04:23 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hzLnB-0003VW-24 for bug-gnu-emacs@gnu.org; Sun, 18 Aug 2019 10:04:22 -0400 Original-Received: from mail-wr1-x429.google.com ([2a00:1450:4864:20::429]:44081) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hzLnA-0003Uy-QT for bug-gnu-emacs@gnu.org; Sun, 18 Aug 2019 10:04:21 -0400 Original-Received: by mail-wr1-x429.google.com with SMTP id p17so6002806wrf.11 for ; Sun, 18 Aug 2019 07:04:20 -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=xAAelrz5umkb8lw5p5rfKxpo0upYvzl+HfGPGTcu6yQ=; b=cC1y4Ufv8DPKxra6Ti/Ovz2An7Gsv/DlUy0ChBPAfBzgHcpWDCbb2SooYt+R2SUW6y y9Ygm+9il/tM3xBHYETxM3bBx1IkwB07JZqzFC91vSr4anVMbIx/sELAtIjLRVFmY8R5 uLVM/1TPKTOuXXimkmiB+qZy/gSDxFZatvcHD9PyA0NJNB1/fd6cBkPgF2Bc6KpoZu/L xEYKp+QTo4YK2cN7etcgawQ92HIYUg4mfVcAikad3ng+SASfLxalTVYEjV0EKBokR6xe Tn50vl5usggFYCZxQopirJCKxhhXqgJtpLRmNHiyCSnUvdEdQW1ZCwcJtZ4fqCuVLp9E 6LZQ== 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=xAAelrz5umkb8lw5p5rfKxpo0upYvzl+HfGPGTcu6yQ=; b=pXCadig59DjuszHmvSmaF7DfEtueYnZhb8czSXk4XUpmDAvmvUFGVYuafHZZOgGc9P IfyK4QjNoCYIiEPEU8H5/Qh4jco62qrQgq1ZBpBCwHTQFD9PlB3mkfeI1WNKvet1XdRK lGkS7UqS5nJHYtdzSjX5Rw0DLTukhhcVnFACTWeHW+gsinvQaYTKErOowb5dUKVXcbXo 4oIGtff6QNRN1rwrVx7zpcnp7dCn6iAKpeClpmVZgwE+HSGfRqABgmacrI3Rr4Lt4Mym sgYsKoLqIdOJAM9fhQxxZ/bZixXThfMSvERV4vIVKbQv1H9z1XwcIJNKqlrFjFNA7Vmu rYjg== X-Gm-Message-State: APjAAAVP7WsHz7YXO2jJ/6ESd0j+T8fgUNtG1WeYfcdo7gxIz/YlD3KB o+S6SOi0DMOU7dEFGNlNhJX7T7WeUvI= X-Google-Smtp-Source: APXvYqw87XTryk2SQdbcpAZwtRPuRqG6DYXlamTM4Y31NnEarsvE66SYkG9gN1AmKpAeY3uemVnzcg== X-Received: by 2002:adf:db03:: with SMTP id s3mr10316157wri.214.1566137059046; Sun, 18 Aug 2019 07:04:19 -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 a23sm20168226wma.24.2019.08.18.07.04.18 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 18 Aug 2019 07:04:18 -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:165322 Archived-At: Tags: patch That causes the undo feature to fail if the replacement contains special characters. emacs -Q C-x b *foo* RET M-: (insert "theorem 1\ntheorem 2\ntheorem 3") RET M-< M-C-% theorem \([0-9]+\) RET \,(format "theorem \\ref{theo_%s}" \1) RET SPC SPC u q ;; Buffer *foo* now contains: theorem 1ref{theo_1} theorem 2ref{theo_2} theorem 3 ;; Expected: theorem 1 theorem 2 theorem 3 --8<-----------------------------cut here---------------start------------->8--- commit 9f9c56cfa99b1e6fe296ec591ab335521e185e55 Author: Tino Calancha Date: Sun Aug 18 15:57:59 2019 +0200 Fix query-replace-regexp undo feature * lisp/replace.el (perform-replace): Quote regexp (Bug#37073). * test/lisp/replace-tests.el (query-replace-undo-bug37073): Add test diff --git a/lisp/replace.el b/lisp/replace.el index 08feb8eae7..fb703abd92 100644 --- a/lisp/replace.el +++ b/lisp/replace.el @@ -2614,7 +2614,7 @@ perform-replace (setq real-match-data (save-excursion (goto-char (match-beginning 0)) - (looking-at search-string) + (looking-at (regexp-quote search-string)) ; Bug#37073 (match-data t (nth 2 elt))) noedit (replace-match-maybe-edit diff --git a/test/lisp/replace-tests.el b/test/lisp/replace-tests.el index cd30633e37..f96bd9cf05 100644 --- a/test/lisp/replace-tests.el +++ b/test/lisp/replace-tests.el @@ -454,5 +454,15 @@ replace-tests--query-replace-undo input "a" "B" ((?\s . (1 2 3)) (?E . (4)) (?U . (5))) ?q (string= input (buffer-string)))))) +(ert-deftest query-replace-undo-bug37073 () + "Test for https://debbugs.gnu.org/37073 ." + (let ((input "theorem 1\ntheorem 2\ntheorem 3")) + (should + (replace-tests-with-undo + input "theorem \\([0-9]+\\)" + "theorem \\\\ref{theo_\\1}" + ((?\s . (1 2)) (?U . (3))) + ?q + (string= input (buffer-string)))))) ;;; replace-tests.el ends here --8<-----------------------------cut here---------------end--------------->8--- In GNU Emacs 26.2.90 (build 19, x86_64-pc-linux-gnu, GTK+ Version 3.24.5) of 2019-08-18 built Repository revision: 3f00db7ca6d40312651a302842561e7fb168ee99