Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs into feature/pgtk

1 files changed, 6 insertions, 2 deletions

diff --git a/src/alloc.c b/src/alloc.c
index 51088eb0e77..42d096ef2ae 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -664,7 +664,7 @@ display_malloc_warning (void)
   call3 (intern ("display-warning"),
          intern ("alloc"),
          build_string (pending_malloc_warning),
-         intern ("emergency"));
+         intern (":emergency"));
   pending_malloc_warning = 0;
 }
 
@@ -732,7 +732,11 @@ static void
 malloc_unblock_input (void)
 {
   if (block_input_in_memory_allocators)
-    unblock_input ();
+    {
+      int err = errno;
+      unblock_input ();
+      errno = err;
+    }
 }
 # define MALLOC_BLOCK_INPUT malloc_block_input ()
 # define MALLOC_UNBLOCK_INPUT malloc_unblock_input ()