comparison src/keyboard.c @ 6208:db4139d43f8a

(command_loop_1, read_key_sequence, Fcommand_execute): Don't call Vrun_hooks if it is nil.

6207:993ca5adfcd1

  this_command_key_count = 0;
  last_command = this_command;

  /* Make sure this hook runs after commands that get errors and
     throw to top level.  */
  if (!NILP (Vpost_command_hook))
    {
      /* If we get an error during the post-command-hook,
	 cause post-command-hook to be nil.  */
      Vcommand_hook_internal = Vpost_command_hook;
      Vpost_command_hook = Qnil;

      last_point_position = PT;

      /* Execute the command.  */

      this_command = cmd;
      if (!NILP (Vpre_command_hook))
	{
	  /* If we get an error during the pre-command-hook,
	     cause pre-command-hook to be nil.  */
	  Vcommand_hook_internal = Vpre_command_hook;
	  Vpre_command_hook = Qnil;

	  Fcommand_execute (this_command, Qnil);

	}
    directly_done: ;

      if (!NILP (Vpost_command_hook))
	{
	  /* If we get an error during the post-command-hook,
	     cause post-command-hook to be nil.  */
	  Vcommand_hook_internal = Vpost_command_hook;
	  Vpost_command_hook = Qnil;

	  last_command = this_command;
	  cancel_echoing ();
	  this_command_key_count = 0;
	}

      if (!NILP (current_buffer->mark_active))
	{
	  if (!NILP (Vdeactivate_mark) && !NILP (Vtransient_mark_mode))
	    {
	      current_buffer->mark_active = Qnil;
	      call1 (Vrun_hooks, intern ("deactivate-mark-hook"));

	      if (EQ (posn, Qmenu_bar))
		{
		  if (t + 1 >= bufsize)
		    error ("key sequence too long");
		  /* Run the Lucid hook.  */
		  call1 (Vrun_hooks, Qactivate_menubar_hook);
		  /* If it has changed current-menubar from previous value,
		     really recompute the menubar from the value.  */
		  if (! NILP (Vlucid_menu_bar_dirty_flag))
		    call0 (Qrecompute_lucid_menubar);
		  keybuf[t] = posn;

  debug_on_next_call = 0;

  if (XTYPE (cmd) == Lisp_Symbol)
    {
      tem = Fget (cmd, Qdisabled);
      if (!NILP (tem))
	return call1 (Vrun_hooks, Qdisabled_command_hook);
    }

  while (1)
    {

6208:db4139d43f8a

  this_command_key_count = 0;
  last_command = this_command;

  /* Make sure this hook runs after commands that get errors and
     throw to top level.  */
  if (!NILP (Vpost_command_hook) && !NILP (Vrun_hooks))
    {
      /* If we get an error during the post-command-hook,
	 cause post-command-hook to be nil.  */
      Vcommand_hook_internal = Vpost_command_hook;
      Vpost_command_hook = Qnil;

      last_point_position = PT;

      /* Execute the command.  */

      this_command = cmd;
      if (!NILP (Vpre_command_hook) && !NILP (Vrun_hooks))
	{
	  /* If we get an error during the pre-command-hook,
	     cause pre-command-hook to be nil.  */
	  Vcommand_hook_internal = Vpre_command_hook;
	  Vpre_command_hook = Qnil;

	  Fcommand_execute (this_command, Qnil);

	}
    directly_done: ;

      if (!NILP (Vpost_command_hook) && !NILP (Vrun_hooks))
	{
	  /* If we get an error during the post-command-hook,
	     cause post-command-hook to be nil.  */
	  Vcommand_hook_internal = Vpost_command_hook;
	  Vpost_command_hook = Qnil;

	  last_command = this_command;
	  cancel_echoing ();
	  this_command_key_count = 0;
	}

      if (!NILP (current_buffer->mark_active) && !NILP (Vrun_hooks))
	{
	  if (!NILP (Vdeactivate_mark) && !NILP (Vtransient_mark_mode))
	    {
	      current_buffer->mark_active = Qnil;
	      call1 (Vrun_hooks, intern ("deactivate-mark-hook"));

	      if (EQ (posn, Qmenu_bar))
		{
		  if (t + 1 >= bufsize)
		    error ("key sequence too long");
		  /* Run the Lucid hook.  */
		  if (!NILP (Vrun_hooks))
		    call1 (Vrun_hooks, Qactivate_menubar_hook);
		  /* If it has changed current-menubar from previous value,
		     really recompute the menubar from the value.  */
		  if (! NILP (Vlucid_menu_bar_dirty_flag))
		    call0 (Qrecompute_lucid_menubar);
		  keybuf[t] = posn;

  debug_on_next_call = 0;

  if (XTYPE (cmd) == Lisp_Symbol)
    {
      tem = Fget (cmd, Qdisabled);
      if (!NILP (tem) && !NILP (Vrun_hooks))
	return call1 (Vrun_hooks, Qdisabled_command_hook);
    }

  while (1)
    {