* alloc.c (allocate_vectorlike): Surround calls to mallopt with

  BLOCK/UNBLOCK_INPUT.

diff --git a/src/ChangeLog b/src/ChangeLog
index 27c76179e57cc8e1fba391f25342c4fc2fae5e71..8b6160fb5ebe74dac26002036dd18cccf32c502a 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2004-01-11  Jan Dj\e,Ad\e(Brv  <jan.h.d@swipnet.se>
+
+       * alloc.c (allocate_vectorlike): Surround calls to mallopt with
+       BLOCK/UNBLOCK_INPUT.
+
 2004-01-08  Jan Dj\e,Ad\e(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 1835d2a59eb96a0d199e8e879b2b45e2f0afa12a..91fade836099a20f83304de981e1dd7e8d974988 100644 (file)
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -2498,7 +2498,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];
@@ -2506,7 +2508,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;