summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Goaziou <n.goaziou@gmail.com>2012-11-28 12:34:22 (GMT)
committer Nicolas Goaziou <n.goaziou@gmail.com>2012-11-28 12:36:31 (GMT)
commitdbdbf53cd69c2bcbab1cbef8c84ed5196de95885 (patch)
tree41e1e56a8687e84a415a3f8bd81873631a531159
parentd344fda27aebcf0b40d1d3f74b8a877403eae208 (diff)
downloadorg-mode-dbdbf53cd69c2bcbab1cbef8c84ed5196de95885.zip
org-mode-dbdbf53cd69c2bcbab1cbef8c84ed5196de95885.tar.gz
org-export: Fix *:nil export option
* contrib/lisp/org-export.el (org-export--interpret-p): Fix *:nil export option. (org-export-with-emphasize): Update docstring.
-rw-r--r--contrib/lisp/org-export.el9
1 files changed, 5 insertions, 4 deletions
diff --git a/contrib/lisp/org-export.el b/contrib/lisp/org-export.el
index e822765..2597109 100644
--- a/contrib/lisp/org-export.el
+++ b/contrib/lisp/org-export.el
@@ -362,11 +362,11 @@ e.g. \"email:t\"."
:type 'boolean)
(defcustom org-export-with-emphasize t
- "Non-nil means interpret *word*, /word/, and _word_ as emphasized text.
+ "Non-nil means interpret *word*, /word/, _word_ and +word+.
If the export target supports emphasizing text, the word will be
-typeset in bold, italic, or underlined, respectively. Not all
-export backends support this.
+typeset in bold, italic, with an underline or strike-through,
+respectively.
This option can also be set with the #+OPTIONS line, e.g. \"*:nil\"."
:group 'org-export-general
@@ -2002,7 +2002,8 @@ a plist."
;; ... entities...
(entity (plist-get info :with-entities))
;; ... emphasis...
- (emphasis (plist-get info :with-emphasize))
+ ((bold italic strike-through underline)
+ (plist-get info :with-emphasize))
;; ... fixed-width areas.
(fixed-width (plist-get info :with-fixed-width))
;; ... footnotes...