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

Always return t on a successful init-time load

Browse source 
Fixes https://github.com/jwiegley/use-package/issues/174
This commit is contained in:
John Wiegley 2015-03-16 22:12:52 -05:00
parent db69a3f81c
commit 771f2edc83
1 changed files with 14 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -105,6 +105,9 @@ possible."
:type 'boolean :type 'boolean
:group 'use-package) :group 'use-package)
(eval-when-compile
(defvar use-package-expand-minimally))
(defmacro use-package-expand (name label form) (defmacro use-package-expand (name label form)
(declare (indent 1)) (declare (indent 1))
(when form (when form
@ -479,7 +482,8 @@ possible."
(if config-body (if config-body
`((eval-after-load ',name `((eval-after-load ',name
;; '(,config-defun) ;; '(,config-defun)
',config-body*)))) ',config-body*)))
(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)
@ -488,15 +492,18 @@ possible."
(use-package-cat-maybes (use-package-cat-maybes
(list `(require ',name-symbol)) (list `(require ',name-symbol))
bindings bindings
(list config-body*))) config-body
(list t)))
`(if (not (require ',name-symbol nil t)) `(if (not (require ',name-symbol nil t))
(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
(list config-body*))))))))))) config-body
(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.