From: Eli Zaretskii <eliz@gnu.org>
Date: Mon, 10 Apr 2006 20:11:12 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: emacs-pretest-22.0.90~3228
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=978781a5f7b2d6e3081e4b9fd442896c051309e8;p=emacs.git

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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5f3b91fefb9..558af5fab0b 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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 --git a/src/ChangeLog b/src/ChangeLog
index ab26fb9a4c8..bd557cd0b16 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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.