summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
authorJay Belanger <jay.p.belanger@gmail.com>2009-07-06 00:11:09 +0000
committerJay Belanger <jay.p.belanger@gmail.com>2009-07-06 00:11:09 +0000
commite4a5a3079bcca5dadb280a95a1c2f451cfd3fadf (patch)
tree9b13d49ab3275c81ae5c7c08264d250c1248a860 /lisp
parent4b8b1ec5b0231e2140ad136f97321b7dd523624b (diff)
downloademacs-e4a5a3079bcca5dadb280a95a1c2f451cfd3fadf.tar.gz
(calc-embedded-make-info): Don't force when `calc-embedded-word' is
called twice.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/calc/calc-embed.el2
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 92f6b62b73c..9bde54d5044 100644
--- 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 1f84bb66412..ed8734a28bf 100644
--- 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)