# HG changeset patch
# User Gerd Moellmann <gerd@gnu.org>
# Date 969448956 0
# Node ID 1d2b57dffb6061b0cca60baa49d806580dc2254a
# Parent  adedb7435316593edcdc805ee8bc1dd11c33075a
*** empty log message ***

diff -r adedb7435316 -r 1d2b57dffb60 lisp/ChangeLog
--- a/lisp/ChangeLog	Wed Sep 20 11:22:17 2000 +0000
+++ b/lisp/ChangeLog	Wed Sep 20 11:22:36 2000 +0000
@@ -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 -r adedb7435316 -r 1d2b57dffb60 src/ChangeLog
--- a/src/ChangeLog	Wed Sep 20 11:22:17 2000 +0000
+++ b/src/ChangeLog	Wed Sep 20 11:22:36 2000 +0000
@@ -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