Re: Emacs crashes when displaying the Euro character

[Chong Yidong]

Richard Stallman <address@hidden> writes:

> How about this fix?

I'm not sure it will fix this particular bug, but in any case it seems
like the correct thing to do.

> diff -c /home/rms/emacs/src/xdisp.c.\~125\~ /home/rms/emacs/src/xdisp.c
> *** /home/rms/emacs/src/xdisp.c.~125~ Tue Aug 29 07:35:42 2006
> --- /home/rms/emacs/src/xdisp.c       Sat Sep  2 09:31:55 2006
> ***************
> *** 10788,10800 ****
>        int preserve_echo_area;
>   {
>     struct window *w = XWINDOW (selected_window);
> !   struct frame *f = XFRAME (w->frame);
>     int pause;
>     int must_finish = 0;
>     struct text_pos tlbufpos, tlendpos;
>     int number_of_visible_frames;
>     int count;
> !   struct frame *sf = SELECTED_FRAME ();
>     int polling_stopped_here = 0;
>   
>     /* Non-zero means redisplay has to consider all windows on all
> --- 10788,10800 ----
>        int preserve_echo_area;
>   {
>     struct window *w = XWINDOW (selected_window);
> !   struct frame *f;
>     int pause;
>     int must_finish = 0;
>     struct text_pos tlbufpos, tlendpos;
>     int number_of_visible_frames;
>     int count;
> !   struct frame *sf;
>     int polling_stopped_here = 0;
>   
>     /* Non-zero means redisplay has to consider all windows on all
> ***************
> *** 10807,10814 ****
>        initialized, or redisplay is explicitly turned off by setting
>        Vinhibit_redisplay.  */
>     if (noninteractive
> !       || !NILP (Vinhibit_redisplay)
> !       || !f->glyphs_initialized_p)
>       return;
>   
>     /* The flag redisplay_performed_directly_p is set by
> --- 10807,10822 ----
>        initialized, or redisplay is explicitly turned off by setting
>        Vinhibit_redisplay.  */
>     if (noninteractive
> !       || !NILP (Vinhibit_redisplay))
> !     return;
> ! 
> !   /* Don't examine these until after testing Vinhibit_redisplay.
> !      When Emacs is shutting down, perhaps because its connection to
> !      X has dropped, we should not look at them at all.  */
> !   f = XFRAME (w->frame);
> !   sf = SELECTED_FRAME ();
> ! 
> !   if (!f->glyphs_initialized_p)
>       return;
>   
>     /* The flag redisplay_performed_directly_p is set by
>
> Diff finished.  Sat Sep  2 09:32:26 2006