X-Git-Url: http://git.chise.org/gitweb/?p=chise%2Fxemacs-chise.git.1;a=blobdiff_plain;f=src%2Fredisplay-msw.c;h=307fd6e8c96b8978ffb8e189cf7e8bb67aa3bd1c;hp=ea34721f7b59b22338e9b1b09000f2d4b09af315;hb=98a6e4055a1fa624c592ac06f79287d55196ca37;hpb=557a8105b1bfe98e9a52f16fc2d4b10107f66b19

diff --git a/src/redisplay-msw.c b/src/redisplay-msw.c
index ea34721..307fd6e 100644
--- a/src/redisplay-msw.c
+++ b/src/redisplay-msw.c
@@ -134,9 +134,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
 	}