Mercurial > emacs
comparison src/macmenu.c @ 90054:f2ebccfa87d4
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-74
Merge from emacs--cvs-trunk--0
Patches applied:
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-709
Update from CVS: src/indent.c (Fvertical_motion): Fix last change.
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-710
- miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-715
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-716
Merge from gnus--rel--5.10
* miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-74
Update from CVS
| author | Miles Bader <miles@gnu.org> |
|---|---|
| date | Wed, 08 Dec 2004 05:02:30 +0000 |
| parents | ff0e824afa37 4ad0594e1ac4 |
| children | 29e773288013 |
comparison
equal
deleted
inserted
replaced
| 90053:fff5f1a61d92 | 90054:f2ebccfa87d4 |
|---|---|
| 2262 strncat (item_name, wv->key, 255); | 2262 strncat (item_name, wv->key, 255); |
| 2263 } | 2263 } |
| 2264 item_name[255] = 0; | 2264 item_name[255] = 0; |
| 2265 #if TARGET_API_MAC_CARBON | 2265 #if TARGET_API_MAC_CARBON |
| 2266 { | 2266 { |
| 2267 CFStringRef string = | 2267 CFStringRef string = cfstring_create_with_utf8_cstring (item_name); |
| 2268 CFStringCreateWithCString (NULL, item_name, kCFStringEncodingUTF8); | |
| 2269 | 2268 |
| 2270 SetMenuItemTextWithCFString (menu, pos, string); | 2269 SetMenuItemTextWithCFString (menu, pos, string); |
| 2271 CFRelease (string); | 2270 CFRelease (string); |
| 2272 } | 2271 } |
| 2273 #else | 2272 #else |