Mercurial > hg > xemacs-beta

diff src/menubar-x.c @ 771:943eaba38521

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[xemacs-hg @ 2002-03-13 08:51:24 by ben] The big ben-mule-21-5 check-in! Various files were added and deleted. See CHANGES-ben-mule. There are still some test suite failures. No crashes, though. Many of the failures have to do with problems in the test suite itself rather than in the actual code. I'll be addressing these in the next day or so -- none of the test suite failures are at all critical. Meanwhile I'll be trying to address the biggest issues -- i.e. build or run failures, which will almost certainly happen on various platforms. All comments should be sent to ben@xemacs.org -- use a Cc: if necessary when sending to mailing lists. There will be pre- and post- tags, something like pre-ben-mule-21-5-merge-in, and post-ben-mule-21-5-merge-in.
author ben
date Wed, 13 Mar 2002 08:54:06 +0000
parents fdefd0186b75
children e38acbeb1cae
line wrap: on
line diff
--- a/src/menubar-x.c	Fri Mar 08 13:33:14 2002 +0000
+++ b/src/menubar-x.c	Wed Mar 13 08:54:06 2002 +0000
@@ -1,7 +1,7 @@
 /* Implements an elisp-programmable menubar -- X interface.
    Copyright (C) 1993, 1994 Free Software Foundation, Inc.
    Copyright (C) 1995 Tinker Systems and INS Engineering Corp.
-   Copyright (C) 2000 Ben Wing.
+   Copyright (C) 2000, 2001 Ben Wing.
 
 This file is part of XEmacs.
 
@@ -335,7 +335,7 @@
       set_opaque_ptr (wv_closure, 0);
     }
 
-  unbind_to (count, Qnil);
+  unbind_to (count);
   return wv;
 }
 
@@ -348,14 +348,11 @@
 							should run now */
 {
   widget_value *wv;
-  int count = specpdl_depth ();
-  record_unwind_protect (restore_gc_inhibit,
-			 make_int (gc_currently_forbidden));
-  gc_currently_forbidden = 1;
+  int count = begin_gc_forbidden ();
   /* Can't GC! */
   wv = menu_item_descriptor_to_widget_value_1 (desc, menu_type, deep_p,
 					       filter_p, 0);
-  unbind_to (count, Qnil);
+  unbind_to (count);
   return wv;
 }
 
@@ -464,7 +461,7 @@
       in_menu_callback = 1;
       wv = menu_item_descriptor_to_widget_value (submenu_desc, SUBMENU_TYPE,
 						 1, 0);
-      unbind_to (count, Qnil);
+      unbind_to (count);
 
       if (!wv)
 	{
@@ -528,7 +525,7 @@
       Fset_buffer (XWINDOW (FRAME_SELECTED_WINDOW (f))->buffer);
       data = menu_item_descriptor_to_widget_value (menubar, MENUBAR_TYPE,
 						   deep_p, 0);
-      unbind_to (count, Qnil);
+      unbind_to (count);
 
       return data;
     }
@@ -1155,17 +1152,15 @@
   Vmenu_accelerator_enabled   = Qnil;
   if (!NILP (errordata))
     {
-      Lisp_Object args[2];
-
-      args[0] = build_string ("Error in menu accelerators (setting to nil)");
       /* #### This should call
 	 (with-output-to-string (display-error errordata))
 	 but that stuff is all in Lisp currently. */
-      args[1] = errordata;
       warn_when_safe_lispobj
 	(Qerror, Qwarning,
-	 emacs_doprnt_string_lisp ((const Intbyte *) "%s: %s",
-				   Qnil, -1, 2, args));
+	 emacs_sprintf_string_lisp
+	 ("%s: %s", Qnil, 2,
+	  build_msg_string ("Error in menu accelerators (setting to nil)"),
+	  errordata));
     }
 
   return Qnil;