Prefer defvar-keymap in net/*.el

* lisp/net/dictionary.el (dictionary-mode-map):
* lisp/net/dig.el (dig-mode-map):
* lisp/net/eudc-hotlist.el (eudc-hotlist-mode-map):
* lisp/net/eudc.el (eudc-mode-map):
* lisp/net/mairix.el (mairix-searches-mode-map):
* lisp/net/newst-treeview.el
(newsticker-treeview-list-sort-button-map)
(newsticker-treeview-mode-map):
* lisp/net/quickurl.el (quickurl-list-mode-map):
* lisp/net/rcirc.el (rcirc-mode-map)
(rcirc-multiline-minor-mode-map, rcirc-track-minor-mode-map):
* lisp/net/rlogin.el (rlogin-mode-map):
* lisp/net/secrets.el (secrets-mode-map):
* lisp/net/sieve-mode.el (sieve-mode-map):
* lisp/net/sieve.el (sieve-manage-mode-map):
* lisp/net/snmp-mode.el (snmp-mode-map):
* lisp/net/telnet.el (telnet-mode-map): Prefer defvar-keymap.

1 files changed, 37 insertions, 43 deletions

diff --git a/lisp/net/newst-treeview.el b/lisp/net/newst-treeview.el
index b429a33dec8..1e04e7d1ca9 100644
--- a/lisp/net/newst-treeview.el
+++ b/lisp/net/newst-treeview.el
@@ -608,14 +608,10 @@ If CLEAR-BUFFER is non-nil the list buffer is completely erased."
     (newsticker--treeview-list-update-faces)
     (goto-char (point-min))))
 
-(defvar newsticker-treeview-list-sort-button-map
-  (let ((map (make-sparse-keymap)))
-    (define-key map [header-line mouse-1]
-      #'newsticker--treeview-list-sort-by-column)
-    (define-key map [header-line mouse-2]
-      #'newsticker--treeview-list-sort-by-column)
-    map)
-  "Local keymap for newsticker treeview list window sort buttons.")
+(defvar-keymap newsticker-treeview-list-sort-button-map
+  :doc "Local keymap for newsticker treeview list window sort buttons."
+  "<header-line> <mouse-1>" #'newsticker--treeview-list-sort-by-column
+  "<header-line> <mouse-2>" #'newsticker--treeview-list-sort-by-column)
 
 (defun newsticker--treeview-list-sort-by-column (&optional event)
   "Sort the newsticker list window buffer by the column clicked on.
@@ -2012,41 +2008,39 @@ Return t if groups have changed, nil otherwise."
     menu)
   "Map for newsticker item menu.")
 
-(defvar newsticker-treeview-mode-map
-  (let ((map (make-sparse-keymap 'newsticker-treeview-mode-map)))
-    (define-key map " " #'newsticker-treeview-next-page)
-    (define-key map "a" #'newsticker-add-url)
-    (define-key map "b" #'newsticker-treeview-browse-url-item)
-    (define-key map "c" #'newsticker-treeview-customize-current-feed)
-    (define-key map "F" #'newsticker-treeview-prev-feed)
-    (define-key map "f" #'newsticker-treeview-next-feed)
-    (define-key map "g" #'newsticker-treeview-get-news)
-    (define-key map "G" #'newsticker-get-all-news)
-    (define-key map "i" #'newsticker-treeview-toggle-item-immortal)
-    (define-key map "j" #'newsticker-treeview-jump)
-    (define-key map "n" #'newsticker-treeview-next-item)
-    (define-key map "N" #'newsticker-treeview-next-new-or-immortal-item)
-    (define-key map "O" #'newsticker-treeview-mark-list-items-old)
-    (define-key map "o" #'newsticker-treeview-mark-item-old)
-    (define-key map "p" #'newsticker-treeview-prev-item)
-    (define-key map "P" #'newsticker-treeview-prev-new-or-immortal-item)
-    (define-key map "q" #'newsticker-treeview-quit)
-    (define-key map "S" #'newsticker-treeview-save-item)
-    (define-key map "s" #'newsticker-treeview-save)
-    (define-key map "u" #'newsticker-treeview-update)
-    (define-key map "v" #'newsticker-treeview-browse-url)
-    ;;(define-key map "\n" #'newsticker-treeview-scroll-item)
-    ;;(define-key map "\C-m" #'newsticker-treeview-scroll-item)
-    (define-key map "\M-m" #'newsticker-group-move-feed)
-    (define-key map "\M-a" #'newsticker-group-add-group)
-    (define-key map "\M-d" #'newsticker-group-delete-group)
-    (define-key map "\M-r" #'newsticker-group-rename-group)
-    (define-key map [M-down] #'newsticker-group-shift-feed-down)
-    (define-key map [M-up] #'newsticker-group-shift-feed-up)
-    (define-key map [M-S-down] #'newsticker-group-shift-group-down)
-    (define-key map [M-S-up] #'newsticker-group-shift-group-up)
-    map)
-  "Mode map for newsticker treeview.")
+(defvar-keymap newsticker-treeview-mode-map
+  :doc "Mode map for newsticker treeview."
+  "SPC"        #'newsticker-treeview-next-page
+  "a"          #'newsticker-add-url
+  "b"          #'newsticker-treeview-browse-url-item
+  "c"          #'newsticker-treeview-customize-current-feed
+  "F"          #'newsticker-treeview-prev-feed
+  "f"          #'newsticker-treeview-next-feed
+  "g"          #'newsticker-treeview-get-news
+  "G"          #'newsticker-get-all-news
+  "i"          #'newsticker-treeview-toggle-item-immortal
+  "j"          #'newsticker-treeview-jump
+  "n"          #'newsticker-treeview-next-item
+  "N"          #'newsticker-treeview-next-new-or-immortal-item
+  "O"          #'newsticker-treeview-mark-list-items-old
+  "o"          #'newsticker-treeview-mark-item-old
+  "p"          #'newsticker-treeview-prev-item
+  "P"          #'newsticker-treeview-prev-new-or-immortal-item
+  "q"          #'newsticker-treeview-quit
+  "S"          #'newsticker-treeview-save-item
+  "s"          #'newsticker-treeview-save
+  "u"          #'newsticker-treeview-update
+  "v"          #'newsticker-treeview-browse-url
+  ;;"C-j"      #'newsticker-treeview-scroll-item
+  ;;"RET"      #'newsticker-treeview-scroll-item
+  "M-m"        #'newsticker-group-move-feed
+  "M-a"        #'newsticker-group-add-group
+  "M-d"        #'newsticker-group-delete-group
+  "M-r"        #'newsticker-group-rename-group
+  "M-<down>"   #'newsticker-group-shift-feed-down
+  "M-<up>"     #'newsticker-group-shift-feed-up
+  "M-S-<down>" #'newsticker-group-shift-group-down
+  "M-S-<up>"   #'newsticker-group-shift-group-up)
 
 (define-derived-mode newsticker-treeview-mode fundamental-mode "Newsticker TV"
   "Major mode for Newsticker Treeview.