[ELPA] Update
This commit is contained in:
parent
3422bb7e46
commit
96f390074a
|
@ -1,2 +1,2 @@
|
||||||
;;; -*- no-byte-compile: t -*-
|
;;; -*- 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"))
|
|
@ -3,8 +3,8 @@
|
||||||
;; Copyright (C) 2012-2016 Free Software Foundation, Inc.
|
;; Copyright (C) 2012-2016 Free Software Foundation, Inc.
|
||||||
|
|
||||||
;; Author: Magnar Sveen <magnars@gmail.com>
|
;; Author: Magnar Sveen <magnars@gmail.com>
|
||||||
;; Version: 2.15.0
|
;; Version: 2.16.0
|
||||||
;; Package-Version: 20190409.1402
|
;; Package-Version: 20190920.1035
|
||||||
;; Keywords: lists
|
;; Keywords: lists
|
||||||
|
|
||||||
;; This program is free software; you can redistribute it and/or modify
|
;; This program is free software; you can redistribute it and/or modify
|
||||||
|
@ -34,6 +34,12 @@
|
||||||
|
|
||||||
;;; Code:
|
;;; 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 ()
|
(defgroup dash ()
|
||||||
"Customize group for dash.el"
|
"Customize group for dash.el"
|
||||||
:group 'lisp
|
:group 'lisp
|
||||||
|
@ -683,7 +689,10 @@ See also: `-third-item'.
|
||||||
|
|
||||||
\(fn LIST)")
|
\(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.
|
"Return the third item of LIST, or nil if LIST is too short.
|
||||||
|
|
||||||
See also: `-fourth-item'.
|
See also: `-fourth-item'.
|
||||||
|
@ -704,28 +713,18 @@ See also: `-last-item'."
|
||||||
(declare (pure t) (side-effect-free t))
|
(declare (pure t) (side-effect-free t))
|
||||||
(car (cdr (cdr (cdr (cdr list))))))
|
(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)
|
(defun -last-item (list)
|
||||||
"Return the last item of LIST, or nil on an empty list."
|
"Return the last item of LIST, or nil on an empty list."
|
||||||
(declare (pure t) (side-effect-free t))
|
(declare (pure t) (side-effect-free t))
|
||||||
(car (last list)))
|
(car (last list)))
|
||||||
|
|
||||||
;; TODO: gv was introduced in 24.3, so we can remove the if statement
|
;; Use `with-no-warnings' to suppress unbound `-last-item' or
|
||||||
;; when support for earlier versions is dropped
|
;; undefined `gv--defsetter' warnings arising from both
|
||||||
(eval-when-compile
|
;; `gv-define-setter' and `defsetf' in certain Emacs versions.
|
||||||
|
(with-no-warnings
|
||||||
(if (fboundp 'gv-define-setter)
|
(if (fboundp 'gv-define-setter)
|
||||||
(gv-define-setter -last-item (val x) `(setcar (last ,x) ,val))
|
(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)
|
(defun -butlast (list)
|
||||||
"Return a list of all items in list except for the last."
|
"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)
|
(defun dash-expand:&hash? (key source)
|
||||||
"Generate extracting KEY from SOURCE for &hash? destructuring.
|
"Generate extracting KEY from SOURCE for &hash? destructuring.
|
||||||
Similar to &hash but check whether the map is not nil."
|
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)
|
(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.
|
or with `-compare-fn' if that's non-nil.
|
||||||
|
|
||||||
Alias: `-uniq'"
|
Alias: `-uniq'"
|
||||||
(let (result)
|
;; Implementation note: The speedup gained from hash table lookup
|
||||||
(--each list (unless (-contains? result it) (!cons it result)))
|
;; starts to outweigh its overhead for lists of length greater than
|
||||||
(nreverse result)))
|
;; 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)
|
(defalias '-uniq '-distinct)
|
||||||
|
|
||||||
|
@ -2328,7 +2342,11 @@ or with `-compare-fn' if that's non-nil."
|
||||||
|
|
||||||
(defun -inits (list)
|
(defun -inits (list)
|
||||||
"Return all prefixes of 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)
|
(defun -tails (list)
|
||||||
"Return all suffixes of LIST"
|
"Return all suffixes of LIST"
|
|
@ -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")
|
'((cl-lib "0.5")
|
||||||
(lv "0"))
|
(lv "0"))
|
||||||
:keywords
|
:keywords
|
|
@ -253,14 +253,6 @@ the body or the head."
|
||||||
(const posframe))
|
(const posframe))
|
||||||
:group 'hydra)
|
: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
|
(defcustom hydra-verbose nil
|
||||||
"When non-nil, hydra will issue some non essential style warnings."
|
"When non-nil, hydra will issue some non essential style warnings."
|
||||||
:type 'boolean)
|
:type 'boolean)
|
|
@ -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"))
|
|
|
@ -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"))
|
|
@ -1,5 +1,5 @@
|
||||||
;;; lv.el --- Other echo area
|
;;; lv.el --- Other echo area
|
||||||
;; Package-Version: 20190716.1741
|
;; Package-Version: 20190821.947
|
||||||
|
|
||||||
;; Copyright (C) 2015 Free Software Foundation, Inc.
|
;; Copyright (C) 2015 Free Software Foundation, Inc.
|
||||||
|
|
||||||
|
@ -56,6 +56,7 @@ Only the background color is significant."
|
||||||
"Holds the current LV window.")
|
"Holds the current LV window.")
|
||||||
|
|
||||||
(defvar display-line-numbers)
|
(defvar display-line-numbers)
|
||||||
|
(defvar display-fill-column-indicator)
|
||||||
|
|
||||||
(defun lv-window ()
|
(defun lv-window ()
|
||||||
"Ensure that LV window is live and return it."
|
"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 header-line-format nil)
|
||||||
(setq cursor-type nil)
|
(setq cursor-type nil)
|
||||||
(setq display-line-numbers nil)
|
(setq display-line-numbers nil)
|
||||||
|
(setq display-fill-column-indicator nil)
|
||||||
(set-window-dedicated-p lv-wnd t)
|
(set-window-dedicated-p lv-wnd t)
|
||||||
(set-window-parameter lv-wnd 'no-other-window t))
|
(set-window-parameter lv-wnd 'no-other-window t))
|
||||||
(select-window ori)))))
|
(select-window ori)))))
|
|
@ -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:
|
|
|
@ -54,8 +54,8 @@ other non-nil value will cause short lines to be padded."
|
||||||
(error "Mark a set of lines first"))
|
(error "Mark a set of lines first"))
|
||||||
(mc/remove-fake-cursors)
|
(mc/remove-fake-cursors)
|
||||||
(let* ((col (current-column))
|
(let* ((col (current-column))
|
||||||
(point-line (line-number-at-pos))
|
(point-line (mc/line-number-at-pos))
|
||||||
(mark-line (progn (exchange-point-and-mark) (line-number-at-pos)))
|
(mark-line (progn (exchange-point-and-mark) (mc/line-number-at-pos)))
|
||||||
(direction (if (< point-line mark-line) :up :down))
|
(direction (if (< point-line mark-line) :up :down))
|
||||||
(style (cond
|
(style (cond
|
||||||
;; called from lisp
|
;; called from lisp
|
||||||
|
@ -71,7 +71,7 @@ other non-nil value will cause short lines to be padded."
|
||||||
(previous-logical-line 1 nil)
|
(previous-logical-line 1 nil)
|
||||||
(move-to-column col))
|
(move-to-column col))
|
||||||
;; Add the cursors
|
;; 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
|
;; Pad the line
|
||||||
(when (eq style 'pad)
|
(when (eq style 'pad)
|
||||||
(while (< (current-column) col)
|
(while (< (current-column) col)
|
|
@ -579,8 +579,8 @@ If the region is inactive or on a single line, it will behave like
|
||||||
(interactive "P")
|
(interactive "P")
|
||||||
(if (and (use-region-p)
|
(if (and (use-region-p)
|
||||||
(not (> (mc/num-cursors) 1))
|
(not (> (mc/num-cursors) 1))
|
||||||
(not (= (line-number-at-pos (region-beginning))
|
(not (= (mc/line-number-at-pos (region-beginning))
|
||||||
(line-number-at-pos (region-end)))))
|
(mc/line-number-at-pos (region-end)))))
|
||||||
(if arg
|
(if arg
|
||||||
(call-interactively 'mc/edit-lines)
|
(call-interactively 'mc/edit-lines)
|
||||||
(call-interactively 'mc/mark-all-in-region))
|
(call-interactively 'mc/mark-all-in-region))
|
|
@ -109,6 +109,19 @@
|
||||||
(and (listp cursor-type)
|
(and (listp cursor-type)
|
||||||
(eq (car cursor-type) 'bar))))
|
(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)
|
(defun mc/make-cursor-overlay-at-eol (pos)
|
||||||
"Create overlay to look like cursor at end of line."
|
"Create overlay to look like cursor at end of line."
|
||||||
(let ((overlay (make-overlay pos pos nil nil nil)))
|
(let ((overlay (make-overlay pos pos nil nil nil)))
|
|
@ -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:
|
|
@ -75,9 +75,9 @@ an exceedingly quick way of adding multiple cursors to multiple lines."
|
||||||
(rrm/remove-rectangular-region-overlays)
|
(rrm/remove-rectangular-region-overlays)
|
||||||
(let* ((annoying-arrows-mode nil)
|
(let* ((annoying-arrows-mode nil)
|
||||||
(point-column (current-column))
|
(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-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))
|
(left-column (if (< point-column anchor-column) point-column anchor-column))
|
||||||
(right-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)))
|
(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))
|
(set-mark (point))
|
||||||
(move-to-column point-column)
|
(move-to-column point-column)
|
||||||
(mc/save-excursion
|
(mc/save-excursion
|
||||||
(while (not (= anchor-line (line-number-at-pos)))
|
(while (not (= anchor-line (mc/line-number-at-pos)))
|
||||||
(forward-line navigation-step)
|
(forward-line navigation-step)
|
||||||
(move-to-column anchor-column)
|
(move-to-column anchor-column)
|
||||||
(when (= anchor-column (current-column))
|
(when (= anchor-column (current-column))
|
Loading…
Reference in New Issue