#include "insdel.h"
#include "window.h"
-extern int num_input_chars;
+extern Charcount num_input_chars;
Lisp_Object Vcurrent_prefix_arg;
Lisp_Object Qcall_interactively;
#endif
#if 0 /* ill-conceived */
+/* FSF calls Qmouse_leave_buffer_hook at all sorts of random places,
+ including a bunch of places in their mouse.el. If this is
+ implemented, it has to be done cleanly. */
Lisp_Object Vmouse_leave_buffer_hook, Qmouse_leave_buffer_hook;
#endif
-Lisp_Object Qlet, QletX, Qsave_excursion;
+Lisp_Object QletX, Qsave_excursion;
-Lisp_Object Qcurrent_prefix_arg;
-
-Lisp_Object Quser_variable_p;
Lisp_Object Qread_from_minibuffer;
Lisp_Object Qread_file_name;
Lisp_Object Qread_directory_name;
static Lisp_Object
quotify_args (Lisp_Object expr)
{
- REGISTER Lisp_Object tail;
- REGISTER struct Lisp_Cons *ptr;
+ Lisp_Object tail;
+ Lisp_Cons *ptr;
for (tail = expr; CONSP (tail); tail = ptr->cdr)
{
ptr = XCONS (tail);
}
static Lisp_Object
-callint_prompt (CONST Bufbyte *prompt_start, Bytecount prompt_length,
- CONST Lisp_Object *args, int nargs)
+callint_prompt (const Bufbyte *prompt_start, Bytecount prompt_length,
+ const Lisp_Object *args, int nargs)
{
Lisp_Object s = make_string (prompt_start, prompt_length);
struct gcpro gcpro1;
#endif
/* If SPECS is a string, we reset prompt_data to string_data
* (XSTRING (specs)) every time a GC might have occurred */
- CONST char *prompt_data = 0;
+ const char *prompt_data = 0;
int prompt_index = 0;
int argcount;
int set_zmacs_region_stays = 0;
}
else if (COMPILED_FUNCTIONP (fun))
{
- struct Lisp_Compiled_Function *b = XCOMPILED_FUNCTION (fun);
- if (!(b->flags.interactivep))
+ Lisp_Compiled_Function *f = XCOMPILED_FUNCTION (fun);
+ if (! f->flags.interactivep)
goto lose;
- specs = compiled_function_interactive (b);
+ specs = compiled_function_interactive (f);
}
else if (!CONSP (fun))
goto lose;
if (EQ (funcar, Qautoload))
{
- struct gcpro gcpro1, gcpro2;
- GCPRO2 (function, prefix);
+ struct gcpro gcpro1;
+ GCPRO1 (prefix);
+ /* do_autoload GCPROs both arguments */
do_autoload (fun, function);
UNGCPRO;
goto retry;
{
Lisp_Object domain = Qnil;
if (COMPILED_FUNCTIONP (fun))
- domain = Fcompiled_function_domain (fun);
+ domain = compiled_function_domain (XCOMPILED_FUNCTION (fun));
if (NILP (domain))
specs = Fgettext (specs);
else
for (;;)
{
if (STRINGP (specs))
- prompt_data = (CONST char *) XSTRING_DATA (specs);
+ prompt_data = (const char *) XSTRING_DATA (specs);
if (prompt_data[prompt_index] == '+')
error ("`+' is not used in `interactive' for ordinary commands");
us give to the function. */
argcount = 0;
{
- CONST char *tem;
+ const char *tem;
for (tem = prompt_data + prompt_index; *tem; )
{
/* 'r' specifications ("point and mark as 2 numeric args")
argcount += 2;
else
argcount += 1;
- tem = (CONST char *) strchr (tem + 1, '\n');
+ tem = (const char *) strchr (tem + 1, '\n');
if (!tem)
break;
tem++;
struct gcpro gcpro1;
GCPRO1 (fun);
- fun = funcall_recording_as (function, 1, &fun);
+ fun = Ffuncall (1, &fun);
UNGCPRO;
}
if (set_zmacs_region_stays)
for (argnum = 0; ; argnum++)
{
- CONST char *prompt_start = prompt_data + prompt_index + 1;
- CONST char *prompt_limit = (CONST char *) strchr (prompt_start, '\n');
+ const char *prompt_start = prompt_data + prompt_index + 1;
+ const char *prompt_limit = (const char *) strchr (prompt_start, '\n');
int prompt_length;
prompt_length = ((prompt_limit)
? (prompt_limit - prompt_start)
- : strlen (prompt_start));
+ : (int) strlen (prompt_start));
if (prompt_limit && prompt_limit[1] == 0)
{
prompt_limit = 0; /* "sfoo:\n" -- strip tailing return */
prompts with "Set key C-x C-f to command: "instead of printing
event objects in there.
*/
-#define PROMPT() callint_prompt ((CONST Bufbyte *) prompt_start, prompt_length, visargs, argnum)
+#define PROMPT() callint_prompt ((const Bufbyte *) prompt_start, prompt_length, visargs, argnum)
switch (prompt_data[prompt_index])
{
case 'a': /* Symbol defined as a function */
}
case 'S': /* Any symbol. */
{
-#if 0 /* Historical crock */
- Lisp_Object tem = intern ("minibuffer-local-ns-map");
- tem = find_symbol_value (tem);
- if (UNBOUNDP (tem)) tem = Qnil;
- tem = call3 (Qread_from_minibuffer, PROMPT (), Qnil,
- tem);
- args[argnum] = Fintern (tem, Qnil);
-#else /* 1 */
visargs[argnum] = Qnil;
for (;;)
{
directly */
break;
}
-#endif /* 1 */
arg_from_tty = 1;
break;
}
if (!prompt_limit)
break;
if (STRINGP (specs))
- prompt_data = (CONST char *) XSTRING_DATA (specs);
+ prompt_data = (const char *) XSTRING_DATA (specs);
prompt_index += prompt_length + 1 + 1; /* +1 to skip spec, +1 for \n */
}
unbind_to (speccount, Qnil);
}
DEFUN ("prefix-numeric-value", Fprefix_numeric_value, 1, 1, 0, /*
-Return numeric meaning of raw prefix argument ARG.
+Return numeric meaning of raw prefix argument RAW.
A raw prefix argument is what you get from `(interactive "P")'.
Its numeric meaning is what you would get from `(interactive "p")'.
*/
defsymbol (&Qevents_to_keys, "events-to-keys");
defsymbol (&Qcommand_debug_status, "command-debug-status");
defsymbol (&Qenable_recursive_minibuffers, "enable-recursive-minibuffers");
- defsymbol (&Quser_variable_p, "user-variable-p");
- defsymbol (&Qcurrent_prefix_arg, "current-prefix-arg");
- defsymbol (&Qlet, "let");
defsymbol (&QletX, "let*");
defsymbol (&Qsave_excursion, "save-excursion");
#if 0 /* ill-conceived */