tec/org-mode
tec
/
org-mode
forked from mirrors/org-mode
1
0
Fork 0
Code Pull Requests Releases Activity

Merge branch 'maint'

This commit is contained in:
Nicolas Goaziou 2016-11-29 09:30:10 +01:00
parent 3d80b3545e f5916c4fbb
commit e53452c76c
2 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lisp/org.el
View File

@ -19386,12 +19386,9 @@ inspection."
(with-current-buffer (find-file-noselect tmp-out-file t) (with-current-buffer (find-file-noselect tmp-out-file t)
(goto-char (point-min)) (goto-char (point-min))
(when (re-search-forward (when (re-search-forward
(concat (format "<math[^>]*?%s[^>]*?>\\(.\\|\n\\)*</math>"
(regexp-quote (regexp-quote
"<math xmlns=\"http://www.w3.org/1998/Math/MathML\"") "xmlns=\"http://www.w3.org/1998/Math/MathML\""))
"[^>]*?>"
"\\(.\\|\n\\)*"
"</math>")
nil t) nil t)
(prog1 (match-string 0) (kill-buffer)))))) (prog1 (match-string 0) (kill-buffer))))))
(cond (cond

6
lisp/ox-odt.el
View File

@ -3741,9 +3741,9 @@ contextual information."
(org-link (org-link
(let ((link (with-temp-buffer (let ((link (with-temp-buffer
(insert latex-frag) (insert latex-frag)
(org-format-latex cache-subdir cache-dir (org-format-latex cache-subdir nil nil cache-dir
nil display-msg nil display-msg nil
nil processing-type) processing-type)
(buffer-substring-no-properties (buffer-substring-no-properties
(point-min) (point-max))))) (point-min) (point-max)))))
(if (string-match-p "file:\\([^]]*\\)" link) link (if (string-match-p "file:\\([^]]*\\)" link) link