masscollaborationlabs/emacs
2
0
Fork 0
mirror of https://github.com/masscollaborationlabs/emacs.git synced 2025-07-05 03:39:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

use-package-progn: replace with macroexp-progn

Browse source
This commit is contained in:
Noam Postavsky 2015-03-19 17:40:41 -04:00
parent 23ec1ca719
commit 3467e4eaa6
1 changed files with 7 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -143,11 +143,6 @@ the creation of new phases in future.")
(phases (cl-remove-if #'(lambda (x) (keywordp args)))))) (phases (cl-remove-if #'(lambda (x) (keywordp args))))))
) )
(defun use-package-progn (body)
(if (= (length body) 1)
(car body)
`(progn ,@body)))
(defun use-package-expand (name label form) (defun use-package-expand (name label form)
"FORM is a list of forms, so `((foo))' if only `foo' is being called." "FORM is a list of forms, so `((foo))' if only `foo' is being called."
(declare (indent 1)) (declare (indent 1))
@ -157,7 +152,7 @@ the creation of new phases in future.")
(let ((err (make-symbol "err"))) (let ((err (make-symbol "err")))
(list (list
`(condition-case-unless-debug ,err `(condition-case-unless-debug ,err
,(use-package-progn form) ,(macroexp-progn form)
(error (error
(ignore (ignore
(display-warning 'use-package (display-warning 'use-package
@ -176,15 +171,15 @@ ARGS is a list of forms, so `((foo))' if only `foo' is being called."
(let ((keyword-name (substring (format "%s" keyword) 1)) (let ((keyword-name (substring (format "%s" keyword) 1))
(block (plist-get args keyword))) (block (plist-get args keyword)))
(when block (when block
`((when ,(use-package-progn `((when ,(macroexp-progn
(use-package-expand name-string (format "pre-%s hook" keyword) (use-package-expand name-string (format "pre-%s hook" keyword)
`(run-hook-with-args-until-failure `(run-hook-with-args-until-failure
',(intern (concat "use-package--" name-string ',(intern (concat "use-package--" name-string
"--pre-" keyword-name "-hook"))))) "--pre-" keyword-name "-hook")))))
,(use-package-progn ,(macroexp-progn
(use-package-expand name-string (format "%s" keyword) (use-package-expand name-string (format "%s" keyword)
(plist-get args keyword))) (plist-get args keyword)))
,(use-package-progn ,(macroexp-progn
(use-package-expand name-string (format "post-%s hook" keyword) (use-package-expand name-string (format "post-%s hook" keyword)
`(run-hooks `(run-hooks
',(intern (concat "use-package--" name-string ',(intern (concat "use-package--" name-string
@ -200,7 +195,7 @@ ARGS is a list of forms, so `((foo))' if only `foo' is being called."
`((let ((,nowvar (current-time))) `((let ((,nowvar (current-time)))
(message "%s..." ,text) (message "%s..." ,text)
(prog1 (prog1
,(use-package-progn body) ,(macroexp-progn body)
(let ((elapsed (let ((elapsed
(float-time (time-subtract (current-time) ,nowvar)))) (float-time (time-subtract (current-time) ,nowvar))))
(if (> elapsed ,use-package-minimum-reported-time) (if (> elapsed ,use-package-minimum-reported-time)
@ -540,7 +535,7 @@ ARGS is a list of forms, so `((foo))' if only `foo' is being called."
(if config-body (if config-body
`((eval-after-load ',name `((eval-after-load ',name
;; '(,config-defun) ;; '(,config-defun)
',(use-package-progn config-body)))) ',(macroexp-progn config-body))))
(list t)) (list t))
(use-package-with-elapsed-timer (use-package-with-elapsed-timer
(format "Loading package %s" name-string) (format "Loading package %s" name-string)
@ -639,7 +634,7 @@ this file. Usage:
body)) body))
(requires (plist-get args* :requires)) (requires (plist-get args* :requires))
(body* (body*
(use-package-progn (macroexp-progn
(if (null requires) (if (null requires)
expansion expansion
`((if ,(if (listp requires) `((if ,(if (listp requires)