From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <bounce+ml==a==inbox.vuxu.org==zsh-workers@zsh.org>
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 899A024BA1
	for <ml@inbox.vuxu.org>; Sat,  9 Mar 2024 23:31:12 +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:From:Reply-To:Cc:
	Content-Transfer-Encoding:Content-Description:Resent-Date:Resent-From:
	Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References;
	bh=HNBndXhG4KN3jStUxXGWGW4HPhrszb1fMxzlXL2VU64=; b=V7xshIJgNwOQrDAbOJbdDBCFcX
	T/opCqWuRzshgjfjgegAD1GT82nHy2d0U+SCidGKSzTP34/d05y+d+09m7rCgN7WsZn9oa/YuG+Fj
	i2piVkB3sDg7Yke6f1iOC5IpBz5hAFaoPVZ+1HGw4BEXkRyBGRhcYAfPSQxw3bAUIGkMUbluPpGU7
	78KE8enVNgXAWYbF3iL1GaTH99HjvsSfUNOAp616+h7CwtfsmEYW8PCDkVQ2XjnfZVGK1kZlWI9Nk
	FpQ0RLoKMvd588ZO+3zzZHAiXji/UgHA+Aofd74S52LX/1cps6lOxBkgRt1Hma+jkOBdhaIl8xxGM
	YT/mLsNg==;
Received: by zero.zsh.org with local
	id 1rj5Dj-000Jj5-MA;
	Sat, 09 Mar 2024 22:31:11 +0000
Received: by zero.zsh.org with esmtpsa (TLS1.3:TLS_AES_256_GCM_SHA384:256)
	id 1rj5DS-000JP5-2N;
	Sat, 09 Mar 2024 22:30:54 +0000
Received: from [192.168.178.21] (helo=hydra)
	by mail.kiddle.eu with esmtp(Exim 4.97.1)
	(envelope-from <opk@zsh.org>)
	id 1rj5DL-00000000Fuz-3wkb
	for zsh-workers@zsh.org;
	Sat, 09 Mar 2024 23:30:53 +0100
From: Oliver Kiddle <opk@zsh.org>
To: Zsh workers <zsh-workers@zsh.org>
Subject: PATCH: fix .zle.sgr for empty sequences
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-ID: <61191.1710023447.1@hydra>
Date: Sat, 09 Mar 2024 23:30:47 +0100
Message-ID: <61192-1710023447.936507@Vf9U.zuLW.VgB3>
X-Seq: 52724
Archived-At: <https://zsh.org/workers/52724>
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: <zsh-workers.zsh.org>
List-Help: <http://www.zsh.org/sympa/help>, <mailto:sympa@zsh.org?subject=HELP>
List-Subscribe: <http://www.zsh.org/sympa/subscribe/zsh-workers>, <mailto:sympa@zsh.org?subject=SUB%20zsh-workers>
List-Unsubscribe: <http://www.zsh.org/sympa/signoff/zsh-workers>, <mailto:sympa@zsh.org?subject=SIG%20zsh-workers>
List-Post: <mailto:zsh-workers@zsh.org>
List-Owner: <mailto:zsh-workers-request@zsh.org>
List-Archive: <http://www.zsh.org/sympa/arc/zsh-workers>

This fixes .zle.sgr from the new hlgroups module to return "0" when the
sequence is empty. In particular \e[m typically works them same as \e[0m
so we want to return the 0 in that case.

Oliver

diff --git a/Src/Modules/hlgroup.c b/Src/Modules/hlgroup.c
index 6382f3216..9c0aedcf8 100644
--- a/Src/Modules/hlgroup.c
+++ b/Src/Modules/hlgroup.c
@@ -59,6 +59,10 @@ convertattr(char *attrstr, int sgr)
 	    *t = ';';
 	    c++;
 	}
+	if (t <= s) { /* always return at least "0" */
+	    *s = '0';
+	    t = s + 1;
+	}
 	*t = '\0';
 	len = t - s;
     }