ld/avy
1
0
Fork 0
mirror of https://github.com/abo-abo/avy.git synced 2025-10-13 21:33:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

avy.el (avy-goto-line): Call avy-action-goto only when avy-action is not set

Browse Source 
Fixes #274
This commit is contained in:
Arte Ebrahimi 2019-05-19 11:38:01 -07:00 committed by Oleh Krehel
parent 8686845ed9
commit f91ae613a8
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
avy.el
View File

@ -1656,8 +1656,8 @@ The window scope is determined by `avy-all-windows'.
When ARG is non-nil, do the opposite of `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. BEG and END narrow the scope where candidates are searched.
When BOTTOM-UP is non-nil, display avy candidates from top to bottom" When BOTTOM-UP is non-nil, display avy candidates from top to bottom"
(let ((avy-action #'identity) (setq avy-action (or avy-action #'identity))
(avy-style (if avy-linum-mode (let ((avy-style (if avy-linum-mode
(progn (progn
(message "Goto line:") (message "Goto line:")
'ignore) 'ignore)
@ -1699,7 +1699,7 @@ Otherwise, forward to `goto-line' with ARG."
(forward-line (1- (string-to-number line)))) (forward-line (1- (string-to-number line))))
(throw 'done 'exit)))))) (throw 'done 'exit))))))
(r (avy--line (eq arg 4)))) (r (avy--line (eq arg 4))))
(unless (eq r t) (when (and (not (eq r t)) (eq avy-action #'identity))
(avy-action-goto r)))))) (avy-action-goto r))))))
;;;###autoload ;;;###autoload