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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2a92152994918941365590b074a74a012351c462..b7ff4e5608706991d51fe66507333c6399eaea66 100644 (file)
--- 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 13b91c8f3d3a7b2a6702afbe1c85dd7e32873209..83cb7aeee787e86b71e9da9e9aca93f0721df7f7 100644 (file)
--- 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