diff options
| author | Robby Russell <robby@planetargon.com> | 2015-08-30 21:47:42 -0700 |
|---|---|---|
| committer | Robby Russell <robby@planetargon.com> | 2015-08-30 21:47:42 -0700 |
| commit | c10d5c8b7cd1ccb8ea2303cd7b9b48f04251ce66 (patch) | |
| tree | ba78c544649d987a17edf5cc6938d248ae1d3de3 /plugins/emoji | |
| parent | 69a17150ad3b594edb0d18c43371a1ca2e85edbe (diff) | |
| parent | 02383017268004c4873797c16a667389bead1b83 (diff) | |
| download | zsh-c10d5c8b7cd1ccb8ea2303cd7b9b48f04251ce66.tar.gz zsh-c10d5c8b7cd1ccb8ea2303cd7b9b48f04251ce66.tar.bz2 zsh-c10d5c8b7cd1ccb8ea2303cd7b9b48f04251ce66.zip | |
Merge pull request #4244 from Gnouc/master
Emoji plugin - Fix wrong string comparison
Diffstat (limited to 'plugins/emoji')
| -rw-r--r-- | plugins/emoji/emoji-char-definitions.zsh | 9 | ||||
| -rw-r--r-- | plugins/emoji/update_emoji.pl | 2 |
2 files changed, 10 insertions, 1 deletions
diff --git a/plugins/emoji/emoji-char-definitions.zsh b/plugins/emoji/emoji-char-definitions.zsh index 7d110603c..04693da05 100644 --- a/plugins/emoji/emoji-char-definitions.zsh +++ b/plugins/emoji/emoji-char-definitions.zsh @@ -7,8 +7,12 @@ # $emoji - which maps character names to Unicode characters # $emoji_flags - maps country names to Unicode flag characters using region indicators +# Main emoji typeset -gAH emoji +# National flags typeset -gAH emoji_flags +# Combining modifiers +typeset -gAH emoji_mod emoji[copyright_sign]=$'\U00A9' emoji[registered_sign]=$'\U00AE' @@ -448,10 +452,15 @@ emoji[badminton_racquet_and_shuttlecock]=$'\U1F3F8' emoji[bow_and_arrow]=$'\U1F3F9' emoji[amphora]=$'\U1F3FA' emoji[emoji_modifier_fitzpatrick_type_1_2]=$'\U1F3FB' +emoji_mod[emoji_modifier_fitzpatrick_type_1_2]=$'\U1F3FB' emoji[emoji_modifier_fitzpatrick_type_3]=$'\U1F3FC' +emoji_mod[emoji_modifier_fitzpatrick_type_3]=$'\U1F3FC' emoji[emoji_modifier_fitzpatrick_type_4]=$'\U1F3FD' +emoji_mod[emoji_modifier_fitzpatrick_type_4]=$'\U1F3FD' emoji[emoji_modifier_fitzpatrick_type_5]=$'\U1F3FE' +emoji_mod[emoji_modifier_fitzpatrick_type_5]=$'\U1F3FE' emoji[emoji_modifier_fitzpatrick_type_6]=$'\U1F3FF' +emoji_mod[emoji_modifier_fitzpatrick_type_6]=$'\U1F3FF' emoji[rat]=$'\U1F400' emoji[mouse]=$'\U1F401' emoji[ox]=$'\U1F402' diff --git a/plugins/emoji/update_emoji.pl b/plugins/emoji/update_emoji.pl index d90c6e316..04f3ce8e7 100644 --- a/plugins/emoji/update_emoji.pl +++ b/plugins/emoji/update_emoji.pl @@ -88,7 +88,7 @@ typeset -gAH emoji_mod } # Modifiers are included in both the main set and their separate map, # because they have a standalone representation as a color swatch. - if ( $modifier_status == "modifier" ) { + if ( $modifier_status eq "modifier" ) { $outfh->print("emoji_mod[$omz_name]=\$'$zsh_code'\n"); } } else { |