diff options
| author | Chong Yidong | 2008-08-01 15:44:26 +0000 |
|---|---|---|
| committer | Chong Yidong | 2008-08-01 15:44:26 +0000 |
| commit | d142dd3dbcecbf9026acb639eeabca6c0c8cf4c5 (patch) | |
| tree | 05b76d69d20ab48ac4c1dfacf29c05a809cc6b3c /src/xmenu.c | |
| parent | 61bf63e29d116999e608efccb17f1b41e708c262 (diff) | |
| download | emacs-d142dd3dbcecbf9026acb639eeabca6c0c8cf4c5.tar.gz emacs-d142dd3dbcecbf9026acb639eeabca6c0c8cf4c5.zip | |
Revert last change.
Diffstat (limited to 'src/xmenu.c')
| -rw-r--r-- | src/xmenu.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/xmenu.c b/src/xmenu.c index 199b19baec9..17ea25c1fde 100644 --- a/src/xmenu.c +++ b/src/xmenu.c | |||
| @@ -146,6 +146,12 @@ static int popup_activated_flag; | |||
| 146 | 146 | ||
| 147 | static int next_menubar_widget_id; | 147 | static int next_menubar_widget_id; |
| 148 | 148 | ||
| 149 | /* For NS and NTGUI, these prototypes are defined in keyboard.h. */ | ||
| 150 | #if defined (USE_X_TOOLKIT) || defined (USE_GTK) | ||
| 151 | extern widget_value *xmalloc_widget_value P_ ((void)); | ||
| 152 | extern widget_value *digest_single_submenu P_ ((int, int, int)); | ||
| 153 | #endif | ||
| 154 | |||
| 149 | /* This is set nonzero after the user activates the menu bar, and set | 155 | /* This is set nonzero after the user activates the menu bar, and set |
| 150 | to zero again after the menu bars are redisplayed by prepare_menu_bar. | 156 | to zero again after the menu bars are redisplayed by prepare_menu_bar. |
| 151 | While it is nonzero, all calls to set_frame_menubar go deep. | 157 | While it is nonzero, all calls to set_frame_menubar go deep. |