summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Goaziou <mail@nicolasgoaziou.fr>2016-02-27 09:35:30 +0100
committerNicolas Goaziou <mail@nicolasgoaziou.fr>2016-02-27 09:35:30 +0100
commit2a0a37c1a727763e70f612d1829d0e3168b3595b (patch)
tree584121cc174d507e0b963a6fd3a3194215c51583
parent07e514b58b89fd7e9a25026f5052463bb5778e75 (diff)
parentdc68d28d67fb8cd48de317585dbddae9dd1470e8 (diff)
downloadorg-mode-2a0a37c1a727763e70f612d1829d0e3168b3595b.tar.gz
Merge branch 'maint'
-rw-r--r--lisp/ox-latex.el2
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/ox-latex.el b/lisp/ox-latex.el
index 815dbbf..7fa68c5 100644
--- a/lisp/ox-latex.el
+++ b/lisp/ox-latex.el
@@ -1280,7 +1280,7 @@ For non-floats, see `org-latex--wrap-label'."
((org-string-nw-p caption-from-attr-latex)
(concat caption-from-attr-latex "\n"))
((and (not main) (equal label "")) "")
- ((not main) (concat label "\n"))
+ ((not main) label)
;; Option caption format with short name.
(t
(format (if nonfloat "\\captionof{%s}%s{%s%s}\n"