From 96e4b4f34af47b374861e0178ef8669cee423823 Mon Sep 17 00:00:00 2001 From: Dan Davison Date: Thu, 14 Oct 2010 14:52:54 +0100 Subject: [PATCH] babel: Avoid extra newline characters in sh block expansion * ob-sh.el (org-babel-expand-body:sh): Avoid inserting extra newline characters --- lisp/ob-sh.el | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/lisp/ob-sh.el b/lisp/ob-sh.el index a3145d278..64da0c970 100644 --- a/lisp/ob-sh.el +++ b/lisp/ob-sh.el @@ -51,12 +51,13 @@ This will be passed to `shell-command-on-region'") (let ((vars (nth 1 (or processed-params (org-babel-process-params params)))) (sep (cdr (assoc :separator params)))) (concat - (mapconcat ;; define any variables - (lambda (pair) - (format "%s=%s" - (car pair) - (org-babel-sh-var-to-sh (cdr pair) sep))) - vars "\n") "\n" body "\n\n"))) + (if vars (concat (mapconcat ;; define any variables + (lambda (pair) + (format "%s=%s" + (car pair) + (org-babel-sh-var-to-sh (cdr pair) sep))) + vars "\n") "\n")) + (org-babel-trim body) "\n"))) (defun org-babel-execute:sh (body params) "Execute a block of Shell commands with Babel. -- 2.11.4.GIT