Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 399-413)

   - Update from CVS
   - Rcirc update from Ryan Yeske
   - Merge from gnus--rel--5.10
   - Miscellaneous tq-related fixes.

 * gnus--rel--5.10  (patch 126-127)

   - Merge from emacs--devo--0
   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-105

1 files changed, 6 insertions, 16 deletions

diff --git a/src/alloc.c b/src/alloc.c
index 9cd87503c5a..94be9fa6132 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -130,27 +130,17 @@ static pthread_mutex_t alloc_mutex;
 #define BLOCK_INPUT_ALLOC                       \
   do                                            \
     {                                           \
-      if (!in_sighandler)                       \
-        {                                       \
-           pthread_mutex_lock (&alloc_mutex);   \
-           if (pthread_self () == main_thread)  \
-             BLOCK_INPUT;                       \
-           else                                 \
-             sigblock (sigmask (SIGIO));        \
-        }                                       \
+      if (pthread_self () == main_thread)       \
+        BLOCK_INPUT;                            \
+      pthread_mutex_lock (&alloc_mutex);        \
     }                                           \
   while (0)
 #define UNBLOCK_INPUT_ALLOC                     \
   do                                            \
     {                                           \
-      if (!in_sighandler)                       \
-        {                                       \
-           pthread_mutex_unlock (&alloc_mutex); \
-           if (pthread_self () == main_thread)  \
-             UNBLOCK_INPUT;                     \
-           else                                 \
-             sigunblock (sigmask (SIGIO));      \
-        }                                       \
+      pthread_mutex_unlock (&alloc_mutex);      \
+      if (pthread_self () == main_thread)       \
+        UNBLOCK_INPUT;                          \
     }                                           \
   while (0)