Merge changes from Org 7.4 to current Org 7.7.

[gnu-emacs] / lisp / org / ob-sass.el

diff --git a/lisp/org/ob-sass.el b/lisp/org/ob-sass.el
index b3acc8b8d2c7f6c5735b4954e8eeb705dc050d37..c51a443342667b39fef1352e3c5080c95f86feaa 100644 (file)
--- a/lisp/org/ob-sass.el
+++ b/lisp/org/ob-sass.el
@@ -5,7 +5,7 @@
 ;; Author: Eric Schulte
 ;; Keywords: literate programming, reproducible research
 ;; Homepage: http://orgmode.org
-;; Version: 7.4
+;; Version: 7.7
 
 ;; This file is part of GNU Emacs.
 
@@ -40,6 +40,7 @@
 
 ;;; Code:
 (require 'ob)
+(require 'ob-eval)
 
 (defvar org-babel-default-header-args:sass '())
 
@@ -55,8 +56,11 @@ This function is called by `org-babel-execute-src-block'."
                      " " (org-babel-process-file-name in-file)
                      " " (org-babel-process-file-name out-file))))
     (with-temp-file in-file
-      (insert (org-babel-expand-body:generic body params))) (shell-command cmd)
-    (or file (with-temp-buffer (insert-file-contents out-file) (buffer-string)))))
+      (insert (org-babel-expand-body:generic body params)))
+    (org-babel-eval cmd "")
+    (if file
+       nil ;; signal that output has already been written to file
+      (with-temp-buffer (insert-file-contents out-file) (buffer-string)))))
 
 (defun org-babel-prep-session:sass (session params)
   "Raise an error because sass does not support sessions."