/* Call a Lisp function interactively.
- Copyright (C) 1985, 1986, 1993, 1994, 1995, 1997, 2000, 2002, 2003,
- 2004, 2005 Free Software Foundation, Inc.
+ Copyright (C) 1985, 1986, 1993, 1994, 1995, 1997, 2000, 2001, 2002,
+ 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
/* Marker used within call-interactively to refer to point. */
static Lisp_Object point_marker;
-/* Buffer for the prompt text used in Fcall_interactively. */
-static char *callint_message;
-
-/* Allocated length of that buffer. */
-static int callint_message_size;
-
+/* String for the prompt text used in Fcall_interactively. */
+static Lisp_Object callint_message;
+\f
/* ARGSUSED */
DEFUN ("interactive", Finteractive, Sinteractive, 0, UNEVALLED, 0,
doc: /* Specify a way of parsing arguments for interactive use of a function.
m -- Value of mark as number. Does not do I/O.
M -- Any string. Inherits the current input method.
n -- Number read using minibuffer.
-N -- Raw prefix arg, or if none, do like code `n'.
+N -- Numeric prefix arg, or if none, do like code `n'.
p -- Prefix arg converted to number. Does not do I/O.
P -- Prefix arg in raw form. Does not do I/O.
r -- Region: point and mark as 2 numeric args, smallest first. Does no I/O.
: "The mark is not set now");
if (!NILP (Vtransient_mark_mode) && NILP (Vmark_even_if_inactive)
&& NILP (current_buffer->mark_active))
- Fsignal (Qmark_inactive, Qnil);
+ xsignal0 (Qmark_inactive);
}
/* If the list of args INPUT was produced with an explicit call to
Optional second arg RECORD-FLAG non-nil
means unconditionally put this command in the command-history.
Otherwise, this is done only if an arg is read using the minibuffer.
+
Optional third arg KEYS, if given, specifies the sequence of events to
-supply if the command inquires which events were used to invoke it.
-If KEYS is omitted or nil, the return value of `this-command-keys' is used. */)
+supply, as a vector, if the command inquires which events were used to
+invoke it. If KEYS is omitted or nil, the return value of
+`this-command-keys-vector' is used. */)
(function, record_flag, keys)
Lisp_Object function, record_flag, keys;
{
Lisp_Object *args, *visargs;
- unsigned char **argstrings;
Lisp_Object fun;
Lisp_Object specs;
Lisp_Object filter_specs;
/* Save this now, since use of minibuffer will clobber it. */
prefix_arg = Vcurrent_prefix_arg;
- retry:
-
if (SYMBOLP (function))
enable = Fget (function, Qenable_recursive_minibuffers);
else
up_event = Qnil;
/* Decode the kind of function. Either handle it and return,
- or go to `lose' if not interactive, or go to `retry'
- to specify a different function, or set either STRING or SPECS. */
+ or go to `lose' if not interactive, or set either STRING or SPECS. */
if (SUBRP (fun))
{
if (!string)
{
lose:
- function = wrong_type_argument (Qcommandp, function);
- goto retry;
+ wrong_type_argument (Qcommandp, function);
}
}
else if (COMPILEDP (fun))
/* Count the number of arguments the interactive spec would have
us give to the function. */
tem = string;
- for (j = 0; *tem; j++)
+ for (j = 0; *tem;)
{
/* 'r' specifications ("point and mark as 2 numeric args")
produce *two* arguments. */
- if (*tem == 'r') j++;
+ if (*tem == 'r')
+ j += 2;
+ else
+ j++;
tem = (unsigned char *) index (tem, '\n');
if (tem)
- tem++;
+ ++tem;
else
- tem = (unsigned char *) "";
+ break;
}
count = j;
args = (Lisp_Object *) alloca ((count + 1) * sizeof (Lisp_Object));
visargs = (Lisp_Object *) alloca ((count + 1) * sizeof (Lisp_Object));
- argstrings = (unsigned char **) alloca ((count + 1) * sizeof (char *));
varies = (int *) alloca ((count + 1) * sizeof (int));
for (i = 0; i < (count + 1); i++)
prompt1[sizeof prompt1 - 1] = 0;
tem1 = (char *) index (prompt1, '\n');
if (tem1) *tem1 = 0;
- /* Fill argstrings with a vector of C strings
- corresponding to the Lisp strings in visargs. */
- for (j = 1; j < i; j++)
- argstrings[j]
- = (EQ (visargs[j], Qnil)
- ? (unsigned char *) ""
- : SDATA (visargs[j]));
-
- /* Process the format-string in prompt1, putting the output
- into callint_message. Make callint_message bigger if necessary.
- We don't use a buffer on the stack, because the contents
- need to stay stable for a while. */
- while (1)
- {
- int nchars = doprnt (callint_message, callint_message_size,
- prompt1, (char *)0,
- j - 1, (char **) argstrings + 1);
- if (nchars < callint_message_size - 1)
- break;
- callint_message_size *= 2;
- callint_message
- = (char *) xrealloc (callint_message, callint_message_size);
- }
+
+ visargs[0] = build_string (prompt1);
+ if (index (prompt1, '%'))
+ callint_message = Fformat (i, visargs);
+ else
+ callint_message = visargs[0];
switch (*tem)
{
case 'a': /* Symbol defined as a function */
- visargs[i] = Fcompleting_read (build_string (callint_message),
+ visargs[i] = Fcompleting_read (callint_message,
Vobarray, Qfboundp, Qt,
Qnil, Qnil, Qnil, Qnil);
/* Passing args[i] directly stimulates compiler bug */
args[i] = Fcurrent_buffer ();
if (EQ (selected_window, minibuf_window))
args[i] = Fother_buffer (args[i], Qnil, Qnil);
- args[i] = Fread_buffer (build_string (callint_message), args[i], Qt);
+ args[i] = Fread_buffer (callint_message, args[i], Qt);
break;
case 'B': /* Name of buffer, possibly nonexistent */
- args[i] = Fread_buffer (build_string (callint_message),
+ args[i] = Fread_buffer (callint_message,
Fother_buffer (Fcurrent_buffer (), Qnil, Qnil),
Qnil);
break;
case 'c': /* Character */
- args[i] = Fread_char (build_string (callint_message), Qnil);
+ args[i] = Fread_char (callint_message, Qnil, Qnil);
message1_nolog ((char *) 0);
/* Passing args[i] directly stimulates compiler bug */
teml = args[i];
break;
case 'C': /* Command: symbol with interactive function */
- visargs[i] = Fcompleting_read (build_string (callint_message),
+ visargs[i] = Fcompleting_read (callint_message,
Vobarray, Qcommandp,
Qt, Qnil, Qnil, Qnil, Qnil);
/* Passing args[i] directly stimulates compiler bug */
break;
case 'D': /* Directory name. */
- args[i] = Fread_file_name (build_string (callint_message), Qnil,
+ args[i] = Fread_file_name (callint_message, Qnil,
current_buffer->directory, Qlambda, Qnil,
Qfile_directory_p);
break;
case 'f': /* Existing file name. */
- args[i] = Fread_file_name (build_string (callint_message),
+ args[i] = Fread_file_name (callint_message,
Qnil, Qnil, Qlambda, Qnil, Qnil);
break;
case 'F': /* Possibly nonexistent file name. */
- args[i] = Fread_file_name (build_string (callint_message),
+ args[i] = Fread_file_name (callint_message,
Qnil, Qnil, Qnil, Qnil, Qnil);
break;
case 'G': /* Possibly nonexistent file name,
default to directory alone. */
- args[i] = Fread_file_name (build_string (callint_message),
- Qnil, Qnil, Qnil, build_string (""), Qnil);
+ args[i] = Fread_file_name (callint_message,
+ Qnil, Qnil, Qnil, empty_unibyte_string, Qnil);
break;
case 'i': /* Ignore an argument -- Does not do I/O */
{
int speccount1 = SPECPDL_INDEX ();
specbind (Qcursor_in_echo_area, Qt);
- args[i] = Fread_key_sequence (build_string (callint_message),
+ args[i] = Fread_key_sequence (callint_message,
Qnil, Qnil, Qnil, Qnil);
unbind_to (speccount1, Qnil);
teml = args[i];
/* Ignore first element, which is the base key. */
tem2 = Fmemq (intern ("down"), Fcdr (teml));
if (! NILP (tem2))
- up_event = Fread_event (Qnil, Qnil);
+ up_event = Fread_event (Qnil, Qnil, Qnil);
}
}
break;
{
int speccount1 = SPECPDL_INDEX ();
specbind (Qcursor_in_echo_area, Qt);
- args[i] = Fread_key_sequence (build_string (callint_message),
+ args[i] = Fread_key_sequence (callint_message,
Qnil, Qt, Qnil, Qnil);
teml = args[i];
visargs[i] = Fkey_description (teml, Qnil);
/* Ignore first element, which is the base key. */
tem2 = Fmemq (intern ("down"), Fcdr (teml));
if (! NILP (tem2))
- up_event = Fread_event (Qnil, Qnil);
+ up_event = Fread_event (Qnil, Qnil, Qnil);
}
}
break;
case 'M': /* String read via minibuffer with
inheriting the current input method. */
- args[i] = Fread_string (build_string (callint_message),
+ args[i] = Fread_string (callint_message,
Qnil, Qnil, Qnil, Qt);
break;
- case 'N': /* Prefix arg, else number from minibuffer */
+ case 'N': /* Prefix arg as number, else number from minibuffer */
if (!NILP (prefix_arg))
goto have_prefix_arg;
case 'n': /* Read number from minibuffer. */
do
{
Lisp_Object tem;
- if (! first)
+ if (! first)
{
message ("Please enter a number.");
- sit_for (1, 0, 0, 0, 0);
+ sit_for (make_number (1), 0, 0);
}
first = 0;
- tem = Fread_from_minibuffer (build_string (callint_message),
+ tem = Fread_from_minibuffer (callint_message,
Qnil, Qnil, Qnil, Qnil, Qnil,
- Qnil, Qnil);
+ Qnil);
if (! STRINGP (tem) || SCHARS (tem) == 0)
args[i] = Qnil;
else
}
while (! NUMBERP (args[i]));
}
- visargs[i] = last_minibuf_string;
+ visargs[i] = args[i];
break;
case 'P': /* Prefix arg in raw form. Does no I/O. */
case 's': /* String read via minibuffer without
inheriting the current input method. */
- args[i] = Fread_string (build_string (callint_message),
+ args[i] = Fread_string (callint_message,
Qnil, Qnil, Qnil, Qnil);
break;
case 'S': /* Any symbol. */
- visargs[i] = Fread_string (build_string (callint_message),
+ visargs[i] = Fread_string (callint_message,
Qnil, Qnil, Qnil, Qnil);
/* Passing args[i] directly stimulates compiler bug */
teml = visargs[i];
case 'v': /* Variable name: symbol that is
user-variable-p. */
- args[i] = Fread_variable (build_string (callint_message), Qnil);
+ args[i] = Fread_variable (callint_message, Qnil);
visargs[i] = last_minibuf_string;
break;
case 'x': /* Lisp expression read but not evaluated */
- args[i] = Fread_minibuffer (build_string (callint_message), Qnil);
+ args[i] = Fread_minibuffer (callint_message, Qnil);
visargs[i] = last_minibuf_string;
break;
case 'X': /* Lisp expression read and evaluated */
- args[i] = Feval_minibuffer (build_string (callint_message), Qnil);
+ args[i] = Feval_minibuffer (callint_message, Qnil);
visargs[i] = last_minibuf_string;
break;
else
{
args[i]
- = Fread_non_nil_coding_system (build_string (callint_message));
+ = Fread_non_nil_coding_system (callint_message);
visargs[i] = last_minibuf_string;
}
break;
case 'z': /* Coding-system symbol or nil */
- args[i] = Fread_coding_system (build_string (callint_message), Qnil);
+ args[i] = Fread_coding_system (callint_message, Qnil);
visargs[i] = last_minibuf_string;
break;
point_marker = Fmake_marker ();
staticpro (&point_marker);
+ callint_message = Qnil;
+ staticpro (&callint_message);
+
preserved_fns = Fcons (intern ("region-beginning"),
Fcons (intern ("region-end"),
Fcons (intern ("point"),
Qmouse_leave_buffer_hook = intern ("mouse-leave-buffer-hook");
staticpro (&Qmouse_leave_buffer_hook);
- callint_message_size = 100;
- callint_message = (char *) xmalloc (callint_message_size);
-
-
DEFVAR_KBOARD ("prefix-arg", Vprefix_arg,
doc: /* The value of the prefix argument for the next editing command.
It may be a number, or the symbol `-' for just a minus sign as arg,