3 files changed, 5 insertions, 2 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 3717924ff68..7c043f6d087 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2011-08-03  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * xdisp.c (compute_display_string_pos): Remove unused local.
+
 2011-08-02  Eli Zaretskii  <eliz@gnu.org>
 
         Fix slow cursor motion and scrolling in large buffers with
diff --git a/src/xdisp.c b/src/xdisp.c
index e7c3ac301ba..6f871903ed5 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -3168,7 +3168,6 @@ compute_display_string_pos (struct text_pos *position,
   EMACS_INT lim =
     (charpos < eob - MAX_DISP_SCAN) ? charpos + MAX_DISP_SCAN : eob;
   struct text_pos tpos;
-  struct buffer *b;
 
   *disp_prop_p = 1;
 
diff --git a/src/xwidget.c b/src/xwidget.c
index 08b16bbbc35..1a3e76dd4a2 100644
--- a/src/xwidget.c
+++ b/src/xwidget.c
@@ -614,7 +614,7 @@ x_draw_xwidget_glyph_string (struct glyph_string *s)
   int y = s->y + (s->height / 2) - (xww->height / 2);
   int moved=0;
 
-  if (xv == NULL){
+  if (xv == NULL || xv->initialized == 0){
     /* Views must be initialized once(only once).
        We do it here in the display loop because there is no other time to know things like
        window placement etc.