From unknown Tue Aug 19 10:08:50 2025 X-Loop: help-debbugs@gnu.org Subject: bug#54227: 29.0.50; [PATCH] Inconsistencies with Eshell variable interpolation Resent-From: Jim Porter Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Thu, 03 Mar 2022 06:36:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 54227 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch To: 54227@debbugs.gnu.org X-Debbugs-Original-To: bug-gnu-emacs@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.164628933521556 (code B ref -1); Thu, 03 Mar 2022 06:36:01 +0000 Received: (at submit) by debbugs.gnu.org; 3 Mar 2022 06:35:35 +0000 Received: from localhost ([127.0.0.1]:41225 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nPf3l-0005bZ-RU for submit@debbugs.gnu.org; Thu, 03 Mar 2022 01:35:35 -0500 Received: from lists.gnu.org ([209.51.188.17]:46448) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nPf3h-0005bN-GS for submit@debbugs.gnu.org; Thu, 03 Mar 2022 01:35:31 -0500 Received: from eggs.gnu.org ([209.51.188.92]:50850) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nPf3h-0002CW-4M for bug-gnu-emacs@gnu.org; Thu, 03 Mar 2022 01:35:29 -0500 Received: from [2607:f8b0:4864:20::436] (port=47077 helo=mail-pf1-x436.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nPf3d-0003NF-6t for bug-gnu-emacs@gnu.org; Thu, 03 Mar 2022 01:35:28 -0500 Received: by mail-pf1-x436.google.com with SMTP id s11so3917997pfu.13 for ; Wed, 02 Mar 2022 22:35:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:subject:to:message-id:date:mime-version:content-language; bh=nuiInJyGkhK+e9rEJjZwxmT4CUE6eAbT+HqDDStfLq8=; b=Id2wGiRkKxojeJOrkVHG7Tun6wHQDGQxzl5/ssr8fR4iias25pTAFlvm1Rviuj/CP5 V0hW1UWhpnUIKcvlIRkkg6qrkhuplpEWytLil3drM32wqFZgtfj87gwV96VSQWQ+R5tp ZE4RinY5BeVGZSV982yfqwRLmiJ5X7GB8Bal+h1lseVl/e105As4zx2lDA3iaKryQsIF 2jZBmzNE78giWT8OikhRSvaUf3hQFc/VhM8qxX9V26JXqFgVwi0s/L/STfeixOx+Atc2 bC/BZDH9gYl/j+OIRtdNbUGhFi1q0uxu4eceNSl8R151yWbYnUElTYiWup7uDFoNVu8Q bOmw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:subject:to:message-id:date:mime-version :content-language; bh=nuiInJyGkhK+e9rEJjZwxmT4CUE6eAbT+HqDDStfLq8=; b=CKFHL2gcOw/q0r7t/iaSQ3oVP/7e7KoP+oSrqLigRS1WE//7BatsDrsly77eUaKSqE dDf1XmNd4cGCrW46bF+R2SKESR9hTNkHKnSGYAW1vOV4sLYaWQq2KJSPbPNpeI6meFPm 485cPRTJPb2kynKB63VPU1e2BPtOV0K/rxMiL30BN1LWds1jRM7tpgHn/bFw1OKVCfAR wUo+RSHoee4Uyr6Lpn4BoxcYMlqtclBETUcsh+UkTlBTAFV2zKNmviOyKXayJhhdUxuQ X78hW60tXxVfcVkkIShdGfj9lo2vgo2LaUxU5hiohFpVk7B8St3G8TIXkMj8Kc3Vs6dZ q+dQ== X-Gm-Message-State: AOAM532CyQdQw8nYmq7cpBvjyHFo0aIWQn349573363RWwHvb8cxU7gB 9oyx21LgDMUDUxA1ww/jVPxnxVEGl8s= X-Google-Smtp-Source: ABdhPJzXnAko766+RLrG9llX0v6CYYmjf0TcruofhcqTIJrkaZbhGOSwVKxjHQXMRqneuJWlqKy5vg== X-Received: by 2002:a63:a519:0:b0:373:38c9:cea6 with SMTP id n25-20020a63a519000000b0037338c9cea6mr28739653pgf.472.1646289323391; Wed, 02 Mar 2022 22:35:23 -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 x6-20020a17090aa38600b001bce781ce03sm1018122pjp.18.2022.03.02.22.35.22 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 02 Mar 2022 22:35:22 -0800 (PST) X-Mozilla-News-Host: news://news.gmane.org:119 From: Jim Porter Message-ID: Date: Wed, 2 Mar 2022 22:35:22 -0800 MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="------------84BAF41E9AB7415EAB9F2A21" Content-Language: en-US X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::436 (failed) Received-SPF: pass client-ip=2607:f8b0:4864:20::436; envelope-from=jporterbugs@gmail.com; helo=mail-pf1-x436.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 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, PDS_HP_HELO_NORDNS=0.659, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no 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. --------------84BAF41E9AB7415EAB9F2A21 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit There are a few related issues with how Eshell parses variable interpolations, especially when mixing with double-quotes. Starting from "emacs -Q --eval '(eshell)': 1. Quoted subcommands ~ $ echo ${echo hi} hi ;; good, this is what we want ~ $ echo "${echo hi}" echo hi: command not found In this case, Eshell gets confused by the double quotes and looks for the command named `echo hi', not the command named `echo' with the argument `hi'. 2. Complex list indexing ~ $ echo $PATH[: 0] /usr/local/bin ;; good (the first element of your $PATH) ~ $ echo $PATH[":" 0] Wrong type argument: number-or-marker-p, (eshell-escape-arg ":") Here, Eshell neglects to evaluate the subscript arguments, so only literal, unquoted values work. Note that the ":" in this case means "split the string $PATH with colon as a delimiter". The same happens with Elisp subexpressions: ~ $ echo $exec-path[0] /usr/local/bin ;; good, again ~ $ echo $exec-path[$(+ 1 -1)] Wrong type argument: number-or-marker-p, (eshell-escape-arg (let ((indices 'nil)) (eshell-command-to-value (eshell-lisp-command '(+ 1 -1))))) 3. Bare-string indexing ~ $ setq foo "fooXbarXbaz" fooXbarXbaz ~ $ echo $foo[X 0] (nil #("fooXbarXbaz" 0 11 (escaped t))) This is similar to the above case, but here Eshell thinks that "X" is a literal index to use. First, it splits `foo' into a list using space as a delimiter. Then gets confused when it uses a string as an index into a list, so it returns nil. The second element of the result is the 0th element of `foo'-as-a-list, aka the whole string since there are no spaces. (Just ignore for now the fact that the string "fooXbarXbaz" mysteriously gained an `escaped' property. That's a separate bug.) This last one is less of a bug and more of a missing feature: if a bare (non-numeric) string is used as an index for a string variable, we know it *must* be a delimiter argument. Since we're indexing into a list, a string index doesn't really make sense. -------------------- Attached is a patch series to fix these cases, as well as a lot more tests for Eshell variable interpolation, since this can get tricky. I've also updated the documentation to clarify how indexing works. I didn't initially realize that you could do quite so many complex things with it, so I figured it'd be good to explain in more detail so it's easier to discover. --------------84BAF41E9AB7415EAB9F2A21 Content-Type: text/plain; charset=UTF-8; name="0001-Move-Eshell-variable-interpolation-tests-to-their-ow.patch" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename*0="0001-Move-Eshell-variable-interpolation-tests-to-their-ow.pa"; filename*1="tch" RnJvbSBiZWVhOThjZWM2ZTU2ZmNmZjdhYmM2M2VkYTAwZmVjYjQ0OGEzYThjIE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBKaW0gUG9ydGVyIDxqcG9ydGVyYnVnc0BnbWFpbC5j b20+CkRhdGU6IFN1biwgMjcgRmViIDIwMjIgMTg6MzQ6MjIgLTA4MDAKU3ViamVjdDogW1BB VENIIDEvNV0gTW92ZSBFc2hlbGwgdmFyaWFibGUgaW50ZXJwb2xhdGlvbiB0ZXN0cyB0byB0 aGVpciBvd24KIGZpbGUKCiogdGVzdC9saXNwL2VzaGVsbC9lc2hlbGwtdGVzdHMuZWwgKGVz aGVsbC10ZXN0L2ludGVycC1jbWQpCihlc2hlbGwtdGVzdC9pbnRlcnAtbGlzcCwgZXNoZWxs LXRlc3QvaW50ZXJwLXRlbXAtY21kKQooZXNoZWxsLXRlc3QvaW50ZXJwLWNvbmNhdCwgZXNo ZWxsLXRlc3QvaW50ZXJwLWNvbmNhdC1saXNwKQooZXNoZWxsLXRlc3QvaW50ZXJwLWNvbmNh dDIsIGVzaGVsbC10ZXN0L2ludGVycC1jb25jYXQtbGlzcDIpCihlc2hlbGwtdGVzdC9pbnRl cnAtY21kLWV4dGVybmFsKQooZXNoZWxsLXRlc3QvaW50ZXJwLWNtZC1leHRlcm5hbC1jb25j YXQsIGVzaGVsbC10ZXN0L3dpbmRvdy1oZWlnaHQpCihlc2hlbGwtdGVzdC93aW5kb3ctd2lk dGgsIGVzaGVsbC10ZXN0L2xhc3QtcmVzdWx0LXZhcikKKGVzaGVsbC10ZXN0L2xhc3QtcmVz dWx0LXZhcjIsIGVzaGVsbC10ZXN0L2xhc3QtYXJnLXZhcik6Ck1vdmUgZnJvbSBoZXJlLi4u CgoqIHRlc3QvbGlzcC9lc2hlbGwvZXNoLXZhci10ZXN0LmVsIChlc2gtdmFyLXRlc3QvaW50 ZXJwLWxpc3ApCihlc2gtdmFyLXRlc3QvaW50ZXJwLWNtZCwgZXNoLXZhci10ZXN0L2ludGVy cC1jbWQtZXh0ZXJuYWwpCihlc2gtdmFyLXRlc3QvaW50ZXJwLXRlbXAtY21kLCBlc2gtdmFy LXRlc3QvaW50ZXJwLWNvbmNhdC1saXNwKQooZXNoLXZhci10ZXN0L2ludGVycC1jb25jYXQt bGlzcDIsIGVzaC12YXItdGVzdC9pbnRlcnAtY29uY2F0LWNtZCkKKGVzaC12YXItdGVzdC9p bnRlcnAtY29uY2F0LWNtZDIpCihlc2gtdmFyLXRlc3QvaW50ZXJwLWNvbmNhdC1jbWQtZXh0 ZXJuYWwsIGVzaC12YXItdGVzdC93aW5kb3ctaGVpZ2h0KQooZXNoLXZhci10ZXN0L3dpbmRv dy13aWR0aCwgZXNoLXZhci10ZXN0L2xhc3QtcmVzdWx0LXZhcikKKGVzaC12YXItdGVzdC9s YXN0LXJlc3VsdC12YXIyLCBlc2gtdmFyLXRlc3QvbGFzdC1hcmctdmFyKToKLi4uIHRvIGhl cmUuCi0tLQogdGVzdC9saXNwL2VzaGVsbC9lc2gtdmFyLXRlc3RzLmVsIHwgMTExICsrKysr KysrKysrKysrKysrKysrKysrKysrKysrKwogdGVzdC9saXNwL2VzaGVsbC9lc2hlbGwtdGVz dHMuZWwgIHwgIDY4IC0tLS0tLS0tLS0tLS0tLS0tLQogMiBmaWxlcyBjaGFuZ2VkLCAxMTEg aW5zZXJ0aW9ucygrKSwgNjggZGVsZXRpb25zKC0pCiBjcmVhdGUgbW9kZSAxMDA2NDQgdGVz dC9saXNwL2VzaGVsbC9lc2gtdmFyLXRlc3RzLmVsCgpkaWZmIC0tZ2l0IGEvdGVzdC9saXNw L2VzaGVsbC9lc2gtdmFyLXRlc3RzLmVsIGIvdGVzdC9saXNwL2VzaGVsbC9lc2gtdmFyLXRl c3RzLmVsCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAuLjhkODAzZTVj YTQKLS0tIC9kZXYvbnVsbAorKysgYi90ZXN0L2xpc3AvZXNoZWxsL2VzaC12YXItdGVzdHMu ZWwKQEAgLTAsMCArMSwxMTEgQEAKKzs7OyBlc2gtdmFyLXRlc3RzLmVsIC0tLSBlc2gtdmFy IHRlc3Qgc3VpdGUgIC0qLSBsZXhpY2FsLWJpbmRpbmc6dCAtKi0KKworOzsgQ29weXJpZ2h0 IChDKSAyMDIyIEZyZWUgU29mdHdhcmUgRm91bmRhdGlvbiwgSW5jLgorCis7OyBUaGlzIGZp bGUgaXMgcGFydCBvZiBHTlUgRW1hY3MuCisKKzs7IEdOVSBFbWFjcyBpcyBmcmVlIHNvZnR3 YXJlOiB5b3UgY2FuIHJlZGlzdHJpYnV0ZSBpdCBhbmQvb3IgbW9kaWZ5Cis7OyBpdCB1bmRl ciB0aGUgdGVybXMgb2YgdGhlIEdOVSBHZW5lcmFsIFB1YmxpYyBMaWNlbnNlIGFzIHB1Ymxp c2hlZCBieQorOzsgdGhlIEZyZWUgU29mdHdhcmUgRm91bmRhdGlvbiwgZWl0aGVyIHZlcnNp b24gMyBvZiB0aGUgTGljZW5zZSwgb3IKKzs7IChhdCB5b3VyIG9wdGlvbikgYW55IGxhdGVy IHZlcnNpb24uCisKKzs7IEdOVSBFbWFjcyBpcyBkaXN0cmlidXRlZCBpbiB0aGUgaG9wZSB0 aGF0IGl0IHdpbGwgYmUgdXNlZnVsLAorOzsgYnV0IFdJVEhPVVQgQU5ZIFdBUlJBTlRZOyB3 aXRob3V0IGV2ZW4gdGhlIGltcGxpZWQgd2FycmFudHkgb2YKKzs7IE1FUkNIQU5UQUJJTElU WSBvciBGSVRORVNTIEZPUiBBIFBBUlRJQ1VMQVIgUFVSUE9TRS4gIFNlZSB0aGUKKzs7IEdO VSBHZW5lcmFsIFB1YmxpYyBMaWNlbnNlIGZvciBtb3JlIGRldGFpbHMuCisKKzs7IFlvdSBz aG91bGQgaGF2ZSByZWNlaXZlZCBhIGNvcHkgb2YgdGhlIEdOVSBHZW5lcmFsIFB1YmxpYyBM aWNlbnNlCis7OyBhbG9uZyB3aXRoIEdOVSBFbWFjcy4gIElmIG5vdCwgc2VlIDxodHRwczov L3d3dy5nbnUub3JnL2xpY2Vuc2VzLz4uCisKKzs7OyBDb21tZW50YXJ5OgorCis7OyBUZXN0 cyBmb3IgRXNoZWxsJ3MgdmFyaWFibGUgaGFuZGxpbmcuCisKKzs7OyBDb2RlOgorCisocmVx dWlyZSAnZXJ0KQorKHJlcXVpcmUgJ2VzaC1tb2RlKQorKHJlcXVpcmUgJ2VzaGVsbCkKKwor KHJlcXVpcmUgJ2VzaGVsbC10ZXN0cy1oZWxwZXJzCisgICAgICAgICAoZXhwYW5kLWZpbGUt bmFtZSAiZXNoZWxsLXRlc3RzLWhlbHBlcnMiCisgICAgICAgICAgICAgICAgICAgICAgICAg ICAoZmlsZS1uYW1lLWRpcmVjdG9yeSAob3IgbG9hZC1maWxlLW5hbWUKKyAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBkZWZhdWx0LWRpcmVj dG9yeSkpKSkKKworOzs7IFRlc3RzOgorCisMCis7OyBWYXJpYWJsZSBpbnRlcnBvbGF0aW9u CisKKyhlcnQtZGVmdGVzdCBlc2gtdmFyLXRlc3QvaW50ZXJwLWxpc3AgKCkKKyAgIkludGVy cG9sYXRlIExpc3AgZm9ybSBldmFsdWF0aW9uIgorICAoc2hvdWxkIChlcXVhbCAoZXNoZWxs LXRlc3QtY29tbWFuZC1yZXN1bHQgIisgJCgrIDEgMikgMyIpIDYpKSkKKworKGVydC1kZWZ0 ZXN0IGVzaC12YXItdGVzdC9pbnRlcnAtY21kICgpCisgICJJbnRlcnBvbGF0ZSBjb21tYW5k IHJlc3VsdCIKKyAgKHNob3VsZCAoZXF1YWwgKGVzaGVsbC10ZXN0LWNvbW1hbmQtcmVzdWx0 ICIrICR7KyAxIDJ9IDMiKSA2KSkpCisKKyhlcnQtZGVmdGVzdCBlc2gtdmFyLXRlc3QvaW50 ZXJwLWNtZC1leHRlcm5hbCAoKQorICAiSW50ZXJwb2xhdGUgY29tbWFuZCByZXN1bHQgZnJv bSBleHRlcm5hbCBjb21tYW5kIgorICAoc2tpcC11bmxlc3MgKGV4ZWN1dGFibGUtZmluZCAi ZWNobyIpKQorICAod2l0aC10ZW1wLWVzaGVsbAorICAgKGVzaGVsbC1jb21tYW5kLXJlc3Vs dC1wICJlY2hvICR7KmVjaG8gaGl9IgorICAgICAgICAgICAgICAgICAgICAgICAgICAgICJo aVxuIikpKQorCisoZXJ0LWRlZnRlc3QgZXNoLXZhci10ZXN0L2ludGVycC10ZW1wLWNtZCAo KQorICAiSW50ZXJwb2xhdGUgY29tbWFuZCByZXN1bHQgcmVkaXJlY3RlZCB0byB0ZW1wIGZp bGUiCisgIChzaG91bGQgKGVxdWFsIChlc2hlbGwtdGVzdC1jb21tYW5kLXJlc3VsdCAiY2F0 ICQ8ZWNobyBoaT4iKSAiaGkiKSkpCisKKyhlcnQtZGVmdGVzdCBlc2gtdmFyLXRlc3QvaW50 ZXJwLWNvbmNhdC1saXNwICgpCisgICJJbnRlcnBvbGF0ZSBhbmQgY29uY2F0IExpc3AgZm9y bSIKKyAgKHNob3VsZCAoZXF1YWwgKGVzaGVsbC10ZXN0LWNvbW1hbmQtcmVzdWx0ICIrICQo KyAxIDIpMyAzIikgMzYpKSkKKworKGVydC1kZWZ0ZXN0IGVzaC12YXItdGVzdC9pbnRlcnAt Y29uY2F0LWxpc3AyICgpCisgICJJbnRlcnBvbGF0ZSBhbmQgY29uY2F0IHR3byBMaXNwIGZv cm1zIgorICAoc2hvdWxkIChlcXVhbCAoZXNoZWxsLXRlc3QtY29tbWFuZC1yZXN1bHQgIisg JCgrIDEgMikkKCsgMSAyKSAzIikgMzYpKSkKKworKGVydC1kZWZ0ZXN0IGVzaC12YXItdGVz dC9pbnRlcnAtY29uY2F0LWNtZCAoKQorICAiSW50ZXJwb2xhdGUgYW5kIGNvbmNhdCBjb21t YW5kIgorICAoc2hvdWxkIChlcXVhbCAoZXNoZWxsLXRlc3QtY29tbWFuZC1yZXN1bHQgIisg JHsrIDEgMn0zIDMiKSAzNikpKQorCisoZXJ0LWRlZnRlc3QgZXNoLXZhci10ZXN0L2ludGVy cC1jb25jYXQtY21kMiAoKQorICAiSW50ZXJwb2xhdGUgYW5kIGNvbmNhdCB0d28gY29tbWFu ZHMiCisgIChzaG91bGQgKGVxdWFsIChlc2hlbGwtdGVzdC1jb21tYW5kLXJlc3VsdCAiKyAk eysgMSAyfSR7KyAxIDJ9IDMiKSAzNikpKQorCisoZXJ0LWRlZnRlc3QgZXNoLXZhci10ZXN0 L2ludGVycC1jb25jYXQtY21kLWV4dGVybmFsICgpCisgICJJbnRlcnBvbGF0ZSBjb21tYW5k IHJlc3VsdCBmcm9tIGV4dGVybmFsIGNvbW1hbmQgd2l0aCBjb25jYXRlbmF0aW9uIgorICAo c2tpcC11bmxlc3MgKGV4ZWN1dGFibGUtZmluZCAiZWNobyIpKQorICAod2l0aC10ZW1wLWVz aGVsbAorICAgKGVzaGVsbC1jb21tYW5kLXJlc3VsdC1wICJlY2hvICR7ZWNobyBoaX0tJHsq ZWNobyB0aGVyZX0iCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgImhpLXRoZXJlXG4i KSkpCisKKwwKKzs7IEJ1aWx0LWluIHZhcmlhYmxlcworCisoZXJ0LWRlZnRlc3QgZXNoLXZh ci10ZXN0L3dpbmRvdy1oZWlnaHQgKCkKKyAgIiRMSU5FUyBzaG91bGQgZXF1YWwgKHdpbmRv dy1oZWlnaHQpIgorICAoc2hvdWxkIChlc2hlbGwtdGVzdC1jb21tYW5kLXJlc3VsdCAiPSAk TElORVMgKHdpbmRvdy1oZWlnaHQpIikpKQorCisoZXJ0LWRlZnRlc3QgZXNoLXZhci10ZXN0 L3dpbmRvdy13aWR0aCAoKQorICAiJENPTFVNTlMgc2hvdWxkIGVxdWFsICh3aW5kb3ctd2lk dGgpIgorICAoc2hvdWxkIChlc2hlbGwtdGVzdC1jb21tYW5kLXJlc3VsdCAiPSAkQ09MVU1O UyAod2luZG93LXdpZHRoKSIpKSkKKworKGVydC1kZWZ0ZXN0IGVzaC12YXItdGVzdC9sYXN0 LXJlc3VsdC12YXIgKCkKKyAgIlRlc3QgdXNpbmcgdGhlIFwibGFzdCByZXN1bHRcIiAoJCQp IHZhcmlhYmxlIgorICAod2l0aC10ZW1wLWVzaGVsbAorICAgKGVzaGVsbC1jb21tYW5kLXJl c3VsdC1wICIrIDEgMjsgKyAkJCAyIgorICAgICAgICAgICAgICAgICAgICAgICAgICAgICIz XG41XG4iKSkpCisKKyhlcnQtZGVmdGVzdCBlc2gtdmFyLXRlc3QvbGFzdC1yZXN1bHQtdmFy MiAoKQorICAiVGVzdCB1c2luZyB0aGUgXCJsYXN0IHJlc3VsdFwiICgkJCkgdmFyaWFibGUg dHdpY2UiCisgICh3aXRoLXRlbXAtZXNoZWxsCisgICAoZXNoZWxsLWNvbW1hbmQtcmVzdWx0 LXAgIisgMSAyOyArICQkICQkIgorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAiM1xu NlxuIikpKQorCisoZXJ0LWRlZnRlc3QgZXNoLXZhci10ZXN0L2xhc3QtYXJnLXZhciAoKQor ICAiVGVzdCB1c2luZyB0aGUgXCJsYXN0IGFyZ1wiICgkXykgdmFyaWFibGUiCisgICh3aXRo LXRlbXAtZXNoZWxsCisgICAoZXNoZWxsLWNvbW1hbmQtcmVzdWx0LXAgIisgMSAyOyArICRf IDQiCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICIzXG42XG4iKSkpCisKKzs7IGVz aC12YXItdGVzdHMuZWwgZW5kcyBoZXJlCmRpZmYgLS1naXQgYS90ZXN0L2xpc3AvZXNoZWxs L2VzaGVsbC10ZXN0cy5lbCBiL3Rlc3QvbGlzcC9lc2hlbGwvZXNoZWxsLXRlc3RzLmVsCmlu ZGV4IGVmZjRlZGQ2MmMuLmUzMWRiMDdjNjEgMTAwNjQ0Ci0tLSBhL3Rlc3QvbGlzcC9lc2hl bGwvZXNoZWxsLXRlc3RzLmVsCisrKyBiL3Rlc3QvbGlzcC9lc2hlbGwvZXNoZWxsLXRlc3Rz LmVsCkBAIC04NSw0OCArODUsNiBAQCBlc2hlbGwtdGVzdC9zdWJjb21tYW5kLWxpc3AKIGUu Zy4gXCJ7KCsgMSAyKX0gM1wiID0+IDMiCiAgIChzaG91bGQgKGVxdWFsIChlc2hlbGwtdGVz dC1jb21tYW5kLXJlc3VsdCAieygrIDEgMil9IDMiKSAzKSkpCiAKLShlcnQtZGVmdGVzdCBl c2hlbGwtdGVzdC9pbnRlcnAtY21kICgpCi0gICJJbnRlcnBvbGF0ZSBjb21tYW5kIHJlc3Vs dCIKLSAgKHNob3VsZCAoZXF1YWwgKGVzaGVsbC10ZXN0LWNvbW1hbmQtcmVzdWx0ICIrICR7 KyAxIDJ9IDMiKSA2KSkpCi0KLShlcnQtZGVmdGVzdCBlc2hlbGwtdGVzdC9pbnRlcnAtbGlz cCAoKQotICAiSW50ZXJwb2xhdGUgTGlzcCBmb3JtIGV2YWx1YXRpb24iCi0gIChzaG91bGQg KGVxdWFsIChlc2hlbGwtdGVzdC1jb21tYW5kLXJlc3VsdCAiKyAkKCsgMSAyKSAzIikgNikp KQotCi0oZXJ0LWRlZnRlc3QgZXNoZWxsLXRlc3QvaW50ZXJwLXRlbXAtY21kICgpCi0gICJJ bnRlcnBvbGF0ZSBjb21tYW5kIHJlc3VsdCByZWRpcmVjdGVkIHRvIHRlbXAgZmlsZSIKLSAg KHNob3VsZCAoZXF1YWwgKGVzaGVsbC10ZXN0LWNvbW1hbmQtcmVzdWx0ICJjYXQgJDxlY2hv IGhpPiIpICJoaSIpKSkKLQotKGVydC1kZWZ0ZXN0IGVzaGVsbC10ZXN0L2ludGVycC1jb25j YXQgKCkKLSAgIkludGVycG9sYXRlIGFuZCBjb25jYXQgY29tbWFuZCIKLSAgKHNob3VsZCAo ZXF1YWwgKGVzaGVsbC10ZXN0LWNvbW1hbmQtcmVzdWx0ICIrICR7KyAxIDJ9MyAzIikgMzYp KSkKLQotKGVydC1kZWZ0ZXN0IGVzaGVsbC10ZXN0L2ludGVycC1jb25jYXQtbGlzcCAoKQot ICAiSW50ZXJwb2xhdGUgYW5kIGNvbmNhdCBMaXNwIGZvcm0iCi0gIChzaG91bGQgKGVxdWFs IChlc2hlbGwtdGVzdC1jb21tYW5kLXJlc3VsdCAiKyAkKCsgMSAyKTMgMyIpIDM2KSkpCi0K LShlcnQtZGVmdGVzdCBlc2hlbGwtdGVzdC9pbnRlcnAtY29uY2F0MiAoKQotICAiSW50ZXJw b2xhdGUgYW5kIGNvbmNhdCB0d28gY29tbWFuZHMiCi0gIChzaG91bGQgKGVxdWFsIChlc2hl bGwtdGVzdC1jb21tYW5kLXJlc3VsdCAiKyAkeysgMSAyfSR7KyAxIDJ9IDMiKSAzNikpKQot Ci0oZXJ0LWRlZnRlc3QgZXNoZWxsLXRlc3QvaW50ZXJwLWNvbmNhdC1saXNwMiAoKQotICAi SW50ZXJwb2xhdGUgYW5kIGNvbmNhdCB0d28gTGlzcCBmb3JtcyIKLSAgKHNob3VsZCAoZXF1 YWwgKGVzaGVsbC10ZXN0LWNvbW1hbmQtcmVzdWx0ICIrICQoKyAxIDIpJCgrIDEgMikgMyIp IDM2KSkpCi0KLShlcnQtZGVmdGVzdCBlc2hlbGwtdGVzdC9pbnRlcnAtY21kLWV4dGVybmFs ICgpCi0gICJJbnRlcnBvbGF0ZSBjb21tYW5kIHJlc3VsdCBmcm9tIGV4dGVybmFsIGNvbW1h bmQiCi0gIChza2lwLXVubGVzcyAoZXhlY3V0YWJsZS1maW5kICJlY2hvIikpCi0gICh3aXRo LXRlbXAtZXNoZWxsCi0gICAoZXNoZWxsLWNvbW1hbmQtcmVzdWx0LXAgImVjaG8gJHsqZWNo byBoaX0iCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgImhpXG4iKSkpCi0KLShlcnQt ZGVmdGVzdCBlc2hlbGwtdGVzdC9pbnRlcnAtY21kLWV4dGVybmFsLWNvbmNhdCAoKQotICAi SW50ZXJwb2xhdGUgY29tbWFuZCByZXN1bHQgZnJvbSBleHRlcm5hbCBjb21tYW5kIHdpdGgg Y29uY2F0ZW5hdGlvbiIKLSAgKHNraXAtdW5sZXNzIChleGVjdXRhYmxlLWZpbmQgImVjaG8i KSkKLSAgKHdpdGgtdGVtcC1lc2hlbGwKLSAgIChlc2hlbGwtY29tbWFuZC1yZXN1bHQtcCAi ZWNobyAke2VjaG8gaGl9LSR7KmVjaG8gdGhlcmV9IgotICAgICAgICAgICAgICAgICAgICAg ICAgICAgICJoaS10aGVyZVxuIikpKQotCiAoZXJ0LWRlZnRlc3QgZXNoZWxsLXRlc3QvcGlw ZS1oZWFkcHJvYyAoKQogICAiQ2hlY2sgdGhhdCBwaXBpbmcgYSBub24tcHJvY2VzcyB0byBh IHByb2Nlc3MgY29tbWFuZCB3YWl0cyBmb3IgdGhlIHByb2Nlc3MiCiAgIChza2lwLXVubGVz cyAoZXhlY3V0YWJsZS1maW5kICJjYXQiKSkKQEAgLTE1MiwzMiArMTEwLDYgQEAgZXNoZWxs LXRlc3QvcGlwZS1oZWFkcHJvYy1zdGRpbgogICAgKGVzaGVsbC13YWl0LWZvci1zdWJwcm9j ZXNzKQogICAgKGVzaGVsbC1tYXRjaC1yZXN1bHQgIk9MTEVIXG4iKSkpCiAKLShlcnQtZGVm dGVzdCBlc2hlbGwtdGVzdC93aW5kb3ctaGVpZ2h0ICgpCi0gICIkTElORVMgc2hvdWxkIGVx dWFsICh3aW5kb3ctaGVpZ2h0KSIKLSAgKHNob3VsZCAoZXNoZWxsLXRlc3QtY29tbWFuZC1y ZXN1bHQgIj0gJExJTkVTICh3aW5kb3ctaGVpZ2h0KSIpKSkKLQotKGVydC1kZWZ0ZXN0IGVz aGVsbC10ZXN0L3dpbmRvdy13aWR0aCAoKQotICAiJENPTFVNTlMgc2hvdWxkIGVxdWFsICh3 aW5kb3ctd2lkdGgpIgotICAoc2hvdWxkIChlc2hlbGwtdGVzdC1jb21tYW5kLXJlc3VsdCAi PSAkQ09MVU1OUyAod2luZG93LXdpZHRoKSIpKSkKLQotKGVydC1kZWZ0ZXN0IGVzaGVsbC10 ZXN0L2xhc3QtcmVzdWx0LXZhciAoKQotICAiVGVzdCB1c2luZyB0aGUgXCJsYXN0IHJlc3Vs dFwiICgkJCkgdmFyaWFibGUiCi0gICh3aXRoLXRlbXAtZXNoZWxsCi0gICAoZXNoZWxsLWNv bW1hbmQtcmVzdWx0LXAgIisgMSAyOyArICQkIDIiCi0gICAgICAgICAgICAgICAgICAgICAg ICAgICAgIjNcbjVcbiIpKSkKLQotKGVydC1kZWZ0ZXN0IGVzaGVsbC10ZXN0L2xhc3QtcmVz dWx0LXZhcjIgKCkKLSAgIlRlc3QgdXNpbmcgdGhlIFwibGFzdCByZXN1bHRcIiAoJCQpIHZh cmlhYmxlIHR3aWNlIgotICAod2l0aC10ZW1wLWVzaGVsbAotICAgKGVzaGVsbC1jb21tYW5k LXJlc3VsdC1wICIrIDEgMjsgKyAkJCAkJCIKLSAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIjNcbjZcbiIpKSkKLQotKGVydC1kZWZ0ZXN0IGVzaGVsbC10ZXN0L2xhc3QtYXJnLXZh ciAoKQotICAiVGVzdCB1c2luZyB0aGUgXCJsYXN0IGFyZ1wiICgkXykgdmFyaWFibGUiCi0g ICh3aXRoLXRlbXAtZXNoZWxsCi0gICAoZXNoZWxsLWNvbW1hbmQtcmVzdWx0LXAgIisgMSAy OyArICRfIDQiCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICIzXG42XG4iKSkpCi0K IChlcnQtZGVmdGVzdCBlc2hlbGwtdGVzdC9pbnNpZGUtZW1hY3MtdmFyICgpCiAgICJUZXN0 IHByZXNlbmNlIG9mIFwiSU5TSURFX0VNQUNTXCIgaW4gc3VicHJvY2Vzc2VzIgogICAod2l0 aC10ZW1wLWVzaGVsbAotLSAKMi4yNS4xCgo= --------------84BAF41E9AB7415EAB9F2A21 Content-Type: text/plain; charset=UTF-8; name="0002-Add-a-new-macro-to-simplify-parsing-temporary-Eshell.patch" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename*0="0002-Add-a-new-macro-to-simplify-parsing-temporary-Eshell.pa"; filename*1="tch" RnJvbSA3YTY0MDU2ZTQ0YTZmNzg5ZmIyZjU4Y2NhMmM2ODc2Y2ZkY2MxMDdkIE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBKaW0gUG9ydGVyIDxqcG9ydGVyYnVnc0BnbWFpbC5j b20+CkRhdGU6IFNhdCwgMjYgRmViIDIwMjIgMjA6NTU6MjIgLTA4MDAKU3ViamVjdDogW1BB VENIIDIvNV0gQWRkIGEgbmV3IG1hY3JvIHRvIHNpbXBsaWZ5IHBhcnNpbmcgdGVtcG9yYXJ5 IEVzaGVsbAogY29tbWFuZCBzdHJpbmdzCgpUaGlzIGFic3RyYWN0cyBvdXQgdGhlIHNvbWV3 aGF0LXVudXN1YWwgImluc2VydCZkZWxldGUiIGxvZ2ljIGluCidlc2hlbGwtcGFyc2UtY29t bWFuZCcgc28gdGhhdCBpdCBjYW4gYmUgdXNlZCBlbHNld2hlcmUsIGFuZCBhbHNvCmVuc3Vy ZXMgdGhhdCB0aGUgZGVsZXRpb24gb2NjdXJzIGV2ZW4gaWYgYW4gYW4gZXJyb3Igb2NjdXJz LgoKKiBsaXNwL2VzaGVsbC9lc2gtY21kLmVsIChlc2hlbGwtd2l0aC10ZW1wLWNvbW1hbmQp OiBOZXcgbWFjcm8uCihlc2hlbGwtcGFyc2UtY29tbWFuZCk6IFVzZSBpdC4KLS0tCiBsaXNw L2VzaGVsbC9lc2gtY21kLmVsIHwgNDIgKysrKysrKysrKysrKysrKysrKysrKysrKysrKysr KysrLS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgMzMgaW5zZXJ0aW9ucygrKSwgOSBkZWxl dGlvbnMoLSkKCmRpZmYgLS1naXQgYS9saXNwL2VzaGVsbC9lc2gtY21kLmVsIGIvbGlzcC9l c2hlbGwvZXNoLWNtZC5lbAppbmRleCBkY2ViMDYxYzhmLi4wNGI1NGQ5ZDc5IDEwMDY0NAot LS0gYS9saXNwL2VzaGVsbC9lc2gtY21kLmVsCisrKyBiL2xpc3AvZXNoZWxsL2VzaC1jbWQu ZWwKQEAgLTM1MCw2ICszNTAsMzYgQEAgZXNoZWxsLWNvbXBsZXRlLWxpc3Atc3ltYm9scwog CiAoZGVmdmFyIGVzaGVsbC0tc2VwLXRlcm1zKQogCisoZGVmbWFjcm8gZXNoZWxsLXdpdGgt dGVtcC1jb21tYW5kIChjb21tYW5kICZyZXN0IGJvZHkpCisgICJOYXJyb3cgdGhlIGJ1ZmZl ciB0byBDT01NQU5EIGFuZCBleGVjdXRlIHRoZSBmb3JtcyBpbiBCT0RZLgorQ09NTUFORCBj YW4gZWl0aGVyIGJlIGEgc3RyaW5nLCBvciBhIGNvbnMgY2VsbCBkZW1hcmNhdGluZyBhCiti dWZmZXIgcmVnaW9uLiAgSWYgQ09NTUFORCBpcyBhIHN0cmluZywgdGVtcG9yYXJpbHkgaW5z ZXJ0IGl0CitpbnRvIHRoZSBidWZmZXIgYmVmb3JlIG5hcnJvd2luZy4gIFBvaW50IHdpbGwg YmUgc2V0IHRvIHRoZQorYmVnaW5uaW5nIG9mIHRoZSBuYXJyb3dlZCByZWdpb24uCisKK1Ro ZSB2YWx1ZSByZXR1cm5lZCBpcyB0aGUgbGFzdCBmb3JtIGluIEJPRFkuIgorICAoZGVjbGFy ZSAoaW5kZW50IDEpKQorICBgKGxldCAoKGNtZCAsY29tbWFuZCkpCisgICAgIChpZiAoc3Ry aW5ncCBjbWQpCisgICAgICAgICA7OyBTaW5jZSBwYXJzaW5nIHJlbGllcyBwYXJ0bHkgb24g YnVmZmVyLWxvY2FsIHN0YXRlCisgICAgICAgICA7OyAoZS5nLiB0aGF0IG9mIGBlc2hlbGwt cGFyc2UtYXJndW1lbnQtaG9vaycpLCB3ZSBuZWVkIHRvCisgICAgICAgICA7OyBwZXJmb3Jt IHRoZSBwYXJzaW5nIGluIHRoZSBFc2hlbGwgYnVmZmVyLgorICAgICAgICAgKGxldCAoKGJl Z2luIChwb2ludCkpIGVuZAorCSAgICAgICAoaW5oaWJpdC1wb2ludC1tb3Rpb24taG9va3Mg dCkpCisgICAgICAgICAgICh3aXRoLXNpbGVudC1tb2RpZmljYXRpb25zCisgICAgICAgICAg ICAgKGluc2VydCBjbWQpCisgICAgICAgICAgICAgKHNldHEgZW5kIChwb2ludCkpCisgICAg ICAgICAgICAgKHVud2luZC1wcm90ZWN0CisgICAgICAgICAgICAgICAgIChzYXZlLXJlc3Ry aWN0aW9uCisgICAgICAgICAgICAgICAgICAgKG5hcnJvdy10by1yZWdpb24gYmVnaW4gZW5k KQorICAgICAgICAgICAgICAgICAgIChnb3RvLWNoYXIgYmVnaW4pCisgICAgICAgICAgICAg ICAgICAgLEBib2R5KQorICAgICAgICAgICAgICAgKGRlbGV0ZS1yZWdpb24gYmVnaW4gZW5k KSkpKQorICAgICAgIChzYXZlLXJlc3RyaWN0aW9uCisgICAgICAgICAobmFycm93LXRvLXJl Z2lvbiAoY2FyIGNtZCkgKGNkciBjbWQpKQorICAgICAgICAgKGdvdG8tY2hhciAoY2FyIGNt ZCkpCisgICAgICAgICAsQGJvZHkpKSkpCisKIChkZWZ1biBlc2hlbGwtcGFyc2UtY29tbWFu ZCAoY29tbWFuZCAmb3B0aW9uYWwgYXJncyB0b3BsZXZlbCkKICAgIlBhcnNlIHRoZSBDT01N QU5ELCBhZGRpbmcgQVJHUyBpZiBnaXZlbi4KIENPTU1BTkQgY2FuIGVpdGhlciBiZSBhIHN0 cmluZywgb3IgYSBjb25zIGNlbGwgZGVtYXJjYXRpbmcgYSBidWZmZXIKQEAgLTM2MSwxNSAr MzkxLDkgQEAgZXNoZWxsLXBhcnNlLWNvbW1hbmQKIAkgIChhcHBlbmQKIAkgICAoaWYgKGNv bnNwIGNvbW1hbmQpCiAJICAgICAgIChlc2hlbGwtcGFyc2UtYXJndW1lbnRzIChjYXIgY29t bWFuZCkgKGNkciBjb21tYW5kKSkKLQkgICAgIChsZXQgKChoZXJlIChwb2ludCkpCi0JCSAg IChpbmhpYml0LXBvaW50LW1vdGlvbi1ob29rcyB0KSkKLSAgICAgICAgICAgICAgICh3aXRo LXNpbGVudC1tb2RpZmljYXRpb25zCi0gICAgICAgICAgICAgICAgIDs7IEZJWE1FOiBXaHkg bm90IHVzZSBhIHRlbXBvcmFyeSBidWZmZXIgYW5kIGF2b2lkIHRoaXMKLSAgICAgICAgICAg ICAgICAgOzsgImluc2VydCZkZWxldGUiIGJ1c2luZXNzPyAgLS1TdGVmCi0gICAgICAgICAg ICAgICAgIChpbnNlcnQgY29tbWFuZCkKLSAgICAgICAgICAgICAgICAgKHByb2cxCi0gICAg ICAgICAgICAgICAgICAgICAoZXNoZWxsLXBhcnNlLWFyZ3VtZW50cyBoZXJlIChwb2ludCkp Ci0gICAgICAgICAgICAgICAgICAgKGRlbGV0ZS1yZWdpb24gaGVyZSAocG9pbnQpKSkpKSkK KyAgICAgICAgICAgICAoZXNoZWxsLXdpdGgtdGVtcC1jb21tYW5kIGNvbW1hbmQKKyAgICAg ICAgICAgICAgIChnb3RvLWNoYXIgKHBvaW50LW1heCkpCisgICAgICAgICAgICAgICAoZXNo ZWxsLXBhcnNlLWFyZ3VtZW50cyAocG9pbnQtbWluKSAocG9pbnQtbWF4KSkpKQogCSAgIGFy Z3MpKQogCSAoY29tbWFuZHMKIAkgIChtYXBjYXIKLS0gCjIuMjUuMQoK --------------84BAF41E9AB7415EAB9F2A21 Content-Type: text/plain; charset=UTF-8; name="0003-Fix-Eshell-dollar-interpolation-inside-of-double-quo.patch" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename*0="0003-Fix-Eshell-dollar-interpolation-inside-of-double-quo.pa"; filename*1="tch" RnJvbSA2NDQ4NGFkNzUxYmZlYmM2MzhhZmFmODdiMmNjOGJlNjNjNTUwYmE4IE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBKaW0gUG9ydGVyIDxqcG9ydGVyYnVnc0BnbWFpbC5j b20+CkRhdGU6IFN1biwgMjcgRmViIDIwMjIgMjE6MDQ6MzAgLTA4MDAKU3ViamVjdDogW1BB VENIIDMvNV0gRml4IEVzaGVsbCBkb2xsYXIgaW50ZXJwb2xhdGlvbiBpbnNpZGUgb2YgZG91 YmxlLXF1b3RlcwoKRm9yIGV4YW1wbGUsCgogIGVjaG8gIiR7ZWNobyBoaX0iCgpwcmV2aW91 c2x5IHRyaWVkIHRvIHJ1biB0aGUgcHJvZ3JhbSBuYW1lZCAnZWNobyBoaScsIGluc3RlYWQg b2YgJ2VjaG8nCndpdGggdGhlIGFyZ3VtZW50ICdoaScuCgoqIGxpc3AvZXNoZWxsL2VzaC1h cmcuZWwgKGVzaGVsbC1wYXJzZS1pbm5lci1kb3VibGUtcXVvdGUpOgpOZXcgZnVuY3Rpb24u CgoqIGxpc3AvZXNoZWxsL2VzaC12YXIuZWwgKGVzaGVsbC1wYXJzZS12YXJpYWJsZS1yZWYp OiBTdXBwb3J0IHBhcnNpbmcKd2hlbiB3cmFwcGVkIGluIGRvdWJsZS1xdWlvdGVzLgoKKiB0 ZXN0L2xpc3AvZXNoZWxsL2VzaC12YXItdGVzdHMuZWwgKGVzaC12YXItdGVzdC9pbnRlcnAt dmFyKQooZXNoLXZhci10ZXN0L2ludGVycC1xdW90ZWQtdmFyKQooZXNoLXZhci10ZXN0L2lu dGVycC1xdW90ZWQtdmFyLWNvbmNhdCkKKGVzaC12YXItdGVzdC9xdW90ZWQtaW50ZXJwLXZh cikKKGVzaC12YXItdGVzdC9xdW90ZWQtaW50ZXJwLXF1b3RlZC12YXIpCihlc2gtdmFyLXRl c3QvcXVvdGVkLWludGVycC1saXNwLCBlc2gtdmFyLXRlc3QvcXVvdGVkLWludGVycC1jbWQp Cihlc2gtdmFyLXRlc3QvcXVvdGVkLWludGVycC10ZW1wLWNtZCk6IE5ldyB0ZXN0cy4KLS0t CiBsaXNwL2VzaGVsbC9lc2gtYXJnLmVsICAgICAgICAgICAgfCAyNCArKysrKysrKysrKysr KysKIGxpc3AvZXNoZWxsL2VzaC12YXIuZWwgICAgICAgICAgICB8IDI3ICsrKysrKysrKysr LS0tLS0tCiB0ZXN0L2xpc3AvZXNoZWxsL2VzaC12YXItdGVzdHMuZWwgfCA0OSArKysrKysr KysrKysrKysrKysrKysrKysrKysrKysrCiAzIGZpbGVzIGNoYW5nZWQsIDkxIGluc2VydGlv bnMoKyksIDkgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvbGlzcC9lc2hlbGwvZXNoLWFy Zy5lbCBiL2xpc3AvZXNoZWxsL2VzaC1hcmcuZWwKaW5kZXggMWEyZjJhNTdlOC4uZTE5NDgx YzRiYSAxMDA2NDQKLS0tIGEvbGlzcC9lc2hlbGwvZXNoLWFyZy5lbAorKysgYi9saXNwL2Vz aGVsbC9lc2gtYXJnLmVsCkBAIC0zNTQsNiArMzU0LDMwIEBAIGVzaGVsbC1wYXJzZS1kb3Vi bGUtcXVvdGUKIAkJICAobGlzdCAnZXNoZWxsLWVzY2FwZS1hcmcgYXJnKSkpKQogCSAgKGdv dG8tY2hhciAoMSsgZW5kKSkpKSkpKQogCisoZGVmdW4gZXNoZWxsLXBhcnNlLWlubmVyLWRv dWJsZS1xdW90ZSAoYm91bmQpCisgICJQYXJzZSB0aGUgaW5uZXIgcGFydCBvZiBhIGRvdWJs ZSBxdW90ZWQgc3RyaW5nLgorVGhlIHN0cmluZyB0byBwYXJzZSBzdGFydHMgYXQgcG9pbnQg YW5kIGVuZHMgYXQgQk9VTkQuCisKK0lmIEVzaGVsbCBpcyBjdXJyZW50bHkgcGFyc2luZyBh IHF1b3RlZCBzdHJpbmcgYW5kIHRoZXJlIGFyZSBhbnkKK2JhY2tzbGFzaC1lc2NhcGVkIGNo YXJhY3RlcnMsIHRoaXMgd2lsbCByZXR1cm4gdGhlIHVuZXNjYXBlZAorc3RyaW5nLCB1cGRh dGluZyBwb2ludCB0byBCT1VORC4gIE90aGVyd2lzZSwgdGhpcyByZXR1cm5zIG5pbCBhbmQK K2xlYXZlcyBwb2ludCB3aGVyZSBpdCB3YXMuIgorICAod2hlbiBlc2hlbGwtY3VycmVudC1x dW90ZWQKKyAgICAobGV0IChzdHJpbmdzCisgICAgICAgICAgKHN0YXJ0IChwb2ludCkpCisg ICAgICAgICAgKHNwZWNpYWwtY2hhcgorICAgICAgICAgICAocngtdG8tc3RyaW5nCisgICAg ICAgICAgICBgKHNlcSAiXFwiIChncm91cCAoYW55ICxAZXNoZWxsLXNwZWNpYWwtY2hhcnMt aW5zaWRlLXF1b3RpbmcpKSkpKSkKKyAgICAgICh3aGlsZSAocmUtc2VhcmNoLWZvcndhcmQg c3BlY2lhbC1jaGFyIGJvdW5kIHQpCisgICAgICAgIChwdXNoIChjb25jYXQgKGJ1ZmZlci1z dWJzdHJpbmcgc3RhcnQgKG1hdGNoLWJlZ2lubmluZyAwKSkKKyAgICAgICAgICAgICAgICAg ICAgICAobWF0Y2gtc3RyaW5nIDEpKQorICAgICAgICAgICAgICBzdHJpbmdzKQorICAgICAg ICAoc2V0cSBzdGFydCAobWF0Y2gtZW5kIDApKSkKKyAgICAgICh3aGVuIHN0cmluZ3MKKyAg ICAgICAgKHB1c2ggKGJ1ZmZlci1zdWJzdHJpbmcgc3RhcnQgYm91bmQpIHN0cmluZ3MpCisg ICAgICAgIChnb3RvLWNoYXIgYm91bmQpCisgICAgICAgIChhcHBseSAjJ2NvbmNhdCAobnJl dmVyc2Ugc3RyaW5ncykpKSkpKQorCiAoZGVmdW4gZXNoZWxsLXBhcnNlLXNwZWNpYWwtcmVm ZXJlbmNlICgpCiAgICJQYXJzZSBhIHNwZWNpYWwgc3ludGF4IHJlZmVyZW5jZSwgb2YgdGhl IGZvcm0gYCM8YXJncz4nLgogCmRpZmYgLS1naXQgYS9saXNwL2VzaGVsbC9lc2gtdmFyLmVs IGIvbGlzcC9lc2hlbGwvZXNoLXZhci5lbAppbmRleCBlZTNmZmJjNjQ3Li4yNGZkYmRlM2Nm IDEwMDY0NAotLS0gYS9saXNwL2VzaGVsbC9lc2gtdmFyLmVsCisrKyBiL2xpc3AvZXNoZWxs L2VzaC12YXIuZWwKQEAgLTQ0MCwxOCArNDQwLDE2IEBAIGVzaGVsbC1wYXJzZS12YXJpYWJs ZS1yZWYKICAgICAobGV0ICgoZW5kIChlc2hlbGwtZmluZC1kZWxpbWl0ZXIgP1x7ID9cfSkp KQogICAgICAgKGlmIChub3QgZW5kKQogICAgICAgICAgICh0aHJvdyAnZXNoZWxsLWluY29t cGxldGUgP1x7KQorICAgICAgICAoZm9yd2FyZC1jaGFyKQogICAgICAgICAocHJvZzEKICAg ICAgICAgICAgIGAoZXNoZWxsLWNvbnZlcnQKICAgICAgICAgICAgICAgKGVzaGVsbC1jb21t YW5kLXRvLXZhbHVlCiAgICAgICAgICAgICAgICAoZXNoZWxsLWFzLXN1YmNvbW1hbmQKLSAg ICAgICAgICAgICAgICAsKGVzaGVsbC1wYXJzZS1jb21tYW5kIChjb25zICgxKyAocG9pbnQp KSBlbmQpKSkpKQorICAgICAgICAgICAgICAgICwobGV0ICgoc3ViY21kIChvciAoZXNoZWxs LXBhcnNlLWlubmVyLWRvdWJsZS1xdW90ZSBlbmQpCisgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIChjb25zIChwb2ludCkgZW5kKSkpCisgICAgICAgICAgICAgICAgICAg ICAgIChlc2hlbGwtY3VycmVudC1xdW90ZWQgbmlsKSkKKyAgICAgICAgICAgICAgICAgICAo ZXNoZWxsLXBhcnNlLWNvbW1hbmQgc3ViY21kKSkpKSkKICAgICAgICAgICAoZ290by1jaGFy ICgxKyBlbmQpKSkpKSkKLSAgICgobWVtcSAoY2hhci1hZnRlcikgJyg/XCcgP1wiKSkKLSAg ICAobGV0ICgobmFtZSAoaWYgKGVxIChjaGFyLWFmdGVyKSA/XCcpCi0gICAgICAgICAgICAg ICAgICAgIChlc2hlbGwtcGFyc2UtbGl0ZXJhbC1xdW90ZSkKLSAgICAgICAgICAgICAgICAg IChlc2hlbGwtcGFyc2UtZG91YmxlLXF1b3RlKSkpKQotICAgICAgKGlmIG5hbWUKLQkgIGAo ZXNoZWxsLWdldC12YXJpYWJsZSAsKGV2YWwgbmFtZSkgaW5kaWNlcykpKSkKICAgICgoZXEg KGNoYXItYWZ0ZXIpID9cPCkKICAgICAobGV0ICgoZW5kIChlc2hlbGwtZmluZC1kZWxpbWl0 ZXIgP1w8ID9cPikpKQogICAgICAgKGlmIChub3QgZW5kKQpAQCAtNDYzLDcgKzQ2MSw5IEBA IGVzaGVsbC1wYXJzZS12YXJpYWJsZS1yZWYKICAgICAgICAgICAgICAgYChsZXQgKChlc2hl bGwtY3VycmVudC1oYW5kbGVzCiAgICAgICAgICAgICAgICAgICAgICAgKGVzaGVsbC1jcmVh dGUtaGFuZGxlcyAsdGVtcCAnb3ZlcndyaXRlKSkpCiAgICAgICAgICAgICAgICAgIChwcm9n bgotICAgICAgICAgICAgICAgICAgIChlc2hlbGwtYXMtc3ViY29tbWFuZCAsKGVzaGVsbC1w YXJzZS1jb21tYW5kIGNtZCkpCisgICAgICAgICAgICAgICAgICAgKGVzaGVsbC1hcy1zdWJj b21tYW5kCisgICAgICAgICAgICAgICAgICAgICwobGV0ICgoZXNoZWxsLWN1cnJlbnQtcXVv dGVkIG5pbCkpCisgICAgICAgICAgICAgICAgICAgICAgIChlc2hlbGwtcGFyc2UtY29tbWFu ZCBjbWQpKSkKICAgICAgICAgICAgICAgICAgICAoaWdub3JlCiAgICAgICAgICAgICAgICAg ICAgIChuY29uYyBlc2hlbGwtdGhpcy1jb21tYW5kLWhvb2sKICAgICAgICAgICAgICAgICAg ICAgICAgICAgIDs7IFF1b3RlIHRoaXMgbGFtYmRhOyBpdCB3aWxsIGJlIGV2YWx1YXRlZApA QCAtNDc4LDkgKzQ3OCwxOCBAQCBlc2hlbGwtcGFyc2UtdmFyaWFibGUtcmVmCiAgICAgKGNv bmRpdGlvbi1jYXNlIG5pbAogICAgICAgICBgKGVzaGVsbC1jb21tYW5kLXRvLXZhbHVlCiAg ICAgICAgICAgKGVzaGVsbC1saXNwLWNvbW1hbmQKLSAgICAgICAgICAgJywocmVhZCAoY3Vy cmVudC1idWZmZXIpKSkpCisgICAgICAgICAgICcsKHJlYWQgKG9yIChlc2hlbGwtcGFyc2Ut aW5uZXItZG91YmxlLXF1b3RlIChwb2ludC1tYXgpKQorICAgICAgICAgICAgICAgICAgICAg ICAoY3VycmVudC1idWZmZXIpKSkpKQogICAgICAgKGVuZC1vZi1maWxlCiAgICAgICAgKHRo cm93ICdlc2hlbGwtaW5jb21wbGV0ZSA/XCgpKSkpCisgICAoKGxvb2tpbmctYXQgKHJ4IChv ciAiJyIgIlwiIiAiXFxcIiIpKSkKKyAgICAoZXNoZWxsLXdpdGgtdGVtcC1jb21tYW5kIChv ciAoZXNoZWxsLXBhcnNlLWlubmVyLWRvdWJsZS1xdW90ZSAocG9pbnQtbWF4KSkKKyAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAoY29ucyAocG9pbnQpIChwb2ludC1tYXgp KSkKKyAgICAgIChsZXQgKChuYW1lIChpZiAoZXEgKGNoYXItYWZ0ZXIpID9cJykKKyAgICAg ICAgICAgICAgICAgICAgICAoZXNoZWxsLXBhcnNlLWxpdGVyYWwtcXVvdGUpCisgICAgICAg ICAgICAgICAgICAgIChlc2hlbGwtcGFyc2UtZG91YmxlLXF1b3RlKSkpKQorICAgICAgICAo d2hlbiBuYW1lCisJICBgKGVzaGVsbC1nZXQtdmFyaWFibGUgLChldmFsIG5hbWUpIGluZGlj ZXMpKSkpKQogICAgKChhc3NvYyAoY2hhci10by1zdHJpbmcgKGNoYXItYWZ0ZXIpKQogICAg ICAgICAgICBlc2hlbGwtdmFyaWFibGUtYWxpYXNlcy1saXN0KQogICAgIChmb3J3YXJkLWNo YXIpCmRpZmYgLS1naXQgYS90ZXN0L2xpc3AvZXNoZWxsL2VzaC12YXItdGVzdHMuZWwgYi90 ZXN0L2xpc3AvZXNoZWxsL2VzaC12YXItdGVzdHMuZWwKaW5kZXggOGQ4MDNlNWNhNC4uN2Vj NmE5NzUxOSAxMDA2NDQKLS0tIGEvdGVzdC9saXNwL2VzaGVsbC9lc2gtdmFyLXRlc3RzLmVs CisrKyBiL3Rlc3QvbGlzcC9lc2hlbGwvZXNoLXZhci10ZXN0cy5lbApAQCAtMzcsNiArMzcs MjUgQEAKIAwKIDs7IFZhcmlhYmxlIGludGVycG9sYXRpb24KIAorKGVydC1kZWZ0ZXN0IGVz aC12YXItdGVzdC9pbnRlcnAtdmFyICgpCisgICJJbnRlcnBvbGF0ZSB2YXJpYWJsZSIKKyAg KHNob3VsZCAoZXF1YWwgKGVzaGVsbC10ZXN0LWNvbW1hbmQtcmVzdWx0ICJlY2hvICR1c2Vy LWxvZ2luLW5hbWUiKQorICAgICAgICAgICAgICAgICB1c2VyLWxvZ2luLW5hbWUpKSkKKwor KGVydC1kZWZ0ZXN0IGVzaC12YXItdGVzdC9pbnRlcnAtcXVvdGVkLXZhciAoKQorICAiSW50 ZXJwb2xhdGUgcXVvdGVkIHZhcmlhYmxlIgorICAoc2hvdWxkIChlcXVhbCAoZXNoZWxsLXRl c3QtY29tbWFuZC1yZXN1bHQgImVjaG8gJCd1c2VyLWxvZ2luLW5hbWUnIikKKyAgICAgICAg ICAgICAgICAgdXNlci1sb2dpbi1uYW1lKSkKKyAgKHNob3VsZCAoZXF1YWwgKGVzaGVsbC10 ZXN0LWNvbW1hbmQtcmVzdWx0ICJlY2hvICRcInVzZXItbG9naW4tbmFtZVwiIikKKyAgICAg ICAgICAgICAgICAgdXNlci1sb2dpbi1uYW1lKSkpCisKKyhlcnQtZGVmdGVzdCBlc2gtdmFy LXRlc3QvaW50ZXJwLXF1b3RlZC12YXItY29uY2F0ICgpCisgICJJbnRlcnBvbGF0ZSBhbmQg Y29uY2F0IHF1b3RlZCB2YXJpYWJsZSIKKyAgKHNob3VsZCAoZXF1YWwgKGVzaGVsbC10ZXN0 LWNvbW1hbmQtcmVzdWx0ICJlY2hvICQndXNlci1sb2dpbi1uYW1lJy1mb28iKQorICAgICAg ICAgICAgICAgICAoY29uY2F0IHVzZXItbG9naW4tbmFtZSAiLWZvbyIpKSkKKyAgKHNob3Vs ZCAoZXF1YWwgKGVzaGVsbC10ZXN0LWNvbW1hbmQtcmVzdWx0ICJlY2hvICRcInVzZXItbG9n aW4tbmFtZVwiLWZvbyIpCisgICAgICAgICAgICAgICAgIChjb25jYXQgdXNlci1sb2dpbi1u YW1lICItZm9vIikpKSkKKwogKGVydC1kZWZ0ZXN0IGVzaC12YXItdGVzdC9pbnRlcnAtbGlz cCAoKQogICAiSW50ZXJwb2xhdGUgTGlzcCBmb3JtIGV2YWx1YXRpb24iCiAgIChzaG91bGQg KGVxdWFsIChlc2hlbGwtdGVzdC1jb21tYW5kLXJlc3VsdCAiKyAkKCsgMSAyKSAzIikgNikp KQpAQCAtNzksNiArOTgsMzYgQEAgZXNoLXZhci10ZXN0L2ludGVycC1jb25jYXQtY21kLWV4 dGVybmFsCiAgICAoZXNoZWxsLWNvbW1hbmQtcmVzdWx0LXAgImVjaG8gJHtlY2hvIGhpfS0k eyplY2hvIHRoZXJlfSIKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAiaGktdGhlcmVc biIpKSkKIAorKGVydC1kZWZ0ZXN0IGVzaC12YXItdGVzdC9xdW90ZWQtaW50ZXJwLXZhciAo KQorICAiSW50ZXJwb2xhdGUgdmFyaWFibGUgaW5zaWRlIGRvdWJsZS1xdW90ZXMiCisgIChz aG91bGQgKGVxdWFsIChlc2hlbGwtdGVzdC1jb21tYW5kLXJlc3VsdCAiZWNobyBcIiR1c2Vy LWxvZ2luLW5hbWVcIiIpCisgICAgICAgICAgICAgICAgIHVzZXItbG9naW4tbmFtZSkpKQor CisoZXJ0LWRlZnRlc3QgZXNoLXZhci10ZXN0L3F1b3RlZC1pbnRlcnAtcXVvdGVkLXZhciAo KQorICAiSW50ZXJwb2xhdGUgcXVvdGVkIHZhcmlhYmxlIGluc2lkZSBkb3VibGUtcXVvdGVz IgorICAoc2hvdWxkIChlcXVhbCAoZXNoZWxsLXRlc3QtY29tbWFuZC1yZXN1bHQKKyAgICAg ICAgICAgICAgICAgICJlY2hvIFwiaGksICQndXNlci1sb2dpbi1uYW1lJ1wiIikKKyAgICAg ICAgICAgICAgICAgKGNvbmNhdCAiaGksICIgdXNlci1sb2dpbi1uYW1lKSkpCisgIChzaG91 bGQgKGVxdWFsIChlc2hlbGwtdGVzdC1jb21tYW5kLXJlc3VsdAorICAgICAgICAgICAgICAg ICAgImVjaG8gXCJoaSwgJFxcXCJ1c2VyLWxvZ2luLW5hbWVcXFwiXCIiKQorICAgICAgICAg ICAgICAgICAoY29uY2F0ICJoaSwgIiB1c2VyLWxvZ2luLW5hbWUpKSkpCisKKyhlcnQtZGVm dGVzdCBlc2gtdmFyLXRlc3QvcXVvdGVkLWludGVycC1saXNwICgpCisgICJJbnRlcnBvbGF0 ZSBMaXNwIGZvcm0gZXZhbHVhdGlvbiBpbnNpZGUgZG91YmxlLXF1b3RlcyIKKyAgKHNob3Vs ZCAoZXF1YWwgKGVzaGVsbC10ZXN0LWNvbW1hbmQtcmVzdWx0CisgICAgICAgICAgICAgICAg ICAiZWNobyBcImhpICQoY29uY2F0IFxcXCJ0aGVcXFwiIFxcXCJyZVxcXCIpXCIiKQorICAg ICAgICAgICAgICAgICAiaGkgdGhlcmUiKSkpCisKKyhlcnQtZGVmdGVzdCBlc2gtdmFyLXRl c3QvcXVvdGVkLWludGVycC1jbWQgKCkKKyAgIkludGVycG9sYXRlIGNvbW1hbmQgcmVzdWx0 IGluc2lkZSBkb3VibGUtcXVvdGVzIgorICAoc2hvdWxkIChlcXVhbCAoZXNoZWxsLXRlc3Qt Y29tbWFuZC1yZXN1bHQKKyAgICAgICAgICAgICAgICAgICJlY2hvIFwiaGkgJHtlY2hvIFxc XCJ0aGVyZVxcXCJ9XCIiKQorICAgICAgICAgICAgICAgICAiaGkgdGhlcmUiKSkpCisKKyhl cnQtZGVmdGVzdCBlc2gtdmFyLXRlc3QvcXVvdGVkLWludGVycC10ZW1wLWNtZCAoKQorICAi SW50ZXJwb2xhdGUgY29tbWFuZCByZXN1bHQgcmVkaXJlY3RlZCB0byB0ZW1wIGZpbGUgaW5z aWRlIGRvdWJsZS1xdW90ZXMiCisgIChzaG91bGQgKGVxdWFsIChlc2hlbGwtdGVzdC1jb21t YW5kLXJlc3VsdCAiY2F0IFwiJDxlY2hvIGhpPlwiIikgImhpIikpKQorCiAMCiA7OyBCdWls dC1pbiB2YXJpYWJsZXMKIAotLSAKMi4yNS4xCgo= --------------84BAF41E9AB7415EAB9F2A21 Content-Type: text/plain; charset=UTF-8; name="0004-Fix-parsing-of-indices-in-Eshell-expansions.patch" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="0004-Fix-parsing-of-indices-in-Eshell-expansions.patch" RnJvbSAzZDkzZWJhM2ViZTgzOTZjMGQzNDljYWQxNWY0MGUyYzM4N2Y0ZTkxIE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBKaW0gUG9ydGVyIDxqcG9ydGVyYnVnc0BnbWFpbC5j b20+CkRhdGU6IFR1ZSwgMSBNYXIgMjAyMiAxODozNjowOCAtMDgwMApTdWJqZWN0OiBbUEFU Q0ggNC81XSBGaXggcGFyc2luZyBvZiBpbmRpY2VzIGluIEVzaGVsbCBleHBhbnNpb25zCgpQ cmV2aW91c2x5LCBtb3JlLWNvbXBsZXggaW5kZXggZXhwYW5zaW9ucywgbGlrZSAnJHZhclsi OiIgMF0nIG9yCickdmFyWyQoZXhwcikgMF0nIGZhaWxlZCB0byBwYXJzZSBjb3JyZWN0bHku CgoqIGxpc3AvZXNoZWxsL2VzaC12YXIuZWwgKENvbW1lbnRhcnkpOiBDbGFyaWZ5IGluZGV4 aW5nIGFuZCBsZW5ndGgKZXhwYW5zaW9ucy4KKGVzaGVsbC1wYXJzZS1pbmRpY2VzKTogRXhw YW5kIGRvY3N0cmluZyBhbmQgc3VwcG9ydCBwYXJzaW5nIGluc2lkZQpkb3VibGUtcXVvdGVz LgooZXNoZWxsLWV2YWwtaW5kaWNlcyk6IE5ldyBmdW5jdGlvbi4KKGVzaGVsbC1wYXJzZS12 YXJpYWJsZSk6IFVzZSBpdC4KCiogdGVzdC9saXNwL2VzaGVsbC9lc2gtdmFyLXRlc3RzLmVs IChlc2hlbGwtdGVzdC12YWx1ZSk6IE5ldyBkZWZ2YXIuCihlc2gtdmFyLXRlc3QvaW50ZXJw LXZhci1pbmRpY2VzLAooZXNoLXZhci10ZXN0L2ludGVycC12YXItc3BsaXQtaW5kaWNlcykK KGVzaC12YXItdGVzdC9pbnRlcnAtdmFyLXN0cmluZy1zcGxpdC1pbmRpY2VzKQooZXNoLXZh ci10ZXN0L2ludGVycC12YXItcmVnZXhwLXNwbGl0LWluZGljZXMpCihlc2gtdmFyLXRlc3Qv aW50ZXJwLXZhci1hc3NvYywgZXNoLXZhci10ZXN0L2ludGVycC12YXItbGVuZ3RoLWxpc3Qp Cihlc2gtdmFyLXRlc3QvaW50ZXJwLXZhci1sZW5ndGgtc3RyaW5nKQooZXNoLXZhci10ZXN0 L2ludGVycC12YXItbGVuZ3RoLWFsaXN0KQooZXNoLXZhci10ZXN0L3F1b3RlZC1pbnRlcnAt dmFyLWluZGljZXMpCihlc2gtdmFyLXRlc3QvcXVvdGVkLWludGVycC12YXItc3BsaXQtaW5k aWNlcykKKGVzaC12YXItdGVzdC9xdW90ZWQtaW50ZXJwLXZhci1zdHJpbmctc3BsaXQtaW5k aWNlcykKKGVzaC12YXItdGVzdC9xdW90ZWQtaW50ZXJwLXZhci1yZWdleHAtc3BsaXQtaW5k aWNlcykKKGVzaC12YXItdGVzdC9xdW90ZWQtaW50ZXJwLXZhci1hc3NvYykKKGVzaC12YXIt dGVzdC9xdW90ZWQtaW50ZXJwLXZhci1sZW5ndGgtbGlzdCkKKGVzaC12YXItdGVzdC9xdW90 ZWQtaW50ZXJwLXZhci1sZW5ndGgtc3RyaW5nKQooZXNoLXZhci10ZXN0L3F1b3RlZC1pbnRl cnAtdmFyLWxlbmd0aC1hbGlzdCk6IE5ldyB0ZXN0cy4KCiogZG9jL21pc2MvZXNoZWxsLnRl eGkgKERvbGxhcnMgRXhwYW5zaW9uKTogRXhwYW5kIGFuZCByZXdvcmQKZG9jdW1lbnRhdGlv biBmb3IgaW5kZXhpbmcgYW5kIGxlbmd0aCBleHBhbnNpb25zLgotLS0KIGRvYy9taXNjL2Vz aGVsbC50ZXhpICAgICAgICAgICAgICB8ICA2MiArKysrKystLS0tLS0KIGxpc3AvZXNoZWxs L2VzaC12YXIuZWwgICAgICAgICAgICB8ICA1OSArKysrKystLS0tLS0KIHRlc3QvbGlzcC9l c2hlbGwvZXNoLXZhci10ZXN0cy5lbCB8IDE1MiArKysrKysrKysrKysrKysrKysrKysrKysr KysrKysKIDMgZmlsZXMgY2hhbmdlZCwgMjEyIGluc2VydGlvbnMoKyksIDYxIGRlbGV0aW9u cygtKQoKZGlmZiAtLWdpdCBhL2RvYy9taXNjL2VzaGVsbC50ZXhpIGIvZG9jL21pc2MvZXNo ZWxsLnRleGkKaW5kZXggYmJmOGNhNmI4Yi4uMzMwMWE4NTRlYiAxMDA2NDQKLS0tIGEvZG9j L21pc2MvZXNoZWxsLnRleGkKKysrIGIvZG9jL21pc2MvZXNoZWxsLnRleGkKQEAgLTEwMjIs MTEgKzEwMjIsNiBAQCBEb2xsYXJzIEV4cGFuc2lvbgogZGlzYW1iaWd1YXRlIHRoZSB2YXJp YWJsZSBuYW1lIHdoZW4gY29uY2F0ZW5hdGluZyBpdCB3aXRoIGFub3RoZXIKIHZhbHVlLCBz dWNoIGFzIEBzYW1weyQiQHZhcnt2YXJ9Ii1zdWZmaXh9LgogCi1AaXRlbSAkI0B2YXJ7dmFy fQotRXhwYW5kcyB0byB0aGUgbGVuZ3RoIG9mIHRoZSB2YWx1ZSBib3VuZCB0byBAdmFye3Zh cn0uICBSYWlzZXMgYW4gZXJyb3IKLWlmIHRoZSB2YWx1ZSBpcyBub3QgYSBzZXF1ZW5jZQot KEBweHJlZntTZXF1ZW5jZXMgQXJyYXlzIFZlY3RvcnMsIFNlcXVlbmNlcywgLCBlbGlzcCwg VGhlIEVtYWNzIExpc3AgUmVmZXJlbmNlIE1hbnVhbH0pLgotCiBAaXRlbSAkKEB2YXJ7bGlz cH0pCiBFeHBhbmRzIHRvIHRoZSByZXN1bHQgb2YgZXZhbHVhdGluZyB0aGUgUy1leHByZXNz aW9uIEBjb2RleyhAdmFye2xpc3B9KX0uICBPbgogaXRzIG93biwgdGhpcyBpcyBpZGVudGlj YWwgdG8ganVzdCBAY29kZXsoQHZhcntsaXNwfSl9LCBidXQgd2l0aCB0aGUgQGNvZGV7JH0s CkBAIC0xMDQxLDM0ICsxMDM2LDM1IEBAIERvbGxhcnMgRXhwYW5zaW9uCiBAY29tbWFuZHtA dmFye2NvbW1hbmR9fSwgYnV0IHdyaXRlcyB0aGUgb3V0cHV0IHRvIGEgdGVtcG9yYXJ5IGZp bGUgYW5kCiByZXR1cm5zIHRoZSBmaWxlIG5hbWUuCiAKLUBpdGVtICRAdmFye3Zhcn1baV0K LUV4cGFuZHMgdG8gdGhlIEBjb2Rle2l9dGggZWxlbWVudCBvZiB0aGUgdmFsdWUgYm91bmQg dG8gQHZhcnt2YXJ9LiAgSWYKLXRoZSB2YWx1ZSBpcyBhIHN0cmluZywgaXQgd2lsbCBiZSBz cGxpdCBhdCB3aGl0ZXNwYWNlIHRvIG1ha2UgaXQgYSBsaXN0LgotQWdhaW4sIHJhaXNlcyBh biBlcnJvciBpZiB0aGUgdmFsdWUgaXMgbm90IGEgc2VxdWVuY2UuCi0KLUBpdGVtICRAdmFy e3Zhcn1bOiBpXQotQXMgYWJvdmUsIGJ1dCBub3cgc3BsaXR0aW5nIG9jY3VycyBhdCB0aGUg Y29sb24gY2hhcmFjdGVyLgotCi1AaXRlbSAkQHZhcnt2YXJ9WzogaSBqXQotQXMgYWJvdmUs IGJ1dCBpbnN0ZWFkIG9mIHJldHVybmluZyBqdXN0IGEgc3RyaW5nLCBpdCBub3cgcmV0dXJu cyBhIGxpc3QKLW9mIHR3byBzdHJpbmdzLiAgSWYgdGhlIHJlc3VsdCBpcyBiZWluZyBpbnRl cnBvbGF0ZWQgaW50byBhIGxhcmdlcgotc3RyaW5nLCB0aGlzIGxpc3Qgd2lsbCBiZSBmbGF0 dGVuZWQgaW50byBvbmUgYmlnIHN0cmluZywgd2l0aCBlYWNoCi1lbGVtZW50IHNlcGFyYXRl ZCBieSBhIHNwYWNlLgotCi1AaXRlbSAkQHZhcnt2YXJ9WyJcXFxcIiBpXQotU2VwYXJhdGUg b24gYmFja3NsYXNoIGNoYXJhY3RlcnMuICBBY3R1YWxseSwgdGhlIGZpcnN0IGFyZ3VtZW50 IC0tIGlmIGl0Ci1kb2Vzbid0IGhhdmUgdGhlIGZvcm0gb2YgYSBudW1iZXIsIG9yIGEgcGxh aW4gdmFyaWFibGUgbmFtZSAtLSBjYW4gYmUKLWFueSByZWd1bGFyIGV4cHJlc3Npb24uICBT byB0byBzcGxpdCBvbiBudW1iZXJzLCB1c2UKLUBzYW1weyRAdmFye3Zhcn1bIlswLTldKyIg MTAgMjBdfS4KLQotQGl0ZW0gJEB2YXJ7dmFyfVtoZWxsb10KLUNhbGxzIEBjb2Rle2Fzc29j fSBvbiBAdmFye3Zhcn0gd2l0aCBAY29kZXsiaGVsbG8ifSwgZXhwZWN0aW5nIGl0IHRvIGJl Ci1hbiBhbGlzdCAoQHB4cmVme0Fzc29jaWF0aW9uIExpc3QgVHlwZSwgQXNzb2NpYXRpb24g TGlzdHMsICwgZWxpc3AsCi1UaGUgRW1hY3MgTGlzcCBSZWZlcmVuY2UgTWFudWFsfSkuCi0K LUBpdGVtICQjQHZhcnt2YXJ9W2hlbGxvXQotUmV0dXJucyB0aGUgbGVuZ3RoIG9mIHRoZSBA Y29kZXtjZHJ9IG9mIHRoZSBlbGVtZW50IG9mIEB2YXJ7dmFyfSB3aG9zZQotY2FyIGlzIGVx dWFsIHRvIEBjb2RleyJoZWxsbyJ9LgorQGl0ZW0gJEB2YXJ7ZXhwcn1bQHZhcntpLi4ufV0K K0V4cGFuZHMgdG8gdGhlIEB2YXJ7aX10aCBlbGVtZW50IG9mIHRoZSByZXN1bHQgb2YgQHZh cntleHByfSwgYW4KK2V4cHJlc3Npb24gaW4gb25lIG9mIHRoZSBhYm92ZSBmb3JtcyBsaXN0 ZWQgaGVyZS4gIElmIG11bHRpcGxlIGluZGljZXMKK2FyZSBzdXBwbGllZCwgdGhpcyB3aWxs IHJldHVybiBhIGxpc3QgY29udGFpbmluZyB0aGUgZWxlbWVudHMgZm9yIGVhY2gKK2luZGV4 LiAgSWYgQHZhcntleHByfSdzIHZhbHVlIGlzIGEgc3RyaW5nLCBpdCB3aWxsIGZpcnN0IGJl IHNwbGl0IGF0Cit3aGl0ZXNwYWNlIHRvIG1ha2UgaXQgYSBsaXN0LiAgSWYgQHZhcntleHBy fSdzIHZhbHVlIGlzIGFuIGFsaXN0CisoQHB4cmVme0Fzc29jaWF0aW9uIExpc3QgVHlwZSwg QXNzb2NpYXRpb24gTGlzdHMsICwgZWxpc3AsIFRoZSBFbWFjcworTGlzcCBSZWZlcmVuY2Ug TWFudWFsfSksIHRoaXMgd2lsbCBjYWxsIEBjb2Rle2Fzc29jfSBvbiB0aGUgcmVzdWx0IG9m CitAdmFye2V4cHJ9LCByZXR1cm5pbmcgdGhlIEBjb2Rle2Nkcn0gb2YgdGhlIGVsZW1lbnQg b2YgdGhlIHJlc3VsdAord2hvc2UgY2FyIGlzIGVxdWFsIHRvIEBjb2RleyJpIn0uICBSYWlz ZXMgYW4gZXJyb3IgaWYgdGhlIHZhbHVlIGlzIG5vdAorYSBzZXF1ZW5jZSAoQHB4cmVme1Nl cXVlbmNlcyBBcnJheXMgVmVjdG9ycywgU2VxdWVuY2VzLCAsIGVsaXNwLCBUaGUKK0VtYWNz IExpc3AgUmVmZXJlbmNlIE1hbnVhbH0pLgorCitNdWx0aXBsZSBzZXRzIG9mIGluZGljZXMg Y2FuIGFsc28gYmUgc3BlY2lmaWVkLiBGb3IgZXhhbXBsZSwgaWYKK0B2YXJ7dmFyfSBpcyBh IGxpc3Qgb2YgbGlzdHMsIEBzYW1weyRAdmFye3Zhcn1bMF1bMF19IGlzIGVxdWl2YWxlbnQg dG8KK0BzYW1weyhjYWFyIEB2YXJ7dmFyfSl9LgorCitAaXRlbSAkQHZhcntleHByfVtAdmFy e3JlZ2V4cH0gQHZhcntpLi4ufV0KK0FzIGFib3ZlICh3aGVuIEB2YXJ7ZXhwcn0gZXhwYW5k cyB0byBhIHN0cmluZyksIGJ1dCB1c2UgQHZhcntyZWdleHB9Cit0byBzcGxpdCB0aGUgc3Ry aW5nLiAgQHZhcntyZWdleHB9IGNhbiBiZSBhbnkgZm9ybSBvdGhlciB0aGFuIGEgbnVtYmVy CitvciBhIHBsYWluIHZhcmlhYmxlIG5hbWUuICBGb3IgZXhhbXBsZSwgQHNhbXB7JEB2YXJ7 dmFyfVs6IDBdfSB3aWxsCityZXR1cm4gdGhlIGZpcnN0IGVsZW1lbnQgb2YgYSBjb2xvbi1k ZWxpbWl0ZWQgc3RyaW5nLgorCitAaXRlbSAkI0B2YXJ7ZXhwcn0KK0V4cGFuZHMgdG8gdGhl IGxlbmd0aCBvZiB0aGUgcmVzdWx0IG9mIEB2YXJ7ZXhwcn0sIGFuIGV4cHJlc3Npb24gaW4K K29uZSBvZiB0aGUgYWJvdmUgZm9ybXMuICBGb3IgZXhhbXBsZSwgQHNhbXB7JCNAdmFye3Zh cn19IHJldHVybnMgdGhlCitsZW5ndGggb2YgdGhlIHZhcmlhYmxlIEB2YXJ7dmFyfSBhbmQg QHNhbXB7JCNAdmFye3Zhcn1bMF19IHJldHVybnMgdGhlCitsZW5ndGggb2YgdGhlIGZpcnN0 IGVsZW1lbnQgb2YgQHZhcnt2YXJ9LiAgQWdhaW4sIHJhaXNlcyBhbiBlcnJvciBpZgordGhl IHJlc3VsdCBvZiBAdmFye2V4cHJ9IGlzIG5vdCBhIHNlcXVlbmNlLgogCiBAZW5kIHRhYmxl CiAKZGlmZiAtLWdpdCBhL2xpc3AvZXNoZWxsL2VzaC12YXIuZWwgYi9saXNwL2VzaGVsbC9l c2gtdmFyLmVsCmluZGV4IDI0ZmRiZGUzY2YuLjZmMDhhM2ZiYzQgMTAwNjQ0Ci0tLSBhL2xp c3AvZXNoZWxsL2VzaC12YXIuZWwKKysrIGIvbGlzcC9lc2hlbGwvZXNoLXZhci5lbApAQCAt MzksMTEgKzM5LDYgQEAKIDs7CiA7OyBPbmx5ICJNWVZBUiIgaXMgcGFydCBvZiB0aGUgdmFy aWFibGUgbmFtZSBpbiB0aGlzIGNhc2UuCiA7OwotOzsgICAkI1ZBUklBQkxFCi07OwotOzsg UmV0dXJucyB0aGUgbGVuZ3RoIG9mIHRoZSB2YWx1ZSBvZiBWQVJJQUJMRS4gIFRoaXMgY291 bGQgYWxzbyBiZQotOzsgZG9uZSB1c2luZyB0aGUgYGxlbmd0aCcgTGlzcCBmdW5jdGlvbi4K LTs7CiA7OyAgICQobGlzcCkKIDs7CiA7OyBSZXR1cm5zIHJlc3VsdCBvZiBMaXNwIGV2YWx1 YXRpb24uICBOb3RlOiBVc2VkIGFsb25lIGxpa2UgdGhpcywgaXQKQEAgLTYxLDM4ICs1Niwz NiBAQAogOzsgRXZhbHVhdGVzIGFuIGVzaGVsbCBzdWJjb21tYW5kLCByZWRpcmVjdGluZyB0 aGUgb3V0cHV0IHRvIGEKIDs7IHRlbXBvcmFyeSBmaWxlLCBhbmQgcmV0dXJuaW5nIHRoZSBm aWxlIG5hbWUuCiA7OwotOzsgICAkQU5ZVkFSWzEwXQorOzsgICAkRVhQUlsxMF0KIDs7Ci07 OyBSZXR1cm4gdGhlIDEwdGggZWxlbWVudCBvZiBBTllWQVIuICBJZiBBTllWQVIncyB2YWx1 ZSBpcyBhIHN0cmluZywKLTs7IGl0IHdpbGwgYmUgc3BsaXQgaW4gb3JkZXIgdG8gbWFrZSBp dCBhIGxpc3QuICBUaGUgc3BsaXR0aW5nIHdpbGwKLTs7IG9jY3VyIGF0IHdoaXRlc3BhY2Uu Cis7OyBSZXR1cm4gdGhlIDEwdGggZWxlbWVudCBvZiAkRVhQUiwgd2hpY2ggY2FuIGJlIGFu eSBkb2xsYXIKKzs7IGV4cHJlc3Npb24uICBJZiAkRVhQUidzIHZhbHVlIGlzIGEgc3RyaW5n LCBpdCB3aWxsIGJlIHNwbGl0IGluCis7OyBvcmRlciB0byBtYWtlIGl0IGEgbGlzdC4gIFRo ZSBzcGxpdHRpbmcgd2lsbCBvY2N1ciBhdCB3aGl0ZXNwYWNlLgogOzsKLTs7ICAgJEFOWVZB Uls6IDEwXQorOzsgICAkRVhQUlsxMCAyMF0KIDs7Ci07OyBBcyBhYm92ZSwgZXhjZXB0IHRo YXQgc3BsaXR0aW5nIG9jY3VycyBhdCB0aGUgY29sb24gbm93LgorOzsgQXMgYWJvdmUsIGJ1 dCBpbnN0ZWFkIG9mIHJldHVybmluZyBhIHNpbmdsZSBlbGVtZW50LCBpdCBub3cgcmV0dXJu cyBhCis7OyBsaXN0IG9mIHR3byBlbGVtZW50cy4KIDs7Ci07OyAgICRBTllWQVJbOiAxMCAy MF0KKzs7ICAgJEVYUFJbOiAxMF0KIDs7Ci07OyBBcyBhYm92ZSwgYnV0IGluc3RlYWQgb2Yg cmV0dXJuaW5nIGp1c3QgYSBzdHJpbmcsIGl0IG5vdyByZXR1cm5zIGEKLTs7IGxpc3Qgb2Yg dHdvIHN0cmluZ3MuICBJZiB0aGUgcmVzdWx0IGlzIGJlaW5nIGludGVycG9sYXRlZCBpbnRv IGEKLTs7IGxhcmdlciBzdHJpbmcsIHRoaXMgbGlzdCB3aWxsIGJlIGZsYXR0ZW5lZCBpbnRv IG9uZSBiaWcgc3RyaW5nLAotOzsgd2l0aCBlYWNoIGVsZW1lbnQgc2VwYXJhdGVkIGJ5IGEg c3BhY2UuCis7OyBMaWtlICRFWFBSWzEwXSwgZXhjZXB0IHRoYXQgc3BsaXR0aW5nIG9jY3Vy cyBhdCB0aGUgY29sb24gbm93LgogOzsKLTs7ICAgJEFOWVZBUlsiXFxcXCIgMTBdCis7OyAg ICRFWFBSWyJcXFxcIiAxMF0KIDs7CiA7OyBTZXBhcmF0ZSBvbiBiYWNrc2xhc2ggY2hhcmFj dGVycy4gIEFjdHVhbGx5LCB0aGUgZmlyc3QgYXJndW1lbnQgLS0KIDs7IGlmIGl0IGRvZXNu J3QgaGF2ZSB0aGUgZm9ybSBvZiBhIG51bWJlciwgb3IgYSBwbGFpbiB2YXJpYWJsZSBuYW1l CiA7OyAtLSBjYW4gYmUgYW55IHJlZ3VsYXIgZXhwcmVzc2lvbi4gIFNvIHRvIHNwbGl0IG9u IG51bWJlcnMsIHVzZQotOzsgJyRBTllWQVJbIlswLTldKyIgMTAgMjBdJy4KKzs7ICckRVhQ UlsiWzAtOV0rIiAxMCAyMF0nLgogOzsKLTs7ICAgJEFOWVZBUltoZWxsb10KKzs7ICAgJEVY UFJbaGVsbG9dCiA7OwotOzsgQ2FsbHMgYGFzc29jJyBvbiBBTllWQVIgd2l0aCAnaGVsbG8n LCBleHBlY3RpbmcgaXQgdG8gYmUgYW4gYWxpc3QuCis7OyBDYWxscyBgYXNzb2MnIG9uICRF WFBSIHdpdGggJ2hlbGxvJywgZXhwZWN0aW5nIGl0IHRvIGJlIGFuIGFsaXN0LgogOzsKLTs7 ICAgJCNBTllWQVJbaGVsbG9dCis7OyAgICQjRVhQUgogOzsKLTs7IFJldHVybnMgdGhlIGxl bmd0aCBvZiB0aGUgY2RyIG9mIHRoZSBlbGVtZW50IG9mIEFOWVZBUiB3aG8gY2FyIGlzCi07 OyBlcXVhbCB0byAiaGVsbG8iLgorOzsgUmV0dXJucyB0aGUgbGVuZ3RoIG9mIHRoZSB2YWx1 ZSBvZiAkRVhQUi4gIFRoaXMgY291bGQgYWxzbyBiZQorOzsgZG9uZSB1c2luZyB0aGUgYGxl bmd0aCcgTGlzcCBmdW5jdGlvbi4KIDs7CiA7OyBUaGVyZSBhcmUgYWxzbyBhIGZldyBzcGVj aWFsIHZhcmlhYmxlcyBkZWZpbmVkIGJ5IEVzaGVsbC4gICckJCcgaXMKIDs7IHRoZSB2YWx1 ZSBvZiB0aGUgbGFzdCBjb21tYW5kICh0IG9yIG5pbCwgaW4gdGhlIGNhc2Ugb2YgYW4gZXh0 ZXJuYWwKQEAgLTQxNiw3ICs0MDksNyBAQCBlc2hlbGwtcGFyc2UtdmFyaWFibGUKIAkJICAg ICAgIChlc2hlbGwtcGFyc2UtaW5kaWNlcykpCiAgICAgICAgICAgOzsgVGhpcyBpcyBhbiBl eHByZXNzaW9uIHRoYXQgd2lsbCBiZSBldmFsdWF0ZWQgYnkgYGVzaGVsbC1kby1ldmFsJywK ICAgICAgICAgICA7OyB3aGljaCBvbmx5IHN1cHBvcnQgbGV0LWJpbmRpbmcgb2YgZHluYW1p Y2FsbHktc2NvcGVkIHZhcnMKLQkgIHZhbHVlIGAobGV0ICgoaW5kaWNlcyAnLGluZGljZXMp KSAsdmFsdWUpKQorCSAgdmFsdWUgYChsZXQgKChpbmRpY2VzIChlc2hlbGwtZXZhbC1pbmRp Y2VzICcsaW5kaWNlcykpKSAsdmFsdWUpKQogICAgIChpZiBnZXQtbGVuCiAJYChsZW5ndGgg LHZhbHVlKQogICAgICAgdmFsdWUpKSkKQEAgLTUwNCwxOSArNDk3LDI5IEBAIGVzaGVsbC1w YXJzZS12YXJpYWJsZS1yZWYKIChkZWZ2YXIgZXNoZWxsLWdsb2ItZnVuY3Rpb24pCiAKIChk ZWZ1biBlc2hlbGwtcGFyc2UtaW5kaWNlcyAoKQotICAiUGFyc2UgYW5kIHJldHVybiBhIGxp c3Qgb2YgbGlzdCBvZiBpbmRpY2VzLiIKKyAgIlBhcnNlIGFuZCByZXR1cm4gYSBsaXN0IG9m IGluZGV4LWxpc3RzLgorCitGb3IgZXhhbXBsZSwgXCJbMCAxXVsyXVwiIGJlY29tZXM6Cisg ICgoXCIwXCIgXCIxXCIpIChcIjJcIikuIgogICAobGV0IChpbmRpY2VzKQogICAgICh3aGls ZSAoZXEgKGNoYXItYWZ0ZXIpID9cWykKICAgICAgIChsZXQgKChlbmQgKGVzaGVsbC1maW5k LWRlbGltaXRlciA/XFsgP1xdKSkpCiAJKGlmIChub3QgZW5kKQogCSAgICAodGhyb3cgJ2Vz aGVsbC1pbmNvbXBsZXRlID9cWykKIAkgIChmb3J3YXJkLWNoYXIpCi0JICAobGV0IChlc2hl bGwtZ2xvYi1mdW5jdGlvbikKLQkgICAgKHNldHEgaW5kaWNlcyAoY29ucyAoZXNoZWxsLXBh cnNlLWFyZ3VtZW50cyAocG9pbnQpIGVuZCkKLQkJCQlpbmRpY2VzKSkpCisgICAgICAgICAg KGVzaGVsbC13aXRoLXRlbXAtY29tbWFuZCAob3IgKGVzaGVsbC1wYXJzZS1pbm5lci1kb3Vi bGUtcXVvdGUgZW5kKQorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IChjb25zIChwb2ludCkgZW5kKSkKKwkgICAgKGxldCAoZXNoZWxsLWdsb2ItZnVuY3Rpb24g KGVzaGVsbC1jdXJyZW50LXF1b3RlZCBuaWwpKQorCSAgICAgIChzZXRxIGluZGljZXMgKGNv bnMgKGVzaGVsbC1wYXJzZS1hcmd1bWVudHMKKyAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgKHBvaW50LW1pbikgKHBvaW50LW1heCkpCisJCQkJICBpbmRpY2VzKSkpKQog CSAgKGdvdG8tY2hhciAoMSsgZW5kKSkpKSkKICAgICAobnJldmVyc2UgaW5kaWNlcykpKQog CisoZGVmdW4gZXNoZWxsLWV2YWwtaW5kaWNlcyAoaW5kaWNlcykKKyAgIkV2YWx1YXRlIElO RElDRVMsIGEgbGlzdCBvZiBpbmRleC1saXN0cyBnZW5lcmF0ZWQgYnkgYGVzaGVsbC1wYXJz ZS1pbmRpY2VzJy4iCisgIChtYXBjYXIgKGxhbWJkYSAoaSkgKG1hcGNhciAjJ2V2YWwgaSkp IGluZGljZXMpKQorCiAoZGVmdW4gZXNoZWxsLWdldC12YXJpYWJsZSAobmFtZSAmb3B0aW9u YWwgaW5kaWNlcykKICAgIkdldCB0aGUgdmFsdWUgZm9yIHRoZSB2YXJpYWJsZSBOQU1FLiIK ICAgKGxldCogKChhbGlhcyAoYXNzb2MgbmFtZSBlc2hlbGwtdmFyaWFibGUtYWxpYXNlcy1s aXN0KSkKZGlmZiAtLWdpdCBhL3Rlc3QvbGlzcC9lc2hlbGwvZXNoLXZhci10ZXN0cy5lbCBi L3Rlc3QvbGlzcC9lc2hlbGwvZXNoLXZhci10ZXN0cy5lbAppbmRleCA3ZWM2YTk3NTE5Li5l Njc5MTc0OTM5IDEwMDY0NAotLS0gYS90ZXN0L2xpc3AvZXNoZWxsL2VzaC12YXItdGVzdHMu ZWwKKysrIGIvdGVzdC9saXNwL2VzaGVsbC9lc2gtdmFyLXRlc3RzLmVsCkBAIC0zMiw2ICsz Miw4IEBACiAgICAgICAgICAgICAgICAgICAgICAgICAgICAoZmlsZS1uYW1lLWRpcmVjdG9y eSAob3IgbG9hZC1maWxlLW5hbWUKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICBkZWZhdWx0LWRpcmVjdG9yeSkpKSkKIAorKGRlZnZhciBl c2hlbGwtdGVzdC12YWx1ZSBuaWwpCisKIDs7OyBUZXN0czoKIAogDApAQCAtNTYsNiArNTgs NzYgQEAgZXNoLXZhci10ZXN0L2ludGVycC1xdW90ZWQtdmFyLWNvbmNhdAogICAoc2hvdWxk IChlcXVhbCAoZXNoZWxsLXRlc3QtY29tbWFuZC1yZXN1bHQgImVjaG8gJFwidXNlci1sb2dp bi1uYW1lXCItZm9vIikKICAgICAgICAgICAgICAgICAgKGNvbmNhdCB1c2VyLWxvZ2luLW5h bWUgIi1mb28iKSkpKQogCisoZXJ0LWRlZnRlc3QgZXNoLXZhci10ZXN0L2ludGVycC12YXIt aW5kaWNlcyAoKQorICAiSW50ZXJwb2xhdGUgbGlzdCB2YXJpYWJsZSB3aXRoIGluZGljZXMi CisgIChsZXQgKChlc2hlbGwtdGVzdC12YWx1ZSAnKCJ6ZXJvIiAib25lIiAidHdvIiAidGhy ZWUiICJmb3VyIikpKQorICAgIChzaG91bGQgKGVxdWFsIChlc2hlbGwtdGVzdC1jb21tYW5k LXJlc3VsdCAiZWNobyAkZXNoZWxsLXRlc3QtdmFsdWVbMF0iKQorICAgICAgICAgICAgICAg ICAgICJ6ZXJvIikpCisgICAgKHNob3VsZCAoZXF1YWwgKGVzaGVsbC10ZXN0LWNvbW1hbmQt cmVzdWx0ICJlY2hvICRlc2hlbGwtdGVzdC12YWx1ZVswIDJdIikKKyAgICAgICAgICAgICAg ICAgICAnKCJ6ZXJvIiAidHdvIikpKQorICAgIChzaG91bGQgKGVxdWFsIChlc2hlbGwtdGVz dC1jb21tYW5kLXJlc3VsdCAiZWNobyAkZXNoZWxsLXRlc3QtdmFsdWVbMCAyIDRdIikKKyAg ICAgICAgICAgICAgICAgICAnKCJ6ZXJvIiAidHdvIiAiZm91ciIpKSkpKQorCisoZXJ0LWRl ZnRlc3QgZXNoLXZhci10ZXN0L2ludGVycC12YXItc3BsaXQtaW5kaWNlcyAoKQorICAiSW50 ZXJwb2xhdGUgc3RyaW5nIHZhcmlhYmxlIHdpdGggaW5kaWNlcyIKKyAgKGxldCAoKGVzaGVs bC10ZXN0LXZhbHVlICJ6ZXJvIG9uZSB0d28gdGhyZWUgZm91ciIpKQorICAgIChzaG91bGQg KGVxdWFsIChlc2hlbGwtdGVzdC1jb21tYW5kLXJlc3VsdCAiZWNobyAkZXNoZWxsLXRlc3Qt dmFsdWVbMF0iKQorICAgICAgICAgICAgICAgICAgICJ6ZXJvIikpCisgICAgKHNob3VsZCAo ZXF1YWwgKGVzaGVsbC10ZXN0LWNvbW1hbmQtcmVzdWx0ICJlY2hvICRlc2hlbGwtdGVzdC12 YWx1ZVswIDJdIikKKyAgICAgICAgICAgICAgICAgICAnKCJ6ZXJvIiAidHdvIikpKQorICAg IChzaG91bGQgKGVxdWFsIChlc2hlbGwtdGVzdC1jb21tYW5kLXJlc3VsdCAiZWNobyAkZXNo ZWxsLXRlc3QtdmFsdWVbMCAyIDRdIikKKyAgICAgICAgICAgICAgICAgICAnKCJ6ZXJvIiAi dHdvIiAiZm91ciIpKSkpKQorCisoZXJ0LWRlZnRlc3QgZXNoLXZhci10ZXN0L2ludGVycC12 YXItc3RyaW5nLXNwbGl0LWluZGljZXMgKCkKKyAgIkludGVycG9sYXRlIHN0cmluZyB2YXJp YWJsZSB3aXRoIHN0cmluZyBzcGxpdHRlciBhbmQgaW5kaWNlcyIKKyAgKGxldCAoKGVzaGVs bC10ZXN0LXZhbHVlICJ6ZXJvOm9uZTp0d286dGhyZWU6Zm91ciIpKQorICAgIChzaG91bGQg KGVxdWFsIChlc2hlbGwtdGVzdC1jb21tYW5kLXJlc3VsdCAiZWNobyAkZXNoZWxsLXRlc3Qt dmFsdWVbOiAwXSIpCisgICAgICAgICAgICAgICAgICAgInplcm8iKSkKKyAgICAoc2hvdWxk IChlcXVhbCAoZXNoZWxsLXRlc3QtY29tbWFuZC1yZXN1bHQgImVjaG8gJGVzaGVsbC10ZXN0 LXZhbHVlWzogMCAyXSIpCisgICAgICAgICAgICAgICAgICAgJygiemVybyIgInR3byIpKSkp KQorCisoZXJ0LWRlZnRlc3QgZXNoLXZhci10ZXN0L2ludGVycC12YXItcmVnZXhwLXNwbGl0 LWluZGljZXMgKCkKKyAgIkludGVycG9sYXRlIHN0cmluZyB2YXJpYWJsZSB3aXRoIHJlZ2V4 cCBzcGxpdHRlciBhbmQgaW5kaWNlcyIKKyAgKGxldCAoKGVzaGVsbC10ZXN0LXZhbHVlICJ6 ZXJvOm9uZSF0d286dGhyZWUhZm91ciIpKQorICAgIChzaG91bGQgKGVxdWFsIChlc2hlbGwt dGVzdC1jb21tYW5kLXJlc3VsdAorICAgICAgICAgICAgICAgICAgICAiZWNobyAkZXNoZWxs LXRlc3QtdmFsdWVbJ1s6IV0nIDBdIikKKyAgICAgICAgICAgICAgICAgICAiemVybyIpKQor ICAgIChzaG91bGQgKGVxdWFsIChlc2hlbGwtdGVzdC1jb21tYW5kLXJlc3VsdAorICAgICAg ICAgICAgICAgICAgICAiZWNobyAkZXNoZWxsLXRlc3QtdmFsdWVbJ1s6IV0nIDAgMl0iKQor ICAgICAgICAgICAgICAgICAgICcoInplcm8iICJ0d28iKSkpCisgICAgKHNob3VsZCAoZXF1 YWwgKGVzaGVsbC10ZXN0LWNvbW1hbmQtcmVzdWx0CisgICAgICAgICAgICAgICAgICAgICJl Y2hvICRlc2hlbGwtdGVzdC12YWx1ZVtcIls6IV1cIiAwXSIpCisgICAgICAgICAgICAgICAg ICAgInplcm8iKSkKKyAgICAoc2hvdWxkIChlcXVhbCAoZXNoZWxsLXRlc3QtY29tbWFuZC1y ZXN1bHQKKyAgICAgICAgICAgICAgICAgICAgImVjaG8gJGVzaGVsbC10ZXN0LXZhbHVlW1wi WzohXVwiIDAgMl0iKQorICAgICAgICAgICAgICAgICAgICcoInplcm8iICJ0d28iKSkpKSkK KworKGVydC1kZWZ0ZXN0IGVzaC12YXItdGVzdC9pbnRlcnAtdmFyLWFzc29jICgpCisgICJJ bnRlcnBvbGF0ZSBhbGlzdCB2YXJpYWJsZSB3aXRoIGluZGV4IgorICAobGV0ICgoZXNoZWxs LXRlc3QtdmFsdWUgJygoImZvbyIgLiAxKSkpKQorICAgIChzaG91bGQgKGVxIChlc2hlbGwt dGVzdC1jb21tYW5kLXJlc3VsdCAiZWNobyAkZXNoZWxsLXRlc3QtdmFsdWVbZm9vXSIpCisg ICAgICAgICAgICAgICAgMSkpKSkKKworKGVydC1kZWZ0ZXN0IGVzaC12YXItdGVzdC9pbnRl cnAtdmFyLWxlbmd0aC1saXN0ICgpCisgICJJbnRlcnBvbGF0ZSBsZW5ndGggb2YgbGlzdCB2 YXJpYWJsZSIKKyAgKGxldCAoKGVzaGVsbC10ZXN0LXZhbHVlICcoKDEgMikgKDMpICg1ICg2 IDcgOCA5KSkpKSkKKyAgICAoc2hvdWxkIChlcSAoZXNoZWxsLXRlc3QtY29tbWFuZC1yZXN1 bHQgImVjaG8gJCNlc2hlbGwtdGVzdC12YWx1ZSIpIDMpKQorICAgIChzaG91bGQgKGVxIChl c2hlbGwtdGVzdC1jb21tYW5kLXJlc3VsdCAiZWNobyAkI2VzaGVsbC10ZXN0LXZhbHVlWzFd IikgMSkpCisgICAgKHNob3VsZCAoZXEgKGVzaGVsbC10ZXN0LWNvbW1hbmQtcmVzdWx0ICJl Y2hvICQjZXNoZWxsLXRlc3QtdmFsdWVbMl1bMV0iKQorICAgICAgICAgICAgICAgIDQpKSkp CisKKyhlcnQtZGVmdGVzdCBlc2gtdmFyLXRlc3QvaW50ZXJwLXZhci1sZW5ndGgtc3RyaW5n ICgpCisgICJJbnRlcnBvbGF0ZSBsZW5ndGggb2Ygc3RyaW5nIHZhcmlhYmxlIgorICAobGV0 ICgoZXNoZWxsLXRlc3QtdmFsdWUgImZvb2JhciIpKQorICAgIChzaG91bGQgKGVxIChlc2hl bGwtdGVzdC1jb21tYW5kLXJlc3VsdCAiZWNobyAkI2VzaGVsbC10ZXN0LXZhbHVlIikgNikp KSkKKworKGVydC1kZWZ0ZXN0IGVzaC12YXItdGVzdC9pbnRlcnAtdmFyLWxlbmd0aC1hbGlz dCAoKQorICAiSW50ZXJwb2xhdGUgbGVuZ3RoIG9mIGFsaXN0IHZhcmlhYmxlIgorICAobGV0 ICgoZXNoZWxsLXRlc3QtdmFsdWUgJygoImZvbyIgLiAoMSAyIDMpKSkpKQorICAgIChzaG91 bGQgKGVxIChlc2hlbGwtdGVzdC1jb21tYW5kLXJlc3VsdCAiZWNobyAkI2VzaGVsbC10ZXN0 LXZhbHVlIikgMSkpCisgICAgKHNob3VsZCAoZXEgKGVzaGVsbC10ZXN0LWNvbW1hbmQtcmVz dWx0ICJlY2hvICQjZXNoZWxsLXRlc3QtdmFsdWVbZm9vXSIpCisgICAgICAgICAgICAgICAg MykpKSkKKwogKGVydC1kZWZ0ZXN0IGVzaC12YXItdGVzdC9pbnRlcnAtbGlzcCAoKQogICAi SW50ZXJwb2xhdGUgTGlzcCBmb3JtIGV2YWx1YXRpb24iCiAgIChzaG91bGQgKGVxdWFsIChl c2hlbGwtdGVzdC1jb21tYW5kLXJlc3VsdCAiKyAkKCsgMSAyKSAzIikgNikpKQpAQCAtMTEy LDYgKzE4NCw4NiBAQCBlc2gtdmFyLXRlc3QvcXVvdGVkLWludGVycC1xdW90ZWQtdmFyCiAg ICAgICAgICAgICAgICAgICAiZWNobyBcImhpLCAkXFxcInVzZXItbG9naW4tbmFtZVxcXCJc IiIpCiAgICAgICAgICAgICAgICAgIChjb25jYXQgImhpLCAiIHVzZXItbG9naW4tbmFtZSkp KSkKIAorKGVydC1kZWZ0ZXN0IGVzaC12YXItdGVzdC9xdW90ZWQtaW50ZXJwLXZhci1pbmRp Y2VzICgpCisgICJJbnRlcnBvbGF0ZSBzdHJpbmcgdmFyaWFibGUgd2l0aCBpbmRpY2VzIGlu c2lkZSBkb3VibGUtcXVvdGVzIgorICAobGV0ICgoZXNoZWxsLXRlc3QtdmFsdWUgJygiemVy byIgIm9uZSIgInR3byIgInRocmVlIiAiZm91ciIpKSkKKyAgICAoc2hvdWxkIChlcXVhbCAo ZXNoZWxsLXRlc3QtY29tbWFuZC1yZXN1bHQKKyAgICAgICAgICAgICAgICAgICAgImVjaG8g XCIkZXNoZWxsLXRlc3QtdmFsdWVbMF1cIiIpCisgICAgICAgICAgICAgICAgICAgInplcm8i KSkKKyAgICAoc2hvdWxkIChlcXVhbCAoZXNoZWxsLXRlc3QtY29tbWFuZC1yZXN1bHQKKyAg ICAgICAgICAgICAgICAgICAgImVjaG8gXCIkZXNoZWxsLXRlc3QtdmFsdWVbMCAyXVwiIikK KyAgICAgICAgICAgICAgICAgICAnKCJ6ZXJvIiAidHdvIikpKQorICAgIChzaG91bGQgKGVx dWFsIChlc2hlbGwtdGVzdC1jb21tYW5kLXJlc3VsdAorICAgICAgICAgICAgICAgICAgICAi ZWNobyBcIiRlc2hlbGwtdGVzdC12YWx1ZVswIDIgNF1cIiIpCisgICAgICAgICAgICAgICAg ICAgJygiemVybyIgInR3byIgImZvdXIiKSkpKSkKKworKGVydC1kZWZ0ZXN0IGVzaC12YXIt dGVzdC9xdW90ZWQtaW50ZXJwLXZhci1zcGxpdC1pbmRpY2VzICgpCisgICJJbnRlcnBvbGF0 ZSBzdHJpbmcgdmFyaWFibGUgd2l0aCBpbmRpY2VzIGluc2lkZSBkb3VibGUtcXVvdGVzIgor ICAobGV0ICgoZXNoZWxsLXRlc3QtdmFsdWUgInplcm8gb25lIHR3byB0aHJlZSBmb3VyIikp CisgICAgKHNob3VsZCAoZXF1YWwgKGVzaGVsbC10ZXN0LWNvbW1hbmQtcmVzdWx0CisgICAg ICAgICAgICAgICAgICAgICJlY2hvIFwiJGVzaGVsbC10ZXN0LXZhbHVlWzBdXCIiKQorICAg ICAgICAgICAgICAgICAgICJ6ZXJvIikpCisgICAgKHNob3VsZCAoZXF1YWwgKGVzaGVsbC10 ZXN0LWNvbW1hbmQtcmVzdWx0CisgICAgICAgICAgICAgICAgICAgICJlY2hvIFwiJGVzaGVs bC10ZXN0LXZhbHVlWzAgMl1cIiIpCisgICAgICAgICAgICAgICAgICAgJygiemVybyIgInR3 byIpKSkpKQorCisoZXJ0LWRlZnRlc3QgZXNoLXZhci10ZXN0L3F1b3RlZC1pbnRlcnAtdmFy LXN0cmluZy1zcGxpdC1pbmRpY2VzICgpCisgICJJbnRlcnBvbGF0ZSBzdHJpbmcgdmFyaWFi bGUgd2l0aCBzdHJpbmcgc3BsaXR0ZXIgYW5kIGluZGljZXMKK2luc2lkZSBkb3VibGUtcXVv dGVzIgorICAobGV0ICgoZXNoZWxsLXRlc3QtdmFsdWUgInplcm86b25lOnR3bzp0aHJlZTpm b3VyIikpCisgICAgKHNob3VsZCAoZXF1YWwgKGVzaGVsbC10ZXN0LWNvbW1hbmQtcmVzdWx0 CisgICAgICAgICAgICAgICAgICAgICJlY2hvIFwiJGVzaGVsbC10ZXN0LXZhbHVlWzogMF1c IiIpCisgICAgICAgICAgICAgICAgICAgInplcm8iKSkKKyAgICAoc2hvdWxkIChlcXVhbCAo ZXNoZWxsLXRlc3QtY29tbWFuZC1yZXN1bHQKKyAgICAgICAgICAgICAgICAgICAgImVjaG8g XCIkZXNoZWxsLXRlc3QtdmFsdWVbOiAwIDJdXCIiKQorICAgICAgICAgICAgICAgICAgICco Inplcm8iICJ0d28iKSkpKSkKKworKGVydC1kZWZ0ZXN0IGVzaC12YXItdGVzdC9xdW90ZWQt aW50ZXJwLXZhci1yZWdleHAtc3BsaXQtaW5kaWNlcyAoKQorICAiSW50ZXJwb2xhdGUgc3Ry aW5nIHZhcmlhYmxlIHdpdGggcmVnZXhwIHNwbGl0dGVyIGFuZCBpbmRpY2VzIgorICAobGV0 ICgoZXNoZWxsLXRlc3QtdmFsdWUgInplcm86b25lIXR3bzp0aHJlZSFmb3VyIikpCisgICAg KHNob3VsZCAoZXF1YWwgKGVzaGVsbC10ZXN0LWNvbW1hbmQtcmVzdWx0CisgICAgICAgICAg ICAgICAgICAgICJlY2hvIFwiJGVzaGVsbC10ZXN0LXZhbHVlWydbOiFdJyAwXVwiIikKKyAg ICAgICAgICAgICAgICAgICAiemVybyIpKQorICAgIChzaG91bGQgKGVxdWFsIChlc2hlbGwt dGVzdC1jb21tYW5kLXJlc3VsdAorICAgICAgICAgICAgICAgICAgICAiZWNobyBcIiRlc2hl bGwtdGVzdC12YWx1ZVsnWzohXScgMCAyXVwiIikKKyAgICAgICAgICAgICAgICAgICAnKCJ6 ZXJvIiAidHdvIikpKQorICAgIChzaG91bGQgKGVxdWFsIChlc2hlbGwtdGVzdC1jb21tYW5k LXJlc3VsdAorICAgICAgICAgICAgICAgICAgICAiZWNobyBcIiRlc2hlbGwtdGVzdC12YWx1 ZVtcXFwiWzohXVxcXCIgMF1cIiIpCisgICAgICAgICAgICAgICAgICAgInplcm8iKSkKKyAg ICAoc2hvdWxkIChlcXVhbCAoZXNoZWxsLXRlc3QtY29tbWFuZC1yZXN1bHQKKyAgICAgICAg ICAgICAgICAgICAgImVjaG8gXCIkZXNoZWxsLXRlc3QtdmFsdWVbXFxcIls6IV1cXFwiIDAg Ml1cIiIpCisgICAgICAgICAgICAgICAgICAgJygiemVybyIgInR3byIpKSkpKQorCisoZXJ0 LWRlZnRlc3QgZXNoLXZhci10ZXN0L3F1b3RlZC1pbnRlcnAtdmFyLWFzc29jICgpCisgICJJ bnRlcnBvbGF0ZSBhbGlzdCB2YXJpYWJsZSB3aXRoIGluZGV4IGluc2lkZSBkb3VibGUtcXVv dGVzIgorICAobGV0ICgoZXNoZWxsLXRlc3QtdmFsdWUgJygoImZvbyIgLiAxKSkpKQorICAg IChzaG91bGQgKGVxdWFsIChlc2hlbGwtdGVzdC1jb21tYW5kLXJlc3VsdAorICAgICAgICAg ICAgICAgICAgICAiZWNobyBcIiRlc2hlbGwtdGVzdC12YWx1ZVtmb29dXCIiKQorICAgICAg ICAgICAgICAgICAgIDEpKSkpCisKKyhlcnQtZGVmdGVzdCBlc2gtdmFyLXRlc3QvcXVvdGVk LWludGVycC12YXItbGVuZ3RoLWxpc3QgKCkKKyAgIkludGVycG9sYXRlIGxlbmd0aCBvZiBs aXN0IHZhcmlhYmxlIGluc2lkZSBkb3VibGUtcXVvdGVzIgorICAobGV0ICgoZXNoZWxsLXRl c3QtdmFsdWUgJygoMSAyKSAoMykgKDUgKDYgNyA4IDkpKSkpKQorICAgIChzaG91bGQgKGVx IChlc2hlbGwtdGVzdC1jb21tYW5kLXJlc3VsdCAiZWNobyBcIiQjZXNoZWxsLXRlc3QtdmFs dWVcIiIpIDMpKQorICAgIChzaG91bGQgKGVxIChlc2hlbGwtdGVzdC1jb21tYW5kLXJlc3Vs dCAiZWNobyBcIiQjZXNoZWxsLXRlc3QtdmFsdWVbMV1cIiIpCisgICAgICAgICAgICAgICAg MSkpCisgICAgKHNob3VsZCAoZXEgKGVzaGVsbC10ZXN0LWNvbW1hbmQtcmVzdWx0CisgICAg ICAgICAgICAgICAgICJlY2hvIFwiJCNlc2hlbGwtdGVzdC12YWx1ZVsyXVsxXVwiIikKKyAg ICAgICAgICAgICAgICA0KSkpKQorCisoZXJ0LWRlZnRlc3QgZXNoLXZhci10ZXN0L3F1b3Rl ZC1pbnRlcnAtdmFyLWxlbmd0aC1zdHJpbmcgKCkKKyAgIkludGVycG9sYXRlIGxlbmd0aCBv ZiBzdHJpbmcgdmFyaWFibGUgaW5zaWRlIGRvdWJsZS1xdW90ZXMiCisgIChsZXQgKChlc2hl bGwtdGVzdC12YWx1ZSAiZm9vYmFyIikpCisgICAgKHNob3VsZCAoZXEgKGVzaGVsbC10ZXN0 LWNvbW1hbmQtcmVzdWx0ICJlY2hvIFwiJCNlc2hlbGwtdGVzdC12YWx1ZVwiIikKKyAgICAg ICAgICAgICAgICA2KSkpKQorCisoZXJ0LWRlZnRlc3QgZXNoLXZhci10ZXN0L3F1b3RlZC1p bnRlcnAtdmFyLWxlbmd0aC1hbGlzdCAoKQorICAiSW50ZXJwb2xhdGUgbGVuZ3RoIG9mIGFs aXN0IHZhcmlhYmxlIGluc2lkZSBkb3VibGUtcXVvdGVzIgorICAobGV0ICgoZXNoZWxsLXRl c3QtdmFsdWUgJygoImZvbyIgLiAoMSAyIDMpKSkpKQorICAgIChzaG91bGQgKGVxIChlc2hl bGwtdGVzdC1jb21tYW5kLXJlc3VsdCAiZWNobyBcIiQjZXNoZWxsLXRlc3QtdmFsdWVcIiIp IDEpKQorICAgIChzaG91bGQgKGVxIChlc2hlbGwtdGVzdC1jb21tYW5kLXJlc3VsdCAiZWNo byBcIiQjZXNoZWxsLXRlc3QtdmFsdWVbZm9vXVwiIikKKyAgICAgICAgICAgICAgICAzKSkp KQorCiAoZXJ0LWRlZnRlc3QgZXNoLXZhci10ZXN0L3F1b3RlZC1pbnRlcnAtbGlzcCAoKQog ICAiSW50ZXJwb2xhdGUgTGlzcCBmb3JtIGV2YWx1YXRpb24gaW5zaWRlIGRvdWJsZS1xdW90 ZXMiCiAgIChzaG91bGQgKGVxdWFsIChlc2hlbGwtdGVzdC1jb21tYW5kLXJlc3VsdAotLSAK Mi4yNS4xCgo= --------------84BAF41E9AB7415EAB9F2A21 Content-Type: text/plain; charset=UTF-8; name="0005-Allow-splitting-strings-in-Eshell-expansions-with-pl.patch" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename*0="0005-Allow-splitting-strings-in-Eshell-expansions-with-pl.pa"; filename*1="tch" RnJvbSAyZDczY2E2N2I4NDRkZjZlMWVkMDMxOWY1ZDQ1NDY0NmQ2ODVjYWFhIE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBKaW0gUG9ydGVyIDxqcG9ydGVyYnVnc0BnbWFpbC5j b20+CkRhdGU6IFR1ZSwgMSBNYXIgMjAyMiAxODo1Mzo0MiAtMDgwMApTdWJqZWN0OiBbUEFU Q0ggNS81XSBBbGxvdyBzcGxpdHRpbmcgc3RyaW5ncyBpbiBFc2hlbGwgZXhwYW5zaW9ucyB3 aXRoICJwbGFpbiIKIHN0cmluZ3MKClNpbmNlICckdmFyW2hlbGxvIDBdJyBkb2Vzbid0IG1h a2Ugc2Vuc2Ugd2hlbiAndmFyJyBpcyBhIHN0cmluZywgdGhlCnByZXZpb3VzIHJlc3RyaWN0 aW9uIHdhcyB1bm5lY2Vzc2FyeS4KCiogbGlzcC9lc2hlbGwvZXNoLXZhci5lbCAoQ29tbWVu dGFyeSk6IFVwZGF0ZSBkb2N1bWVudGF0aW9uLgooZXNoZWxsLWFwcGx5LWluZGljZXMpOiBB bGxvdyAicGxhaW4iIHN0cmluZ3MgdG8gc3BsaXQgc3RyaW5ncy4KCiogdGVzdC9saXNwL2Vz aGVsbC9lc2gtdmFyLXRlc3QuZWwKKGVzaC12YXItdGVzdC9pbnRlcnAtdmFyLXN0cmluZy1z cGxpdC1pbmRpY2VzKQooZXNoLXZhci10ZXN0L3F1b3RlZC1pbnRlcnAtdmFyLXN0cmluZy1z cGxpdC1pbmRpY2VzKTogVXBkYXRlIHRlc3RzLgoKKiBkb2MvbWlzYy9lc2hlbGwudGV4aSAo RG9sbGFycyBleHBhbnNpb24pOiBVcGRhdGUgZG9jdW1lbnRhdGlvbi4KLS0tCiBkb2MvbWlz Yy9lc2hlbGwudGV4aSAgICAgICAgICAgICAgfCAgNiArKystLS0KIGxpc3AvZXNoZWxsL2Vz aC12YXIuZWwgICAgICAgICAgICB8IDE3ICsrKysrKystLS0tLS0tLS0tCiB0ZXN0L2xpc3Av ZXNoZWxsL2VzaC12YXItdGVzdHMuZWwgfCAxMiArKysrKysrKysrKysKIDMgZmlsZXMgY2hh bmdlZCwgMjIgaW5zZXJ0aW9ucygrKSwgMTMgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEv ZG9jL21pc2MvZXNoZWxsLnRleGkgYi9kb2MvbWlzYy9lc2hlbGwudGV4aQppbmRleCAzMzAx YTg1NGViLi41NTgxZTVjZDllIDEwMDY0NAotLS0gYS9kb2MvbWlzYy9lc2hlbGwudGV4aQor KysgYi9kb2MvbWlzYy9lc2hlbGwudGV4aQpAQCAtMTA1NSw5ICsxMDU1LDkgQEAgRG9sbGFy cyBFeHBhbnNpb24KIAogQGl0ZW0gJEB2YXJ7ZXhwcn1bQHZhcntyZWdleHB9IEB2YXJ7aS4u Ln1dCiBBcyBhYm92ZSAod2hlbiBAdmFye2V4cHJ9IGV4cGFuZHMgdG8gYSBzdHJpbmcpLCBi dXQgdXNlIEB2YXJ7cmVnZXhwfQotdG8gc3BsaXQgdGhlIHN0cmluZy4gIEB2YXJ7cmVnZXhw fSBjYW4gYmUgYW55IGZvcm0gb3RoZXIgdGhhbiBhIG51bWJlcgotb3IgYSBwbGFpbiB2YXJp YWJsZSBuYW1lLiAgRm9yIGV4YW1wbGUsIEBzYW1weyRAdmFye3Zhcn1bOiAwXX0gd2lsbAot cmV0dXJuIHRoZSBmaXJzdCBlbGVtZW50IG9mIGEgY29sb24tZGVsaW1pdGVkIHN0cmluZy4K K3RvIHNwbGl0IHRoZSBzdHJpbmcuICBAdmFye3JlZ2V4cH0gY2FuIGJlIGFueSBmb3JtIG90 aGVyIHRoYW4gYQorbnVtYmVyLiAgRm9yIGV4YW1wbGUsIEBzYW1weyRAdmFye3Zhcn1bOiAw XX0gd2lsbCByZXR1cm4gdGhlIGZpcnN0CitlbGVtZW50IG9mIGEgY29sb24tZGVsaW1pdGVk IHN0cmluZy4KIAogQGl0ZW0gJCNAdmFye2V4cHJ9CiBFeHBhbmRzIHRvIHRoZSBsZW5ndGgg b2YgdGhlIHJlc3VsdCBvZiBAdmFye2V4cHJ9LCBhbiBleHByZXNzaW9uIGluCmRpZmYgLS1n aXQgYS9saXNwL2VzaGVsbC9lc2gtdmFyLmVsIGIvbGlzcC9lc2hlbGwvZXNoLXZhci5lbApp bmRleCA2ZjA4YTNmYmM0Li5hZjg5ZTM1ZjU1IDEwMDY0NAotLS0gYS9saXNwL2VzaGVsbC9l c2gtdmFyLmVsCisrKyBiL2xpc3AvZXNoZWxsL2VzaC12YXIuZWwKQEAgLTc0LDkgKzc0LDgg QEAKIDs7ICAgJEVYUFJbIlxcXFwiIDEwXQogOzsKIDs7IFNlcGFyYXRlIG9uIGJhY2tzbGFz aCBjaGFyYWN0ZXJzLiAgQWN0dWFsbHksIHRoZSBmaXJzdCBhcmd1bWVudCAtLQotOzsgaWYg aXQgZG9lc24ndCBoYXZlIHRoZSBmb3JtIG9mIGEgbnVtYmVyLCBvciBhIHBsYWluIHZhcmlh YmxlIG5hbWUKLTs7IC0tIGNhbiBiZSBhbnkgcmVndWxhciBleHByZXNzaW9uLiAgU28gdG8g c3BsaXQgb24gbnVtYmVycywgdXNlCi07OyAnJEVYUFJbIlswLTldKyIgMTAgMjBdJy4KKzs7 IGlmIGl0IGRvZXNuJ3QgaGF2ZSB0aGUgZm9ybSBvZiBhIG51bWJlciAtLSBjYW4gYmUgYW55 IHJlZ3VsYXIKKzs7IGV4cHJlc3Npb24uICBTbyB0byBzcGxpdCBvbiBudW1iZXJzLCB1c2Ug JyRFWFBSWyJbMC05XSsiIDEwIDIwXScuCiA7OwogOzsgICAkRVhQUltoZWxsb10KIDs7CkBA IC01NjYsMTMgKzU2NSwxMSBAQCBlc2hlbGwtYXBwbHktaW5kaWNlcwogICAod2hpbGUgaW5k aWNlcwogICAgIChsZXQgKChyZWZzIChjYXIgaW5kaWNlcykpKQogICAgICAgKHdoZW4gKHN0 cmluZ3AgdmFsdWUpCi0JKGxldCAoc2VwYXJhdG9yKQotCSAgKGlmIChub3QgKG9yIChub3Qg KHN0cmluZ3AgKGNhYXIgaW5kaWNlcykpKQotCQkgICAgICAgKHN0cmluZy1tYXRjaAotCQkJ KGNvbmNhdCAiXiIgZXNoZWxsLXZhcmlhYmxlLW5hbWUtcmVnZXhwICIkIikKLQkJCShjYWFy IGluZGljZXMpKSkpCi0JICAgICAgKHNldHEgc2VwYXJhdG9yIChjYWFyIGluZGljZXMpCi0J CSAgICByZWZzIChjZHIgcmVmcykpKQorCShsZXQgKHNlcGFyYXRvciAoaW5kZXggKGNhYXIg aW5kaWNlcykpKQorICAgICAgICAgICh3aGVuIChhbmQgKHN0cmluZ3AgaW5kZXgpCisgICAg ICAgICAgICAgICAgICAgICAobm90IChnZXQtdGV4dC1wcm9wZXJ0eSAwICdudW1iZXIgaW5k ZXgpKSkKKyAgICAgICAgICAgIChzZXRxIHNlcGFyYXRvciBpbmRleAorICAgICAgICAgICAg ICAgICAgcmVmcyAoY2RyIHJlZnMpKSkKIAkgIChzZXRxIHZhbHVlCiAJCShtYXBjYXIgIydl c2hlbGwtY29udmVydAogCQkJKHNwbGl0LXN0cmluZyB2YWx1ZSBzZXBhcmF0b3IpKSkpKQpk aWZmIC0tZ2l0IGEvdGVzdC9saXNwL2VzaGVsbC9lc2gtdmFyLXRlc3RzLmVsIGIvdGVzdC9s aXNwL2VzaGVsbC9lc2gtdmFyLXRlc3RzLmVsCmluZGV4IGU2NzkxNzQ5MzkuLmQwOWRkNjE0 ZGUgMTAwNjQ0Ci0tLSBhL3Rlc3QvbGlzcC9lc2hlbGwvZXNoLXZhci10ZXN0cy5lbAorKysg Yi90ZXN0L2xpc3AvZXNoZWxsL2VzaC12YXItdGVzdHMuZWwKQEAgLTg0LDYgKzg0LDExIEBA IGVzaC12YXItdGVzdC9pbnRlcnAtdmFyLXN0cmluZy1zcGxpdC1pbmRpY2VzCiAgICAgKHNo b3VsZCAoZXF1YWwgKGVzaGVsbC10ZXN0LWNvbW1hbmQtcmVzdWx0ICJlY2hvICRlc2hlbGwt dGVzdC12YWx1ZVs6IDBdIikKICAgICAgICAgICAgICAgICAgICAiemVybyIpKQogICAgIChz aG91bGQgKGVxdWFsIChlc2hlbGwtdGVzdC1jb21tYW5kLXJlc3VsdCAiZWNobyAkZXNoZWxs LXRlc3QtdmFsdWVbOiAwIDJdIikKKyAgICAgICAgICAgICAgICAgICAnKCJ6ZXJvIiAidHdv IikpKSkKKyAgKGxldCAoKGVzaGVsbC10ZXN0LXZhbHVlICJ6ZXJvWG9uZVh0d29YdGhyZWVY Zm91ciIpKQorICAgIChzaG91bGQgKGVxdWFsIChlc2hlbGwtdGVzdC1jb21tYW5kLXJlc3Vs dCAiZWNobyAkZXNoZWxsLXRlc3QtdmFsdWVbWCAwXSIpCisgICAgICAgICAgICAgICAgICAg Inplcm8iKSkKKyAgICAoc2hvdWxkIChlcXVhbCAoZXNoZWxsLXRlc3QtY29tbWFuZC1yZXN1 bHQgImVjaG8gJGVzaGVsbC10ZXN0LXZhbHVlW1ggMCAyXSIpCiAgICAgICAgICAgICAgICAg ICAgJygiemVybyIgInR3byIpKSkpKQogCiAoZXJ0LWRlZnRlc3QgZXNoLXZhci10ZXN0L2lu dGVycC12YXItcmVnZXhwLXNwbGl0LWluZGljZXMgKCkKQEAgLTIxNiw2ICsyMjEsMTMgQEAg ZXNoLXZhci10ZXN0L3F1b3RlZC1pbnRlcnAtdmFyLXN0cmluZy1zcGxpdC1pbmRpY2VzCiAg ICAgICAgICAgICAgICAgICAgInplcm8iKSkKICAgICAoc2hvdWxkIChlcXVhbCAoZXNoZWxs LXRlc3QtY29tbWFuZC1yZXN1bHQKICAgICAgICAgICAgICAgICAgICAgImVjaG8gXCIkZXNo ZWxsLXRlc3QtdmFsdWVbOiAwIDJdXCIiKQorICAgICAgICAgICAgICAgICAgICcoInplcm8i ICJ0d28iKSkpKQorICAobGV0ICgoZXNoZWxsLXRlc3QtdmFsdWUgInplcm9Yb25lWHR3b1h0 aHJlZVhmb3VyIikpCisgICAgKHNob3VsZCAoZXF1YWwgKGVzaGVsbC10ZXN0LWNvbW1hbmQt cmVzdWx0CisgICAgICAgICAgICAgICAgICAgICJlY2hvIFwiJGVzaGVsbC10ZXN0LXZhbHVl W1ggMF1cIiIpCisgICAgICAgICAgICAgICAgICAgInplcm8iKSkKKyAgICAoc2hvdWxkIChl cXVhbCAoZXNoZWxsLXRlc3QtY29tbWFuZC1yZXN1bHQKKyAgICAgICAgICAgICAgICAgICAg ImVjaG8gXCIkZXNoZWxsLXRlc3QtdmFsdWVbWCAwIDJdXCIiKQogICAgICAgICAgICAgICAg ICAgICcoInplcm8iICJ0d28iKSkpKSkKIAogKGVydC1kZWZ0ZXN0IGVzaC12YXItdGVzdC9x dW90ZWQtaW50ZXJwLXZhci1yZWdleHAtc3BsaXQtaW5kaWNlcyAoKQotLSAKMi4yNS4xCgo= --------------84BAF41E9AB7415EAB9F2A21-- From unknown Tue Aug 19 10:08:50 2025 X-Loop: help-debbugs@gnu.org Subject: bug#54227: 29.0.50; [PATCH] Inconsistencies with Eshell variable interpolation Resent-From: Lars Ingebrigtsen Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Thu, 03 Mar 2022 13:59:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 54227 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch To: Jim Porter Cc: 54227@debbugs.gnu.org Received: via spool by 54227-submit@debbugs.gnu.org id=B54227.16463159399144 (code B ref 54227); Thu, 03 Mar 2022 13:59:01 +0000 Received: (at 54227) by debbugs.gnu.org; 3 Mar 2022 13:58:59 +0000 Received: from localhost ([127.0.0.1]:41817 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nPlyt-0002NQ-Gb for submit@debbugs.gnu.org; Thu, 03 Mar 2022 08:58:59 -0500 Received: from quimby.gnus.org ([95.216.78.240]:41568) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nPlyr-0002NC-So for 54227@debbugs.gnu.org; Thu, 03 Mar 2022 08:58:58 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnus.org; s=20200322; h=Content-Type:MIME-Version:Message-ID:In-Reply-To:Date: References:Subject:Cc:To:From:Sender:Reply-To:Content-Transfer-Encoding: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=yIzRcgAL/WVJ5ptf5/1QLHKt4MM6C0ZZwBQFn9pUXWM=; b=hLo4nLczDq3EapYhF/6Ko08LtT Tf5lke0f1UlRQRcKsBeRrauUVzz3WaCFI7k8t++L+3v5T3rFXbIfUT8X+m4uwAITyejkuEefUJMkD CF4vxzoDa/9eUwTQ4f6IUPk0U6A8Oh9BHIH9qOZutfVf0XojR1pLcFve0LVdjN25xpGI=; Received: from [84.212.220.105] (helo=giant) by quimby.gnus.org with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1nPlyk-0000dF-40; Thu, 03 Mar 2022 14:58:52 +0100 From: Lars Ingebrigtsen References: X-Now-Playing: The Slits's _Make More Noise (1)_: "Typical Girls" Date: Thu, 03 Mar 2022 14:58:49 +0100 In-Reply-To: (Jim Porter's message of "Wed, 2 Mar 2022 22:35:22 -0800") Message-ID: <87y21ri1d2.fsf@gnus.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/29.0.50 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Report: Spam detection software, running on the system "quimby.gnus.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see @@CONTACT_ADDRESS@@ for details. Content preview: Jim Porter writes: > Attached is a patch series to fix these cases, as well as a lot more > tests for Eshell variable interpolation, since this can get > tricky. I've also updated the documentation to clarify how indexi [...] Content analysis details: (-2.9 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -1.0 ALL_TRUSTED Passed through trusted hosts only via SMTP -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] X-Spam-Score: -2.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: -3.3 (---) Jim Porter writes: > Attached is a patch series to fix these cases, as well as a lot more > tests for Eshell variable interpolation, since this can get > tricky. I've also updated the documentation to clarify how indexing > works. I didn't initially realize that you could do quite so many > complex things with it, so I figured it'd be good to explain in more > detail so it's easier to discover. Looks good to me; pushed to Emacs 29. -- (domestic pets only, the antidote for overdose, milk.) bloggy blog: http://lars.ingebrigtsen.no From debbugs-submit-bounces@debbugs.gnu.org Thu Mar 03 08:59:05 2022 Received: (at control) by debbugs.gnu.org; 3 Mar 2022 13:59:05 +0000 Received: from localhost ([127.0.0.1]:41821 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nPlyy-0002OJ-Nr for submit@debbugs.gnu.org; Thu, 03 Mar 2022 08:59:04 -0500 Received: from quimby.gnus.org ([95.216.78.240]:41582) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nPlyw-0002NI-A7 for control@debbugs.gnu.org; Thu, 03 Mar 2022 08:59:03 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnus.org; s=20200322; h=Subject:From:To:Message-Id:Date:Sender:Reply-To:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=wtb2TgvRP2sJymG98ROzCc0FeKbo3te5HQ2EMJb2t1Y=; b=mQtUQZXsK8DAwiPjSpXukAukmq IeUSLrR27N5Oim4/y4NwCLsidyBzoNbVq2Ee8I7S5MW0yDkzgQOgYwQ7zhZ8Xgl1Y2NHJ4eQYkJMX 2UHx9vxWkrEvUVaUtx9ZJm/e1nH9D3LjIJprDXiw0dpD5J5ueXHF2WGGYq2vjJnvyzfk=; Received: from [84.212.220.105] (helo=giant) by quimby.gnus.org with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1nPlyo-0000dP-QK for control@debbugs.gnu.org; Thu, 03 Mar 2022 14:58:56 +0100 Date: Thu, 03 Mar 2022 14:58:54 +0100 Message-Id: <87wnhbi1cx.fsf@gnus.org> To: control@debbugs.gnu.org From: Lars Ingebrigtsen Subject: control message for bug #54227 X-Spam-Report: Spam detection software, running on the system "quimby.gnus.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see @@CONTACT_ADDRESS@@ for details. Content preview: close 54227 29.1 quit Content analysis details: (-2.9 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -1.0 ALL_TRUSTED Passed through trusted hosts only via SMTP -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: control 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 (---) close 54227 29.1 quit From unknown Tue Aug 19 10:08:50 2025 X-Loop: help-debbugs@gnu.org Subject: bug#54227: 29.0.50; [PATCH] Inconsistencies with Eshell variable interpolation Resent-From: Eli Zaretskii Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Thu, 03 Mar 2022 16:58:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 54227 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch To: Jim Porter Cc: 54227@debbugs.gnu.org Received: via spool by 54227-submit@debbugs.gnu.org id=B54227.16463266366690 (code B ref 54227); Thu, 03 Mar 2022 16:58:02 +0000 Received: (at 54227) by debbugs.gnu.org; 3 Mar 2022 16:57:16 +0000 Received: from localhost ([127.0.0.1]:43573 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nPolQ-0001jq-6a for submit@debbugs.gnu.org; Thu, 03 Mar 2022 11:57:16 -0500 Received: from eggs.gnu.org ([209.51.188.92]:40826) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nPolO-0001ja-OA for 54227@debbugs.gnu.org; Thu, 03 Mar 2022 11:57:15 -0500 Received: from [2001:470:142:3::e] (port=53634 helo=fencepost.gnu.org) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nPolJ-0002rP-Er; Thu, 03 Mar 2022 11:57:09 -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=P60tm3WHDsWi5NPg+fa+HiNbAEWOorliASTab7UN7Kg=; b=jU2hgfO1ZcZ6 l79fEY7QbYgYOK6x3G6u7fruPvRsifYdNOq+hGv+lnesAh1jyR7YNdntm906ICcg4kEDitJT44KOR cCofsF5UR+0xrwnhUgmSWF5C/dmKjgcWN+PAqkyaSAkIhzp5LQLUcgMzPFeWdETuS37zx5Tvly4iV TE7m6Ed3owZnHsM2KRzb+nPGEFh7oaw1mI6LPEOX8XB5B144hbh9OI906gWM6PQ76G8XTXLpxCKFy cKT4py7uk+P1FCHYE0iEXDgS7K4kBpFdpDtYD2JZPjoH+dhyQL3LnwmDSixxx2yQJL1OFnDpdT9FF hmZ6jxbMUs9yxelFtQSdJw==; Received: from [87.69.77.57] (port=4853 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 1nPolI-0005Lh-Rx; Thu, 03 Mar 2022 11:57:09 -0500 Date: Thu, 03 Mar 2022 18:57:07 +0200 Message-Id: <8335jzj7oc.fsf@gnu.org> From: Eli Zaretskii In-Reply-To: (message from Jim Porter on Wed, 2 Mar 2022 22:35:22 -0800) References: X-Spam-Score: -2.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: -3.3 (---) > From: Jim Porter > Date: Wed, 2 Mar 2022 22:35:22 -0800 > > +@item $@var{expr}[@var{i...}] > +Expands to the @var{i}th element of the result of @var{expr}, an > +expression in one of the above forms listed here. If multiple indices > +are supplied, this will return a list containing the elements for each > +index. If @var{expr}'s value is a string, it will first be split at > +whitespace to make it a list. If @var{expr}'s value is an alist > +(@pxref{Association List Type, Association Lists, , elisp, The Emacs > +Lisp Reference Manual}), this will call @code{assoc} on the result of > +@var{expr}, returning the @code{cdr} of the element of the result > +whose car is equal to @code{"i"}. Thanks. I think the documentation parts of this should be reworded to be consistent with the manual's audience. The Eshell manual is for users, not necessarily for Lisp programmers. So explaining features in terms of Emacs primitives, such as assoc and car/cdr/caar is not the best way of documenting them. Can we reword this text such that the way the feature works is clear to non-programmers as well? From unknown Tue Aug 19 10:08:50 2025 X-Loop: help-debbugs@gnu.org Subject: bug#54227: 29.0.50; [PATCH] Inconsistencies with Eshell variable interpolation Resent-From: Eli Zaretskii Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Thu, 03 Mar 2022 17:04:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 54227 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch To: Jim Porter Cc: 54227@debbugs.gnu.org Received: via spool by 54227-submit@debbugs.gnu.org id=B54227.16463270317364 (code B ref 54227); Thu, 03 Mar 2022 17:04:01 +0000 Received: (at 54227) by debbugs.gnu.org; 3 Mar 2022 17:03:51 +0000 Received: from localhost ([127.0.0.1]:43578 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nPorm-0001uh-Vr for submit@debbugs.gnu.org; Thu, 03 Mar 2022 12:03:51 -0500 Received: from eggs.gnu.org ([209.51.188.92]:42262) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nPorl-0001uQ-FK for 54227@debbugs.gnu.org; Thu, 03 Mar 2022 12:03:49 -0500 Received: from [2001:470:142:3::e] (port=53926 helo=fencepost.gnu.org) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nPorg-0003su-6A; Thu, 03 Mar 2022 12:03:44 -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=tIqiK8CbSYhQpDXN47zV+G//Q8CTT80jeL1bv/WGAYY=; b=aSS98QzqvvYY CYdUvKzwtiYrT7u5wOheKFv1Zs6uWC2oAA8zVsKdyqBGKbOKaOurhqU6BlWvlCfUDPbSlGZje7+Ev ZFmHLbnopDlNt3rAgM4JXhNPpE70Wzadsb6bAztabKJXsNLPylET00me/L5/mZ+WxUzKZKA5atBBz u6RF8DZ9mNp2mTyD2RHRzopakPyxNcWsyRnSrmHRB86LuPvZT61EGGiaxJ8KZLqSGe3e0rHiIgRiX qfwSVVgFHajXZJHY0doRpuxTfHwG1KIaV9OQb/vOhspFTe8NdTcx7e7x07oH7ntQMf9N4AphXCf4u FX/oTIvjxNBH6vVnGfHXLA==; Received: from [87.69.77.57] (port=1277 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 1nPorf-0001o8-Jy; Thu, 03 Mar 2022 12:03:43 -0500 Date: Thu, 03 Mar 2022 19:03:42 +0200 Message-Id: <831qzjj7dd.fsf@gnu.org> From: Eli Zaretskii In-Reply-To: (message from Jim Porter on Wed, 2 Mar 2022 22:35:22 -0800) References: X-Spam-Score: -2.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: -3.3 (---) > From: Jim Porter > Date: Wed, 2 Mar 2022 22:35:22 -0800 > > +(defmacro eshell-with-temp-command (command &rest body) > + "Narrow the buffer to COMMAND and execute the forms in BODY. What does it mean to "narrow the buffer to COMMAND"? Imagine that the user only sees this one line of the doc string -- that actually happens in apropos commands. How can such a user understand what this macro does? > +COMMAND can either be a string, or a cons cell demarcating a > +buffer region. If COMMAND is a string, temporarily insert it > +into the buffer before narrowing. Point will be set to the > +beginning of the narrowed region. After reading this several time and looking at the implementation, I'm beginning to think that COMMAND is not a good name for this argument. > +(defun eshell-parse-inner-double-quote (bound) > + "Parse the inner part of a double quoted string. > +The string to parse starts at point and ends at BOUND. > + > +If Eshell is currently parsing a quoted string and there are any > +backslash-escaped characters, this will return the unescaped > +string, updating point to BOUND. Otherwise, this returns nil and > +leaves point where it was." This seems to just unescape characters in the string? If so, "parse" is not the best name for it, and the first line of the doc string should say "unescape", not "parse". Thanks. From unknown Tue Aug 19 10:08:50 2025 X-Loop: help-debbugs@gnu.org Subject: bug#54227: 29.0.50; [PATCH] Inconsistencies with Eshell variable interpolation Resent-From: Jim Porter Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Thu, 03 Mar 2022 17:57:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 54227 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch To: Eli Zaretskii Cc: 54227@debbugs.gnu.org Received: via spool by 54227-submit@debbugs.gnu.org id=B54227.164633018221071 (code B ref 54227); Thu, 03 Mar 2022 17:57:02 +0000 Received: (at 54227) by debbugs.gnu.org; 3 Mar 2022 17:56:22 +0000 Received: from localhost ([127.0.0.1]:43619 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nPpgc-0005Tn-9s for submit@debbugs.gnu.org; Thu, 03 Mar 2022 12:56:22 -0500 Received: from mail-pf1-f175.google.com ([209.85.210.175]:34456) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nPpga-0005TY-51 for 54227@debbugs.gnu.org; Thu, 03 Mar 2022 12:56:20 -0500 Received: by mail-pf1-f175.google.com with SMTP id g1so5350123pfv.1 for <54227@debbugs.gnu.org>; Thu, 03 Mar 2022 09:56:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=subject:to:cc:references:from:message-id:date:mime-version :in-reply-to:content-language; bh=hkWGFv3jReC2WJm+A4I1WW1HmE6O7g0Wf1V3WHfDV0c=; b=b4bCQaFgA/644ftkAXXbH2/FMunPnNN4YTdXcPGgfCfzK9NE/iHo4ylqLCsrRU5O3D VowUN2Vte/IQTT+rZMs1JhT/nfo45PuPv7rLxu9hKsoFdkV8q9nR/1lQspFcUassaF8m y5f/O0pRHUWoYqS9kGvlee+D2xxv7E9DwBPQkS09jDI3P5bcIADmJJRZvrRORJcE4tOB lmlNRd/pNfkfy7fw1q5Lghr9T44lngcY1umjn1kuc4sZYyBQD3/Ae2tX4vkZaI82Yicn ZzR7FSJhU/8GlAXZnO2O3gsJD3f7SgJG9m9v4OV1rldEgkR44ODV1Mrv88lL/kKEFBrj CHDw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:subject:to:cc:references:from:message-id:date :mime-version:in-reply-to:content-language; bh=hkWGFv3jReC2WJm+A4I1WW1HmE6O7g0Wf1V3WHfDV0c=; b=ik9f0jz81n2mT0BpEmut51+S32EA0SW9fcdiA8TzjvGr3LI/jYTjCycIRKt7kAlhmU YNQRyvZvVcRWDok8uK4CKT3WEYwUQ7DCXnzijis6ZPT1aZwjrDVWeWUiaoUi8hk1adMF K5E8nPNOHCTT7cDU7/IIafX5Uk7rysl/CQMdroG92eDaKqihgbQhJ4Nb1eyQVztIFeT8 84qx58FUj+FAsPcp8S3DSUYwvjC2lNvXRwX4vBxLLuSQEznsMkmas/tjUJW+c0Sh5ESd VQwvV8jgOUQh139YXKcLz6Np9KyioF/4dd1meTHTziY8gAoX25N4h/HNcD8IO8WpoHsJ 17rA== X-Gm-Message-State: AOAM533mjKxIWX1FLk00cUSSqxA27dWrzl4v6GkyY5sqt0JAPfI20/pO BF/P0P5fSGCVVQeelz7mC6hklHjezbg= X-Google-Smtp-Source: ABdhPJxBoGpp1xoQO2BdREnyKeFx3IQDbbjJHmKvXwn/a3TKgu09PXXJRtCEPJ3xXTuBW0i3XyQ7aQ== X-Received: by 2002:a05:6a00:a23:b0:4f6:72a8:20c7 with SMTP id p35-20020a056a000a2300b004f672a820c7mr3476021pfh.12.1646330174006; Thu, 03 Mar 2022 09:56:14 -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 e30-20020a056a0000de00b004ef299a4f89sm3382664pfj.180.2022.03.03.09.56.12 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 03 Mar 2022 09:56:13 -0800 (PST) References: <831qzjj7dd.fsf@gnu.org> From: Jim Porter Message-ID: Date: Thu, 3 Mar 2022 09:56:14 -0800 MIME-Version: 1.0 In-Reply-To: <831qzjj7dd.fsf@gnu.org> Content-Type: multipart/mixed; boundary="------------4D2A7DF5CF159FAD0CD50FA6" Content-Language: en-US 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. --------------4D2A7DF5CF159FAD0CD50FA6 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit On 3/3/2022 9:03 AM, Eli Zaretskii wrote: >> From: Jim Porter >> Date: Wed, 2 Mar 2022 22:35:22 -0800 >> >> +(defmacro eshell-with-temp-command (command &rest body) >> + "Narrow the buffer to COMMAND and execute the forms in BODY. > > What does it mean to "narrow the buffer to COMMAND"? > > Imagine that the user only sees this one line of the doc string -- > that actually happens in apropos commands. How can such a user > understand what this macro does? The macro's job is to take an Eshell command (or some fragment thereof) and narrow the buffer so that it's just looking at that part. This is to make sure that whatever is called in the body knows where to start and stop looking. I agree that this isn't very clear, but I had trouble coming up with a concise explanation. It's essentially a workaround for how Eshell expects things; a lot of the Eshell command parsing functions operate on a range of text in the buffer. Normally, if you wanted to use those functions with a temporary string, you'd use `with-temp-buffer' and insert the string there. That doesn't work here though, since Eshell uses lots of buffer-local state. This function tries to abstract that out in a way that's useful for a few different places in Eshell. If you have any ideas about how to improve the wording, I'm happy to update it though. I'll try to keep thinking as well. > >> +COMMAND can either be a string, or a cons cell demarcating a >> +buffer region. If COMMAND is a string, temporarily insert it >> +into the buffer before narrowing. Point will be set to the >> +beginning of the narrowed region. > > After reading this several time and looking at the implementation, I'm > beginning to think that COMMAND is not a good name for this argument. Perhaps not. That comes from `eshell-parse-command' below, which takes a COMMAND argument of the same possible forms. There's probably a better name to use... >> +(defun eshell-parse-inner-double-quote (bound) [snip] > > This seems to just unescape characters in the string? If so, "parse" > is not the best name for it, and the first line of the doc string > should say "unescape", not "parse". Fixed. I also reworded the manual entries. Hopefully they're a bit better. Finally, I made a very small tweak to how quoted variable expansions (like $"foo") are detected. The old code wasn't reporting the right error if you typed: echo $\"foo\" That's not correct and it should be considered invalid syntax (which it is now). --------------4D2A7DF5CF159FAD0CD50FA6 Content-Type: text/plain; charset=UTF-8; name="0001-Improve-wording-of-Eshell-variable-interpolation-cod.patch" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename*0="0001-Improve-wording-of-Eshell-variable-interpolation-cod.pa"; filename*1="tch" RnJvbSBjYmY0M2JiM2Q5ZmJiMDVmNmE2N2Q3ODBjYjgwNTNmZjVlMGQ3MDBiIE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBKaW0gUG9ydGVyIDxqcG9ydGVyYnVnc0BnbWFpbC5j b20+CkRhdGU6IFRodSwgMyBNYXIgMjAyMiAwOTozNzoyNSAtMDgwMApTdWJqZWN0OiBbUEFU Q0hdIEltcHJvdmUgd29yZGluZyBvZiBFc2hlbGwgdmFyaWFibGUgaW50ZXJwb2xhdGlvbgog Y29kZS9kb2N1bWVudGF0aW9uCgoqIGxpc3AvZXNoZWxsL2VzaC1hcmcuZWwgKGVzaGVsbC11 bmVzY2FwZS1pbm5lci1kb3VibGUtcXVvdGUpOiBSZW5hbWUKZnJvbSAnZXNoZWxsLXBhcnNl LWlubmVyLWRvdWJsZS1xdW90ZScuCgoqIGxpc3AvZXNoZWxsL2VzaC12YXIuZWwgKGVzaGVs bC1wYXJzZS12YXJpYWJsZS1yZWYpOiBVc2UKJ2VzaGVsbC11bmVzY2FwZS1pbm5lci1kb3Vi bGUtcXVvdGUnIGFuZCBpbXByb3ZlIHJvYnVzdG5lc3Mgb2YgcXVvdGVkCnZhcmlhYmxlIG5h bWUgbWF0Y2hpbmcuCihlc2hlbGwtcGFyc2UtaW5kaWNlcyk6IFVzZSAnZXNoZWxsLXVuZXNj YXBlLWlubmVyLWRvdWJsZS1xdW90ZScuCgoqIGRvYy9taXNjL2VzaGVsbC50ZXhpIChEb2xs YXJzIEV4cGFuc2lvbik6IEltcHJvdmUgd29yZGluZyBvZgpzdWJzY3JpcHQgbm90YXRpb24u Ci0tLQogZG9jL21pc2MvZXNoZWxsLnRleGkgICB8IDE5ICsrKysrKysrKystLS0tLS0tLS0K IGxpc3AvZXNoZWxsL2VzaC1hcmcuZWwgfCAgNCArKy0tCiBsaXNwL2VzaGVsbC9lc2gtdmFy LmVsIHwgMTQgKysrKysrKystLS0tLS0KIDMgZmlsZXMgY2hhbmdlZCwgMjAgaW5zZXJ0aW9u cygrKSwgMTcgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZG9jL21pc2MvZXNoZWxsLnRl eGkgYi9kb2MvbWlzYy9lc2hlbGwudGV4aQppbmRleCA1NTgxZTVjZDllLi40N2Y4OTAyZDVh IDEwMDY0NAotLS0gYS9kb2MvbWlzYy9lc2hlbGwudGV4aQorKysgYi9kb2MvbWlzYy9lc2hl bGwudGV4aQpAQCAtMTA0MywxNSArMTA0MywxNiBAQCBEb2xsYXJzIEV4cGFuc2lvbgogaW5k ZXguICBJZiBAdmFye2V4cHJ9J3MgdmFsdWUgaXMgYSBzdHJpbmcsIGl0IHdpbGwgZmlyc3Qg YmUgc3BsaXQgYXQKIHdoaXRlc3BhY2UgdG8gbWFrZSBpdCBhIGxpc3QuICBJZiBAdmFye2V4 cHJ9J3MgdmFsdWUgaXMgYW4gYWxpc3QKIChAcHhyZWZ7QXNzb2NpYXRpb24gTGlzdCBUeXBl LCBBc3NvY2lhdGlvbiBMaXN0cywgLCBlbGlzcCwgVGhlIEVtYWNzCi1MaXNwIFJlZmVyZW5j ZSBNYW51YWx9KSwgdGhpcyB3aWxsIGNhbGwgQGNvZGV7YXNzb2N9IG9uIHRoZSByZXN1bHQg b2YKLUB2YXJ7ZXhwcn0sIHJldHVybmluZyB0aGUgQGNvZGV7Y2RyfSBvZiB0aGUgZWxlbWVu dCBvZiB0aGUgcmVzdWx0Ci13aG9zZSBjYXIgaXMgZXF1YWwgdG8gQGNvZGV7ImkifS4gIFJh aXNlcyBhbiBlcnJvciBpZiB0aGUgdmFsdWUgaXMgbm90Ci1hIHNlcXVlbmNlIChAcHhyZWZ7 U2VxdWVuY2VzIEFycmF5cyBWZWN0b3JzLCBTZXF1ZW5jZXMsICwgZWxpc3AsIFRoZQotRW1h Y3MgTGlzcCBSZWZlcmVuY2UgTWFudWFsfSkuCitMaXNwIFJlZmVyZW5jZSBNYW51YWx9KSwg dGhpcyB3aWxsIHJldHVybiB0aGUgdmFsdWUgYXNzb2NpYXRlZCB3aXRoCit0aGUga2V5IEBj b2RleyJpIn0uCiAKLU11bHRpcGxlIHNldHMgb2YgaW5kaWNlcyBjYW4gYWxzbyBiZSBzcGVj aWZpZWQuIEZvciBleGFtcGxlLCBpZgotQHZhcnt2YXJ9IGlzIGEgbGlzdCBvZiBsaXN0cywg QHNhbXB7JEB2YXJ7dmFyfVswXVswXX0gaXMgZXF1aXZhbGVudCB0bwotQHNhbXB7KGNhYXIg QHZhcnt2YXJ9KX0uCitNdWx0aXBsZSBzZXRzIG9mIGluZGljZXMgY2FuIGFsc28gYmUgc3Bl Y2lmaWVkLiAgRm9yIGV4YW1wbGUsIGlmCitAdmFye3Zhcn0gaXMgQHNhbXB7KCgxIDIpICgz IDQpKX0sIHRoZW4gQHNhbXB7JEB2YXJ7dmFyfVswXVsxXX0gd2lsbAorZXhwYW5kIHRvIEBj b2RlezJ9LgorCitSYWlzZXMgYW4gZXJyb3IgaWYgdGhlIHJlc3VsdCBvZiBAdmFye2V4cHJ9 IGlzIG5vdCBhIHN0cmluZyBvciBhCitzZXF1ZW5jZSAoQHB4cmVme1NlcXVlbmNlcyBBcnJh eXMgVmVjdG9ycywgU2VxdWVuY2VzLCAsIGVsaXNwLCBUaGUKK0VtYWNzIExpc3AgUmVmZXJl bmNlIE1hbnVhbH0uKQogCiBAaXRlbSAkQHZhcntleHByfVtAdmFye3JlZ2V4cH0gQHZhcntp Li4ufV0KIEFzIGFib3ZlICh3aGVuIEB2YXJ7ZXhwcn0gZXhwYW5kcyB0byBhIHN0cmluZyks IGJ1dCB1c2UgQHZhcntyZWdleHB9CkBAIC0xMDY0LDcgKzEwNjUsNyBAQCBEb2xsYXJzIEV4 cGFuc2lvbgogb25lIG9mIHRoZSBhYm92ZSBmb3Jtcy4gIEZvciBleGFtcGxlLCBAc2FtcHsk I0B2YXJ7dmFyfX0gcmV0dXJucyB0aGUKIGxlbmd0aCBvZiB0aGUgdmFyaWFibGUgQHZhcnt2 YXJ9IGFuZCBAc2FtcHskI0B2YXJ7dmFyfVswXX0gcmV0dXJucyB0aGUKIGxlbmd0aCBvZiB0 aGUgZmlyc3QgZWxlbWVudCBvZiBAdmFye3Zhcn0uICBBZ2FpbiwgcmFpc2VzIGFuIGVycm9y IGlmCi10aGUgcmVzdWx0IG9mIEB2YXJ7ZXhwcn0gaXMgbm90IGEgc2VxdWVuY2UuCit0aGUg cmVzdWx0IG9mIEB2YXJ7ZXhwcn0gaXMgbm90IGEgc3RyaW5nIG9yIGEgc2VxdWVuY2UuCiAK IEBlbmQgdGFibGUKIApkaWZmIC0tZ2l0IGEvbGlzcC9lc2hlbGwvZXNoLWFyZy5lbCBiL2xp c3AvZXNoZWxsL2VzaC1hcmcuZWwKaW5kZXggZTE5NDgxYzRiYS4uYTNjOTYxZjU0NiAxMDA2 NDQKLS0tIGEvbGlzcC9lc2hlbGwvZXNoLWFyZy5lbAorKysgYi9saXNwL2VzaGVsbC9lc2gt YXJnLmVsCkBAIC0zNTQsOCArMzU0LDggQEAgZXNoZWxsLXBhcnNlLWRvdWJsZS1xdW90ZQog CQkgIChsaXN0ICdlc2hlbGwtZXNjYXBlLWFyZyBhcmcpKSkpCiAJICAoZ290by1jaGFyICgx KyBlbmQpKSkpKSkpCiAKLShkZWZ1biBlc2hlbGwtcGFyc2UtaW5uZXItZG91YmxlLXF1b3Rl IChib3VuZCkKLSAgIlBhcnNlIHRoZSBpbm5lciBwYXJ0IG9mIGEgZG91YmxlIHF1b3RlZCBz dHJpbmcuCisoZGVmdW4gZXNoZWxsLXVuZXNjYXBlLWlubmVyLWRvdWJsZS1xdW90ZSAoYm91 bmQpCisgICJVbmVzY2FwZSB0aGUgaW5uZXIgcGFydCBvZiBhIGRvdWJsZSBxdW90ZWQgc3Ry aW5nLgogVGhlIHN0cmluZyB0byBwYXJzZSBzdGFydHMgYXQgcG9pbnQgYW5kIGVuZHMgYXQg Qk9VTkQuCiAKIElmIEVzaGVsbCBpcyBjdXJyZW50bHkgcGFyc2luZyBhIHF1b3RlZCBzdHJp bmcgYW5kIHRoZXJlIGFyZSBhbnkKZGlmZiAtLWdpdCBhL2xpc3AvZXNoZWxsL2VzaC12YXIu ZWwgYi9saXNwL2VzaGVsbC9lc2gtdmFyLmVsCmluZGV4IGFmODllMzVmNTUuLjg3NDZmMmJi OTMgMTAwNjQ0Ci0tLSBhL2xpc3AvZXNoZWxsL2VzaC12YXIuZWwKKysrIGIvbGlzcC9lc2hl bGwvZXNoLXZhci5lbApAQCAtNDM3LDcgKzQzNyw3IEBAIGVzaGVsbC1wYXJzZS12YXJpYWJs ZS1yZWYKICAgICAgICAgICAgIGAoZXNoZWxsLWNvbnZlcnQKICAgICAgICAgICAgICAgKGVz aGVsbC1jb21tYW5kLXRvLXZhbHVlCiAgICAgICAgICAgICAgICAoZXNoZWxsLWFzLXN1YmNv bW1hbmQKLSAgICAgICAgICAgICAgICAsKGxldCAoKHN1YmNtZCAob3IgKGVzaGVsbC1wYXJz ZS1pbm5lci1kb3VibGUtcXVvdGUgZW5kKQorICAgICAgICAgICAgICAgICwobGV0ICgoc3Vi Y21kIChvciAoZXNoZWxsLXVuZXNjYXBlLWlubmVyLWRvdWJsZS1xdW90ZSBlbmQpCiAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIChjb25zIChwb2ludCkgZW5kKSkpCiAg ICAgICAgICAgICAgICAgICAgICAgIChlc2hlbGwtY3VycmVudC1xdW90ZWQgbmlsKSkKICAg ICAgICAgICAgICAgICAgICAoZXNoZWxsLXBhcnNlLWNvbW1hbmQgc3ViY21kKSkpKSkKQEAg LTQ3MCwxMyArNDcwLDE1IEBAIGVzaGVsbC1wYXJzZS12YXJpYWJsZS1yZWYKICAgICAoY29u ZGl0aW9uLWNhc2UgbmlsCiAgICAgICAgIGAoZXNoZWxsLWNvbW1hbmQtdG8tdmFsdWUKICAg ICAgICAgICAoZXNoZWxsLWxpc3AtY29tbWFuZAotICAgICAgICAgICAnLChyZWFkIChvciAo ZXNoZWxsLXBhcnNlLWlubmVyLWRvdWJsZS1xdW90ZSAocG9pbnQtbWF4KSkKKyAgICAgICAg ICAgJywocmVhZCAob3IgKGVzaGVsbC11bmVzY2FwZS1pbm5lci1kb3VibGUtcXVvdGUgKHBv aW50LW1heCkpCiAgICAgICAgICAgICAgICAgICAgICAgIChjdXJyZW50LWJ1ZmZlcikpKSkp CiAgICAgICAoZW5kLW9mLWZpbGUKICAgICAgICAodGhyb3cgJ2VzaGVsbC1pbmNvbXBsZXRl ID9cKCkpKSkKLSAgICgobG9va2luZy1hdCAocnggKG9yICInIiAiXCIiICJcXFwiIikpKQot ICAgIChlc2hlbGwtd2l0aC10ZW1wLWNvbW1hbmQgKG9yIChlc2hlbGwtcGFyc2UtaW5uZXIt ZG91YmxlLXF1b3RlIChwb2ludC1tYXgpKQotICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIChjb25zIChwb2ludCkgKHBvaW50LW1heCkpKQorICAgKChsb29raW5nLWF0IChy eC10by1zdHJpbmcKKyAgICAgICAgICAgICAgICAgYChvciAiJyIgLChpZiBlc2hlbGwtY3Vy cmVudC1xdW90ZWQgIlxcXCIiICJcIiIpKSkpCisgICAgKGVzaGVsbC13aXRoLXRlbXAtY29t bWFuZAorICAgICAgICAob3IgKGVzaGVsbC11bmVzY2FwZS1pbm5lci1kb3VibGUtcXVvdGUg KHBvaW50LW1heCkpCisgICAgICAgICAgICAoY29ucyAocG9pbnQpIChwb2ludC1tYXgpKSkK ICAgICAgIChsZXQgKChuYW1lIChpZiAoZXEgKGNoYXItYWZ0ZXIpID9cJykKICAgICAgICAg ICAgICAgICAgICAgICAoZXNoZWxsLXBhcnNlLWxpdGVyYWwtcXVvdGUpCiAgICAgICAgICAg ICAgICAgICAgIChlc2hlbGwtcGFyc2UtZG91YmxlLXF1b3RlKSkpKQpAQCAtNTA2LDcgKzUw OCw3IEBAIGVzaGVsbC1wYXJzZS1pbmRpY2VzCiAJKGlmIChub3QgZW5kKQogCSAgICAodGhy b3cgJ2VzaGVsbC1pbmNvbXBsZXRlID9cWykKIAkgIChmb3J3YXJkLWNoYXIpCi0gICAgICAg ICAgKGVzaGVsbC13aXRoLXRlbXAtY29tbWFuZCAob3IgKGVzaGVsbC1wYXJzZS1pbm5lci1k b3VibGUtcXVvdGUgZW5kKQorICAgICAgICAgIChlc2hlbGwtd2l0aC10ZW1wLWNvbW1hbmQg KG9yIChlc2hlbGwtdW5lc2NhcGUtaW5uZXItZG91YmxlLXF1b3RlIGVuZCkKICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAoY29ucyAocG9pbnQpIGVuZCkpCiAJ ICAgIChsZXQgKGVzaGVsbC1nbG9iLWZ1bmN0aW9uIChlc2hlbGwtY3VycmVudC1xdW90ZWQg bmlsKSkKIAkgICAgICAoc2V0cSBpbmRpY2VzIChjb25zIChlc2hlbGwtcGFyc2UtYXJndW1l bnRzCi0tIAoyLjI1LjEKCg== --------------4D2A7DF5CF159FAD0CD50FA6-- From unknown Tue Aug 19 10:08:50 2025 X-Loop: help-debbugs@gnu.org Subject: bug#54227: 29.0.50; [PATCH] Inconsistencies with Eshell variable interpolation Resent-From: Eli Zaretskii Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Thu, 03 Mar 2022 18:44:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 54227 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch To: Jim Porter Cc: 54227@debbugs.gnu.org Received: via spool by 54227-submit@debbugs.gnu.org id=B54227.164633300825956 (code B ref 54227); Thu, 03 Mar 2022 18:44:02 +0000 Received: (at 54227) by debbugs.gnu.org; 3 Mar 2022 18:43:28 +0000 Received: from localhost ([127.0.0.1]:43761 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nPqQC-0006kZ-3j for submit@debbugs.gnu.org; Thu, 03 Mar 2022 13:43:28 -0500 Received: from eggs.gnu.org ([209.51.188.92]:45106) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nPqQB-0006kN-75 for 54227@debbugs.gnu.org; Thu, 03 Mar 2022 13:43:27 -0500 Received: from [2001:470:142:3::e] (port=55906 helo=fencepost.gnu.org) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nPqQ3-0000kf-72; Thu, 03 Mar 2022 13:43:21 -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=xAWVjs/QuGML4V3PTyzRvrfbWZrFcgHxvnDQFsqSDyI=; b=fjd7v9a7PirL 96ARPFXn62r66vdobeAmkZS51HdN0mZ7Za+pYCpdq97YW/P1+kFitlzBQLPxeZAHNFV9mb0P7ALu1 SeQCeSmM4I2jPG60p+r3CN9Y465Ah4JcSJ8gmXGZyqgH+tW5Y5JlXLx6jlqSrDrgzbMhLAIW6mDyl vAPCx2x7ZICGDnTy06zF4ZSRqHXxcSAjz48A8J2Wd9+W3H9fUqrSowRufD1z5yIXf6WMwB8meP/iX TBYwSsl5GZyf6+KOXgacrb46ZS5y6x6MI+RoRxz58VSrx4J2HNezCSO+/fP8oeWwrz3rGUGWRRnmC d83JtEzqavYnEn+g853fdA==; Received: from [87.69.77.57] (port=3583 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 1nPqPz-0008QY-UL; Thu, 03 Mar 2022 13:43:17 -0500 Date: Thu, 03 Mar 2022 20:43:14 +0200 Message-Id: <83r17ij2rh.fsf@gnu.org> From: Eli Zaretskii In-Reply-To: (message from Jim Porter on Thu, 3 Mar 2022 09:56:14 -0800) References: <831qzjj7dd.fsf@gnu.org> X-Spam-Score: -2.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: -3.3 (---) > Cc: 54227@debbugs.gnu.org > From: Jim Porter > Date: Thu, 3 Mar 2022 09:56:14 -0800 > > >> +(defmacro eshell-with-temp-command (command &rest body) > >> + "Narrow the buffer to COMMAND and execute the forms in BODY. > > > > What does it mean to "narrow the buffer to COMMAND"? > > > > Imagine that the user only sees this one line of the doc string -- > > that actually happens in apropos commands. How can such a user > > understand what this macro does? > > The macro's job is to take an Eshell command (or some fragment thereof) > and narrow the buffer so that it's just looking at that part. This is to > make sure that whatever is called in the body knows where to start and > stop looking. > > I agree that this isn't very clear, but I had trouble coming up with a > concise explanation. It's essentially a workaround for how Eshell > expects things; a lot of the Eshell command parsing functions operate on > a range of text in the buffer. Normally, if you wanted to use those > functions with a temporary string, you'd use `with-temp-buffer' and > insert the string there. That doesn't work here though, since Eshell > uses lots of buffer-local state. This function tries to abstract that > out in a way that's useful for a few different places in Eshell. > > If you have any ideas about how to improve the wording, I'm happy to > update it though. I'll try to keep thinking as well. Something like the below: (defmacro eshell-with-temp-command (region &rest body) "Narrow the buffer to REGION and execute the forms in BODY. REGION is a cons cell (START . END) that specifies the region to which to narrow the buffer. REGION can also be a string, in which case the macro temporarily inserts it into the buffer at point, and narrows the buffer to the inserted string. Before executing BODY, point is set to the beginning of the narrowed REGION. > diff --git a/doc/misc/eshell.texi b/doc/misc/eshell.texi > index 5581e5cd9e..47f8902d5a 100644 > --- a/doc/misc/eshell.texi > +++ b/doc/misc/eshell.texi > @@ -1043,15 +1043,16 @@ Dollars Expansion > index. If @var{expr}'s value is a string, it will first be split at > whitespace to make it a list. If @var{expr}'s value is an alist > (@pxref{Association List Type, Association Lists, , elisp, The Emacs > -Lisp Reference Manual}), this will call @code{assoc} on the result of > -@var{expr}, returning the @code{cdr} of the element of the result > -whose car is equal to @code{"i"}. Raises an error if the value is not > -a sequence (@pxref{Sequences Arrays Vectors, Sequences, , elisp, The > -Emacs Lisp Reference Manual}). > +Lisp Reference Manual}), this will return the value associated with > +the key @code{"i"}. > > -Multiple sets of indices can also be specified. For example, if > -@var{var} is a list of lists, @samp{$@var{var}[0][0]} is equivalent to > -@samp{(caar @var{var})}. > +Multiple sets of indices can also be specified. For example, if > +@var{var} is @samp{((1 2) (3 4))}, then @samp{$@var{var}[0][1]} will > +expand to @code{2}. I would add to the last sentence: ", i.e.@: the second element of the first list member (all indices are zero-based)." Also, it sounds like you just dropped the ball on the alist use case? > -(defun eshell-parse-inner-double-quote (bound) > - "Parse the inner part of a double quoted string. > +(defun eshell-unescape-inner-double-quote (bound) > + "Unescape the inner part of a double quoted string. "Unescape escaped characters of a double-quoted string." Thanks. From unknown Tue Aug 19 10:08:50 2025 X-Loop: help-debbugs@gnu.org Subject: bug#54227: 29.0.50; [PATCH] Inconsistencies with Eshell variable interpolation Resent-From: Jim Porter Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Thu, 03 Mar 2022 19:30:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 54227 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch To: Eli Zaretskii Cc: 54227@debbugs.gnu.org Received: via spool by 54227-submit@debbugs.gnu.org id=B54227.164633580030399 (code B ref 54227); Thu, 03 Mar 2022 19:30:02 +0000 Received: (at 54227) by debbugs.gnu.org; 3 Mar 2022 19:30:00 +0000 Received: from localhost ([127.0.0.1]:43817 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nPr9D-0007uD-Fx for submit@debbugs.gnu.org; Thu, 03 Mar 2022 14:30:00 -0500 Received: from mail-pj1-f48.google.com ([209.85.216.48]:37594) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nPr9B-0007u0-3F for 54227@debbugs.gnu.org; Thu, 03 Mar 2022 14:29:57 -0500 Received: by mail-pj1-f48.google.com with SMTP id p3-20020a17090a680300b001bbfb9d760eso8643248pjj.2 for <54227@debbugs.gnu.org>; Thu, 03 Mar 2022 11:29:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=subject:to:cc:references:from:message-id:date:mime-version :in-reply-to:content-language; bh=0h/Nr3LH7csF03ZTaqT7N2iQBGPBpLMb93lzipnIIko=; b=lDN9FccRlWKu5Nfqg2ct73wuMsJUHNxJvQXzP91LhyQTIEBQb0mtduLfX0Ia+IrMsw 1wEjMC5FK+Vk1mYZfIeg4LGFAuP5+ZPksjUBoep8EY0LlmsXxiR9azM9K/PvbqP99+Jj MIXcsHi7JJV+x1lS/5BlqSCHuA4fw6yjACgwcbdXDtyYrNYu48d3Md23DjrXat0X5JUt 67iZzIEKjSLaS0IZqJ3JBa0V3PzemVwwuXNJxpt2kRScdf05ZASBnZZQCM8po66nTVJ2 AWNN0jUNJi0+mwn/Tq7jZZYL/t05pO7A5fmm99vKaU3goGQtdKQLuVMvmZi2mtHvT6Ei arXg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:subject:to:cc:references:from:message-id:date :mime-version:in-reply-to:content-language; bh=0h/Nr3LH7csF03ZTaqT7N2iQBGPBpLMb93lzipnIIko=; b=MjjdqCd6i1n80T57lkfK3xeAjF6uROCW95gQziLzBySPoCkwOrhin/GZlefyUWAPps MNRE067wc7D6AH4aDQTCgVhtK7hE80ZYALWG0vD3DrlbXqu/jV5225dT39E3vYLGxehs BUgsis3UGzwmbDJjd+85IwiTP266tZQa/ld5OPB3uY5qI9R1WcOc6PH8A9ahC1OeW6YR juFO0xA1Sc9kYQs9umhZQxMtm01GufWESIUdxtIHWM9rJMp2/VVYR5wJ8wZCK90RSAz1 zD8nWOoAZ9B2q1dWHqWnnA6aWtCg2lO3lIKRV7fqirYnl/6GQl53AqQmhtU/aAV4kmXU 1+7g== X-Gm-Message-State: AOAM532LPPeS8PfbXapXKeq518U8R+JiY5qa9Km+pssP7ne7Ohxn0Bxk D+ihYGqHhcZiMnGQV/53P7r51A/1gdE= X-Google-Smtp-Source: ABdhPJyq5gH8c4lGIoNrZOtFDHwjzOwCKHL9dlJuZ6TUZvwnpoF7SVAP6iUPU9I4BcI/1d+2JqRqnA== X-Received: by 2002:a17:90b:4a52:b0:1be:fb7c:9fef with SMTP id lb18-20020a17090b4a5200b001befb7c9fefmr6929688pjb.57.1646335791261; Thu, 03 Mar 2022 11:29: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 i128-20020a626d86000000b004f3f2929d7asm3144501pfc.217.2022.03.03.11.29.50 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 03 Mar 2022 11:29:50 -0800 (PST) References: <831qzjj7dd.fsf@gnu.org> <83r17ij2rh.fsf@gnu.org> From: Jim Porter Message-ID: <6f4c480d-90ea-fbb4-ae5c-dc07dd32026e@gmail.com> Date: Thu, 3 Mar 2022 11:29:49 -0800 MIME-Version: 1.0 In-Reply-To: <83r17ij2rh.fsf@gnu.org> Content-Type: multipart/mixed; boundary="------------241B045E3E1B04B93A0AECA6" Content-Language: en-US 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. --------------241B045E3E1B04B93A0AECA6 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit On 3/3/2022 10:43 AM, Eli Zaretskii wrote: >> Cc: 54227@debbugs.gnu.org >> From: Jim Porter >> Date: Thu, 3 Mar 2022 09:56:14 -0800 >> >> If you have any ideas about how to improve the wording, I'm happy to >> update it though. I'll try to keep thinking as well. > > Something like the below: > > (defmacro eshell-with-temp-command (region &rest body) > "Narrow the buffer to REGION and execute the forms in BODY. > > REGION is a cons cell (START . END) that specifies the region > to which to narrow the buffer. REGION can also be a string, > in which case the macro temporarily inserts it into the > buffer at point, and narrows the buffer to the inserted string. > Before executing BODY, point is set to the beginning of the > narrowed REGION. Thanks, updated to use that docstring. >> diff --git a/doc/misc/eshell.texi b/doc/misc/eshell.texi >> index 5581e5cd9e..47f8902d5a 100644 >> --- a/doc/misc/eshell.texi >> +++ b/doc/misc/eshell.texi >> @@ -1043,15 +1043,16 @@ Dollars Expansion [snip] >> >> -Multiple sets of indices can also be specified. For example, if >> -@var{var} is a list of lists, @samp{$@var{var}[0][0]} is equivalent to >> -@samp{(caar @var{var})}. >> +Multiple sets of indices can also be specified. For example, if >> +@var{var} is @samp{((1 2) (3 4))}, then @samp{$@var{var}[0][1]} will >> +expand to @code{2}. > > I would add to the last sentence: ", i.e.@: the second element of the > first list member (all indices are zero-based)." Ok, added. > Also, it sounds like you just dropped the ball on the alist use case? I think we just had different ideas of how much detail was necessary. Given your above comment, I think I have a better idea of the level of detail, so I've expanded this section into a table. The single paragraph was a little too dense, so breaking it out into separate blocks for each data type makes it easier to provide a more thorough explanation. >> -(defun eshell-parse-inner-double-quote (bound) >> - "Parse the inner part of a double quoted string. >> +(defun eshell-unescape-inner-double-quote (bound) >> + "Unescape the inner part of a double quoted string. > > "Unescape escaped characters of a double-quoted string." Done, though I worded it as, "Unescape escaped characters inside a double-quoted string." I wanted to be extra-clear that this only operates on the bits *between* the double-quotes, but doesn't do anything with the surrounding double-quotes themselves. --------------241B045E3E1B04B93A0AECA6 Content-Type: text/plain; charset=UTF-8; name="0001-Improve-wording-of-Eshell-variable-interpolation-cod.patch" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename*0="0001-Improve-wording-of-Eshell-variable-interpolation-cod.pa"; filename*1="tch" RnJvbSBlYTRjOWIwYjc3NzBiNzNjMTMyMGNmNGE5OWFkMmVkMzY2MzhjNGFlIE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBKaW0gUG9ydGVyIDxqcG9ydGVyYnVnc0BnbWFpbC5j b20+CkRhdGU6IFRodSwgMyBNYXIgMjAyMiAwOTozNzoyNSAtMDgwMApTdWJqZWN0OiBbUEFU Q0hdIEltcHJvdmUgd29yZGluZyBvZiBFc2hlbGwgdmFyaWFibGUgaW50ZXJwb2xhdGlvbgog Y29kZS9kb2N1bWVudGF0aW9uCgoqIGxpc3AvZXNoZWxsL2VzaC1hcmcuZWwgKGVzaGVsbC11 bmVzY2FwZS1pbm5lci1kb3VibGUtcXVvdGUpOiBSZW5hbWUKZnJvbSAnZXNoZWxsLXBhcnNl LWlubmVyLWRvdWJsZS1xdW90ZScuCgoqIGxpc3AvZXNoZWxsL2VzaC1jbWQuZWwgKGVzaGVs bC13aXRoLXRlbXAtY29tbWFuZCk6IEltcHJvdmUKZG9jc3RyaW5nLgoKKiBsaXNwL2VzaGVs bC9lc2gtdmFyLmVsIChlc2hlbGwtcGFyc2UtdmFyaWFibGUtcmVmKTogVXNlCidlc2hlbGwt dW5lc2NhcGUtaW5uZXItZG91YmxlLXF1b3RlJyBhbmQgaW1wcm92ZSByb2J1c3RuZXNzIG9m IHF1b3RlZAp2YXJpYWJsZSBuYW1lIG1hdGNoaW5nLgooZXNoZWxsLXBhcnNlLWluZGljZXMp OiBVc2UgJ2VzaGVsbC11bmVzY2FwZS1pbm5lci1kb3VibGUtcXVvdGUnLgoKKiBkb2MvbWlz Yy9lc2hlbGwudGV4aSAoRG9sbGFycyBFeHBhbnNpb24pOiBJbXByb3ZlIHdvcmRpbmcgb2YK c3Vic2NyaXB0IG5vdGF0aW9uLgotLS0KIGRvYy9taXNjL2VzaGVsbC50ZXhpICAgfCA0MSAr KysrKysrKysrKysrKysrKysrKysrKysrKysrKystLS0tLS0tLS0tLQogbGlzcC9lc2hlbGwv ZXNoLWFyZy5lbCB8ICA0ICsrLS0KIGxpc3AvZXNoZWxsL2VzaC1jbWQuZWwgfCAyNSArKysr KysrKysrKysrKy0tLS0tLS0tLS0tCiBsaXNwL2VzaGVsbC9lc2gtdmFyLmVsIHwgMTQgKysr KysrKystLS0tLS0KIDQgZmlsZXMgY2hhbmdlZCwgNTQgaW5zZXJ0aW9ucygrKSwgMzAgZGVs ZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZG9jL21pc2MvZXNoZWxsLnRleGkgYi9kb2MvbWlz Yy9lc2hlbGwudGV4aQppbmRleCA1NTgxZTVjZDllLi4yZGY0ZGUxY2VmIDEwMDY0NAotLS0g YS9kb2MvbWlzYy9lc2hlbGwudGV4aQorKysgYi9kb2MvbWlzYy9lc2hlbGwudGV4aQpAQCAt MTA0MCwxOCArMTA0MCwzNyBAQCBEb2xsYXJzIEV4cGFuc2lvbgogRXhwYW5kcyB0byB0aGUg QHZhcntpfXRoIGVsZW1lbnQgb2YgdGhlIHJlc3VsdCBvZiBAdmFye2V4cHJ9LCBhbgogZXhw cmVzc2lvbiBpbiBvbmUgb2YgdGhlIGFib3ZlIGZvcm1zIGxpc3RlZCBoZXJlLiAgSWYgbXVs dGlwbGUgaW5kaWNlcwogYXJlIHN1cHBsaWVkLCB0aGlzIHdpbGwgcmV0dXJuIGEgbGlzdCBj b250YWluaW5nIHRoZSBlbGVtZW50cyBmb3IgZWFjaAotaW5kZXguICBJZiBAdmFye2V4cHJ9 J3MgdmFsdWUgaXMgYSBzdHJpbmcsIGl0IHdpbGwgZmlyc3QgYmUgc3BsaXQgYXQKLXdoaXRl c3BhY2UgdG8gbWFrZSBpdCBhIGxpc3QuICBJZiBAdmFye2V4cHJ9J3MgdmFsdWUgaXMgYW4g YWxpc3QKLShAcHhyZWZ7QXNzb2NpYXRpb24gTGlzdCBUeXBlLCBBc3NvY2lhdGlvbiBMaXN0 cywgLCBlbGlzcCwgVGhlIEVtYWNzCi1MaXNwIFJlZmVyZW5jZSBNYW51YWx9KSwgdGhpcyB3 aWxsIGNhbGwgQGNvZGV7YXNzb2N9IG9uIHRoZSByZXN1bHQgb2YKLUB2YXJ7ZXhwcn0sIHJl dHVybmluZyB0aGUgQGNvZGV7Y2RyfSBvZiB0aGUgZWxlbWVudCBvZiB0aGUgcmVzdWx0Ci13 aG9zZSBjYXIgaXMgZXF1YWwgdG8gQGNvZGV7ImkifS4gIFJhaXNlcyBhbiBlcnJvciBpZiB0 aGUgdmFsdWUgaXMgbm90Ci1hIHNlcXVlbmNlIChAcHhyZWZ7U2VxdWVuY2VzIEFycmF5cyBW ZWN0b3JzLCBTZXF1ZW5jZXMsICwgZWxpc3AsIFRoZQoraW5kZXguICBUaGUgZXhhY3QgYmVo YXZpb3IgZGVwZW5kcyBvbiB0aGUgdHlwZSBvZiBAdmFye2V4cHJ9J3MgdmFsdWU6CisKK0B0 YWJsZSBAYXNpcworCitAaXRlbSBhIHNlcXVlbmNlCitFeHBhbmRzIHRvIHRoZSBlbGVtZW50 IGF0IHRoZSAoemVyby1iYXNlZCkgaW5kZXggQHZhcntpfSBvZiB0aGUKK3NlcXVlbmNlIChA cHhyZWZ7U2VxdWVuY2VzIEFycmF5cyBWZWN0b3JzLCBTZXF1ZW5jZXMsICwgZWxpc3AsIFRo ZQogRW1hY3MgTGlzcCBSZWZlcmVuY2UgTWFudWFsfSkuCiAKLU11bHRpcGxlIHNldHMgb2Yg aW5kaWNlcyBjYW4gYWxzbyBiZSBzcGVjaWZpZWQuIEZvciBleGFtcGxlLCBpZgotQHZhcnt2 YXJ9IGlzIGEgbGlzdCBvZiBsaXN0cywgQHNhbXB7JEB2YXJ7dmFyfVswXVswXX0gaXMgZXF1 aXZhbGVudCB0bwotQHNhbXB7KGNhYXIgQHZhcnt2YXJ9KX0uCitAaXRlbSBhIHN0cmluZwor U3BsaXQgdGhlIHN0cmluZyBhdCB3aGl0ZXNwYWNlLCBhbmQgdGhlbiBleHBhbmQgdG8gdGhl IEB2YXJ7aX10aAorZWxlbWVudCBvZiB0aGUgcmVzdWx0aW5nIHNlcXVlbmNlLgorCitAaXRl bSBhbiBhbGlzdAorSWYgQHZhcntpfSBpcyBhIG5vbi1udW1lcmljIHZhbHVlLCBleHBhbmQg dG8gdGhlIHZhbHVlIGFzc29jaWF0ZWQgd2l0aAordGhlIGtleSBAY29kZXsiaSJ9LiBGb3Ig ZXhhbXBsZSwgaWYgQHZhcnt2YXJ9IGlzIEBzYW1weygoImRvZyIKKy4gImZpZG8iKSAoImNh dCIgLiAiZmVsaXgiKSl9LCB0aGVuIEBzYW1weyRAdmFye3Zhcn1bZG9nXX0gZXhwYW5kcyB0 bworQGNvZGV7ImZpZG8ifS4gIE90aGVyd2lzZSwgdGhpcyBiZWhhdmVzIGFzIHdpdGggc2Vx dWVuY2VzOyBlLmcuLAorQHNhbXB7JEB2YXJ7dmFyfVswXX0gZXhwYW5kcyB0byBAY29kZXso ImRvZyIgLiAiZmlkbyIpfS4KK0B4cmVme0Fzc29jaWF0aW9uIExpc3QgVHlwZSwgQXNzb2Np YXRpb24gTGlzdHMsICwgZWxpc3AsIFRoZSBFbWFjcworTGlzcCBSZWZlcmVuY2UgTWFudWFs fS4KKworQGl0ZW0gYW55dGhpbmcgZWxzZQorUmFpc2VzIGFuIGVycm9yLgorCitAZW5kIHRh YmxlCisKK011bHRpcGxlIHNldHMgb2YgaW5kaWNlcyBjYW4gYWxzbyBiZSBzcGVjaWZpZWQu ICBGb3IgZXhhbXBsZSwgaWYKK0B2YXJ7dmFyfSBpcyBAc2FtcHsoKDEgMikgKDMgNCkpfSwg dGhlbiBAc2FtcHskQHZhcnt2YXJ9WzBdWzFdfSB3aWxsCitleHBhbmQgdG8gQGNvZGV7Mn0s IGkuZS5AOiB0aGUgc2Vjb25kIGVsZW1lbnQgb2YgdGhlIGZpcnN0IGxpc3QgbWVtYmVyCiso YWxsIGluZGljZXMgYXJlIHplcm8tYmFzZWQpLgogCiBAaXRlbSAkQHZhcntleHByfVtAdmFy e3JlZ2V4cH0gQHZhcntpLi4ufV0KIEFzIGFib3ZlICh3aGVuIEB2YXJ7ZXhwcn0gZXhwYW5k cyB0byBhIHN0cmluZyksIGJ1dCB1c2UgQHZhcntyZWdleHB9CkBAIC0xMDY0LDcgKzEwODMs NyBAQCBEb2xsYXJzIEV4cGFuc2lvbgogb25lIG9mIHRoZSBhYm92ZSBmb3Jtcy4gIEZvciBl eGFtcGxlLCBAc2FtcHskI0B2YXJ7dmFyfX0gcmV0dXJucyB0aGUKIGxlbmd0aCBvZiB0aGUg dmFyaWFibGUgQHZhcnt2YXJ9IGFuZCBAc2FtcHskI0B2YXJ7dmFyfVswXX0gcmV0dXJucyB0 aGUKIGxlbmd0aCBvZiB0aGUgZmlyc3QgZWxlbWVudCBvZiBAdmFye3Zhcn0uICBBZ2Fpbiwg cmFpc2VzIGFuIGVycm9yIGlmCi10aGUgcmVzdWx0IG9mIEB2YXJ7ZXhwcn0gaXMgbm90IGEg c2VxdWVuY2UuCit0aGUgcmVzdWx0IG9mIEB2YXJ7ZXhwcn0gaXMgbm90IGEgc3RyaW5nIG9y IGEgc2VxdWVuY2UuCiAKIEBlbmQgdGFibGUKIApkaWZmIC0tZ2l0IGEvbGlzcC9lc2hlbGwv ZXNoLWFyZy5lbCBiL2xpc3AvZXNoZWxsL2VzaC1hcmcuZWwKaW5kZXggZTE5NDgxYzRiYS4u ZWUzZjkwN2Y4NSAxMDA2NDQKLS0tIGEvbGlzcC9lc2hlbGwvZXNoLWFyZy5lbAorKysgYi9s aXNwL2VzaGVsbC9lc2gtYXJnLmVsCkBAIC0zNTQsOCArMzU0LDggQEAgZXNoZWxsLXBhcnNl LWRvdWJsZS1xdW90ZQogCQkgIChsaXN0ICdlc2hlbGwtZXNjYXBlLWFyZyBhcmcpKSkpCiAJ ICAoZ290by1jaGFyICgxKyBlbmQpKSkpKSkpCiAKLShkZWZ1biBlc2hlbGwtcGFyc2UtaW5u ZXItZG91YmxlLXF1b3RlIChib3VuZCkKLSAgIlBhcnNlIHRoZSBpbm5lciBwYXJ0IG9mIGEg ZG91YmxlIHF1b3RlZCBzdHJpbmcuCisoZGVmdW4gZXNoZWxsLXVuZXNjYXBlLWlubmVyLWRv dWJsZS1xdW90ZSAoYm91bmQpCisgICJVbmVzY2FwZSBlc2NhcGVkIGNoYXJhY3RlcnMgaW5z aWRlIGEgZG91YmxlLXF1b3RlZCBzdHJpbmcuCiBUaGUgc3RyaW5nIHRvIHBhcnNlIHN0YXJ0 cyBhdCBwb2ludCBhbmQgZW5kcyBhdCBCT1VORC4KIAogSWYgRXNoZWxsIGlzIGN1cnJlbnRs eSBwYXJzaW5nIGEgcXVvdGVkIHN0cmluZyBhbmQgdGhlcmUgYXJlIGFueQpkaWZmIC0tZ2l0 IGEvbGlzcC9lc2hlbGwvZXNoLWNtZC5lbCBiL2xpc3AvZXNoZWxsL2VzaC1jbWQuZWwKaW5k ZXggMDRiNTRkOWQ3OS4uOGJlMTEzNmUzMSAxMDA2NDQKLS0tIGEvbGlzcC9lc2hlbGwvZXNo LWNtZC5lbAorKysgYi9saXNwL2VzaGVsbC9lc2gtY21kLmVsCkBAIC0zNTAsMjQgKzM1MCwy NyBAQCBlc2hlbGwtY29tcGxldGUtbGlzcC1zeW1ib2xzCiAKIChkZWZ2YXIgZXNoZWxsLS1z ZXAtdGVybXMpCiAKLShkZWZtYWNybyBlc2hlbGwtd2l0aC10ZW1wLWNvbW1hbmQgKGNvbW1h bmQgJnJlc3QgYm9keSkKLSAgIk5hcnJvdyB0aGUgYnVmZmVyIHRvIENPTU1BTkQgYW5kIGV4 ZWN1dGUgdGhlIGZvcm1zIGluIEJPRFkuCi1DT01NQU5EIGNhbiBlaXRoZXIgYmUgYSBzdHJp bmcsIG9yIGEgY29ucyBjZWxsIGRlbWFyY2F0aW5nIGEKLWJ1ZmZlciByZWdpb24uICBJZiBD T01NQU5EIGlzIGEgc3RyaW5nLCB0ZW1wb3JhcmlseSBpbnNlcnQgaXQKLWludG8gdGhlIGJ1 ZmZlciBiZWZvcmUgbmFycm93aW5nLiAgUG9pbnQgd2lsbCBiZSBzZXQgdG8gdGhlCi1iZWdp bm5pbmcgb2YgdGhlIG5hcnJvd2VkIHJlZ2lvbi4KKyhkZWZtYWNybyBlc2hlbGwtd2l0aC10 ZW1wLWNvbW1hbmQgKHJlZ2lvbiAmcmVzdCBib2R5KQorICAiTmFycm93IHRoZSBidWZmZXIg dG8gUkVHSU9OIGFuZCBleGVjdXRlIHRoZSBmb3JtcyBpbiBCT0RZLgorCitSRUdJT04gaXMg YSBjb25zIGNlbGwgKFNUQVJUIC4gRU5EKSB0aGF0IHNwZWNpZmllcyB0aGUgcmVnaW9uIHRv Cit3aGljaCB0byBuYXJyb3cgdGhlIGJ1ZmZlci4gIFJFR0lPTiBjYW4gYWxzbyBiZSBhIHN0 cmluZywgaW4KK3doaWNoIGNhc2UgdGhlIG1hY3JvIHRlbXBvcmFyaWx5IGluc2VydHMgaXQg aW50byB0aGUgYnVmZmVyIGF0Citwb2ludCwgYW5kIG5hcnJvd3MgdGhlIGJ1ZmZlciB0byB0 aGUgaW5zZXJ0ZWQgc3RyaW5nLiAgQmVmb3JlCitleGVjdXRpbmcgQk9EWSwgcG9pbnQgaXMg c2V0IHRvIHRoZSBiZWdpbm5pbmcgb2YgdGhlIG5hcnJvd2VkCitSRUdJT04uCiAKIFRoZSB2 YWx1ZSByZXR1cm5lZCBpcyB0aGUgbGFzdCBmb3JtIGluIEJPRFkuIgogICAoZGVjbGFyZSAo aW5kZW50IDEpKQotICBgKGxldCAoKGNtZCAsY29tbWFuZCkpCi0gICAgIChpZiAoc3RyaW5n cCBjbWQpCisgIGAobGV0ICgocmVnICxyZWdpb24pKQorICAgICAoaWYgKHN0cmluZ3AgcmVn KQogICAgICAgICAgOzsgU2luY2UgcGFyc2luZyByZWxpZXMgcGFydGx5IG9uIGJ1ZmZlci1s b2NhbCBzdGF0ZQogICAgICAgICAgOzsgKGUuZy4gdGhhdCBvZiBgZXNoZWxsLXBhcnNlLWFy Z3VtZW50LWhvb2snKSwgd2UgbmVlZCB0bwogICAgICAgICAgOzsgcGVyZm9ybSB0aGUgcGFy c2luZyBpbiB0aGUgRXNoZWxsIGJ1ZmZlci4KICAgICAgICAgIChsZXQgKChiZWdpbiAocG9p bnQpKSBlbmQKIAkgICAgICAgKGluaGliaXQtcG9pbnQtbW90aW9uLWhvb2tzIHQpKQogICAg ICAgICAgICAod2l0aC1zaWxlbnQtbW9kaWZpY2F0aW9ucwotICAgICAgICAgICAgIChpbnNl cnQgY21kKQorICAgICAgICAgICAgIChpbnNlcnQgcmVnKQogICAgICAgICAgICAgIChzZXRx IGVuZCAocG9pbnQpKQogICAgICAgICAgICAgICh1bndpbmQtcHJvdGVjdAogICAgICAgICAg ICAgICAgICAoc2F2ZS1yZXN0cmljdGlvbgpAQCAtMzc2LDggKzM3OSw4IEBAIGVzaGVsbC13 aXRoLXRlbXAtY29tbWFuZAogICAgICAgICAgICAgICAgICAgICxAYm9keSkKICAgICAgICAg ICAgICAgIChkZWxldGUtcmVnaW9uIGJlZ2luIGVuZCkpKSkKICAgICAgICAoc2F2ZS1yZXN0 cmljdGlvbgotICAgICAgICAgKG5hcnJvdy10by1yZWdpb24gKGNhciBjbWQpIChjZHIgY21k KSkKLSAgICAgICAgIChnb3RvLWNoYXIgKGNhciBjbWQpKQorICAgICAgICAgKG5hcnJvdy10 by1yZWdpb24gKGNhciByZWcpIChjZHIgcmVnKSkKKyAgICAgICAgIChnb3RvLWNoYXIgKGNh ciByZWcpKQogICAgICAgICAgLEBib2R5KSkpKQogCiAoZGVmdW4gZXNoZWxsLXBhcnNlLWNv bW1hbmQgKGNvbW1hbmQgJm9wdGlvbmFsIGFyZ3MgdG9wbGV2ZWwpCmRpZmYgLS1naXQgYS9s aXNwL2VzaGVsbC9lc2gtdmFyLmVsIGIvbGlzcC9lc2hlbGwvZXNoLXZhci5lbAppbmRleCBh Zjg5ZTM1ZjU1Li44NzQ2ZjJiYjkzIDEwMDY0NAotLS0gYS9saXNwL2VzaGVsbC9lc2gtdmFy LmVsCisrKyBiL2xpc3AvZXNoZWxsL2VzaC12YXIuZWwKQEAgLTQzNyw3ICs0MzcsNyBAQCBl c2hlbGwtcGFyc2UtdmFyaWFibGUtcmVmCiAgICAgICAgICAgICBgKGVzaGVsbC1jb252ZXJ0 CiAgICAgICAgICAgICAgIChlc2hlbGwtY29tbWFuZC10by12YWx1ZQogICAgICAgICAgICAg ICAgKGVzaGVsbC1hcy1zdWJjb21tYW5kCi0gICAgICAgICAgICAgICAgLChsZXQgKChzdWJj bWQgKG9yIChlc2hlbGwtcGFyc2UtaW5uZXItZG91YmxlLXF1b3RlIGVuZCkKKyAgICAgICAg ICAgICAgICAsKGxldCAoKHN1YmNtZCAob3IgKGVzaGVsbC11bmVzY2FwZS1pbm5lci1kb3Vi bGUtcXVvdGUgZW5kKQogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAoY29u cyAocG9pbnQpIGVuZCkpKQogICAgICAgICAgICAgICAgICAgICAgICAoZXNoZWxsLWN1cnJl bnQtcXVvdGVkIG5pbCkpCiAgICAgICAgICAgICAgICAgICAgKGVzaGVsbC1wYXJzZS1jb21t YW5kIHN1YmNtZCkpKSkpCkBAIC00NzAsMTMgKzQ3MCwxNSBAQCBlc2hlbGwtcGFyc2UtdmFy aWFibGUtcmVmCiAgICAgKGNvbmRpdGlvbi1jYXNlIG5pbAogICAgICAgICBgKGVzaGVsbC1j b21tYW5kLXRvLXZhbHVlCiAgICAgICAgICAgKGVzaGVsbC1saXNwLWNvbW1hbmQKLSAgICAg ICAgICAgJywocmVhZCAob3IgKGVzaGVsbC1wYXJzZS1pbm5lci1kb3VibGUtcXVvdGUgKHBv aW50LW1heCkpCisgICAgICAgICAgICcsKHJlYWQgKG9yIChlc2hlbGwtdW5lc2NhcGUtaW5u ZXItZG91YmxlLXF1b3RlIChwb2ludC1tYXgpKQogICAgICAgICAgICAgICAgICAgICAgICAo Y3VycmVudC1idWZmZXIpKSkpKQogICAgICAgKGVuZC1vZi1maWxlCiAgICAgICAgKHRocm93 ICdlc2hlbGwtaW5jb21wbGV0ZSA/XCgpKSkpCi0gICAoKGxvb2tpbmctYXQgKHJ4IChvciAi JyIgIlwiIiAiXFxcIiIpKSkKLSAgICAoZXNoZWxsLXdpdGgtdGVtcC1jb21tYW5kIChvciAo ZXNoZWxsLXBhcnNlLWlubmVyLWRvdWJsZS1xdW90ZSAocG9pbnQtbWF4KSkKLSAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAoY29ucyAocG9pbnQpIChwb2ludC1tYXgpKSkK KyAgICgobG9va2luZy1hdCAocngtdG8tc3RyaW5nCisgICAgICAgICAgICAgICAgIGAob3Ig IiciICwoaWYgZXNoZWxsLWN1cnJlbnQtcXVvdGVkICJcXFwiIiAiXCIiKSkpKQorICAgIChl c2hlbGwtd2l0aC10ZW1wLWNvbW1hbmQKKyAgICAgICAgKG9yIChlc2hlbGwtdW5lc2NhcGUt aW5uZXItZG91YmxlLXF1b3RlIChwb2ludC1tYXgpKQorICAgICAgICAgICAgKGNvbnMgKHBv aW50KSAocG9pbnQtbWF4KSkpCiAgICAgICAobGV0ICgobmFtZSAoaWYgKGVxIChjaGFyLWFm dGVyKSA/XCcpCiAgICAgICAgICAgICAgICAgICAgICAgKGVzaGVsbC1wYXJzZS1saXRlcmFs LXF1b3RlKQogICAgICAgICAgICAgICAgICAgICAoZXNoZWxsLXBhcnNlLWRvdWJsZS1xdW90 ZSkpKSkKQEAgLTUwNiw3ICs1MDgsNyBAQCBlc2hlbGwtcGFyc2UtaW5kaWNlcwogCShpZiAo bm90IGVuZCkKIAkgICAgKHRocm93ICdlc2hlbGwtaW5jb21wbGV0ZSA/XFspCiAJICAoZm9y d2FyZC1jaGFyKQotICAgICAgICAgIChlc2hlbGwtd2l0aC10ZW1wLWNvbW1hbmQgKG9yIChl c2hlbGwtcGFyc2UtaW5uZXItZG91YmxlLXF1b3RlIGVuZCkKKyAgICAgICAgICAoZXNoZWxs LXdpdGgtdGVtcC1jb21tYW5kIChvciAoZXNoZWxsLXVuZXNjYXBlLWlubmVyLWRvdWJsZS1x dW90ZSBlbmQpCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKGNv bnMgKHBvaW50KSBlbmQpKQogCSAgICAobGV0IChlc2hlbGwtZ2xvYi1mdW5jdGlvbiAoZXNo ZWxsLWN1cnJlbnQtcXVvdGVkIG5pbCkpCiAJICAgICAgKHNldHEgaW5kaWNlcyAoY29ucyAo ZXNoZWxsLXBhcnNlLWFyZ3VtZW50cwotLSAKMi4yNS4xCgo= --------------241B045E3E1B04B93A0AECA6-- From unknown Tue Aug 19 10:08:50 2025 X-Loop: help-debbugs@gnu.org Subject: bug#54227: 29.0.50; [PATCH] Inconsistencies with Eshell variable interpolation Resent-From: Eli Zaretskii Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Thu, 03 Mar 2022 19:51:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 54227 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch To: Jim Porter Cc: 54227@debbugs.gnu.org Received: via spool by 54227-submit@debbugs.gnu.org id=B54227.164633705632491 (code B ref 54227); Thu, 03 Mar 2022 19:51:01 +0000 Received: (at 54227) by debbugs.gnu.org; 3 Mar 2022 19:50:56 +0000 Received: from localhost ([127.0.0.1]:43824 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nPrTT-0008Ry-M6 for submit@debbugs.gnu.org; Thu, 03 Mar 2022 14:50:55 -0500 Received: from eggs.gnu.org ([209.51.188.92]:34740) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nPrTS-0008Rm-Ii for 54227@debbugs.gnu.org; Thu, 03 Mar 2022 14:50:54 -0500 Received: from [2001:470:142:3::e] (port=56726 helo=fencepost.gnu.org) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nPrTN-0006vP-9G; Thu, 03 Mar 2022 14:50: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=Q7Gkh856wl/HGVE6EJOMHSY37ro22YgF/ka4Y+YhQxk=; b=khQdrrj2F5Jr gzGLxeppmzDc7+xZurUv8VaAWl7kWdwaektaxk283JmcbbzvAYSrCrGVv6/HxjJFj0PpN7M1PSLxn 0QPdW3POcQDeyCqiRrMWnfcBSnCzrXFxc8zDL6XoFNy0Y0nHaB2CD9hcV8t8vzgkgMTjX3XDt6vmx wv845X5IG6Bch5lptIW1YhqIkSPHOUlhU9KlxDKBSHNs2tZZqmETUEfbfJcZnFHXaWosfQupTX2Eh aj2Z2QMxZSXWQGmVYfX0c6z9o+OWnjYPcNVFIQgBCZVhYWAj4IYP2x2Fk120eFZex3lAWujrXbfdl lBfhOhtHgY6qmses+mfkeQ==; Received: from [87.69.77.57] (port=3744 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 1nPrTM-0002pm-LB; Thu, 03 Mar 2022 14:50:49 -0500 Date: Thu, 03 Mar 2022 21:50:46 +0200 Message-Id: <83o82mizmx.fsf@gnu.org> From: Eli Zaretskii In-Reply-To: <6f4c480d-90ea-fbb4-ae5c-dc07dd32026e@gmail.com> (message from Jim Porter on Thu, 3 Mar 2022 11:29:49 -0800) References: <831qzjj7dd.fsf@gnu.org> <83r17ij2rh.fsf@gnu.org> <6f4c480d-90ea-fbb4-ae5c-dc07dd32026e@gmail.com> X-Spam-Score: -2.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: -3.3 (---) > Cc: 54227@debbugs.gnu.org > From: Jim Porter > Date: Thu, 3 Mar 2022 11:29:49 -0800 > > On 3/3/2022 10:43 AM, Eli Zaretskii wrote: > >> Cc: 54227@debbugs.gnu.org > >> From: Jim Porter > >> Date: Thu, 3 Mar 2022 09:56:14 -0800 > >> > >> If you have any ideas about how to improve the wording, I'm happy to > >> update it though. I'll try to keep thinking as well. > > > > Something like the below: > > > > (defmacro eshell-with-temp-command (region &rest body) > > "Narrow the buffer to REGION and execute the forms in BODY. > > > > REGION is a cons cell (START . END) that specifies the region > > to which to narrow the buffer. REGION can also be a string, > > in which case the macro temporarily inserts it into the > > buffer at point, and narrows the buffer to the inserted string. > > Before executing BODY, point is set to the beginning of the > > narrowed REGION. > > Thanks, updated to use that docstring. > > >> diff --git a/doc/misc/eshell.texi b/doc/misc/eshell.texi > >> index 5581e5cd9e..47f8902d5a 100644 > >> --- a/doc/misc/eshell.texi > >> +++ b/doc/misc/eshell.texi > >> @@ -1043,15 +1043,16 @@ Dollars Expansion > [snip] > >> > >> -Multiple sets of indices can also be specified. For example, if > >> -@var{var} is a list of lists, @samp{$@var{var}[0][0]} is equivalent to > >> -@samp{(caar @var{var})}. > >> +Multiple sets of indices can also be specified. For example, if > >> +@var{var} is @samp{((1 2) (3 4))}, then @samp{$@var{var}[0][1]} will > >> +expand to @code{2}. > > > > I would add to the last sentence: ", i.e.@: the second element of the > > first list member (all indices are zero-based)." > > Ok, added. > > > Also, it sounds like you just dropped the ball on the alist use case? > > I think we just had different ideas of how much detail was necessary. > Given your above comment, I think I have a better idea of the level of > detail, so I've expanded this section into a table. The single paragraph > was a little too dense, so breaking it out into separate blocks for each > data type makes it easier to provide a more thorough explanation. > > >> -(defun eshell-parse-inner-double-quote (bound) > >> - "Parse the inner part of a double quoted string. > >> +(defun eshell-unescape-inner-double-quote (bound) > >> + "Unescape the inner part of a double quoted string. > > > > "Unescape escaped characters of a double-quoted string." > > Done, though I worded it as, "Unescape escaped characters inside a > double-quoted string." I wanted to be extra-clear that this only > operates on the bits *between* the double-quotes, but doesn't do > anything with the surrounding double-quotes themselves. Thanks, this now LGTM. From unknown Tue Aug 19 10:08:50 2025 X-Loop: help-debbugs@gnu.org Subject: bug#54227: 29.0.50; [PATCH] Inconsistencies with Eshell variable interpolation Resent-From: Jim Porter Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sat, 05 Mar 2022 20:07:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 54227 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch To: Eli Zaretskii Cc: 54227@debbugs.gnu.org Received: via spool by 54227-submit@debbugs.gnu.org id=B54227.164651077021384 (code B ref 54227); Sat, 05 Mar 2022 20:07:02 +0000 Received: (at 54227) by debbugs.gnu.org; 5 Mar 2022 20:06:10 +0000 Received: from localhost ([127.0.0.1]:49127 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nQafJ-0005Yq-Ov for submit@debbugs.gnu.org; Sat, 05 Mar 2022 15:06:10 -0500 Received: from mail-pf1-f178.google.com ([209.85.210.178]:42566) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nQafH-0005YV-Oy for 54227@debbugs.gnu.org; Sat, 05 Mar 2022 15:06:08 -0500 Received: by mail-pf1-f178.google.com with SMTP id a5so10423466pfv.9 for <54227@debbugs.gnu.org>; Sat, 05 Mar 2022 12:06:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=subject:to:cc:references:from:message-id:date:mime-version :in-reply-to:content-language; bh=O5bf32QqgRntZJOzfK20H2SHz+brF/uMYg86h7gVza8=; b=ngB0f+JayNManWiU6IeAVEWk0RFvkbgdiPHdkohb2Zg/ReLB2SaJLN1WhZdCyB4QjO 1OqMWmUKR4AssgAXy2AS4skQJYVeJll2U2lVDGMDi1YpOsM6472aTBDe8mEmopnlm+fM WUWSxDieqeRImHujiJPu4m8WU4Fv3mfQLqDv9MCDrem8un8kW3+atVlzHnUg+w7Mhi1j aqxYP25BH7/MHOlCxv5RwbnvhRP6zOGlv520huVs4dHiKE3gGC0bRB/aJv4ypJQMmeZB 8uAw85PSYL5HJRaW3kQUriGRGindzIYU9lJ/F/FQvXXFFgPKHjm/6DsyNIQZ4szLj5vI T23Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:subject:to:cc:references:from:message-id:date :mime-version:in-reply-to:content-language; bh=O5bf32QqgRntZJOzfK20H2SHz+brF/uMYg86h7gVza8=; b=0q+FIkgnZGfU2eEdz5ljTd6czE8vt/QYzbcGEkxSyxCReiJ6aT3kmdnIb68t2ChDFl fGZtBHp9gBKAWafWuztsMxs4C3idsyykyUO+ZnXpP7rT2PwjmfhMo3wBqE2Bz2Bfbprd TJKGnfsofo8fn/C/IKZzina/pjabHf5Y/p+/7ZqWEBNwcVd93axFPVz1XcvYc+D11hZv TvWkdchMk2RoQ5blJ/yhUukYMLAUCv9VIwoztsx4/vGQbCv5wsImSRcbbCKpeFg+Ixhy o5AlOsru0ks6OlHz12p3grWXOrIwPV03Mt46MBvb8dhlbw+welJ1/Nkkfhdb1KI5fgyq coKg== X-Gm-Message-State: AOAM531jhK8/8WD1otkDk5Ofr25vsXQJNSSNmgRAstURF7S0hFyPoQiR KOAjsbY8+gRMFTktRR90g7S9rHuAQvk= X-Google-Smtp-Source: ABdhPJwNFt3AconCBwIngrVcCgui0DI4saG54a6vL7oKc3hoYo947sX+5JM8dxpwFKBHiJrGi+SMsQ== X-Received: by 2002:aa7:8256:0:b0:4e0:78ad:eb81 with SMTP id e22-20020aa78256000000b004e078adeb81mr5167150pfn.30.1646510761762; Sat, 05 Mar 2022 12:06: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 n42-20020a056a000d6a00b004d221c3e021sm10218135pfv.55.2022.03.05.12.06.00 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sat, 05 Mar 2022 12:06:00 -0800 (PST) References: <831qzjj7dd.fsf@gnu.org> <83r17ij2rh.fsf@gnu.org> <6f4c480d-90ea-fbb4-ae5c-dc07dd32026e@gmail.com> <83o82mizmx.fsf@gnu.org> From: Jim Porter Message-ID: <25921c41-e6ac-7cf8-d17e-d1b5e8a2ff68@gmail.com> Date: Sat, 5 Mar 2022 12:06:00 -0800 MIME-Version: 1.0 In-Reply-To: <83o82mizmx.fsf@gnu.org> Content-Type: multipart/mixed; boundary="------------81C85BE6163520C52196FA63" Content-Language: en-US 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. --------------81C85BE6163520C52196FA63 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit On 3/3/2022 11:50 AM, Eli Zaretskii wrote: > Thanks, this now LGTM. Thanks. I found one more issue with the code though: the subscript operator doesn't work on subcommands. For example, from "emacs -Q --eval '(eshell)'": ~ $ echo ${*echo -e "hi\nbye"}[0] ("hi" "bye") Since `${COMMAND}' forms split the output line-by-line, you'd expect this to say "hi", but the subscript operator is a no-op in this case. This was previously documented to work in the docstring for `eshell-apply-indices': For example, to retrieve the second element of a user's record in '/etc/passwd', the variable reference would look like: ${grep johnw /etc/passwd}[: 2] I also updated the manual to indicate that this is possible (though I didn't provide any direct examples), since I thought this already worked based on that docstring. Attached is a patch with some tests for this. Just a note: using subscript on `$' forms is probably not super-useful (at least not currently), though I added support for it anyway for consistency and future improvement. Since the result of that form is the name of a temp file, there's not much reason to do something like `$[0]'. However in the future, if the subscript operator were more advanced, you could do something like `$[/ *]' to split the file name by directory separators. (The "*" is a suggested feature in the "Bugs and ideas" section to return the whole list.) --------------81C85BE6163520C52196FA63 Content-Type: text/plain; charset=UTF-8; name="0001-Support-applying-indices-to-more-Eshell-dollar-expan.patch" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename*0="0001-Support-applying-indices-to-more-Eshell-dollar-expan.pa"; filename*1="tch" RnJvbSAxZTdiYjYwNTUxNjEyYjE2YWM1Yjk0OTA2MDNlYjkzZDVkYjE5MjFkIE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBKaW0gUG9ydGVyIDxqcG9ydGVyYnVnc0BnbWFpbC5j b20+CkRhdGU6IFNhdCwgNSBNYXIgMjAyMiAxMTo0NTo0OSAtMDgwMApTdWJqZWN0OiBbUEFU Q0hdIFN1cHBvcnQgYXBwbHlpbmcgaW5kaWNlcyB0byBtb3JlIEVzaGVsbCBkb2xsYXIgZXhw YW5zaW9ucwoKRm9yIGV4YW1wbGUsICcke2VjaG8gLWUgImhpXG5ieWUifVsxXScgc2hvdWxk IGV4cGFuZCB0byAiYnllIi4KCiogbGlzcC9lc2hlbGwvZXNoLXZhci5lbCAoZXNoZWxsLXBh cnNlLXZhcmlhYmxlLXJlZik6IFN1cHBvcnQgYXBwbHlpbmcKaW5kaWNlcyB0byAnJHt9Jywg JyQoKScsIGFuZCAnJDw+JyBmb3Jtcy4KCiogbGlzcC9lc2hlbGwvZXNoLXZhci10ZXN0cy5l bCAoZXNoLXZhci10ZXN0L2ludGVycC1saXNwLWluZGljZXMpCihlc2gtdmFyLXRlc3QvaW50 ZXJwLWNtZC1pbmRpY2VzKQooZXNoLXZhci10ZXN0L2ludGVycC1jbWQtZXh0ZXJuYWwtaW5k aWNlcykKKGVzaC12YXItdGVzdC9xdW90ZWQtaW50ZXJwLWxpc3AtaW5kaWNlcykKKGVzaC12 YXItdGVzdC9xdW90ZWQtaW50ZXJwLWNtZC1pbmRpY2VzKTogTmV3IHRlc3RzLgotLS0KIGxp c3AvZXNoZWxsL2VzaC12YXIuZWwgICAgICAgICAgICB8IDI4ICsrKysrKysrKysrKysrKyst LS0tLS0tLS0tLS0KIHRlc3QvbGlzcC9lc2hlbGwvZXNoLXZhci10ZXN0cy5lbCB8IDIzICsr KysrKysrKysrKysrKysrKysrKysrCiAyIGZpbGVzIGNoYW5nZWQsIDM5IGluc2VydGlvbnMo KyksIDEyIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2xpc3AvZXNoZWxsL2VzaC12YXIu ZWwgYi9saXNwL2VzaGVsbC9lc2gtdmFyLmVsCmluZGV4IGFmODllMzVmNTUuLmU4ZGY2NmQ5 OTkgMTAwNjQ0Ci0tLSBhL2xpc3AvZXNoZWxsL2VzaC12YXIuZWwKKysrIGIvbGlzcC9lc2hl bGwvZXNoLXZhci5lbApAQCAtNDM0LDEzICs0MzQsMTUgQEAgZXNoZWxsLXBhcnNlLXZhcmlh YmxlLXJlZgogICAgICAgICAgICh0aHJvdyAnZXNoZWxsLWluY29tcGxldGUgP1x7KQogICAg ICAgICAoZm9yd2FyZC1jaGFyKQogICAgICAgICAocHJvZzEKLSAgICAgICAgICAgIGAoZXNo ZWxsLWNvbnZlcnQKLSAgICAgICAgICAgICAgKGVzaGVsbC1jb21tYW5kLXRvLXZhbHVlCi0g ICAgICAgICAgICAgICAoZXNoZWxsLWFzLXN1YmNvbW1hbmQKLSAgICAgICAgICAgICAgICAs KGxldCAoKHN1YmNtZCAob3IgKGVzaGVsbC1wYXJzZS1pbm5lci1kb3VibGUtcXVvdGUgZW5k KQotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAoY29ucyAocG9pbnQpIGVu ZCkpKQotICAgICAgICAgICAgICAgICAgICAgICAoZXNoZWxsLWN1cnJlbnQtcXVvdGVkIG5p bCkpCi0gICAgICAgICAgICAgICAgICAgKGVzaGVsbC1wYXJzZS1jb21tYW5kIHN1YmNtZCkp KSkpCisgICAgICAgICAgICBgKGVzaGVsbC1hcHBseS1pbmRpY2VzCisgICAgICAgICAgICAg IChlc2hlbGwtY29udmVydAorICAgICAgICAgICAgICAgKGVzaGVsbC1jb21tYW5kLXRvLXZh bHVlCisgICAgICAgICAgICAgICAgKGVzaGVsbC1hcy1zdWJjb21tYW5kCisgICAgICAgICAg ICAgICAgICwobGV0ICgoc3ViY21kIChvciAoZXNoZWxsLXBhcnNlLWlubmVyLWRvdWJsZS1x dW90ZSBlbmQpCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAoY29ucyAo cG9pbnQpIGVuZCkpKQorICAgICAgICAgICAgICAgICAgICAgICAgKGVzaGVsbC1jdXJyZW50 LXF1b3RlZCBuaWwpKQorICAgICAgICAgICAgICAgICAgICAoZXNoZWxsLXBhcnNlLWNvbW1h bmQgc3ViY21kKSkpKSkKKyAgICAgICAgICAgICAgaW5kaWNlcykKICAgICAgICAgICAoZ290 by1jaGFyICgxKyBlbmQpKSkpKSkKICAgICgoZXEgKGNoYXItYWZ0ZXIpID9cPCkKICAgICAo bGV0ICgoZW5kIChlc2hlbGwtZmluZC1kZWxpbWl0ZXIgP1w8ID9cPikpKQpAQCAtNDY0LDE0 ICs0NjYsMTYgQEAgZXNoZWxsLXBhcnNlLXZhcmlhYmxlLXJlZgogICAgICAgICAgICAgICAg ICAgICAgICAgICAgOzsgcHJvcGVybHkuICBTZWUgYnVnIzU0MTkwLgogICAgICAgICAgICAg ICAgICAgICAgICAgICAgKGxpc3QgKGZ1bmN0aW9uIChsYW1iZGEgKCkKICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgKGRlbGV0ZS1maWxlICx0ZW1wKSkpKSkpCi0gICAg ICAgICAgICAgICAgICAgKHF1b3RlICx0ZW1wKSkpCisgICAgICAgICAgICAgICAgICAgKGVz aGVsbC1hcHBseS1pbmRpY2VzICx0ZW1wIGluZGljZXMpKSkKICAgICAgICAgICAgIChnb3Rv LWNoYXIgKDErIGVuZCkpKSkpKSkKICAgICgoZXEgKGNoYXItYWZ0ZXIpID9cKCkKICAgICAo Y29uZGl0aW9uLWNhc2UgbmlsCi0gICAgICAgIGAoZXNoZWxsLWNvbW1hbmQtdG8tdmFsdWUK LSAgICAgICAgICAoZXNoZWxsLWxpc3AtY29tbWFuZAotICAgICAgICAgICAnLChyZWFkIChv ciAoZXNoZWxsLXBhcnNlLWlubmVyLWRvdWJsZS1xdW90ZSAocG9pbnQtbWF4KSkKLSAgICAg ICAgICAgICAgICAgICAgICAgKGN1cnJlbnQtYnVmZmVyKSkpKSkKKyAgICAgICAgYChlc2hl bGwtYXBwbHktaW5kaWNlcworICAgICAgICAgIChlc2hlbGwtY29tbWFuZC10by12YWx1ZQor ICAgICAgICAgICAoZXNoZWxsLWxpc3AtY29tbWFuZAorICAgICAgICAgICAgJywocmVhZCAo b3IgKGVzaGVsbC1wYXJzZS1pbm5lci1kb3VibGUtcXVvdGUgKHBvaW50LW1heCkpCisgICAg ICAgICAgICAgICAgICAgICAgICAoY3VycmVudC1idWZmZXIpKSkpKQorICAgICAgICAgIGlu ZGljZXMpCiAgICAgICAoZW5kLW9mLWZpbGUKICAgICAgICAodGhyb3cgJ2VzaGVsbC1pbmNv bXBsZXRlID9cKCkpKSkKICAgICgobG9va2luZy1hdCAocnggKG9yICInIiAiXCIiICJcXFwi IikpKQpkaWZmIC0tZ2l0IGEvdGVzdC9saXNwL2VzaGVsbC9lc2gtdmFyLXRlc3RzLmVsIGIv dGVzdC9saXNwL2VzaGVsbC9lc2gtdmFyLXRlc3RzLmVsCmluZGV4IGQwOWRkNjE0ZGUuLjFk MDUxZDY4MWEgMTAwNjQ0Ci0tLSBhL3Rlc3QvbGlzcC9lc2hlbGwvZXNoLXZhci10ZXN0cy5l bAorKysgYi90ZXN0L2xpc3AvZXNoZWxsL2VzaC12YXItdGVzdHMuZWwKQEAgLTEzNywxMCAr MTM3LDE4IEBAIGVzaC12YXItdGVzdC9pbnRlcnAtbGlzcAogICAiSW50ZXJwb2xhdGUgTGlz cCBmb3JtIGV2YWx1YXRpb24iCiAgIChzaG91bGQgKGVxdWFsIChlc2hlbGwtdGVzdC1jb21t YW5kLXJlc3VsdCAiKyAkKCsgMSAyKSAzIikgNikpKQogCisoZXJ0LWRlZnRlc3QgZXNoLXZh ci10ZXN0L2ludGVycC1saXNwLWluZGljZXMgKCkKKyAgIkludGVycG9sYXRlIExpc3AgZm9y bSBldmFsdWF0aW9uIHdpdGggaW5kZXgiCisgIChzaG91bGQgKGVxdWFsIChlc2hlbGwtdGVz dC1jb21tYW5kLXJlc3VsdCAiKyAkKGxpc3QgMSAyKVsxXSAzIikgNSkpKQorCiAoZXJ0LWRl ZnRlc3QgZXNoLXZhci10ZXN0L2ludGVycC1jbWQgKCkKICAgIkludGVycG9sYXRlIGNvbW1h bmQgcmVzdWx0IgogICAoc2hvdWxkIChlcXVhbCAoZXNoZWxsLXRlc3QtY29tbWFuZC1yZXN1 bHQgIisgJHsrIDEgMn0gMyIpIDYpKSkKIAorKGVydC1kZWZ0ZXN0IGVzaC12YXItdGVzdC9p bnRlcnAtY21kLWluZGljZXMgKCkKKyAgIkludGVycG9sYXRlIGNvbW1hbmQgcmVzdWx0IHdp dGggaW5kZXgiCisgIChzaG91bGQgKGVxdWFsIChlc2hlbGwtdGVzdC1jb21tYW5kLXJlc3Vs dCAiKyAke2xpc3QgMSAyfVsxXSAzIikgNSkpKQorCiAoZXJ0LWRlZnRlc3QgZXNoLXZhci10 ZXN0L2ludGVycC1jbWQtZXh0ZXJuYWwgKCkKICAgIkludGVycG9sYXRlIGNvbW1hbmQgcmVz dWx0IGZyb20gZXh0ZXJuYWwgY29tbWFuZCIKICAgKHNraXAtdW5sZXNzIChleGVjdXRhYmxl LWZpbmQgImVjaG8iKSkKQEAgLTE0OCw2ICsxNTYsMTMgQEAgZXNoLXZhci10ZXN0L2ludGVy cC1jbWQtZXh0ZXJuYWwKICAgIChlc2hlbGwtY29tbWFuZC1yZXN1bHQtcCAiZWNobyAkeypl Y2hvIGhpfSIKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAiaGlcbiIpKSkKIAorKGVy dC1kZWZ0ZXN0IGVzaC12YXItdGVzdC9pbnRlcnAtY21kLWV4dGVybmFsLWluZGljZXMgKCkK KyAgIkludGVycG9sYXRlIGNvbW1hbmQgcmVzdWx0IGZyb20gZXh0ZXJuYWwgY29tbWFuZCB3 aXRoIGluZGV4IgorICAoc2tpcC11bmxlc3MgKGV4ZWN1dGFibGUtZmluZCAiZWNobyIpKQor ICAod2l0aC10ZW1wLWVzaGVsbAorICAgKGVzaGVsbC1jb21tYW5kLXJlc3VsdC1wICJlY2hv ICR7KmVjaG8gXCJoaVxuYnllXCJ9WzFdIgorICAgICAgICAgICAgICAgICAgICAgICAgICAg ICJieWVcbiIpKSkKKwogKGVydC1kZWZ0ZXN0IGVzaC12YXItdGVzdC9pbnRlcnAtdGVtcC1j bWQgKCkKICAgIkludGVycG9sYXRlIGNvbW1hbmQgcmVzdWx0IHJlZGlyZWN0ZWQgdG8gdGVt cCBmaWxlIgogICAoc2hvdWxkIChlcXVhbCAoZXNoZWxsLXRlc3QtY29tbWFuZC1yZXN1bHQg ImNhdCAkPGVjaG8gaGk+IikgImhpIikpKQpAQCAtMjgyLDEyICsyOTcsMjAgQEAgZXNoLXZh ci10ZXN0L3F1b3RlZC1pbnRlcnAtbGlzcAogICAgICAgICAgICAgICAgICAgImVjaG8gXCJo aSAkKGNvbmNhdCBcXFwidGhlXFxcIiBcXFwicmVcXFwiKVwiIikKICAgICAgICAgICAgICAg ICAgImhpIHRoZXJlIikpKQogCisoZXJ0LWRlZnRlc3QgZXNoLXZhci10ZXN0L3F1b3RlZC1p bnRlcnAtbGlzcC1pbmRpY2VzICgpCisgICJJbnRlcnBvbGF0ZSBMaXNwIGZvcm0gZXZhbHVh dGlvbiB3aXRoIGluZGV4IgorICAoc2hvdWxkIChlcXVhbCAoZXNoZWxsLXRlc3QtY29tbWFu ZC1yZXN1bHQgIisgXCIkKGxpc3QgMSAyKVsxXVwiIDMiKSA1KSkpCisKIChlcnQtZGVmdGVz dCBlc2gtdmFyLXRlc3QvcXVvdGVkLWludGVycC1jbWQgKCkKICAgIkludGVycG9sYXRlIGNv bW1hbmQgcmVzdWx0IGluc2lkZSBkb3VibGUtcXVvdGVzIgogICAoc2hvdWxkIChlcXVhbCAo ZXNoZWxsLXRlc3QtY29tbWFuZC1yZXN1bHQKICAgICAgICAgICAgICAgICAgICJlY2hvIFwi aGkgJHtlY2hvIFxcXCJ0aGVyZVxcXCJ9XCIiKQogICAgICAgICAgICAgICAgICAiaGkgdGhl cmUiKSkpCiAKKyhlcnQtZGVmdGVzdCBlc2gtdmFyLXRlc3QvcXVvdGVkLWludGVycC1jbWQt aW5kaWNlcyAoKQorICAiSW50ZXJwb2xhdGUgY29tbWFuZCByZXN1bHQgd2l0aCBpbmRleCBp bnNpZGUgZG91YmxlLXF1b3RlcyIKKyAgKHNob3VsZCAoZXF1YWwgKGVzaGVsbC10ZXN0LWNv bW1hbmQtcmVzdWx0ICIrIFwiJHtsaXN0IDEgMn1bMV1cIiAzIikgNSkpKQorCiAoZXJ0LWRl ZnRlc3QgZXNoLXZhci10ZXN0L3F1b3RlZC1pbnRlcnAtdGVtcC1jbWQgKCkKICAgIkludGVy cG9sYXRlIGNvbW1hbmQgcmVzdWx0IHJlZGlyZWN0ZWQgdG8gdGVtcCBmaWxlIGluc2lkZSBk b3VibGUtcXVvdGVzIgogICAoc2hvdWxkIChlcXVhbCAoZXNoZWxsLXRlc3QtY29tbWFuZC1y ZXN1bHQgImNhdCBcIiQ8ZWNobyBoaT5cIiIpICJoaSIpKSkKLS0gCjIuMjUuMQoK --------------81C85BE6163520C52196FA63-- From unknown Tue Aug 19 10:08:50 2025 X-Loop: help-debbugs@gnu.org Subject: bug#54227: 29.0.50; [PATCH] Inconsistencies with Eshell variable interpolation Resent-From: Jim Porter Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sat, 05 Mar 2022 21:45:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 54227 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch To: Eli Zaretskii Cc: 54227@debbugs.gnu.org Received: via spool by 54227-submit@debbugs.gnu.org id=B54227.16465166756589 (code B ref 54227); Sat, 05 Mar 2022 21:45:02 +0000 Received: (at 54227) by debbugs.gnu.org; 5 Mar 2022 21:44:35 +0000 Received: from localhost ([127.0.0.1]:49214 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nQcCY-0001iC-DD for submit@debbugs.gnu.org; Sat, 05 Mar 2022 16:44:35 -0500 Received: from mail-pj1-f47.google.com ([209.85.216.47]:53005) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nQcCV-0001hx-Vc for 54227@debbugs.gnu.org; Sat, 05 Mar 2022 16:44:32 -0500 Received: by mail-pj1-f47.google.com with SMTP id v4so10116971pjh.2 for <54227@debbugs.gnu.org>; Sat, 05 Mar 2022 13:44:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=subject:from:to:cc:references:message-id:date:mime-version :in-reply-to:content-language; bh=qFMlcgOhDxRbB04//kTaKFtL1m5dLpYRnaJJ6iBWkwU=; b=LsaK67Jw9PwDW6KJzFc1uOHU/rIxc2ZxF7DRLbuLNJ+sv3ppUqSk7wqKGEV0MHnv+x dp4IVBzIuHey1oQ1GY0X8Ob/Q2F23rnTNHznXCgesuSTCYVX4c++LCevZCdTaN+nUj2/ hKUnN4mvw4fVhZeEdwnC8Unu1sl77eUGc/HMLM+Q6ymVazUTphMk3Dxr8N16JYZVBBB0 VNPqo/u9gIjAjqf7JEjD6SmueCfb8GTzWGzZBqG1PQv4PImTfsGmzSyhX0Fyqt+CI0Or jmeoQwE0Vp1F3hOTdup+XeiSm2ERMgyl8fKwKp+rNnWM34/LdNis2qmd2/oaZcU4HLnN Tjnw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:subject:from:to:cc:references:message-id:date :mime-version:in-reply-to:content-language; bh=qFMlcgOhDxRbB04//kTaKFtL1m5dLpYRnaJJ6iBWkwU=; b=HYCkM7ESWmxA/3ntaR+eDA8c1BElKojegqccDzsvVkFxK4iSfrB6CieQO20fcb0vCN kzf3Oj8jAbBoVuIW13f+bhcO2LPASfMJt9ehdmIVXeF29A7jlpBSKnLSGUA+p18xizk4 agXQxr7lk6DtcZJM2mKI0eZV2ITAIL4zcht1aOEReTG+ScA2AEUyDLa+re8kfjuIL10o m6D7hry08A8ezihXM0JJ1U+AUBYiLNhiFTKUs/GoOqUy8V5xJTB7Pbu1ozTJBLR4mYn8 xSDBBJrV9dUvkUIY1QZDrL5PVOGPwP1/b9h6sZ2NUXZEEmZ2Nkliigeb4Z1Z6KF1PsIM Yfsg== X-Gm-Message-State: AOAM533W+qG8NTZ+2X4/t0n/RAa19Vr9Jj9wE00gHjqHN48OBBSQt1cW QOM9pLh2AQB9cYOArIL6mB0p/bVjBs4= X-Google-Smtp-Source: ABdhPJwvOkl5FeWPoX/27jeAnUo2N0navMG0erw+bgEd5jdSDTX9/MJnBzBSKAIA68G6v820F/ZtXQ== X-Received: by 2002:a17:902:e746:b0:151:c46d:5845 with SMTP id p6-20020a170902e74600b00151c46d5845mr4975277plf.117.1646516665976; Sat, 05 Mar 2022 13:44:25 -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 17-20020a056a00071100b004f0f941d1e8sm9674906pfl.24.2022.03.05.13.44.24 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sat, 05 Mar 2022 13:44:25 -0800 (PST) From: Jim Porter References: <831qzjj7dd.fsf@gnu.org> <83r17ij2rh.fsf@gnu.org> <6f4c480d-90ea-fbb4-ae5c-dc07dd32026e@gmail.com> <83o82mizmx.fsf@gnu.org> <25921c41-e6ac-7cf8-d17e-d1b5e8a2ff68@gmail.com> Message-ID: <37edacda-dfa5-225e-258d-5330c6d522e2@gmail.com> Date: Sat, 5 Mar 2022 13:44:24 -0800 MIME-Version: 1.0 In-Reply-To: <25921c41-e6ac-7cf8-d17e-d1b5e8a2ff68@gmail.com> Content-Type: multipart/mixed; boundary="------------616BF3EA5314D1FABE527BBC" Content-Language: en-US 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. --------------616BF3EA5314D1FABE527BBC Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit On 3/5/2022 12:06 PM, Jim Porter wrote: > Attached is a patch with some tests for this. Oops, that patch had a conflict with the previous one. Here are both patches together, so they'll apply correctly. --------------616BF3EA5314D1FABE527BBC Content-Type: text/plain; charset=UTF-8; name="0001-Improve-wording-of-Eshell-variable-interpolation-cod.patch" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename*0="0001-Improve-wording-of-Eshell-variable-interpolation-cod.pa"; filename*1="tch" RnJvbSBlYTRjOWIwYjc3NzBiNzNjMTMyMGNmNGE5OWFkMmVkMzY2MzhjNGFlIE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBKaW0gUG9ydGVyIDxqcG9ydGVyYnVnc0BnbWFpbC5j b20+CkRhdGU6IFRodSwgMyBNYXIgMjAyMiAwOTozNzoyNSAtMDgwMApTdWJqZWN0OiBbUEFU Q0ggMS8yXSBJbXByb3ZlIHdvcmRpbmcgb2YgRXNoZWxsIHZhcmlhYmxlIGludGVycG9sYXRp b24KIGNvZGUvZG9jdW1lbnRhdGlvbgoKKiBsaXNwL2VzaGVsbC9lc2gtYXJnLmVsIChlc2hl bGwtdW5lc2NhcGUtaW5uZXItZG91YmxlLXF1b3RlKTogUmVuYW1lCmZyb20gJ2VzaGVsbC1w YXJzZS1pbm5lci1kb3VibGUtcXVvdGUnLgoKKiBsaXNwL2VzaGVsbC9lc2gtY21kLmVsIChl c2hlbGwtd2l0aC10ZW1wLWNvbW1hbmQpOiBJbXByb3ZlCmRvY3N0cmluZy4KCiogbGlzcC9l c2hlbGwvZXNoLXZhci5lbCAoZXNoZWxsLXBhcnNlLXZhcmlhYmxlLXJlZik6IFVzZQonZXNo ZWxsLXVuZXNjYXBlLWlubmVyLWRvdWJsZS1xdW90ZScgYW5kIGltcHJvdmUgcm9idXN0bmVz cyBvZiBxdW90ZWQKdmFyaWFibGUgbmFtZSBtYXRjaGluZy4KKGVzaGVsbC1wYXJzZS1pbmRp Y2VzKTogVXNlICdlc2hlbGwtdW5lc2NhcGUtaW5uZXItZG91YmxlLXF1b3RlJy4KCiogZG9j L21pc2MvZXNoZWxsLnRleGkgKERvbGxhcnMgRXhwYW5zaW9uKTogSW1wcm92ZSB3b3JkaW5n IG9mCnN1YnNjcmlwdCBub3RhdGlvbi4KLS0tCiBkb2MvbWlzYy9lc2hlbGwudGV4aSAgIHwg NDEgKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0KIGxpc3AvZXNo ZWxsL2VzaC1hcmcuZWwgfCAgNCArKy0tCiBsaXNwL2VzaGVsbC9lc2gtY21kLmVsIHwgMjUg KysrKysrKysrKysrKystLS0tLS0tLS0tLQogbGlzcC9lc2hlbGwvZXNoLXZhci5lbCB8IDE0 ICsrKysrKysrLS0tLS0tCiA0IGZpbGVzIGNoYW5nZWQsIDU0IGluc2VydGlvbnMoKyksIDMw IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RvYy9taXNjL2VzaGVsbC50ZXhpIGIvZG9j L21pc2MvZXNoZWxsLnRleGkKaW5kZXggNTU4MWU1Y2Q5ZS4uMmRmNGRlMWNlZiAxMDA2NDQK LS0tIGEvZG9jL21pc2MvZXNoZWxsLnRleGkKKysrIGIvZG9jL21pc2MvZXNoZWxsLnRleGkK QEAgLTEwNDAsMTggKzEwNDAsMzcgQEAgRG9sbGFycyBFeHBhbnNpb24KIEV4cGFuZHMgdG8g dGhlIEB2YXJ7aX10aCBlbGVtZW50IG9mIHRoZSByZXN1bHQgb2YgQHZhcntleHByfSwgYW4K IGV4cHJlc3Npb24gaW4gb25lIG9mIHRoZSBhYm92ZSBmb3JtcyBsaXN0ZWQgaGVyZS4gIElm IG11bHRpcGxlIGluZGljZXMKIGFyZSBzdXBwbGllZCwgdGhpcyB3aWxsIHJldHVybiBhIGxp c3QgY29udGFpbmluZyB0aGUgZWxlbWVudHMgZm9yIGVhY2gKLWluZGV4LiAgSWYgQHZhcntl eHByfSdzIHZhbHVlIGlzIGEgc3RyaW5nLCBpdCB3aWxsIGZpcnN0IGJlIHNwbGl0IGF0Ci13 aGl0ZXNwYWNlIHRvIG1ha2UgaXQgYSBsaXN0LiAgSWYgQHZhcntleHByfSdzIHZhbHVlIGlz IGFuIGFsaXN0Ci0oQHB4cmVme0Fzc29jaWF0aW9uIExpc3QgVHlwZSwgQXNzb2NpYXRpb24g TGlzdHMsICwgZWxpc3AsIFRoZSBFbWFjcwotTGlzcCBSZWZlcmVuY2UgTWFudWFsfSksIHRo aXMgd2lsbCBjYWxsIEBjb2Rle2Fzc29jfSBvbiB0aGUgcmVzdWx0IG9mCi1AdmFye2V4cHJ9 LCByZXR1cm5pbmcgdGhlIEBjb2Rle2Nkcn0gb2YgdGhlIGVsZW1lbnQgb2YgdGhlIHJlc3Vs dAotd2hvc2UgY2FyIGlzIGVxdWFsIHRvIEBjb2RleyJpIn0uICBSYWlzZXMgYW4gZXJyb3Ig aWYgdGhlIHZhbHVlIGlzIG5vdAotYSBzZXF1ZW5jZSAoQHB4cmVme1NlcXVlbmNlcyBBcnJh eXMgVmVjdG9ycywgU2VxdWVuY2VzLCAsIGVsaXNwLCBUaGUKK2luZGV4LiAgVGhlIGV4YWN0 IGJlaGF2aW9yIGRlcGVuZHMgb24gdGhlIHR5cGUgb2YgQHZhcntleHByfSdzIHZhbHVlOgor CitAdGFibGUgQGFzaXMKKworQGl0ZW0gYSBzZXF1ZW5jZQorRXhwYW5kcyB0byB0aGUgZWxl bWVudCBhdCB0aGUgKHplcm8tYmFzZWQpIGluZGV4IEB2YXJ7aX0gb2YgdGhlCitzZXF1ZW5j ZSAoQHB4cmVme1NlcXVlbmNlcyBBcnJheXMgVmVjdG9ycywgU2VxdWVuY2VzLCAsIGVsaXNw LCBUaGUKIEVtYWNzIExpc3AgUmVmZXJlbmNlIE1hbnVhbH0pLgogCi1NdWx0aXBsZSBzZXRz IG9mIGluZGljZXMgY2FuIGFsc28gYmUgc3BlY2lmaWVkLiBGb3IgZXhhbXBsZSwgaWYKLUB2 YXJ7dmFyfSBpcyBhIGxpc3Qgb2YgbGlzdHMsIEBzYW1weyRAdmFye3Zhcn1bMF1bMF19IGlz IGVxdWl2YWxlbnQgdG8KLUBzYW1weyhjYWFyIEB2YXJ7dmFyfSl9LgorQGl0ZW0gYSBzdHJp bmcKK1NwbGl0IHRoZSBzdHJpbmcgYXQgd2hpdGVzcGFjZSwgYW5kIHRoZW4gZXhwYW5kIHRv IHRoZSBAdmFye2l9dGgKK2VsZW1lbnQgb2YgdGhlIHJlc3VsdGluZyBzZXF1ZW5jZS4KKwor QGl0ZW0gYW4gYWxpc3QKK0lmIEB2YXJ7aX0gaXMgYSBub24tbnVtZXJpYyB2YWx1ZSwgZXhw YW5kIHRvIHRoZSB2YWx1ZSBhc3NvY2lhdGVkIHdpdGgKK3RoZSBrZXkgQGNvZGV7ImkifS4g Rm9yIGV4YW1wbGUsIGlmIEB2YXJ7dmFyfSBpcyBAc2FtcHsoKCJkb2ciCisuICJmaWRvIikg KCJjYXQiIC4gImZlbGl4IikpfSwgdGhlbiBAc2FtcHskQHZhcnt2YXJ9W2RvZ119IGV4cGFu ZHMgdG8KK0Bjb2RleyJmaWRvIn0uICBPdGhlcndpc2UsIHRoaXMgYmVoYXZlcyBhcyB3aXRo IHNlcXVlbmNlczsgZS5nLiwKK0BzYW1weyRAdmFye3Zhcn1bMF19IGV4cGFuZHMgdG8gQGNv ZGV7KCJkb2ciIC4gImZpZG8iKX0uCitAeHJlZntBc3NvY2lhdGlvbiBMaXN0IFR5cGUsIEFz c29jaWF0aW9uIExpc3RzLCAsIGVsaXNwLCBUaGUgRW1hY3MKK0xpc3AgUmVmZXJlbmNlIE1h bnVhbH0uCisKK0BpdGVtIGFueXRoaW5nIGVsc2UKK1JhaXNlcyBhbiBlcnJvci4KKworQGVu ZCB0YWJsZQorCitNdWx0aXBsZSBzZXRzIG9mIGluZGljZXMgY2FuIGFsc28gYmUgc3BlY2lm aWVkLiAgRm9yIGV4YW1wbGUsIGlmCitAdmFye3Zhcn0gaXMgQHNhbXB7KCgxIDIpICgzIDQp KX0sIHRoZW4gQHNhbXB7JEB2YXJ7dmFyfVswXVsxXX0gd2lsbAorZXhwYW5kIHRvIEBjb2Rl ezJ9LCBpLmUuQDogdGhlIHNlY29uZCBlbGVtZW50IG9mIHRoZSBmaXJzdCBsaXN0IG1lbWJl cgorKGFsbCBpbmRpY2VzIGFyZSB6ZXJvLWJhc2VkKS4KIAogQGl0ZW0gJEB2YXJ7ZXhwcn1b QHZhcntyZWdleHB9IEB2YXJ7aS4uLn1dCiBBcyBhYm92ZSAod2hlbiBAdmFye2V4cHJ9IGV4 cGFuZHMgdG8gYSBzdHJpbmcpLCBidXQgdXNlIEB2YXJ7cmVnZXhwfQpAQCAtMTA2NCw3ICsx MDgzLDcgQEAgRG9sbGFycyBFeHBhbnNpb24KIG9uZSBvZiB0aGUgYWJvdmUgZm9ybXMuICBG b3IgZXhhbXBsZSwgQHNhbXB7JCNAdmFye3Zhcn19IHJldHVybnMgdGhlCiBsZW5ndGggb2Yg dGhlIHZhcmlhYmxlIEB2YXJ7dmFyfSBhbmQgQHNhbXB7JCNAdmFye3Zhcn1bMF19IHJldHVy bnMgdGhlCiBsZW5ndGggb2YgdGhlIGZpcnN0IGVsZW1lbnQgb2YgQHZhcnt2YXJ9LiAgQWdh aW4sIHJhaXNlcyBhbiBlcnJvciBpZgotdGhlIHJlc3VsdCBvZiBAdmFye2V4cHJ9IGlzIG5v dCBhIHNlcXVlbmNlLgordGhlIHJlc3VsdCBvZiBAdmFye2V4cHJ9IGlzIG5vdCBhIHN0cmlu ZyBvciBhIHNlcXVlbmNlLgogCiBAZW5kIHRhYmxlCiAKZGlmZiAtLWdpdCBhL2xpc3AvZXNo ZWxsL2VzaC1hcmcuZWwgYi9saXNwL2VzaGVsbC9lc2gtYXJnLmVsCmluZGV4IGUxOTQ4MWM0 YmEuLmVlM2Y5MDdmODUgMTAwNjQ0Ci0tLSBhL2xpc3AvZXNoZWxsL2VzaC1hcmcuZWwKKysr IGIvbGlzcC9lc2hlbGwvZXNoLWFyZy5lbApAQCAtMzU0LDggKzM1NCw4IEBAIGVzaGVsbC1w YXJzZS1kb3VibGUtcXVvdGUKIAkJICAobGlzdCAnZXNoZWxsLWVzY2FwZS1hcmcgYXJnKSkp KQogCSAgKGdvdG8tY2hhciAoMSsgZW5kKSkpKSkpKQogCi0oZGVmdW4gZXNoZWxsLXBhcnNl LWlubmVyLWRvdWJsZS1xdW90ZSAoYm91bmQpCi0gICJQYXJzZSB0aGUgaW5uZXIgcGFydCBv ZiBhIGRvdWJsZSBxdW90ZWQgc3RyaW5nLgorKGRlZnVuIGVzaGVsbC11bmVzY2FwZS1pbm5l ci1kb3VibGUtcXVvdGUgKGJvdW5kKQorICAiVW5lc2NhcGUgZXNjYXBlZCBjaGFyYWN0ZXJz IGluc2lkZSBhIGRvdWJsZS1xdW90ZWQgc3RyaW5nLgogVGhlIHN0cmluZyB0byBwYXJzZSBz dGFydHMgYXQgcG9pbnQgYW5kIGVuZHMgYXQgQk9VTkQuCiAKIElmIEVzaGVsbCBpcyBjdXJy ZW50bHkgcGFyc2luZyBhIHF1b3RlZCBzdHJpbmcgYW5kIHRoZXJlIGFyZSBhbnkKZGlmZiAt LWdpdCBhL2xpc3AvZXNoZWxsL2VzaC1jbWQuZWwgYi9saXNwL2VzaGVsbC9lc2gtY21kLmVs CmluZGV4IDA0YjU0ZDlkNzkuLjhiZTExMzZlMzEgMTAwNjQ0Ci0tLSBhL2xpc3AvZXNoZWxs L2VzaC1jbWQuZWwKKysrIGIvbGlzcC9lc2hlbGwvZXNoLWNtZC5lbApAQCAtMzUwLDI0ICsz NTAsMjcgQEAgZXNoZWxsLWNvbXBsZXRlLWxpc3Atc3ltYm9scwogCiAoZGVmdmFyIGVzaGVs bC0tc2VwLXRlcm1zKQogCi0oZGVmbWFjcm8gZXNoZWxsLXdpdGgtdGVtcC1jb21tYW5kIChj b21tYW5kICZyZXN0IGJvZHkpCi0gICJOYXJyb3cgdGhlIGJ1ZmZlciB0byBDT01NQU5EIGFu ZCBleGVjdXRlIHRoZSBmb3JtcyBpbiBCT0RZLgotQ09NTUFORCBjYW4gZWl0aGVyIGJlIGEg c3RyaW5nLCBvciBhIGNvbnMgY2VsbCBkZW1hcmNhdGluZyBhCi1idWZmZXIgcmVnaW9uLiAg SWYgQ09NTUFORCBpcyBhIHN0cmluZywgdGVtcG9yYXJpbHkgaW5zZXJ0IGl0Ci1pbnRvIHRo ZSBidWZmZXIgYmVmb3JlIG5hcnJvd2luZy4gIFBvaW50IHdpbGwgYmUgc2V0IHRvIHRoZQot YmVnaW5uaW5nIG9mIHRoZSBuYXJyb3dlZCByZWdpb24uCisoZGVmbWFjcm8gZXNoZWxsLXdp dGgtdGVtcC1jb21tYW5kIChyZWdpb24gJnJlc3QgYm9keSkKKyAgIk5hcnJvdyB0aGUgYnVm ZmVyIHRvIFJFR0lPTiBhbmQgZXhlY3V0ZSB0aGUgZm9ybXMgaW4gQk9EWS4KKworUkVHSU9O IGlzIGEgY29ucyBjZWxsIChTVEFSVCAuIEVORCkgdGhhdCBzcGVjaWZpZXMgdGhlIHJlZ2lv biB0bword2hpY2ggdG8gbmFycm93IHRoZSBidWZmZXIuICBSRUdJT04gY2FuIGFsc28gYmUg YSBzdHJpbmcsIGluCit3aGljaCBjYXNlIHRoZSBtYWNybyB0ZW1wb3JhcmlseSBpbnNlcnRz IGl0IGludG8gdGhlIGJ1ZmZlciBhdAorcG9pbnQsIGFuZCBuYXJyb3dzIHRoZSBidWZmZXIg dG8gdGhlIGluc2VydGVkIHN0cmluZy4gIEJlZm9yZQorZXhlY3V0aW5nIEJPRFksIHBvaW50 IGlzIHNldCB0byB0aGUgYmVnaW5uaW5nIG9mIHRoZSBuYXJyb3dlZAorUkVHSU9OLgogCiBU aGUgdmFsdWUgcmV0dXJuZWQgaXMgdGhlIGxhc3QgZm9ybSBpbiBCT0RZLiIKICAgKGRlY2xh cmUgKGluZGVudCAxKSkKLSAgYChsZXQgKChjbWQgLGNvbW1hbmQpKQotICAgICAoaWYgKHN0 cmluZ3AgY21kKQorICBgKGxldCAoKHJlZyAscmVnaW9uKSkKKyAgICAgKGlmIChzdHJpbmdw IHJlZykKICAgICAgICAgIDs7IFNpbmNlIHBhcnNpbmcgcmVsaWVzIHBhcnRseSBvbiBidWZm ZXItbG9jYWwgc3RhdGUKICAgICAgICAgIDs7IChlLmcuIHRoYXQgb2YgYGVzaGVsbC1wYXJz ZS1hcmd1bWVudC1ob29rJyksIHdlIG5lZWQgdG8KICAgICAgICAgIDs7IHBlcmZvcm0gdGhl IHBhcnNpbmcgaW4gdGhlIEVzaGVsbCBidWZmZXIuCiAgICAgICAgICAobGV0ICgoYmVnaW4g KHBvaW50KSkgZW5kCiAJICAgICAgIChpbmhpYml0LXBvaW50LW1vdGlvbi1ob29rcyB0KSkK ICAgICAgICAgICAgKHdpdGgtc2lsZW50LW1vZGlmaWNhdGlvbnMKLSAgICAgICAgICAgICAo aW5zZXJ0IGNtZCkKKyAgICAgICAgICAgICAoaW5zZXJ0IHJlZykKICAgICAgICAgICAgICAo c2V0cSBlbmQgKHBvaW50KSkKICAgICAgICAgICAgICAodW53aW5kLXByb3RlY3QKICAgICAg ICAgICAgICAgICAgKHNhdmUtcmVzdHJpY3Rpb24KQEAgLTM3Niw4ICszNzksOCBAQCBlc2hl bGwtd2l0aC10ZW1wLWNvbW1hbmQKICAgICAgICAgICAgICAgICAgICAsQGJvZHkpCiAgICAg ICAgICAgICAgICAoZGVsZXRlLXJlZ2lvbiBiZWdpbiBlbmQpKSkpCiAgICAgICAgKHNhdmUt cmVzdHJpY3Rpb24KLSAgICAgICAgIChuYXJyb3ctdG8tcmVnaW9uIChjYXIgY21kKSAoY2Ry IGNtZCkpCi0gICAgICAgICAoZ290by1jaGFyIChjYXIgY21kKSkKKyAgICAgICAgIChuYXJy b3ctdG8tcmVnaW9uIChjYXIgcmVnKSAoY2RyIHJlZykpCisgICAgICAgICAoZ290by1jaGFy IChjYXIgcmVnKSkKICAgICAgICAgICxAYm9keSkpKSkKIAogKGRlZnVuIGVzaGVsbC1wYXJz ZS1jb21tYW5kIChjb21tYW5kICZvcHRpb25hbCBhcmdzIHRvcGxldmVsKQpkaWZmIC0tZ2l0 IGEvbGlzcC9lc2hlbGwvZXNoLXZhci5lbCBiL2xpc3AvZXNoZWxsL2VzaC12YXIuZWwKaW5k ZXggYWY4OWUzNWY1NS4uODc0NmYyYmI5MyAxMDA2NDQKLS0tIGEvbGlzcC9lc2hlbGwvZXNo LXZhci5lbAorKysgYi9saXNwL2VzaGVsbC9lc2gtdmFyLmVsCkBAIC00MzcsNyArNDM3LDcg QEAgZXNoZWxsLXBhcnNlLXZhcmlhYmxlLXJlZgogICAgICAgICAgICAgYChlc2hlbGwtY29u dmVydAogICAgICAgICAgICAgICAoZXNoZWxsLWNvbW1hbmQtdG8tdmFsdWUKICAgICAgICAg ICAgICAgIChlc2hlbGwtYXMtc3ViY29tbWFuZAotICAgICAgICAgICAgICAgICwobGV0ICgo c3ViY21kIChvciAoZXNoZWxsLXBhcnNlLWlubmVyLWRvdWJsZS1xdW90ZSBlbmQpCisgICAg ICAgICAgICAgICAgLChsZXQgKChzdWJjbWQgKG9yIChlc2hlbGwtdW5lc2NhcGUtaW5uZXIt ZG91YmxlLXF1b3RlIGVuZCkKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg KGNvbnMgKHBvaW50KSBlbmQpKSkKICAgICAgICAgICAgICAgICAgICAgICAgKGVzaGVsbC1j dXJyZW50LXF1b3RlZCBuaWwpKQogICAgICAgICAgICAgICAgICAgIChlc2hlbGwtcGFyc2Ut Y29tbWFuZCBzdWJjbWQpKSkpKQpAQCAtNDcwLDEzICs0NzAsMTUgQEAgZXNoZWxsLXBhcnNl LXZhcmlhYmxlLXJlZgogICAgIChjb25kaXRpb24tY2FzZSBuaWwKICAgICAgICAgYChlc2hl bGwtY29tbWFuZC10by12YWx1ZQogICAgICAgICAgIChlc2hlbGwtbGlzcC1jb21tYW5kCi0g ICAgICAgICAgICcsKHJlYWQgKG9yIChlc2hlbGwtcGFyc2UtaW5uZXItZG91YmxlLXF1b3Rl IChwb2ludC1tYXgpKQorICAgICAgICAgICAnLChyZWFkIChvciAoZXNoZWxsLXVuZXNjYXBl LWlubmVyLWRvdWJsZS1xdW90ZSAocG9pbnQtbWF4KSkKICAgICAgICAgICAgICAgICAgICAg ICAgKGN1cnJlbnQtYnVmZmVyKSkpKSkKICAgICAgIChlbmQtb2YtZmlsZQogICAgICAgICh0 aHJvdyAnZXNoZWxsLWluY29tcGxldGUgP1woKSkpKQotICAgKChsb29raW5nLWF0IChyeCAo b3IgIiciICJcIiIgIlxcXCIiKSkpCi0gICAgKGVzaGVsbC13aXRoLXRlbXAtY29tbWFuZCAo b3IgKGVzaGVsbC1wYXJzZS1pbm5lci1kb3VibGUtcXVvdGUgKHBvaW50LW1heCkpCi0gICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKGNvbnMgKHBvaW50KSAocG9pbnQtbWF4 KSkpCisgICAoKGxvb2tpbmctYXQgKHJ4LXRvLXN0cmluZworICAgICAgICAgICAgICAgICBg KG9yICInIiAsKGlmIGVzaGVsbC1jdXJyZW50LXF1b3RlZCAiXFxcIiIgIlwiIikpKSkKKyAg ICAoZXNoZWxsLXdpdGgtdGVtcC1jb21tYW5kCisgICAgICAgIChvciAoZXNoZWxsLXVuZXNj YXBlLWlubmVyLWRvdWJsZS1xdW90ZSAocG9pbnQtbWF4KSkKKyAgICAgICAgICAgIChjb25z IChwb2ludCkgKHBvaW50LW1heCkpKQogICAgICAgKGxldCAoKG5hbWUgKGlmIChlcSAoY2hh ci1hZnRlcikgP1wnKQogICAgICAgICAgICAgICAgICAgICAgIChlc2hlbGwtcGFyc2UtbGl0 ZXJhbC1xdW90ZSkKICAgICAgICAgICAgICAgICAgICAgKGVzaGVsbC1wYXJzZS1kb3VibGUt cXVvdGUpKSkpCkBAIC01MDYsNyArNTA4LDcgQEAgZXNoZWxsLXBhcnNlLWluZGljZXMKIAko aWYgKG5vdCBlbmQpCiAJICAgICh0aHJvdyAnZXNoZWxsLWluY29tcGxldGUgP1xbKQogCSAg KGZvcndhcmQtY2hhcikKLSAgICAgICAgICAoZXNoZWxsLXdpdGgtdGVtcC1jb21tYW5kIChv ciAoZXNoZWxsLXBhcnNlLWlubmVyLWRvdWJsZS1xdW90ZSBlbmQpCisgICAgICAgICAgKGVz aGVsbC13aXRoLXRlbXAtY29tbWFuZCAob3IgKGVzaGVsbC11bmVzY2FwZS1pbm5lci1kb3Vi bGUtcXVvdGUgZW5kKQogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IChjb25zIChwb2ludCkgZW5kKSkKIAkgICAgKGxldCAoZXNoZWxsLWdsb2ItZnVuY3Rpb24g KGVzaGVsbC1jdXJyZW50LXF1b3RlZCBuaWwpKQogCSAgICAgIChzZXRxIGluZGljZXMgKGNv bnMgKGVzaGVsbC1wYXJzZS1hcmd1bWVudHMKLS0gCjIuMjUuMQoK --------------616BF3EA5314D1FABE527BBC Content-Type: text/plain; charset=UTF-8; name="0002-Support-applying-indices-to-more-Eshell-dollar-expan.patch" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename*0="0002-Support-applying-indices-to-more-Eshell-dollar-expan.pa"; filename*1="tch" RnJvbSBiYmQ3NDMyNDYzMjIyOGE2NDM4ODY4OWU2M2VhMDI4NjYzMmMwYTMyIE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBKaW0gUG9ydGVyIDxqcG9ydGVyYnVnc0BnbWFpbC5j b20+CkRhdGU6IFNhdCwgNSBNYXIgMjAyMiAxMTo0NTo0OSAtMDgwMApTdWJqZWN0OiBbUEFU Q0ggMi8yXSBTdXBwb3J0IGFwcGx5aW5nIGluZGljZXMgdG8gbW9yZSBFc2hlbGwgZG9sbGFy IGV4cGFuc2lvbnMKCkZvciBleGFtcGxlLCAnJHtlY2hvIC1lICJoaVxuYnllIn1bMV0nIHNo b3VsZCBleHBhbmQgdG8gImJ5ZSIuCgoqIGxpc3AvZXNoZWxsL2VzaC12YXIuZWwgKGVzaGVs bC1wYXJzZS12YXJpYWJsZS1yZWYpOiBTdXBwb3J0IGFwcGx5aW5nCmluZGljZXMgdG8gJyR7 fScsICckKCknLCBhbmQgJyQ8PicgZm9ybXMuCgoqIGxpc3AvZXNoZWxsL2VzaC12YXItdGVz dHMuZWwgKGVzaC12YXItdGVzdC9pbnRlcnAtbGlzcC1pbmRpY2VzKQooZXNoLXZhci10ZXN0 L2ludGVycC1jbWQtaW5kaWNlcykKKGVzaC12YXItdGVzdC9pbnRlcnAtY21kLWV4dGVybmFs LWluZGljZXMpCihlc2gtdmFyLXRlc3QvcXVvdGVkLWludGVycC1saXNwLWluZGljZXMpCihl c2gtdmFyLXRlc3QvcXVvdGVkLWludGVycC1jbWQtaW5kaWNlcyk6IE5ldyB0ZXN0cy4KLS0t CiBsaXNwL2VzaGVsbC9lc2gtdmFyLmVsICAgICAgICAgICAgfCAyOCArKysrKysrKysrKysr KysrLS0tLS0tLS0tLS0tCiB0ZXN0L2xpc3AvZXNoZWxsL2VzaC12YXItdGVzdHMuZWwgfCAy MyArKysrKysrKysrKysrKysrKysrKysrKwogMiBmaWxlcyBjaGFuZ2VkLCAzOSBpbnNlcnRp b25zKCspLCAxMiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9saXNwL2VzaGVsbC9lc2gt dmFyLmVsIGIvbGlzcC9lc2hlbGwvZXNoLXZhci5lbAppbmRleCA4NzQ2ZjJiYjkzLi5jYTRj YmQ3NDRjIDEwMDY0NAotLS0gYS9saXNwL2VzaGVsbC9lc2gtdmFyLmVsCisrKyBiL2xpc3Av ZXNoZWxsL2VzaC12YXIuZWwKQEAgLTQzNCwxMyArNDM0LDE1IEBAIGVzaGVsbC1wYXJzZS12 YXJpYWJsZS1yZWYKICAgICAgICAgICAodGhyb3cgJ2VzaGVsbC1pbmNvbXBsZXRlID9ceykK ICAgICAgICAgKGZvcndhcmQtY2hhcikKICAgICAgICAgKHByb2cxCi0gICAgICAgICAgICBg KGVzaGVsbC1jb252ZXJ0Ci0gICAgICAgICAgICAgIChlc2hlbGwtY29tbWFuZC10by12YWx1 ZQotICAgICAgICAgICAgICAgKGVzaGVsbC1hcy1zdWJjb21tYW5kCi0gICAgICAgICAgICAg ICAgLChsZXQgKChzdWJjbWQgKG9yIChlc2hlbGwtdW5lc2NhcGUtaW5uZXItZG91YmxlLXF1 b3RlIGVuZCkKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKGNvbnMgKHBv aW50KSBlbmQpKSkKLSAgICAgICAgICAgICAgICAgICAgICAgKGVzaGVsbC1jdXJyZW50LXF1 b3RlZCBuaWwpKQotICAgICAgICAgICAgICAgICAgIChlc2hlbGwtcGFyc2UtY29tbWFuZCBz dWJjbWQpKSkpKQorICAgICAgICAgICAgYChlc2hlbGwtYXBwbHktaW5kaWNlcworICAgICAg ICAgICAgICAoZXNoZWxsLWNvbnZlcnQKKyAgICAgICAgICAgICAgIChlc2hlbGwtY29tbWFu ZC10by12YWx1ZQorICAgICAgICAgICAgICAgIChlc2hlbGwtYXMtc3ViY29tbWFuZAorICAg ICAgICAgICAgICAgICAsKGxldCAoKHN1YmNtZCAob3IgKGVzaGVsbC11bmVzY2FwZS1pbm5l ci1kb3VibGUtcXVvdGUgZW5kKQorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgKGNvbnMgKHBvaW50KSBlbmQpKSkKKyAgICAgICAgICAgICAgICAgICAgICAgIChlc2hl bGwtY3VycmVudC1xdW90ZWQgbmlsKSkKKyAgICAgICAgICAgICAgICAgICAgKGVzaGVsbC1w YXJzZS1jb21tYW5kIHN1YmNtZCkpKSkpCisgICAgICAgICAgICAgIGluZGljZXMpCiAgICAg ICAgICAgKGdvdG8tY2hhciAoMSsgZW5kKSkpKSkpCiAgICAoKGVxIChjaGFyLWFmdGVyKSA/ XDwpCiAgICAgKGxldCAoKGVuZCAoZXNoZWxsLWZpbmQtZGVsaW1pdGVyID9cPCA/XD4pKSkK QEAgLTQ2NCwxNCArNDY2LDE2IEBAIGVzaGVsbC1wYXJzZS12YXJpYWJsZS1yZWYKICAgICAg ICAgICAgICAgICAgICAgICAgICAgIDs7IHByb3Blcmx5LiAgU2VlIGJ1ZyM1NDE5MC4KICAg ICAgICAgICAgICAgICAgICAgICAgICAgIChsaXN0IChmdW5jdGlvbiAobGFtYmRhICgpCiAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIChkZWxldGUtZmlsZSAsdGVtcCkp KSkpKQotICAgICAgICAgICAgICAgICAgIChxdW90ZSAsdGVtcCkpKQorICAgICAgICAgICAg ICAgICAgIChlc2hlbGwtYXBwbHktaW5kaWNlcyAsdGVtcCBpbmRpY2VzKSkpCiAgICAgICAg ICAgICAoZ290by1jaGFyICgxKyBlbmQpKSkpKSkpCiAgICAoKGVxIChjaGFyLWFmdGVyKSA/ XCgpCiAgICAgKGNvbmRpdGlvbi1jYXNlIG5pbAotICAgICAgICBgKGVzaGVsbC1jb21tYW5k LXRvLXZhbHVlCi0gICAgICAgICAgKGVzaGVsbC1saXNwLWNvbW1hbmQKLSAgICAgICAgICAg JywocmVhZCAob3IgKGVzaGVsbC11bmVzY2FwZS1pbm5lci1kb3VibGUtcXVvdGUgKHBvaW50 LW1heCkpCi0gICAgICAgICAgICAgICAgICAgICAgIChjdXJyZW50LWJ1ZmZlcikpKSkpCisg ICAgICAgIGAoZXNoZWxsLWFwcGx5LWluZGljZXMKKyAgICAgICAgICAoZXNoZWxsLWNvbW1h bmQtdG8tdmFsdWUKKyAgICAgICAgICAgKGVzaGVsbC1saXNwLWNvbW1hbmQKKyAgICAgICAg ICAgICcsKHJlYWQgKG9yIChlc2hlbGwtdW5lc2NhcGUtaW5uZXItZG91YmxlLXF1b3RlIChw b2ludC1tYXgpKQorICAgICAgICAgICAgICAgICAgICAgICAgKGN1cnJlbnQtYnVmZmVyKSkp KSkKKyAgICAgICAgICBpbmRpY2VzKQogICAgICAgKGVuZC1vZi1maWxlCiAgICAgICAgKHRo cm93ICdlc2hlbGwtaW5jb21wbGV0ZSA/XCgpKSkpCiAgICAoKGxvb2tpbmctYXQgKHJ4LXRv LXN0cmluZwpkaWZmIC0tZ2l0IGEvdGVzdC9saXNwL2VzaGVsbC9lc2gtdmFyLXRlc3RzLmVs IGIvdGVzdC9saXNwL2VzaGVsbC9lc2gtdmFyLXRlc3RzLmVsCmluZGV4IGQwOWRkNjE0ZGUu LjFkMDUxZDY4MWEgMTAwNjQ0Ci0tLSBhL3Rlc3QvbGlzcC9lc2hlbGwvZXNoLXZhci10ZXN0 cy5lbAorKysgYi90ZXN0L2xpc3AvZXNoZWxsL2VzaC12YXItdGVzdHMuZWwKQEAgLTEzNywx MCArMTM3LDE4IEBAIGVzaC12YXItdGVzdC9pbnRlcnAtbGlzcAogICAiSW50ZXJwb2xhdGUg TGlzcCBmb3JtIGV2YWx1YXRpb24iCiAgIChzaG91bGQgKGVxdWFsIChlc2hlbGwtdGVzdC1j b21tYW5kLXJlc3VsdCAiKyAkKCsgMSAyKSAzIikgNikpKQogCisoZXJ0LWRlZnRlc3QgZXNo LXZhci10ZXN0L2ludGVycC1saXNwLWluZGljZXMgKCkKKyAgIkludGVycG9sYXRlIExpc3Ag Zm9ybSBldmFsdWF0aW9uIHdpdGggaW5kZXgiCisgIChzaG91bGQgKGVxdWFsIChlc2hlbGwt dGVzdC1jb21tYW5kLXJlc3VsdCAiKyAkKGxpc3QgMSAyKVsxXSAzIikgNSkpKQorCiAoZXJ0 LWRlZnRlc3QgZXNoLXZhci10ZXN0L2ludGVycC1jbWQgKCkKICAgIkludGVycG9sYXRlIGNv bW1hbmQgcmVzdWx0IgogICAoc2hvdWxkIChlcXVhbCAoZXNoZWxsLXRlc3QtY29tbWFuZC1y ZXN1bHQgIisgJHsrIDEgMn0gMyIpIDYpKSkKIAorKGVydC1kZWZ0ZXN0IGVzaC12YXItdGVz dC9pbnRlcnAtY21kLWluZGljZXMgKCkKKyAgIkludGVycG9sYXRlIGNvbW1hbmQgcmVzdWx0 IHdpdGggaW5kZXgiCisgIChzaG91bGQgKGVxdWFsIChlc2hlbGwtdGVzdC1jb21tYW5kLXJl c3VsdCAiKyAke2xpc3QgMSAyfVsxXSAzIikgNSkpKQorCiAoZXJ0LWRlZnRlc3QgZXNoLXZh ci10ZXN0L2ludGVycC1jbWQtZXh0ZXJuYWwgKCkKICAgIkludGVycG9sYXRlIGNvbW1hbmQg cmVzdWx0IGZyb20gZXh0ZXJuYWwgY29tbWFuZCIKICAgKHNraXAtdW5sZXNzIChleGVjdXRh YmxlLWZpbmQgImVjaG8iKSkKQEAgLTE0OCw2ICsxNTYsMTMgQEAgZXNoLXZhci10ZXN0L2lu dGVycC1jbWQtZXh0ZXJuYWwKICAgIChlc2hlbGwtY29tbWFuZC1yZXN1bHQtcCAiZWNobyAk eyplY2hvIGhpfSIKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAiaGlcbiIpKSkKIAor KGVydC1kZWZ0ZXN0IGVzaC12YXItdGVzdC9pbnRlcnAtY21kLWV4dGVybmFsLWluZGljZXMg KCkKKyAgIkludGVycG9sYXRlIGNvbW1hbmQgcmVzdWx0IGZyb20gZXh0ZXJuYWwgY29tbWFu ZCB3aXRoIGluZGV4IgorICAoc2tpcC11bmxlc3MgKGV4ZWN1dGFibGUtZmluZCAiZWNobyIp KQorICAod2l0aC10ZW1wLWVzaGVsbAorICAgKGVzaGVsbC1jb21tYW5kLXJlc3VsdC1wICJl Y2hvICR7KmVjaG8gXCJoaVxuYnllXCJ9WzFdIgorICAgICAgICAgICAgICAgICAgICAgICAg ICAgICJieWVcbiIpKSkKKwogKGVydC1kZWZ0ZXN0IGVzaC12YXItdGVzdC9pbnRlcnAtdGVt cC1jbWQgKCkKICAgIkludGVycG9sYXRlIGNvbW1hbmQgcmVzdWx0IHJlZGlyZWN0ZWQgdG8g dGVtcCBmaWxlIgogICAoc2hvdWxkIChlcXVhbCAoZXNoZWxsLXRlc3QtY29tbWFuZC1yZXN1 bHQgImNhdCAkPGVjaG8gaGk+IikgImhpIikpKQpAQCAtMjgyLDEyICsyOTcsMjAgQEAgZXNo LXZhci10ZXN0L3F1b3RlZC1pbnRlcnAtbGlzcAogICAgICAgICAgICAgICAgICAgImVjaG8g XCJoaSAkKGNvbmNhdCBcXFwidGhlXFxcIiBcXFwicmVcXFwiKVwiIikKICAgICAgICAgICAg ICAgICAgImhpIHRoZXJlIikpKQogCisoZXJ0LWRlZnRlc3QgZXNoLXZhci10ZXN0L3F1b3Rl ZC1pbnRlcnAtbGlzcC1pbmRpY2VzICgpCisgICJJbnRlcnBvbGF0ZSBMaXNwIGZvcm0gZXZh bHVhdGlvbiB3aXRoIGluZGV4IgorICAoc2hvdWxkIChlcXVhbCAoZXNoZWxsLXRlc3QtY29t bWFuZC1yZXN1bHQgIisgXCIkKGxpc3QgMSAyKVsxXVwiIDMiKSA1KSkpCisKIChlcnQtZGVm dGVzdCBlc2gtdmFyLXRlc3QvcXVvdGVkLWludGVycC1jbWQgKCkKICAgIkludGVycG9sYXRl IGNvbW1hbmQgcmVzdWx0IGluc2lkZSBkb3VibGUtcXVvdGVzIgogICAoc2hvdWxkIChlcXVh bCAoZXNoZWxsLXRlc3QtY29tbWFuZC1yZXN1bHQKICAgICAgICAgICAgICAgICAgICJlY2hv IFwiaGkgJHtlY2hvIFxcXCJ0aGVyZVxcXCJ9XCIiKQogICAgICAgICAgICAgICAgICAiaGkg dGhlcmUiKSkpCiAKKyhlcnQtZGVmdGVzdCBlc2gtdmFyLXRlc3QvcXVvdGVkLWludGVycC1j bWQtaW5kaWNlcyAoKQorICAiSW50ZXJwb2xhdGUgY29tbWFuZCByZXN1bHQgd2l0aCBpbmRl eCBpbnNpZGUgZG91YmxlLXF1b3RlcyIKKyAgKHNob3VsZCAoZXF1YWwgKGVzaGVsbC10ZXN0 LWNvbW1hbmQtcmVzdWx0ICIrIFwiJHtsaXN0IDEgMn1bMV1cIiAzIikgNSkpKQorCiAoZXJ0 LWRlZnRlc3QgZXNoLXZhci10ZXN0L3F1b3RlZC1pbnRlcnAtdGVtcC1jbWQgKCkKICAgIklu dGVycG9sYXRlIGNvbW1hbmQgcmVzdWx0IHJlZGlyZWN0ZWQgdG8gdGVtcCBmaWxlIGluc2lk ZSBkb3VibGUtcXVvdGVzIgogICAoc2hvdWxkIChlcXVhbCAoZXNoZWxsLXRlc3QtY29tbWFu ZC1yZXN1bHQgImNhdCBcIiQ8ZWNobyBoaT5cIiIpICJoaSIpKSkKLS0gCjIuMjUuMQoK --------------616BF3EA5314D1FABE527BBC-- From unknown Tue Aug 19 10:08:50 2025 X-Loop: help-debbugs@gnu.org Subject: bug#54227: 29.0.50; [PATCH] Inconsistencies with Eshell variable interpolation Resent-From: Eli Zaretskii Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Mon, 07 Mar 2022 12:53:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 54227 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch To: Jim Porter Cc: 54227@debbugs.gnu.org Received: via spool by 54227-submit@debbugs.gnu.org id=B54227.164665757430090 (code B ref 54227); Mon, 07 Mar 2022 12:53:01 +0000 Received: (at 54227) by debbugs.gnu.org; 7 Mar 2022 12:52:54 +0000 Received: from localhost ([127.0.0.1]:52717 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nRCr7-0007pF-W0 for submit@debbugs.gnu.org; Mon, 07 Mar 2022 07:52:54 -0500 Received: from eggs.gnu.org ([209.51.188.92]:39272) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nRCr6-0007p3-BC for 54227@debbugs.gnu.org; Mon, 07 Mar 2022 07:52:52 -0500 Received: from [2001:470:142:3::e] (port=41424 helo=fencepost.gnu.org) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nRCr1-0005px-1B; Mon, 07 Mar 2022 07:52:47 -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=dsszBnMeEyKpep2PPOGYkwXeRMwIqi8lKTQZA2Qxz58=; b=GgphO4NEjPzw d2f/SMoKOwBJANtic2r9N3GPOfG4kxtDjujVZpsZ01BThNsbf2xEsepqmF/yOqSLO299w9yQrJkWC KZoLvaJT9PGMRRPx6iCtMSSUaK298fC5tD/UeDlJ4jwjqcIkDBv9RCITpWwrns0YCRNBhzvpXH/aW A7vlw9a1bTdffQahkSSH8NNsbVwvHx9Z1QM/bZ8olsPsQaLODfRVF2UxF8Aiat2zYDp3d4AsTXd+c GjdjVg48+ibH5aRXDUy4Xjqoekh5mi41E949HEwEdHuwFLriNFaFODrjwARyaoU96AquF8bdMJ6/C +R8VlOmy4fhg2PcyUs2/dA==; Received: from [87.69.77.57] (port=4112 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 1nRCr0-00033S-DF; Mon, 07 Mar 2022 07:52:46 -0500 Date: Mon, 07 Mar 2022 14:52:37 +0200 Message-Id: <83tuc9gc16.fsf@gnu.org> From: Eli Zaretskii In-Reply-To: <37edacda-dfa5-225e-258d-5330c6d522e2@gmail.com> (message from Jim Porter on Sat, 5 Mar 2022 13:44:24 -0800) References: <831qzjj7dd.fsf@gnu.org> <83r17ij2rh.fsf@gnu.org> <6f4c480d-90ea-fbb4-ae5c-dc07dd32026e@gmail.com> <83o82mizmx.fsf@gnu.org> <25921c41-e6ac-7cf8-d17e-d1b5e8a2ff68@gmail.com> <37edacda-dfa5-225e-258d-5330c6d522e2@gmail.com> X-Spam-Score: -2.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: -3.3 (---) > From: Jim Porter > Cc: 54227@debbugs.gnu.org > Date: Sat, 5 Mar 2022 13:44:24 -0800 > > +If @var{i} is a non-numeric value, expand to the value associated with > +the key @code{"i"}. For example, if @var{var} is @samp{(("dog" Why did you need quotes in "i"? Also, it's suppoed to be @var{i}, as in the other alternatives. > +@item anything else > +Raises an error. We say "Signals an error". Otherwise, LGTM, thanks. From unknown Tue Aug 19 10:08:50 2025 X-Loop: help-debbugs@gnu.org Subject: bug#54227: 29.0.50; [PATCH] Inconsistencies with Eshell variable interpolation Resent-From: Jim Porter Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Tue, 08 Mar 2022 03:39:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 54227 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch To: Eli Zaretskii Cc: 54227@debbugs.gnu.org Received: via spool by 54227-submit@debbugs.gnu.org id=B54227.164671070221448 (code B ref 54227); Tue, 08 Mar 2022 03:39:02 +0000 Received: (at 54227) by debbugs.gnu.org; 8 Mar 2022 03:38:22 +0000 Received: from localhost ([127.0.0.1]:54953 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nRQg1-0005Zs-DP for submit@debbugs.gnu.org; Mon, 07 Mar 2022 22:38:22 -0500 Received: from mail-pj1-f45.google.com ([209.85.216.45]:41750) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nRQfz-0005Ze-QH for 54227@debbugs.gnu.org; Mon, 07 Mar 2022 22:38:20 -0500 Received: by mail-pj1-f45.google.com with SMTP id fs4-20020a17090af28400b001bf5624c0aaso1235763pjb.0 for <54227@debbugs.gnu.org>; Mon, 07 Mar 2022 19:38:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=subject:to:cc:references:from:message-id:date:mime-version :in-reply-to:content-language; bh=87qooq+QlgV5j5IQncSNGble9DcbhRWMMR6Y3Pmwe8I=; b=FlQ/rEaLoYEp41DW7AG8eGG8FIdbe+oR7cIzbPJfEFP6qAvDWZXCIaJuXZB5WTsuLN EO3kT/jAzbXM98uaCn2AoP2/pWtMIlAmSw5KObx6c9qBHIN0aPNQ0jKGTAE9Q4GDgkK2 2r3yycu8OOBxZbXALXwDe0AsvBH5PNfCoDPzwyvoqm2jE6quu5tPn0ExMb3IzEfxAWBD b6Iibq3uM+Zo3osE2w/L3zFPXlk0Xq2FZ5QSuz1MfGSePGMch77mOYMRpbCLOkk3jt/c Mm+n1vCpCY/Rx+X2jF29YbC0ImJ8SFELWtfD1IBO+tf20lfCMr2SVpSUE7fvJuElt6Ge uCpA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:subject:to:cc:references:from:message-id:date :mime-version:in-reply-to:content-language; bh=87qooq+QlgV5j5IQncSNGble9DcbhRWMMR6Y3Pmwe8I=; b=swwsEICCjTaDishl3vmaYTgBe3xVnB1B0yEMu9ywiQBGokU4DkL3qbLsws32RIV2Xd L/Ro6onnBmMZ8CiE4IA4zEhGG8bzNG6zTsGMM97NFywDVQ6yFHS+bfVZGjnRAgwfJvat 4ZcAoat+h8seKvZqic4rt/1AT6k/fLRRs8EMC/F7vG8eeal2nsgz9aXhE6qc1V8ws9Qa 7FSwe1TJw6H8KHohN+UYcWBkv2fmxVqrc8dN01w98tUS1ufnR6zPzTP7/QETL9yfPhwX ajkfUdEDHhQz47569RSSmfUILWL7qBuKWVPttORyK5BwxB+sKaYsrnDl8jm13xy+BTy0 nhpA== X-Gm-Message-State: AOAM532GuZx3KxgtAd81DoRtop/cahIn/+ucOWdNMdvn5AX+Kz8X21oB eAv/BLCgxBwhCOjcRvrEXcaygrXBZF4= X-Google-Smtp-Source: ABdhPJx6YHV8nd6EkPKE2caaK1ip+by5idiMcDhrSGZQhbBKomDQU9wK2wOSZ+X2u/kcqDbpYnUjuQ== X-Received: by 2002:a17:902:c443:b0:151:ca88:684 with SMTP id m3-20020a170902c44300b00151ca880684mr15518084plm.80.1646710693634; Mon, 07 Mar 2022 19:38:13 -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 ls7-20020a17090b350700b001bd37f4e045sm815236pjb.26.2022.03.07.19.38.11 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 07 Mar 2022 19:38:12 -0800 (PST) References: <831qzjj7dd.fsf@gnu.org> <83r17ij2rh.fsf@gnu.org> <6f4c480d-90ea-fbb4-ae5c-dc07dd32026e@gmail.com> <83o82mizmx.fsf@gnu.org> <25921c41-e6ac-7cf8-d17e-d1b5e8a2ff68@gmail.com> <37edacda-dfa5-225e-258d-5330c6d522e2@gmail.com> <83tuc9gc16.fsf@gnu.org> From: Jim Porter Message-ID: <18835061-d853-f4b7-36db-71284024f221@gmail.com> Date: Mon, 7 Mar 2022 19:38:12 -0800 MIME-Version: 1.0 In-Reply-To: <83tuc9gc16.fsf@gnu.org> Content-Type: multipart/mixed; boundary="------------D8D250BFC24698505D2BC74B" Content-Language: en-US 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. --------------D8D250BFC24698505D2BC74B Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit On 3/7/2022 4:52 AM, Eli Zaretskii wrote: >> From: Jim Porter >> Cc: 54227@debbugs.gnu.org >> Date: Sat, 5 Mar 2022 13:44:24 -0800 >> >> +If @var{i} is a non-numeric value, expand to the value associated with >> +the key @code{"i"}. For example, if @var{var} is @samp{(("dog" > > Why did you need quotes in "i"? That was my attempt to indicate that this: $foo[bar] means (cdr (assoc "bar" foo)), not (cdr (assoc 'bar foo)) or (cdr (assoc bar foo)). Hopefully that's an ok way to express that. That said, this means the same thing too: $foo["bar"] so it's not quite as simple as wrapping quotes around the subscript. This seemed like the simplest way to express the general idea, but it might be more technically correct to say something like, "... expand to the value associated with @var{i}'s value as a string." That wording is pretty confusing to me though... > Also, it's suppoed to be @var{i}, as in the other alternatives. Thanks, fixed. >> +@item anything else >> +Raises an error. > > We say "Signals an error". Fixed there, and in the entry below about the '$#foo' syntax. --------------D8D250BFC24698505D2BC74B Content-Type: text/plain; charset=UTF-8; name="0001-Improve-wording-of-Eshell-variable-interpolation-cod.patch" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename*0="0001-Improve-wording-of-Eshell-variable-interpolation-cod.pa"; filename*1="tch" RnJvbSA0OGRiYjNkOWUxZjgyODM0NDBiZjQ2OTU3MDhhODgwYTM3MmYwNmQyIE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBKaW0gUG9ydGVyIDxqcG9ydGVyYnVnc0BnbWFpbC5j b20+CkRhdGU6IFRodSwgMyBNYXIgMjAyMiAwOTozNzoyNSAtMDgwMApTdWJqZWN0OiBbUEFU Q0ggMS8yXSBJbXByb3ZlIHdvcmRpbmcgb2YgRXNoZWxsIHZhcmlhYmxlIGludGVycG9sYXRp b24KIGNvZGUvZG9jdW1lbnRhdGlvbgoKKiBsaXNwL2VzaGVsbC9lc2gtYXJnLmVsIChlc2hl bGwtdW5lc2NhcGUtaW5uZXItZG91YmxlLXF1b3RlKTogUmVuYW1lCmZyb20gJ2VzaGVsbC1w YXJzZS1pbm5lci1kb3VibGUtcXVvdGUnLgoKKiBsaXNwL2VzaGVsbC9lc2gtY21kLmVsIChl c2hlbGwtd2l0aC10ZW1wLWNvbW1hbmQpOiBJbXByb3ZlCmRvY3N0cmluZy4KCiogbGlzcC9l c2hlbGwvZXNoLXZhci5lbCAoZXNoZWxsLXBhcnNlLXZhcmlhYmxlLXJlZik6IFVzZQonZXNo ZWxsLXVuZXNjYXBlLWlubmVyLWRvdWJsZS1xdW90ZScgYW5kIGltcHJvdmUgcm9idXN0bmVz cyBvZiBxdW90ZWQKdmFyaWFibGUgbmFtZSBtYXRjaGluZy4KKGVzaGVsbC1wYXJzZS1pbmRp Y2VzKTogVXNlICdlc2hlbGwtdW5lc2NhcGUtaW5uZXItZG91YmxlLXF1b3RlJy4KCiogZG9j L21pc2MvZXNoZWxsLnRleGkgKERvbGxhcnMgRXhwYW5zaW9uKTogSW1wcm92ZSB3b3JkaW5n IG9mCnN1YnNjcmlwdCBub3RhdGlvbi4KLS0tCiBkb2MvbWlzYy9lc2hlbGwudGV4aSAgIHwg NDMgKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0tCiBsaXNwL2Vz aGVsbC9lc2gtYXJnLmVsIHwgIDQgKystLQogbGlzcC9lc2hlbGwvZXNoLWNtZC5lbCB8IDI1 ICsrKysrKysrKysrKystLS0tLS0tLS0tLQogbGlzcC9lc2hlbGwvZXNoLXZhci5lbCB8IDE0 ICsrKysrKysrLS0tLS0tCiA0IGZpbGVzIGNoYW5nZWQsIDU1IGluc2VydGlvbnMoKyksIDMx IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RvYy9taXNjL2VzaGVsbC50ZXhpIGIvZG9j L21pc2MvZXNoZWxsLnRleGkKaW5kZXggNTU4MWU1Y2Q5ZS4uMzcyZTRjM2ZmYiAxMDA2NDQK LS0tIGEvZG9jL21pc2MvZXNoZWxsLnRleGkKKysrIGIvZG9jL21pc2MvZXNoZWxsLnRleGkK QEAgLTEwNDAsMTggKzEwNDAsMzcgQEAgRG9sbGFycyBFeHBhbnNpb24KIEV4cGFuZHMgdG8g dGhlIEB2YXJ7aX10aCBlbGVtZW50IG9mIHRoZSByZXN1bHQgb2YgQHZhcntleHByfSwgYW4K IGV4cHJlc3Npb24gaW4gb25lIG9mIHRoZSBhYm92ZSBmb3JtcyBsaXN0ZWQgaGVyZS4gIElm IG11bHRpcGxlIGluZGljZXMKIGFyZSBzdXBwbGllZCwgdGhpcyB3aWxsIHJldHVybiBhIGxp c3QgY29udGFpbmluZyB0aGUgZWxlbWVudHMgZm9yIGVhY2gKLWluZGV4LiAgSWYgQHZhcntl eHByfSdzIHZhbHVlIGlzIGEgc3RyaW5nLCBpdCB3aWxsIGZpcnN0IGJlIHNwbGl0IGF0Ci13 aGl0ZXNwYWNlIHRvIG1ha2UgaXQgYSBsaXN0LiAgSWYgQHZhcntleHByfSdzIHZhbHVlIGlz IGFuIGFsaXN0Ci0oQHB4cmVme0Fzc29jaWF0aW9uIExpc3QgVHlwZSwgQXNzb2NpYXRpb24g TGlzdHMsICwgZWxpc3AsIFRoZSBFbWFjcwotTGlzcCBSZWZlcmVuY2UgTWFudWFsfSksIHRo aXMgd2lsbCBjYWxsIEBjb2Rle2Fzc29jfSBvbiB0aGUgcmVzdWx0IG9mCi1AdmFye2V4cHJ9 LCByZXR1cm5pbmcgdGhlIEBjb2Rle2Nkcn0gb2YgdGhlIGVsZW1lbnQgb2YgdGhlIHJlc3Vs dAotd2hvc2UgY2FyIGlzIGVxdWFsIHRvIEBjb2RleyJpIn0uICBSYWlzZXMgYW4gZXJyb3Ig aWYgdGhlIHZhbHVlIGlzIG5vdAotYSBzZXF1ZW5jZSAoQHB4cmVme1NlcXVlbmNlcyBBcnJh eXMgVmVjdG9ycywgU2VxdWVuY2VzLCAsIGVsaXNwLCBUaGUKK2luZGV4LiAgVGhlIGV4YWN0 IGJlaGF2aW9yIGRlcGVuZHMgb24gdGhlIHR5cGUgb2YgQHZhcntleHByfSdzIHZhbHVlOgor CitAdGFibGUgQGFzaXMKKworQGl0ZW0gYSBzZXF1ZW5jZQorRXhwYW5kcyB0byB0aGUgZWxl bWVudCBhdCB0aGUgKHplcm8tYmFzZWQpIGluZGV4IEB2YXJ7aX0gb2YgdGhlCitzZXF1ZW5j ZSAoQHB4cmVme1NlcXVlbmNlcyBBcnJheXMgVmVjdG9ycywgU2VxdWVuY2VzLCAsIGVsaXNw LCBUaGUKIEVtYWNzIExpc3AgUmVmZXJlbmNlIE1hbnVhbH0pLgogCi1NdWx0aXBsZSBzZXRz IG9mIGluZGljZXMgY2FuIGFsc28gYmUgc3BlY2lmaWVkLiBGb3IgZXhhbXBsZSwgaWYKLUB2 YXJ7dmFyfSBpcyBhIGxpc3Qgb2YgbGlzdHMsIEBzYW1weyRAdmFye3Zhcn1bMF1bMF19IGlz IGVxdWl2YWxlbnQgdG8KLUBzYW1weyhjYWFyIEB2YXJ7dmFyfSl9LgorQGl0ZW0gYSBzdHJp bmcKK1NwbGl0IHRoZSBzdHJpbmcgYXQgd2hpdGVzcGFjZSwgYW5kIHRoZW4gZXhwYW5kIHRv IHRoZSBAdmFye2l9dGgKK2VsZW1lbnQgb2YgdGhlIHJlc3VsdGluZyBzZXF1ZW5jZS4KKwor QGl0ZW0gYW4gYWxpc3QKK0lmIEB2YXJ7aX0gaXMgYSBub24tbnVtZXJpYyB2YWx1ZSwgZXhw YW5kIHRvIHRoZSB2YWx1ZSBhc3NvY2lhdGVkIHdpdGgKK3RoZSBrZXkgQGNvZGV7IkB2YXJ7 aX0ifSBpbiB0aGUgYWxpc3QuICBGb3IgZXhhbXBsZSwgaWYgQHZhcnt2YXJ9IGlzCitAc2Ft cHsoKCJkb2ciIC4gImZpZG8iKSAoImNhdCIgLiAiZmVsaXgiKSl9LCB0aGVuCitAc2FtcHsk QHZhcnt2YXJ9W2RvZ119IGV4cGFuZHMgdG8gQGNvZGV7ImZpZG8ifS4gIE90aGVyd2lzZSwg dGhpcworYmVoYXZlcyBhcyB3aXRoIHNlcXVlbmNlczsgZS5nLiwgQHNhbXB7JEB2YXJ7dmFy fVswXX0gZXhwYW5kcyB0bworQGNvZGV7KCJkb2ciIC4gImZpZG8iKX0uICBAeHJlZntBc3Nv Y2lhdGlvbiBMaXN0IFR5cGUsIEFzc29jaWF0aW9uCitMaXN0cywgLCBlbGlzcCwgVGhlIEVt YWNzIExpc3AgUmVmZXJlbmNlIE1hbnVhbH0uCisKK0BpdGVtIGFueXRoaW5nIGVsc2UKK1Np Z25hbHMgYW4gZXJyb3IuCisKK0BlbmQgdGFibGUKKworTXVsdGlwbGUgc2V0cyBvZiBpbmRp Y2VzIGNhbiBhbHNvIGJlIHNwZWNpZmllZC4gIEZvciBleGFtcGxlLCBpZgorQHZhcnt2YXJ9 IGlzIEBzYW1weygoMSAyKSAoMyA0KSl9LCB0aGVuIEBzYW1weyRAdmFye3Zhcn1bMF1bMV19 IHdpbGwKK2V4cGFuZCB0byBAY29kZXsyfSwgaS5lLkA6IHRoZSBzZWNvbmQgZWxlbWVudCBv ZiB0aGUgZmlyc3QgbGlzdCBtZW1iZXIKKyhhbGwgaW5kaWNlcyBhcmUgemVyby1iYXNlZCku CiAKIEBpdGVtICRAdmFye2V4cHJ9W0B2YXJ7cmVnZXhwfSBAdmFye2kuLi59XQogQXMgYWJv dmUgKHdoZW4gQHZhcntleHByfSBleHBhbmRzIHRvIGEgc3RyaW5nKSwgYnV0IHVzZSBAdmFy e3JlZ2V4cH0KQEAgLTEwNjMsOCArMTA4Miw4IEBAIERvbGxhcnMgRXhwYW5zaW9uCiBFeHBh bmRzIHRvIHRoZSBsZW5ndGggb2YgdGhlIHJlc3VsdCBvZiBAdmFye2V4cHJ9LCBhbiBleHBy ZXNzaW9uIGluCiBvbmUgb2YgdGhlIGFib3ZlIGZvcm1zLiAgRm9yIGV4YW1wbGUsIEBzYW1w eyQjQHZhcnt2YXJ9fSByZXR1cm5zIHRoZQogbGVuZ3RoIG9mIHRoZSB2YXJpYWJsZSBAdmFy e3Zhcn0gYW5kIEBzYW1weyQjQHZhcnt2YXJ9WzBdfSByZXR1cm5zIHRoZQotbGVuZ3RoIG9m IHRoZSBmaXJzdCBlbGVtZW50IG9mIEB2YXJ7dmFyfS4gIEFnYWluLCByYWlzZXMgYW4gZXJy b3IgaWYKLXRoZSByZXN1bHQgb2YgQHZhcntleHByfSBpcyBub3QgYSBzZXF1ZW5jZS4KK2xl bmd0aCBvZiB0aGUgZmlyc3QgZWxlbWVudCBvZiBAdmFye3Zhcn0uICBBZ2Fpbiwgc2lnbmFs cyBhbiBlcnJvciBpZgordGhlIHJlc3VsdCBvZiBAdmFye2V4cHJ9IGlzIG5vdCBhIHN0cmlu ZyBvciBhIHNlcXVlbmNlLgogCiBAZW5kIHRhYmxlCiAKZGlmZiAtLWdpdCBhL2xpc3AvZXNo ZWxsL2VzaC1hcmcuZWwgYi9saXNwL2VzaGVsbC9lc2gtYXJnLmVsCmluZGV4IGUxOTQ4MWM0 YmEuLmVlM2Y5MDdmODUgMTAwNjQ0Ci0tLSBhL2xpc3AvZXNoZWxsL2VzaC1hcmcuZWwKKysr IGIvbGlzcC9lc2hlbGwvZXNoLWFyZy5lbApAQCAtMzU0LDggKzM1NCw4IEBAIGVzaGVsbC1w YXJzZS1kb3VibGUtcXVvdGUKIAkJICAobGlzdCAnZXNoZWxsLWVzY2FwZS1hcmcgYXJnKSkp KQogCSAgKGdvdG8tY2hhciAoMSsgZW5kKSkpKSkpKQogCi0oZGVmdW4gZXNoZWxsLXBhcnNl LWlubmVyLWRvdWJsZS1xdW90ZSAoYm91bmQpCi0gICJQYXJzZSB0aGUgaW5uZXIgcGFydCBv ZiBhIGRvdWJsZSBxdW90ZWQgc3RyaW5nLgorKGRlZnVuIGVzaGVsbC11bmVzY2FwZS1pbm5l ci1kb3VibGUtcXVvdGUgKGJvdW5kKQorICAiVW5lc2NhcGUgZXNjYXBlZCBjaGFyYWN0ZXJz IGluc2lkZSBhIGRvdWJsZS1xdW90ZWQgc3RyaW5nLgogVGhlIHN0cmluZyB0byBwYXJzZSBz dGFydHMgYXQgcG9pbnQgYW5kIGVuZHMgYXQgQk9VTkQuCiAKIElmIEVzaGVsbCBpcyBjdXJy ZW50bHkgcGFyc2luZyBhIHF1b3RlZCBzdHJpbmcgYW5kIHRoZXJlIGFyZSBhbnkKZGlmZiAt LWdpdCBhL2xpc3AvZXNoZWxsL2VzaC1jbWQuZWwgYi9saXNwL2VzaGVsbC9lc2gtY21kLmVs CmluZGV4IDA0YjU0ZDlkNzkuLjhiZTExMzZlMzEgMTAwNjQ0Ci0tLSBhL2xpc3AvZXNoZWxs L2VzaC1jbWQuZWwKKysrIGIvbGlzcC9lc2hlbGwvZXNoLWNtZC5lbApAQCAtMzUwLDI0ICsz NTAsMjcgQEAgZXNoZWxsLWNvbXBsZXRlLWxpc3Atc3ltYm9scwogCiAoZGVmdmFyIGVzaGVs bC0tc2VwLXRlcm1zKQogCi0oZGVmbWFjcm8gZXNoZWxsLXdpdGgtdGVtcC1jb21tYW5kIChj b21tYW5kICZyZXN0IGJvZHkpCi0gICJOYXJyb3cgdGhlIGJ1ZmZlciB0byBDT01NQU5EIGFu ZCBleGVjdXRlIHRoZSBmb3JtcyBpbiBCT0RZLgotQ09NTUFORCBjYW4gZWl0aGVyIGJlIGEg c3RyaW5nLCBvciBhIGNvbnMgY2VsbCBkZW1hcmNhdGluZyBhCi1idWZmZXIgcmVnaW9uLiAg SWYgQ09NTUFORCBpcyBhIHN0cmluZywgdGVtcG9yYXJpbHkgaW5zZXJ0IGl0Ci1pbnRvIHRo ZSBidWZmZXIgYmVmb3JlIG5hcnJvd2luZy4gIFBvaW50IHdpbGwgYmUgc2V0IHRvIHRoZQot YmVnaW5uaW5nIG9mIHRoZSBuYXJyb3dlZCByZWdpb24uCisoZGVmbWFjcm8gZXNoZWxsLXdp dGgtdGVtcC1jb21tYW5kIChyZWdpb24gJnJlc3QgYm9keSkKKyAgIk5hcnJvdyB0aGUgYnVm ZmVyIHRvIFJFR0lPTiBhbmQgZXhlY3V0ZSB0aGUgZm9ybXMgaW4gQk9EWS4KKworUkVHSU9O IGlzIGEgY29ucyBjZWxsIChTVEFSVCAuIEVORCkgdGhhdCBzcGVjaWZpZXMgdGhlIHJlZ2lv biB0bword2hpY2ggdG8gbmFycm93IHRoZSBidWZmZXIuICBSRUdJT04gY2FuIGFsc28gYmUg YSBzdHJpbmcsIGluCit3aGljaCBjYXNlIHRoZSBtYWNybyB0ZW1wb3JhcmlseSBpbnNlcnRz IGl0IGludG8gdGhlIGJ1ZmZlciBhdAorcG9pbnQsIGFuZCBuYXJyb3dzIHRoZSBidWZmZXIg dG8gdGhlIGluc2VydGVkIHN0cmluZy4gIEJlZm9yZQorZXhlY3V0aW5nIEJPRFksIHBvaW50 IGlzIHNldCB0byB0aGUgYmVnaW5uaW5nIG9mIHRoZSBuYXJyb3dlZAorUkVHSU9OLgogCiBU aGUgdmFsdWUgcmV0dXJuZWQgaXMgdGhlIGxhc3QgZm9ybSBpbiBCT0RZLiIKICAgKGRlY2xh cmUgKGluZGVudCAxKSkKLSAgYChsZXQgKChjbWQgLGNvbW1hbmQpKQotICAgICAoaWYgKHN0 cmluZ3AgY21kKQorICBgKGxldCAoKHJlZyAscmVnaW9uKSkKKyAgICAgKGlmIChzdHJpbmdw IHJlZykKICAgICAgICAgIDs7IFNpbmNlIHBhcnNpbmcgcmVsaWVzIHBhcnRseSBvbiBidWZm ZXItbG9jYWwgc3RhdGUKICAgICAgICAgIDs7IChlLmcuIHRoYXQgb2YgYGVzaGVsbC1wYXJz ZS1hcmd1bWVudC1ob29rJyksIHdlIG5lZWQgdG8KICAgICAgICAgIDs7IHBlcmZvcm0gdGhl IHBhcnNpbmcgaW4gdGhlIEVzaGVsbCBidWZmZXIuCiAgICAgICAgICAobGV0ICgoYmVnaW4g KHBvaW50KSkgZW5kCiAJICAgICAgIChpbmhpYml0LXBvaW50LW1vdGlvbi1ob29rcyB0KSkK ICAgICAgICAgICAgKHdpdGgtc2lsZW50LW1vZGlmaWNhdGlvbnMKLSAgICAgICAgICAgICAo aW5zZXJ0IGNtZCkKKyAgICAgICAgICAgICAoaW5zZXJ0IHJlZykKICAgICAgICAgICAgICAo c2V0cSBlbmQgKHBvaW50KSkKICAgICAgICAgICAgICAodW53aW5kLXByb3RlY3QKICAgICAg ICAgICAgICAgICAgKHNhdmUtcmVzdHJpY3Rpb24KQEAgLTM3Niw4ICszNzksOCBAQCBlc2hl bGwtd2l0aC10ZW1wLWNvbW1hbmQKICAgICAgICAgICAgICAgICAgICAsQGJvZHkpCiAgICAg ICAgICAgICAgICAoZGVsZXRlLXJlZ2lvbiBiZWdpbiBlbmQpKSkpCiAgICAgICAgKHNhdmUt cmVzdHJpY3Rpb24KLSAgICAgICAgIChuYXJyb3ctdG8tcmVnaW9uIChjYXIgY21kKSAoY2Ry IGNtZCkpCi0gICAgICAgICAoZ290by1jaGFyIChjYXIgY21kKSkKKyAgICAgICAgIChuYXJy b3ctdG8tcmVnaW9uIChjYXIgcmVnKSAoY2RyIHJlZykpCisgICAgICAgICAoZ290by1jaGFy IChjYXIgcmVnKSkKICAgICAgICAgICxAYm9keSkpKSkKIAogKGRlZnVuIGVzaGVsbC1wYXJz ZS1jb21tYW5kIChjb21tYW5kICZvcHRpb25hbCBhcmdzIHRvcGxldmVsKQpkaWZmIC0tZ2l0 IGEvbGlzcC9lc2hlbGwvZXNoLXZhci5lbCBiL2xpc3AvZXNoZWxsL2VzaC12YXIuZWwKaW5k ZXggYWY4OWUzNWY1NS4uODc0NmYyYmI5MyAxMDA2NDQKLS0tIGEvbGlzcC9lc2hlbGwvZXNo LXZhci5lbAorKysgYi9saXNwL2VzaGVsbC9lc2gtdmFyLmVsCkBAIC00MzcsNyArNDM3LDcg QEAgZXNoZWxsLXBhcnNlLXZhcmlhYmxlLXJlZgogICAgICAgICAgICAgYChlc2hlbGwtY29u dmVydAogICAgICAgICAgICAgICAoZXNoZWxsLWNvbW1hbmQtdG8tdmFsdWUKICAgICAgICAg ICAgICAgIChlc2hlbGwtYXMtc3ViY29tbWFuZAotICAgICAgICAgICAgICAgICwobGV0ICgo c3ViY21kIChvciAoZXNoZWxsLXBhcnNlLWlubmVyLWRvdWJsZS1xdW90ZSBlbmQpCisgICAg ICAgICAgICAgICAgLChsZXQgKChzdWJjbWQgKG9yIChlc2hlbGwtdW5lc2NhcGUtaW5uZXIt ZG91YmxlLXF1b3RlIGVuZCkKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg KGNvbnMgKHBvaW50KSBlbmQpKSkKICAgICAgICAgICAgICAgICAgICAgICAgKGVzaGVsbC1j dXJyZW50LXF1b3RlZCBuaWwpKQogICAgICAgICAgICAgICAgICAgIChlc2hlbGwtcGFyc2Ut Y29tbWFuZCBzdWJjbWQpKSkpKQpAQCAtNDcwLDEzICs0NzAsMTUgQEAgZXNoZWxsLXBhcnNl LXZhcmlhYmxlLXJlZgogICAgIChjb25kaXRpb24tY2FzZSBuaWwKICAgICAgICAgYChlc2hl bGwtY29tbWFuZC10by12YWx1ZQogICAgICAgICAgIChlc2hlbGwtbGlzcC1jb21tYW5kCi0g ICAgICAgICAgICcsKHJlYWQgKG9yIChlc2hlbGwtcGFyc2UtaW5uZXItZG91YmxlLXF1b3Rl IChwb2ludC1tYXgpKQorICAgICAgICAgICAnLChyZWFkIChvciAoZXNoZWxsLXVuZXNjYXBl LWlubmVyLWRvdWJsZS1xdW90ZSAocG9pbnQtbWF4KSkKICAgICAgICAgICAgICAgICAgICAg ICAgKGN1cnJlbnQtYnVmZmVyKSkpKSkKICAgICAgIChlbmQtb2YtZmlsZQogICAgICAgICh0 aHJvdyAnZXNoZWxsLWluY29tcGxldGUgP1woKSkpKQotICAgKChsb29raW5nLWF0IChyeCAo b3IgIiciICJcIiIgIlxcXCIiKSkpCi0gICAgKGVzaGVsbC13aXRoLXRlbXAtY29tbWFuZCAo b3IgKGVzaGVsbC1wYXJzZS1pbm5lci1kb3VibGUtcXVvdGUgKHBvaW50LW1heCkpCi0gICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKGNvbnMgKHBvaW50KSAocG9pbnQtbWF4 KSkpCisgICAoKGxvb2tpbmctYXQgKHJ4LXRvLXN0cmluZworICAgICAgICAgICAgICAgICBg KG9yICInIiAsKGlmIGVzaGVsbC1jdXJyZW50LXF1b3RlZCAiXFxcIiIgIlwiIikpKSkKKyAg ICAoZXNoZWxsLXdpdGgtdGVtcC1jb21tYW5kCisgICAgICAgIChvciAoZXNoZWxsLXVuZXNj YXBlLWlubmVyLWRvdWJsZS1xdW90ZSAocG9pbnQtbWF4KSkKKyAgICAgICAgICAgIChjb25z IChwb2ludCkgKHBvaW50LW1heCkpKQogICAgICAgKGxldCAoKG5hbWUgKGlmIChlcSAoY2hh ci1hZnRlcikgP1wnKQogICAgICAgICAgICAgICAgICAgICAgIChlc2hlbGwtcGFyc2UtbGl0 ZXJhbC1xdW90ZSkKICAgICAgICAgICAgICAgICAgICAgKGVzaGVsbC1wYXJzZS1kb3VibGUt cXVvdGUpKSkpCkBAIC01MDYsNyArNTA4LDcgQEAgZXNoZWxsLXBhcnNlLWluZGljZXMKIAko aWYgKG5vdCBlbmQpCiAJICAgICh0aHJvdyAnZXNoZWxsLWluY29tcGxldGUgP1xbKQogCSAg KGZvcndhcmQtY2hhcikKLSAgICAgICAgICAoZXNoZWxsLXdpdGgtdGVtcC1jb21tYW5kIChv ciAoZXNoZWxsLXBhcnNlLWlubmVyLWRvdWJsZS1xdW90ZSBlbmQpCisgICAgICAgICAgKGVz aGVsbC13aXRoLXRlbXAtY29tbWFuZCAob3IgKGVzaGVsbC11bmVzY2FwZS1pbm5lci1kb3Vi bGUtcXVvdGUgZW5kKQogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IChjb25zIChwb2ludCkgZW5kKSkKIAkgICAgKGxldCAoZXNoZWxsLWdsb2ItZnVuY3Rpb24g KGVzaGVsbC1jdXJyZW50LXF1b3RlZCBuaWwpKQogCSAgICAgIChzZXRxIGluZGljZXMgKGNv bnMgKGVzaGVsbC1wYXJzZS1hcmd1bWVudHMKLS0gCjIuMjUuMQoK --------------D8D250BFC24698505D2BC74B Content-Type: text/plain; charset=UTF-8; name="0002-Support-applying-indices-to-more-Eshell-dollar-expan.patch" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename*0="0002-Support-applying-indices-to-more-Eshell-dollar-expan.pa"; filename*1="tch" RnJvbSAxZjU3MDRiMjRhMzA3M2Y5YWMxZDI3M2ZmN2E2YjE5NzYwMDcxNzExIE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBKaW0gUG9ydGVyIDxqcG9ydGVyYnVnc0BnbWFpbC5j b20+CkRhdGU6IFNhdCwgNSBNYXIgMjAyMiAxMTo0NTo0OSAtMDgwMApTdWJqZWN0OiBbUEFU Q0ggMi8yXSBTdXBwb3J0IGFwcGx5aW5nIGluZGljZXMgdG8gbW9yZSBFc2hlbGwgZG9sbGFy IGV4cGFuc2lvbnMKCkZvciBleGFtcGxlLCAnJHtlY2hvIC1lICJoaVxuYnllIn1bMV0nIHNo b3VsZCBleHBhbmQgdG8gImJ5ZSIuCgoqIGxpc3AvZXNoZWxsL2VzaC12YXIuZWwgKGVzaGVs bC1wYXJzZS12YXJpYWJsZS1yZWYpOiBTdXBwb3J0IGFwcGx5aW5nCmluZGljZXMgdG8gJyR7 fScsICckKCknLCBhbmQgJyQ8PicgZm9ybXMuCgoqIGxpc3AvZXNoZWxsL2VzaC12YXItdGVz dHMuZWwgKGVzaC12YXItdGVzdC9pbnRlcnAtbGlzcC1pbmRpY2VzKQooZXNoLXZhci10ZXN0 L2ludGVycC1jbWQtaW5kaWNlcykKKGVzaC12YXItdGVzdC9pbnRlcnAtY21kLWV4dGVybmFs LWluZGljZXMpCihlc2gtdmFyLXRlc3QvcXVvdGVkLWludGVycC1saXNwLWluZGljZXMpCihl c2gtdmFyLXRlc3QvcXVvdGVkLWludGVycC1jbWQtaW5kaWNlcyk6IE5ldyB0ZXN0cy4KLS0t CiBsaXNwL2VzaGVsbC9lc2gtdmFyLmVsICAgICAgICAgICAgfCAyOCArKysrKysrKysrKysr KysrLS0tLS0tLS0tLS0tCiB0ZXN0L2xpc3AvZXNoZWxsL2VzaC12YXItdGVzdHMuZWwgfCAy MyArKysrKysrKysrKysrKysrKysrKysrKwogMiBmaWxlcyBjaGFuZ2VkLCAzOSBpbnNlcnRp b25zKCspLCAxMiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9saXNwL2VzaGVsbC9lc2gt dmFyLmVsIGIvbGlzcC9lc2hlbGwvZXNoLXZhci5lbAppbmRleCA4NzQ2ZjJiYjkzLi5jYTRj YmQ3NDRjIDEwMDY0NAotLS0gYS9saXNwL2VzaGVsbC9lc2gtdmFyLmVsCisrKyBiL2xpc3Av ZXNoZWxsL2VzaC12YXIuZWwKQEAgLTQzNCwxMyArNDM0LDE1IEBAIGVzaGVsbC1wYXJzZS12 YXJpYWJsZS1yZWYKICAgICAgICAgICAodGhyb3cgJ2VzaGVsbC1pbmNvbXBsZXRlID9ceykK ICAgICAgICAgKGZvcndhcmQtY2hhcikKICAgICAgICAgKHByb2cxCi0gICAgICAgICAgICBg KGVzaGVsbC1jb252ZXJ0Ci0gICAgICAgICAgICAgIChlc2hlbGwtY29tbWFuZC10by12YWx1 ZQotICAgICAgICAgICAgICAgKGVzaGVsbC1hcy1zdWJjb21tYW5kCi0gICAgICAgICAgICAg ICAgLChsZXQgKChzdWJjbWQgKG9yIChlc2hlbGwtdW5lc2NhcGUtaW5uZXItZG91YmxlLXF1 b3RlIGVuZCkKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKGNvbnMgKHBv aW50KSBlbmQpKSkKLSAgICAgICAgICAgICAgICAgICAgICAgKGVzaGVsbC1jdXJyZW50LXF1 b3RlZCBuaWwpKQotICAgICAgICAgICAgICAgICAgIChlc2hlbGwtcGFyc2UtY29tbWFuZCBz dWJjbWQpKSkpKQorICAgICAgICAgICAgYChlc2hlbGwtYXBwbHktaW5kaWNlcworICAgICAg ICAgICAgICAoZXNoZWxsLWNvbnZlcnQKKyAgICAgICAgICAgICAgIChlc2hlbGwtY29tbWFu ZC10by12YWx1ZQorICAgICAgICAgICAgICAgIChlc2hlbGwtYXMtc3ViY29tbWFuZAorICAg ICAgICAgICAgICAgICAsKGxldCAoKHN1YmNtZCAob3IgKGVzaGVsbC11bmVzY2FwZS1pbm5l ci1kb3VibGUtcXVvdGUgZW5kKQorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgKGNvbnMgKHBvaW50KSBlbmQpKSkKKyAgICAgICAgICAgICAgICAgICAgICAgIChlc2hl bGwtY3VycmVudC1xdW90ZWQgbmlsKSkKKyAgICAgICAgICAgICAgICAgICAgKGVzaGVsbC1w YXJzZS1jb21tYW5kIHN1YmNtZCkpKSkpCisgICAgICAgICAgICAgIGluZGljZXMpCiAgICAg ICAgICAgKGdvdG8tY2hhciAoMSsgZW5kKSkpKSkpCiAgICAoKGVxIChjaGFyLWFmdGVyKSA/ XDwpCiAgICAgKGxldCAoKGVuZCAoZXNoZWxsLWZpbmQtZGVsaW1pdGVyID9cPCA/XD4pKSkK QEAgLTQ2NCwxNCArNDY2LDE2IEBAIGVzaGVsbC1wYXJzZS12YXJpYWJsZS1yZWYKICAgICAg ICAgICAgICAgICAgICAgICAgICAgIDs7IHByb3Blcmx5LiAgU2VlIGJ1ZyM1NDE5MC4KICAg ICAgICAgICAgICAgICAgICAgICAgICAgIChsaXN0IChmdW5jdGlvbiAobGFtYmRhICgpCiAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIChkZWxldGUtZmlsZSAsdGVtcCkp KSkpKQotICAgICAgICAgICAgICAgICAgIChxdW90ZSAsdGVtcCkpKQorICAgICAgICAgICAg ICAgICAgIChlc2hlbGwtYXBwbHktaW5kaWNlcyAsdGVtcCBpbmRpY2VzKSkpCiAgICAgICAg ICAgICAoZ290by1jaGFyICgxKyBlbmQpKSkpKSkpCiAgICAoKGVxIChjaGFyLWFmdGVyKSA/ XCgpCiAgICAgKGNvbmRpdGlvbi1jYXNlIG5pbAotICAgICAgICBgKGVzaGVsbC1jb21tYW5k LXRvLXZhbHVlCi0gICAgICAgICAgKGVzaGVsbC1saXNwLWNvbW1hbmQKLSAgICAgICAgICAg JywocmVhZCAob3IgKGVzaGVsbC11bmVzY2FwZS1pbm5lci1kb3VibGUtcXVvdGUgKHBvaW50 LW1heCkpCi0gICAgICAgICAgICAgICAgICAgICAgIChjdXJyZW50LWJ1ZmZlcikpKSkpCisg ICAgICAgIGAoZXNoZWxsLWFwcGx5LWluZGljZXMKKyAgICAgICAgICAoZXNoZWxsLWNvbW1h bmQtdG8tdmFsdWUKKyAgICAgICAgICAgKGVzaGVsbC1saXNwLWNvbW1hbmQKKyAgICAgICAg ICAgICcsKHJlYWQgKG9yIChlc2hlbGwtdW5lc2NhcGUtaW5uZXItZG91YmxlLXF1b3RlIChw b2ludC1tYXgpKQorICAgICAgICAgICAgICAgICAgICAgICAgKGN1cnJlbnQtYnVmZmVyKSkp KSkKKyAgICAgICAgICBpbmRpY2VzKQogICAgICAgKGVuZC1vZi1maWxlCiAgICAgICAgKHRo cm93ICdlc2hlbGwtaW5jb21wbGV0ZSA/XCgpKSkpCiAgICAoKGxvb2tpbmctYXQgKHJ4LXRv LXN0cmluZwpkaWZmIC0tZ2l0IGEvdGVzdC9saXNwL2VzaGVsbC9lc2gtdmFyLXRlc3RzLmVs IGIvdGVzdC9saXNwL2VzaGVsbC9lc2gtdmFyLXRlc3RzLmVsCmluZGV4IGQwOWRkNjE0ZGUu LjFkMDUxZDY4MWEgMTAwNjQ0Ci0tLSBhL3Rlc3QvbGlzcC9lc2hlbGwvZXNoLXZhci10ZXN0 cy5lbAorKysgYi90ZXN0L2xpc3AvZXNoZWxsL2VzaC12YXItdGVzdHMuZWwKQEAgLTEzNywx MCArMTM3LDE4IEBAIGVzaC12YXItdGVzdC9pbnRlcnAtbGlzcAogICAiSW50ZXJwb2xhdGUg TGlzcCBmb3JtIGV2YWx1YXRpb24iCiAgIChzaG91bGQgKGVxdWFsIChlc2hlbGwtdGVzdC1j b21tYW5kLXJlc3VsdCAiKyAkKCsgMSAyKSAzIikgNikpKQogCisoZXJ0LWRlZnRlc3QgZXNo LXZhci10ZXN0L2ludGVycC1saXNwLWluZGljZXMgKCkKKyAgIkludGVycG9sYXRlIExpc3Ag Zm9ybSBldmFsdWF0aW9uIHdpdGggaW5kZXgiCisgIChzaG91bGQgKGVxdWFsIChlc2hlbGwt dGVzdC1jb21tYW5kLXJlc3VsdCAiKyAkKGxpc3QgMSAyKVsxXSAzIikgNSkpKQorCiAoZXJ0 LWRlZnRlc3QgZXNoLXZhci10ZXN0L2ludGVycC1jbWQgKCkKICAgIkludGVycG9sYXRlIGNv bW1hbmQgcmVzdWx0IgogICAoc2hvdWxkIChlcXVhbCAoZXNoZWxsLXRlc3QtY29tbWFuZC1y ZXN1bHQgIisgJHsrIDEgMn0gMyIpIDYpKSkKIAorKGVydC1kZWZ0ZXN0IGVzaC12YXItdGVz dC9pbnRlcnAtY21kLWluZGljZXMgKCkKKyAgIkludGVycG9sYXRlIGNvbW1hbmQgcmVzdWx0 IHdpdGggaW5kZXgiCisgIChzaG91bGQgKGVxdWFsIChlc2hlbGwtdGVzdC1jb21tYW5kLXJl c3VsdCAiKyAke2xpc3QgMSAyfVsxXSAzIikgNSkpKQorCiAoZXJ0LWRlZnRlc3QgZXNoLXZh ci10ZXN0L2ludGVycC1jbWQtZXh0ZXJuYWwgKCkKICAgIkludGVycG9sYXRlIGNvbW1hbmQg cmVzdWx0IGZyb20gZXh0ZXJuYWwgY29tbWFuZCIKICAgKHNraXAtdW5sZXNzIChleGVjdXRh YmxlLWZpbmQgImVjaG8iKSkKQEAgLTE0OCw2ICsxNTYsMTMgQEAgZXNoLXZhci10ZXN0L2lu dGVycC1jbWQtZXh0ZXJuYWwKICAgIChlc2hlbGwtY29tbWFuZC1yZXN1bHQtcCAiZWNobyAk eyplY2hvIGhpfSIKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAiaGlcbiIpKSkKIAor KGVydC1kZWZ0ZXN0IGVzaC12YXItdGVzdC9pbnRlcnAtY21kLWV4dGVybmFsLWluZGljZXMg KCkKKyAgIkludGVycG9sYXRlIGNvbW1hbmQgcmVzdWx0IGZyb20gZXh0ZXJuYWwgY29tbWFu ZCB3aXRoIGluZGV4IgorICAoc2tpcC11bmxlc3MgKGV4ZWN1dGFibGUtZmluZCAiZWNobyIp KQorICAod2l0aC10ZW1wLWVzaGVsbAorICAgKGVzaGVsbC1jb21tYW5kLXJlc3VsdC1wICJl Y2hvICR7KmVjaG8gXCJoaVxuYnllXCJ9WzFdIgorICAgICAgICAgICAgICAgICAgICAgICAg ICAgICJieWVcbiIpKSkKKwogKGVydC1kZWZ0ZXN0IGVzaC12YXItdGVzdC9pbnRlcnAtdGVt cC1jbWQgKCkKICAgIkludGVycG9sYXRlIGNvbW1hbmQgcmVzdWx0IHJlZGlyZWN0ZWQgdG8g dGVtcCBmaWxlIgogICAoc2hvdWxkIChlcXVhbCAoZXNoZWxsLXRlc3QtY29tbWFuZC1yZXN1 bHQgImNhdCAkPGVjaG8gaGk+IikgImhpIikpKQpAQCAtMjgyLDEyICsyOTcsMjAgQEAgZXNo LXZhci10ZXN0L3F1b3RlZC1pbnRlcnAtbGlzcAogICAgICAgICAgICAgICAgICAgImVjaG8g XCJoaSAkKGNvbmNhdCBcXFwidGhlXFxcIiBcXFwicmVcXFwiKVwiIikKICAgICAgICAgICAg ICAgICAgImhpIHRoZXJlIikpKQogCisoZXJ0LWRlZnRlc3QgZXNoLXZhci10ZXN0L3F1b3Rl ZC1pbnRlcnAtbGlzcC1pbmRpY2VzICgpCisgICJJbnRlcnBvbGF0ZSBMaXNwIGZvcm0gZXZh bHVhdGlvbiB3aXRoIGluZGV4IgorICAoc2hvdWxkIChlcXVhbCAoZXNoZWxsLXRlc3QtY29t bWFuZC1yZXN1bHQgIisgXCIkKGxpc3QgMSAyKVsxXVwiIDMiKSA1KSkpCisKIChlcnQtZGVm dGVzdCBlc2gtdmFyLXRlc3QvcXVvdGVkLWludGVycC1jbWQgKCkKICAgIkludGVycG9sYXRl IGNvbW1hbmQgcmVzdWx0IGluc2lkZSBkb3VibGUtcXVvdGVzIgogICAoc2hvdWxkIChlcXVh bCAoZXNoZWxsLXRlc3QtY29tbWFuZC1yZXN1bHQKICAgICAgICAgICAgICAgICAgICJlY2hv IFwiaGkgJHtlY2hvIFxcXCJ0aGVyZVxcXCJ9XCIiKQogICAgICAgICAgICAgICAgICAiaGkg dGhlcmUiKSkpCiAKKyhlcnQtZGVmdGVzdCBlc2gtdmFyLXRlc3QvcXVvdGVkLWludGVycC1j bWQtaW5kaWNlcyAoKQorICAiSW50ZXJwb2xhdGUgY29tbWFuZCByZXN1bHQgd2l0aCBpbmRl eCBpbnNpZGUgZG91YmxlLXF1b3RlcyIKKyAgKHNob3VsZCAoZXF1YWwgKGVzaGVsbC10ZXN0 LWNvbW1hbmQtcmVzdWx0ICIrIFwiJHtsaXN0IDEgMn1bMV1cIiAzIikgNSkpKQorCiAoZXJ0 LWRlZnRlc3QgZXNoLXZhci10ZXN0L3F1b3RlZC1pbnRlcnAtdGVtcC1jbWQgKCkKICAgIklu dGVycG9sYXRlIGNvbW1hbmQgcmVzdWx0IHJlZGlyZWN0ZWQgdG8gdGVtcCBmaWxlIGluc2lk ZSBkb3VibGUtcXVvdGVzIgogICAoc2hvdWxkIChlcXVhbCAoZXNoZWxsLXRlc3QtY29tbWFu ZC1yZXN1bHQgImNhdCBcIiQ8ZWNobyBoaT5cIiIpICJoaSIpKSkKLS0gCjIuMjUuMQoK --------------D8D250BFC24698505D2BC74B-- From unknown Tue Aug 19 10:08:50 2025 X-Loop: help-debbugs@gnu.org Subject: bug#54227: 29.0.50; [PATCH] Inconsistencies with Eshell variable interpolation Resent-From: Eli Zaretskii Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Tue, 08 Mar 2022 13:58:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 54227 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch To: Jim Porter Cc: 54227@debbugs.gnu.org Received: via spool by 54227-submit@debbugs.gnu.org id=B54227.16467478333046 (code B ref 54227); Tue, 08 Mar 2022 13:58:01 +0000 Received: (at 54227) by debbugs.gnu.org; 8 Mar 2022 13:57:13 +0000 Received: from localhost ([127.0.0.1]:55560 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nRaKv-0000n4-F3 for submit@debbugs.gnu.org; Tue, 08 Mar 2022 08:57:13 -0500 Received: from eggs.gnu.org ([209.51.188.92]:42712) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nRaKt-0000ms-SC for 54227@debbugs.gnu.org; Tue, 08 Mar 2022 08:57:12 -0500 Received: from [2001:470:142:3::e] (port=38528 helo=fencepost.gnu.org) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nRaKo-0005tu-Ck; Tue, 08 Mar 2022 08:57:06 -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=kAaDNFSLZ6TiWM89uW+t9dAfTEavniNZNISwjWoBSVc=; b=CGb4ysfXkNB6 YcTLp9kSPaIJ5e7YNLqwYPScmc1fqJFRa9lZhrNA3o9vQ5hwjRxq0IRS0DwYGOHgxwcXDxMjJPWRh F2U5o8VAPZjfoBvLmJbqPh6fCo65arxFe/qgzqytciqBLvfkNKJbJzqguzUIvZNvbl6mjo8vH3XNi nHMhKODhmwuf4sZ27Arx2KXzN3fGDXigvQ8e06+0G0gtU6+oktj3SILTmz+O4vrhgQbn828j63tvM e4+v22Ala2JviSqCxOs2802yq55KeuB9CWMdiu/vrGAnHKwl6fILUfU3ER75zicYPH7Iscxi1C+Vg 00PoFeOtOM0u6umeNf2a4A==; Received: from [87.69.77.57] (port=1912 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 1nRaKm-0007wk-Jn; Tue, 08 Mar 2022 08:57:05 -0500 Date: Tue, 08 Mar 2022 15:56:57 +0200 Message-Id: <83bkygfsye.fsf@gnu.org> From: Eli Zaretskii In-Reply-To: <18835061-d853-f4b7-36db-71284024f221@gmail.com> (message from Jim Porter on Mon, 7 Mar 2022 19:38:12 -0800) References: <831qzjj7dd.fsf@gnu.org> <83r17ij2rh.fsf@gnu.org> <6f4c480d-90ea-fbb4-ae5c-dc07dd32026e@gmail.com> <83o82mizmx.fsf@gnu.org> <25921c41-e6ac-7cf8-d17e-d1b5e8a2ff68@gmail.com> <37edacda-dfa5-225e-258d-5330c6d522e2@gmail.com> <83tuc9gc16.fsf@gnu.org> <18835061-d853-f4b7-36db-71284024f221@gmail.com> X-Spam-Score: -2.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: -3.3 (---) > Cc: 54227@debbugs.gnu.org > From: Jim Porter > Date: Mon, 7 Mar 2022 19:38:12 -0800 > > > Also, it's suppoed to be @var{i}, as in the other alternatives. > > Thanks, fixed. > > >> +@item anything else > >> +Raises an error. > > > > We say "Signals an error". > > Fixed there, and in the entry below about the '$#foo' syntax. Thanks, installed on the master branch.