mirror of
https://github.com/abo-abo/avy.git
synced 2026-02-04 06:42:26 +00:00
avy.el (avy-goto-line): Call avy-action-goto only when avy-action is not set
Fixes #274
This commit is contained in:
committed by
Oleh Krehel
parent
8686845ed9
commit
f91ae613a8
6
avy.el
6
avy.el
@@ -1656,8 +1656,8 @@ The window scope is determined by `avy-all-windows'.
|
||||
"Select a line.
|
||||
The window scope is determined by `avy-all-windows'.
|
||||
When ARG is non-nil, do the opposite of `avy-all-windows'.
|
||||
BEG and END narrow the scope where candidates are searched.
|
||||
When BOTTOM-UP is non-nil, display avy candidates from top to bottom"
|
||||
BEG and END narrow the scope where candidates are searched.
|
||||
When BOTTOM-UP is non-nil, display avy candidates from top to bottom"
|
||||
(setq avy-action (or avy-action #'identity))
|
||||
(let ((avy-style (if avy-linum-mode
|
||||
(progn
|
||||
@@ -1699,7 +1699,7 @@ Otherwise, forward to `goto-line' with ARG."
|
||||
(widen)
|
||||
(goto-char (point-min))
|
||||
(forward-line (1- (string-to-number line))))
|
||||
(throw 'done 'exit))))))
|
||||
(throw 'done 'exit))))))
|
||||
(r (avy--line (eq arg 4))))
|
||||
(when (and (not (eq r t)) (eq avy-action #'identity))
|
||||
(avy-action-goto r))))))
|
||||
|
||||
Reference in New Issue
Block a user