X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=src%2Fredisplay-x.c;h=68ceb567c31f16e6f8dfbc09ca80dd916a1cd96b;hb=ac645215c78bf4fcd6a9d863b3de7ba5666b670c;hp=2385b2010b5be2e75f8e87fa44328e22abc58aa9;hpb=d8bd7eee3147c839d3c74d1823c139cd54867a75;p=chise%2Fxemacs-chise.git-

diff --git a/src/redisplay-x.c b/src/redisplay-x.c
index 2385b20..68ceb56 100644
--- a/src/redisplay-x.c
+++ b/src/redisplay-x.c
@@ -174,9 +174,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
 	}