summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Maus <dmaus@ictsoc.de>2011-01-14 06:37:52 +0100
committerDavid Maus <dmaus@ictsoc.de>2011-01-14 06:37:52 +0100
commit163cd58ffd6461c98a96b1b63a3cf082b2825a52 (patch)
treec8756f353fd0eba3ba43ee7abffc54018bbe2e21
parentb41a340e9ef9471cae8d443c8491b748dce41df2 (diff)
downloadorg-mode-163cd58ffd6461c98a96b1b63a3cf082b2825a52.tar.gz
Handle timestamps after handling links
* org-html.el (org-export-as-html): Handle timestamps after handling links. otherwise a link description with an ISO date is handled as an inactive timestamp and replaced by a timestamp span. Bug reported by Vincent Belaïche.
-rw-r--r--lisp/org-html.el4
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/org-html.el b/lisp/org-html.el
index 312e716..9a5d225 100644
--- a/lisp/org-html.el
+++ b/lisp/org-html.el
@@ -1308,8 +1308,6 @@ lang=\"%s\" xml:lang=\"%s\">
"@</a> ")
t t line)))))
- (setq line (org-html-handle-time-stamps line))
-
;; replace "&" by "&amp;", "<" and ">" by "&lt;" and "&gt;"
;; handle @<..> HTML tags (replace "@&gt;..&lt;" by "<..>")
;; Also handle sub_superscripts and checkboxes
@@ -1474,6 +1472,8 @@ lang=\"%s\" xml:lang=\"%s\">
(setq line (replace-match rpl t t line)
start (+ start (length rpl))))
+ (setq line (org-html-handle-time-stamps line))
+
;; TODO items
(if (and (string-match org-todo-line-regexp line)
(match-beginning 2))