X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=shell-completion%2Fzsh%2F_localectl;h=c04f4f3109c7f66d386c6d7d429fd658c9d54dd3;hp=321e418b5089841ee37fcd5db642b67417faac32;hb=627a98d39844a1ac10fde1f72cf18b4f08be4990;hpb=3e7f60ab32fc2a7d5244d10a0c4e1c3be838409d

diff --git a/shell-completion/zsh/_localectl b/shell-completion/zsh/_localectl
index 321e418b5..c04f4f310 100644
--- a/shell-completion/zsh/_localectl
+++ b/shell-completion/zsh/_localectl
@@ -1,17 +1,22 @@
 #compdef localectl
 
 _localectl_set-locale() {
-    local -a _confs _locales
+    local -a _locales locale_fields
+    locale_fields=(LANG LANGUAGE LC_CTYPE LC_NUMERIC LC_TIME \
+                   LC_COLLATE LC_MONETARY LC_MESSAGES LC_PAPER \
+                   LC_NAME LC_ADDRESS LC_TELEPHONE \
+                   LC_MEASUREMENT LC_IDENTIFICATION)
+    # LC_ALL is omitted on purpose
+
     local expl suf
     _locales=( ${(f)"$(_call_program locales "$service" list-locales)"} )
-    _confs=( ${${(f)"$(_call_program confs "locale 2>/dev/null")"}%\=*} )
+    compset -P1 '*='
     if [[ -prefix 1 *\= ]]; then
         local conf=${PREFIX%%\=*}
-        compset -P1 '*='
         _wanted locales expl "locales configs" \
             _combination localeconfs  confs=$conf locales "$@" -
     else
-        compadd -S '='  $_confs
+        compadd -S '=' $locale_fields
     fi
 }
 
@@ -79,5 +84,5 @@ _arguments \
     "--no-convert[Don't convert keyboard mappings]" \
     '--no-pager[Do not pipe output into a pager]' \
     '--no-ask-password[Do not prompt for password]' \
-    {-H,--host=}'[Operate on remote host]:userathost:_sd_hosts_or_user_at_host' \
+    {-H+,--host=}'[Operate on remote host]:userathost:_sd_hosts_or_user_at_host' \
     '*::localectl commands:_localectl_command'