(calc-mode): Compare `calc-settings-file' to `user-init-file' rather

than "\\.emacs" to determine if it is the user-init-file.

diff --git a/lisp/calc/calc.el b/lisp/calc/calc.el
index daa01136dd7ec9b1e4214b0bc55a072f82a004cb..22dbbef2c5baa9752bf00534e7ac6902e36993bf 100644 (file)
--- a/lisp/calc/calc.el
+++ b/lisp/calc/calc.el
@@ -1059,7 +1059,7 @@ Notations:  3.14e6     3.14 * 10^6
   (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)
+      (equal calc-settings-file user-init-file)
       (progn
        (setq calc-loaded-settings-file t)
        (load calc-settings-file t)))   ; t = missing-ok