*** empty log message ***

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f18cb0b81dd08365dc9841c6fd2fb6692df84f3f..b23e2c9de266ecd6d4b6689508254976b85fa359 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2001-10-04  Andrew Innes  <andrewi@gnu.org>
+
+       * faces.el (face-font-registry-alternatives) [windows-nt]: Make
+       gb2312 an alias for gb2312.1980.
+
 2001-10-03  Stefan Monnier  <monnier@cs.yale.edu>
 
        * pcvs-util.el (cvs-prefix-define): Typo cons->concat.

diff --git a/src/ChangeLog b/src/ChangeLog
index bc2c8c2bfb5c8a588b2794a68eb76b255791edf1..90ef210a154c7065835a3d52af5e016e22d8075b 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,19 @@
+2001-10-04  Andrew Innes  <andrewi@gnu.org>
+
+       * w32fns.c (x_to_w32_color): Fix argument to alloca.
+       (w32_load_system_font): Don't believe what GetLanguageFontInfo
+       says; query codepage info directly to determine if font is double
+       byte.
+       (x_to_w32_charset): Handle private format for unknown charsets.
+       Handle wildcards in charset spec, by ignoring them.
+       (w32_codepage_for_font): Fix argument to alloca.  Don't remove
+       "*-" prefix from charset.
+       (x_to_w32_font): Enlarge remainder array for safety.  Specifically
+       handle the truncated font spec form constructed by font_list_1, so
+       that we correctly identify the charset fields.  Don't remove "*-"
+       prefix from charset.
+       (w32_list_synthesized_fonts): Fix argument to alloca.
+
 2001-10-03  Miles Bader  <miles@gnu.org>
 
        * callproc.c (syms_of_callproc): Explicitly state in the