Boring merge.

2 files changed, 5 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 50fc953024a..21ec98fa217 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2011-10-28  Dan Nicolaescu  <dann@ics.uci.edu>
+
+        * window.c (make_window): Initialize phys_cursor_on_p.
+
 2011-10-28  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * lisp.h (struct Lisp_Symbol): Update comments.
diff --git a/src/window.c b/src/window.c
index 0c35b913789..38f16c91f34 100644
--- a/src/window.c
+++ b/src/window.c
@@ -3320,6 +3320,7 @@ make_window (void)
   memset (&w->phys_cursor, 0, sizeof (w->phys_cursor));
   w->phys_cursor_type = -1;
   w->phys_cursor_width = -1;
+  w->phys_cursor_on_p = 0;
   w->last_cursor_off_p = w->cursor_off_p = 0;
   w->must_be_updated_p = 0;
   w->pseudo_window_p = 0;