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

[Jay Belanger]

Index: emacs/lisp/calc/calc.el
diff -c emacs/lisp/calc/calc.el:1.43 emacs/lisp/calc/calc.el:1.44
*** emacs/lisp/calc/calc.el:1.43        Sun Jan  9 15:48:20 2005
--- emacs/lisp/calc/calc.el     Mon Jan 10 04:07:04 2005
***************
*** 257,271 ****
  (defun calc-mode-var-list-restore-saved-values ()
    (let ((newvarlist '()))
      (save-excursion
!       (let (pos)
!         (set-buffer (find-file-noselect (substitute-in-file-name
!                                          calc-settings-file)))
!         (goto-char (point-min))
!         (when (and (search-forward ";;; Mode settings stored by Calc" nil t)
!                    (progn
!                      (forward-line 1)
!                      (setq pos (point))
!                      (search-forward "\n;;; End of mode settings" nil t)))
            (beginning-of-line)
            (calc-mode-var-list-restore-default-values)
            (eval-region pos (point))
--- 257,273 ----
  (defun calc-mode-var-list-restore-saved-values ()
    (let ((newvarlist '()))
      (save-excursion
!       (let (pos
!             (file (substitute-in-file-name calc-settings-file)))
!         (when (and
!                (file-regular-p file)
!                (set-buffer (find-file-noselect file))
!                (goto-char (point-min))
!                (search-forward ";;; Mode settings stored by Calc" nil t)
!                (progn
!                  (forward-line 1)
!                  (setq pos (point))
!                  (search-forward "\n;;; End of mode settings" nil t)))
            (beginning-of-line)
            (calc-mode-var-list-restore-default-values)
            (eval-region pos (point))