From: Jay Belanger <jay.p.belanger@gmail.com>
Date: Wed, 15 Sep 2004 16:54:26 +0000 (+0000)
Subject: (calc-mode):  Compare `calc-settings-file' to `user-init-file' rather
X-Git-Tag: ttn-vms-21-2-B4~4905
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=a8aee43bd29a425b3684083263ac1f2c1a335a91;p=emacs.git

(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 daa01136dd7..22dbbef2c5b 100644
--- 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