1 files changed, 11 insertions, 10 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index ce03ac5ccda..357060188a5 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,19 +1,21 @@
+2004-03-26  Kim F. Storm  <storm@cua.dk>
+
+        * xdisp.c (syms_of_xdisp): Include `void-variable' in list_of_error
+        to catch errors in calc_pixel_width_or_height during redisplay.
+
 2004-03-26  Masatake YAMATO  <jet@gyve.org>
 
-        * insdel.c (adjust_markers_for_insert): Call
-        fix_start_end_in_overlays.
+        * buffer.c (fix_start_end_in_overlays): Rename fix_overlays_in_range.
 
-        * buffer.c (fix_start_end_in_overlays): Rename
-        fix_overlays_in_range.
+        * lisp.h (fix_start_end_in_overlays): Likewise.
 
-        * editfns.c (Ftranspose_regions): Likewise.
+        * insdel.c (adjust_markers_for_insert): Call fix_start_end_in_overlays.
 
-        * lisp.h (top_level): Likewise.
+        * editfns.c (Ftranspose_regions): Likewise.
 
 2004-03-20  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
 
-        * xterm.c (handle_one_xevent): Do not pass key press events to
-        GTK.
+        * xterm.c (handle_one_xevent): Do not pass key press events to GTK.
 
 2004-03-19  Richard M. Stallman  <rms@gnu.org>
 
@@ -65,8 +67,7 @@
 
 2004-03-14  Steven Tamm <steventamm@mac.com>
 
-        * Makefile.in (XMENU_OBJ): Do not include xmenu.o if
-        HAVE_CARBON is defined.
+        * Makefile.in (XMENU_OBJ) [HAVE_CARBON]: Do not include xmenu.o.
 
 2004-03-14  Kim F. Storm  <storm@cua.dk>