masscollaborationlabs/emacs
2
0
Fork 0
mirror of https://github.com/masscollaborationlabs/emacs.git synced 2025-07-15 08:21:18 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Change use-package to use bind-keys and bind-keys*

Browse source 
Fixes https://github.com/jwiegley/use-package/issues/129
This commit is contained in:
John Wiegley 2015-03-21 03:46:26 -05:00
parent 012c37d722
commit 8c00f108bf
2 changed files with 28 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

49
lisp/use-package/bind-key.el
View file

@ -191,32 +191,35 @@ function symbol (unquoted)."
(pop args) (pop args)
(pop args)) (pop args))
args))) args)))
(when (or (and prefix-map (when (or (and prefix-map (not prefix))
(not prefix)) (and prefix (not prefix-map)))
(and prefix
(not prefix-map)))
(error "Both :prefix-map and :prefix must be supplied")) (error "Both :prefix-map and :prefix must be supplied"))
(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"))
`(progn (macroexp-progn
,@(when prefix-map (append
`((defvar ,prefix-map) (when prefix-map
,@(when doc `((put ',prefix-map 'variable-documentation ,doc))) `((defvar ,prefix-map)
,@(if menu-name ,@(when doc `((put ',prefix-map 'variable-documentation ,doc)))
`((define-prefix-command ',prefix-map nil ,menu-name)) ,@(if menu-name
`((define-prefix-command ',prefix-map))) `((define-prefix-command ',prefix-map nil ,menu-name))
,@(mapcar `((define-prefix-command ',prefix-map)))
#'(lambda (m) ,@(if maps
`(bind-key ,prefix ',prefix-map ,m)) maps))) (mapcar
,@(apply #'(lambda (m)
#'nconc `(bind-key ,prefix ',prefix-map ,m)) maps)
(mapcar (lambda (form) `((bind-key ,prefix ',prefix-map)))))
(if prefix-map (apply
`((bind-key ,(car form) ',(cdr form) ,prefix-map)) #'nconc
(mapcar (mapcar (lambda (form)
#'(lambda (m) (if prefix-map
`(bind-key ,(car form) ',(cdr form) ,m)) maps))) `((bind-key ,(car form) ',(cdr form) ,prefix-map))
key-bindings))))) (if maps
(mapcar
#'(lambda (m)
`(bind-key ,(car form) ',(cdr form) ,m)) maps)
`((bind-key ,(car form) ',(cdr form))))))
key-bindings))))))
(defmacro bind-keys* (&rest args) (defmacro bind-keys* (&rest args)
`(bind-keys :map override-global-map ,@args)) `(bind-keys :map override-global-map ,@args))

10
lisp/use-package/use-package.el
View file

@ -633,19 +633,13 @@ manually updated package."
(defun use-package-handler/:bind (defun use-package-handler/:bind
(name-symbol keyword arg rest state &optional override) (name-symbol keyword arg rest state &optional override)
(let* (commands (let ((commands (mapcar #'cdr arg)))
(form (mapcar
#'(lambda (binding)
(push (cdr binding) commands)
`(,(if override
'bind-key*
'bind-key) ,(car binding) #',(cdr binding))) arg)))
(use-package-concat (use-package-concat
(use-package-process-keywords name-symbol (use-package-process-keywords name-symbol
(use-package-sort-keywords (use-package-sort-keywords
(use-package-plist-maybe-put rest :defer t)) (use-package-plist-maybe-put rest :defer t))
(use-package-plist-append state :commands commands)) (use-package-plist-append state :commands commands))
`((ignore ,@form))))) `((ignore (,(if override 'bind-keys* 'bind-keys) ,@arg))))))
(defun use-package-handler/:bind* (name-symbol keyword arg rest state) (defun use-package-handler/:bind* (name-symbol keyword arg rest state)
(use-package-handler/:bind name-symbol keyword arg rest state t)) (use-package-handler/:bind name-symbol keyword arg rest state t))