summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Schulte <schulte.eric@gmail.com>2010-10-15 21:17:08 -0600
committerDan Davison <davison@stats.ox.ac.uk>2010-10-21 13:06:00 +0100
commitf16c46c856afbd41b115a6a50306c0c002cdb333 (patch)
treef09a9cf5eea9f40dd0bbd4d7c40abb19aa5415e4
parent832dc71f31b046bfaf032aa592a71df43082826d (diff)
downloadorg-mode-f16c46c856afbd41b115a6a50306c0c002cdb333.tar.gz
babel: purging all calls to removed org-babel-ref-variables
* lisp/ob-clojure.el (org-babel-prep-session:clojure): purging all calls to removed org-babel-ref-variables * lisp/ob-gnuplot.el (org-babel-gnuplot-process-vars): purging all calls to removed org-babel-ref-variables * lisp/ob-ruby.el (org-babel-prep-session:ruby): purging all calls to removed org-babel-ref-variables * lisp/ob-scheme.el (org-babel-prep-session:scheme): purging all calls to removed org-babel-ref-variables * lisp/ob-sqlite.el (org-babel-expand-body:sqlite): purging all calls to removed org-babel-ref-variables (org-babel-execute:sqlite): purging all calls to removed org-babel-ref-variables
-rw-r--r--lisp/ob-clojure.el3
-rw-r--r--lisp/ob-gnuplot.el2
-rw-r--r--lisp/ob-ruby.el2
-rw-r--r--lisp/ob-scheme.el2
-rw-r--r--lisp/ob-sh.el1
-rw-r--r--lisp/ob-sqlite.el5
6 files changed, 7 insertions, 8 deletions
diff --git a/lisp/ob-clojure.el b/lisp/ob-clojure.el
index 43a069c..66d5846 100644
--- a/lisp/ob-clojure.el
+++ b/lisp/ob-clojure.el
@@ -45,7 +45,6 @@
(declare-function slime-eval-async "ext:slime" (sexp &optional cont package))
(declare-function slime-eval "ext:slime" (sexp &optional package))
(declare-function swank-clojure-concat-paths "ext:slime" (paths))
-(declare-function org-babel-ref-variables "ext:slime" (params))
(declare-function slime "ext:slime" (&optional command coding-system))
(declare-function slime-output-buffer "ext:slime" (&optional noprompt))
(declare-function slime-filter-buffers "ext:slime" (predicate))
@@ -155,7 +154,7 @@ code specifying a variable of the same value."
"Prepare SESSION according to the header arguments specified in PARAMS."
(require 'slime) (require 'swank-clojure)
(let* ((session-buf (org-babel-clojure-initiate-session session))
- (vars (org-babel-ref-variables params))
+ (vars (mapcar #'cdr (org-babel-get-header params :var)))
(var-lines (mapcar ;; define any top level session variables
(lambda (pair)
(format "(def %s %s)\n" (car pair)
diff --git a/lisp/ob-gnuplot.el b/lisp/ob-gnuplot.el
index cfe80d8..31cfabf 100644
--- a/lisp/ob-gnuplot.el
+++ b/lisp/ob-gnuplot.el
@@ -70,7 +70,7 @@ code."
(org-babel-gnuplot-table-to-data
(cdr pair) (org-babel-temp-file "gnuplot-") params)
(cdr pair))))
- (org-babel-ref-variables params)))
+ (mapcar #'cdr (org-babel-get-header params :var))))
(defun org-babel-expand-body:gnuplot (body params &optional processed-params)
"Expand BODY according to PARAMS, return the expanded body."
diff --git a/lisp/ob-ruby.el b/lisp/ob-ruby.el
index 2d966b8..cf21300 100644
--- a/lisp/ob-ruby.el
+++ b/lisp/ob-ruby.el
@@ -86,7 +86,7 @@ This function is called by `org-babel-execute-src-block'."
"Prepare SESSION according to the header arguments specified in PARAMS."
;; (message "params=%S" params) ;; debugging
(let* ((session (org-babel-ruby-initiate-session session))
- (vars (org-babel-ref-variables params))
+ (vars (mapcar #'cdr (org-babel-get-header params :var)))
(var-lines (mapcar ;; define any variables
(lambda (pair)
(format "%s=%s"
diff --git a/lisp/ob-scheme.el b/lisp/ob-scheme.el
index ce6be0b..b974c1a 100644
--- a/lisp/ob-scheme.el
+++ b/lisp/ob-scheme.el
@@ -104,7 +104,7 @@ This function is called by `org-babel-execute-src-block'"
(defun org-babel-prep-session:scheme (session params)
"Prepare SESSION according to the header arguments specified in PARAMS."
(let* ((session (org-babel-scheme-initiate-session session))
- (vars (org-babel-ref-variables params))
+ (vars (mapcar #'cdr (org-babel-get-header params :var)))
(var-lines
(mapcar
(lambda (var) (format "%S" (print `(define ,(car var) ',(cdr var)))))
diff --git a/lisp/ob-sh.el b/lisp/ob-sh.el
index d258100..9481a43 100644
--- a/lisp/ob-sh.el
+++ b/lisp/ob-sh.el
@@ -33,7 +33,6 @@
(require 'shell)
(eval-when-compile (require 'cl))
-(declare-function org-babel-ref-variables "ob-ref" (params))
(declare-function org-babel-comint-in-buffer "ob-comint" (buffer &rest body))
(declare-function org-babel-comint-wait-for-output "ob-comint" (buffer))
(declare-function org-babel-comint-buffer-livep "ob-comint" (buffer))
diff --git a/lisp/ob-sqlite.el b/lisp/ob-sqlite.el
index e53d074..b21f565 100644
--- a/lisp/ob-sqlite.el
+++ b/lisp/ob-sqlite.el
@@ -42,8 +42,9 @@
"Sqlite specific header args.")
(defun org-babel-expand-body:sqlite (body params &optional processed-params)
+ "Expand BODY according to the values of PARAMS."
(org-babel-sqlite-expand-vars
- body (or (nth 1 processed-params) (org-babel-ref-variables params))))
+ body (mapcar #'cdr (org-babel-get-header params :var))))
(defvar org-babel-sqlite3-command "sqlite3")
@@ -51,7 +52,7 @@
"Execute a block of Sqlite code with Babel.
This function is called by `org-babel-execute-src-block'."
(let ((result-params (split-string (or (cdr (assoc :results params)) "")))
- (vars (org-babel-ref-variables params))
+ (vars (org-babel-get-header params :var))
(db (cdr (assoc :db params)))
(separator (cdr (assoc :separator params)))
(nullvalue (cdr (assoc :nullvalue params)))