In `ispell-command-loop' don't use `next-window'.

* textmodes/ispell.el (ispell-command-loop): Don't use
`next-window'.

2 files changed, 9 insertions, 2 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b50d5844b58..feeab01a106 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2014-12-19  Martin Rudalics  <rudalics@gmx.at>
+
+        * textmodes/ispell.el (ispell-command-loop): Don't use
+        `next-window'.
+
 2014-12-18  Sam Steingold  <sds@gnu.org>
 
         Keyboard interface (C-f10) to `mouse-buffer-menu' (C-down-mouse-1).
diff --git a/lisp/textmodes/ispell.el b/lisp/textmodes/ispell.el
index ea2eaba6b9e..ab2c83b3ebc 100644
--- a/lisp/textmodes/ispell.el
+++ b/lisp/textmodes/ispell.el
@@ -2265,8 +2265,9 @@ Global `ispell-quit' set to start location to continue spell session."
         (sit-for 0))
 
     ;; Display choices for misspelled word.
+    (setq textwin (selected-window))
     (ispell-show-choices)
-    (select-window (setq textwin (next-window)))
+    (select-window textwin)
 
     ;; highlight word, protecting current buffer status
     (unwind-protect
@@ -2408,8 +2409,9 @@ Global `ispell-quit' set to start location to continue spell session."
                                       count (ispell-int-char (1+ count))))
                               (setq count (ispell-int-char
                                            (- count ?0 skipped))))
+                            (setq textwin (selected-window))
                             (ispell-show-choices)
-                            (select-window (next-window)))))
+                            (select-window textwin))))
                     (and (eq 'block ispell-highlight-p)
                          (ispell-highlight-spelling-error start end nil
                                                           'block))