(calc-embedded-make-info): Don't force when `calc-embedded-word' is

called twice.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 92f6b62b73cd006db28644e15212c3c4f09af327..9bde54d50442217281df942836b65a6565af1f4c 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2009-07-06  Vincent Belaïche <vincent.belaiche@gmail.com>
+
+       * calc/calc-embed.el (calc-embedded-make-info): Don't force when
+       `calc-embedded-word' is called twice.
+
 2009-07-05  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * files.el (find-alternate-file-other-window, find-alternate-file):

diff --git a/lisp/calc/calc-embed.el b/lisp/calc/calc-embed.el
index 1f84bb664124ceca5bde0bba39da051f11f68f14..ed8734a28bf9bdc2ef8e84e75d5ec262bbcf7108 100644 (file)
--- a/lisp/calc/calc-embed.el
+++ b/lisp/calc/calc-embed.el
@@ -821,7 +821,7 @@ The command \\[yank] can retrieve it from there."
                                       calc-embed-outer-top calc-embed-outer-bot)
   (let* ((bufentry (assq (current-buffer) calc-embedded-active))
         (found bufentry)
-        (force (and fresh calc-embed-top))
+        (force (and fresh calc-embed-top (null (equal calc-embed-top '(t)))))
         (fixed calc-embed-top)
         (new-info nil)
         info str)