*** empty log message ***

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 68f9fbc..4d2fca9 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1586,7 +1586,9 @@
 
 1999-07-23  Gerd Moellmann  <gerd@gnu.org>
 
-       * font-lock.el, help.el, simple.el: Re-integrate changes.
+       * font-lock.el, help.el, simple.el: Re-integrate previously
+       described changes that were lost due to errors while checking them
+       in.
 
 1999-07-23  Kevin Blake  <kblake@ticnet.com>
 

diff --git a/src/ChangeLog b/src/ChangeLog
index 21bb42e..920f220 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,13 @@
+1999-10-09  Gerd Moellmann  <gerd@gnu.org>
+
+       * xfns.c (prepare_image_for_display): Don't try to load image if
+       loading it failed before.
+       (lookup_image, prepare_image_for_display): Remember if loading the
+       image failed.
+       (xpm_load): Add missing UNBLOCK_INPUT.
+
+       * dispextern.h (struct image): New member load_failed_p.
+
 1999-10-08  Stefan Monnier  <monnier@cs.yale.edu>
 
        * fileio.c (Fmake_temp_name): add a reference to `make-temp-file'