(widget-browse-mode-map, widget-minor-mode-map): Initialize in the declaration.

(widget-minor-mode): Use define-minor-mode.

2 files changed, 16 insertions, 30 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4c9d5278c74..6e084849de1 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,9 @@
 2007-09-10  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+        * wid-browse.el (widget-browse-mode-map, widget-minor-mode-map):
+        Initialize in the declaration.
+        (widget-minor-mode): Use define-minor-mode.
+
         * woman.el (woman-mode-map, woman-syntax-table):
         Initialize in the declaration.
 
diff --git a/lisp/wid-browse.el b/lisp/wid-browse.el
index ec702f7b45c..f0dab6626ac 100644
--- a/lisp/wid-browse.el
+++ b/lisp/wid-browse.el
@@ -40,14 +40,13 @@
 
 ;;; The Mode.
 
-(defvar widget-browse-mode-map nil
+(defvar widget-browse-mode-map
+  (let ((map (make-sparse-keymap)))
+    (set-keymap-parent map widget-keymap)
+    (define-key map "q" 'bury-buffer)
+    map)
   "Keymap for `widget-browse-mode'.")
 
-(unless widget-browse-mode-map
-  (setq widget-browse-mode-map (make-sparse-keymap))
-  (set-keymap-parent widget-browse-mode-map widget-keymap)
-  (define-key widget-browse-mode-map "q" 'bury-buffer))
-
 (easy-menu-define widget-browse-mode-customize-menu
     widget-browse-mode-map
   "Menu used in widget browser buffers."
@@ -265,38 +264,21 @@ VALUE is assumed to be a list of widgets."
 
 ;;; Widget Minor Mode.
 
-(defvar widget-minor-mode nil
-  "If non-nil, we are in Widget Minor Mode.")
-(make-variable-buffer-local 'widget-minor-mode)
-
-(defvar widget-minor-mode-map nil
+(defvar widget-minor-mode-map
+  (let ((map (make-sparse-keymap)))
+    (set-keymap-parent map widget-keymap)
+    map)
   "Keymap used in Widget Minor Mode.")
 
-(unless widget-minor-mode-map
-  (setq widget-minor-mode-map (make-sparse-keymap))
-  (set-keymap-parent widget-minor-mode-map widget-keymap))
-
 ;;;###autoload
-(defun widget-minor-mode (&optional arg)
+(define-minor-mode widget-minor-mode
   "Togle minor mode for traversing widgets.
 With arg, turn widget mode on if and only if arg is positive."
-  (interactive "P")
-  (cond ((null arg)
-         (setq widget-minor-mode (not widget-minor-mode)))
-        ((<= arg 0)
-         (setq widget-minor-mode nil))
-        (t
-         (setq widget-minor-mode t)))
-  (force-mode-line-update))
-
-(add-to-list 'minor-mode-alist '(widget-minor-mode " Widget"))
-
-(add-to-list 'minor-mode-map-alist
-             (cons 'widget-minor-mode widget-minor-mode-map))
+  :lighter " Widget")
 
 ;;; The End:
 
 (provide 'wid-browse)
 
-;;; arch-tag: d5ffb18f-8984-4735-8502-edf70456db21
+;; arch-tag: d5ffb18f-8984-4735-8502-edf70456db21
 ;;; wid-browse.el ends here