Mercurial > emacs
changeset 56847:6079dd23b546
Don't call ENCODE_MENU_STRING on top level menu names, GC may occur.
| author | Jan Djärv <jan.h.d@swipnet.se> |
|---|---|
| date | Mon, 30 Aug 2004 20:14:21 +0000 |
| parents | 5817080daeba |
| children | 7201186afcb7 |
| files | src/ChangeLog src/xmenu.c |
| diffstat | 2 files changed, 3 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Mon Aug 30 19:42:53 2004 +0000 +++ b/src/ChangeLog Mon Aug 30 20:14:21 2004 +0000 @@ -4,8 +4,7 @@ instead of name and key. (update_submenu_strings): New function. (set_frame_menubar): Remove call to inhibit_garbage_collection, - call update_submenu_strings. Call ENCODE_MENU_STRING for top level - menu names. + call update_submenu_strings. * gtkutil.h (_widget_value): Added lname and lkey.
--- a/src/xmenu.c Mon Aug 30 19:42:53 2004 +0000 +++ b/src/xmenu.c Mon Aug 30 20:14:21 2004 +0000 @@ -2056,7 +2056,7 @@ string = XVECTOR (items)->contents[i + 1]; if (NILP (string)) break; - wv->name = (char *) SDATA (ENCODE_MENU_STRING (string)); + wv->name = (char *) SDATA (string); update_submenu_strings (wv->contents); wv = wv->next; } @@ -2088,7 +2088,7 @@ break; wv = xmalloc_widget_value (); - wv->name = (char *) SDATA (ENCODE_MENU_STRING (string)); + wv->name = (char *) SDATA (string); wv->value = 0; wv->enabled = 1; wv->button_type = BUTTON_TYPE_NONE;