Merge branch 'master' into next

This commit is contained in:
Nicolas Goaziou 2018-11-10 21:57:29 +01:00
commit a97903944b
1 changed files with 1 additions and 1 deletions

View File

@ -1364,7 +1364,7 @@ original parsed data. INFO is a plist holding export options."
(condition-case nil
(read s)
(error (user-error "Invalid styles file specification: %S" s))))
(filename filename))))
(filename (org-strip-quote filename)))))
(cond
;; Non-availability of styles.xml is not a critical error. For
;; now, throw an error.