From 02f593f3d0c929553d017f6b2c25bdffd6db80dd Mon Sep 17 00:00:00 2001 From: Jason Rumney Date: Fri, 10 Nov 2000 22:11:25 +0000 Subject: [PATCH] (w32_encode_char): Handle CP_UNICODE specially. (w32_use_unicode_for_codepage): Use new pseudo-codepages. --- src/w32term.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/src/w32term.c b/src/w32term.c index 3b64348a6a3..fe2ae116ac1 100644 --- a/src/w32term.c +++ b/src/w32term.c @@ -1411,10 +1411,13 @@ w32_encode_char (c, char2b, font_info, two_byte_p) temp[0] = BYTE1 (*char2b); temp[1] = BYTE2 (*char2b); temp[2] = '\0'; - if (temp[0]) - MultiByteToWideChar (codepage, 0, temp, 2, char2b, 1); - else - MultiByteToWideChar (codepage, 0, temp+1, 1, char2b, 1); + if (codepage != CP_UNICODE) + { + if (temp[0]) + MultiByteToWideChar (codepage, 0, temp, 2, char2b, 1); + else + MultiByteToWideChar (codepage, 0, temp+1, 1, char2b, 1); + } unicode_p = 1; *two_byte_p = 1; } @@ -2521,7 +2524,8 @@ w32_use_unicode_for_codepage (codepage) { /* If the current codepage is supported, use Unicode for output. */ return (w32_enable_unicode_output - && codepage != CP_DEFAULT && IsValidCodePage (codepage)); + && codepage != CP_8BIT + && (codepage == CP_UNICODE || IsValidCodePage (codepage))); } @@ -10199,8 +10203,6 @@ w32_initialize () void syms_of_w32term () { - Lisp_Object codepage; - staticpro (&w32_display_name_list); w32_display_name_list = Qnil; -- 2.39.5