Commit 88539837 authored by Erik Naggum's avatar Erik Naggum

(Fkeymapp, Fdefine_prefix_command, Faccessible_keymaps,

Ftext_char_description, Fapropos_internal): Harmonize arguments with
parent e57d8fd8
......@@ -179,7 +179,7 @@ synkey (frommap, fromchar, tomap, tochar)
#endif /* 0 */
DEFUN ("keymapp", Fkeymapp, Skeymapp, 1, 1, 0,
"Return t if ARG is a keymap.\n\
"Return t if OBJECT is a keymap.\n\
A keymap is a list (keymap . ALIST),\n\
or a symbol whose function definition is itself a keymap.\n\
......@@ -1050,17 +1050,17 @@ A new sparse keymap is stored as COMMAND's function definition and its value.\n\
If a second optional argument MAPVAR is given, the map is stored as\n\
its value instead of as COMMAND's value; but COMMAND is still defined\n\
as a function.")
(name, mapvar)
Lisp_Object name, mapvar;
(command, mapvar)
Lisp_Object command, mapvar;
Lisp_Object map;
map = Fmake_sparse_keymap (Qnil);
Ffset (name, map);
Ffset (command, map);
if (!NILP (mapvar))
Fset (mapvar, map);
Fset (name, map);
return name;
Fset (command, map);
return command;
DEFUN ("use-global-map", Fuse_global_map, Suse_global_map, 1, 1, 0,
......@@ -1126,8 +1126,8 @@ KEYS starting from KEYMAP gets you to MAP. These elements are ordered\n\
so that the KEYS increase in length. The first element is (\"\" . KEYMAP).\n\
An optional argument PREFIX, if non-nil, should be a key sequence;\n\
then the value includes only maps for prefixes that start with PREFIX.")
(startmap, prefix)
Lisp_Object startmap, prefix;
(keymap, prefix)
Lisp_Object keymap, prefix;
Lisp_Object maps, good_maps, tail;
int prefixlen = 0;
......@@ -1142,7 +1142,7 @@ then the value includes only maps for prefixes that start with PREFIX.")
/* If a prefix was specified, start with the keymap (if any) for
that prefix, so we don't waste time considering other prefixes. */
Lisp_Object tem;
tem = Flookup_key (startmap, prefix, Qt);
tem = Flookup_key (keymap, prefix, Qt);
/* Flookup_key may give us nil, or a number,
if the prefix is not defined in this particular map.
It might even give us a list that isn't a keymap. */
......@@ -1154,7 +1154,7 @@ then the value includes only maps for prefixes that start with PREFIX.")
maps = Fcons (Fcons (Fmake_vector (make_number (0), Qnil),
get_keymap (startmap)),
get_keymap (keymap)),
/* For each map in the list maps,
......@@ -1519,16 +1519,16 @@ push_text_char_description (c, p)
/* This function cannot GC. */
DEFUN ("text-char-description", Ftext_char_description, Stext_char_description, 1, 1, 0,
"Return a pretty description of file-character CHAR.\n\
"Return a pretty description of file-character CHARACTER.\n\
Control characters turn into \"^char\", etc.")
Lisp_Object chr;
Lisp_Object character;
char tem[6];
CHECK_NUMBER (chr, 0);
CHECK_NUMBER (character, 0);
*push_text_char_description (XINT (chr) & 0377, tem) = 0;
*push_text_char_description (XINT (character) & 0377, tem) = 0;
return build_string (tem);
......@@ -2515,18 +2515,18 @@ apropos_accum (symbol, string)
DEFUN ("apropos-internal", Fapropos_internal, Sapropos_internal, 1, 2, 0,
"Show all symbols whose names contain match for REGEXP.\n\
If optional 2nd arg PRED is non-nil, (funcall PRED SYM) is done\n\
If optional 2nd arg PREDICATE is non-nil, (funcall PREDICATE SYMBOL) is done\n\
for each symbol and a symbol is mentioned only if that returns non-nil.\n\
Return list of symbols found.")
(string, pred)
Lisp_Object string, pred;
(regexp, predicate)
Lisp_Object regexp, predicate;
struct gcpro gcpro1, gcpro2;
CHECK_STRING (string, 0);
apropos_predicate = pred;
CHECK_REGEXP (regexp, 0);
apropos_predicate = predicate;
GCPRO2 (apropos_predicate, apropos_accumulate);
apropos_accumulate = Qnil;
map_obarray (Vobarray, apropos_accum, string);
map_obarray (Vobarray, apropos_accum, regexp);
apropos_accumulate = Fsort (apropos_accumulate, Qstring_lessp);
return apropos_accumulate;
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment