From: Juanma Barranquero <lekktu@gmail.com>
Date: Tue, 5 Dec 2006 14:35:23 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: emacs-pretest-22.0.92~272
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=dd4b03cd67839e2b279b35468f33f6e4cb69412b;p=emacs.git

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

diff --git a/etc/ChangeLog b/etc/ChangeLog
index 4e30b687f55..12ab19fa7b1 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -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 --git a/leim/ChangeLog b/leim/ChangeLog
index 8717f228df4..1d86928a2c8 100644
--- a/leim/ChangeLog
+++ b/leim/ChangeLog
@@ -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 --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2c1c3a0394a..0d4e0bdeee4 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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 --git a/man/ChangeLog b/man/ChangeLog
index 5947274b460..7682e006ae3 100644
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -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.