From 47035cf4ea63f127c3b810fed67c8bd46f25502b Mon Sep 17 00:00:00 2001
From: Oleh Krehel <ohwoeowho@gmail.com>
Date: Tue, 22 Dec 2015 09:16:34 +0100
Subject: [PATCH] avy.el (avy--line): Don't modify avy-action

Fixes #124
---
 avy.el | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/avy.el b/avy.el
index 089121b..8d7e31f 100644
--- a/avy.el
+++ b/avy.el
@@ -1041,8 +1041,8 @@ Narrow the scope to BEG END."
                     (setq temporary-goal-column 0)
                     (line-move-visual 1 t))
                 (forward-line 1)))))))
-    (setq avy-action #'identity)
-    (avy--process (nreverse candidates) (avy--style-fn avy-style))))
+    (let ((avy-action #'identity))
+      (avy--process (nreverse candidates) (avy--style-fn avy-style)))))
 
 ;;;###autoload
 (defun avy-goto-line (&optional arg)
@@ -1056,6 +1056,7 @@ When ARG is 4, negate the window scope determined by
 
 Otherwise, forward to `goto-line' with ARG."
   (interactive "p")
+  (setq arg (or arg 1))
   (if (not (memq arg '(1 4)))
       (progn
         (goto-char (point-min))