[Emacs-diffs] Changes to emacs/src/w32term.c

[Jason Rumney]

Index: emacs/src/w32term.c
diff -c emacs/src/w32term.c:1.180 emacs/src/w32term.c:1.181
*** emacs/src/w32term.c:1.180   Sun Mar 16 15:47:48 2003
--- emacs/src/w32term.c Sun Mar 16 17:11:04 2003
***************
*** 1134,1146 ****
    int charset = CHAR_CHARSET (c);
    int codepage;
    int unicode_p = 0;
  
    XFontStruct *font = font_info->font;
  
!   xassert (two_byte_p);
! 
!   if (two_byte_p)
!     *two_byte_p = w32_font_is_double_byte (font);
  
    /* FONT_INFO may define a scheme by which to encode byte1 and byte2.
       This may be either a program in a special encoder language or a
--- 1134,1144 ----
    int charset = CHAR_CHARSET (c);
    int codepage;
    int unicode_p = 0;
+   int internal_two_byte_p = 0;
  
    XFontStruct *font = font_info->font;
  
!   internal_two_byte_p = w32_font_is_double_byte (font);
  
    /* FONT_INFO may define a scheme by which to encode byte1 and byte2.
       This may be either a program in a special encoder language or a
***************
*** 1167,1173 ****
  
        /* We assume that MSBs are appropriately set/reset by CCL
         program.  */
!       if (!*two_byte_p)       /* 1-byte font */
        STORE_XCHAR2B (char2b, 0, ccl->reg[1]);
        else
        STORE_XCHAR2B (char2b, ccl->reg[1], ccl->reg[2]);
--- 1165,1171 ----
  
        /* We assume that MSBs are appropriately set/reset by CCL
         program.  */
!       if (!internal_two_byte_p)       /* 1-byte font */
        STORE_XCHAR2B (char2b, 0, ccl->reg[1]);
        else
        STORE_XCHAR2B (char2b, ccl->reg[1], ccl->reg[2]);
***************
*** 1214,1221 ****
              MultiByteToWideChar (codepage, 0, temp+1, 1, char2b, 1);
          }
        unicode_p = 1;
!       *two_byte_p = 1;
      }
    if (!font)
      return UNKNOWN_FONT;
    else if (font->bdf && CHARSET_DIMENSION (charset) == 1)
--- 1212,1223 ----
              MultiByteToWideChar (codepage, 0, temp+1, 1, char2b, 1);
          }
        unicode_p = 1;
!       internal_two_byte_p = 1;
      }
+ 
+   if (two_byte_p)
+     *two_byte_p = internal_two_byte_p;
+ 
    if (!font)
      return UNKNOWN_FONT;
    else if (font->bdf && CHARSET_DIMENSION (charset) == 1)