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

Add code to workaround an inefficiency with eval-after-load

Browse source 
This is currently disabled, as it leads to strange byte-compilation
errors that need to be tracked down.
This commit is contained in:
John Wiegley 2015-03-16 02:54:43 -05:00
parent 4029030eb5
commit 55d6bb00ca
1 changed files with 21 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -386,7 +386,11 @@ the user specified.")
(if (listp var) (if (listp var)
`(diminish (quote ,(car var)) ,(cdr var)) `(diminish (quote ,(car var)) ,(cdr var))
`(diminish (quote ,var)))) `(diminish (quote ,var))))
(plist-get args :diminish))))) (plist-get args :diminish))))
(config-defun (make-symbol (concat name-string "-config"))))
(setq commands (delete-dups commands))
;; Return the main body of the macro ;; Return the main body of the macro
(use-package-cat-maybes (use-package-cat-maybes
@ -412,6 +416,12 @@ the user specified.")
`(declare-function ,fn ,name-string)) `(declare-function ,fn ,name-string))
(append (plist-get args :functions) commands))) (append (plist-get args :functions) commands)))
;; (if (and defer-loading config-body)
;; `((defun ,config-defun ()
;; (use-package-with-elapsed-timer
;; ,(format "Configuring package %s" name-string)
;; ,@config-body))))
;; The user's initializations ;; The user's initializations
(list (use-package-hook-injector name-string :init args)) (list (use-package-hook-injector name-string :init args))
@ -419,17 +429,16 @@ the user specified.")
(use-package-cat-maybes (use-package-cat-maybes
bindings bindings
(if config-body (if config-body
(let ((body `((eval-after-load ',name
`(use-package-with-elapsed-timer '(use-package-with-elapsed-timer
,(format "Configuring package %s" ,(format "Configuring package %s" name-string)
name-string) ,@config-body)))))
,@config-body)))
(list `(eval-after-load ',name
',body)))))
`((use-package-with-elapsed-timer `((use-package-with-elapsed-timer
,(format "Loading package %s" name-string) ,(format "Loading package %s" name-string)
(if (not (require ',name-symbol nil t)) (if (not (require ',name-symbol nil t))
(message "Could not load package %s" ,name-string) (display-warning
'use-package
(format "Could not load package %s" ,name-string) :error)
,@(use-package-cat-maybes ,@(use-package-cat-maybes
bindings bindings
config-body) config-body)
@ -485,7 +494,9 @@ this file. Usage:
(args* (args*
(condition-case-unless-debug err (condition-case-unless-debug err
(use-package-normalize-plist name-symbol args) (use-package-normalize-plist name-symbol args)
(error (message (error-message-string err)))))) (error
(display-warning 'use-package
(error-message-string err) :error)))))
;; Pin any packages that have been marked with `:pin'. ;; Pin any packages that have been marked with `:pin'.
(let ((archive-name (plist-get args* :pin))) (let ((archive-name (plist-get args* :pin)))