From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Jim Porter Newsgroups: gmane.emacs.bugs Subject: bug#54470: 29.0.50; [PATCH] Add documentation/tests for Eshell argument expansion Date: Fri, 15 Apr 2022 21:57:02 -0700 Message-ID: <25d222b3-9633-708e-6ac7-568c7a89e806@gmail.com> References: <83bky1f6jk.fsf@gnu.org> <83k0ca7fo6.fsf@gnu.org> <83zgkm1p4v.fsf@gnu.org> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="------------4017CB4689B6014B2155B87C" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="30868"; mail-complaints-to="usenet@ciao.gmane.io" Cc: 54470@debbugs.gnu.org To: Eli Zaretskii Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Sat Apr 16 06:58:20 2022 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1nfaVn-0007v8-Dn for geb-bug-gnu-emacs@m.gmane-mx.org; Sat, 16 Apr 2022 06:58:19 +0200 Original-Received: from localhost ([::1]:40408 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nfaVm-0006yM-1G for geb-bug-gnu-emacs@m.gmane-mx.org; Sat, 16 Apr 2022 00:58:18 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:58942) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nfaVW-0006yE-Pd for bug-gnu-emacs@gnu.org; Sat, 16 Apr 2022 00:58:02 -0400 Original-Received: from debbugs.gnu.org ([209.51.188.43]:38484) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nfaVW-0002iD-HW for bug-gnu-emacs@gnu.org; Sat, 16 Apr 2022 00:58:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nfaVW-0004pf-AI for bug-gnu-emacs@gnu.org; Sat, 16 Apr 2022 00:58:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Jim Porter Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sat, 16 Apr 2022 04:58:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 54470 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch Original-Received: via spool by 54470-submit@debbugs.gnu.org id=B54470.165008503118512 (code B ref 54470); Sat, 16 Apr 2022 04:58:02 +0000 Original-Received: (at 54470) by debbugs.gnu.org; 16 Apr 2022 04:57:11 +0000 Original-Received: from localhost ([127.0.0.1]:60614 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nfaUg-0004oV-TI for submit@debbugs.gnu.org; Sat, 16 Apr 2022 00:57:11 -0400 Original-Received: from mail-pj1-f53.google.com ([209.85.216.53]:50849) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nfaUf-0004oG-C1 for 54470@debbugs.gnu.org; Sat, 16 Apr 2022 00:57:09 -0400 Original-Received: by mail-pj1-f53.google.com with SMTP id o5so9035724pjr.0 for <54470@debbugs.gnu.org>; Fri, 15 Apr 2022 21:57:09 -0700 (PDT) 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=C3m3C2ZZXn1afQw/DMmJOY+8NLEP05ix38CV0bSE4fg=; b=hCr0qTwwaGYgROn+XJjXYZ35N00HrcgQKY/My4b+HlkPKhM9hm7PQE48zLe6wRMQat zoo7FwZy+8RBqQ8rUsmlOE6oMzXkknWUEQgQ5qdA3kHuBi2OC2191xW8sClLDYHxQdTw etLg3PNc8VPnht41ds38y5rZYNF6lNlbZTgG26/jNu0Lepac4FrMRvN7MMts02w2QauR iNTwbrcjz74arLZ/RZCAAZWla62NCXLKl1nD1Q+r4Rmkgf1xGP58IVyN9n6G4yxfthpL /I3kMjoXPol+Mro7mtI8WypR2ueWnWgyHCGFH6Naud/eAeLE1mghojXQG+5a1eztT14R fmww== 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=C3m3C2ZZXn1afQw/DMmJOY+8NLEP05ix38CV0bSE4fg=; b=TyRSyo1pQtGrkuUoung7z7WBtr79wCAtcF9geLkJ1oHfkJ41ynF81FvrYmKQCWLl8g Rmmb37uldFVgx2ixBKyhXXxL6AfOzA7pbt9RFv+Loag1sU1SV4+iRDRr+IoM57eaG/7G FFjzFEuDnFIOKuypJ6BpIVB9RHTDPpP2ShePgzUOgXbydkgvFhWy4O5GT9LwLFjGEJyh 79zhtaBHBj5LJKG40zNuCFgmsgZRT7Qdyo/IcVZzg4tC7uCCv57gzC4QljROTiJx1SbW NoknHViqQOdJ3U8jso6i77FaAYQOHi0yPNoIcgGWtpv0qKWfjd8mtQVr5VoQO66mdLhD 71Zw== X-Gm-Message-State: AOAM533HsbtMsT1EAnrhUukk6apj+x6DwMRObt0RNxhmmH+VmKMds9/o g8eQtxY8a6xxCoP9lIXxAI0qDIboaP8= X-Google-Smtp-Source: ABdhPJzwV+R+AhG3dP3KXiE/zRfB6NfF+STHL6p5UGDVl3/frnQGhcArstUHC6NrXPeV4qNiQw11IA== X-Received: by 2002:a17:902:a710:b0:156:5650:f94a with SMTP id w16-20020a170902a71000b001565650f94amr2126122plq.86.1650085023395; Fri, 15 Apr 2022 21:57:03 -0700 (PDT) Original-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 b12-20020a17090aa58c00b001ca977b49d5sm6273436pjq.31.2022.04.15.21.57.02 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 15 Apr 2022 21:57:02 -0700 (PDT) In-Reply-To: <83zgkm1p4v.fsf@gnu.org> Content-Language: en-US X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Original-Sender: "bug-gnu-emacs" Xref: news.gmane.io gmane.emacs.bugs:229954 Archived-At: This is a multi-part message in MIME format. --------------4017CB4689B6014B2155B87C Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit On 4/15/2022 5:56 AM, Eli Zaretskii wrote: >> Cc: 54470@debbugs.gnu.org >> From: Jim Porter >> Date: Fri, 1 Apr 2022 22:10:07 -0700 >> >>> @kbd is right for things that are meant specifically and only as >>> keyboard input. >> >> Thanks for the explanation. >> >> Having thought this over further, I think Eli's suggestion to use @samp >> makes sense for both the globs and the predicates/modifiers, so I've >> updated my patches to do this. > > Thanks. I was about to install these, but then I saw that some of > the tests you added fail on my system: [snip] Thanks for testing. I think this is because `eshell-file-attributes' calls `expand-file-name' on the FILE argument, which prepends a drive letter on MS Windows. That makes my code in `eshell-partial-let-func' (in em-pred-tests.el) fail to identify the fake files. Can you try the attached patch to see if the tests pass? If it works, I'll fold it into the previous patches and resubmit them. (It works for me on an MS Windows system, but I don't have build tools on it, so I just used the binary release of 28.1 with some of the bits copied from my patches to test it out.) There are a few other ways I could fix this, but this seemed like the best. Now, if `eshell-file-attributes' calls `file-attributes', it always forwards the FILE argument unchanged, so the wrapping is more "transparent" in that case. (Note: I'm not sure `eshell-file-attributes' is even necessary anymore; maybe Tramp handles that for us? I haven't tested this enough to be confident we can remove it though...) --------------4017CB4689B6014B2155B87C Content-Type: text/plain; charset=UTF-8; name="fix-ms-windows-tests.patch" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="fix-ms-windows-tests.patch" ZGlmZiAtLWdpdCBhL2xpc3AvZXNoZWxsL2VzaC11dGlsLmVsIGIvbGlzcC9lc2hlbGwvZXNo LXV0aWwuZWwKaW5kZXggODA4OWQ0ZDc0Yi4uM2RhNzEyYzcxOSAxMDA2NDQKLS0tIGEvbGlz cC9lc2hlbGwvZXNoLXV0aWwuZWwKKysrIGIvbGlzcC9lc2hlbGwvZXNoLXV0aWwuZWwKQEAg LTU5MiwxMSArNTkyLDExIEBAIGVzaGVsbC1maWxlLWF0dHJpYnV0ZXMKIFRoZSBvcHRpb25h bCBhcmd1bWVudCBJRC1GT1JNQVQgc3BlY2lmaWVzIHRoZSBwcmVmZXJyZWQgdWlkIGFuZAog Z2lkIGZvcm1hdC4gIFZhbGlkIHZhbHVlcyBhcmUgYHN0cmluZycgYW5kIGBpbnRlZ2VyJywg ZGVmYXVsdGluZyB0bwogYGludGVnZXInLiAgU2VlIGBmaWxlLWF0dHJpYnV0ZXMnLiIKLSAg KGxldCogKChmaWxlIChleHBhbmQtZmlsZS1uYW1lIGZpbGUpKQorICAobGV0KiAoKGV4cGFu ZGVkLWZpbGUgKGV4cGFuZC1maWxlLW5hbWUgZmlsZSkpCiAJIGVudHJ5KQotICAgIChpZiAo c3RyaW5nLWVxdWFsIChmaWxlLXJlbW90ZS1wIGZpbGUgJ21ldGhvZCkgImZ0cCIpCi0JKGxl dCAoKGJhc2UgKGZpbGUtbmFtZS1ub25kaXJlY3RvcnkgZmlsZSkpCi0JICAgICAgKGRpciAo ZmlsZS1uYW1lLWRpcmVjdG9yeSBmaWxlKSkpCisgICAgKGlmIChzdHJpbmctZXF1YWwgKGZp bGUtcmVtb3RlLXAgZXhwYW5kZWQtZmlsZSAnbWV0aG9kKSAiZnRwIikKKwkobGV0ICgoYmFz ZSAoZmlsZS1uYW1lLW5vbmRpcmVjdG9yeSBleHBhbmRlZC1maWxlKSkKKwkgICAgICAoZGly IChmaWxlLW5hbWUtZGlyZWN0b3J5IGV4cGFuZGVkLWZpbGUpKSkKIAkgIChpZiAoc3RyaW5n LWVxdWFsICIiIGJhc2UpIChzZXRxIGJhc2UgIi4iKSkKIAkgICh1bmxlc3MgZW50cnkKIAkg ICAgKHNldHEgZW50cnkgKGVzaGVsbC1wYXJzZS1hbmdlLWxzIGRpcikpCg== --------------4017CB4689B6014B2155B87C--