(easy-mmode-define-global-mode, define-minor-mode): Call

custom-current-group at load-time.

diff --git a/lisp/emacs-lisp/easy-mmode.el b/lisp/emacs-lisp/easy-mmode.el
index b6b91710ed426cd5187d5936bb633c52c35e9318..da93190f2e99cf49688ed6775c1809799a3597b2 100644 (file)
--- a/lisp/emacs-lisp/easy-mmode.el
+++ b/lisp/emacs-lisp/easy-mmode.el
@@ -1,6 +1,7 @@
 ;;; easy-mmode.el --- easy definition for major and minor modes
 
-;; Copyright (C) 1997,2000,01,02,03,2004  Free Software Foundation, Inc.
+;; Copyright (C) 1997, 2000, 2001, 2002, 2003, 2004, 2005
+;;   Free Software Foundation, Inc.
 
 ;; Author: Georges Brun-Cottan <Georges.Brun-Cottan@inria.fr>
 ;; Maintainer: Stefan Monnier <monnier@gnu.org>
@@ -152,8 +153,8 @@ For example, you could write
     (unless group
       ;; We might as well provide a best-guess default group.
       (setq group
-           `(:group ',(or (custom-current-group)
-                          (intern (replace-regexp-in-string
+           `(:group (or (custom-current-group)
+                        ',(intern (replace-regexp-in-string
                                    "-mode\\'" "" mode-name))))))
 
     `(progn
@@ -278,8 +279,8 @@ KEYS is a list of CL-style keyword arguments:
     (unless group
       ;; We might as well provide a best-guess default group.
       (setq group
-           `(:group ',(or (custom-current-group)
-                          (intern (replace-regexp-in-string
+           `(:group (or (custom-current-group)
+                        ',(intern (replace-regexp-in-string
                                    "-mode\\'" "" (symbol-name mode)))))))
 
     `(progn