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

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>
This commit is contained in:
Kyle Meyer 2019-01-14 17:09:03 -05:00
parent ba321d0e44
commit baa98a4a6f
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lisp/org.el
View File

@ -258,8 +258,9 @@ byte-compiled before it is loaded."
(interactive "fFile to load: \nP") (interactive "fFile to load: \nP")
(let* ((tangled-file (concat (file-name-sans-extension file) ".el"))) (let* ((tangled-file (concat (file-name-sans-extension file) ".el")))
;; Tangle only if the Org file is newer than the Elisp file. ;; Tangle only if the Org file is newer than the Elisp file.
(unless (org-file-newer-than-p tangled-file (unless (org-file-newer-than-p
(file-attribute-modification-time file)) tangled-file
(file-attribute-modification-time (file-attributes file)))
(org-babel-tangle-file file tangled-file "emacs-lisp")) (org-babel-tangle-file file tangled-file "emacs-lisp"))
(if compile (if compile
(progn (progn