aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
authorColin Walters2002-09-30 04:24:40 +0000
committerColin Walters2002-09-30 04:24:40 +0000
commit2528da6a32002a7d597784e4dde02453625f68ef (patch)
tree3794762a14e4f4d01637fa85e81cfa7d0d6f8f1b /lisp
parent9b08ce78d24d2fac7092afe3ace0f4bbac5d1544 (diff)
downloademacs-2528da6a32002a7d597784e4dde02453625f68ef.tar.gz
emacs-2528da6a32002a7d597784e4dde02453625f68ef.zip
(calc-reset): Don't bind `executing-kbd-macro'. Call
`calc-flush-caches' with inhibit-msg arg. (calc-change-mode): Remove extra arg for `calc-save-modes'.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/calc/calc-ext.el5
1 files changed, 2 insertions, 3 deletions
diff --git a/lisp/calc/calc-ext.el b/lisp/calc/calc-ext.el
index 66daedf02e2..7caad434729 100644
--- a/lisp/calc/calc-ext.el
+++ b/lisp/calc/calc-ext.el
@@ -1288,8 +1288,7 @@ calc-kill calc-kill-region calc-yank))))
1288 calc-mode-var-list)) 1288 calc-mode-var-list))
1289 (calc-set-language nil nil t) 1289 (calc-set-language nil nil t)
1290 (calc-mode) 1290 (calc-mode)
1291 (let ((executing-kbd-macro "")) ; inhibit message 1291 (calc-flush-caches t)
1292 (calc-flush-caches))
1293 (run-hooks 'calc-reset-hook)) 1292 (run-hooks 'calc-reset-hook))
1294 (calc-wrapper 1293 (calc-wrapper
1295 (let ((win (get-buffer-window (current-buffer)))) 1294 (let ((win (get-buffer-window (current-buffer))))
@@ -1486,7 +1485,7 @@ calc-kill calc-kill-region calc-yank))))
1486 (calc-refresh-evaltos)) 1485 (calc-refresh-evaltos))
1487 (and (eq calc-mode-save-mode 'save) 1486 (and (eq calc-mode-save-mode 'save)
1488 (not (equal var '(calc-mode-save-mode))) 1487 (not (equal var '(calc-mode-save-mode)))
1489 (calc-save-modes t)))) 1488 (calc-save-modes))))
1490 (if calc-embedded-info (calc-embedded-modes-change var)) 1489 (if calc-embedded-info (calc-embedded-modes-change var))
1491 (symbol-value (car var))))) 1490 (symbol-value (car var)))))
1492 1491