# HG changeset patch # User Luc Teirlinck # Date 1121302573 0 # Node ID f2e16ba201e0159df61a65eebf6d1120840c57be # Parent 3ac645ba39864e6ecddbc12d863c434c23a01236 (define-minor-mode): Do not override explicitly specified :initialize keyword. diff -r 3ac645ba3986 -r f2e16ba201e0 lisp/emacs-lisp/easy-mmode.el --- a/lisp/emacs-lisp/easy-mmode.el Wed Jul 13 21:47:54 2005 +0000 +++ b/lisp/emacs-lisp/easy-mmode.el Thu Jul 14 00:56:13 2005 +0000 @@ -142,6 +142,7 @@ (let* ((mode-name (symbol-name mode)) (pretty-name (easy-mmode-pretty-mode-name mode lighter)) (globalp nil) + (initialize nil) (group nil) (extra-args nil) (extra-keywords nil) @@ -159,6 +160,7 @@ (:lighter (setq lighter (pop body))) (:global (setq globalp (pop body))) (:extra-args (setq extra-args (pop body))) + (:initialize (setq initialize (list :initialize (pop body)))) (:group (setq group (nconc group (list :group (pop body))))) (:require (setq require (pop body))) (:keymap (setq keymap (pop body))) @@ -167,6 +169,10 @@ (setq keymap-sym (if (and keymap (symbolp keymap)) keymap (intern (concat mode-name "-map")))) + (unless initialize + (setq initialize + '(:initialize 'custom-initialize-default))) + (unless group ;; We might as well provide a best-guess default group. (setq group @@ -196,7 +202,7 @@ `(defcustom ,mode ,init-value ,(format base-doc-string pretty-name mode mode) :set 'custom-set-minor-mode - :initialize 'custom-initialize-default + ,@initialize ,@group :type 'boolean ,@(cond