(define-minor-mode): Improve the spec and remove the rogue second spec.

diff --git a/lisp/emacs-lisp/edebug.el b/lisp/emacs-lisp/edebug.el
index 65f8cfaa92f8c6faaf7d57274b3b28a0c7c58d73..60bfa9952d637dee321d416e3b9c57f00b7244b5 100644 (file)
--- a/lisp/emacs-lisp/edebug.el
+++ b/lisp/emacs-lisp/edebug.el
@@ -1988,9 +1988,12 @@ expressions; a `progn' form will be returned enclosing these forms."
 (def-edebug-spec defmacro
   (&define name lambda-list def-body))
 (def-edebug-spec define-derived-mode
-  (&define name name stringp [&optional stringp] def-body))
+  (&define name symbolp stringp [&optional stringp] def-body))
 (def-edebug-spec define-minor-mode
-  (&define name stringp def-body))
+  (&define name stringp
+          [&optional sexp sexp &or consp symbolp]
+          [&rest [keywordp sexp]]
+          def-body))
 ;; This plain doesn't work ;-(   -sm
 ;; (def-edebug-spec define-skeleton
 ;;   (&define name stringp def-body))
@@ -2136,8 +2139,6 @@ expressions; a `progn' form will be returned enclosing these forms."
 
 (def-edebug-spec sregexq (&rest sexp))
 
-(def-edebug-spec define-minor-mode (symbolp stringp body))
-
 ;;; The debugger itself
 
 (defvar edebug-active nil)  ;; Non-nil when edebug is active