From a39ca9bf8e34e7cf6760e2fa3b7d644bef09ce91 Mon Sep 17 00:00:00 2001 From: Po Lu Date: Tue, 14 Mar 2023 19:51:42 +0800 Subject: [PATCH] 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. --- lisp/minibuffer.el | 7 ++++--- src/keyboard.c | 2 -- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/lisp/minibuffer.el b/lisp/minibuffer.el index ef0eb1ca108..0055914105d 100644 --- a/lisp/minibuffer.el +++ b/lisp/minibuffer.el @@ -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)))) diff --git a/src/keyboard.c b/src/keyboard.c index e376fa299dd..11c37372db7 100644 --- a/src/keyboard.c +++ b/src/keyboard.c @@ -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", -- 2.39.2