(calc-reset): Restore saved values of variables instead of default

values (restore default values with a 0 argument).
This commit is contained in:
Jay Belanger 2005-01-09 15:55:08 +00:00
parent 6c8e75541e
commit 9ab8041d24

View file

@ -1240,20 +1240,22 @@ calc-kill calc-kill-region calc-yank))))
(defun calc-reset (arg)
(interactive "P")
(setq arg (if arg (prefix-numeric-value arg) nil))
(save-excursion
(or (eq major-mode 'calc-mode)
(calc-create-buffer))
(if calc-embedded-info
(calc-embedded nil))
(or arg
(setq calc-stack nil))
(unless (and arg (> (abs arg) 0))
(setq calc-stack nil))
(setq calc-undo-list nil
calc-redo-list nil)
(let (calc-stack calc-user-parse-tables calc-standard-date-formats
calc-invocation-macro)
(mapcar (function (lambda (v) (set v nil))) calc-local-var-list)
(mapcar (function (lambda (v) (set (car v) (nth 1 v))))
calc-mode-var-list))
(if (and arg (<= arg 0))
(calc-mode-var-list-restore-default-values)
(calc-mode-var-list-restore-saved-values)))
(calc-set-language nil nil t)
(calc-mode)
(calc-flush-caches t)