# HG changeset patch # User Jay Belanger # Date 1095267266 0 # Node ID d2ffbe58525c70181fb57e88acdc0ce69d4487a1 # Parent 344baab70c72540891aa56b16fa3891c5b5aaf32 (calc-mode): Compare `calc-settings-file' to `user-init-file' rather than "\\.emacs" to determine if it is the user-init-file. diff -r 344baab70c72 -r d2ffbe58525c lisp/calc/calc.el --- a/lisp/calc/calc.el Wed Sep 15 16:49:04 2004 +0000 +++ b/lisp/calc/calc.el Wed Sep 15 16:54:26 2004 +0000 @@ -1059,7 +1059,7 @@ (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