diff options
author | Bastien Guerry <bzg@altern.org> | 2012-09-28 17:08:46 +0200 |
---|---|---|
committer | Bastien Guerry <bzg@altern.org> | 2012-09-28 17:08:46 +0200 |
commit | cbe4cfc99a503c6bfa092fdd9a00da5bacaa1694 (patch) | |
tree | 89dee4f9912996e3c0ebb1261170ef9160f46373 | |
parent | 16441f6f4090d91a6572f883ccd4ce62b3dabf9b (diff) | |
parent | 79d3c289dab4c8d76da10f3ee33f21ecec1e7e08 (diff) | |
download | org-mode-cbe4cfc99a503c6bfa092fdd9a00da5bacaa1694.tar.gz |
Merge branch 'maint'
-rw-r--r-- | contrib/lisp/org-e-html.el | 2 | ||||
-rw-r--r-- | lisp/org-publish.el | 13 |
2 files changed, 8 insertions, 7 deletions
diff --git a/contrib/lisp/org-e-html.el b/contrib/lisp/org-e-html.el index fd5d97a..87741b0 100644 --- a/contrib/lisp/org-e-html.el +++ b/contrib/lisp/org-e-html.el @@ -2800,7 +2800,7 @@ contextual information." (defun org-e-html-final-function (contents backend info) (if (not org-e-html-pretty-output) contents (with-temp-buffer - (nxml-mode) + (html-mode) (insert contents) (indent-region (point-min) (point-max)) (buffer-substring-no-properties (point-min) (point-max))))) diff --git a/lisp/org-publish.el b/lisp/org-publish.el index e78e2d4..346bf4f 100644 --- a/lisp/org-publish.el +++ b/lisp/org-publish.el @@ -338,7 +338,7 @@ function can still decide about that independently." "Update publishing timestamp for file FILENAME. If there is no timestamp, create one." (let ((key (org-publish-timestamp-filename filename pub-dir pub-func)) - (stamp (org-publish-cache-ctime-of-src filename base-dir))) + (stamp (org-publish-cache-ctime-of-src filename))) (org-publish-cache-set key stamp))) (defun org-publish-remove-all-timestamps () @@ -1128,12 +1128,12 @@ so that the file including them will be republished as well." (while (re-search-forward "^#\\+include:[ \t]+\"\\([^\t\n\r\"]*\\)\"[ \t]*.*$" nil t) (let* ((included-file (expand-file-name (match-string 1)))) (add-to-list 'included-files-ctime - (org-publish-cache-ctime-of-src included-file base-dir) t)))) + (org-publish-cache-ctime-of-src included-file) t)))) ;; FIXME don't kill current buffer (unless visiting (kill-buffer buf))) (if (null pstamp) t - (let ((ctime (org-publish-cache-ctime-of-src filename base-dir))) + (let ((ctime (org-publish-cache-ctime-of-src filename))) (or (< pstamp ctime) (when included-files-ctime (not (null (delq nil (mapcar (lambda(ct) (< ctime ct)) @@ -1188,10 +1188,11 @@ Returns value on success, else nil." (error "`org-publish-cache-set' called, but no cache present")) (puthash key value org-publish-cache)) -(defun org-publish-cache-ctime-of-src (f base-dir) - "Get the FILENAME ctime as an integer." +(defun org-publish-cache-ctime-of-src (file) + "Get the ctime of filename F as an integer." (let ((attr (file-attributes - (expand-file-name (or (file-symlink-p f) f) base-dir)))) + (expand-file-name (or (file-symlink-p file) file) + (file-name-directory file))))) (+ (lsh (car (nth 5 attr)) 16) (cadr (nth 5 attr))))) |