diff options
| author | Andrew Janke <andrew@apjanke.net> | 2015-09-28 08:52:03 -0400 |
|---|---|---|
| committer | Andrew Janke <andrew@apjanke.net> | 2015-09-28 08:52:03 -0400 |
| commit | e4fdb083655fc582ebcecb07cd1bd1130077f0e4 (patch) | |
| tree | fee07d9adfee79d1c88206ead154a23520ac51cb /plugins/emoji/emoji.plugin.zsh | |
| parent | 5c8b0cc0c1782b34790548498018fb9e0300992b (diff) | |
| parent | b05ef1034fffd7b0c29f1558a8a357ccce7ae74b (diff) | |
| download | zsh-e4fdb083655fc582ebcecb07cd1bd1130077f0e4.tar.gz zsh-e4fdb083655fc582ebcecb07cd1bd1130077f0e4.tar.bz2 zsh-e4fdb083655fc582ebcecb07cd1bd1130077f0e4.zip | |
Merge branch 'master' into copyfile-portability
Diffstat (limited to 'plugins/emoji/emoji.plugin.zsh')
| -rw-r--r-- | plugins/emoji/emoji.plugin.zsh | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/plugins/emoji/emoji.plugin.zsh b/plugins/emoji/emoji.plugin.zsh index a98d0b714..7876f1c89 100644 --- a/plugins/emoji/emoji.plugin.zsh +++ b/plugins/emoji/emoji.plugin.zsh @@ -76,8 +76,6 @@ emoji_skintone[6]=$'\U1F3FF' # These are stored in a single associative array, $emoji_groups, to avoid cluttering up the global # namespace, and to allow adding additional group definitions at run time. # The keys are the group names, and the values are whitespace-separated lists of emoji character names. -# -# These extra local arrays are used to allow more convenient formatting of the source code. emoji_groups[fruits]=" tomato @@ -255,9 +253,10 @@ function random_emoji() { if [[ -z "$group" || "$group" == "all" ]]; then names=(${(k)emoji}) else - names=(${=emoji_groups[$group_name]}) + names=(${=emoji_groups[$group]}) fi - local list_size=$#names + local list_size=${#names} + [[ $list_size -eq 0 ]] && return 1 local random_index=$(( ( RANDOM % $list_size ) + 1 )) local name=${names[$random_index]} echo ${emoji[$name]} |