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

internal function & mark ring fix 

corrected global marker check in mark ring
This commit is contained in:
Trey Peacock 2021-01-31 23:03:38 -07:00
parent 3dc3c72a49
commit 1c897f6496
No known key found for this signature in database
GPG Key ID: 21E35BB0B36D1094
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -46,10 +46,10 @@
(evil-set-command-property 'consult-mark :jump t)
(evil-set-command-property 'consult-line :jump t))
(defun evil-collection-consult-evil-mark-ring ()
(defun evil-collection-consult--evil-mark-ring ()
"Return alist of char & marker for evil markers in current buffer."
(sort (cl-remove-if (lambda (elem)
(or (not (evil-global-marker-p (car elem)))
(or (evil-global-marker-p (car elem))
(not (markerp (cdr-safe elem)))))
evil-markers-alist)
#'car-less-than-car))
@ -58,13 +58,13 @@
"Return alist of lines containing markers.
The alist contains (string . position) pairs."
(consult--forbid-minibuffer)
(unless (evil-collection-consult-evil-mark-ring)
(unless (evil-collection-consult--evil-mark-ring)
(user-error "No marks"))
(consult--fontify-all)
(let* ((max-line 0)
(candidates))
(save-excursion
(dolist (marker (evil-collection-consult-evil-mark-ring))
(dolist (marker (evil-collection-consult--evil-mark-ring))
(let ((pos (marker-position (cdr marker))))
(when (consult--in-range-p pos)
(goto-char pos)