--- emacs-23.0.0_NS-9.0pre3/src/fontset.c	2006-05-29 12:41:50.000000000 -0400
+++ emacs/src/fontset.c	2006-06-09 11:24:16.000000000 -0400
@@ -499,6 +499,9 @@
     return -1;
 
   if (NILP (AREF (font_def, 2))
+#ifdef HAVE_NS  /* PENDING: avert a crash until we can DTRT. */
+      && get_font_repertory_func
+#endif
       && NILP (Fassq (make_number (font_info->font_idx),
 		      FONTSET_REPERTORY (fontset))))
     {
@@ -886,11 +889,7 @@
   int face_id;
   int id;
 
-/* Causing segfault under NS when called from xdisp.c:5751.
-   In any case, diff face for diff char unneeded under NS. */
-#ifndef HAVE_NS
   if (ASCII_CHAR_P (c))
-#endif
     return face->ascii_face->id;
 
   xassert (fontset_id_valid_p (face->fontset));