(define-derived-mode): Add `doc-string' declaration.

2 files changed, 8 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2a921529949..b7ff4e56087 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2008-06-21  John Paul Wallington  <jpw@pobox.com>
+
+        * emacs-lisp/derived.el (define-derived-mode): Add `doc-string' decl.
+
+        * textmodes/rst.el (rst-mode): Put docstring in right place.
+
 2008-06-21  Chong Yidong  <cyd@stupidchicken.com>
 
         * startup.el (fancy-about-text, fancy-startup-tail): Increase text
diff --git a/lisp/emacs-lisp/derived.el b/lisp/emacs-lisp/derived.el
index 13b91c8f3d3..83cb7aeee78 100644
--- a/lisp/emacs-lisp/derived.el
+++ b/lisp/emacs-lisp/derived.el
@@ -162,7 +162,8 @@ The new mode runs the hook constructed by the function
 
 See Info node `(elisp)Derived Modes' for more details."
   (declare (debug (&define name symbolp sexp [&optional stringp]
-                           [&rest keywordp sexp] def-body)))
+                           [&rest keywordp sexp] def-body))
+           (doc-string 4))
 
   (when (and docstring (not (stringp docstring)))
     ;; Some trickiness, since what appears to be the docstring may really be