From baa98a4a6fe93dd99fb624ad218fb3e1868cfde3 Mon Sep 17 00:00:00 2001 From: Kyle Meyer Date: Mon, 14 Jan 2019 17:09:03 -0500 Subject: [PATCH] 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 --- lisp/org.el | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lisp/org.el b/lisp/org.el index 0b090ee39..5c11de7b6 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