From 85177c862b21fd10dabf288559a56558be5c6ba5 Mon Sep 17 00:00:00 2001 From: Gerd Moellmann Date: Sat, 9 Oct 1999 19:58:13 +0000 Subject: [PATCH] *** empty log message *** --- lisp/ChangeLog | 4 +++- src/ChangeLog | 10 ++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 68f9fbcf66b..4d2fca9b490 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1586,7 +1586,9 @@ 1999-07-23 Gerd Moellmann - * 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 diff --git a/src/ChangeLog b/src/ChangeLog index 21bb42e6758..920f22046c6 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,13 @@ +1999-10-09 Gerd Moellmann + + * 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 * fileio.c (Fmake_temp_name): add a reference to `make-temp-file' -- 2.39.5