Sync Org 7.9.2 from the commit tagged "release_7.9.2" in Org's Git repo.

[gnu-emacs] / lisp / org / ob-calc.el

diff --git a/lisp/org/ob-calc.el b/lisp/org/ob-calc.el
index f8ad7e3374efb8578c543a4908d2ce4b2cd2ee52..c79d0b5d1b4037208f362a59e4b495806965ed65 100644 (file)
--- 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)