From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tom Regner Subject: (no subject) Date: Mon, 23 Jan 2012 13:00:47 +0100 Message-ID: Return-path: Received: from eggs.gnu.org ([140.186.70.92]:52464) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RpIa1-0004GC-VL for emacs-orgmode@gnu.org; Mon, 23 Jan 2012 07:01:03 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RpIZz-0005bw-3N for emacs-orgmode@gnu.org; Mon, 23 Jan 2012 07:00:57 -0500 Received: from v2201111105296627.yourvserver.net ([46.38.233.178]:51980) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RpIZy-0005ZF-RB for emacs-orgmode@gnu.org; Mon, 23 Jan 2012 07:00:54 -0500 Received: from tom by v2201111105296627.yourvserver.net with local (Exim 4.76) (envelope-from ) id 1RpIZr-0001Ca-0I for emacs-orgmode@gnu.org; Mon, 23 Jan 2012 13:00:47 +0100 List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org Sender: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org To: emacs-orgmode@gnu.org >From aea3adc952de33aa9acad94fbd9baa717b7b1a1e Mon Sep 17 00:00:00 2001 From: Tom Regner 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