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

values (restore default values with a 0 argument).

diff --git a/lisp/calc/calc-ext.el b/lisp/calc/calc-ext.el
index 89588b4ea747ac88bd9477ca9a33dec0caebf4c7..80e801ab2b76caecbdee7b421b8bdb5d4fd2016b 100644 (file)
--- a/lisp/calc/calc-ext.el
+++ b/lisp/calc/calc-ext.el
@@ -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)