summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKyle Meyer <kyle@kyleam.com>2020-05-05 00:16:53 -0400
committerKyle Meyer <kyle@kyleam.com>2020-05-05 00:16:53 -0400
commit89b0d485b1a8a01cbe16c5546c418184b274021f (patch)
tree9f9b141778fdc191e9feaaaea10202d7820b4621
parent6fd05fcaca1cdd83f623287a1e08daa99a662278 (diff)
parent0f783cbca8c3e2a3f9c48b3f30bf6d2f0cda35e0 (diff)
downloadorg-mode-89b0d485b1a8a01cbe16c5546c418184b274021f.tar.gz
Merge branch 'maint'
-rw-r--r--lisp/ox-odt.el3
1 files changed, 1 insertions, 2 deletions
diff --git a/lisp/ox-odt.el b/lisp/ox-odt.el
index 2723c60..d353a3a 100644
--- a/lisp/ox-odt.el
+++ b/lisp/ox-odt.el
@@ -96,7 +96,7 @@
(if a (org-odt-export-to-odt t s v)
(org-open-file (org-odt-export-to-odt nil s v) 'system))))))
:options-alist
- '((:odt-styles-file "ODT_STYLES_FILE" nil nil t)
+ '((:odt-styles-file "ODT_STYLES_FILE" nil org-odt-styles-file t)
(:description "DESCRIPTION" nil nil newline)
(:keywords "KEYWORDS" nil nil space)
(:subtitle "SUBTITLE" nil nil parse)
@@ -110,7 +110,6 @@
(:odt-inline-formula-rules nil nil org-odt-inline-formula-rules)
(:odt-inline-image-rules nil nil org-odt-inline-image-rules)
(:odt-pixels-per-inch nil nil org-odt-pixels-per-inch)
- (:odt-styles-file nil nil org-odt-styles-file)
(:odt-table-styles nil nil org-odt-table-styles)
(:odt-use-date-fields nil nil org-odt-use-date-fields)
;; Redefine regular option.