From: Po Lu <luangruo@yahoo.com>
Date: Sat, 27 May 2023 01:49:49 +0000 (+0800)
Subject: Merge remote-tracking branch 'origin/master' into feature/android
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=cdca0fddcc3352bcd01bec147c264be1b2a04e12;p=emacs.git

Merge remote-tracking branch 'origin/master' into feature/android
---

cdca0fddcc3352bcd01bec147c264be1b2a04e12
diff --cc lisp/subr.el
index 73f3cd4a28e,95d3bc03544..b5c59023f8e
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@@ -3611,8 -3590,9 +3611,10 @@@ confusing to some users."
  (defun use-dialog-box-p ()
    "Return non-nil if the current command should prompt the user via a dialog box."
    (and last-input-event                 ; not during startup
-        (or (featurep 'android)		; prefer dialog boxes on Android
-            (consp last-nonmenu-event)   ; invoked by a mouse event
+        (or (consp last-nonmenu-event)   ; invoked by a mouse event
+            (and (null last-nonmenu-event)
+                 (consp last-input-event))
++           (featurep 'android)		; Prefer dialog boxes on Android.
             from--tty-menu-p)            ; invoked via TTY menu
         use-dialog-box))