emacs
/
evil-collection
mirror of https://github.com/jojojames/evil-collection.git
1
0
Fork 0
Code Issues Releases Wiki Activity

update evil-collection-consult--mark-candidates for upstream change

This commit is contained in:
Trey Peacock 2021-07-03 13:12:13 -07:00
parent a24168ffe3
commit b747f0f7e8
No known key found for this signature in database
GPG Key ID: 21E35BB0B36D1094
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
modes/consult/evil-collection-consult.el
View File

@ -54,18 +54,22 @@
evil-markers-alist)
#'car-less-than-car))
(defun evil-collection-consult--mark-candidates ()
"Return alist of lines containing markers.
The alist contains (string . position) pairs."
(defun evil-collection-consult--mark-candidates (&optional markers)
"Return alist of lines containing markers from `evil-mark-alist'.
Opional MARKERS should be an alist containing (char . marker) pairs
as defined in `evil-collection-consult--evil-mark-ring'."
(consult--forbid-minibuffer)
(unless (evil-collection-consult--evil-mark-ring)
(user-error "No marks"))
(consult--fontify-all)
(let* (candidates)
(let* ((candidates)
(current-buf (current-buffer)))
(save-excursion
(dolist (marker (evil-collection-consult--evil-mark-ring))
(let ((pos (marker-position (cdr marker))))
(when (consult--in-range-p pos)
(dolist (marker (or markers (evil-collection-consult--evil-mark-ring)))
(let ((pos (marker-position (cdr marker)))
(buf (marker-buffer (cdr marker))))
(when (and (eq buf current-buf)
(consult--in-range-p pos))
(goto-char pos)
(push (consult--location-candidate
(format "%s: %s" (char-to-string (car marker)) (consult--line-with-cursor (cdr marker))) (cdr marker)