From: Jay Belanger <jay.p.belanger@gmail.com>
Date: Sat, 8 Jan 2005 07:12:32 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: ttn-vms-21-2-B4~2866
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=a4dfc830e04f9f01cc359e5b0b40ec5f39a3406b;p=emacs.git

*** empty log message ***
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 034374789cc..ab44fcc5612 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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 --git a/man/ChangeLog b/man/ChangeLog
index 83eeaaf3129..e0de2c18558 100644
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -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