# HG changeset patch
# User Jason Rumney <jasonr@gnu.org>
# Date 975101347 0
# Node ID d77db72e017d80ff9c739b1bd79fb1fc8dec4858
# Parent  de4e8869e7e37105e8916833aee9309376d07671
*** empty log message ***

diff -r de4e8869e7e3 -r d77db72e017d lisp/ChangeLog
--- a/lisp/ChangeLog	Fri Nov 24 21:07:19 2000 +0000
+++ b/lisp/ChangeLog	Fri Nov 24 21:29:07 2000 +0000
@@ -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 -r de4e8869e7e3 -r d77db72e017d src/ChangeLog
--- a/src/ChangeLog	Fri Nov 24 21:07:19 2000 +0000
+++ b/src/ChangeLog	Fri Nov 24 21:29:07 2000 +0000
@@ -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