Update copyright year to 2015

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

diff --git a/lisp/org/ob-sass.el b/lisp/org/ob-sass.el
index 7f241e0320d24fb3f2e93b822d476847174f6861..a39248d78c7a1fb8bb1fa89eb23252bc595be6b5 100644 (file)
--- a/lisp/org/ob-sass.el
+++ b/lisp/org/ob-sass.el
@@ -1,11 +1,10 @@
 ;;; ob-sass.el --- org-babel functions for the sass css generation language
 
-;; Copyright (C) 2009, 2010  Free Software Foundation, Inc.
+;; Copyright (C) 2009-2015 Free Software Foundation, Inc.
 
 ;; Author: Eric Schulte
 ;; Keywords: literate programming, reproducible research
 ;; Homepage: http://orgmode.org
-;; Version: 7.3
 
 ;; This file is part of GNU Emacs.
 
@@ -55,8 +54,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."
@@ -64,6 +66,6 @@ This function is called by `org-babel-execute-src-block'."
 
 (provide 'ob-sass)
 
-;; arch-tag: 2954b169-eef4-45ce-a8e5-3e619f0f07ac
+
 
 ;;; ob-sass.el ends here