From: Charalampos Mitrodimas <charmitro@posteo.net>
To: Stefan Monnier <monnier@iro.umontreal.ca>
Cc: 70139@debbugs.gnu.org
Subject: bug#70139: [PATCH] Improve key-translate to support removing translations
Date: Tue, 9 Apr 2024 11:14:34 +0000 [thread overview]
Message-ID: <68b807b9-1fa4-4430-87f4-e684a50f0bbe@posteo.net> (raw)
In-Reply-To: <jwvle5pz10f.fsf-monnier+emacs@gnu.org>
[-- Attachment #1: Type: text/plain, Size: 1074 bytes --]
On 4/7/24 17:45, Stefan Monnier wrote:
>> + (lambda (form) (keymap--compile-check from (and to to)) form)))
> ^^^^^^^^^^^
> ??
>
>> (keymap--check from)
>> - (keymap--check to)
>> - (or (char-table-p keyboard-translate-table)
>> - (setq keyboard-translate-table
>> - (make-char-table 'keyboard-translate-table nil)))
>> - (aset keyboard-translate-table
>> - (aref (key-parse from) 0)
>> - (aref (key-parse to) 0)))
>> + (when to
>> + (keymap--check to))
>> + (let ((from-key (key-parse from))
>> + (to-key (and to (key-parse to))))
>> + (when (> (length from-key) 1)
>> + (error "FROM key %s is not a single key" from))
>> + (when (and to (> (length to-key) 1))
>> + (error "TO key %s is not a single key" to))
> I'd check `=` while at it (if length is 0 the error is caught by
> `aref`, but it's a less helpful error).
>
>
> Stefan
Updated & attached.
--
Charalampos
[-- Attachment #2: 0001-Improve-key-translate-to-support-removing-translatio.patch --]
[-- Type: text/x-patch, Size: 2939 bytes --]
From 30cbe7722a677a53ae9c9f66b13153275324adc6 Mon Sep 17 00:00:00 2001
From: Charalampos Mitrodimas <charmitro@posteo.net>
Date: Tue, 2 Apr 2024 19:02:46 +0000
Subject: [PATCH] Improve key-translate to support removing translations
This patch enhances the key-translate function to allow removing
keyboard translations by passing nil as the second argument (TO).
If TO is nil, any existing translation for the FROM key will be removed.
The compiler macro is updated to only check TO when it is non-nil.
This change makes key-translate more consistent with the behavior of
keyboard-translate, providing a way to remove translations without
having to specify the same key for both FROM and TO.
The documentation string is updated to reflect the new behavior.
* lisp/keymap.el (key-translate): support removing translations by
passing nil as the second argument (TO). Also throw error if multiple
items passed. (Bug#70139)
---
lisp/keymap.el | 33 ++++++++++++++++++++++++---------
1 file changed, 24 insertions(+), 9 deletions(-)
diff --git a/lisp/keymap.el b/lisp/keymap.el
index b2b475c7d71..51dfbf45d24 100644
--- a/lisp/keymap.el
+++ b/lisp/keymap.el
@@ -379,20 +379,35 @@ key-valid-p
(defun key-translate (from to)
"Translate character FROM to TO on the current terminal.
+
This function creates a `keyboard-translate-table' if necessary
and then modifies one entry in it.
-Both FROM and TO should be specified by strings that satisfy `key-valid-p'."
+Both FROM and TO should be specified by strings that satisfy `key-valid-p'.
+If TO is nil, remove any existing translation for FROM."
(declare (compiler-macro
- (lambda (form) (keymap--compile-check from to) form)))
+ (lambda (form) (keymap--compile-check from (if to to nil)) form)))
(keymap--check from)
- (keymap--check to)
- (or (char-table-p keyboard-translate-table)
- (setq keyboard-translate-table
- (make-char-table 'keyboard-translate-table nil)))
- (aset keyboard-translate-table
- (aref (key-parse from) 0)
- (aref (key-parse to) 0)))
+ (when to
+ (keymap--check to))
+ (let ((from-key (key-parse from))
+ (to-key (and to (key-parse to))))
+ (cond
+ ((= (length from-key) 0)
+ (error "FROM key is empty"))
+ ((> (length from-key) 1)
+ (error "FROM key %s is not a single key" from)))
+ (cond
+ ((and to (= (length to-key) 0))
+ (error "TO key is empty"))
+ ((and to (> (length to-key) 1))
+ (error "TO key %s is not a single key" to)))
+ (or (char-table-p keyboard-translate-table)
+ (setq keyboard-translate-table
+ (make-char-table 'keyboard-translate-table nil)))
+ (aset keyboard-translate-table
+ (aref from-key 0)
+ (and to (aref to-key 0)))))
(defun keymap-lookup (keymap key &optional accept-default no-remap position)
"Return the binding for command KEY in KEYMAP.
--
2.39.2
next prev parent reply other threads:[~2024-04-09 11:14 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-02 9:50 bug#70139: 29.3.50; key-translate does not support all keyboard-translate usages Robert Pluim
2024-04-02 14:21 ` bug#70139: [PATCH] Improve key-translate to support removing translations Charalampos Mitrodimas
2024-04-02 14:28 ` bug#70139: 29.3.50; key-translate does not support all keyboard-translate usages Charalampos Mitrodimas
2024-04-02 15:41 ` Robert Pluim
2024-04-02 19:02 ` bug#70139: [PATCH] Improve key-translate to support removing translations Charalampos Mitrodimas
2024-04-04 13:00 ` Stefan Monnier via Bug reports for GNU Emacs, the Swiss army knife of text editors
2024-04-04 19:48 ` Charalampos Mitrodimas
2024-04-04 21:53 ` Stefan Monnier via Bug reports for GNU Emacs, the Swiss army knife of text editors
2024-04-06 17:09 ` Charalampos Mitrodimas
2024-04-06 17:18 ` Charalampos Mitrodimas
2024-04-07 14:45 ` Stefan Monnier via Bug reports for GNU Emacs, the Swiss army knife of text editors
2024-04-09 11:14 ` Charalampos Mitrodimas [this message]
2024-04-09 12:57 ` Stefan Monnier via Bug reports for GNU Emacs, the Swiss army knife of text editors
2024-04-09 13:07 ` Charalampos Mitrodimas
2024-04-13 9:19 ` Eli Zaretskii
2024-04-13 12:46 ` Stefan Monnier via Bug reports for GNU Emacs, the Swiss army knife of text editors
2024-04-13 16:02 ` Eli Zaretskii
2024-04-14 21:31 ` Charalampos Mitrodimas
2024-04-15 2:30 ` Eli Zaretskii
2024-05-20 20:39 ` Charalampos Mitrodimas
2024-05-23 13:25 ` Eli Zaretskii
2024-04-04 12:27 ` bug#70139: 29.3.50; key-translate does not support all keyboard-translate usages Eli Zaretskii
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=68b807b9-1fa4-4430-87f4-e684a50f0bbe@posteo.net \
--to=charmitro@posteo.net \
--cc=70139@debbugs.gnu.org \
--cc=monnier@iro.umontreal.ca \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).