From 27c673781309f1ad58a55c4130b793ff18fc7ac9 Mon Sep 17 00:00:00 2001 From: Bastien Guerry Date: Wed, 3 Oct 2012 10:28:43 +0200 Subject: [PATCH] org-e-odt.el: Bugfix: default to the correct directory for styles. * org-e-odt.el (org-e-odt-styles-dir): Try more directories. Don't throw an error, just send a message. (org-e-odt): Fix a bug about deactivating an advice that was activated by org-odt.el, not org-e-odt.el. Thanks to Nick Dokos for reporting this. --- contrib/lisp/org-e-odt.el | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/contrib/lisp/org-e-odt.el b/contrib/lisp/org-e-odt.el index 14147c71d..69fbea17a 100644 --- a/contrib/lisp/org-e-odt.el +++ b/contrib/lisp/org-e-odt.el @@ -117,9 +117,12 @@ (defconst org-e-odt-styles-dir (let* ((d (expand-file-name (org-find-library-dir "org-e-odt.el"))) (styles-dir-list (list - (concat d "../../etc/styles/") ;; Git - (concat d "../../etc/org/") ;; system - (concat d "../etc/org/"))) ;; ELPA org-plus + (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 styles-dir) (setq styles-dir (car @@ -133,8 +136,8 @@ "OrgOdtStyles.xml" sd))) sd)) styles-dir-list)))) - (or styles-dir - (error "Cannot find factory styles files for Org ODT, aborting"))) + (or (expand-file-name styles-dir) + (message "Cannot find factory styles files for Org ODT"))) "Directory that holds auxiliary XML files used by the ODT exporter. This directory contains the following XML files - @@ -1826,7 +1829,7 @@ CONTENTS is nil. INFO is a plist holding contextual information." ;;;; Latex Environment -(eval-after-load 'org-e-odt +(eval-after-load 'org-odt '(ad-deactivate 'org-format-latex-as-mathml)) ;; (defadvice org-format-latex-as-mathml ; FIXME