[ELPA] Update
This commit is contained in:
parent
599e6d41b8
commit
bab4ae2b07
GPG Key ID:
4F63DB96D45AA9C6
|
|
@ -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"))
|
||||
|
|
@ -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" (22652 34798 75217
|
||||
;;;;;; 942000))
|
||||
;;;### (autoloads nil "bind-key" "bind-key.el" (23074 63739 689897
|
||||
;;;;;; 354000))
|
||||
;;; Generated autoloads from bind-key.el
|
||||
|
||||
(autoload 'bind-key "bind-key" "\
|
||||
|
|
@ -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"))
|
||||
|
|
@ -1,12 +1,13 @@
|
|||
;;; 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>
|
||||
;; Maintainer: John Wiegley <jwiegley@gmail.com>
|
||||
;; Author: John Wiegley <johnw@newartisans.com>
|
||||
;; Maintainer: John Wiegley <johnw@newartisans.com>
|
||||
;; Created: 16 Jun 2012
|
||||
;; Version: 1.0
|
||||
;; Package-Version: 20161218.1520
|
||||
;; Modified: 29 Nov 2017
|
||||
;; Version: 2.4
|
||||
;; Package-Version: 20171129.2144
|
||||
;; Keywords: keys keybinding config dotemacs
|
||||
;; URL: https://github.com/jwiegley/use-package
|
||||
|
||||
|
|
@ -162,9 +163,13 @@ can safely be called at any time."
|
|||
(key-description ,namevar))
|
||||
(quote ,keymap)))
|
||||
(,bindingvar (lookup-key (or ,keymap global-map) ,keyvar)))
|
||||
(add-to-list 'personal-keybindings
|
||||
(list ,kdescvar ,command
|
||||
(unless (numberp ,bindingvar) ,bindingvar)))
|
||||
(let ((entry (assoc ,kdescvar personal-keybindings))
|
||||
(details (list ,command
|
||||
(unless (numberp ,bindingvar)
|
||||
,bindingvar))))
|
||||
(if entry
|
||||
(setcdr entry details)
|
||||
(add-to-list 'personal-keybindings (cons ,kdescvar details))))
|
||||
,(if predicate
|
||||
`(define-key (or ,keymap global-map) ,keyvar
|
||||
'(menu-item "" nil :filter (lambda (&optional _)
|
||||
|
|
@ -263,11 +268,12 @@ function symbol (unquoted)."
|
|||
(wrap map
|
||||
(cl-mapcan
|
||||
(lambda (form)
|
||||
(let ((fun (and (cdr form) (list 'function (cdr form)))))
|
||||
(if prefix-map
|
||||
`((bind-key ,(car form) ',(cdr form) ,prefix-map ,filter))
|
||||
`((bind-key ,(car form) ,fun ,prefix-map ,filter))
|
||||
(if (and map (not (eq map 'global-map)))
|
||||
`((bind-key ,(car form) ',(cdr form) ,map ,filter))
|
||||
`((bind-key ,(car form) ',(cdr form) nil ,filter)))))
|
||||
`((bind-key ,(car form) ,fun ,map ,filter))
|
||||
`((bind-key ,(car form) ,fun nil ,filter))))))
|
||||
first))
|
||||
(when next
|
||||
(bind-keys-form
|
||||
|
|
@ -302,7 +308,7 @@ function symbol (unquoted)."
|
|||
(cond
|
||||
((listp elem)
|
||||
(cond
|
||||
((eq 'lambda (car elem))
|
||||
((memq (car elem) '(lambda function))
|
||||
(if (and bind-key-describe-special-forms
|
||||
(stringp (nth 2 elem)))
|
||||
(nth 2 elem)
|
||||
|
|
@ -371,8 +377,8 @@ function symbol (unquoted)."
|
|||
(car (compare-keybindings l r))))))
|
||||
|
||||
(if (not (eq (cdar last-binding) (cdar binding)))
|
||||
(princ (format "\n\n%s\n%s\n\n"
|
||||
(cdar binding)
|
||||
(princ (format "\n\n%s: %s\n%s\n\n"
|
||||
(cdar binding) (caar binding)
|
||||
(make-string (+ 21 (car bind-key-column-widths)
|
||||
(cdr bind-key-column-widths)) ?-)))
|
||||
(if (and last-binding
|
||||
|
|
@ -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" (23004 61710 690801 163000))
|
||||
;;;### (autoloads nil "hydra" "hydra.el" (23074 63707 509730 106000))
|
||||
;;; 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") (23004 61710 702801 140000))
|
||||
;;;;;; "lv.el") (23074 63707 525730 189000))
|
||||
|
||||
;;;***
|
||||
|
||||
|
|
@ -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"))
|
||||
:url "https://github.com/abo-abo/hydra" :keywords
|
||||
'("bindings"))
|
||||
|
|
@ -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.
|
||||
Every heads-group have equal length by adding padding heads where applicable."
|
||||
(when heads-groups
|
||||
(cl-loop for heads-group in (hydra--pad-heads heads-groups '(" " nil " " :exit t))
|
||||
for column-name = (hydra--head-property (nth 0 heads-group) :column)
|
||||
for max-key-len = (apply #'max (mapcar (lambda (x) (length (car x))) heads-group))
|
||||
for max-doc-len = (apply #'max
|
||||
(let ((res nil))
|
||||
(dolist (heads-group (hydra--pad-heads heads-groups '(" " nil " " :exit t)))
|
||||
(let* ((column-name (hydra--head-property (nth 0 heads-group) :column))
|
||||
(max-key-len (apply #'max (mapcar (lambda (x) (length (car x))) heads-group)))
|
||||
(max-doc-len (apply #'max
|
||||
(length column-name)
|
||||
(mapcar (lambda (x) (length (hydra--to-string (nth 2 x)))) heads-group))
|
||||
for header-virtual-head = `(" " nil ,column-name :column ,column-name :exit t)
|
||||
for separator-virtual-head = `(" " nil ,(make-string (+ 2 max-doc-len max-key-len) ?-) :column ,column-name :exit t)
|
||||
for decorated-heads = (copy-tree (apply 'list header-virtual-head separator-virtual-head heads-group))
|
||||
collect (mapcar (lambda (it)
|
||||
(mapcar (lambda (x) (length (hydra--to-string (nth 2 x)))) heads-group)))
|
||||
(header-virtual-head `(" " nil ,column-name :column ,column-name :exit t))
|
||||
(separator-virtual-head `(" " nil ,(make-string (+ 2 max-doc-len max-key-len) ?-) :column ,column-name :exit t))
|
||||
(decorated-heads (copy-tree (apply 'list header-virtual-head separator-virtual-head heads-group))))
|
||||
(push (mapcar (lambda (it)
|
||||
(hydra--head-set-property it :max-key-len max-key-len)
|
||||
(hydra--head-set-property it :max-doc-len max-doc-len))
|
||||
decorated-heads)
|
||||
into decorated-heads-matrix
|
||||
finally return decorated-heads-matrix)))
|
||||
decorated-heads) res)))
|
||||
(nreverse res))))
|
||||
|
||||
(defun hydra--hint-from-matrix (body 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 head must have a property max-key-len and max-doc-len."
|
||||
(when heads-matrix
|
||||
(cl-loop with first-heads-col = (nth 0 heads-matrix)
|
||||
with last-row-index = (- (length first-heads-col) 1)
|
||||
for row-index from 0 to last-row-index
|
||||
for heads-in-row = (mapcar (lambda (heads) (nth row-index heads)) heads-matrix)
|
||||
concat (concat
|
||||
(replace-regexp-in-string "\s+$" ""
|
||||
(let* ((first-heads-col (nth 0 heads-matrix))
|
||||
(last-row-index (- (length first-heads-col) 1))
|
||||
(lines nil))
|
||||
(dolist (row-index (number-sequence 0 last-row-index))
|
||||
(let ((heads-in-row (mapcar
|
||||
(lambda (heads) (nth row-index heads))
|
||||
heads-matrix)))
|
||||
(push (replace-regexp-in-string
|
||||
"\s+$" ""
|
||||
(mapconcat (lambda (head)
|
||||
(funcall hydra-key-doc-function
|
||||
(hydra-fontify-head head body) ;; key
|
||||
(hydra--head-property head :max-key-len)
|
||||
(let ((n (hydra--head-property head :max-key-len)))
|
||||
(+ n (cl-count ?% (car head))))
|
||||
(nth 2 head) ;; doc
|
||||
(hydra--head-property head :max-doc-len)))
|
||||
heads-in-row "| ")) "\n")
|
||||
into matrix-image
|
||||
finally return matrix-image)))
|
||||
heads-in-row "| "))
|
||||
lines)))
|
||||
(concat (mapconcat #'identity (nreverse lines) "\n") "\n"))))
|
||||
|
||||
;; previous functions dealt with automatic docstring table generation from :column head property
|
||||
|
||||
(defun hydra-idle-message (secs hint name)
|
||||
|
|
@ -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"))
|
||||
|
|
@ -3,8 +3,8 @@
|
|||
;;; Code:
|
||||
(add-to-list 'load-path (directory-file-name (or (file-name-directory #$) (car load-path))))
|
||||
|
||||
;;;### (autoloads nil "use-package" "use-package.el" (23028 47880
|
||||
;;;;;; 842290 450000))
|
||||
;;;### (autoloads nil "use-package" "use-package.el" (23074 63646
|
||||
;;;;;; 149414 588000))
|
||||
;;; Generated autoloads from use-package.el
|
||||
|
||||
(autoload 'use-package-autoload-keymap "use-package" "\
|
||||
|
|
@ -41,7 +41,6 @@ this file. Usage:
|
|||
:mode Form to be added to `auto-mode-alist'.
|
||||
:magic Form to be added to `magic-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'.
|
||||
|
||||
: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,
|
||||
to force loading after N seconds of idle time, if the package
|
||||
has not already been loaded.
|
||||
|
||||
:after Defer loading of a package until after any of the named
|
||||
features are loaded.
|
||||
|
||||
:demand Prevent deferred loading in all cases.
|
||||
|
||||
: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.
|
||||
:diminish Support for diminish.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.
|
||||
:pin Pin the package to an archive.
|
||||
|
||||
|
|
@ -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"))
|
||||
File diff suppressed because it is too large
Load Diff
2
private
2
private
|
|
@ -1 +1 @@
|
|||
Subproject commit a890621dbe600294d71bbec031782feb73605011
|
||||
Subproject commit bc7421cc242dd1caf5c1259a44310e0bb97437be
|
||||
Loading…
Reference in New Issue