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: X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on f.primenet.com.au X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=ham autolearn_force=no version=3.4.1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:reply-to:subject:references:to:cc:from :organization:message-id:date:user-agent:mime-version:in-reply-to :content-transfer-encoding; bh=4u+i2vjYJO7a3NJtwOUnMnsXogCHr4KkgkVxIpIJuLE=; b=LR6LfLo1ckXVsFVLRYRQ7/UIbTYC2VDZUDsmus2e7iEQihh/3NNbBii5BXeuz+ZTeb cRofJEO7tRosRqlxFbSen5yWuhZ/J6fkslIChMVnlR+tCdq9PgLJT655WaXe9AcTKyAp kOmTg/HB0w5XUyqAVUnWCZF6z2HgHRE1BTKoMe2NAPBJ+BdEq+L1m1+El2Y/BK64rl26 q1ZT4F9AC+syPFGhcqEVExhdIanzqpTuxza80qQVNKiCjdMy9NKm39BENbGvi/qZc9I3 /5xZ46YSz06Bop66CibprrLlj9fcq8s3jT34mp+54yz5tH5laA1DBn6QKI+xXMXYEuse E81A== X-Gm-Message-State: AOPr4FWa223T6RulymbnGb8fZK3L0xuD1ecjVCS/gR2ZdGt5I/LTkoeqKE27MgR/xOTuaLzq X-Received: by 10.194.64.35 with SMTP id l3mr38911966wjs.180.1462894326543; Tue, 10 May 2016 08:32:06 -0700 (PDT) Reply-To: Marko Myllynen Subject: Re: [PATCH] zsh locale completion References: <573088A4.3020204@redhat.com> <20160509221458.GA30922@tarsus.local2> To: Daniel Shahaf Cc: zsh-workers@zsh.org From: Marko Myllynen Organization: Red Hat Message-ID: <5731FEF4.7000306@redhat.com> Date: Tue, 10 May 2016 18:32:04 +0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.7.0 MIME-Version: 1.0 In-Reply-To: <20160509221458.GA30922@tarsus.local2> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Seq: zsh-workers 38462 Hi, On 2016-05-10 01:14, Daniel Shahaf wrote: > Marko Myllynen wrote on Mon, May 09, 2016 at 15:55:00 +0300: >> +++ b/Completion/Unix/Command/_locale >> @@ -0,0 +1,28 @@ >> +local curcontext="$curcontext" state line expl ret=1 > ⋮ >> +_arguments -A -C -S -s \ > ⋮ >> + '*:name:->catkey' \ >> + && return=0 > > Typo: s/return/ret/ Good catch - updated patch below. It seems that using return is required as otherwise we end up inside the if-statement even in cases like locale -. --- Completion/Unix/Command/_locale | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 Completion/Unix/Command/_locale diff --git a/Completion/Unix/Command/_locale b/Completion/Unix/Command/_locale new file mode 100644 index 0000000..af6e90c --- /dev/null +++ b/Completion/Unix/Command/_locale @@ -0,0 +1,28 @@ +#compdef locale + +local curcontext="$curcontext" state line expl ret=1 +local exargs="-? --help --usage -V --version" + +_arguments -A -C -S -s \ + '(- *)'{-\?,--help}'[display help information]' \ + '(- *)--usage[display a short usage message]' \ + '(- *)'{-V,--version}'[print program version]' \ + - set1 \ + "(-a --all-locales $exargs)"{-a,--all-locales}'[list all available locales]' \ + "(-v --verbose $exargs)"{-v,--verbose}'[display additional information]' \ + - set2 \ + "(-m --charmaps $exargs)"{-m,--charmaps}'[list all available charmaps]' \ + - set3 \ + "(-c --category-name $exargs)"{-c,--category-name}'[print also locale category]' \ + "(-k --keyword-name $exargs)"{-k,--keyword-name}'[print also keyword of each value]' \ + '*:name:->catkey' \ + && return 0 + +if [[ $state == catkey ]]; then + typeset -a cats keys + cats=( ${${${(f)"$(locale)"}%=*}%(LANG|LANGUAGE|LC_ALL)} ) + keys=( ${${(f)"$(locale -k $cats 2>/dev/null)"}%=*} ) + _wanted values expl name compadd "$@" -a - cats keys && ret=0 +fi + +return ret Thanks, -- Marko Myllynen