Improve "p" when there are more than 2 windows

* lispy.el (lispy-eval--active-window): Remove.
(lispy-eval--eval-window): Remove.
(lispy-eval-other--window): Add.
(lispy-eval--eval-buffer): Remove.
(lispy-eval-other--buffer): Add.
(lispy-eval--expr): Remove.
(lispy--eval-in-window): Remove.
(lispy-eval--last-live-p): Add.
(lispy-eval-other-window): Eval in `lispy-eval-other--window' when it's
live, otherwise select it with `ace-window'.

* lispy-pkg.el: Depend on `ace-window'.

* Cask: Depend on `ace-window'.

Author: abo-abo

Cask

@@ -16,4 +16,5 @@
  (depends-on "projectile")
  (depends-on "s")
  (depends-on "highlight")
- (depends-on "hydra"))
+ (depends-on "hydra")
+ (depends-on "ace-window"))

lispy-pkg.el

@@ -1,9 +1,10 @@
-(define-package "lispy" "0.22.0"
+(define-package "lispy" "0.23.0"
   "vi-like Paredit"
   '((helm "1.5.3")
     (ace-jump-mode "2.0")
     (s "1.4.0")
     (multiple-cursors "1.3.0")
     (iedit "0.97")
     (highlight "0")
-    (hydra "0.4.1")))
+    (hydra "0.4.1")
+    (ace-window "0.7.0")))

lispy.el

@@ -4,7 +4,7 @@
 
 ;; Author: Oleh Krehel <[email protected]>
 ;; URL: https://github.com/abo-abo/lispy
-;; Version: 0.22.0
+;; Version: 0.23.0
 ;; Keywords: lisp
 
 ;; This file is not part of GNU Emacs
@@ -2682,33 +2682,18 @@ When ARG isn't nil, try to pretty print the sexp."
   (format "%s: nil" (propertize "cond" 'face 'font-lock-keyword-face))
   "Message to echo when the current `cond' branch is nil.")
 
-(defvar lispy-eval--active-window nil
-  "Source window for `lispy-eval-other-window'.")
-(defvar lispy-eval--eval-window nil
+(defvar lispy-eval-other--window nil
   "Target window for `lispy-eval-other-window'.")
-(defvar lispy-eval--eval-buffer nil
+
+(defvar lispy-eval-other--buffer nil
   "Target buffer for `lispy-eval-other-window'.")
-(defvar lispy-eval--expr nil
-  "The expression for`lispy-eval-other-window'.")
-
-(defun lispy--eval-in-window (aj-data)
-  "Eval in the context of AJ-DATA."
-  (let ((frame (aj-position-frame aj-data))
-        (window (aj-position-window aj-data)))
-    (when (and (frame-live-p frame)
-               (not (eq frame (selected-frame))))
-      (select-frame-set-input-focus frame))
-    (select-window window)
-    (setq lispy-eval--eval-window window)
-    (setq lispy-eval--eval-buffer (current-buffer))
-    (let ((res (condition-case e
-                   (eval lispy-eval--expr lexical-binding)
-                 (error
-                  (message "error: %s" (error-message-string e))))))
-      (if (equal res lispy--eval-cond-msg)
-          (message res)
-        (message "%S" res))
-      (select-window lispy-eval--active-window))))
+
+(defun lispy-eval--last-live-p ()
+  (and (window-live-p
+        lispy-eval-other--window)
+       (equal (window-buffer
+               lispy-eval-other--window)
+              lispy-eval-other--buffer)))
 
 (defun lispy-eval-other-window ()
   "Eval current expression in the context of other window.
@@ -2749,9 +2734,21 @@ In case the point is on a let-bound variable, add a `setq'."
                  (t (read str)))))
        res)
     (goto-char pt)
-    (other-window 1)
-    (setq res (eval expr lexical-binding))
-    (other-window -1)
+    (let* ((source-window (selected-window))
+           (target-window
+            (if (lispy-eval--last-live-p)
+                lispy-eval-other--window
+              (if (setq lispy-eval-other--window
+                        (aw-select " Ace - Eval in Window"))
+                  (progn
+                    (setq lispy-eval-other--buffer
+                          (window-buffer lispy-eval-other--window))
+                    lispy-eval-other--window)
+                (setq lispy-eval-other--buffer nil)
+                source-window))))
+      (select-window target-window)
+      (setq res (eval expr lexical-binding))
+      (select-window source-window))
     (if (equal res lispy--eval-cond-msg)
         (message res)
       (message "%S" res))))