Merge

1 files changed, 31 insertions, 2 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 0d421223228..50fc953024a 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,32 @@
+2011-10-28  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * lisp.h (struct Lisp_Symbol): Update comments.
+
+2011-10-28  Juanma Barranquero  <lekktu@gmail.com>
+
+        * w32font.c (w32_load_unicows_or_gdi32): Add missing return.
+
+2011-10-28  Eli Zaretskii  <eliz@gnu.org>
+
+        Fix Emacs on Windows 9X (bug#8562).  Thanks to oslsachem
+        <oslsachem@gmail.com> for helping to debug this.
+
+        * w32font.c (g_b_init_is_w9x, g_b_init_get_outline_metrics_w)
+        (g_b_init_get_text_metrics_w, g_b_init_get_glyph_outline_w)
+        (g_b_init_get_glyph_outline_w): New static variables.
+        (GetOutlineTextMetricsW_Proc, GetTextMetricsW_Proc)
+        (GetGlyphOutlineW_Proc): New typedefs.
+        (w32_load_unicows_or_gdi32, get_outline_metrics_w)
+        (get_text_metrics_w, get_glyph_outline_w, globals_of_w32font):
+        New functions.
+        (w32font_open_internal, compute_metrics):
+        Call get_outline_metrics_w, get_text_metrics_w, and get_glyph_outline_w
+        instead of calling the "wide" APIs directly.
+
+        * emacs.c (main) [HAVE_NTGUI]: Call globals_of_w32font.
+
+        * w32.h (syms_of_w32font): Add prototype.
+
 2011-10-27  Juanma Barranquero  <lekktu@gmail.com>
 
         * window.c (Fframe_root_window, Fframe_first_window, Fwindow_end)
@@ -18,8 +47,8 @@
 
 2011-10-27  Chong Yidong  <cyd@gnu.org>
 
-        * gnutls.c (emacs_gnutls_deinit): New function.  Deallocate
-        credentials structures as well as calling gnutls_deinit.
+        * gnutls.c (emacs_gnutls_deinit): New function.
+        Deallocate credentials structures as well as calling gnutls_deinit.
         (Fgnutls_deinit, Fgnutls_boot): Use it.
 
         * process.c (make_process): Initialize GnuTLS credentials to NULL.