From mboxrd@z Thu Jan 1 00:00:00 1970 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on inbox.vuxu.org X-Spam-Level: X-Spam-Status: No, score=-0.1 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FROM,UNPARSEABLE_RELAY autolearn=ham autolearn_force=no version=3.4.4 Received: (qmail 2055 invoked from network); 5 Dec 2021 01:57:44 -0000 Received: from 4ess.inri.net (216.126.196.42) by inbox.vuxu.org with ESMTPUTF8; 5 Dec 2021 01:57:44 -0000 Received: from mail-wm1-f51.google.com ([209.85.128.51]) by 4ess; Sat Dec 4 20:24:17 -0500 2021 Received: by mail-wm1-f51.google.com with SMTP id m25-20020a7bcb99000000b0033aa12cdd33so6439564wmi.1 for <9front@9front.org>; Sat, 04 Dec 2021 17:24:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=date:from:to:subject:message-id:mail-followup-to:references :mime-version:content-disposition:content-transfer-encoding :in-reply-to; bh=AkZnCGDol3beZgVL6S2+xEGesIm5XjL6Z2+PJ6IQlzA=; b=Lx7Jvypp4FEbtMCWVZ1TmxNHIRI7Jd7GIUR+hUxMR4ZkExKcLWxhfDDVqKLVNtfSTh LjkGz3sOC2+LxBlisv+XnhV18xLNmt9YeH4wSB3iBhRFNFRhhPzZHMWDIid/lTHEO32r /MSNNHuPOAwv/YPTA19ramZTkzJt8DcZSPKLrUuEhuXeP2fhTAdTNGq0BALHu1HsUQi+ HSKIKm32ZRX2X+dyBxmf3dA1HM6IpqogWtWL1S9LZiRyRfAfCT30B6dtmwS31QustQvk sysMqEVU7H9AoIOXE4eUqGjS10HCdIgPH4KCsnWxu8eH4Wbmfsp2Yqk0X7RDai0p/1zD xc/A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:subject:message-id:mail-followup-to :references:mime-version:content-disposition :content-transfer-encoding:in-reply-to; bh=AkZnCGDol3beZgVL6S2+xEGesIm5XjL6Z2+PJ6IQlzA=; b=k+4plyuSPWbEAAkySqOKRV4rT7e0KnOGJh6/BnOxO7667vfggpMMKX8DaurHh8x8lZ p3Jt7nNtoY5H6qRTmndAaWvFojGotOWIDL5LwUlRkoOpxeYfyb+JUp5Cwz+zMVhOiUjw ugIWPoaaLXGsxc+za5XwJgHPkOhT+TfmN4cw1bfvAn/huA+qwPRIdExO7vIg54fPruUI x68Mc1Wf0CWSyaR2bUsD3Cmw+l6kI1+tf9mFzwaWhicKv61LO1oic6+jDHPhoCuNYrGS Fw4SgYA8OEPIIetAm7J5gpx4voDhCGY/Ah0HhmX06ajzzRCRkllFfObDItd3w7r7lEc7 WGiQ== X-Gm-Message-State: AOAM533FHVtIyWP///be52Vdu0hD/KBPCubL10uUd55QUB4nRx+5Gl4x Aj5oMElR6si+aIYWNMrzTgoaxVYcJpg= X-Google-Smtp-Source: ABdhPJxmz3CgitWnxRnYQdr9jLpSxQIUfHYlkGDPhITrOWswsQ4nmkTp3YLnTx1tLnwLfkRatWkrNg== X-Received: by 2002:a05:600c:1548:: with SMTP id f8mr27284857wmg.67.1638667451028; Sat, 04 Dec 2021 17:24:11 -0800 (PST) Return-Path: Received: from beryllium.local (dyndsl-095-033-230-048.ewe-ip-backbone.de. [95.33.230.48]) by smtp.gmail.com with ESMTPSA id m125sm9396496wmm.39.2021.12.04.17.24.10 for <9front@9front.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 04 Dec 2021 17:24:10 -0800 (PST) Received: from localhost (beryllium.local [local]) by beryllium.local (OpenSMTPD) with ESMTPA id 93c4d36c for <9front@9front.org>; Sun, 5 Dec 2021 02:24:07 +0100 (CET) Date: Sun, 5 Dec 2021 01:24:07 +0000 From: Humm To: 9front@9front.org Message-ID: Mail-Followup-To: 9front@9front.org References: MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="7xSMSDw8udVR2vJX" Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: List-ID: <9front.9front.org> List-Help: X-Glyph: ➈ X-Bullshit: asynchronous ORM over XML interface lifecycle GPU controller Subject: Re: [9front] [PATCH] troff: we are not htmlroff Reply-To: 9front@9front.org Precedence: bulk --7xSMSDw8udVR2vJX Content-Type: text/plain; charset=utf-8; format=flowed Content-Disposition: inline Content-Transfer-Encoding: 8bit Quoth Sigrid Solveig Haflínudóttir: >I tried applying this but all I get is > >applying troff: we are not htmlroff >/rc/lib/rcmain: patch failed >/bin/git/import: rc 190991: patch failed > >Can you perhaps git/export and send it as an attachment? Thank you. Sure thing. I suppose NeoVim, which I use to compose emails, thought it had to double the spaces at the beginning of lines in the diff. -- Humm --7xSMSDw8udVR2vJX Content-Type: text/plain; charset=utf-8 Content-Disposition: attachment; filename="troff.diff" Content-Transfer-Encoding: 8bit From: Humm Date: Wed, 24 Nov 2021 19:56:44 +0000 Subject: [PATCH] troff: we are not htmlroff If we don’t explicitly check for ‘h’ in troff, we can’t reliably check for non-htmlroff well. Consider the following: .if h \{\ . de M . tm m ..\} Without this change, this will print m and not define macro M. --- diff 24b9a78ceb63234ef0b0e7d1da0d46119b7a297d c2f89dc6c142284fc3b4c38a4e9fbf5c0c5b2a1d --- a/sys/src/cmd/troff/n5.c Wed Nov 24 15:41:36 2021 +++ b/sys/src/cmd/troff/n5.c Wed Nov 24 20:56:44 2021 @@ -683,6 +683,7 @@ if (TROFF) true++; break; + case 'h': case ' ': break; default: --7xSMSDw8udVR2vJX--