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

[Jay Belanger]

Index: emacs/lisp/calc/calc-mode.el
diff -c emacs/lisp/calc/calc-mode.el:1.10 emacs/lisp/calc/calc-mode.el:1.11
*** emacs/lisp/calc/calc-mode.el:1.10   Tue Nov 30 17:18:19 2004
--- emacs/lisp/calc/calc-mode.el        Sat Jan  8 05:58:05 2005
***************
*** 309,333 ****
  (defun calc-settings-file-name (name &optional arg)
    (interactive
     (list (read-file-name (format "Settings file name (normally %s): "
!                                (abbreviate-file-name (or user-init-file
!                                                          "~/.emacs"))))
         current-prefix-arg))
    (calc-wrapper
     (setq arg (if arg (prefix-numeric-value arg) 0))
!    (if (equal name "")
         (message "Calc settings file is \"%s\"" calc-settings-file)
       (if (< (math-abs arg) 2)
         (let ((list calc-mode-var-list))
           (while list
             (set (car (car list)) (nth 1 (car list)))
             (setq list (cdr list)))))
-      ;; FIXME: we should use ~/.calc or so in order to avoid
-      ;; reexecuting ~/.emacs (it's not always idempotent) -cgw 2001.11.12
       (setq calc-settings-file name)
       (or (and
          calc-settings-file
!         (string-match "\\.emacs" calc-settings-file)
!             (> arg 0))
         (< arg 0)
         (load name t)
         (message "New file")))))
--- 309,330 ----
  (defun calc-settings-file-name (name &optional arg)
    (interactive
     (list (read-file-name (format "Settings file name (normally %s): "
!                                (abbreviate-file-name calc-settings-file)))
         current-prefix-arg))
    (calc-wrapper
     (setq arg (if arg (prefix-numeric-value arg) 0))
!    (if (string-equal (file-name-nondirectory name) "")
         (message "Calc settings file is \"%s\"" calc-settings-file)
       (if (< (math-abs arg) 2)
         (let ((list calc-mode-var-list))
           (while list
             (set (car (car list)) (nth 1 (car list)))
             (setq list (cdr list)))))
       (setq calc-settings-file name)
       (or (and
          calc-settings-file
!           (equal user-init-file calc-settings-file)
!           (> arg 0))
         (< arg 0)
         (load name t)
         (message "New file")))))