*** empty log message ***

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 26b141c4e14ee7f2e121993b221dfc4d7ff321bd..3366c911ed28331c994edeb53ad484dfadde9e6b 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2000-09-20  Gerd Moellmann  <gerd@gnu.org>
 
+       * dired.el (dired-font-lock-keywords): Undo last change.
+       (dired-readin): Bind indent-tabs-mode to nil.
+
        * startup.el (fancy-splash-head): If frame's background mode
        is `dark', change the black background of the image to gray.
        (fancy-splash-screens): Display startup echo area message.

diff --git a/src/ChangeLog b/src/ChangeLog
index 7534a0d6fee107fa3cb1d092272ac3d731eade36..9cf9978e2953e27fbcbc9d866a7d97fe2cce63a4 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,14 @@
+2000-09-20  Gerd Moellmann  <gerd@gnu.org>
+
+       * xfns.c (xpm_init_color_cache) [ALLOC_XPM_COLORS]: If color
+       symbols are specified, add color translations to the cache.
+       (xpm_color_bucket, xpm_cache_color) [ALLOC_XPM_COLORS]: New
+       functions.
+       (xpm_lookup_color) [ALLOC_XPM_COLORS]: Use xpm_color_bucket and
+       xpm_cache_color.
+       (xpm_load) [ALLOC_XPM_COLORS]: Pass frame and XPM attributes
+       structures to xpm_init_color_cache.
+
 2000-09-19  Gerd Moellmann  <gerd@gnu.org>
 
        * dispnew.c (update_window_line): Make sure to always draw