Merge branch 'maint'

2016-02-27 09:35:30 +01:00 · 2016-02-27 09:35:30 +01:00 · 2a0a37c1a7
parent 07e514b58b dc68d28d67
commit 2a0a37c1a7
1 changed files with 1 additions and 1 deletions
--- 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"