Mercurial > emacs
comparison src/xmenu.c @ 90127:30ad2795fdab
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-28
Merge from emacs--cvs-trunk--0
Patches applied:
* emacs--cvs-trunk--0 (patch 180-191)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 39-44)
- Merge from emacs--cvs-trunk--0
- Update from CVS
author | Miles Bader <miles@gnu.org> |
---|---|
date | Sat, 19 Mar 2005 02:42:17 +0000 |
parents | 8395880305fe 2b7e54e81973 |
children | 4da4a09e8b1b |
comparison
equal
deleted
inserted
replaced
90126:8ee106ee2dc8 | 90127:30ad2795fdab |
---|---|
135 confined to an extended version of this with sections of code below | 135 confined to an extended version of this with sections of code below |
136 using it unconditionally. */ | 136 using it unconditionally. */ |
137 #ifdef USE_GTK | 137 #ifdef USE_GTK |
138 /* gtk just uses utf-8. */ | 138 /* gtk just uses utf-8. */ |
139 # define ENCODE_MENU_STRING(str) ENCODE_UTF_8 (str) | 139 # define ENCODE_MENU_STRING(str) ENCODE_UTF_8 (str) |
140 #elif defined HAVE_X_I18N | |
141 # define ENCODE_MENU_STRING(str) ENCODE_SYSTEM (str) | |
140 #else | 142 #else |
141 # define ENCODE_MENU_STRING(str) string_make_unibyte (str) | 143 # define ENCODE_MENU_STRING(str) string_make_unibyte (str) |
142 #endif | 144 #endif |
143 | 145 |
144 static void push_menu_item P_ ((Lisp_Object, Lisp_Object, Lisp_Object, | 146 static void push_menu_item P_ ((Lisp_Object, Lisp_Object, Lisp_Object, |