better load-path defaults

[bpt/emacs.git] / src / xmenu.c

diff --git a/src/xmenu.c b/src/xmenu.c
index 92f293b..0de8faa 100644 (file)
--- a/src/xmenu.c
+++ b/src/xmenu.c
@@ -1921,7 +1921,7 @@ xw_popup_dialog (struct frame *f, Lisp_Object header, Lisp_Object contents)
   Lisp_Object title;
   const char *error_name;
   Lisp_Object selection;
-  ptrdiff_t specpdl_count = SPECPDL_INDEX ();
+  dynwind_begin ();
 
   check_window_system (f);
 
@@ -1943,7 +1943,7 @@ xw_popup_dialog (struct frame *f, Lisp_Object header, Lisp_Object contents)
   selection = x_dialog_show (f, title, header, &error_name);
   unblock_input ();
 
-  unbind_to (specpdl_count, Qnil);
+  dynwind_end ();
   discard_menu_items ();
 
   if (error_name) error ("%s", error_name);
@@ -2346,6 +2346,6 @@ syms_of_xmenu (void)
 
 #if defined (USE_GTK) || defined (USE_X_TOOLKIT)
   Ffset (intern_c_string ("accelerate-menu"),
-        intern_c_string (Sx_menu_bar_open_internal.symbol_name));
+         intern_c_string ("x-menu-bar-open-internal"));
 #endif
 }