[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
feature/android a39ca9bf8e3: Update Android port
From: |
Po Lu |
Subject: |
feature/android a39ca9bf8e3: Update Android port |
Date: |
Tue, 14 Mar 2023 07:51:54 -0400 (EDT) |
branch: feature/android
commit a39ca9bf8e34e7cf6760e2fa3b7d644bef09ce91
Author: Po Lu <luangruo@yahoo.com>
Commit: Po Lu <luangruo@yahoo.com>
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",
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- feature/android a39ca9bf8e3: Update Android port,
Po Lu <=