mirror of
https://git.savannah.gnu.org/git/emacs/org-mode.git
synced 2024-09-30 01:27:53 +00:00
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:
parent
3416a0e323
commit
baa6e1d3d7
1
Makefile
1
Makefile
|
@ -122,6 +122,7 @@ LISPF = org.el \
|
||||||
ob-exp.el \
|
ob-exp.el \
|
||||||
ob-tangle.el \
|
ob-tangle.el \
|
||||||
ob-comint.el \
|
ob-comint.el \
|
||||||
|
ob-eval.el \
|
||||||
ob-keys.el \
|
ob-keys.el \
|
||||||
ob-C.el \
|
ob-C.el \
|
||||||
ob-ditaa.el \
|
ob-ditaa.el \
|
||||||
|
|
|
@ -231,7 +231,7 @@ last statement in BODY, as elisp."
|
||||||
"FALSE")))
|
"FALSE")))
|
||||||
(org-babel-R-process-value-result
|
(org-babel-R-process-value-result
|
||||||
(org-babel-import-elisp-from-file
|
(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
|
;; comint session evaluation
|
||||||
(case result-type
|
(case result-type
|
||||||
(value
|
(value
|
||||||
|
|
|
@ -107,7 +107,7 @@ or user `keyboard-quit' during execution of body."
|
||||||
(if (and ,remove-echo ,full-body
|
(if (and ,remove-echo ,full-body
|
||||||
(string-match
|
(string-match
|
||||||
(replace-regexp-in-string
|
(replace-regexp-in-string
|
||||||
"\n" "[\r\n]+" (regexp-quote ,full-body))
|
"\n" "[\r\n]+" (regexp-quote (or ,full-body "")))
|
||||||
string-buffer))
|
string-buffer))
|
||||||
(setq raw (substring string-buffer (match-end 0))))
|
(setq raw (substring string-buffer (match-end 0))))
|
||||||
(split-string string-buffer comint-prompt-regexp)))))
|
(split-string string-buffer comint-prompt-regexp)))))
|
||||||
|
|
|
@ -61,7 +61,7 @@ otherwise display STDERR with `org-babel-eval-error-notify'."
|
||||||
(defun org-babel-eval-read-file (file)
|
(defun org-babel-eval-read-file (file)
|
||||||
"Return the contents of FILE as a string."
|
"Return the contents of FILE as a string."
|
||||||
(with-temp-buffer (insert-file-contents
|
(with-temp-buffer (insert-file-contents
|
||||||
(org-babel-maybe-remote-file tmp-file))
|
(org-babel-maybe-remote-file file))
|
||||||
(buffer-string)))
|
(buffer-string)))
|
||||||
|
|
||||||
(defun org-babel-shell-command-on-region (start end command
|
(defun org-babel-shell-command-on-region (start end command
|
||||||
|
|
|
@ -33,6 +33,7 @@
|
||||||
(require 'ob)
|
(require 'ob)
|
||||||
(require 'ob-ref)
|
(require 'ob-ref)
|
||||||
(require 'ob-comint)
|
(require 'ob-comint)
|
||||||
|
(require 'ob-eval)
|
||||||
(eval-when-compile (require 'cl))
|
(eval-when-compile (require 'cl))
|
||||||
|
|
||||||
(declare-function matlab-shell "ext:matlab-mode")
|
(declare-function matlab-shell "ext:matlab-mode")
|
||||||
|
|
Loading…
Reference in a new issue