From 8c00f108bfa31bae6dfde16a29e7744f8c8ffc96 Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Sat, 21 Mar 2015 03:46:26 -0500 Subject: Change use-package to use bind-keys and bind-keys* Fixes https://github.com/jwiegley/use-package/issues/129 --- lisp/use-package/use-package.el | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'lisp/use-package/use-package.el') diff --git a/lisp/use-package/use-package.el b/lisp/use-package/use-package.el index 4c1433d66d9..5f911e3b718 100644 --- a/lisp/use-package/use-package.el +++ b/lisp/use-package/use-package.el @@ -633,19 +633,13 @@ manually updated package." (defun use-package-handler/:bind (name-symbol keyword arg rest state &optional override) - (let* (commands - (form (mapcar - #'(lambda (binding) - (push (cdr binding) commands) - `(,(if override - 'bind-key* - 'bind-key) ,(car binding) #',(cdr binding))) arg))) + (let ((commands (mapcar #'cdr arg))) (use-package-concat (use-package-process-keywords name-symbol (use-package-sort-keywords (use-package-plist-maybe-put rest :defer t)) (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) (use-package-handler/:bind name-symbol keyword arg rest state t)) -- cgit v1.2.3