From mboxrd@z Thu Jan  1 00:00:00 1970
From: Antti Kaihola <akaihola@gmail.com>
Subject: Re: [babel] [BUG] incorrect indentation when tangling with
 org-src-preserve-indentation
Date: Sat, 9 Oct 2010 18:36:10 +0300
Message-ID: <AANLkTing1H3jhEkbREYSugUAHRQqqYw0pxXqQJktUzYA@mail.gmail.com>
References: <AANLkTinsu1A7B-JQ6=tcZXHTpsVcWU3DyJV+2w-4VnK0@mail.gmail.com>
	<AANLkTim1s_km=Q0i1jgK6U=jx=gaQ-kC0+d7PX3jpUta@mail.gmail.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Return-path: <emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org>
Received: from [140.186.70.92] (port=44795 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1P4bT5-0003vq-3o
	for emacs-orgmode@gnu.org; Sat, 09 Oct 2010 11:36:16 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <akaihola@gmail.com>) id 1P4bT3-00055m-Lh
	for emacs-orgmode@gnu.org; Sat, 09 Oct 2010 11:36:15 -0400
Received: from mail-iw0-f169.google.com ([209.85.214.169]:36744)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <akaihola@gmail.com>) id 1P4bT3-00055g-Ha
	for emacs-orgmode@gnu.org; Sat, 09 Oct 2010 11:36:13 -0400
Received: by iwn1 with SMTP id 1so2332914iwn.0
	for <emacs-orgmode@gnu.org>; Sat, 09 Oct 2010 08:36:12 -0700 (PDT)
In-Reply-To: <AANLkTim1s_km=Q0i1jgK6U=jx=gaQ-kC0+d7PX3jpUta@mail.gmail.com>
List-Id: "General discussions about Org-mode." <emacs-orgmode.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/emacs-orgmode>,
	<mailto:emacs-orgmode-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/emacs-orgmode>
List-Post: <mailto:emacs-orgmode@gnu.org>
List-Help: <mailto:emacs-orgmode-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/emacs-orgmode>,
	<mailto:emacs-orgmode-request@gnu.org?subject=subscribe>
Sender: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org
Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org
To: emacs-orgmode@gnu.org

Here's another stab at fixing the problem. This one enhances the
existing trimming algorithm by preserving any leading whitespace on
the first non-blank line of a block. This probably breaks tangling of
other languages than Python, but someone more familiar with the babel
codebase will be able to come up with a saner solution.


diff --git a/lisp/ob-python.el b/lisp/ob-python.el
index c172756..39665c2 100644
--- a/lisp/ob-python.el
+++ b/lisp/ob-python.el
@@ -58,3 +58,3 @@
     (nth 1 (or processed-params (org-babel-process-params params))) "\n")
-   "\n" (org-babel-trim body) "\n"))
+   "\n" (org-babel-indent-safe-trim body) "\n"))

diff --git a/lisp/ob-tangle.el b/lisp/ob-tangle.el
index 3a0426a..e619e90 100644
--- a/lisp/ob-tangle.el
+++ b/lisp/ob-tangle.el
@@ -368,3 +368,3 @@ form
       (insert (format "%s\n" (replace-regexp-in-string
-			      "^," "" (org-babel-trim body))))
+			      "^," "" (org-babel-indent-safe-trim body))))
       (when link-p
diff --git a/lisp/ob.el b/lisp/ob.el
index b05100c..9d750e7 100644
--- a/lisp/ob.el
+++ b/lisp/ob.el
@@ -1723,2 +1723,9 @@ overwritten by specifying a regexp as a second argument."

+(defun org-babel-indent-safe-trim (string)
+  "Strip leading and trailing spaces and carriage returns from STRING.
+Like `org-babel-chomp' only it runs on both the front and back
+of the string. Preserves leading tabs and spaces on first non-blank line."
+  (string-match "\\`\\(?:[ \f\t\n\r\v]*\n\\)?\\(\\(?:\n?.*?\\)*?\\)[
\f\t\n\r\v]*\\'" string)
+  (match-string 1 string))
+
 (defun org-babel-trim (string &optional regexp)