Commit 023b93f6 authored by Kim F. Storm's avatar Kim F. Storm

Renamed remap-command to command-remapping. All uses changed.

parent 0ab47edc
2003-02-13 Kim F. Storm <storm@cua.dk>
* help.el (where-is): Rename remap-command to command-remapping.
* help-fns.el (describe-function-1): Likewise.
2003-02-12 Glenn Morris <gmorris@ast.cam.ac.uk>
* progmodes/fortran.el (fortran-fill): Fill lines that do not have
......
......@@ -291,9 +291,9 @@ The usage info is built from ARGLIST. DOC can be nil."
(princ ".")
(terpri)
(when (commandp function)
(let* ((remapped (remap-command function))
(let* ((remapped (command-remapping function))
(keys (where-is-internal
(or remapped function) overriding-local-map nil nil)))
(or remapped function) overriding-local-map nil nil)))
(when remapped
(princ "It is remapped to `")
(princ (symbol-name remapped))
......
......@@ -431,7 +431,7 @@ If INSERT (the prefix arg) is non-nil, insert the message in the buffer."
(push symbol defs))))
(princ (mapconcat
#'(lambda (symbol)
(let* ((remapped (remap-command symbol))
(let* ((remapped (command-remapping symbol))
(keys (where-is-internal
symbol overriding-local-map nil nil remapped))
(keys (mapconcat 'key-description keys ", ")))
......
2003-02-13 Kim F. Storm <storm@cua.dk>
* keymap.c (Fcommand_remapping): Renamed from Fremap_command.
All uses changed.
2003-02-12 Juanma Barranquero <lektu@terra.es>
* eval.c (Fdefmacro): Fix typo.
......
......@@ -1557,7 +1557,7 @@ command_loop_1 ()
if (SYMBOLP (cmd))
{
Lisp_Object cmd1;
if (cmd1 = Fremap_command (cmd), !NILP (cmd1))
if (cmd1 = Fcommand_remapping (cmd), !NILP (cmd1))
cmd = cmd1;
}
......
......@@ -97,8 +97,8 @@ Lisp_Object Qkeymapp, Qkeymap, Qnon_ascii, Qmenu_item, Qremap;
/* Alist of elements like (DEL . "\d"). */
static Lisp_Object exclude_keys;
/* Pre-allocated 2-element vector for Fremap_command to use. */
static Lisp_Object remap_command_vector;
/* Pre-allocated 2-element vector for Fcommand_remapping to use. */
static Lisp_Object command_remapping_vector;
/* A char with the CHAR_META bit set in a vector or the 0200 bit set
in a string key sequence is equivalent to prefixing with this
......@@ -1068,7 +1068,7 @@ the front of KEYMAP. */)
/* This function may GC (it calls Fkey_binding). */
DEFUN ("remap-command", Fremap_command, Sremap_command, 1, 1, 0,
DEFUN ("command-remapping", Fcommand_remapping, Scommand_remapping, 1, 1, 0,
doc: /* Return the remapping for command COMMAND in current keymaps.
Returns nil if COMMAND is not remapped (or not a symbol). */)
(command)
......@@ -1077,8 +1077,8 @@ Returns nil if COMMAND is not remapped (or not a symbol). */)
if (!SYMBOLP (command))
return Qnil;
ASET (remap_command_vector, 1, command);
return Fkey_binding (remap_command_vector, Qnil, Qt);
ASET (command_remapping_vector, 1, command);
return Fkey_binding (command_remapping_vector, Qnil, Qt);
}
/* Value is number if KEY is too long; nil if valid but has no definition. */
......@@ -1490,7 +1490,7 @@ is non-nil, `key-binding' returns the unmapped command. */)
if (NILP (no_remap) && SYMBOLP (value))
{
Lisp_Object value1;
if (value1 = Fremap_command (value), !NILP (value1))
if (value1 = Fcommand_remapping (value), !NILP (value1))
value = value1;
}
......@@ -2257,7 +2257,7 @@ where_is_internal (definition, keymaps, firstonly, noindirect, no_remap)
if (NILP (no_remap) && SYMBOLP (definition))
{
Lisp_Object tem;
if (tem = Fremap_command (definition), !NILP (tem))
if (tem = Fcommand_remapping (definition), !NILP (tem))
return Qnil;
}
......@@ -3644,8 +3644,8 @@ and applies even for keys that have ordinary bindings. */);
Qremap = intern ("remap");
staticpro (&Qremap);
remap_command_vector = Fmake_vector (make_number (2), Qremap);
staticpro (&remap_command_vector);
command_remapping_vector = Fmake_vector (make_number (2), Qremap);
staticpro (&command_remapping_vector);
where_is_cache_keymaps = Qt;
where_is_cache = Qnil;
......@@ -3659,7 +3659,7 @@ and applies even for keys that have ordinary bindings. */);
defsubr (&Smake_keymap);
defsubr (&Smake_sparse_keymap);
defsubr (&Scopy_keymap);
defsubr (&Sremap_command);
defsubr (&Scommand_remapping);
defsubr (&Skey_binding);
defsubr (&Slocal_key_binding);
defsubr (&Sglobal_key_binding);
......
......@@ -28,7 +28,7 @@ EXFUN (Fmake_sparse_keymap, 1);
EXFUN (Fkeymap_prompt, 1);
EXFUN (Fdefine_key, 3);
EXFUN (Flookup_key, 3);
EXFUN (Fremap_command, 1);
EXFUN (Fcommand_remapping, 1);
EXFUN (Fkey_binding, 3);
EXFUN (Fkey_description, 1);
EXFUN (Fsingle_key_description, 2);
......
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