comparison src/keyboard.c @ 13309:499e9df6c0f6

(Fcommand_execute): New arg KEYS. Callers changed. (read_char): Specify KEYS when handling Vspecial_event_map.

13308:99457b67e20c

	  /* Here for a command that isn't executed directly */

	  nonundocount = 0;
	  if (NILP (current_kboard->Vprefix_arg))
	    Fundo_boundary ();
	  Fcommand_execute (this_command, Qnil);

	}
    directly_done: ;

      /* Note that the value cell will never directly contain nil

  Vquit_flag = save;

  if (!NILP (tem))
    {
      last_input_char = c;
      Fcommand_execute (tem, Qnil);
      goto retry;
    }

  /* Wipe the echo area.  */
  echo_area_glyphs = 0;

    }
  UNGCPRO;
  return make_event_array (i, keybuf);
}

DEFUN ("command-execute", Fcommand_execute, Scommand_execute, 1, 2, 0,
 "Execute CMD as an editor command.\n\
CMD must be a symbol that satisfies the `commandp' predicate.\n\
Optional second arg RECORD-FLAG non-nil\n\
means unconditionally put this command in `command-history'.\n\
Otherwise, that is done only if an arg is read using the minibuffer.")
     (cmd, record)
     Lisp_Object cmd, record;
{
  register Lisp_Object final;
  register Lisp_Object tem;
  Lisp_Object prefixarg;
  struct backtrace backtrace;

      backtrace.function = &Qcall_interactively;
      backtrace.args = &cmd;
      backtrace.nargs = 1;
      backtrace.evalargs = 0;

      tem = Fcall_interactively (cmd, record);

      backtrace_list = backtrace.next;
      return tem;
    }
  return Qnil;

		     ? Vsuggest_key_bindings : make_number (2)),
		    Qnil, Qnil);
	}
    }

  return Fcommand_execute (function, Qt);
}

/* Find the set of keymaps now active.
   Store into *MAPS_P a vector holding the various maps
   and return the number of them.  The vector was malloc'd

13309:499e9df6c0f6

	  /* Here for a command that isn't executed directly */

	  nonundocount = 0;
	  if (NILP (current_kboard->Vprefix_arg))
	    Fundo_boundary ();
	  Fcommand_execute (this_command, Qnil, Qnil);

	}
    directly_done: ;

      /* Note that the value cell will never directly contain nil

  Vquit_flag = save;

  if (!NILP (tem))
    {
      last_input_char = c;
      Fcommand_execute (tem, Qnil, Fvector (1, &last_input_char));
      goto retry;
    }

  /* Wipe the echo area.  */
  echo_area_glyphs = 0;

    }
  UNGCPRO;
  return make_event_array (i, keybuf);
}

DEFUN ("command-execute", Fcommand_execute, Scommand_execute, 1, 3, 0,
 "Execute CMD as an editor command.\n\
CMD must be a symbol that satisfies the `commandp' predicate.\n\
Optional second arg RECORD-FLAG non-nil\n\
means unconditionally put this command in `command-history'.\n\
Otherwise, that is done only if an arg is read using the minibuffer.\n\
The argument KEYS specifies the value to use instead of (this-command-keys)\n\
when reading the arguments; if it is nil, (this_command_key_count) is used.")
     (cmd, record, keys)
     Lisp_Object cmd, record, keys;
{
  register Lisp_Object final;
  register Lisp_Object tem;
  Lisp_Object prefixarg;
  struct backtrace backtrace;

      backtrace.function = &Qcall_interactively;
      backtrace.args = &cmd;
      backtrace.nargs = 1;
      backtrace.evalargs = 0;

      tem = Fcall_interactively (cmd, record, keys);

      backtrace_list = backtrace.next;
      return tem;
    }
  return Qnil;

		     ? Vsuggest_key_bindings : make_number (2)),
		    Qnil, Qnil);
	}
    }

  return Fcommand_execute (function, Qt, Qnil);
}

/* Find the set of keymaps now active.
   Store into *MAPS_P a vector holding the various maps
   and return the number of them.  The vector was malloc'd