Merged from miles@gnu.org--gnu-2005 (patch 45-55, 214-231)

Patches applied:

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-214
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-215
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-216
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-217
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-218
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-219
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-220
   Merge from gnus--rel--5.10

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-221
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-222
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-223
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-224
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-225
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-226
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-227
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-228
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-229
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-230
   Merge from gnus--rel--5.10

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-231
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-45
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-46
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-47
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-48
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-49
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-50
   Update from CVS: texi Makefile.in CVS keyw cruft

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-51
   Update from CVS: ChangeLog tweaks

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-52
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-53
   Merge from emacs--cvs-trunk--0

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-54
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-55
   Update from CVS

git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-324

1 files changed, 8 insertions, 0 deletions

diff --git a/src/alloc.c b/src/alloc.c
index dbb77f77128..c29c4c8e7f6 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -1934,14 +1934,18 @@ allocate_string_data (s, nchars, nbytes)
          mmap'ed data typically have an address towards the top of the
          address space, which won't fit into an EMACS_INT (at least on
          32-bit systems with the current tagging scheme).  --fx  */
+      BLOCK_INPUT;
       mallopt (M_MMAP_MAX, 0);
+      UNBLOCK_INPUT;
 #endif
 
       b = (struct sblock *) lisp_malloc (size + GC_STRING_EXTRA, MEM_TYPE_NON_LISP);
 
 #ifdef DOUG_LEA_MALLOC
       /* Back to a reasonable maximum of mmap'ed areas. */
+      BLOCK_INPUT;
       mallopt (M_MMAP_MAX, MMAP_MAX_AREAS);
+      UNBLOCK_INPUT;
 #endif
 
       b->next_free = &b->first_data;
@@ -4684,6 +4688,8 @@ returns nil, because real GC can't be done.  */)
   if (pure_bytes_used_before_overflow)
     return Qnil;
 
+  CHECK_CONS_LIST ();
+
   /* Don't keep undo information around forever.
      Do this early on, so it is no problem if the user quits.  */
   {
@@ -4878,6 +4884,8 @@ returns nil, because real GC can't be done.  */)
 
   UNBLOCK_INPUT;
 
+  CHECK_CONS_LIST ();
+
   /* clear_marks (); */
   gc_in_progress = 0;