bug#7787: 23.2; wrong meaning for mouse-2 while in search mode

[Juri Linkov]

>> The problem is that 'key-binding' in 'isearch-mouse-2'
>>
>>   (let ((overriding-terminal-local-map nil))
>>     (key-binding (this-command-keys-vector) t))
>>
>> still returns the keybinding from 'overriding-terminal-local-map'
>> that contains isearch keybindings.  Something is wrong here.
>
> I'm wholly unfamiliar with this code, but the following trivial patch
> seems to do the trick?
>
> diff --git a/lisp/isearch.el b/lisp/isearch.el
> index 168d71ada3..26db141781 100644
> --- a/lisp/isearch.el
> +++ b/lisp/isearch.el
> @@ -2629,9 +2629,10 @@ isearch-mouse-2
>                         ;; Key search depends on mode (bug#47755)
>                         (isearch-mode nil))
>                     (key-binding (this-command-keys-vector) t))))
> -    (if (and (window-minibuffer-p w)
> -          (not (minibuffer-window-active-p w))) ; in echo area
> -     (isearch-yank-x-selection)
> +    (if (or mouse-yank-at-point
> +            (and (window-minibuffer-p w)
> +              (not (minibuffer-window-active-p w)))) ; in echo area
> +        (isearch-yank-x-selection)
>        (when (functionp binding)
>       (call-interactively binding)))))
>
> Is this the wrong thing to do for some reason?  I mean, we don't care
> about the value of binding in this case, I think?

I don't understand how this fixes the problem above.