mirrors/org-mode
0
0
Fork 1
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git synced 2024-09-29 18:36:26 +00:00
Code Releases Activity

Merge branch 'maint'

Browse source
This commit is contained in:
Nicolas Goaziou 2016-04-19 21:31:30 +02:00
parent dbda42010c 21ef130752
commit b2411769cf
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lisp/ox-odt.el
View file

@ -178,7 +178,7 @@ and `org-odt-data-dir'.")
(eval-when-compile (eval-when-compile
(and (boundp 'org-odt-data-dir) org-odt-data-dir ; see make install (and (boundp 'org-odt-data-dir) org-odt-data-dir ; see make install
(expand-file-name "./styles/" org-odt-data-dir))) (expand-file-name "./styles/" org-odt-data-dir)))
(expand-file-name "../../etc/styles/" org-odt-lib-dir) ; git (expand-file-name "../etc/styles/" org-odt-lib-dir) ; git
(expand-file-name "./etc/styles/" org-odt-lib-dir) ; elpa (expand-file-name "./etc/styles/" org-odt-lib-dir) ; elpa
(expand-file-name "./org/" data-directory) ; system (expand-file-name "./org/" data-directory) ; system
) )