Merge changes from emacs-23 branch

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

diff --git a/lisp/org/ob-gnuplot.el b/lisp/org/ob-gnuplot.el
index 41b47102d65589a16254754da1124d4bace10e1b..9bf0433f9fcbfa2a3e568edaffb65f016b6ef536 100644 (file)
--- a/lisp/org/ob-gnuplot.el
+++ b/lisp/org/ob-gnuplot.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.
 
@@ -157,7 +157,7 @@ This function is called by `org-babel-execute-src-block'."
           (gnuplot-send-buffer-to-gnuplot)))
       (if (member "output" (split-string result-type))
           output
-        out-file))))
+       nil)))) ;; signal that output has already been written to file
 
 (defun org-babel-prep-session:gnuplot (session params)
   "Prepare SESSION according to the header arguments in PARAMS."
@@ -231,4 +231,5 @@ Pass PARAMS through to `orgtbl-to-generic' when exporting TABLE."
 (provide 'ob-gnuplot)
 
 
+
 ;;; ob-gnuplot.el ends here