branch: externals/mct commit 1313880514efceb413ce5acbfa8fae440b113289 Author: Protesilaos Stavrou <i...@protesilaos.com> Commit: Protesilaos Stavrou <i...@protesilaos.com>
Placate the compiler for group motions Thanks to James Cash for the contribution in merge request 2: <https://gitlab.com/protesilaos/mct/-/merge_requests/2>. --- mct.el | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/mct.el b/mct.el index 8bbff09..d36695c 100644 --- a/mct.el +++ b/mct.el @@ -574,6 +574,11 @@ minibuffer." (line-move-to-column col))) (previous-completion (if (natnump arg) arg 1)))))) +(declare-function text-property-search-backward "text-property-search" (property &optional value predicate not-current)) +(declare-function text-property-search-forward "text-property-search" (property &optional value predicate not-current)) +(declare-function prop-match-beginning "text-property-search" (cl-x)) +(declare-function prop-match-end "text-property-search" (cl-x)) + (defun mct-next-completion-group (&optional arg) "Move to the next completion group. If ARG is supplied, move that many completion groups at a time." @@ -594,7 +599,7 @@ If ARG is supplied, move that many completion groups at a time." (interactive "p" mct-mode) (dotimes (_ (or arg 1)) ;; skip back, so if we're at the top of a group, we go to the previous one... - (next-line -1) + (forward-line -1) (if-let (group (save-excursion (text-property-search-backward 'face 'completions-group-separator @@ -605,7 +610,7 @@ If ARG is supplied, move that many completion groups at a time." (next-completion 1))) ;; ...and if there was a match, go back down, so the point doesn't ;; end in the group separator - (next-line 1)))) + (forward-line 1)))) ;;;;; Candidate selection @@ -693,6 +698,7 @@ Completions' buffer." (mct--line-number-selection))))) (defvar crm-completion-table) +(defvar crm-separator) (defun mct--regex-to-separator (regex) (save-match-data