Subject: bug#32850: 27.0.50; window-swap-states doesn't swap window prev/next-buffers

From: Juri Linkov <[email-masked]>
Date: Tue, 30 Oct 2018 23:23:29 +0200

>>    (delete-other-windows) (split-window) (delete-window)
>
> OK.  If we document it sufficiently, let's use that.

I thought it's ugly.  But if there is no other way:

diff --git a/lisp/window.el b/lisp/window.el
index bcd4fa2959..9fdf005202 100644
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -5898,20 +5898,12 @@ window-state-put
 windows can get as small as `window-safe-min-height' and
 `window-safe-min-width'."
   (setq window-state-put-stale-windows nil)
-  (setq window (window-normalize-window window))
 
-  ;; When WINDOW is internal, reduce it to a live one to put STATE into,
-  ;; see Bug#16793.
+  ;; When WINDOW is internal or nil, create a new window.
   (unless (window-live-p window)
-    (let ((root window))
-      (setq window (catch 'live
-                     (walk-window-subtree
-                      (lambda (window)
-                        (when (and (window-live-p window)
-                                   (not (window-parameter window 'window-side)))
-                          (throw 'live window)))
-                      root)))
-      (delete-other-windows-internal window root)))
+    (delete-other-windows)
+    (setq window (split-window))
+    (delete-window))
 
   (set-window-dedicated-p window nil)