Merge from emacs-23

[gnu-emacs] / lisp / erc / erc-list.el

diff --git a/lisp/erc/erc-list.el b/lisp/erc/erc-list.el
index 3a3b40e4850658ea2c7910edc61f827d9b4ce0f8..b86cf4e6c05491c888104e6533169642c8ead0ee 100644 (file)
--- a/lisp/erc/erc-list.el
+++ b/lisp/erc/erc-list.el
@@ -117,19 +117,18 @@
          (sort-fields col (point-min) (point-max))
        (sort-numeric-fields col (point-min) (point-max))))))
 
-(defvar erc-list-menu-mode-map nil
+(defvar erc-list-menu-mode-map
+  (let ((map (make-keymap)))
+    (suppress-keymap map)
+    (define-key map "k" 'erc-list-kill)
+    (define-key map "j" 'erc-list-join)
+    (define-key map "g" 'erc-list-revert)
+    (define-key map "n" 'next-line)
+    (define-key map "p" 'previous-line)
+    (define-key map "q" 'quit-window)
+    map)
   "Local keymap for `erc-list-mode' buffers.")
 
-(unless erc-list-menu-mode-map
-  (setq erc-list-menu-mode-map (make-keymap))
-  (suppress-keymap erc-list-menu-mode-map)
-  (define-key erc-list-menu-mode-map "k" 'erc-list-kill)
-  (define-key erc-list-menu-mode-map "j" 'erc-list-join)
-  (define-key erc-list-menu-mode-map "g" 'erc-list-revert)
-  (define-key erc-list-menu-mode-map "n" 'next-line)
-  (define-key erc-list-menu-mode-map "p" 'previous-line)
-  (define-key erc-list-menu-mode-map "q" 'quit-window))
-
 (defvar erc-list-menu-sort-button-map nil
   "Local keymap for ERC list menu mode sorting buttons.")