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

[Steven Tamm]

Index: emacs/src/macmenu.c
diff -c emacs/src/macmenu.c:1.20 emacs/src/macmenu.c:1.21
*** emacs/src/macmenu.c:1.20    Wed Oct  6 15:38:53 2004
--- emacs/src/macmenu.c Wed Dec  1 15:51:22 2004
***************
*** 2267,2272 ****
--- 2267,2280 ----
        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);
        }