From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on inbox.vuxu.org X-Spam-Level: X-Spam-Status: No, score=-1.1 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=ham autolearn_force=no version=3.4.2 Received: from primenet.com.au (ns1.primenet.com.au [203.24.36.2]) by inbox.vuxu.org (OpenSMTPD) with ESMTP id dc8ad4c9 for ; Mon, 7 Oct 2019 09:14:58 +0000 (UTC) Received: (qmail 23760 invoked by alias); 7 Oct 2019 09:14:50 -0000 Mailing-List: contact zsh-workers-help@zsh.org; run by ezmlm Precedence: bulk X-No-Archive: yes List-Id: Zsh Workers List List-Post: List-Help: List-Unsubscribe: X-Seq: 44804 Received: (qmail 6138 invoked by uid 1010); 7 Oct 2019 09:14:50 -0000 X-Qmail-Scanner-Diagnostics: from park01.gkg.net by f.primenet.com.au (envelope-from , uid 7791) with qmail-scanner-2.11 (clamdscan: 0.101.2/25594. spamassassin: 3.4.2. Clear:RC:0(205.235.26.22):SA:0(-1.6/5.0):. Processed in 4.917709 secs); 07 Oct 2019 09:14:50 -0000 X-Envelope-From: SRS0=f6UE=YA=yahoo.co.uk=okiddle@bounces.park01.gkg.net X-Qmail-Scanner-Mime-Attachments: | X-Qmail-Scanner-Zip-Files: | Received-SPF: pass (ns1.primenet.com.au: SPF record at bounces.park01.gkg.net designates 205.235.26.22 as permitted sender) X-Virus-Scanned: by amavisd-new at gkg.net Authentication-Results: amavisd4.gkg.net (amavisd-new); dkim=pass (2048-bit key) header.d=yahoo.co.uk X-Greylist: domain auto-whitelisted by SQLgrey-1.8.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.co.uk; s=s2048; t=1570439630; bh=0EVRhfaoqpVLnKDHG4cps2HuNNwHIDEJHOwZTewETeM=; h=From:To:Subject:Date:From:Subject; b=RFQLWicARUI2a+s+SQXHDdzt3q8pfyyC6AglXCGCR2Xv0vpU3pTYkHN0CL+Q1jw7p3QQxnPFFC8TXi480gy4ZhjGhN4kxCrzBpvSqZ+NPH4pSaupBxYC2QwSFJd0J+udw6wDsDoKB3nKbM4pPx5aYTNQCniqgSQfrtoinW6+En0DvpRyUkviAiO1lpH72dy/NsWN8KjwBYJ5OJcx0Uun9gHlESM8ecz1nzg1FN8Ghkf3rCjFpwPtDX8Ni6Wv6hPOGVYOY9hhgznYJ+uGYKW9d1tGRyx1iWv2dNUiu1E5rqzGpCP/YnvDLV9bpVlLU/J5IHiRm+AZgV2y1Jumihm90Q== X-YMail-OSG: xErm6koVM1kbNKZ8Wdh86C.1DAe11bmnOio7UzuIJWF_0ZUX6_4sRS1LDRY3mHZ C88fUPRu8ZxgPDHAjke6FskFvYuAtqJX5Cf.qQFBpH7rnngrreBCsWkP0hUvijFz4LxgtKv9FtYS x0PnTzNUWobGkOmjH28WHK8L3dA9Zl3t1p6rabNxR30nQu2WLweN9ruAs5F69a3rISfoFmBkQu2_ K19eNfQ6xEn63q_cBZGDw29OKSNq3Ossp47L3o.E2k1nEEauHE4U4dGtTYI30HCCA5l5nVWoyEhl lGCDuE6kXrVLTwhxAoLYNMzCYEQTnYK4Nx4KkUvPz7eRacCieBxalwwU6v1A13eZgpsnyFHp7q2W sUvtLke.THqIECWjGMXV_fRhURt203w8evQqUbwH7LNXUCV2KErwxnmS.ZPl6CGxWWi5GOb2HAdw P6bCsxevBfNVVcsL10ORQSYqrIMUZHwxr8Ov.c5A9PEzMKrqe6HyV2NXTD.1W5fc_Ee2WIKjPYHT jVrrnGlZ1KVSFBiaoeitaJ745hR7K4Ntbv091ntfgaSnWwXojbKuPOfTinse47IKvwQ5mduwBxvN PMuBH6.BGENwHsxbj9cg2oclyLn.CFgR5H_ObYL0VSgsZiBDx.VdLMcJYRAhQFslQkaNU2IqGA13 tVQ5MuuUBV1.Qyor_h8jwqvm4sKaoAn9URRr6tsC7GV_N.OmxA5gDW0tOvBmhtbX_goWqEBV1cN5 VGgWBccPsh94zZopmmQGG_gZvvNAO8j_l8R1R7bBFDvCVunlGhBfURAkI2bdgyDnUUb1ZmCZzxRN inA5Pt1HjgMe29ZNX8.40mPfYWP4uUHPkY3pVCWqH39obbfO5tz5eddNefYMWJ3C8jvK33iALzPx 8gD0kTG8GIP.qAUxo7MgTg3cURZ_vhLXIvPdMUPA6SMWz704h2Y4M6A4FUR6o51DRMnsXqL.bP62 cYR4vt212zU7Tm.v3BkCzcoMb.pZugLvdWn0aEkbGFGWKUkafO_sUKkeIZ9TDyC88d3E.K52c6LD 6LKphxjDSJmGK4D6gd8i032bUe0LctZhaGjhMhb.JVKZM7RhicieoAnF4KYyKXxFI7KfClJG4j8W dqqsKNSpxev4CpmeiivcUIqStohAOr8sKDVAjgniHGmKYWB166ouCAor4ICIr6Hfu0nzHkI56YDO hR.eAOrEBmoFhynMKPpgWISQ.b2ciriVgqk4ppi_KIb4XzDTZeZUd0y4Co0tJt1x2gRtNo0yks5V R7ctCrmL0i95V2YIl9c_yX0xQp6rJDN2O1X3DzvIbmQM- From: Oliver Kiddle To: Zsh workers Subject: completion functions reorganisation and cleanup MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-ID: <60417.1570439627.1@hydra> Content-Transfer-Encoding: quoted-printable Date: Mon, 07 Oct 2019 11:13:47 +0200 Message-ID: <60418-1570439627.075514@NIya.iyMV.mGw3> We carry a few completion functions that have their own licence terms listed in their headers. In some cases packagers need to jump through hoops to accomodate this. There are probably also cases where they ought to but it has gone unnoticied. I'm not especially keen to be a stickler for licences but we might be doing some packagers a favour by making a clearer distinction. How about the following patch to add in an extra directory for completions that will NOT be installed by default? A configure option is there so tweaking of config.modules is not required. I have named the directory `Contrib' which isn't a particularly accurate description of its contents. If anything they are not contributed but the name might be a good match to expectations for the contents. Any better ideas would be good, though we should perhaps first decide on what the criteria should be for being moved to the non-Default-installed directory. Other criteria that come to mind are: - low quality, - poorly maintained, - obscure command - dead upstream We might also consider pulling in the whole zsh-completions project, perhaps updating periodically via git-subtree rather than with a view to replacing it. Differently licenced functions are: _hg, _qdbus, _osc, _darcs and _zypper.= = _hg is carried by upstream so I would suggest we just remove it. The same applies to _notmuch (and possibly _git-buildpackage - that needs verifying= on Debian). _osc and _zypper would be good candidates for trying to persuade upstream to take them. Where the upstream projects are dead, there may be users around long afterwards so I'm not sure I would be too quick to remove completions. They also have the advantage of being stable and not breaking our completions. But functions for dead projects, that I would suggest removing include: prcs - this was fairly well known 20 years ago and the completion is good quality (by Sven) but appears to be very dead vux uzbl flasher elm tpconfig sablotron - not sure, sources still there on sourceforge but not packaged raggle - website only down since Feb 2016, not in Debian aap, cplay, totd also seem to be dead but still are packaged on either Debian or FreeBSD so should perhaps be kept. Should we just remove these? Or perhaps announce for 5.8 that they will go in 5.9? Any individual objections, or additions. The only thing that really comes to mind for the "obscure command" criteria is mysqldiff. Sadly for "poorly maintained" there are quite a few. Oliver diff --git a/INSTALL b/INSTALL index cf70893a7..9edcc63f6 100644 --- a/INSTALL +++ b/INSTALL @@ -479,6 +479,12 @@ want; in particular, the zsh/complete and zsh/zftp mo= dules are of much less use without the associated functions. The functions listed with zsh/zle are not used by the editor unless you explicitly load them, however. = +Some of the completion functions have been separated out into a `Contrib' +directory where they are licenced under different terms to the rest of th= e +zsh distribution - see the headers of individual files for details. Thes= e +are not installed by default but you can use the configure option +--enable-contrib-completions to include them in config.modules. + You can also use the configure option --enable-function-subdirs to allow shell functions to be installed into subdirectories of the function directory, i.e. `Base/*' files will be installed into `FNDIR/Base, and so diff --git a/Src/Zle/complete.mdd b/Src/Zle/complete.mdd index 77e33504d..93e9084dc 100644 --- a/Src/Zle/complete.mdd +++ b/Src/Zle/complete.mdd @@ -1,8 +1,7 @@ name=3Dzsh/complete link=3Deither load=3Dyes -functions=3D'Completion/*comp* Completion/AIX/*/* Completion/BSD/*/* Comp= letion/Base/*/* Completion/Cygwin/*/* Completion/Darwin/*/* Completion/Deb= ian/*/* Completion/Linux/*/* Completion/Mandriva/*/* Completion/Redhat/*/*= Completion/Solaris/*/* Completion/openSUSE/*/* Completion/Unix/*/* Comple= tion/X/*/* Completion/Zsh/*/*' - +functions=3D'Completion/*comp* Completion/AIX/*/* Completion/BSD/*/* Comp= letion/Base/*/* Completion/Cygwin/*/* Completion/Darwin/*/* Completion/Deb= ian/*/* Completion/Linux/*/* Completion/Mandriva/*/* Completion/Redhat/*/*= Completion/Solaris/*/* Completion/openSUSE/*/* Completion/Unix/*/* Comple= tion/X/*/*'`if test x$enable_contrib_completions =3D xyes; then echo " Com= pletion/Contrib/*/*"; fi` moddeps=3D"zsh/zle" = autofeatures=3D"b:compadd b:compset c:prefix c:suffix c:between c:after" diff --git a/configure.ac b/configure.ac index 8a2664ed2..8c8790767 100644 --- a/configure.ac +++ b/configure.ac @@ -344,6 +344,9 @@ else FUNCTIONS_SUBDIRS=3Dno fi = +AC_ARG_ENABLE(contrib-completions, +AS_HELP_STRING([--enable-contrib-completions],[install additional complet= ion functions])) + ifdef([additionalfpath],[undefine([additionalfpath])])dnl AC_ARG_ENABLE(additional-fpath, AS_HELP_STRING([--enable-additional-fpath=3DDIR],[add directories to defa= ult function path]),