mirror of
https://git.savannah.gnu.org/git/emacs/org-mode.git
synced 2024-08-22 12:18:40 +00:00
Merge branch 'maint'
This commit is contained in:
commit
36b95d4491
|
@ -381,9 +381,7 @@ Also add it to `rng-schema-locating-files'."
|
||||||
(file-readable-p
|
(file-readable-p
|
||||||
(expand-file-name "schemas.xml" schema-dir)))
|
(expand-file-name "schemas.xml" schema-dir)))
|
||||||
schema-dir
|
schema-dir
|
||||||
(when value
|
(when value (message "No OpenDocument schema files")))))
|
||||||
(message "No OpenDocument schema files" value))
|
|
||||||
nil)))
|
|
||||||
(when org-e-odt-schema-dir
|
(when org-e-odt-schema-dir
|
||||||
(eval-after-load 'rng-loc
|
(eval-after-load 'rng-loc
|
||||||
'(add-to-list 'rng-schema-locating-files
|
'(add-to-list 'rng-schema-locating-files
|
||||||
|
|
|
@ -139,9 +139,7 @@ Also add it to `rng-schema-locating-files'."
|
||||||
(file-readable-p
|
(file-readable-p
|
||||||
(expand-file-name "schemas.xml" schema-dir)))
|
(expand-file-name "schemas.xml" schema-dir)))
|
||||||
schema-dir
|
schema-dir
|
||||||
(when value
|
(when value (message "No OpenDocument schema files")))))
|
||||||
(message "No OpenDocument schema files" value))
|
|
||||||
nil)))
|
|
||||||
(when org-export-odt-schema-dir
|
(when org-export-odt-schema-dir
|
||||||
(eval-after-load 'rng-loc
|
(eval-after-load 'rng-loc
|
||||||
'(add-to-list 'rng-schema-locating-files
|
'(add-to-list 'rng-schema-locating-files
|
||||||
|
|
Loading…
Reference in a new issue