emacs-orgmode@gnu.org archives
 help / color / mirror / code / Atom feed

From: Antti Kaihola <akaihola@gmail.com>
To: emacs-orgmode@gnu.org
Subject: Re: [babel] [BUG] incorrect indentation when tangling with org-src-preserve-indentation
Date: Sat, 9 Oct 2010 18:36:10 +0300	[thread overview]
Message-ID: <AANLkTing1H3jhEkbREYSugUAHRQqqYw0pxXqQJktUzYA@mail.gmail.com> (raw)
In-Reply-To: <AANLkTim1s_km=Q0i1jgK6U=jx=gaQ-kC0+d7PX3jpUta@mail.gmail.com>

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)

next prev parent reply	other threads:[~2010-10-09 15:36 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-10-09 11:09 [BUG] incorrect indentation when tangling with org-src-preserve-indentation Antti Kaihola
2010-10-09 12:22 ` [babel] " Antti Kaihola
2010-10-09 15:36   ` Antti Kaihola [this message]
2010-10-12 14:54     ` Dan Davison
2010-10-12 16:40       ` Achim Gratz
2010-10-13  5:03         ` Eric Schulte
2010-10-15  7:14       ` Antti Kaihola

find likely ancestor, descendant, or conflicting patches for this message:
dfblob:c172756 dfblob:3a0426a dfblob:b05100c dfblob:39665c2
dfblob:e619e90 dfblob:9d750e7
	(help)

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=AANLkTing1H3jhEkbREYSugUAHRQqqYw0pxXqQJktUzYA@mail.gmail.com \
    --to=akaihola@gmail.com \
    --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

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).