Change the call convention for `defvar-keymap'

* doc/lispref/keymaps.texi (Changing Key Bindings): Adjust
documentation.

* lisp/simple.el (special-mode-map):
* lisp/net/shr.el (shr-map):
* lisp/net/eww.el (eww-link-keymap):
(eww-mode-map):
(eww-submit-map):
(eww-textarea-map):
(eww-bookmark-mode-map):
(eww-history-mode-map):
(eww-buffers-mode-map):
* lisp/gnus/message.el (message-mode-map):
* lisp/gnus/gnus-html.el (gnus-html-image-map):
* lisp/gnus/gnus-eform.el (gnus-edit-form-mode-map):
* lisp/gnus/gnus-dired.el (gnus-dired-mode-map):
* lisp/gnus/gnus-bookmark.el (gnus-bookmark-bmenu-mode-map):
Adjust usage of `defvar-keymap'.

* lisp/subr.el (define-keymap, define-keymap--define): Change how
these functions call each other.
(defvar-keymap): Change interface to be more like `define-keymap'.

* lisp/emacs-lisp/lisp-mode.el (lisp-indent--defvar-keymap): Remove.
(lisp-indent-function): Don't use it.

5 files changed, 11 insertions, 8 deletions

diff --git a/lisp/gnus/gnus-bookmark.el b/lisp/gnus/gnus-bookmark.el
index a6b1a0762ba..171da9d17a0 100644
--- a/lisp/gnus/gnus-bookmark.el
+++ b/lisp/gnus/gnus-bookmark.el
@@ -419,8 +419,9 @@ That is, all information but the name."
 (defvar gnus-bookmark-bmenu-bookmark-column nil)
 (defvar gnus-bookmark-bmenu-hidden-bookmarks ())
 
-(defvar-keymap gnus-bookmark-bmenu-mode-map (:full t
-                                             :suppress 'nodigits)
+(defvar-keymap gnus-bookmark-bmenu-mode-map
+  :full t
+  :suppress 'nodigits
   "q" #'quit-window
   "\C-m" #'gnus-bookmark-bmenu-select
   "v" #'gnus-bookmark-bmenu-select
diff --git a/lisp/gnus/gnus-dired.el b/lisp/gnus/gnus-dired.el
index 08a4289714b..be46d3a341d 100644
--- a/lisp/gnus/gnus-dired.el
+++ b/lisp/gnus/gnus-dired.el
@@ -53,7 +53,7 @@
 (autoload 'message-buffers "message")
 (autoload 'gnus-print-buffer "gnus-sum")
 
-(defvar-keymap gnus-dired-mode-map ()
+(defvar-keymap gnus-dired-mode-map
   "\C-c\C-m\C-a" #'gnus-dired-attach
   "\C-c\C-m\C-l" #'gnus-dired-find-file-mailcap
   "\C-c\C-m\C-p" #'gnus-dired-print)
diff --git a/lisp/gnus/gnus-eform.el b/lisp/gnus/gnus-eform.el
index 922e25e277e..b0aa58f0f28 100644
--- a/lisp/gnus/gnus-eform.el
+++ b/lisp/gnus/gnus-eform.el
@@ -48,7 +48,8 @@
 (defvar gnus-edit-form-buffer "*Gnus edit form*")
 (defvar gnus-edit-form-done-function nil)
 
-(defvar-keymap gnus-edit-form-mode-map (:parent emacs-lisp-mode-map)
+(defvar-keymap gnus-edit-form-mode-map
+  :parent emacs-lisp-mode-map
   "\C-c\C-c" #'gnus-edit-form-done
   "\C-c\C-k" #'gnus-edit-form-exit)
 
diff --git a/lisp/gnus/gnus-html.el b/lisp/gnus/gnus-html.el
index e9fa819d0b5..c1815d3486c 100644
--- a/lisp/gnus/gnus-html.el
+++ b/lisp/gnus/gnus-html.el
@@ -71,12 +71,12 @@ fit these criteria."
   :group 'gnus-art
   :type 'float)
 
-(defvar-keymap gnus-html-image-map ()
+(defvar-keymap gnus-html-image-map
   "u" #'gnus-article-copy-string
   "i" #'gnus-html-insert-image
   "v" #'gnus-html-browse-url)
 
-(defvar-keymap gnus-html-displayed-image-map ()
+(defvar-keymap gnus-html-displayed-image-map
   "a" #'gnus-html-show-alt-text
   "i" #'gnus-html-browse-image
   "\r" #'gnus-html-browse-url
diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el
index 7ca43d603ff..e165a0429fd 100644
--- a/lisp/gnus/message.el
+++ b/lisp/gnus/message.el
@@ -2868,8 +2868,9 @@ Consider adding this function to `message-header-setup-hook'"
 
 ;;; Set up keymap.
 
-(defvar-keymap message-mode-map (:full t :parent text-mode-map
-                                 :doc "Message Mode keymap.")
+(defvar-keymap message-mode-map
+  :full t :parent text-mode-map
+  :doc "Message Mode keymap."
   "\C-c?" #'describe-mode
 
   "\C-c\C-f\C-t" #'message-goto-to