(math-ms-args): Declare it.

(calc-embedded-eval-expr, calc-embedded-eval-get-var): Use variable
math-ms-args.
(calc-embedded-subst): Use math-multi-subst-rec to substitute
variables.

diff --git a/lisp/calc/calc-embed.el b/lisp/calc/calc-embed.el
index b05d62250362d5d8d446f5f220fe1fe7e378909c..3ad42037b507a278e9ea82a56cfdc959cde82b00 100644 (file)
--- a/lisp/calc/calc-embed.el
+++ b/lisp/calc/calc-embed.el
@@ -881,13 +881,13 @@ The command \\[yank] can retrieve it from there."
         (while (setq x (cdr x))
           (calc-embedded-find-vars (car x))))))
 
-
+(defvar math-ms-args)
 (defun calc-embedded-evaluate-expr (x)
   (let ((calc-embed-vars-used (aref calc-embedded-info 10)))
     (or calc-embed-vars-used (calc-embedded-find-vars x))
     (if calc-embed-vars-used
        (let ((active (assq (aref calc-embedded-info 0) calc-embedded-active))
-             (args nil))
+             (math-ms-args nil))
          (save-excursion
            (calc-embedded-original-buffer t)
            (or active
@@ -911,7 +911,7 @@ The command \\[yank] can retrieve it from there."
        (list 'calcFunc-assign
              (nth 1 x)
              (calc-embedded-subst (nth 2 x)))
-      (calc-normalize (math-evaluate-expr-rec (math-multi-subst x nil nil))))))
+      (calc-normalize (math-evaluate-expr-rec (math-multi-subst-rec x))))))
 
 (defun calc-embedded-eval-get-var (var base)
   (let ((entry base)
@@ -938,7 +938,7 @@ The command \\[yank] can retrieve it from there."
                    (setq val (nth 2 val)))
                (if (eq (car-safe val) 'calcFunc-assign)
                    (setq val (nth 2 val)))
-               (setq args (cons (cons var val) args)))
+               (setq math-ms-args (cons (cons var val) math-ms-args)))
            (calc-embedded-activate)
            (calc-embedded-eval-get-var var base))))))