Re: [PATCH] Renaming non-X x_* identifiers

[Alex Gramiak]

"Basil L. Contovounesios" <address@hidden> writes:

>> diff --git a/src/xdisp.c b/src/xdisp.c
>> index ae4c405b8d..11667d2735 100644
>> --- a/src/xdisp.c
>> +++ b/src/xdisp.c
>> @@ -11592,9 +11592,8 @@ clear_garbaged_frames (void)
>>            else
>>              clear_current_matrices (f);
>>  
>> -#if defined (HAVE_WINDOW_SYSTEM) && !defined (HAVE_NS)
>> -          x_clear_under_internal_border (f);
>> -#endif /* HAVE_WINDOW_SYSTEM && !HAVE_NS */
>> +              if (FRAME_RIF (f)->clear_under_internal_border)
>> +                FRAME_RIF (f)->clear_under_internal_border (f);
>>  
>>            fset_redisplay (f);
>>            f->garbaged = false;
>
> This causes a segfault in 'emacs -nw' and emacsclient because
> FRAME_RIF (f) is NULL in tty frames such as the initial daemon frame.

Sorry about the trouble. Somehow I didn't test using -nw with a
HAVE_WINDOW_SYSTEM build. It should be fixed now.

> Is x_clear_under_internal_border not supposed to be run in tty frames?

Previously it did, but each implementation of that procedure was a no-op
for tty frames. The issue is that FRAME_RIF procedures shouldn't be
called for tty frames; I didn't realize that FRAME_RIF was NULL for tty
frames instead of a blank struct. I wonder if that should be changed to
avoid this in the future?