From: Jonas Bernoulli <jonas@bernoul.li>
Date: Fri, 13 Oct 2017 12:09:13 +0000 (+0200)
Subject: Cosmetic changes to use-package-ensure-elpa
X-Git-Tag: emacs-29.0.90~1306^2~15^2~258^2
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=85643eaf18842b11032f2c919c7656ed00a5d6a5;p=emacs.git

Cosmetic changes to use-package-ensure-elpa
---

diff --git a/lisp/use-package/use-package.el b/lisp/use-package/use-package.el
index 4720c072ba6..969cd0beabf 100644
--- a/lisp/use-package/use-package.el
+++ b/lisp/use-package/use-package.el
@@ -741,14 +741,15 @@ If the package is installed, its entry is removed from
               (progn
                 (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)
-                  (progn
-                    (package-refresh-contents)
-                    (when (assoc package (bound-and-true-p
-                                          package-pinned-packages))
-                      (package-read-all-archive-contents))
-                    (package-install package))))
+                (cond ((assoc package package-archive-contents)
+                       (package-install package)
+                       t)
+                      (t
+                       (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))))))