|
|
|
@ -228,16 +228,16 @@ self-inserting keys and thus aren't read as characters.") |
|
|
|
(a (make-list (* n k) 0)) |
|
|
|
(a (make-list (* n k) 0)) |
|
|
|
sequence) |
|
|
|
sequence) |
|
|
|
(cl-labels ((db (T p) |
|
|
|
(cl-labels ((db (T p) |
|
|
|
(if (> T n) |
|
|
|
(if (> T n) |
|
|
|
(if (eq (% n p) 0) |
|
|
|
(if (eq (% n p) 0) |
|
|
|
(setq sequence |
|
|
|
(setq sequence |
|
|
|
(append sequence |
|
|
|
(append sequence |
|
|
|
(cl-subseq a 1 (1+ p))))) |
|
|
|
(cl-subseq a 1 (1+ p))))) |
|
|
|
(setf (nth T a) (nth (- T p) a)) |
|
|
|
(setf (nth T a) (nth (- T p) a)) |
|
|
|
(db (1+ T) p) |
|
|
|
(db (1+ T) p) |
|
|
|
(cl-loop for j from (1+ (nth (- T p) a)) to (1- k) do |
|
|
|
(cl-loop for j from (1+ (nth (- T p) a)) to (1- k) do |
|
|
|
(setf (nth T a) j) |
|
|
|
(setf (nth T a) j) |
|
|
|
(db (1+ T) T))))) |
|
|
|
(db (1+ T) T))))) |
|
|
|
(db 1 1) |
|
|
|
(db 1 1) |
|
|
|
(mapcar (lambda (n) |
|
|
|
(mapcar (lambda (n) |
|
|
|
(nth n keys)) |
|
|
|
(nth n keys)) |
|
|
|
@ -271,9 +271,10 @@ SEQ-LEN is how many elements of KEYS it takes to identify a match." |
|
|
|
(when (and (> diff 0) (< diff seq-len)) |
|
|
|
(when (and (> diff 0) (< diff seq-len)) |
|
|
|
(while (and (nth (1- seq-len) db-seq) |
|
|
|
(while (and (nth (1- seq-len) db-seq) |
|
|
|
(not |
|
|
|
(not |
|
|
|
(eq 0 (cl-search |
|
|
|
(eq 0 |
|
|
|
(cl-subseq prev-seq diff) |
|
|
|
(cl-search |
|
|
|
(cl-subseq db-seq 0 seq-len))))) |
|
|
|
(cl-subseq prev-seq diff) |
|
|
|
|
|
|
|
(cl-subseq db-seq 0 seq-len))))) |
|
|
|
(pop db-seq))) |
|
|
|
(pop db-seq))) |
|
|
|
(subseq-and-pop)) |
|
|
|
(subseq-and-pop)) |
|
|
|
(subseq-and-pop)))) |
|
|
|
(subseq-and-pop)))) |
|
|
|
@ -1272,8 +1273,10 @@ This function obeys `avy-all-windows' setting." |
|
|
|
(match-end 0)))) |
|
|
|
(match-end 0)))) |
|
|
|
(setq found t) |
|
|
|
(setq found t) |
|
|
|
(push ov overlays) |
|
|
|
(push ov overlays) |
|
|
|
(overlay-put ov 'window (selected-window)) |
|
|
|
(overlay-put |
|
|
|
(overlay-put ov 'face 'avy-goto-char-timer-face))))))) |
|
|
|
ov 'window (selected-window)) |
|
|
|
|
|
|
|
(overlay-put |
|
|
|
|
|
|
|
ov 'face 'avy-goto-char-timer-face))))))) |
|
|
|
;; No matches at all, so there's surely a typo in the input. |
|
|
|
;; No matches at all, so there's surely a typo in the input. |
|
|
|
(unless found (beep))))) |
|
|
|
(unless found (beep))))) |
|
|
|
(nreverse (mapcar (lambda (ov) |
|
|
|
(nreverse (mapcar (lambda (ov) |
|
|
|
@ -1322,13 +1325,6 @@ The window scope is determined by `avy-all-windows' (ARG negates it)." |
|
|
|
(error |
|
|
|
(error |
|
|
|
(set-mark-command 4))))) |
|
|
|
(set-mark-command 4))))) |
|
|
|
|
|
|
|
|
|
|
|
(define-obsolete-function-alias |
|
|
|
|
|
|
|
'avy--goto 'identity "0.3.0" |
|
|
|
|
|
|
|
"Don't use this function any more. |
|
|
|
|
|
|
|
`avy--process' will do the jump all by itself.") |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
(define-obsolete-function-alias 'avy--with-avy-keys 'avy-with "0.3.0") |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
(provide 'avy) |
|
|
|
(provide 'avy) |
|
|
|
|
|
|
|
|
|
|
|
;;; avy.el ends here |
|
|
|
;;; avy.el ends here |
|
|
|
|