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

Merge branch 'maint'

This commit is contained in:
Bastien Guerry 2014-07-29 15:21:31 +02:00
parent 2dbb338ad3 507244d56b
commit a98a6afe56
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lisp/ox-publish.el
View File

@ -806,11 +806,9 @@ Default for SITEMAP-FILENAME is 'sitemap.org'."
"Find the title of FILE in project." "Find the title of FILE in project."
(or (or
(and (not reset) (org-publish-cache-get-file-property file :title nil t)) (and (not reset) (org-publish-cache-get-file-property file :title nil t))
(let* ((org-inhibit-startup t) (let* ((visiting (find-buffer-visiting file))
(visiting (find-buffer-visiting file))
(buffer (or visiting (find-file-noselect file)))) (buffer (or visiting (find-file-noselect file))))
(with-current-buffer buffer (with-current-buffer buffer
(org-mode)
(let ((title (let ((title
(let ((property (plist-get (org-export-get-environment) :title))) (let ((property (plist-get (org-export-get-environment) :title)))
(if property (if property
@ -831,7 +829,6 @@ time in `current-time' format."
(file-buf (or visiting (find-file-noselect file nil))) (file-buf (or visiting (find-file-noselect file nil)))
(date (plist-get (date (plist-get
(with-current-buffer file-buf (with-current-buffer file-buf
(let ((org-inhibit-startup t)) (org-mode))
(org-export-get-environment)) (org-export-get-environment))
:date))) :date)))
(unless visiting (kill-buffer file-buf)) (unless visiting (kill-buffer file-buf))