summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Wiegley <johnw@newartisans.com>2014-01-06 12:53:52 -0800
committerJohn Wiegley <johnw@newartisans.com>2014-01-06 12:53:52 -0800
commit6ca942d7803fdb0885e60d76d4ca0d7648dfd3b7 (patch)
tree9281478adbf5e4398a63f0a9f4272361a3bfd4f5
parent283653ff4b41024cc821f0e24d5769eadd3b952f (diff)
parent21cabfd334083628fc28641c0944540a97c11ada (diff)
downloademacs-6ca942d780.tar.gz
Merge pull request from aspiers/best-practices
Start addressing some of @jaalto's submitted issues. GitHub-reference: https://github.com/jwiegley/use-package/issues/79
-rw-r--r--lisp/use-package/bind-key.el2
-rw-r--r--lisp/use-package/use-package.el8
2 files changed, 5 insertions, 5 deletions
diff --git a/lisp/use-package/bind-key.el b/lisp/use-package/bind-key.el
index f5e07ba7831..68146c05c2a 100644
--- a/lisp/use-package/bind-key.el
+++ b/lisp/use-package/bind-key.el
@@ -6,7 +6,7 @@
;; Created: 16 Jun 2012
;; Version: 1.0
;; Keywords: keys keybinding config dotemacs
-;; X-URL: https://github.com/jwiegley/bind-key
+;; URL: https://github.com/jwiegley/use-package
;; This program is free software; you can redistribute it and/or
;; modify it under the terms of the GNU General Public License as
diff --git a/lisp/use-package/use-package.el b/lisp/use-package/use-package.el
index df0d2310da9..1a99e1258c9 100644
--- a/lisp/use-package/use-package.el
+++ b/lisp/use-package/use-package.el
@@ -58,7 +58,7 @@
:type 'number
:group 'use-package)
-(defmacro with-elapsed-timer (text &rest forms)
+(defmacro use-package-with-elapsed-timer (text &rest forms)
(let ((body `(progn ,@forms)))
(if use-package-verbose
(let ((nowvar (make-symbol "now")))
@@ -72,7 +72,7 @@
(message "%s...done" ,text))))))
body)))
-(put 'with-elapsed-timer 'lisp-indent-function 1)
+(put 'use-package-with-elapsed-timer 'lisp-indent-function 1)
(defvar use-package-idle-timer nil)
(defvar use-package-idle-forms nil)
@@ -341,13 +341,13 @@ For full documentation. please see commentary.
`(eval-after-load ,(if (stringp name) name `',name)
`(,(lambda ()
(if ,requires-test
- (with-elapsed-timer
+ (use-package-with-elapsed-timer
,(format "Configuring package %s" name-string)
,config-body))))))
t))
`(if (and ,(or predicate t)
,requires-test)
- (with-elapsed-timer
+ (use-package-with-elapsed-timer
,(format "Loading package %s" name-string)
(if (not ,(if (stringp name)
`(load ,name t)