diff options
| author | Bastien Guerry <bzg@altern.org> | 2014-04-17 17:11:35 +0200 |
|---|---|---|
| committer | Bastien Guerry <bzg@altern.org> | 2014-04-17 17:11:35 +0200 |
| commit | b8ba8cbe3662777122baa3ac9f709eeb29857db5 (patch) | |
| tree | e856a66186c594f828f64f59b6ffadb8c663ec36 | |
| parent | 53aab23e70e16e872c8a7194b2601f3205aa417d (diff) | |
| parent | eaaa5c2e48c054a3d6dbfea4ed0bee16c0b78369 (diff) | |
| download | org-mode-b8ba8cbe3662777122baa3ac9f709eeb29857db5.tar.gz | |
Merge branch 'maint'
Conflicts:
lisp/ox-latex.el
| -rw-r--r-- | lisp/ox-latex.el | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/ox-latex.el b/lisp/ox-latex.el index a241a91..cea21be 100644 --- a/lisp/ox-latex.el +++ b/lisp/ox-latex.el @@ -2361,8 +2361,8 @@ contextual information." ((and float (not (assoc "float" org-latex-listings-options))) `(("float" ,org-latex-default-figure-position)))) `(("language" ,lst-lang)) - (when label `(("label" ,label))) - (when caption-str `(("caption" ,caption-str))) + (if label `(("label" ,label)) '(("label" " "))) + (if caption-str `(("caption" ,caption-str)) '(("caption" " "))) (cond ((assoc "numbers" org-latex-listings-options) nil) ((not num-start) '(("numbers" "none"))) ((zerop num-start) '(("numbers" "left"))) |