emacs-orgmode@gnu.org archives
 help / color / mirror / code / Atom feed
* [PATCH] org.el: org-babel-load-file loads first tangle file
@ 2015-01-29 21:49 Sami Airaksinen
  2015-01-30  9:44 ` Nicolas Goaziou
  0 siblings, 1 reply; 6+ messages in thread
From: Sami Airaksinen @ 2015-01-29 21:49 UTC (permalink / raw)
  To: emacs-orgmode


[-- Attachment #1.1: Type: text/plain, Size: 698 bytes --]

Hi,

I use quite sophisticated (read complicated) initialization of my emacs.
Now I finally updated my emacs and org-mode upto date and found out that
org-babel-load-file doesn't work as previously.

I don't know if you have already noticed but if your tangled source
org-mode file has multiple target files for the tangle blocks, it loads
the file which was found last. This most often isn't the file name that
was given as input. There could be more generic solution to this, but I
though that it might be best to keep this patching simple as possible.

This is my first patch proposal so I hope I'm doing right and adding it
as an attachment to this post

-- 
Sami Airaksinen


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.2: 0001-org.el-org-babel-load-file-loads-first-tangle-file.patch --]
[-- Type: text/x-patch; name="0001-org.el-org-babel-load-file-loads-first-tangle-file.patch", Size: 1291 bytes --]

From fe2c30fb06935ce871485b4e3816313d59d96cbe Mon Sep 17 00:00:00 2001
From: Sami Airaksinen <samiaira@gmail.com>
Date: Thu, 29 Jan 2015 23:10:02 +0200
Subject: [PATCH] org.el: org-babel-load-file loads first tangle file

(org-babel-load-file): When org-mode FILE has multiple target files
for tangle blocks, `exported-file' will be set to last found
target file, which might not be the `file'.

Therefore fix for this bug is to select the last element of that
tangled file list, which is the tangle target file of the first found
tangle block, most typically the `file'.

Suggestion from a patch proposal by Sami Airaksinen

TINYCHANGE
---
 lisp/org.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lisp/org.el b/lisp/org.el
index b0e4380..2bc7f30 100755
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -236,7 +236,7 @@ file to byte-code before it is loaded."
     (unless (and (file-exists-p exported-file)
 		 (> (funcall age file) (funcall age exported-file)))
       (setq exported-file
-	    (car (org-babel-tangle-file file exported-file "emacs-lisp"))))
+	    (car (last (org-babel-tangle-file file exported-file "emacs-lisp")))))
     (message "%s %s"
 	     (if compile
 		 (progn (byte-compile-file exported-file 'load)
-- 
1.9.1


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 473 bytes --]

^ permalink raw reply related	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2015-01-31 23:03 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-01-29 21:49 [PATCH] org.el: org-babel-load-file loads first tangle file Sami Airaksinen
2015-01-30  9:44 ` Nicolas Goaziou
2015-01-30 12:55   ` Sami Airaksinen
2015-01-30 17:13     ` Nicolas Goaziou
2015-01-31 22:20       ` Sami Airaksinen
2015-01-31 23:04         ` Nicolas Goaziou

Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/emacs/org-mode.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).