Re: Merging feature/android

[Po Lu]

Robert Pluim <rpluim@gmail.com> writes:

>>>>>> On Tue, 14 Mar 2023 11:47:36 +0100, Robert Pluim <rpluim@gmail.com> said:
>
>>>>>> On Tue, 14 Mar 2023 18:39:22 +0800, Po Lu <luangruo@yahoo.com> said:
>     >>> most of which are variants of
>     >>> 
>     >>> Test simple-test-undo-extra-boundary-in-tex backtrace:
>     >>> signal(error ("Invalid argument macro in `get-device-terminal'"))
>     >>> apply(signal (error ("Invalid argument macro in `get-device-terminal
>
>     Robert>     Po Lu> If you could get a backtrace for this, it would be 
> great.  What is
>     Robert>     Po Lu> calling frames-on-display-list?
>
>     Robert>     Po Lu> Thanks.
>
> This fixes 3 of the 4 test failures:
>
> diff --git a/lisp/minibuffer.el b/lisp/minibuffer.el
> index ef0eb1ca108..cdff129b7a8 100644
> --- a/lisp/minibuffer.el
> +++ b/lisp/minibuffer.el
> @@ -4598,9 +4598,10 @@ minibuffer-setup-on-screen-keyboard
>      (cancel-timer minibuffer-on-screen-keyboard-timer)
>      (setq minibuffer-on-screen-keyboard-timer nil))
>    (setq minibuffer-on-screen-keyboard-displayed nil)
> -  (when (not (memq (device-class last-event-frame
> +  (when (and (not (eq last-event-frame 'macro))
> +             (not (memq (device-class last-event-frame
>                                 last-event-device)
> -                   '(keyboard core-keyboard)))
> +                   '(keyboard core-keyboard))))
>      (setq minibuffer-on-screen-keyboard-displayed
>            (frame-toggle-on-screen-keyboard (selected-frame) nil))))
>
>
> Robert

Does this work too?

Thanks.

diff --git a/lisp/minibuffer.el b/lisp/minibuffer.el
index ef0eb1ca108..b28bbae7c64 100644
--- a/lisp/minibuffer.el
+++ b/lisp/minibuffer.el
@@ -4598,9 +4598,11 @@ minibuffer-setup-on-screen-keyboard
     (cancel-timer minibuffer-on-screen-keyboard-timer)
     (setq minibuffer-on-screen-keyboard-timer nil))
   (setq minibuffer-on-screen-keyboard-displayed nil)
-  (when (not (memq (device-class last-event-frame
-                               last-event-device)
-                   '(keyboard core-keyboard)))
+  (when (and (framep last-event-frame)
+             last-event-device
+             (not (memq (device-class last-event-frame
+                                      last-event-device)
+                        '(keyboard core-keyboard))))
     (setq minibuffer-on-screen-keyboard-displayed
           (frame-toggle-on-screen-keyboard (selected-frame) nil))))