[Emacs-diffs] Changes to emacs/src/eval.c

[Richard M . Stallman]

Index: emacs/src/eval.c
diff -c emacs/src/eval.c:1.227 emacs/src/eval.c:1.228
*** emacs/src/eval.c:1.227      Fri Nov 26 11:47:20 2004
--- emacs/src/eval.c    Thu Dec  2 23:36:53 2004
***************
*** 573,579 ****
  unconditionally for that argument.  (`p' is a good way to do this.)  */)
       ()
  {
!   return (INTERACTIVE && interactive_p (1)) ? Qt : Qnil;
  }
  
  
--- 573,579 ----
  unconditionally for that argument.  (`p' is a good way to do this.)  */)
       ()
  {
!   return interactive_p (1) ? Qt : Qnil;
  }
  
  
***************
*** 595,601 ****
    /* If this isn't a byte-compiled function, there may be a frame at
       the top for Finteractive_p.  If so, skip it.  */
    fun = Findirect_function (*btp->function);
!   if (SUBRP (fun) && XSUBR (fun) == &Sinteractive_p)
      btp = btp->next;
  
    /* If we're running an Emacs 18-style byte-compiled function, there
--- 595,602 ----
    /* If this isn't a byte-compiled function, there may be a frame at
       the top for Finteractive_p.  If so, skip it.  */
    fun = Findirect_function (*btp->function);
!   if (SUBRP (fun) && (XSUBR (fun) == &Sinteractive_p
!                     || XSUBR (fun) == &Scalled_interactively_p))
      btp = btp->next;
  
    /* If we're running an Emacs 18-style byte-compiled function, there
***************
*** 1173,1181 ****
    /* Save the value in the tag.  */
    catch->val = value;
  
!   /* Restore the polling-suppression count.  */
    set_poll_suppress_count (catch->poll_suppress_count);
    interrupt_input_blocked = catch->interrupt_input_blocked;
  
    do
      {
--- 1174,1183 ----
    /* Save the value in the tag.  */
    catch->val = value;
  
!   /* Restore certain special C variables.  */
    set_poll_suppress_count (catch->poll_suppress_count);
    interrupt_input_blocked = catch->interrupt_input_blocked;
+   handling_signal = 0;
  
    do
      {