bug#45617: <query-replace> loses the edit region. Works in 23.3, broke in 26.3

[Bob Floyd]

Sorry, sorry, my bad. Ignore my last email! 

I'm now using the last version:
----------------------------------------------------
(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))))
      (list from to
            (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 this test:
-----------------------------------------------------
  void
  DHroot::ModuleToGoverningParamsets::
  Insert
  (IObj<BDHdfnsScope> const& _iDfnGoverned, IObj<BDHscope> const&
_iBDHparamset)
  {
    std::pair<ModuleToGoverningParamsets::TIterator,bool>       _pr
    ( TBase::Insert( _iDfnGoverned, ParamsetsGoverningModule() ) );

    ParamsetsGoverningModule&   _prmsets( (*_pr.first).second );

    _prmsets.Insert( _iBDHparamset, Unused() );
  }
----------------------------------------------------

Do this:

1. Select entire region by dragging left mouse down from the BOTTOM to the
TOP.
2. Begin <query-replace>
   In the command window: Query replace in region: 
3. Double left mouse click on "_iDfnGoverned" at line 4 to select it:
    (IObj<BDHdfnsScope> const& _iDfnGoverned <---THIS ONE , IObj<BDHscope>
const& _iBDHparamset)
4. middle mouse click in the command window to insert, then enter:
   Query replace in region: _iDfnGoverned with: 
   Notice the selection region changes to lines 1-4 and is never restored.
5. middle mouse click in the command window to insert it again and edit:
   Query replace in region _iDfnGoverned with: _iBDHdfnGoverned
6. Enter
   Nothing happens!

Middle mouse click: <mouse-2>   mouse-yank-at-click


Hope you can reproduce this!!!

-----Original Message-----
From: Juri Linkov [mailto:juri@linkov.net] 
Sent: Tuesday, January 19, 2021 9:44 AM
To: Bob Floyd
Cc: 'Eli Zaretskii'; 45617@debbugs.gnu.org
Subject: Re: bug#45617: <query-replace> loses the edit region. Works in
23.3, broke in 26.3

> I'm having an issue with the new patch. <query-replace> fails!

Sorry, I tried your test case, but can't reproduce the problem.

> 1. Select entire region by dragging mouse.
> 2. Begin <query-replace>
>    In the command window: Query replace in region: 
> 3. Enter RL using the keyboard
>    In the command window: Query replace in region RL with: 
> 4. Now, with the mouse, select RL at line 12 ...
>    paramset P2 RL; <--- THIS ONE
>    ... then yank it to the command window and with keyboard enter X:

The most important line of your test case is the line above,
but I don't understand what you mean by yanking the selected text.
I tried to drag the selected text "RL" to the minibuffer window,
as all other apps allow to do, but Emacs fails to do the same.
Please help to clarify how do you yank the selected text.

>    In the command window: Query replace in region RL with: RLX
> 5. Enter
>    Only one of the two RL's in the region are selected, depending on
>    if the region was selected from top-to-bottom or bottom-to-top.
>
>    It should select both RL's!

It selects both RL's when I tried.

> Just in case I misread the diff, this is the function as I have manually
> patched it:
>
> (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))))
>     (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)))
>     (list from to
>         (and current-prefix-arg (not (eq current-prefix-arg '-)))
>         (and current-prefix-arg (eq current-prefix-arg '-))))))

This function is very much messed up.  Please try the function below:

(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))))
      (list from to
            (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 '-))))))