mirror/org-mode
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git synced 2024-11-29 07:58:21 +00:00
Code

Merge branch 'maint' of orgmode.org:org-mode into maint

Browse Source
This commit is contained in:
Bastien Guerry 2013-04-24 09:55:27 +02:00
commit 0e438a9621
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lisp/ox-html.el
View File

@ -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) ".")