aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJay Belanger2005-01-10 05:01:27 +0000
committerJay Belanger2005-01-10 05:01:27 +0000
commit7f72c3db5a74a0bcfed1ed19c00ef014bb9612e8 (patch)
tree103462e38c5f9213b83c4307c4047f31aacb3290
parent3579f0c2bcdbae7273b59d8fff0228816db732c2 (diff)
downloademacs-7f72c3db5a74a0bcfed1ed19c00ef014bb9612e8.tar.gz
emacs-7f72c3db5a74a0bcfed1ed19c00ef014bb9612e8.zip
(calc-embedded-subst): Replace math-multi-subst-rec, which is only
supposed to be called by math-multi-subst, by math-multi-subst.
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/calc/calc-embed.el2
2 files changed, 5 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index df1affc2c0e..e5e5cc56f8a 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -3,6 +3,10 @@
3 * calc/calc.el (calc-mode-var-list-restore-saved-values): 3 * calc/calc.el (calc-mode-var-list-restore-saved-values):
4 Make sure settings file exists before accessing it. 4 Make sure settings file exists before accessing it.
5 5
6 * calc/calc-embed.el (calc-embedded-subst):
7 Replace math-multi-subst-rec, which is only supposed to be called
8 by math-multi-subst, by math-multi-subst.
9
62005-01-09 Andre Spiegel <spiegel@gnu.org> 102005-01-09 Andre Spiegel <spiegel@gnu.org>
7 11
8 * vc.el (vc-allow-async-revert): New user option. 12 * vc.el (vc-allow-async-revert): New user option.
diff --git a/lisp/calc/calc-embed.el b/lisp/calc/calc-embed.el
index cdab562dc21..db1acfcb145 100644
--- a/lisp/calc/calc-embed.el
+++ b/lisp/calc/calc-embed.el
@@ -885,7 +885,7 @@ The command \\[yank] can retrieve it from there."
885 (list 'calcFunc-assign 885 (list 'calcFunc-assign
886 (nth 1 x) 886 (nth 1 x)
887 (calc-embedded-subst (nth 2 x))) 887 (calc-embedded-subst (nth 2 x)))
888 (calc-normalize (math-evaluate-expr-rec (math-multi-subst-rec x)))))) 888 (calc-normalize (math-evaluate-expr-rec (math-multi-subst x nil nil))))))
889 889
890(defun calc-embedded-eval-get-var (var base) 890(defun calc-embedded-eval-get-var (var base)
891 (let ((entry base) 891 (let ((entry base)