Merged from miles@gnu.org--gnu-2005 (patch 160-161)

Patches applied:

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

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

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

1 files changed, 3 insertions, 5 deletions

diff --git a/src/blockinput.h b/src/blockinput.h
index a3b50d2a0f2..6aa865ea9be 100644
--- a/src/blockinput.h
+++ b/src/blockinput.h
@@ -98,12 +98,12 @@ extern int pending_atimers;
    and also reinvoke any pending signal.  */
 
 #define TOTALLY_UNBLOCK_INPUT                   \
-  if (interrupt_input_blocked != 0)             \
+  do if (interrupt_input_blocked != 0)          \
     {                                           \
       interrupt_input_blocked = 1;              \
       UNBLOCK_INPUT;                            \
     }                                           \
-  else
+  while (0)
 
 /* Undo any number of BLOCK_INPUT calls down to level LEVEL,
    and also (if the level is now 0) reinvoke any pending signal.  */
@@ -111,10 +111,8 @@ extern int pending_atimers;
 #define UNBLOCK_INPUT_TO(LEVEL)                         \
   do                                                    \
     {                                                   \
-      int oldlevel = interrupt_input_blocked;           \
       interrupt_input_blocked = (LEVEL) + 1;            \
-      if (interrupt_input_blocked != oldlevel + 1)      \
-        UNBLOCK_INPUT;                                  \
+      UNBLOCK_INPUT;                                    \
     }                                                   \
   while (0)