Merge branch 'maint'

2016-12-13 09:13:37 +01:00 · 2016-12-13 09:13:37 +01:00 · 7274786f6e
parent 591ca3a0f3 e491ab31c6
commit 7274786f6e
1 changed files with 2 additions and 1 deletions
--- a/lisp/ox-latex.el
+++ b/lisp/ox-latex.el
@ -2707,7 +2707,8 @@ containing export options.  Modify DATA by side-effect and return it."
 		(or (string-prefix-p "\\(" value)
 		    (string-match-p "\\`\\$[^$]" value))))
 	     ((and type (or `subscript `superscript))
-	      (not (org-element-map b type #'identity info t)))))))
+	      (not (memq type (mapcar #'org-element-type
+				      (org-element-contents b)))))))))
    (org-element-map data '(entity latex-fragment subscript superscript)
      (lambda (object)
 	;; Skip objects already wrapped.