[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master 26123a7 10/78: avy.el (avy-goto-line): Fixup goto-line cla
From: |
Oleh Krehel |
Subject: |
[elpa] master 26123a7 10/78: avy.el (avy-goto-line): Fixup goto-line clause |
Date: |
Sat, 23 Jan 2016 13:59:39 +0000 |
branch: master
commit 26123a7b37b07560b63ea75c43923d7eee12c0a9
Author: Oleh Krehel <address@hidden>
Commit: Oleh Krehel <address@hidden>
avy.el (avy-goto-line): Fixup goto-line clause
Fixes #79
---
avy.el | 29 +++++++++++++++--------------
1 files 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)
- [elpa] master updated (4300eae -> a6b7502), Oleh Krehel, 2016/01/23
- [elpa] master 8c8ad97 01/78: Add de-bruijn to the defcustom of avy-styles-alist, Oleh Krehel, 2016/01/23
- [elpa] master eb28aeb 02/78: avy.el (avy-goto-line): push mark for numeric line, Oleh Krehel, 2016/01/23
- [elpa] master 7928d11 05/78: Remove the old obsolete aliases, Oleh Krehel, 2016/01/23
- [elpa] master 0cac589 04/78: Allow non-printing keys in avy-keys, Oleh Krehel, 2016/01/23
- [elpa] master 36e4d14 03/78: Respect the current input method for target chars, Oleh Krehel, 2016/01/23
- [elpa] master 465d5f2 07/78: Improve docstrings, Oleh Krehel, 2016/01/23
- [elpa] master 26123a7 10/78: avy.el (avy-goto-line): Fixup goto-line clause,
Oleh Krehel <=
- [elpa] master 492ac49 11/78: avy.el (avy-pop-mark): Add, Oleh Krehel, 2016/01/23
- [elpa] master 3b9a60a 09/78: avy.el (avy-dispatch-alist): Upgrade to defcustom, Oleh Krehel, 2016/01/23
- [elpa] master d22493c 12/78: Autload avy-goto-word-or-subword-1, Oleh Krehel, 2016/01/23
- [elpa] master 1d1e4b6 06/78: Allow to switch action midway from goto to kill/mark/copy, Oleh Krehel, 2016/01/23
- [elpa] master 30067dd 14/78: avy.el (avy-action-goto): Don't push mark when region is active, Oleh Krehel, 2016/01/23
- [elpa] master a6db8a3 08/78: Rename avy--with-avy-keys to avy-with, Oleh Krehel, 2016/01/23
- [elpa] master 1e578a1 15/78: Considers letter case only if given Upcase letter, Oleh Krehel, 2016/01/23
- [elpa] master e8cebf1 13/78: Make arg optional in avy-goto-subword-1, Oleh Krehel, 2016/01/23
- [elpa] master 36b296c 20/78: avy.el (subword-backward-regexp): Fix declaration, Oleh Krehel, 2016/01/23
- [elpa] master dbd2d20 17/78: avy.el (avy-pop-mark): Handle multiple frames, Oleh Krehel, 2016/01/23