From 26123a7b37b07560b63ea75c43923d7eee12c0a9 Mon Sep 17 00:00:00 2001 From: Oleh Krehel Date: Thu, 16 Jul 2015 22:03:25 +0200 Subject: [PATCH] avy.el (avy-goto-line): Fixup goto-line clause Fixes #79 --- avy.el | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/avy.el b/avy.el index b65ce16..25cd086 100644 --- a/avy.el +++ b/avy.el @@ -932,20 +932,21 @@ The window scope is determined by `avy-all-windows' (ARG negates it)." The window scope is determined by `avy-all-windows' (ARG negates it)." (interactive "P") (avy-with avy-goto-line - (let ((avy-handler-function - (lambda (char) - (if (or (< char ?0) - (> char ?9)) - (avy-handler-default char) - (let ((line (read-from-minibuffer - "Goto line: " (string char)))) - (when line - (push-mark) - (goto-char (point-min)) - (forward-line (1- (string-to-number line))) - (throw 'done 'exit))))))) - (avy-action-goto - (avy--line arg))))) + (let* ((avy-handler-function + (lambda (char) + (if (or (< char ?0) + (> char ?9)) + (avy-handler-default char) + (let ((line (read-from-minibuffer + "Goto line: " (string char)))) + (when line + (push-mark) + (goto-char (point-min)) + (forward-line (1- (string-to-number line))) + (throw 'done 'exit)))))) + (r (avy--line arg))) + (unless (eq r t) + (avy-action-goto r))))) ;;;###autoload (defun avy-copy-line (arg)