From 566a2ea3a1f0fb1449e9c662924ed1d87e109284 Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Sat, 27 Jan 2018 14:09:10 -0800 Subject: [PATCH] Revert "Move variable bindings to the bottom of each file" This reverts commit c29193bf0724633adf7183dad2d0b6faf7d029ab. --- lisp/use-package/use-package-bind-key.el | 7 +------ lisp/use-package/use-package-chords.el | 7 +------ lisp/use-package/use-package-core.el | 7 +++---- lisp/use-package/use-package-delight.el | 7 +------ lisp/use-package/use-package-diminish.el | 7 +------ lisp/use-package/use-package-ensure.el | 7 +------ lisp/use-package/use-package-jump.el | 7 +------ lisp/use-package/use-package-lint.el | 7 +------ lisp/use-package/use-package.el | 7 +------ test/lisp/use-package/use-package-tests.el | 3 +-- 10 files changed, 12 insertions(+), 54 deletions(-) diff --git a/lisp/use-package/use-package-bind-key.el b/lisp/use-package/use-package-bind-key.el index 0f286c51c68..8c86ef5edfc 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 +;;; use-package-bind-key.el --- Support for the :bind/:bind-keymap keywords -*- lexical-binding: t; -*- ;; Copyright (C) 2012-2017 John Wiegley @@ -166,9 +166,4 @@ 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 240da96eca1..936ff228999 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 +;;; use-package-chords.el --- key-chord keyword for use-package -*- lexical-binding: t; -*- ;; Copyright (C) 2015-2017 Justin Talbott @@ -47,9 +47,4 @@ (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 9ec5d3b1422..9adebdf4bf0 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 +;;; use-package-core.el --- A configuration macro for simplifying your .emacs -*- lexical-binding: t; -*- ;; 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,7 +1536,6 @@ 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 ab2dad9bd0a..85d5c7cb4d6 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 +;;; use-package-delight.el --- Support for the :delight keyword -*- lexical-binding: t; -*- ;; Copyright (C) 2012-2017 John Wiegley @@ -88,9 +88,4 @@ (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 69b8dafc4c3..1f3895f42cd 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 +;;; use-package-diminish.el --- Support for the :diminish keyword -*- lexical-binding: t; -*- ;; Copyright (C) 2012-2017 John Wiegley @@ -77,9 +77,4 @@ (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 2d4e00e5c01..50005a9e990 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 +;;; use-package-ensure.el --- Support for the :ensure and :pin keywords -*- lexical-binding: t; -*- ;; Copyright (C) 2012-2017 John Wiegley @@ -211,9 +211,4 @@ 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 60d3ef525bc..4044ad16564 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 +;;; use-package-jump.el --- Attempt to jump to a use-package declaration -*- lexical-binding: t; -*- ;; Copyright (C) 2012-2017 John Wiegley @@ -76,9 +76,4 @@ 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 54f5b759406..c6e7c3c0ce2 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 +;;; use-package-lint.el --- Attempt to find errors in use-package declarations -*- lexical-binding: t; -*- ;; Copyright (C) 2012-2017 John Wiegley @@ -81,9 +81,4 @@ 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 4d1b56b6d6a..1a8fff895f6 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 +;;; use-package.el --- A configuration macro for simplifying your .emacs -*- lexical-binding: t; -*- ;; Copyright (C) 2012-2017 John Wiegley @@ -51,9 +51,4 @@ (provide 'use-package) -;; Local Variables: -;; indent-tabs-mode: nil -;; lexical-binding: t -;; End: - ;;; use-package.el ends here diff --git a/test/lisp/use-package/use-package-tests.el b/test/lisp/use-package/use-package-tests.el index ec9c59be916..55d9959fb10 100644 --- a/test/lisp/use-package/use-package-tests.el +++ b/test/lisp/use-package/use-package-tests.el @@ -1,4 +1,4 @@ -;;; use-package-tests.el --- Tests for use-package.el +;;; use-package-tests.el --- Tests for use-package.el -*- lexical-binding: t; -*- ;; This program is free software; you can redistribute it and/or ;; modify it under the terms of the GNU General Public License as @@ -1885,7 +1885,6 @@ ;; Local Variables: ;; indent-tabs-mode: nil -;; lexical-binding: t ;; no-byte-compile: t ;; no-update-autoloads: t ;; End: -- 2.39.2