Merged in changes from CVS HEAD

Patches applied:

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


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

2 files changed, 9 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 27c76179e57..8b6160fb5eb 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2004-01-11  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
+
+        * alloc.c (allocate_vectorlike): Surround calls to mallopt with
+        BLOCK/UNBLOCK_INPUT.
+
 2004-01-08  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
 
         * xmenu.c (Fx_popup_dialog): Add an Ok button if no buttons are
diff --git a/src/alloc.c b/src/alloc.c
index 700845ab6c5..616e264fbf1 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -2499,7 +2499,9 @@ allocate_vectorlike (len, type)
   /* Prevent mmap'ing the chunk.  Lisp data may not be mmap'ed
      because mapped region contents are not preserved in
      a dumped Emacs.  */
+  BLOCK_INPUT;
   mallopt (M_MMAP_MAX, 0);
+  UNBLOCK_INPUT;
 #endif
 
   nbytes = sizeof *p + (len - 1) * sizeof p->contents[0];
@@ -2507,7 +2509,9 @@ allocate_vectorlike (len, type)
 
 #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
 
   consing_since_gc += nbytes;