diff src/menubar-x.c @ 1261:465bd3c7d932

[xemacs-hg @ 2003-02-06 06:35:47 by ben] various bug fixes mule/cyril-util.el: Fix compile warning. loadup.el, make-docfile.el, update-elc-2.el, update-elc.el: Set stack-trace-on-error, load-always-display-messages so we get better debug results. update-elc-2.el: Fix typo in name of lisp/mule, leading to compile failure. simple.el: Omit M-S-home/end from motion keys. update-elc.el: Overhaul: -- allow list of "early-compile" files to be specified, not hardcoded -- fix autoload checking to include all .el files, not just dumped ones -- be smarter about regenerating autoloads, so we don't need to use loadup-el if not necessary -- use standard methods for loading/not loading auto-autoloads.el (maybe fixes "Already loaded" error?) -- rename misleading NOBYTECOMPILE flag file. window-xemacs.el: Fix bug in default param. window-xemacs.el: Fix compile warnings. lwlib-Xm.c: Fix compile warning. lispref/mule.texi: Lots of Mule rewriting. internals/internals.texi: Major fixup. Correct for new names of Bytebpos, Ichar, etc. and lots of Mule rewriting. config.inc.samp: Various fixups. Makefile.in.in: NOBYTECOMPILE -> BYTECOMPILE_CHANGE. esd.c: Warning fixes. fns.c: Eliminate bogus require-prints-loading-message; use already existent load-always-display-messages instead. Make sure `load' knows we are coming from `require'. lread.c: Turn on `load-warn-when-source-newer' by default. Change loading message to indicate when we are `require'ing. Eliminate purify_flag hacks to display more messages; instead, loadup and friends specify this explicitly with `load-always-display-messages'. Add spaces when batch to clearly indicate recursive loading. Fassoc() does not GC so no need to gcpro. gui-x.c, gui-x.h, menubar-x.c: Fix up crashes when selecting menubar items due to lack of GCPROing of callbacks in lwlib structures. eval.c, lisp.h, print.c: Don't canonicalize to selected-frame when noninteractive, or backtraces get all screwed up as some values are printed through the stream console and some aren't. Export canonicalize_printcharfun() and use in Fbacktrace().
author ben
date Thu, 06 Feb 2003 06:36:17 +0000
parents e22b0213b713
children fffe735e63ee
line wrap: on
line diff
--- a/src/menubar-x.c	Wed Feb 05 22:53:04 2003 +0000
+++ b/src/menubar-x.c	Thu Feb 06 06:36:17 2003 +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, 2001 ,2002 Ben Wing.
+   Copyright (C) 2000, 2001, 2002, 2003 Ben Wing.
 
 This file is part of XEmacs.
 
@@ -487,6 +487,10 @@
       assert (wv && wv->type == CASCADE_TYPE && wv->contents);
       replace_widget_value_tree (hack_wv, wv->contents);
       free_popup_widget_value_tree (wv);
+      /* Now that we've destructively modified part of the widget value
+	 hierarchy, our list of protected callbacks will no longer be
+	 valid, so we need to recompute it. */
+      snarf_widget_values_for_gcpro (FRAME_MENUBAR_DATA (f));
     }
   else if (!POPUP_DATAP (FRAME_MENUBAR_DATA (f)))
     return;
@@ -613,6 +617,12 @@
     }
   free_popup_widget_value_tree (data);
 
+  /* Buried inside of the lwlib data are pointers to Lisp objects that may
+     have been freshly created.  They need to be GC-protected, so snarf them
+     now and record them into the popup-data object associated with the
+     frame. */
+  snarf_widget_values_for_gcpro (FRAME_MENUBAR_DATA (f));
+
   XFRAME_MENUBAR_DATA (f)->menubar_contents_up_to_date = deep_p;
   XFRAME_MENUBAR_DATA (f)->last_menubar_buffer =
     XWINDOW (FRAME_LAST_NONMINIBUF_WINDOW (f))->buffer;