aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJay Belanger2004-09-15 16:54:26 +0000
committerJay Belanger2004-09-15 16:54:26 +0000
commita8aee43bd29a425b3684083263ac1f2c1a335a91 (patch)
treedc58244dfa54f055a24b9d3cd89a655e801aac58
parentf10b7b1b5af2d282b9586cfa32f60b1180a230ee (diff)
downloademacs-a8aee43bd29a425b3684083263ac1f2c1a335a91.tar.gz
emacs-a8aee43bd29a425b3684083263ac1f2c1a335a91.zip
(calc-mode): Compare `calc-settings-file' to `user-init-file' rather
than "\\.emacs" to determine if it is the user-init-file.
-rw-r--r--lisp/calc/calc.el2
1 files changed, 1 insertions, 1 deletions
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
1059 (setq calc-stack-top (- (length calc-stack) calc-stack-top -1)) 1059 (setq calc-stack-top (- (length calc-stack) calc-stack-top -1))
1060 (or calc-loaded-settings-file 1060 (or calc-loaded-settings-file
1061 (null calc-settings-file) 1061 (null calc-settings-file)
1062 (string-match "\\.emacs" calc-settings-file) 1062 (equal calc-settings-file user-init-file)
1063 (progn 1063 (progn
1064 (setq calc-loaded-settings-file t) 1064 (setq calc-loaded-settings-file t)
1065 (load calc-settings-file t))) ; t = missing-ok 1065 (load calc-settings-file t))) ; t = missing-ok