calc-embed.el

(calc-do-embedded): Put data on stack before changing modes.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e7374fbff1d029764485982b65f9a3feb2a67822..2891b60e84e70bd131976d32c960f142cde6bba0 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2005-03-21  Jay Belanger  <belanger@truman.edu>
+
+       * calc/calc-embed.el (calc-do-embedded): Put data on stack before
+       changing modes.
+
 2005-03-21  Sam Steingold  <sds@gnu.org>
 
        * add-log.el (add-log-current-defun): Support more C DEFUN forms.

diff --git a/lisp/calc/calc-embed.el b/lisp/calc/calc-embed.el
index f1a273f7cf33427052b12d648865519586a02291..006be041bc2e251f4929cd4f9029684af2ebc74c 100644 (file)
--- a/lisp/calc/calc-embed.el
+++ b/lisp/calc/calc-embed.el
@@ -227,10 +227,13 @@ This is not required to be present for user-written mode annotations.")
        (calc-wrapper
         (let* ((okay nil)
                (calc-no-refresh-evaltos t))
-          (setq chg (calc-embedded-set-modes
-                     (aref info 15) (aref info 12) (aref info 13)))
           (if (aref info 8)
-              (calc-push (calc-normalize (aref info 8)))
+               (progn
+                 (calc-push (calc-normalize (aref info 8)))
+                 (setq chg (calc-embedded-set-modes
+                            (aref info 15) (aref info 12) (aref info 13))))
+             (setq chg (calc-embedded-set-modes
+                        (aref info 15) (aref info 12) (aref info 13)))
             (calc-alg-entry)))
         (setq calc-undo-list nil
               calc-redo-list nil