summaryrefslogtreecommitdiff
path: root/lisp/use-package
diff options
context:
space:
mode:
authorJohn Wiegley <johnw@newartisans.com>2015-03-15 02:21:53 -0500
committerJohn Wiegley <johnw@newartisans.com>2015-03-15 02:21:53 -0500
commitb4a00d2eb56abf89dc076dc92d9f14cca6972fd1 (patch)
tree47cabc728b14de8b77f946f1485fb728e6c9c5d8 /lisp/use-package
parent71f894fe78dc5ddb369ab387ece3d2255e11f07c (diff)
downloademacs-b4a00d2eb56abf89dc076dc92d9f14cca6972fd1.tar.gz
emacs-b4a00d2eb56abf89dc076dc92d9f14cca6972fd1.tar.bz2
emacs-b4a00d2eb56abf89dc076dc92d9f14cca6972fd1.zip
Some minor code reformatting
Diffstat (limited to 'lisp/use-package')
-rw-r--r--lisp/use-package/use-package.el15
1 files changed, 8 insertions, 7 deletions
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'."