ndwarshuis
/
org-mode
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'maint'

This commit is contained in:
Bastien Guerry 2012-09-22 18:43:07 +02:00
parent 08c5ea04ec c76d722fc4
commit 1fea5530e3
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
contrib/lisp/org-e-html.el
View File

@ -2753,11 +2753,12 @@ information."
"Transcode a TIMESTAMP object from Org to HTML. "Transcode a TIMESTAMP object from Org to HTML.
CONTENTS is nil. INFO is a plist holding contextual CONTENTS is nil. INFO is a plist holding contextual
information." information."
(let ((value (org-translate-time (org-element-property :value timestamp))) (let* ((f (if (eq (org-element-property :type timestamp) 'inactive) "[%s]" "<%s>"))
(range-end (org-element-property :range-end timestamp))) (value (org-translate-time (format f (org-element-property :value timestamp))))
(range-end (org-element-property :range-end timestamp)))
(format "<span class=\"timestamp-wrapper\"><span class=\"timestamp\">%s</span></span>" (format "<span class=\"timestamp-wrapper\"><span class=\"timestamp\">%s</span></span>"
(if (not range-end) value (if (not range-end) value
(concat value "&ndash;" (org-translate-time range-end)))))) (concat value "&ndash;" (org-translate-time (format f range-end)))))))
;;;; Underline ;;;; Underline