# HG changeset patch
# User Jason Rumney <jasonr@gnu.org>
# Date 1084138605 0
# Node ID ec3fac03b44a0e900bde6970c8cac24ad8fdb094
# Parent  e131e8f2f9f285d4e2003f654a1b6a310ceecc93
*** empty log message ***

diff -r e131e8f2f9f2 -r ec3fac03b44a lisp/ChangeLog
--- a/lisp/ChangeLog	Sun May 09 21:35:11 2004 +0000
+++ b/lisp/ChangeLog	Sun May 09 21:36:45 2004 +0000
@@ -1,5 +1,14 @@
 2004-05-09  Jason Rumney  <jasonr@gnu.org>
 
+	* international/code-pages (cp932, cp936, cp949, c950): Remove.
+	Only define cp125* if windows-125* is already defined.
+
+	* language/korean.el (cp949): Add alias.
+
+	* language/chinese.el (cp936, cp950): Add aliases.
+
+	* language/japanese.el (cp932): Add alias.
+
 	* term/w32-win.el: Require code-pages.
 
 	* international/mule-cmds.el (set-locale-environment): On