diff options
| -rw-r--r-- | lisp/calc/calc.el | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/lisp/calc/calc.el b/lisp/calc/calc.el index eac19b9ca94..a578a8666b8 100644 --- a/lisp/calc/calc.el +++ b/lisp/calc/calc.el | |||
| @@ -257,15 +257,17 @@ scientific notation in calc-mode.") | |||
| 257 | (defun calc-mode-var-list-restore-saved-values () | 257 | (defun calc-mode-var-list-restore-saved-values () |
| 258 | (let ((newvarlist '())) | 258 | (let ((newvarlist '())) |
| 259 | (save-excursion | 259 | (save-excursion |
| 260 | (let (pos) | 260 | (let (pos |
| 261 | (set-buffer (find-file-noselect (substitute-in-file-name | 261 | (file (substitute-in-file-name calc-settings-file))) |
| 262 | calc-settings-file))) | 262 | (when (and |
| 263 | (goto-char (point-min)) | 263 | (file-regular-p file) |
| 264 | (when (and (search-forward ";;; Mode settings stored by Calc" nil t) | 264 | (set-buffer (find-file-noselect file)) |
| 265 | (progn | 265 | (goto-char (point-min)) |
| 266 | (forward-line 1) | 266 | (search-forward ";;; Mode settings stored by Calc" nil t) |
| 267 | (setq pos (point)) | 267 | (progn |
| 268 | (search-forward "\n;;; End of mode settings" nil t))) | 268 | (forward-line 1) |
| 269 | (setq pos (point)) | ||
| 270 | (search-forward "\n;;; End of mode settings" nil t))) | ||
| 269 | (beginning-of-line) | 271 | (beginning-of-line) |
| 270 | (calc-mode-var-list-restore-default-values) | 272 | (calc-mode-var-list-restore-default-values) |
| 271 | (eval-region pos (point)) | 273 | (eval-region pos (point)) |