[xemacs-hg @ 2003-03-02 09:38:37 by ben] To: xemacs-patches@xemacs.org PROBLEMS: Include nt/PROBLEMS and update. Add note about incremental linking badness. cmdloop.el, custom.el, dumped-lisp.el, files.el, keydefs.el, keymap.el, lisp-mode.el, make-docfile.el, replace.el, simple.el, subr.el, view-less.el, wid-edit.el: Lots of syncing with FSF 21.2. Use if-fboundp in wid-edit.el. New file newcomment.el from FSF. internals/internals.texi: Fix typo. (Build-Time Dependencies): New node. PROBLEMS: Delete. config.inc.samp, xemacs.mak: Eliminate HAVE_VC6, use SUPPORT_EDIT_AND_CONTINUE in its place. No incremental linking unless SUPPORT_EDIT_AND_CONTINUE, since it can cause nasty crashes in pdump. Put warnings about this in config.inc.samp. Report the full compile flags used for src and lib-src in the Installation output. alloc.c, lisp.h, ralloc.c, regex.c: Use ALLOCA() in regex.c to avoid excessive stack allocation. Also fix subtle problem with REL_ALLOC() -- any call to malloc() (direct or indirect) may relocate rel-alloced data, causing buffer text to shift. After any such call, regex must update all its pointers to such data. Add a system, when ERROR_CHECK_MALLOC, whereby regex.c indicates all the places it is prepared to handle malloc()/realloc()/free(), and any calls anywhere in XEmacs outside of this will trigger an abort. alloc.c, dialog-msw.c, eval.c, event-stream.c, general-slots.h, insdel.c, lisp.h, menubar-msw.c, menubar-x.c: Change *run_hook*_trapping_problems to take a warning class, not a string. Factor out code to issue warnings, add flag to call_trapping_problems() to postpone warning issue, and make *run_hook*_trapping_problems issue their own warnings tailored to the hook, postponed in the case of safe_run_hook_trapping_problems() so that the appropriate message can be issued about resetting to nil only when not `quit'. Make record_unwind_protect_restoring_int() non-static. dumper.c: Issue notes about incremental linking problems under Windows. fileio.c: Mule-ize encrypt/decrypt-string code. text.h: Spacing changes.

--- a/src/alloc.c	Sun Mar 02 02:18:12 2003 +0000
+++ b/src/alloc.c	Sun Mar 02 09:38:54 2003 +0000
@@ -315,6 +315,7 @@
 
 #ifdef ERROR_CHECK_MALLOC
 static int in_malloc;
+extern int regex_malloc_disallowed;
 #endif
 
 #undef xmalloc
@@ -324,6 +325,7 @@
   void *val;
 #ifdef ERROR_CHECK_MALLOC
   assert (!in_malloc);
+  assert (!regex_malloc_disallowed);
   in_malloc = 1;
 #endif
   val = malloc (size);
@@ -342,6 +344,7 @@
   void *val;
 #ifdef ERROR_CHECK_MALLOC
   assert (!in_malloc);
+  assert (!regex_malloc_disallowed);
   in_malloc = 1;
 #endif
   val= calloc (nelem, elsize);
@@ -366,6 +369,7 @@
 {
 #ifdef ERROR_CHECK_MALLOC
   assert (!in_malloc);
+  assert (!regex_malloc_disallowed);
   in_malloc = 1;
 #endif
   block = realloc (block, size);
@@ -392,6 +396,7 @@
   assert (block != (void *) 0xDEADBEEF);
   assert (block);
   assert (!in_malloc);
+  assert (!regex_malloc_disallowed);
   in_malloc = 1;
 #endif /* ERROR_CHECK_MALLOC */
   free (block);
@@ -4448,7 +4453,7 @@
 
   if (!gc_hooks_inhibited)
     run_hook_trapping_problems
-      ("Error in pre-gc-hook", Qpre_gc_hook,
+      (Qgarbage_collecting, Qpre_gc_hook,
        INHIBIT_EXISTING_PERMANENT_DISPLAY_OBJECT_DELETION);
 
   /* Now show the GC cursor/message. */