diff options
author | Bastien Guerry <bzg@altern.org> | 2012-10-03 12:13:07 +0200 |
---|---|---|
committer | Bastien Guerry <bzg@altern.org> | 2012-10-03 12:13:07 +0200 |
commit | 156b42e4f27f73480e5fe9773a162d9851b05959 (patch) | |
tree | cc98942b495d21b596b4ffbcd8db5c87178930ef | |
parent | 7dd847c6852c979a9a93bfe3577a032ebe0cff3a (diff) | |
download | org-mode-156b42e4f27f73480e5fe9773a162d9851b05959.tar.gz |
Revert "org-odt.el (org-odt-styles-dir): Try more directories"
This reverts commit fc8ad1347e103b399d0fcdb617d99e5bf06b80b6.
-rw-r--r-- | lisp/org-odt.el | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/lisp/org-odt.el b/lisp/org-odt.el index 117c824..c417080 100644 --- a/lisp/org-odt.el +++ b/lisp/org-odt.el @@ -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 - |