From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Stefan Kangas Newsgroups: gmane.emacs.devel Subject: Re: master d0a66f3e0e: Display a warning for some uses of nil in face attributes. Date: Sun, 27 Nov 2022 09:07:52 -0800 Message-ID: References: <166215065969.27647.10737851450469499017@vcs2.savannah.gnu.org> <20220902203100.0C8D8C0088A@vcs2.savannah.gnu.org> Mime-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="18047"; mail-complaints-to="usenet@ciao.gmane.io" To: Gregory Heytings , emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Sun Nov 27 18:08:50 2022 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 1ozL97-0004Wh-Jl for ged-emacs-devel@m.gmane-mx.org; Sun, 27 Nov 2022 18:08:49 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ozL8J-0006gs-Es; Sun, 27 Nov 2022 12:07:59 -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 1ozL8F-0006gX-Uw for emacs-devel@gnu.org; Sun, 27 Nov 2022 12:07:57 -0500 Original-Received: from mail-oa1-x2e.google.com ([2001:4860:4864:20::2e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ozL8E-00078G-Bq for emacs-devel@gnu.org; Sun, 27 Nov 2022 12:07:55 -0500 Original-Received: by mail-oa1-x2e.google.com with SMTP id 586e51a60fabf-14279410bf4so10570644fac.8 for ; Sun, 27 Nov 2022 09:07:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=to:subject:message-id:date:mime-version:references:in-reply-to:from :from:to:cc:subject:date:message-id:reply-to; bh=adpajGLlRQVh5cMQ7GQhvkge6Nw2IwGNL0wRs3Nr0Yc=; b=RiYDXk5MxYBf7vKz59OraYGRiiZlhD8LYdrnPjVrepG1KvJMsqRkQZDQGhqfTp1y+s zKLzjF9cKrQkJ0wjTUTvt7jOaXt8U3BffU722iXn8M/fNRoA5O1D/Z7+EeBSaDSmbtbw uDTHRR2sW6g3GnXM2oHXLZrkRFHi8OXpwNoyLM0u2UKvvegLwka7h60a4BoYQ2WNbqtF uJxURdrW30FMfUI1t0ECvTRahmHgSRNDwhTKTZykedOYx9VM9sR7d/CNMb0PiDYO5Bej 3iJ1EsdnPDIuvP9mnJ+obTEDQN4QCMTT8fayeHB879nWos6jq41jJeg50Oz6xS84lfp/ yXTw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=to:subject:message-id:date:mime-version:references:in-reply-to:from :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=adpajGLlRQVh5cMQ7GQhvkge6Nw2IwGNL0wRs3Nr0Yc=; b=1hyZSeZ+wEjvbCLnNsISVeqxAbbBQ0XbRl7y2Q2hUFjatCnrKsRfYBz6DZuO1R585c NP55IMNkbeMS02NjvpO7mYIY082rCmgQmGTCw8NFVJgOQKQlNPUGlSXH8fgfrVwNnnzJ aPNy0cr3R9l4uAcimxsn+3coMMHIpar1iv664W1MBWZNYsXtbtLQPazOwYKc74HpT6U5 ZpBgf39kajIEUeRda9buZI7oNAYOOZCDviTB02XuNoybmCxB6iyQpal3MFpBIprxu1y1 fh2a8T9OJitqJdVYHEpa3yQpIVOjxwarpsa0mwcWFbwLoQHevExjxQydA90fjMhbZzg3 MODQ== X-Gm-Message-State: ANoB5plAVZdwJbysdlnm/pbczHqWKfXfpXlGPLHNOwNlRp1rCgCTjoTs 9RckJDZqTgkzMGUlV9A+Lw2EwzSb04qUXzDMqDm1trLgM3U= X-Google-Smtp-Source: AA0mqf7TXMSexKevOK4hK7UotTezAKUFp9fnaXbIYh1Ts91VvaTcxsn9p6Cqb7sKkgkWtMLYtW3XqVQ5gy9JjHKoZu4= X-Received: by 2002:a05:6870:4995:b0:143:522a:ebcc with SMTP id ho21-20020a056870499500b00143522aebccmr9496695oab.199.1669568872985; Sun, 27 Nov 2022 09:07:52 -0800 (PST) Original-Received: from 753933720722 named unknown by gmailapi.google.com with HTTPREST; Sun, 27 Nov 2022 09:07:52 -0800 In-Reply-To: <20220902203100.0C8D8C0088A@vcs2.savannah.gnu.org> X-Hashcash: 1:20:221127:emacs-devel@gnu.org::tJ4m9XvAsbaMvwHK:16eX Received-SPF: pass client-ip=2001:4860:4864:20::2e; envelope-from=stefankangas@gmail.com; helo=mail-oa1-x2e.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, 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:300635 Archived-At: Gregory Heytings writes: > branch: master > commit d0a66f3e0e668d8c12c54436740c62f8e238a664 > Author: Gregory Heytings > Commit: Gregory Heytings > > Display a warning for some uses of nil in face attributes. > > * src/xfaces.c (HANDLE_INVALID_NIL_VALUE): New macro, which displays > a warning for invalid uses of nil as a face attribute value. > (Finternal_set_lisp_face_attribute): Use the macro for the attributes > :foreground, :distant-foreground and :background. > --- > src/xfaces.c | 21 ++++++++++++--------- > 1 file changed, 12 insertions(+), 9 deletions(-) > > diff --git a/src/xfaces.c b/src/xfaces.c > index 70d5cbeb4c..5e3a47d7f8 100644 > --- a/src/xfaces.c > +++ b/src/xfaces.c > @@ -3052,6 +3052,15 @@ The value is TO. */) > } > > > +#define HANDLE_INVALID_NIL_VALUE(A,F) \ > + if (NILP (value)) \ > + { \ > + add_to_log ("Warning: setting attribute `%s' of face `%s': nil " \ > + "value is invalid, use `unspecified' instead.", A, F); \ > + /* Compatibility with 20.x. */ \ > + value = Qunspecified; \ > + } > + Thanks, it makes sense to warn users using Emacs 20 face specifications. But should the newly introduced warning be called out in NEWS? Also, why not make this into a function? Is it performance critical enough to warrant using a macro? > DEFUN ("internal-set-lisp-face-attribute", Finternal_set_lisp_face_attribute, > Sinternal_set_lisp_face_attribute, 3, 4, 0, > doc: /* Set attribute ATTR of FACE to VALUE. > @@ -3390,9 +3399,7 @@ FRAME 0 means change the face on all frames, and change the default > } > else if (EQ (attr, QCforeground)) > { > - /* Compatibility with 20.x. */ > - if (NILP (value)) > - value = Qunspecified; > + HANDLE_INVALID_NIL_VALUE (QCforeground, face); > if (!UNSPECIFIEDP (value) > && !IGNORE_DEFFACE_P (value) > && !RESET_P (value)) > @@ -3409,9 +3416,7 @@ FRAME 0 means change the face on all frames, and change the default > } > else if (EQ (attr, QCdistant_foreground)) > { > - /* Compatibility with 20.x. */ > - if (NILP (value)) > - value = Qunspecified; > + HANDLE_INVALID_NIL_VALUE (QCdistant_foreground, face); > if (!UNSPECIFIEDP (value) > && !IGNORE_DEFFACE_P (value) > && !RESET_P (value)) > @@ -3428,9 +3433,7 @@ FRAME 0 means change the face on all frames, and change the default > } > else if (EQ (attr, QCbackground)) > { > - /* Compatibility with 20.x. */ > - if (NILP (value)) > - value = Qunspecified; > + HANDLE_INVALID_NIL_VALUE (QCbackground, face); > if (!UNSPECIFIEDP (value) > && !IGNORE_DEFFACE_P (value) > && !RESET_P (value))