diff --git a/elpa/dash-20190409.1402/dash-autoloads.el b/elpa/dash-20190920.1035/dash-autoloads.el similarity index 100% rename from elpa/dash-20190409.1402/dash-autoloads.el rename to elpa/dash-20190920.1035/dash-autoloads.el diff --git a/elpa/dash-20190409.1402/dash-pkg.el b/elpa/dash-20190920.1035/dash-pkg.el similarity index 55% rename from elpa/dash-20190409.1402/dash-pkg.el rename to elpa/dash-20190920.1035/dash-pkg.el index 3fa3823..bd4357b 100644 --- a/elpa/dash-20190409.1402/dash-pkg.el +++ b/elpa/dash-20190920.1035/dash-pkg.el @@ -1,2 +1,2 @@ ;;; -*- no-byte-compile: t -*- -(define-package "dash" "20190409.1402" "A modern list library for Emacs" 'nil :commit "dca7bdcf7919dd3e589e0bb2fa210fcba34ec69a" :keywords '("lists") :authors '(("Magnar Sveen" . "magnars@gmail.com")) :maintainer '("Magnar Sveen" . "magnars@gmail.com")) +(define-package "dash" "20190920.1035" "A modern list library for Emacs" 'nil :commit "a743ae3da1d5869434c6f262bbe45ef30d87cb9c" :keywords '("lists") :authors '(("Magnar Sveen" . "magnars@gmail.com")) :maintainer '("Magnar Sveen" . "magnars@gmail.com")) diff --git a/elpa/dash-20190409.1402/dash.el b/elpa/dash-20190920.1035/dash.el similarity index 98% rename from elpa/dash-20190409.1402/dash.el rename to elpa/dash-20190920.1035/dash.el index 120e657..858c868 100644 --- a/elpa/dash-20190409.1402/dash.el +++ b/elpa/dash-20190920.1035/dash.el @@ -3,8 +3,8 @@ ;; Copyright (C) 2012-2016 Free Software Foundation, Inc. ;; Author: Magnar Sveen -;; Version: 2.15.0 -;; Package-Version: 20190409.1402 +;; Version: 2.16.0 +;; Package-Version: 20190920.1035 ;; Keywords: lists ;; This program is free software; you can redistribute it and/or modify @@ -34,6 +34,12 @@ ;;; Code: +;; TODO: `gv' was introduced in Emacs 24.3, so remove this and all +;; calls to `defsetf' when support for earlier versions is dropped. +(eval-when-compile + (unless (fboundp 'gv-define-setter) + (require 'cl))) + (defgroup dash () "Customize group for dash.el" :group 'lisp @@ -683,7 +689,10 @@ See also: `-third-item'. \(fn LIST)") -(defalias '-third-item 'caddr +(defalias '-third-item + (if (fboundp 'caddr) + #'caddr + (lambda (list) (car (cddr list)))) "Return the third item of LIST, or nil if LIST is too short. See also: `-fourth-item'. @@ -704,28 +713,18 @@ See also: `-last-item'." (declare (pure t) (side-effect-free t)) (car (cdr (cdr (cdr (cdr list)))))) -;; TODO: gv was introduced in 24.3, so we can remove the if statement -;; when support for earlier versions is dropped -(eval-when-compile - (require 'cl) - (if (fboundp 'gv-define-simple-setter) - (gv-define-simple-setter -first-item setcar) - (require 'cl) - (with-no-warnings - (defsetf -first-item (x) (val) `(setcar ,x ,val))))) - (defun -last-item (list) "Return the last item of LIST, or nil on an empty list." (declare (pure t) (side-effect-free t)) (car (last list))) -;; TODO: gv was introduced in 24.3, so we can remove the if statement -;; when support for earlier versions is dropped -(eval-when-compile +;; Use `with-no-warnings' to suppress unbound `-last-item' or +;; undefined `gv--defsetter' warnings arising from both +;; `gv-define-setter' and `defsetf' in certain Emacs versions. +(with-no-warnings (if (fboundp 'gv-define-setter) (gv-define-setter -last-item (val x) `(setcar (last ,x) ,val)) - (with-no-warnings - (defsetf -last-item (x) (val) `(setcar (last ,x) ,val))))) + (defsetf -last-item (x) (val) `(setcar (last ,x) ,val)))) (defun -butlast (list) "Return a list of all items in list except for the last." @@ -1832,7 +1831,9 @@ kv can be any key-value store, such as plist, alist or hash-table." (defun dash-expand:&hash? (key source) "Generate extracting KEY from SOURCE for &hash? destructuring. Similar to &hash but check whether the map is not nil." - `(when ,source (gethash ,key ,source))) + (let ((src (make-symbol "src"))) + `(let ((,src ,source)) + (when ,src (gethash ,key ,src))))) (defalias 'dash-expand:&keys 'dash-expand:&plist) @@ -2273,9 +2274,22 @@ The test for equality is done with `equal', or with `-compare-fn' if that's non-nil. Alias: `-uniq'" - (let (result) - (--each list (unless (-contains? result it) (!cons it result))) - (nreverse result))) + ;; Implementation note: The speedup gained from hash table lookup + ;; starts to outweigh its overhead for lists of length greater than + ;; 32. See discussion in PR #305. + (let* ((len (length list)) + (lut (and (> len 32) + ;; Check that `-compare-fn' is a valid hash-table + ;; lookup function or `nil'. + (memq -compare-fn '(nil equal eq eql)) + (make-hash-table :test (or -compare-fn #'equal) + :size len)))) + (if lut + (--filter (unless (gethash it lut) + (puthash it t lut)) + list) + (--each list (unless (-contains? lut it) (!cons it lut))) + (nreverse lut)))) (defalias '-uniq '-distinct) @@ -2328,7 +2342,11 @@ or with `-compare-fn' if that's non-nil." (defun -inits (list) "Return all prefixes of LIST." - (nreverse (-map 'reverse (-tails (nreverse list))))) + (let ((res (list list))) + (setq list (reverse list)) + (while list + (push (reverse (!cdr list)) res)) + res)) (defun -tails (list) "Return all suffixes of LIST" diff --git a/elpa/hydra-20190617.859/hydra-autoloads.el b/elpa/hydra-20190821.939/hydra-autoloads.el similarity index 100% rename from elpa/hydra-20190617.859/hydra-autoloads.el rename to elpa/hydra-20190821.939/hydra-autoloads.el diff --git a/elpa/hydra-20190617.859/hydra-examples.el b/elpa/hydra-20190821.939/hydra-examples.el similarity index 100% rename from elpa/hydra-20190617.859/hydra-examples.el rename to elpa/hydra-20190821.939/hydra-examples.el diff --git a/elpa/hydra-20190617.859/hydra-ox.el b/elpa/hydra-20190821.939/hydra-ox.el similarity index 100% rename from elpa/hydra-20190617.859/hydra-ox.el rename to elpa/hydra-20190821.939/hydra-ox.el diff --git a/elpa/hydra-20190617.859/hydra-pkg.el b/elpa/hydra-20190821.939/hydra-pkg.el similarity index 81% rename from elpa/hydra-20190617.859/hydra-pkg.el rename to elpa/hydra-20190821.939/hydra-pkg.el index 054d23a..ac073f7 100644 --- a/elpa/hydra-20190617.859/hydra-pkg.el +++ b/elpa/hydra-20190821.939/hydra-pkg.el @@ -1,4 +1,4 @@ -(define-package "hydra" "20190617.859" "Make bindings that stick around." +(define-package "hydra" "20190821.939" "Make bindings that stick around." '((cl-lib "0.5") (lv "0")) :keywords diff --git a/elpa/hydra-20190617.859/hydra.el b/elpa/hydra-20190821.939/hydra.el similarity index 99% rename from elpa/hydra-20190617.859/hydra.el rename to elpa/hydra-20190821.939/hydra.el index 246d3d3..a33be7a 100644 --- a/elpa/hydra-20190617.859/hydra.el +++ b/elpa/hydra-20190821.939/hydra.el @@ -253,14 +253,6 @@ the body or the head." (const posframe)) :group 'hydra) -(define-obsolete-variable-alias - 'hydra-lv 'hydra-hint-display-type "0.14.0" - "Use either `hydra-hint-display-type' or `hydra-set-property' :verbosity.") - -(defcustom hydra-lv t - "When non-nil, `lv-message' (not `message') will be used to display hints." - :type 'boolean) - (defcustom hydra-verbose nil "When non-nil, hydra will issue some non essential style warnings." :type 'boolean) diff --git a/elpa/lv-20190716.1741/lv-pkg.el b/elpa/lv-20190716.1741/lv-pkg.el deleted file mode 100644 index 4be1e50..0000000 --- a/elpa/lv-20190716.1741/lv-pkg.el +++ /dev/null @@ -1,2 +0,0 @@ -;;; -*- no-byte-compile: t -*- -(define-package "lv" "20190716.1741" "Other echo area" 'nil :commit "a91dd72529aadd2d3cc14e132a3e0545eb2975a6" :authors '(("Oleh Krehel")) :maintainer '("Oleh Krehel")) diff --git a/elpa/lv-20190716.1741/lv-autoloads.el b/elpa/lv-20190821.947/lv-autoloads.el similarity index 100% rename from elpa/lv-20190716.1741/lv-autoloads.el rename to elpa/lv-20190821.947/lv-autoloads.el diff --git a/elpa/lv-20190821.947/lv-pkg.el b/elpa/lv-20190821.947/lv-pkg.el new file mode 100644 index 0000000..2f14e7d --- /dev/null +++ b/elpa/lv-20190821.947/lv-pkg.el @@ -0,0 +1,2 @@ +;;; -*- no-byte-compile: t -*- +(define-package "lv" "20190821.947" "Other echo area" 'nil :commit "435c55e9f75a8cf3ae6a4ba0c7725e3dc4e5963f" :authors '(("Oleh Krehel")) :maintainer '("Oleh Krehel")) diff --git a/elpa/lv-20190716.1741/lv.el b/elpa/lv-20190821.947/lv.el similarity index 97% rename from elpa/lv-20190716.1741/lv.el rename to elpa/lv-20190821.947/lv.el index 27d957a..14a6b51 100644 --- a/elpa/lv-20190716.1741/lv.el +++ b/elpa/lv-20190821.947/lv.el @@ -1,5 +1,5 @@ ;;; lv.el --- Other echo area -;; Package-Version: 20190716.1741 +;; Package-Version: 20190821.947 ;; Copyright (C) 2015 Free Software Foundation, Inc. @@ -56,6 +56,7 @@ Only the background color is significant." "Holds the current LV window.") (defvar display-line-numbers) +(defvar display-fill-column-indicator) (defun lv-window () "Ensure that LV window is live and return it." @@ -77,6 +78,7 @@ Only the background color is significant." (setq header-line-format nil) (setq cursor-type nil) (setq display-line-numbers nil) + (setq display-fill-column-indicator nil) (set-window-dedicated-p lv-wnd t) (set-window-parameter lv-wnd 'no-other-window t)) (select-window ori))))) diff --git a/elpa/multiple-cursors-20190317.1211/multiple-cursors-pkg.el b/elpa/multiple-cursors-20190317.1211/multiple-cursors-pkg.el deleted file mode 100644 index c5f1d05..0000000 --- a/elpa/multiple-cursors-20190317.1211/multiple-cursors-pkg.el +++ /dev/null @@ -1,5 +0,0 @@ -(define-package "multiple-cursors" "20190317.1211" "Multiple cursors for Emacs." - '((cl-lib "0.5"))) -;; Local Variables: -;; no-byte-compile: t -;; End: diff --git a/elpa/multiple-cursors-20190317.1211/mc-cycle-cursors.el b/elpa/multiple-cursors-20190820.749/mc-cycle-cursors.el similarity index 100% rename from elpa/multiple-cursors-20190317.1211/mc-cycle-cursors.el rename to elpa/multiple-cursors-20190820.749/mc-cycle-cursors.el diff --git a/elpa/multiple-cursors-20190317.1211/mc-edit-lines.el b/elpa/multiple-cursors-20190820.749/mc-edit-lines.el similarity index 95% rename from elpa/multiple-cursors-20190317.1211/mc-edit-lines.el rename to elpa/multiple-cursors-20190820.749/mc-edit-lines.el index e38d1c1..55772af 100644 --- a/elpa/multiple-cursors-20190317.1211/mc-edit-lines.el +++ b/elpa/multiple-cursors-20190820.749/mc-edit-lines.el @@ -54,8 +54,8 @@ other non-nil value will cause short lines to be padded." (error "Mark a set of lines first")) (mc/remove-fake-cursors) (let* ((col (current-column)) - (point-line (line-number-at-pos)) - (mark-line (progn (exchange-point-and-mark) (line-number-at-pos))) + (point-line (mc/line-number-at-pos)) + (mark-line (progn (exchange-point-and-mark) (mc/line-number-at-pos))) (direction (if (< point-line mark-line) :up :down)) (style (cond ;; called from lisp @@ -71,7 +71,7 @@ other non-nil value will cause short lines to be padded." (previous-logical-line 1 nil) (move-to-column col)) ;; Add the cursors - (while (not (eq (line-number-at-pos) point-line)) + (while (not (eq (mc/line-number-at-pos) point-line)) ;; Pad the line (when (eq style 'pad) (while (< (current-column) col) diff --git a/elpa/multiple-cursors-20190317.1211/mc-hide-unmatched-lines-mode.el b/elpa/multiple-cursors-20190820.749/mc-hide-unmatched-lines-mode.el similarity index 100% rename from elpa/multiple-cursors-20190317.1211/mc-hide-unmatched-lines-mode.el rename to elpa/multiple-cursors-20190820.749/mc-hide-unmatched-lines-mode.el diff --git a/elpa/multiple-cursors-20190317.1211/mc-mark-more.el b/elpa/multiple-cursors-20190820.749/mc-mark-more.el similarity index 99% rename from elpa/multiple-cursors-20190317.1211/mc-mark-more.el rename to elpa/multiple-cursors-20190820.749/mc-mark-more.el index da8cedf..2e63130 100644 --- a/elpa/multiple-cursors-20190317.1211/mc-mark-more.el +++ b/elpa/multiple-cursors-20190820.749/mc-mark-more.el @@ -579,8 +579,8 @@ If the region is inactive or on a single line, it will behave like (interactive "P") (if (and (use-region-p) (not (> (mc/num-cursors) 1)) - (not (= (line-number-at-pos (region-beginning)) - (line-number-at-pos (region-end))))) + (not (= (mc/line-number-at-pos (region-beginning)) + (mc/line-number-at-pos (region-end))))) (if arg (call-interactively 'mc/edit-lines) (call-interactively 'mc/mark-all-in-region)) diff --git a/elpa/multiple-cursors-20190317.1211/mc-mark-pop.el b/elpa/multiple-cursors-20190820.749/mc-mark-pop.el similarity index 100% rename from elpa/multiple-cursors-20190317.1211/mc-mark-pop.el rename to elpa/multiple-cursors-20190820.749/mc-mark-pop.el diff --git a/elpa/multiple-cursors-20190317.1211/mc-separate-operations.el b/elpa/multiple-cursors-20190820.749/mc-separate-operations.el similarity index 100% rename from elpa/multiple-cursors-20190317.1211/mc-separate-operations.el rename to elpa/multiple-cursors-20190820.749/mc-separate-operations.el diff --git a/elpa/multiple-cursors-20190317.1211/multiple-cursors-autoloads.el b/elpa/multiple-cursors-20190820.749/multiple-cursors-autoloads.el similarity index 100% rename from elpa/multiple-cursors-20190317.1211/multiple-cursors-autoloads.el rename to elpa/multiple-cursors-20190820.749/multiple-cursors-autoloads.el diff --git a/elpa/multiple-cursors-20190317.1211/multiple-cursors-core.el b/elpa/multiple-cursors-20190820.749/multiple-cursors-core.el similarity index 98% rename from elpa/multiple-cursors-20190317.1211/multiple-cursors-core.el rename to elpa/multiple-cursors-20190820.749/multiple-cursors-core.el index 12e9e75..d93ace9 100644 --- a/elpa/multiple-cursors-20190317.1211/multiple-cursors-core.el +++ b/elpa/multiple-cursors-20190820.749/multiple-cursors-core.el @@ -109,6 +109,19 @@ (and (listp cursor-type) (eq (car cursor-type) 'bar)))) +(defun mc/line-number-at-pos (&optional pos absolute) + "Faster implementation of `line-number-at-pos'." + (if pos + (save-excursion + (if absolute + (save-restriction + (widen) + (goto-char pos) + (string-to-number (format-mode-line "%l"))) + (goto-char pos) + (string-to-number (format-mode-line "%l")))) + (string-to-number (format-mode-line "%l")))) + (defun mc/make-cursor-overlay-at-eol (pos) "Create overlay to look like cursor at end of line." (let ((overlay (make-overlay pos pos nil nil nil))) diff --git a/elpa/multiple-cursors-20190820.749/multiple-cursors-pkg.el b/elpa/multiple-cursors-20190820.749/multiple-cursors-pkg.el new file mode 100644 index 0000000..4c7583e --- /dev/null +++ b/elpa/multiple-cursors-20190820.749/multiple-cursors-pkg.el @@ -0,0 +1,5 @@ +(define-package "multiple-cursors" "20190820.749" "Multiple cursors for Emacs." + '((cl-lib "0.5"))) +;; Local Variables: +;; no-byte-compile: t +;; End: diff --git a/elpa/multiple-cursors-20190317.1211/multiple-cursors.el b/elpa/multiple-cursors-20190820.749/multiple-cursors.el similarity index 100% rename from elpa/multiple-cursors-20190317.1211/multiple-cursors.el rename to elpa/multiple-cursors-20190820.749/multiple-cursors.el diff --git a/elpa/multiple-cursors-20190317.1211/rectangular-region-mode.el b/elpa/multiple-cursors-20190820.749/rectangular-region-mode.el similarity index 97% rename from elpa/multiple-cursors-20190317.1211/rectangular-region-mode.el rename to elpa/multiple-cursors-20190820.749/rectangular-region-mode.el index 01a078d..d8051cc 100644 --- a/elpa/multiple-cursors-20190317.1211/rectangular-region-mode.el +++ b/elpa/multiple-cursors-20190820.749/rectangular-region-mode.el @@ -75,9 +75,9 @@ an exceedingly quick way of adding multiple cursors to multiple lines." (rrm/remove-rectangular-region-overlays) (let* ((annoying-arrows-mode nil) (point-column (current-column)) - (point-line (line-number-at-pos)) + (point-line (mc/line-number-at-pos)) (anchor-column (save-excursion (goto-char rrm/anchor) (current-column))) - (anchor-line (save-excursion (goto-char rrm/anchor) (line-number-at-pos))) + (anchor-line (save-excursion (goto-char rrm/anchor) (mc/line-number-at-pos))) (left-column (if (< point-column anchor-column) point-column anchor-column)) (right-column (if (> point-column anchor-column) point-column anchor-column)) (navigation-step (if (< point-line anchor-line) 1 -1))) @@ -85,7 +85,7 @@ an exceedingly quick way of adding multiple cursors to multiple lines." (set-mark (point)) (move-to-column point-column) (mc/save-excursion - (while (not (= anchor-line (line-number-at-pos))) + (while (not (= anchor-line (mc/line-number-at-pos))) (forward-line navigation-step) (move-to-column anchor-column) (when (= anchor-column (current-column))