mirror of
https://git.savannah.gnu.org/git/emacs/org-mode.git
synced 2024-09-30 02:20:01 +00:00
babel: fix a number of compiler warnings
* Makefile (LISPF): Add ob-calc.el to compiled files. * lisp/ob-calc.el (org-babel-execute:calc): Fix compiler warnings. * lisp/ob-lisp.el (slime-process): Declare an external function. (slime-eval): Declare an external function. (slime-connected-p): Declared an external function. (org-babel-lisp-cmd): Add a group to the defcustom specification. (org-babel-execute:lisp): Require slime inside function. (org-babel-lisp-initiate-session): Require slime inside function.
This commit is contained in:
parent
c303127cee
commit
5da47e2c2e
1
Makefile
1
Makefile
|
@ -125,6 +125,7 @@ LISPF = org.el \
|
||||||
ob-eval.el \
|
ob-eval.el \
|
||||||
ob-keys.el \
|
ob-keys.el \
|
||||||
ob-C.el \
|
ob-C.el \
|
||||||
|
ob-calc.el \
|
||||||
ob-ditaa.el \
|
ob-ditaa.el \
|
||||||
ob-haskell.el \
|
ob-haskell.el \
|
||||||
ob-perl.el \
|
ob-perl.el \
|
||||||
|
|
|
@ -48,7 +48,7 @@
|
||||||
(calc-push-list (list (cdr pair)))
|
(calc-push-list (list (cdr pair)))
|
||||||
(calc-store-into (car pair)))
|
(calc-store-into (car pair)))
|
||||||
vars)
|
vars)
|
||||||
(mapcar
|
(mapc
|
||||||
(lambda (line)
|
(lambda (line)
|
||||||
(when (> (length line) 0)
|
(when (> (length line) 0)
|
||||||
(cond
|
(cond
|
||||||
|
@ -80,13 +80,13 @@
|
||||||
(calc-pop 1)))
|
(calc-pop 1)))
|
||||||
el))
|
el))
|
||||||
;; parse line into calc objects
|
;; parse line into calc objects
|
||||||
(first (math-read-exprs line))))))))
|
(car (math-read-exprs line))))))))
|
||||||
(calc-eval line))))))))
|
(calc-eval line))))))))
|
||||||
(mapcar #'org-babel-trim
|
(mapcar #'org-babel-trim
|
||||||
(split-string (org-babel-expand-body:calc body params) "[\n\r]"))))
|
(split-string (org-babel-expand-body:calc body params) "[\n\r]"))))
|
||||||
(save-excursion
|
(save-excursion
|
||||||
(set-buffer (get-buffer "*Calculator*"))
|
(with-current-buffer (get-buffer "*Calculator*")
|
||||||
(calc-eval (calc-top 1))))
|
(calc-eval (calc-top 1)))))
|
||||||
|
|
||||||
(provide 'ob-calc)
|
(provide 'ob-calc)
|
||||||
|
|
||||||
|
|
|
@ -41,13 +41,18 @@
|
||||||
(require 'ob-ref)
|
(require 'ob-ref)
|
||||||
(require 'ob-comint)
|
(require 'ob-comint)
|
||||||
(require 'ob-eval)
|
(require 'ob-eval)
|
||||||
(require 'slime)
|
|
||||||
|
(declare-function slime-eval "ext:slime" (sexp &optional package))
|
||||||
|
(declare-function slime-process "ext:slime" (&optional connection))
|
||||||
|
(declare-function slime-connected-p "ext:slime" ())
|
||||||
|
|
||||||
(defvar org-babel-default-header-args:lisp '()
|
(defvar org-babel-default-header-args:lisp '()
|
||||||
"Default header arguments for lisp code blocks.")
|
"Default header arguments for lisp code blocks.")
|
||||||
|
|
||||||
(defcustom org-babel-lisp-cmd "sbcl --script"
|
(defcustom org-babel-lisp-cmd "sbcl --script"
|
||||||
"Name of command used to evaluate lisp blocks.")
|
"Name of command used to evaluate lisp blocks."
|
||||||
|
:group 'org-babel
|
||||||
|
:type 'string)
|
||||||
|
|
||||||
(defun org-babel-expand-body:lisp (body params)
|
(defun org-babel-expand-body:lisp (body params)
|
||||||
"Expand BODY according to PARAMS, return the expanded body."
|
"Expand BODY according to PARAMS, return the expanded body."
|
||||||
|
@ -63,6 +68,7 @@
|
||||||
(defun org-babel-execute:lisp (body params)
|
(defun org-babel-execute:lisp (body params)
|
||||||
"Execute a block of Lisp code with org-babel.
|
"Execute a block of Lisp code with org-babel.
|
||||||
This function is called by `org-babel-execute-src-block'"
|
This function is called by `org-babel-execute-src-block'"
|
||||||
|
(require 'slime)
|
||||||
(message "executing Lisp source code block")
|
(message "executing Lisp source code block")
|
||||||
(let* ((session (org-babel-lisp-initiate-session
|
(let* ((session (org-babel-lisp-initiate-session
|
||||||
(cdr (assoc :session params))))
|
(cdr (assoc :session params))))
|
||||||
|
@ -94,6 +100,7 @@ This function is called by `org-babel-execute-src-block'"
|
||||||
(defun org-babel-lisp-initiate-session (&optional session)
|
(defun org-babel-lisp-initiate-session (&optional session)
|
||||||
"If there is not a current inferior-process-buffer in SESSION
|
"If there is not a current inferior-process-buffer in SESSION
|
||||||
then create. Return the initialized session."
|
then create. Return the initialized session."
|
||||||
|
(require 'slime)
|
||||||
(unless (string= session "none")
|
(unless (string= session "none")
|
||||||
(save-window-excursion
|
(save-window-excursion
|
||||||
(or (slime-connected-p)
|
(or (slime-connected-p)
|
||||||
|
|
Loading…
Reference in a new issue