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

diff --cc INSTALL
Simple merge

diff --cc configure.ac
Simple merge

diff --cc etc/NEWS
Simple merge

diff --cc etc/PROBLEMS
Simple merge

diff --cc lisp/comint.el
Simple merge

diff --cc lisp/menu-bar.el
Simple merge

diff --cc lisp/pixel-scroll.el
Simple merge

diff --cc lisp/subr.el
index 73f3cd4a28e24cd59ad25028f8139455f9d34d2d,95d3bc035440736e6ffda89202f7aa52c2e7c766..b5c59023f8e489f51d609af11b96b88fd2dc1932
--- 1/lisp/subr.el
--- 2/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))
  

diff --cc lisp/tab-bar.el
Simple merge

diff --cc src/fns.c
Simple merge

diff --cc src/lread.c
Simple merge

diff --cc src/xdisp.c
Simple merge