summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKyle Meyer <kyle@kyleam.com>2019-01-14 17:09:03 -0500
committerKyle Meyer <kyle@kyleam.com>2019-01-14 17:09:03 -0500
commitbaa98a4a6fe93dd99fb624ad218fb3e1868cfde3 (patch)
treedf06308631e8ed5a6388fd54636b955a824cda47
parentba321d0e44b34840466dd386223f702615ff8562 (diff)
downloadorg-mode-baa98a4a6fe93dd99fb624ad218fb3e1868cfde3.tar.gz
babel: Fix incorrect merge resolution from ba321d0e4
* lisp/org.el (org-babel-load-file): Fix type error introduced by merge ba321d0e4. Reported-by: Gregor Zattler <telegraph@gmx.net> <https://lists.gnu.org/archive/html/emacs-orgmode/2019-01/msg00208.html>
-rw-r--r--lisp/org.el5
1 files changed, 3 insertions, 2 deletions
diff --git a/lisp/org.el b/lisp/org.el
index 0b090ee..5c11de7 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -258,8 +258,9 @@ byte-compiled before it is loaded."
(interactive "fFile to load: \nP")
(let* ((tangled-file (concat (file-name-sans-extension file) ".el")))
;; Tangle only if the Org file is newer than the Elisp file.
- (unless (org-file-newer-than-p tangled-file
- (file-attribute-modification-time file))
+ (unless (org-file-newer-than-p
+ tangled-file
+ (file-attribute-modification-time (file-attributes file)))
(org-babel-tangle-file file tangled-file "emacs-lisp"))
(if compile
(progn