1
0
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git synced 2024-11-25 07:27:57 +00:00

Merge branch 'maint'

This commit is contained in:
Nicolas Goaziou 2013-06-20 20:19:55 +02:00
commit ab40235826

View File

@ -1719,7 +1719,7 @@ holding export options."
"<body>\n" "<body>\n"
(let ((link-up (org-trim (plist-get info :html-link-up))) (let ((link-up (org-trim (plist-get info :html-link-up)))
(link-home (org-trim (plist-get info :html-link-home)))) (link-home (org-trim (plist-get info :html-link-home))))
(unless (and (string= link-up "") (string= link-up "")) (unless (and (string= link-up "") (string= link-home ""))
(format org-html-home/up-format (format org-html-home/up-format
(or link-up link-home) (or link-up link-home)
(or link-home link-up)))) (or link-home link-up))))