From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Alan Mackenzie Newsgroups: gmane.emacs.devel Subject: Re: server.el test failures (was: Re: bug#9800: Incomplete truncated file buffers from the /proc filesystem) Date: Fri, 24 Feb 2023 19:45:05 +0000 Message-ID: References: <98e880a0-d076-cfd9-b39d-50c84fa8975a@gmail.com> <811d85e0-4032-68df-bc0c-1073ff5d1b96@cs.ucla.edu> <5a38c18d-263c-223b-7335-8395a10eb494@gmail.com> <83wn47o5zm.fsf@gnu.org> <83mt52nc4a.fsf@gnu.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="40938"; mail-complaints-to="usenet@ciao.gmane.io" Cc: Jim Porter , eggert@cs.ucla.edu, emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Fri Feb 24 20:46:02 2023 Return-path: Envelope-to: ged-emacs-devel@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1pVe14-000AVM-Pl for ged-emacs-devel@m.gmane-mx.org; Fri, 24 Feb 2023 20:46:02 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pVe0Y-0003gm-EA; Fri, 24 Feb 2023 14:45:30 -0500 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pVe0U-0003gV-Bs for emacs-devel@gnu.org; Fri, 24 Feb 2023 14:45:26 -0500 Original-Received: from mx3.muc.de ([193.149.48.5]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pVe0R-0001nl-N5 for emacs-devel@gnu.org; Fri, 24 Feb 2023 14:45:25 -0500 Original-Received: (qmail 11195 invoked by uid 3782); 24 Feb 2023 20:45:06 +0100 Original-Received: from acm.muc.de (pd953abf4.dip0.t-ipconnect.de [217.83.171.244]) (using STARTTLS) by colin.muc.de (tmda-ofmipd) with ESMTP; Fri, 24 Feb 2023 20:45:06 +0100 Original-Received: (qmail 1448 invoked by uid 1000); 24 Feb 2023 19:45:05 -0000 Content-Disposition: inline In-Reply-To: <83mt52nc4a.fsf@gnu.org> X-Submission-Agent: TMDA/1.3.x (Ph3nix) X-Primary-Address: acm@muc.de Received-SPF: pass client-ip=193.149.48.5; envelope-from=acm@muc.de; helo=mx3.muc.de X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.devel:303758 Archived-At: 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 [ .... ] > 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).