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.
This commit is contained in:
Eric Schulte 2010-07-04 15:09:20 -07:00
parent 3416a0e323
commit baa6e1d3d7
5 changed files with 5 additions and 3 deletions

View File

@ -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 \

View File

@ -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

View File

@ -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)))))

View File

@ -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

View File

@ -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")