[Emacs-diffs] emacs/lisp/calc calc.el

[Jay Belanger]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Jay Belanger <jpb>      09/04/26 01:36:39

Modified files:
        lisp/calc      : calc.el 

Log message:
        (calc-set-mode-line): Check to make sure that the correct Calc buffer
        gets "Embed" in the mode line.
        (calc-mode): Copy stack list for additional Calc buffers.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/calc/calc.el?cvsroot=emacs&r1=1.124&r2=1.125

Patches:
Index: calc.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/calc/calc.el,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -b -r1.124 -r1.125
--- calc.el     30 Mar 2009 02:19:07 -0000      1.124
+++ calc.el     26 Apr 2009 01:36:39 -0000      1.125
@@ -1335,6 +1335,7 @@
   (calc-refresh t)
   (calc-set-mode-line)
   (calc-check-defines)
+  (if calc-buffer-list (setq calc-stack (copy-list calc-stack)))
   (add-to-list 'calc-buffer-list (current-buffer) t))
 
 (defvar calc-check-defines 'calc-check-defines)  ; suitable for run-hooks
@@ -1657,7 +1658,9 @@
           (figs (nth 1 calc-float-format))
           (new-mode-string
            (format "Calc%s%s: %d %s %-14s"
-                   (if calc-embedded-info "Embed" "")
+                   (if (and calc-embedded-info
+                             (eq (aref calc-embedded-info 1) (current-buffer)))
+                        "Embed" "")
                    (if (and (> (length (buffer-name)) 12)
                             (equal (substring (buffer-name) 0 12)
                                    "*Calculator*"))