diff options
| author | Bastien Guerry <bzg@gnu.org> | 2012-09-30 17:14:59 +0200 |
|---|---|---|
| committer | Bastien Guerry <bzg@gnu.org> | 2012-09-30 17:14:59 +0200 |
| commit | 8223b1d23361b74ede10bac47974ce7803804380 (patch) | |
| tree | 3a2491c5193fed1bef14acd45092c0b9736fa5d6 /lisp/org/ob-calc.el | |
| parent | 163227893c97b5b41039ea9d5ceadb7e5b2d570c (diff) | |
| download | emacs-8223b1d23361b74ede10bac47974ce7803804380.tar.gz emacs-8223b1d23361b74ede10bac47974ce7803804380.tar.bz2 emacs-8223b1d23361b74ede10bac47974ce7803804380.zip | |
Sync Org 7.9.2 from the commit tagged "release_7.9.2" in Org's Git repo.
Diffstat (limited to 'lisp/org/ob-calc.el')
| -rw-r--r-- | lisp/org/ob-calc.el | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lisp/org/ob-calc.el b/lisp/org/ob-calc.el index f8ad7e3374e..c79d0b5d1b4 100644 --- a/lisp/org/ob-calc.el +++ b/lisp/org/ob-calc.el @@ -71,16 +71,16 @@ (cond ((numberp res) res) ((math-read-number res) (math-read-number res)) - ((listp res) (error "calc error \"%s\" on input \"%s\"" + ((listp res) (error "Calc error \"%s\" on input \"%s\"" (cadr res) line)) (t (replace-regexp-in-string - "'\\[" "[" + "'" "" (calc-eval (math-evaluate-expr ;; 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) |