Merge changes from emacs-23 branch

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

diff --git a/lisp/org/ob-mscgen.el b/lisp/org/ob-mscgen.el
index 3b55f2e27b3e9684a883a0474c253f41ce376ebb..b40f9a39cef63c1135a283983aaa7e861cc22b7f 100644 (file)
--- a/lisp/org/ob-mscgen.el
+++ b/lisp/org/ob-mscgen.el
@@ -1,11 +1,10 @@
 ;;; ob-msc.el --- org-babel functions for mscgen evaluation
 
-;; Copyright (C) 2010-2011  Free Software Foundation, Inc.
+;; Copyright (C) 2010-2012  Free Software Foundation, Inc.
 
 ;; Author: Juan Pechiar
 ;; Keywords: literate programming, reproducible research
 ;; Homepage: http://orgmode.org
-;; Version: 7.4
 
 ;; This file is part of GNU Emacs.
 
@@ -73,7 +72,7 @@ mscgen supported formats."
       (error "
 ERROR: no output file specified. Add \":file name.png\" to the src header"))
     (org-babel-eval (concat "mscgen -T " filetype " -o " out-file) body)
-    out-file))
+    nil)) ;; signal that output has already been written to file
 
 (defun org-babel-prep-session:mscgen (session params)
   "Raise an error because Mscgen doesn't support sessions."
@@ -82,4 +81,5 @@ ERROR: no output file specified. Add \":file name.png\" to the src header"))
 (provide 'ob-mscgen)
 
 
+
 ;;; ob-msc.el ends here