procyberian/emacs
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Don't use with-demoted-errors in use-package-ensure-elpa

Browse source 
It expects a literal string as argument at macro-expansion
time, but we need to construct the message.
This commit is contained in:
Jonas Bernoulli 2017-10-13 14:08:06 +02:00
parent 3f58555ed8
commit 68c9ee4bff
1 changed files with 12 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -737,17 +737,20 @@ If the package is installed, its entry is removed from
;; bypassed.
(member context '(:byte-compile :ensure :config))
(y-or-n-p (format "Install package %S?" package))))
(with-demoted-errors (format "Cannot load %s: %%S" name)
(when (assoc package (bound-and-true-p package-pinned-packages))
(package-read-all-archive-contents))
(if (assoc package package-archive-contents)
(progn (package-install package) t)
(condition-case-unless-debug err
(progn
(package-refresh-contents)
(when (assoc package (bound-and-true-p
package-pinned-packages))
(when (assoc package (bound-and-true-p package-pinned-packages))
(package-read-all-archive-contents))
(package-install package))))))))
(if (assoc package package-archive-contents)
(progn (package-install package) t)
(progn
(package-refresh-contents)
(when (assoc package (bound-and-true-p
package-pinned-packages))
(package-read-all-archive-contents))
(package-install package))))
(error (message "Error: Cannot load %s: %S" name err)
nil))))))
(defun use-package-handler/:ensure (name keyword ensure rest state)
(let* ((body (use-package-process-keywords name rest