Browse Source

babel: Avoid extra newline characters in sh block expansion

	* ob-sh.el (org-babel-expand-body:sh): Avoid inserting extra
	newline characters
Dan Davison 14 years ago
parent
commit
96e4b4f34a
1 changed files with 7 additions and 6 deletions
  1. 7 6
      lisp/ob-sh.el

+ 7 - 6
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.