Move variable bindings to the bottom of each file

9 files changed, 52 insertions, 11 deletions

diff --git a/lisp/use-package/use-package-bind-key.el b/lisp/use-package/use-package-bind-key.el
index 8c86ef5edfc..0f286c51c68 100644
--- a/lisp/use-package/use-package-bind-key.el
+++ b/lisp/use-package/use-package-bind-key.el
@@ -1,4 +1,4 @@
-;;; use-package-bind-key.el --- Support for the :bind/:bind-keymap keywords  -*- lexical-binding: t; -*-
+;;; use-package-bind-key.el --- Support for the :bind/:bind-keymap keywords
 
 ;; Copyright (C) 2012-2017 John Wiegley
 
@@ -166,4 +166,9 @@ deferred until the prefix key sequence is pressed."
 
 (provide 'use-package-bind-key)
 
+;; Local Variables:
+;; indent-tabs-mode: nil
+;; lexical-binding: t
+;; End:
+
 ;;; use-package-bind-key.el ends here
diff --git a/lisp/use-package/use-package-chords.el b/lisp/use-package/use-package-chords.el
index 936ff228999..240da96eca1 100644
--- a/lisp/use-package/use-package-chords.el
+++ b/lisp/use-package/use-package-chords.el
@@ -1,4 +1,4 @@
-;;; use-package-chords.el --- key-chord keyword for use-package  -*- lexical-binding: t; -*-
+;;; use-package-chords.el --- key-chord keyword for use-package
 
 ;; Copyright (C) 2015-2017 Justin Talbott
 
@@ -47,4 +47,9 @@
 
 (provide 'use-package-chords)
 
+;; Local Variables:
+;; indent-tabs-mode: nil
+;; lexical-binding: t
+;; End:
+
 ;;; use-package-chords.el ends here
diff --git a/lisp/use-package/use-package-core.el b/lisp/use-package/use-package-core.el
index 9adebdf4bf0..9ec5d3b1422 100644
--- a/lisp/use-package/use-package-core.el
+++ b/lisp/use-package/use-package-core.el
@@ -1,4 +1,4 @@
-;;; use-package-core.el --- A configuration macro for simplifying your .emacs  -*- lexical-binding: t; -*-
+;;; use-package-core.el --- A configuration macro for simplifying your .emacs
 
 ;; Copyright (C) 2012-2017 John Wiegley
 
@@ -550,7 +550,7 @@ extending any keys already present."
            (nreverse
             (sort plist-grouped
                   #'(lambda (l r) (< (use-package-keyword-index (car l))
-                                (use-package-keyword-index (car r)))))))
+                                     (use-package-keyword-index (car r)))))))
         (setq result (cons (car x) (cons (cdr x) result))))
       result)))
 
@@ -754,7 +754,7 @@ no more than once."
     `((defvar ,loaded nil)
       (defvar ,result nil)
       (defvar ,next #'(lambda () (if ,loaded ,result
-                              (setq ,loaded t ,result ,arg))))
+                                   (setq ,loaded t ,result ,arg))))
       ,@(funcall f `((funcall ,next))))))
 
 (defsubst use-package-normalize-value (_label arg)
@@ -1536,6 +1536,7 @@ this file.  Usage:
 
 ;; Local Variables:
 ;; indent-tabs-mode: nil
+;; lexical-binding: t
 ;; End:
 
 ;;; use-package-core.el ends here
diff --git a/lisp/use-package/use-package-delight.el b/lisp/use-package/use-package-delight.el
index 85d5c7cb4d6..ab2dad9bd0a 100644
--- a/lisp/use-package/use-package-delight.el
+++ b/lisp/use-package/use-package-delight.el
@@ -1,4 +1,4 @@
-;;; use-package-delight.el --- Support for the :delight keyword  -*- lexical-binding: t; -*-
+;;; use-package-delight.el --- Support for the :delight keyword
 
 ;; Copyright (C) 2012-2017 John Wiegley
 
@@ -88,4 +88,9 @@
 
 (provide 'use-package-delight)
 
+;; Local Variables:
+;; indent-tabs-mode: nil
+;; lexical-binding: t
+;; End:
+
 ;;; use-package-delight.el ends here
diff --git a/lisp/use-package/use-package-diminish.el b/lisp/use-package/use-package-diminish.el
index 1f3895f42cd..69b8dafc4c3 100644
--- a/lisp/use-package/use-package-diminish.el
+++ b/lisp/use-package/use-package-diminish.el
@@ -1,4 +1,4 @@
-;;; use-package-diminish.el --- Support for the :diminish keyword  -*- lexical-binding: t; -*-
+;;; use-package-diminish.el --- Support for the :diminish keyword
 
 ;; Copyright (C) 2012-2017 John Wiegley
 
@@ -77,4 +77,9 @@
 
 (provide 'use-package-diminish)
 
+;; Local Variables:
+;; indent-tabs-mode: nil
+;; lexical-binding: t
+;; End:
+
 ;;; use-package-diminish.el ends here
diff --git a/lisp/use-package/use-package-ensure.el b/lisp/use-package/use-package-ensure.el
index 50005a9e990..2d4e00e5c01 100644
--- a/lisp/use-package/use-package-ensure.el
+++ b/lisp/use-package/use-package-ensure.el
@@ -1,4 +1,4 @@
-;;; use-package-ensure.el --- Support for the :ensure and :pin keywords  -*- lexical-binding: t; -*-
+;;; use-package-ensure.el --- Support for the :ensure and :pin keywords
 
 ;; Copyright (C) 2012-2017 John Wiegley
 
@@ -211,4 +211,9 @@ manually updated package."
 
 (provide 'use-package-ensure)
 
+;; Local Variables:
+;; indent-tabs-mode: nil
+;; lexical-binding: t
+;; End:
+
 ;;; use-package-ensure.el ends here
diff --git a/lisp/use-package/use-package-jump.el b/lisp/use-package/use-package-jump.el
index 4044ad16564..60d3ef525bc 100644
--- a/lisp/use-package/use-package-jump.el
+++ b/lisp/use-package/use-package-jump.el
@@ -1,4 +1,4 @@
-;;; use-package-jump.el --- Attempt to jump to a use-package declaration  -*- lexical-binding: t; -*-
+;;; use-package-jump.el --- Attempt to jump to a use-package declaration
 
 ;; Copyright (C) 2012-2017 John Wiegley
 
@@ -76,4 +76,9 @@ instead."
 
 (provide 'use-package-jump)
 
+;; Local Variables:
+;; indent-tabs-mode: nil
+;; lexical-binding: t
+;; End:
+
 ;;; use-package-jump.el ends here
diff --git a/lisp/use-package/use-package-lint.el b/lisp/use-package/use-package-lint.el
index c6e7c3c0ce2..54f5b759406 100644
--- a/lisp/use-package/use-package-lint.el
+++ b/lisp/use-package/use-package-lint.el
@@ -1,4 +1,4 @@
-;;; use-package-lint.el --- Attempt to find errors in use-package declarations  -*- lexical-binding: t; -*-
+;;; use-package-lint.el --- Attempt to find errors in use-package declarations
 
 ;; Copyright (C) 2012-2017 John Wiegley
 
@@ -81,4 +81,9 @@ with the specified `:load-path' the module cannot be found."
 
 (provide 'use-package-lint)
 
+;; Local Variables:
+;; indent-tabs-mode: nil
+;; lexical-binding: t
+;; End:
+
 ;;; use-package-lint.el ends here
diff --git a/lisp/use-package/use-package.el b/lisp/use-package/use-package.el
index 1a8fff895f6..4d1b56b6d6a 100644
--- a/lisp/use-package/use-package.el
+++ b/lisp/use-package/use-package.el
@@ -1,4 +1,4 @@
-;;; use-package.el --- A configuration macro for simplifying your .emacs  -*- lexical-binding: t; -*-
+;;; use-package.el --- A configuration macro for simplifying your .emacs
 
 ;; Copyright (C) 2012-2017 John Wiegley
 
@@ -51,4 +51,9 @@
 
 (provide 'use-package)
 
+;; Local Variables:
+;; indent-tabs-mode: nil
+;; lexical-binding: t
+;; End:
+
 ;;; use-package.el ends here