From: Dmitry Antipov <dmantipov@yandex.ru>
Date: Mon, 6 Aug 2012 08:32:49 +0000 (+0400)
Subject: Fix replacement typo.
X-Git-Tag: emacs-24.2.90~826
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=f99bac932bf883dbd4b91dc5ba21c77a23840be7;p=emacs.git

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 58bc7de8d08..497ba67f106 100644
--- 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 fcd9c666553..1c62e6f00a7 100644
--- 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)
     {