mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-28 07:45:00 +00:00
Code Issues Releases Activity

Repair :map handling in bind-key.el

Browse Source 
GitHub-reference: fixes https://github.com/jwiegley/use-package/issues/324
This commit is contained in:
John Wiegley 2016-02-26 16:06:58 -08:00
parent 6a90a9f16d
commit 6ca19531bb
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lisp/use-package/bind-key.el
View File

@ -205,6 +205,11 @@ Accepts keyword arguments:
The rest of the arguments are conses of keybinding string and a The rest of the arguments are conses of keybinding string and a
function symbol (unquoted)." function symbol (unquoted)."
;; jww (2016-02-26): This is a hack; this whole function needs to be
;; rewritten to normalize arguments the way that use-package.el does.
(if (and (eq (car args) :package)
(not (eq (car (cdr (cdr args))) :map)))
(setq args (cons :map (cons 'global-map args))))
(let* ((map (plist-get args :map)) (let* ((map (plist-get args :map))
(maps (if (listp map) map (list map))) (maps (if (listp map) map (list map)))
(doc (plist-get args :prefix-docstring)) (doc (plist-get args :prefix-docstring))
@ -224,7 +229,7 @@ function symbol (unquoted)."
(when (and menu-name (not prefix)) (when (and menu-name (not prefix))
(error "If :menu-name is supplied, :prefix must be too")) (error "If :menu-name is supplied, :prefix must be too"))
(let ((args key-bindings) (let ((args key-bindings)
first next) saw-map first next)
(while args (while args
(if (keywordp (car args)) (if (keywordp (car args))
(progn (progn
@ -235,7 +240,8 @@ function symbol (unquoted)."
(setq first (list (car args)))) (setq first (list (car args))))
(setq args (cdr args)))) (setq args (cdr args))))
(cl-flet ((wrap (maps bindings) (cl-flet ((wrap (maps bindings)
(if (and maps pkg) (if (and maps pkg
(not (equal maps '(global-map))))
`((eval-after-load `((eval-after-load
,(if (symbolp pkg) `',pkg pkg) ,(if (symbolp pkg) `',pkg pkg)
'(progn ,@bindings))) '(progn ,@bindings)))
@ -247,7 +253,7 @@ function symbol (unquoted)."
,@(if menu-name ,@(if menu-name
`((define-prefix-command ',prefix-map nil ,menu-name)) `((define-prefix-command ',prefix-map nil ,menu-name))
`((define-prefix-command ',prefix-map))) `((define-prefix-command ',prefix-map)))
,@(if maps ,@(if (and maps (not (equal maps '(global-map))))
(wrap maps (wrap maps
(mapcar (mapcar
#'(lambda (m) #'(lambda (m)
@ -259,7 +265,7 @@ function symbol (unquoted)."
(lambda (form) (lambda (form)
(if prefix-map (if prefix-map
`((bind-key ,(car form) ',(cdr form) ,prefix-map ,filter)) `((bind-key ,(car form) ',(cdr form) ,prefix-map ,filter))
(if maps (if (and maps (not (equal maps '(global-map))))
(mapcar (mapcar
#'(lambda (m) #'(lambda (m)
`(bind-key ,(car form) ',(cdr form) ,m ,filter)) `(bind-key ,(car form) ',(cdr form) ,m ,filter))