masscollaborationlabs/emacs
2
0
Fork 0
mirror of https://github.com/masscollaborationlabs/emacs.git synced 2025-07-04 19:29:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Change some code for consistency's sake

Browse source
This commit is contained in:
John Wiegley 2015-03-17 10:21:34 -05:00
parent c819beebf0
commit eda8246fc6
1 changed files with 24 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -384,14 +384,14 @@ possible."
`(bind-key ,(car binding) `(bind-key ,(car binding)
#'(lambda () (interactive) #'(lambda () (interactive)
(use-package-autoload-keymap (use-package-autoload-keymap
',(cdr binding) (quote ,name-symbol) nil)))) ',(cdr binding) ',name-symbol nil))))
(plist-get args :bind-keymap)) (plist-get args :bind-keymap))
(mapcar #'(lambda (binding) (mapcar #'(lambda (binding)
`(bind-key ,(car binding) `(bind-key ,(car binding)
#'(lambda () (interactive) #'(lambda () (interactive)
(use-package-autoload-keymap (use-package-autoload-keymap
',(cdr binding) (quote ,name-symbol) t)))) ',(cdr binding) ',name-symbol t))))
(plist-get args :bind-keymap*)) (plist-get args :bind-keymap*))
(mapcar #'(lambda (mode) (mapcar #'(lambda (mode)
@ -428,16 +428,16 @@ possible."
(mapcar #'(lambda (var) (mapcar #'(lambda (var)
(if (listp var) (if (listp var)
`(diminish (quote ,(car var)) ,(cdr var)) `(diminish ',(car var) ,(cdr var))
`(diminish (quote ,var)))) `(diminish ',var)))
(plist-get args :diminish)))) (plist-get args :diminish))))
(config-body* (config-body*
(and config-body (and config-body
(macroexpand (macroexpand
`(use-package-with-elapsed-timer `(use-package-with-elapsed-timer
,(format "Configuring package %s" name-string) ,(format "Configuring package %s" name-string)
,@config-body)))) ,@config-body))))
(config-defun (config-defun
(make-symbol (concat "use-package--" name-string "--config")))) (make-symbol (concat "use-package--" name-string "--config"))))
@ -488,24 +488,24 @@ possible."
(list t)) (list t))
`(,(macroexpand `(,(macroexpand
`(use-package-with-elapsed-timer `(use-package-with-elapsed-timer
,(format "Loading package %s" name-string) ,(format "Loading package %s" name-string)
,(if use-package-expand-minimally ,(if use-package-expand-minimally
(use-package-progn (use-package-progn
(use-package-cat-maybes (use-package-cat-maybes
(list `(require ',name-symbol)) (list `(require ',name-symbol))
bindings bindings
config-body config-body
(list t))) (list t)))
`(if (not (require ',name-symbol nil t)) `(if (not (require ',name-symbol nil t))
(ignore (ignore
(display-warning (display-warning
'use-package 'use-package
(format "Could not load package %s" ,name-string) (format "Could not load package %s" ,name-string)
:error)) :error))
,@(use-package-cat-maybes ,@(use-package-cat-maybes
bindings bindings
config-body config-body
(list t))))))))))) (list t)))))))))))
(defmacro use-package (name &rest args) (defmacro use-package (name &rest args)
"Declare an Emacs package by specifying a group of configuration options. "Declare an Emacs package by specifying a group of configuration options.