Re: master e5d76634a2: Make remapped keys work in set-transient-map

Re: master e5d76634a2: Make remapped keys work in set-transient-map

[Stefan Monnier]

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 <mc>] 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

Re: master e5d76634a2: Make remapped keys work in set-transient-map

[Lars Ingebrigtsen]

Stefan Monnier <monnier@iro.umontreal.ca> writes:

> The remapping could also come from [remap <mc>] bindings in some other
> active keymap so maybe we should skip passing `map` to
> `command-remapping`.

Yes, I guess.  Now fixed.

> 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`.

I was unable to convince myself one way or another here, so I left this
logic as is, but feel free to adjust if you think that won't regress
anything.

-- 
(domestic pets only, the antidote for overdose, milk.)
   bloggy blog: http://lars.ingebrigtsen.no

Re: master e5d76634a2: Make remapped keys work in set-transient-map

[Stefan Monnier]

>> 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`.
> I was unable to convince myself one way or another here,

That makes two of us.


        Stefan