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 npostavs/state-noconst

Browse source 
Some minor fixes
GitHub-reference: https://github.com/jwiegley/use-package/issues/342
This commit is contained in:
John Wiegley 2016-07-18 09:10:49 -07:00 • committed by GitHub
commit 811c99da52
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -46,7 +46,7 @@
(eval-when-compile (require 'cl)) (eval-when-compile (require 'cl))
(eval-when-compile (require 'regexp-opt)) (eval-when-compile (require 'regexp-opt))
(declare-function package-installed-p 'package) (declare-function package-installed-p "package")
(defgroup use-package nil (defgroup use-package nil
"A use-package declaration for simplifying your `.emacs'." "A use-package declaration for simplifying your `.emacs'."
@ -212,8 +212,8 @@ convert it to a string and return that."
"Return a form which will load or require NAME depending on "Return a form which will load or require NAME depending on
whether it's a string or symbol." whether it's a string or symbol."
(if (stringp name) (if (stringp name)
`(load ,name 'noerror) `(load ,name ',noerror)
`(require ',name nil 'noerror))) `(require ',name nil ',noerror)))
(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."
@ -1167,7 +1167,7 @@ this file. Usage:
(let ((body (let ((body
(macroexp-progn (macroexp-progn
(use-package-process-keywords name args* (use-package-process-keywords name args*
(and use-package-always-defer '(:deferred t)))))) (and use-package-always-defer (list :deferred t))))))
(if use-package-debug (if use-package-debug
(display-buffer (display-buffer
(save-current-buffer (save-current-buffer