summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Davison <davison@stats.ox.ac.uk>2010-08-30 18:20:01 -0700
committerDan Davison <davison@stats.ox.ac.uk>2010-08-30 18:20:01 -0700
commit8cb53ddc1a2960c4e5eccc3c9be605ea7f492e4b (patch)
tree41655d6a4cc96e72eb9f049d043e1f95953bdf74
parent9c878a8290c071fbe5e97bc33c300ef2f07d6153 (diff)
downloadorg-mode-8cb53ddc1a2960c4e5eccc3c9be605ea7f492e4b.tar.gz
babel: Eliminate compiler warnings
* ob.el (with-parsed-tramp-file-name): declared (org-babel-tramp-localname): Ensure variable name exists locally * ob-R.el (ess-eval-buffer): declared * ob-comint.el (with-parsed-tramp-file-name): declared (tramp-flush-directory-property): declared (org-babel-comint-eval-invisibly-and-wait-for-file): Ensure variable name exists locally
-rw-r--r--lisp/ob-R.el1
-rw-r--r--lisp/ob-comint.el7
-rw-r--r--lisp/ob.el6
3 files changed, 10 insertions, 4 deletions
diff --git a/lisp/ob-R.el b/lisp/ob-R.el
index 1963271..76e83e8 100644
--- a/lisp/ob-R.el
+++ b/lisp/ob-R.el
@@ -37,6 +37,7 @@
(declare-function R "ext:essd-r" (&optional start-args))
(declare-function inferior-ess-send-input "ext:ess-inf" ())
(declare-function ess-make-buffer-current "ext:ess-inf" ())
+(declare-function ess-eval-buffer "ext:ess-inf" (vis))
(defconst org-babel-header-arg-names:R
'(width height bg units pointsize antialias quality compression
diff --git a/lisp/ob-comint.el b/lisp/ob-comint.el
index ff7f0cb..cef27ff 100644
--- a/lisp/ob-comint.el
+++ b/lisp/ob-comint.el
@@ -34,6 +34,8 @@
(require 'ob)
(require 'comint)
(eval-when-compile (require 'cl))
+(declare-function with-parsed-tramp-file-name "tramp" (filename var &rest body))
+(declare-function tramp-flush-directory-property "tramp" (vec directory))
(defun org-babel-comint-buffer-livep (buffer)
"Check if BUFFER is a comint buffer with a live process."
@@ -149,8 +151,9 @@ FILE exists at end of evaluation."
(if (string-match "\n$" string) string (concat string "\n")))
;; From Tramp 2.1.19 the following cache flush is not necessary
(if (file-remote-p default-directory)
- (with-parsed-tramp-file-name default-directory nil
- (tramp-flush-directory-property v "")))
+ (let (v)
+ (with-parsed-tramp-file-name default-directory nil
+ (tramp-flush-directory-property v ""))))
(while (not (file-exists-p file)) (sit-for (or period 0.25))))
(provide 'ob-comint)
diff --git a/lisp/ob.el b/lisp/ob.el
index 619421a..56005a6 100644
--- a/lisp/ob.el
+++ b/lisp/ob.el
@@ -40,6 +40,7 @@
(declare-function tramp-dissect-file-name "tramp" (name &optional nodefault))
(declare-function tramp-file-name-user "tramp" (vec))
(declare-function tramp-file-name-host "tramp" (vec))
+(declare-function with-parsed-tramp-file-name "tramp" (filename var &rest body))
(declare-function org-icompleting-read "org" (&rest args))
(declare-function org-edit-src-code "org-src"
(&optional context code edit-buffer-name quietp))
@@ -1674,8 +1675,9 @@ the remote connection."
(defun org-babel-tramp-localname (file)
"Return the local name component of FILE."
(if (file-remote-p file)
- (with-parsed-tramp-file-name file nil
- localname)
+ (let (localname)
+ (with-parsed-tramp-file-name file nil
+ localname))
file))
(defvar org-babel-temporary-directory