Changeset 1691

Show
Ignore:
Timestamp:
02/17/98 01:45:18 (11 years ago)
Author:
himi
Message:

Emacs20.5 import

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/GNU/src/w32menu.c

    r1681 r1691  
    3030#include "blockinput.h" 
    3131#include "buffer.h" 
    32 #include "charset.h" 
    33 #include "coding.h" 
    3432 
    3533/* This may include sys/types.h, and that somehow loses 
    …… 
    12381236#ifndef HAVE_MULTILINGUAL_MENU 
    12391237          if (STRINGP (pane_name) && STRING_MULTIBYTE (pane_name)) 
    1240             pane_name = ENCODE_SYSTEM (pane_name); 
     1238            pane_name = string_make_unibyte (pane_name); 
    12411239#endif 
    12421240          pane_string = (NILP (pane_name) 
    …… 
    12801278#ifndef HAVE_MULTILINGUAL_MENU 
    12811279          if (STRING_MULTIBYTE (item_name)) 
    1282             item_name = ENCODE_SYSTEM (item_name); 
     1280            item_name = string_make_unibyte (item_name); 
    12831281          if (STRINGP (descrip) && STRING_MULTIBYTE (descrip)) 
    1284             descrip = ENCODE_SYSTEM (descrip); 
     1282            descrip = string_make_unibyte (descrip); 
    12851283#endif 
    12861284          wv = xmalloc_widget_value (); 
    …… 
    16831681#ifndef HAVE_MULTILINGUAL_MENU 
    16841682          if (!NILP (pane_name) && STRING_MULTIBYTE (pane_name)) 
    1685             pane_name = ENCODE_SYSTEM (pane_name); 
     1683            pane_name = string_make_unibyte (pane_name); 
    16861684#endif 
    16871685          pane_string = (NILP (pane_name) 
    …… 
    17601758#ifndef HAVE_MULTILINGUAL_MENU 
    17611759      if (STRING_MULTIBYTE (title)) 
    1762         title = ENCODE_SYSTEM (title); 
     1760        title = string_make_unibyte (title); 
    17631761#endif 
    17641762      wv_title->name = (char *) XSTRING (title)->data;