diff options
| author | Nicolas Goaziou <n.goaziou@gmail.com> | 2013-04-29 09:40:32 +0200 |
|---|---|---|
| committer | Nicolas Goaziou <n.goaziou@gmail.com> | 2013-04-29 09:40:32 +0200 |
| commit | 24aa4ab127a50c45c4688bc5b3b603bb87b6b54f (patch) | |
| tree | 74ff69343231e8d8208387f149c21d7adafc515f | |
| parent | 5ca2ea00b2e5814161eab0dac5d08e8d2d2d27bb (diff) | |
| parent | 1ce00aaffddc66e154893aed267fe05f06d56501 (diff) | |
| download | org-mode-24aa4ab127a50c45c4688bc5b3b603bb87b6b54f.tar.gz | |
Merge branch 'maint'
| -rw-r--r-- | lisp/ox-publish.el | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/lisp/ox-publish.el b/lisp/ox-publish.el index 194e169..cf428d1 100644 --- a/lisp/ox-publish.el +++ b/lisp/ox-publish.el @@ -829,7 +829,10 @@ modification time. Return time in `current-time' format." (cond ((eq (org-element-type date) 'timestamp) (org-time-string-to-time (org-element-interpret-data date))) ((let ((ts (and (consp date) (assq 'timestamp date)))) - (and ts (org-string-nw-p (org-element-interpret-data ts))))) + (and ts + (let ((value (org-element-interpret-data ts))) + (and (org-string-nw-p value) + (org-time-string-to-time value)))))) ((file-exists-p file) (nth 5 (file-attributes file))) (t (error "No such file: \"%s\"" file))))) |