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 2016-11-11 00:48:30 +01:00
parent c535f54330 c6f9aeb06e
commit 147cada506
1 changed files with 28 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lisp/ox-publish.el
View File

@ -1199,14 +1199,14 @@ the file including them will be republished as well."
(unless org-publish-cache (unless org-publish-cache
(error (error
"`org-publish-cache-file-needs-publishing' called, but no cache present")) "`org-publish-cache-file-needs-publishing' called, but no cache present"))
(let* ((case-fold-search t) (let* ((key (org-publish-timestamp-filename filename pub-dir pub-func))
(key (org-publish-timestamp-filename filename pub-dir pub-func))
(pstamp (org-publish-cache-get key)) (pstamp (org-publish-cache-get key))
(org-inhibit-startup t) (org-inhibit-startup t)
(visiting (find-buffer-visiting filename))
(buf (find-file-noselect (expand-file-name filename)))
included-files-ctime) included-files-ctime)
(when (equal (file-name-extension filename) "org") (when (equal (file-name-extension filename) "org")
(let ((visiting (find-buffer-visiting filename))
(buf (find-file-noselect filename))
(case-fold-search t))
(unwind-protect (unwind-protect
(with-current-buffer buf (with-current-buffer buf
(goto-char (point-min)) (goto-char (point-min))
@ -1223,15 +1223,14 @@ the file including them will be republished as well."
(org-unbracket-string (org-unbracket-string
"\"" "\"" "\"" "\""
;; Ignore search suffix. ;; Ignore search suffix.
(if (string-match "\\(::\\(.*?\\)\\)\"?\\'" (if (string-match "::.*?\"?\\'" m)
m)
(substring m 0 (match-beginning 0)) (substring m 0 (match-beginning 0))
m)))))))) m))))))))
(when included-file (when included-file
(push (org-publish-cache-ctime-of-src (push (org-publish-cache-ctime-of-src
(expand-file-name included-file)) (expand-file-name included-file))
included-files-ctime))))) included-files-ctime)))))
(unless visiting (kill-buffer buf)))) (unless visiting (kill-buffer buf)))))
(or (null pstamp) (or (null pstamp)
(let ((ctime (org-publish-cache-ctime-of-src filename))) (let ((ctime (org-publish-cache-ctime-of-src filename)))
(or (< pstamp ctime) (or (< pstamp ctime)