Mercurial > emacs
comparison 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 |
comparison
equal
deleted
inserted
replaced
90132:4080fe8b4f0f | 90133:4da4a09e8b1b |
---|---|
1255 "[" header " " mname ": " | 1255 "[" header " " mname ": " |
1256 (prin1-to-string (car values)) "]" | 1256 (prin1-to-string (car values)) "]" |
1257 calc-embedded-close-mode)))) | 1257 calc-embedded-close-mode)))) |
1258 (setq vars (cdr vars) | 1258 (setq vars (cdr vars) |
1259 values (cdr values)))))) | 1259 values (cdr values)))))) |
1260 (when (and vars calc-embedded-original-modes (eq calc-mode-save-mode 'save)) | 1260 (when (and vars (eq calc-mode-save-mode 'save)) |
1261 (cond ((equal vars '(the-language)) | 1261 (calc-embedded-save-original-modes)))) |
1262 (setcar calc-embedded-original-modes | |
1263 (cons calc-language calc-language-option))) | |
1264 ((equal vars '(the-display-just)) | |
1265 (let* ((modes (cdr calc-embedded-original-modes)) | |
1266 (just (assq 'calc-display-just modes)) | |
1267 (origin (assq 'calc-display-origin modes))) | |
1268 (if just | |
1269 (setcdr just calc-display-just)) | |
1270 (if origin | |
1271 (setcdr origin calc-display-origin)))) | |
1272 (t | |
1273 (let ((modes (cdr calc-embedded-original-modes))) | |
1274 (while vars | |
1275 (let* ((var (car vars)) | |
1276 (cell (assq var modes))) | |
1277 (if cell | |
1278 (setcdr cell (symbol-value var)))) | |
1279 (setq vars (cdr vars))))))))) | |
1280 | 1262 |
1281 (defun calc-embedded-var-change (var &optional buf) | 1263 (defun calc-embedded-var-change (var &optional buf) |
1282 (if (symbolp var) | 1264 (if (symbolp var) |
1283 (setq var (list 'var | 1265 (setq var (list 'var |
1284 (if (string-match "\\`var-.+\\'" | 1266 (if (string-match "\\`var-.+\\'" |