From debbugs-submit-bounces@debbugs.gnu.org Sat Nov 26 19:37:09 2022 Received: (at submit) by debbugs.gnu.org; 27 Nov 2022 00:37:09 +0000 Received: from localhost ([127.0.0.1]:41718 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oz5fQ-0000oc-6V for submit@debbugs.gnu.org; Sat, 26 Nov 2022 19:37:09 -0500 Received: from lists.gnu.org ([209.51.188.17]:57724) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oz5fO-0000oW-0E for submit@debbugs.gnu.org; Sat, 26 Nov 2022 19:37:07 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oz5fN-0002Jy-Qy for bug-gnu-emacs@gnu.org; Sat, 26 Nov 2022 19:37:05 -0500 Received: from mail-pj1-x1034.google.com ([2607:f8b0:4864:20::1034]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oz5fL-0006qr-Av for bug-gnu-emacs@gnu.org; Sat, 26 Nov 2022 19:37:05 -0500 Received: by mail-pj1-x1034.google.com with SMTP id x13-20020a17090a46cd00b00218f611b6e9so7195969pjg.1 for ; Sat, 26 Nov 2022 16:37:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=to:subject:from:content-language:mime-version:date:message-id:from :to:cc:subject:date:message-id:reply-to; bh=n7UGkeWBN39QbNGsZ1X8Ml8TPkPHDms7GbCa2qKjdEI=; b=Fbues1dv26AdXAmdwXJr1V/+C5j5NYT8ib/PDHImSRqBk4fdYq7KjrY3PqI2rCE910 b80XqkHgM6Wh2s9OvCoG/R+zKCb8XP/wZb+RI1skN4YFe3+HZe9Bcbm8zUzqBy09ibWe CHBgVkjUGA9n1rgZTIvMC7Go5CqZWmWkHUDkrcsgztdUECMESLDFFuyPYdNc2i0ani1l ku7go0AHBBzJHqfeVyoFjqSN0xMh024Kr1bXIbjV1/F2GROWoHjV75QiFX0NvT7wMTNS 8Q1Y6UmEJ0xsDB/AW8sR17Kj8ZytjrHc1xMZW6CIwT/lrIynkeyDwq08CZYFie0KbpMW UUmg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=to:subject:from:content-language:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=n7UGkeWBN39QbNGsZ1X8Ml8TPkPHDms7GbCa2qKjdEI=; b=Lw1jCrWI0PkTHx+Qx2iza2a28dgvT3lkIJ44kMC87eLqCiaaWuqW/I9GUzU+yQg2Qw wtYsF1Eih4Vj5w4aCbjftC+MPMw0AroZlInkccq2Upi9w/hbhYuxuOcab9bX+qjaK4cv g3WOdvrYUhlM+WsojyxR7mPpC/yi2oYlrBZ9SO6JcW3owTeVbwthEvapX3RyTHCfSH0B td9hcqYKGoiftXlFfpB5169tTi7PqFI1NNabrDq5i5AvpHn4lG52ISSgg5P4HnDsm9Lv ZME0YkR/CzwdGe3v5wTRXWxGfp8LElyWgJnKNxyPd/y6tn9IM/WN23zIvCFDx6UPoVEc qumA== X-Gm-Message-State: ANoB5pnQcY1arFcScrPwlzU2KzqCh4pNIxj52LI112afx+BcI7lkn+p1 hFumL8XxaGLtvBTRfGO76jFU7QJJfh4= X-Google-Smtp-Source: AA0mqf4tY7zK2/a3renkPZhW3Z0PNUdywrDq4XZG88OYAvXY9BSflOZLnf/ak/r+OJJSCG9xbb4lCA== X-Received: by 2002:a17:90a:e2c2:b0:218:825e:17f8 with SMTP id fr2-20020a17090ae2c200b00218825e17f8mr43508880pjb.129.1669509421469; Sat, 26 Nov 2022 16:37:01 -0800 (PST) Received: from [192.168.1.2] (cpe-76-168-148-233.socal.res.rr.com. [76.168.148.233]) by smtp.googlemail.com with ESMTPSA id d9-20020a170902b70900b001869f2120a5sm5933677pls.34.2022.11.26.16.37.00 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sat, 26 Nov 2022 16:37:00 -0800 (PST) Content-Type: multipart/mixed; boundary="------------k14fyLamPluour2GQkGtrBE6" Message-ID: <90faf628-390d-1094-2fcb-e6a23ac46da8@gmail.com> Date: Sat, 26 Nov 2022 16:36:59 -0800 MIME-Version: 1.0 X-Mozilla-News-Host: news://news.gmane.io:119 Content-Language: en-US From: Jim Porter Subject: 29.0.50; [PATCH] Regression in Eshell's handling of escaped newlines To: bug-gnu-emacs@gnu.org Received-SPF: pass client-ip=2607:f8b0:4864:20::1034; envelope-from=jporterbugs@gmail.com; helo=mail-pj1-x1034.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.3 (-) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) This is a multi-part message in MIME format. --------------k14fyLamPluour2GQkGtrBE6 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Starting from "emacs -Q -f eshell": # Emacs 28 ~ $ echo foo\ bar foobar # Emacs 29 ~ $ echo foo\ bar foo bar That is, Emacs 28 used to treat escaped newlines in the way you'd expect from other shells: it expands to the empty string. Now in Emacs 29, it inserts a literal newline. There's also a similar bug when doing this inside double-quotes: # Emacs 28 ~ $ echo "foo\ bar" ("foo\\" "bar") # Emacs 29 ~ $ echo "foo\ bar" foo\ bar Here, both cases are wrong. In Emacs 29, it inserts the literal backslash+newline combo, but Emacs 28 is even worse: it returns a list of two elements! Wrapping arguments in quotes should always produce a string in Eshell. --------------k14fyLamPluour2GQkGtrBE6 Content-Type: text/plain; charset=UTF-8; name="0001-Treat-escaped-newlines-in-Eshell-as-the-empty-string.patch" Content-Disposition: attachment; filename*0="0001-Treat-escaped-newlines-in-Eshell-as-the-empty-string.pa"; filename*1="tch" Content-Transfer-Encoding: base64 RnJvbSAzMDE4YzFjMGMyZDAzYzE3NTRlYzVjZjEyYzgzNmFhMWM5M2NlNDY4IE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBKaW0gUG9ydGVyIDxqcG9ydGVyYnVnc0BnbWFpbC5j b20+CkRhdGU6IFNhdCwgMjYgTm92IDIwMjIgMTE6NTI6MTggLTA4MDAKU3ViamVjdDogW1BB VENIXSBUcmVhdCBlc2NhcGVkIG5ld2xpbmVzIGluIEVzaGVsbCBhcyB0aGUgZW1wdHkgc3Ry aW5nCgoqIGxpc3AvZXNoZWxsL2VzaC1hcmcuZWwgKGVzaGVsbC1wYXJzZS1hcmd1bWVudCk6 IEhhbmRsZQonZXNoZWxsLWVtcHR5LXRva2VuJyBhcyB0aGUgcmVzdWx0IG9mIGFuIGFyZ3Vt ZW50LXBhcnNpbmcgaG9vay4KKGVzaGVsbC1wYXJzZS1hcmd1bWVudC1ob29rKTogRG9jdW1l bnQgJ2VzaGVsbC1lbXB0eS10b2tlbicuCihlc2hlbGwtcGFyc2UtYmFja3NsYXNoKTogUmV0 dXJuICdlc2hlbGwtZW1wdHktdG9rZW4nIHdoZW4KZW5jb3VudGVyaW5nIGFuIGVzY2FwZWQg bmV3bGluZS4KCiogdGVzdC9saXNwL2VzaGVsbC9lc2hlbGwtdGVzdHMuZWwgKGVzaGVsbC10 ZXN0L2VzY2FwZS1ub25zcGVjaWFsKQooZXNoZWxsLXRlc3QvZXNjYXBlLW5vbnNwZWNpYWwt dW5pY29kZSkKKGVzaGVsbC10ZXN0L2VzY2FwZS1ub25zcGVjaWFsLXF1b3RlZCkKKGVzaGVs bC10ZXN0L2VzY2FwZS1zcGVjaWFsLXF1b3RlZCk6IE1vdmUgZnJvbSBoZXJlLi4uCgoqIHRl c3QvbGlzcC9lc2hlbGwvZXNoLWFyZy10ZXN0cy5lbCAoZXNoLWFyZy10ZXN0L2VzY2FwZS9u b25zcGVjaWFsKQooZXNoLWFyZy10ZXN0L2VzY2FwZS9ub25zcGVjaWFsLXVuaWNvZGUpCihl c2gtYXJnLXRlc3QvZXNjYXBlLXF1b3RlZC9ub25zcGVjaWFsKQooZXNoLWFyZy10ZXN0L2Vz Y2FwZS1xdW90ZWQvc3BlY2lhbCk6IC4uLiB0byBoZXJlLgooZXNoLWFyZy10ZXN0L2VzY2Fw ZS9zcGVjaWFsLCBlc2gtYXJnLXRlc3QvZXNjYXBlL25ld2xpbmUpCihlc2gtYXJnLXRlc3Qv ZXNjYXBlLXF1b3RlZC9uZXdsaW5lKTogTmV3IHRlc3RzLgoKKiBkb2MvbWlzYy9lc2hlbGwu dGV4aSAoQXJndW1lbnRzKTogRXhwbGFpbiBlc2NhcGluZyBsb2dpYyBpbiBtb3JlCmRldGFp bC4KLS0tCiBkb2MvbWlzYy9lc2hlbGwudGV4aSAgICAgICAgICAgICAgfCAgMjMgKysrKysr KwogbGlzcC9lc2hlbGwvZXNoLWFyZy5lbCAgICAgICAgICAgIHwgIDQ2ICsrKysrKysrLS0t LS0KIHRlc3QvbGlzcC9lc2hlbGwvZXNoLWFyZy10ZXN0cy5lbCB8IDEwNSArKysrKysrKysr KysrKysrKysrKysrKysrKysrKysKIHRlc3QvbGlzcC9lc2hlbGwvZXNoZWxsLXRlc3RzLmVs ICB8ICAzMSAtLS0tLS0tLS0KIDQgZmlsZXMgY2hhbmdlZCwgMTU2IGluc2VydGlvbnMoKyks IDQ5IGRlbGV0aW9ucygtKQogY3JlYXRlIG1vZGUgMTAwNjQ0IHRlc3QvbGlzcC9lc2hlbGwv ZXNoLWFyZy10ZXN0cy5lbAoKZGlmZiAtLWdpdCBhL2RvYy9taXNjL2VzaGVsbC50ZXhpIGIv ZG9jL21pc2MvZXNoZWxsLnRleGkKaW5kZXggZTZkZGNmMTFkZi4uNjdkOGY4ZjgxZCAxMDA2 NDQKLS0tIGEvZG9jL21pc2MvZXNoZWxsLnRleGkKKysrIGIvZG9jL21pc2MvZXNoZWxsLnRl eGkKQEAgLTI2Myw2ICsyNjMsMjkgQEAgQXJndW1lbnRzCiBjaGFyYWN0ZXJzIGxpa2UgcGlw ZSAoQGNvZGV7fH0pLCB3aGljaCBjb3VsZCBiZSBwYXJ0IG9mIHJlbW90ZSBmaWxlCiBuYW1l cy4KIAorV2hlbiB5b3UgZXNjYXBlIGEgY2hhcmFjdGVyIHdpdGggQGNvZGV7XH0gb3V0c2lk ZSBvZiBxdW90ZXMsIHRoZQorcmVzdWx0IGlzIHRoZSBsaXRlcmFsIGNoYXJhY3RlciBpbW1l ZGlhdGVseSBmb2xsb3dpbmcgaXQsIHNvCitAc2FtcHtcJDEwfSBtZWFucyB0aGUgbGl0ZXJh bCBzdHJpbmcgQGNvZGV7JDEwfS4gIEluc2lkZSBvZgorZG91YmxlIHF1b3RlcywgdGhlIHJl c3VsdCBpcyB0aGUgbGl0ZXJhbCBjaGFyYWN0ZXIgZm9sbG93aW5nIGl0IGlmCit0aGF0IGNo YXJhY3RlciBpcyBzcGVjaWFsLCBvciB0aGUgZnVsbCBAY29kZXtcQHZhcntjfX0gc2VxdWVu Y2UKK290aGVyd2lzZTsgaW5zaWRlIGRvdWJsZS1xdW90ZXMsIEBjb2Rle1x9LCBAY29kZXsi fSwgYW5kIEBjb2RleyR9IGFyZQorY29uc2lkZXJlZCBzcGVjaWFsLgorCitBZGRpdGlvbmFs bHksIHdoZW4gZXNjYXBpbmcgYSBuZXdsaW5lLCB0aGUgd2hvbGUgZXNjYXBlIHNlcXVlbmNl IGlzCityZW1vdmVkIGJ5IHRoZSBwYXJzZXIuICBUaGlzIGxldHMgeW91IGNvbnRpbnVlIGNv bW1hbmRzIGFjcm9zcworbXVsdGlwbGUgbGluZXM6CisKK0BleGFtcGxlCit+ICQgZWNobyAi Zm9vXAorYmFyIgorZm9vYmFyCitAZW5kIGV4YW1wbGUKKworSW5zaWRlIGFwb3N0cm9waGVz LCBlc2NhcGluZyB3b3JrcyBkaWZmZXJlbnRseS4gIEFsbCBjaGFyYWN0ZXJzCitiZXR3ZWVu IHRoZSBhcG9zdHJvcGhlcyBoYXZlIHRoZWlyIGxpdGVyYWwgbWVhbmluZyBleGNlcHQgQGNv ZGV7J30sCit3aGljaCBlbmRzIHRoZSBxdW90ZWQgc3RyaW5nLiAgVG8gaW5zZXJ0IGEgbGl0 ZXJhbCBhcG9zdHJvcGhlLCB5b3UgY2FuCit1c2UgQGNvZGV7Jyd9LgorCiBXaGVuIHVzaW5n IGV4cGFuc2lvbnMgKEBweHJlZntFeHBhbnNpb259KSBpbiBhbiBFc2hlbGwgY29tbWFuZCwg dGhlCiByZXN1bHQgbWF5IHBvdGVudGlhbGx5IGJlIG9mIGFueSBkYXRhIHR5cGUuICBUbyBl bnN1cmUgdGhhdCB0aGUgcmVzdWx0CiBpcyBhbHdheXMgYSBzdHJpbmcsIHRoZSBleHBhbnNp b24gY2FuIGJlIHN1cnJvdW5kZWQgYnkgZG91YmxlIHF1b3Rlcy4KZGlmZiAtLWdpdCBhL2xp c3AvZXNoZWxsL2VzaC1hcmcuZWwgYi9saXNwL2VzaGVsbC9lc2gtYXJnLmVsCmluZGV4IGY4 N2NjMmYyMGEuLjI5YzhiN2JhMGIgMTAwNjQ0Ci0tLSBhL2xpc3AvZXNoZWxsL2VzaC1hcmcu ZWwKKysrIGIvbGlzcC9lc2hlbGwvZXNoLWFyZy5lbApAQCAtMTQ2LDkgKzE0NiwxMCBAQCBl c2hlbGwtcGFyc2UtYXJndW1lbnQtaG9vawogV2hlbiBlYWNoIGZ1bmN0aW9uIG9uIHRoaXMg aG9vayBpcyBjYWxsZWQsIHBvaW50IHdpbGwgYmUgYXQgdGhlCiBjdXJyZW50IHBvc2l0aW9u IHdpdGhpbiB0aGUgYXJndW1lbnQgbGlzdC4gIFRoZSBmdW5jdGlvbiBzaG91bGQgZWl0aGVy CiByZXR1cm4gbmlsLCBtZWFuaW5nIHRoYXQgaXQgZGlkIG5vIGFyZ3VtZW50IHBhcnNpbmcs IG9yIGl0IHNob3VsZAotcmV0dXJuIHRoZSByZXN1bHQgb2YgdGhlIHBhcnNlIGFzIGEgc2V4 cC4gIEl0IGlzIGFsc28gcmVzcG9uc2libGUgZm9yCi1tb3ZpbmcgdGhlIHBvaW50IGZvcndh cmQgdG8gcmVmbGVjdCB0aGUgYW1vdW50IG9mIGlucHV0IHRleHQgdGhhdCB3YXMKLXBhcnNl ZC4KK3JldHVybiB0aGUgcmVzdWx0IG9mIHRoZSBwYXJzZSBhcyBhIHNleHAuICBJZiB0aGUg ZnVuY3Rpb24gZGlkIGRvCithcmd1bWVudCBwYXJzaW5nLCBidXQgdGhlIHJlc3VsdCB3YXMg bm90aGluZyBhdCBhbGwsIGl0IHNob3VsZCByZXR1cm4KK2Blc2hlbGwtZW1wdHktdG9rZW4n LiAgVGhlIGZ1bmN0aW9uIGlzIGFsc28gcmVzcG9uc2libGUgZm9yIG1vdmluZyB0aGUKK3Bv aW50IGZvcndhcmQgdG8gcmVmbGVjdCB0aGUgYW1vdW50IG9mIGlucHV0IHRleHQgdGhhdCB3 YXMgcGFyc2VkLgogCiBJZiB0aGUgaG9vayBkZXRlcm1pbmVzIHRoYXQgaXQgaGFzIHJlYWNo ZWQgdGhlIGVuZCBvZiBhbiBhcmd1bWVudCwgaXQKIHNob3VsZCBjYWxsIGBlc2hlbGwtZmlu aXNoLWFyZycgdG8gY29tcGxldGUgcHJvY2Vzc2luZyBvZiB0aGUgY3VycmVudApAQCAtMzI1 LDEzICszMjYsMTQgQEAgZXNoZWxsLXBhcnNlLWFyZ3VtZW50CiAJCSAgIChwcm9nMQogCQkg ICAgICAgKGNoYXItdG8tc3RyaW5nIChjaGFyLWFmdGVyKSkKIAkJICAgICAoZm9yd2FyZC1j aGFyKSkpKSkKLQkgIChpZiAobm90IGVzaGVsbC1jdXJyZW50LWFyZ3VtZW50KQotCSAgICAg IChzZXRxIGVzaGVsbC1jdXJyZW50LWFyZ3VtZW50IHJlc3VsdCkKLQkgICAgKHVubGVzcyBl c2hlbGwtYXJnLWxpc3RpZmllZAotCSAgICAgIChzZXRxIGVzaGVsbC1jdXJyZW50LWFyZ3Vt ZW50Ci0JCSAgICAobGlzdCBlc2hlbGwtY3VycmVudC1hcmd1bWVudCkKLQkJICAgIGVzaGVs bC1hcmctbGlzdGlmaWVkIHQpKQotCSAgICAobmNvbmMgZXNoZWxsLWN1cnJlbnQtYXJndW1l bnQgKGxpc3QgcmVzdWx0KSkpKSkpCisgICAgICAgICAgKHVubGVzcyAoZXEgcmVzdWx0ICdl c2hlbGwtZW1wdHktdG9rZW4pCisgICAgICAgICAgICAoaWYgKG5vdCBlc2hlbGwtY3VycmVu dC1hcmd1bWVudCkKKyAgICAgICAgICAgICAgICAoc2V0cSBlc2hlbGwtY3VycmVudC1hcmd1 bWVudCByZXN1bHQpCisgICAgICAgICAgICAgICh1bmxlc3MgZXNoZWxsLWFyZy1saXN0aWZp ZWQKKyAgICAgICAgICAgICAgICAoc2V0cSBlc2hlbGwtY3VycmVudC1hcmd1bWVudAorICAg ICAgICAgICAgICAgICAgICAgIChsaXN0IGVzaGVsbC1jdXJyZW50LWFyZ3VtZW50KQorICAg ICAgICAgICAgICAgICAgICAgIGVzaGVsbC1hcmctbGlzdGlmaWVkIHQpKQorICAgICAgICAg ICAgICAobmNvbmMgZXNoZWxsLWN1cnJlbnQtYXJndW1lbnQgKGxpc3QgcmVzdWx0KSkpKSkp KQogICAgICh3aGVuIChhbmQgb3V0ZXIgZXNoZWxsLWN1cnJlbnQtYXJndW1lbnQpCiAgICAg ICAoYWRkLXRleHQtcHJvcGVydGllcyBhcmctYmVnaW4gKDErIGFyZy1iZWdpbikKIAkJCSAg ICcoYXJnLWJlZ2luIHQgcmVhci1ub25zdGlja3kKQEAgLTM3MywxNyArMzc1LDI1IEBAIGVz aGVsbC1wYXJzZS1iYWNrc2xhc2gKIGFmdGVyIGFyZSBib3RoIHJldHVybmVkLiIKICAgKHdo ZW4gKGVxIChjaGFyLWFmdGVyKSA/XFwpCiAgICAgKHdoZW4gKGVzaGVsbC1sb29raW5nLWF0 LWJhY2tzbGFzaC1yZXR1cm4gKHBvaW50KSkKLQkodGhyb3cgJ2VzaGVsbC1pbmNvbXBsZXRl ID9cXCkpCisgICAgICAgICh0aHJvdyAnZXNoZWxsLWluY29tcGxldGUgP1xcKSkKICAgICAo Zm9yd2FyZC1jaGFyIDIpIDsgTW92ZSBvbmUgY2hhciBwYXN0IHRoZSBiYWNrc2xhc2guCiAg ICAgOzsgSWYgdGhlIGNoYXIgaXMgaW4gYSBxdW90ZSwgYmFja3NsYXNoIG9ubHkgaGFzIHNw ZWNpYWwgbWVhbmluZwogICAgIDs7IGlmIGl0IGlzIGVzY2FwaW5nIGEgc3BlY2lhbCBjaGFy LgotICAgIChpZiBlc2hlbGwtY3VycmVudC1xdW90ZWQKLSAgICAgICAgKGlmIChtZW1xIChj aGFyLWJlZm9yZSkgZXNoZWxsLXNwZWNpYWwtY2hhcnMtaW5zaWRlLXF1b3RpbmcpCi0gICAg ICAgICAgICAobGlzdCAnZXNoZWxsLWVzY2FwZS1hcmcgKGNoYXItdG8tc3RyaW5nIChjaGFy LWJlZm9yZSkpKQotICAgICAgICAgIChjb25jYXQgIlxcIiAoY2hhci10by1zdHJpbmcgKGNo YXItYmVmb3JlKSkpKQotICAgICAgKGlmIChtZW1xIChjaGFyLWJlZm9yZSkgZXNoZWxsLXNw ZWNpYWwtY2hhcnMtb3V0c2lkZS1xdW90aW5nKQotICAgICAgICAgIChsaXN0ICdlc2hlbGwt ZXNjYXBlLWFyZyAoY2hhci10by1zdHJpbmcgKGNoYXItYmVmb3JlKSkpCi0gICAgICAgIChj aGFyLXRvLXN0cmluZyAoY2hhci1iZWZvcmUpKSkpKSkKKyAgICAobGV0ICgoc3BlY2lhbC1j aGFycyAoaWYgZXNoZWxsLWN1cnJlbnQtcXVvdGVkCisgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIGVzaGVsbC1zcGVjaWFsLWNoYXJzLWluc2lkZS1xdW90aW5nCisgICAgICAgICAg ICAgICAgICAgICAgICAgICBlc2hlbGwtc3BlY2lhbC1jaGFycy1vdXRzaWRlLXF1b3Rpbmcp KSkKKyAgICAgIChjb25kCisgICAgICAgOzsgRXNjYXBlZCBuZXdsaW5lcyBhcmUgZXh0cmEt c3BlY2lhbDogdGhleSBleHBhbmQgdG8gYW4gZW1wdHkKKyAgICAgICA7OyB0b2tlbiB0byBh bGxvdyBmb3IgY29udGludWluZyBFc2hlbGwgY29tbWFuZHMgYWNyb3NzCisgICAgICAgOzsg bXVsdGlwbGUgbGluZXMuCisgICAgICAgKChlcSAoY2hhci1iZWZvcmUpID9cbikKKyAgICAg ICAgJ2VzaGVsbC1lbXB0eS10b2tlbikKKyAgICAgICAoKG1lbXEgKGNoYXItYmVmb3JlKSBz cGVjaWFsLWNoYXJzKQorICAgICAgICAobGlzdCAnZXNoZWxsLWVzY2FwZS1hcmcgKGNoYXIt dG8tc3RyaW5nIChjaGFyLWJlZm9yZSkpKSkKKyAgICAgICAoZXNoZWxsLWN1cnJlbnQtcXVv dGVkCisgICAgICAgIChjb25jYXQgIlxcIiAoY2hhci10by1zdHJpbmcgKGNoYXItYmVmb3Jl KSkpKQorICAgICAgICh0CisgICAgICAgIChjaGFyLXRvLXN0cmluZyAoY2hhci1iZWZvcmUp KSkpKSkpCiAKIChkZWZ1biBlc2hlbGwtcGFyc2UtbGl0ZXJhbC1xdW90ZSAoKQogICAiUGFy c2UgYSBsaXRlcmFsbHkgcXVvdGVkIHN0cmluZy4gIE5vdGhpbmcgaGFzIHNwZWNpYWwgbWVh bmluZyEiCmRpZmYgLS1naXQgYS90ZXN0L2xpc3AvZXNoZWxsL2VzaC1hcmctdGVzdHMuZWwg Yi90ZXN0L2xpc3AvZXNoZWxsL2VzaC1hcmctdGVzdHMuZWwKbmV3IGZpbGUgbW9kZSAxMDA2 NDQKaW5kZXggMDAwMDAwMDAwMC4uNzdmOTQwNGQ0YwotLS0gL2Rldi9udWxsCisrKyBiL3Rl c3QvbGlzcC9lc2hlbGwvZXNoLWFyZy10ZXN0cy5lbApAQCAtMCwwICsxLDEwNSBAQAorOzs7 IGVzaC1hcmctdGVzdHMuZWwgLS0tIGVzaC1hcmcgdGVzdCBzdWl0ZSAgLSotIGxleGljYWwt YmluZGluZzp0IC0qLQorCis7OyBDb3B5cmlnaHQgKEMpIDIwMjIgRnJlZSBTb2Z0d2FyZSBG b3VuZGF0aW9uLCBJbmMuCisKKzs7IFRoaXMgZmlsZSBpcyBwYXJ0IG9mIEdOVSBFbWFjcy4K KworOzsgR05VIEVtYWNzIGlzIGZyZWUgc29mdHdhcmU6IHlvdSBjYW4gcmVkaXN0cmlidXRl IGl0IGFuZC9vciBtb2RpZnkKKzs7IGl0IHVuZGVyIHRoZSB0ZXJtcyBvZiB0aGUgR05VIEdl bmVyYWwgUHVibGljIExpY2Vuc2UgYXMgcHVibGlzaGVkIGJ5Cis7OyB0aGUgRnJlZSBTb2Z0 d2FyZSBGb3VuZGF0aW9uLCBlaXRoZXIgdmVyc2lvbiAzIG9mIHRoZSBMaWNlbnNlLCBvcgor OzsgKGF0IHlvdXIgb3B0aW9uKSBhbnkgbGF0ZXIgdmVyc2lvbi4KKworOzsgR05VIEVtYWNz IGlzIGRpc3RyaWJ1dGVkIGluIHRoZSBob3BlIHRoYXQgaXQgd2lsbCBiZSB1c2VmdWwsCis7 OyBidXQgV0lUSE9VVCBBTlkgV0FSUkFOVFk7IHdpdGhvdXQgZXZlbiB0aGUgaW1wbGllZCB3 YXJyYW50eSBvZgorOzsgTUVSQ0hBTlRBQklMSVRZIG9yIEZJVE5FU1MgRk9SIEEgUEFSVElD VUxBUiBQVVJQT1NFLiAgU2VlIHRoZQorOzsgR05VIEdlbmVyYWwgUHVibGljIExpY2Vuc2Ug Zm9yIG1vcmUgZGV0YWlscy4KKworOzsgWW91IHNob3VsZCBoYXZlIHJlY2VpdmVkIGEgY29w eSBvZiB0aGUgR05VIEdlbmVyYWwgUHVibGljIExpY2Vuc2UKKzs7IGFsb25nIHdpdGggR05V IEVtYWNzLiAgSWYgbm90LCBzZWUgPGh0dHBzOi8vd3d3LmdudS5vcmcvbGljZW5zZXMvPi4K KworOzs7IENvbW1lbnRhcnk6CisKKzs7IFRlc3RzIGZvciBFc2hlbGwncyBhcmd1bWVudCBo YW5kbGluZy4KKworOzs7IENvZGU6CisKKyhyZXF1aXJlICdlcnQpCisocmVxdWlyZSAnZXNo LW1vZGUpCisocmVxdWlyZSAnZXNoZWxsKQorCisocmVxdWlyZSAnZXNoZWxsLXRlc3RzLWhl bHBlcnMKKyAgICAgICAgIChleHBhbmQtZmlsZS1uYW1lICJlc2hlbGwtdGVzdHMtaGVscGVy cyIKKyAgICAgICAgICAgICAgICAgICAgICAgICAgIChmaWxlLW5hbWUtZGlyZWN0b3J5IChv ciBsb2FkLWZpbGUtbmFtZQorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIGRlZmF1bHQtZGlyZWN0b3J5KSkpKQorCisoZGVmdmFyIGVzaGVs bC10ZXN0LXZhbHVlIG5pbCkKKworOzs7IFRlc3RzOgorCisoZXJ0LWRlZnRlc3QgZXNoLWFy Zy10ZXN0L2VzY2FwZS9ub25zcGVjaWFsICgpCisgICJUZXN0IHRoYXQgXCJcXGNcIiBhbmQg XCJjXCIgYXJlIGVxdWl2YWxlbnQgd2hlbiBcImNcIiBpcyBub3QgYQorc3BlY2lhbCBjaGFy YWN0ZXIuIgorICAod2l0aC10ZW1wLWVzaGVsbAorICAgKGVzaGVsbC1tYXRjaC1jb21tYW5k LW91dHB1dCAiZWNobyBoZVxcbGxvIgorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAiaGVsbG9cbiIpKSkKKworKGVydC1kZWZ0ZXN0IGVzaC1hcmctdGVzdC9lc2NhcGUvbm9u c3BlY2lhbC11bmljb2RlICgpCisgICJUZXN0IHRoYXQgXCJcXGNcIiBhbmQgXCJjXCIgYXJl IGVxdWl2YWxlbnQgd2hlbiBcImNcIiBpcyBhCit1bmljb2RlIGNoYXJhY3RlciAodW5pY29k ZSBjaGFyYWN0ZXJzIGFyZSBub25zcGVjaWFsIGJ5CitkZWZpbml0aW9uKS4iCisgICh3aXRo LXRlbXAtZXNoZWxsCisgICAoZXNoZWxsLW1hdGNoLWNvbW1hbmQtb3V0cHV0ICJlY2hvIFZp ZFxcw6lvcyIKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIlZpZMOpb3NcbiIp KSkKKworKGVydC1kZWZ0ZXN0IGVzaC1hcmctdGVzdC9lc2NhcGUvc3BlY2lhbCAoKQorICAi VGVzdCB0aGF0IHRoZSBiYWNrc2xhc2ggaXMgbm90IHByZXNlcnZlZCBmb3IgZXNjYXBlZCBz cGVjaWFsCitjaGFycy4iCisgICh3aXRoLXRlbXAtZXNoZWxsCisgICAoZXNoZWxsLW1hdGNo LWNvbW1hbmQtb3V0cHV0ICJlY2hvIGhlXFxcXGxsbyIKKyAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgOzsgQmFja3NsYXNoZXMgYXJlIGRvdWJsZWQgZm9yIHJlZ2V4cC4KKyAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgImhlXFxcXGxsb1xuIikpKQorCisoZXJ0 LWRlZnRlc3QgZXNoLWFyZy10ZXN0L2VzY2FwZS9uZXdsaW5lICgpCisgICJUZXN0IHRoYXQg YW4gZXNjYXBlZCBuZXdsaW5lIGlzIGVxdWl2YWxlbnQgdG8gdGhlIGVtcHR5IHN0cmluZy4K K1doZW4gbmV3bGluZXMgYXJlICpub25zcGVjaWFsKiwgYW4gZXNjYXBlZCBuZXdsaW5lIHNo b3VsZCBiZQordHJlYXRlZCBhcyBqdXN0IGEgbmV3bGluZS4iCisgICh3aXRoLXRlbXAtZXNo ZWxsCisgICAoZXNoZWxsLW1hdGNoLWNvbW1hbmQtb3V0cHV0ICJlY2hvIGhpXFxcbnRoZXJl IgorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAiaGl0aGVyZVxuIikpKQorCiso ZXJ0LWRlZnRlc3QgZXNoLWFyZy10ZXN0L2VzY2FwZS9uZXdsaW5lLWNvbmRpdGlvbmFsICgp CisgICJUZXN0IGludm9jYXRpb24gb2YgYW4gaWYvZWxzZSBzdGF0ZW1lbnQgdXNpbmcgbGlu ZSBjb250aW51YXRpb25zLiIKKyAgKGxldCAoKGVzaGVsbC10ZXN0LXZhbHVlIHQpKQorICAg IChlc2hlbGwtY29tbWFuZC1yZXN1bHQtZXF1YWwKKyAgICAgImlmICRlc2hlbGwtdGVzdC12 YWx1ZSBcXFxue2VjaG8geWVzfSBcXFxue2VjaG8gbm99IgorICAgICAieWVzIikpCisgIChs ZXQgKChlc2hlbGwtdGVzdC12YWx1ZSBuaWwpKQorICAgIChlc2hlbGwtY29tbWFuZC1yZXN1 bHQtZXF1YWwKKyAgICAgImlmICRlc2hlbGwtdGVzdC12YWx1ZSBcXFxue2VjaG8geWVzfSBc XFxue2VjaG8gbm99IgorICAgICAibm8iKSkpCisKKyhlcnQtZGVmdGVzdCBlc2gtYXJnLXRl c3QvZXNjYXBlLXF1b3RlZC9ub25zcGVjaWFsICgpCisgICJUZXN0IHRoYXQgdGhlIGJhY2tz bGFzaCBpcyBwcmVzZXJ2ZWQgZm9yIGVzY2FwZWQgbm9uc3BlY2lhbAorY2hhcnMuIgorICAo d2l0aC10ZW1wLWVzaGVsbAorICAgKGVzaGVsbC1tYXRjaC1jb21tYW5kLW91dHB1dCAiZWNo byBcImhcXGlcIiIKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgOzsgQmFja3Ns YXNoZXMgYXJlIGRvdWJsZWQgZm9yIHJlZ2V4cC4KKyAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgImhcXFxcaVxuIikpKQorCisoZXJ0LWRlZnRlc3QgZXNoLWFyZy10ZXN0L2Vz Y2FwZS1xdW90ZWQvc3BlY2lhbCAoKQorICAiVGVzdCB0aGF0IHRoZSBiYWNrc2xhc2ggaXMg bm90IHByZXNlcnZlZCBmb3IgZXNjYXBlZCBzcGVjaWFsCitjaGFycy4iCisgICh3aXRoLXRl bXAtZXNoZWxsCisgICAoZXNoZWxsLW1hdGNoLWNvbW1hbmQtb3V0cHV0ICJlY2hvIFwiXFxc ImhpXFxcXFwiIgorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICA7OyBCYWNrc2xh c2hlcyBhcmUgZG91YmxlZCBmb3IgcmVnZXhwLgorICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAiXFxcImhpXFxcXFxuIikpKQorCisoZXJ0LWRlZnRlc3QgZXNoLWFyZy10ZXN0 L2VzY2FwZS1xdW90ZWQvbmV3bGluZSAoKQorICAiVGVzdCB0aGF0IGFuIGVzY2FwZWQgbmV3 bGluZSBpcyBlcXVpdmFsZW50IHRvIHRoZSBlbXB0eSBzdHJpbmcuCitXaGVuIG5ld2xpbmVz IGFyZSAqbm9uc3BlY2lhbCosIGFuIGVzY2FwZWQgbmV3bGluZSBzaG91bGQgYmUKK3RyZWF0 ZWQgbGl0ZXJhbGx5LCBhcyBhIGJhY2tzbGFzaCBhbmQgYSBuZXdsaW5lLiIKKyAgKHdpdGgt dGVtcC1lc2hlbGwKKyAgIChlc2hlbGwtbWF0Y2gtY29tbWFuZC1vdXRwdXQgImVjaG8gXCJo aVxcXG50aGVyZVwiIgorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAiaGl0aGVy ZVxuIikpKQorCis7OyBlc2gtYXJnLXRlc3RzLmVsIGVuZHMgaGVyZQpkaWZmIC0tZ2l0IGEv dGVzdC9saXNwL2VzaGVsbC9lc2hlbGwtdGVzdHMuZWwgYi90ZXN0L2xpc3AvZXNoZWxsL2Vz aGVsbC10ZXN0cy5lbAppbmRleCBkNTExMjE0NmMyLi5jNjdhYzY3ZmQzIDEwMDY0NAotLS0g YS90ZXN0L2xpc3AvZXNoZWxsL2VzaGVsbC10ZXN0cy5lbAorKysgYi90ZXN0L2xpc3AvZXNo ZWxsL2VzaGVsbC10ZXN0cy5lbApAQCAtMTA1LDM3ICsxMDUsNiBAQCBlc2hlbGwtdGVzdC9s aXNwLXJlc2V0LWluLXBpcGVsaW5lCiAgICAgIChmb3JtYXQgdGVtcGxhdGUgImZvcm1hdCBc IiVzXCIgZXNoZWxsLWluLXBpcGVsaW5lLXAiKQogICAgICAibmlsIikpKQogCi0oZXJ0LWRl ZnRlc3QgZXNoZWxsLXRlc3QvZXNjYXBlLW5vbnNwZWNpYWwgKCkKLSAgIlRlc3QgdGhhdCBc IlxcY1wiIGFuZCBcImNcIiBhcmUgZXF1aXZhbGVudCB3aGVuIFwiY1wiIGlzIG5vdCBhCi1z cGVjaWFsIGNoYXJhY3Rlci4iCi0gICh3aXRoLXRlbXAtZXNoZWxsCi0gICAoZXNoZWxsLW1h dGNoLWNvbW1hbmQtb3V0cHV0ICJlY2hvIGhlXFxsbG8iCi0gICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICJoZWxsb1xuIikpKQotCi0oZXJ0LWRlZnRlc3QgZXNoZWxsLXRlc3Qv ZXNjYXBlLW5vbnNwZWNpYWwtdW5pY29kZSAoKQotICAiVGVzdCB0aGF0IFwiXFxjXCIgYW5k IFwiY1wiIGFyZSBlcXVpdmFsZW50IHdoZW4gXCJjXCIgaXMgYQotdW5pY29kZSBjaGFyYWN0 ZXIgKHVuaWNvZGUgY2hhcmFjdGVycyBhcmUgbm9uc3BlY2lhbCBieQotZGVmaW5pdGlvbiku IgotICAod2l0aC10ZW1wLWVzaGVsbAotICAgKGVzaGVsbC1tYXRjaC1jb21tYW5kLW91dHB1 dCAiZWNobyBWaWRcXMOpb3MiCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICJW aWTDqW9zXG4iKSkpCi0KLShlcnQtZGVmdGVzdCBlc2hlbGwtdGVzdC9lc2NhcGUtbm9uc3Bl Y2lhbC1xdW90ZWQgKCkKLSAgIlRlc3QgdGhhdCB0aGUgYmFja3NsYXNoIGlzIHByZXNlcnZl ZCBmb3IgZXNjYXBlZCBub25zcGVjaWFsCi1jaGFycyIKLSAgKHdpdGgtdGVtcC1lc2hlbGwK LSAgIChlc2hlbGwtbWF0Y2gtY29tbWFuZC1vdXRwdXQgImVjaG8gXCJoXFxpXCIiCi0gICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIDs7IEJhY2tzbGFzaGVzIGFyZSBkb3VibGVk IGZvciByZWdleHAuCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICJoXFxcXGlc biIpKSkKLQotKGVydC1kZWZ0ZXN0IGVzaGVsbC10ZXN0L2VzY2FwZS1zcGVjaWFsLXF1b3Rl ZCAoKQotICAiVGVzdCB0aGF0IHRoZSBiYWNrc2xhc2ggaXMgbm90IHByZXNlcnZlZCBmb3Ig ZXNjYXBlZCBzcGVjaWFsCi1jaGFycyIKLSAgKHdpdGgtdGVtcC1lc2hlbGwKLSAgIChlc2hl bGwtbWF0Y2gtY29tbWFuZC1vdXRwdXQgImVjaG8gXCJcXFwiaGlcXFxcXCIiCi0gICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIDs7IEJhY2tzbGFzaGVzIGFyZSBkb3VibGVkIGZv ciByZWdleHAuCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICJcXFwiaGlcXFxc XG4iKSkpCi0KIChlcnQtZGVmdGVzdCBlc2hlbGwtdGVzdC9jb21tYW5kLXJ1bm5pbmctcCAo KQogICAiTW9kZWxpbmUgc2hvdWxkIHNob3cgbm8gY29tbWFuZCBydW5uaW5nIgogICAod2l0 aC10ZW1wLWVzaGVsbAotLSAKMi4yNS4xCgo= --------------k14fyLamPluour2GQkGtrBE6-- From debbugs-submit-bounces@debbugs.gnu.org Sat Nov 26 19:42:53 2022 Received: (at 59622) by debbugs.gnu.org; 27 Nov 2022 00:42:53 +0000 Received: from localhost ([127.0.0.1]:41731 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oz5kz-0000sH-5t for submit@debbugs.gnu.org; Sat, 26 Nov 2022 19:42:53 -0500 Received: from mail-pj1-f50.google.com ([209.85.216.50]:46683) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oz5kt-0000sA-9G for 59622@debbugs.gnu.org; Sat, 26 Nov 2022 19:42:51 -0500 Received: by mail-pj1-f50.google.com with SMTP id b13-20020a17090a5a0d00b0021906102d05so5720814pjd.5 for <59622@debbugs.gnu.org>; Sat, 26 Nov 2022 16:42:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:in-reply-to:references:to:from :content-language:subject:mime-version:date:message-id:from:to:cc :subject:date:message-id:reply-to; bh=GBCHLhJ8vgf0eu5gjf1c9Svgo/8+8GfP6MDqUBr7B3Q=; b=iiGXYj3SQ+Pf0bXlDsAIVVTy8mjygUl2tZid0PPDVz7Vt8VETjiSvOPVxTo831BCaV +8eucBBPuZYuXJzLYqQubfCvauSQsATpgNFW93CCCJSIZm4oXgwlxd5sIm9AAmepQDyu h7crfw7gj+Q7DTbJHPupGFkgmAkE+y8Pb74YGJYeUZfe/z7J1wWMicY0RqJ2jYD4vYoF 3Hd8svMzPq1zPdnkPSIueyh+M0CtqvFuLdcmlLh4KzR9r+GsKr2N23qdyLm1Jw2d1kGv gd8JLeDGssNXzcd3va7/Xt+Z8Y5I7L3VsGvLov9Xq1BJF7rKwK51MyX0Qzl43AZPPG0Q idrA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:in-reply-to:references:to:from :content-language:subject:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=GBCHLhJ8vgf0eu5gjf1c9Svgo/8+8GfP6MDqUBr7B3Q=; b=zTS2gVg+TyYFUU7lvWVLskb5dRgV5mCYV5WaQyLJFpEys+abfQx0C8iG5lhsPBjvGL 25APwPbwf4qo+a7B9BU09KYGXPVCuu8q/qgFwQex84DDstS3wWBxvzKG57vo6j9xKqOd Ki/c4syGbjwzAjNeBJwFCOFKgaGO9b81WouvZDNjS2qNu0OFkSUaZzc90d4VqfnNSfC5 ffcWJ9UY12rmYGlD7fKItwQtAOQv5gRAk1zLI8zWwxc5xNmsT1QI8+8TQ/67UJuDjI40 ZGeV7Cp6uSH8UyQWfDm8Y9SQpMaFhUUyjaeO0oxIGa/4ux1vFMrjBr7haY1WIG9U9YgE V8RA== X-Gm-Message-State: ANoB5pkemSaB68raiaPpIDXYlLnxfNQRy7NJLZbv1s4Bik3qBQwz+qPd aa4Hnt5+EAS078tTiyVOwGBNDNhzDz8= X-Google-Smtp-Source: AA0mqf4t7+GMyjcpVnvE7RoU1nFVmyxrJKN+fdERyO7uVwpH1lv25Iu/xggAB1IOBilxp+2FPFTnYQ== X-Received: by 2002:a17:902:748a:b0:186:9c32:79d9 with SMTP id h10-20020a170902748a00b001869c3279d9mr26748423pll.47.1669509761650; Sat, 26 Nov 2022 16:42:41 -0800 (PST) Received: from [192.168.1.2] (cpe-76-168-148-233.socal.res.rr.com. [76.168.148.233]) by smtp.googlemail.com with ESMTPSA id j3-20020a170902da8300b00186b549cdc2sm5938151plx.157.2022.11.26.16.42.40 for <59622@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sat, 26 Nov 2022 16:42:41 -0800 (PST) Message-ID: <2745278b-515f-6b8e-c70c-54440432f1d9@gmail.com> Date: Sat, 26 Nov 2022 16:42:40 -0800 MIME-Version: 1.0 Subject: Re: bug#59622: 29.0.50; [PATCH] Regression in Eshell's handling of escaped newlines Content-Language: en-US From: Jim Porter To: 59622@debbugs.gnu.org References: <90faf628-390d-1094-2fcb-e6a23ac46da8@gmail.com> In-Reply-To: <90faf628-390d-1094-2fcb-e6a23ac46da8@gmail.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 59622 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) On 11/26/2022 4:36 PM, Jim Porter wrote: >   ~ $ echo foo\ >   bar [snip] >   ~ $ echo "foo\ >   bar" Sorry, I forgot to mention: the new behavior with my patch in both cases above is to print "foobar" as a single word. From debbugs-submit-bounces@debbugs.gnu.org Sat Dec 03 20:41:59 2022 Received: (at 59622) by debbugs.gnu.org; 4 Dec 2022 01:41:59 +0000 Received: from localhost ([127.0.0.1]:54447 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p1e11-0004Sc-HW for submit@debbugs.gnu.org; Sat, 03 Dec 2022 20:41:59 -0500 Received: from mail-pg1-f182.google.com ([209.85.215.182]:37659) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p1e0z-0004SW-Uq for 59622@debbugs.gnu.org; Sat, 03 Dec 2022 20:41:58 -0500 Received: by mail-pg1-f182.google.com with SMTP id v3so7511694pgh.4 for <59622@debbugs.gnu.org>; Sat, 03 Dec 2022 17:41:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:in-reply-to:references:to:from :content-language:subject:mime-version:date:message-id:from:to:cc :subject:date:message-id:reply-to; bh=SzEx23/dOVdCVdOxELNIEOOdNlhBROa+CdGpWKCxbOY=; b=dNCjn8IUSR8XHKKxPQYWVp6YUv6TBprzFOFqrC1Wq9VNx6DjlROIgpvsxG27dlUx1s SNepFXOrxgN8ZLuM5IjErDipY7Up6FqJDBehjfRROrYp1vB4dzFzPQgld0MoiKQcC+Nh 0uVIge9e2G4ZG9ALsd8U78yIVdgxBbSiOB1Gl1refxqFdWnZEDaakLA31rIl70Mrqcrv DsCh3+gG8uizb0sfwV+we3ax+dkbXYvwuhJe9B+OI7YbnGKjG876+j7b0ISsKc/KEWCF oF1JHNxBsEe8Ogs82hCVc8iqnMqhNR3srx94cvGDvSNZ8b6Y9/E+Z22kCzh6aHeOuPvj xcjw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:in-reply-to:references:to:from :content-language:subject:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=SzEx23/dOVdCVdOxELNIEOOdNlhBROa+CdGpWKCxbOY=; b=g9zRvz/hXesq9MbEjeLv8LYOxJHxmVQwyDP7guvXwniDqMOm8RPfwRORmbiGLWSzPN e1Sx+H8cjPCTFSMW87UoinWfqo+Idrep19VAVbskrsYbYClCQlwIVU98jvHtXL5KRJbV TlA0IsagpP1fIeBm6YFibb7cSrV9YsPtyrIm1nZewKkLEmchF6nVYJehaJjSXSvigaa/ G1e9hydkcx7smDbgJwgDiCTVAG0L3JlFZ2BkqTGRulp9ekC69hXziNzyhqKcXZ3JVMJR EWsxXumoMZ6FmU2QYOK3mrHQkwNqDS2V+99Fu//J/VLBwwCRgEHktIyUTdibOL46fWMO nF+Q== X-Gm-Message-State: ANoB5png01pC6KlJR9Ega6Vk3VlwFnyCa15Ph3OP4m4b6O7sHDNZ79d6 tr1h83aUj9vWa32GKfvF/TvIUlsSOJw= X-Google-Smtp-Source: AA0mqf6fSTVUcIvk3Fj1hezzRDxziDunJfyN/6eg8xgCfxJePA/xGWG4Db5K0lKeu+jeIjrHKrGg7A== X-Received: by 2002:a63:5f83:0:b0:478:ab05:4da9 with SMTP id t125-20020a635f83000000b00478ab054da9mr1768414pgb.369.1670118111905; Sat, 03 Dec 2022 17:41:51 -0800 (PST) Received: from [192.168.1.2] (cpe-76-168-148-233.socal.res.rr.com. [76.168.148.233]) by smtp.googlemail.com with ESMTPSA id iw1-20020a170903044100b0017f5ad327casm7913434plb.103.2022.12.03.17.41.50 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sat, 03 Dec 2022 17:41:51 -0800 (PST) Message-ID: Date: Sat, 3 Dec 2022 17:41:50 -0800 MIME-Version: 1.0 Subject: Re: bug#59622: 29.0.50; [PATCH] Regression in Eshell's handling of escaped newlines Content-Language: en-US From: Jim Porter To: 59622@debbugs.gnu.org, eliz@gnu.org References: <90faf628-390d-1094-2fcb-e6a23ac46da8@gmail.com> In-Reply-To: <90faf628-390d-1094-2fcb-e6a23ac46da8@gmail.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 59622 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) On 11/26/2022 4:36 PM, Jim Porter wrote: > Starting from "emacs -Q -f eshell": > >   # Emacs 28 >   ~ $ echo foo\ >   bar > >   foobar > >   # Emacs 29 >   ~ $ echo foo\ >   bar > >   foo >   bar > > That is, Emacs 28 used to treat escaped newlines in the way you'd expect > from other shells: it expands to the empty string. Now in Emacs 29, it > inserts a literal newline. Eli, since this is a regression from Emacs 28 (likely fallout from one of my changes to fix some longstanding bugs with quotes in Eshell), would my current patch be ok on the release branch? I can try to minimize the changes a bit further (I slightly refactored 'eshell-parse-backslash' to reduce repetition), but since it has unit tests, I think it should be pretty safe either way. From debbugs-submit-bounces@debbugs.gnu.org Sun Dec 04 02:26:34 2022 Received: (at 59622) by debbugs.gnu.org; 4 Dec 2022 07:26:34 +0000 Received: from localhost ([127.0.0.1]:55917 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p1jOT-00084k-TE for submit@debbugs.gnu.org; Sun, 04 Dec 2022 02:26:34 -0500 Received: from eggs.gnu.org ([209.51.188.92]:39058) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p1jOS-00084d-6p for 59622@debbugs.gnu.org; Sun, 04 Dec 2022 02:26:32 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p1jOK-0007Qw-Ca; Sun, 04 Dec 2022 02:26:26 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-version:References:Subject:In-Reply-To:To:From: Date; bh=anir569Kvz6zpz8JP5GsC0iwZKPo701+JDfenkxkMRE=; b=f7UqLscd6sHE0JnyCX+4 X3nii719oaBn3SlwkuEOsM3Hcv64Q2F0h0niywiGc88UEKPe7cCxs2vv828jhRW23Tbf9VZsbD44T 5mm4zN4CEEUl4UFl26qeTONNsMZGwgiTGDAaAlAeLQMM41HMTUmWMG6PKoaeTvjRptayFUo8Hhzbp FQjB7xd7N3nqWyiE67vd759xfd56Y0vXL6n/1nN70iXbD7H6fhlvLpS2oF9ZQEvXv2Pa4LOwdpZO6 wM/H4jBkzNKj0QCafGH4IDw7nNckm3ym9jWMU4lD6c0cYxUWEULGUbVaJWV4KS1a+9EwSQIRrP4GF j0pX9w9q7rk99A==; Received: from [87.69.77.57] (helo=home-c4e4a596f7) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p1jOJ-0004i8-I9; Sun, 04 Dec 2022 02:26:23 -0500 Date: Sun, 04 Dec 2022 09:26:04 +0200 Message-Id: <83v8mrbpf7.fsf@gnu.org> From: Eli Zaretskii To: Jim Porter In-Reply-To: (message from Jim Porter on Sat, 3 Dec 2022 17:41:50 -0800) Subject: Re: bug#59622: 29.0.50; [PATCH] Regression in Eshell's handling of escaped newlines References: <90faf628-390d-1094-2fcb-e6a23ac46da8@gmail.com> MIME-version: 1.0 Content-type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 59622 Cc: 59622@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) > Date: Sat, 3 Dec 2022 17:41:50 -0800 > From: Jim Porter > > On 11/26/2022 4:36 PM, Jim Porter wrote: > > Starting from "emacs -Q -f eshell": > > > >   # Emacs 28 > >   ~ $ echo foo\ > >   bar > > > >   foobar > > > >   # Emacs 29 > >   ~ $ echo foo\ > >   bar > > > >   foo > >   bar > > > > That is, Emacs 28 used to treat escaped newlines in the way you'd expect > > from other shells: it expands to the empty string. Now in Emacs 29, it > > inserts a literal newline. > > Eli, since this is a regression from Emacs 28 (likely fallout from one > of my changes to fix some longstanding bugs with quotes in Eshell), > would my current patch be ok on the release branch? Yes, but please do try to make it as safe as is feasible. > I can try to minimize the changes a bit further (I slightly refactored > 'eshell-parse-backslash' to reduce repetition), but since it has unit > tests, I think it should be pretty safe either way. OK. From debbugs-submit-bounces@debbugs.gnu.org Sun Dec 04 20:35:42 2022 Received: (at 59622) by debbugs.gnu.org; 5 Dec 2022 01:35:42 +0000 Received: from localhost ([127.0.0.1]:60947 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p20OT-0005if-Sf for submit@debbugs.gnu.org; Sun, 04 Dec 2022 20:35:42 -0500 Received: from mail-pj1-f41.google.com ([209.85.216.41]:39870) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p20OQ-0005iY-4q for 59622@debbugs.gnu.org; Sun, 04 Dec 2022 20:35:40 -0500 Received: by mail-pj1-f41.google.com with SMTP id e7-20020a17090a77c700b00216928a3917so13353489pjs.4 for <59622@debbugs.gnu.org>; Sun, 04 Dec 2022 17:35:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=in-reply-to:from:references:cc:to:content-language:subject :mime-version:date:message-id:from:to:cc:subject:date:message-id :reply-to; bh=qDMYOau5esuSTN00CXrME7tic6PTLWWhy4qM61Y2Grk=; b=NoFFZGHqELppp1UepivSmB5pUKBuSbsU/Z6LHh4Sw4nTVj61JT9aVanMNL/1jovqB/ 2WWf8ikKjGg60VGXoRrrFi6jYAbQlK5wwiKJJLQFqGsDXn/BWYID5WMDszzEtbsMnjnt RIZarId52Lf759jdiBFF9YLF6XXG785dEiY+8KOBbofVoNGeoTt9FDrgtvfKPxPk/5V7 Yx/Fsy6oqAUFGE/Yi5GJ+S5sq9KexbPEH68wqME1j+7GZ/4RXO7R9qsGTgBUBJ6AcpYS jZs+WUXoKLDoZ+3LKF8yEFO3KkrcH75BXDQOj+/JlMXI5h1rmY7wp/dxK8vVu1C1jmWW RcJA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=in-reply-to:from:references:cc:to:content-language:subject :mime-version:date:message-id:x-gm-message-state:from:to:cc:subject :date:message-id:reply-to; bh=qDMYOau5esuSTN00CXrME7tic6PTLWWhy4qM61Y2Grk=; b=0xQT1Tk8gtxPGVD7y16kgsZqTXASpWmsKLmH2iTFphPT7DfFwgpE8h1X7k0h3dzuGr dAV5mXuVNG5Vq6845ILUTu3iTKfpFbRH/UbkiVpJ/9iY80CjEOYH1ol+o4xK6STafQoS +0dNyp2VmR+xfxAMfmHeHGa6GnY9pSoC/27RzGsAIZ5KZXVLck9L5bNd9oUVMiggj2kw QY/Rs9XhM5U9UcOjT651vrpdENO043qIVLsVdooM/dm8DVqLctskaI0tyE8sJl13K9sM QmMUwbXKOgRA+nJFDPJokSaemlCiQj9LWrUMzHFPrOKunw9g9v5lEKg7KQo60fORjKCC dS5w== X-Gm-Message-State: ANoB5plNp4eFTjdGjWdWcMbfEjLaLX10h7j4MfLVgpPVykWEOqHozv+G OS9prDOeVr+3wgergGYsOq0mB0Obc1s= X-Google-Smtp-Source: AA0mqf4079NfwR0VSCtL+o5cBfxJ5kbkfwSbo4nta41akyAtXAGUMF4fTPn1m3wQWIuskjDZEQ+z5Q== X-Received: by 2002:a17:90a:8c82:b0:218:77d2:8c30 with SMTP id b2-20020a17090a8c8200b0021877d28c30mr82623849pjo.226.1670204132096; Sun, 04 Dec 2022 17:35:32 -0800 (PST) Received: from [192.168.1.2] (cpe-76-168-148-233.socal.res.rr.com. [76.168.148.233]) by smtp.googlemail.com with ESMTPSA id o6-20020a170902d4c600b0018853dd8832sm1499243plg.4.2022.12.04.17.35.30 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sun, 04 Dec 2022 17:35:31 -0800 (PST) Content-Type: multipart/mixed; boundary="------------TC6QX9tIk40xSUC5C1qq6bVf" Message-ID: <3d78b158-5fde-d4c0-0e9a-cb05e09bed6e@gmail.com> Date: Sun, 4 Dec 2022 17:35:30 -0800 MIME-Version: 1.0 Subject: Re: bug#59622: 29.0.50; [PATCH] Regression in Eshell's handling of escaped newlines Content-Language: en-US To: Eli Zaretskii References: <90faf628-390d-1094-2fcb-e6a23ac46da8@gmail.com> <83v8mrbpf7.fsf@gnu.org> From: Jim Porter In-Reply-To: <83v8mrbpf7.fsf@gnu.org> X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 59622 Cc: 59622@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) This is a multi-part message in MIME format. --------------TC6QX9tIk40xSUC5C1qq6bVf Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 12/3/2022 11:26 PM, Eli Zaretskii wrote: >> Date: Sat, 3 Dec 2022 17:41:50 -0800 >> From: Jim Porter >> >> Eli, since this is a regression from Emacs 28 (likely fallout from one >> of my changes to fix some longstanding bugs with quotes in Eshell), >> would my current patch be ok on the release branch? > > Yes, but please do try to make it as safe as is feasible. Thanks. How does this look? I just simplified the change in 'eshell-parse-backslash' so that the only difference is an extra conditional (plus whitespace changes). --------------TC6QX9tIk40xSUC5C1qq6bVf Content-Type: text/plain; charset=UTF-8; name="0001-Treat-escaped-newlines-in-Eshell-as-the-empty-string.patch" Content-Disposition: attachment; filename*0="0001-Treat-escaped-newlines-in-Eshell-as-the-empty-string.pa"; filename*1="tch" Content-Transfer-Encoding: base64 RnJvbSA2NmQ1NGQ3OGQxYmRlY2QwMmYwM2Q3M2FlZTI5MTY1NWExYTA5N2MzIE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBKaW0gUG9ydGVyIDxqcG9ydGVyYnVnc0BnbWFpbC5j b20+CkRhdGU6IFNhdCwgMjYgTm92IDIwMjIgMTE6NTI6MTggLTA4MDAKU3ViamVjdDogW1BB VENIXSBUcmVhdCBlc2NhcGVkIG5ld2xpbmVzIGluIEVzaGVsbCBhcyB0aGUgZW1wdHkgc3Ry aW5nCgpEbyBub3QgbWVyZ2UgdG8gbWFzdGVyLiAgKFRoaXMgaXMgZml4ZWQgaW4gYSBzbGln aHRseSBjbGVhbmVyIHdheQp0aGVyZS4pCgoqIGxpc3AvZXNoZWxsL2VzaC1hcmcuZWwgKGVz aGVsbC1wYXJzZS1hcmd1bWVudCk6IEhhbmRsZQonZXNoZWxsLWVtcHR5LXRva2VuJyBhcyB0 aGUgcmVzdWx0IG9mIGFuIGFyZ3VtZW50LXBhcnNpbmcgaG9vay4KKGVzaGVsbC1wYXJzZS1h cmd1bWVudC1ob29rKTogRG9jdW1lbnQgJ2VzaGVsbC1lbXB0eS10b2tlbicuCihlc2hlbGwt cGFyc2UtYmFja3NsYXNoKTogUmV0dXJuICdlc2hlbGwtZW1wdHktdG9rZW4nIHdoZW4KZW5j b3VudGVyaW5nIGFuIGVzY2FwZWQgbmV3bGluZS4KCiogdGVzdC9saXNwL2VzaGVsbC9lc2hl bGwtdGVzdHMuZWwgKGVzaGVsbC10ZXN0L2VzY2FwZS1ub25zcGVjaWFsKQooZXNoZWxsLXRl c3QvZXNjYXBlLW5vbnNwZWNpYWwtdW5pY29kZSkKKGVzaGVsbC10ZXN0L2VzY2FwZS1ub25z cGVjaWFsLXF1b3RlZCkKKGVzaGVsbC10ZXN0L2VzY2FwZS1zcGVjaWFsLXF1b3RlZCk6IE1v dmUgZnJvbSBoZXJlLi4uCgoqIHRlc3QvbGlzcC9lc2hlbGwvZXNoLWFyZy10ZXN0cy5lbCAo ZXNoLWFyZy10ZXN0L2VzY2FwZS9ub25zcGVjaWFsKQooZXNoLWFyZy10ZXN0L2VzY2FwZS9u b25zcGVjaWFsLXVuaWNvZGUpCihlc2gtYXJnLXRlc3QvZXNjYXBlLXF1b3RlZC9ub25zcGVj aWFsKQooZXNoLWFyZy10ZXN0L2VzY2FwZS1xdW90ZWQvc3BlY2lhbCk6IC4uLiB0byBoZXJl LgooZXNoLWFyZy10ZXN0L2VzY2FwZS9zcGVjaWFsLCBlc2gtYXJnLXRlc3QvZXNjYXBlL25l d2xpbmUpCihlc2gtYXJnLXRlc3QvZXNjYXBlLXF1b3RlZC9uZXdsaW5lKTogTmV3IHRlc3Rz LgoKKiBkb2MvbWlzYy9lc2hlbGwudGV4aSAoQXJndW1lbnRzKTogRXhwbGFpbiBlc2NhcGlu ZyBsb2dpYyBpbiBtb3JlCmRldGFpbCAoYnVnIzU5NjIyKS4KLS0tCiBkb2MvbWlzYy9lc2hl bGwudGV4aSAgICAgICAgICAgICAgfCAgMjMgKysrKysrKwogbGlzcC9lc2hlbGwvZXNoLWFy Zy5lbCAgICAgICAgICAgIHwgIDQzICsrKysrKystLS0tLQogdGVzdC9saXNwL2VzaGVsbC9l c2gtYXJnLXRlc3RzLmVsIHwgMTA1ICsrKysrKysrKysrKysrKysrKysrKysrKysrKysrKwog dGVzdC9saXNwL2VzaGVsbC9lc2hlbGwtdGVzdHMuZWwgIHwgIDMxIC0tLS0tLS0tLQogNCBm aWxlcyBjaGFuZ2VkLCAxNTMgaW5zZXJ0aW9ucygrKSwgNDkgZGVsZXRpb25zKC0pCiBjcmVh dGUgbW9kZSAxMDA2NDQgdGVzdC9saXNwL2VzaGVsbC9lc2gtYXJnLXRlc3RzLmVsCgpkaWZm IC0tZ2l0IGEvZG9jL21pc2MvZXNoZWxsLnRleGkgYi9kb2MvbWlzYy9lc2hlbGwudGV4aQpp bmRleCBlNmRkY2YxMWRmYS4uNjdkOGY4ZjgxZGYgMTAwNjQ0Ci0tLSBhL2RvYy9taXNjL2Vz aGVsbC50ZXhpCisrKyBiL2RvYy9taXNjL2VzaGVsbC50ZXhpCkBAIC0yNjMsNiArMjYzLDI5 IEBAIEFyZ3VtZW50cwogY2hhcmFjdGVycyBsaWtlIHBpcGUgKEBjb2Rle3x9KSwgd2hpY2gg Y291bGQgYmUgcGFydCBvZiByZW1vdGUgZmlsZQogbmFtZXMuCiAKK1doZW4geW91IGVzY2Fw ZSBhIGNoYXJhY3RlciB3aXRoIEBjb2Rle1x9IG91dHNpZGUgb2YgcXVvdGVzLCB0aGUKK3Jl c3VsdCBpcyB0aGUgbGl0ZXJhbCBjaGFyYWN0ZXIgaW1tZWRpYXRlbHkgZm9sbG93aW5nIGl0 LCBzbworQHNhbXB7XCQxMH0gbWVhbnMgdGhlIGxpdGVyYWwgc3RyaW5nIEBjb2RleyQxMH0u ICBJbnNpZGUgb2YKK2RvdWJsZSBxdW90ZXMsIHRoZSByZXN1bHQgaXMgdGhlIGxpdGVyYWwg Y2hhcmFjdGVyIGZvbGxvd2luZyBpdCBpZgordGhhdCBjaGFyYWN0ZXIgaXMgc3BlY2lhbCwg b3IgdGhlIGZ1bGwgQGNvZGV7XEB2YXJ7Y319IHNlcXVlbmNlCitvdGhlcndpc2U7IGluc2lk ZSBkb3VibGUtcXVvdGVzLCBAY29kZXtcfSwgQGNvZGV7In0sIGFuZCBAY29kZXskfSBhcmUK K2NvbnNpZGVyZWQgc3BlY2lhbC4KKworQWRkaXRpb25hbGx5LCB3aGVuIGVzY2FwaW5nIGEg bmV3bGluZSwgdGhlIHdob2xlIGVzY2FwZSBzZXF1ZW5jZSBpcworcmVtb3ZlZCBieSB0aGUg cGFyc2VyLiAgVGhpcyBsZXRzIHlvdSBjb250aW51ZSBjb21tYW5kcyBhY3Jvc3MKK211bHRp cGxlIGxpbmVzOgorCitAZXhhbXBsZQorfiAkIGVjaG8gImZvb1wKK2JhciIKK2Zvb2Jhcgor QGVuZCBleGFtcGxlCisKK0luc2lkZSBhcG9zdHJvcGhlcywgZXNjYXBpbmcgd29ya3MgZGlm ZmVyZW50bHkuICBBbGwgY2hhcmFjdGVycworYmV0d2VlbiB0aGUgYXBvc3Ryb3BoZXMgaGF2 ZSB0aGVpciBsaXRlcmFsIG1lYW5pbmcgZXhjZXB0IEBjb2Rleyd9LAord2hpY2ggZW5kcyB0 aGUgcXVvdGVkIHN0cmluZy4gIFRvIGluc2VydCBhIGxpdGVyYWwgYXBvc3Ryb3BoZSwgeW91 IGNhbgordXNlIEBjb2RleycnfS4KKwogV2hlbiB1c2luZyBleHBhbnNpb25zIChAcHhyZWZ7 RXhwYW5zaW9ufSkgaW4gYW4gRXNoZWxsIGNvbW1hbmQsIHRoZQogcmVzdWx0IG1heSBwb3Rl bnRpYWxseSBiZSBvZiBhbnkgZGF0YSB0eXBlLiAgVG8gZW5zdXJlIHRoYXQgdGhlIHJlc3Vs dAogaXMgYWx3YXlzIGEgc3RyaW5nLCB0aGUgZXhwYW5zaW9uIGNhbiBiZSBzdXJyb3VuZGVk IGJ5IGRvdWJsZSBxdW90ZXMuCmRpZmYgLS1naXQgYS9saXNwL2VzaGVsbC9lc2gtYXJnLmVs IGIvbGlzcC9lc2hlbGwvZXNoLWFyZy5lbAppbmRleCBmODdjYzJmMjBhYS4uNDhhYzNlMmJk NGQgMTAwNjQ0Ci0tLSBhL2xpc3AvZXNoZWxsL2VzaC1hcmcuZWwKKysrIGIvbGlzcC9lc2hl bGwvZXNoLWFyZy5lbApAQCAtMTQ2LDkgKzE0NiwxMCBAQCBlc2hlbGwtcGFyc2UtYXJndW1l bnQtaG9vawogV2hlbiBlYWNoIGZ1bmN0aW9uIG9uIHRoaXMgaG9vayBpcyBjYWxsZWQsIHBv aW50IHdpbGwgYmUgYXQgdGhlCiBjdXJyZW50IHBvc2l0aW9uIHdpdGhpbiB0aGUgYXJndW1l bnQgbGlzdC4gIFRoZSBmdW5jdGlvbiBzaG91bGQgZWl0aGVyCiByZXR1cm4gbmlsLCBtZWFu aW5nIHRoYXQgaXQgZGlkIG5vIGFyZ3VtZW50IHBhcnNpbmcsIG9yIGl0IHNob3VsZAotcmV0 dXJuIHRoZSByZXN1bHQgb2YgdGhlIHBhcnNlIGFzIGEgc2V4cC4gIEl0IGlzIGFsc28gcmVz cG9uc2libGUgZm9yCi1tb3ZpbmcgdGhlIHBvaW50IGZvcndhcmQgdG8gcmVmbGVjdCB0aGUg YW1vdW50IG9mIGlucHV0IHRleHQgdGhhdCB3YXMKLXBhcnNlZC4KK3JldHVybiB0aGUgcmVz dWx0IG9mIHRoZSBwYXJzZSBhcyBhIHNleHAuICBJZiB0aGUgZnVuY3Rpb24gZGlkIGRvCith cmd1bWVudCBwYXJzaW5nLCBidXQgdGhlIHJlc3VsdCB3YXMgbm90aGluZyBhdCBhbGwsIGl0 IHNob3VsZCByZXR1cm4KK2Blc2hlbGwtZW1wdHktdG9rZW4nLiAgVGhlIGZ1bmN0aW9uIGlz IGFsc28gcmVzcG9uc2libGUgZm9yIG1vdmluZyB0aGUKK3BvaW50IGZvcndhcmQgdG8gcmVm bGVjdCB0aGUgYW1vdW50IG9mIGlucHV0IHRleHQgdGhhdCB3YXMgcGFyc2VkLgogCiBJZiB0 aGUgaG9vayBkZXRlcm1pbmVzIHRoYXQgaXQgaGFzIHJlYWNoZWQgdGhlIGVuZCBvZiBhbiBh cmd1bWVudCwgaXQKIHNob3VsZCBjYWxsIGBlc2hlbGwtZmluaXNoLWFyZycgdG8gY29tcGxl dGUgcHJvY2Vzc2luZyBvZiB0aGUgY3VycmVudApAQCAtMzI1LDEzICszMjYsMTQgQEAgZXNo ZWxsLXBhcnNlLWFyZ3VtZW50CiAJCSAgIChwcm9nMQogCQkgICAgICAgKGNoYXItdG8tc3Ry aW5nIChjaGFyLWFmdGVyKSkKIAkJICAgICAoZm9yd2FyZC1jaGFyKSkpKSkKLQkgIChpZiAo bm90IGVzaGVsbC1jdXJyZW50LWFyZ3VtZW50KQotCSAgICAgIChzZXRxIGVzaGVsbC1jdXJy ZW50LWFyZ3VtZW50IHJlc3VsdCkKLQkgICAgKHVubGVzcyBlc2hlbGwtYXJnLWxpc3RpZmll ZAotCSAgICAgIChzZXRxIGVzaGVsbC1jdXJyZW50LWFyZ3VtZW50Ci0JCSAgICAobGlzdCBl c2hlbGwtY3VycmVudC1hcmd1bWVudCkKLQkJICAgIGVzaGVsbC1hcmctbGlzdGlmaWVkIHQp KQotCSAgICAobmNvbmMgZXNoZWxsLWN1cnJlbnQtYXJndW1lbnQgKGxpc3QgcmVzdWx0KSkp KSkpCisgICAgICAgICAgKHVubGVzcyAoZXEgcmVzdWx0ICdlc2hlbGwtZW1wdHktdG9rZW4p CisgICAgICAgICAgICAoaWYgKG5vdCBlc2hlbGwtY3VycmVudC1hcmd1bWVudCkKKyAgICAg ICAgICAgICAgICAoc2V0cSBlc2hlbGwtY3VycmVudC1hcmd1bWVudCByZXN1bHQpCisgICAg ICAgICAgICAgICh1bmxlc3MgZXNoZWxsLWFyZy1saXN0aWZpZWQKKyAgICAgICAgICAgICAg ICAoc2V0cSBlc2hlbGwtY3VycmVudC1hcmd1bWVudAorICAgICAgICAgICAgICAgICAgICAg IChsaXN0IGVzaGVsbC1jdXJyZW50LWFyZ3VtZW50KQorICAgICAgICAgICAgICAgICAgICAg IGVzaGVsbC1hcmctbGlzdGlmaWVkIHQpKQorICAgICAgICAgICAgICAobmNvbmMgZXNoZWxs LWN1cnJlbnQtYXJndW1lbnQgKGxpc3QgcmVzdWx0KSkpKSkpKQogICAgICh3aGVuIChhbmQg b3V0ZXIgZXNoZWxsLWN1cnJlbnQtYXJndW1lbnQpCiAgICAgICAoYWRkLXRleHQtcHJvcGVy dGllcyBhcmctYmVnaW4gKDErIGFyZy1iZWdpbikKIAkJCSAgICcoYXJnLWJlZ2luIHQgcmVh ci1ub25zdGlja3kKQEAgLTM3NSwxNSArMzc3LDIwIEBAIGVzaGVsbC1wYXJzZS1iYWNrc2xh c2gKICAgICAod2hlbiAoZXNoZWxsLWxvb2tpbmctYXQtYmFja3NsYXNoLXJldHVybiAocG9p bnQpKQogCSh0aHJvdyAnZXNoZWxsLWluY29tcGxldGUgP1xcKSkKICAgICAoZm9yd2FyZC1j aGFyIDIpIDsgTW92ZSBvbmUgY2hhciBwYXN0IHRoZSBiYWNrc2xhc2guCi0gICAgOzsgSWYg dGhlIGNoYXIgaXMgaW4gYSBxdW90ZSwgYmFja3NsYXNoIG9ubHkgaGFzIHNwZWNpYWwgbWVh bmluZwotICAgIDs7IGlmIGl0IGlzIGVzY2FwaW5nIGEgc3BlY2lhbCBjaGFyLgotICAgIChp ZiBlc2hlbGwtY3VycmVudC1xdW90ZWQKLSAgICAgICAgKGlmIChtZW1xIChjaGFyLWJlZm9y ZSkgZXNoZWxsLXNwZWNpYWwtY2hhcnMtaW5zaWRlLXF1b3RpbmcpCisgICAgKGlmIChlcSAo Y2hhci1iZWZvcmUpID9cbikKKyAgICAgICAgOzsgRXNjYXBlZCBuZXdsaW5lcyBhcmUgZXh0 cmEtc3BlY2lhbDogdGhleSBleHBhbmQgdG8gYW4gZW1wdHkKKyAgICAgICAgOzsgdG9rZW4g dG8gYWxsb3cgZm9yIGNvbnRpbnVpbmcgRXNoZWxsIGNvbW1hbmRzIGFjcm9zcworICAgICAg ICA7OyBtdWx0aXBsZSBsaW5lcy4KKyAgICAgICAgJ2VzaGVsbC1lbXB0eS10b2tlbgorICAg ICAgOzsgSWYgdGhlIGNoYXIgaXMgaW4gYSBxdW90ZSwgYmFja3NsYXNoIG9ubHkgaGFzIHNw ZWNpYWwgbWVhbmluZworICAgICAgOzsgaWYgaXQgaXMgZXNjYXBpbmcgYSBzcGVjaWFsIGNo YXIuCisgICAgICAoaWYgZXNoZWxsLWN1cnJlbnQtcXVvdGVkCisgICAgICAgICAgKGlmICht ZW1xIChjaGFyLWJlZm9yZSkgZXNoZWxsLXNwZWNpYWwtY2hhcnMtaW5zaWRlLXF1b3Rpbmcp CisgICAgICAgICAgICAgIChsaXN0ICdlc2hlbGwtZXNjYXBlLWFyZyAoY2hhci10by1zdHJp bmcgKGNoYXItYmVmb3JlKSkpCisgICAgICAgICAgICAoY29uY2F0ICJcXCIgKGNoYXItdG8t c3RyaW5nIChjaGFyLWJlZm9yZSkpKSkKKyAgICAgICAgKGlmIChtZW1xIChjaGFyLWJlZm9y ZSkgZXNoZWxsLXNwZWNpYWwtY2hhcnMtb3V0c2lkZS1xdW90aW5nKQogICAgICAgICAgICAg KGxpc3QgJ2VzaGVsbC1lc2NhcGUtYXJnIChjaGFyLXRvLXN0cmluZyAoY2hhci1iZWZvcmUp KSkKLSAgICAgICAgICAoY29uY2F0ICJcXCIgKGNoYXItdG8tc3RyaW5nIChjaGFyLWJlZm9y ZSkpKSkKLSAgICAgIChpZiAobWVtcSAoY2hhci1iZWZvcmUpIGVzaGVsbC1zcGVjaWFsLWNo YXJzLW91dHNpZGUtcXVvdGluZykKLSAgICAgICAgICAobGlzdCAnZXNoZWxsLWVzY2FwZS1h cmcgKGNoYXItdG8tc3RyaW5nIChjaGFyLWJlZm9yZSkpKQotICAgICAgICAoY2hhci10by1z dHJpbmcgKGNoYXItYmVmb3JlKSkpKSkpCisgICAgICAgICAgKGNoYXItdG8tc3RyaW5nIChj aGFyLWJlZm9yZSkpKSkpKSkKIAogKGRlZnVuIGVzaGVsbC1wYXJzZS1saXRlcmFsLXF1b3Rl ICgpCiAgICJQYXJzZSBhIGxpdGVyYWxseSBxdW90ZWQgc3RyaW5nLiAgTm90aGluZyBoYXMg c3BlY2lhbCBtZWFuaW5nISIKZGlmZiAtLWdpdCBhL3Rlc3QvbGlzcC9lc2hlbGwvZXNoLWFy Zy10ZXN0cy5lbCBiL3Rlc3QvbGlzcC9lc2hlbGwvZXNoLWFyZy10ZXN0cy5lbApuZXcgZmls ZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMC4uNzdmOTQwNGQ0YzcKLS0tIC9kZXYv bnVsbAorKysgYi90ZXN0L2xpc3AvZXNoZWxsL2VzaC1hcmctdGVzdHMuZWwKQEAgLTAsMCAr MSwxMDUgQEAKKzs7OyBlc2gtYXJnLXRlc3RzLmVsIC0tLSBlc2gtYXJnIHRlc3Qgc3VpdGUg IC0qLSBsZXhpY2FsLWJpbmRpbmc6dCAtKi0KKworOzsgQ29weXJpZ2h0IChDKSAyMDIyIEZy ZWUgU29mdHdhcmUgRm91bmRhdGlvbiwgSW5jLgorCis7OyBUaGlzIGZpbGUgaXMgcGFydCBv ZiBHTlUgRW1hY3MuCisKKzs7IEdOVSBFbWFjcyBpcyBmcmVlIHNvZnR3YXJlOiB5b3UgY2Fu IHJlZGlzdHJpYnV0ZSBpdCBhbmQvb3IgbW9kaWZ5Cis7OyBpdCB1bmRlciB0aGUgdGVybXMg b2YgdGhlIEdOVSBHZW5lcmFsIFB1YmxpYyBMaWNlbnNlIGFzIHB1Ymxpc2hlZCBieQorOzsg dGhlIEZyZWUgU29mdHdhcmUgRm91bmRhdGlvbiwgZWl0aGVyIHZlcnNpb24gMyBvZiB0aGUg TGljZW5zZSwgb3IKKzs7IChhdCB5b3VyIG9wdGlvbikgYW55IGxhdGVyIHZlcnNpb24uCisK Kzs7IEdOVSBFbWFjcyBpcyBkaXN0cmlidXRlZCBpbiB0aGUgaG9wZSB0aGF0IGl0IHdpbGwg YmUgdXNlZnVsLAorOzsgYnV0IFdJVEhPVVQgQU5ZIFdBUlJBTlRZOyB3aXRob3V0IGV2ZW4g dGhlIGltcGxpZWQgd2FycmFudHkgb2YKKzs7IE1FUkNIQU5UQUJJTElUWSBvciBGSVRORVNT IEZPUiBBIFBBUlRJQ1VMQVIgUFVSUE9TRS4gIFNlZSB0aGUKKzs7IEdOVSBHZW5lcmFsIFB1 YmxpYyBMaWNlbnNlIGZvciBtb3JlIGRldGFpbHMuCisKKzs7IFlvdSBzaG91bGQgaGF2ZSBy ZWNlaXZlZCBhIGNvcHkgb2YgdGhlIEdOVSBHZW5lcmFsIFB1YmxpYyBMaWNlbnNlCis7OyBh bG9uZyB3aXRoIEdOVSBFbWFjcy4gIElmIG5vdCwgc2VlIDxodHRwczovL3d3dy5nbnUub3Jn L2xpY2Vuc2VzLz4uCisKKzs7OyBDb21tZW50YXJ5OgorCis7OyBUZXN0cyBmb3IgRXNoZWxs J3MgYXJndW1lbnQgaGFuZGxpbmcuCisKKzs7OyBDb2RlOgorCisocmVxdWlyZSAnZXJ0KQor KHJlcXVpcmUgJ2VzaC1tb2RlKQorKHJlcXVpcmUgJ2VzaGVsbCkKKworKHJlcXVpcmUgJ2Vz aGVsbC10ZXN0cy1oZWxwZXJzCisgICAgICAgICAoZXhwYW5kLWZpbGUtbmFtZSAiZXNoZWxs LXRlc3RzLWhlbHBlcnMiCisgICAgICAgICAgICAgICAgICAgICAgICAgICAoZmlsZS1uYW1l LWRpcmVjdG9yeSAob3IgbG9hZC1maWxlLW5hbWUKKyAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICBkZWZhdWx0LWRpcmVjdG9yeSkpKSkKKwor KGRlZnZhciBlc2hlbGwtdGVzdC12YWx1ZSBuaWwpCisKKzs7OyBUZXN0czoKKworKGVydC1k ZWZ0ZXN0IGVzaC1hcmctdGVzdC9lc2NhcGUvbm9uc3BlY2lhbCAoKQorICAiVGVzdCB0aGF0 IFwiXFxjXCIgYW5kIFwiY1wiIGFyZSBlcXVpdmFsZW50IHdoZW4gXCJjXCIgaXMgbm90IGEK K3NwZWNpYWwgY2hhcmFjdGVyLiIKKyAgKHdpdGgtdGVtcC1lc2hlbGwKKyAgIChlc2hlbGwt bWF0Y2gtY29tbWFuZC1vdXRwdXQgImVjaG8gaGVcXGxsbyIKKyAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgImhlbGxvXG4iKSkpCisKKyhlcnQtZGVmdGVzdCBlc2gtYXJnLXRl c3QvZXNjYXBlL25vbnNwZWNpYWwtdW5pY29kZSAoKQorICAiVGVzdCB0aGF0IFwiXFxjXCIg YW5kIFwiY1wiIGFyZSBlcXVpdmFsZW50IHdoZW4gXCJjXCIgaXMgYQordW5pY29kZSBjaGFy YWN0ZXIgKHVuaWNvZGUgY2hhcmFjdGVycyBhcmUgbm9uc3BlY2lhbCBieQorZGVmaW5pdGlv bikuIgorICAod2l0aC10ZW1wLWVzaGVsbAorICAgKGVzaGVsbC1tYXRjaC1jb21tYW5kLW91 dHB1dCAiZWNobyBWaWRcXMOpb3MiCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICJWaWTDqW9zXG4iKSkpCisKKyhlcnQtZGVmdGVzdCBlc2gtYXJnLXRlc3QvZXNjYXBlL3Nw ZWNpYWwgKCkKKyAgIlRlc3QgdGhhdCB0aGUgYmFja3NsYXNoIGlzIG5vdCBwcmVzZXJ2ZWQg Zm9yIGVzY2FwZWQgc3BlY2lhbAorY2hhcnMuIgorICAod2l0aC10ZW1wLWVzaGVsbAorICAg KGVzaGVsbC1tYXRjaC1jb21tYW5kLW91dHB1dCAiZWNobyBoZVxcXFxsbG8iCisgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIDs7IEJhY2tzbGFzaGVzIGFyZSBkb3VibGVkIGZv ciByZWdleHAuCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICJoZVxcXFxsbG9c biIpKSkKKworKGVydC1kZWZ0ZXN0IGVzaC1hcmctdGVzdC9lc2NhcGUvbmV3bGluZSAoKQor ICAiVGVzdCB0aGF0IGFuIGVzY2FwZWQgbmV3bGluZSBpcyBlcXVpdmFsZW50IHRvIHRoZSBl bXB0eSBzdHJpbmcuCitXaGVuIG5ld2xpbmVzIGFyZSAqbm9uc3BlY2lhbCosIGFuIGVzY2Fw ZWQgbmV3bGluZSBzaG91bGQgYmUKK3RyZWF0ZWQgYXMganVzdCBhIG5ld2xpbmUuIgorICAo d2l0aC10ZW1wLWVzaGVsbAorICAgKGVzaGVsbC1tYXRjaC1jb21tYW5kLW91dHB1dCAiZWNo byBoaVxcXG50aGVyZSIKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgImhpdGhl cmVcbiIpKSkKKworKGVydC1kZWZ0ZXN0IGVzaC1hcmctdGVzdC9lc2NhcGUvbmV3bGluZS1j b25kaXRpb25hbCAoKQorICAiVGVzdCBpbnZvY2F0aW9uIG9mIGFuIGlmL2Vsc2Ugc3RhdGVt ZW50IHVzaW5nIGxpbmUgY29udGludWF0aW9ucy4iCisgIChsZXQgKChlc2hlbGwtdGVzdC12 YWx1ZSB0KSkKKyAgICAoZXNoZWxsLWNvbW1hbmQtcmVzdWx0LWVxdWFsCisgICAgICJpZiAk ZXNoZWxsLXRlc3QtdmFsdWUgXFxcbntlY2hvIHllc30gXFxcbntlY2hvIG5vfSIKKyAgICAg InllcyIpKQorICAobGV0ICgoZXNoZWxsLXRlc3QtdmFsdWUgbmlsKSkKKyAgICAoZXNoZWxs LWNvbW1hbmQtcmVzdWx0LWVxdWFsCisgICAgICJpZiAkZXNoZWxsLXRlc3QtdmFsdWUgXFxc bntlY2hvIHllc30gXFxcbntlY2hvIG5vfSIKKyAgICAgIm5vIikpKQorCisoZXJ0LWRlZnRl c3QgZXNoLWFyZy10ZXN0L2VzY2FwZS1xdW90ZWQvbm9uc3BlY2lhbCAoKQorICAiVGVzdCB0 aGF0IHRoZSBiYWNrc2xhc2ggaXMgcHJlc2VydmVkIGZvciBlc2NhcGVkIG5vbnNwZWNpYWwK K2NoYXJzLiIKKyAgKHdpdGgtdGVtcC1lc2hlbGwKKyAgIChlc2hlbGwtbWF0Y2gtY29tbWFu ZC1vdXRwdXQgImVjaG8gXCJoXFxpXCIiCisgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIDs7IEJhY2tzbGFzaGVzIGFyZSBkb3VibGVkIGZvciByZWdleHAuCisgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICJoXFxcXGlcbiIpKSkKKworKGVydC1kZWZ0ZXN0IGVz aC1hcmctdGVzdC9lc2NhcGUtcXVvdGVkL3NwZWNpYWwgKCkKKyAgIlRlc3QgdGhhdCB0aGUg YmFja3NsYXNoIGlzIG5vdCBwcmVzZXJ2ZWQgZm9yIGVzY2FwZWQgc3BlY2lhbAorY2hhcnMu IgorICAod2l0aC10ZW1wLWVzaGVsbAorICAgKGVzaGVsbC1tYXRjaC1jb21tYW5kLW91dHB1 dCAiZWNobyBcIlxcXCJoaVxcXFxcIiIKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgOzsgQmFja3NsYXNoZXMgYXJlIGRvdWJsZWQgZm9yIHJlZ2V4cC4KKyAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIlxcXCJoaVxcXFxcbiIpKSkKKworKGVydC1kZWZ0ZXN0 IGVzaC1hcmctdGVzdC9lc2NhcGUtcXVvdGVkL25ld2xpbmUgKCkKKyAgIlRlc3QgdGhhdCBh biBlc2NhcGVkIG5ld2xpbmUgaXMgZXF1aXZhbGVudCB0byB0aGUgZW1wdHkgc3RyaW5nLgor V2hlbiBuZXdsaW5lcyBhcmUgKm5vbnNwZWNpYWwqLCBhbiBlc2NhcGVkIG5ld2xpbmUgc2hv dWxkIGJlCit0cmVhdGVkIGxpdGVyYWxseSwgYXMgYSBiYWNrc2xhc2ggYW5kIGEgbmV3bGlu ZS4iCisgICh3aXRoLXRlbXAtZXNoZWxsCisgICAoZXNoZWxsLW1hdGNoLWNvbW1hbmQtb3V0 cHV0ICJlY2hvIFwiaGlcXFxudGhlcmVcIiIKKyAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgImhpdGhlcmVcbiIpKSkKKworOzsgZXNoLWFyZy10ZXN0cy5lbCBlbmRzIGhlcmUK ZGlmZiAtLWdpdCBhL3Rlc3QvbGlzcC9lc2hlbGwvZXNoZWxsLXRlc3RzLmVsIGIvdGVzdC9s aXNwL2VzaGVsbC9lc2hlbGwtdGVzdHMuZWwKaW5kZXggZDUxMTIxNDZjMmQuLmM2N2FjNjdm ZDM2IDEwMDY0NAotLS0gYS90ZXN0L2xpc3AvZXNoZWxsL2VzaGVsbC10ZXN0cy5lbAorKysg Yi90ZXN0L2xpc3AvZXNoZWxsL2VzaGVsbC10ZXN0cy5lbApAQCAtMTA1LDM3ICsxMDUsNiBA QCBlc2hlbGwtdGVzdC9saXNwLXJlc2V0LWluLXBpcGVsaW5lCiAgICAgIChmb3JtYXQgdGVt cGxhdGUgImZvcm1hdCBcIiVzXCIgZXNoZWxsLWluLXBpcGVsaW5lLXAiKQogICAgICAibmls IikpKQogCi0oZXJ0LWRlZnRlc3QgZXNoZWxsLXRlc3QvZXNjYXBlLW5vbnNwZWNpYWwgKCkK LSAgIlRlc3QgdGhhdCBcIlxcY1wiIGFuZCBcImNcIiBhcmUgZXF1aXZhbGVudCB3aGVuIFwi Y1wiIGlzIG5vdCBhCi1zcGVjaWFsIGNoYXJhY3Rlci4iCi0gICh3aXRoLXRlbXAtZXNoZWxs Ci0gICAoZXNoZWxsLW1hdGNoLWNvbW1hbmQtb3V0cHV0ICJlY2hvIGhlXFxsbG8iCi0gICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICJoZWxsb1xuIikpKQotCi0oZXJ0LWRlZnRl c3QgZXNoZWxsLXRlc3QvZXNjYXBlLW5vbnNwZWNpYWwtdW5pY29kZSAoKQotICAiVGVzdCB0 aGF0IFwiXFxjXCIgYW5kIFwiY1wiIGFyZSBlcXVpdmFsZW50IHdoZW4gXCJjXCIgaXMgYQot dW5pY29kZSBjaGFyYWN0ZXIgKHVuaWNvZGUgY2hhcmFjdGVycyBhcmUgbm9uc3BlY2lhbCBi eQotZGVmaW5pdGlvbikuIgotICAod2l0aC10ZW1wLWVzaGVsbAotICAgKGVzaGVsbC1tYXRj aC1jb21tYW5kLW91dHB1dCAiZWNobyBWaWRcXMOpb3MiCi0gICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICJWaWTDqW9zXG4iKSkpCi0KLShlcnQtZGVmdGVzdCBlc2hlbGwtdGVz dC9lc2NhcGUtbm9uc3BlY2lhbC1xdW90ZWQgKCkKLSAgIlRlc3QgdGhhdCB0aGUgYmFja3Ns YXNoIGlzIHByZXNlcnZlZCBmb3IgZXNjYXBlZCBub25zcGVjaWFsCi1jaGFycyIKLSAgKHdp dGgtdGVtcC1lc2hlbGwKLSAgIChlc2hlbGwtbWF0Y2gtY29tbWFuZC1vdXRwdXQgImVjaG8g XCJoXFxpXCIiCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIDs7IEJhY2tzbGFz aGVzIGFyZSBkb3VibGVkIGZvciByZWdleHAuCi0gICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICJoXFxcXGlcbiIpKSkKLQotKGVydC1kZWZ0ZXN0IGVzaGVsbC10ZXN0L2VzY2Fw ZS1zcGVjaWFsLXF1b3RlZCAoKQotICAiVGVzdCB0aGF0IHRoZSBiYWNrc2xhc2ggaXMgbm90 IHByZXNlcnZlZCBmb3IgZXNjYXBlZCBzcGVjaWFsCi1jaGFycyIKLSAgKHdpdGgtdGVtcC1l c2hlbGwKLSAgIChlc2hlbGwtbWF0Y2gtY29tbWFuZC1vdXRwdXQgImVjaG8gXCJcXFwiaGlc XFxcXCIiCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIDs7IEJhY2tzbGFzaGVz IGFyZSBkb3VibGVkIGZvciByZWdleHAuCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICJcXFwiaGlcXFxcXG4iKSkpCi0KIChlcnQtZGVmdGVzdCBlc2hlbGwtdGVzdC9jb21t YW5kLXJ1bm5pbmctcCAoKQogICAiTW9kZWxpbmUgc2hvdWxkIHNob3cgbm8gY29tbWFuZCBy dW5uaW5nIgogICAod2l0aC10ZW1wLWVzaGVsbAotLSAKMi4yNS4xCgo= --------------TC6QX9tIk40xSUC5C1qq6bVf-- From debbugs-submit-bounces@debbugs.gnu.org Mon Dec 05 07:39:30 2022 Received: (at 59622) by debbugs.gnu.org; 5 Dec 2022 12:39:30 +0000 Received: from localhost ([127.0.0.1]:35775 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p2Aks-0000Na-94 for submit@debbugs.gnu.org; Mon, 05 Dec 2022 07:39:30 -0500 Received: from eggs.gnu.org ([209.51.188.92]:34242) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p2Akq-0000NU-Jl for 59622@debbugs.gnu.org; Mon, 05 Dec 2022 07:39:29 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p2Akk-00043p-KV; Mon, 05 Dec 2022 07:39:22 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=References:Subject:In-Reply-To:To:From:Date: mime-version; bh=OkY5WTvdVA7ral0xfpuZWKyJ7G1UwKRWLEsQt1pnqNk=; b=FAhagGf2Z72v 2celVHOA6/VYrwgePxxMiCbfE9Zqg0HIf7RhaIVjSovU5q0BL1g0/NDHkPvreY3mL/wM1ZhGPFzEo 1pWftAzuKUH7wKLRO6iMb2UNqQeDY1WN+2zwpwaA/uCwi5iqOkHnH+JiiH7ylyGIzdTW2HEy8p4iz s8KJOxQQuya17KRk9xIh3tz5t+v4XtHdJewfr1Z3yBiEu314oCefEUZT2PWaPPL5RJmtDR3yFQgUm fTGPPbN2Ikw/qUvBQdwdeCxtOxPvSHBfSv/q+suehbbqRM8KgKOnKAkz19DAnHaZRotGUV/i99mew 4uJpnfqyOURDKGi6PJ/pDg==; Received: from [87.69.77.57] (helo=home-c4e4a596f7) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p2Akk-0003M6-0Y; Mon, 05 Dec 2022 07:39:22 -0500 Date: Mon, 05 Dec 2022 14:39:06 +0200 Message-Id: <83359u9g9h.fsf@gnu.org> From: Eli Zaretskii To: Jim Porter In-Reply-To: <3d78b158-5fde-d4c0-0e9a-cb05e09bed6e@gmail.com> (message from Jim Porter on Sun, 4 Dec 2022 17:35:30 -0800) Subject: Re: bug#59622: 29.0.50; [PATCH] Regression in Eshell's handling of escaped newlines References: <90faf628-390d-1094-2fcb-e6a23ac46da8@gmail.com> <83v8mrbpf7.fsf@gnu.org> <3d78b158-5fde-d4c0-0e9a-cb05e09bed6e@gmail.com> X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 59622 Cc: 59622@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) > Date: Sun, 4 Dec 2022 17:35:30 -0800 > Cc: 59622@debbugs.gnu.org > From: Jim Porter > > On 12/3/2022 11:26 PM, Eli Zaretskii wrote: > >> Date: Sat, 3 Dec 2022 17:41:50 -0800 > >> From: Jim Porter > >> > >> Eli, since this is a regression from Emacs 28 (likely fallout from one > >> of my changes to fix some longstanding bugs with quotes in Eshell), > >> would my current patch be ok on the release branch? > > > > Yes, but please do try to make it as safe as is feasible. > > Thanks. How does this look? I just simplified the change in > 'eshell-parse-backslash' so that the only difference is an extra > conditional (plus whitespace changes). Looks good, thanks. One comment: > +When you escape a character with @code{\} outside of quotes, the > +result is the literal character immediately following it, so > +@samp{\$10} means the literal string @code{$10}. Inside of > +double quotes, the result is the literal character following it if > +that character is special, or the full @code{\@var{c}} sequence > +otherwise; inside double-quotes, @code{\}, @code{"}, and @code{$} are > +considered special. The last sentence is very unclear, please try saying what you need in a clearer way, and/or maybe add a couple of examples. From debbugs-submit-bounces@debbugs.gnu.org Tue Dec 06 23:18:43 2022 Received: (at 59622) by debbugs.gnu.org; 7 Dec 2022 04:18:44 +0000 Received: from localhost ([127.0.0.1]:47118 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p2ltK-0006YU-Rw for submit@debbugs.gnu.org; Tue, 06 Dec 2022 23:18:43 -0500 Received: from mail-pf1-f169.google.com ([209.85.210.169]:36596) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p2ltF-0006YO-IE for 59622@debbugs.gnu.org; Tue, 06 Dec 2022 23:18:41 -0500 Received: by mail-pf1-f169.google.com with SMTP id x66so16474166pfx.3 for <59622@debbugs.gnu.org>; Tue, 06 Dec 2022 20:18:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=in-reply-to:from:references:cc:to:content-language:subject :mime-version:date:message-id:from:to:cc:subject:date:message-id :reply-to; bh=ar2SQiphsTmi6UDEVU64v3uM0qWhhaI9TTTYF+dL9JA=; b=eQgGAYEkm2o8ZuyJsIo/SuUj67jeV1ZlyiOMZq/BJYyB2CdBdJDXXNTyl6CYq1NbFp 3yO1V5nBV8MxucpnR6furh+rp/UYohB6+0YlkgUi7uMA50ABWlUEQAoUX3Wj7dZeDeCv Vdnb1nr4sGA5usZU6/6aq4r1lrRA74Ea7rp/ZVcHbIybJNvM5w+jveVZDdO9iW0OpdOk YZRBqMkSaStBIfHdHxrO00o7xeRAOmaxAyf3Rn649ISyb0X2ijwcLvMxNF/9YbXrphxY o+YZ5OYgTjVv/fP1PgriF7hr79qpjyZzznybhj0F3RSNpKKffvabSHmK8QZ0Enjyz/el MAlg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=in-reply-to:from:references:cc:to:content-language:subject :mime-version:date:message-id:x-gm-message-state:from:to:cc:subject :date:message-id:reply-to; bh=ar2SQiphsTmi6UDEVU64v3uM0qWhhaI9TTTYF+dL9JA=; b=byZWMDJwspYR4IHfpwa+ifHUZvcEqbNRBiWcJZRYT5yakb1wLunm1HpHXVAQljMiF4 sHQNOBaxc8cv0XwAx6pYuYAOJOuIrJG5smEelX67xyX2pDDDU5BQV1Rhgto4oPoy3SOo /NZFezfjWEh9TVXekXj0MFrinZGKmOaLW6ZKBHYFwaRgjOQLO5kJ6secTOf5ZTPEdZui cmU2RcJbFx3BvmhKRcTFAQaqHRcdBaTEWNI0t0u6KNYp47MdU8YGU7B4OnVpf1HvcLpy V6YSXVEU7ASw3kcRLuITbl/TY2D5Gc2biugNkZ76jEkiSYP60qZe7fOC80BDYzr790b2 umAg== X-Gm-Message-State: ANoB5pmzG3SK+tFcSY/cUnXqHhprb81z/Rj6VkVlt+PtrP4G9QW+u+YG fF14d7s+gAprZdaw+oPRX88= X-Google-Smtp-Source: AA0mqf6r8IcDKvKPZMHU3gpmVkyXBkLYG/6gyhU3djO6rQJZwQmj0cAjZ1KJ2C0D0rlThOHLwQwB7w== X-Received: by 2002:a63:2047:0:b0:478:7cbd:752d with SMTP id r7-20020a632047000000b004787cbd752dmr22912589pgm.103.1670386711405; Tue, 06 Dec 2022 20:18:31 -0800 (PST) Received: from [192.168.1.2] (cpe-76-168-148-233.socal.res.rr.com. [76.168.148.233]) by smtp.googlemail.com with ESMTPSA id j10-20020a170902c3ca00b001869f2120absm13388653plj.294.2022.12.06.20.18.29 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 06 Dec 2022 20:18:30 -0800 (PST) Content-Type: multipart/mixed; boundary="------------ZBvu6f9zoUZ351ECsQ85Bnuh" Message-ID: <9b18ac1f-04b3-63c9-56c0-84233f849d5d@gmail.com> Date: Tue, 6 Dec 2022 20:18:30 -0800 MIME-Version: 1.0 Subject: Re: bug#59622: 29.0.50; [PATCH] Regression in Eshell's handling of escaped newlines Content-Language: en-US To: Eli Zaretskii References: <90faf628-390d-1094-2fcb-e6a23ac46da8@gmail.com> <83v8mrbpf7.fsf@gnu.org> <3d78b158-5fde-d4c0-0e9a-cb05e09bed6e@gmail.com> <83359u9g9h.fsf@gnu.org> From: Jim Porter In-Reply-To: <83359u9g9h.fsf@gnu.org> X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 59622 Cc: 59622@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) This is a multi-part message in MIME format. --------------ZBvu6f9zoUZ351ECsQ85Bnuh Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 12/5/2022 4:39 AM, Eli Zaretskii wrote: >> +When you escape a character with @code{\} outside of quotes, the >> +result is the literal character immediately following it, so >> +@samp{\$10} means the literal string @code{$10}. Inside of >> +double quotes, the result is the literal character following it if >> +that character is special, or the full @code{\@var{c}} sequence >> +otherwise; inside double-quotes, @code{\}, @code{"}, and @code{$} are >> +considered special. > > The last sentence is very unclear, please try saying what you need in a > clearer way, and/or maybe add a couple of examples. Ok, I expanded that part of the manual and added a few more examples. How does this look? I also split the patch in two: the first patch for the 29 branch (which makes the least code changes I could manage), and the second as an additional small cleanup patch for master only. --------------ZBvu6f9zoUZ351ECsQ85Bnuh Content-Type: text/plain; charset=UTF-8; name="29.1--0001-Treat-escaped-newlines-in-Eshell-as-the-empty-string.patch" Content-Disposition: attachment; filename*0="29.1--0001-Treat-escaped-newlines-in-Eshell-as-the-empty-str"; filename*1="ing.patch" Content-Transfer-Encoding: base64 RnJvbSBhOWVjZDcxNWQxOGIzMDAyNzFmZmY0NTZkNzlhZDA5MzA4NTgwODI4IE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBKaW0gUG9ydGVyIDxqcG9ydGVyYnVnc0BnbWFpbC5j b20+CkRhdGU6IFNhdCwgMjYgTm92IDIwMjIgMTE6NTI6MTggLTA4MDAKU3ViamVjdDogW1BB VENIIDEvMl0gVHJlYXQgZXNjYXBlZCBuZXdsaW5lcyBpbiBFc2hlbGwgYXMgdGhlIGVtcHR5 IHN0cmluZwoKRG8gbm90IG1lcmdlIHRvIG1hc3Rlci4gIChUaGlzIGlzIGZpeGVkIGluIGEg c2xpZ2h0bHkgY2xlYW5lciB3YXkKdGhlcmUuKQoKKiBsaXNwL2VzaGVsbC9lc2gtYXJnLmVs IChlc2hlbGwtcGFyc2UtYXJndW1lbnQpOiBIYW5kbGUKJ2VzaGVsbC1lbXB0eS10b2tlbicg YXMgdGhlIHJlc3VsdCBvZiBhbiBhcmd1bWVudC1wYXJzaW5nIGhvb2suCihlc2hlbGwtcGFy c2UtYXJndW1lbnQtaG9vayk6IERvY3VtZW50ICdlc2hlbGwtZW1wdHktdG9rZW4nLgooZXNo ZWxsLXBhcnNlLWJhY2tzbGFzaCk6IFJldHVybiAnZXNoZWxsLWVtcHR5LXRva2VuJyB3aGVu CmVuY291bnRlcmluZyBhbiBlc2NhcGVkIG5ld2xpbmUuCgoqIHRlc3QvbGlzcC9lc2hlbGwv ZXNoZWxsLXRlc3RzLmVsIChlc2hlbGwtdGVzdC9lc2NhcGUtbm9uc3BlY2lhbCkKKGVzaGVs bC10ZXN0L2VzY2FwZS1ub25zcGVjaWFsLXVuaWNvZGUpCihlc2hlbGwtdGVzdC9lc2NhcGUt bm9uc3BlY2lhbC1xdW90ZWQpCihlc2hlbGwtdGVzdC9lc2NhcGUtc3BlY2lhbC1xdW90ZWQp OiBNb3ZlIGZyb20gaGVyZS4uLgoKKiB0ZXN0L2xpc3AvZXNoZWxsL2VzaC1hcmctdGVzdHMu ZWwgKGVzaC1hcmctdGVzdC9lc2NhcGUvbm9uc3BlY2lhbCkKKGVzaC1hcmctdGVzdC9lc2Nh cGUvbm9uc3BlY2lhbC11bmljb2RlKQooZXNoLWFyZy10ZXN0L2VzY2FwZS1xdW90ZWQvbm9u c3BlY2lhbCkKKGVzaC1hcmctdGVzdC9lc2NhcGUtcXVvdGVkL3NwZWNpYWwpOiAuLi4gdG8g aGVyZS4KKGVzaC1hcmctdGVzdC9lc2NhcGUvc3BlY2lhbCwgZXNoLWFyZy10ZXN0L2VzY2Fw ZS9uZXdsaW5lKQooZXNoLWFyZy10ZXN0L2VzY2FwZS1xdW90ZWQvbmV3bGluZSk6IE5ldyB0 ZXN0cy4KCiogZG9jL21pc2MvZXNoZWxsLnRleGkgKEFyZ3VtZW50cyk6IEV4cGxhaW4gZXNj YXBpbmcgbG9naWMgaW4gbW9yZQpkZXRhaWwgKGJ1ZyM1OTYyMikuCi0tLQogZG9jL21pc2Mv ZXNoZWxsLnRleGkgICAgICAgICAgICAgIHwgIDM3ICsrKysrKysrKy0tCiBsaXNwL2VzaGVs bC9lc2gtYXJnLmVsICAgICAgICAgICAgfCAgNDMgKysrKysrKy0tLS0tCiB0ZXN0L2xpc3Av ZXNoZWxsL2VzaC1hcmctdGVzdHMuZWwgfCAxMDUgKysrKysrKysrKysrKysrKysrKysrKysr KysrKysrCiB0ZXN0L2xpc3AvZXNoZWxsL2VzaGVsbC10ZXN0cy5lbCAgfCAgMzEgLS0tLS0t LS0tCiA0IGZpbGVzIGNoYW5nZWQsIDE2MyBpbnNlcnRpb25zKCspLCA1MyBkZWxldGlvbnMo LSkKIGNyZWF0ZSBtb2RlIDEwMDY0NCB0ZXN0L2xpc3AvZXNoZWxsL2VzaC1hcmctdGVzdHMu ZWwKCmRpZmYgLS1naXQgYS9kb2MvbWlzYy9lc2hlbGwudGV4aSBiL2RvYy9taXNjL2VzaGVs bC50ZXhpCmluZGV4IGU2ZGRjZjExZGZhLi4yNmM2Y2NlNmNhYyAxMDA2NDQKLS0tIGEvZG9j L21pc2MvZXNoZWxsLnRleGkKKysrIGIvZG9jL21pc2MvZXNoZWxsLnRleGkKQEAgLTI1Nywx MiArMjU3LDQxIEBAIEFyZ3VtZW50cwogCiBAc3Vic2VjdGlvbiBRdW90aW5nIGFuZCBlc2Nh cGluZwogQXMgd2l0aCBvdGhlciBzaGVsbHMsIHlvdSBjYW4gZXNjYXBlIHNwZWNpYWwgY2hh cmFjdGVycyBhbmQgc3BhY2VzCi13aXRoIGJ5IHByZWZpeGluZyB0aGUgY2hhcmFjdGVyIHdp dGggYSBiYWNrc2xhc2ggKEBjb2Rle1x9KSwgb3IgYnkKLXN1cnJvdW5kaW5nIHRoZSBzdHJp bmcgd2l0aCBhcG9zdHJvcGhlcyAoQGNvZGV7Jyd9KSBvciBkb3VibGUgcXVvdGVzCi0oQGNv ZGV7IiJ9KS4gIFRoaXMgaXMgbmVlZGVkIGVzcGVjaWFsbHkgZm9yIGZpbGUgbmFtZXMgd2l0 aCBzcGVjaWFsCi1jaGFyYWN0ZXJzIGxpa2UgcGlwZSAoQGNvZGV7fH0pLCB3aGljaCBjb3Vs ZCBiZSBwYXJ0IG9mIHJlbW90ZSBmaWxlCit3aXRoIGJ5IHByZWZpeGluZyB0aGUgY2hhcmFj dGVyIHdpdGggYSBiYWNrc2xhc2ggKEBzYW1we1x9KSwgb3IgYnkKK3N1cnJvdW5kaW5nIHRo ZSBzdHJpbmcgd2l0aCBhcG9zdHJvcGhlcyAoQHNhbXB7Jyd9KSBvciBkb3VibGUgcXVvdGVz CisoQHNhbXB7IiJ9KS4gIFRoaXMgaXMgbmVlZGVkIGVzcGVjaWFsbHkgZm9yIGZpbGUgbmFt ZXMgd2l0aCBzcGVjaWFsCitjaGFyYWN0ZXJzIGxpa2UgcGlwZSAoQHNhbXB7fH0pLCB3aGlj aCBjb3VsZCBiZSBwYXJ0IG9mIHJlbW90ZSBmaWxlCiBuYW1lcy4KIAorV2hlbiB5b3UgZXNj YXBlIGEgY2hhcmFjdGVyIHdpdGggQHNhbXB7XH0gb3V0c2lkZSBvZiBhbnkgcXVvdGVzLCB0 aGUKK3Jlc3VsdCBpcyB0aGUgbGl0ZXJhbCBjaGFyYWN0ZXIgaW1tZWRpYXRlbHkgZm9sbG93 aW5nIGl0LiAgRm9yCitleGFtcGxlLCBAY29kZXtcJDEwfSBtZWFucyB0aGUgbGl0ZXJhbCBz dHJpbmcgQGNvZGV7JDEwfS4KKworSW5zaWRlIG9mIGRvdWJsZSBxdW90ZXMsIG1vc3QgY2hh cmFjdGVycyBoYXZlIG5vIHNwZWNpYWwgbWVhbmluZy4KK0hvd2V2ZXIsIEBzYW1we1x9LCBA c2FtcHsifSwgYW5kIEBzYW1weyR9IGFyZSBzdGlsbCBzcGVjaWFsOyB0byBlc2NhcGUKK3Ro ZW0sIHVzZSBiYWNrc2xhc2ggYXMgYWJvdmUuICBUaHVzLCBpZiB0aGUgdmFsdWUgb2YgdGhl IHZhcmlhYmxlCitAdmFye2Fuc3dlcn0gaXMgQGNvZGV7NDJ9LCB0aGVuIEBjb2RleyJUaGUg YW5zd2VyIGlzOiBcIiRhbnN3ZXJcIiJ9CityZXR1cm5zIHRoZSBzdHJpbmcgQGNvZGV7VGhl IGFuc3dlciBpczogIjQyIn0uIEhvd2V2ZXIsIHdoZW4gZXNjYXBpbmcKK2NoYXJhY3RlcnMg d2l0aCBubyBzcGVjaWFsIG1lYW5pbmcsIHRoZSByZXN1bHQgaXMgdGhlIGZ1bGwKK0Bjb2Rl e1xAdmFye2N9fSBzZXF1ZW5jZS4gIEZvciBleGFtcGxlLCBAY29kZXsiZm9vXGJhciJ9IG1l YW5zIHRoZQorbGl0ZXJhbCBzdHJpbmcgQGNvZGV7Zm9vXGJhcn0uCisKK0FkZGl0aW9uYWxs eSwgd2hlbiBlc2NhcGluZyBhIG5ld2xpbmUsIHRoZSB3aG9sZSBlc2NhcGUgc2VxdWVuY2Ug aXMKK3JlbW92ZWQgYnkgdGhlIHBhcnNlci4gIFRoaXMgbGV0cyB5b3UgY29udGludWUgY29t bWFuZHMgYWNyb3NzCittdWx0aXBsZSBsaW5lczoKKworQGV4YW1wbGUKK34gJCBlY2hvICJm b29cCitiYXIiCitmb29iYXIKK0BlbmQgZXhhbXBsZQorCitJbnNpZGUgYXBvc3Ryb3BoZXMs IGVzY2FwaW5nIHdvcmtzIGRpZmZlcmVudGx5LiAgQWxsIGNoYXJhY3RlcnMKK2JldHdlZW4g dGhlIGFwb3N0cm9waGVzIGhhdmUgdGhlaXIgbGl0ZXJhbCBtZWFuaW5nIGV4Y2VwdCBAc2Ft cHsnfSwKK3doaWNoIGVuZHMgdGhlIHF1b3RlZCBzdHJpbmcuICBUbyBpbnNlcnQgYSBsaXRl cmFsIGFwb3N0cm9waGUsIHlvdSBjYW4KK3VzZSBAc2FtcHsnJ30sIHNvIEBjb2RleydJdCcn cyBtZSd9IG1lYW5zIHRoZSBsaXRlcmFsIHN0cmluZworQGNvZGV7SXQncyBtZX0uCisKIFdo ZW4gdXNpbmcgZXhwYW5zaW9ucyAoQHB4cmVme0V4cGFuc2lvbn0pIGluIGFuIEVzaGVsbCBj b21tYW5kLCB0aGUKIHJlc3VsdCBtYXkgcG90ZW50aWFsbHkgYmUgb2YgYW55IGRhdGEgdHlw ZS4gIFRvIGVuc3VyZSB0aGF0IHRoZSByZXN1bHQKIGlzIGFsd2F5cyBhIHN0cmluZywgdGhl IGV4cGFuc2lvbiBjYW4gYmUgc3Vycm91bmRlZCBieSBkb3VibGUgcXVvdGVzLgpkaWZmIC0t Z2l0IGEvbGlzcC9lc2hlbGwvZXNoLWFyZy5lbCBiL2xpc3AvZXNoZWxsL2VzaC1hcmcuZWwK aW5kZXggZjg3Y2MyZjIwYWEuLjQ4YWMzZTJiZDRkIDEwMDY0NAotLS0gYS9saXNwL2VzaGVs bC9lc2gtYXJnLmVsCisrKyBiL2xpc3AvZXNoZWxsL2VzaC1hcmcuZWwKQEAgLTE0Niw5ICsx NDYsMTAgQEAgZXNoZWxsLXBhcnNlLWFyZ3VtZW50LWhvb2sKIFdoZW4gZWFjaCBmdW5jdGlv biBvbiB0aGlzIGhvb2sgaXMgY2FsbGVkLCBwb2ludCB3aWxsIGJlIGF0IHRoZQogY3VycmVu dCBwb3NpdGlvbiB3aXRoaW4gdGhlIGFyZ3VtZW50IGxpc3QuICBUaGUgZnVuY3Rpb24gc2hv dWxkIGVpdGhlcgogcmV0dXJuIG5pbCwgbWVhbmluZyB0aGF0IGl0IGRpZCBubyBhcmd1bWVu dCBwYXJzaW5nLCBvciBpdCBzaG91bGQKLXJldHVybiB0aGUgcmVzdWx0IG9mIHRoZSBwYXJz ZSBhcyBhIHNleHAuICBJdCBpcyBhbHNvIHJlc3BvbnNpYmxlIGZvcgotbW92aW5nIHRoZSBw b2ludCBmb3J3YXJkIHRvIHJlZmxlY3QgdGhlIGFtb3VudCBvZiBpbnB1dCB0ZXh0IHRoYXQg d2FzCi1wYXJzZWQuCityZXR1cm4gdGhlIHJlc3VsdCBvZiB0aGUgcGFyc2UgYXMgYSBzZXhw LiAgSWYgdGhlIGZ1bmN0aW9uIGRpZCBkbworYXJndW1lbnQgcGFyc2luZywgYnV0IHRoZSBy ZXN1bHQgd2FzIG5vdGhpbmcgYXQgYWxsLCBpdCBzaG91bGQgcmV0dXJuCitgZXNoZWxsLWVt cHR5LXRva2VuJy4gIFRoZSBmdW5jdGlvbiBpcyBhbHNvIHJlc3BvbnNpYmxlIGZvciBtb3Zp bmcgdGhlCitwb2ludCBmb3J3YXJkIHRvIHJlZmxlY3QgdGhlIGFtb3VudCBvZiBpbnB1dCB0 ZXh0IHRoYXQgd2FzIHBhcnNlZC4KIAogSWYgdGhlIGhvb2sgZGV0ZXJtaW5lcyB0aGF0IGl0 IGhhcyByZWFjaGVkIHRoZSBlbmQgb2YgYW4gYXJndW1lbnQsIGl0CiBzaG91bGQgY2FsbCBg ZXNoZWxsLWZpbmlzaC1hcmcnIHRvIGNvbXBsZXRlIHByb2Nlc3Npbmcgb2YgdGhlIGN1cnJl bnQKQEAgLTMyNSwxMyArMzI2LDE0IEBAIGVzaGVsbC1wYXJzZS1hcmd1bWVudAogCQkgICAo cHJvZzEKIAkJICAgICAgIChjaGFyLXRvLXN0cmluZyAoY2hhci1hZnRlcikpCiAJCSAgICAg KGZvcndhcmQtY2hhcikpKSkpCi0JICAoaWYgKG5vdCBlc2hlbGwtY3VycmVudC1hcmd1bWVu dCkKLQkgICAgICAoc2V0cSBlc2hlbGwtY3VycmVudC1hcmd1bWVudCByZXN1bHQpCi0JICAg ICh1bmxlc3MgZXNoZWxsLWFyZy1saXN0aWZpZWQKLQkgICAgICAoc2V0cSBlc2hlbGwtY3Vy cmVudC1hcmd1bWVudAotCQkgICAgKGxpc3QgZXNoZWxsLWN1cnJlbnQtYXJndW1lbnQpCi0J CSAgICBlc2hlbGwtYXJnLWxpc3RpZmllZCB0KSkKLQkgICAgKG5jb25jIGVzaGVsbC1jdXJy ZW50LWFyZ3VtZW50IChsaXN0IHJlc3VsdCkpKSkpKQorICAgICAgICAgICh1bmxlc3MgKGVx IHJlc3VsdCAnZXNoZWxsLWVtcHR5LXRva2VuKQorICAgICAgICAgICAgKGlmIChub3QgZXNo ZWxsLWN1cnJlbnQtYXJndW1lbnQpCisgICAgICAgICAgICAgICAgKHNldHEgZXNoZWxsLWN1 cnJlbnQtYXJndW1lbnQgcmVzdWx0KQorICAgICAgICAgICAgICAodW5sZXNzIGVzaGVsbC1h cmctbGlzdGlmaWVkCisgICAgICAgICAgICAgICAgKHNldHEgZXNoZWxsLWN1cnJlbnQtYXJn dW1lbnQKKyAgICAgICAgICAgICAgICAgICAgICAobGlzdCBlc2hlbGwtY3VycmVudC1hcmd1 bWVudCkKKyAgICAgICAgICAgICAgICAgICAgICBlc2hlbGwtYXJnLWxpc3RpZmllZCB0KSkK KyAgICAgICAgICAgICAgKG5jb25jIGVzaGVsbC1jdXJyZW50LWFyZ3VtZW50IChsaXN0IHJl c3VsdCkpKSkpKSkKICAgICAod2hlbiAoYW5kIG91dGVyIGVzaGVsbC1jdXJyZW50LWFyZ3Vt ZW50KQogICAgICAgKGFkZC10ZXh0LXByb3BlcnRpZXMgYXJnLWJlZ2luICgxKyBhcmctYmVn aW4pCiAJCQkgICAnKGFyZy1iZWdpbiB0IHJlYXItbm9uc3RpY2t5CkBAIC0zNzUsMTUgKzM3 NywyMCBAQCBlc2hlbGwtcGFyc2UtYmFja3NsYXNoCiAgICAgKHdoZW4gKGVzaGVsbC1sb29r aW5nLWF0LWJhY2tzbGFzaC1yZXR1cm4gKHBvaW50KSkKIAkodGhyb3cgJ2VzaGVsbC1pbmNv bXBsZXRlID9cXCkpCiAgICAgKGZvcndhcmQtY2hhciAyKSA7IE1vdmUgb25lIGNoYXIgcGFz dCB0aGUgYmFja3NsYXNoLgotICAgIDs7IElmIHRoZSBjaGFyIGlzIGluIGEgcXVvdGUsIGJh Y2tzbGFzaCBvbmx5IGhhcyBzcGVjaWFsIG1lYW5pbmcKLSAgICA7OyBpZiBpdCBpcyBlc2Nh cGluZyBhIHNwZWNpYWwgY2hhci4KLSAgICAoaWYgZXNoZWxsLWN1cnJlbnQtcXVvdGVkCi0g ICAgICAgIChpZiAobWVtcSAoY2hhci1iZWZvcmUpIGVzaGVsbC1zcGVjaWFsLWNoYXJzLWlu c2lkZS1xdW90aW5nKQorICAgIChpZiAoZXEgKGNoYXItYmVmb3JlKSA/XG4pCisgICAgICAg IDs7IEVzY2FwZWQgbmV3bGluZXMgYXJlIGV4dHJhLXNwZWNpYWw6IHRoZXkgZXhwYW5kIHRv IGFuIGVtcHR5CisgICAgICAgIDs7IHRva2VuIHRvIGFsbG93IGZvciBjb250aW51aW5nIEVz aGVsbCBjb21tYW5kcyBhY3Jvc3MKKyAgICAgICAgOzsgbXVsdGlwbGUgbGluZXMuCisgICAg ICAgICdlc2hlbGwtZW1wdHktdG9rZW4KKyAgICAgIDs7IElmIHRoZSBjaGFyIGlzIGluIGEg cXVvdGUsIGJhY2tzbGFzaCBvbmx5IGhhcyBzcGVjaWFsIG1lYW5pbmcKKyAgICAgIDs7IGlm IGl0IGlzIGVzY2FwaW5nIGEgc3BlY2lhbCBjaGFyLgorICAgICAgKGlmIGVzaGVsbC1jdXJy ZW50LXF1b3RlZAorICAgICAgICAgIChpZiAobWVtcSAoY2hhci1iZWZvcmUpIGVzaGVsbC1z cGVjaWFsLWNoYXJzLWluc2lkZS1xdW90aW5nKQorICAgICAgICAgICAgICAobGlzdCAnZXNo ZWxsLWVzY2FwZS1hcmcgKGNoYXItdG8tc3RyaW5nIChjaGFyLWJlZm9yZSkpKQorICAgICAg ICAgICAgKGNvbmNhdCAiXFwiIChjaGFyLXRvLXN0cmluZyAoY2hhci1iZWZvcmUpKSkpCisg ICAgICAgIChpZiAobWVtcSAoY2hhci1iZWZvcmUpIGVzaGVsbC1zcGVjaWFsLWNoYXJzLW91 dHNpZGUtcXVvdGluZykKICAgICAgICAgICAgIChsaXN0ICdlc2hlbGwtZXNjYXBlLWFyZyAo Y2hhci10by1zdHJpbmcgKGNoYXItYmVmb3JlKSkpCi0gICAgICAgICAgKGNvbmNhdCAiXFwi IChjaGFyLXRvLXN0cmluZyAoY2hhci1iZWZvcmUpKSkpCi0gICAgICAoaWYgKG1lbXEgKGNo YXItYmVmb3JlKSBlc2hlbGwtc3BlY2lhbC1jaGFycy1vdXRzaWRlLXF1b3RpbmcpCi0gICAg ICAgICAgKGxpc3QgJ2VzaGVsbC1lc2NhcGUtYXJnIChjaGFyLXRvLXN0cmluZyAoY2hhci1i ZWZvcmUpKSkKLSAgICAgICAgKGNoYXItdG8tc3RyaW5nIChjaGFyLWJlZm9yZSkpKSkpKQor ICAgICAgICAgIChjaGFyLXRvLXN0cmluZyAoY2hhci1iZWZvcmUpKSkpKSkpCiAKIChkZWZ1 biBlc2hlbGwtcGFyc2UtbGl0ZXJhbC1xdW90ZSAoKQogICAiUGFyc2UgYSBsaXRlcmFsbHkg cXVvdGVkIHN0cmluZy4gIE5vdGhpbmcgaGFzIHNwZWNpYWwgbWVhbmluZyEiCmRpZmYgLS1n aXQgYS90ZXN0L2xpc3AvZXNoZWxsL2VzaC1hcmctdGVzdHMuZWwgYi90ZXN0L2xpc3AvZXNo ZWxsL2VzaC1hcmctdGVzdHMuZWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAw MDAwMDAuLjc3Zjk0MDRkNGM3Ci0tLSAvZGV2L251bGwKKysrIGIvdGVzdC9saXNwL2VzaGVs bC9lc2gtYXJnLXRlc3RzLmVsCkBAIC0wLDAgKzEsMTA1IEBACis7OzsgZXNoLWFyZy10ZXN0 cy5lbCAtLS0gZXNoLWFyZyB0ZXN0IHN1aXRlICAtKi0gbGV4aWNhbC1iaW5kaW5nOnQgLSot CisKKzs7IENvcHlyaWdodCAoQykgMjAyMiBGcmVlIFNvZnR3YXJlIEZvdW5kYXRpb24sIElu Yy4KKworOzsgVGhpcyBmaWxlIGlzIHBhcnQgb2YgR05VIEVtYWNzLgorCis7OyBHTlUgRW1h Y3MgaXMgZnJlZSBzb2Z0d2FyZTogeW91IGNhbiByZWRpc3RyaWJ1dGUgaXQgYW5kL29yIG1v ZGlmeQorOzsgaXQgdW5kZXIgdGhlIHRlcm1zIG9mIHRoZSBHTlUgR2VuZXJhbCBQdWJsaWMg TGljZW5zZSBhcyBwdWJsaXNoZWQgYnkKKzs7IHRoZSBGcmVlIFNvZnR3YXJlIEZvdW5kYXRp b24sIGVpdGhlciB2ZXJzaW9uIDMgb2YgdGhlIExpY2Vuc2UsIG9yCis7OyAoYXQgeW91ciBv cHRpb24pIGFueSBsYXRlciB2ZXJzaW9uLgorCis7OyBHTlUgRW1hY3MgaXMgZGlzdHJpYnV0 ZWQgaW4gdGhlIGhvcGUgdGhhdCBpdCB3aWxsIGJlIHVzZWZ1bCwKKzs7IGJ1dCBXSVRIT1VU IEFOWSBXQVJSQU5UWTsgd2l0aG91dCBldmVuIHRoZSBpbXBsaWVkIHdhcnJhbnR5IG9mCis7 OyBNRVJDSEFOVEFCSUxJVFkgb3IgRklUTkVTUyBGT1IgQSBQQVJUSUNVTEFSIFBVUlBPU0Uu ICBTZWUgdGhlCis7OyBHTlUgR2VuZXJhbCBQdWJsaWMgTGljZW5zZSBmb3IgbW9yZSBkZXRh aWxzLgorCis7OyBZb3Ugc2hvdWxkIGhhdmUgcmVjZWl2ZWQgYSBjb3B5IG9mIHRoZSBHTlUg R2VuZXJhbCBQdWJsaWMgTGljZW5zZQorOzsgYWxvbmcgd2l0aCBHTlUgRW1hY3MuICBJZiBu b3QsIHNlZSA8aHR0cHM6Ly93d3cuZ251Lm9yZy9saWNlbnNlcy8+LgorCis7OzsgQ29tbWVu dGFyeToKKworOzsgVGVzdHMgZm9yIEVzaGVsbCdzIGFyZ3VtZW50IGhhbmRsaW5nLgorCis7 OzsgQ29kZToKKworKHJlcXVpcmUgJ2VydCkKKyhyZXF1aXJlICdlc2gtbW9kZSkKKyhyZXF1 aXJlICdlc2hlbGwpCisKKyhyZXF1aXJlICdlc2hlbGwtdGVzdHMtaGVscGVycworICAgICAg ICAgKGV4cGFuZC1maWxlLW5hbWUgImVzaGVsbC10ZXN0cy1oZWxwZXJzIgorICAgICAgICAg ICAgICAgICAgICAgICAgICAgKGZpbGUtbmFtZS1kaXJlY3RvcnkgKG9yIGxvYWQtZmlsZS1u YW1lCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgZGVmYXVsdC1kaXJlY3RvcnkpKSkpCisKKyhkZWZ2YXIgZXNoZWxsLXRlc3QtdmFsdWUg bmlsKQorCis7OzsgVGVzdHM6CisKKyhlcnQtZGVmdGVzdCBlc2gtYXJnLXRlc3QvZXNjYXBl L25vbnNwZWNpYWwgKCkKKyAgIlRlc3QgdGhhdCBcIlxcY1wiIGFuZCBcImNcIiBhcmUgZXF1 aXZhbGVudCB3aGVuIFwiY1wiIGlzIG5vdCBhCitzcGVjaWFsIGNoYXJhY3Rlci4iCisgICh3 aXRoLXRlbXAtZXNoZWxsCisgICAoZXNoZWxsLW1hdGNoLWNvbW1hbmQtb3V0cHV0ICJlY2hv IGhlXFxsbG8iCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICJoZWxsb1xuIikp KQorCisoZXJ0LWRlZnRlc3QgZXNoLWFyZy10ZXN0L2VzY2FwZS9ub25zcGVjaWFsLXVuaWNv ZGUgKCkKKyAgIlRlc3QgdGhhdCBcIlxcY1wiIGFuZCBcImNcIiBhcmUgZXF1aXZhbGVudCB3 aGVuIFwiY1wiIGlzIGEKK3VuaWNvZGUgY2hhcmFjdGVyICh1bmljb2RlIGNoYXJhY3RlcnMg YXJlIG5vbnNwZWNpYWwgYnkKK2RlZmluaXRpb24pLiIKKyAgKHdpdGgtdGVtcC1lc2hlbGwK KyAgIChlc2hlbGwtbWF0Y2gtY29tbWFuZC1vdXRwdXQgImVjaG8gVmlkXFzDqW9zIgorICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAiVmlkw6lvc1xuIikpKQorCisoZXJ0LWRl ZnRlc3QgZXNoLWFyZy10ZXN0L2VzY2FwZS9zcGVjaWFsICgpCisgICJUZXN0IHRoYXQgdGhl IGJhY2tzbGFzaCBpcyBub3QgcHJlc2VydmVkIGZvciBlc2NhcGVkIHNwZWNpYWwKK2NoYXJz LiIKKyAgKHdpdGgtdGVtcC1lc2hlbGwKKyAgIChlc2hlbGwtbWF0Y2gtY29tbWFuZC1vdXRw dXQgImVjaG8gaGVcXFxcbGxvIgorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICA7 OyBCYWNrc2xhc2hlcyBhcmUgZG91YmxlZCBmb3IgcmVnZXhwLgorICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAiaGVcXFxcbGxvXG4iKSkpCisKKyhlcnQtZGVmdGVzdCBlc2gt YXJnLXRlc3QvZXNjYXBlL25ld2xpbmUgKCkKKyAgIlRlc3QgdGhhdCBhbiBlc2NhcGVkIG5l d2xpbmUgaXMgZXF1aXZhbGVudCB0byB0aGUgZW1wdHkgc3RyaW5nLgorV2hlbiBuZXdsaW5l cyBhcmUgKm5vbnNwZWNpYWwqLCBhbiBlc2NhcGVkIG5ld2xpbmUgc2hvdWxkIGJlCit0cmVh dGVkIGFzIGp1c3QgYSBuZXdsaW5lLiIKKyAgKHdpdGgtdGVtcC1lc2hlbGwKKyAgIChlc2hl bGwtbWF0Y2gtY29tbWFuZC1vdXRwdXQgImVjaG8gaGlcXFxudGhlcmUiCisgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICJoaXRoZXJlXG4iKSkpCisKKyhlcnQtZGVmdGVzdCBl c2gtYXJnLXRlc3QvZXNjYXBlL25ld2xpbmUtY29uZGl0aW9uYWwgKCkKKyAgIlRlc3QgaW52 b2NhdGlvbiBvZiBhbiBpZi9lbHNlIHN0YXRlbWVudCB1c2luZyBsaW5lIGNvbnRpbnVhdGlv bnMuIgorICAobGV0ICgoZXNoZWxsLXRlc3QtdmFsdWUgdCkpCisgICAgKGVzaGVsbC1jb21t YW5kLXJlc3VsdC1lcXVhbAorICAgICAiaWYgJGVzaGVsbC10ZXN0LXZhbHVlIFxcXG57ZWNo byB5ZXN9IFxcXG57ZWNobyBub30iCisgICAgICJ5ZXMiKSkKKyAgKGxldCAoKGVzaGVsbC10 ZXN0LXZhbHVlIG5pbCkpCisgICAgKGVzaGVsbC1jb21tYW5kLXJlc3VsdC1lcXVhbAorICAg ICAiaWYgJGVzaGVsbC10ZXN0LXZhbHVlIFxcXG57ZWNobyB5ZXN9IFxcXG57ZWNobyBub30i CisgICAgICJubyIpKSkKKworKGVydC1kZWZ0ZXN0IGVzaC1hcmctdGVzdC9lc2NhcGUtcXVv dGVkL25vbnNwZWNpYWwgKCkKKyAgIlRlc3QgdGhhdCB0aGUgYmFja3NsYXNoIGlzIHByZXNl cnZlZCBmb3IgZXNjYXBlZCBub25zcGVjaWFsCitjaGFycy4iCisgICh3aXRoLXRlbXAtZXNo ZWxsCisgICAoZXNoZWxsLW1hdGNoLWNvbW1hbmQtb3V0cHV0ICJlY2hvIFwiaFxcaVwiIgor ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICA7OyBCYWNrc2xhc2hlcyBhcmUgZG91 YmxlZCBmb3IgcmVnZXhwLgorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAiaFxc XFxpXG4iKSkpCisKKyhlcnQtZGVmdGVzdCBlc2gtYXJnLXRlc3QvZXNjYXBlLXF1b3RlZC9z cGVjaWFsICgpCisgICJUZXN0IHRoYXQgdGhlIGJhY2tzbGFzaCBpcyBub3QgcHJlc2VydmVk IGZvciBlc2NhcGVkIHNwZWNpYWwKK2NoYXJzLiIKKyAgKHdpdGgtdGVtcC1lc2hlbGwKKyAg IChlc2hlbGwtbWF0Y2gtY29tbWFuZC1vdXRwdXQgImVjaG8gXCJcXFwiaGlcXFxcXCIiCisg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIDs7IEJhY2tzbGFzaGVzIGFyZSBkb3Vi bGVkIGZvciByZWdleHAuCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICJcXFwi aGlcXFxcXG4iKSkpCisKKyhlcnQtZGVmdGVzdCBlc2gtYXJnLXRlc3QvZXNjYXBlLXF1b3Rl ZC9uZXdsaW5lICgpCisgICJUZXN0IHRoYXQgYW4gZXNjYXBlZCBuZXdsaW5lIGlzIGVxdWl2 YWxlbnQgdG8gdGhlIGVtcHR5IHN0cmluZy4KK1doZW4gbmV3bGluZXMgYXJlICpub25zcGVj aWFsKiwgYW4gZXNjYXBlZCBuZXdsaW5lIHNob3VsZCBiZQordHJlYXRlZCBsaXRlcmFsbHks IGFzIGEgYmFja3NsYXNoIGFuZCBhIG5ld2xpbmUuIgorICAod2l0aC10ZW1wLWVzaGVsbAor ICAgKGVzaGVsbC1tYXRjaC1jb21tYW5kLW91dHB1dCAiZWNobyBcImhpXFxcbnRoZXJlXCIi CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICJoaXRoZXJlXG4iKSkpCisKKzs7 IGVzaC1hcmctdGVzdHMuZWwgZW5kcyBoZXJlCmRpZmYgLS1naXQgYS90ZXN0L2xpc3AvZXNo ZWxsL2VzaGVsbC10ZXN0cy5lbCBiL3Rlc3QvbGlzcC9lc2hlbGwvZXNoZWxsLXRlc3RzLmVs CmluZGV4IGQ1MTEyMTQ2YzJkLi5jNjdhYzY3ZmQzNiAxMDA2NDQKLS0tIGEvdGVzdC9saXNw L2VzaGVsbC9lc2hlbGwtdGVzdHMuZWwKKysrIGIvdGVzdC9saXNwL2VzaGVsbC9lc2hlbGwt dGVzdHMuZWwKQEAgLTEwNSwzNyArMTA1LDYgQEAgZXNoZWxsLXRlc3QvbGlzcC1yZXNldC1p bi1waXBlbGluZQogICAgICAoZm9ybWF0IHRlbXBsYXRlICJmb3JtYXQgXCIlc1wiIGVzaGVs bC1pbi1waXBlbGluZS1wIikKICAgICAgIm5pbCIpKSkKIAotKGVydC1kZWZ0ZXN0IGVzaGVs bC10ZXN0L2VzY2FwZS1ub25zcGVjaWFsICgpCi0gICJUZXN0IHRoYXQgXCJcXGNcIiBhbmQg XCJjXCIgYXJlIGVxdWl2YWxlbnQgd2hlbiBcImNcIiBpcyBub3QgYQotc3BlY2lhbCBjaGFy YWN0ZXIuIgotICAod2l0aC10ZW1wLWVzaGVsbAotICAgKGVzaGVsbC1tYXRjaC1jb21tYW5k LW91dHB1dCAiZWNobyBoZVxcbGxvIgotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAiaGVsbG9cbiIpKSkKLQotKGVydC1kZWZ0ZXN0IGVzaGVsbC10ZXN0L2VzY2FwZS1ub25z cGVjaWFsLXVuaWNvZGUgKCkKLSAgIlRlc3QgdGhhdCBcIlxcY1wiIGFuZCBcImNcIiBhcmUg ZXF1aXZhbGVudCB3aGVuIFwiY1wiIGlzIGEKLXVuaWNvZGUgY2hhcmFjdGVyICh1bmljb2Rl IGNoYXJhY3RlcnMgYXJlIG5vbnNwZWNpYWwgYnkKLWRlZmluaXRpb24pLiIKLSAgKHdpdGgt dGVtcC1lc2hlbGwKLSAgIChlc2hlbGwtbWF0Y2gtY29tbWFuZC1vdXRwdXQgImVjaG8gVmlk XFzDqW9zIgotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAiVmlkw6lvc1xuIikp KQotCi0oZXJ0LWRlZnRlc3QgZXNoZWxsLXRlc3QvZXNjYXBlLW5vbnNwZWNpYWwtcXVvdGVk ICgpCi0gICJUZXN0IHRoYXQgdGhlIGJhY2tzbGFzaCBpcyBwcmVzZXJ2ZWQgZm9yIGVzY2Fw ZWQgbm9uc3BlY2lhbAotY2hhcnMiCi0gICh3aXRoLXRlbXAtZXNoZWxsCi0gICAoZXNoZWxs LW1hdGNoLWNvbW1hbmQtb3V0cHV0ICJlY2hvIFwiaFxcaVwiIgotICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICA7OyBCYWNrc2xhc2hlcyBhcmUgZG91YmxlZCBmb3IgcmVnZXhw LgotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAiaFxcXFxpXG4iKSkpCi0KLShl cnQtZGVmdGVzdCBlc2hlbGwtdGVzdC9lc2NhcGUtc3BlY2lhbC1xdW90ZWQgKCkKLSAgIlRl c3QgdGhhdCB0aGUgYmFja3NsYXNoIGlzIG5vdCBwcmVzZXJ2ZWQgZm9yIGVzY2FwZWQgc3Bl Y2lhbAotY2hhcnMiCi0gICh3aXRoLXRlbXAtZXNoZWxsCi0gICAoZXNoZWxsLW1hdGNoLWNv bW1hbmQtb3V0cHV0ICJlY2hvIFwiXFxcImhpXFxcXFwiIgotICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICA7OyBCYWNrc2xhc2hlcyBhcmUgZG91YmxlZCBmb3IgcmVnZXhwLgot ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAiXFxcImhpXFxcXFxuIikpKQotCiAo ZXJ0LWRlZnRlc3QgZXNoZWxsLXRlc3QvY29tbWFuZC1ydW5uaW5nLXAgKCkKICAgIk1vZGVs aW5lIHNob3VsZCBzaG93IG5vIGNvbW1hbmQgcnVubmluZyIKICAgKHdpdGgtdGVtcC1lc2hl bGwKLS0gCjIuMjUuMQoK --------------ZBvu6f9zoUZ351ECsQ85Bnuh Content-Type: text/plain; charset=UTF-8; name="master--0002-Reorganize-the-conditionals-in-eshell-parse-backslas.patch" Content-Disposition: attachment; filename*0="master--0002-Reorganize-the-conditionals-in-eshell-parse-bac"; filename*1="kslas.patch" Content-Transfer-Encoding: base64 RnJvbSBhNTlmOWZkZWZkYzQ5ZDc5YmQ0ZjlhMGUwNGZiMTgwZDA3MzdjODVkIE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBKaW0gUG9ydGVyIDxqcG9ydGVyYnVnc0BnbWFpbC5j b20+CkRhdGU6IFR1ZSwgNiBEZWMgMjAyMiAyMDowNjo0MiAtMDgwMApTdWJqZWN0OiBbUEFU Q0ggMi8yXSA7IFJlb3JnYW5pemUgdGhlIGNvbmRpdGlvbmFscyBpbiAnZXNoZWxsLXBhcnNl LWJhY2tzbGFzaCcKIHRvIHJlZHVjZSByZXBldGl0aW9uCgoqIGxpc3AvZXNoZWxsL2VzaC1h cmcuZWwgKGVzaGVsbC1wYXJzZS1iYWNrc2xhc2gpOiBSZW9yZ2FuaXplLgotLS0KIGxpc3Av ZXNoZWxsL2VzaC1hcmcuZWwgfCAzMiArKysrKysrKysrKysrKysrKystLS0tLS0tLS0tLS0t LQogMSBmaWxlIGNoYW5nZWQsIDE4IGluc2VydGlvbnMoKyksIDE0IGRlbGV0aW9ucygtKQoK ZGlmZiAtLWdpdCBhL2xpc3AvZXNoZWxsL2VzaC1hcmcuZWwgYi9saXNwL2VzaGVsbC9lc2gt YXJnLmVsCmluZGV4IDQ4YWMzZTJiZDRkLi5jZmVjMDRlMTgzZCAxMDA2NDQKLS0tIGEvbGlz cC9lc2hlbGwvZXNoLWFyZy5lbAorKysgYi9saXNwL2VzaGVsbC9lc2gtYXJnLmVsCkBAIC0z NzcsMjAgKzM3NywyNCBAQCBlc2hlbGwtcGFyc2UtYmFja3NsYXNoCiAgICAgKHdoZW4gKGVz aGVsbC1sb29raW5nLWF0LWJhY2tzbGFzaC1yZXR1cm4gKHBvaW50KSkKIAkodGhyb3cgJ2Vz aGVsbC1pbmNvbXBsZXRlID9cXCkpCiAgICAgKGZvcndhcmQtY2hhciAyKSA7IE1vdmUgb25l IGNoYXIgcGFzdCB0aGUgYmFja3NsYXNoLgotICAgIChpZiAoZXEgKGNoYXItYmVmb3JlKSA/ XG4pCi0gICAgICAgIDs7IEVzY2FwZWQgbmV3bGluZXMgYXJlIGV4dHJhLXNwZWNpYWw6IHRo ZXkgZXhwYW5kIHRvIGFuIGVtcHR5Ci0gICAgICAgIDs7IHRva2VuIHRvIGFsbG93IGZvciBj b250aW51aW5nIEVzaGVsbCBjb21tYW5kcyBhY3Jvc3MKLSAgICAgICAgOzsgbXVsdGlwbGUg bGluZXMuCi0gICAgICAgICdlc2hlbGwtZW1wdHktdG9rZW4KLSAgICAgIDs7IElmIHRoZSBj aGFyIGlzIGluIGEgcXVvdGUsIGJhY2tzbGFzaCBvbmx5IGhhcyBzcGVjaWFsIG1lYW5pbmcK LSAgICAgIDs7IGlmIGl0IGlzIGVzY2FwaW5nIGEgc3BlY2lhbCBjaGFyLgotICAgICAgKGlm IGVzaGVsbC1jdXJyZW50LXF1b3RlZAotICAgICAgICAgIChpZiAobWVtcSAoY2hhci1iZWZv cmUpIGVzaGVsbC1zcGVjaWFsLWNoYXJzLWluc2lkZS1xdW90aW5nKQotICAgICAgICAgICAg ICAobGlzdCAnZXNoZWxsLWVzY2FwZS1hcmcgKGNoYXItdG8tc3RyaW5nIChjaGFyLWJlZm9y ZSkpKQotICAgICAgICAgICAgKGNvbmNhdCAiXFwiIChjaGFyLXRvLXN0cmluZyAoY2hhci1i ZWZvcmUpKSkpCi0gICAgICAgIChpZiAobWVtcSAoY2hhci1iZWZvcmUpIGVzaGVsbC1zcGVj aWFsLWNoYXJzLW91dHNpZGUtcXVvdGluZykKLSAgICAgICAgICAgIChsaXN0ICdlc2hlbGwt ZXNjYXBlLWFyZyAoY2hhci10by1zdHJpbmcgKGNoYXItYmVmb3JlKSkpCi0gICAgICAgICAg KGNoYXItdG8tc3RyaW5nIChjaGFyLWJlZm9yZSkpKSkpKSkKKyAgICAobGV0ICgoc3BlY2lh bC1jaGFycyAoaWYgZXNoZWxsLWN1cnJlbnQtcXVvdGVkCisgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIGVzaGVsbC1zcGVjaWFsLWNoYXJzLWluc2lkZS1xdW90aW5nCisgICAgICAg ICAgICAgICAgICAgICAgICAgICBlc2hlbGwtc3BlY2lhbC1jaGFycy1vdXRzaWRlLXF1b3Rp bmcpKSkKKyAgICAgIChjb25kCisgICAgICAgOzsgRXNjYXBlZCBuZXdsaW5lcyBhcmUgZXh0 cmEtc3BlY2lhbDogdGhleSBleHBhbmQgdG8gYW4gZW1wdHkKKyAgICAgICA7OyB0b2tlbiB0 byBhbGxvdyBmb3IgY29udGludWluZyBFc2hlbGwgY29tbWFuZHMgYWNyb3NzCisgICAgICAg OzsgbXVsdGlwbGUgbGluZXMuCisgICAgICAgKChlcSAoY2hhci1iZWZvcmUpID9cbikKKyAg ICAgICAgJ2VzaGVsbC1lbXB0eS10b2tlbikKKyAgICAgICAoKG1lbXEgKGNoYXItYmVmb3Jl KSBzcGVjaWFsLWNoYXJzKQorICAgICAgICAobGlzdCAnZXNoZWxsLWVzY2FwZS1hcmcgKGNo YXItdG8tc3RyaW5nIChjaGFyLWJlZm9yZSkpKSkKKyAgICAgICA7OyBJZiB0aGUgY2hhciBp cyBpbiBhIHF1b3RlLCBiYWNrc2xhc2ggb25seSBoYXMgc3BlY2lhbAorICAgICAgIDs7IG1l YW5pbmcgaWYgaXQgaXMgZXNjYXBpbmcgYSBzcGVjaWFsIGNoYXIuICBPdGhlcndpc2UsIHRo ZQorICAgICAgIDs7IHJlc3VsdCBpcyB0aGUgbGl0ZXJhbCBzdHJpbmcgIlxjIi4KKyAgICAg ICAoZXNoZWxsLWN1cnJlbnQtcXVvdGVkCisgICAgICAgIChjb25jYXQgIlxcIiAoY2hhci10 by1zdHJpbmcgKGNoYXItYmVmb3JlKSkpKQorICAgICAgICh0CisgICAgICAgIChjaGFyLXRv LXN0cmluZyAoY2hhci1iZWZvcmUpKSkpKSkpCiAKIChkZWZ1biBlc2hlbGwtcGFyc2UtbGl0 ZXJhbC1xdW90ZSAoKQogICAiUGFyc2UgYSBsaXRlcmFsbHkgcXVvdGVkIHN0cmluZy4gIE5v dGhpbmcgaGFzIHNwZWNpYWwgbWVhbmluZyEiCi0tIAoyLjI1LjEKCg== --------------ZBvu6f9zoUZ351ECsQ85Bnuh-- From debbugs-submit-bounces@debbugs.gnu.org Wed Dec 07 08:34:58 2022 Received: (at 59622) by debbugs.gnu.org; 7 Dec 2022 13:34:59 +0000 Received: from localhost ([127.0.0.1]:50391 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p2uZe-0000tO-Id for submit@debbugs.gnu.org; Wed, 07 Dec 2022 08:34:58 -0500 Received: from eggs.gnu.org ([209.51.188.92]:35436) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p2uZa-0000tE-Ga for 59622@debbugs.gnu.org; Wed, 07 Dec 2022 08:34:57 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p2uZV-0005pb-8J; Wed, 07 Dec 2022 08:34:49 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=References:Subject:In-Reply-To:To:From:Date: mime-version; bh=mpNsuQV0XZN9hpGw4vX20JHHhCf7S8b/BP2NIZ/0zXc=; b=koKuxTnJUFXQ TJoGUCB82W1m4vECF7M9Fp/Zr0QGJi5smnJs2N/YYVScigB6fCVmIQNhDmZ9oZJwtC9AuJm59Dz3h vKY30WXRl7XmN0In5UWDlhj9L6F9WDxZOzqqGZKqK6ZxA9JgUxc2fsNJIpXQAxKAhGI/H46c5o65e vdSm/h2vQp/bjX1Sw7UA+VIWmOc3vNUDCphSbEwazK5Kfikb5r5bMynvL+kVkHSPz1CRF9XaeFEju aLwMq53GxYVFfaAx5VAujY3qn8OoUfETuderNjQ6ANBiiFbajBI3sV0wWinkw4hfotTwdOeHHiXrk aeJT17PG8KsDwodeDe7pxQ==; Received: from [87.69.77.57] (helo=home-c4e4a596f7) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p2uZU-0000HQ-9f; Wed, 07 Dec 2022 08:34:48 -0500 Date: Wed, 07 Dec 2022 15:34:36 +0200 Message-Id: <83v8mn49sj.fsf@gnu.org> From: Eli Zaretskii To: Jim Porter In-Reply-To: <9b18ac1f-04b3-63c9-56c0-84233f849d5d@gmail.com> (message from Jim Porter on Tue, 6 Dec 2022 20:18:30 -0800) Subject: Re: bug#59622: 29.0.50; [PATCH] Regression in Eshell's handling of escaped newlines References: <90faf628-390d-1094-2fcb-e6a23ac46da8@gmail.com> <83v8mrbpf7.fsf@gnu.org> <3d78b158-5fde-d4c0-0e9a-cb05e09bed6e@gmail.com> <83359u9g9h.fsf@gnu.org> <9b18ac1f-04b3-63c9-56c0-84233f849d5d@gmail.com> X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 59622 Cc: 59622@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) > Date: Tue, 6 Dec 2022 20:18:30 -0800 > Cc: 59622@debbugs.gnu.org > From: Jim Porter > > > The last sentence is very unclear, please try saying what you need in a > > clearer way, and/or maybe add a couple of examples. > > Ok, I expanded that part of the manual and added a few more examples. > How does this look? Much better, thanks. > I also split the patch in two: the first patch for the 29 branch (which > makes the least code changes I could manage), and the second as an > additional small cleanup patch for master only. Since which Emacs version do we have this regression? If it's a very old regression, I'd prefer not to fix it on the emacs-29 branch. > @subsection Quoting and escaping > As with other shells, you can escape special characters and spaces > -with by prefixing the character with a backslash (@code{\}), or by > -surrounding the string with apostrophes (@code{''}) or double quotes > -(@code{""}). This is needed especially for file names with special > -characters like pipe (@code{|}), which could be part of remote file > +with by prefixing the character with a backslash (@samp{\}), or by "with by prefixing" is a typo; probably "with" should be dropped. From debbugs-submit-bounces@debbugs.gnu.org Wed Dec 07 12:58:09 2022 Received: (at 59622) by debbugs.gnu.org; 7 Dec 2022 17:58:09 +0000 Received: from localhost ([127.0.0.1]:51381 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p2ygL-0005Z9-CO for submit@debbugs.gnu.org; Wed, 07 Dec 2022 12:58:09 -0500 Received: from mail-pf1-f182.google.com ([209.85.210.182]:36429) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p2ygI-0005YO-U5 for 59622@debbugs.gnu.org; Wed, 07 Dec 2022 12:58:07 -0500 Received: by mail-pf1-f182.google.com with SMTP id x66so18150186pfx.3 for <59622@debbugs.gnu.org>; Wed, 07 Dec 2022 09:58:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:in-reply-to:from:references:cc:to :content-language:subject:mime-version:date:message-id:from:to:cc :subject:date:message-id:reply-to; bh=r5yR7Swzt85fCmPSSZcvkJXaUMeuK4Q9orshjkjL8wU=; b=cESfJOIyF8TsuO8L3hQElBHU2t1/bm75K6bTQtrG4pTBO534aCvSjyPrpEd5hmVrNE Z/r77CP2d5AGTyLfoqNCHIwNlvyt3HkGJ6jtT12FtLsyRUrfZXp/SxtVQboSKPBY2LsH wrvWCkKcBSXwvVp/jnbmAlX2XW9rk2gL0p8j5yB4bVXJWQiy7Kj/48h+NKoNaZD3ixLI 3tG2Oqp0iSScJra0CHXONUeaRVUY359uM5lrsPyFFCjLzSbwuBuImDMgP8XzAxIGCoSD binHecG2YUuxYzcwqlugDHbkolYzEITEg4Q8PekvGEziQ2EV6hy8zvWLSScXjPZ9+6Yw jtKA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:in-reply-to:from:references:cc:to :content-language:subject:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=r5yR7Swzt85fCmPSSZcvkJXaUMeuK4Q9orshjkjL8wU=; b=cXcekRyT3yfZocwwmIwEEmoqrKVPpRmhB60DdRheG6HiXfKR5uh2hX9wrq6KjDzv3/ ZjIC4rSSrH/Pr2yEQZzz0VB+/MQfFPN2CWSd5HF8FVbbnL6gjlY24FGESyLj8sc+M9i8 dsoNvG7tBBawP3kDRJD40dXgtyECrsEIIaojflDgvg+XgcPN/Ht6zsXy6RRC8Jyi2EQ4 bCA2KFIZH6V5NrDDPuOgBBumeGLar9AC+H76EeP1tkPIodw91f51INieoK5peM08eepK UgFneaqj+/yl0yd7ss/ubnMxozeBEX1mhH/MCipPyExvW1vhU+x5cYIvP9m1XLleXAi1 damw== X-Gm-Message-State: ANoB5plioTXCb9PcQ8GC1/iPxnKPs3wCOJRU8vi8dnROiVGw/0yXNhoA k85S+9ZREhKe1hUY2raIRbY= X-Google-Smtp-Source: AA0mqf6nShQglRfoI58dYBelUmGGurkdTgm1C9SvZtsJrkvi+C4QmYjzZ9IQk6/3tRT40+i7W/Vc/A== X-Received: by 2002:a63:d556:0:b0:46b:158f:6265 with SMTP id v22-20020a63d556000000b0046b158f6265mr65541768pgi.193.1670435881012; Wed, 07 Dec 2022 09:58:01 -0800 (PST) Received: from [192.168.1.2] (cpe-76-168-148-233.socal.res.rr.com. [76.168.148.233]) by smtp.googlemail.com with ESMTPSA id t15-20020a63f34f000000b0046fefb18a09sm11614377pgj.91.2022.12.07.09.57.59 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 07 Dec 2022 09:58:00 -0800 (PST) Message-ID: <1335dd36-a50b-e03b-670b-58b1e08cc979@gmail.com> Date: Wed, 7 Dec 2022 09:57:59 -0800 MIME-Version: 1.0 Subject: Re: bug#59622: 29.0.50; [PATCH] Regression in Eshell's handling of escaped newlines Content-Language: en-US To: Eli Zaretskii References: <90faf628-390d-1094-2fcb-e6a23ac46da8@gmail.com> <83v8mrbpf7.fsf@gnu.org> <3d78b158-5fde-d4c0-0e9a-cb05e09bed6e@gmail.com> <83359u9g9h.fsf@gnu.org> <9b18ac1f-04b3-63c9-56c0-84233f849d5d@gmail.com> <83v8mn49sj.fsf@gnu.org> From: Jim Porter In-Reply-To: <83v8mn49sj.fsf@gnu.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 59622 Cc: 59622@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) On 12/7/2022 5:34 AM, Eli Zaretskii wrote: >> Date: Tue, 6 Dec 2022 20:18:30 -0800 >> Cc: 59622@debbugs.gnu.org >> From: Jim Porter >> >> I also split the patch in two: the first patch for the 29 branch (which >> makes the least code changes I could manage), and the second as an >> additional small cleanup patch for master only. > > Since which Emacs version do we have this regression? If it's a very > old regression, I'd prefer not to fix it on the emacs-29 branch. This worked properly in Emacs 28 and is broken in 29. I'm not 100% sure which patch regressed it, but my guess is patch 0003 in bug#54227, which was merged in March. >> @subsection Quoting and escaping >> As with other shells, you can escape special characters and spaces >> -with by prefixing the character with a backslash (@code{\}), or by >> -surrounding the string with apostrophes (@code{''}) or double quotes >> -(@code{""}). This is needed especially for file names with special >> -characters like pipe (@code{|}), which could be part of remote file >> +with by prefixing the character with a backslash (@samp{\}), or by > > "with by prefixing" is a typo; probably "with" should be dropped. Good catch! I missed that despite reading it a few times while editing the manual. From debbugs-submit-bounces@debbugs.gnu.org Wed Dec 07 13:10:26 2022 Received: (at 59622) by debbugs.gnu.org; 7 Dec 2022 18:10:26 +0000 Received: from localhost ([127.0.0.1]:51448 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p2ysD-0007xi-SJ for submit@debbugs.gnu.org; Wed, 07 Dec 2022 13:10:26 -0500 Received: from eggs.gnu.org ([209.51.188.92]:52982) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p2ysC-0007xc-88 for 59622@debbugs.gnu.org; Wed, 07 Dec 2022 13:10:24 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p2ys7-0003mQ-23; Wed, 07 Dec 2022 13:10:19 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=References:Subject:In-Reply-To:To:From:Date: mime-version; bh=9elJ0bVk7XIv6QVWoEa92M6Zq4vTKLsFk9fzqsYbbAo=; b=Jz0Q+nCzMtvD EjXFVyo9+/EvlGwEsyfr5Y9YFnmbihnbxtE4/RDbcVy2UNU2ALYRAKl78yj26RByr9mP+wa6vXPrK 5vDUpbPKGDhgY37uYG6W+lPplOLNKwn0K6bib4nt6U0RcqirywKdLrTCYCOWokSNZkFQ7sFtAuDHc 994pAPF8IWTySugfJtR4JICY9hIju4TO+h1xx6lNsbfyiOlAM9T5M7eIpBpgKcmYIRPYKadUU6Dd5 BN819u431NUyJXIK8hqOssjuk335Aw3hAHG3Phxwhb7cUEoF6oKKUw+1KXKNmKTH7MRzSj3vLaKln GDIFg+dmcWiDLCzpvo+kLQ==; Received: from [87.69.77.57] (helo=home-c4e4a596f7) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p2ys5-0003Cw-Or; Wed, 07 Dec 2022 13:10:18 -0500 Date: Wed, 07 Dec 2022 20:10:05 +0200 Message-Id: <838rjj3x1e.fsf@gnu.org> From: Eli Zaretskii To: Jim Porter In-Reply-To: <1335dd36-a50b-e03b-670b-58b1e08cc979@gmail.com> (message from Jim Porter on Wed, 7 Dec 2022 09:57:59 -0800) Subject: Re: bug#59622: 29.0.50; [PATCH] Regression in Eshell's handling of escaped newlines References: <90faf628-390d-1094-2fcb-e6a23ac46da8@gmail.com> <83v8mrbpf7.fsf@gnu.org> <3d78b158-5fde-d4c0-0e9a-cb05e09bed6e@gmail.com> <83359u9g9h.fsf@gnu.org> <9b18ac1f-04b3-63c9-56c0-84233f849d5d@gmail.com> <83v8mn49sj.fsf@gnu.org> <1335dd36-a50b-e03b-670b-58b1e08cc979@gmail.com> X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 59622 Cc: 59622@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) > Date: Wed, 7 Dec 2022 09:57:59 -0800 > Cc: 59622@debbugs.gnu.org > From: Jim Porter > > On 12/7/2022 5:34 AM, Eli Zaretskii wrote: > >> Date: Tue, 6 Dec 2022 20:18:30 -0800 > >> Cc: 59622@debbugs.gnu.org > >> From: Jim Porter > >> > >> I also split the patch in two: the first patch for the 29 branch (which > >> makes the least code changes I could manage), and the second as an > >> additional small cleanup patch for master only. > > > > Since which Emacs version do we have this regression? If it's a very > > old regression, I'd prefer not to fix it on the emacs-29 branch. > > This worked properly in Emacs 28 and is broken in 29. I'm not 100% sure > which patch regressed it, but my guess is patch 0003 in bug#54227, which > was merged in March. Then we must fix the regression on the emacs-29 branch. Thanks. From debbugs-submit-bounces@debbugs.gnu.org Thu Dec 08 00:47:35 2022 Received: (at 59622) by debbugs.gnu.org; 8 Dec 2022 05:47:35 +0000 Received: from localhost ([127.0.0.1]:54492 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p39ks-0003xY-Sl for submit@debbugs.gnu.org; Thu, 08 Dec 2022 00:47:35 -0500 Received: from mail-pf1-f175.google.com ([209.85.210.175]:41780) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p39ko-0003xF-2s for 59622@debbugs.gnu.org; Thu, 08 Dec 2022 00:47:32 -0500 Received: by mail-pf1-f175.google.com with SMTP id 130so454471pfu.8 for <59622@debbugs.gnu.org>; Wed, 07 Dec 2022 21:47:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:in-reply-to:from:content-language :references:cc:to:subject:mime-version:date:message-id:from:to:cc :subject:date:message-id:reply-to; bh=4J+mH8RhjFvDlpVqvVvlUmxmORlZoFMdboeSE8ydsVY=; b=Mj+QWrivkBtHjw3AWBFbgyCFK6LyproLH5CvvPJAIe1atZdEVzWEykKx+aVmse2JmS 30cQCNh2B93xF3xYxLKXOKioVKVa089ljhhhqJoVR8JpSvMC+vaSdLRN0dZt371u9/es SYFvtPElHJUr0EByg0lrUlefJ/gWr7UVNyWFOotxFMmD8PK3neHxUoaiiG5W26/FHEqP jqYy9Pvt6gFAqvMeEq+ylcu38b1U3vCcB7yR1gNZXReyoHYlC7kjMaoMOlT5mlfiOPuJ AyLVEoewjAoVeeOJA7fnM/bZr0XJahBwxC8t0Zjg88yrs3HzArpzP8Fp8DHdxsreu40P d+SQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:in-reply-to:from:content-language :references:cc:to:subject:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=4J+mH8RhjFvDlpVqvVvlUmxmORlZoFMdboeSE8ydsVY=; b=6s3ev34yNAFsa047Y3/HaK4Vq7Kdxkm0FsTJseBzQUFViZb8BP29oG+dT1WYVSM733 OJQqhvdPh0nYgYUHrEaBB+pE5GDPZOkWX+R/PwqHfDUW/zhkmRgUj+uPx4dCAawqzaEL mjSu096qpMfGanrLIZTiRhaPjt1jrXv6cxYhmrWqFVthOemnetH1iSX1Xn2C4jLVF/P6 IPXu64IOLRp3ZD+lTHcylBJJcF4K4+wIPE3ZgBAQrrfcgmP2Y9arhhfCmDXcatmuCspG dh861LKlwGLAwjP4KBsRZpVPmjT9GW3Zbbl6BDyb1dOin0MTr7qey/3mAI832RRHlHoe zvcA== X-Gm-Message-State: ANoB5pnWs///WR/vczfWKKW+FqVG4df1jmRBX35+mz6n9ltywQrvVkXs pQRJARi1aL6af7H9K0he7YypT/bXHjQ= X-Google-Smtp-Source: AA0mqf6JltL+VIq+V9qqayUBKuQoma5atBcG9Augi/iQ1Wn1o8RHD9pmpOYol7MKHbsc0PslsKCehw== X-Received: by 2002:a63:6286:0:b0:478:c84a:ade1 with SMTP id w128-20020a636286000000b00478c84aade1mr12846100pgb.66.1670478444084; Wed, 07 Dec 2022 21:47:24 -0800 (PST) Received: from [192.168.1.2] (cpe-76-168-148-233.socal.res.rr.com. [76.168.148.233]) by smtp.googlemail.com with ESMTPSA id x12-20020a17090abc8c00b002132f3e71c6sm2037239pjr.52.2022.12.07.21.47.22 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 07 Dec 2022 21:47:23 -0800 (PST) Message-ID: Date: Wed, 7 Dec 2022 21:47:23 -0800 MIME-Version: 1.0 Subject: Re: bug#59622: 29.0.50; [PATCH] Regression in Eshell's handling of escaped newlines To: Eli Zaretskii References: <90faf628-390d-1094-2fcb-e6a23ac46da8@gmail.com> <83v8mrbpf7.fsf@gnu.org> <3d78b158-5fde-d4c0-0e9a-cb05e09bed6e@gmail.com> <83359u9g9h.fsf@gnu.org> <9b18ac1f-04b3-63c9-56c0-84233f849d5d@gmail.com> <83v8mn49sj.fsf@gnu.org> <1335dd36-a50b-e03b-670b-58b1e08cc979@gmail.com> <838rjj3x1e.fsf@gnu.org> Content-Language: en-US From: Jim Porter In-Reply-To: <838rjj3x1e.fsf@gnu.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 59622 Cc: 59622@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) On 12/7/2022 10:10 AM, Eli Zaretskii wrote: >> Date: Wed, 7 Dec 2022 09:57:59 -0800 >> Cc: 59622@debbugs.gnu.org >> From: Jim Porter >> >> This worked properly in Emacs 28 and is broken in 29. I'm not 100% sure >> which patch regressed it, but my guess is patch 0003 in bug#54227, which >> was merged in March. > > Then we must fix the regression on the emacs-29 branch. > > Thanks. Thanks, that sounds right to me too. I've merged this (just the first patch with the fix) to the emacs-29 branch as cf5ce14a6b442649426003fed8dc02ee7edca914. I'll leave this open until I merge the small cleanup patch to master once my first patch has gotten there. From debbugs-submit-bounces@debbugs.gnu.org Thu Dec 08 20:00:03 2022 Received: (at 59622-done) by debbugs.gnu.org; 9 Dec 2022 01:00:04 +0000 Received: from localhost ([127.0.0.1]:60157 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p3RkB-00087S-Ls for submit@debbugs.gnu.org; Thu, 08 Dec 2022 20:00:03 -0500 Received: from mail-pl1-f177.google.com ([209.85.214.177]:46873) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p3Rk9-00086Y-A7 for 59622-done@debbugs.gnu.org; Thu, 08 Dec 2022 20:00:01 -0500 Received: by mail-pl1-f177.google.com with SMTP id jn7so3231647plb.13 for <59622-done@debbugs.gnu.org>; Thu, 08 Dec 2022 17:00:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:in-reply-to:references:cc:to:from :content-language:subject:mime-version:date:message-id:from:to:cc :subject:date:message-id:reply-to; bh=+LWFKYCqRmS78yZl0W1EcVObdTayF81ugJ+5bRnJKaA=; b=B/aKPdzMWbG14jK/JQRjRQJ9DRwXUPL01aBc9zjhtfGzAu4F9mllwPrCBsnIKXctpw dcv4OqHT20r+/Hf6cnSi5eLhtk8onR7Ei05eaZ1c90kBPHgnzq+OfcoFddWdXsbqSKYC PmXXLW6n0AYXRyJBiSrE8upZswta0WH3oVM/kaPkz24XCq0m62THo+YloC5uI+lvbCaS rzu1zjhYvUrCGo80vrPokUW0m00MLJxRjxqQ7hdwfeukrt+E64qbBfdbG6d/vhhq9rsi Spwd2l/uSN7g6stee3Yu6i10xzM22obTolMc4wOXRbSjIW2tvvnAvH9yafYcv9R7BxoG 74aw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:in-reply-to:references:cc:to:from :content-language:subject:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=+LWFKYCqRmS78yZl0W1EcVObdTayF81ugJ+5bRnJKaA=; b=uEFTqIBi9jRhusg5L+3GOi+657Ahj87M6dIMILADWlsKjJsxCGr2R3OMAihQ6/KCrN 2iEbDijvdOLuVbur4LtwD6H/MzYiNwdoMPjxg+JWefCyFWJGqC0Q84X6qTpsQ0C7IS9u a/K/h2nJlySLeH2kT9/P8id+jPabpjq5JvRCf2v3d5+skMRc1gaqda1nhkA7VOnQsnJR gp9js1nEnKRQfl4RCCHrSgo35Xtz7ICzTQKb9yjLfmi9YgT/vF+MECynZpx4SHj5YGVH oAuu4iw3C2njdBOSTz7yRgPhMLWl/PWoC8WWGO/IJZnm7eD8mvtoJ26NBJK3prykE53P PwWg== X-Gm-Message-State: ANoB5pkkwMndnQquQW+EkB0+IcwtPkb+A8HDKGT5bH1Gx21EFdNEg/ve U/dXiIHGGB8yopr/XtNQsyfzJNkozmE= X-Google-Smtp-Source: AA0mqf4wkjs6WDS7IplNclbp+eNqOUodrfTx2m8NKvWNIb9xlLmfu9O5TKwx7p5jIuYqMLSbSaBtCQ== X-Received: by 2002:a17:902:b406:b0:189:e711:173 with SMTP id x6-20020a170902b40600b00189e7110173mr3813133plr.33.1670547595192; Thu, 08 Dec 2022 16:59:55 -0800 (PST) Received: from [192.168.1.2] (cpe-76-168-148-233.socal.res.rr.com. [76.168.148.233]) by smtp.googlemail.com with ESMTPSA id x22-20020a170902821600b00183e2a96414sm50206pln.121.2022.12.08.16.59.53 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 08 Dec 2022 16:59:54 -0800 (PST) Message-ID: <2443e376-23f8-594d-5e4c-bb3f2cc69557@gmail.com> Date: Thu, 8 Dec 2022 16:59:53 -0800 MIME-Version: 1.0 Subject: Re: bug#59622: 29.0.50; [PATCH] Regression in Eshell's handling of escaped newlines Content-Language: en-US From: Jim Porter To: Eli Zaretskii References: <90faf628-390d-1094-2fcb-e6a23ac46da8@gmail.com> <83v8mrbpf7.fsf@gnu.org> <3d78b158-5fde-d4c0-0e9a-cb05e09bed6e@gmail.com> <83359u9g9h.fsf@gnu.org> <9b18ac1f-04b3-63c9-56c0-84233f849d5d@gmail.com> <83v8mn49sj.fsf@gnu.org> <1335dd36-a50b-e03b-670b-58b1e08cc979@gmail.com> <838rjj3x1e.fsf@gnu.org> In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 59622-done Cc: 59622-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) On 12/7/2022 9:47 PM, Jim Porter wrote: > I'll leave this open until I merge the small cleanup patch to master > once my first patch has gotten there. Pushed my followup patch to master as 8c01829c01ca81c990eadf34bc16794b65d62c70. Closing this now. From unknown Wed Jun 18 00:13:41 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Fri, 06 Jan 2023 12:24:07 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator