aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2011-08-24 22:37:55 -0700
committerGlenn Morris2011-08-24 22:37:55 -0700
commitb2948976fc35f12755c5d33e81578e5f3db0d884 (patch)
treeb657dbec8b4408662e8880cf5481ee2a79f3331f
parente4ed06f12b052a3c80d5c572889cb670a41f3c7d (diff)
downloademacs-b2948976fc35f12755c5d33e81578e5f3db0d884.tar.gz
emacs-b2948976fc35f12755c5d33e81578e5f3db0d884.zip
* lisp/emacs-lisp/derived.el (define-derived-mode): Doc fix.
-rw-r--r--lisp/ChangeLog2
-rw-r--r--lisp/emacs-lisp/derived.el4
2 files changed, 4 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 91078ce3246..9533d43f572 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -4,6 +4,8 @@
4 4
52011-08-25 Glenn Morris <rgm@gnu.org> 52011-08-25 Glenn Morris <rgm@gnu.org>
6 6
7 * emacs-lisp/derived.el (define-derived-mode): Doc fix.
8
7 * mail/smtpmail.el (smtpmail-smtp-user): Add version: tag. 9 * mail/smtpmail.el (smtpmail-smtp-user): Add version: tag.
8 (smtpmail-via-smtp): Handle nil response from smtp. 10 (smtpmail-via-smtp): Handle nil response from smtp.
9 11
diff --git a/lisp/emacs-lisp/derived.el b/lisp/emacs-lisp/derived.el
index 4fda2bf1d52..81932f9940a 100644
--- a/lisp/emacs-lisp/derived.el
+++ b/lisp/emacs-lisp/derived.el
@@ -133,10 +133,10 @@ BODY can start with a bunch of keyword arguments. The following keyword
133 Declare the customization group that corresponds to this mode. 133 Declare the customization group that corresponds to this mode.
134 The command `customize-mode' uses this. 134 The command `customize-mode' uses this.
135:syntax-table TABLE 135:syntax-table TABLE
136 Use TABLE instead of the default. 136 Use TABLE instead of the default (CHILD-syntax-table).
137 A nil value means to simply use the same syntax-table as the parent. 137 A nil value means to simply use the same syntax-table as the parent.
138:abbrev-table TABLE 138:abbrev-table TABLE
139 Use TABLE instead of the default. 139 Use TABLE instead of the default (CHILD-abbrev-table).
140 A nil value means to simply use the same abbrev-table as the parent. 140 A nil value means to simply use the same abbrev-table as the parent.
141 141
142Here is how you could define LaTeX-Thesis mode as a variant of LaTeX mode: 142Here is how you could define LaTeX-Thesis mode as a variant of LaTeX mode: