[elpa] master 54bce2c 036/110: avy.el (avy-move-region): Update

[Oleh Krehel]

branch: master
commit 54bce2cfb07aab6c0b2a5a9d22c9df748649fecd
Author: Oleh Krehel <address@hidden>
Commit: Oleh Krehel <address@hidden>

    avy.el (avy-move-region): Update
    
    Fixes #188
---
 avy.el | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/avy.el b/avy.el
index be317ba..00720fa 100644
--- a/avy.el
+++ b/avy.el
@@ -1481,21 +1481,23 @@ The window scope is determined by `avy-all-windows' or
 
 ;;;###autoload
 (defun avy-move-region ()
-  "Select two lines and move the text between them here."
+  "Select two lines and move the text between them above the current line."
   (interactive)
   (avy-with avy-move-region
     (let* ((initial-window (selected-window))
            (beg (avy--line))
-           (end (save-excursion
-                  (goto-char (avy--line))
-                  (forward-line)
-                  (point)))
-           (text (buffer-substring beg end))
-           (pad (if (bolp) "" "\n")))
+           (end (avy--line))
+           text)
+      (when (> beg end)
+        (cl-rotatef beg end))
+      (setq end (save-excursion
+                  (goto-char end)
+                  (1+ (line-end-position))))
+      (setq text (buffer-substring beg end))
       (move-beginning-of-line nil)
       (delete-region beg end)
       (select-window initial-window)
-      (insert text pad))))
+      (insert text))))
 
 ;;;###autoload
 (defun avy-kill-region (arg)