[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/calc/calc-embed.el
From: |
Jay Belanger |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/calc/calc-embed.el |
Date: |
Thu, 10 Mar 2005 02:14:32 -0500 |
Index: emacs/lisp/calc/calc-embed.el
diff -c emacs/lisp/calc/calc-embed.el:1.18 emacs/lisp/calc/calc-embed.el:1.19
*** emacs/lisp/calc/calc-embed.el:1.18 Tue Mar 8 05:26:44 2005
--- emacs/lisp/calc/calc-embed.el Thu Mar 10 07:14:32 2005
***************
*** 881,893 ****
(while (setq x (cdr x))
(calc-embedded-find-vars (car x))))))
!
(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))
(save-excursion
(calc-embedded-original-buffer t)
(or active
--- 881,893 ----
(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))
! (math-ms-args nil))
(save-excursion
(calc-embedded-original-buffer t)
(or active
***************
*** 911,917 ****
(list 'calcFunc-assign
(nth 1 x)
(calc-embedded-subst (nth 2 x)))
! (calc-normalize (math-evaluate-expr-rec (math-multi-subst x nil
nil))))))
(defun calc-embedded-eval-get-var (var base)
(let ((entry base)
--- 911,917 ----
(list 'calcFunc-assign
(nth 1 x)
(calc-embedded-subst (nth 2 x)))
! (calc-normalize (math-evaluate-expr-rec (math-multi-subst-rec x))))))
(defun calc-embedded-eval-get-var (var base)
(let ((entry base)
***************
*** 938,944 ****
(setq val (nth 2 val)))
(if (eq (car-safe val) 'calcFunc-assign)
(setq val (nth 2 val)))
! (setq args (cons (cons var val) args)))
(calc-embedded-activate)
(calc-embedded-eval-get-var var base))))))
--- 938,944 ----
(setq val (nth 2 val)))
(if (eq (car-safe val) 'calcFunc-assign)
(setq val (nth 2 val)))
! (setq math-ms-args (cons (cons var val) math-ms-args)))
(calc-embedded-activate)
(calc-embedded-eval-get-var var base))))))