comparison src/keyboard.c @ 30051:70d9d51a864c

(show_help_echo): New function, extracted from read_char. Feval its `msg' argument if it's a cons cell. (read_char): Use it. (follow_key): Pass `autoload' to get_keyelt.

30050:ed1979c6dfb9

  c |= (upper & ~ctrl_modifier);

  return c;
}



/* Input of single characters from keyboard */

Lisp_Object print_help ();

 reread_first:

  /* Display help if not echoing.  */
  if (CONSP (c) && EQ (XCAR (c), Qhelp_echo))
    {
      Lisp_Object msg;
      int count = specpdl_ptr - specpdl;

      specbind (Qmessage_truncate_lines, Qt);
      msg = XCDR (XCDR (c));

      if (!NILP (Vshow_help_function))
	call1 (Vshow_help_function, msg);
      else if (/* Don't overwrite minibuffer contents.  */
	       !MINI_WINDOW_P (XWINDOW (selected_window))
	       /* Don't overwrite a keystroke echo.  */
	       && NILP (echo_message_buffer)
	       /* Don't overwrite a prompt.  */
	       && !cursor_in_echo_area)
	{
	  if (STRINGP (msg))
	    message3_nolog (msg, XSTRING (msg)->size, STRING_MULTIBYTE (msg));
	  else
	    message (0);
	}

      unbind_to (count, Qnil);
      goto retry;
    }
  
  if (this_command_key_count == 0 || ! reread)
    {

	    = XCAR (item);
	  start = item;
	  item = XCDR (item);
	}
	  
      /* Maybee key binding cache.  */
      if (CONSP (item) && CONSP (XCAR (item))
	  && (NILP (XCAR (XCAR (item)))
	      || VECTORP (XCAR (XCAR (item)))))
	{
	  cachelist = XCAR (item);

	  if (did_meta)
	    map = defs[i];
	  else
	    map = current[i];

	  defs[i] = get_keyelt (access_keymap (map, key, 1, 0), 0);
	  if (! NILP (defs[i]))
	    first_binding = i;
	}
      else
	defs[i] = Qnil;

30051:70d9d51a864c

  c |= (upper & ~ctrl_modifier);

  return c;
}

/* Display a help message in the echo area.  */
void
show_help_echo (msg)
     Lisp_Object msg;
{
  int count = specpdl_ptr - specpdl;

  specbind (Qmessage_truncate_lines, Qt);
  if (CONSP (msg))
    msg = Feval (msg);

  if (!NILP (Vshow_help_function))
    call1 (Vshow_help_function, msg);
  else if (/* Don't overwrite minibuffer contents.  */
	   !MINI_WINDOW_P (XWINDOW (selected_window))
	   /* Don't overwrite a keystroke echo.  */
	   && NILP (echo_message_buffer)
	   /* Don't overwrite a prompt.  */
	   && !cursor_in_echo_area)
    {
      if (STRINGP (msg))
	message3_nolog (msg, XSTRING (msg)->size, STRING_MULTIBYTE (msg));
      else
	message (0);
    }

  unbind_to (count, Qnil);
}



/* Input of single characters from keyboard */

Lisp_Object print_help ();

 reread_first:

  /* Display help if not echoing.  */
  if (CONSP (c) && EQ (XCAR (c), Qhelp_echo))
    {
      show_help_echo (XCDR (XCDR (c)));
      goto retry;
    }
  
  if (this_command_key_count == 0 || ! reread)
    {

	    = XCAR (item);
	  start = item;
	  item = XCDR (item);
	}
	  
      /* Maybe key binding cache.  */
      if (CONSP (item) && CONSP (XCAR (item))
	  && (NILP (XCAR (XCAR (item)))
	      || VECTORP (XCAR (XCAR (item)))))
	{
	  cachelist = XCAR (item);

	  if (did_meta)
	    map = defs[i];
	  else
	    map = current[i];

	  defs[i] = get_keyelt (access_keymap (map, key, 1, 0), 1);
	  if (! NILP (defs[i]))
	    first_binding = i;
	}
      else
	defs[i] = Qnil;