Merge branch 'maint'

This commit is contained in:
Nicolas Goaziou 2015-10-18 09:28:30 +02:00
commit 486d947761

View file

@ -916,23 +916,22 @@ channel."
;; Id and custom-id links: Headlines refer to their numbering.
((member type '("custom-id" "id"))
(let ((dest (org-export-resolve-id-link link info)))
(if (concat
(org-ascii--fill-string
(format
"[%s] %s"
anchor
(if (stringp dest) ; External file.
dest
(format
(org-ascii--translate "See section %s" info)
(if (org-export-numbered-headline-p dest info)
(mapconcat #'number-to-string
(org-export-get-headline-number dest info)
".")
(org-export-data
(org-element-property :title dest) info)))))
width info)
"\n\n"))))
(concat
(org-ascii--fill-string
(format
"[%s] %s"
anchor
(if (stringp dest) ; External file.
dest
(format
(org-ascii--translate "See section %s" info)
(if (org-export-numbered-headline-p dest info)
(mapconcat #'number-to-string
(org-export-get-headline-number dest info)
".")
(org-export-data (org-element-property :title dest) info)))))
width info)
"\n\n")))
;; Do not add a link that cannot be resolved and doesn't have
;; any description: destination is already visible in the
;; paragraph.