Mercurial > emacs
changeset 49757:9fe119b14379
Renamed remap-command to command-remapping. All uses changed.
| author | Kim F. Storm <storm@cua.dk> |
|---|---|
| date | Wed, 12 Feb 2003 23:13:43 +0000 |
| parents | 07ae86d85ff1 |
| children | 0f9474583892 |
| files | lisp/ChangeLog lisp/help-fns.el lisp/help.el src/ChangeLog src/keyboard.c src/keymap.c src/keymap.h |
| diffstat | 7 files changed, 25 insertions(+), 15 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Wed Feb 12 21:52:37 2003 +0000 +++ b/lisp/ChangeLog Wed Feb 12 23:13:43 2003 +0000 @@ -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
--- a/lisp/help-fns.el Wed Feb 12 21:52:37 2003 +0000 +++ b/lisp/help-fns.el Wed Feb 12 23:13:43 2003 +0000 @@ -291,9 +291,9 @@ (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))
--- a/lisp/help.el Wed Feb 12 21:52:37 2003 +0000 +++ b/lisp/help.el Wed Feb 12 23:13:43 2003 +0000 @@ -431,7 +431,7 @@ (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 ", ")))
--- a/src/ChangeLog Wed Feb 12 21:52:37 2003 +0000 +++ b/src/ChangeLog Wed Feb 12 23:13:43 2003 +0000 @@ -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.
--- a/src/keyboard.c Wed Feb 12 21:52:37 2003 +0000 +++ b/src/keyboard.c Wed Feb 12 23:13:43 2003 +0000 @@ -1557,7 +1557,7 @@ if (SYMBOLP (cmd)) { Lisp_Object cmd1; - if (cmd1 = Fremap_command (cmd), !NILP (cmd1)) + if (cmd1 = Fcommand_remapping (cmd), !NILP (cmd1)) cmd = cmd1; }
--- a/src/keymap.c Wed Feb 12 21:52:37 2003 +0000 +++ b/src/keymap.c Wed Feb 12 23:13:43 2003 +0000 @@ -97,8 +97,8 @@ /* 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 @@ /* 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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);
--- a/src/keymap.h Wed Feb 12 21:52:37 2003 +0000 +++ b/src/keymap.h Wed Feb 12 23:13:43 2003 +0000 @@ -28,7 +28,7 @@ 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);