mirrors
/
org-mode
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git
0
0
Fork 1
Code Releases Activity

Merge branch 'maint'

This commit is contained in:
Bastien Guerry 2012-10-02 17:58:00 +02:00
parent 30235e6773 79e907fd8c
commit 36b95d4491
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
contrib/lisp/org-e-odt.el
View File

@ -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

4
lisp/org-odt.el
View File

@ -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