ndwarshuis
/
org-mode
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "org-odt.el (org-odt-styles-dir): Try more directories" 

This reverts commit fc8ad1347e.
This commit is contained in:
Bastien Guerry 2012-10-03 12:13:07 +02:00
parent 7dd847c685
commit 156b42e4f2
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lisp/org-odt.el
View File

@ -150,11 +150,7 @@ Also add it to `rng-schema-locating-files'."
(let* ((d (expand-file-name "../" (org-find-library-dir "org-odt.el")))
(styles-dir-list (list
(concat d "etc/styles/") ;; ELPA and Git
(concat d "etc/org/") ;; Org from Emacs
(concat d "../"
(number-to-string emacs-major-version) "."
(number-to-string emacs-minor-version) "/etc/org/")
(concat data-directory "org/"))) ;; Custom install
(concat d "etc/org/")))
styles-dir)
(setq styles-dir
(car
@ -168,8 +164,8 @@ Also add it to `rng-schema-locating-files'."
"OrgOdtStyles.xml" sd)))
sd))
styles-dir-list))))
(or (expand-file-name styles-dir)
(message "Cannot find factory styles files for Org ODT, aborting")))
(or styles-dir
(error "Cannot find factory styles files for Org ODT, aborting")))
"Directory that holds auxiliary XML files used by the ODT exporter.
This directory contains the following XML files -