Merge branch 'maint'

Conflicts: lisp/ox-latex.el
2014-09-22 17:43:30 +02:00 · 2014-09-22 17:43:30 +02:00 · a24ac01cd5
parent 7585fe449b 05d8d76e74
commit a24ac01cd5
1 changed files with 2 additions and 1 deletions
--- 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