From unknown Sun Jun 22 11:47:47 2025 X-Loop: help-debbugs@gnu.org Subject: bug#71545: 30.0.50; [PATCH] Fix paragraph navigation in Eshell Resent-From: Jim Porter Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Fri, 14 Jun 2024 04:35:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 71545 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch To: 71545@debbugs.gnu.org X-Debbugs-Original-To: bug-gnu-emacs@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.171833964820649 (code B ref -1); Fri, 14 Jun 2024 04:35:01 +0000 Received: (at submit) by debbugs.gnu.org; 14 Jun 2024 04:34:08 +0000 Received: from localhost ([127.0.0.1]:39565 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sHydc-0005My-2U for submit@debbugs.gnu.org; Fri, 14 Jun 2024 00:34:08 -0400 Received: from lists.gnu.org ([209.51.188.17]:38232) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sHydX-0005Mo-4T for submit@debbugs.gnu.org; Fri, 14 Jun 2024 00:34:06 -0400 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 1sHydW-0007mm-PU for bug-gnu-emacs@gnu.org; Fri, 14 Jun 2024 00:34:02 -0400 Received: from mail-pl1-x62b.google.com ([2607:f8b0:4864:20::62b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sHydU-00027v-K9 for bug-gnu-emacs@gnu.org; Fri, 14 Jun 2024 00:34:02 -0400 Received: by mail-pl1-x62b.google.com with SMTP id d9443c01a7336-1f4c7b022f8so16361075ad.1 for ; Thu, 13 Jun 2024 21:34:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1718339638; x=1718944438; darn=gnu.org; h=subject:from:to:content-language:mime-version:date:message-id:from :to:cc:subject:date:message-id:reply-to; bh=pJ9P8jqREwGm91UZSy5HoDCQDOUAf7UTgOSOIhSATLk=; b=fBWbBUIhrak+Y97/4blU1nP5yP0LaTQGti9tAnzq7p7WJNKgUWEH2lXn3TeTyn2yE1 YE2abAyJhAJexj8grGdeO+CjD43JWviCKxF/tR5rQPfcuHo8V4wtFrls44R46rDXixcJ p80wwKICCRBlDS8QECgVtbv7pLey2MvXp46bQgLK9wGDOE60PdnxgBmGdcYnHvWupYPn KHCzS6TN2Dt0Ht6Knj7CV1xlEz3EsJ4KvsEqoQK7/2IhHRhkXmbUemSUYTPNGsjzgYH5 ppRNlPJ0lByt+SjGFEkCq/bv4tvJkAg4Q2zukUvd60pO5dgpQLNBQDl+E6tfcFYLMKdQ /xVw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1718339638; x=1718944438; h=subject:from:to:content-language:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=pJ9P8jqREwGm91UZSy5HoDCQDOUAf7UTgOSOIhSATLk=; b=bnf9nnmG1fSbbWG//kZk3FDzScEv8mkil3YvzXi0eHlNezLt5ZHWOgxxujnzxENaWU xz5Vt8/oEHleB/E3w33sD1i8fg/rBpADSqcQsRwk2uU92fTBB6Bll3NxcQbZwVapYbHd 4b4GGOxU7SoO3LGZeKlMo//m0fNz0joy/OLthVNNV6+B8xFs7CjK5XUspdvIbi8P+tcC LVYuYppoT8dVWvNjNbhODPY0AMX4CI6yR7Cytq8MBOy/7mMl64Cm82HKTISNbEVxJnSb VEd0YedN3UVNfcN3SxC3azZ312CZjPMQ7f8aUiGthTs5vCfHF6OtzkgwcXzqZo3nGJwt 2zbA== X-Gm-Message-State: AOJu0YwFUW0S35YgKh/yoGuq7r2/Svu0f1gj6lQ4MC/n9Gaxytc3g7Rq 70ZByX0w+4H+33g1n4lEomvPwPwM/+04zlNWBc2hX28KHyRucWbBKILiaQ== X-Google-Smtp-Source: AGHT+IHo8EheH92FHw7KjMovD+yjRW8lzl0/PCPKuKM4cLJWBK0bM9SFov1zs4WkpwC3j9DFpELZqw== X-Received: by 2002:a17:902:f548:b0:1f7:2bed:226 with SMTP id d9443c01a7336-1f8627eba78mr15850585ad.36.1718339638358; Thu, 13 Jun 2024 21:33:58 -0700 (PDT) Received: from [192.168.1.2] (syn-023-240-098-037.res.spectrum.com. [23.240.98.37]) by smtp.googlemail.com with ESMTPSA id d9443c01a7336-1f868b83c5bsm3567155ad.164.2024.06.13.21.33.57 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 13 Jun 2024 21:33:57 -0700 (PDT) Content-Type: multipart/mixed; boundary="------------hwGLM9HS1nmnok6vItbukCSX" Message-ID: <6b1f64c8-9f25-eb5f-ae32-13c9eb5c1c30@gmail.com> Date: Thu, 13 Jun 2024 21:33:57 -0700 MIME-Version: 1.0 X-Mozilla-News-Host: news://news.gmane.io:119 Content-Language: en-US From: Jim Porter Received-SPF: pass client-ip=2607:f8b0:4864:20::62b; envelope-from=jporterbugs@gmail.com; helo=mail-pl1-x62b.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, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.3 (-) 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. --------------hwGLM9HS1nmnok6vItbukCSX Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit A while back, I updated how forward- and backward-paragraph work in Eshell so that we didn't have to rely on regexps to detect the prompt (paragraph navigation in Eshell has always stopped at prompts as well as blank lines separating paragraphs). I got that implementation wrong, and since then it's only navigated between prompts. Attached is a patch to restore the proper behavior, plus some tests to make sure I got it right this time. --------------hwGLM9HS1nmnok6vItbukCSX Content-Type: text/plain; charset=UTF-8; name="0001-Ensure-navigating-by-paragraphs-in-Eshell-stops-at-p.patch" Content-Disposition: attachment; filename*0="0001-Ensure-navigating-by-paragraphs-in-Eshell-stops-at-p.pa"; filename*1="tch" Content-Transfer-Encoding: base64 RnJvbSBmMDE1YjdmMWQ3ZWYzNWVkZjU5Yzc4OTlmZTZiNGQyN2YwMTZkYzc2IE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBKaW0gUG9ydGVyIDxqcG9ydGVyYnVnc0BnbWFpbC5j b20+CkRhdGU6IFRodSwgMTMgSnVuIDIwMjQgMjE6MjY6NTMgLTA3MDAKU3ViamVjdDogW1BB VENIXSBFbnN1cmUgbmF2aWdhdGluZyBieSBwYXJhZ3JhcGhzIGluIEVzaGVsbCBzdG9wcyBh dCBwcm9tcHRzCiBhbmQgcGFyYWdyYXBocwoKVGhlIHByZXZpb3VzIGltcGxlbWVudGF0aW9u IGluIDZhZTJiNzRlZDIwIG9ubHkgc3RvcHBlZCBhdCBwcm9tcHRzLAp3aGljaCBpc24ndCB0 aGUgcmlnaHQgYmVoYXZpb3IuCgoqIGxpc3AvZXNoZWxsL2VtLXByb21wdC5lbCAoZXNoZWxs LWZvcndhcmQtcGFyYWdyYXBoKQooZXNoZWxsLWJhY2t3YXJkLXBhcmFncmFwaCk6IFJlaW1w bGVtZW50IHRvIGhhbmRsZSBwcm9tcHRzIGFuZApwYXJhZ3JhcGhzICh0aGUgbGF0dGVyIGJ5 IGNhbGxpbmcgdGhlIG9yaWdpbmFsICdmb3J3YXJkLXBhcmFncmFwaCcpLgoKKiB0ZXN0L2xp c3AvZXNoZWxsL2VtLXByb21wdC10ZXN0cy5lbAooZW0tcHJvbXB0LXRlc3QvbmV4dC1wcmV2 aW91cy1wcm9tcHQvbXVsdGlsaW5lKTogUmVuYW1lLgooZW0tcHJvbXB0LXRlc3QvZm9yd2Fy ZC1iYWNrd2FyZC1wYXJhZ3JhcGgtMSk6IE5ldyBmdW5jdGlvbi4KKGVtLXByb21wdC10ZXN0 L2ZvcndhcmQtYmFja3dhcmQtcGFyYWdyYXBoKQooZW0tcHJvbXB0LXRlc3QvZm9yd2FyZC1i YWNrd2FyZC1wYXJhZ3JhcGgvbXVsdGlsaW5lKTogTmV3IHRlc3RzLgotLS0KIGxpc3AvZXNo ZWxsL2VtLXByb21wdC5lbCAgICAgICAgICAgIHwgMzQgKysrKysrKysrKysrKysrKy0tLS0K IHRlc3QvbGlzcC9lc2hlbGwvZW0tcHJvbXB0LXRlc3RzLmVsIHwgNDkgKysrKysrKysrKysr KysrKysrKysrKysrKysrKy0KIDIgZmlsZXMgY2hhbmdlZCwgNzYgaW5zZXJ0aW9ucygrKSwg NyBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9saXNwL2VzaGVsbC9lbS1wcm9tcHQuZWwg Yi9saXNwL2VzaGVsbC9lbS1wcm9tcHQuZWwKaW5kZXggYjY1NTZkMjk1NDQuLmZiNGU1MWNk ZmUwIDEwMDY0NAotLS0gYS9saXNwL2VzaGVsbC9lbS1wcm9tcHQuZWwKKysrIGIvbGlzcC9l c2hlbGwvZW0tcHJvbXB0LmVsCkBAIC0xMTcsNyArMTE3LDcgQEAgZXNoZWxsLXByb21wdC1p bml0aWFsaXplCiAgICJJbml0aWFsaXplIHRoZSBwcm9tcHRpbmcgY29kZS4iCiAgICh1bmxl c3MgZXNoZWxsLW5vbi1pbnRlcmFjdGl2ZS1wCiAgICAgKGFkZC1ob29rICdlc2hlbGwtcG9z dC1jb21tYW5kLWhvb2sgJ2VzaGVsbC1lbWl0LXByb21wdCBuaWwgdCkKLSAgICAoZXNoZWxs LXByb21wdC1tb2RlKSkpCisgICAgKGVzaGVsbC1wcm9tcHQtbW9kZSkpCiAKIChkZWZ1biBl c2hlbGwtZW1pdC1wcm9tcHQgKCkKICAgIkVtaXQgYSBwcm9tcHQgaWYgZXNoZWxsIGlzIGJl aW5nIHVzZWQgaW50ZXJhY3RpdmVseS4iCkBAIC0xNjcsMTcgKzE2NywzOSBAQCBlc2hlbGwt YmFja3dhcmQtbWF0Y2hpbmctaW5wdXQKIAogKGRlZnVuIGVzaGVsbC1mb3J3YXJkLXBhcmFn cmFwaCAoJm9wdGlvbmFsIG4pCiAgICJNb3ZlIHRvIHRoZSBiZWdpbm5pbmcgb2YgdGhlIE50 aCBuZXh0IHByb21wdCBpbiB0aGUgYnVmZmVyLgotTGlrZSBgZm9yd2FyZC1wYXJhZ3JhcGgn LCBidXQgbmF2aWdhdGVzIHVzaW5nIGZpZWxkcy4iCitMaWtlIGBmb3J3YXJkLXBhcmFncmFw aCcsIGJ1dCBhbHNvIHN0b3BzIGF0IHRoZSBiZWdpbm5pbmcgb2YgZWFjaCBwcm9tcHQuIgog ICAoaW50ZXJhY3RpdmUgInAiKQotICAoZXNoZWxsLW5leHQtcHJvbXB0IG4pCi0gIChnb3Rv LWNoYXIgKGZpZWxkLWJlZ2lubmluZyAocG9pbnQpIHQpKSkKKyAgKHVubGVzcyBuIChzZXRx IG4gMSkpCisgIChsZXQgKDs7IFdlJ2xsIGhhbmRsZSB0aGUgInBhcmFncmFwaCIgc3RhcnRz IG91cnNlbHZlcy4KKyAgICAgICAgKHBhcmFncmFwaC1zdGFydCByZWdleHAtdW5tYXRjaGFi bGUpCisgICAgICAgIChpbmhpYml0LWZpZWxkLXRleHQtbW90aW9uIHQpKQorICAgIChjb25k CisgICAgICgoPiBuIDApCisgICAgICAod2hpbGUgKGFuZCAoPiBuIDApICg8IChwb2ludCkg KHBvaW50LW1heCkpKQorICAgICAgICAobGV0ICgobmV4dC1wYXJhZ3JhcGggKHNhdmUtZXhj dXJzaW9uIChmb3J3YXJkLXBhcmFncmFwaCkgKHBvaW50KSkpCisgICAgICAgICAgICAgIChu ZXh0LXByb21wdCAoc2F2ZS1leGN1cnNpb24KKyAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgKGlmLWxldCAoKG1hdGNoICh0ZXh0LXByb3BlcnR5LXNlYXJjaC1mb3J3YXJkCisgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgJ2ZpZWxkICdwcm9t cHQgdCB0KSkpCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAocHJvcC1tYXRj aC1iZWdpbm5pbmcgbWF0Y2gpCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKHBv aW50LW1heCkpKSkpCisgICAgICAgICAgKGdvdG8tY2hhciAobWluIG5leHQtcGFyYWdyYXBo IG5leHQtcHJvbXB0KSkpCisgICAgICAgIChzZXRxIG4gKDEtIG4pKSkpCisgICAgICgoPCBu IDApCisgICAgICAod2hpbGUgKGFuZCAoPCBuIDApICg+IChwb2ludCkgKHBvaW50LW1pbikp KQorICAgICAgICAobGV0ICgocHJldi1wYXJhZ3JhcGggKHNhdmUtZXhjdXJzaW9uIChiYWNr d2FyZC1wYXJhZ3JhcGgpIChwb2ludCkpKQorICAgICAgICAgICAgICAocHJldi1wcm9tcHQg KHNhdmUtZXhjdXJzaW9uCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgIChpZiAodGV4 dC1wcm9wZXJ0eS1zZWFyY2gtYmFja3dhcmQKKyAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAnZmllbGQgJ3Byb21wdCB0KQorICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgKHBvaW50KQorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIChwb2ludC1t aW4pKSkpKQorICAgICAgICAgIChnb3RvLWNoYXIgKG1heCBwcmV2LXBhcmFncmFwaCBwcmV2 LXByb21wdCkpKQorICAgICAgICAoc2V0cSBuICgxKyBuKSkpKSkpKQogCiAoZGVmdW4gZXNo ZWxsLWJhY2t3YXJkLXBhcmFncmFwaCAoJm9wdGlvbmFsIG4pCiAgICJNb3ZlIHRvIHRoZSBi ZWdpbm5pbmcgb2YgdGhlIE50aCBwcmV2aW91cyBwcm9tcHQgaW4gdGhlIGJ1ZmZlci4KIExp a2UgYGJhY2t3YXJkLXBhcmFncmFwaCcsIGJ1dCBuYXZpZ2F0ZXMgdXNpbmcgZmllbGRzLiIK ICAgKGludGVyYWN0aXZlICJwIikKLSAgKGVzaGVsbC1wcmV2aW91cy1wcm9tcHQgbikKLSAg KGdvdG8tY2hhciAoZmllbGQtYmVnaW5uaW5nIChwb2ludCkgdCkpKQorICAoZXNoZWxsLWZv cndhcmQtcGFyYWdyYXBoICgtIChvciBuIDEpKSkpCiAKIChkZWZ1biBlc2hlbGwtbmV4dC1w cm9tcHQgKCZvcHRpb25hbCBuKQogICAiTW92ZSB0byBlbmQgb2YgTnRoIG5leHQgcHJvbXB0 IGluIHRoZSBidWZmZXIuIgpkaWZmIC0tZ2l0IGEvdGVzdC9saXNwL2VzaGVsbC9lbS1wcm9t cHQtdGVzdHMuZWwgYi90ZXN0L2xpc3AvZXNoZWxsL2VtLXByb21wdC10ZXN0cy5lbAppbmRl eCA5NjQ2MDllNjQxMC4uZmJhZGFkZTA2MWYgMTAwNjQ0Ci0tLSBhL3Rlc3QvbGlzcC9lc2hl bGwvZW0tcHJvbXB0LXRlc3RzLmVsCisrKyBiL3Rlc3QvbGlzcC9lc2hlbGwvZW0tcHJvbXB0 LXRlc3RzLmVsCkBAIC0zOSw2ICszOSw5IEBAIGVtLXByb21wdC10ZXN0LS13aXRoLW11bHRp bGluZQogCiA7OzsgVGVzdHM6CiAKKwwKKzs7IFByb21wdCBvdXRwdXQKKwogKGVydC1kZWZ0 ZXN0IGVtLXByb21wdC10ZXN0L2ZpZWxkLXByb3BlcnRpZXMgKCkKICAgIkNoZWNrIHRoYXQg ZmllbGQgcHJvcGVydGllcyBhcmUgcHJvcGVybHkgc2V0IG9uIEVzaGVsbCBvdXRwdXQvcHJv bXB0cy4iCiAgICh3aXRoLXRlbXAtZXNoZWxsCkBAIC0xMDQsNiArMTA3LDkgQEAgZW0tcHJv bXB0LXRlc3QvYWZ0ZXItZmFpbHVyZQogICAgICAgICAgICAgICAgJ2Zyb250LXN0aWNreSAn KHJlYWQtb25seSBmaWVsZCBmb250LWxvY2stZmFjZSkKICAgICAgICAgICAgICAgICdyZWFy LW5vbnN0aWNreSAnKHJlYWQtb25seSBmaWVsZCBmb250LWxvY2stZmFjZSkpKSkpKSkKIAor DAorOzsgUHJvbXB0IG5hdmlnYXRpb24KKwogKGRlZnVuIGVtLXByb21wdC10ZXN0L25leHQt cHJldmlvdXMtcHJvbXB0LTEgKCkKICAgIkhlbHBlciBmb3IgY2hlY2tpbmcgZm9yd2FyZC9i YWNrd2FyZCBuYXZpZ2F0aW9uIG9mIG9sZCBwcm9tcHRzLiIKICAgKHdpdGgtdGVtcC1lc2hl bGwKQEAgLTE1MCwxMSArMTU2LDUyIEBAIGVtLXByb21wdC10ZXN0L25leHQtcHJldmlvdXMt cHJvbXB0CiAgICJDaGVjayB0aGF0IG5hdmlnYXRpbmcgZm9yd2FyZC9iYWNrd2FyZCB0aHJv dWdoIG9sZCBwcm9tcHRzIHdvcmtzIGNvcnJlY3RseS4iCiAgIChlbS1wcm9tcHQtdGVzdC9u ZXh0LXByZXZpb3VzLXByb21wdC0xKSkKIAotKGVydC1kZWZ0ZXN0IGVtLXByb21wdC10ZXN0 L25leHQtcHJldmlvdXMtcHJvbXB0LW11bHRpbGluZSAoKQorKGVydC1kZWZ0ZXN0IGVtLXBy b21wdC10ZXN0L25leHQtcHJldmlvdXMtcHJvbXB0L211bHRpbGluZSAoKQogICAiQ2hlY2sg b2xkIHByb21wdCBmb3J3YXJkL2JhY2t3YXJkIG5hdmlnYXRpb24gZm9yIG11bHRpbGluZSBw cm9tcHRzLiIKICAgKGVtLXByb21wdC10ZXN0LS13aXRoLW11bHRpbGluZQogICAgKGVtLXBy b21wdC10ZXN0L25leHQtcHJldmlvdXMtcHJvbXB0LTEpKSkKIAorKGRlZnVuIGVtLXByb21w dC10ZXN0L2ZvcndhcmQtYmFja3dhcmQtcGFyYWdyYXBoLTEgKCkKKyAgIkhlbHBlciBmb3Ig Y2hlY2tpbmcgZm9yd2FyZC9iYWNrd2FyZCBuYXZpZ2F0aW9uIGJ5IHBhcmFncmFwaHMuIgor ICAod2l0aC10ZW1wLWVzaGVsbAorICAgIChjbC1mbGV0ICgoYXQtcHJvbXB0LWZvci1jb21t YW5kLXAgKGNvbW1hbmQpCisgICAgICAgICAgICAgICAgKGFuZCAoZXF1YWwgKHBvaW50KSAo ZmllbGQtYmVnaW5uaW5nKSkKKyAgICAgICAgICAgICAgICAgICAgIChlcXVhbCAoZ2V0LXRl eHQtcHJvcGVydHkgKHBvaW50KSAnZmllbGQpICdwcm9tcHQpCisgICAgICAgICAgICAgICAg ICAgICAoc2F2ZS1leGN1cnNpb24KKyAgICAgICAgICAgICAgICAgICAgICAgKGdvdG8tY2hh ciAoZmllbGQtZW5kKSkKKyAgICAgICAgICAgICAgICAgICAgICAgKGVxdWFsIChmaWVsZC1z dHJpbmcpIGNvbW1hbmQpKSkpKQorICAgICAgKGVzaGVsbC1pbnNlcnQtY29tbWFuZCAiZWNo byAnaGlnaCBmaXZlJyIpCisgICAgICAoZXNoZWxsLWluc2VydC1jb21tYW5kICJlY2hvICd1 cCBoaWdoXG5cbmRvd24gbG93JyIpCisgICAgICAoZXNoZWxsLWluc2VydC1jb21tYW5kICJl Y2hvICd0b28gc2xvdyciKQorICAgICAgKGluc2VydCAiZWNobyBnb29kYnkiKSAgICAgICAg ICAgIDsgQSBwYXJ0aWFsbHktZW50ZXJlZCBjb21tYW5kLgorICAgICAgKGVydC1pbmZvICgi R28gYmFjayB0byB0aGUgbGFzdCBwcm9tcHQiKQorICAgICAgICAoZXNoZWxsLWJhY2t3YXJk LXBhcmFncmFwaCkKKyAgICAgICAgKHNob3VsZCAoYXQtcHJvbXB0LWZvci1jb21tYW5kLXAg ImVjaG8gZ29vZGJ5IikpKQorICAgICAgKGVydC1pbmZvICgiR28gYmFjayB0byB0aGUgcGFy YWdyYXBoIGJyZWFrIikKKyAgICAgICAgKGVzaGVsbC1iYWNrd2FyZC1wYXJhZ3JhcGggMikK KyAgICAgICAgKHNob3VsZCAobG9va2luZy1hdCAiXG5kb3duIGxvd1xuIikpKQorICAgICAg KGVydC1pbmZvICgiR28gZm9yd2FyZCB0byB0aGUgdGhpcmQgcHJvbXB0IikKKyAgICAgICAg KGVzaGVsbC1mb3J3YXJkLXBhcmFncmFwaCkKKyAgICAgICAgKHNob3VsZCAoYXQtcHJvbXB0 LWZvci1jb21tYW5kLXAgImVjaG8gJ3RvbyBzbG93J1xuIikpKQorICAgICAgKGVydC1pbmZv ICgiR28gYmFja3dhcmQgdG8gYmVmb3JlIHRoZSBmaXJzdCBwcm9tcHQiKQorICAgICAgICAo ZXNoZWxsLWJhY2t3YXJkLXBhcmFncmFwaCA1KQorICAgICAgICAoc2hvdWxkIChsb29raW5n LWJhY2sgIldlbGNvbWUgdG8gdGhlIEVtYWNzIHNoZWxsXG4iKSkpCisgICAgICAoZXJ0LWlu Zm8gKCJHbyBiYWNrd2FyZCB0byB0aGUgYmVnaW5uaW5nIG9mIHRoZSBidWZmZXIiKQorICAg ICAgICAoZXNoZWxsLWJhY2t3YXJkLXBhcmFncmFwaCkKKyAgICAgICAgKHNob3VsZCAoYm9i cCkpKQorICAgICAgKGVydC1pbmZvICgiR28gZm9yd2FyZCB0byB0aGUgc2Vjb25kIHByb21w dCIpCisgICAgICAgIChlc2hlbGwtZm9yd2FyZC1wYXJhZ3JhcGggMykKKyAgICAgICAgKHNo b3VsZCAoYXQtcHJvbXB0LWZvci1jb21tYW5kLXAgImVjaG8gJ3VwIGhpZ2hcblxuZG93biBs b3cnXG4iKSkpKSkpCisKKyhlcnQtZGVmdGVzdCBlbS1wcm9tcHQtdGVzdC9mb3J3YXJkLWJh Y2t3YXJkLXBhcmFncmFwaCAoKQorICAiQ2hlY2sgdGhhdCBuYXZpZ2F0aW5nIGZvcndhcmQv YmFja3dhcmQgdGhyb3VnaCBwYXJhZ3JhcGhzIHdvcmtzIGNvcnJlY3RseS4iCisgIChlbS1w cm9tcHQtdGVzdC9mb3J3YXJkLWJhY2t3YXJkLXBhcmFncmFwaC0xKSkKKworKGVydC1kZWZ0 ZXN0IGVtLXByb21wdC10ZXN0L2ZvcndhcmQtYmFja3dhcmQtcGFyYWdyYXBoL211bHRpbGlu ZSAoKQorICAiQ2hlY2sgcGFyYWdyYXBoIGZvcndhcmQvYmFja3dhcmQgbmF2aWdhdGlvbiBm b3IgbXVsdGlsaW5lIHByb21wdHMuIgorICAoZW0tcHJvbXB0LXRlc3QtLXdpdGgtbXVsdGls aW5lCisgICAoZW0tcHJvbXB0LXRlc3QvZm9yd2FyZC1iYWNrd2FyZC1wYXJhZ3JhcGgtMSkp KQorCiAoZGVmdW4gZW0tcHJvbXB0LXRlc3QvZm9yd2FyZC1iYWNrd2FyZC1tYXRjaGluZy1p bnB1dC0xICgpCiAgICJIZWxwZXIgZm9yIGNoZWNraW5nIGZvcndhcmQvYmFja3dhcmQgbmF2 aWdhdGlvbiB2aWEgcmVnZXhwcy4iCiAgICh3aXRoLXRlbXAtZXNoZWxsCi0tIAoyLjI1LjEK Cg== --------------hwGLM9HS1nmnok6vItbukCSX-- From unknown Sun Jun 22 11:47:47 2025 X-Loop: help-debbugs@gnu.org Subject: bug#71545: 30.0.50; [PATCH] Fix paragraph navigation in Eshell Resent-From: Jim Porter Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Fri, 14 Jun 2024 04:45:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 71545 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch To: 71545@debbugs.gnu.org Received: via spool by 71545-submit@debbugs.gnu.org id=B71545.171834024421553 (code B ref 71545); Fri, 14 Jun 2024 04:45:02 +0000 Received: (at 71545) by debbugs.gnu.org; 14 Jun 2024 04:44:04 +0000 Received: from localhost ([127.0.0.1]:39571 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sHynD-0005bX-Gt for submit@debbugs.gnu.org; Fri, 14 Jun 2024 00:44:03 -0400 Received: from mail-pl1-f173.google.com ([209.85.214.173]:55486) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sHyn8-0005aq-TN for 71545@debbugs.gnu.org; Fri, 14 Jun 2024 00:44:01 -0400 Received: by mail-pl1-f173.google.com with SMTP id d9443c01a7336-1f6b0a40721so12775975ad.2 for <71545@debbugs.gnu.org>; Thu, 13 Jun 2024 21:43:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1718340173; x=1718944973; darn=debbugs.gnu.org; h=in-reply-to:references:newsgroups:to:from:content-language:subject :mime-version:date:message-id:from:to:cc:subject:date:message-id :reply-to; bh=bqHt4w1iG9Yea0Hx4Fnh5MwdPcwS92CpqL0AYGltBJE=; b=CYw38VE853clV5EesEuGo0fbbho5WBhjGfBqgrvuZGsOsbTyppA7X6b8aadP9HYLfI 9+Wh1UQPSbXcTFFYWbRXT74Lop8awPHRk5GczASX5CtBSctwBtDOoUT8QzQWG8aaG31t dnD/CGouOrV7L5R/CxXTPGB/UtDfQ5oueyHODxSWxoC+pJHvvBONuA30Qylc3pxr4EsP NvquKpl/sGK+oCVROHlVAuDfG9/o5+ATqPc1mladMy4eE7N+AWKxGDWh8rIi4aWwcON/ vSZ1gIjM6WPiVCbtNdPB5caHUfGNhrpnGB4wKUlXd0i8VUHQqMffHqUc+5bZ8XqWxaVp umiA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1718340173; x=1718944973; h=in-reply-to:references:newsgroups:to:from:content-language:subject :mime-version:date:message-id:x-gm-message-state:from:to:cc:subject :date:message-id:reply-to; bh=bqHt4w1iG9Yea0Hx4Fnh5MwdPcwS92CpqL0AYGltBJE=; b=Rpo5Op/MVp7fZ7zldTNnmU4JgfIYOFN0UurOheno+rusL3ZD21R8D8zunXQuQ5hiCA j5rrIPrKXrz1GZxYRYaXfSRSX+Frvm8L1cBJ5lrKQrPZOjN2mZXR7Bc/bMAw/C8OoQYP IdiinTYFjHXbLHKL2Q1Ul4o3VzqafimSAuOBvFuOqtz1wRf55mqJCdZRvrPaC/zsHZLq MbHfWTitijix3pNZrEObVN5W2gyMcMDvZawWkw8460HucMnECppSaDIQyBSlgARo0r0i 7tRSXrg5DDsG6GGF28snv+dmP3Zts7I+XD9MvQAHZoiq8b8e4kuiRUqDMNjid0uOCX/q 421g== X-Gm-Message-State: AOJu0YwnA74SBzUw28aEl6wFpmBZxnwxL7Qcsx1CSnOjXis2DfIfT/19 2GpTM6sC0z3p7e18tAMT5mwbd47v61EGkIQMSw6yfr2xVm8dfZ39uGqtQw== X-Google-Smtp-Source: AGHT+IF3q72Esgs/CMJZZL80+9iaUIjkHNnJrfDCQGEtDwiLe5G64DfWXDVlKUU8zSd0de90dHJIdw== X-Received: by 2002:a17:902:e80c:b0:1f7:174e:354d with SMTP id d9443c01a7336-1f862b1562fmr18934415ad.48.1718340172863; Thu, 13 Jun 2024 21:42:52 -0700 (PDT) Received: from [192.168.1.2] (syn-023-240-098-037.res.spectrum.com. [23.240.98.37]) by smtp.googlemail.com with ESMTPSA id d9443c01a7336-1f855f53e80sm22727145ad.297.2024.06.13.21.42.51 for <71545@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 13 Jun 2024 21:42:52 -0700 (PDT) Content-Type: multipart/mixed; boundary="------------h3ZPFDuLpMkIGckyKO20Cbku" Message-ID: Date: Thu, 13 Jun 2024 21:42:50 -0700 MIME-Version: 1.0 Content-Language: en-US From: Jim Porter Newsgroups: gmane.emacs.bugs References: <6b1f64c8-9f25-eb5f-ae32-13c9eb5c1c30@gmail.com> In-Reply-To: <6b1f64c8-9f25-eb5f-ae32-13c9eb5c1c30@gmail.com> X-Spam-Score: -0.0 (/) 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. --------------h3ZPFDuLpMkIGckyKO20Cbku Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit My previous patch had a typo that snuck in. Here's the fixed version. --------------h3ZPFDuLpMkIGckyKO20Cbku Content-Type: text/plain; charset=UTF-8; name="0001-Ensure-navigating-by-paragraphs-in-Eshell-stops-at-p.patch" Content-Disposition: attachment; filename*0="0001-Ensure-navigating-by-paragraphs-in-Eshell-stops-at-p.pa"; filename*1="tch" Content-Transfer-Encoding: base64 RnJvbSBhYzlhYWRlZjg4NjNhMjA2NzIwMmVkYzAwNTAxYzM0ZTIyMDA2MjIyIE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBKaW0gUG9ydGVyIDxqcG9ydGVyYnVnc0BnbWFpbC5j b20+CkRhdGU6IFRodSwgMTMgSnVuIDIwMjQgMjE6MjY6NTMgLTA3MDAKU3ViamVjdDogW1BB VENIXSBFbnN1cmUgbmF2aWdhdGluZyBieSBwYXJhZ3JhcGhzIGluIEVzaGVsbCBzdG9wcyBh dCBwcm9tcHRzCiBhbmQgcGFyYWdyYXBocwoKVGhlIHByZXZpb3VzIGltcGxlbWVudGF0aW9u IGluIDZhZTJiNzRlZDIwIG9ubHkgc3RvcHBlZCBhdCBwcm9tcHRzLAp3aGljaCBpc24ndCB0 aGUgcmlnaHQgYmVoYXZpb3IuCgoqIGxpc3AvZXNoZWxsL2VtLXByb21wdC5lbCAoZXNoZWxs LWZvcndhcmQtcGFyYWdyYXBoKQooZXNoZWxsLWJhY2t3YXJkLXBhcmFncmFwaCk6IFJlaW1w bGVtZW50IHRvIGhhbmRsZSBwcm9tcHRzIGFuZApwYXJhZ3JhcGhzICh0aGUgbGF0dGVyIGJ5 IGNhbGxpbmcgdGhlIG9yaWdpbmFsICdmb3J3YXJkLXBhcmFncmFwaCcpLgoKKiB0ZXN0L2xp c3AvZXNoZWxsL2VtLXByb21wdC10ZXN0cy5lbAooZW0tcHJvbXB0LXRlc3QvbmV4dC1wcmV2 aW91cy1wcm9tcHQvbXVsdGlsaW5lKTogUmVuYW1lLgooZW0tcHJvbXB0LXRlc3QvZm9yd2Fy ZC1iYWNrd2FyZC1wYXJhZ3JhcGgtMSk6IE5ldyBmdW5jdGlvbi4KKGVtLXByb21wdC10ZXN0 L2ZvcndhcmQtYmFja3dhcmQtcGFyYWdyYXBoKQooZW0tcHJvbXB0LXRlc3QvZm9yd2FyZC1i YWNrd2FyZC1wYXJhZ3JhcGgvbXVsdGlsaW5lKTogTmV3IHRlc3RzLgotLS0KIGxpc3AvZXNo ZWxsL2VtLXByb21wdC5lbCAgICAgICAgICAgIHwgMzIgKysrKysrKysrKysrKysrKy0tLQog dGVzdC9saXNwL2VzaGVsbC9lbS1wcm9tcHQtdGVzdHMuZWwgfCA0OSArKysrKysrKysrKysr KysrKysrKysrKysrKysrLQogMiBmaWxlcyBjaGFuZ2VkLCA3NSBpbnNlcnRpb25zKCspLCA2 IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2xpc3AvZXNoZWxsL2VtLXByb21wdC5lbCBi L2xpc3AvZXNoZWxsL2VtLXByb21wdC5lbAppbmRleCBiNjU1NmQyOTU0NC4uN2RlMmJkNGRj MjEgMTAwNjQ0Ci0tLSBhL2xpc3AvZXNoZWxsL2VtLXByb21wdC5lbAorKysgYi9saXNwL2Vz aGVsbC9lbS1wcm9tcHQuZWwKQEAgLTE2NywxNyArMTY3LDM5IEBAIGVzaGVsbC1iYWNrd2Fy ZC1tYXRjaGluZy1pbnB1dAogCiAoZGVmdW4gZXNoZWxsLWZvcndhcmQtcGFyYWdyYXBoICgm b3B0aW9uYWwgbikKICAgIk1vdmUgdG8gdGhlIGJlZ2lubmluZyBvZiB0aGUgTnRoIG5leHQg cHJvbXB0IGluIHRoZSBidWZmZXIuCi1MaWtlIGBmb3J3YXJkLXBhcmFncmFwaCcsIGJ1dCBu YXZpZ2F0ZXMgdXNpbmcgZmllbGRzLiIKK0xpa2UgYGZvcndhcmQtcGFyYWdyYXBoJywgYnV0 IGFsc28gc3RvcHMgYXQgdGhlIGJlZ2lubmluZyBvZiBlYWNoIHByb21wdC4iCiAgIChpbnRl cmFjdGl2ZSAicCIpCi0gIChlc2hlbGwtbmV4dC1wcm9tcHQgbikKLSAgKGdvdG8tY2hhciAo ZmllbGQtYmVnaW5uaW5nIChwb2ludCkgdCkpKQorICAodW5sZXNzIG4gKHNldHEgbiAxKSkK KyAgKGxldCAoOzsgV2UnbGwgaGFuZGxlIHRoZSAicGFyYWdyYXBoIiBzdGFydHMgb3Vyc2Vs dmVzLgorICAgICAgICAocGFyYWdyYXBoLXN0YXJ0IHJlZ2V4cC11bm1hdGNoYWJsZSkKKyAg ICAgICAgKGluaGliaXQtZmllbGQtdGV4dC1tb3Rpb24gdCkpCisgICAgKGNvbmQKKyAgICAg KCg+IG4gMCkKKyAgICAgICh3aGlsZSAoYW5kICg+IG4gMCkgKDwgKHBvaW50KSAocG9pbnQt bWF4KSkpCisgICAgICAgIChsZXQgKChuZXh0LXBhcmFncmFwaCAoc2F2ZS1leGN1cnNpb24g KGZvcndhcmQtcGFyYWdyYXBoKSAocG9pbnQpKSkKKyAgICAgICAgICAgICAgKG5leHQtcHJv bXB0IChzYXZlLWV4Y3Vyc2lvbgorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAoaWYt bGV0ICgobWF0Y2ggKHRleHQtcHJvcGVydHktc2VhcmNoLWZvcndhcmQKKyAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAnZmllbGQgJ3Byb21wdCB0IHQp KSkKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIChwcm9wLW1hdGNoLWJlZ2lu bmluZyBtYXRjaCkKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAocG9pbnQtbWF4 KSkpKSkKKyAgICAgICAgICAoZ290by1jaGFyIChtaW4gbmV4dC1wYXJhZ3JhcGggbmV4dC1w cm9tcHQpKSkKKyAgICAgICAgKHNldHEgbiAoMS0gbikpKSkKKyAgICAgKCg8IG4gMCkKKyAg ICAgICh3aGlsZSAoYW5kICg8IG4gMCkgKD4gKHBvaW50KSAocG9pbnQtbWluKSkpCisgICAg ICAgIChsZXQgKChwcmV2LXBhcmFncmFwaCAoc2F2ZS1leGN1cnNpb24gKGJhY2t3YXJkLXBh cmFncmFwaCkgKHBvaW50KSkpCisgICAgICAgICAgICAgIChwcmV2LXByb21wdCAoc2F2ZS1l eGN1cnNpb24KKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKGlmICh0ZXh0LXByb3Bl cnR5LXNlYXJjaC1iYWNrd2FyZAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICdmaWVsZCAncHJvbXB0IHQpCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAo cG9pbnQpCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKHBvaW50LW1pbikpKSkp CisgICAgICAgICAgKGdvdG8tY2hhciAobWF4IHByZXYtcGFyYWdyYXBoIHByZXYtcHJvbXB0 KSkpCisgICAgICAgIChzZXRxIG4gKDErIG4pKSkpKSkpCiAKIChkZWZ1biBlc2hlbGwtYmFj a3dhcmQtcGFyYWdyYXBoICgmb3B0aW9uYWwgbikKICAgIk1vdmUgdG8gdGhlIGJlZ2lubmlu ZyBvZiB0aGUgTnRoIHByZXZpb3VzIHByb21wdCBpbiB0aGUgYnVmZmVyLgogTGlrZSBgYmFj a3dhcmQtcGFyYWdyYXBoJywgYnV0IG5hdmlnYXRlcyB1c2luZyBmaWVsZHMuIgogICAoaW50 ZXJhY3RpdmUgInAiKQotICAoZXNoZWxsLXByZXZpb3VzLXByb21wdCBuKQotICAoZ290by1j aGFyIChmaWVsZC1iZWdpbm5pbmcgKHBvaW50KSB0KSkpCisgIChlc2hlbGwtZm9yd2FyZC1w YXJhZ3JhcGggKC0gKG9yIG4gMSkpKSkKIAogKGRlZnVuIGVzaGVsbC1uZXh0LXByb21wdCAo Jm9wdGlvbmFsIG4pCiAgICJNb3ZlIHRvIGVuZCBvZiBOdGggbmV4dCBwcm9tcHQgaW4gdGhl IGJ1ZmZlci4iCmRpZmYgLS1naXQgYS90ZXN0L2xpc3AvZXNoZWxsL2VtLXByb21wdC10ZXN0 cy5lbCBiL3Rlc3QvbGlzcC9lc2hlbGwvZW0tcHJvbXB0LXRlc3RzLmVsCmluZGV4IDk2NDYw OWU2NDEwLi5mYmFkYWRlMDYxZiAxMDA2NDQKLS0tIGEvdGVzdC9saXNwL2VzaGVsbC9lbS1w cm9tcHQtdGVzdHMuZWwKKysrIGIvdGVzdC9saXNwL2VzaGVsbC9lbS1wcm9tcHQtdGVzdHMu ZWwKQEAgLTM5LDYgKzM5LDkgQEAgZW0tcHJvbXB0LXRlc3QtLXdpdGgtbXVsdGlsaW5lCiAK IDs7OyBUZXN0czoKIAorDAorOzsgUHJvbXB0IG91dHB1dAorCiAoZXJ0LWRlZnRlc3QgZW0t cHJvbXB0LXRlc3QvZmllbGQtcHJvcGVydGllcyAoKQogICAiQ2hlY2sgdGhhdCBmaWVsZCBw cm9wZXJ0aWVzIGFyZSBwcm9wZXJseSBzZXQgb24gRXNoZWxsIG91dHB1dC9wcm9tcHRzLiIK ICAgKHdpdGgtdGVtcC1lc2hlbGwKQEAgLTEwNCw2ICsxMDcsOSBAQCBlbS1wcm9tcHQtdGVz dC9hZnRlci1mYWlsdXJlCiAgICAgICAgICAgICAgICAnZnJvbnQtc3RpY2t5ICcocmVhZC1v bmx5IGZpZWxkIGZvbnQtbG9jay1mYWNlKQogICAgICAgICAgICAgICAgJ3JlYXItbm9uc3Rp Y2t5ICcocmVhZC1vbmx5IGZpZWxkIGZvbnQtbG9jay1mYWNlKSkpKSkpKQogCisMCis7OyBQ cm9tcHQgbmF2aWdhdGlvbgorCiAoZGVmdW4gZW0tcHJvbXB0LXRlc3QvbmV4dC1wcmV2aW91 cy1wcm9tcHQtMSAoKQogICAiSGVscGVyIGZvciBjaGVja2luZyBmb3J3YXJkL2JhY2t3YXJk IG5hdmlnYXRpb24gb2Ygb2xkIHByb21wdHMuIgogICAod2l0aC10ZW1wLWVzaGVsbApAQCAt MTUwLDExICsxNTYsNTIgQEAgZW0tcHJvbXB0LXRlc3QvbmV4dC1wcmV2aW91cy1wcm9tcHQK ICAgIkNoZWNrIHRoYXQgbmF2aWdhdGluZyBmb3J3YXJkL2JhY2t3YXJkIHRocm91Z2ggb2xk IHByb21wdHMgd29ya3MgY29ycmVjdGx5LiIKICAgKGVtLXByb21wdC10ZXN0L25leHQtcHJl dmlvdXMtcHJvbXB0LTEpKQogCi0oZXJ0LWRlZnRlc3QgZW0tcHJvbXB0LXRlc3QvbmV4dC1w cmV2aW91cy1wcm9tcHQtbXVsdGlsaW5lICgpCisoZXJ0LWRlZnRlc3QgZW0tcHJvbXB0LXRl c3QvbmV4dC1wcmV2aW91cy1wcm9tcHQvbXVsdGlsaW5lICgpCiAgICJDaGVjayBvbGQgcHJv bXB0IGZvcndhcmQvYmFja3dhcmQgbmF2aWdhdGlvbiBmb3IgbXVsdGlsaW5lIHByb21wdHMu IgogICAoZW0tcHJvbXB0LXRlc3QtLXdpdGgtbXVsdGlsaW5lCiAgICAoZW0tcHJvbXB0LXRl c3QvbmV4dC1wcmV2aW91cy1wcm9tcHQtMSkpKQogCisoZGVmdW4gZW0tcHJvbXB0LXRlc3Qv Zm9yd2FyZC1iYWNrd2FyZC1wYXJhZ3JhcGgtMSAoKQorICAiSGVscGVyIGZvciBjaGVja2lu ZyBmb3J3YXJkL2JhY2t3YXJkIG5hdmlnYXRpb24gYnkgcGFyYWdyYXBocy4iCisgICh3aXRo LXRlbXAtZXNoZWxsCisgICAgKGNsLWZsZXQgKChhdC1wcm9tcHQtZm9yLWNvbW1hbmQtcCAo Y29tbWFuZCkKKyAgICAgICAgICAgICAgICAoYW5kIChlcXVhbCAocG9pbnQpIChmaWVsZC1i ZWdpbm5pbmcpKQorICAgICAgICAgICAgICAgICAgICAgKGVxdWFsIChnZXQtdGV4dC1wcm9w ZXJ0eSAocG9pbnQpICdmaWVsZCkgJ3Byb21wdCkKKyAgICAgICAgICAgICAgICAgICAgIChz YXZlLWV4Y3Vyc2lvbgorICAgICAgICAgICAgICAgICAgICAgICAoZ290by1jaGFyIChmaWVs ZC1lbmQpKQorICAgICAgICAgICAgICAgICAgICAgICAoZXF1YWwgKGZpZWxkLXN0cmluZykg Y29tbWFuZCkpKSkpCisgICAgICAoZXNoZWxsLWluc2VydC1jb21tYW5kICJlY2hvICdoaWdo IGZpdmUnIikKKyAgICAgIChlc2hlbGwtaW5zZXJ0LWNvbW1hbmQgImVjaG8gJ3VwIGhpZ2hc blxuZG93biBsb3cnIikKKyAgICAgIChlc2hlbGwtaW5zZXJ0LWNvbW1hbmQgImVjaG8gJ3Rv byBzbG93JyIpCisgICAgICAoaW5zZXJ0ICJlY2hvIGdvb2RieSIpICAgICAgICAgICAgOyBB IHBhcnRpYWxseS1lbnRlcmVkIGNvbW1hbmQuCisgICAgICAoZXJ0LWluZm8gKCJHbyBiYWNr IHRvIHRoZSBsYXN0IHByb21wdCIpCisgICAgICAgIChlc2hlbGwtYmFja3dhcmQtcGFyYWdy YXBoKQorICAgICAgICAoc2hvdWxkIChhdC1wcm9tcHQtZm9yLWNvbW1hbmQtcCAiZWNobyBn b29kYnkiKSkpCisgICAgICAoZXJ0LWluZm8gKCJHbyBiYWNrIHRvIHRoZSBwYXJhZ3JhcGgg YnJlYWsiKQorICAgICAgICAoZXNoZWxsLWJhY2t3YXJkLXBhcmFncmFwaCAyKQorICAgICAg ICAoc2hvdWxkIChsb29raW5nLWF0ICJcbmRvd24gbG93XG4iKSkpCisgICAgICAoZXJ0LWlu Zm8gKCJHbyBmb3J3YXJkIHRvIHRoZSB0aGlyZCBwcm9tcHQiKQorICAgICAgICAoZXNoZWxs LWZvcndhcmQtcGFyYWdyYXBoKQorICAgICAgICAoc2hvdWxkIChhdC1wcm9tcHQtZm9yLWNv bW1hbmQtcCAiZWNobyAndG9vIHNsb3cnXG4iKSkpCisgICAgICAoZXJ0LWluZm8gKCJHbyBi YWNrd2FyZCB0byBiZWZvcmUgdGhlIGZpcnN0IHByb21wdCIpCisgICAgICAgIChlc2hlbGwt YmFja3dhcmQtcGFyYWdyYXBoIDUpCisgICAgICAgIChzaG91bGQgKGxvb2tpbmctYmFjayAi V2VsY29tZSB0byB0aGUgRW1hY3Mgc2hlbGxcbiIpKSkKKyAgICAgIChlcnQtaW5mbyAoIkdv IGJhY2t3YXJkIHRvIHRoZSBiZWdpbm5pbmcgb2YgdGhlIGJ1ZmZlciIpCisgICAgICAgIChl c2hlbGwtYmFja3dhcmQtcGFyYWdyYXBoKQorICAgICAgICAoc2hvdWxkIChib2JwKSkpCisg ICAgICAoZXJ0LWluZm8gKCJHbyBmb3J3YXJkIHRvIHRoZSBzZWNvbmQgcHJvbXB0IikKKyAg ICAgICAgKGVzaGVsbC1mb3J3YXJkLXBhcmFncmFwaCAzKQorICAgICAgICAoc2hvdWxkIChh dC1wcm9tcHQtZm9yLWNvbW1hbmQtcCAiZWNobyAndXAgaGlnaFxuXG5kb3duIGxvdydcbiIp KSkpKSkKKworKGVydC1kZWZ0ZXN0IGVtLXByb21wdC10ZXN0L2ZvcndhcmQtYmFja3dhcmQt cGFyYWdyYXBoICgpCisgICJDaGVjayB0aGF0IG5hdmlnYXRpbmcgZm9yd2FyZC9iYWNrd2Fy ZCB0aHJvdWdoIHBhcmFncmFwaHMgd29ya3MgY29ycmVjdGx5LiIKKyAgKGVtLXByb21wdC10 ZXN0L2ZvcndhcmQtYmFja3dhcmQtcGFyYWdyYXBoLTEpKQorCisoZXJ0LWRlZnRlc3QgZW0t cHJvbXB0LXRlc3QvZm9yd2FyZC1iYWNrd2FyZC1wYXJhZ3JhcGgvbXVsdGlsaW5lICgpCisg ICJDaGVjayBwYXJhZ3JhcGggZm9yd2FyZC9iYWNrd2FyZCBuYXZpZ2F0aW9uIGZvciBtdWx0 aWxpbmUgcHJvbXB0cy4iCisgIChlbS1wcm9tcHQtdGVzdC0td2l0aC1tdWx0aWxpbmUKKyAg IChlbS1wcm9tcHQtdGVzdC9mb3J3YXJkLWJhY2t3YXJkLXBhcmFncmFwaC0xKSkpCisKIChk ZWZ1biBlbS1wcm9tcHQtdGVzdC9mb3J3YXJkLWJhY2t3YXJkLW1hdGNoaW5nLWlucHV0LTEg KCkKICAgIkhlbHBlciBmb3IgY2hlY2tpbmcgZm9yd2FyZC9iYWNrd2FyZCBuYXZpZ2F0aW9u IHZpYSByZWdleHBzLiIKICAgKHdpdGgtdGVtcC1lc2hlbGwKLS0gCjIuMjUuMQoK --------------h3ZPFDuLpMkIGckyKO20Cbku-- From unknown Sun Jun 22 11:47:47 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Jim Porter Subject: bug#71545: closed (Re: bug#71545: 30.0.50; [PATCH] Fix paragraph navigation in Eshell) Message-ID: References: <6b1f64c8-9f25-eb5f-ae32-13c9eb5c1c30@gmail.com> X-Gnu-PR-Message: they-closed 71545 X-Gnu-PR-Package: emacs X-Gnu-PR-Keywords: patch Reply-To: 71545@debbugs.gnu.org Date: Fri, 21 Jun 2024 02:11:02 +0000 Content-Type: multipart/mixed; boundary="----------=_1718935862-13383-1" This is a multi-part message in MIME format... ------------=_1718935862-13383-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #71545: 30.0.50; [PATCH] Fix paragraph navigation in Eshell which was filed against the emacs package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 71545@debbugs.gnu.org. --=20 71545: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D71545 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1718935862-13383-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 71545-done) by debbugs.gnu.org; 21 Jun 2024 02:10:36 +0000 Received: from localhost ([127.0.0.1]:52295 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sKTjY-0003Sw-Hk for submit@debbugs.gnu.org; Thu, 20 Jun 2024 22:10:36 -0400 Received: from mail-pl1-f176.google.com ([209.85.214.176]:56437) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sKTjW-0003Sa-84 for 71545-done@debbugs.gnu.org; Thu, 20 Jun 2024 22:10:34 -0400 Received: by mail-pl1-f176.google.com with SMTP id d9443c01a7336-1f44b441b08so12018925ad.0 for <71545-done@debbugs.gnu.org>; Thu, 20 Jun 2024 19:10:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1718935764; x=1719540564; darn=debbugs.gnu.org; h=content-transfer-encoding:in-reply-to:references:newsgroups:to:from :content-language:subject:mime-version:date:message-id:from:to:cc :subject:date:message-id:reply-to; bh=3kfS/PsWpfpUY8GJr+DXsWsLzBzITDJUE+/vOneklxA=; b=R2KWeFx+oDUfNeLJ/nHsxyco36W/H6z6FYIW391Cx+3hklz/VBN2zuMS6KMyJdGmPG GlIi157FGbt9vPDIoyEtTvWcFfDpHsGwmPtxC9+/ZY7eaJ8d2D9YxivJyGCnTf2Q2B/w V16M+N29ie8udcuHTr0rYa1bLDXSvPOEYBXho+pNWvQFnCNAUcnaSD+glLTdLLEWSewl bpzqrO+AmKBUjZ1+YFXH6nmjEVKIgefh4WDOqL5RjQifEIvDNMDNiMVFlIzhsa0/WV4k UCCGKTNgLgiSgue+u2OxrrcARldkI4+eMYrT6YN600HwfNLAK0YQeJpgIloox6CtGfQN 202g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1718935764; x=1719540564; h=content-transfer-encoding:in-reply-to:references:newsgroups:to:from :content-language:subject:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=3kfS/PsWpfpUY8GJr+DXsWsLzBzITDJUE+/vOneklxA=; b=ACO7iiprtSxbVZb9gsQx2rck3XU30a/XnQDb//vp5Q1uZncGYcPmMWkH3YmemWdyvg qH71A9mLaI1+T0lTXC2b6cKiHZMzbE2MYy9RViHLxklH88WwjiXGRiq6rUVAHUEP/717 Wz32AiPFB9OTMEk/LSti43WW5jP7D6u6oD5fsGMX/jvavPik/F1Shdq0XncbwKydRUAI wOlGBEfmzKM5PMOXwuBC3+kGS9QU3UFHQJ3rM7FAdCie0zVXZElfHxnkDPgIUN3QHqHr BdF5ig7pSxtmKCQjGhi/WVmVUN29mHRZszA5Es6IWPXTzQoDnJ1bnNsgt6iJZBZ+IoE3 ibdw== X-Gm-Message-State: AOJu0YwX5ZIxLWiwBsDijzKJNLC8Hg5Cb5BlvwiSvb6gUZEunImjFFcG h1Ognuxeutn8alSHBsy9KQoWkUILmH9Vvi6tSNYWg4f+FL7MVgfzL4XhAw== X-Google-Smtp-Source: AGHT+IGlmqvOMJcTDFfcsjUC3DlaccjleHvPD71HKCQZUtNtPKd2WdUHsepmevZAez0FR712QyT01w== X-Received: by 2002:a17:902:ea07:b0:1f9:ab2c:e458 with SMTP id d9443c01a7336-1f9ab2ce46amr86210905ad.31.1718935764188; Thu, 20 Jun 2024 19:09:24 -0700 (PDT) Received: from [192.168.1.2] (syn-023-240-098-037.res.spectrum.com. [23.240.98.37]) by smtp.googlemail.com with ESMTPSA id d9443c01a7336-1f9eb3c8c01sm2961955ad.129.2024.06.20.19.09.23 for <71545-done@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 20 Jun 2024 19:09:23 -0700 (PDT) Message-ID: Date: Thu, 20 Jun 2024 19:09:23 -0700 MIME-Version: 1.0 Subject: Re: bug#71545: 30.0.50; [PATCH] Fix paragraph navigation in Eshell Content-Language: en-US From: Jim Porter To: 71545-done@debbugs.gnu.org Newsgroups: gmane.emacs.bugs References: <6b1f64c8-9f25-eb5f-ae32-13c9eb5c1c30@gmail.com> 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: 71545-done 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 6/13/2024 9:42 PM, Jim Porter wrote: > My previous patch had a typo that snuck in. Here's the fixed version. Merged as e22b072423a to the master branch, and closing this bug. ------------=_1718935862-13383-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 14 Jun 2024 04:34:08 +0000 Received: from localhost ([127.0.0.1]:39565 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sHydc-0005My-2U for submit@debbugs.gnu.org; Fri, 14 Jun 2024 00:34:08 -0400 Received: from lists.gnu.org ([209.51.188.17]:38232) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sHydX-0005Mo-4T for submit@debbugs.gnu.org; Fri, 14 Jun 2024 00:34:06 -0400 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 1sHydW-0007mm-PU for bug-gnu-emacs@gnu.org; Fri, 14 Jun 2024 00:34:02 -0400 Received: from mail-pl1-x62b.google.com ([2607:f8b0:4864:20::62b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sHydU-00027v-K9 for bug-gnu-emacs@gnu.org; Fri, 14 Jun 2024 00:34:02 -0400 Received: by mail-pl1-x62b.google.com with SMTP id d9443c01a7336-1f4c7b022f8so16361075ad.1 for ; Thu, 13 Jun 2024 21:34:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1718339638; x=1718944438; darn=gnu.org; h=subject:from:to:content-language:mime-version:date:message-id:from :to:cc:subject:date:message-id:reply-to; bh=pJ9P8jqREwGm91UZSy5HoDCQDOUAf7UTgOSOIhSATLk=; b=fBWbBUIhrak+Y97/4blU1nP5yP0LaTQGti9tAnzq7p7WJNKgUWEH2lXn3TeTyn2yE1 YE2abAyJhAJexj8grGdeO+CjD43JWviCKxF/tR5rQPfcuHo8V4wtFrls44R46rDXixcJ p80wwKICCRBlDS8QECgVtbv7pLey2MvXp46bQgLK9wGDOE60PdnxgBmGdcYnHvWupYPn KHCzS6TN2Dt0Ht6Knj7CV1xlEz3EsJ4KvsEqoQK7/2IhHRhkXmbUemSUYTPNGsjzgYH5 ppRNlPJ0lByt+SjGFEkCq/bv4tvJkAg4Q2zukUvd60pO5dgpQLNBQDl+E6tfcFYLMKdQ /xVw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1718339638; x=1718944438; h=subject:from:to:content-language:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=pJ9P8jqREwGm91UZSy5HoDCQDOUAf7UTgOSOIhSATLk=; b=bnf9nnmG1fSbbWG//kZk3FDzScEv8mkil3YvzXi0eHlNezLt5ZHWOgxxujnzxENaWU xz5Vt8/oEHleB/E3w33sD1i8fg/rBpADSqcQsRwk2uU92fTBB6Bll3NxcQbZwVapYbHd 4b4GGOxU7SoO3LGZeKlMo//m0fNz0joy/OLthVNNV6+B8xFs7CjK5XUspdvIbi8P+tcC LVYuYppoT8dVWvNjNbhODPY0AMX4CI6yR7Cytq8MBOy/7mMl64Cm82HKTISNbEVxJnSb VEd0YedN3UVNfcN3SxC3azZ312CZjPMQ7f8aUiGthTs5vCfHF6OtzkgwcXzqZo3nGJwt 2zbA== X-Gm-Message-State: AOJu0YwFUW0S35YgKh/yoGuq7r2/Svu0f1gj6lQ4MC/n9Gaxytc3g7Rq 70ZByX0w+4H+33g1n4lEomvPwPwM/+04zlNWBc2hX28KHyRucWbBKILiaQ== X-Google-Smtp-Source: AGHT+IHo8EheH92FHw7KjMovD+yjRW8lzl0/PCPKuKM4cLJWBK0bM9SFov1zs4WkpwC3j9DFpELZqw== X-Received: by 2002:a17:902:f548:b0:1f7:2bed:226 with SMTP id d9443c01a7336-1f8627eba78mr15850585ad.36.1718339638358; Thu, 13 Jun 2024 21:33:58 -0700 (PDT) Received: from [192.168.1.2] (syn-023-240-098-037.res.spectrum.com. [23.240.98.37]) by smtp.googlemail.com with ESMTPSA id d9443c01a7336-1f868b83c5bsm3567155ad.164.2024.06.13.21.33.57 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 13 Jun 2024 21:33:57 -0700 (PDT) Content-Type: multipart/mixed; boundary="------------hwGLM9HS1nmnok6vItbukCSX" Message-ID: <6b1f64c8-9f25-eb5f-ae32-13c9eb5c1c30@gmail.com> Date: Thu, 13 Jun 2024 21:33:57 -0700 MIME-Version: 1.0 X-Mozilla-News-Host: news://news.gmane.io:119 Content-Language: en-US To: bug-gnu-emacs@gnu.org From: Jim Porter Subject: 30.0.50; [PATCH] Fix paragraph navigation in Eshell Received-SPF: pass client-ip=2607:f8b0:4864:20::62b; envelope-from=jporterbugs@gmail.com; helo=mail-pl1-x62b.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, T_SCC_BODY_TEXT_LINE=-0.01 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. --------------hwGLM9HS1nmnok6vItbukCSX Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit A while back, I updated how forward- and backward-paragraph work in Eshell so that we didn't have to rely on regexps to detect the prompt (paragraph navigation in Eshell has always stopped at prompts as well as blank lines separating paragraphs). I got that implementation wrong, and since then it's only navigated between prompts. Attached is a patch to restore the proper behavior, plus some tests to make sure I got it right this time. --------------hwGLM9HS1nmnok6vItbukCSX Content-Type: text/plain; charset=UTF-8; name="0001-Ensure-navigating-by-paragraphs-in-Eshell-stops-at-p.patch" Content-Disposition: attachment; filename*0="0001-Ensure-navigating-by-paragraphs-in-Eshell-stops-at-p.pa"; filename*1="tch" Content-Transfer-Encoding: base64 RnJvbSBmMDE1YjdmMWQ3ZWYzNWVkZjU5Yzc4OTlmZTZiNGQyN2YwMTZkYzc2IE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBKaW0gUG9ydGVyIDxqcG9ydGVyYnVnc0BnbWFpbC5j b20+CkRhdGU6IFRodSwgMTMgSnVuIDIwMjQgMjE6MjY6NTMgLTA3MDAKU3ViamVjdDogW1BB VENIXSBFbnN1cmUgbmF2aWdhdGluZyBieSBwYXJhZ3JhcGhzIGluIEVzaGVsbCBzdG9wcyBh dCBwcm9tcHRzCiBhbmQgcGFyYWdyYXBocwoKVGhlIHByZXZpb3VzIGltcGxlbWVudGF0aW9u IGluIDZhZTJiNzRlZDIwIG9ubHkgc3RvcHBlZCBhdCBwcm9tcHRzLAp3aGljaCBpc24ndCB0 aGUgcmlnaHQgYmVoYXZpb3IuCgoqIGxpc3AvZXNoZWxsL2VtLXByb21wdC5lbCAoZXNoZWxs LWZvcndhcmQtcGFyYWdyYXBoKQooZXNoZWxsLWJhY2t3YXJkLXBhcmFncmFwaCk6IFJlaW1w bGVtZW50IHRvIGhhbmRsZSBwcm9tcHRzIGFuZApwYXJhZ3JhcGhzICh0aGUgbGF0dGVyIGJ5 IGNhbGxpbmcgdGhlIG9yaWdpbmFsICdmb3J3YXJkLXBhcmFncmFwaCcpLgoKKiB0ZXN0L2xp c3AvZXNoZWxsL2VtLXByb21wdC10ZXN0cy5lbAooZW0tcHJvbXB0LXRlc3QvbmV4dC1wcmV2 aW91cy1wcm9tcHQvbXVsdGlsaW5lKTogUmVuYW1lLgooZW0tcHJvbXB0LXRlc3QvZm9yd2Fy ZC1iYWNrd2FyZC1wYXJhZ3JhcGgtMSk6IE5ldyBmdW5jdGlvbi4KKGVtLXByb21wdC10ZXN0 L2ZvcndhcmQtYmFja3dhcmQtcGFyYWdyYXBoKQooZW0tcHJvbXB0LXRlc3QvZm9yd2FyZC1i YWNrd2FyZC1wYXJhZ3JhcGgvbXVsdGlsaW5lKTogTmV3IHRlc3RzLgotLS0KIGxpc3AvZXNo ZWxsL2VtLXByb21wdC5lbCAgICAgICAgICAgIHwgMzQgKysrKysrKysrKysrKysrKy0tLS0K IHRlc3QvbGlzcC9lc2hlbGwvZW0tcHJvbXB0LXRlc3RzLmVsIHwgNDkgKysrKysrKysrKysr KysrKysrKysrKysrKysrKy0KIDIgZmlsZXMgY2hhbmdlZCwgNzYgaW5zZXJ0aW9ucygrKSwg NyBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9saXNwL2VzaGVsbC9lbS1wcm9tcHQuZWwg Yi9saXNwL2VzaGVsbC9lbS1wcm9tcHQuZWwKaW5kZXggYjY1NTZkMjk1NDQuLmZiNGU1MWNk ZmUwIDEwMDY0NAotLS0gYS9saXNwL2VzaGVsbC9lbS1wcm9tcHQuZWwKKysrIGIvbGlzcC9l c2hlbGwvZW0tcHJvbXB0LmVsCkBAIC0xMTcsNyArMTE3LDcgQEAgZXNoZWxsLXByb21wdC1p bml0aWFsaXplCiAgICJJbml0aWFsaXplIHRoZSBwcm9tcHRpbmcgY29kZS4iCiAgICh1bmxl c3MgZXNoZWxsLW5vbi1pbnRlcmFjdGl2ZS1wCiAgICAgKGFkZC1ob29rICdlc2hlbGwtcG9z dC1jb21tYW5kLWhvb2sgJ2VzaGVsbC1lbWl0LXByb21wdCBuaWwgdCkKLSAgICAoZXNoZWxs LXByb21wdC1tb2RlKSkpCisgICAgKGVzaGVsbC1wcm9tcHQtbW9kZSkpCiAKIChkZWZ1biBl c2hlbGwtZW1pdC1wcm9tcHQgKCkKICAgIkVtaXQgYSBwcm9tcHQgaWYgZXNoZWxsIGlzIGJl aW5nIHVzZWQgaW50ZXJhY3RpdmVseS4iCkBAIC0xNjcsMTcgKzE2NywzOSBAQCBlc2hlbGwt YmFja3dhcmQtbWF0Y2hpbmctaW5wdXQKIAogKGRlZnVuIGVzaGVsbC1mb3J3YXJkLXBhcmFn cmFwaCAoJm9wdGlvbmFsIG4pCiAgICJNb3ZlIHRvIHRoZSBiZWdpbm5pbmcgb2YgdGhlIE50 aCBuZXh0IHByb21wdCBpbiB0aGUgYnVmZmVyLgotTGlrZSBgZm9yd2FyZC1wYXJhZ3JhcGgn LCBidXQgbmF2aWdhdGVzIHVzaW5nIGZpZWxkcy4iCitMaWtlIGBmb3J3YXJkLXBhcmFncmFw aCcsIGJ1dCBhbHNvIHN0b3BzIGF0IHRoZSBiZWdpbm5pbmcgb2YgZWFjaCBwcm9tcHQuIgog ICAoaW50ZXJhY3RpdmUgInAiKQotICAoZXNoZWxsLW5leHQtcHJvbXB0IG4pCi0gIChnb3Rv LWNoYXIgKGZpZWxkLWJlZ2lubmluZyAocG9pbnQpIHQpKSkKKyAgKHVubGVzcyBuIChzZXRx IG4gMSkpCisgIChsZXQgKDs7IFdlJ2xsIGhhbmRsZSB0aGUgInBhcmFncmFwaCIgc3RhcnRz IG91cnNlbHZlcy4KKyAgICAgICAgKHBhcmFncmFwaC1zdGFydCByZWdleHAtdW5tYXRjaGFi bGUpCisgICAgICAgIChpbmhpYml0LWZpZWxkLXRleHQtbW90aW9uIHQpKQorICAgIChjb25k CisgICAgICgoPiBuIDApCisgICAgICAod2hpbGUgKGFuZCAoPiBuIDApICg8IChwb2ludCkg KHBvaW50LW1heCkpKQorICAgICAgICAobGV0ICgobmV4dC1wYXJhZ3JhcGggKHNhdmUtZXhj dXJzaW9uIChmb3J3YXJkLXBhcmFncmFwaCkgKHBvaW50KSkpCisgICAgICAgICAgICAgIChu ZXh0LXByb21wdCAoc2F2ZS1leGN1cnNpb24KKyAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgKGlmLWxldCAoKG1hdGNoICh0ZXh0LXByb3BlcnR5LXNlYXJjaC1mb3J3YXJkCisgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgJ2ZpZWxkICdwcm9t cHQgdCB0KSkpCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAocHJvcC1tYXRj aC1iZWdpbm5pbmcgbWF0Y2gpCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKHBv aW50LW1heCkpKSkpCisgICAgICAgICAgKGdvdG8tY2hhciAobWluIG5leHQtcGFyYWdyYXBo IG5leHQtcHJvbXB0KSkpCisgICAgICAgIChzZXRxIG4gKDEtIG4pKSkpCisgICAgICgoPCBu IDApCisgICAgICAod2hpbGUgKGFuZCAoPCBuIDApICg+IChwb2ludCkgKHBvaW50LW1pbikp KQorICAgICAgICAobGV0ICgocHJldi1wYXJhZ3JhcGggKHNhdmUtZXhjdXJzaW9uIChiYWNr d2FyZC1wYXJhZ3JhcGgpIChwb2ludCkpKQorICAgICAgICAgICAgICAocHJldi1wcm9tcHQg KHNhdmUtZXhjdXJzaW9uCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgIChpZiAodGV4 dC1wcm9wZXJ0eS1zZWFyY2gtYmFja3dhcmQKKyAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAnZmllbGQgJ3Byb21wdCB0KQorICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgKHBvaW50KQorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIChwb2ludC1t aW4pKSkpKQorICAgICAgICAgIChnb3RvLWNoYXIgKG1heCBwcmV2LXBhcmFncmFwaCBwcmV2 LXByb21wdCkpKQorICAgICAgICAoc2V0cSBuICgxKyBuKSkpKSkpKQogCiAoZGVmdW4gZXNo ZWxsLWJhY2t3YXJkLXBhcmFncmFwaCAoJm9wdGlvbmFsIG4pCiAgICJNb3ZlIHRvIHRoZSBi ZWdpbm5pbmcgb2YgdGhlIE50aCBwcmV2aW91cyBwcm9tcHQgaW4gdGhlIGJ1ZmZlci4KIExp a2UgYGJhY2t3YXJkLXBhcmFncmFwaCcsIGJ1dCBuYXZpZ2F0ZXMgdXNpbmcgZmllbGRzLiIK ICAgKGludGVyYWN0aXZlICJwIikKLSAgKGVzaGVsbC1wcmV2aW91cy1wcm9tcHQgbikKLSAg KGdvdG8tY2hhciAoZmllbGQtYmVnaW5uaW5nIChwb2ludCkgdCkpKQorICAoZXNoZWxsLWZv cndhcmQtcGFyYWdyYXBoICgtIChvciBuIDEpKSkpCiAKIChkZWZ1biBlc2hlbGwtbmV4dC1w cm9tcHQgKCZvcHRpb25hbCBuKQogICAiTW92ZSB0byBlbmQgb2YgTnRoIG5leHQgcHJvbXB0 IGluIHRoZSBidWZmZXIuIgpkaWZmIC0tZ2l0IGEvdGVzdC9saXNwL2VzaGVsbC9lbS1wcm9t cHQtdGVzdHMuZWwgYi90ZXN0L2xpc3AvZXNoZWxsL2VtLXByb21wdC10ZXN0cy5lbAppbmRl eCA5NjQ2MDllNjQxMC4uZmJhZGFkZTA2MWYgMTAwNjQ0Ci0tLSBhL3Rlc3QvbGlzcC9lc2hl bGwvZW0tcHJvbXB0LXRlc3RzLmVsCisrKyBiL3Rlc3QvbGlzcC9lc2hlbGwvZW0tcHJvbXB0 LXRlc3RzLmVsCkBAIC0zOSw2ICszOSw5IEBAIGVtLXByb21wdC10ZXN0LS13aXRoLW11bHRp bGluZQogCiA7OzsgVGVzdHM6CiAKKwwKKzs7IFByb21wdCBvdXRwdXQKKwogKGVydC1kZWZ0 ZXN0IGVtLXByb21wdC10ZXN0L2ZpZWxkLXByb3BlcnRpZXMgKCkKICAgIkNoZWNrIHRoYXQg ZmllbGQgcHJvcGVydGllcyBhcmUgcHJvcGVybHkgc2V0IG9uIEVzaGVsbCBvdXRwdXQvcHJv bXB0cy4iCiAgICh3aXRoLXRlbXAtZXNoZWxsCkBAIC0xMDQsNiArMTA3LDkgQEAgZW0tcHJv bXB0LXRlc3QvYWZ0ZXItZmFpbHVyZQogICAgICAgICAgICAgICAgJ2Zyb250LXN0aWNreSAn KHJlYWQtb25seSBmaWVsZCBmb250LWxvY2stZmFjZSkKICAgICAgICAgICAgICAgICdyZWFy LW5vbnN0aWNreSAnKHJlYWQtb25seSBmaWVsZCBmb250LWxvY2stZmFjZSkpKSkpKSkKIAor DAorOzsgUHJvbXB0IG5hdmlnYXRpb24KKwogKGRlZnVuIGVtLXByb21wdC10ZXN0L25leHQt cHJldmlvdXMtcHJvbXB0LTEgKCkKICAgIkhlbHBlciBmb3IgY2hlY2tpbmcgZm9yd2FyZC9i YWNrd2FyZCBuYXZpZ2F0aW9uIG9mIG9sZCBwcm9tcHRzLiIKICAgKHdpdGgtdGVtcC1lc2hl bGwKQEAgLTE1MCwxMSArMTU2LDUyIEBAIGVtLXByb21wdC10ZXN0L25leHQtcHJldmlvdXMt cHJvbXB0CiAgICJDaGVjayB0aGF0IG5hdmlnYXRpbmcgZm9yd2FyZC9iYWNrd2FyZCB0aHJv dWdoIG9sZCBwcm9tcHRzIHdvcmtzIGNvcnJlY3RseS4iCiAgIChlbS1wcm9tcHQtdGVzdC9u ZXh0LXByZXZpb3VzLXByb21wdC0xKSkKIAotKGVydC1kZWZ0ZXN0IGVtLXByb21wdC10ZXN0 L25leHQtcHJldmlvdXMtcHJvbXB0LW11bHRpbGluZSAoKQorKGVydC1kZWZ0ZXN0IGVtLXBy b21wdC10ZXN0L25leHQtcHJldmlvdXMtcHJvbXB0L211bHRpbGluZSAoKQogICAiQ2hlY2sg b2xkIHByb21wdCBmb3J3YXJkL2JhY2t3YXJkIG5hdmlnYXRpb24gZm9yIG11bHRpbGluZSBw cm9tcHRzLiIKICAgKGVtLXByb21wdC10ZXN0LS13aXRoLW11bHRpbGluZQogICAgKGVtLXBy b21wdC10ZXN0L25leHQtcHJldmlvdXMtcHJvbXB0LTEpKSkKIAorKGRlZnVuIGVtLXByb21w dC10ZXN0L2ZvcndhcmQtYmFja3dhcmQtcGFyYWdyYXBoLTEgKCkKKyAgIkhlbHBlciBmb3Ig Y2hlY2tpbmcgZm9yd2FyZC9iYWNrd2FyZCBuYXZpZ2F0aW9uIGJ5IHBhcmFncmFwaHMuIgor ICAod2l0aC10ZW1wLWVzaGVsbAorICAgIChjbC1mbGV0ICgoYXQtcHJvbXB0LWZvci1jb21t YW5kLXAgKGNvbW1hbmQpCisgICAgICAgICAgICAgICAgKGFuZCAoZXF1YWwgKHBvaW50KSAo ZmllbGQtYmVnaW5uaW5nKSkKKyAgICAgICAgICAgICAgICAgICAgIChlcXVhbCAoZ2V0LXRl eHQtcHJvcGVydHkgKHBvaW50KSAnZmllbGQpICdwcm9tcHQpCisgICAgICAgICAgICAgICAg ICAgICAoc2F2ZS1leGN1cnNpb24KKyAgICAgICAgICAgICAgICAgICAgICAgKGdvdG8tY2hh ciAoZmllbGQtZW5kKSkKKyAgICAgICAgICAgICAgICAgICAgICAgKGVxdWFsIChmaWVsZC1z dHJpbmcpIGNvbW1hbmQpKSkpKQorICAgICAgKGVzaGVsbC1pbnNlcnQtY29tbWFuZCAiZWNo byAnaGlnaCBmaXZlJyIpCisgICAgICAoZXNoZWxsLWluc2VydC1jb21tYW5kICJlY2hvICd1 cCBoaWdoXG5cbmRvd24gbG93JyIpCisgICAgICAoZXNoZWxsLWluc2VydC1jb21tYW5kICJl Y2hvICd0b28gc2xvdyciKQorICAgICAgKGluc2VydCAiZWNobyBnb29kYnkiKSAgICAgICAg ICAgIDsgQSBwYXJ0aWFsbHktZW50ZXJlZCBjb21tYW5kLgorICAgICAgKGVydC1pbmZvICgi R28gYmFjayB0byB0aGUgbGFzdCBwcm9tcHQiKQorICAgICAgICAoZXNoZWxsLWJhY2t3YXJk LXBhcmFncmFwaCkKKyAgICAgICAgKHNob3VsZCAoYXQtcHJvbXB0LWZvci1jb21tYW5kLXAg ImVjaG8gZ29vZGJ5IikpKQorICAgICAgKGVydC1pbmZvICgiR28gYmFjayB0byB0aGUgcGFy YWdyYXBoIGJyZWFrIikKKyAgICAgICAgKGVzaGVsbC1iYWNrd2FyZC1wYXJhZ3JhcGggMikK KyAgICAgICAgKHNob3VsZCAobG9va2luZy1hdCAiXG5kb3duIGxvd1xuIikpKQorICAgICAg KGVydC1pbmZvICgiR28gZm9yd2FyZCB0byB0aGUgdGhpcmQgcHJvbXB0IikKKyAgICAgICAg KGVzaGVsbC1mb3J3YXJkLXBhcmFncmFwaCkKKyAgICAgICAgKHNob3VsZCAoYXQtcHJvbXB0 LWZvci1jb21tYW5kLXAgImVjaG8gJ3RvbyBzbG93J1xuIikpKQorICAgICAgKGVydC1pbmZv ICgiR28gYmFja3dhcmQgdG8gYmVmb3JlIHRoZSBmaXJzdCBwcm9tcHQiKQorICAgICAgICAo ZXNoZWxsLWJhY2t3YXJkLXBhcmFncmFwaCA1KQorICAgICAgICAoc2hvdWxkIChsb29raW5n LWJhY2sgIldlbGNvbWUgdG8gdGhlIEVtYWNzIHNoZWxsXG4iKSkpCisgICAgICAoZXJ0LWlu Zm8gKCJHbyBiYWNrd2FyZCB0byB0aGUgYmVnaW5uaW5nIG9mIHRoZSBidWZmZXIiKQorICAg ICAgICAoZXNoZWxsLWJhY2t3YXJkLXBhcmFncmFwaCkKKyAgICAgICAgKHNob3VsZCAoYm9i cCkpKQorICAgICAgKGVydC1pbmZvICgiR28gZm9yd2FyZCB0byB0aGUgc2Vjb25kIHByb21w dCIpCisgICAgICAgIChlc2hlbGwtZm9yd2FyZC1wYXJhZ3JhcGggMykKKyAgICAgICAgKHNo b3VsZCAoYXQtcHJvbXB0LWZvci1jb21tYW5kLXAgImVjaG8gJ3VwIGhpZ2hcblxuZG93biBs b3cnXG4iKSkpKSkpCisKKyhlcnQtZGVmdGVzdCBlbS1wcm9tcHQtdGVzdC9mb3J3YXJkLWJh Y2t3YXJkLXBhcmFncmFwaCAoKQorICAiQ2hlY2sgdGhhdCBuYXZpZ2F0aW5nIGZvcndhcmQv YmFja3dhcmQgdGhyb3VnaCBwYXJhZ3JhcGhzIHdvcmtzIGNvcnJlY3RseS4iCisgIChlbS1w cm9tcHQtdGVzdC9mb3J3YXJkLWJhY2t3YXJkLXBhcmFncmFwaC0xKSkKKworKGVydC1kZWZ0 ZXN0IGVtLXByb21wdC10ZXN0L2ZvcndhcmQtYmFja3dhcmQtcGFyYWdyYXBoL211bHRpbGlu ZSAoKQorICAiQ2hlY2sgcGFyYWdyYXBoIGZvcndhcmQvYmFja3dhcmQgbmF2aWdhdGlvbiBm b3IgbXVsdGlsaW5lIHByb21wdHMuIgorICAoZW0tcHJvbXB0LXRlc3QtLXdpdGgtbXVsdGls aW5lCisgICAoZW0tcHJvbXB0LXRlc3QvZm9yd2FyZC1iYWNrd2FyZC1wYXJhZ3JhcGgtMSkp KQorCiAoZGVmdW4gZW0tcHJvbXB0LXRlc3QvZm9yd2FyZC1iYWNrd2FyZC1tYXRjaGluZy1p bnB1dC0xICgpCiAgICJIZWxwZXIgZm9yIGNoZWNraW5nIGZvcndhcmQvYmFja3dhcmQgbmF2 aWdhdGlvbiB2aWEgcmVnZXhwcy4iCiAgICh3aXRoLXRlbXAtZXNoZWxsCi0tIAoyLjI1LjEK Cg== --------------hwGLM9HS1nmnok6vItbukCSX-- ------------=_1718935862-13383-1--