/[emacs]/emacs/src/eval.c
ViewVC logotype

Diff of /emacs/src/eval.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.227 by eliz, Fri Nov 26 11:47:20 2004 UTC revision 1.228 by rms, Thu Dec 2 23:36:53 2004 UTC
# Line 573  optional argument, and making the `inter Line 573  optional argument, and making the `inter
573  unconditionally for that argument.  (`p' is a good way to do this.)  */)  unconditionally for that argument.  (`p' is a good way to do this.)  */)
574       ()       ()
575  {  {
576    return (INTERACTIVE && interactive_p (1)) ? Qt : Qnil;    return interactive_p (1) ? Qt : Qnil;
577  }  }
578    
579    
# Line 595  interactive_p (exclude_subrs_p) Line 595  interactive_p (exclude_subrs_p)
595    /* If this isn't a byte-compiled function, there may be a frame at    /* If this isn't a byte-compiled function, there may be a frame at
596       the top for Finteractive_p.  If so, skip it.  */       the top for Finteractive_p.  If so, skip it.  */
597    fun = Findirect_function (*btp->function);    fun = Findirect_function (*btp->function);
598    if (SUBRP (fun) && XSUBR (fun) == &Sinteractive_p)    if (SUBRP (fun) && (XSUBR (fun) == &Sinteractive_p
599                          || XSUBR (fun) == &Scalled_interactively_p))
600      btp = btp->next;      btp = btp->next;
601    
602    /* If we're running an Emacs 18-style byte-compiled function, there    /* If we're running an Emacs 18-style byte-compiled function, there
# Line 1173  unwind_to_catch (catch, value) Line 1174  unwind_to_catch (catch, value)
1174    /* Save the value in the tag.  */    /* Save the value in the tag.  */
1175    catch->val = value;    catch->val = value;
1176    
1177    /* Restore the polling-suppression count.  */    /* Restore certain special C variables.  */
1178    set_poll_suppress_count (catch->poll_suppress_count);    set_poll_suppress_count (catch->poll_suppress_count);
1179    interrupt_input_blocked = catch->interrupt_input_blocked;    interrupt_input_blocked = catch->interrupt_input_blocked;
1180      handling_signal = 0;
1181    
1182    do    do
1183      {      {

Legend:
Removed from v.1.227  
changed lines
  Added in v.1.228

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26