# HG changeset patch
# User Jay Belanger <jay.p.belanger@gmail.com>
# Date 1105168352 0
# Node ID 9a44c6f6d8b75d63bfa231d4da40c52a71786ad4
# Parent  08f6c11de799660abd17ad5e0a6dc184c2362608
*** empty log message ***

diff -r 08f6c11de799 -r 9a44c6f6d8b7 lisp/ChangeLog
--- a/lisp/ChangeLog	Sat Jan 08 06:17:44 2005 +0000
+++ b/lisp/ChangeLog	Sat Jan 08 07:12:32 2005 +0000
@@ -1,3 +1,12 @@
+2005-01-08  Jay Belanger  <belanger@truman.edu>
+
+	* calc/calc.el (calc-settings-file): Change default value.
+	Suggested by cgw in a comment in calc-mode.el.
+
+	* calc/calc-mode.el (calc-settings-file-name):
+	Compare calc-settings-file to user-init-file instead of ~/.emacs.
+	Replace ~/.emacs in a prompt by calc-settings-file.
+
 2005-01-07  Lars Hansen  <larsh@math.ku.dk>
 
 	* desktop.el (desktop-restore-eager, desktop-lazy-verbose,
diff -r 08f6c11de799 -r 9a44c6f6d8b7 man/ChangeLog
--- a/man/ChangeLog	Sat Jan 08 06:17:44 2005 +0000
+++ b/man/ChangeLog	Sat Jan 08 07:12:32 2005 +0000
@@ -1,3 +1,8 @@
+2005-01-08  Jay Belanger  <belanger@truman.edu>
+
+	* calc.texi (General Mode Commands, Installation): Change to
+	reflect new default value of calc-settings-file.
+
 2005-01-06  Katsumi Yamaoka  <yamaoka@jpl.org>
 
 	* message.texi (Reply): `message-reply-to-function' should return