# HG changeset patch
# User Jason Rumney <jasonr@gnu.org>
# Date 973894752 0
# Node ID ebf2995faea18d1ebdab9ea12c129dd3d3a331e9
# Parent  ba5202c8e467c6f6fabc08761d52e2153a735e6d
*** empty log message ***

diff -r ba5202c8e467 -r ebf2995faea1 lisp/ChangeLog
--- a/lisp/ChangeLog	Fri Nov 10 22:17:41 2000 +0000
+++ b/lisp/ChangeLog	Fri Nov 10 22:19:12 2000 +0000
@@ -1,3 +1,8 @@
+2000-11-10  Jason Rumney  <jasonr@gnu.org>
+
+	* w32-fns.el (w32-add-charset-info): New function.
+	(w32-charset-info-alist): Use it.
+
 2000-11-10  Gerd Moellmann  <gerd@gnu.org>
 
 	* faces.el (face-font-registry-alternatives): New user-option.
diff -r ba5202c8e467 -r ebf2995faea1 src/ChangeLog
--- a/src/ChangeLog	Fri Nov 10 22:17:41 2000 +0000
+++ b/src/ChangeLog	Fri Nov 10 22:19:12 2000 +0000
@@ -1,3 +1,24 @@
+2000-11-10  Jason Rumney  <jasonr@gnu.org>
+
+	* w32term.h (CP_8BIT, CP_UNICODE, CP_INVALID): New pseudo-codepages.
+
+	* w32term.c (w32_encode_char): Handle CP_UNICODE specially.
+	(w32_use_unicode_for_codepage): Use new pseudo-codepages.
+
+	* w32fns.c (Qw32_charset_hangeul): Rename to match w32 headers.
+	(Qw32_charset_vietnamese): New symbol.
+	(xlfd_charset_of_font): New function.
+	(w32_load_system_font): Use it.
+	(x_to_w32_charset): Use Fassoc to find charset info. Special case
+	when Vw32_charset_info_alist is nil to ensure default face always
+	has font. Use Fcar and Fcdr for safety.
+	(w32_to_x_charset): Use Vw32_charset_info_alist for mappings.
+	(w32_codepage_for_font): Use xlfd_charset_of_font.  Use new
+	pseudo-codepages for special cases.
+	(w32_to_x_font): New parameter to allow charset portion to be
+	specified where there is many to one mapping.  Callers changed.
+	(w32_list_fonts): Avoid listing fonts that won't display.
+
 2000-11-10  Gerd Moellmann  <gerd@gnu.org>
 
 	* xfaces.c (Vface_alternative_font_registry_alist): New variable.