diff options
| author | Bastien Guerry <bzg@altern.org> | 2013-04-24 09:55:27 +0200 |
|---|---|---|
| committer | Bastien Guerry <bzg@altern.org> | 2013-04-24 09:55:27 +0200 |
| commit | 0e438a9621ee93834287a8ccd074388be88dfd5f (patch) | |
| tree | bb8c25feb52b31783b3a7f13121bc884bad59785 | |
| parent | 862b91e8db127a51e50dce0910a144c977d47151 (diff) | |
| parent | bb30de44fd73148da435e0b724e200590a622159 (diff) | |
| download | org-mode-0e438a9621ee93834287a8ccd074388be88dfd5f.tar.gz | |
Merge branch 'maint' of orgmode.org:org-mode into maint
| -rw-r--r-- | lisp/ox-html.el | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/lisp/ox-html.el b/lisp/ox-html.el index 54c6a45..ef7d15a 100644 --- a/lisp/ox-html.el +++ b/lisp/ox-html.el @@ -2521,7 +2521,7 @@ INFO is a plist holding contextual information. See (type (org-element-property :type link)) (raw-path (org-element-property :path link)) ;; Ensure DESC really exists, or set it to nil. - (desc (and (not (string= desc "")) desc)) + (desc (org-string-nw-p desc)) (path (cond ((member type '("http" "https" "ftp" "mailto")) @@ -2625,12 +2625,9 @@ INFO is a plist holding contextual information. See ;; What description to use? (desc ;; Case 1: Headline is numbered and LINK has no - ;; description or LINK's description matches - ;; headline's title. Display section number. + ;; description. Display section number. (if (and (org-export-numbered-headline-p destination info) - (or (not desc) - (string= desc (org-element-property - :raw-value destination)))) + (not desc)) (mapconcat 'number-to-string (org-export-get-headline-number destination info) ".") |