diff options
| author | Jan Djärv | 2004-08-30 20:14:21 +0000 |
|---|---|---|
| committer | Jan Djärv | 2004-08-30 20:14:21 +0000 |
| commit | ec867797797c80ba00a29af18fb9c38f137a0a6b (patch) | |
| tree | 005e3a290fe74eaa581d4731cd411cdbd50887fb /src/xmenu.c | |
| parent | 2bf436c3bb916cc9368dafeb54d1cab0196e15cf (diff) | |
| download | emacs-ec867797797c80ba00a29af18fb9c38f137a0a6b.tar.gz emacs-ec867797797c80ba00a29af18fb9c38f137a0a6b.zip | |
Don't call ENCODE_MENU_STRING on top level menu names, GC may occur.
Diffstat (limited to 'src/xmenu.c')
| -rw-r--r-- | src/xmenu.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/xmenu.c b/src/xmenu.c index 2eed2b4987e..229f9c37de7 100644 --- a/src/xmenu.c +++ b/src/xmenu.c | |||
| @@ -2056,7 +2056,7 @@ set_frame_menubar (f, first_time, deep_p) | |||
| 2056 | string = XVECTOR (items)->contents[i + 1]; | 2056 | string = XVECTOR (items)->contents[i + 1]; |
| 2057 | if (NILP (string)) | 2057 | if (NILP (string)) |
| 2058 | break; | 2058 | break; |
| 2059 | wv->name = (char *) SDATA (ENCODE_MENU_STRING (string)); | 2059 | wv->name = (char *) SDATA (string); |
| 2060 | update_submenu_strings (wv->contents); | 2060 | update_submenu_strings (wv->contents); |
| 2061 | wv = wv->next; | 2061 | wv = wv->next; |
| 2062 | } | 2062 | } |
| @@ -2088,7 +2088,7 @@ set_frame_menubar (f, first_time, deep_p) | |||
| 2088 | break; | 2088 | break; |
| 2089 | 2089 | ||
| 2090 | wv = xmalloc_widget_value (); | 2090 | wv = xmalloc_widget_value (); |
| 2091 | wv->name = (char *) SDATA (ENCODE_MENU_STRING (string)); | 2091 | wv->name = (char *) SDATA (string); |
| 2092 | wv->value = 0; | 2092 | wv->value = 0; |
| 2093 | wv->enabled = 1; | 2093 | wv->enabled = 1; |
| 2094 | wv->button_type = BUTTON_TYPE_NONE; | 2094 | wv->button_type = BUTTON_TYPE_NONE; |