diff options
| author | Po Lu <luangruo@yahoo.com> | 2021-12-11 11:00:39 +0800 |
|---|---|---|
| committer | Po Lu <luangruo@yahoo.com> | 2021-12-11 11:00:39 +0800 |
| commit | ea8bb59c1b393e57046fec698fbb498f08bc70cc (patch) | |
| tree | f50b02d5b91e7194955cc920f11017e26dd84000 /lisp/keymap.el | |
| parent | cc0f147180300b672894de931bee76b2a3a719e9 (diff) | |
| parent | c9cb59bc4f68d6050451bc0a619fd3eb6a6ed554 (diff) | |
| download | emacs-ea8bb59c1b393e57046fec698fbb498f08bc70cc.tar.gz emacs-ea8bb59c1b393e57046fec698fbb498f08bc70cc.tar.bz2 emacs-ea8bb59c1b393e57046fec698fbb498f08bc70cc.zip | |
Merge remote-tracking branch 'origin/master' into feature/pgtk
Diffstat (limited to 'lisp/keymap.el')
| -rw-r--r-- | lisp/keymap.el | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lisp/keymap.el b/lisp/keymap.el index 48f087c5287..fd91689f887 100644 --- a/lisp/keymap.el +++ b/lisp/keymap.el @@ -411,9 +411,10 @@ specified buffer position instead of point are used." (error "Can't pass in both keymap and position")) (if keymap (let ((value (lookup-key keymap (key-parse key) accept-default))) - (when (and (not no-remap) + (if (and (not no-remap) (symbolp value)) - (or (command-remapping value) value))) + (or (command-remapping value) value) + value)) (key-binding (kbd key) accept-default no-remap position))) (defun keymap-local-lookup (keys &optional accept-default) |