diff options
| -rw-r--r-- | lisp/keymap.el | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/keymap.el b/lisp/keymap.el index 07e43c37b36..48f087c5287 100644 --- a/lisp/keymap.el +++ b/lisp/keymap.el | |||
| @@ -407,10 +407,10 @@ be a number or marker, in which case the keymap properties at the | |||
| 407 | specified buffer position instead of point are used." | 407 | specified buffer position instead of point are used." |
| 408 | (declare (compiler-macro (lambda (form) (keymap--compile-check key) form))) | 408 | (declare (compiler-macro (lambda (form) (keymap--compile-check key) form))) |
| 409 | (keymap--check key) | 409 | (keymap--check key) |
| 410 | (when (and keymap (not position)) | 410 | (when (and keymap position) |
| 411 | (error "Can't pass in both keymap and position")) | 411 | (error "Can't pass in both keymap and position")) |
| 412 | (if keymap | 412 | (if keymap |
| 413 | (let ((value (lookup-key (key-parse key) keymap accept-default))) | 413 | (let ((value (lookup-key keymap (key-parse key) accept-default))) |
| 414 | (when (and (not no-remap) | 414 | (when (and (not no-remap) |
| 415 | (symbolp value)) | 415 | (symbolp value)) |
| 416 | (or (command-remapping value) value))) | 416 | (or (command-remapping value) value))) |