# HG changeset patch
# User Juanma Barranquero <lekktu@gmail.com>
# Date 1165329323 0
# Node ID 335a9eff819bb6da4f39fdb98fdcd83ccf7ddc61
# Parent  dc2d02a90d3de8e12fed006ece7d9bc6173004ea
*** empty log message ***

diff -r dc2d02a90d3d -r 335a9eff819b etc/ChangeLog
--- a/etc/ChangeLog	Tue Dec 05 14:34:46 2006 +0000
+++ b/etc/ChangeLog	Tue Dec 05 14:35:23 2006 +0000
@@ -1,3 +1,10 @@
+2006-12-05  Micha,Ak(Bl Cadilhac  <michael.cadilhac@lrde.org>
+
+	* NEWS (Changes to cmuscheme): Mention the alternative for
+	`~/.emacs_SCHEMEPROG' which is `~/.emacs.d/init_SCHEMEPROG.scm'.
+	(Init file changes): Same for `~/.emacs_SHELL' versus
+	`~/.emacs.d/init_SHELL.sh'.
+
 2006-12-01  Juanma Barranquero  <lekktu@gmail.com>
 
 	* DEVEL.HUMOR: Another entry.
diff -r dc2d02a90d3d -r 335a9eff819b leim/ChangeLog
--- a/leim/ChangeLog	Tue Dec 05 14:34:46 2006 +0000
+++ b/leim/ChangeLog	Tue Dec 05 14:35:23 2006 +0000
@@ -1,3 +1,7 @@
+2006-12-05  Juanma Barranquero  <lekktu@gmail.com>
+
+	* makefile.w32-in (MISC): Add $(srcdir)/quail/sisheng.elc.
+
 2006-11-29  Juanma Barranquero  <lekktu@gmail.com>
 
 	* quail/greek.el ("greek-mizuochi"): Remove spurious initial newline
diff -r dc2d02a90d3d -r 335a9eff819b lisp/ChangeLog
--- a/lisp/ChangeLog	Tue Dec 05 14:34:46 2006 +0000
+++ b/lisp/ChangeLog	Tue Dec 05 14:35:23 2006 +0000
@@ -1,3 +1,11 @@
+2006-12-05  Micha,Ak(Bl Cadilhac  <michael.cadilhac@lrde.org>
+
+	* cmuscheme.el (run-scheme, scheme-start-file): Search the start
+	file in ~/.emacs.d as `init_SCHEMENAME.scm' instead.
+
+	* shell.el (shell): Search the start file in ~/.emacs.d as
+	`init_SHELLNAME.sh' instead.
+
 2006-12-05  Glenn Morris  <rgm@gnu.org>
 
 	* progmodes/cperl-mode.el (cperl-mode)
diff -r dc2d02a90d3d -r 335a9eff819b man/ChangeLog
--- a/man/ChangeLog	Tue Dec 05 14:34:46 2006 +0000
+++ b/man/ChangeLog	Tue Dec 05 14:35:23 2006 +0000
@@ -1,3 +1,12 @@
+2006-12-05  Micha,Ak(Bl Cadilhac  <michael.cadilhac@lrde.org>
+
+	* anti.texi (Antinews): Mention the alternative to
+	`~/.emacs_SHELLNAME', which is `~/.emacs.d/init_SHELLNAME.sh'.
+
+	* faq.texi (^M in the shell buffer): Ditto.
+
+	* misc.texi (Interactive Shell): Ditto.
+
 2006-12-04  Eli Zaretskii  <eliz@gnu.org>
 
 	* emacs.texi (Acknowledgments): Fix Arne J@o{}rgensen's name.