diff options
author | Bastien Guerry <bzg@altern.org> | 2012-10-02 17:58:00 +0200 |
---|---|---|
committer | Bastien Guerry <bzg@altern.org> | 2012-10-02 17:58:00 +0200 |
commit | 36b95d44918f2d45f15ea057d97bf4dea4e00dbe (patch) | |
tree | e0844432649fb64b7c790bf0bf9954764b7fc848 | |
parent | 30235e67733cd3cc4621916ca9231ad96ca85c10 (diff) | |
parent | 79e907fd8c2a650e17f9703f7332dab51d534b8f (diff) | |
download | org-mode-36b95d44918f2d45f15ea057d97bf4dea4e00dbe.tar.gz |
Merge branch 'maint'
-rw-r--r-- | contrib/lisp/org-e-odt.el | 4 | ||||
-rw-r--r-- | lisp/org-odt.el | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/contrib/lisp/org-e-odt.el b/contrib/lisp/org-e-odt.el index 58839e5..715a06b 100644 --- a/contrib/lisp/org-e-odt.el +++ b/contrib/lisp/org-e-odt.el @@ -381,9 +381,7 @@ Also add it to `rng-schema-locating-files'." (file-readable-p (expand-file-name "schemas.xml" schema-dir))) schema-dir - (when value - (message "No OpenDocument schema files" value)) - nil))) + (when value (message "No OpenDocument schema files"))))) (when org-e-odt-schema-dir (eval-after-load 'rng-loc '(add-to-list 'rng-schema-locating-files diff --git a/lisp/org-odt.el b/lisp/org-odt.el index 249bd0a..c417080 100644 --- a/lisp/org-odt.el +++ b/lisp/org-odt.el @@ -139,9 +139,7 @@ Also add it to `rng-schema-locating-files'." (file-readable-p (expand-file-name "schemas.xml" schema-dir))) schema-dir - (when value - (message "No OpenDocument schema files" value)) - nil))) + (when value (message "No OpenDocument schema files"))))) (when org-export-odt-schema-dir (eval-after-load 'rng-loc '(add-to-list 'rng-schema-locating-files |