Re: server.el test failures (was: Re: bug#9800: Incomplete truncated file buffers from the /proc filesystem)

[Alan Mackenzie <acm@muc.de>]

Hello, Eli.

On Fri, Feb 24, 2023 at 20:37:25 +0200, Eli Zaretskii wrote:
> > Date: Fri, 24 Feb 2023 09:48:02 -0800
> > Cc: eggert@cs.ucla.edu, emacs-devel@gnu.org
> > From: Jim Porter <jporterbugs@gmail.com>

[ .... ]

> Thanks.  Does the patch below give good results?

It fixes the errors I was seeing with server-tests.el, so I was probably
seeing the same problem as Jim.

Thanks!

> diff --git a/src/xfaces.c b/src/xfaces.c
> index 62d7823..37b7039 100644
> --- a/src/xfaces.c
> +++ b/src/xfaces.c
> @@ -4186,7 +4186,9 @@ DEFUN ("internal-merge-in-global-face", Finternal_merge_in_global_face,
>    if (EQ (face, Qdefault))
>      {
>        struct face_cache *c = FRAME_FACE_CACHE (f);
> -      struct face *newface, *oldface = FACE_FROM_ID_OR_NULL (f, DEFAULT_FACE_ID);
> +      struct face *newface;
> +      struct face *oldface =
> +	c ? FACE_FROM_ID_OR_NULL (f, DEFAULT_FACE_ID) : NULL;
>        Lisp_Object attrs[LFACE_VECTOR_SIZE];
 
>        /* This can be NULL (e.g., in batch mode).  */

-- 
Alan Mackenzie (Nuremberg, Germany).