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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 11a4acba970af9dc5c4cff2da15240fc4d72627c..27ef503079c53b4195d5a6548ac574618f33fc0f 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+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

diff --git a/lisp/help-fns.el b/lisp/help-fns.el
index cda2e7d19f25d5d06b2e7ca6b086108eb96eb6c4..4f3626c4511ab6f0674ba6042efd4d9e88c6d487 100644 (file)
--- a/lisp/help-fns.el
+++ b/lisp/help-fns.el
@@ -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))

diff --git a/lisp/help.el b/lisp/help.el
index e6f9f173dea7ec4a4659f6e13a2e43a8cf5d93c9..8488e6939c0a8b5cf01f54f36481e2ac90caff6a 100644 (file)
--- a/lisp/help.el
+++ b/lisp/help.el
@@ -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 ", ")))

diff --git a/src/ChangeLog b/src/ChangeLog
index 5f963c8f796186c6ad24c26a2fdc5ccb58d49f90..f5933c00a8e589e8b569ea5b09a0aa2c660d5386 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+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.

diff --git a/src/keyboard.c b/src/keyboard.c
index 5b520b9569bd0deb478fbe17e6ee09c6c33b44b2..c104c43e2184bad4d86decffb6de0026a6043416 100644 (file)
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -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;
        }
 

diff --git a/src/keymap.c b/src/keymap.c
index 3c8c7a3ce3faf602bc2075cccfe76358db059985..6bf50cb18f6e31bc7025fc968c0acd057defd756 100644 (file)
--- a/src/keymap.c
+++ b/src/keymap.c
@@ -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);

diff --git a/src/keymap.h b/src/keymap.h
index 4e672eeaa65093ffb5207337c8ee134033b4ee19..2524c9af45b25caaf6a2db741a75a3804b15d46c 100644 (file)
--- a/src/keymap.h
+++ b/src/keymap.h
@@ -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);