summaryrefslogtreecommitdiff
path: root/lisp/emacs-lisp
diff options
context:
space:
mode:
authorMarkus Rost <rost@math.uni-bielefeld.de>2002-12-13 23:54:45 +0000
committerMarkus Rost <rost@math.uni-bielefeld.de>2002-12-13 23:54:45 +0000
commitdce88ea679bbc59910a5c6d5dad579821c70cddf (patch)
tree8fc2d158e58acefda7caddf3708a4aac8527e688 /lisp/emacs-lisp
parent990a41084b6a63674f6c1060b5b42ea1c95da08f (diff)
downloademacs-dce88ea679bbc59910a5c6d5dad579821c70cddf.tar.gz
emacs-dce88ea679bbc59910a5c6d5dad579821c70cddf.tar.bz2
emacs-dce88ea679bbc59910a5c6d5dad579821c70cddf.zip
(define-minor-mode): Use `custom-current-group'.
Pass all groups to the hook. (easy-mmode-define-global-mode): Use `custom-current-group'.
Diffstat (limited to 'lisp/emacs-lisp')
-rw-r--r--lisp/emacs-lisp/easy-mmode.el13
1 files changed, 8 insertions, 5 deletions
diff --git a/lisp/emacs-lisp/easy-mmode.el b/lisp/emacs-lisp/easy-mmode.el
index 898afddaf31..a0c2ff11522 100644
--- a/lisp/emacs-lisp/easy-mmode.el
+++ b/lisp/emacs-lisp/easy-mmode.el
@@ -140,8 +140,9 @@ For example, you could write
(unless group
;; We might as well provide a best-guess default group.
(setq group
- `(:group ',(intern (replace-regexp-in-string "-mode\\'" ""
- mode-name)))))
+ `(:group ',(or (custom-current-group)
+ (intern (replace-regexp-in-string
+ "-mode\\'" "" mode-name))))))
`(progn
;; Define the variable to enable or disable the mode.
@@ -211,7 +212,7 @@ With zero or negative ARG turn mode off.
;; The toggle's hook.
(defcustom ,hook nil
,(format "Hook run at the end of function `%s'." mode-name)
- :group ,(cadr group)
+ ,@group
:type 'hook)
;; Define the minor-mode keymap.
@@ -263,8 +264,10 @@ KEYS is a list of CL-style keyword arguments:
(unless group
;; We might as well provide a best-guess default group.
(setq group
- `(:group ',(intern (replace-regexp-in-string "-mode\\'" ""
- (symbol-name mode))))))
+ `(:group ',(or (custom-current-group)
+ (intern (replace-regexp-in-string
+ "-mode\\'" "" (symbol-name mode)))))))
+
`(progn
;; The actual global minor-mode
(define-minor-mode ,global-mode