*** empty log message ***

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0f218cfa53beb15936e35313c2d695a50ff1f82d..3be2952ff06555b210b211f2b52fdd999ab90fcc 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2000-11-05  Andrew Innes  <andrewi@gnu.org>
+
+       * w32-fns.el (w32-version): New function.
+
 2000-11-05  Stefan Monnier  <monnier@cs.yale.edu>
 
        * progmodes/awk-mode.el: Update copyright.

diff --git a/src/ChangeLog b/src/ChangeLog
index 56b0bd3c5e1105bc9a70be071a2fee55722cf62f..168d290ea2cf1d3258095701fc0bb1ed511e6f17 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,21 @@
+2000-11-05  Andrew Innes  <andrewi@gnu.org>
+
+       * w32term.c (x_produce_glyphs): Fix typo in enum name.
+
+       * sysdep.c (read_input_waiting): Remove extraneous argument to
+       read_socket_hook.
+
+       * w32fns.c (Fx_server_version): Include w32_build_number in the
+       return list.
+
+       * w32heap.c (w32_build_number): New variable.
+       (cache_system_info): Set it.
+
+       * w32heap.h (w32_build_number): Add extern.
+
+       * emacs.c (syms_of_emacs): Update docstring for
+       system-configuration, to reflect the actual usage on MS-Windows.
+
 2000-10-31  Gerd Moellmann  <gerd@gnu.org>
 
        * keyboard.c (read_char) <wrong_kboard>: Make sure that we