From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 140 invoked by alias); 29 Jun 2018 08:33:32 -0000 Mailing-List: contact zsh-users-help@zsh.org; run by ezmlm Precedence: bulk X-No-Archive: yes List-Id: Zsh Users List List-Post: List-Help: List-Unsubscribe: X-Seq: 23519 Received: (qmail 944 invoked by uid 1010); 29 Jun 2018 08:33:32 -0000 X-Qmail-Scanner-Diagnostics: from mailout2.w1.samsung.com by f.primenet.com.au (envelope-from , uid 7791) with qmail-scanner-2.11 (clamdscan: 0.99.2/21882. spamassassin: 3.4.1. Clear:RC:0(210.118.77.12):SA:0(-6.9/5.0):. Processed in 1.464807 secs); 29 Jun 2018 08:33:32 -0000 X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on f.primenet.com.au X-Spam-Level: X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_HI, SPF_HELO_PASS,SPF_PASS,T_DKIMWL_WL_HIGH,T_DKIM_INVALID autolearn=ham autolearn_force=no version=3.4.1 X-Envelope-From: p.stephenson@samsung.com X-Qmail-Scanner-Mime-Attachments: | X-Qmail-Scanner-Zip-Files: | DKIM-Filter: OpenDKIM Filter v2.11.0 mailout2.w1.samsung.com 20180629083326euoutp02246a7b4ca32b4071b5ff7e4a9d2b4215~8lHWeNUQx1961419614euoutp02c DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1530261206; bh=c7OJh9swg1/bzJ4EimUuwZ4gL+JYxLEA9C39FfynJE8=; h=Date:From:To:Subject:In-Reply-To:References:From; b=imEVQ7WxhDAY1gpB5XtE9wf8oV4ehHexZe9KE2ILl07DTW2H/MH3pQ8a2Ln/ozefa rlJ2TG+HlYNx72By0MJ8SN6AFE3xJe3exwd2JOZLE+nVH0FCdUR1rcGSJ2tSQI/llc Sw3hdI6SRYM2Y/ehGIM2gyJ6QcRgp2Kl05acxR2U= X-AuditID: cbfec7f5-f95739c0000028a9-90-5b35eed5328d Date: Fri, 29 Jun 2018 09:33:22 +0100 From: Peter Stephenson To: Zsh Users Subject: Re: scp completion options In-Reply-To: <20180627091514.22955a04@camnpupstephen.cam.scsc.local> Organization: SCSC X-Mailer: Claws Mail 3.13.2 (GTK+ 2.24.30; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Brightmail-Tracker: H4sIAAAAAAAAA02SbUhTYRTHe+69zrvh1WdT8KCCOCnSUFtpGJUlLOqT2LdQSG95mZKbcu+2 1A9lBSkmMke+ZxoSpQnGSp1hWSObouGsxioFFfpgvq5FvoRoblfLb7//Of//ec6BhyYVbiqM ztPpOV7H5islMqrn/fpYnHMpKfNwxYeAZOtwOzqDzne8dRPpKEN2MofLzzNyfEJKtix3bdxD FVbLi9wj436laJ6pQFIacCK8+jVJVCAZrcBPEDyfcvmLopKAmjkXEsVdAhp+tJG7kRrXoERs PEYwXemU/HNND3wjRTGKYPnB6o5wIKgb6KK8eQrvh+V+k48lWAU1libk5RAcBaN/VggvB+No ePqszc/LUqwGp2t1m2k6CCvAcfuUuMZpGOwf9tkZLIfhhu++kSSOhN7F+753AS9LYNZsQqLJ CM2zHiSG1eD+VOYvcjDM2V/scARs9bUQYrgMQad53l8UlQgsg5M76RNQNTGOvBuROAa6XiaI 5VSYsU9R3jLgQPiyKBcXCgRzTx0plhkov6MQ3QfAeqsbmVB0454TGvec0Ph/fisiO1AoZxC0 Gk44quOuxQusVjDoNPFXCrQWtP0PRjbtv63o9cZlG8I0UgYwQ58TMxV+rFEo1toQ0KQyhGG7 kjIVTA5bXMLxBVm8IZ8TbCicppShzKWD1zMUWMPquascV8jxu12CloaVosRDtum1+YU3Fy33 Qouyb1pN0W0fHfuqzi1MWFVLqljHSmdfPZ/V+07i1rR+1YUZI8fS9LXhtc031E5LQAnV/nAz zb5FDW1YuO6tRe2RHEEfaG4ZkQeVpx6vVhk81gjdsUe53NmO+pTkVlhXpqujmmLWLqQKHk3a z54ZdZySEnJZVSzJC+xf8ABaCwMDAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFuphkeLIzCtJLcpLzFFi42I5/e/4Xd0r70yjDRr+SlrsOLmS0YHRY9XB D0wBjFF6NkX5pSWpChn5xSW2StGGFkZ6hpYWekYmlnqGxuaxVkamSvp2NimpOZllqUX6dgl6 GT8ufmIpmChY8eH0RdYGxte8XYycHBICJhJTrx9lA7GFBJYySuzbqgMRl5H4dOUjO4QtLPHn WhdQDRdQTSeTxPIdB6AazjBK/N+SCJG4wCjxcvYpsASLgKrE+z0TWEBsNgFDiambZjOC2CIC ihJnfn1jArGFBZQlVm9YzApi8wo4Sxy6dBGsnlPAReLq9e+sEEP3MErsfXcPqJmDg19ASOJC sy3ERfYSR/ecZILoFZQ4OfMJWC+zgI7EiVXHmCFseYntb+cwT2AUnoWkbBaSsllIyhYwMq9i FEktLc5Nzy020itOzC0uzUvXS87P3cQIjIltx35u2cHY9S74EKMAB6MSD++JKybRQqyJZcWV uYcYJTiYlUR4E9ebRgvxpiRWVqUW5ccXleakFh9iNAUGxkRmKdHkfGC85pXEG5oamltYGpob mxubWSiJ8543qIwSEkhPLEnNTk0tSC2C6WPi4JRqYPSVuRSwTqz1vHP3pv818Z/PLPr1aOaV nT/FUs+bP35g+UlhR1s455XlbgYGB/7GHEk/5NB0LWM1B++nE5sXzpgby9RvwaPXls2vKhry ydH457TkZQlVzUpeosxlpZzX5j4vXnk+7oF/rEqKZRPz/NpSwTNMJ53ckr7Uciu3ht293cBt d5hvshJLcUaioRZzUXEiAHJiu7CfAgAA Message-Id: <20180629083324eucas1p186be36055bfc764f4d7bc884235beebd~8lHVA-nVD2372623726eucas1p1k@eucas1p1.samsung.com> X-CMS-MailID: 20180629083324eucas1p186be36055bfc764f4d7bc884235beebd X-Msg-Generator: CA Content-Type: text/plain; charset="utf-8" X-RootMTR: 20180626231957epcas4p275197b8b1b133496936cd1e2a59d15b6 X-EPHeader: CA CMS-TYPE: 201P X-CMS-RootMailID: 20180626231957epcas4p275197b8b1b133496936cd1e2a59d15b6 References: <20180626230654.GK11049@blackswan> <20180627091514.22955a04@camnpupstephen.cam.scsc.local> On Wed, 27 Jun 2018 09:15:14 +0100 Peter Stephenson wrote: >.., > But actually I don't see how to get this to work in the case you're > talking about (hence the question marks), because the tag for remote > files is just 'files' so will allow it to complete local files. This > looks to me like a mistake, and _remote_files should arrange for a > different tag. > > I may be missing something, but if I'm not, changing _remote_files > ought to be easy. This does appear to do the trick. I propose to submit this. pws diff --git a/Completion/Unix/Type/_remote_files b/Completion/Unix/Type/_remote_files index a5fce9a..267715a 100644 --- a/Completion/Unix/Type/_remote_files +++ b/Completion/Unix/Type/_remote_files @@ -75,9 +75,9 @@ if zstyle -T ":completion:${curcontext}:files" remote-access; then remdispf=( ${(M)remdispf:#${~glob[2]}} ) fi - _tags files + _tags remote-files while _tags; do - while _next_label files expl ${suf:-remote directory}; do + while _next_label remote-files expl ${suf:-remote directory}; do [[ -n $suf ]] && compadd "$args[@]" "$expl[@]" -d remdispf -- ${(q)remdispf%[*=|]} && ret=0 compadd ${suf:+-S/} -r "/ \t\n\-" "$args[@]" "$expl[@]" -d remdispd \ diff --git a/README b/README index 2cf2266..fd4c59e 100644 --- a/README +++ b/README @@ -32,9 +32,17 @@ Zsh is a shell with lots of features. For a list of some of these, see the file FEATURES, and for the latest changes see NEWS. For more details, see the documentation. -Incompatibilities since 5.4.2 +Incompatibilities since 5.5.1 ----------------------------- +The completion helper _remote_files, typically used after a hostname +with scp-style completion, now uses remote-files instead of files as a +tag. This makes it easier to restrict completions with the tag-order +style. + +Incompatibilities between 5.4.2 and 5.5.1 +----------------------------------------- + 1) The default build-time maximum nested function depth has been decreased from 1000 to 500 based on user experience. However, it can now be changed at run time via the variable FUNCNEST.