diff options
| author | Bastien Guerry <bzg@altern.org> | 2012-08-21 13:17:08 +0200 |
|---|---|---|
| committer | Bastien Guerry <bzg@altern.org> | 2012-08-21 13:17:08 +0200 |
| commit | c71b0dacb15ee2d57a2783108fc2c3510993a8aa (patch) | |
| tree | c3cce4f7e16164ec9abc2f00256e4292dfc90d3d | |
| parent | 1b35780196592a4ece1da91b4f8405195ce10072 (diff) | |
| download | org-mode-c71b0dacb15ee2d57a2783108fc2c3510993a8aa.tar.gz | |
Replace "ob-" by "org-babel-" as a prefix for two functions
* ob-fortran.el (org-babel-fortran-transform-list): Rename
from `ob-fortran-transform-list'.
(org-babel-fortran-var-to-fortran): Use the new function's
name.
* ob-calc.el (org-babel-calc-maybe-resolve-var): Rename from
`ob-calc-maybe-resolve-var'.
(org-babel-execute:calc): Use the new function's name.
| -rw-r--r-- | lisp/ob-calc.el | 6 | ||||
| -rw-r--r-- | lisp/ob-fortran.el | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/lisp/ob-calc.el b/lisp/ob-calc.el index a428ba5..c79d0b5 100644 --- a/lisp/ob-calc.el +++ b/lisp/ob-calc.el @@ -80,7 +80,7 @@ ;; resolve user variables, calc built in ;; variables are handled automatically ;; upstream by calc - (mapcar #'ob-calc-maybe-resolve-var + (mapcar #'org-babel-calc-maybe-resolve-var ;; parse line into calc objects (car (math-read-exprs line))))))))) (calc-eval line)))))))) @@ -91,14 +91,14 @@ (calc-eval (calc-top 1))))) (defvar var-syms) ; Dynamically scoped from org-babel-execute:calc -(defun ob-calc-maybe-resolve-var (el) +(defun org-babel-calc-maybe-resolve-var (el) (if (consp el) (if (and (equal 'var (car el)) (member (cadr el) var-syms)) (progn (calc-recall (cadr el)) (prog1 (calc-top 1) (calc-pop 1))) - (mapcar #'ob-calc-maybe-resolve-var el)) + (mapcar #'org-babel-calc-maybe-resolve-var el)) el)) (provide 'ob-calc) diff --git a/lisp/ob-fortran.el b/lisp/ob-fortran.el index 8f3c250..5736c64 100644 --- a/lisp/ob-fortran.el +++ b/lisp/ob-fortran.el @@ -146,15 +146,15 @@ of the same value." (length val) var val)) ((listp val) (format "real, parameter :: %S(%d) = %s\n" - var (length val) (ob-fortran-transform-list val))) + var (length val) (org-babel-fortran-transform-list val))) (t (error (format "the type of parameter %s is not supported by ob-fortran" var)))))) -(defun ob-fortran-transform-list (val) +(defun org-babel-fortran-transform-list (val) "Return a fortran representation of enclose syntactic lists." (if (listp val) - (concat "(/" (mapconcat #'ob-fortran-transform-list val ", ") "/)") + (concat "(/" (mapconcat #'org-babel-fortran-transform-list val ", ") "/)") (format "%S" val))) (provide 'ob-fortran) |