02383017268004c4873797c16a667389bead1b83

 1diff --git a/plugins/emoji/emoji-char-definitions.zsh b/plugins/emoji/emoji-char-definitions.zsh
 2index 7d110603ceb4d7b579acaf8f12f4cea3e2b05833..04693da0593b98620161e2d52aaeba3115d953c9 100644
 3--- a/plugins/emoji/emoji-char-definitions.zsh
 4+++ b/plugins/emoji/emoji-char-definitions.zsh
 5@@ -7,8 +7,12 @@
 6 #   $emoji         - which maps character names to Unicode characters
 7 #   $emoji_flags   - maps country names to Unicode flag characters using region indicators 
 8 
 9+# Main emoji
10 typeset -gAH emoji
11+# National flags
12 typeset -gAH emoji_flags
13+# Combining modifiers
14+typeset -gAH emoji_mod
15 
16 emoji[copyright_sign]=$'\U00A9'
17 emoji[registered_sign]=$'\U00AE'
18@@ -448,10 +452,15 @@ emoji[badminton_racquet_and_shuttlecock]=$'\U1F3F8'
19 emoji[bow_and_arrow]=$'\U1F3F9'
20 emoji[amphora]=$'\U1F3FA'
21 emoji[emoji_modifier_fitzpatrick_type_1_2]=$'\U1F3FB'
22+emoji_mod[emoji_modifier_fitzpatrick_type_1_2]=$'\U1F3FB'
23 emoji[emoji_modifier_fitzpatrick_type_3]=$'\U1F3FC'
24+emoji_mod[emoji_modifier_fitzpatrick_type_3]=$'\U1F3FC'
25 emoji[emoji_modifier_fitzpatrick_type_4]=$'\U1F3FD'
26+emoji_mod[emoji_modifier_fitzpatrick_type_4]=$'\U1F3FD'
27 emoji[emoji_modifier_fitzpatrick_type_5]=$'\U1F3FE'
28+emoji_mod[emoji_modifier_fitzpatrick_type_5]=$'\U1F3FE'
29 emoji[emoji_modifier_fitzpatrick_type_6]=$'\U1F3FF'
30+emoji_mod[emoji_modifier_fitzpatrick_type_6]=$'\U1F3FF'
31 emoji[rat]=$'\U1F400'
32 emoji[mouse]=$'\U1F401'
33 emoji[ox]=$'\U1F402'
34diff --git a/plugins/emoji/update_emoji.pl b/plugins/emoji/update_emoji.pl
35index d90c6e31622e362038880a64d26c41dc6f860580..04f3ce8e77f2e3f18ca6ded37e0a95b2b5520b04 100644
36--- a/plugins/emoji/update_emoji.pl
37+++ b/plugins/emoji/update_emoji.pl
38@@ -88,7 +88,7 @@ typeset -gAH emoji_mod
39 			}
40 			# Modifiers are included in both the main set and their separate map,
41 			# because they have a standalone representation as a color swatch.
42-			if ( $modifier_status == "modifier" ) {
43+			if ( $modifier_status eq "modifier" ) {
44 				$outfh->print("emoji_mod[$omz_name]=\$'$zsh_code'\n");
45 			}
46 		} else {