# HG changeset patch
# User Eli Zaretskii <eliz@gnu.org>
# Date 1144699872 0
# Node ID 6dce72f812e7c0d950f381e18864ee5158dc8b9a
# Parent  32dd7ee0ac8b62745320950dafbe60eff1f0df6c
*** empty log message ***

diff -r 32dd7ee0ac8b -r 6dce72f812e7 lisp/ChangeLog
--- a/lisp/ChangeLog	Mon Apr 10 20:10:33 2006 +0000
+++ b/lisp/ChangeLog	Mon Apr 10 20:11:12 2006 +0000
@@ -1,3 +1,9 @@
+2006-04-10  Eli Zaretskii  <eliz@gnu.org>
+
+	* international/mule-cmds.el (set-locale-environment): Fix last
+	change for when the locale's preferences don't specify any
+	encoding.
+
 2006-04-10  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	* emacs-lisp/find-func.el (find-function-search-for-symbol): Fix regexp
diff -r 32dd7ee0ac8b -r 6dce72f812e7 src/ChangeLog
--- a/src/ChangeLog	Mon Apr 10 20:10:33 2006 +0000
+++ b/src/ChangeLog	Mon Apr 10 20:11:12 2006 +0000
@@ -1,3 +1,7 @@
+2006-04-10  Eli Zaretskii  <eliz@gnu.org>
+
+	* s/ms-w32.h (pid_t) [_MSC_VER]: New typedef.
+
 2006-04-10  Romain Francoise  <romain@orebokech.com>
 
 	* xrdb.c (gethomedir): Use xstrdup.