summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Schulte <schulte.eric@gmail.com>2010-07-04 15:09:20 -0700
committerEric Schulte <schulte.eric@gmail.com>2010-07-05 11:14:51 -0700
commitbaa6e1d3d7680fa11108b57bff56af0fb1d1291d (patch)
tree4f3275c1cad9e821d0fd611d8a1eb7662d196357
parent3416a0e32366951d789b55dda1248757577acbce (diff)
downloadorg-mode-baa6e1d3d7680fa11108b57bff56af0fb1d1291d.tar.gz
babel: absolutely no babel related compiler warnings
had to nest an argument in a trivial `or' to trick the compiler in the large ob-comint macro.
-rw-r--r--Makefile1
-rw-r--r--lisp/ob-R.el2
-rw-r--r--lisp/ob-comint.el2
-rw-r--r--lisp/ob-eval.el2
-rw-r--r--lisp/ob-octave.el1
5 files changed, 5 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 3520a45..641dbc3 100644
--- a/Makefile
+++ b/Makefile
@@ -122,6 +122,7 @@ LISPF = org.el \
ob-exp.el \
ob-tangle.el \
ob-comint.el \
+ ob-eval.el \
ob-keys.el \
ob-C.el \
ob-ditaa.el \
diff --git a/lisp/ob-R.el b/lisp/ob-R.el
index 255e153..b914de6 100644
--- a/lisp/ob-R.el
+++ b/lisp/ob-R.el
@@ -231,7 +231,7 @@ last statement in BODY, as elisp."
"FALSE")))
(org-babel-R-process-value-result
(org-babel-import-elisp-from-file
- (org-babel-maybe-remote-file tmp-file)) column-names-p))))
+ (org-babel-maybe-remote-file tmp-file)) column-names-p))))
;; comint session evaluation
(case result-type
(value
diff --git a/lisp/ob-comint.el b/lisp/ob-comint.el
index 2a2f86c..7b742d5 100644
--- a/lisp/ob-comint.el
+++ b/lisp/ob-comint.el
@@ -107,7 +107,7 @@ or user `keyboard-quit' during execution of body."
(if (and ,remove-echo ,full-body
(string-match
(replace-regexp-in-string
- "\n" "[\r\n]+" (regexp-quote ,full-body))
+ "\n" "[\r\n]+" (regexp-quote (or ,full-body "")))
string-buffer))
(setq raw (substring string-buffer (match-end 0))))
(split-string string-buffer comint-prompt-regexp)))))
diff --git a/lisp/ob-eval.el b/lisp/ob-eval.el
index e5af294..282baee 100644
--- a/lisp/ob-eval.el
+++ b/lisp/ob-eval.el
@@ -61,7 +61,7 @@ otherwise display STDERR with `org-babel-eval-error-notify'."
(defun org-babel-eval-read-file (file)
"Return the contents of FILE as a string."
(with-temp-buffer (insert-file-contents
- (org-babel-maybe-remote-file tmp-file))
+ (org-babel-maybe-remote-file file))
(buffer-string)))
(defun org-babel-shell-command-on-region (start end command
diff --git a/lisp/ob-octave.el b/lisp/ob-octave.el
index b20a3c9..e50b74f 100644
--- a/lisp/ob-octave.el
+++ b/lisp/ob-octave.el
@@ -33,6 +33,7 @@
(require 'ob)
(require 'ob-ref)
(require 'ob-comint)
+(require 'ob-eval)
(eval-when-compile (require 'cl))
(declare-function matlab-shell "ext:matlab-mode")