From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Stefan Monnier Newsgroups: gmane.emacs.devel Subject: Re: master e5d76634a2: Make remapped keys work in set-transient-map Date: Mon, 23 May 2022 08:41:25 -0400 Message-ID: References: <165330421099.23674.7590022790639219967@vcs2.savannah.gnu.org> <20220523111011.525EAC051FF@vcs2.savannah.gnu.org> Mime-Version: 1.0 Content-Type: text/plain Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="27533"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/29.0.50 (gnu/linux) Cc: emacs-devel@gnu.org To: Lars Ingebrigtsen Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Mon May 23 14:48:55 2022 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 1nt7UU-00070J-V2 for ged-emacs-devel@m.gmane-mx.org; Mon, 23 May 2022 14:48:55 +0200 Original-Received: from localhost ([::1]:48902 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nt7UT-0005dk-Sc for ged-emacs-devel@m.gmane-mx.org; Mon, 23 May 2022 08:48:53 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:47922) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nt7NO-0006oS-3W for emacs-devel@gnu.org; Mon, 23 May 2022 08:41:34 -0400 Original-Received: from mailscanner.iro.umontreal.ca ([132.204.25.50]:64613) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nt7NJ-0007Aa-UY for emacs-devel@gnu.org; Mon, 23 May 2022 08:41:32 -0400 Original-Received: from pmg1.iro.umontreal.ca (localhost.localdomain [127.0.0.1]) by pmg1.iro.umontreal.ca (Proxmox) with ESMTP id 7B1781001CB; Mon, 23 May 2022 08:41:28 -0400 (EDT) Original-Received: from mail01.iro.umontreal.ca (unknown [172.31.2.1]) by pmg1.iro.umontreal.ca (Proxmox) with ESMTP id 35A5F10012B; Mon, 23 May 2022 08:41:27 -0400 (EDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=iro.umontreal.ca; s=mail; t=1653309687; bh=jH0ZgeHv+wysOW0jufSVrHaVyIgofXheHonnuK2kzps=; h=From:To:Cc:Subject:References:Date:In-Reply-To:From; b=mHpwRMJNxDpkT7ZCZGcIezf+Atv9UNS8D+9tsQiwfQU/vVMG7kqDru5XbkVn1xIMo LC1Tl/MWzXET2eyNPLWjh05LsbU9ABjdvfAPNpL33tinwkC1G2tqNv9JNwzgkTiaFy rta9bc2eaDEfsl3sNdsaDcDJbBwK1abk7oJqANJUIxQDmmao8VbHfI8BTaHLNcJWGR wvOKuIcmqkWpWyAVRhYF1NrVJtR/cRlmiPc8/nHvm5kYYAKa0aQrM6uqt9vhezyGIK ORRGsU7DLDP4EcuEZ4RfKf8/5V1dVZbQ1JbF81n0iKo1wke4MY1Q/oH6HFatVotoOZ mwek8OIwuT4hg== Original-Received: from pastel (unknown [45.72.221.51]) by mail01.iro.umontreal.ca (Postfix) with ESMTPSA id CDFB61208BF; Mon, 23 May 2022 08:41:26 -0400 (EDT) In-Reply-To: <20220523111011.525EAC051FF@vcs2.savannah.gnu.org> (Lars Ingebrigtsen's message of "Mon, 23 May 2022 07:10:11 -0400 (EDT)") Received-SPF: pass client-ip=132.204.25.50; envelope-from=monnier@iro.umontreal.ca; helo=mailscanner.iro.umontreal.ca X-Spam_score_int: -42 X-Spam_score: -4.3 X-Spam_bar: ---- X-Spam_report: (-4.3 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, RCVD_IN_DNSWL_MED=-2.3, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.29 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:290155 Archived-At: Lars Ingebrigtsen [2022-05-23 07:10:11] wrote: > index 6538d79050..0fc1156d40 100644 > --- a/lisp/subr.el > +++ b/lisp/subr.el > @@ -6043,6 +6043,10 @@ to deactivate this transient map, regardless of KEEP-PRED." > t) > ((eq t keep-pred) > (let ((mc (lookup-key map (this-command-keys-vector)))) > + ;; We may have a remapped command, so chase > + ;; down that. > + (when (and mc (symbolp mc)) > + (setq mc (or (command-remapping mc nil map) mc))) > ;; If the key is unbound `this-command` is > ;; nil and so is `mc`. > (and mc (eq this-command mc)))) The remapping could also come from [remap ] bindings in some other active keymap so maybe we should skip passing `map` to `command-remapping`. Then again, maybe we don't really need to check (eq this-command mc) at all, and just make sure `lookup-key` found a binding in `map`. Stefan