summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Schulte <schulte.eric@gmail.com>2010-06-12 16:18:50 -0700
committerEric Schulte <schulte.eric@gmail.com>2010-06-17 18:15:32 -0700
commit2dc30adf151f702640011068284cc8d50b4d3889 (patch)
tree8c6421c453d2e92a3f49d1353788b8df9cab02bb
parentea8565e2ed46b925a049a231eed983dd6e2c2971 (diff)
downloadorg-mode-2dc30adf151f702640011068284cc8d50b4d3889.tar.gz
babel: call-process-region-original is no longer a free variable
* lisp/babel/ob.el (org-babel-execute-src-block): call-process-region-original is no longer free (org-babel-org-babel-call-process-region-original): call-process-region-original is no longer free and is now renamed org-babel-call-process-region-original (org-babel-tramp-handle-call-process-region): call-process-region-original is no longer free
-rw-r--r--lisp/babel/ob.el11
1 files changed, 6 insertions, 5 deletions
diff --git a/lisp/babel/ob.el b/lisp/babel/ob.el
index 8571c61..b4248f0 100644
--- a/lisp/babel/ob.el
+++ b/lisp/babel/ob.el
@@ -251,8 +251,8 @@ block."
(dir (cdr (assoc :dir params)))
(default-directory
(or (and dir (file-name-as-directory dir)) default-directory))
- (call-process-region-original
- (if (boundp 'call-process-region-original) call-process-region-original
+ (org-babel-call-process-region-original
+ (if (boundp 'org-babel-call-process-region-original) org-babel-call-process-region-original
(symbol-function 'call-process-region)))
(indent (car (last info)))
result)
@@ -279,7 +279,7 @@ block."
result result-params info new-hash indent lang)
(run-hooks 'org-babel-after-execute-hook)
result))
- (setq call-process-region 'call-process-region-original))))
+ (setq call-process-region 'org-babel-call-process-region-original))))
(defun org-babel-expand-body:generic (body params &optional processed-params)
"Expand a block of code with org-babel according to it's header
@@ -1409,6 +1409,7 @@ of the string."
(org-babel-chomp (org-babel-reverse-string string) regexp))
regexp))
+(defvar org-babel-org-babel-call-process-region-original nil)
(defun org-babel-tramp-handle-call-process-region
(start end program &optional delete buffer display &rest args)
"Use tramp to handle call-process-region. Fixes a bug in
@@ -1422,9 +1423,9 @@ of the string."
;; bug in tramp
(apply 'process-file program tmpfile buffer display args)
(delete-file tmpfile)))
- ;; call-process-region-original is the original emacs definition. It
+ ;; org-babel-call-process-region-original is the original emacs definition. It
;; is in scope from the let binding in org-babel-execute-src-block
- (apply call-process-region-original
+ (apply org-babel-call-process-region-original
start end program delete buffer display args)))
(defun org-babel-maybe-remote-file (file)