[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master 9fb9d07 17/21: Merge from origin/emacs-25
From: |
John Wiegley |
Subject: |
[Emacs-diffs] master 9fb9d07 17/21: Merge from origin/emacs-25 |
Date: |
Fri, 04 Mar 2016 08:08:57 +0000 |
branch: master
commit 9fb9d0706c9353ea76d8355361854947bba2550d
Merge: 4df043c b6d6304
Author: John Wiegley <address@hidden>
Commit: John Wiegley <address@hidden>
Merge from origin/emacs-25
b6d6304 Comment on last change to define-derived-mode
---
lisp/emacs-lisp/derived.el | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/lisp/emacs-lisp/derived.el b/lisp/emacs-lisp/derived.el
index 19ff7ab..a615f9a 100644
--- 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
- [Emacs-diffs] master 68ed6bf 05/21: Merge from origin/emacs-25, (continued)
- [Emacs-diffs] master 68ed6bf 05/21: Merge from origin/emacs-25, John Wiegley, 2016/03/04
- [Emacs-diffs] master fd4fc00 03/21: Merge from origin/emacs-25, John Wiegley, 2016/03/04
- [Emacs-diffs] master 5ab243f 12/21: ; Merge from origin/emacs-25, John Wiegley, 2016/03/04
- [Emacs-diffs] master b50a207 10/21: ; Merge from origin/emacs-25, John Wiegley, 2016/03/04
- [Emacs-diffs] master f991a50 11/21: Merge from origin/emacs-25, John Wiegley, 2016/03/04
- [Emacs-diffs] master 692caf1 09/21: Merge from origin/emacs-25, John Wiegley, 2016/03/04
- [Emacs-diffs] master 68ce800 13/21: Merge from origin/emacs-25, John Wiegley, 2016/03/04
- [Emacs-diffs] master eab3f9e 14/21: ; Merge from origin/emacs-25, John Wiegley, 2016/03/04
- [Emacs-diffs] master 4df043c 16/21: ; Merge from origin/emacs-25, John Wiegley, 2016/03/04
- [Emacs-diffs] master 5be4e9d 19/21: Merge from origin/emacs-25, John Wiegley, 2016/03/04
- [Emacs-diffs] master 9fb9d07 17/21: Merge from origin/emacs-25,
John Wiegley <=
- [Emacs-diffs] master de3fa65 15/21: Merge from origin/emacs-25, John Wiegley, 2016/03/04
- [Emacs-diffs] master c69aef1 18/21: ; Merge from origin/emacs-25, John Wiegley, 2016/03/04
- [Emacs-diffs] master 5c6cc95 20/21: ; Merge from origin/emacs-25, John Wiegley, 2016/03/04
- [Emacs-diffs] master 17982e0 21/21: Merge from origin/emacs-25, John Wiegley, 2016/03/04