From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Gregory Heytings Newsgroups: gmane.emacs.devel Subject: Re: master 859190f 2/3: Convert some keymaps to defvar-keymap Date: Thu, 14 Oct 2021 13:41:02 +0000 Message-ID: <9865db3af596e2553d9d@heytings.org> References: <20211004081724.6281.11798@vcs0.savannah.gnu.org> <87o87ubcnl.fsf@gnus.org> <87h7dm9en7.fsf@gnus.org> <818f9907c2b1fe8b54b1@heytings.org> <83tuhlnkxm.fsf@gnu.org> <818f9907c2f359a71f49@heytings.org> <83czo9nj4g.fsf@gnu.org> <818f9907c244b9db0bea@heytings.org> <834k9lnd2i.fsf@gnu.org> <818f9907c2dff3b49971@heytings.org> <83k0ign3zj.fsf@gnu.org> <818f9907c26fb6f0233a@heytings.org> <838rywm7a7.fsf@gnu.org> <9865db3af5547c6ca15c@heytings.org> <9865db3af561bf9f05d1@heytings.org> <87lf2vyej8.fsf@gnus.org> <9865db3af5710fbcc443@heytings.org> <87h7djybv9.fsf@gnus.org> <9865db3af54c5432a529@heytings.org> <87czo7ybhj.fsf@gnus.org> Mime-Version: 1.0 Content-Type: text/plain; format=flowed; charset=us-ascii Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="27281"; mail-complaints-to="usenet@ciao.gmane.io" Cc: Eli Zaretskii , Stefan Kangas , emacs-devel@gnu.org To: Lars Ingebrigtsen Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Thu Oct 14 15:41:58 2021 Return-path: Envelope-to: ged-emacs-devel@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1mb0zd-0006ph-O3 for ged-emacs-devel@m.gmane-mx.org; Thu, 14 Oct 2021 15:41:57 +0200 Original-Received: from localhost ([::1]:40958 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mb0zc-0003Ic-2e for ged-emacs-devel@m.gmane-mx.org; Thu, 14 Oct 2021 09:41:56 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:39966) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mb0yq-0001rz-OJ for emacs-devel@gnu.org; Thu, 14 Oct 2021 09:41:09 -0400 Original-Received: from heytings.org ([95.142.160.155]:51112) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mb0yn-0004rO-Dp; Thu, 14 Oct 2021 09:41:08 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=heytings.org; s=20210101; t=1634218862; bh=tC+ixDQ2EyRvlAFagbwy9YROy5+rTz7YhLjCShXcW4A=; h=Date:From:To:cc:Subject:In-Reply-To:Message-ID:References:From; b=VXIzaOhxUd8I86lxDW7uHX5SiabmebvlzK5Xyl0lIbk2fOBi4LmE/Yys/TBmgtDZD 9hj/V/bQab8EEliUh7rJB6U107lFlews9/1oOcX/gTLVdAC3WMS0K7RLlDJM6r12oS 9i+7EAmgLg9Sd7tEk80QhKpN96gh5dBPlC+cgwmLwQNsLUI6vuz6AygEl/Pn7WdtIv qbmCpxpBuvaP6UIJmDbnvUaH0wsZCpvlATfaFrh/oAY57ftS0I1jqUvS42usoSIMNi KpGQMOnu7kOPk/C0hFjvjpZHVZV5t+dXevamFAhl0jbFcnOJ2fIyjkEEHLEjgwB/09 +Jed1Fxk3COXw== In-Reply-To: <87czo7ybhj.fsf@gnus.org> Received-SPF: pass client-ip=95.142.160.155; envelope-from=gregory@heytings.org; helo=heytings.org X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Original-Sender: "Emacs-devel" Xref: news.gmane.io gmane.emacs.devel:277022 Archived-At: >> But such a key sequence would not be transformed by kbd, because it >> does not contain "C-" or something similar. > > The thing I pasted up there was a literal evaluation of the form. > Sorry for the confusion, what I said was unclear: with the proposed (proof of concept) patch (see below), such a sequence would not be transformed by kbd, because it does not contain "C-" or something similar. diff --git a/src/keymap.c b/src/keymap.c index be45d2be1e..8e0a99a4b0 100644 --- a/src/keymap.c +++ b/src/keymap.c @@ -1059,6 +1059,15 @@ DEFUN ("define-key", Fdefine_key, Sdefine_key, 3, 3, 0, { bool metized = false; + Lisp_Object kbd_key; + if (STRINGP (key) && + (strstr (SSDATA (key), "C-") || strstr (SSDATA (key), "M-") || + strstr (SSDATA (key), "S-") || strstr (SSDATA (key), "H-") || + strstr (SSDATA (key), "s-")) && + !NILP (Ffboundp (Qkbd)) && + !NILP (kbd_key = safe_call1 (Qkbd, key))) + key = kbd_key; + keymap = get_keymap (keymap, 1, 1); ptrdiff_t length = CHECK_VECTOR_OR_STRING (key); @@ -3261,4 +3270,6 @@ syms_of_keymap (void) defsubr (&Stext_char_description); defsubr (&Swhere_is_internal); defsubr (&Sdescribe_buffer_bindings); + + DEFSYM (Qkbd, "kbd"); }