Mercurial > emacs
diff lisp/calc/calc-embed.el @ 90133:4da4a09e8b1b
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-31
Merge from emacs--cvs-trunk--0
Patches applied:
* emacs--cvs-trunk--0 (patch 206-222)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 45-52)
- Update from CVS
- Update from CVS: texi Makefile.in CVS keyw cruft
- Update from CVS: ChangeLog tweaks
author | Miles Bader <miles@gnu.org> |
---|---|
date | Thu, 31 Mar 2005 09:58:14 +0000 |
parents | 13796b0653c7 61f186efc434 |
children | 7a3341d65a12 |
line wrap: on
line diff
--- a/lisp/calc/calc-embed.el Tue Mar 29 00:48:14 2005 +0000 +++ b/lisp/calc/calc-embed.el Thu Mar 31 09:58:14 2005 +0000 @@ -1257,26 +1257,8 @@ calc-embedded-close-mode)))) (setq vars (cdr vars) values (cdr values)))))) - (when (and vars calc-embedded-original-modes (eq calc-mode-save-mode 'save)) - (cond ((equal vars '(the-language)) - (setcar calc-embedded-original-modes - (cons calc-language calc-language-option))) - ((equal vars '(the-display-just)) - (let* ((modes (cdr calc-embedded-original-modes)) - (just (assq 'calc-display-just modes)) - (origin (assq 'calc-display-origin modes))) - (if just - (setcdr just calc-display-just)) - (if origin - (setcdr origin calc-display-origin)))) - (t - (let ((modes (cdr calc-embedded-original-modes))) - (while vars - (let* ((var (car vars)) - (cell (assq var modes))) - (if cell - (setcdr cell (symbol-value var)))) - (setq vars (cdr vars))))))))) + (when (and vars (eq calc-mode-save-mode 'save)) + (calc-embedded-save-original-modes)))) (defun calc-embedded-var-change (var &optional buf) (if (symbolp var)