[elpa] externals/agitate e0acda46b9 2/5: Check for previous window as well

[ELPA Syncer]

branch: externals/agitate
commit e0acda46b9462eac757e6f091f7efef656d872fc
Author: Protesilaos Stavrou <info@protesilaos.com>
Commit: Protesilaos Stavrou <info@protesilaos.com>

    Check for previous window as well
---
 agitate.el | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/agitate.el b/agitate.el
index edbdbd9772..1876e26c46 100644
--- a/agitate.el
+++ b/agitate.el
@@ -282,9 +282,13 @@ user option `log-edit-keep-buffer'."
 (defvar agitate--previous-window-point nil
   "Store the last window `point'.")
 
+(defvar agitate--previous-window nil
+  "Store the last window.")
+
 (defun agitate--log-edit-informative-save-windows ()
   "Save `current-window-configuration'."
-  (setq agitate--previous-window-point (point)
+  (setq agitate--previous-window (get-buffer-window)
+        agitate--previous-window-point (point)
         agitate--previous-window-configuration (current-window-configuration)))
 
 (defun agitate--log-edit-informative-setup ()
@@ -315,9 +319,13 @@ user option `log-edit-keep-buffer'."
   (when agitate--previous-window-configuration
     (set-window-configuration agitate--previous-window-configuration)
     (setq agitate--previous-window-configuration nil))
-  (when agitate--previous-window-point
+  (when (and agitate--previous-window
+             agitate--previous-window-point
+             (window-live-p agitate--previous-window))
+    (select-window agitate--previous-window)
     (goto-char agitate--previous-window-point)
-    (setq agitate--previous-window-point nil)))
+    (setq agitate--previous-window nil
+          agitate--previous-window-point nil)))
 
 (defun agitate--log-edit-informative-kill-buffer ()
   "Kill the vc-log buffer."