From d388d2ac7d9a01e664637287677bde25db2a872c Mon Sep 17 00:00:00 2001
From: Chong Yidong <cyd@stupidchicken.com>
Date: Wed, 7 Nov 2007 15:29:56 +0000
Subject: [PATCH] * dispextern.h (struct it): Don't define
 OVERLAY_STRING_CHUNK_SIZE twice.

* xdisp.c (handle_face_prop): Fix last change.
---
 src/ChangeLog | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/ChangeLog b/src/ChangeLog
index 88a3c84aa9a..5849ac96f4e 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,10 @@
+2007-11-07  Chong Yidong  <cyd@stupidchicken.com>
+
+	* dispextern.h (struct it): Don't define OVERLAY_STRING_CHUNK_SIZE
+	twice.
+
+	* xdisp.c (handle_face_prop): Fix last change.
+
 2007-11-06  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
 
 	* gtkutil.c (xg_tool_bar_menu_proxy): Handle GTK_IMAGE_ICON_NAME and
-- 
2.11.4.GIT