Merge branch 'master' into next

This commit is contained in:
Nicolas Goaziou 2018-11-27 21:47:38 +01:00
commit 61396763ac

View file

@ -2892,7 +2892,7 @@ contextual information."
(listings (plist-get info :latex-listings))) (listings (plist-get info :latex-listings)))
(cond (cond
;; Case 1. No source fontification. ;; Case 1. No source fontification.
((not listings) ((or (not lang) (not listings))
(let* ((caption-str (org-latex--caption/label-string src-block info)) (let* ((caption-str (org-latex--caption/label-string src-block info))
(float-env (float-env
(cond ((string= "multicolumn" float) (cond ((string= "multicolumn" float)