[Emacs-diffs] Changes to emacs/src/lisp.h

[Richard M . Stallman]

Index: emacs/src/lisp.h
diff -c emacs/src/lisp.h:1.515 emacs/src/lisp.h:1.516
*** emacs/src/lisp.h:1.515      Tue Dec  7 08:25:43 2004
--- emacs/src/lisp.h    Mon Dec 13 18:56:52 2004
***************
*** 1768,1778 ****
--- 1768,1782 ----
  #ifdef SYNC_INPUT
  extern void handle_async_input P_ ((void));
  extern int interrupt_input_pending;
+ 
  #define QUIT                                          \
    do {                                                        \
      if (!NILP (Vquit_flag) && NILP (Vinhibit_quit))   \
        {                                                       \
+         Lisp_Object flag = Vquit_flag;                        \
        Vquit_flag = Qnil;                              \
+       if (EQ (Vthrow_on_input, flag))                 \
+         Fthrow (Vthrow_on_input, Qnil);               \
        Fsignal (Qquit, Qnil);                          \
        }                                                       \
      else if (interrupt_input_pending)                 \
***************
*** 1785,1791 ****
--- 1789,1798 ----
    do {                                                        \
      if (!NILP (Vquit_flag) && NILP (Vinhibit_quit))   \
        {                                                       \
+         Lisp_Object flag = Vquit_flag;                        \
        Vquit_flag = Qnil;                              \
+       if (EQ (Vthrow_on_input, flag))                 \
+         Fthrow (Vthrow_on_input, Qnil);               \
        Fsignal (Qquit, Qnil);                          \
        }                                                       \
    } while (0)
***************
*** 2876,2881 ****
--- 2883,2889 ----
  extern void cancel_echoing P_ ((void));
  extern Lisp_Object Qdisabled, QCfilter;
  extern Lisp_Object Vtty_erase_char, Vhelp_form, Vtop_level;
+ extern Lisp_Object Vthrow_on_input;
  extern int input_pending;
  EXFUN (Fdiscard_input, 0);
  EXFUN (Frecursive_edit, 0);