[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.24 emacs/lisp/calc/calc.el:1.25
*** emacs/lisp/calc/calc.el:1.24        Wed Sep 15 16:48:19 2004
--- emacs/lisp/calc/calc.el     Wed Sep 15 16:54:26 2004
***************
*** 1059,1065 ****
    (setq calc-stack-top (- (length calc-stack) calc-stack-top -1))
    (or calc-loaded-settings-file
        (null calc-settings-file)
!       (string-match "\\.emacs" calc-settings-file)
        (progn
        (setq calc-loaded-settings-file t)
        (load calc-settings-file t)))   ; t = missing-ok
--- 1059,1065 ----
    (setq calc-stack-top (- (length calc-stack) calc-stack-top -1))
    (or calc-loaded-settings-file
        (null calc-settings-file)
!       (equal calc-settings-file user-init-file)
        (progn
        (setq calc-loaded-settings-file t)
        (load calc-settings-file t)))   ; t = missing-ok