aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog2
-rw-r--r--src/alloc.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 4e378dc1852..5614b421a56 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,7 @@
12000-09-25 Gerd Moellmann <gerd@gnu.org> 12000-09-25 Gerd Moellmann <gerd@gnu.org>
2 2
3 * alloc.c (mark_image): Use GC_NILP instead of NILP.
4
3 * keyboard.c (show_help_echo): Set help_echo_showing_p. 5 * keyboard.c (show_help_echo): Set help_echo_showing_p.
4 (read_char): If help-echo is showing, preserve the echo area 6 (read_char): If help-echo is showing, preserve the echo area
5 when redisplaying. 7 when redisplaying.
diff --git a/src/alloc.c b/src/alloc.c
index 75466a787c7..5f08cd07d81 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -3769,7 +3769,7 @@ mark_image (img)
3769{ 3769{
3770 mark_object (&img->spec); 3770 mark_object (&img->spec);
3771 3771
3772 if (!NILP (img->data.lisp_val)) 3772 if (!GC_NILP (img->data.lisp_val))
3773 mark_object (&img->data.lisp_val); 3773 mark_object (&img->data.lisp_val);
3774} 3774}
3775 3775