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

Merge branch 'maint'

This commit is contained in:
Nicolas Goaziou 2013-04-29 09:40:32 +02:00
parent 5ca2ea00b2 1ce00aaffd
commit 24aa4ab127
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lisp/ox-publish.el
View File

@ -829,7 +829,10 @@ modification time. Return time in `current-time' format."
(cond ((eq (org-element-type date) 'timestamp) (cond ((eq (org-element-type date) 'timestamp)
(org-time-string-to-time (org-element-interpret-data date))) (org-time-string-to-time (org-element-interpret-data date)))
((let ((ts (and (consp date) (assq 'timestamp 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))) ((file-exists-p file) (nth 5 (file-attributes file)))
(t (error "No such file: \"%s\"" file))))) (t (error "No such file: \"%s\"" file)))))