From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on inbox.vuxu.org X-Spam-Level: X-Spam-Status: No, score=-3.5 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,DKIM_VALID_EF,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.4 Received: from zero.zsh.org (zero.zsh.org [IPv6:2a02:898:31:0:48:4558:7a:7368]) by inbox.vuxu.org (Postfix) with ESMTP id B965722425 for ; Wed, 20 Mar 2024 23:27:18 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=zsh.org; s=rsa-20210803; h=List-Archive:List-Owner:List-Post:List-Unsubscribe: List-Subscribe:List-Help:List-Id:Sender:Message-ID:Date:Content-ID: Content-Type:MIME-Version:Subject:To:References:From:In-reply-to:cc:Reply-To: Content-Transfer-Encoding:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID; bh=C98flm+xBqwjeaPyTsLGwsrOBC/goj8l8WjX0H8uhJ0=; b=ouypCLokELFdRrALx/9Y00fzDR NhxE7EIHh7L58Ir+YI6l7DE4O/xJykmKYKYcWXT0Hkgzg1Jkm20pHdJMAiVbCOVYIFMCEd3QIj2Bk 0NS7/MPrngk7RPl8tyvr+d8DlDFdps0s+zgSpIAbMqoGjsjl3mToYFS9sSAQPfNjKfcmwL71SYm0X c7XP3g6Kule+aCWidvbaFG+PhVdHiDYFCM1L2UWi12A0A3lqyrDD0V8IGo30q4tqCnPFpuiiDTjuv 6b56dpzMH5q8r9sqa94htjjSiGnD/FMpONjlNnJjmFG2gWqR2MnZQX6/10OchBfqd3UrPKl4CbP25 Wf5g1vjA==; Received: by zero.zsh.org with local id 1rn4Oy-0004QG-Nd; Wed, 20 Mar 2024 22:27:16 +0000 Received: by zero.zsh.org with esmtpsa (TLS1.3:TLS_AES_256_GCM_SHA384:256) id 1rn4OO-000454-3f; Wed, 20 Mar 2024 22:26:40 +0000 Received: from [192.168.178.21] (helo=hydra) by mail.kiddle.eu with esmtp(Exim 4.97.1) (envelope-from ) id 1rn4ON-0000000049h-010o; Wed, 20 Mar 2024 23:26:39 +0100 cc: Clinton Bunch , zsh-workers@zsh.org In-reply-to: <615589318.5857173.1710951314600@mail.virginmedia.com> From: Oliver Kiddle References: <4660bb1c-c15f-41a0-bd7b-0da19073a534@zentaur.org> <1922525261.5866551.1710927037473@mail.virginmedia.com> <947945847.5869623.1710929963847@mail.virginmedia.com> <7e9a2bfd-3a91-4c19-ad11-0397a839be4f@zentaur.org> <615589318.5857173.1710951314600@mail.virginmedia.com> To: Peter Stephenson Subject: Re: current git Fails to compile on Solaris 11 x86 MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-ID: <15975.1710973598.1@hydra> Date: Wed, 20 Mar 2024 23:26:38 +0100 Message-ID: <15976-1710973599.000679@Gv72.cS7i.MXME> X-Seq: 52783 Archived-At: X-Loop: zsh-workers@zsh.org Errors-To: zsh-workers-owner@zsh.org Precedence: list Precedence: bulk Sender: zsh-workers-request@zsh.org X-no-archive: yes List-Id: List-Help: , List-Subscribe: , List-Unsubscribe: , List-Post: List-Owner: List-Archive: Peter Stephenson wrote: > The wrapper function just fits a generic form, so should stay void. > It's as simple as it looks. (I guess the line numbers were out in the > code I was looking at so I misidentified what it was complaining about.) Yes sorry, that fix is right. I still have my git branch and, looking at the steps, I mistakenly copied the same form from the get* functions when factoring out the common code for the .zle.esc and .zle.sgr parameters. Also the following fix is needed for this case: typeset -A .zle.hlgroups zmodload -i zsh/hlgroup : ${.zle.hlgroups[select]} export GREP_COLOR=${.zle.sgr[select]} Oliver diff --git a/Src/Modules/hlgroup.c b/Src/Modules/hlgroup.c index f20f2c1f9..082762623 100644 --- a/Src/Modules/hlgroup.c +++ b/Src/Modules/hlgroup.c @@ -91,7 +91,8 @@ getgroup(const char *name, int sgr) if (!(v = getvalue(&vbuf, &var, 0)) || PM_TYPE(v->pm->node.flags) != PM_HASHED || !(hlg = v->pm->gsu.h->getfn(v->pm)) || - !(hn = gethashnode2(hlg, name))) + !(hn = gethashnode2(hlg, name)) || + (((Param) hn)->node.flags & PM_UNSET)) { pm->u.str = dupstring(""); pm->node.flags |= PM_UNSET;