From: ntzrmtthihu777 <ntzrmtthihu777@gmail.com>
Date: Fri, 15 Jul 2016 08:59:45 +0000 (-0500)
Subject: zsh-completion: fix option ordering in set-x11-keymap (#3646)
X-Git-Tag: v231~61
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b010a6a1ae8f3b6903a51513eaecc8de163cf9b5;p=thirdparty%2Fsystemd.git

zsh-completion: fix option ordering in set-x11-keymap (#3646)
---

diff --git a/shell-completion/zsh/_localectl b/shell-completion/zsh/_localectl
index d8af4d18637..54c2d456e41 100644
--- a/shell-completion/zsh/_localectl
+++ b/shell-completion/zsh/_localectl
@@ -36,8 +36,8 @@ _localectl_set-x11-keymap() {
         local _xorg_lst
         _xorg_lst=${"$($commands[pkg-config] xkeyboard-config --variable=xkb_base)"}
         _file=( ${(ps:\n\!:)"$(<$_xorg_lst/rules/xorg.lst)"} )
-        _layout=( ${${${(M)${(f)_file[1]}:#  *}#  }%% *} )
-        _model=( ${${${(M)${(f)_file[2]}:#  *}#  }%% *} )
+        _layout=( ${${${(M)${(f)_file[2]}:#  *}#  }%% *} )
+        _model=( ${${${(M)${(f)_file[1]}:#  *}#  }%% *} )
         _variant=( ${${${(M)${(f)_file[3]}:#  *}#  }%% *} )
         _options=( ${${${(M)${(f)_file[4]}:#  *}#  }%% *} )
         #_layout=( ${(f)"$( echo $_file[1] | awk '/^  / {print $1}' )"} )