From: Tom Regner <tom@goochesa.de>
To: emacs-orgmode@gnu.org
Subject: (no subject)
Date: Mon, 23 Jan 2012 13:00:47 +0100 [thread overview]
Message-ID: <E1RpIZr-0001Ca-0I@v2201111105296627.yourvserver.net> (raw)
From aea3adc952de33aa9acad94fbd9baa717b7b1a1e Mon Sep 17 00:00:00 2001
From: Tom Regner <tom@goochesa.de>
Rcpt To: emacs-orgmode@gnu.org
Date: Mon, 23 Jan 2012 12:39:52 +0100
Subject: [PATCH] ob.el Adhere to current :padline header during noweb dereferencing.
At the moment using the :noweb-ref: property approach on subtrees results in the tangled code beeing broken
because the newlines before the #+end_src line are excluded from the output. This patch uses :padline
to check if a newline should be added. The default being yes, tangling with subtree mangling now produces correct
results; code depending on the (errorneous?) behaviour would be broken though.
---
lisp/ob.el | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/lisp/ob.el b/lisp/ob.el
index 47be708..398a997 100644
--- a/lisp/ob.el
+++ b/lisp/ob.el
@@ -2211,13 +2211,16 @@ block but are passed literally to the \"example-block\"."
(nth 4 i))
source-name)
(let* ((body (org-babel-expand-noweb-references i))
- (full (if comment
+ (padded (if (not (string= "no" (cdr (assoc :padline (nth 2 i)))))
+ (concat body "\n")
+ body ))
+ (full (if comment
((lambda (cs)
(concat (c-wrap (car cs)) "\n"
- body "\n"
+ padded "\n"
(c-wrap (cadr cs))))
(org-babel-tangle-comment-links i))
- body)))
+ padded)))
(setq expansion (concat expansion full))))))))
expansion)
;; possibly raise an error if named block doesn't exist
--
1.7.5.4
next reply other threads:[~2012-01-23 12:01 UTC|newest]
Thread overview: 97+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-01-23 12:00 Tom Regner [this message]
2012-01-23 16:34 ` (no subject) Tom Regner
2012-01-23 20:31 ` Eric Schulte
2012-01-24 1:55 ` Tom Regner
2012-01-24 2:49 ` string joining accumulated noweb references Was: " Eric Schulte
2012-01-24 4:46 ` string joining accumulated noweb references Tom Regner
2012-01-24 6:24 ` Achim Gratz
2012-01-24 7:04 ` Eric Schulte
-- strict thread matches above, loose matches on Subject: below --
2019-02-04 3:40 (no subject) Lawrence Bottorff
2018-12-19 12:58 Emmanuel Charpentier
2018-10-20 9:02 stardiviner
2018-10-15 8:04 Nik Clayton
2018-10-17 13:20 ` Nicolas Goaziou
2019-09-15 21:06 ` Matt Price
2018-05-03 13:44 Arne Babenhauserheide
2018-05-03 14:29 ` Bastien
2018-05-03 21:02 ` Arne Babenhauserheide
2018-05-04 1:02 ` steen
2018-05-04 5:38 ` Michael Welle
2018-05-11 20:07 ` Nicolas Goaziou
2018-03-02 16:10 Joseph Vidal-Rosset
2016-11-01 16:10 John Kitchin
2016-09-19 16:38 John Brodie
2016-09-20 20:32 ` Nicolas Goaziou
2015-11-03 19:53 Fritz Kunze
2015-10-11 19:51 Shankar Rao
2015-09-04 14:51 Eduardo Mercovich
2015-09-04 15:25 ` thomas
2015-09-04 18:35 ` Eduardo Mercovich
2015-01-24 16:23 M.S.Khed Khed
2014-05-03 1:52 Ryan Moszynski
2014-05-03 3:01 ` William Henney
2014-05-03 3:22 ` William Henney
2014-01-30 0:03 Ken Okada
2014-01-30 0:15 ` Bastien
2014-01-30 0:22 ` John Hendy
2014-01-30 7:17 ` Ken Okada
2014-01-31 6:29 ` John Hendy
2014-01-31 7:11 ` Nick Dokos
2014-02-03 22:13 ` Marcin Borkowski
2013-11-06 6:13 Cecil Westerhof
2013-11-06 8:32 ` Bastien
2013-11-06 8:42 ` Bastien
[not found] ` <CAG-LmmDGaczy8pyeCTU6-YJ9oTBeEufqU6kC2PUb-U6ucexhZA@mail.gmail.com>
[not found] ` <87txfpaeli.fsf@bzg.ath.cx>
[not found] ` <CAG-LmmDFjqbuqfF1YJoeX6x_UdujK+0noeFcGSD15hs49Tbo=Q@mail.gmail.com>
2013-11-06 18:38 ` Cecil Westerhof
2013-10-11 7:14 "Recent items" Agenda view? Martin Beck
2013-10-11 20:35 ` Samuel Wales
2013-10-14 8:46 ` (no subject) Martin Beck
2013-03-07 20:37 [RFC] Org syntax (draft) Nicolas Goaziou
2013-03-08 10:39 ` was: " Andreas Röhler
2013-03-08 10:46 ` (no subject) Bastien
2013-03-08 10:59 ` Andreas Röhler
2013-03-08 11:05 ` Bastien
2013-03-08 11:18 ` Andreas Röhler
2013-03-08 11:23 ` Bastien
2013-03-08 13:00 ` Andreas Röhler
2013-03-08 13:12 ` Bastien
2013-03-08 15:22 ` Andreas Röhler
2013-03-08 15:40 ` Bastien
2013-03-08 20:39 ` T.F. Torrey
2013-03-08 21:19 ` Nicolas Goaziou
2013-03-08 21:57 ` Suvayu Ali
2013-03-09 14:09 ` Bastien
2013-03-10 22:40 ` T.F. Torrey
2013-03-03 0:55 Vikas Rawal
2013-01-29 9:43 Martin Beck
2013-01-30 12:12 ` Bernt Hansen
2013-01-24 12:11 Herbert Sitz
2013-01-15 19:26 Rick Frankel
2012-11-11 15:36 Fabrice Popineau
2012-11-11 23:09 ` Nicolas Goaziou
2012-11-12 7:40 ` Fabrice Popineau
2012-11-07 18:50 Kevin Buchs
2012-09-29 7:30 Neuwirth Erich
2012-09-29 7:39 ` Bastien
2012-09-29 8:09 ` Achim Gratz
2012-09-29 9:12 ` Bastien
2012-09-29 9:52 ` Achim Gratz
2012-08-24 16:21 Feiming Chen
2012-05-22 3:32 "Smart" quotes Mark E. Shoulson
2012-05-23 22:17 ` Nicolas Goaziou
2012-05-24 3:05 ` Mark E. Shoulson
2012-05-25 17:14 ` Nicolas Goaziou
2012-05-25 22:51 ` Mark E. Shoulson
2012-05-26 6:48 ` Nicolas Goaziou
2012-05-29 1:30 ` Mark E. Shoulson
2012-05-29 17:57 ` Nicolas Goaziou
2012-05-30 0:51 ` Mark E. Shoulson
2012-05-31 1:50 ` (no subject) Mark Shoulson
2012-05-31 13:38 ` Nicolas Goaziou
2012-05-11 20:56 Rick Frankel
2012-05-11 20:38 ` Eric Schulte
2012-05-11 22:43 ` Bernt Hansen
2012-05-17 6:23 ` Bastien
2012-01-05 17:36 Ab Cd
2011-08-06 1:19 Vikas Rawal
2011-02-21 22:13 Vincent-Xavier JUMEL
2011-02-23 19:52 ` Bernt Hansen
2011-02-23 19:54 ` Bernt Hansen
2011-04-09 9:41 ` Vincent-Xavier JUMEL
2010-06-29 17:50 amscopub-mail
2009-09-18 12:35 Robin Green
2009-02-17 18:57 Matthew Lundin
2009-02-17 20:26 ` Carsten Dominik
2008-01-28 11:20 Dimitris Kapetanakis
2008-01-29 9:39 ` Bastien Guerry
2007-11-13 20:35 François Puitg
2007-10-20 10:33 Kevin Brubeck Unhammer
2007-10-21 22:20 ` Bastien
2006-05-25 10:43 Thomas Baumann
2006-05-25 12:49 ` Carsten Dominik
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.orgmode.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=E1RpIZr-0001Ca-0I@v2201111105296627.yourvserver.net \
--to=tom@goochesa.de \
--cc=emacs-orgmode@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).