Fix replacement typo.

* window.c (replace_window): Set root_window instead of
selected_window.  This fixes a total window subsystem
malfunction reported by Bastien Guerry <bzg@gnu.org>.

diff --git a/src/ChangeLog b/src/ChangeLog
index 58bc7de8d087182a8fc530abe33eeecae0ab210d..497ba67f1060aa8af54c7b2fb94989d530f431c3 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,10 @@
+2012-08-06  Dmitry Antipov  <dmantipov@yandex.ru>
+
+       Fix replacement typo.
+       * window.c (replace_window): Set root_window instead of
+       selected_window.  This fixes a total window subsystem
+       malfunction reported by Bastien Guerry <bzg@gnu.org>.
+
 2012-08-06  Glenn Morris  <rgm@gnu.org>
 
        * lisp.mk (lisp): Add language/persian.elc.

diff --git a/src/window.c b/src/window.c
index fcd9c666553c0a1520622e9af60f2c2c5b8d6cae..1c62e6f00a77ffa98e0321c9ce3eac87b9824f0f 100644 (file)
--- a/src/window.c
+++ b/src/window.c
@@ -1841,7 +1841,7 @@ replace_window (Lisp_Object old, Lisp_Object new, int setflag)
   /* If OLD is its frame's root window, then NEW is the new
      root window for that frame.  */
   if (EQ (old, FRAME_ROOT_WINDOW (XFRAME (WVAR (o, frame)))))
-    FSET (XFRAME (WVAR (o, frame)), selected_window, new);
+    FSET (XFRAME (WVAR (o, frame)), root_window, new);
 
   if (setflag)
     {