summaryrefslogtreecommitdiff
path: root/src/emacs.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/emacs.c')
-rw-r--r--src/emacs.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/src/emacs.c b/src/emacs.c
index ac4f391681a..8143498a104 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -311,7 +311,14 @@ main (argc, argv, envp)
#ifndef SYSTEM_MALLOC
if (! initialized)
- memory_warnings (0, malloc_warning);
+ {
+ /* Arrange to get warning messages as memory fills up. */
+ memory_warnings (0, malloc_warning);
+
+ /* Arrange to disable interrupt input while malloc and friends are
+ running. */
+ uninterrupt_malloc ();
+ }
#endif /* not SYSTEM_MALLOC */
#ifdef PRIO_PROCESS