[elpa] master 7defba2 327/399: ivy.el (ivy-avy): Fix when there's a scroll

[Oleh Krehel]

branch: master
commit 7defba28cd53ace60e21b29855261ee22d566553
Author: Oleh Krehel <address@hidden>
Commit: Oleh Krehel <address@hidden>

    ivy.el (ivy-avy): Fix when there's a scroll
    
    * ivy.el (ivy--avy-action): Fix.
    
    * ivy-test.el (ivy-avy): Add test.
    
    * elpa.el: Add so that avy can be loaded.
    
    * Makefile: Load elpa.el with "make test" and "make plain"
---
 Makefile    | 2 +-
 elpa.el     | 6 ++++++
 ivy-test.el | 6 ++++++
 ivy.el      | 8 +++++---
 4 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index c6f3eca..2ad6a00 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 emacs ?= emacs
 elmake = $(emacs) -batch -l makefi.el -f
 
-LOAD = -l colir.el -l ivy-overlay.el -l ivy.el -l swiper.el -l counsel.el
+LOAD = -l elpa.el -l colir.el -l ivy-overlay.el -l ivy.el -l swiper.el -l 
counsel.el
 RM ?= rm -f
 
 all: test
diff --git a/elpa.el b/elpa.el
new file mode 100644
index 0000000..e49b8d4
--- /dev/null
+++ b/elpa.el
@@ -0,0 +1,6 @@
+(setq package-user-dir
+      (expand-file-name
+       (format "~/.elpa/%s/elpa"
+               (concat emacs-version (when (getenv "MELPA_STABLE") 
"-stable")))))
+(package-initialize)
+(add-to-list 'load-path default-directory)
diff --git a/ivy-test.el b/ivy-test.el
index f40f63d..bbae82b 100644
--- a/ivy-test.el
+++ b/ivy-test.el
@@ -1211,6 +1211,12 @@ a buffer visiting a file."
                         :dir "tests/find-file/directories-with-spaces/"))
              "tests/find-file/directories-with-spaces/bar baz ii/file2"))))
 
+(ert-deftest ivy-avy ()
+  (let ((enable-recursive-minibuffers t)
+        (read-numbers '(ivy-read "test: " (mapcar #'number-to-string 
(number-sequence 1 100)))))
+    (should (string= (ivy-with read-numbers "C-' a") "1"))
+    (should (string= (ivy-with read-numbers "C-v C-' d") "7"))))
+
 (provide 'ivy-test)
 
 ;;; ivy-test.el ends here
diff --git a/ivy.el b/ivy.el
index 03566ca..2ab556d 100644
--- a/ivy.el
+++ b/ivy.el
@@ -1623,9 +1623,11 @@ This string is inserted into the minibuffer.")
 
 (defun ivy--avy-action (pt)
   (when (number-or-marker-p pt)
-    (ivy--done
-     (substring-no-properties
-      (nth (- (line-number-at-pos pt) 2) ivy--old-cands)))))
+    (let ((bnd (ivy--minibuffer-index-bounds
+                ivy--index ivy--length ivy-height)))
+      (ivy--done
+       (substring-no-properties
+        (nth (+ (car bnd) (- (line-number-at-pos pt) 2)) ivy--old-cands))))))
 
 (defun ivy-avy ()
   "Jump to one of the current ivy candidates."