diff options
| -rw-r--r-- | src/xmenu.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/xmenu.c b/src/xmenu.c index 54b1d50e096..6ed239d4e86 100644 --- a/src/xmenu.c +++ b/src/xmenu.c @@ -82,6 +82,8 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ #define FALSE 0 #endif /* no TRUE */ +Lisp_Object Qdebug_on_next_call; + extern Lisp_Object Qmenu_enable; extern Lisp_Object Qmenu_bar; extern Lisp_Object Qmouse_click, Qevent_kind; @@ -1526,6 +1528,9 @@ set_frame_menubar (f, first_time) count = inhibit_garbage_collection (); specbind (Qinhibit_quit, Qt); + /* Don't let the debugger step into this code + because it is not reentrant. */ + specbind (Qdebug_on_next_call, Qnil); id = frame_vector_add_frame (f); @@ -2444,6 +2449,9 @@ syms_of_xmenu () staticpro (&menu_items); menu_items = Qnil; + Qdebug_on_next_call = intern ("debug-on-next-call"); + staticpro (&Qdebug_on_next_call); + #ifdef USE_X_TOOLKIT widget_id_tick = (1<<16); #endif |