[ELPA] Update

This commit is contained in:
dbo 2017-12-02 20:21:57 +01:00
parent 599e6d41b8
commit bab4ae2b07
Signed by: dbo
GPG Key ID: 4F63DB96D45AA9C6
15 changed files with 524 additions and 502 deletions

View File

@ -1,2 +0,0 @@
;;; -*- no-byte-compile: t -*-
(define-package "bind-key" "20161218.1520" "A simple way to manage personal keybindings" 'nil :url "https://github.com/jwiegley/use-package" :keywords '("keys" "keybinding" "config" "dotemacs"))

View File

@ -3,8 +3,8 @@
;;; Code: ;;; Code:
(add-to-list 'load-path (directory-file-name (or (file-name-directory #$) (car load-path)))) (add-to-list 'load-path (directory-file-name (or (file-name-directory #$) (car load-path))))
;;;### (autoloads nil "bind-key" "bind-key.el" (22652 34798 75217 ;;;### (autoloads nil "bind-key" "bind-key.el" (23074 63739 689897
;;;;;; 942000)) ;;;;;; 354000))
;;; Generated autoloads from bind-key.el ;;; Generated autoloads from bind-key.el
(autoload 'bind-key "bind-key" "\ (autoload 'bind-key "bind-key" "\

View File

@ -0,0 +1,2 @@
;;; -*- no-byte-compile: t -*-
(define-package "bind-key" "20171129.2144" "A simple way to manage personal keybindings" 'nil :commit "fe5d8a9f501d9151efd633c0e16f42932969f1fc" :url "https://github.com/jwiegley/use-package" :keywords '("keys" "keybinding" "config" "dotemacs"))

View File

@ -1,12 +1,13 @@
;;; bind-key.el --- A simple way to manage personal keybindings ;;; bind-key.el --- A simple way to manage personal keybindings
;; Copyright (c) 2012-2015 john wiegley ;; Copyright (c) 2012-2017 John Wiegley
;; Author: John Wiegley <jwiegley@gmail.com> ;; Author: John Wiegley <johnw@newartisans.com>
;; Maintainer: John Wiegley <jwiegley@gmail.com> ;; Maintainer: John Wiegley <johnw@newartisans.com>
;; Created: 16 Jun 2012 ;; Created: 16 Jun 2012
;; Version: 1.0 ;; Modified: 29 Nov 2017
;; Package-Version: 20161218.1520 ;; Version: 2.4
;; Package-Version: 20171129.2144
;; Keywords: keys keybinding config dotemacs ;; Keywords: keys keybinding config dotemacs
;; URL: https://github.com/jwiegley/use-package ;; URL: https://github.com/jwiegley/use-package
@ -162,9 +163,13 @@ can safely be called at any time."
(key-description ,namevar)) (key-description ,namevar))
(quote ,keymap))) (quote ,keymap)))
(,bindingvar (lookup-key (or ,keymap global-map) ,keyvar))) (,bindingvar (lookup-key (or ,keymap global-map) ,keyvar)))
(add-to-list 'personal-keybindings (let ((entry (assoc ,kdescvar personal-keybindings))
(list ,kdescvar ,command (details (list ,command
(unless (numberp ,bindingvar) ,bindingvar))) (unless (numberp ,bindingvar)
,bindingvar))))
(if entry
(setcdr entry details)
(add-to-list 'personal-keybindings (cons ,kdescvar details))))
,(if predicate ,(if predicate
`(define-key (or ,keymap global-map) ,keyvar `(define-key (or ,keymap global-map) ,keyvar
'(menu-item "" nil :filter (lambda (&optional _) '(menu-item "" nil :filter (lambda (&optional _)
@ -263,11 +268,12 @@ function symbol (unquoted)."
(wrap map (wrap map
(cl-mapcan (cl-mapcan
(lambda (form) (lambda (form)
(if prefix-map (let ((fun (and (cdr form) (list 'function (cdr form)))))
`((bind-key ,(car form) ',(cdr form) ,prefix-map ,filter)) (if prefix-map
(if (and map (not (eq map 'global-map))) `((bind-key ,(car form) ,fun ,prefix-map ,filter))
`((bind-key ,(car form) ',(cdr form) ,map ,filter)) (if (and map (not (eq map 'global-map)))
`((bind-key ,(car form) ',(cdr form) nil ,filter))))) `((bind-key ,(car form) ,fun ,map ,filter))
`((bind-key ,(car form) ,fun nil ,filter))))))
first)) first))
(when next (when next
(bind-keys-form (bind-keys-form
@ -302,7 +308,7 @@ function symbol (unquoted)."
(cond (cond
((listp elem) ((listp elem)
(cond (cond
((eq 'lambda (car elem)) ((memq (car elem) '(lambda function))
(if (and bind-key-describe-special-forms (if (and bind-key-describe-special-forms
(stringp (nth 2 elem))) (stringp (nth 2 elem)))
(nth 2 elem) (nth 2 elem)
@ -371,8 +377,8 @@ function symbol (unquoted)."
(car (compare-keybindings l r)))))) (car (compare-keybindings l r))))))
(if (not (eq (cdar last-binding) (cdar binding))) (if (not (eq (cdar last-binding) (cdar binding)))
(princ (format "\n\n%s\n%s\n\n" (princ (format "\n\n%s: %s\n%s\n\n"
(cdar binding) (cdar binding) (caar binding)
(make-string (+ 21 (car bind-key-column-widths) (make-string (+ 21 (car bind-key-column-widths)
(cdr bind-key-column-widths)) ?-))) (cdr bind-key-column-widths)) ?-)))
(if (and last-binding (if (and last-binding

View File

@ -3,7 +3,7 @@
;;; Code: ;;; Code:
(add-to-list 'load-path (directory-file-name (or (file-name-directory #$) (car load-path)))) (add-to-list 'load-path (directory-file-name (or (file-name-directory #$) (car load-path))))
;;;### (autoloads nil "hydra" "hydra.el" (23004 61710 690801 163000)) ;;;### (autoloads nil "hydra" "hydra.el" (23074 63707 509730 106000))
;;; Generated autoloads from hydra.el ;;; Generated autoloads from hydra.el
(autoload 'defhydra "hydra" "\ (autoload 'defhydra "hydra" "\
@ -65,7 +65,7 @@ result of `defhydra'.
;;;*** ;;;***
;;;### (autoloads nil nil ("hydra-examples.el" "hydra-ox.el" "hydra-pkg.el" ;;;### (autoloads nil nil ("hydra-examples.el" "hydra-ox.el" "hydra-pkg.el"
;;;;;; "lv.el") (23004 61710 702801 140000)) ;;;;;; "lv.el") (23074 63707 525730 189000))
;;;*** ;;;***

View File

@ -1,4 +1,4 @@
(define-package "hydra" "20170924.2259" "Make bindings that stick around." (define-package "hydra" "20171120.1042" "Make bindings that stick around."
'((cl-lib "0.5")) '((cl-lib "0.5"))
:url "https://github.com/abo-abo/hydra" :keywords :url "https://github.com/abo-abo/hydra" :keywords
'("bindings")) '("bindings"))

View File

@ -485,8 +485,8 @@ Return DEFAULT if PROP is not in H."
(defun hydra-key-doc-function-default (key key-width doc doc-width) (defun hydra-key-doc-function-default (key key-width doc doc-width)
"Doc" "Doc"
(cond (cond
((equal key " ") (format (format "%%-%ds" (+ 3 key-width doc-width)) doc)) ((equal key " ") (format (format "%%-%ds" (+ 3 key-width doc-width)) doc))
(t (format (format "%%%ds: %%%ds" key-width (- -1 doc-width)) key doc)))) (t (format (format "%%%ds: %%%ds" key-width (- -1 doc-width)) key doc))))
(defun hydra--to-string (x) (defun hydra--to-string (x)
(if (stringp x) (if (stringp x)
@ -1044,21 +1044,21 @@ Each head is decorated with 2 new properties max-doc-len and max-key-len
representing the maximum dimension of their owning group. representing the maximum dimension of their owning group.
Every heads-group have equal length by adding padding heads where applicable." Every heads-group have equal length by adding padding heads where applicable."
(when heads-groups (when heads-groups
(cl-loop for heads-group in (hydra--pad-heads heads-groups '(" " nil " " :exit t)) (let ((res nil))
for column-name = (hydra--head-property (nth 0 heads-group) :column) (dolist (heads-group (hydra--pad-heads heads-groups '(" " nil " " :exit t)))
for max-key-len = (apply #'max (mapcar (lambda (x) (length (car x))) heads-group)) (let* ((column-name (hydra--head-property (nth 0 heads-group) :column))
for max-doc-len = (apply #'max (max-key-len (apply #'max (mapcar (lambda (x) (length (car x))) heads-group)))
(length column-name) (max-doc-len (apply #'max
(mapcar (lambda (x) (length (hydra--to-string (nth 2 x)))) heads-group)) (length column-name)
for header-virtual-head = `(" " nil ,column-name :column ,column-name :exit t) (mapcar (lambda (x) (length (hydra--to-string (nth 2 x)))) heads-group)))
for separator-virtual-head = `(" " nil ,(make-string (+ 2 max-doc-len max-key-len) ?-) :column ,column-name :exit t) (header-virtual-head `(" " nil ,column-name :column ,column-name :exit t))
for decorated-heads = (copy-tree (apply 'list header-virtual-head separator-virtual-head heads-group)) (separator-virtual-head `(" " nil ,(make-string (+ 2 max-doc-len max-key-len) ?-) :column ,column-name :exit t))
collect (mapcar (lambda (it) (decorated-heads (copy-tree (apply 'list header-virtual-head separator-virtual-head heads-group))))
(hydra--head-set-property it :max-key-len max-key-len) (push (mapcar (lambda (it)
(hydra--head-set-property it :max-doc-len max-doc-len)) (hydra--head-set-property it :max-key-len max-key-len)
decorated-heads) (hydra--head-set-property it :max-doc-len max-doc-len))
into decorated-heads-matrix decorated-heads) res)))
finally return decorated-heads-matrix))) (nreverse res))))
(defun hydra--hint-from-matrix (body heads-matrix) (defun hydra--hint-from-matrix (body heads-matrix)
"Generate a formated table-style docstring according to BODY and HEADS-MATRIX. "Generate a formated table-style docstring according to BODY and HEADS-MATRIX.
@ -1066,21 +1066,26 @@ HEADS-MATRIX is expected to be a list of heads with following features:
Each heads must have the same length Each heads must have the same length
Each head must have a property max-key-len and max-doc-len." Each head must have a property max-key-len and max-doc-len."
(when heads-matrix (when heads-matrix
(cl-loop with first-heads-col = (nth 0 heads-matrix) (let* ((first-heads-col (nth 0 heads-matrix))
with last-row-index = (- (length first-heads-col) 1) (last-row-index (- (length first-heads-col) 1))
for row-index from 0 to last-row-index (lines nil))
for heads-in-row = (mapcar (lambda (heads) (nth row-index heads)) heads-matrix) (dolist (row-index (number-sequence 0 last-row-index))
concat (concat (let ((heads-in-row (mapcar
(replace-regexp-in-string "\s+$" "" (lambda (heads) (nth row-index heads))
(mapconcat (lambda (head) heads-matrix)))
(funcall hydra-key-doc-function (push (replace-regexp-in-string
(hydra-fontify-head head body) ;; key "\s+$" ""
(hydra--head-property head :max-key-len) (mapconcat (lambda (head)
(nth 2 head) ;; doc (funcall hydra-key-doc-function
(hydra--head-property head :max-doc-len))) (hydra-fontify-head head body) ;; key
heads-in-row "| ")) "\n") (let ((n (hydra--head-property head :max-key-len)))
into matrix-image (+ n (cl-count ?% (car head))))
finally return matrix-image))) (nth 2 head) ;; doc
(hydra--head-property head :max-doc-len)))
heads-in-row "| "))
lines)))
(concat (mapconcat #'identity (nreverse lines) "\n") "\n"))))
;; previous functions dealt with automatic docstring table generation from :column head property ;; previous functions dealt with automatic docstring table generation from :column head property
(defun hydra-idle-message (secs hint name) (defun hydra-idle-message (secs hint name)

View File

@ -1,2 +0,0 @@
;;; -*- no-byte-compile: t -*-
(define-package "use-package" "20171013.1548" "A use-package declaration for simplifying your .emacs" '((bind-key "1.0") (diminish "0.44")) :commit "cb89901b52a9413b6c233d7fbb616a2d8f38b50a" :url "https://github.com/jwiegley/use-package" :keywords '("dotemacs" "startup" "speed" "config" "package"))

View File

@ -3,21 +3,21 @@
;;; Code: ;;; Code:
(add-to-list 'load-path (directory-file-name (or (file-name-directory #$) (car load-path)))) (add-to-list 'load-path (directory-file-name (or (file-name-directory #$) (car load-path))))
;;;### (autoloads nil "use-package" "use-package.el" (23028 47880 ;;;### (autoloads nil "use-package" "use-package.el" (23074 63646
;;;;;; 842290 450000)) ;;;;;; 149414 588000))
;;; Generated autoloads from use-package.el ;;; Generated autoloads from use-package.el
(autoload 'use-package-autoload-keymap "use-package" "\ (autoload 'use-package-autoload-keymap "use-package" "\
Loads PACKAGE and then binds the key sequence used to invoke Loads PACKAGE and then binds the key sequence used to invoke
this function to KEYMAP-SYMBOL. It then simulates pressing the this function to KEYMAP-SYMBOL. It then simulates pressing the
same key sequence a again, so that the next key pressed is routed same key sequence a again, so that the next key pressed is routed
to the newly loaded keymap. to the newly loaded keymap.
This function supports use-package's :bind-keymap keyword. It This function supports use-package's :bind-keymap keyword. It
works by binding the given key sequence to an invocation of this works by binding the given key sequence to an invocation of this
function for a particular keymap. The keymap is expected to be function for a particular keymap. The keymap is expected to be
defined by the package. In this way, loading the package is defined by the package. In this way, loading the package is
deferred until the prefix key sequence is pressed. deferred until the prefix key sequence is pressed.
\(fn KEYMAP-SYMBOL PACKAGE OVERRIDE)" nil nil) \(fn KEYMAP-SYMBOL PACKAGE OVERRIDE)" nil nil)
@ -41,7 +41,6 @@ this file. Usage:
:mode Form to be added to `auto-mode-alist'. :mode Form to be added to `auto-mode-alist'.
:magic Form to be added to `magic-mode-alist'. :magic Form to be added to `magic-mode-alist'.
:magic-fallback Form to be added to `magic-fallback-mode-alist'. :magic-fallback Form to be added to `magic-fallback-mode-alist'.
:mode Form to be added to `auto-mode-alist'.
:interpreter Form to be added to `interpreter-mode-alist'. :interpreter Form to be added to `interpreter-mode-alist'.
:commands Define autoloads for commands that will be defined by the :commands Define autoloads for commands that will be defined by the
@ -61,10 +60,8 @@ this file. Usage:
`:magic-fallback', or `:interpreter'. This can be an integer, `:magic-fallback', or `:interpreter'. This can be an integer,
to force loading after N seconds of idle time, if the package to force loading after N seconds of idle time, if the package
has not already been loaded. has not already been loaded.
:after Defer loading of a package until after any of the named :after Defer loading of a package until after any of the named
features are loaded. features are loaded.
:demand Prevent deferred loading in all cases. :demand Prevent deferred loading in all cases.
:if EXPR Initialize and load only if EXPR evaluates to a non-nil value. :if EXPR Initialize and load only if EXPR evaluates to a non-nil value.
@ -74,6 +71,8 @@ this file. Usage:
:load-path Add to the `load-path' before attempting to load the package. :load-path Add to the `load-path' before attempting to load the package.
:diminish Support for diminish.el (if installed). :diminish Support for diminish.el (if installed).
:delight Support for delight.el (if installed). :delight Support for delight.el (if installed).
:custom Call `customize-set-variable' with each variable definition.
:custom-face Call `customize-set-faces' with each face definition.
:ensure Loads the package using package.el if necessary. :ensure Loads the package using package.el if necessary.
:pin Pin the package to an archive. :pin Pin the package to an archive.

View File

@ -0,0 +1,2 @@
;;; -*- no-byte-compile: t -*-
(define-package "use-package" "20171201.1339" "A use-package declaration for simplifying your .emacs" '((emacs "24.3") (bind-key "2.4")) :commit "e8a3fdcc2e4c1557b64df25bec26851ec319d912" :url "https://github.com/jwiegley/use-package" :keywords '("dotemacs" "startup" "speed" "config" "package"))

@ -1 +1 @@
Subproject commit a890621dbe600294d71bbec031782feb73605011 Subproject commit bc7421cc242dd1caf5c1259a44310e0bb97437be