Mercurial > hg > xemacs-beta
diff src/gui-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 | 70921960b980 |
line wrap: on
line diff
--- a/src/gui-x.c Wed Feb 05 22:53:04 2003 +0000 +++ b/src/gui-x.c Thu Feb 06 06:36:17 2003 +0000 @@ -1,6 +1,6 @@ /* General GUI code -- X-specific. (menubars, scrollbars, toolbars, dialogs) Copyright (C) 1995 Board of Trustees, University of Illinois. - Copyright (C) 1995, 1996, 2000, 2001, 2002 Ben Wing. + Copyright (C) 1995, 1996, 2000, 2001, 2002, 2003 Ben Wing. Copyright (C) 1995 Sun Microsystems, Inc. Copyright (C) 1998 Free Software Foundation, Inc. @@ -105,6 +105,21 @@ return 0; } +/* Snarf the callbacks and other Lisp data that are hidden in the lwlib + call-data and accel and stick them into POPUP-DATA for proper marking. */ + +void +snarf_widget_values_for_gcpro (Lisp_Object popup_data) +{ + struct popup_data *pdata = XPOPUP_DATA (popup_data); + + free_list (pdata->protect_me); + pdata->protect_me = Qnil; + + if (pdata->id) + lw_map_widget_values (pdata->id, snarf_widget_value_mapper, pdata); +} + void gcpro_popup_callbacks (LWLIB_ID id) { @@ -120,12 +135,7 @@ pdata->menubar_contents_up_to_date = 0; lpdata = wrap_popup_data (pdata); - /* Now snarf the callbacks and such that are hidden in the lwlib - call-data and accel and stick them into the list for proper - marking. */ - - if (pdata->id) - lw_map_widget_values (pdata->id, snarf_widget_value_mapper, pdata); + snarf_widget_values_for_gcpro (lpdata); Vpopup_callbacks = Fcons (Fcons (lid, lpdata), Vpopup_callbacks); }