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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ca9da31080ed816c8161505e11fc0609f8a9206a..cf054e11340eca8f680bfde0392c588e8ac05ca8 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
 2008-04-01  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+       * abbrev.el (abbrev-mode): Use define-minor-mode.
+
        * mouse.el (mouse-major-mode-menu-prefix): Remove.  Remove uses.
        (mouse-menu-non-singleton): Rename from mouse-major-mode-menu-1.
        Use map-keymap.

diff --git a/lisp/abbrev.el b/lisp/abbrev.el
index 1f0b28cfb97413a9cf00b994ad1d3a1246d05fea..da09401504d0647b40c5dae95ec8ed996b20fb23 100644 (file)
--- a/lisp/abbrev.el
+++ b/lisp/abbrev.el
@@ -49,16 +49,11 @@ define global abbrevs instead."
   :group 'abbrev-mode
   :group 'convenience)
 
-(defun abbrev-mode (&optional arg)
+(define-minor-mode abbrev-mode
   "Toggle Abbrev mode in the current buffer.
 With optional argument ARG, turn abbrev mode on if ARG is
 positive, otherwise turn it off.  In Abbrev mode, inserting an
-abbreviation causes it to expand and be replaced by its expansion."
-  (interactive "P")
-  (setq abbrev-mode
-       (if (null arg) (not abbrev-mode)
-         (> (prefix-numeric-value arg) 0)))
-  (force-mode-line-update))
+abbreviation causes it to expand and be replaced by its expansion.")
 
 (defcustom abbrev-mode nil
   "Enable or disable Abbrev mode.