summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Wiegley <johnw@newartisans.com>2014-09-18 21:33:08 +0100
committerJohn Wiegley <johnw@newartisans.com>2014-09-18 21:33:08 +0100
commit6570447a05fc080693efb9db4dc8565a40c38b01 (patch)
tree051ae8c7a292a508c530153e25491b299f3cc77e
parent0bfa35614839c7830e11b30c82b17013661bec22 (diff)
parentf07ecde5a1ba7d07405b4fd228b99529b37613a3 (diff)
downloademacs-6570447a05.tar.gz
Merge pull request from Silex/master
Fix "compiling" typo GitHub-reference: https://github.com/jwiegley/use-package/issues/125
-rw-r--r--lisp/use-package/use-package.el2
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/use-package/use-package.el b/lisp/use-package/use-package.el
index 68aa3c9d0b6..bc2dec27380 100644
--- a/lisp/use-package/use-package.el
+++ b/lisp/use-package/use-package.el
@@ -415,7 +415,7 @@ For full documentation. please see commentary.
,(if (stringp name)
`(load ,name t)
`(require ',name nil t))
- (error (message "Error compiling %s: %s" ',name err) nil))))
+ (error (message "Error requiring %s: %s" ',name err) nil))))
,(if (and (or commands (use-package-plist-get args :defer))
(not (use-package-plist-get args :demand)))