From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Juri Linkov Newsgroups: gmane.emacs.bugs Subject: bug#45617: loses the edit region. Works in 23.3, broke in 26.3 Date: Wed, 13 Jan 2021 20:53:31 +0200 Organization: LINKOV.NET Message-ID: <87k0sgirr0.fsf@mail.linkov.net> References: <000001d6e16c$984bcb70$c8e36250$@net> <83turycc18.fsf@gnu.org> <87ble4ob6v.fsf@mail.linkov.net> <000601d6e2ea$8f6601e0$ae3205a0$@net> <877dorkznt.fsf@mail.linkov.net> <002701d6e39b$4ac35680$e04a0380$@net> <8735ze9e09.fsf@mail.linkov.net> <83mtxm0vzd.fsf@gnu.org> <002d01d6e478$ca50cdf0$5ef269d0$@net> Mime-Version: 1.0 Content-Type: text/plain Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="6073"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.0.50 (x86_64-pc-linux-gnu) Cc: 45617@debbugs.gnu.org To: "Bob Floyd" Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Wed Jan 13 20:16:26 2021 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1kzld4-0001Rz-Bi for geb-bug-gnu-emacs@m.gmane-mx.org; Wed, 13 Jan 2021 20:16:26 +0100 Original-Received: from localhost ([::1]:60662 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kzld3-0005wr-5Y for geb-bug-gnu-emacs@m.gmane-mx.org; Wed, 13 Jan 2021 14:16:25 -0500 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:37868) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kzlS2-00013q-JW for bug-gnu-emacs@gnu.org; Wed, 13 Jan 2021 14:05:02 -0500 Original-Received: from debbugs.gnu.org ([209.51.188.43]:53297) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kzlS2-0006zN-AD for bug-gnu-emacs@gnu.org; Wed, 13 Jan 2021 14:05:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kzlS2-00023R-5C for bug-gnu-emacs@gnu.org; Wed, 13 Jan 2021 14:05:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Juri Linkov Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Wed, 13 Jan 2021 19:05:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 45617 X-GNU-PR-Package: emacs Original-Received: via spool by 45617-submit@debbugs.gnu.org id=B45617.16105646967882 (code B ref 45617); Wed, 13 Jan 2021 19:05:02 +0000 Original-Received: (at 45617) by debbugs.gnu.org; 13 Jan 2021 19:04:56 +0000 Original-Received: from localhost ([127.0.0.1]:36610 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kzlRw-000233-A1 for submit@debbugs.gnu.org; Wed, 13 Jan 2021 14:04:56 -0500 Original-Received: from relay6-d.mail.gandi.net ([217.70.183.198]:48033) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kzlRv-00022p-93 for 45617@debbugs.gnu.org; Wed, 13 Jan 2021 14:04:55 -0500 X-Originating-IP: 91.129.98.64 Original-Received: from mail.gandi.net (m91-129-98-64.cust.tele2.ee [91.129.98.64]) (Authenticated sender: juri@linkov.net) by relay6-d.mail.gandi.net (Postfix) with ESMTPSA id D910CC000C; Wed, 13 Jan 2021 19:04:47 +0000 (UTC) In-Reply-To: <002d01d6e478$ca50cdf0$5ef269d0$@net> (Bob Floyd's message of "Wed, 6 Jan 2021 14:10:48 -0800") X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list 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-mx.org@gnu.org Original-Sender: "bug-gnu-emacs" Xref: news.gmane.io gmane.emacs.bugs:197915 Archived-At: > Perhaps another way to think about this is that emacs is "mode-less". > > I can begin a command, recurse into another, pop out and resume the first > command. > > Without the patch, or minibuffer fix, breaks that design. So here is a simpler patch that fixes all query-replace commands: diff --git a/lisp/replace.el b/lisp/replace.el index d41dc98a0d..16b80a8fd1 100644 --- a/lisp/replace.el +++ b/lisp/replace.el @@ -327,6 +336,7 @@ query-replace-read-to (defun query-replace-read-args (prompt regexp-flag &optional noerror) (unless noerror (barf-if-buffer-read-only)) + (save-mark-and-excursion (let* ((from (query-replace-read-from prompt regexp-flag)) (to (if (consp from) (prog1 (cdr from) (setq from (car from))) (query-replace-read-to from prompt regexp-flag)))) @@ -334,7 +344,7 @@ query-replace-read-args (or (and current-prefix-arg (not (eq current-prefix-arg '-))) (and (plist-member (text-properties-at 0 from) 'isearch-regexp-function) (get-text-property 0 'isearch-regexp-function from))) - (and current-prefix-arg (eq current-prefix-arg '-))))) + (and current-prefix-arg (eq current-prefix-arg '-)))))) (defun query-replace (from-string to-string &optional delimited start end backward region-noncontiguous-p) "Replace some occurrences of FROM-STRING with TO-STRING.