*** empty log message ***

diff --git a/ChangeLog b/ChangeLog
index 1f1fcdcda03a0c80f8bd979e37c3245ca74b7bb6..ab84bcb80aa9dbb64f38842453fd13f0fd76e524 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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 --git a/src/ChangeLog b/src/ChangeLog
index b4410a6f3edb4ae6c45f14c72dcc600d15c89517..fc09566d561f3ae87fd3c2b4b41777f885ff856a 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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.