diff --git a/elpa/bind-key-20171210.2125/bind-key-pkg.el b/elpa/bind-key-20171210.2125/bind-key-pkg.el deleted file mode 100644 index 03d0fd2..0000000 --- a/elpa/bind-key-20171210.2125/bind-key-pkg.el +++ /dev/null @@ -1,2 +0,0 @@ -;;; -*- no-byte-compile: t -*- -(define-package "bind-key" "20171210.2125" "A simple way to manage personal keybindings" 'nil :commit "33e9a4b74042e46161bff70e19b87317b1781fc5" :url "https://github.com/jwiegley/use-package" :keywords '("keys" "keybinding" "config" "dotemacs")) diff --git a/elpa/bind-key-20171210.2125/bind-key-autoloads.el b/elpa/bind-key-20180512.2130/bind-key-autoloads.el similarity index 96% rename from elpa/bind-key-20171210.2125/bind-key-autoloads.el rename to elpa/bind-key-20180512.2130/bind-key-autoloads.el index ac7c587..d8633d1 100644 --- a/elpa/bind-key-20171210.2125/bind-key-autoloads.el +++ b/elpa/bind-key-20180512.2130/bind-key-autoloads.el @@ -3,8 +3,8 @@ ;;; Code: (add-to-list 'load-path (directory-file-name (or (file-name-directory #$) (car load-path)))) -;;;### (autoloads nil "bind-key" "bind-key.el" (23094 13992 105416 -;;;;;; 163000)) +;;;### (autoloads nil "bind-key" "bind-key.el" (23362 18484 20841 +;;;;;; 29000)) ;;; Generated autoloads from bind-key.el (autoload 'bind-key "bind-key" "\ diff --git a/elpa/bind-key-20180512.2130/bind-key-pkg.el b/elpa/bind-key-20180512.2130/bind-key-pkg.el new file mode 100644 index 0000000..ec18d3c --- /dev/null +++ b/elpa/bind-key-20180512.2130/bind-key-pkg.el @@ -0,0 +1,2 @@ +;;; -*- no-byte-compile: t -*- +(define-package "bind-key" "20180512.2130" "A simple way to manage personal keybindings" 'nil) diff --git a/elpa/bind-key-20171210.2125/bind-key.el b/elpa/bind-key-20180512.2130/bind-key.el similarity index 98% rename from elpa/bind-key-20171210.2125/bind-key.el rename to elpa/bind-key-20180512.2130/bind-key.el index ac10ad4..4c6cb64 100644 --- a/elpa/bind-key-20171210.2125/bind-key.el +++ b/elpa/bind-key-20180512.2130/bind-key.el @@ -7,7 +7,7 @@ ;; Created: 16 Jun 2012 ;; Modified: 29 Nov 2017 ;; Version: 2.4 -;; Package-Version: 20171210.2125 +;; Package-Version: 20180512.2130 ;; Keywords: keys keybinding config dotemacs ;; URL: https://github.com/jwiegley/use-package @@ -39,6 +39,12 @@ ;; ;; (bind-key "C-c x" 'my-ctrl-c-x-command) ;; +;; If the keybinding argument is a vector, it is passed straight to +;; `define-key', so remapping a key with `[remap COMMAND]' works as +;; expected: +;; +;; (bind-key [remap original-ctrl-c-x-command] 'my-ctrl-c-x-command) +;; ;; If you want the keybinding to override all minor modes that may also bind ;; the same key, use the `bind-key*' form: ;; diff --git a/elpa/hydra-20180226.1116/hydra-pkg.el b/elpa/hydra-20180226.1116/hydra-pkg.el deleted file mode 100644 index 38ac107..0000000 --- a/elpa/hydra-20180226.1116/hydra-pkg.el +++ /dev/null @@ -1,7 +0,0 @@ -(define-package "hydra" "20180226.1116" "Make bindings that stick around." - '((cl-lib "0.5")) - :url "https://github.com/abo-abo/hydra" :keywords - '("bindings")) -;; Local Variables: -;; no-byte-compile: t -;; End: diff --git a/elpa/hydra-20180226.1116/hydra-autoloads.el b/elpa/hydra-20180703.802/hydra-autoloads.el similarity index 95% rename from elpa/hydra-20180226.1116/hydra-autoloads.el rename to elpa/hydra-20180703.802/hydra-autoloads.el index 769737e..5b29be1 100644 --- a/elpa/hydra-20180226.1116/hydra-autoloads.el +++ b/elpa/hydra-20180703.802/hydra-autoloads.el @@ -3,7 +3,7 @@ ;;; Code: (add-to-list 'load-path (directory-file-name (or (file-name-directory #$) (car load-path)))) -;;;### (autoloads nil "hydra" "hydra.el" (23194 22908 273187 855000)) +;;;### (autoloads nil "hydra" "hydra.el" (23362 18420 988487 438000)) ;;; Generated autoloads from hydra.el (autoload 'defhydra "hydra" "\ @@ -65,7 +65,7 @@ result of `defhydra'. ;;;*** ;;;### (autoloads nil nil ("hydra-examples.el" "hydra-ox.el" "hydra-pkg.el" -;;;;;; "lv.el") (23194 22908 285187 927000)) +;;;;;; "lv.el") (23362 18421 487 506000)) ;;;*** diff --git a/elpa/hydra-20180226.1116/hydra-examples.el b/elpa/hydra-20180703.802/hydra-examples.el similarity index 100% rename from elpa/hydra-20180226.1116/hydra-examples.el rename to elpa/hydra-20180703.802/hydra-examples.el diff --git a/elpa/hydra-20180226.1116/hydra-ox.el b/elpa/hydra-20180703.802/hydra-ox.el similarity index 100% rename from elpa/hydra-20180226.1116/hydra-ox.el rename to elpa/hydra-20180703.802/hydra-ox.el diff --git a/elpa/hydra-20180703.802/hydra-pkg.el b/elpa/hydra-20180703.802/hydra-pkg.el new file mode 100644 index 0000000..cdf91c7 --- /dev/null +++ b/elpa/hydra-20180703.802/hydra-pkg.el @@ -0,0 +1,8 @@ +(define-package "hydra" "20180703.802" "Make bindings that stick around." + '((cl-lib "0.5")) + :keywords + '("bindings") + :url "https://github.com/abo-abo/hydra") +;; Local Variables: +;; no-byte-compile: t +;; End: diff --git a/elpa/hydra-20180226.1116/hydra.el b/elpa/hydra-20180703.802/hydra.el similarity index 98% rename from elpa/hydra-20180226.1116/hydra.el rename to elpa/hydra-20180703.802/hydra.el index 7d3689e..febfcb1 100644 --- a/elpa/hydra-20180226.1116/hydra.el +++ b/elpa/hydra-20180703.802/hydra.el @@ -646,17 +646,18 @@ The expressions can be auto-expanded according to NAME." "" (hydra--hint body heads))) (start 0) + (inner-regex (format "\\(%s\\)\\(%s\\)" hydra-width-spec-regex hydra-key-regex)) varlist offset) (while (setq start (string-match (format - "\\(?:%%\\( ?-?[0-9]*s?\\)\\(`[a-z-A-Z/0-9]+\\|(\\)\\)\\|\\(?:[_?]\\(%s\\)\\(%s\\)[_?]\\)" - hydra-width-spec-regex - hydra-key-regex) + "\\(?:%%\\( ?-?[0-9]*s?\\)\\(`[a-z-A-Z/0-9]+\\|(\\)\\)\\|\\(?:_%s_\\)\\|\\(?:[?]%s[?]\\)" + inner-regex + inner-regex) docstring start)) (cond ((eq ?? (aref (match-string 0 docstring) 0)) - (let* ((key (match-string 4 docstring)) + (let* ((key (match-string 6 docstring)) (head (assoc key heads))) (if head (progn @@ -714,17 +715,21 @@ The expressions can be auto-expanded according to NAME." (substring docstring 0 start) "%" spec (substring docstring (+ start offset 1 lspec varp)))))))) - (if (eq ?\n (aref docstring 0)) - `(concat (format ,(substring docstring 1) ,@(nreverse varlist)) - ,rest) - (let ((r `(replace-regexp-in-string - " +$" "" - (concat ,docstring ": " - (replace-regexp-in-string - "\\(%\\)" "\\1\\1" ,rest))))) - (if (stringp rest) - `(format ,(eval r)) - `(format ,r))))))) + (cond + ((string= docstring "") + (substring rest 1)) + ((eq ?\n (aref docstring 0)) + `(concat (format ,(substring docstring 1) ,@(nreverse varlist)) + ,rest)) + (t + (let ((r `(replace-regexp-in-string + " +$" "" + (concat ,docstring ": " + (replace-regexp-in-string + "\\(%\\)" "\\1\\1" ,rest))))) + (if (stringp rest) + `(format ,(eval r)) + `(format ,r)))))))) (defun hydra--complain (format-string &rest args) "Forward to (`message' FORMAT-STRING ARGS) unless `hydra-verbose' is nil." @@ -1178,15 +1183,17 @@ result of `defhydra'." (setq docstring (concat "\n" (eval docstring)))) (t (setq heads (cons docstring heads)) - (setq docstring "hydra"))) + (setq docstring ""))) (when (keywordp (car body)) (setq body (cons nil (cons nil body)))) (condition-case-unless-debug err - (let* ((keymap (copy-keymap hydra-base-map)) - (keymap-name (intern (format "%S/keymap" name))) + (let* ((keymap-name (intern (format "%S/keymap" name))) (body-name (intern (format "%S/body" name))) (body-key (cadr body)) (body-plist (cddr body)) + (base-map (or (eval (plist-get body-plist :base-map)) + hydra-base-map)) + (keymap (copy-keymap base-map)) (body-map (or (car body) (plist-get body-plist :bind))) (body-pre (plist-get body-plist :pre)) diff --git a/elpa/hydra-20180226.1116/lv.el b/elpa/hydra-20180703.802/lv.el similarity index 100% rename from elpa/hydra-20180226.1116/lv.el rename to elpa/hydra-20180703.802/lv.el diff --git a/elpa/multiple-cursors-20180406.1350/multiple-cursors-pkg.el b/elpa/multiple-cursors-20180406.1350/multiple-cursors-pkg.el deleted file mode 100644 index 471c6c1..0000000 --- a/elpa/multiple-cursors-20180406.1350/multiple-cursors-pkg.el +++ /dev/null @@ -1,5 +0,0 @@ -(define-package "multiple-cursors" "20180406.1350" "Multiple cursors for Emacs." - '((cl-lib "0.5"))) -;; Local Variables: -;; no-byte-compile: t -;; End: diff --git a/elpa/multiple-cursors-20180406.1350/mc-cycle-cursors.el b/elpa/multiple-cursors-20180615.518/mc-cycle-cursors.el similarity index 100% rename from elpa/multiple-cursors-20180406.1350/mc-cycle-cursors.el rename to elpa/multiple-cursors-20180615.518/mc-cycle-cursors.el diff --git a/elpa/multiple-cursors-20180406.1350/mc-edit-lines.el b/elpa/multiple-cursors-20180615.518/mc-edit-lines.el similarity index 100% rename from elpa/multiple-cursors-20180406.1350/mc-edit-lines.el rename to elpa/multiple-cursors-20180615.518/mc-edit-lines.el diff --git a/elpa/multiple-cursors-20180406.1350/mc-hide-unmatched-lines-mode.el b/elpa/multiple-cursors-20180615.518/mc-hide-unmatched-lines-mode.el similarity index 100% rename from elpa/multiple-cursors-20180406.1350/mc-hide-unmatched-lines-mode.el rename to elpa/multiple-cursors-20180615.518/mc-hide-unmatched-lines-mode.el diff --git a/elpa/multiple-cursors-20180406.1350/mc-mark-more.el b/elpa/multiple-cursors-20180615.518/mc-mark-more.el similarity index 99% rename from elpa/multiple-cursors-20180406.1350/mc-mark-more.el rename to elpa/multiple-cursors-20180615.518/mc-mark-more.el index 2ab7ec7..ab1adce 100644 --- a/elpa/multiple-cursors-20180406.1350/mc-mark-more.el +++ b/elpa/multiple-cursors-20180615.518/mc-mark-more.el @@ -131,7 +131,7 @@ Use like case-fold-search, don't recommend setting it globally.") (when point-out-of-order (exchange-point-and-mark)) (mc/create-fake-cursor-at-point)) - (error "no more matches found.")))))) + (user-error "no more matches found.")))))) ;;;###autoload (defun mc/mark-next-like-this (arg) diff --git a/elpa/multiple-cursors-20180406.1350/mc-mark-pop.el b/elpa/multiple-cursors-20180615.518/mc-mark-pop.el similarity index 100% rename from elpa/multiple-cursors-20180406.1350/mc-mark-pop.el rename to elpa/multiple-cursors-20180615.518/mc-mark-pop.el diff --git a/elpa/multiple-cursors-20180406.1350/mc-separate-operations.el b/elpa/multiple-cursors-20180615.518/mc-separate-operations.el similarity index 100% rename from elpa/multiple-cursors-20180406.1350/mc-separate-operations.el rename to elpa/multiple-cursors-20180615.518/mc-separate-operations.el diff --git a/elpa/multiple-cursors-20180406.1350/multiple-cursors-autoloads.el b/elpa/multiple-cursors-20180615.518/multiple-cursors-autoloads.el similarity index 95% rename from elpa/multiple-cursors-20180406.1350/multiple-cursors-autoloads.el rename to elpa/multiple-cursors-20180615.518/multiple-cursors-autoloads.el index 6ef435f..5df7f2c 100644 --- a/elpa/multiple-cursors-20180406.1350/multiple-cursors-autoloads.el +++ b/elpa/multiple-cursors-20180615.518/multiple-cursors-autoloads.el @@ -3,8 +3,8 @@ ;;; Code: (add-to-list 'load-path (directory-file-name (or (file-name-directory #$) (car load-path)))) -;;;### (autoloads nil "mc-edit-lines" "mc-edit-lines.el" (23272 10009 -;;;;;; 169638 219000)) +;;;### (autoloads nil "mc-edit-lines" "mc-edit-lines.el" (23362 18400 +;;;;;; 264371 251000)) ;;; Generated autoloads from mc-edit-lines.el (autoload 'mc/edit-lines "mc-edit-lines" "\ @@ -34,7 +34,7 @@ Add one cursor to the beginning of each line in the active region. ;;;*** ;;;### (autoloads nil "mc-hide-unmatched-lines-mode" "mc-hide-unmatched-lines-mode.el" -;;;;;; (23272 10009 193638 364000)) +;;;;;; (23362 18400 292371 408000)) ;;; Generated autoloads from mc-hide-unmatched-lines-mode.el (autoload 'mc-hide-unmatched-lines-mode "mc-hide-unmatched-lines-mode" "\ @@ -48,8 +48,8 @@ mode. To leave this mode press or \"C-g\" ;;;*** -;;;### (autoloads nil "mc-mark-more" "mc-mark-more.el" (23272 10009 -;;;;;; 213638 485000)) +;;;### (autoloads nil "mc-mark-more" "mc-mark-more.el" (23362 18400 +;;;;;; 308371 498000)) ;;; Generated autoloads from mc-mark-more.el (autoload 'mc/mark-next-like-this "mc-mark-more" "\ @@ -246,8 +246,8 @@ Mark the tag we're in and its pair for renaming. ;;;*** -;;;### (autoloads nil "mc-mark-pop" "mc-mark-pop.el" (23272 10009 -;;;;;; 189638 340000)) +;;;### (autoloads nil "mc-mark-pop" "mc-mark-pop.el" (23362 18400 +;;;;;; 288371 385000)) ;;; Generated autoloads from mc-mark-pop.el (autoload 'mc/mark-pop "mc-mark-pop" "\ @@ -259,7 +259,7 @@ to the popped mark. ;;;*** ;;;### (autoloads nil "mc-separate-operations" "mc-separate-operations.el" -;;;;;; (23272 10009 205638 437000)) +;;;;;; (23362 18400 300371 453000)) ;;; Generated autoloads from mc-separate-operations.el (autoload 'mc/insert-numbers "mc-separate-operations" "\ @@ -299,7 +299,7 @@ Aligns all cursors with whitespace like `mc/vertical-align' does ;;;*** ;;;### (autoloads nil "multiple-cursors-core" "multiple-cursors-core.el" -;;;;;; (23272 10009 165638 194000)) +;;;;;; (23362 18400 248371 161000)) ;;; Generated autoloads from multiple-cursors-core.el (autoload 'multiple-cursors-mode "multiple-cursors-core" "\ @@ -310,7 +310,7 @@ Mode while multiple cursors are active. ;;;*** ;;;### (autoloads nil "rectangular-region-mode" "rectangular-region-mode.el" -;;;;;; (23272 10009 185638 316000)) +;;;;;; (23362 18400 280371 341000)) ;;; Generated autoloads from rectangular-region-mode.el (autoload 'set-rectangular-region-anchor "rectangular-region-mode" "\ @@ -329,7 +329,7 @@ A mode for creating a rectangular region to edit ;;;*** ;;;### (autoloads nil nil ("mc-cycle-cursors.el" "multiple-cursors-pkg.el" -;;;;;; "multiple-cursors.el") (23272 10009 229638 582000)) +;;;;;; "multiple-cursors.el") (23362 18400 316371 542000)) ;;;*** diff --git a/elpa/multiple-cursors-20180406.1350/multiple-cursors-core.el b/elpa/multiple-cursors-20180615.518/multiple-cursors-core.el similarity index 100% rename from elpa/multiple-cursors-20180406.1350/multiple-cursors-core.el rename to elpa/multiple-cursors-20180615.518/multiple-cursors-core.el diff --git a/elpa/multiple-cursors-20180615.518/multiple-cursors-pkg.el b/elpa/multiple-cursors-20180615.518/multiple-cursors-pkg.el new file mode 100644 index 0000000..d3f2150 --- /dev/null +++ b/elpa/multiple-cursors-20180615.518/multiple-cursors-pkg.el @@ -0,0 +1,5 @@ +(define-package "multiple-cursors" "20180615.518" "Multiple cursors for Emacs." + '((cl-lib "0.5"))) +;; Local Variables: +;; no-byte-compile: t +;; End: diff --git a/elpa/multiple-cursors-20180406.1350/multiple-cursors.el b/elpa/multiple-cursors-20180615.518/multiple-cursors.el similarity index 100% rename from elpa/multiple-cursors-20180406.1350/multiple-cursors.el rename to elpa/multiple-cursors-20180615.518/multiple-cursors.el diff --git a/elpa/multiple-cursors-20180406.1350/rectangular-region-mode.el b/elpa/multiple-cursors-20180615.518/rectangular-region-mode.el similarity index 100% rename from elpa/multiple-cursors-20180406.1350/rectangular-region-mode.el rename to elpa/multiple-cursors-20180615.518/rectangular-region-mode.el diff --git a/elpa/use-package-20180314.1143/dir b/elpa/use-package-20180613.2219/dir similarity index 100% rename from elpa/use-package-20180314.1143/dir rename to elpa/use-package-20180613.2219/dir diff --git a/elpa/use-package-20180314.1143/use-package-autoloads.el b/elpa/use-package-20180613.2219/use-package-autoloads.el similarity index 96% rename from elpa/use-package-20180314.1143/use-package-autoloads.el rename to elpa/use-package-20180613.2219/use-package-autoloads.el index 4ee0874..d85d63d 100644 --- a/elpa/use-package-20180314.1143/use-package-autoloads.el +++ b/elpa/use-package-20180613.2219/use-package-autoloads.el @@ -4,7 +4,7 @@ (add-to-list 'load-path (directory-file-name (or (file-name-directory #$) (car load-path)))) ;;;### (autoloads nil "use-package-bind-key" "use-package-bind-key.el" -;;;;;; (23232 59783 369947 51000)) +;;;;;; (23362 18341 680043 7000)) ;;; Generated autoloads from use-package-bind-key.el (autoload 'use-package-autoload-keymap "use-package-bind-key" "\ @@ -55,8 +55,8 @@ deferred until the prefix key sequence is pressed. ;;;*** -;;;### (autoloads nil "use-package-core" "use-package-core.el" (23232 -;;;;;; 59783 273946 507000)) +;;;### (autoloads nil "use-package-core" "use-package-core.el" (23362 +;;;;;; 18341 624042 694000)) ;;; Generated autoloads from use-package-core.el (autoload 'use-package "use-package-core" "\ @@ -121,7 +121,7 @@ this file. Usage: ;;;*** ;;;### (autoloads nil "use-package-delight" "use-package-delight.el" -;;;;;; (23232 59783 301946 666000)) +;;;;;; (23362 18341 640042 783000)) ;;; Generated autoloads from use-package-delight.el (autoload 'use-package-normalize/:delight "use-package-delight" "\ @@ -137,7 +137,7 @@ Normalize arguments to delight. ;;;*** ;;;### (autoloads nil "use-package-diminish" "use-package-diminish.el" -;;;;;; (23232 59783 341946 893000)) +;;;;;; (23362 18341 660042 895000)) ;;; Generated autoloads from use-package-diminish.el (autoload 'use-package-normalize/:diminish "use-package-diminish" "\ @@ -153,7 +153,7 @@ Normalize arguments to delight. ;;;*** ;;;### (autoloads nil "use-package-ensure" "use-package-ensure.el" -;;;;;; (23232 59783 293946 621000)) +;;;;;; (23362 18341 636042 760000)) ;;; Generated autoloads from use-package-ensure.el (autoload 'use-package-normalize/:ensure "use-package-ensure" "\ @@ -168,8 +168,8 @@ Normalize arguments to delight. ;;;*** -;;;### (autoloads nil "use-package-jump" "use-package-jump.el" (23232 -;;;;;; 59783 361947 6000)) +;;;### (autoloads nil "use-package-jump" "use-package-jump.el" (23362 +;;;;;; 18341 676042 985000)) ;;; Generated autoloads from use-package-jump.el (autoload 'use-package-jump-to-package-form "use-package-jump" "\ @@ -183,8 +183,8 @@ instead. ;;;*** -;;;### (autoloads nil "use-package-lint" "use-package-lint.el" (23232 -;;;;;; 59783 305946 689000)) +;;;### (autoloads nil "use-package-lint" "use-package-lint.el" (23362 +;;;;;; 18341 644042 805000)) ;;; Generated autoloads from use-package-lint.el (autoload 'use-package-lint "use-package-lint" "\ @@ -197,7 +197,7 @@ with the specified `:load-path' the module cannot be found. ;;;*** ;;;### (autoloads nil nil ("use-package-pkg.el" "use-package.el") -;;;;;; (23232 59783 349946 938000)) +;;;;;; (23362 18341 672042 962000)) ;;;*** diff --git a/elpa/use-package-20180314.1143/use-package-bind-key.el b/elpa/use-package-20180613.2219/use-package-bind-key.el similarity index 97% rename from elpa/use-package-20180314.1143/use-package-bind-key.el rename to elpa/use-package-20180613.2219/use-package-bind-key.el index d17ecb2..10b5b48 100644 --- a/elpa/use-package-20180314.1143/use-package-bind-key.el +++ b/elpa/use-package-20180613.2219/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 @@ -127,7 +127,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 @@ -148,7 +148,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/elpa/use-package-20180314.1143/use-package-core.el b/elpa/use-package-20180613.2219/use-package-core.el similarity index 95% rename from elpa/use-package-20180314.1143/use-package-core.el rename to elpa/use-package-20180613.2219/use-package-core.el index bd18c97..525b478 100644 --- a/elpa/use-package-20180314.1143/use-package-core.el +++ b/elpa/use-package-20180613.2219/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 @@ -47,10 +47,9 @@ (defsubst hash-table-keys (hash-table) "Return a list of keys in HASH-TABLE." (cl-loop for k being the hash-keys of hash-table collect k)) - (require 'subr-x)) + (eval-when-compile (require 'subr-x))) (eval-when-compile - (require 'cl) (require 'regexp-opt)) (defgroup use-package nil @@ -300,7 +299,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 @@ -546,7 +545,7 @@ extending any keys already present." name tail plist merge-function)) (use-package-error error-string)))))) -(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)) @@ -779,7 +778,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) @@ -801,7 +800,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)) @@ -817,7 +816,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)) @@ -839,7 +838,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 @@ -857,7 +856,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 @@ -921,7 +920,7 @@ If RECURSED is non-nil, recurse into sublists." (eq 'lambda (car v))) v) ((and (listp v) - (memq '(quote function) (car v)) + (memq (car v) '(quote function)) (eq 'lambda (car (cadr v)))) (cadr v)) (t v))) @@ -942,7 +941,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) @@ -1055,20 +1054,21 @@ 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)) +(defun use-package-normalize/:disabled (_name _keyword _arg) + "Do nothing, return nil.") -(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)))) @@ -1078,7 +1078,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)))) @@ -1086,7 +1086,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 @@ -1097,11 +1097,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) @@ -1113,28 +1113,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 @@ -1148,14 +1148,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 @@ -1199,7 +1199,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 @@ -1207,7 +1207,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 @@ -1215,7 +1215,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 @@ -1223,7 +1223,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 @@ -1250,7 +1250,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) @@ -1273,7 +1273,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. @@ -1295,7 +1295,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 @@ -1351,7 +1351,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)) @@ -1366,12 +1366,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) @@ -1383,7 +1383,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 @@ -1399,7 +1399,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 ( ) or list of these" @@ -1416,7 +1416,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) @@ -1426,7 +1426,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))) @@ -1451,7 +1451,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))) @@ -1461,7 +1461,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/elpa/use-package-20180314.1143/use-package-delight.el b/elpa/use-package-20180613.2219/use-package-delight.el similarity index 93% rename from elpa/use-package-20180314.1143/use-package-delight.el rename to elpa/use-package-20180613.2219/use-package-delight.el index 9d4f6ac..85d5c7c 100644 --- a/elpa/use-package-20180314.1143/use-package-delight.el +++ b/elpa/use-package-20180613.2219/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 @@ -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/elpa/use-package-20180314.1143/use-package-diminish.el b/elpa/use-package-20180613.2219/use-package-diminish.el similarity index 96% rename from elpa/use-package-20180314.1143/use-package-diminish.el rename to elpa/use-package-20180613.2219/use-package-diminish.el index c2da622..1f3895f 100644 --- a/elpa/use-package-20180314.1143/use-package-diminish.el +++ b/elpa/use-package-20180613.2219/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 @@ -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/elpa/use-package-20180314.1143/use-package-ensure.el b/elpa/use-package-20180613.2219/use-package-ensure.el similarity index 94% rename from elpa/use-package-20180314.1143/use-package-ensure.el rename to elpa/use-package-20180613.2219/use-package-ensure.el index 1a76b88..50005a9 100644 --- a/elpa/use-package-20180314.1143/use-package-ensure.el +++ b/elpa/use-package-20180613.2219/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 @@ -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 ( :pin )")))))))) -(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/elpa/use-package-20180314.1143/use-package-jump.el b/elpa/use-package-20180613.2219/use-package-jump.el similarity index 98% rename from elpa/use-package-20180314.1143/use-package-jump.el rename to elpa/use-package-20180613.2219/use-package-jump.el index 31d1b05..4044ad1 100644 --- a/elpa/use-package-20180314.1143/use-package-jump.el +++ b/elpa/use-package-20180613.2219/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 diff --git a/elpa/use-package-20180314.1143/use-package-lint.el b/elpa/use-package-20180613.2219/use-package-lint.el similarity index 98% rename from elpa/use-package-20180314.1143/use-package-lint.el rename to elpa/use-package-20180613.2219/use-package-lint.el index 53c6828..c6e7c3c 100644 --- a/elpa/use-package-20180314.1143/use-package-lint.el +++ b/elpa/use-package-20180613.2219/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 diff --git a/elpa/use-package-20180314.1143/use-package-pkg.el b/elpa/use-package-20180613.2219/use-package-pkg.el similarity index 78% rename from elpa/use-package-20180314.1143/use-package-pkg.el rename to elpa/use-package-20180613.2219/use-package-pkg.el index 484e942..5df3576 100644 --- a/elpa/use-package-20180314.1143/use-package-pkg.el +++ b/elpa/use-package-20180613.2219/use-package-pkg.el @@ -1,4 +1,4 @@ -(define-package "use-package" "20180314.1143" "A configuration macro for simplifying your .emacs" +(define-package "use-package" "20180613.2219" "A configuration macro for simplifying your .emacs" '((emacs "24.3") (bind-key "2.4")) :keywords diff --git a/elpa/use-package-20180314.1143/use-package.el b/elpa/use-package-20180613.2219/use-package.el similarity index 98% rename from elpa/use-package-20180314.1143/use-package.el rename to elpa/use-package-20180613.2219/use-package.el index 5f98db1..1a8fff8 100644 --- a/elpa/use-package-20180314.1143/use-package.el +++ b/elpa/use-package-20180613.2219/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 diff --git a/elpa/use-package-20180314.1143/use-package.info b/elpa/use-package-20180613.2219/use-package.info similarity index 96% rename from elpa/use-package-20180314.1143/use-package.info rename to elpa/use-package-20180613.2219/use-package.info index 5f445ae..f80f1fd 100644 --- a/elpa/use-package-20180314.1143/use-package.info +++ b/elpa/use-package-20180613.2219/use-package.info @@ -109,7 +109,12 @@ File: use-package.info, Node: Introduction, Next: Installation, Prev: Top, U 1 Introduction ************** -TODO +The ‘use-package’ macro allows you to isolate package configuration in +your ‘.emacs’ file in a way that is both performance-oriented and, well, +tidy. I created it because I have over 400 packages that I use in +Emacs, and things were getting difficult to manage. Yet with this +utility my total load time is around 2 seconds, with no loss of +functionality!  File: use-package.info, Node: Installation, Next: Getting Started, Prev: Introduction, Up: Top @@ -999,41 +1004,41 @@ Appendix E Variable Index Tag Table: Node: Top784 Node: Introduction2838 -Node: Installation2965 -Node: Installing from an Elpa Archive3317 -Node: Installing from the Git Repository4432 -Node: Post-Installation Tasks5968 -Node: Getting Started6681 -Node: Keywords6853 -Node: after7791 -Node: bind-keymap bind-keymap*9323 -Node: bind bind*10376 -Node: Binding to local keymaps12416 -Node: commands13507 -Node: preface init config13649 -Node: custom15727 -Node: custom-face16167 -Node: defer demand16487 -Node: defines functions17299 -Node: diminish delight18444 -Node: disabled20387 -Node: ensure pin20882 -Node: hook23612 -Node: if when unless25030 -Node: load-path25976 -Node: mode interpreter27122 -Node: magic magic-fallback28433 -Node: no-require29278 -Node: requires29982 -Node: FAQ30869 -Node: FAQ - How to ...?31152 -Node: This is a question31324 -Node: FAQ - Issues and Errors31472 -Node: This is an issues31655 -Node: Debugging Tools31810 -Node: Command Index31984 -Node: Function Index32140 -Node: Variable Index32297 +Node: Installation3325 +Node: Installing from an Elpa Archive3677 +Node: Installing from the Git Repository4792 +Node: Post-Installation Tasks6328 +Node: Getting Started7041 +Node: Keywords7213 +Node: after8151 +Node: bind-keymap bind-keymap*9683 +Node: bind bind*10736 +Node: Binding to local keymaps12776 +Node: commands13867 +Node: preface init config14009 +Node: custom16087 +Node: custom-face16527 +Node: defer demand16847 +Node: defines functions17659 +Node: diminish delight18804 +Node: disabled20747 +Node: ensure pin21242 +Node: hook23972 +Node: if when unless25390 +Node: load-path26336 +Node: mode interpreter27482 +Node: magic magic-fallback28793 +Node: no-require29638 +Node: requires30342 +Node: FAQ31229 +Node: FAQ - How to ...?31512 +Node: This is a question31684 +Node: FAQ - Issues and Errors31832 +Node: This is an issues32015 +Node: Debugging Tools32170 +Node: Command Index32344 +Node: Function Index32500 +Node: Variable Index32657  End Tag Table