Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-57

Merge from emacs--cvs-trunk--0 Patches applied: * emacs--cvs-trunk--0 (patch 324-352) - Merge from gnus--rel--5.10 - Update from CVS - etc/emacs-buffer.gdb: Remove RCS keywords * gnus--rel--5.10 (patch 70-79) - Update from CVS - Merge from emacs--cvs-trunk--0
2005-06-06 02:39:45 +00:00
parent a5c508fe3a a9b4333620
commit fdffd34626
296 changed files with 5865 additions and 2954 deletions
--- a/src/bytecode.c
+++ b/src/bytecode.c
@@ -384,8 +384,11 @@ unmark_byte_stack ()
  do {							\
    if (!NILP (Vquit_flag) && NILP (Vinhibit_quit))	\
      {							\
+        Lisp_Object flag = Vquit_flag;			\
 	Vquit_flag = Qnil;				\
        BEFORE_POTENTIAL_GC ();				\
+	if (EQ (Vthrow_on_input, flag))			\
+	  Fthrow (Vthrow_on_input, Qnil);		\
 	Fsignal (Qquit, Qnil);				\
 	AFTER_POTENTIAL_GC ();				\
      }							\