From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: "Bob Floyd" Newsgroups: gmane.emacs.bugs Subject: bug#45617: loses the edit region. Works in 23.3, broke in 26.3 Date: Thu, 14 Jan 2021 17:22:34 -0800 Message-ID: <002101d6eadc$e816a070$b843e150$@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> <87k0sgirr0.fsf@mail.linkov.net> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="23984"; mail-complaints-to="usenet@ciao.gmane.io" Cc: 45617@debbugs.gnu.org To: "'Juri Linkov'" Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Fri Jan 15 02:23:35 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 1l0Dpu-00067D-Oq for geb-bug-gnu-emacs@m.gmane-mx.org; Fri, 15 Jan 2021 02:23:35 +0100 Original-Received: from localhost ([::1]:33538 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l0Dpt-0003gR-MX for geb-bug-gnu-emacs@m.gmane-mx.org; Thu, 14 Jan 2021 20:23:33 -0500 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:58764) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l0DpO-0003e9-IF for bug-gnu-emacs@gnu.org; Thu, 14 Jan 2021 20:23:02 -0500 Original-Received: from debbugs.gnu.org ([209.51.188.43]:56389) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l0DpN-0000Io-S4 for bug-gnu-emacs@gnu.org; Thu, 14 Jan 2021 20:23:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1l0DpN-0004kh-OK for bug-gnu-emacs@gnu.org; Thu, 14 Jan 2021 20:23:01 -0500 X-Loop: help-debbugs@gnu.org Resent-From: "Bob Floyd" Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Fri, 15 Jan 2021 01:23:01 +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.161067376418234 (code B ref 45617); Fri, 15 Jan 2021 01:23:01 +0000 Original-Received: (at 45617) by debbugs.gnu.org; 15 Jan 2021 01:22:44 +0000 Original-Received: from localhost ([127.0.0.1]:39702 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l0Dp6-0004k1-85 for submit@debbugs.gnu.org; Thu, 14 Jan 2021 20:22:44 -0500 Original-Received: from resqmta-po-10v.sys.comcast.net ([96.114.154.169]:47038) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l0Dp4-0004jj-Nm for 45617@debbugs.gnu.org; Thu, 14 Jan 2021 20:22:43 -0500 Original-Received: from resomta-po-17v.sys.comcast.net ([96.114.154.241]) by resqmta-po-10v.sys.comcast.net with ESMTP id 0D5hlyyid2Xuv0DoylwLKb; Fri, 15 Jan 2021 01:22:36 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=comcast.net; s=20190202a; t=1610673756; bh=SCy5PA1muQx4qmxa9QeKh8jJiDRr2yonHcbKGkBCAPM=; h=Received:Received:From:To:Subject:Date:Message-ID:MIME-Version: Content-Type; b=xxadunfM+hP10mUAj32nie6c7g/aooxwK2WIl/lhnd1KFEHuLI395R7Z5UZHdyKGm IHuKAonjlA8aOcNvgDJHsjAIcPsnTwSXn3t6U0Cblr7Z9c/+T8+zo8PiKaWgEtentD 9Op++MAzWtDvAoDI7oRamI3u3kU6rPZpx1e1BEKamqRGLLPefMkCSZLruzJIcO6F29 KOjr/MEUPTp+vQcN1CWxymuPKpaagXQt9/eZRMnQ/RfHOJzqMU9rPgC8bsi7DkDdKU 5WZzZjfYO1Td1doDGjweqv1vH6PsjJ2912LHtfI/csx3xNtDsvwk7zccaZcjNY8+Ia T/i3a1OIBm0NQ== Original-Received: from Cache ([IPv6:2601:647:6100:1480::5a21]) by resomta-po-17v.sys.comcast.net with ESMTPA id 0Dowlj5XCj2qx0DoxlTQ1j; Fri, 15 Jan 2021 01:22:36 +0000 X-Xfinity-VMeta: sc=-100.00;st=legit In-Reply-To: <87k0sgirr0.fsf@mail.linkov.net> X-Mailer: Microsoft Office Outlook 12.0 Thread-Index: Adbp3vlii5CbgRImSi2QJPxAGEBxiAA/cRXg Content-Language: en-us 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:197969 Archived-At: I've removed the earlier patch and installed these changes. Now testing it! Thanks. -----Original Message----- From: Juri Linkov [mailto:juri@linkov.net] Sent: Wednesday, January 13, 2021 10:54 AM To: Bob Floyd Cc: 'Eli Zaretskii'; 45617@debbugs.gnu.org Subject: Re: bug#45617: loses the edit region. Works in 23.3, broke in 26.3 > 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.