[Emacs-diffs] Changes to emacs/lisp/emacs-lisp/easy-mmode.el

[Luc Teirlinck]

Index: emacs/lisp/emacs-lisp/easy-mmode.el
diff -c emacs/lisp/emacs-lisp/easy-mmode.el:1.68 
emacs/lisp/emacs-lisp/easy-mmode.el:1.69
*** emacs/lisp/emacs-lisp/easy-mmode.el:1.68    Thu Jul 14 00:56:13 2005
--- emacs/lisp/emacs-lisp/easy-mmode.el Sat Jul 16 02:25:48 2005
***************
*** 142,149 ****
--- 142,151 ----
    (let* ((mode-name (symbol-name mode))
         (pretty-name (easy-mmode-pretty-mode-name mode lighter))
         (globalp nil)
+        (set nil)
         (initialize nil)
         (group nil)
+        (type nil)
         (extra-args nil)
         (extra-keywords nil)
         (require t)
***************
*** 160,167 ****
--- 162,171 ----
        (:lighter (setq lighter (pop body)))
        (:global (setq globalp (pop body)))
        (:extra-args (setq extra-args (pop body)))
+       (:set (setq set (list :set (pop body))))
        (:initialize (setq initialize (list :initialize (pop body))))
        (:group (setq group (nconc group (list :group (pop body)))))
+       (:type (setq type (list :type (pop body))))
        (:require (setq require (pop body)))
        (:keymap (setq keymap (pop body)))
        (t (push keyw extra-keywords) (push (pop body) extra-keywords))))
***************
*** 169,177 ****
      (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.
--- 173,182 ----
      (setq keymap-sym (if (and keymap (symbolp keymap)) keymap
                       (intern (concat mode-name "-map"))))
  
+     (unless set (setq set '(:set 'custom-set-minor-mode)))
+ 
      (unless initialize
!       (setq initialize '(:initialize 'custom-initialize-default)))
  
      (unless group
        ;; We might as well provide a best-guess default group.
***************
*** 179,184 ****
--- 184,191 ----
            `(:group ',(intern (replace-regexp-in-string
                                "-mode\\'" "" mode-name)))))
  
+     (unless type (setq type '(:type 'boolean)))
+ 
      `(progn
         ;; Define the variable to enable or disable the mode.
         ,(if (not globalp)
***************
*** 201,210 ****
  
            `(defcustom ,mode ,init-value
               ,(format base-doc-string pretty-name mode mode)
!              :set 'custom-set-minor-mode
               ,@initialize
               ,@group
!              :type 'boolean
               ,@(cond
                  ((not (and curfile require)) nil)
                  ((not (eq require t)) `(:require ,require)))
--- 208,217 ----
  
            `(defcustom ,mode ,init-value
               ,(format base-doc-string pretty-name mode mode)
!              ,@set
               ,@initialize
               ,@group
!              ,@type
               ,@(cond
                  ((not (and curfile require)) nil)
                  ((not (eq require t)) `(:require ,require)))