# HG changeset patch
# User Gerd Moellmann <gerd@gnu.org>
# Date 969284430 0
# Node ID 6856f91c0301d304e8ff09509b2f04264e955402
# Parent  f50932a701059b77ffee1510e5cc172679299683
*** empty log message ***

diff -r f50932a70105 -r 6856f91c0301 ChangeLog
--- a/ChangeLog	Mon Sep 18 13:39:43 2000 +0000
+++ b/ChangeLog	Mon Sep 18 13:40:30 2000 +0000
@@ -1,3 +1,8 @@
+2000-09-18  Gerd Moellmann  <gerd@gnu.org>
+
+	* make-dist (skk): Rename to `ja-dic' because the leim directory
+	was renamed.
+
 2000-09-14  Dave Love  <fx@gnu.org>
 
 	* configure.in: Fix spurion in last change.
diff -r f50932a70105 -r 6856f91c0301 src/ChangeLog
--- a/src/ChangeLog	Mon Sep 18 13:39:43 2000 +0000
+++ b/src/ChangeLog	Mon Sep 18 13:40:30 2000 +0000
@@ -1,5 +1,15 @@
 2000-09-18  Gerd Moellmann  <gerd@gnu.org>
 
+	* xterm.c (x_draw_image_glyph_string): Remove a comment describing
+	a feature to implement that is already implemented.
+	(note_mouse_highlight, x_find_ccl_program): Avoid some compiler
+	warnings.
+
+	* xfns.c (x_clear_image_1): New function.
+	(x_clear_image): Use it.
+	(x_from_xcolors): Use x_clear_image_1; don't free the image's
+	mask.
+
 	* dispnew.c (update_window): Move test for invisible lines
 	at the top to update_window_line.
 	(update_window_line): Handle invisible lines here.