summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Goaziou <mail@nicolasgoaziou.fr>2018-01-31 21:20:54 +0100
committerNicolas Goaziou <mail@nicolasgoaziou.fr>2018-01-31 21:20:54 +0100
commit2a91f967ca43c940ee50a28630b7ff814b61dd34 (patch)
treee240f6d14a7aa05c68afd1dfa9543bb25711ca5b
parent86f3ef8d80bf8738fd3ba99f8d0f7ffec4e23a4e (diff)
parentddc8e8eb23b1c87f6d1bc402b898706837ea0d79 (diff)
downloadorg-mode-2a91f967ca43c940ee50a28630b7ff814b61dd34.tar.gz
Merge branch 'maint'
-rw-r--r--lisp/ox.el20
1 files changed, 12 insertions, 8 deletions
diff --git a/lisp/ox.el b/lisp/ox.el
index f050864..4b25752 100644
--- a/lisp/ox.el
+++ b/lisp/ox.el
@@ -714,12 +714,15 @@ frequently in plain text."
(defcustom org-export-with-toc t
"Non-nil means create a table of contents in exported files.
-The TOC contains headlines with levels up
-to`org-export-headline-levels'. When an integer, include levels
-up to N in the toc, this may then be different from
-`org-export-headline-levels', but it will not be allowed to be
-larger than the number of headline levels. When nil, no table of
-contents is made.
+The table of contents contains headlines with levels up to
+`org-export-headline-levels'.
+
+When this variable is set to an integer N, include levels up to
+N in the table of contents. Although it may then be different
+from `org-export-headline-levels', it is cannot be larger than
+the number of headline levels.
+
+When nil, no table of contents is created.
This option can also be set with the OPTIONS keyword,
e.g. \"toc:nil\" or \"toc:3\"."
@@ -728,8 +731,9 @@ e.g. \"toc:nil\" or \"toc:3\"."
(const :tag "No Table of Contents" nil)
(const :tag "Full Table of Contents" t)
(integer :tag "TOC to level"))
- :safe (lambda (x) (or (booleanp x)
- (integerp x))))
+ :safe (lambda (x)
+ (or (booleanp x)
+ (integerp x))))
(defcustom org-export-with-tables t
"Non-nil means export tables.