summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCharles Berry <ccberry@ucsd.edu>2016-04-22 21:04:16 -0700
committerCharles Berry <ccberry@ucsd.edu>2016-04-23 16:07:46 -0700
commite42454088ff1176cce9cc65a4bd1c6f17fe958ec (patch)
treecc5252f9284dc745aad81187760a7c4238dc38bb
parentdfafc869a3e877cd51b759feeae77d2c9d6499cb (diff)
downloadorg-mode-e42454088ff1176cce9cc65a4bd1c6f17fe958ec.tar.gz
ob-comint.el: Fix bug and remove unused let binding
* ob-comint.el: (tramp-flush-directory-property declaration): The file is now "tramp-cache". * ob-comint.el (org-babel-comint-eval-invisibly-and-wait-for-file): Remove unused let binding for `v' (which is let bound by `with-parsed-tramp-file-name'). Bug reported by Vikas Rawal Subject: Using tramp to run R source code blocks on remote server Archived-At: <http://permalink.gmane.org/gmane.emacs.orgmode/106557>
-rw-r--r--lisp/ob-comint.el7
1 files changed, 3 insertions, 4 deletions
diff --git a/lisp/ob-comint.el b/lisp/ob-comint.el
index a5a7888..c6a0039 100644
--- a/lisp/ob-comint.el
+++ b/lisp/ob-comint.el
@@ -35,7 +35,7 @@
(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))
+(declare-function tramp-flush-directory-property "tramp-cache" (vec directory))
(defun org-babel-comint-buffer-livep (buffer)
"Check if BUFFER is a comint buffer with a live process."
@@ -151,9 +151,8 @@ FILE exists at end of evaluation."
(if (= (aref string (1- (length string))) ?\n) string (concat string "\n")))
;; From Tramp 2.1.19 the following cache flush is not necessary
(if (file-remote-p default-directory)
- (let (v)
- (with-parsed-tramp-file-name default-directory nil
- (tramp-flush-directory-property 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)