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

Merge pull request from tarsius/master

Browse source 
Allow using expanded macro without loading feature
GitHub-reference: https://github.com/jwiegley/use-package/issues/151
This commit is contained in:
John Wiegley 2015-01-18 09:22:03 -06:00
commit 24ace89e5a
1 changed files with 21 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -48,12 +48,27 @@
:group 'startup) :group 'startup)
(defcustom use-package-verbose nil (defcustom use-package-verbose nil
"Whether to report about loading and configuration details." "Whether to report about loading and configuration details.
If you customize this, then you should require the `use-package'
feature in files that use one of the macros `use-package' or
`use-package-with-elapsed-timer', even if these files only
contain compiled expansions of the macros. If you don't do so,
then the expanded macros do their job silently."
:type 'boolean :type 'boolean
:group 'use-package) :group 'use-package)
(defcustom use-package-minimum-reported-time 0.01 (defcustom use-package-minimum-reported-time 0.01
"Minimal load time that will be reported" "Minimal load time that will be reported.
Note that `use-package-verbose' has to be set to t, for anything
to be reported at all.
If you customize this, then you should require the `use-package'
feature in files that use one of the macros `use-package' or
`use-package-with-elapsed-timer', even if these files only
contain compiled expansions of the macros. If you don't do so,
then the expanded macros do their job silently."
:type 'number :type 'number
:group 'use-package) :group 'use-package)
@ -65,13 +80,15 @@
(defmacro use-package-with-elapsed-timer (text &rest body) (defmacro use-package-with-elapsed-timer (text &rest body)
(declare (indent 1)) (declare (indent 1))
(let ((nowvar (make-symbol "now"))) (let ((nowvar (make-symbol "now")))
`(if use-package-verbose `(if (bound-and-true-p use-package-verbose)
(let ((,nowvar (current-time))) (let ((,nowvar (current-time)))
(message "%s..." ,text) (message "%s..." ,text)
(prog1 (progn ,@body) (prog1 (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
(or (bound-and-true-p use-package-minimum-reported-time)
"0.01"))
(message "%s...done (%.3fs)" ,text elapsed) (message "%s...done (%.3fs)" ,text elapsed)
(message "%s...done" ,text))))) (message "%s...done" ,text)))))
,@body))) ,@body)))