X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=src%2Fredisplay-x.c;h=c1b7fcac0734c8d35288d7eb4c9595faeb83d05e;hb=02f4d2761a98c5cb9d5b423d2361160a5d8c9ee4;hp=98f1334286c45e59198f07d338bb99ddc1bbff2b;hpb=59eec5f21669e81977b5b1fe9bf717cab49cf7fb;p=chise%2Fxemacs-chise.git.1

diff --git a/src/redisplay-x.c b/src/redisplay-x.c
index 98f1334..c1b7fca 100644
--- a/src/redisplay-x.c
+++ b/src/redisplay-x.c
@@ -165,9 +165,9 @@ separate_textual_runs (unsigned char *text_storage,
 #ifdef MULE
 	  {
 	    Lisp_Object ccl_prog = XCHARSET_CCL_PROGRAM (charset);
-	    need_ccl_conversion = !NILP (ccl_prog);
-	    if (need_ccl_conversion)
-	      setup_ccl_program (&char_converter, ccl_prog);
+	    if ((!NILP (ccl_prog))
+		  && (setup_ccl_program (&char_converter, ccl_prog) >= 0))
+	      need_ccl_conversion = 1;
 	  }
 #endif
 	}
@@ -514,7 +514,7 @@ x_output_display_block (struct window *w, struct display_line *dl, int block,
 /*****************************************************************************
  x_bevel_area
 
- Draw a shadows for the given area in the given face.
+ Draw shadows for the given area in the given face.
  ****************************************************************************/
 static void
 x_bevel_area (struct window *w, face_index findex,
@@ -1706,6 +1706,7 @@ x_redraw_exposed_window (struct window *w, int x, int y, int width, int height)
       f->windows_structure_changed = 1;
     }
 
+  redisplay_clear_top_of_window (w);
   if (window_needs_vertical_divider (w))
     {
       x_output_vertical_divider (w, 0);