# HG changeset patch
# User Stefan Monnier <monnier@iro.umontreal.ca>
# Date 975879666 0
# Node ID 3f40525951d5b54202136ef7b7a6450b8af99e34
# Parent  96ff9f3650b55fd5ea72ba4b7c2154d57051587a
*** empty log message ***

diff -r 96ff9f3650b5 -r 3f40525951d5 lisp/ChangeLog
--- a/lisp/ChangeLog	Sun Dec 03 21:40:23 2000 +0000
+++ b/lisp/ChangeLog	Sun Dec 03 21:41:06 2000 +0000
@@ -1,3 +1,13 @@
+2000-12-03  Stefan Monnier  <monnier@cs.yale.edu>
+
+	* emacs-lisp/easy-mmode.el (define-derived-mode) 
+	(easy-mmode-derived-mode-p): Remove (moved to derived.el).
+
+	* derived.el (define-derived-mode): Revived, moved from easy-mmode.el.
+	(derived-mode-p): New function.
+	(derived-mode-make-docstring): Add `docstring' argument.
+	Use it if available and complete it if necessary.
+
 2000-12-03  Andreas Schwab  <schwab@suse.de>
 
 	* type-break.el (type-break): Don't make parent of itself.