On Jun 8, 2006, at 10:23 AM, Adrian Robert wrote:

Hi all,

I released version 9.0-pre3.

As per usual I end up noticing something hours after the release: if you do 'C-u C-x =' on a non-ascii character, the same crash as in pre2a gets invoked. ;-| Below is a patch to fontset.c that fixes the problem a bit more aggressively.

I'm not going to do a new release for this because I think the problem is pretty isolated (let me know if I'm wrong), and anyway I intend to put out rc1 within a couple of weeks.

Adrian


--- 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));


Attachment: repertoryFix_pre3.patch
Description: Binary data


_______________________________________________
Emacs-app-dev- mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/emacs-app-dev-

Reply via email to