branch: master
commit f9d7a76cd4e545b7cd2ce95a8b9233a01c921a97
Author: Tassilo Horn <[email protected]>
Commit: Tassilo Horn <[email protected]>
Improve avy-goto-char-timer.
1. Handle DEL in order to fix typos.
2. Handle RET in order to use the current input string immediately
without waiting for another char for avy-timeout-seconds.
3. Highlight matches while reading chars.
---
avy.el | 53 ++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 42 insertions(+), 11 deletions(-)
diff --git a/avy.el b/avy.el
index f46911d..1ae6a1f 100644
--- a/avy.el
+++ b/avy.el
@@ -1039,17 +1039,48 @@ ARG lines can be used."
(defun avy--read-string-timer ()
"Read as many chars as possible and return them as string.
At least one char must be read, and then repeatedly one next char
-may be read if it is entered before `avy-timeout-seconds'."
- (let ((str "") char)
- (while (setq char (read-char (format "char%s: "
- (if (string= str "")
- str
- (format " (%s)" str)))
- t
- (and (not (string= str ""))
- avy-timeout-seconds)))
- (setq str (concat str (list char))))
- str))
+may be read if it is entered before `avy-timeout-seconds'. `DEL'
+deletes the last char entered, and `RET' exits with the currently
+read string immediately instead of waiting for another char for
+`avy-timeout-seconds'."
+ (let ((str "") char break overlays)
+ (unwind-protect
+ (progn
+ (while (and (not break)
+ (setq char (read-char (format "char%s: "
+ (if (string= str "")
+ str
+ (format " (%s)" str)))
+ t
+ (and (not (string= str ""))
+ avy-timeout-seconds))))
+ ;; Unhighlight
+ (dolist (ov overlays)
+ (delete-overlay ov))
+ (setq overlays nil)
+ (cond
+ ;; Handle RET
+ ((= char 13)
+ (setq break t))
+ ;; Handle DEL
+ ((= char 127)
+ (let ((l (length str)))
+ (when (>= l 1)
+ (setq str (substring str 0 (1- l))))))
+ (t
+ (setq str (concat str (list char)))))
+ ;; Highlight
+ (when (>= (length str) 1)
+ (save-excursion
+ (goto-char (window-start))
+ (while (re-search-forward (regexp-quote str) (window-end) t)
+ (let ((ov (make-overlay (match-beginning 0) (match-end 0))))
+ (push ov overlays)
+ (overlay-put ov 'window (selected-window))
+ (overlay-put ov 'face 'avy-lead-face))))))
+ str)
+ (dolist (ov overlays)
+ (delete-overlay ov)))))
;;;###autoload
(defun avy-goto-char-timer (&optional arg)
