summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Goaziou <n.goaziou@gmail.com>2013-06-20 18:19:55 (GMT)
committer Nicolas Goaziou <n.goaziou@gmail.com>2013-06-20 18:19:55 (GMT)
commitab4023582628e152eaf688a328cee0893fc5d900 (patch)
tree323d0143449c5523a0c3d1cda3f22c9bef08f3fe
parenta79fd4be2863a300c88218b40b1adca23d9e1eb8 (diff)
parentf9ae004aca12f2a6439587434a90f4560309a38e (diff)
downloadorg-mode-ab4023582628e152eaf688a328cee0893fc5d900.zip
org-mode-ab4023582628e152eaf688a328cee0893fc5d900.tar.gz
Merge branch 'maint'
-rw-r--r--lisp/ox-html.el2
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/ox-html.el b/lisp/ox-html.el
index 365802f..90d6a5d 100644
--- a/lisp/ox-html.el
+++ b/lisp/ox-html.el
@@ -1719,7 +1719,7 @@ holding export options."
"<body>\n"
(let ((link-up (org-trim (plist-get info :html-link-up)))
(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
(or link-up link-home)
(or link-home link-up))))