branch: externals/leaf commit 8b5bbac1372daadfc93f8f45a8e31155e0e25266 Merge: 9d79978574 5ac6ae61e1 Author: Naoya Yamashita <con...@gmail.com> Commit: GitHub <nore...@github.com>
Merge pull request #512 from meziberry/p/leaf-keys leaf-keys use the BIND-KEYMAP-PKG ranther than :package's value, when… --- leaf.el | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/leaf.el b/leaf.el index 67ddf0af7d..7339302978 100644 --- a/leaf.el +++ b/leaf.el @@ -872,8 +872,8 @@ If BIND-KEYMAP-PKG is passed, require it before binding. OPTIONAL: BIND also accept below form. (:{{map}} :package {{pkg}} (KEY . COMMAND) (KEY . COMMAND)) - KEYMAP is quoted keymap name. - PKG is quoted package name which define KEYMAP. + KEYMAP is keymap name. + PKG is package name which define KEYMAP. (wrap `eval-after-load' PKG) If DRYRUN-NAME is non-nil, return list like @@ -924,7 +924,7 @@ NOTE: BIND can also accept list of these." (lambda (elm) (push (cdr elm) fns) (if bind-keymap - `(leaf-key-bind-keymap ,(car elm) ,(cdr elm) ',map ',pkg) + `(leaf-key-bind-keymap ,(car elm) ,(cdr elm) ',map ,bind-keymap-pkg) `(leaf-key ,(car elm) #',(cdr elm) ',map))) elmbinds)))) (push (if pkg