# HG changeset patch
# User Aidan Kehoe <kehoea@parhasard.net>
# Date 1215725872 -7200
# Node ID ec442dc06fe1bc671fbe0ed0a928b294cdd45aba
# Parent  dbf79a1732bafb35ad5b7e86e8e535e95ec074ca# Parent  e34711681f304b66702247a4537da0537ab14e3e
Merge.

diff -r e34711681f30 -r ec442dc06fe1 src/ChangeLog
--- a/src/ChangeLog	Wed Jul 09 20:46:22 2008 +0200
+++ b/src/ChangeLog	Thu Jul 10 23:37:52 2008 +0200
@@ -51,6 +51,13 @@
 	(gtk_finish_init_device): Call #'make-device-late-gtk-entry-point
 	with the created device as an argument. 
 
+2008-07-10  Aidan Kehoe  <kehoea@parhasard.net>
+
+	* redisplay-msw.c (mswindows_text_width_single_run): 
+	Explicitly check for the null font instance, and return zero if
+	so. Avoids the crash documented in
+	http://mid.gmane.org/18473.32468.712317.149457@parhasard.net .
+
 2008-05-27  Aidan Kehoe  <kehoea@parhasard.net>
 
 	* editfns.c (Ftranslate_region):  
diff -r e34711681f30 -r ec442dc06fe1 src/redisplay-msw.c
--- a/src/redisplay-msw.c	Wed Jul 09 20:46:22 2008 +0200
+++ b/src/redisplay-msw.c	Thu Jul 10 23:37:52 2008 +0200
@@ -148,6 +148,15 @@
   Lisp_Object font_inst = FACE_CACHEL_FONT (cachel, run->charset);
   SIZE size;
 
+  /* The X11 code doesn't have to do this explicitly, because there we trust
+     the font instance to know whether it's actually proportional or not,
+     and we use the zero width that is stored in the monospace null font
+     instance.  */
+  if (EQ (Vthe_null_font_instance, font_inst))
+    {
+      return 0;
+    }
+
 #if 0 /* #### not the way of ikeyama's ws */
   if (!fi->proportional_p || !hdc)
     {