|
@@ -1285,7 +1285,10 @@ the file including them will be republished as well."
|
|
|
(error
|
|
|
"`org-publish-cache-file-needs-publishing' called, but no cache present"))
|
|
|
(let* ((key (org-publish-timestamp-filename filename pub-dir pub-func))
|
|
|
- (pstamp (org-publish-cache-get key))
|
|
|
+ (pstamp (pcase (org-publish-cache-get key)
|
|
|
+ ;; Old format, convert it back to a time value.
|
|
|
+ ((and stamp (pred wholenump)) (seconds-to-time stamp))
|
|
|
+ (stamp stamp)))
|
|
|
(org-inhibit-startup t)
|
|
|
included-files-ctime)
|
|
|
(when (equal (file-name-extension filename) "org")
|
|
@@ -1314,8 +1317,9 @@ the file including them will be republished as well."
|
|
|
(unless visiting (kill-buffer buf)))))
|
|
|
(or (null pstamp)
|
|
|
(let ((ctime (org-publish-cache-ctime-of-src filename)))
|
|
|
- (or (< pstamp ctime)
|
|
|
- (cl-some (lambda (ct) (< ctime ct)) included-files-ctime))))))
|
|
|
+ (or (time-less-p pstamp ctime)
|
|
|
+ (cl-some (lambda (ct) (time-less-p ctime ct))
|
|
|
+ included-files-ctime))))))
|
|
|
|
|
|
(defun org-publish-cache-set-file-property
|
|
|
(filename property value &optional project-name)
|
|
@@ -1365,8 +1369,8 @@ does not exist."
|
|
|
(let ((attr (file-attributes
|
|
|
(expand-file-name (or (file-symlink-p file) file)
|
|
|
(file-name-directory file)))))
|
|
|
- (if (not attr) (error "No such file: \"%s\"" file)
|
|
|
- (floor (float-time (file-attribute-modification-time attr))))))
|
|
|
+ (if (not attr) (error "No such file: %S" file)
|
|
|
+ (file-attribute-modification-time attr))))
|
|
|
|
|
|
|
|
|
(provide 'ox-publish)
|