Merge from origin/emacs-25

b6d6304 Comment on last change to define-derived-mode

diff --git a/lisp/emacs-lisp/derived.el b/lisp/emacs-lisp/derived.el
index 19ff7abda39c541d9817f6a07e64d3099768cd25..a615f9a5854510db22a82a0954c2cceb6f412c99 100644 (file)
--- a/lisp/emacs-lisp/derived.el
+++ b/lisp/emacs-lisp/derived.el
@@ -162,7 +162,13 @@ 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))
-          (doc-string 4))
+          (doc-string 4)
+          ;; Ask not what
+          ;;(indent 3)
+          ;; can do for you, ask what it can do to others. IOW, the
+          ;; missing of indentation setting here is the indentation
+          ;; setting and not an oversight.
+          )
 
   (when (and docstring (not (stringp docstring)))
     ;; Some trickiness, since what appears to be the docstring may really be