From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.ciao.gmane.io!not-for-mail From: Matthew Bauer Newsgroups: gmane.emacs.bugs Subject: bug#36034: [PATCH] Zsh extended_history shows up in comint input ring Date: Wed, 18 Mar 2020 11:05:09 -0400 Message-ID: References: <87woi6e58r.fsf@gmail.com> <87E1A7E1-B0B3-45F9-9282-82A19DDB2516@gmail.com> <3FE84EF1-D1F2-4F8B-B89C-C147C922F32D@gmail.com> <3761BF5D-AD36-4F7D-8518-CEFD3A3AC6E6@gmail.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="0000000000009a2a5205a122610e" Injection-Info: ciao.gmane.io; posting-host="ciao.gmane.io:159.69.161.202"; logging-data="106409"; mail-complaints-to="usenet@ciao.gmane.io" To: Lars Ingebrigtsen , Stefan Kangas , 36034@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Wed Mar 18 16:06:26 2020 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1jEaH4-000RYp-J2 for geb-bug-gnu-emacs@m.gmane-mx.org; Wed, 18 Mar 2020 16:06:26 +0100 Original-Received: from localhost ([::1]:52120 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jEaH3-0006Hx-Kc for geb-bug-gnu-emacs@m.gmane-mx.org; Wed, 18 Mar 2020 11:06:25 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:52104) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jEaGh-00060c-Sd for bug-gnu-emacs@gnu.org; Wed, 18 Mar 2020 11:06:05 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jEaGg-00038Q-6B for bug-gnu-emacs@gnu.org; Wed, 18 Mar 2020 11:06:03 -0400 Original-Received: from debbugs.gnu.org ([209.51.188.43]:35064) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jEaGf-00037c-Ta for bug-gnu-emacs@gnu.org; Wed, 18 Mar 2020 11:06:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jEaGf-0004MJ-NW for bug-gnu-emacs@gnu.org; Wed, 18 Mar 2020 11:06:01 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Matthew Bauer Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Wed, 18 Mar 2020 15:06:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 36034 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch Original-Received: via spool by 36034-submit@debbugs.gnu.org id=B36034.158454393116708 (code B ref 36034); Wed, 18 Mar 2020 15:06:01 +0000 Original-Received: (at 36034) by debbugs.gnu.org; 18 Mar 2020 15:05:31 +0000 Original-Received: from localhost ([127.0.0.1]:41035 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jEaGA-0004LP-OW for submit@debbugs.gnu.org; Wed, 18 Mar 2020 11:05:31 -0400 Original-Received: from mail-il1-f181.google.com ([209.85.166.181]:33118) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jEaG8-0004LB-GM for 36034@debbugs.gnu.org; Wed, 18 Mar 2020 11:05:29 -0400 Original-Received: by mail-il1-f181.google.com with SMTP id k29so23985490ilg.0 for <36034@debbugs.gnu.org>; Wed, 18 Mar 2020 08:05:28 -0700 (PDT) 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; bh=nhrHCCraXLdwYrHJR4YmIGWAT53SONBQqd/YHr+ExjQ=; b=hmop0uWtN+ojBiH0byyHXutcKBAM5w+Yhm2MkA3f0Kz83l8nmtWio1Sq2MK2EbM26M m7rm2Lwf+9UiA2k8hWs9zHBZJi8BlnIzCBJjJloYmUnFZroBNGfaGx6YrH0Uuf+R6bFK MBZ145Ymgb29bhCfwxu1qycJCAdQ+wWNlnMyHwiQKgxwQE3pM8leJEpkRNI522Ug8fmm ZyLXeo76Eb2VqNyVCFpItk+CSsIXlFSkWtRZfYVAxxmpiYb1t85LwvClzsPP7I0wehrw MwHnIvMk06nq9K89xV6hZuP4OL0tw2tKQGVoJTe4gmB/ngn0FZFCEUHRPfmzHu+Si4xX qo7g== 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; bh=nhrHCCraXLdwYrHJR4YmIGWAT53SONBQqd/YHr+ExjQ=; b=WPLRYZ+E9fSSKIUarq0XpPImufewQxNUxnSq6YJANmKjUnCC1TuSy2DraQ7sDagtGB yFjZ9+qvMWOz+GWkcZkZuOJmp31YrwmzHakp0vmVh6DcXoiGQCuTI/Bjh81zBb50apAx JGnMRQ4SyDJsiXM9CkkpnbWRpHz8M1lF+dZ0Q1nrPJW/Rss6AbsOeCQP0T5E6kf59dE2 v138jjuyhW80p7Ir72/l7bEbE/Qa9+s+eo/x7Jaiam47pLansIXrNke2Z5rMIRM6yohT hfVRYAyYvwQubs3tXc1EwMxq5dbaIWSiJxgbSoWzlWVXfjlC6UgX7Zhd0N6D2HQzYHgf R3UQ== X-Gm-Message-State: ANhLgQ1lr9WwL0qwm2RZTKyOfCxgezffU5ElEH0As7O2aQ+hsl58u9xD lHv/SX8GSl16D+UJLwnQBIjPF+NCN4LRYcAjxB4= X-Google-Smtp-Source: ADFU+vuiTlTdpxygdKqywQbCsDpJKV+bL93q+TSiblvf+o70pLVEFKCWhOx+r0uDNx+ffweFAsFTQFbP2pu7w4P+iz8= X-Received: by 2002:a92:3d8c:: with SMTP id k12mr4473194ilf.7.1584543921928; Wed, 18 Mar 2020 08:05:21 -0700 (PDT) In-Reply-To: X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Original-Sender: "bug-gnu-emacs" Xref: news.gmane.io gmane.emacs.bugs:177501 Archived-At: --0000000000009a2a5205a122610e Content-Type: multipart/alternative; boundary="0000000000009a2a4f05a122610c" --0000000000009a2a4f05a122610c Content-Type: text/plain; charset="UTF-8" Sorry for the late reply. Attached is the updated patch, using looking-at and on top of latest Emacs master. On Thu, Jul 4, 2019 at 9:37 AM Lars Ingebrigtsen wrote: > Matthew Bauer writes: > > > (setq start > > (if (re-search-backward > comint-input-ring-separator > > nil t) > > - (match-end 0) > > - (point-min))) > > + (progn > > + (when comint-input-ring-file-prefix > > + ;; Skip zsh extended_history stamps > > + (re-search-forward > comint-input-ring-file-prefix > > + nil t)) > > + (match-end 0)) > > Hm... I don't think this is right, either. If the re-search-forward > fails, then (match-end 0) will fail, too. And since (if I understood > correctly), the prefix will follow on directly from where point it, > using looking-at would be better, anyway... > > > ;; Bypass a bug in certain versions of bash. > > (when (string-equal shell "bash") > > (add-hook 'comint-preoutput-filter-functions > > - 'shell-filter-ctrl-a-ctrl-b nil t))) > > + 'shell-filter-ctrl-a-ctrl-b nil t)) > > + > > + ;; Skip extended history for zsh. > > + (when (string-equal shell "zsh") > > + (setq-local comint-input-ring-file-prefix ": > [[:digit:]]+:[[:digit:]]+;"))) > > (comint-read-input-ring t))) > > And this bit didn't apply. > > -- > (domestic pets only, the antidote for overdose, milk.) > bloggy blog: http://lars.ingebrigtsen.no > --0000000000009a2a4f05a122610c Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
Sorry for=C2=A0the late reply. Attached is the updated pat= ch, using looking-at and on top of latest=C2=A0Emacs master.

On Thu, Jul 4, = 2019 at 9:37 AM Lars Ingebrigtsen <lar= si@gnus.org> wrote:
Matthew Bauer <mjbauer95@gmail.com> writes:

>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0(s= etq start
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 =C2=A0(if (re-search-backward comint-input-ring-separator
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0nil t)
> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0 =C2=A0 =C2=A0(match-end 0)
> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0 =C2=A0(point-min)))
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0 =C2=A0 =C2=A0(progn
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0(when comint-input-ring-file-prefix
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0;; Skip zsh extended_history stam= ps
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0(re-search-forward comint-input-r= ing-file-prefix
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 nil t))
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0(match-end 0))

Hm...=C2=A0 I don't think this is right, either.=C2=A0 If the re-search= -forward
fails, then (match-end 0) will fail, too.=C2=A0 And since (if I understood<= br> correctly), the prefix will follow on directly from where point it,
using looking-at would be better, anyway...

>=C2=A0 =C2=A0 =C2=A0 =C2=A0 ;; Bypass a bug in certain versions of bash= .
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 (when (string-equal shell "bash")=
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 (add-hook 'comint-preoutput-filt= er-functions
> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 's= hell-filter-ctrl-a-ctrl-b nil t)))
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 's= hell-filter-ctrl-a-ctrl-b nil t))
> +
> +=C2=A0 =C2=A0 =C2=A0 ;; Skip extended history for zsh.
> +=C2=A0 =C2=A0 =C2=A0 (when (string-equal shell "zsh")
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 (setq-local comint-input-ring-file-prefix= ": [[:digit:]]+:[[:digit:]]+;")))
>=C2=A0 =C2=A0 =C2=A0 (comint-read-input-ring t)))

And this bit didn't apply.

--
(domestic pets only, the antidote for overdose, milk.)
=C2=A0 =C2=A0bloggy blog: http://lars.ingebrigtsen.no
--0000000000009a2a4f05a122610c-- --0000000000009a2a5205a122610e Content-Type: text/x-patch; charset="UTF-8"; name="0001-Add-zsh-extended_history-handling-for-comint.el-inpu.patch" Content-Disposition: attachment; filename="0001-Add-zsh-extended_history-handling-for-comint.el-inpu.patch" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_k7xgj2kl0 RnJvbSAwNDI3NTRkZmE4NzVhMWJkMTY5YjZmZjIyNDdlYzk0Yzc1ZTFmNzg5IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBNYXR0aGV3IEJhdWVyIDxtamJhdWVyOTVAZ21haWwuY29tPgpE YXRlOiBXZWQsIDE4IE1hciAyMDIwIDEwOjU5OjQ1IC0wNDAwClN1YmplY3Q6IFtQQVRDSF0gQWRk IHpzaCBleHRlbmRlZF9oaXN0b3J5IGhhbmRsaW5nIGZvciBjb21pbnQuZWwgaW5wdXQgcmluZwpN SU1FLVZlcnNpb246IDEuMApDb250ZW50LVR5cGU6IHRleHQvcGxhaW47IGNoYXJzZXQ9VVRGLTgK Q29udGVudC1UcmFuc2Zlci1FbmNvZGluZzogOGJpdAoKQWRkcyBoYW5kbGluZyBvZiB0aGUgWnNo IGV4dGVuZGVkX2hpc3RvcnkgdG8gY29taW50LmVsIGlucHV0CnJpbmcuIFRoaXMgbWVhbnMgdGhh dCB0aGUgdGltZXN0YW1wIGRvZXNu4oCZdCBzaG93IHVwIHdoZW4gcmVhZGluZwp0aHJvdWdoIGhp c3RvcnkgZnJvbSBvdGhlciBzaGVsbHMuIFRoZSBsaW5lcyBsb29rIGxpa2UgdGhpczoKCjogPGJl Z2lubmluZyB0aW1lPjo8ZWxhcHNlZCBzZWNvbmRzPjs8Y29tbWFuZD4KClRoaXMgcGF0Y2ggc2tp cHMgdGhlIHBhcnQgYmVmb3JlIDxjb21tYW5kPiB3aGVuIHRoZSDigJhzaGVsbOKAmSBpcwp6c2gu IFRoaXMgaXMgZG9uZSB0aHJvdWdoIHRoZSBjb21pbnQtaW5wdXQtcmluZy1maWxlLXByZWZpeAp2 YXJpYWJsZS4gV2hlbiBzZXQsIHRoaXMgd2lsbCBza2lwIGEgcHJlZml4IG9mIHRoZSBmaWxlIHdo ZW4gbG9hZGluZwppbnRvIHRoZSBpbnB1dCByaW5nLiBUaGlzIG1hdGNoZXMgdGhlIGJlaGF2aW9y IG9mIFpzaC4gWnNoIGRvY3VtZW50cwppdCBoZXJlOgoKaHR0cDovL3pzaC5zb3VyY2Vmb3JnZS5u ZXQvRG9jL1JlbGVhc2UvT3B0aW9ucy5odG1sI0hpc3RvcnkKLS0tCiBsaXNwL2NvbWludC5lbCB8 IDIwICsrKysrKysrKysrKysrKysrKy0tCiBsaXNwL3NoZWxsLmVsICB8ICA2ICsrKysrLQogMiBm aWxlcyBjaGFuZ2VkLCAyMyBpbnNlcnRpb25zKCspLCAzIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdp dCBhL2xpc3AvY29taW50LmVsIGIvbGlzcC9jb21pbnQuZWwKaW5kZXggZWEwNmY4YWY4Ny4uMDM4 OThjMzAyNyAxMDA2NDQKLS0tIGEvbGlzcC9jb21pbnQuZWwKKysrIGIvbGlzcC9jb21pbnQuZWwK QEAgLTI0OSw2ICsyNDksMTAgQEAgdG8gc2V0IHRoaXMgaW4gYSBtb2RlIGhvb2ssIHJhdGhlciB0 aGFuIGN1c3RvbWl6ZSB0aGUgZGVmYXVsdCB2YWx1ZS4iCiAJCSBmaWxlKQogICA6Z3JvdXAgJ2Nv bWludCkKIAorKGRlZnZhciBjb21pbnQtaW5wdXQtcmluZy1maWxlLXByZWZpeCBuaWwKKyAgIlRo ZSBwcmVmaXggdG8gc2tpcCB3aGVuIHBhcnNpbmcgdGhlIGlucHV0IHJpbmcgZmlsZS4KK1RoaXMg aXMgdXNlZnVsIGluIFpzaCB3aGVuIHRoZSBleHRlbmRlZF9oaXN0b3J5IG9wdGlvbiBpcyBvbi4i KQorCiAoZGVmY3VzdG9tIGNvbWludC1zY3JvbGwtdG8tYm90dG9tLW9uLWlucHV0IG5pbAogICAi Q29udHJvbHMgd2hldGhlciBpbnB1dCB0byBpbnRlcnByZXRlciBjYXVzZXMgd2luZG93IHRvIHNj cm9sbC4KIElmIG5pbCwgdGhlbiBkbyBub3Qgc2Nyb2xsLiAgSWYgdCBvciBgYWxsJywgc2Nyb2xs IGFsbCB3aW5kb3dzIHNob3dpbmcgYnVmZmVyLgpAQCAtOTg3LDggKzk5MSwyMCBAQCBTZWUgYWxz byBgY29taW50LWlucHV0LWlnbm9yZWR1cHMnIGFuZCBgY29taW50LXdyaXRlLWlucHV0LXJpbmcn LiIKICAgICAgICAgICAgICAgICAgICAgICAgICAgIChzZXRxIGVuZCAobWF0Y2gtYmVnaW5uaW5n IDApKSkKICAgICAgICAgICAgICAgICAgKHNldHEgc3RhcnQKICAgICAgICAgICAgICAgICAgICAg ICAgKGlmIChyZS1zZWFyY2gtYmFja3dhcmQgcmluZy1zZXBhcmF0b3IgbmlsIHQpCi0gICAgICAg ICAgICAgICAgICAgICAgICAgICAobWF0Y2gtZW5kIDApCi0gICAgICAgICAgICAgICAgICAgICAg ICAgKHBvaW50LW1pbikpKQorICAgICAgICAgICAgICAgICAgICAgICAgICAgKHByb2duCisgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICh3aGVuIChhbmQgY29taW50LWlucHV0LXJpbmctZmls ZS1wcmVmaXgKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAobG9va2lu Zy1hdCBjb21pbnQtaW5wdXQtcmluZy1maWxlLXByZWZpeCkpCisgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgOzsgU2tpcCB6c2ggZXh0ZW5kZWRfaGlzdG9yeSBzdGFtcHMKKyAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAocmUtc2VhcmNoLWZvcndhcmQgY29taW50LWlucHV0LXJp bmctZmlsZS1wcmVmaXgKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgbmlsIHQpKQorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAobWF0Y2gtZW5k IDApKQorICAgICAgICAgICAgICAgICAgICAgICAgIChwcm9nbgorICAgICAgICAgICAgICAgICAg ICAgICAgICAgKGdvdG8tY2hhciAocG9pbnQtbWluKSkKKyAgICAgICAgICAgICAgICAgICAgICAg ICAgICh3aGVuIChhbmQgY29taW50LWlucHV0LXJpbmctZmlsZS1wcmVmaXgKKyAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgKGxvb2tpbmctYXQgY29taW50LWlucHV0LXJpbmct ZmlsZS1wcmVmaXgpKQorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAocmUtc2VhcmNoLWZv cndhcmQgY29taW50LWlucHV0LXJpbmctZmlsZS1wcmVmaXgKKyAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIG5pbCB0KSkKKyAgICAgICAgICAgICAgICAgICAg ICAgICAgIChwb2ludCkpKSkKICAgICAgICAgICAgICAgICAgKHNldHEgaGlzdG9yeSAoYnVmZmVy LXN1YnN0cmluZyBzdGFydCBlbmQpKQogICAgICAgICAgICAgICAgICAoZ290by1jaGFyIHN0YXJ0 KQogICAgICAgICAgICAgICAgICAod2hlbiAoYW5kIChub3QgKHN0cmluZy1tYXRjaCBoaXN0b3J5 LWlnbm9yZSBoaXN0b3J5KSkKZGlmZiAtLWdpdCBhL2xpc3Avc2hlbGwuZWwgYi9saXNwL3NoZWxs LmVsCmluZGV4IDFlMjY3OWY3MjMuLjNhNjM5NDk4MjEgMTAwNjQ0Ci0tLSBhL2xpc3Avc2hlbGwu ZWwKKysrIGIvbGlzcC9zaGVsbC5lbApAQCAtNjIyLDcgKzYyMiwxMSBAQCBidWZmZXIuIgogICAg ICAgOzsgQnlwYXNzIGEgYnVnIGluIGNlcnRhaW4gdmVyc2lvbnMgb2YgYmFzaC4KICAgICAgICh3 aGVuIChzdHJpbmctZXF1YWwgc2hlbGwgImJhc2giKQogICAgICAgICAoYWRkLWhvb2sgJ2NvbWlu dC1wcmVvdXRwdXQtZmlsdGVyLWZ1bmN0aW9ucwotICAgICAgICAgICAgICAgICAgIydzaGVsbC1m aWx0ZXItY3RybC1hLWN0cmwtYiBuaWwgdCkpKQorICAgICAgICAgICAgICAgICAgIydzaGVsbC1m aWx0ZXItY3RybC1hLWN0cmwtYiBuaWwgdCkpCisKKyAgICAgIDs7IFNraXAgZXh0ZW5kZWQgaGlz dG9yeSBmb3IgenNoLgorICAgICAgKHdoZW4gKHN0cmluZy1lcXVhbCBzaGVsbCAienNoIikKKyAg ICAgICAgKHNldHEtbG9jYWwgY29taW50LWlucHV0LXJpbmctZmlsZS1wcmVmaXggIjogW1s6ZGln aXQ6XV0rOltbOmRpZ2l0Ol1dKzsiKSkpCiAgICAgKGNvbWludC1yZWFkLWlucHV0LXJpbmcgdCkp KQogCiAoZGVmdW4gc2hlbGwtYXBwbHktYW5zaS1jb2xvciAoYmVnIGVuZCBmYWNlKQotLSAKMi4y My4xCgo= --0000000000009a2a5205a122610e--