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

Patches applied:

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

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

5 files changed, 54 insertions, 7 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index dc48d647216..fc2ded6ce94 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,15 @@
+2005-03-06  Richard M. Stallman  <rms@gnu.org>
+
+        * keyboard.c (Ftop_level): Let Fthrow deal with UNBLOCK_INPUT.
+
+        * eval.c (unwind_to_catch): Use UNBLOCK_INPUT_TO.
+        (Feval, Ffuncall): Use CHECK_CONS_LIST.
+
+        * lisp.h (CHECK_CONS_LIST): New macro (two definitions).
+
+        * blockinput.h (UNBLOCK_INPUT_TO): New macro.
+        (TOTALLY_UNBLOCK_INPUT): Handle a pending signal if any.
+
 2005-03-05  Juri Linkov  <juri@jurta.org>
 
         * emacs.c (USAGE1): Replace Info node name "command arguments"
@@ -107,6 +119,11 @@
 
         * keyboard.c (Fposn_at_x_y): Check integerness of X and Y.
 
+2005-02-27  Richard M. Stallman  <rms@gnu.org>
+
+        * xdisp.c (fast_find_position): Rename END to BEG.
+        (syms_of_xdisp) <menu-bar-update-hook>: Doc fix.
+
 2005-02-27  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
 
         * gtkutil.c (xg_resize_outer_widget): Remove unneeded call to
diff --git a/src/blockinput.h b/src/blockinput.h
index a4c8a9b9c22..a3b50d2a0f2 100644
--- a/src/blockinput.h
+++ b/src/blockinput.h
@@ -94,7 +94,30 @@ extern int pending_atimers;
     }                                           \
   while (0)
 
-#define TOTALLY_UNBLOCK_INPUT (interrupt_input_blocked = 0)
+/* Undo any number of BLOCK_INPUT calls,
+   and also reinvoke any pending signal.  */
+
+#define TOTALLY_UNBLOCK_INPUT                   \
+  if (interrupt_input_blocked != 0)             \
+    {                                           \
+      interrupt_input_blocked = 1;              \
+      UNBLOCK_INPUT;                            \
+    }                                           \
+  else
+
+/* Undo any number of BLOCK_INPUT calls down to level LEVEL,
+   and also (if the level is now 0) reinvoke any pending signal.  */
+
+#define UNBLOCK_INPUT_TO(LEVEL)                         \
+  do                                                    \
+    {                                                   \
+      int oldlevel = interrupt_input_blocked;           \
+      interrupt_input_blocked = (LEVEL) + 1;            \
+      if (interrupt_input_blocked != oldlevel + 1)      \
+        UNBLOCK_INPUT;                                  \
+    }                                                   \
+  while (0)
+
 #define UNBLOCK_INPUT_RESIGNAL UNBLOCK_INPUT
 
 /* In critical section ? */
diff --git a/src/eval.c b/src/eval.c
index 83e16360473..bf4fec4f8a1 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -1176,7 +1176,7 @@ unwind_to_catch (catch, value)
 
   /* Restore certain special C variables.  */
   set_poll_suppress_count (catch->poll_suppress_count);
-  interrupt_input_blocked = catch->interrupt_input_blocked;
+  UNBLOCK_INPUT_TO (catch->interrupt_input_blocked);
   handling_signal = 0;
   immediate_quit = 0;
 
@@ -2067,6 +2067,8 @@ DEFUN ("eval", Feval, Seval, 1, 1, 0,
       args_left = original_args;
       numargs = Flength (args_left);
 
+      CHECK_CONS_LIST ();
+
       if (XINT (numargs) < XSUBR (fun)->min_args ||
           (XSUBR (fun)->max_args >= 0 && XSUBR (fun)->max_args < XINT (numargs)))
         return Fsignal (Qwrong_number_of_arguments, Fcons (fun, Fcons (numargs, Qnil)));
@@ -2190,6 +2192,8 @@ DEFUN ("eval", Feval, Seval, 1, 1, 0,
         return Fsignal (Qinvalid_function, Fcons (fun, Qnil));
     }
  done:
+  CHECK_CONS_LIST ();
+
   lisp_eval_depth--;
   if (backtrace.debug_on_exit)
     val = call_debugger (Fcons (Qexit, Fcons (val, Qnil)));
@@ -2746,6 +2750,8 @@ usage: (funcall FUNCTION &rest ARGUMENTS)  */)
 
   if (SUBRP (fun))
     {
+      CHECK_CONS_LIST ();
+
       if (numargs < XSUBR (fun)->min_args
           || (XSUBR (fun)->max_args >= 0 && XSUBR (fun)->max_args < numargs))
         {
@@ -2844,6 +2850,7 @@ usage: (funcall FUNCTION &rest ARGUMENTS)  */)
         return Fsignal (Qinvalid_function, Fcons (fun, Qnil));
     }
  done:
+  CHECK_CONS_LIST ();
   lisp_eval_depth--;
   if (backtrace.debug_on_exit)
     val = call_debugger (Fcons (Qexit, Fcons (val, Qnil)));
diff --git a/src/keyboard.c b/src/keyboard.c
index 3da16b82271..3fa6240381e 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -1335,11 +1335,6 @@ DEFUN ("top-level", Ftop_level, Stop_level, 0, 0, "",
     cancel_hourglass ();
 #endif
 
-  /* Unblock input if we enter with input blocked.  This may happen if
-     redisplay traps e.g. during tool-bar update with input blocked.  */
-  while (INPUT_BLOCKED_P)
-    UNBLOCK_INPUT;
-
   return Fthrow (Qtop_level, Qnil);
 }
 
diff --git a/src/lisp.h b/src/lisp.h
index cff80f1d090..f677eee0953 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -53,6 +53,11 @@ Boston, MA 02111-1307, USA.  */
 
 #endif /* 0 */
 
+#ifdef GC_CHECK_CONS_LIST
+#define CHECK_CONS_LIST() check_cons_list()
+#else
+#define CHECK_CONS_LIST() 0
+#endif
 
 /* These are default choices for the types to use.  */
 #ifdef _LP64