Merge from emacs-23

[gnu-emacs] / lisp / net / eudc-hotlist.el

diff --git a/lisp/net/eudc-hotlist.el b/lisp/net/eudc-hotlist.el
index 7411d08f9551dbb9c9108e49209f48e62dd3ff42..7cfb7a159e910d2b6cdf0d7e1fef20dc3ab120fc 100644 (file)
--- a/lisp/net/eudc-hotlist.el
+++ b/lisp/net/eudc-hotlist.el
@@ -6,6 +6,7 @@
 ;; Author: Oscar Figueiredo <oscar@cpe.fr>
 ;; Maintainer: Pavel Janík <Pavel@Janik.cz>
 ;; Keywords: comm
+;; Package: eudc
 
 ;; This file is part of GNU Emacs.
 
@@ -32,9 +33,18 @@
 (require 'eudc)
 
 (defvar eudc-hotlist-menu nil)
-(defvar eudc-hotlist-mode-map nil)
 (defvar eudc-hotlist-list-beginning nil)
 
+(defvar eudc-hotlist-mode-map
+  (let ((map (make-sparse-keymap)))
+    (define-key map "a" 'eudc-hotlist-add-server)
+    (define-key map "d" 'eudc-hotlist-delete-server)
+    (define-key map "s" 'eudc-hotlist-select-server)
+    (define-key map "t" 'eudc-hotlist-transpose-servers)
+    (define-key map "q" 'eudc-hotlist-quit-edit)
+    (define-key map "x" 'kill-this-buffer)
+    map))
+
 (defun eudc-hotlist-mode ()
   "Major mode used to edit the hotlist of servers.
 
@@ -168,16 +178,6 @@ These are the special commands of this mode:
            (forward-line 1)
            (transpose-lines 1))))))
 
-(setq eudc-hotlist-mode-map
-      (let ((map (make-sparse-keymap)))
-       (define-key map "a" 'eudc-hotlist-add-server)
-       (define-key map "d" 'eudc-hotlist-delete-server)
-       (define-key map "s" 'eudc-hotlist-select-server)
-       (define-key map "t" 'eudc-hotlist-transpose-servers)
-       (define-key map "q" 'eudc-hotlist-quit-edit)
-       (define-key map "x" 'kill-this-buffer)
-       map))
-
 (defconst eudc-hotlist-menu
   '("EUDC Hotlist Edit"
     ["---" nil nil]