*** empty log message ***

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2733ec1ff1ccaa9459b110f15f538ee2f9de1d51..83f6152959b584477941421a6c2e4621c6b349f7 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2000-11-24  Jason Rumney  <jasonr@gnu.org>
+
+       * international/mule-cmds.el (locale-language-names): Add "jp" as
+       a non-standard alternative for Japanese.
+
 2000-11-24  Andre Spiegel  <spiegel@gnu.org>
 
        * vc-hooks.el: Require 'cl during compilation.

diff --git a/src/ChangeLog b/src/ChangeLog
index 2d32e16965471c584619ec9367900dfd3516c602..f31ed60afc770966789517f3ef7aa4f0af6cbb0f 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,14 @@
+2000-11-24  Jason Rumney  <jasonr@gnu.org>
+
+       * w32.c (init_environment): Set LANG environment variable based on
+       locale settings, if not set.
+
+       * w32fns.c (x_set_tool_bar_lines): Clear internal border when
+       making tool bar smaller. When clearing the frame, also
+       clear current matrices. Clear frame when tool bar disappears.
+       Don't use more lines for the tool-bar than is available.
+       (x_change_window_heights): New function.
+
 2000-11-24  Gerd Moellmann  <gerd@gnu.org>
 
        * xdisp.c (init_from_display_pos): If POS says we're already after