branch: externals/pabbrev
commit d5f120c523ddce2e8dea1868150248cd188d8ad8
Merge: bf8a498f2d ab8519bca7
Author: Arthur Miller <am...@users.noreply.github.com>
Commit: GitHub <nore...@github.com>
Merge pull request #9 from sirikid/take
Replace pabbrev-suggestions-subseq with seq-take
---
pabbrev.el | 11 +++--------
1 file changed, 3 insertions(+), 8 deletions(-)
diff --git a/pabbrev.el b/pabbrev.el
index cc76847fb8..73aa4483b3 100644
--- a/pabbrev.el
+++ b/pabbrev.el
@@ -986,14 +986,10 @@ The command `pabbrev-show-previous-binding' prints this
out."
(defvar pabbrev-suggestions-done-suggestions nil)
(defvar pabbrev-suggestions-best-suggestion nil)
-(defsubst pabbrev-suggestions-subseq(sequence from to)
- "Return subsequence from SEQUENCE starting FROM and ending with TO."
- (cl-subseq sequence (min 0 from) (min (length sequence) to)))
-
(defsubst pabbrev-suggestions-limit-alpha-sort (suggestions)
"Limit suggestions and sort."
(delq nil
- (sort (pabbrev-suggestions-subseq suggestions 0 10)
+ (sort (seq-take suggestions 10)
(lambda(a b)
(string< (car a) (car b))))))
@@ -1084,8 +1080,7 @@ matching substring, while
\\[pabbrev-suggestions-delete-window] just deletes the
(interactive)
(pabbrev-suggestions-insert
;;(try-completion "" pabbrev-suggestions-done-suggestions)))
- (try-completion
- "" (pabbrev-suggestions-subseq pabbrev-suggestions-done-suggestions 0
10))))
+ (try-completion "" (seq-take pabbrev-suggestions-done-suggestions 10))))
(defun pabbrev-suggestions-insert(insertion)
"Actually insert the suggestion."
@@ -1388,7 +1383,7 @@ This can be rather slow."
Toggling `pabbrev-mode' will tend to turn them on again, as
will `pabbrev-debug-restart-idle-timer'."
(interactive)
- (when pabbrev-short-idle-timer
+ (when pabbrev-short-idle-timer
(cancel-timer pabbrev-short-idle-timer)
(setq pabbrev-short-idle-timer nil))
(when pabbrev-long-idle-timer
