From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on inbox.vuxu.org X-Spam-Level: X-Spam-Status: No, score=-1.1 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FROM,HTML_MESSAGE,MAILING_LIST_MULTI, RCVD_IN_DNSWL_NONE autolearn=ham autolearn_force=no version=3.4.2 Received: from primenet.com.au (ns1.primenet.com.au [203.24.36.2]) by inbox.vuxu.org (OpenSMTPD) with ESMTP id b1ea0ffe for ; Tue, 9 Apr 2019 18:46:36 +0000 (UTC) Received: (qmail 13892 invoked by alias); 9 Apr 2019 18:46:24 -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: 44215 Received: (qmail 26500 invoked by uid 1010); 9 Apr 2019 18:46:24 -0000 X-Qmail-Scanner-Diagnostics: from mail-it1-f174.google.com by f.primenet.com.au (envelope-from , uid 7791) with qmail-scanner-2.11 (clamdscan: 0.101.1/25412. spamassassin: 3.4.2. Clear:RC:0(209.85.166.174):SA:0(-2.0/5.0):. Processed in 3.032176 secs); 09 Apr 2019 18:46:24 -0000 X-Envelope-From: roman.perepelitsa@gmail.com X-Qmail-Scanner-Mime-Attachments: | X-Qmail-Scanner-Zip-Files: | Received-SPF: pass (ns1.primenet.com.au: SPF record at _netblocks.google.com designates 209.85.166.174 as permitted sender) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=y8baP1ykuoeyUKpltSqmFUH5qm4vyzns3osPXcozHhY=; b=fCNJAV9/HZxllSlJdued2CgZLQni6u3NmR5hyTsQtVqBK2t3LS2//GKoA2uLn9vMS+ XyxpI5967sbA0nvXsaNsTtfdCtXaxwPwnHvU2fh4QKr61RLWA9JOPj6SdNvLSuiwym9Q JMsq31B8T0EczGfa0uiYlC5ZmDDr7IPRyaTDNfLq0ALF9cG5HuWsoPjbnY7jwzf6fwPT FbIJY+Gc53A7q3vO7E9l8D4VQuy1M/96snt4Y1viGG1afx5Tb2LRCkZYtvivveKX1tO4 Y6kPifCWh5OwZ6t3GeO4UGXVGPSK9hEIsqpusyg2KwLxsCHlqKPjbRsy0gqYuNdwBMhL PyXw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=y8baP1ykuoeyUKpltSqmFUH5qm4vyzns3osPXcozHhY=; b=tNlLC0PYVXtLfujNpabODhd9yfH6WMdzu/p+fduphZZrHOQeAx096Tg2Bd7SnaPLeO I5ECYwYjayy2uBSSd8efwz52xsYBkJOF375JVB41MCeqMcHvyYHnAb6IFidXxx2MAqfW ZL+yMXdQe7Nj9PYSQmQFurCIhaytuuaXSvBfOXsxoanhy8cDJRjG0CvLgOZHS98zrSl9 32bCYsW3muiJ8O4EY7n98/STRRqxaRk5EVYvsllFDRWHtTjUDi/bqInENXlS4/V4tIp8 Tsn1vNUBZdCcJ6V81906Zct8sYqxhrSQbJ6yWZkbUNL9UKi0+TIq/bfroG1P4Uph+vXw wYRQ== X-Gm-Message-State: APjAAAV4OqkSkM4Q2sJlAFJ7QW5MzdO0Qo6E1ClYDQGkXsatDhYIjOyz wu5b7ddj557q9G/ItMwzIFEHEGgO42XeDfLaFwyLo9eL X-Google-Smtp-Source: APXvYqzbaI74t7UD4KMlby/08mY8FUQqC+QmDP2ry3dHzwS0KpndSLkxwyVy7++uLYVkzwmKlkZk0yQxZZtqHVnBCog= X-Received: by 2002:a24:6955:: with SMTP id e82mr22757199itc.102.1554835548124; Tue, 09 Apr 2019 11:45:48 -0700 (PDT) MIME-Version: 1.0 References: <1553772029.5713.10.camel@samsung.com> In-Reply-To: <1553772029.5713.10.camel@samsung.com> From: Roman Perepelitsa Date: Tue, 9 Apr 2019 20:45:37 +0200 Message-ID: Subject: Re: Proposal (with code) to fix breaking of history widgets on reset-prompt To: Peter Stephenson Cc: zsh-workers@zsh.org Content-Type: multipart/mixed; boundary="00000000000087e64b05861d5ce3" --00000000000087e64b05861d5ce3 Content-Type: multipart/alternative; boundary="00000000000087e64905861d5ce1" --00000000000087e64905861d5ce1 Content-Type: text/plain; charset="UTF-8" On Thu, Mar 28, 2019 at 12:21 PM Peter Stephenson wrote: > Don't see any problem with doing that. I suppose we really need a > list of widgets that should have this behaviour. > > [...] > > If you can produce this as a single change (with appropriate use of > rebase -i or whatever) we can apply it. A patch to the list would be > fine, since other people get to see it, but I don't mind cherry-picking > / rebasing from your repo if it's a single squashed change somewhere. > Cool! I can do that. Here's a branch with a single commit that modifies reset-prompt so that it doesn't alter LASTWIDGET: https://github.com/zsh-users/zsh/compare/master...romkatv:gentle-reset-prompt2 . Please find a patch from it in the attachment. Roman. --00000000000087e64905861d5ce1 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
On Thu, Mar 28, 2019 at 12:21 PM Peter St= ephenson <p.stephenson@samsu= ng.com> wrote:
Don't see any problem with doing that.= =C2=A0 I suppose we really need a
list of widgets that should have this behaviour.

[...]

If you can produce this as a single change (with appropriate use of
rebase -i or whatever) we can apply it.=C2=A0=C2=A0A patch to the list woul= d be
fine, since other people get to see it, but I don't mind cherry-picking=
/ rebasing from your repo if it's a single squashed change somewhere.

Cool! I can do that.

Here's a branch with a single commit that modifies reset-prompt s= o that it


--00000000000087e64905861d5ce1-- --00000000000087e64b05861d5ce3 Content-Type: text/x-patch; charset="US-ASCII"; name="gentle-reset-prompt.patch" Content-Disposition: attachment; filename="gentle-reset-prompt.patch" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_jua4wi550 ZGlmZiAtLWdpdCBhL0RvYy9ac2gvemxlLnlvIGIvRG9jL1pzaC96bGUueW8KaW5kZXggYzJiOWY1 NDMwLi4wOTg2ZTUzOTAgMTAwNjQ0Ci0tLSBhL0RvYy9ac2gvemxlLnlvCisrKyBiL0RvYy9ac2gv emxlLnlvCkBAIC0yNDE1LDkgKzI0MTUsMTIgQEAgZGlyZWN0b3J5LCBvciBjaGFuZ2VzIHRvIHRo ZSB2YWx1ZSBvZiB2YXJpYWJsZXMgcmVmZXJyZWQgdG8gYnkgdGhlCiBwcm9tcHQpLgogCiBPdGhl cndpc2UsIHRoZSBwcm9tcHQgaXMgb25seSBleHBhbmRlZCBlYWNoIHRpbWUgemxlIHN0YXJ0cywg YW5kCi13aGVuIHRoZSBkaXNwbGF5IGFzIGJlZW4gaW50ZXJydXB0ZWQgYnkgb3V0cHV0IGZyb20g YW5vdGhlciBwYXJ0IG9mIHRoZQord2hlbiB0aGUgZGlzcGxheSBoYXMgYmVlbiBpbnRlcnJ1cHRl ZCBieSBvdXRwdXQgZnJvbSBhbm90aGVyIHBhcnQgb2YgdGhlCiBzaGVsbCAoc3VjaCBhcyBhIGpv YiBub3RpZmljYXRpb24pIHdoaWNoIGNhdXNlcyB0aGUgY29tbWFuZCBsaW5lIHRvIGJlCiByZXBy aW50ZWQuCisKK3R0KHJlc2V0LXByb21wdCkgZG9lc24ndCBhbHRlciB0aGUgc3BlY2lhbCBwYXJh bWV0ZXIgdHQoTEFTVFdJREdFVCkuCisKICkKIHRpbmRleChzZW5kLWJyZWFrKQogaXRlbSh0dChz ZW5kLWJyZWFrKSAodHQoXkcgRVNDLV5HKSkgKHVuYm91bmQpICh1bmJvdW5kKSkoCmRpZmYgLS1n aXQgYS9TcmMvWmxlL2l3aWRnZXRzLmxpc3QgYi9TcmMvWmxlL2l3aWRnZXRzLmxpc3QKaW5kZXgg NTgzMTBjZDc0Li5jOTVjN2E0OTEgMTAwNjQ0Ci0tLSBhL1NyYy9abGUvaXdpZGdldHMubGlzdAor KysgYi9TcmMvWmxlL2l3aWRnZXRzLmxpc3QKQEAgLTk5LDcgKzk5LDcgQEAKICJyZWN1cnNpdmUt ZWRpdCIsIHJlY3Vyc2l2ZWVkaXQsIFpMRV9NRU5VQ01QIHwgWkxFX0tFRVBTVUZGSVggfCBaTEVf TEFTVENPTAogInJlZGlzcGxheSIsIHJlZGlzcGxheSwgWkxFX01FTlVDTVAgfCBaTEVfS0VFUFNV RkZJWCB8IFpMRV9MQVNUQ09MCiAicmVkbyIsIHJlZG8sIFpMRV9LRUVQU1VGRklYCi0icmVzZXQt cHJvbXB0IiwgcmVzZXRwcm9tcHQsIFpMRV9NRU5VQ01QIHwgWkxFX0tFRVBTVUZGSVggfCBaTEVf TEFTVENPTAorInJlc2V0LXByb21wdCIsIHJlc2V0cHJvbXB0LCBaTEVfTUVOVUNNUCB8IFpMRV9L RUVQU1VGRklYIHwgWkxFX0xBU1RDT0wgfCBaTEVfTk9UQ09NTUFORCB8IFpMRV9OT0xBU1QKICJy ZXZlcnNlLW1lbnUtY29tcGxldGUiLCByZXZlcnNlbWVudWNvbXBsZXRlLCBaTEVfTUVOVUNNUCB8 IFpMRV9LRUVQU1VGRklYIHwgWkxFX0lTQ09NUAogInJ1bi1oZWxwIiwgcHJvY2Vzc2NtZCwgWkxF X01FTlVDTVAgfCBaTEVfS0VFUFNVRkZJWCB8IFpMRV9MQVNUQ09MCiAic2VsZWN0LWEtd29yZCIs IHNlbGVjdHdvcmQsIFpMRV9LRUVQU1VGRklYCmRpZmYgLS1naXQgYS9TcmMvWmxlL3psZS5oIGIv U3JjL1psZS96bGUuaAppbmRleCBmMDZjNTY0ODMuLjYwOTQ5M2Y4YyAxMDA2NDQKLS0tIGEvU3Jj L1psZS96bGUuaAorKysgYi9TcmMvWmxlL3psZS5oCkBAIC0yMTcsNiArMjE3LDcgQEAgc3RydWN0 IHdpZGdldCB7CiAjZGVmaW5lIFpMRV9JU0NPTVAgICAgICAoMTw8MTEpCS8qIHVzYWJsZSBmb3Ig bmV3IHN0eWxlIGNvbXBsZXRpb24gKi8KICNkZWZpbmUgV0lER0VUX0lOVVNFICAgICgxPDwxMikg Lyogd2lkZ2V0IGlzIGluIHVzZSAqLwogI2RlZmluZSBXSURHRVRfRlJFRSAgICAgKDE8PDEzKSAv KiByZXF1ZXN0IHRvIGZyZWUgd2hlbiBubyBsb25nZXIgaW4gdXNlICovCisjZGVmaW5lIFpMRV9O T0xBU1QJKDE8PDE0KQkvKiB3aWRnZXQgc2hvdWxkIG5vdCBhbHRlciBsYmluZGsgKi8KIAogLyog dGhpbmdpZXMgKi8KIApkaWZmIC0tZ2l0IGEvU3JjL1psZS96bGVfbWFpbi5jIGIvU3JjL1psZS96 bGVfbWFpbi5jCmluZGV4IDcxOTMwZjc2Yi4uZDU0ZTkyOGE2IDEwMDY0NAotLS0gYS9TcmMvWmxl L3psZV9tYWluLmMKKysrIGIvU3JjL1psZS96bGVfbWFpbi5jCkBAIC0xMDczLDcgKzEwNzMsNyBA QCByZWRyYXdob29rKHZvaWQpCiAJICogdGVtcG9yYXJpbHkgcmVzZXQgc3RhdGUgZm9yIHNwZWNp YWwgdmFyaWFibGUgaGFuZGxpbmcgZXRjLgogCSAqLwogCWluY29tcGZ1bmMgPSAwOwotCWV4ZWN6 bGVmdW5jKGluaXR0aGluZ3ksIGFyZ3MsIDEpOworCWV4ZWN6bGVmdW5jKGluaXR0aGluZ3ksIGFy Z3MsIDEsIDApOwogCWluY29tcGZ1bmMgPSBvbGRfaW5jb21wZnVuYzsKIAogCS8qIFJlc3RvcmUg ZXJyZmxhZyBhbmQgcmV0ZmxhZyBhcyB6bGVjYWxsaG9vaygpIGRvZXMgKi8KQEAgLTExMzYsNyAr MTEzNiw3IEBAIHpsZWNvcmUodm9pZCkKIAkJZW9mc2VudCA9IDE7CiAJCWJyZWFrOwogCSAgICB9 Ci0JICAgIGlmIChleGVjemxlZnVuYyhiaW5kaywgemxlbm9hcmdzLCAwKSkgeworCSAgICBpZiAo ZXhlY3psZWZ1bmMoYmluZGssIHpsZW5vYXJncywgMCwgMCkpIHsKIAkJaGFuZGxlZmVlcCh6bGVu b2FyZ3MpOwogCQlpZiAoZW9mc2VudCkKIAkJICAgIGJyZWFrOwpAQCAtMTM4Niw3ICsxMzg2LDcg QEAgZXhlY2ltbW9ydGFsKFRoaW5neSBmdW5jLCBjaGFyICoqYXJncykKIHsKICAgICBUaGluZ3kg aW1tb3J0YWwgPSBydGhpbmd5X25vY3JlYXRlKGR5bmNhdCgiLiIsIGZ1bmMtPm5hbSkpOwogICAg IGlmIChpbW1vcnRhbCkKLQlyZXR1cm4gZXhlY3psZWZ1bmMoaW1tb3J0YWwsIGFyZ3MsIDApOwor CXJldHVybiBleGVjemxlZnVuYyhpbW1vcnRhbCwgYXJncywgMCwgMCk7CiAgICAgcmV0dXJuIDE7 CiB9CiAKQEAgLTEzOTgsMTMgKzEzOTgsMTQgQEAgZXhlY2ltbW9ydGFsKFRoaW5neSBmdW5jLCBj aGFyICoqYXJncykKIAogLyoqLwogaW50Ci1leGVjemxlZnVuYyhUaGluZ3kgZnVuYywgY2hhciAq KmFyZ3MsIGludCBzZXRfYmluZGspCitleGVjemxlZnVuYyhUaGluZ3kgZnVuYywgY2hhciAqKmFy Z3MsIGludCBzZXRfYmluZGssIGludCBzZXRfbGJpbmRrKQogewogICAgIGludCByID0gMCwgcmV0 ID0gMCwgcmVtZXRhZnkgPSAwOwogICAgIGludCBuZXN0ZWR2aWNoZyA9IHZpY2hnZmxhZzsKICAg ICBpbnQgaXNyZXBlYXQgPSAodmlpbnJlcGVhdCA9PSAzKTsKICAgICBXaWRnZXQgdzsKICAgICBU aGluZ3kgc2F2ZV9iaW5kayA9IGJpbmRrOworICAgIFRoaW5neSBzYXZlX2xiaW5kayA9IGxiaW5k azsKIAogICAgIGlmIChzZXRfYmluZGspCiAJYmluZGsgPSBmdW5jOwpAQCAtMTQxMiw2ICsxNDEz LDggQEAgZXhlY3psZWZ1bmMoVGhpbmd5IGZ1bmMsIGNoYXIgKiphcmdzLCBpbnQgc2V0X2JpbmRr KQogCXVubWV0YWZ5X2xpbmUoKTsKIAlyZW1ldGFmeSA9IDE7CiAgICAgfQorICAgIGlmIChzZXRf bGJpbmRrKQorCXJlZnRoaW5neShzYXZlX2xiaW5kayk7CiAgICAgaWYgKGlzcmVwZWF0KQogCXZp aW5yZXBlYXQgPSAyOwogCkBAIC0xNTM1LDcgKzE1MzgsMTAgQEAgZXhlY3psZWZ1bmMoVGhpbmd5 IGZ1bmMsIGNoYXIgKiphcmdzLCBpbnQgc2V0X2JpbmRrKQogCSAgICByZWR1cChvc2ksIDApOwog CX0KICAgICB9Ci0gICAgaWYgKHIpIHsKKyAgICBpZiAoc2V0X2xiaW5kaykgeworCXVucmVmdGhp bmd5KGxiaW5kayk7CisJbGJpbmRrID0gc2F2ZV9sYmluZGs7CisgICAgfSBlbHNlIGlmIChyKSB7 CiAJdW5yZWZ0aGluZ3kobGJpbmRrKTsKIAlyZWZ0aGluZ3koZnVuYyk7CiAJbGJpbmRrID0gZnVu YzsKZGlmZiAtLWdpdCBhL1NyYy9abGUvemxlX3RoaW5neS5jIGIvU3JjL1psZS96bGVfdGhpbmd5 LmMKaW5kZXggNmI4OTJiODIyLi5jZTYxZGIyN2IgMTAwNjQ0Ci0tLSBhL1NyYy9abGUvemxlX3Ro aW5neS5jCisrKyBiL1NyYy9abGUvemxlX3RoaW5neS5jCkBAIC03MDMsNyArNzAzLDcgQEAgYmlu X3psZV9jYWxsKGNoYXIgKm5hbWUsIGNoYXIgKiphcmdzLCBVTlVTRUQoT3B0aW9ucyBvcHMpLCBV TlVTRUQoY2hhciBmdW5jKSkKIHsKICAgICBUaGluZ3kgdDsKICAgICBzdHJ1Y3QgbW9kaWZpZXIg bW9kc2F2ZSA9IHptb2Q7Ci0gICAgaW50IHJldCwgc2F2ZWZsYWcgPSAwLCBzZXRiaW5kayA9IDAs IHJlbWV0YWZ5OworICAgIGludCByZXQsIHNhdmVmbGFnID0gMCwgc2V0YmluZGsgPSAwLCBzZXRs YmluZGssIHJlbWV0YWZ5OwogICAgIGNoYXIgKnduYW1lID0gKmFyZ3MrKywgKmtleW1hcF9yZXN0 b3JlID0gTlVMTCwgKmtleW1hcF90bXA7CiAKICAgICBpZiAoIXduYW1lKQpAQCAtNzg3LDcgKzc4 Nyw4IEBAIGJpbl96bGVfY2FsbChjaGFyICpuYW1lLCBjaGFyICoqYXJncywgVU5VU0VEKE9wdGlv bnMgb3BzKSwgVU5VU0VEKGNoYXIgZnVuYykpCiAgICAgICogYSB2aSByYW5nZSB0byBkZXRlY3Qg YSByZXBlYXRlZCBrZXkgKi8KICAgICBzZXRiaW5kayA9IHNldGJpbmRrIHx8CiAJKHQtPndpZGdl dCAmJiAodC0+d2lkZ2V0LT5mbGFncyAmIChXSURHRVRfSU5UIHwgWkxFX1ZJT1BFUikpID09IFdJ REdFVF9JTlQpOwotICAgIHJldCA9IGV4ZWN6bGVmdW5jKHQsIGFyZ3MsIHNldGJpbmRrKTsKKyAg ICBzZXRsYmluZGsgPSB0LT53aWRnZXQgJiYgKHQtPndpZGdldC0+ZmxhZ3MgJiBaTEVfTk9MQVNU KSA9PSBaTEVfTk9MQVNUOworICAgIHJldCA9IGV4ZWN6bGVmdW5jKHQsIGFyZ3MsIHNldGJpbmRr LCBzZXRsYmluZGspOwogICAgIHVucmVmdGhpbmd5KHQpOwogICAgIGlmIChzYXZlZmxhZykKIAl6 bW9kID0gbW9kc2F2ZTsKZGlmZiAtLWdpdCBhL1NyYy9abGUvemxlX3V0aWxzLmMgYi9TcmMvWmxl L3psZV91dGlscy5jCmluZGV4IGM2ZGYzZDg5Yy4uMDI3N2Q0OTE3IDEwMDY0NAotLS0gYS9TcmMv WmxlL3psZV91dGlscy5jCisrKyBiL1NyYy9abGUvemxlX3V0aWxzLmMKQEAgLTE3MzMsNyArMTcz Myw3IEBAIHpsZWNhbGxob29rKGNoYXIgKm5hbWUsIGNoYXIgKmFyZykKIAogICAgIGFyZ3NbMF0g PSBhcmc7CiAgICAgYXJnc1sxXSA9IE5VTEw7Ci0gICAgZXhlY3psZWZ1bmModGhpbmd5LCBhcmdz LCAxKTsKKyAgICBleGVjemxlZnVuYyh0aGluZ3ksIGFyZ3MsIDEsIDApOwogICAgIHVucmVmdGhp bmd5KHRoaW5neSk7CiAKICAgICAvKiBSZXRhaW4gYW55IHVzZXIgaW50ZXJydXB0IGVycm9yIHN0 YXR1cyAqLwpkaWZmIC0tZ2l0IGEvU3JjL1psZS96bGVfdmkuYyBiL1NyYy9abGUvemxlX3ZpLmMK aW5kZXggYTVmZjkyMDBjLi4wZjE5OGQwZTggMTAwNjQ0Ci0tLSBhL1NyYy9abGUvemxlX3ZpLmMK KysrIGIvU3JjL1psZS96bGVfdmkuYwpAQCAtMjE2LDcgKzIxNiw3IEBAIGdldHZpcmFuZ2UoaW50 IHdmKQogCSAgICAgKiBhIG51bWJlciBvZiBsaW5lcyBpcyB1c2VkLiAgSWYgdGhlIGZ1bmN0aW9u IHVzZWQKIAkgICAgICogcmV0dXJucyAxLCB3ZSBmYWlsLgogCSAgICAgKi8KLQkgICAgaWYgKChr MiA9PSBiaW5kaykgPyBkb3ZpbGluZXJhbmdlKCkgOiBleGVjemxlZnVuYyhrMiwgemxlbm9hcmdz LCAxKSkKKwkgICAgaWYgKChrMiA9PSBiaW5kaykgPyBkb3ZpbGluZXJhbmdlKCkgOiBleGVjemxl ZnVuYyhrMiwgemxlbm9hcmdzLCAxLCAwKSkKIAkJcmV0ID0gLTE7CiAJICAgIGlmICh2aWlucmVw ZWF0KQogCQl6bXVsdCA9IG11bHQxOwo= --00000000000087e64b05861d5ce3--