From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 17760 invoked by alias); 13 Aug 2018 12:58:17 -0000 Mailing-List: contact zsh-workers-help@zsh.org; run by ezmlm Precedence: bulk X-No-Archive: yes List-Id: Zsh Workers List List-Post: List-Help: List-Unsubscribe: X-Seq: 43285 Received: (qmail 21242 invoked by uid 1010); 13 Aug 2018 12:58:17 -0000 X-Qmail-Scanner-Diagnostics: from mailout2.w1.samsung.com by f.primenet.com.au (envelope-from , uid 7791) with qmail-scanner-2.11 (clamdscan: 0.99.2/21882. spamassassin: 3.4.1. Clear:RC:0(210.118.77.12):SA:0(-6.9/5.0):. Processed in 1.214515 secs); 13 Aug 2018 12:58:17 -0000 X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on f.primenet.com.au X-Spam-Level: X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_HI, SPF_HELO_PASS,SPF_PASS,T_DKIMWL_WL_HIGH,T_DKIM_INVALID autolearn=ham autolearn_force=no version=3.4.1 X-Envelope-From: p.stephenson@samsung.com X-Qmail-Scanner-Mime-Attachments: | X-Qmail-Scanner-Zip-Files: | DKIM-Filter: OpenDKIM Filter v2.11.0 mailout2.w1.samsung.com 20180813125812euoutp029156fb3fd4cfe3f30d66cebdb62b8b35~KcwXlKZRW2239822398euoutp02D DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1534165092; bh=Ki5ejZIGJDxMidUVQ3tbZRH91rL6vO9Xjj8/1zinhf8=; h=Date:From:To:CC:Subject:In-Reply-To:References:From; b=gxGJYGvUoSL9rplI/I1/adF6gdZMUNe7LUvl7iI2PB8GdxMiVwgQrd5G/XPSHZlhy qz2lI6uoMAj7aB27/jae0BjRUbh/SzQ9Bqx6HWYlatzu+URtmx+r5zyB8Ktr0T2weG aDFV38SV3kETsMgGstGu80XCHyAksN8Srg1iRy9Q= X-AuditID: cbfec7f4-84fff700000010c6-1a-5b7180633cce Date: Mon, 13 Aug 2018 13:58:09 +0100 From: Peter Stephenson To: Guillaume Chazarain , CC: Subject: Re: "off by one fix in multiple prompts" breaks multiline prompt In-Reply-To: Organization: SCSC X-Mailer: Claws Mail 3.13.2 (GTK+ 2.24.30; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrBIsWRmVeSWpSXmKPExsWy7djP87rJDYXRBtNmcFq8mfOKyeLtlKNs FgebHzI5MHvsnHWX3WPVwQ9MAUxRXDYpqTmZZalF+nYJXBmr/9cXbOaq2LI4poHxD3sXIweH hICJxLTldV2MXBxCAisYJXqPH2bpYuQEcr4wSky77gSR+MwosWPrLBaYhhlToyFqljNK3P2s BVfz5tAnVgjnDKPEpV9/2SGcC4wSBxs+soO0sAioSlw7eIoVxGYTMJSYumk2I4gtIuAkMfvM YzCbWUBa4tuOS2C2sICnxKuzv8HqOQUCJZb0PmECuYJfQEjiQrMtSFhCwF7i6J6TTCA2r4Cg xMmZT1ggxshLbH87hxmipp9d4s7yfIiaMokTp5cyQcRdJF7Pu8wKYQtLvDq+hR3ClpE4PbmH BeR+CYF2Rok1k16zQzg9jBKbjt5hhKiylui7fZER5CBmAU2J9bv0IcKOEuf+LmSChBafxI23 ghD38ElM2jadGSLMK9HRJjSBUWUWkqtnIbl6FsLMBYzMqxjFU0uLc9NTi43yUsv1ihNzi0vz 0vWS83M3MQLTw+l/x7/sYNz1J+kQowAHoxIPb8fqgmgh1sSy4srcQ4wSHMxKIrwXGIBCvCmJ lVWpRfnxRaU5qcWHGKU5WJTEefm00qKFBNITS1KzU1MLUotgskwcnFINjBtsxGY9N1r6qChk vdOmVULtOY4G/9Kknp88P/WSeMmjOGvPY06mK6a/vthY+vDec5OZz5MfHff65mwZeDKUe/vr Rbpnm+Z/q7318d6MTWynf3c9fDzL7h/Tftt/u2sc1pSk6a7wj+Gty+17w/nuneBl5skTm+Yt 7g1TYhV+IRMp8m3pypbJe5iUWIozEg21mIuKEwGrxna4CwMAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrKIsWRmVeSWpSXmKPExsVy+t/xe7pJDYXRBgeWcVq8mfOKyeLtlKNs FgebHzI5MHvsnHWX3WPVwQ9MAUxRejZF+aUlqQoZ+cUltkrRhhZGeoaWFnpGJpZ6hsbmsVZG pkr6djYpqTmZZalF+nYJehmr/9cXbOaq2LI4poHxD3sXIweHhICJxIyp0V2MnBxCAksZJXZ0 K4HYEgIyEp+ufGSHsIUl/lzrYuti5AKq+cgosXr/BkYI5wyjxIa2s8wQzgVGie+bHrKCtLAI qEpcO3gKzGYTMJSYumk2I4gtIuAkMfvMYzCbWUBa4tuOS2C2sICnxKuzv8HqeQWcJd4eP8oE YnMKBEos6X3CBLGgh0Vi2/NTYGfzCwhJXGi2hTjPXuLonpNMEL2CEidnPmGBmK8jcWLVMWYI W15i+9s5zBMYRWYhKZuFpGwWkrIFjMyrGEVSS4tz03OLDfWKE3OLS/PS9ZLzczcxAqNo27Gf m3cwXtoYfIhRgINRiYf3wdqCaCHWxLLiytxDjBIczEoivBcYgEK8KYmVValF+fFFpTmpxYcY TYEBM5FZSjQ5HxjheSXxhqaG5haWhubG5sZmFkrivOcNKqOEBNITS1KzU1MLUotg+pg4OKUa GOdv7f8W47dsybPMz9fypnlMtTYIfWW2+mSdzOL6hc9vszVas+vHJt9ZVl3skc0Y73x0lrTN vJdXr8/l6fz21yWi/PEUkdOVx/ZOs3LVy3SQO7H9RbhWx/6dD3kF5JhbuesuHD5kGcIQYeKq 8qz17YRlzbtPOUa1u/c94IldmpGS4Tttm9FJPiWW4oxEQy3mouJEAFWB97a4AgAA Message-Id: <20180813125810eucas1p181a58cb55dc815863d6d81e1cd629d71~KcwV9B7ZD1627716277eucas1p1o@eucas1p1.samsung.com> X-CMS-MailID: 20180813125810eucas1p181a58cb55dc815863d6d81e1cd629d71 X-Msg-Generator: CA Content-Type: text/plain; charset="utf-8" X-RootMTR: 20180810072702epcas5p4ecaa5cffa5dc7668e2b2aa3a30824f36 X-EPHeader: CA CMS-TYPE: 201P X-CMS-RootMailID: 20180810072702epcas5p4ecaa5cffa5dc7668e2b2aa3a30824f36 References: <20180813084255eucas1p102bc21872ad72a2cd049d8d9db2f0e86~KZResIryo0309103091eucas1p10@eucas1p1.samsung.com> <20180813113640eucas1p19d52c9c05089626f375a00c5115aef32~KbpML4Mzp0510505105eucas1p1P@eucas1p1.samsung.com> On Mon, 13 Aug 2018 13:42:50 +0200 Guillaume Chazarain wrote: > On Mon, Aug 13, 2018 at 1:36 PM Peter Stephenson > wrote: > > > So you're saying the commit you say is causing the problem isn't > > fixing the problem it was supposed to fix? That implies something > > else changed, since dana tried it out at the time and said it > > worked. > > Sorry, I was unclear. > The commit is indeed fixing the problem it was supposed to fix. > I meant that on all terminals I tested, I saw consistent behaviour: > the commit fixes the original problem but introduces a new one (mine). > So it looks like it should be possible to fix both problems. Thaks for that. I suspect dana was saying we need something like this? Has this got anything to do with it? (Second guessing other people's fixes is really hard work...) pws diff --git a/Src/prompt.c b/Src/prompt.c index 959ed8e..758d5f2 100644 --- a/Src/prompt.c +++ b/Src/prompt.c @@ -1170,7 +1170,7 @@ countprompt(char *str, int *wp, int *hp, int overf) * This isn't easy to handle generally; just assume there's no * output. */ - if(w >= zterm_columns && overf >= 0) { + if(w > zterm_columns && overf >= 0) { if (!overf || w > zterm_columns) { w = 0; h++;