aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/emacs-lisp/derived.el3
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 16cb21dd5c5..2b02373fbe1 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12015-01-27 Oleh Krehel <ohwoeowho@gmail.com>
2
3 * emacs-lisp/derived.el (define-derived-mode): Declare indent 3.
4
12015-01-27 Katsumi Yamaoka <yamaoka@jpl.org> 52015-01-27 Katsumi Yamaoka <yamaoka@jpl.org>
2 6
3 * emacs-lisp/cl.el (cl--function-convert): Run cl--labels-convert 7 * emacs-lisp/cl.el (cl--function-convert): Run cl--labels-convert
diff --git a/lisp/emacs-lisp/derived.el b/lisp/emacs-lisp/derived.el
index a250ea60d21..52da4c99eaf 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
162See Info node `(elisp)Derived Modes' for more details." 162See Info node `(elisp)Derived Modes' for more details."
163 (declare (debug (&define name symbolp sexp [&optional stringp] 163 (declare (debug (&define name symbolp sexp [&optional stringp]
164 [&rest keywordp sexp] def-body)) 164 [&rest keywordp sexp] def-body))
165 (doc-string 4)) 165 (doc-string 4)
166 (indent 3))
166 167
167 (when (and docstring (not (stringp docstring))) 168 (when (and docstring (not (stringp docstring)))
168 ;; Some trickiness, since what appears to be the docstring may really be 169 ;; Some trickiness, since what appears to be the docstring may really be