HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Convert consecutive FSF copyright years to ranges.
[bpt/emacs.git]
/
src
/
callint.c
diff --git
a/src/callint.c
b/src/callint.c
index
45e5bd9
..
6fd3dc0
100644
(file)
--- a/
src/callint.c
+++ b/
src/callint.c
@@
-1,6
+1,5
@@
/* Call a Lisp function interactively.
/* Call a Lisp function interactively.
- Copyright (C) 1985, 1986, 1993, 1994, 1995, 1997, 2000, 2001, 2002,
- 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+ Copyright (C) 1985-1986, 1993-1995, 1997, 2000-2011
Free Software Foundation, Inc.
This file is part of GNU Emacs.
Free Software Foundation, Inc.
This file is part of GNU Emacs.
@@
-29,33
+28,14
@@
along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
#include "window.h"
#include "keymap.h"
#include "window.h"
#include "keymap.h"
-#ifdef HAVE_INDEX
-extern char *index (const char *, int);
-#endif
-
-extern Lisp_Object Qcursor_in_echo_area;
-extern Lisp_Object Qfile_directory_p;
-extern Lisp_Object Qonly;
-
-Lisp_Object Vcurrent_prefix_arg, Qminus, Qplus;
+Lisp_Object Qminus, Qplus;
Lisp_Object Qcall_interactively;
Lisp_Object Qcall_interactively;
-Lisp_Object Vcommand_history;
-
-extern Lisp_Object Vhistory_length;
-extern Lisp_Object Vthis_original_command, real_this_command;
-extern int history_delete_duplicates;
-
-Lisp_Object Vcommand_debug_status, Qcommand_debug_status;
+Lisp_Object Qcommand_debug_status;
Lisp_Object Qenable_recursive_minibuffers;
Lisp_Object Qenable_recursive_minibuffers;
-extern Lisp_Object Qface, Qminibuffer_prompt;
-
-/* Non-nil means treat the mark as active
- even if mark_active is 0. */
-Lisp_Object Vmark_even_if_inactive;
Lisp_Object Qhandle_shift_selection;
Lisp_Object Qhandle_shift_selection;
-Lisp_Object
Vmouse_leave_buffer_hook,
Qmouse_leave_buffer_hook;
+Lisp_Object Qmouse_leave_buffer_hook;
Lisp_Object Qlist, Qlet, Qletx, Qsave_excursion, Qprogn, Qif, Qwhen;
static Lisp_Object preserved_fns;
Lisp_Object Qlist, Qlet, Qletx, Qsave_excursion, Qprogn, Qif, Qwhen;
static Lisp_Object preserved_fns;
@@
-131,8
+111,7
@@
If the string begins with `^' and `shift-select-mode' is non-nil,
You may use `@', `*', and `^' together. They are processed in the
order that they appear, before reading any arguments.
usage: (interactive &optional ARGS) */)
You may use `@', `*', and `^' together. They are processed in the
order that they appear, before reading any arguments.
usage: (interactive &optional ARGS) */)
- (args)
- Lisp_Object args;
+ (Lisp_Object args)
{
return Qnil;
}
{
return Qnil;
}
@@
-140,8
+119,7
@@
usage: (interactive &optional ARGS) */)
/* Quotify EXP: if EXP is constant, return it.
If EXP is not constant, return (quote EXP). */
Lisp_Object
/* Quotify EXP: if EXP is constant, return it.
If EXP is not constant, return (quote EXP). */
Lisp_Object
-quotify_arg (exp)
- register Lisp_Object exp;
+quotify_arg (register Lisp_Object exp)
{
if (!INTEGERP (exp) && !STRINGP (exp)
&& !NILP (exp) && !EQ (exp, Qt))
{
if (!INTEGERP (exp) && !STRINGP (exp)
&& !NILP (exp) && !EQ (exp, Qt))
@@
-152,8
+130,7
@@
quotify_arg (exp)
/* Modify EXP by quotifying each element (except the first). */
Lisp_Object
/* Modify EXP by quotifying each element (except the first). */
Lisp_Object
-quotify_args (exp)
- Lisp_Object exp;
+quotify_args (Lisp_Object exp)
{
register Lisp_Object tail;
Lisp_Object next;
{
register Lisp_Object tail;
Lisp_Object next;
@@
-165,12
+142,11
@@
quotify_args (exp)
return exp;
}
return exp;
}
-char *callint_argfuns[]
+
static const
char *callint_argfuns[]
= {"", "point", "mark", "region-beginning", "region-end"};
static void
= {"", "point", "mark", "region-beginning", "region-end"};
static void
-check_mark (for_region)
- int for_region;
+check_mark (int for_region)
{
Lisp_Object tem;
tem = Fmarker_buffer (current_buffer->mark);
{
Lisp_Object tem;
tem = Fmarker_buffer (current_buffer->mark);
@@
-191,8
+167,7
@@
check_mark (for_region)
of VALUES to do its job. */
static void
of VALUES to do its job. */
static void
-fix_command (input, values)
- Lisp_Object input, values;
+fix_command (Lisp_Object input, Lisp_Object values)
{
if (CONSP (input))
{
{
if (CONSP (input))
{
@@
-267,8
+242,7
@@
Optional third arg KEYS, if given, specifies the sequence of events to
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. */)
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 function, Lisp_Object record_flag, Lisp_Object keys)
{
Lisp_Object *args, *visargs;
Lisp_Object specs;
{
Lisp_Object *args, *visargs;
Lisp_Object specs;
@@
-352,8
+326,7
@@
invoke it. If KEYS is omitted or nil, the return value of
/* Make a copy of string so that if a GC relocates specs,
`string' will still be valid. */
string = (unsigned char *) alloca (SBYTES (specs) + 1);
/* Make a copy of string so that if a GC relocates specs,
`string' will still be valid. */
string = (unsigned char *) alloca (SBYTES (specs) + 1);
- bcopy (SDATA (specs), string,
- SBYTES (specs) + 1);
+ memcpy (string, SDATA (specs), SBYTES (specs) + 1);
}
else
{
}
else
{
@@
-476,7
+449,7
@@
invoke it. If KEYS is omitted or nil, the return value of
j += 2;
else
j++;
j += 2;
else
j++;
- tem = (unsigned char *)
index
(tem, '\n');
+ tem = (unsigned char *)
strchr
(tem, '\n');
if (tem)
++tem;
else
if (tem)
++tem;
else
@@
-507,11
+480,11
@@
invoke it. If KEYS is omitted or nil, the return value of
{
strncpy (prompt1, tem + 1, sizeof prompt1 - 1);
prompt1[sizeof prompt1 - 1] = 0;
{
strncpy (prompt1, tem + 1, sizeof prompt1 - 1);
prompt1[sizeof prompt1 - 1] = 0;
- tem1 =
(char *) index
(prompt1, '\n');
+ tem1 =
strchr
(prompt1, '\n');
if (tem1) *tem1 = 0;
visargs[0] = build_string (prompt1);
if (tem1) *tem1 = 0;
visargs[0] = build_string (prompt1);
- if (
index
(prompt1, '%'))
+ if (
strchr
(prompt1, '%'))
callint_message = Fformat (i, visargs);
else
callint_message = visargs[0];
callint_message = Fformat (i, visargs);
else
callint_message = visargs[0];
@@
-672,7
+645,7
@@
invoke it. If KEYS is omitted or nil, the return value of
if (next_event >= key_count)
error ("%s must be bound to an event with parameters",
(SYMBOLP (function)
if (next_event >= key_count)
error ("%s must be bound to an event with parameters",
(SYMBOLP (function)
- ?
(char *)
SDATA (SYMBOL_NAME (function))
+ ?
S
SDATA (SYMBOL_NAME (function))
: "command"));
args[i] = AREF (keys, next_event);
next_event++;
: "command"));
args[i] = AREF (keys, next_event);
next_event++;
@@
-816,7
+789,7
@@
invoke it. If KEYS is omitted or nil, the return value of
if (NILP (visargs[i]) && STRINGP (args[i]))
visargs[i] = args[i];
if (NILP (visargs[i]) && STRINGP (args[i]))
visargs[i] = args[i];
- tem = (unsigned char *)
index
(tem, '\n');
+ tem = (unsigned char *)
strchr
(tem, '\n');
if (tem) tem++;
else tem = (unsigned char *) "";
}
if (tem) tem++;
else tem = (unsigned char *) "";
}
@@
-877,8
+850,7
@@
DEFUN ("prefix-numeric-value", Fprefix_numeric_value, Sprefix_numeric_value,
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")'. */)
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 raw)
{
Lisp_Object val;
{
Lisp_Object val;
@@
-897,7
+869,7
@@
Its numeric meaning is what you would get from `(interactive "p")'. */)
}
void
}
void
-syms_of_callint ()
+syms_of_callint (
void
)
{
point_marker = Fmake_marker ();
staticpro (&point_marker);
{
point_marker = Fmake_marker ();
staticpro (&point_marker);
@@
-961,7
+933,7
@@
normally commands can get this prefix argument with (interactive "P"). */);
doc: /* The value of the prefix argument for the previous editing command.
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,
+ DEFVAR_LISP ("current-prefix-arg", Vcurrent_prefix_arg,
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
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
@@
-969,7
+941,7
@@
or nil if no argument has been specified.
This is what `(interactive \"P\")' returns. */);
Vcurrent_prefix_arg = Qnil;
This is what `(interactive \"P\")' returns. */);
Vcurrent_prefix_arg = Qnil;
- DEFVAR_LISP ("command-history",
&
Vcommand_history,
+ DEFVAR_LISP ("command-history", Vcommand_history,
doc: /* List of recent commands that read arguments from terminal.
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.
@@
-977,13
+949,13
@@
Maximum length of the history list is determined by the value
of `history-length', which see. */);
Vcommand_history = Qnil;
of `history-length', which see. */);
Vcommand_history = Qnil;
- DEFVAR_LISP ("command-debug-status",
&
Vcommand_debug_status,
+ DEFVAR_LISP ("command-debug-status", Vcommand_debug_status,
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;
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,
+ DEFVAR_LISP ("mark-even-if-inactive", Vmark_even_if_inactive,
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
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
@@
-991,7
+963,7
@@
turns off region highlighting, but commands that use the mark
behave as if the mark were still active. */);
Vmark_even_if_inactive = Qt;
behave as if the mark were still active. */);
Vmark_even_if_inactive = Qt;
- DEFVAR_LISP ("mouse-leave-buffer-hook",
&
Vmouse_leave_buffer_hook,
+ DEFVAR_LISP ("mouse-leave-buffer-hook", Vmouse_leave_buffer_hook,
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. */);
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. */);
@@
-1001,6
+973,3
@@
a way to turn themselves off when a mouse command switches windows. */);
defsubr (&Scall_interactively);
defsubr (&Sprefix_numeric_value);
}
defsubr (&Scall_interactively);
defsubr (&Sprefix_numeric_value);
}
-
-/* arch-tag: a3a7cad7-bcac-42ce-916e-1bd2546ebf37
- (do not change this comment) */