Add new 'keymap-*' functions

* lisp/keymap.el: New file with all the new keymap-* functions.

* lisp/loadup.el ("keymap"): Load.

* lisp/subr.el (kbd): Refactor out all the code to key-parse.
(define-key-after, keyboard-translate, global-set-key)
(local-set-key, global-unset-key, local-unset-key)
(local-key-binding, global-key-binding)
(substitute-key-definition): Note in doc strings that these are
legacy functions.
(define-keymap--define): Use keymap-set.

* lisp/emacs-lisp/byte-opt.el: Remove the optimizations for
defvar-keymap and define-keymap since the macros now only
understand the kbd syntax.
* lisp/emacs-lisp/bytecomp.el (byte-compile-define-keymap)
(byte-compile-define-keymap--define): Warn about invalid key
definitions in all keymap-* functions.

* lisp/emacs-lisp/shortdoc.el (keymaps): Add shortdocs form
keymap* functions.

* src/keymap.c (possibly_translate_key_sequence): Adjust callers
to key-valid-p and key-parse.
(syms_of_keymap): Adjust defs.

1 files changed, 8 insertions, 8 deletions

diff --git a/src/keymap.c b/src/keymap.c
index c6990cffaf6..7993e31ac6d 100644
--- a/src/keymap.c
+++ b/src/keymap.c
@@ -1053,16 +1053,16 @@ possibly_translate_key_sequence (Lisp_Object key, ptrdiff_t *length)
     {
       /* KEY is on the ["C-c"] format, so translate to internal
          format.  */
-      if (NILP (Ffboundp (Qkbd_valid_p)))
+      if (NILP (Ffboundp (Qkey_valid_p)))
         xsignal2 (Qerror,
-                  build_string ("`kbd-valid-p' is not defined, so this syntax can't be used: %s"),
+                  build_string ("`key-valid-p' is not defined, so this syntax can't be used: %s"),
                   key);
-      if (NILP (call1 (Qkbd_valid_p, AREF (key, 0))))
-        xsignal2 (Qerror, build_string ("Invalid `kbd' syntax: %S"), key);
-      key = call1 (Qkbd, AREF (key, 0));
+      if (NILP (call1 (Qkey_valid_p, AREF (key, 0))))
+        xsignal2 (Qerror, build_string ("Invalid `key-parse' syntax: %S"), key);
+      key = call1 (Qkey_parse, AREF (key, 0));
       *length = CHECK_VECTOR_OR_STRING (key);
       if (*length == 0)
-        xsignal2 (Qerror, build_string ("Invalid `kbd' syntax: %S"), key);
+        xsignal2 (Qerror, build_string ("Invalid `key-parse' syntax: %S"), key);
     }
 
   return key;
@@ -3458,6 +3458,6 @@ that describe key bindings.  That is why the default is nil.  */);
   defsubr (&Swhere_is_internal);
   defsubr (&Sdescribe_buffer_bindings);
 
-  DEFSYM (Qkbd, "kbd");
-  DEFSYM (Qkbd_valid_p, "kbd-valid-p");
+  DEFSYM (Qkey_parse, "key-parse");
+  DEFSYM (Qkey_valid_p, "key-valid-p");
 }