From 8950a3e8ab814e37a2635e6adbfbc366ee13537b Mon Sep 17 00:00:00 2001 From: Daniel Borchmann Date: Sun, 2 Dec 2018 14:52:36 +0100 Subject: [PATCH] [ELPA] Package Update --- .../hydra-autoloads.el | 4 +- .../hydra-examples.el | 0 .../hydra-ox.el | 0 .../hydra-pkg.el | 2 +- .../hydra.el | 8 ++- .../lv.el | 2 + .../dir | 0 .../use-package-autoloads.el | 22 ++++---- .../use-package-bind-key.el | 0 .../use-package-core.el | 54 +++++++++---------- .../use-package-delight.el | 0 .../use-package-diminish.el | 0 .../use-package-ensure.el | 0 .../use-package-jump.el | 0 .../use-package-lint.el | 0 .../use-package-pkg.el | 2 +- .../use-package.el | 0 .../use-package.info | 0 18 files changed, 51 insertions(+), 43 deletions(-) rename elpa/{hydra-20181030.1925 => hydra-20181128.1716}/hydra-autoloads.el (95%) rename elpa/{hydra-20181030.1925 => hydra-20181128.1716}/hydra-examples.el (100%) rename elpa/{hydra-20181030.1925 => hydra-20181128.1716}/hydra-ox.el (100%) rename elpa/{hydra-20181030.1925 => hydra-20181128.1716}/hydra-pkg.el (80%) rename elpa/{hydra-20181030.1925 => hydra-20181128.1716}/hydra.el (99%) rename elpa/{hydra-20181030.1925 => hydra-20181128.1716}/lv.el (99%) rename elpa/{use-package-20180715.1801 => use-package-20181119.2350}/dir (100%) rename elpa/{use-package-20180715.1801 => use-package-20181119.2350}/use-package-autoloads.el (96%) rename elpa/{use-package-20180715.1801 => use-package-20181119.2350}/use-package-bind-key.el (100%) rename elpa/{use-package-20180715.1801 => use-package-20181119.2350}/use-package-core.el (97%) rename elpa/{use-package-20180715.1801 => use-package-20181119.2350}/use-package-delight.el (100%) rename elpa/{use-package-20180715.1801 => use-package-20181119.2350}/use-package-diminish.el (100%) rename elpa/{use-package-20180715.1801 => use-package-20181119.2350}/use-package-ensure.el (100%) rename elpa/{use-package-20180715.1801 => use-package-20181119.2350}/use-package-jump.el (100%) rename elpa/{use-package-20180715.1801 => use-package-20181119.2350}/use-package-lint.el (100%) rename elpa/{use-package-20180715.1801 => use-package-20181119.2350}/use-package-pkg.el (84%) rename elpa/{use-package-20180715.1801 => use-package-20181119.2350}/use-package.el (100%) rename elpa/{use-package-20180715.1801 => use-package-20181119.2350}/use-package.info (100%) diff --git a/elpa/hydra-20181030.1925/hydra-autoloads.el b/elpa/hydra-20181128.1716/hydra-autoloads.el similarity index 95% rename from elpa/hydra-20181030.1925/hydra-autoloads.el rename to elpa/hydra-20181128.1716/hydra-autoloads.el index 629985b..ac2ab69 100644 --- a/elpa/hydra-20181030.1925/hydra-autoloads.el +++ b/elpa/hydra-20181128.1716/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" (23517 56142 130390 488000)) +;;;### (autoloads nil "hydra" "hydra.el" (23555 58032 639630 221000)) ;;; 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") (23517 56142 142390 549000)) +;;;;;; "lv.el") (23555 58032 655630 298000)) ;;;*** diff --git a/elpa/hydra-20181030.1925/hydra-examples.el b/elpa/hydra-20181128.1716/hydra-examples.el similarity index 100% rename from elpa/hydra-20181030.1925/hydra-examples.el rename to elpa/hydra-20181128.1716/hydra-examples.el diff --git a/elpa/hydra-20181030.1925/hydra-ox.el b/elpa/hydra-20181128.1716/hydra-ox.el similarity index 100% rename from elpa/hydra-20181030.1925/hydra-ox.el rename to elpa/hydra-20181128.1716/hydra-ox.el diff --git a/elpa/hydra-20181030.1925/hydra-pkg.el b/elpa/hydra-20181128.1716/hydra-pkg.el similarity index 80% rename from elpa/hydra-20181030.1925/hydra-pkg.el rename to elpa/hydra-20181128.1716/hydra-pkg.el index 32e1e4c..34c289b 100644 --- a/elpa/hydra-20181030.1925/hydra-pkg.el +++ b/elpa/hydra-20181128.1716/hydra-pkg.el @@ -1,4 +1,4 @@ -(define-package "hydra" "20181030.1925" "Make bindings that stick around." +(define-package "hydra" "20181128.1716" "Make bindings that stick around." '((cl-lib "0.5")) :keywords '("bindings") diff --git a/elpa/hydra-20181030.1925/hydra.el b/elpa/hydra-20181128.1716/hydra.el similarity index 99% rename from elpa/hydra-20181030.1925/hydra.el rename to elpa/hydra-20181128.1716/hydra.el index e738b18..49066e9 100644 --- a/elpa/hydra-20181030.1925/hydra.el +++ b/elpa/hydra-20181128.1716/hydra.el @@ -724,7 +724,13 @@ The expressions can be auto-expanded according to NAME." (t (let ((r `(replace-regexp-in-string " +$" "" - (concat ,docstring ": " + (concat ,docstring + ,(cond ((string-match-p "\\`\n" rest) + ":") + ((string-match-p "\n" rest) + ":\n") + (t + ": ")) (replace-regexp-in-string "\\(%\\)" "\\1\\1" ,rest))))) (if (stringp rest) diff --git a/elpa/hydra-20181030.1925/lv.el b/elpa/hydra-20181128.1716/lv.el similarity index 99% rename from elpa/hydra-20181030.1925/lv.el rename to elpa/hydra-20181128.1716/lv.el index 28f83b4..7043abb 100644 --- a/elpa/hydra-20181030.1925/lv.el +++ b/elpa/hydra-20181128.1716/lv.el @@ -54,6 +54,8 @@ Only the background color is significant." (defvar lv-wnd nil "Holds the current LV window.") +(defvar display-line-numbers) + (defun lv-window () "Ensure that LV window is live and return it." (if (window-live-p lv-wnd) diff --git a/elpa/use-package-20180715.1801/dir b/elpa/use-package-20181119.2350/dir similarity index 100% rename from elpa/use-package-20180715.1801/dir rename to elpa/use-package-20181119.2350/dir diff --git a/elpa/use-package-20180715.1801/use-package-autoloads.el b/elpa/use-package-20181119.2350/use-package-autoloads.el similarity index 96% rename from elpa/use-package-20180715.1801/use-package-autoloads.el rename to elpa/use-package-20181119.2350/use-package-autoloads.el index 836a608..091a64a 100644 --- a/elpa/use-package-20180715.1801/use-package-autoloads.el +++ b/elpa/use-package-20181119.2350/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" -;;;;;; (23441 26325 101319 983000)) +;;;;;; (23555 57959 115271 477000)) ;;; 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" (23441 -;;;;;; 26325 45319 621000)) +;;;### (autoloads nil "use-package-core" "use-package-core.el" (23555 +;;;;;; 57959 63271 224000)) ;;; 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" -;;;;;; (23441 26325 33319 544000)) +;;;;;; (23555 57959 51271 166000)) ;;; 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" -;;;;;; (23441 26325 81319 854000)) +;;;;;; (23555 57959 95271 379000)) ;;; 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" -;;;;;; (23441 26325 53319 673000)) +;;;;;; (23555 57959 71271 263000)) ;;; 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" (23441 -;;;;;; 26325 61319 724000)) +;;;### (autoloads nil "use-package-jump" "use-package-jump.el" (23555 +;;;;;; 57959 79271 302000)) ;;; 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" (23441 -;;;;;; 26325 73319 802000)) +;;;### (autoloads nil "use-package-lint" "use-package-lint.el" (23555 +;;;;;; 57959 91271 361000)) ;;; 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") -;;;;;; (23441 26325 65319 751000)) +;;;;;; (23555 57959 83271 321000)) ;;;*** diff --git a/elpa/use-package-20180715.1801/use-package-bind-key.el b/elpa/use-package-20181119.2350/use-package-bind-key.el similarity index 100% rename from elpa/use-package-20180715.1801/use-package-bind-key.el rename to elpa/use-package-20181119.2350/use-package-bind-key.el diff --git a/elpa/use-package-20180715.1801/use-package-core.el b/elpa/use-package-20181119.2350/use-package-core.el similarity index 97% rename from elpa/use-package-20180715.1801/use-package-core.el rename to elpa/use-package-20181119.2350/use-package-core.el index 525b478..7fc840f 100644 --- a/elpa/use-package-20180715.1801/use-package-core.el +++ b/elpa/use-package-20181119.2350/use-package-core.el @@ -988,10 +988,10 @@ The date is returned as a string." (defun use-package-statistics-time (package) "Return the time is took for PACKAGE to load." - (+ (float-time (gethash :config-secs package 0)) - (float-time (gethash :init-secs package 0)) - (float-time (gethash :preface-secs package 0)) - (float-time (gethash :use-package-secs package 0)))) + (+ (float-time (gethash :config-secs package '(0 0 0 0))) + (float-time (gethash :init-secs package '(0 0 0 0))) + (float-time (gethash :preface-secs package '(0 0 0 0))) + (float-time (gethash :use-package-secs package '(0 0 0 0))))) (defun use-package-statistics-convert (package) "Return information about PACKAGE. @@ -1315,41 +1315,41 @@ meaning: args (list args))) -(defun use-package-after-count-uses (features) +(defun use-package-after-count-uses (features*) "Count the number of time the body would appear in the result." - (cond ((use-package-non-nil-symbolp features) + (cond ((use-package-non-nil-symbolp features*) 1) - ((and (consp features) - (memq (car features) '(:or :any))) + ((and (consp features*) + (memq (car features*) '(:or :any))) (let ((num 0)) - (cl-dolist (next (cdr features)) + (cl-dolist (next (cdr features*)) (setq num (+ num (use-package-after-count-uses next)))) num)) - ((and (consp features) - (memq (car features) '(:and :all))) + ((and (consp features*) + (memq (car features*) '(:and :all))) (apply #'max (mapcar #'use-package-after-count-uses - (cdr features)))) - ((listp features) - (use-package-after-count-uses (cons :all features))))) + (cdr features*)))) + ((listp features*) + (use-package-after-count-uses (cons :all features*))))) -(defun use-package-require-after-load (features body) - "Generate `eval-after-load' statements to represents FEATURES. -FEATURES is a list containing keywords `:and' and `:all', where +(defun use-package-require-after-load (features* body) + "Generate `eval-after-load' statements to represents FEATURES*. +FEATURES* is a list containing keywords `:and' and `:all', where no keyword implies `:all'." (cond - ((use-package-non-nil-symbolp features) - `((eval-after-load ',features ',(macroexp-progn body)))) - ((and (consp features) - (memq (car features) '(:or :any))) + ((use-package-non-nil-symbolp features*) + `((eval-after-load ',features* ',(macroexp-progn body)))) + ((and (consp features*) + (memq (car features*) '(:or :any))) (cl-mapcan #'(lambda (x) (use-package-require-after-load x body)) - (cdr features))) - ((and (consp features) - (memq (car features) '(:and :all))) - (cl-dolist (next (cdr features)) + (cdr features*))) + ((and (consp features*) + (memq (car features*) '(:and :all))) + (cl-dolist (next (cdr features*)) (setq body (use-package-require-after-load next body))) body) - ((listp features) - (use-package-require-after-load (cons :all features) body)))) + ((listp features*) + (use-package-require-after-load (cons :all features*) body)))) (defun use-package-handler/:after (name _keyword arg rest state) (let ((body (use-package-process-keywords name rest state)) diff --git a/elpa/use-package-20180715.1801/use-package-delight.el b/elpa/use-package-20181119.2350/use-package-delight.el similarity index 100% rename from elpa/use-package-20180715.1801/use-package-delight.el rename to elpa/use-package-20181119.2350/use-package-delight.el diff --git a/elpa/use-package-20180715.1801/use-package-diminish.el b/elpa/use-package-20181119.2350/use-package-diminish.el similarity index 100% rename from elpa/use-package-20180715.1801/use-package-diminish.el rename to elpa/use-package-20181119.2350/use-package-diminish.el diff --git a/elpa/use-package-20180715.1801/use-package-ensure.el b/elpa/use-package-20181119.2350/use-package-ensure.el similarity index 100% rename from elpa/use-package-20180715.1801/use-package-ensure.el rename to elpa/use-package-20181119.2350/use-package-ensure.el diff --git a/elpa/use-package-20180715.1801/use-package-jump.el b/elpa/use-package-20181119.2350/use-package-jump.el similarity index 100% rename from elpa/use-package-20180715.1801/use-package-jump.el rename to elpa/use-package-20181119.2350/use-package-jump.el diff --git a/elpa/use-package-20180715.1801/use-package-lint.el b/elpa/use-package-20181119.2350/use-package-lint.el similarity index 100% rename from elpa/use-package-20180715.1801/use-package-lint.el rename to elpa/use-package-20181119.2350/use-package-lint.el diff --git a/elpa/use-package-20180715.1801/use-package-pkg.el b/elpa/use-package-20181119.2350/use-package-pkg.el similarity index 84% rename from elpa/use-package-20180715.1801/use-package-pkg.el rename to elpa/use-package-20181119.2350/use-package-pkg.el index e9364fd..741f4c7 100644 --- a/elpa/use-package-20180715.1801/use-package-pkg.el +++ b/elpa/use-package-20181119.2350/use-package-pkg.el @@ -1,4 +1,4 @@ -(define-package "use-package" "20180715.1801" "A configuration macro for simplifying your .emacs" +(define-package "use-package" "20181119.2350" "A configuration macro for simplifying your .emacs" '((emacs "24.3") (bind-key "2.4")) :keywords diff --git a/elpa/use-package-20180715.1801/use-package.el b/elpa/use-package-20181119.2350/use-package.el similarity index 100% rename from elpa/use-package-20180715.1801/use-package.el rename to elpa/use-package-20181119.2350/use-package.el diff --git a/elpa/use-package-20180715.1801/use-package.info b/elpa/use-package-20181119.2350/use-package.info similarity index 100% rename from elpa/use-package-20180715.1801/use-package.info rename to elpa/use-package-20181119.2350/use-package.info