summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Goaziou <mail@nicolasgoaziou.fr>2016-11-29 09:30:10 +0100
committerNicolas Goaziou <mail@nicolasgoaziou.fr>2016-11-29 09:30:10 +0100
commite53452c76c1abae064bfe49efe345f9dea3e3b3f (patch)
tree22d8b0eabbbad5dd27c71fbd9fc0503c1b1b6e3a
parent3d80b3545e5e65d836d443d62e89dcee7bcd409c (diff)
parentf5916c4fbb6cd859b179b90489f2eb5b8da65e33 (diff)
downloadorg-mode-e53452c76c1abae064bfe49efe345f9dea3e3b3f.tar.gz
Merge branch 'maint'
-rw-r--r--lisp/org.el9
-rw-r--r--lisp/ox-odt.el6
2 files changed, 6 insertions, 9 deletions
diff --git a/lisp/org.el b/lisp/org.el
index e372475..5763829 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -19386,12 +19386,9 @@ inspection."
(with-current-buffer (find-file-noselect tmp-out-file t)
(goto-char (point-min))
(when (re-search-forward
- (concat
- (regexp-quote
- "<math xmlns=\"http://www.w3.org/1998/Math/MathML\"")
- "[^>]*?>"
- "\\(.\\|\n\\)*"
- "</math>")
+ (format "<math[^>]*?%s[^>]*?>\\(.\\|\n\\)*</math>"
+ (regexp-quote
+ "xmlns=\"http://www.w3.org/1998/Math/MathML\""))
nil t)
(prog1 (match-string 0) (kill-buffer))))))
(cond
diff --git a/lisp/ox-odt.el b/lisp/ox-odt.el
index 05d86bf..a705b68 100644
--- a/lisp/ox-odt.el
+++ b/lisp/ox-odt.el
@@ -3741,9 +3741,9 @@ contextual information."
(org-link
(let ((link (with-temp-buffer
(insert latex-frag)
- (org-format-latex cache-subdir cache-dir
- nil display-msg
- nil processing-type)
+ (org-format-latex cache-subdir nil nil cache-dir
+ nil display-msg nil
+ processing-type)
(buffer-substring-no-properties
(point-min) (point-max)))))
(if (string-match-p "file:\\([^]]*\\)" link) link