Merge branch 'maint'
This commit is contained in:
commit
b2411769cf
|
@ -178,7 +178,7 @@ and `org-odt-data-dir'.")
|
|||
(eval-when-compile
|
||||
(and (boundp 'org-odt-data-dir) org-odt-data-dir ; see make install
|
||||
(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 "./org/" data-directory) ; system
|
||||
)
|
||||
|
|
Loading…
Reference in New Issue