Merge branch 'maint'

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

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