comparison src/keyboard.c @ 8076:3a35434b19d2

(safe_run_hooks): Take symbol as arg. Use Fsymbol_value and Fset. (command_loop_1): Pass symbol to safe_run_hooks. Look in the value cell to check for trivial case (no hooks). (read_key_sequence): Don't echo if echo_keystrokes is 0.

8075:b546fa7e9911

  no_redisplay = 0;
  this_command_key_count = 0;

  /* Make sure this hook runs after commands that get errors and
     throw to top level.  */
  if (!NILP (Vpost_command_hook) && !NILP (Vrun_hooks))
    safe_run_hooks (&Vpost_command_hook);

  /* Do this after running Vpost_command_hook, for consistency.  */
  last_command = this_command;

  while (1)

      XSET (last_point_position_buffer, Lisp_Buffer, prev_buffer);

      /* Execute the command.  */

      this_command = cmd;
      if (!NILP (Vpre_command_hook) && !NILP (Vrun_hooks))
	safe_run_hooks (&Vpre_command_hook);

      if (NILP (this_command))
	{
	  /* nil means key is undefined.  */
	  bitch_at_user ();

	  Fcommand_execute (this_command, Qnil);

	}
    directly_done: ;

      if (!NILP (Vpost_command_hook) && !NILP (Vrun_hooks))
	safe_run_hooks (&Vpost_command_hook);

      /* If there is a prefix argument,
	 1) We don't want last_command to be ``universal-argument''
	 (that would be dumb), so don't set last_command,
	 2) we want to leave echoing on so that the prefix will be

/* If we get an error while running the hook, cause the hook variable
   to be nil.  Also inhibit quits, so that C-g won't cause the hook
   to mysteriously evaporate.  */
static void
safe_run_hooks (hook)
     Lisp_Object *hook;
{
  int count = specpdl_ptr - specpdl;
  specbind (Qinhibit_quit, Qt);

  Vcommand_hook_internal = *hook;
  *hook = Qnil;
  call1 (Vrun_hooks, Qcommand_hook_internal);
  *hook = Vcommand_hook_internal;

  unbind_to (count, Qnil);
}

/* Number of seconds between polling for input.  */

  if (INTERACTIVE)
    {
      if (!NILP (prompt))
	echo_prompt (XSTRING (prompt)->data);
      else if (cursor_in_echo_area)
	/* This doesn't put in a dash if the echo buffer is empty, so
	   you don't always see a dash hanging out in the minibuffer.  */
	echo_dash ();
    }

      /* Does mock_input indicate that we are re-reading a key sequence?  */
      if (t < mock_input)
	{
	  key = keybuf[t];
	  add_command_key (key);
	  echo_char (key);
	}

      /* If not, we should actually read a character.  */
      else
	{

     read-key-sequence will always return a logical unit.

     Better ideas?  */
  for (; t < mock_input; t++)
    {
      echo_char (keybuf[t]);
      add_command_key (keybuf[t]);
    }

  return t;
}

8076:3a35434b19d2

  no_redisplay = 0;
  this_command_key_count = 0;

  /* Make sure this hook runs after commands that get errors and
     throw to top level.  */
  /* Note that the value cell will never directly contain nil
     if the symbol is a local variable.  */
  if (!NILP (XSYMBOL (Qpost_command_hook)->value) && !NILP (Vrun_hooks))
    safe_run_hooks (Qpost_command_hook);

  /* Do this after running Vpost_command_hook, for consistency.  */
  last_command = this_command;

  while (1)

      XSET (last_point_position_buffer, Lisp_Buffer, prev_buffer);

      /* Execute the command.  */

      this_command = cmd;
      /* Note that the value cell will never directly contain nil
	 if the symbol is a local variable.  */
      if (!NILP (XSYMBOL (Qpre_command_hook)->value) && !NILP (Vrun_hooks))
	safe_run_hooks (Qpre_command_hook);

      if (NILP (this_command))
	{
	  /* nil means key is undefined.  */
	  bitch_at_user ();

	  Fcommand_execute (this_command, Qnil);

	}
    directly_done: ;

      /* Note that the value cell will never directly contain nil
	 if the symbol is a local variable.  */
      if (!NILP (XSYMBOL (Qpost_command_hook)->value) && !NILP (Vrun_hooks))
	safe_run_hooks (Qpost_command_hook);

      /* If there is a prefix argument,
	 1) We don't want last_command to be ``universal-argument''
	 (that would be dumb), so don't set last_command,
	 2) we want to leave echoing on so that the prefix will be

/* If we get an error while running the hook, cause the hook variable
   to be nil.  Also inhibit quits, so that C-g won't cause the hook
   to mysteriously evaporate.  */
static void
safe_run_hooks (hook)
     Lisp_Object hook;
{
  int count = specpdl_ptr - specpdl;
  specbind (Qinhibit_quit, Qt);

  /* We read and set the variable with functions,
     in case it's buffer-local.  */
  Vcommand_hook_internal = Fsymbol_value (hook);
  Fset (hook, Qnil);
  call1 (Vrun_hooks, Qcommand_hook_internal);
  Fset (hook, Vcommand_hook_internal);

  unbind_to (count, Qnil);
}

/* Number of seconds between polling for input.  */

  if (INTERACTIVE)
    {
      if (!NILP (prompt))
	echo_prompt (XSTRING (prompt)->data);
      else if (cursor_in_echo_area && echo_keystrokes)
	/* This doesn't put in a dash if the echo buffer is empty, so
	   you don't always see a dash hanging out in the minibuffer.  */
	echo_dash ();
    }

      /* Does mock_input indicate that we are re-reading a key sequence?  */
      if (t < mock_input)
	{
	  key = keybuf[t];
	  add_command_key (key);
	  if (echo_keystrokes)
	    echo_char (key);
	}

      /* If not, we should actually read a character.  */
      else
	{

     read-key-sequence will always return a logical unit.

     Better ideas?  */
  for (; t < mock_input; t++)
    {
      if (echo_keystrokes)
	echo_char (keybuf[t]);
      add_command_key (keybuf[t]);
    }

  return t;
}