Re: [COMMIT] JIT Unicode code point support, and UTF-8 in compound text

Hi, Vin, Ar an cúigiú lá de mí Meitheamh, scríobh Vin Shelton: Thank you for the bug report! I really need to get myself VMWare and a gig more RAM to avoid this sort of thing. The below patch eliminates the two messages you describe on my work machine; however, I still get this on link: link.exe ＠C:\DOKUME~1\AIKE\LOKALE~1\Temp\nm1F9.tmp libjpeg.lib(jerror.obj): error LNK2001: unresolved external symbol __iob C:\xemacs-21.5\src\temacs.exe : fatal error LNK1120: 1 unresolved externals NMAKE: fatal error U1077: 'link.exe' : return code '0x460' Stop. Can you build with your setup? Incidentally, I’m taking a flight to Brisbane this evening; I won’t be back home and in a position to commit anything until late next week, though I will still be checking my mail. Bye, Aidan --- mule-ccl.c~ 2006-06-06 10:07:11.762048845 +0200 +++ mule-ccl.c 2006-06-06 10:06:16.067057480 +0200 ＠＠ -39,8 +39,9 ＠＠ Lisp_Object Vfont_ccl_encoder_alist; /* This symbol is a property which associates with ccl program vector. - Ex: (get 'ccl-big5-encoder 'ccl-program) returns ccl program vector. */ -Lisp_Object Qccl_program; + Ex: (get 'ccl-big5-encoder 'ccl-program) returns ccl program vector. + Moved to general-slots.h. */ +/* Lisp_Object Qccl_program; */ /* These symbols are properties which associate with code conversion map and their ID respectively. */ --- unicode.c~ 2006-06-06 10:05:40.375112471 +0200 +++ unicode.c 2006-06-06 10:05:23.407466391 +0200 ＠＠ -1112,7 +1112,7 ＠＠ if (NILP (Vcurrent_jit_charset) || (-1 == (i = get_free_codepoint(Vcurrent_jit_charset)))) { - Ascbyte setname[32]; + Ibyte setname[32]; Lisp_Object charset_descr = build_string ("Mule charset for otherwise unknown Unicode code points."); Lisp_Object charset_regr = build_string("iso10646-1"); ＠＠ -1125,8 +1125,12 ＠＠ last_jit_charset_final = 0x30; } - snprintf(setname, sizeof(setname), - "jit-ucs-charset-%d", number_of_jit_charsets++); + /* Assertion added partly because our Win32 layer doesn't + support snprintf; with this, we're sure it won't overflow + the buffer. */ + assert(100 > number_of_jit_charsets); + + qxesprintf(setname, "jit-ucs-charset-%d", number_of_jit_charsets++); /* Aside: GCPROing here would be overkill according to the FSF's philosophy. make-charset cannot currently GC, but is intended ＠＠ -1136,7 +1140,7 ＠＠ GCPRO2 (charset_descr, charset_regr); Vcurrent_jit_charset = Fmake_charset - (intern(setname), charset_descr, + (intern((const CIbyte *)setname), charset_descr, /* Set encode-as-utf-8 to t, to have this character set written using UTF-8 escapes in escape-quoted and ctext. This sidesteps the fact that our internal character -> Unicode -- Aidan Kehoe, http://www.parhasard.net/