diff options
| author | Sébastien Delafond <sdelafond@gmail.com> | 2014-07-13 13:35:27 +0200 |
|---|---|---|
| committer | Sébastien Delafond <sdelafond@gmail.com> | 2014-07-13 13:35:27 +0200 |
| commit | e32a45ed36d6000db4b39171149072d11b77af72 (patch) | |
| tree | b5f4a7d43022c08c3298e82b3e9fc50f68be660f /lisp/ob-C.el | |
| parent | 7697fa4daf3ec84f85711a84035d8f0224afd4e3 (diff) | |
Imported Upstream version 8.0.7
Diffstat (limited to 'lisp/ob-C.el')
| -rw-r--r-- | lisp/ob-C.el | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/lisp/ob-C.el b/lisp/ob-C.el index ba50722..b1e8a06 100644 --- a/lisp/ob-C.el +++ b/lisp/ob-C.el @@ -1,6 +1,6 @@ ;;; ob-C.el --- org-babel functions for C and similar languages -;; Copyright (C) 2010-2012 Free Software Foundation, Inc. +;; Copyright (C) 2010-2013 Free Software Foundation, Inc. ;; Author: Eric Schulte ;; Keywords: literate programming, reproducible research @@ -31,7 +31,6 @@ ;;; Code: (require 'ob) -(require 'ob-eval) (require 'cc-mode) (declare-function org-entry-get "org" @@ -106,11 +105,11 @@ or `org-babel-execute:C++'." (org-babel-process-file-name tmp-src-file)) "")))) ((lambda (results) (org-babel-reassemble-table - (if (member "vector" (cdr (assoc :result-params params))) - (let ((tmp-file (org-babel-temp-file "c-"))) - (with-temp-file tmp-file (insert results)) - (org-babel-import-elisp-from-file tmp-file)) - (org-babel-read results)) + (org-babel-result-cond (cdr (assoc :result-params params)) + (org-babel-read results) + (let ((tmp-file (org-babel-temp-file "c-"))) + (with-temp-file tmp-file (insert results)) + (org-babel-import-elisp-from-file tmp-file))) (org-babel-pick-name (cdr (assoc :colname-names params)) (cdr (assoc :colnames params))) (org-babel-pick-name |