Mercurial > hg > xemacs-beta
diff src/redisplay-x.c @ 213:78f53ef88e17 r20-4b5
Import from CVS: tag r20-4b5
| author | cvs |
|---|---|
| date | Mon, 13 Aug 2007 10:06:47 +0200 |
| parents | 41ff10fd062f |
| children | 1f0dabaa0855 |
line wrap: on
line diff
--- a/src/redisplay-x.c Mon Aug 13 10:05:53 2007 +0200 +++ b/src/redisplay-x.c Mon Aug 13 10:06:47 2007 +0200 @@ -48,6 +48,7 @@ #include "sysproc.h" /* for select() */ #ifdef MULE +#include "mule-ccl.h" #include "mule-coding.h" /* for CCL conversion */ #endif @@ -184,7 +185,7 @@ Lisp_Object ccl_prog = XCHARSET_CCL_PROGRAM (charset); need_ccl_conversion = !NILP (ccl_prog); if (need_ccl_conversion) - set_ccl_program (&char_converter, ccl_prog, 0, 0, 0); + setup_ccl_program (&char_converter, ccl_prog); } #endif } @@ -202,12 +203,12 @@ #ifdef MULE if (need_ccl_conversion) { - char_converter.reg[0] = byte1; - char_converter.reg[1] = byte2; - char_converter.ic = 0; /* start at beginning each time */ + char_converter.reg[0] = XCHARSET_ID (charset); + char_converter.reg[1] = byte1; + char_converter.reg[2] = byte2; ccl_driver (&char_converter, 0, 0, 0, 0); - byte1 = char_converter.reg[0]; - byte2 = char_converter.reg[1]; + byte1 = char_converter.reg[1]; + byte2 = char_converter.reg[2]; } #endif *text_storage++ = (unsigned char) byte1;