From: John Wiegley <johnw@newartisans.com>
Date: Sun, 15 Mar 2015 07:21:53 +0000 (-0500)
Subject: Some minor code reformatting
X-Git-Tag: emacs-29.0.90~1306^2~15^2~395
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=b4a00d2eb56abf89dc076dc92d9f14cca6972fd1;p=emacs.git

Some minor code reformatting
---

diff --git a/lisp/use-package/use-package.el b/lisp/use-package/use-package.el
index 7cdd01d07b8..b3bf871576f 100644
--- a/lisp/use-package/use-package.el
+++ b/lisp/use-package/use-package.el
@@ -292,13 +292,14 @@ then the expanded macros do their job silently."
 
 (defsubst use-package-expand (name label form)
   (declare (indent 1))
-  (and form
-       (let ((err (make-symbol "err"))
-             (fmt (format "Failure in %s of %s: %%S" label name)))
-         `(condition-case-unless-debug ,err
-              ,form
-            (error (display-warning 'use-package (format ,fmt ,err) :error)
-                   nil)))))
+  (when form
+    (let ((err (make-symbol "err"))
+          (fmt (format "Failure in %s of %s: %%S" label name)))
+      `(condition-case-unless-debug ,err
+           ,form
+         (error
+          (ignore
+           (display-warning 'use-package (format ,fmt ,err) :error)))))))
 
 (defun use--package (name-symbol name-string args)
   "See docstring for `use-package'."