Move keymap initialization into declaration.

* lisp/textmodes/enriched.el (enriched-mode-map):
* lisp/textmodes/bib-mode.el (bib-mode-map):
* lisp/term/lk201.el (lk201-function-map):
* lisp/tar-mode.el (tar-mode-map):
* lisp/replace.el (occur-mode-map):
* lisp/progmodes/idlwave.el (idlwave-rinfo-mouse-map, idlwave-rinfo-map):
* lisp/progmodes/idlw-help.el (idlwave-help-mode-map):
* lisp/progmodes/gdb-mi.el (gdb-memory-format-menu, gdb-memory-unit-menu):
* lisp/play/solitaire.el (solitaire-mode-map):
* lisp/play/snake.el (snake-mode-map, snake-null-map):
* lisp/play/pong.el (pong-mode-map):
* lisp/play/handwrite.el (menu-bar-handwrite-map):
* lisp/play/gametree.el (gametree-mode-map):
* lisp/net/rcirc.el (rcirc-mode-map, rcirc-browse-url-map
(rcirc-multiline-minor-mode-map, rcirc-track-minor-mode-map):
* lisp/net/newst-plainview.el (newsticker-menu, newsticker-mode-map)
(newsticker--url-keymap):
* lisp/net/net-utils.el (nslookup-mode-map, ftp-mode-map):
* lisp/menu-bar.el (menu-bar-file-menu, menu-bar-i-search-menu)
(menu-bar-search-menu, menu-bar-replace-menu, menu-bar-goto-menu)
(menu-bar-edit-menu, menu-bar-custom-menu)
(menu-bar-showhide-fringe-ind-menu, menu-bar-showhide-fringe-menu)
(menu-bar-showhide-scroll-bar-menu, menu-bar-showhide-menu)
(menu-bar-line-wrapping-menu, menu-bar-options-menu)
(menu-bar-games-menu, menu-bar-encryption-decryption-menu)
(menu-bar-tools-menu, menu-bar-describe-menu)
(menu-bar-search-documentation-menu, menu-bar-manuals-menu)
(menu-bar-help-menu):
* lisp/mail/rmailsum.el (rmail-summary-mode-map):
* lisp/kmacro.el (kmacro-step-edit-map):
* lisp/ibuffer.el (ibuffer-mode-groups-popup, ibuffer-mode-map)
(ibuffer-mode-operate-map):
* lisp/hi-lock.el (hi-lock-menu, hi-lock-map):
* lisp/emulation/vip.el (vip-mode-map):
* lisp/emacs-lisp/re-builder.el (reb-lisp-mode-map):
* lisp/bookmark.el (bookmark-bmenu-mode-map):
* lisp/help-mode.el (help-mode-map):
* lisp/erc/erc-list.el (erc-list-menu-mode-map):
* lisp/org/org-remember.el (org-remember-mode-map):
* lisp/org/org-src.el (org-src-mode-map): Move initialization into declaration.

1 files changed, 54 insertions, 48 deletions

diff --git a/lisp/replace.el b/lisp/replace.el
index 924622b692d..0f8adea2aca 100644
--- a/lisp/replace.el
+++ b/lisp/replace.el
@@ -757,6 +757,60 @@ a previously found match."
       count)))
 
 
+(defvar occur-mode-map
+  (let ((map (make-sparse-keymap)))
+    ;; We use this alternative name, so we can use \\[occur-mode-mouse-goto].
+    (define-key map [mouse-2] 'occur-mode-mouse-goto)
+    (define-key map "\C-c\C-c" 'occur-mode-goto-occurrence)
+    (define-key map "\C-m" 'occur-mode-goto-occurrence)
+    (define-key map "o" 'occur-mode-goto-occurrence-other-window)
+    (define-key map "\C-o" 'occur-mode-display-occurrence)
+    (define-key map "\M-n" 'occur-next)
+    (define-key map "\M-p" 'occur-prev)
+    (define-key map "r" 'occur-rename-buffer)
+    (define-key map "c" 'clone-buffer)
+    (define-key map "\C-c\C-f" 'next-error-follow-minor-mode)
+    (define-key map [menu-bar] (make-sparse-keymap))
+    (define-key map [menu-bar occur]
+      `(cons ,(purecopy "Occur") map))
+    (define-key map [next-error-follow-minor-mode]
+      (menu-bar-make-mm-toggle next-error-follow-minor-mode
+			       "Auto Occurrence Display"
+			       "Display another occurrence when moving the cursor"))
+    (define-key map [separator-1] menu-bar-separator)
+    (define-key map [kill-this-buffer]
+      `(menu-item ,(purecopy "Kill occur buffer") kill-this-buffer
+		  :help ,(purecopy "Kill the current *Occur* buffer")))
+    (define-key map [quit-window]
+      `(menu-item ,(purecopy "Quit occur window") quit-window
+		  :help ,(purecopy "Quit the current *Occur* buffer.  Bury it, and maybe delete the selected frame")))
+    (define-key map [revert-buffer]
+      `(menu-item ,(purecopy "Revert occur buffer") revert-buffer
+		  :help ,(purecopy "Replace the text in the *Occur* buffer with the results of rerunning occur")))
+    (define-key map [clone-buffer]
+      `(menu-item ,(purecopy "Clone occur buffer") clone-buffer
+		  :help ,(purecopy "Create and return a twin copy of the current *Occur* buffer")))
+    (define-key map [occur-rename-buffer]
+      `(menu-item ,(purecopy "Rename occur buffer") occur-rename-buffer
+		  :help ,(purecopy "Rename the current *Occur* buffer to *Occur: original-buffer-name*.")))
+    (define-key map [separator-2] menu-bar-separator)
+    (define-key map [occur-mode-goto-occurrence-other-window]
+      `(menu-item ,(purecopy "Go To Occurrence Other Window") occur-mode-goto-occurrence-other-window
+		  :help ,(purecopy "Go to the occurrence the current line describes, in another window")))
+    (define-key map [occur-mode-goto-occurrence]
+      `(menu-item ,(purecopy "Go To Occurrence") occur-mode-goto-occurrence
+		  :help ,(purecopy "Go to the occurrence the current line describes")))
+    (define-key map [occur-mode-display-occurrence]
+      `(menu-item ,(purecopy "Display Occurrence") occur-mode-display-occurrence
+		  :help ,(purecopy "Display in another window the occurrence the current line describes")))
+    (define-key map [occur-next]
+      `(menu-item ,(purecopy "Move to next match") occur-next
+		  :help ,(purecopy "Move to the Nth (default 1) next match in an Occur mode buffer")))
+    (define-key map [occur-prev]
+      `(menu-item ,(purecopy "Move to previous match") occur-prev
+		  :help ,(purecopy "Move to the Nth (default 1) previous match in an Occur mode buffer")))
+    map)
+  "Keymap for `occur-mode'.")
 
 (defvar occur-revert-arguments nil
   "Arguments to pass to `occur-1' to revert an Occur mode buffer.
@@ -792,54 +846,6 @@ Alternatively, click \\[occur-mode-mouse-goto] on an item to go to it.
   (add-hook 'change-major-mode-hook 'font-lock-defontify nil t)
   (setq next-error-function 'occur-next-error))
 
-(define-key occur-mode-map [mouse-2] 'occur-mode-mouse-goto)
-(define-key occur-mode-map "\C-c\C-c" 'occur-mode-goto-occurrence)
-(define-key occur-mode-map "\C-m" 'occur-mode-goto-occurrence)
-(define-key occur-mode-map "o" 'occur-mode-goto-occurrence-other-window)
-(define-key occur-mode-map "\C-o" 'occur-mode-display-occurrence)
-(define-key occur-mode-map "\M-n" 'occur-next)
-(define-key occur-mode-map "\M-p" 'occur-prev)
-(define-key occur-mode-map "r" 'occur-rename-buffer)
-(define-key occur-mode-map "c" 'clone-buffer)
-(define-key occur-mode-map "\C-c\C-f" 'next-error-follow-minor-mode)
-(define-key occur-mode-map [menu-bar] (make-sparse-keymap))
-(define-key occur-mode-map [menu-bar occur] `(cons ,(purecopy "Occur") map))
-(define-key occur-mode-map [next-error-follow-minor-mode]
-  (menu-bar-make-mm-toggle next-error-follow-minor-mode
-                           "Auto Occurrence Display"
-                           "Display another occurrence when moving the cursor"))
-(define-key occur-mode-map [separator-1] menu-bar-separator)
-(define-key occur-mode-map [kill-this-buffer]
-  `(menu-item ,(purecopy "Kill occur buffer") kill-this-buffer
-              :help ,(purecopy "Kill the current *Occur* buffer")))
-(define-key occur-mode-map [quit-window]
-  `(menu-item ,(purecopy "Quit occur window") quit-window
-              :help ,(purecopy "Quit the current *Occur* buffer.  Bury it, and maybe delete the selected frame")))
-(define-key occur-mode-map [revert-buffer]
-  `(menu-item ,(purecopy "Revert occur buffer") revert-buffer
-              :help ,(purecopy "Replace the text in the *Occur* buffer with the results of rerunning occur")))
-(define-key occur-mode-map [clone-buffer]
-  `(menu-item ,(purecopy "Clone occur buffer") clone-buffer
-              :help ,(purecopy "Create and return a twin copy of the current *Occur* buffer")))
-(define-key occur-mode-map [occur-rename-buffer]
-  `(menu-item ,(purecopy "Rename occur buffer") occur-rename-buffer
-              :help ,(purecopy "Rename the current *Occur* buffer to *Occur: original-buffer-name*.")))
-(define-key occur-mode-map [separator-2] menu-bar-separator)
-(define-key occur-mode-map [occur-mode-goto-occurrence-other-window]
-  `(menu-item ,(purecopy "Go To Occurrence Other Window") occur-mode-goto-occurrence-other-window
-              :help ,(purecopy "Go to the occurrence the current line describes, in another window")))
-(define-key occur-mode-map [occur-mode-goto-occurrence]
-  `(menu-item ,(purecopy "Go To Occurrence") occur-mode-goto-occurrence
-              :help ,(purecopy "Go to the occurrence the current line describes")))
-(define-key occur-mode-map [occur-mode-display-occurrence]
-  `(menu-item ,(purecopy "Display Occurrence") occur-mode-display-occurrence
-              :help ,(purecopy "Display in another window the occurrence the current line describes")))
-(define-key occur-mode-map [occur-next]
-  `(menu-item ,(purecopy "Move to next match") occur-next
-              :help ,(purecopy "Move to the Nth (default 1) next match in an Occur mode buffer")))
-(define-key occur-mode-map [occur-prev]
-  `(menu-item ,(purecopy "Move to previous match") occur-prev
-              :help ,(purecopy "Move to the Nth (default 1) previous match in an Occur mode buffer")))
 (defun occur-revert-function (ignore1 ignore2)
   "Handle `revert-buffer' for Occur mode buffers."
   (apply 'occur-1 (append occur-revert-arguments (list (buffer-name)))))