Merge branch 'master' into next

2018-11-27 21:47:38 +01:00 · 2018-11-27 21:47:38 +01:00 · 61396763ac
parent 819e98afd0 d6e20dbcff
commit 61396763ac
1 changed files with 1 additions and 1 deletions
--- a/lisp/ox-latex.el
+++ b/lisp/ox-latex.el
@ -2892,7 +2892,7 @@ contextual information."
 	   (listings (plist-get info :latex-listings)))
      (cond
       ;; Case 1.  No source fontification.
-       ((not listings)
+       ((or (not lang) (not listings))
 	(let* ((caption-str (org-latex--caption/label-string src-block info))
 	       (float-env
 		(cond ((string= "multicolumn" float)