diff --git a/elpa/dash-20171010.131/dash-pkg.el b/elpa/dash-20171010.131/dash-pkg.el deleted file mode 100644 index 281a4c8..0000000 --- a/elpa/dash-20171010.131/dash-pkg.el +++ /dev/null @@ -1,2 +0,0 @@ -;;; -*- no-byte-compile: t -*- -(define-package "dash" "20171010.131" "A modern list library for Emacs" 'nil :commit "4b465277809aa49e4d34438877b0b2d8eeb4a6b8" :keywords '("lists")) diff --git a/elpa/dash-20171010.131/dash-autoloads.el b/elpa/dash-20171028.854/dash-autoloads.el similarity index 83% rename from elpa/dash-20171010.131/dash-autoloads.el rename to elpa/dash-20171028.854/dash-autoloads.el index f49049b..77f943d 100644 --- a/elpa/dash-20171010.131/dash-autoloads.el +++ b/elpa/dash-20171028.854/dash-autoloads.el @@ -3,7 +3,7 @@ ;;; Code: (add-to-list 'load-path (directory-file-name (or (file-name-directory #$) (car load-path)))) -;;;### (autoloads nil nil ("dash.el") (23004 61741 650744 218000)) +;;;### (autoloads nil nil ("dash.el") (23028 47952 758677 500000)) ;;;*** diff --git a/elpa/dash-20171028.854/dash-pkg.el b/elpa/dash-20171028.854/dash-pkg.el new file mode 100644 index 0000000..e9c44af --- /dev/null +++ b/elpa/dash-20171028.854/dash-pkg.el @@ -0,0 +1,2 @@ +;;; -*- no-byte-compile: t -*- +(define-package "dash" "20171028.854" "A modern list library for Emacs" 'nil :commit "91d8cb01e62bab0d6267d3d4dbcabd6da6fdea78" :keywords '("lists")) diff --git a/elpa/dash-20171010.131/dash.el b/elpa/dash-20171028.854/dash.el similarity index 97% rename from elpa/dash-20171010.131/dash.el rename to elpa/dash-20171028.854/dash.el index ff1ba2b..7cc8f1f 100644 --- a/elpa/dash-20171010.131/dash.el +++ b/elpa/dash-20171028.854/dash.el @@ -4,7 +4,7 @@ ;; Author: Magnar Sveen ;; Version: 2.13.0 -;; Package-Version: 20171010.131 +;; Package-Version: 20171028.854 ;; Keywords: lists ;; This program is free software; you can redistribute it and/or modify @@ -236,6 +236,38 @@ See also: `-reduce-r-from', `-reduce'" (declare (debug (form form))) `(-reduce-r (lambda (&optional it acc) ,form) ,list)) +(defun -reductions-from (fn init list) + "Return a list of the intermediate values of the reduction. + +See `-reduce-from' for explanation of the arguments. + +See also: `-reductions', `-reductions-r', `-reduce-r'" + (nreverse (--reduce-from (cons (funcall fn (car acc) it) acc) (list init) list))) + +(defun -reductions (fn list) + "Return a list of the intermediate values of the reduction. + +See `-reduce' for explanation of the arguments. + +See also: `-reductions-from', `-reductions-r', `-reduce-r'" + (-reductions-from fn (car list) (cdr list))) + +(defun -reductions-r-from (fn init list) + "Return a list of the intermediate values of the reduction. + +See `-reduce-r-from' for explanation of the arguments. + +See also: `-reductions-r', `-reductions', `-reduce'" + (--reduce-r-from (cons (funcall fn it (car acc)) acc) (list init) list)) + +(defun -reductions-r (fn list) + "Return a list of the intermediate values of the reduction. + +See `-reduce-r' for explanation of the arguments. + +See also: `-reductions-r-from', `-reductions', `-reduce'" + (-reductions-r-from fn (-last-item list) (-butlast list))) + (defmacro --filter (form list) "Anaphoric form of `-filter'. @@ -2076,6 +2108,14 @@ or with `-compare-fn' if that's non-nil." (-permutations (remove x list)))) list)))) +(defun -inits (list) + "Return all prefixes of LIST." + (nreverse (-map 'reverse (-tails (nreverse list))))) + +(defun -tails (list) + "Return all suffixes of LIST" + (-reductions-r-from 'cons nil list)) + (defun -contains? (list element) "Return non-nil if LIST contains ELEMENT. @@ -2179,11 +2219,29 @@ Return nil if N is less than 1." (declare (pure t) (side-effect-free t)) (apply '+ list)) +(defun -running-sum (list) + "Return a list with running sums of items in LIST. + +LIST must be non-empty." + (declare (pure t) (side-effect-free t)) + (unless (consp list) + (error "LIST must be non-empty")) + (-reductions '+ list)) + (defun -product (list) "Return the product of LIST." (declare (pure t) (side-effect-free t)) (apply '* list)) +(defun -running-product (list) + "Return a list with running products of items in LIST. + +LIST must be non-empty." + (declare (pure t) (side-effect-free t)) + (unless (consp list) + (error "LIST must be non-empty")) + (-reductions '* list)) + (defun -max (list) "Return the largest value from LIST of numbers or markers." (declare (pure t) (side-effect-free t)) @@ -2463,6 +2521,10 @@ structure such as plist or alist." "--reduce-r-from" "-reduce-r" "--reduce-r" + "-reductions-from" + "-reductions-r-from" + "-reductions" + "-reductions-r" "-filter" "--filter" "-select" @@ -2622,6 +2684,10 @@ structure such as plist or alist." "-union" "-intersection" "-difference" + "-powerset" + "-permutations" + "-inits" + "-tails" "-contains?" "-contains-p" "-same-items?" @@ -2637,7 +2703,9 @@ structure such as plist or alist." "-list" "-repeat" "-sum" + "-running-sum" "-product" + "-running-product" "-max" "-min" "-max-by" diff --git a/elpa/page-break-lines-20170829.157/page-break-lines-pkg.el b/elpa/page-break-lines-20170829.157/page-break-lines-pkg.el deleted file mode 100644 index 0717389..0000000 --- a/elpa/page-break-lines-20170829.157/page-break-lines-pkg.el +++ /dev/null @@ -1,2 +0,0 @@ -;;; -*- no-byte-compile: t -*- -(define-package "page-break-lines" "20170829.157" "Display ^L page breaks as tidy horizontal lines" 'nil :commit "913732ad06d838661989fb1fef05fcc9ca88f725" :url "https://github.com/purcell/page-break-lines" :keywords '("convenience" "faces")) diff --git a/elpa/page-break-lines-20170829.157/page-break-lines-autoloads.el b/elpa/page-break-lines-20171020.108/page-break-lines-autoloads.el similarity index 98% rename from elpa/page-break-lines-20170829.157/page-break-lines-autoloads.el rename to elpa/page-break-lines-20171020.108/page-break-lines-autoloads.el index 9a598e1..b312031 100644 --- a/elpa/page-break-lines-20170829.157/page-break-lines-autoloads.el +++ b/elpa/page-break-lines-20171020.108/page-break-lines-autoloads.el @@ -3,8 +3,8 @@ ;;; Code: (add-to-list 'load-path (directory-file-name (or (file-name-directory #$) (car load-path)))) -;;;### (autoloads nil "page-break-lines" "page-break-lines.el" (22981 -;;;;;; 14380 755029 874000)) +;;;### (autoloads nil "page-break-lines" "page-break-lines.el" (23028 +;;;;;; 47890 302341 377000)) ;;; Generated autoloads from page-break-lines.el (defvar page-break-lines-char 9472 "\ diff --git a/elpa/page-break-lines-20171020.108/page-break-lines-pkg.el b/elpa/page-break-lines-20171020.108/page-break-lines-pkg.el new file mode 100644 index 0000000..7d6581e --- /dev/null +++ b/elpa/page-break-lines-20171020.108/page-break-lines-pkg.el @@ -0,0 +1,2 @@ +;;; -*- no-byte-compile: t -*- +(define-package "page-break-lines" "20171020.108" "Display ^L page breaks as tidy horizontal lines" '((emacs "24.4")) :commit "ae1c0065984429c7364a667abb9180e80134c4c0" :url "https://github.com/purcell/page-break-lines" :keywords '("convenience" "faces")) diff --git a/elpa/page-break-lines-20170829.157/page-break-lines.el b/elpa/page-break-lines-20171020.108/page-break-lines.el similarity index 93% rename from elpa/page-break-lines-20170829.157/page-break-lines.el rename to elpa/page-break-lines-20171020.108/page-break-lines.el index b7ba50a..db3e720 100644 --- a/elpa/page-break-lines-20170829.157/page-break-lines.el +++ b/elpa/page-break-lines-20171020.108/page-break-lines.el @@ -4,8 +4,9 @@ ;; Author: Steve Purcell ;; URL: https://github.com/purcell/page-break-lines -;; Package-Version: 20170829.157 +;; Package-Version: 20171020.108 ;; Package-X-Original-Version: 0 +;; Package-Requires: ((emacs "24.4")) ;; Keywords: convenience, faces ;; This program is free software; you can redistribute it and/or modify @@ -127,12 +128,12 @@ its display table will be modified as necessary." (let ((default-height (face-attribute 'default :height nil 'default))) (set-face-attribute 'page-break-lines nil :height default-height) (let* ((cwidth (char-width page-break-lines-char)) - (wwidth (- (window-width) - (if (bound-and-true-p display-line-numbers) - (+ (line-number-display-width) 2) - 0) - (if (display-graphic-p) 0 1))) - (width (/ wwidth cwidth)) + (wwidth-pix (- (window-width nil t) + (if (bound-and-true-p display-line-numbers) + (line-number-display-width t) + 0))) + (width (- (/ wwidth-pix (frame-char-width) cwidth) + (if (display-graphic-p) 0 1))) (glyph (make-glyph-code page-break-lines-char 'page-break-lines)) (new-display-entry (vconcat (make-list width glyph)))) (unless (equal new-display-entry (elt buffer-display-table ?\^L)) diff --git a/elpa/use-package-20170812.2256/use-package-autoloads.el b/elpa/use-package-20171013.1548/use-package-autoloads.el similarity index 97% rename from elpa/use-package-20170812.2256/use-package-autoloads.el rename to elpa/use-package-20171013.1548/use-package-autoloads.el index b8455a4..41a4554 100644 --- a/elpa/use-package-20170812.2256/use-package-autoloads.el +++ b/elpa/use-package-20171013.1548/use-package-autoloads.el @@ -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" (22942 51203 -;;;;;; 251615 319000)) +;;;### (autoloads nil "use-package" "use-package.el" (23028 47880 +;;;;;; 842290 450000)) ;;; Generated autoloads from use-package.el (autoload 'use-package-autoload-keymap "use-package" "\ diff --git a/elpa/use-package-20170812.2256/use-package-pkg.el b/elpa/use-package-20171013.1548/use-package-pkg.el similarity index 61% rename from elpa/use-package-20170812.2256/use-package-pkg.el rename to elpa/use-package-20171013.1548/use-package-pkg.el index b46fb75..5249a18 100644 --- a/elpa/use-package-20170812.2256/use-package-pkg.el +++ b/elpa/use-package-20171013.1548/use-package-pkg.el @@ -1,2 +1,2 @@ ;;; -*- no-byte-compile: t -*- -(define-package "use-package" "20170812.2256" "A use-package declaration for simplifying your .emacs" '((bind-key "1.0") (diminish "0.44")) :commit "360df30683a711c443f87e495ba14cdd125a505d" :url "https://github.com/jwiegley/use-package" :keywords '("dotemacs" "startup" "speed" "config" "package")) +(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")) diff --git a/elpa/use-package-20170812.2256/use-package.el b/elpa/use-package-20171013.1548/use-package.el similarity index 98% rename from elpa/use-package-20170812.2256/use-package.el rename to elpa/use-package-20171013.1548/use-package.el index 308ab16..2392ddc 100644 --- a/elpa/use-package-20170812.2256/use-package.el +++ b/elpa/use-package-20171013.1548/use-package.el @@ -7,7 +7,7 @@ ;; Created: 17 Jun 2012 ;; Modified: 17 Oct 2016 ;; Version: 2.3 -;; Package-Version: 20170812.2256 +;; Package-Version: 20171013.1548 ;; Package-Requires: ((bind-key "1.0") (diminish "0.44")) ;; Keywords: dotemacs startup speed config package ;; URL: https://github.com/jwiegley/use-package @@ -738,17 +738,21 @@ If the package is installed, its entry is removed from ;; bypassed. (member context '(:byte-compile :ensure :config)) (y-or-n-p (format "Install package %S?" package)))) - (with-demoted-errors (format "Cannot load %s: %%S" name) - (when (assoc package (bound-and-true-p package-pinned-packages)) - (package-read-all-archive-contents)) - (if (assoc package package-archive-contents) - (progn (package-install package) t) + (condition-case-unless-debug err (progn - (package-refresh-contents) - (when (assoc package (bound-and-true-p - package-pinned-packages)) + (when (assoc package (bound-and-true-p package-pinned-packages)) (package-read-all-archive-contents)) - (package-install package)))))))) + (cond ((assoc package package-archive-contents) + (package-install package) + t) + (t + (package-refresh-contents) + (when (assoc package + (bound-and-true-p package-pinned-packages)) + (package-read-all-archive-contents)) + (package-install package)))) + (error (message "Error: Cannot load %s: %S" name err) + nil)))))) (defun use-package-handler/:ensure (name keyword ensure rest state) (let* ((body (use-package-process-keywords name rest