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

Diff of /emacs/src/keyboard.c

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

revision 1.690 by lektu, Thu Jul 11 14:12:22 2002 UTC revision 1.691 by rms, Fri Jul 12 11:18:36 2002 UTC
# Line 1199  cmd_error_internal (data, context) Line 1199  cmd_error_internal (data, context)
1199        Fdiscard_input ();        Fdiscard_input ();
1200        bitch_at_user ();        bitch_at_user ();
1201        stream = Qt;        stream = Qt;
1202    
1203          /* If we know from where the error was signaled, show it in
1204             *Messages*.  */
1205          if (!NILP (Vsignaling_function) && SYMBOLP (Vsignaling_function))
1206            {
1207              char *name = XSTRING (SYMBOL_NAME (Vsignaling_function))->data;
1208              message_dolog (name, strlen (name), 0, 0);
1209              message_dolog (": ", 2, 0, 0);
1210              Vsignaling_function = Qnil;
1211            }
1212      }      }
1213    
1214    if (context != 0)    if (context != 0)
# Line 1349  command_loop_1 () Line 1359  command_loop_1 ()
1359    this_command_key_count = 0;    this_command_key_count = 0;
1360    this_single_command_key_start = 0;    this_single_command_key_start = 0;
1361    
1362    /* Make sure this hook runs after commands that get errors and    if (! NILP (Vmemory_full))
      throw to top level.  */  
   /* Note that the value cell will never directly contain nil  
      if the symbol is a local variable.  */  
   if (!NILP (Vpost_command_hook) && !NILP (Vrun_hooks))  
     safe_run_hooks (Qpost_command_hook);  
   
   /* If displaying a message, resize the echo area window to fit  
      that message's size exactly.  */  
   if (!NILP (echo_area_buffer[0]))  
     resize_echo_area_exactly ();  
   
   if (!NILP (Vdeferred_action_list))  
     call0 (Vdeferred_action_function);  
   
   if (!NILP (Vpost_command_idle_hook) && !NILP (Vrun_hooks))  
1363      {      {
1364        if (NILP (Vunread_command_events)        /* Make sure this hook runs after commands that get errors and
1365            && NILP (Vunread_input_method_events)           throw to top level.  */
1366            && NILP (Vunread_post_input_method_events)        /* Note that the value cell will never directly contain nil
1367            && NILP (Vexecuting_macro)           if the symbol is a local variable.  */
1368            && !NILP (sit_for (0, post_command_idle_delay, 0, 1, 1)))        if (!NILP (Vpost_command_hook) && !NILP (Vrun_hooks))
1369          safe_run_hooks (Qpost_command_idle_hook);          safe_run_hooks (Qpost_command_hook);
1370    
1371          /* If displaying a message, resize the echo area window to fit
1372             that message's size exactly.  */
1373          if (!NILP (echo_area_buffer[0]))
1374            resize_echo_area_exactly ();
1375    
1376          if (!NILP (Vdeferred_action_list))
1377            call0 (Vdeferred_action_function);
1378    
1379          if (!NILP (Vpost_command_idle_hook) && !NILP (Vrun_hooks))
1380            {
1381              if (NILP (Vunread_command_events)
1382                  && NILP (Vunread_input_method_events)
1383                  && NILP (Vunread_post_input_method_events)
1384                  && NILP (Vexecuting_macro)
1385                  && !NILP (sit_for (0, post_command_idle_delay, 0, 1, 1)))
1386                safe_run_hooks (Qpost_command_idle_hook);
1387            }
1388      }      }
1389    
1390      Vmemory_full = Qnil;
1391    
1392    /* Do this after running Vpost_command_hook, for consistency.  */    /* Do this after running Vpost_command_hook, for consistency.  */
1393    current_kboard->Vlast_command = Vthis_command;    current_kboard->Vlast_command = Vthis_command;
1394    current_kboard->Vreal_last_command = real_this_command;    current_kboard->Vreal_last_command = real_this_command;

Legend:
Removed from v.1.690  
changed lines
  Added in v.1.691

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