[Emacs-diffs] Changes to emacs/lisp/calc/calc-ext.el

[Jay Belanger]

Index: emacs/lisp/calc/calc-ext.el
diff -c emacs/lisp/calc/calc-ext.el:1.31 emacs/lisp/calc/calc-ext.el:1.32
*** emacs/lisp/calc/calc-ext.el:1.31    Wed Dec  8 06:10:56 2004
--- emacs/lisp/calc/calc-ext.el Sun Jan  9 15:55:08 2005
***************
*** 1240,1259 ****
  
  (defun calc-reset (arg)
    (interactive "P")
    (save-excursion
      (or (eq major-mode 'calc-mode)
        (calc-create-buffer))
      (if calc-embedded-info
        (calc-embedded nil))
!     (or arg
!       (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))
      (calc-set-language nil nil t)
      (calc-mode)
      (calc-flush-caches t)
--- 1240,1261 ----
  
  (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))
!     (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)
!       (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)