Use extended form of define-minor-mode

1 files changed, 2 insertions, 14 deletions

diff --git a/lib/bufhist.el b/lib/bufhist.el
index ddde0ef8..9ef3b6b9 100644
--- a/lib/bufhist.el
+++ b/lib/bufhist.el
@@ -119,22 +119,12 @@ Commands:\\<bufhist-minor-mode-map>
 \\[bufhist-last]    bufhist-last    go to last (current) item in history.
 \\[bufhist-clear]   bufhist-clear   clear history.
 \\[bufhist-delete]  bufhist-clear   delete current item from history."
-  nil "" bufhist-minor-mode-map)
-
-; For newer versions of define-minor-mode we can use extra
-; args above instead of hook function below:
-;  :group 'bufhist
-;  (if bufhist-mode
-;      (bufhist-init)
-;    (bufhist-exit)))
-; This doesn't work, e.g. with XEmacs 21.4.15.
-
-(defun bufhist-toggle-fn ()
+  nil "" bufhist-minor-mode-map
+  :group 'bufhist
   (if bufhist-mode
       (bufhist-init)
     (bufhist-exit)))
 
-
 (make-variable-buffer-local 'bufhist-ring)
 (make-variable-buffer-local 'bufhist-ring-pos)
 (make-variable-buffer-local 'bufhist-lastswitch-modified-tick)
@@ -343,6 +333,4 @@ The size defaults to `bufhist-ring-size'."
   (widget-setup))
 
 
-(add-hook 'bufhist-mode-hook 'bufhist-toggle-fn)
-
 (provide 'bufhist)