From ab918196faff60300a8c9e3b7e1d825c42831b6e Mon Sep 17 00:00:00 2001
From: John Wiegley <johnw@newartisans.com>
Date: Sat, 27 Jan 2018 14:13:48 -0800
Subject: [PATCH] Revert "Merge pull request from jabranham/lexical-bindings"

This reverts commit d21787f1d64a740c0e00899835d9200a0e4690df, reversing
changes made to fd8a3510fd1a555b925f57b2870917e3c4ea0206.
GitHub-reference: https://github.com/jwiegley/use-package/issues/617
---
 lisp/use-package/use-package-bind-key.el   |  6 +-
 lisp/use-package/use-package-chords.el     |  2 +-
 lisp/use-package/use-package-core.el       | 80 +++++++++++-----------
 lisp/use-package/use-package-delight.el    |  6 +-
 lisp/use-package/use-package-diminish.el   |  4 +-
 lisp/use-package/use-package-ensure.el     | 16 ++---
 lisp/use-package/use-package-jump.el       |  2 +-
 lisp/use-package/use-package-lint.el       |  2 +-
 lisp/use-package/use-package.el            |  2 +-
 test/lisp/use-package/use-package-tests.el |  2 +-
 10 files changed, 61 insertions(+), 61 deletions(-)

diff --git a/lisp/use-package/use-package-bind-key.el b/lisp/use-package/use-package-bind-key.el
index 8c86ef5edfc..d8fe56dfaa5 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
 
@@ -125,7 +125,7 @@ deferred until the prefix key sequence is pressed."
 
 ;;;###autoload
 (defun use-package-handler/:bind
-    (name _keyword args rest state &optional bind-macro)
+    (name keyword args rest state &optional bind-macro)
   (use-package-concat
    (use-package-process-keywords name rest state)
    `(,@(mapcar
@@ -146,7 +146,7 @@ deferred until the prefix key sequence is pressed."
 
 ;;;###autoload
 (defun use-package-handler/:bind-keymap
-    (name _keyword args rest state &optional override)
+    (name keyword args rest state &optional override)
   (use-package-concat
    (use-package-process-keywords name rest state)
    (mapcar
diff --git a/lisp/use-package/use-package-chords.el b/lisp/use-package/use-package-chords.el
index 936ff228999..63a9737109f 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
 
diff --git a/lisp/use-package/use-package-core.el b/lisp/use-package/use-package-core.el
index 9adebdf4bf0..469b3f7b23c 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
 
@@ -43,6 +43,7 @@
 (require 'cl-lib)
 
 (eval-when-compile
+  (require 'cl)
   (require 'regexp-opt))
 
 (defgroup use-package nil
@@ -285,7 +286,7 @@ include support for finding `use-package' and `require' forms.
 Must be set before loading use-package."
   :type 'boolean
   :set
-  #'(lambda (_sym value)
+  #'(lambda (sym value)
       (eval-after-load 'lisp-mode
         (if value
             `(add-to-list 'lisp-imenu-generic-expression
@@ -524,7 +525,7 @@ extending any keys already present."
                          arg)))
         (use-package-error (format "Unrecognized keyword: %s" keyword))))))
 
-(defun use-package-unalias-keywords (_name args)
+(defun use-package-unalias-keywords (name args)
   (setq args (cl-nsubstitute :if :when args))
   (let (temp)
     (while (setq temp (plist-get args :unless))
@@ -757,7 +758,7 @@ no more than once."
                               (setq ,loaded t ,result ,arg))))
       ,@(funcall f `((funcall ,next))))))
 
-(defsubst use-package-normalize-value (_label arg)
+(defsubst use-package-normalize-value (label arg)
   "Normalize the Lisp value given by ARG.
 The argument LABEL is ignored."
   (cond ((null arg) nil)
@@ -779,7 +780,7 @@ The argument LABEL is ignored."
     (use-package-error
      (concat label " wants a symbol, or list of symbols")))))
 
-(defun use-package-normalize-symlist (_name keyword args)
+(defun use-package-normalize-symlist (name keyword args)
   (use-package-as-one (symbol-name keyword) args
     #'use-package-normalize-symbols))
 
@@ -795,7 +796,7 @@ The argument LABEL is ignored."
     (use-package-error
      (concat label " wants a symbol, or nested list of symbols")))))
 
-(defun use-package-normalize-recursive-symlist (_name keyword args)
+(defun use-package-normalize-recursive-symlist (name keyword args)
   (use-package-as-one (symbol-name keyword) args
     #'use-package-normalize-recursive-symbols))
 
@@ -817,7 +818,7 @@ The argument LABEL is ignored."
     (use-package-error
      (concat label " wants a directory path, or list of paths")))))
 
-(defun use-package-normalize-predicate (_name keyword args)
+(defun use-package-normalize-predicate (name keyword args)
   (if (null args)
       t
     (use-package-only-one (symbol-name keyword) args
@@ -835,7 +836,7 @@ The argument LABEL is ignored."
                   (macroexpand form)
                 form)) args))
 
-(defun use-package-normalize-forms (_name keyword args)
+(defun use-package-normalize-forms (name keyword args)
   (use-package-normalize-form (symbol-name keyword) args))
 
 (defun use-package-normalize-pairs
@@ -920,7 +921,7 @@ If RECURSED is non-nil, recurse into sublists."
                      #'use-package-recognize-function
                      name)))
 
-(defun use-package-autoloads-mode (_name _keyword args)
+(defun use-package-autoloads-mode (name keyword args)
   (mapcar
    #'(lambda (x) (cons (cdr x) 'command))
    (cl-remove-if-not #'(lambda (x)
@@ -1004,21 +1005,20 @@ meaning:
 
 ;; Don't alias this to `ignore', as that will cause the resulting
 ;; function to be interactive.
-(defun use-package-normalize/:disabled (_name _keyword _arg)
-  "Do nothing, return nil.")
+(defun use-package-normalize/:disabled (name keyword arg))
 
-(defun use-package-handler/:disabled (name _keyword _arg rest state)
+(defun use-package-handler/:disabled (name keyword arg rest state)
   (use-package-process-keywords name rest state))
 
 ;;;; :if, :when and :unless
 
-(defun use-package-normalize-test (_name keyword args)
+(defun use-package-normalize-test (name keyword args)
   (use-package-only-one (symbol-name keyword) args
     #'use-package-normalize-value))
 
 (defalias 'use-package-normalize/:if 'use-package-normalize-test)
 
-(defun use-package-handler/:if (name _keyword pred rest state)
+(defun use-package-handler/:if (name keyword pred rest state)
   (let ((body (use-package-process-keywords name rest state)))
     `((when ,pred ,@body))))
 
@@ -1028,7 +1028,7 @@ meaning:
 
 (defalias 'use-package-normalize/:unless 'use-package-normalize-test)
 
-(defun use-package-handler/:unless (name _keyword pred rest state)
+(defun use-package-handler/:unless (name keyword pred rest state)
   (let ((body (use-package-process-keywords name rest state)))
     `((unless ,pred ,@body))))
 
@@ -1036,7 +1036,7 @@ meaning:
 
 (defalias 'use-package-normalize/:requires 'use-package-normalize-symlist)
 
-(defun use-package-handler/:requires (name _keyword requires rest state)
+(defun use-package-handler/:requires (name keyword requires rest state)
   (let ((body (use-package-process-keywords name rest state)))
     (if (null requires)
         body
@@ -1047,11 +1047,11 @@ meaning:
 
 ;;;; :load-path
 
-(defun use-package-normalize/:load-path (_name keyword args)
+(defun use-package-normalize/:load-path (name keyword args)
   (use-package-as-one (symbol-name keyword) args
     #'use-package-normalize-paths))
 
-(defun use-package-handler/:load-path (name _keyword arg rest state)
+(defun use-package-handler/:load-path (name keyword arg rest state)
   (let ((body (use-package-process-keywords name rest state)))
     (use-package-concat
      (mapcar #'(lambda (path)
@@ -1063,28 +1063,28 @@ meaning:
 
 (defalias 'use-package-normalize/:no-require 'use-package-normalize-predicate)
 
-(defun use-package-handler/:no-require (name _keyword _arg rest state)
+(defun use-package-handler/:no-require (name keyword arg rest state)
   (use-package-process-keywords name rest state))
 
 ;;;; :defines
 
 (defalias 'use-package-normalize/:defines 'use-package-normalize-symlist)
 
-(defun use-package-handler/:defines (name _keyword _arg rest state)
+(defun use-package-handler/:defines (name keyword arg rest state)
   (use-package-process-keywords name rest state))
 
 ;;;; :functions
 
 (defalias 'use-package-normalize/:functions 'use-package-normalize-symlist)
 
-(defun use-package-handler/:functions (name _keyword _arg rest state)
+(defun use-package-handler/:functions (name keyword arg rest state)
   (use-package-process-keywords name rest state))
 
 ;;;; :preface
 
 (defalias 'use-package-normalize/:preface 'use-package-normalize-forms)
 
-(defun use-package-handler/:preface (name _keyword arg rest state)
+(defun use-package-handler/:preface (name keyword arg rest state)
   (let ((body (use-package-process-keywords name rest state)))
     (use-package-concat
      (when use-package-compute-statistics
@@ -1098,14 +1098,14 @@ meaning:
 ;;;; :catch
 
 (defvar use-package--form)
-(defvar use-package--hush-function #'(lambda (_keyword body) body))
+(defvar use-package--hush-function #'(lambda (keyword body) body))
 
 (defsubst use-package-hush (context keyword body)
   `((condition-case-unless-debug err
         ,(macroexp-progn body)
       (error (funcall ,context ,keyword err)))))
 
-(defun use-package-normalize/:catch (_name keyword args)
+(defun use-package-normalize/:catch (name keyword args)
   (if (null args)
       t
     (use-package-only-one (symbol-name keyword) args
@@ -1149,7 +1149,7 @@ meaning:
 (defalias 'use-package-normalize/:interpreter 'use-package-normalize-mode)
 (defalias 'use-package-autoloads/:interpreter 'use-package-autoloads-mode)
 
-(defun use-package-handler/:interpreter (name _keyword arg rest state)
+(defun use-package-handler/:interpreter (name keyword arg rest state)
   (use-package-handle-mode name 'interpreter-mode-alist arg rest state))
 
 ;;;; :mode
@@ -1157,7 +1157,7 @@ meaning:
 (defalias 'use-package-normalize/:mode 'use-package-normalize-mode)
 (defalias 'use-package-autoloads/:mode 'use-package-autoloads-mode)
 
-(defun use-package-handler/:mode (name _keyword arg rest state)
+(defun use-package-handler/:mode (name keyword arg rest state)
   (use-package-handle-mode name 'auto-mode-alist arg rest state))
 
 ;;;; :magic
@@ -1165,7 +1165,7 @@ meaning:
 (defalias 'use-package-normalize/:magic 'use-package-normalize-mode)
 (defalias 'use-package-autoloads/:magic 'use-package-autoloads-mode)
 
-(defun use-package-handler/:magic (name _keyword arg rest state)
+(defun use-package-handler/:magic (name keyword arg rest state)
   (use-package-handle-mode name 'magic-mode-alist arg rest state))
 
 ;;;; :magic-fallback
@@ -1173,7 +1173,7 @@ meaning:
 (defalias 'use-package-normalize/:magic-fallback 'use-package-normalize-mode)
 (defalias 'use-package-autoloads/:magic-fallback 'use-package-autoloads-mode)
 
-(defun use-package-handler/:magic-fallback (name _keyword arg rest state)
+(defun use-package-handler/:magic-fallback (name keyword arg rest state)
   (use-package-handle-mode name 'magic-fallback-mode-alist arg rest state))
 
 ;;;; :hook
@@ -1200,7 +1200,7 @@ meaning:
 
 (defalias 'use-package-autoloads/:hook 'use-package-autoloads-mode)
 
-(defun use-package-handler/:hook (name _keyword args rest state)
+(defun use-package-handler/:hook (name keyword args rest state)
   "Generate use-package custom keyword code."
   (use-package-concat
    (use-package-process-keywords name rest state)
@@ -1223,7 +1223,7 @@ meaning:
 
 (defalias 'use-package-normalize/:commands 'use-package-normalize-symlist)
 
-(defun use-package-handler/:commands (name _keyword arg rest state)
+(defun use-package-handler/:commands (name keyword arg rest state)
   (use-package-concat
    ;; Since we deferring load, establish any necessary autoloads, and also
    ;; keep the byte-compiler happy.
@@ -1245,7 +1245,7 @@ meaning:
 
 (defalias 'use-package-normalize/:defer 'use-package-normalize-predicate)
 
-(defun use-package-handler/:defer (name _keyword arg rest state)
+(defun use-package-handler/:defer (name keyword arg rest state)
   (let ((body (use-package-process-keywords name rest state)))
     (use-package-concat
      ;; Load the package after a set amount of idle time, if the argument to
@@ -1301,7 +1301,7 @@ no keyword implies `:all'."
    ((listp features)
     (use-package-require-after-load (cons :all features) body))))
 
-(defun use-package-handler/:after (name _keyword arg rest state)
+(defun use-package-handler/:after (name keyword arg rest state)
   (let ((body (use-package-process-keywords name rest state))
         (uses (use-package-after-count-uses arg)))
     (if (or (null uses) (null body))
@@ -1316,12 +1316,12 @@ no keyword implies `:all'."
 
 (defalias 'use-package-normalize/:demand 'use-package-normalize-predicate)
 
-(defun use-package-handler/:demand (name _keyword _arg rest state)
+(defun use-package-handler/:demand (name keyword arg rest state)
   (use-package-process-keywords name rest state))
 
 ;;;; :custom
 
-(defun use-package-normalize/:custom (_name keyword args)
+(defun use-package-normalize/:custom (name keyword args)
   "Normalize use-package custom keyword."
   (use-package-as-one (symbol-name keyword) args
     #'(lambda (label arg)
@@ -1333,7 +1333,7 @@ no keyword implies `:all'."
             (list arg)
           arg))))
 
-(defun use-package-handler/:custom (name _keyword args rest state)
+(defun use-package-handler/:custom (name keyword args rest state)
   "Generate use-package custom keyword code."
   (use-package-concat
    (mapcar
@@ -1349,7 +1349,7 @@ no keyword implies `:all'."
 
 ;;;; :custom-face
 
-(defun use-package-normalize/:custom-face (name-symbol _keyword arg)
+(defun use-package-normalize/:custom-face (name-symbol keyword arg)
   "Normalize use-package custom-face keyword."
   (let ((error-msg
          (format "%s wants a (<symbol> <face-spec>) or list of these"
@@ -1366,7 +1366,7 @@ no keyword implies `:all'."
                   (> (length def) 2))
           (use-package-error error-msg))))))
 
-(defun use-package-handler/:custom-face (name _keyword args rest state)
+(defun use-package-handler/:custom-face (name keyword args rest state)
   "Generate use-package custom-face keyword code."
   (use-package-concat
    (mapcar #'(lambda (def) `(custom-set-faces (quote ,def))) args)
@@ -1376,7 +1376,7 @@ no keyword implies `:all'."
 
 (defalias 'use-package-normalize/:init 'use-package-normalize-forms)
 
-(defun use-package-handler/:init (name _keyword arg rest state)
+(defun use-package-handler/:init (name keyword arg rest state)
   (use-package-concat
    (when use-package-compute-statistics
      `((use-package-statistics-gather :init ',name nil)))
@@ -1401,7 +1401,7 @@ no keyword implies `:all'."
       args
     (list args)))
 
-(defun use-package-handler/:load (name _keyword arg rest state)
+(defun use-package-handler/:load (name keyword arg rest state)
   (let ((body (use-package-process-keywords name rest state)))
     (cl-dolist (pkg arg)
       (setq body (use-package-require (if (eq t pkg) name pkg) nil body)))
@@ -1411,7 +1411,7 @@ no keyword implies `:all'."
 
 (defalias 'use-package-normalize/:config 'use-package-normalize-forms)
 
-(defun use-package-handler/:config (name _keyword arg rest state)
+(defun use-package-handler/:config (name keyword arg rest state)
   (let* ((body (use-package-process-keywords name rest state))
          (name-symbol (use-package-as-symbol name)))
     (use-package-concat
diff --git a/lisp/use-package/use-package-delight.el b/lisp/use-package/use-package-delight.el
index 85d5c7cb4d6..9d4f6acf2de 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
 
@@ -52,7 +52,7 @@
           ":delight expects `delight' arguments or a list of them"))))
 
 ;;;###autoload
-(defun use-package-normalize/:delight (name _keyword args)
+(defun use-package-normalize/:delight (name keyword args)
   "Normalize arguments to delight."
   (cond ((null args)
          `((,(use-package-as-mode name) nil ,name)))
@@ -77,7 +77,7 @@
               args)))))
 
 ;;;###autoload
-(defun use-package-handler/:delight (name _keyword args rest state)
+(defun use-package-handler/:delight (name keyword args rest state)
   (let ((body (use-package-process-keywords name rest state)))
     (use-package-concat
      body
diff --git a/lisp/use-package/use-package-diminish.el b/lisp/use-package/use-package-diminish.el
index 1f3895f42cd..c2da62257e6 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
 
@@ -62,7 +62,7 @@
     (apply-partially #'use-package-normalize-diminish name) t))
 
 ;;;###autoload
-(defun use-package-handler/:diminish (name _keyword arg rest state)
+(defun use-package-handler/:diminish (name keyword arg rest state)
   (let ((body (use-package-process-keywords name rest state)))
     (use-package-concat
      (mapcar #'(lambda (var)
diff --git a/lisp/use-package/use-package-ensure.el b/lisp/use-package/use-package-ensure.el
index 50005a9e990..1a76b883e1c 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
 
@@ -76,9 +76,9 @@ The default value uses package.el to install the package."
 
 ;;;; :pin
 
-(defun use-package-normalize/:pin (_name keyword args)
+(defun use-package-normalize/:pin (name keyword args)
   (use-package-only-one (symbol-name keyword) args
-    #'(lambda (_label arg)
+    #'(lambda (label arg)
         (cond
          ((stringp arg) arg)
          ((use-package-non-nil-symbolp arg) (symbol-name arg))
@@ -116,7 +116,7 @@ manually updated package."
     (unless (bound-and-true-p package--initialized)
       (package-initialize t))))
 
-(defun use-package-handler/:pin (name _keyword archive-name rest state)
+(defun use-package-handler/:pin (name keyword archive-name rest state)
   (let ((body (use-package-process-keywords name rest state))
         (pin-form (if archive-name
                       `(use-package-pin-package ',(use-package-as-symbol name)
@@ -133,11 +133,11 @@ manually updated package."
 (defvar package-archive-contents)
 
 ;;;###autoload
-(defun use-package-normalize/:ensure (_name keyword args)
+(defun use-package-normalize/:ensure (name keyword args)
   (if (null args)
       (list t)
     (use-package-only-one (symbol-name keyword) args
-      #'(lambda (_label arg)
+      #'(lambda (label arg)
           (cond
            ((symbolp arg)
             (list arg))
@@ -152,7 +152,7 @@ manually updated package."
              (concat ":ensure wants an optional package name "
                      "(an unquoted symbol name), or (<symbol> :pin <string>)"))))))))
 
-(defun use-package-ensure-elpa (name args _state &optional _no-refresh)
+(defun use-package-ensure-elpa (name args state &optional no-refresh)
   (dolist (ensure args)
     (let ((package
            (or (and (eq ensure t) (use-package-as-symbol name))
@@ -183,7 +183,7 @@ manually updated package."
                               :error))))))))
 
 ;;;###autoload
-(defun use-package-handler/:ensure (name _keyword ensure rest state)
+(defun use-package-handler/:ensure (name keyword ensure rest state)
   (let* ((body (use-package-process-keywords name rest state)))
     ;; We want to avoid installing packages when the `use-package' macro is
     ;; being macro-expanded by elisp completion (see `lisp--local-variables'),
diff --git a/lisp/use-package/use-package-jump.el b/lisp/use-package/use-package-jump.el
index 4044ad16564..31d1b054060 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
 
diff --git a/lisp/use-package/use-package-lint.el b/lisp/use-package/use-package-lint.el
index c6e7c3c0ce2..53c682842f9 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
 
diff --git a/lisp/use-package/use-package.el b/lisp/use-package/use-package.el
index 1a8fff895f6..5f98db1bed7 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
 
diff --git a/test/lisp/use-package/use-package-tests.el b/test/lisp/use-package/use-package-tests.el
index 55d9959fb10..fc86fa63f81 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  -*- lexical-binding: t; -*-
+;;; use-package-tests.el --- Tests for use-package.el
 
 ;; This program is free software; you can redistribute it and/or
 ;; modify it under the terms of the GNU General Public License as
-- 
2.39.2