From 17a1a4659a490275917e0dcdb0df428307bf8258 Mon Sep 17 00:00:00 2001 From: Jonas Bernoulli Date: Sat, 27 Apr 2013 17:04:47 +0200 Subject: [PATCH 1/4] enforce use of spaces for indentation --- lisp/use-package/bind-key.el | 4 +++- lisp/use-package/use-package.el | 8 +++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/lisp/use-package/bind-key.el b/lisp/use-package/bind-key.el index 5d125199e70..95dc0c8a605 100644 --- a/lisp/use-package/bind-key.el +++ b/lisp/use-package/bind-key.el @@ -219,5 +219,7 @@ (display-buffer (current-buffer)))) (provide 'bind-key) - +;; Local Variables: +;; indent-tabs-mode: nil +;; End: ;;; bind-key.el ends here diff --git a/lisp/use-package/use-package.el b/lisp/use-package/use-package.el index 896edeade97..46b46278c07 100644 --- a/lisp/use-package/use-package.el +++ b/lisp/use-package/use-package.el @@ -376,9 +376,9 @@ (message "Failure on use-package idle. Form: %s, Error: %s" next e))) - ;; recurse after a bit + ;; recurse after a bit (when (sit-for 3) - (use-package-idle-eval))) + (use-package-idle-eval))) ;; finished (so far!) (cancel-timer use-package-idle-timer) (setq use-package-idle-timer nil)))) @@ -605,5 +605,7 @@ For full documentation. please see commentary. (put 'use-package 'lisp-indent-function 1) (provide 'use-package) - +;; Local Variables: +;; indent-tabs-mode: nil +;; End: ;;; use-package.el ends here From 82903da9d8d50bf446a9fc90d65e4fefd18f17eb Mon Sep 17 00:00:00 2001 From: Jonas Bernoulli Date: Sat, 27 Apr 2013 17:09:12 +0200 Subject: [PATCH 2/4] don't use obsolete flet Unfortunately there isn't a proper dynamically scoped replacement, so we have to resort to using funcall. --- lisp/use-package/use-package.el | 55 +++++++++++++++++---------------- 1 file changed, 29 insertions(+), 26 deletions(-) diff --git a/lisp/use-package/use-package.el b/lisp/use-package/use-package.el index 46b46278c07..f4db4e3259a 100644 --- a/lisp/use-package/use-package.el +++ b/lisp/use-package/use-package.el @@ -482,35 +482,38 @@ For full documentation. please see commentary. ,init-body))) - (flet ((init-for-commands - (func sym-or-list) - (let ((cons-list (if (and (consp sym-or-list) - (stringp (car sym-or-list))) - (list sym-or-list) - sym-or-list))) - (if cons-list - (setq init-body - `(progn - ,init-body - ,@(mapcar #'(lambda (elem) - (push (cdr elem) commands) - (funcall func elem)) - cons-list))))))) + (let ((init-for-commands + (lambda (func sym-or-list) + (let ((cons-list (if (and (consp sym-or-list) + (stringp (car sym-or-list))) + (list sym-or-list) + sym-or-list))) + (if cons-list + (setq init-body + `(progn + ,init-body + ,@(mapcar #'(lambda (elem) + (push (cdr elem) commands) + (funcall func elem)) + cons-list)))))))) - (init-for-commands #'(lambda (binding) - `(bind-key ,(car binding) - (quote ,(cdr binding)))) - (plist-get args :bind)) + (funcall init-for-commands + #'(lambda (binding) + `(bind-key ,(car binding) + (quote ,(cdr binding)))) + (plist-get args :bind)) - (init-for-commands #'(lambda (mode) - `(add-to-list 'auto-mode-alist - (quote ,mode))) - (plist-get args :mode)) + (funcall init-for-commands + #'(lambda (mode) + `(add-to-list 'auto-mode-alist + (quote ,mode))) + (plist-get args :mode)) - (init-for-commands #'(lambda (interpreter) - `(add-to-list 'interpreter-mode-alist - (quote ,interpreter))) - (plist-get args :interpreter))) + (funcall init-for-commands + #'(lambda (interpreter) + `(add-to-list 'interpreter-mode-alist + (quote ,interpreter))) + (plist-get args :interpreter))) `(progn ,@(mapcar From a5e4a6d93836b88fb8dc15c3f5084bd8a0ea29b6 Mon Sep 17 00:00:00 2001 From: Jonas Bernoulli Date: Sat, 27 Apr 2013 17:09:52 +0200 Subject: [PATCH 3/4] quiet byte-compiler; ensure package.el is loaded --- lisp/use-package/use-package.el | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lisp/use-package/use-package.el b/lisp/use-package/use-package.el index f4db4e3259a..0438deade7d 100644 --- a/lisp/use-package/use-package.el +++ b/lisp/use-package/use-package.el @@ -284,6 +284,9 @@ (eval-when-compile (require 'cl)) +(declare-function package-installed-p 'package) +(declare-function el-get-read-recipe 'el-get) + (defgroup use-package nil "A use-package declaration for simplifying your .emacs" :group 'startup) @@ -448,6 +451,7 @@ For full documentation. please see commentary. ensure))) (when package-name + (require 'package) (use-package-ensure-elpa package-name))) From d2460b92769e6ed78057c36dfcb450bd0d3e97cc Mon Sep 17 00:00:00 2001 From: Jonas Bernoulli Date: Sat, 27 Apr 2013 17:11:16 +0200 Subject: [PATCH 4/4] add dots; cleanup whitespace --- lisp/use-package/use-package.el | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/lisp/use-package/use-package.el b/lisp/use-package/use-package.el index 0438deade7d..5b2cb03580d 100644 --- a/lisp/use-package/use-package.el +++ b/lisp/use-package/use-package.el @@ -288,7 +288,7 @@ (declare-function el-get-read-recipe 'el-get) (defgroup use-package nil - "A use-package declaration for simplifying your .emacs" + "A use-package declaration for simplifying your `.emacs'." :group 'startup) (defcustom use-package-verbose t @@ -297,15 +297,14 @@ :group 'use-package) (defcustom use-package-debug nil - "Whether to report more information, mostly regarding el-get" + "Whether to report more information, mostly regarding el-get." :type 'boolean :group 'use-package) (defcustom use-package-minimum-reported-time 0.01 "Minimal load time that will be reported" :type 'number - :group 'use-package - ) + :group 'use-package) (defmacro with-elapsed-timer (text &rest forms) `(let ((now ,(if use-package-verbose @@ -349,7 +348,7 @@ (defvar use-package-idle-forms nil) (defun use-package-start-idle-timer () - "Ensure that the idle timer is running" + "Ensure that the idle timer is running." (unless use-package-idle-timer (setq use-package-idle-timer (run-with-idle-timer @@ -357,16 +356,15 @@ 'use-package-idle-eval)))) (defun use-package-init-on-idle (form) - "Add a new form to the idle queue" + "Add a new form to the idle queue." (use-package-start-idle-timer) (if use-package-idle-forms (add-to-list 'use-package-idle-forms form t) - (setq use-package-idle-forms (list form)) - )) + (setq use-package-idle-forms (list form)))) (defun use-package-idle-eval() - "Start to eval idle-commands from the idle queue" + "Start to eval idle-commands from the idle queue." (let ((next (pop use-package-idle-forms))) (if next (progn @@ -413,8 +411,7 @@ For full documentation. please see commentary. :defines Define vars to silence byte-compiler. :load-path Add to `load-path' before loading. :diminish Support for diminish package (if it's installed). -:idle adds a form to run on an idle timer -" +:idle adds a form to run on an idle timer" (let* ((commands (plist-get args :commands)) (pre-init-body (plist-get args :pre-init)) (init-body (plist-get args :init))