From: Juri Linkov <juri@linkov.net>
Date: Tue, 16 May 2023 17:32:34 +0000 (+0300)
Subject: * lisp/windmove.el (windmove-swap-states-in-direction): Don't swap minibuffer.
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=a8f2009d03138b3b3b6c75452aba7a17c68a60f7;p=emacs.git

* lisp/windmove.el (windmove-swap-states-in-direction): Don't swap minibuffer.

Guard against swapping the minibuffer when the minibuffer is in the selected
window (bug#62427).  The function was already protected when the minibuffer
is in other-window.
---

diff --git a/lisp/windmove.el b/lisp/windmove.el
index 06ce16c0d42..746a440bacb 100644
--- a/lisp/windmove.el
+++ b/lisp/windmove.el
@@ -724,6 +724,8 @@ from the opposite side of the frame."
                                            nil windmove-wrap-around 'nomini)))
     (cond ((or (null other-window) (window-minibuffer-p other-window))
            (user-error "No window %s from selected window" dir))
+          ((window-minibuffer-p (selected-window))
+           (user-error "Can't swap window with the minibuffer"))
           (t
            (window-swap-states nil other-window)))))