X-Git-Url: http://git.hcoop.net/bpt/emacs.git/blobdiff_plain/7539e11fca07e5837010aaae18eaaefc7e51cf52..db707a17c5cdc5d70b335492bb6a13f3e64c7a6f:/src/callint.c diff --git a/src/callint.c b/src/callint.c index 8efab94673..4789fb5582 100644 --- a/src/callint.c +++ b/src/callint.c @@ -1,5 +1,6 @@ /* Call a Lisp function interactively. - Copyright (C) 1985, 86, 93, 94, 95, 1997 Free Software Foundation, Inc. + Copyright (C) 1985, 1986, 1993, 1994, 1995, 1997, 2000, 2002, 2003, + 2004, 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. @@ -15,27 +16,32 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ #include + #include "lisp.h" #include "buffer.h" #include "commands.h" #include "keyboard.h" #include "window.h" -#include "mocklisp.h" +#include "keymap.h" -extern char *index (); +#ifdef HAVE_INDEX +extern char *index P_ ((const char *, int)); +#endif extern Lisp_Object Qcursor_in_echo_area; +extern Lisp_Object Qfile_directory_p; Lisp_Object Vcurrent_prefix_arg, Qminus, Qplus; Lisp_Object Qcall_interactively; Lisp_Object Vcommand_history; extern Lisp_Object Vhistory_length; +extern Lisp_Object Vthis_original_command, real_this_command; Lisp_Object Vcommand_debug_status, Qcommand_debug_status; Lisp_Object Qenable_recursive_minibuffers; @@ -46,7 +52,7 @@ Lisp_Object Vmark_even_if_inactive; Lisp_Object Vmouse_leave_buffer_hook, Qmouse_leave_buffer_hook; -Lisp_Object Qlist, Qlet, Qletx, Qsave_excursion; +Lisp_Object Qlist, Qlet, Qletx, Qsave_excursion, Qprogn, Qif, Qwhen; static Lisp_Object preserved_fns; /* Marker used within call-interactively to refer to point. */ @@ -58,72 +64,69 @@ static char *callint_message; /* Allocated length of that buffer. */ static int callint_message_size; -/* This comment supplies the doc string for interactive, - for make-docfile to see. We cannot put this in the real DEFUN - due to limits in the Unix cpp. - -DEFUN ("interactive", Ffoo, Sfoo, 0, 0, 0, - "Specify a way of parsing arguments for interactive use of a function.\n\ -For example, write\n\ - (defun foo (arg) \"Doc string\" (interactive \"p\") ...use arg...)\n\ -to make ARG be the prefix argument when `foo' is called as a command.\n\ -The \"call\" to `interactive' is actually a declaration rather than a function;\n\ - it tells `call-interactively' how to read arguments\n\ - to pass to the function.\n\ -When actually called, `interactive' just returns nil.\n\ -\n\ -The argument of `interactive' is usually a string containing a code letter\n\ - followed by a prompt. (Some code letters do not use I/O to get\n\ - the argument and do not need prompts.) To prompt for multiple arguments,\n\ - give a code letter, its prompt, a newline, and another code letter, etc.\n\ - Prompts are passed to format, and may use % escapes to print the\n\ - arguments that have already been read.\n\ -If the argument is not a string, it is evaluated to get a list of\n\ - arguments to pass to the function.\n\ -Just `(interactive)' means pass no args when calling interactively.\n\ -\nCode letters available are:\n\ -a -- Function name: symbol with a function definition.\n\ -b -- Name of existing buffer.\n\ -B -- Name of buffer, possibly nonexistent.\n\ -c -- Character (no input method is used).\n\ -C -- Command name: symbol with interactive function definition.\n\ -d -- Value of point as number. Does not do I/O.\n\ -D -- Directory name.\n\ -e -- Parametrized event (i.e., one that's a list) that invoked this command.\n\ - If used more than once, the Nth `e' returns the Nth parameterized event.\n\ - This skips events that are integers or symbols.\n\ -f -- Existing file name.\n\ -F -- Possibly nonexistent file name.\n\ -i -- Ignored, i.e. always nil. Does not do I/O.\n\ -k -- Key sequence (downcase the last event if needed to get a definition).\n\ -K -- Key sequence to be redefined (do not downcase the last event).\n\ -m -- Value of mark as number. Does not do I/O.\n\ -M -- Any string. Inherits the current input method.\n\ -n -- Number read using minibuffer.\n\ -N -- Raw prefix arg, or if none, do like code `n'.\n\ -p -- Prefix arg converted to number. Does not do I/O.\n\ -P -- Prefix arg in raw form. Does not do I/O.\n\ -r -- Region: point and mark as 2 numeric args, smallest first. Does no I/O.\n\ -s -- Any string. Does not inherit the current input method.\n\ -S -- Any symbol.\n\ -v -- Variable name: symbol that is user-variable-p.\n\ -x -- Lisp expression read but not evaluated.\n\ -X -- Lisp expression read and evaluated.\n\ -z -- Coding system.\n\ -Z -- Coding system, nil if no prefix arg.\n\ -In addition, if the string begins with `*'\n\ - then an error is signaled if the buffer is read-only.\n\ - This happens before reading any arguments.\n\ -If the string begins with `@', then Emacs searches the key sequence\n\ - which invoked the command for its first mouse click (or any other\n\ - event which specifies a window), and selects that window before\n\ - reading any arguments. You may use both `@' and `*'; they are\n\ - processed in the order that they appear." */ - /* ARGSUSED */ DEFUN ("interactive", Finteractive, Sinteractive, 0, UNEVALLED, 0, - 0 /* See immediately above */) - (args) + doc: /* Specify a way of parsing arguments for interactive use of a function. +For example, write + (defun foo (arg) "Doc string" (interactive "p") ...use arg...) +to make ARG be the prefix argument when `foo' is called as a command. +The "call" to `interactive' is actually a declaration rather than a function; + it tells `call-interactively' how to read arguments + to pass to the function. +When actually called, `interactive' just returns nil. + +The argument of `interactive' is usually a string containing a code letter + followed by a prompt. (Some code letters do not use I/O to get + the argument and do not need prompts.) To prompt for multiple arguments, + give a code letter, its prompt, a newline, and another code letter, etc. + Prompts are passed to format, and may use % escapes to print the + arguments that have already been read. +If the argument is not a string, it is evaluated to get a list of + arguments to pass to the function. +Just `(interactive)' means pass no args when calling interactively. + +Code letters available are: +a -- Function name: symbol with a function definition. +b -- Name of existing buffer. +B -- Name of buffer, possibly nonexistent. +c -- Character (no input method is used). +C -- Command name: symbol with interactive function definition. +d -- Value of point as number. Does not do I/O. +D -- Directory name. +e -- Parametrized event (i.e., one that's a list) that invoked this command. + If used more than once, the Nth `e' returns the Nth parameterized event. + This skips events that are integers or symbols. +f -- Existing file name. +F -- Possibly nonexistent file name. +G -- Possibly nonexistent file name, defaulting to just directory name. +i -- Ignored, i.e. always nil. Does not do I/O. +k -- Key sequence (downcase the last event if needed to get a definition). +K -- Key sequence to be redefined (do not downcase the last event). +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'. +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. +s -- Any string. Does not inherit the current input method. +S -- Any symbol. +U -- Mouse up event discarded by a previous k or K argument. +v -- Variable name: symbol that is user-variable-p. +x -- Lisp expression read but not evaluated. +X -- Lisp expression read and evaluated. +z -- Coding system. +Z -- Coding system, nil if no prefix arg. +In addition, if the string begins with `*' + then an error is signaled if the buffer is read-only. + This happens before reading any arguments. +If the string begins with `@', then Emacs searches the key sequence + which invoked the command for its first mouse click (or any other + event which specifies a window), and selects that window before + reading any arguments. You may use both `@' and `*'; they are + processed in the order that they appear. +usage: (interactive ARGS) */) + (args) Lisp_Object args; { return Qnil; @@ -152,7 +155,7 @@ quotify_args (exp) for (tail = exp; CONSP (tail); tail = next) { next = XCDR (tail); - XCAR (tail) = quotify_arg (XCAR (tail)); + XSETCAR (tail, quotify_arg (XCAR (tail))); } return exp; } @@ -161,40 +164,114 @@ char *callint_argfuns[] = {"", "point", "mark", "region-beginning", "region-end"}; static void -check_mark () +check_mark (for_region) + int for_region; { Lisp_Object tem; tem = Fmarker_buffer (current_buffer->mark); if (NILP (tem) || (XBUFFER (tem) != current_buffer)) - error ("The mark is not set now"); + error (for_region ? "The mark is not set now, so there is no region" + : "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); } +/* If the list of args INPUT was produced with an explicit call to + `list', look for elements that were computed with + (region-beginning) or (region-end), and put those expressions into + VALUES instead of the present values. + + This function doesn't return a value because it modifies elements + of VALUES to do its job. */ + +static void +fix_command (input, values) + Lisp_Object input, values; +{ + if (CONSP (input)) + { + Lisp_Object car; + + car = XCAR (input); + /* Skip through certain special forms. */ + while (EQ (car, Qlet) || EQ (car, Qletx) + || EQ (car, Qsave_excursion) + || EQ (car, Qprogn)) + { + while (CONSP (XCDR (input))) + input = XCDR (input); + input = XCAR (input); + if (!CONSP (input)) + break; + car = XCAR (input); + } + if (EQ (car, Qlist)) + { + Lisp_Object intail, valtail; + for (intail = Fcdr (input), valtail = values; + CONSP (valtail); + intail = Fcdr (intail), valtail = XCDR (valtail)) + { + Lisp_Object elt; + elt = Fcar (intail); + if (CONSP (elt)) + { + Lisp_Object presflag, carelt; + carelt = Fcar (elt); + /* If it is (if X Y), look at Y. */ + if (EQ (carelt, Qif) + && EQ (Fnthcdr (make_number (3), elt), Qnil)) + elt = Fnth (make_number (2), elt); + /* If it is (when ... Y), look at Y. */ + else if (EQ (carelt, Qwhen)) + { + while (CONSP (XCDR (elt))) + elt = XCDR (elt); + elt = Fcar (elt); + } + + /* If the function call we're looking at + is a special preserved one, copy the + whole expression for this argument. */ + if (CONSP (elt)) + { + presflag = Fmemq (Fcar (elt), preserved_fns); + if (!NILP (presflag)) + Fsetcar (valtail, Fcar (intail)); + } + } + } + } + } +} DEFUN ("call-interactively", Fcall_interactively, Scall_interactively, 1, 3, 0, - "Call FUNCTION, reading args according to its interactive calling specs.\n\ -Return the value FUNCTION returns.\n\ -The function contains a specification of how to do the argument reading.\n\ -In the case of user-defined functions, this is specified by placing a call\n\ -to the function `interactive' at the top level of the function body.\n\ -See `interactive'.\n\ -\n\ -Optional second arg RECORD-FLAG non-nil\n\ -means unconditionally put this command in the command-history.\n\ -Otherwise, this is done only if an arg is read using the minibuffer.") - (function, record_flag, keys) + doc: /* Call FUNCTION, reading args according to its interactive calling specs. +Return the value FUNCTION returns. +The function contains a specification of how to do the argument reading. +In the case of user-defined functions, this is specified by placing a call +to the function `interactive' at the top level of the function body. +See `interactive'. + +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. */) + (function, record_flag, keys) Lisp_Object function, record_flag, keys; { Lisp_Object *args, *visargs; unsigned char **argstrings; Lisp_Object fun; - Lisp_Object funcar; Lisp_Object specs; + Lisp_Object filter_specs; Lisp_Object teml; + Lisp_Object up_event; Lisp_Object enable; - int speccount = specpdl_ptr - specpdl; + int speccount = SPECPDL_INDEX (); /* The index of the next element of this_command_keys to examine for the 'e' interactive code. */ @@ -214,14 +291,23 @@ Otherwise, this is done only if an arg is read using the minibuffer.") char prompt1[100]; char *tem1; int arg_from_tty = 0; - struct gcpro gcpro1, gcpro2, gcpro3, gcpro4; + struct gcpro gcpro1, gcpro2, gcpro3, gcpro4, gcpro5; int key_count; + int record_then_fail = 0; + + Lisp_Object save_this_command, save_last_command; + Lisp_Object save_this_original_command, save_real_this_command; + + save_this_command = Vthis_command; + save_this_original_command = Vthis_original_command; + save_real_this_command = real_this_command; + save_last_command = current_kboard->Vlast_command; if (NILP (keys)) keys = this_command_keys, key_count = this_command_key_count; else { - CHECK_VECTOR (keys, 3); + CHECK_VECTOR (keys); key_count = XVECTOR (keys)->size; } @@ -232,11 +318,20 @@ Otherwise, this is done only if an arg is read using the minibuffer.") if (SYMBOLP (function)) enable = Fget (function, Qenable_recursive_minibuffers); + else + enable = Qnil; fun = indirect_function (function); specs = Qnil; string = 0; + /* The idea of FILTER_SPECS is to provide away to + specify how to represent the arguments in command history. + The feature is not fully implemented. */ + filter_specs = Qnil; + + /* If k or K discard an up-event, save it here so it can be retrieved with U */ + up_event = Qnil; /* Decode the kind of function. Either handle it and return, or go to `lose' if not interactive, or go to `retry' @@ -251,9 +346,6 @@ Otherwise, this is done only if an arg is read using the minibuffer.") function = wrong_type_argument (Qcommandp, function); goto retry; } - if ((EMACS_INT) string == 1) - /* Let SPECS (which is nil) be used as the args. */ - string = 0; } else if (COMPILEDP (fun)) { @@ -261,38 +353,26 @@ Otherwise, this is done only if an arg is read using the minibuffer.") goto lose; specs = XVECTOR (fun)->contents[COMPILED_INTERACTIVE]; } - else if (!CONSP (fun)) - goto lose; - else if (funcar = Fcar (fun), EQ (funcar, Qautoload)) + else { + Lisp_Object form; GCPRO2 (function, prefix_arg); - do_autoload (fun, function); + form = Finteractive_form (function); UNGCPRO; - goto retry; - } - else if (EQ (funcar, Qlambda)) - { - specs = Fassq (Qinteractive, Fcdr (Fcdr (fun))); - if (NILP (specs)) + if (CONSP (form)) + specs = filter_specs = Fcar (XCDR (form)); + else goto lose; - specs = Fcar (Fcdr (specs)); - } - else if (EQ (funcar, Qmocklisp)) - { - single_kboard_state (); - return ml_apply (fun, Qinteractive); } - else - goto lose; - /* If either specs or string is set to a string, use it. */ + /* If either SPECS or STRING is set to a string, use it. */ if (STRINGP (specs)) { /* Make a copy of string so that if a GC relocates specs, `string' will still be valid. */ - string = (unsigned char *) alloca (STRING_BYTES (XSTRING (specs)) + 1); - bcopy (XSTRING (specs)->data, string, - STRING_BYTES (XSTRING (specs)) + 1); + string = (unsigned char *) alloca (SBYTES (specs) + 1); + bcopy (SDATA (specs), string, + SBYTES (specs) + 1); } else if (string == 0) { @@ -300,62 +380,34 @@ Otherwise, this is done only if an arg is read using the minibuffer.") i = num_input_events; input = specs; /* Compute the arg values using the user's expression. */ + GCPRO2 (input, filter_specs); specs = Feval (specs); + UNGCPRO; if (i != num_input_events || !NILP (record_flag)) { /* We should record this command on the command history. */ - Lisp_Object values, car; + Lisp_Object values; /* Make a copy of the list of values, for the command history, and turn them into things we can eval. */ values = quotify_args (Fcopy_sequence (specs)); - /* If the list of args was produced with an explicit call to `list', - look for elements that were computed with (region-beginning) - or (region-end), and put those expressions into VALUES - instead of the present values. */ - if (CONSP (input)) - { - car = XCAR (input); - /* Skip through certain special forms. */ - while (EQ (car, Qlet) || EQ (car, Qletx) - || EQ (car, Qsave_excursion)) - { - while (CONSP (XCDR (input))) - input = XCDR (input); - input = XCAR (input); - if (!CONSP (input)) - break; - car = XCAR (input); - } - if (EQ (car, Qlist)) - { - Lisp_Object intail, valtail; - for (intail = Fcdr (input), valtail = values; - CONSP (valtail); - intail = Fcdr (intail), valtail = Fcdr (valtail)) - { - Lisp_Object elt; - elt = Fcar (intail); - if (CONSP (elt)) - { - Lisp_Object presflag; - presflag = Fmemq (Fcar (elt), preserved_fns); - if (!NILP (presflag)) - Fsetcar (valtail, Fcar (intail)); - } - } - } - } + fix_command (input, values); Vcommand_history = Fcons (Fcons (function, values), Vcommand_history); /* Don't keep command history around forever. */ - if (NUMBERP (Vhistory_length) && XINT (Vhistory_length) > 0) + if (INTEGERP (Vhistory_length) && XINT (Vhistory_length) > 0) { teml = Fnthcdr (Vhistory_length, Vcommand_history); if (CONSP (teml)) - XCDR (teml) = Qnil; + XSETCDR (teml, Qnil); } } + + Vthis_command = save_this_command; + Vthis_original_command = save_this_original_command; + real_this_command= save_real_this_command; + current_kboard->Vlast_command = save_last_command; + single_kboard_state (); return apply1 (function, specs); } @@ -366,7 +418,7 @@ Otherwise, this is done only if an arg is read using the minibuffer.") for (next_event = 0; next_event < key_count; next_event++) if (EVENT_HAS_PARAMETERS (XVECTOR (keys)->contents[next_event])) break; - + /* Handle special starting chars `*' and `@'. Also `-'. */ /* Note that `+' is reserved for user extensions. */ while (1) @@ -377,30 +429,47 @@ Otherwise, this is done only if an arg is read using the minibuffer.") { string++; if (!NILP (current_buffer->read_only)) - Fbarf_if_buffer_read_only (); + { + if (!NILP (record_flag)) + { + unsigned char *p = string; + while (*p) + { + if (! (*p == 'r' || *p == 'p' || *p == 'P' + || *p == '\n')) + Fbarf_if_buffer_read_only (); + p++; + } + record_then_fail = 1; + } + else + Fbarf_if_buffer_read_only (); + } } /* Ignore this for semi-compatibility with Lucid. */ else if (*string == '-') string++; else if (*string == '@') { - Lisp_Object event; + Lisp_Object event, tem; - event = XVECTOR (keys)->contents[next_event]; + event = (next_event < key_count + ? XVECTOR (keys)->contents[next_event] + : Qnil); if (EVENT_HAS_PARAMETERS (event) - && (event = XCDR (event), CONSP (event)) - && (event = XCAR (event), CONSP (event)) - && (event = XCAR (event), WINDOWP (event))) + && (tem = XCDR (event), CONSP (tem)) + && (tem = XCAR (tem), CONSP (tem)) + && (tem = XCAR (tem), WINDOWP (tem))) { - if (MINI_WINDOW_P (XWINDOW (event)) - && ! (minibuf_level > 0 && EQ (event, minibuf_window))) + if (MINI_WINDOW_P (XWINDOW (tem)) + && ! (minibuf_level > 0 && EQ (tem, minibuf_window))) error ("Attempt to select inactive minibuffer window"); /* If the current buffer wants to clean up, let it. */ if (!NILP (Vmouse_leave_buffer_hook)) call1 (Vrun_hooks, Qmouse_leave_buffer_hook); - Fselect_window (event); + Fselect_window (tem, Qnil); } string++; } @@ -435,7 +504,7 @@ Otherwise, this is done only if an arg is read using the minibuffer.") varies[i] = 0; } - GCPRO4 (prefix_arg, function, *args, *visargs); + GCPRO5 (prefix_arg, function, *args, *visargs, up_event); gcpro3.nvars = (count + 1); gcpro4.nvars = (count + 1); @@ -447,7 +516,7 @@ Otherwise, this is done only if an arg is read using the minibuffer.") { strncpy (prompt1, tem + 1, sizeof prompt1 - 1); prompt1[sizeof prompt1 - 1] = 0; - tem1 = index (prompt1, '\n'); + tem1 = (char *) index (prompt1, '\n'); if (tem1) *tem1 = 0; /* Fill argstrings with a vector of C strings corresponding to the Lisp strings in visargs. */ @@ -455,7 +524,7 @@ Otherwise, this is done only if an arg is read using the minibuffer.") argstrings[j] = (EQ (visargs[j], Qnil) ? (unsigned char *) "" - : XSTRING (visargs[j])->data); + : SDATA (visargs[j])); /* Process the format-string in prompt1, putting the output into callint_message. Make callint_message bigger if necessary. @@ -466,7 +535,7 @@ Otherwise, this is done only if an arg is read using the minibuffer.") int nchars = doprnt (callint_message, callint_message_size, prompt1, (char *)0, j - 1, (char **) argstrings + 1); - if (nchars < callint_message_size) + if (nchars < callint_message_size - 1) break; callint_message_size *= 2; callint_message @@ -523,17 +592,24 @@ Otherwise, this is done only if an arg is read using the minibuffer.") case 'D': /* Directory name. */ args[i] = Fread_file_name (build_string (callint_message), Qnil, - current_buffer->directory, Qlambda, Qnil); + current_buffer->directory, Qlambda, Qnil, + Qfile_directory_p); break; case 'f': /* Existing file name. */ args[i] = Fread_file_name (build_string (callint_message), - Qnil, Qnil, Qlambda, Qnil); + Qnil, Qnil, Qlambda, Qnil, Qnil); break; case 'F': /* Possibly nonexistent file name. */ args[i] = Fread_file_name (build_string (callint_message), - Qnil, Qnil, Qnil, Qnil); + 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); break; case 'i': /* Ignore an argument -- Does not do I/O */ @@ -542,13 +618,13 @@ Otherwise, this is done only if an arg is read using the minibuffer.") case 'k': /* Key sequence. */ { - int speccount1 = specpdl_ptr - specpdl; + int speccount1 = SPECPDL_INDEX (); specbind (Qcursor_in_echo_area, Qt); args[i] = Fread_key_sequence (build_string (callint_message), Qnil, Qnil, Qnil, Qnil); unbind_to (speccount1, Qnil); teml = args[i]; - visargs[i] = Fkey_description (teml); + visargs[i] = Fkey_description (teml, Qnil); /* If the key sequence ends with a down-event, discard the following up-event. */ @@ -563,19 +639,19 @@ Otherwise, this is done only if an arg is read using the minibuffer.") /* Ignore first element, which is the base key. */ tem2 = Fmemq (intern ("down"), Fcdr (teml)); if (! NILP (tem2)) - Fread_event (Qnil, Qnil); + up_event = Fread_event (Qnil, Qnil); } } break; case 'K': /* Key sequence to be defined. */ { - int speccount1 = specpdl_ptr - specpdl; + int speccount1 = SPECPDL_INDEX (); specbind (Qcursor_in_echo_area, Qt); args[i] = Fread_key_sequence (build_string (callint_message), Qnil, Qt, Qnil, Qnil); teml = args[i]; - visargs[i] = Fkey_description (teml); + visargs[i] = Fkey_description (teml, Qnil); unbind_to (speccount1, Qnil); /* If the key sequence ends with a down-event, @@ -591,16 +667,26 @@ Otherwise, this is done only if an arg is read using the minibuffer.") /* Ignore first element, which is the base key. */ tem2 = Fmemq (intern ("down"), Fcdr (teml)); if (! NILP (tem2)) - Fread_event (Qnil, Qnil); + up_event = Fread_event (Qnil, Qnil); } } break; + case 'U': /* Up event from last k or K */ + if (!NILP (up_event)) + { + args[i] = Fmake_vector (make_number (1), up_event); + up_event = Qnil; + teml = args[i]; + visargs[i] = Fkey_description (teml, Qnil); + } + break; + case 'e': /* The invoking event. */ if (next_event >= key_count) error ("%s must be bound to an event with parameters", (SYMBOLP (function) - ? (char *) XSYMBOL (function)->name->data + ? (char *) SDATA (SYMBOL_NAME (function)) : "command")); args[i] = XVECTOR (keys)->contents[next_event++]; varies[i] = -1; @@ -614,7 +700,7 @@ Otherwise, this is done only if an arg is read using the minibuffer.") break; case 'm': /* Value of mark. Does not do I/O. */ - check_mark (); + check_mark (0); /* visargs[i] = Qnil; */ args[i] = current_buffer->mark; varies[i] = 2; @@ -644,8 +730,8 @@ Otherwise, this is done only if an arg is read using the minibuffer.") tem = Fread_from_minibuffer (build_string (callint_message), Qnil, Qnil, Qnil, Qnil, Qnil, - Qnil); - if (! STRINGP (tem) || XSTRING (tem)->size == 0) + Qnil, Qnil); + if (! STRINGP (tem) || SCHARS (tem) == 0) args[i] = Qnil; else args[i] = Fread (tem); @@ -669,7 +755,7 @@ Otherwise, this is done only if an arg is read using the minibuffer.") break; case 'r': /* Region, point and mark as 2 args. */ - check_mark (); + check_mark (1); set_marker_both (point_marker, Qnil, PT, PT_BYTE); /* visargs[i+1] = Qnil; */ foo = marker_position (current_buffer->mark); @@ -717,7 +803,7 @@ Otherwise, this is done only if an arg is read using the minibuffer.") args[i] = Qnil; varies[i] = -1; } - else + else { args[i] = Fread_non_nil_coding_system (build_string (callint_message)); @@ -767,11 +853,11 @@ Otherwise, this is done only if an arg is read using the minibuffer.") Vcommand_history = Fcons (Flist (count + 1, visargs), Vcommand_history); /* Don't keep command history around forever. */ - if (NUMBERP (Vhistory_length) && XINT (Vhistory_length) > 0) + if (INTEGERP (Vhistory_length) && XINT (Vhistory_length) > 0) { teml = Fnthcdr (Vhistory_length, Vcommand_history); if (CONSP (teml)) - XCDR (teml) = Qnil; + XSETCDR (teml, Qnil); } } @@ -781,6 +867,14 @@ Otherwise, this is done only if an arg is read using the minibuffer.") if (varies[i] >= 1 && varies[i] <= 4) XSETINT (args[i], marker_position (args[i])); + if (record_then_fail) + Fbarf_if_buffer_read_only (); + + Vthis_command = save_this_command; + Vthis_original_command = save_this_original_command; + real_this_command= save_real_this_command; + current_kboard->Vlast_command = save_last_command; + single_kboard_state (); { @@ -791,18 +885,18 @@ Otherwise, this is done only if an arg is read using the minibuffer.") UNGCPRO; return unbind_to (speccount, val); } -} +} DEFUN ("prefix-numeric-value", Fprefix_numeric_value, Sprefix_numeric_value, - 1, 1, 0, - "Return numeric meaning of raw prefix argument RAW.\n\ -A raw prefix argument is what you get from `(interactive \"P\")'.\n\ -Its numeric meaning is what you would get from `(interactive \"p\")'.") - (raw) + 1, 1, 0, + doc: /* 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")'. */) + (raw) Lisp_Object raw; { Lisp_Object val; - + if (NILP (raw)) XSETFASTINT (val, 1); else if (EQ (raw, Qminus)) @@ -833,10 +927,16 @@ syms_of_callint () staticpro (&Qlist); Qlet = intern ("let"); staticpro (&Qlet); + Qif = intern ("if"); + staticpro (&Qif); + Qwhen = intern ("when"); + staticpro (&Qwhen); Qletx = intern ("let*"); staticpro (&Qletx); Qsave_excursion = intern ("save-excursion"); staticpro (&Qsave_excursion); + Qprogn = intern ("progn"); + staticpro (&Qprogn); Qminus = intern ("-"); staticpro (&Qminus); @@ -861,54 +961,57 @@ syms_of_callint () DEFVAR_KBOARD ("prefix-arg", Vprefix_arg, - "The value of the prefix argument for the next editing command.\n\ -It may be a number, or the symbol `-' for just a minus sign as arg,\n\ -or a list whose car is a number for just one or more C-U's\n\ -or nil if no argument has been specified.\n\ -\n\ -You cannot examine this variable to find the argument for this command\n\ -since it has been set to nil by the time you can look.\n\ -Instead, you should use the variable `current-prefix-arg', although\n\ -normally commands can get this prefix argument with (interactive \"P\")."); + 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, +or a list whose car is a number for just one or more C-u's +or nil if no argument has been specified. + +You cannot examine this variable to find the argument for this command +since it has been set to nil by the time you can look. +Instead, you should use the variable `current-prefix-arg', although +normally commands can get this prefix argument with (interactive "P"). */); DEFVAR_KBOARD ("last-prefix-arg", Vlast_prefix_arg, - "The value of the prefix argument for the previous editing command.\n\ -See `prefix-arg' for the meaning of the value."); + doc: /* The value of the prefix argument for the previous editing command. +See `prefix-arg' for the meaning of the value. */); DEFVAR_LISP ("current-prefix-arg", &Vcurrent_prefix_arg, - "The value of the prefix argument for this editing command.\n\ -It may be a number, or the symbol `-' for just a minus sign as arg,\n\ -or a list whose car is a number for just one or more C-U's\n\ -or nil if no argument has been specified.\n\ -This is what `(interactive \"P\")' returns."); + doc: /* The value of the prefix argument for this editing command. +It may be a number, or the symbol `-' for just a minus sign as arg, +or a list whose car is a number for just one or more C-u's +or nil if no argument has been specified. +This is what `(interactive \"P\")' returns. */); Vcurrent_prefix_arg = Qnil; DEFVAR_LISP ("command-history", &Vcommand_history, - "List of recent commands that read arguments from terminal.\n\ -Each command is represented as a form to evaluate."); + doc: /* List of recent commands that read arguments from terminal. +Each command is represented as a form to evaluate. */); Vcommand_history = Qnil; DEFVAR_LISP ("command-debug-status", &Vcommand_debug_status, - "Debugging status of current interactive command.\n\ -Bound each time `call-interactively' is called;\n\ -may be set by the debugger as a reminder for itself."); + doc: /* Debugging status of current interactive command. +Bound each time `call-interactively' is called; +may be set by the debugger as a reminder for itself. */); Vcommand_debug_status = Qnil; DEFVAR_LISP ("mark-even-if-inactive", &Vmark_even_if_inactive, - "*Non-nil means you can use the mark even when inactive.\n\ -This option makes a difference in Transient Mark mode.\n\ -When the option is non-nil, deactivation of the mark\n\ -turns off region highlighting, but commands that use the mark\n\ -behave as if the mark were still active."); + doc: /* *Non-nil means you can use the mark even when inactive. +This option makes a difference in Transient Mark mode. +When the option is non-nil, deactivation of the mark +turns off region highlighting, but commands that use the mark +behave as if the mark were still active. */); Vmark_even_if_inactive = Qnil; DEFVAR_LISP ("mouse-leave-buffer-hook", &Vmouse_leave_buffer_hook, - "Hook to run when about to switch windows with a mouse command.\n\ -Its purpose is to give temporary modes such as Isearch mode\n\ -a way to turn themselves off when a mouse command switches windows."); + doc: /* Hook to run when about to switch windows with a mouse command. +Its purpose is to give temporary modes such as Isearch mode +a way to turn themselves off when a mouse command switches windows. */); Vmouse_leave_buffer_hook = Qnil; defsubr (&Sinteractive); defsubr (&Scall_interactively); defsubr (&Sprefix_numeric_value); } + +/* arch-tag: a3a7cad7-bcac-42ce-916e-1bd2546ebf37 + (do not change this comment) */