summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Goaziou <mail@nicolasgoaziou.fr>2014-09-22 15:43:30 (GMT)
committer Nicolas Goaziou <mail@nicolasgoaziou.fr>2014-09-22 15:43:30 (GMT)
commita24ac01cd53646fa0f622b998cdbddf8787a1713 (patch)
tree0ec5c1ec54838e985c935571bcdcce3ffd997423
parent7585fe449b0d8c8cf29f2721c89202b00de7cfe6 (diff)
parent05d8d76e74b0cfb0715c41a162ef98cb4b3022d8 (diff)
downloadorg-mode-master.zip
org-mode-master.tar.gz
Merge branch 'maint'HEADmaster
Conflicts: lisp/ox-latex.el
-rw-r--r--lisp/ox-latex.el3
1 files changed, 2 insertions, 1 deletions
diff --git a/lisp/ox-latex.el b/lisp/ox-latex.el
index f59d6b2..218c69f 100644
--- a/lisp/ox-latex.el
+++ b/lisp/ox-latex.el
@@ -1982,7 +1982,8 @@ INFO is a plist holding contextual information. See
#'number-to-string
(org-export-get-headline-number destination info)
"-")))))
- (if (and (plist-get info :section-numbers) (not desc))
+ (if (and (not desc)
+ (org-export-numbered-headline-p destination info))
(format "\\ref{%s}" label)
(format "\\hyperref[%s]{%s}" label
(or desc