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

[Steven Tamm]

Index: emacs/src/macmenu.c
diff -c emacs/src/macmenu.c:1.21 emacs/src/macmenu.c:1.22
*** emacs/src/macmenu.c:1.21    Wed Dec  1 15:51:22 2004
--- emacs/src/macmenu.c Fri Dec  3 17:00:11 2004
***************
*** 2264,2280 ****
        item_name[255] = 0;
  #if TARGET_API_MAC_CARBON
        {
!       CFStringRef string =
!         CFStringCreateWithCString (NULL, item_name, kCFStringEncodingUTF8);
  
-       if (string == NULL)
-         {
-           /* Failed to interpret as UTF8.  Fall back to Mac Roman.
-              Maybe wv->name is corrupted?  */
-           string = CFStringCreateWithCString (NULL, item_name,
-                                               kCFStringEncodingMacRoman);
-         }
-       
        SetMenuItemTextWithCFString (menu, pos, string);
        CFRelease (string);
        }
--- 2264,2271 ----
        item_name[255] = 0;
  #if TARGET_API_MAC_CARBON
        {
!       CFStringRef string = cfstring_create_with_utf8_cstring (item_name);
  
        SetMenuItemTextWithCFString (menu, pos, string);
        CFRelease (string);
        }