Update Android port

* lisp/minibuffer.el (minibuffer-setup-on-screen-keyboard):
Handle cases where last-event-frame is a kbd macro.
* src/keyboard.c (lispy_function_keys): Remove duplicates.
This commit is contained in:
Po Lu 2023-03-14 19:51:42 +08:00
parent aa24854e7f
commit a39ca9bf8e
2 changed files with 4 additions and 5 deletions

View file

@ -4598,9 +4598,10 @@ This is run upon minibuffer setup."
(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)
(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))))

View file

@ -4996,8 +4996,6 @@ const char *const lispy_function_keys[] =
[19] = "up",
[20] = "down",
[213] = "muhenkan",
[213] = "muhenkan",
[214] = "henkan",
[214] = "henkan",
[215] = "hiragana-katakana",
[218] = "kana",