From dd30cf104c9ca42d89d26a134382ca421869ce7e Mon Sep 17 00:00:00 2001
From: Aleksandr Kozlov <avlkozlov@avito.ru>
Date: Mon, 22 Jan 2018 12:54:02 +0300
Subject: [PATCH 001/869] Added kgpall alias

---
 plugins/kubectl/kubectl.plugin.zsh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/kubectl/kubectl.plugin.zsh b/plugins/kubectl/kubectl.plugin.zsh
index 88177b5a0..3c6e8045c 100644
--- a/plugins/kubectl/kubectl.plugin.zsh
+++ b/plugins/kubectl/kubectl.plugin.zsh
@@ -24,6 +24,7 @@ alias klp='k logs pods'
 alias kep='k edit pods'
 alias kdp='k describe pods'
 alias kdelp='k delete pods'
+alias kgpall='k get pods --all-namespaces -o wide'
 
 # Service management.
 alias kgs='k get svc'

From edbd86cd956266ee80f6b128588f5673f0cdb3c7 Mon Sep 17 00:00:00 2001
From: Sayan Roy <sayan98.roy@gmail.com>
Date: Sun, 7 Jun 2020 12:14:55 +0530
Subject: [PATCH 002/869] Updating some gem command reference

# Updating some gem command reference
gem_info,gem help , etc.
---
 plugins/ruby/ruby.plugin.zsh | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/plugins/ruby/ruby.plugin.zsh b/plugins/ruby/ruby.plugin.zsh
index 177b35b31..88e769d39 100644
--- a/plugins/ruby/ruby.plugin.zsh
+++ b/plugins/ruby/ruby.plugin.zsh
@@ -12,3 +12,14 @@ alias rb="ruby"
 alias gin="gem install"
 alias gun="gem uninstall"
 alias gli="gem list"
+alias gi="gem info"
+alias giall="gem info --all"
+alias gca="gem cert --add"
+alias gcr="gem cert --remove"
+alias gcb="gem cert --build"
+alias gclup="gem cleanup -n"
+alias ggi="gem generate_index"
+alias gh="gem help"
+alias gl="gem lock"
+alias go="gem open"
+alias goe="gem open -e"

From c268d176bf5e1efbf31bb1f3c00c182c1b369e9b Mon Sep 17 00:00:00 2001
From: Sayan Roy <sayan98.roy@gmail.com>
Date: Tue, 9 Jun 2020 00:48:50 +0530
Subject: [PATCH 003/869] Updating the README.md

---
 plugins/ruby/README.md | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/plugins/ruby/README.md b/plugins/ruby/README.md
index ad2755bbf..a4a9c5036 100644
--- a/plugins/ruby/README.md
+++ b/plugins/ruby/README.md
@@ -18,3 +18,14 @@ plugins=(... ruby)
 | gin   | `gem install`                          | Install a gem into the local repository              |
 | gun   | `gem uninstall`                        | Uninstall gems from the local repository             |
 | gli   | `gem list`                             | Display gems installed locally                       |
+| gi    | `gem info`                             | Show information for the given gem                   |
+| giall | `gem info --all`                        | Display all gem versions                             |
+| gca   | `gem cert --add`                       | Add a trusted certificate                            |
+| gcr   | `gem cert --remove`                    | Remove a trusted certificate                         |
+| gcb   | `gem cert --build`                     | Build private key and self-signed certificate        |
+| gclup | `gem cleanup -n`                       | Do not uninstall gem                                 |
+| ggi   | `gem generate_index`                   | Generate index file for gem server                   |
+| gh    | `gem help`                             | Provide additional help                              |
+| gl    | `gem lock`                             | Generate a lockdown list of gems                     |
+| go    | `gem open`                             | Open gem source in default editor                    |
+| goe   | `gem open -e`                          | Open gem sources in preferred editor                 |

From 3f6e87df15104484219c04828b2eddd6d09ee065 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Wed, 17 Jun 2020 11:23:52 +0200
Subject: [PATCH 004/869] init: run update check in the same zsh process
 (#9019)

---
 oh-my-zsh.sh | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/oh-my-zsh.sh b/oh-my-zsh.sh
index 4b4191c01..741bad510 100644
--- a/oh-my-zsh.sh
+++ b/oh-my-zsh.sh
@@ -5,9 +5,7 @@ if [[ -z "$ZSH_CACHE_DIR" ]]; then
 fi
 
 # Check for updates on initial load...
-if [ "$DISABLE_AUTO_UPDATE" != "true" ]; then
-  env ZSH=$ZSH ZSH_CACHE_DIR=$ZSH_CACHE_DIR DISABLE_UPDATE_PROMPT=$DISABLE_UPDATE_PROMPT zsh -f $ZSH/tools/check_for_upgrade.sh
-fi
+source $ZSH/tools/check_for_upgrade.sh
 
 # Initializes Oh My Zsh
 

From d47447a5e63715ae6ab6c2f46924dc8766c8e746 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Wed, 17 Jun 2020 11:26:39 +0200
Subject: [PATCH 005/869] osx: refactor plugin and add a few features (#9026)

Co-authored-by: Capybara <git.capybara@gmail.com>
Co-authored-by: drootang <drootang@users.noreply.github.com>
Co-authored-by: Augusto Souza <augustorsouza@gmail.com>
Co-authored-by: PatrBal <44707588+PatrBal@users.noreply.github.com>
---
 plugins/osx/README.md      |   9 +-
 plugins/osx/_security      |  90 +++++++++++
 plugins/osx/music          | 170 +++++++++++++++++++++
 plugins/osx/osx.plugin.zsh | 297 ++++++++++++-------------------------
 4 files changed, 359 insertions(+), 207 deletions(-)
 create mode 100644 plugins/osx/_security
 create mode 100644 plugins/osx/music

diff --git a/plugins/osx/README.md b/plugins/osx/README.md
index 50e9e7f21..ecc9327d0 100644
--- a/plugins/osx/README.md
+++ b/plugins/osx/README.md
@@ -22,14 +22,17 @@ Original author: [Sorin Ionescu](https://github.com/sorin-ionescu)
 | `pfs`           | Return the current Finder selection                   |
 | `cdf`           | `cd` to the current Finder directory                  |
 | `pushdf`        | `pushd` to the current Finder directory               |
+| `pxd`           | Return the current Xcode project directory            |
+| `cdx`           | `cd` to the current Xcode project directory           |
 | `quick-look`    | Quick-Look a specified file                           |
 | `man-preview`   | Open a specified man page in Preview app              |
-| `showfiles`     | Show hidden files                                     |
-| `hidefiles`     | Hide the hidden files                                 |
-| `itunes`        | DEPRECATED. Use `music` from macOS Catalina on        |
+| `showfiles`     | Show hidden files in Finder                           |
+| `hidefiles`     | Hide the hidden files in Finder                       |
+| `itunes`        | _DEPRECATED_. Use `music` from macOS Catalina on      |
 | `music`         | Control Apple Music. Use `music -h` for usage details |
 | `spotify`       | Control Spotify and search by artist, album, track…   |
 | `rmdsstore`     | Remove .DS\_Store files recursively in a directory    |
+| `btrestart`     | Restart the Bluetooth daemon                          |
 
 ## Acknowledgements
 
diff --git a/plugins/osx/_security b/plugins/osx/_security
new file mode 100644
index 000000000..e4ed585ac
--- /dev/null
+++ b/plugins/osx/_security
@@ -0,0 +1,90 @@
+#compdef security
+
+local -a _1st_arguments
+_1st_arguments=(
+  'help:Show all commands, or show usage for a command'
+  'list-keychains:Display or manipulate the keychain search list'
+  'default-keychain:Display or set the default keychain'
+  'login-keychain:Display or set the login keychain'
+  'create-keychain:Create keychains and add them to the search list'
+  'delete-keychain:Delete keychains and remove them from the search list'
+  'lock-keychain:Lock the specified keychain'
+  'lock-keychain:Unlock the specified keychain'
+  'set-keychain-settings:Set settings for a keychain'
+  'set-keychain-password:Set password for a keychain'
+  'show-keychain-info:Show the settings for keychain'
+  'dump-keychain:Dump the contents of one or more keychains'
+  'create-keypair:Create an asymmetric key pair'
+  'add-generic-password:Add a generic password item'
+  'add-internet-password:Add an internet password item'
+  'add-certificates:Add certificates to a keychain'
+  'find-generic-password:Find a generic password item'
+  'delete-generic-password:Delete a generic password item'
+  'find-internet-password:Find an internet password item'
+  'delete-internet-password:Delete an internet password item'
+  'find-certificate:Find a certificate item'
+  'find-identity:Find an identity certificate + private key'
+  'delete-certificate:Delete a certificate from a keychain'
+  'set-identity-preference:Set the preferred identity to use for a service'
+  'get-identity-preference:Get the preferred identity to use for a service'
+  'create-db:Create a db using the DL'
+  'export:Export items from a keychain'
+  'import:Import items into a keychain'
+  'cms:Encode or decode CMS messages'
+  'install-mds:MDS database'
+  'add-trusted-cert:Add trusted certificates:'
+  'remove-trusted-cert:Remove trusted certificates:'
+  'dump-trust-settings:Display contents of trust settings'
+  'user-trust-settings-enable:Display or manipulate user-level trust settings'
+  'trust-settings-export:Export trust settings'
+  'trust-settings-import:Import trust settings'
+  'verify-cert:Verify certificates:'
+  'authorize:Perform authorization operations'
+  'authorizationdb:Make changes to the authorization policy database'
+  'execute-with-privileges:Execute tool with privileges'
+  'leaks:Run /usr/bin/leaks on this process'
+  'error:Display a descriptive message for the given error codes:'
+  'create-filevaultmaster-keychain:"Create a keychain containing a key pair for FileVault recovery use'
+)
+_arguments '*:: :->command'
+
+if (( CURRENT == 1 )); then
+  _describe -t commands "security command" _1st_arguments
+  return
+fi
+
+case "$words[1]" in
+  find-(generic|internet)-password)
+    _values \
+      'Usage: find-[internet/generic]-password [-a account] [-s server] [options...] [-g] [keychain...]' \
+      '-a[Match "account" string]' \
+      '-c[Match "creator" (four-character code)]' \
+      '-C[Match "type" (four-character code)]' \
+      '-D[Match "kind" string]' \
+      '-G[Match "value" string (generic attribute)]' \
+      '-j[Match "comment" string]' \
+      '-l[Match "label" string]' \
+      '-s[Match "service" string]' \
+      '-g[Display the password for the item found]' \
+      '-w[Display only the password on stdout]' ;;
+  add-(generic|internet)-password)
+    _values \
+      'Usage: add-[internet/generic]-password [-a account] [-s server] [-w password] [options...] [-A|-T appPath] [keychain]]' \
+      '-a[Specify account name (required)]' \
+      '-c[Specify item creator (optional four-character code)]' \
+      '-C[Specify item type (optional four-character code)]' \
+      '-d[Specify security domain string (optional)]' \
+      '-D[Specify kind (default is "Internet password")]' \
+      '-j[Specify comment string (optional)]' \
+      '-l[Specify label (if omitted, server name is used as default label)]' \
+      '-p[Specify path string (optional)]' \
+      '-P[Specify port number (optional)]' \
+      '-r[Specify protocol (optional four-character SecProtocolType, e.g. "http", "ftp ")]' \
+      '-s[Specify server name (required)]' \
+      '-t[Specify authentication type (as a four-character SecAuthenticationType, default is "dflt")]' \
+      '-w[Specify password to be added]' \
+      '-A[Allow any application to access this item without warning (insecure, not recommended!)]' \
+      '-T[Specify an application which may access this item (multiple -T options are allowed)]' \
+      '-U[Update item if it already exists (if omitted, the item cannot already exist) ]' \
+      'utils)]' ;;
+esac
diff --git a/plugins/osx/music b/plugins/osx/music
new file mode 100644
index 000000000..50566797b
--- /dev/null
+++ b/plugins/osx/music
@@ -0,0 +1,170 @@
+#!/usr/bin/env zsh
+
+function music itunes() {
+  local APP_NAME=Music sw_vers=$(sw_vers -productVersion 2>/dev/null)
+
+  autoload is-at-least
+  if [[ -z "$sw_vers" ]] || is-at-least 10.15 $sw_vers; then
+    if [[ $0 = itunes ]]; then
+      echo >&2 The itunes function name is deprecated. Use \'music\' instead.
+      return 1
+    fi
+  else
+    APP_NAME=iTunes
+  fi
+
+  local opt=$1 playlist=$2
+  (( $# > 0 )) && shift
+  case "$opt" in
+    launch|play|pause|stop|rewind|resume|quit)
+      ;;
+    mute)
+      opt="set mute to true"
+      ;;
+    unmute)
+      opt="set mute to false"
+      ;;
+    next|previous)
+      opt="$opt track"
+      ;;
+    vol)
+      local new_volume volume=$(osascript -e "tell application \"$APP_NAME\" to get sound volume")
+      if [[ $# -eq 0 ]]; then
+        echo "Current volume is ${volume}."
+        return 0
+      fi
+      case $1 in
+        up) new_volume=$((volume + 10 < 100 ? volume + 10 : 100)) ;;
+        down) new_volume=$((volume - 10 > 0 ? volume - 10 : 0)) ;;
+        <0-100>) new_volume=$1 ;;
+        *) echo "'$1' is not valid. Expected <0-100>, up or down."
+           return 1 ;;
+      esac
+      opt="set sound volume to ${new_volume}"
+      ;;
+    playlist)
+      # Inspired by: https://gist.github.com/nakajijapan/ac8b45371064ae98ea7f
+      if [[ -n "$playlist" ]]; then
+        osascript 2>/dev/null <<EOF
+          tell application "$APP_NAME"
+            set new_playlist to "$playlist" as string
+            play playlist new_playlist
+          end tell
+EOF
+        if [[ $? -eq 0 ]]; then
+          opt="play"
+        else
+          opt="stop"
+        fi
+      else
+        opt="set allPlaylists to (get name of every playlist)"
+      fi
+      ;;
+    playing|status)
+      local currenttrack currentartist state=$(osascript -e "tell application \"$APP_NAME\" to player state as string")
+      if [[ "$state" = "playing" ]]; then
+        currenttrack=$(osascript -e "tell application \"$APP_NAME\" to name of current track as string")
+        currentartist=$(osascript -e "tell application \"$APP_NAME\" to artist of current track as string")
+        echo -E "Listening to ${fg[yellow]}${currenttrack}${reset_color} by ${fg[yellow]}${currentartist}${reset_color}"
+      else
+        echo "$APP_NAME is $state"
+      fi
+      return 0
+      ;;
+    shuf|shuff|shuffle)
+      # The shuffle property of current playlist can't be changed in iTunes 12,
+      # so this workaround uses AppleScript to simulate user input instead.
+      # Defaults to toggling when no options are given.
+      # The toggle option depends on the shuffle button being visible in the Now playing area.
+      # On and off use the menu bar items.
+      local state=$1
+
+      if [[ -n "$state" && "$state" != (on|off|toggle) ]]; then
+        print "Usage: $0 shuffle [on|off|toggle]. Invalid option."
+        return 1
+      fi
+
+      case "$state" in
+        on|off)
+          # Inspired by: https://stackoverflow.com/a/14675583
+          osascript >/dev/null 2>&1 <<EOF
+            tell application "System Events" to perform action "AXPress" of (menu item "${state}" of menu "Shuffle" of menu item "Shuffle" of menu "Controls" of menu bar item "Controls" of menu bar 1 of application process "iTunes" )
+EOF
+          return 0
+          ;;
+        toggle|*)
+          osascript >/dev/null 2>&1 <<EOF
+            tell application "System Events" to perform action "AXPress" of (button 2 of process "iTunes"'s window "iTunes"'s scroll area 1)
+EOF
+          return 0
+          ;;
+      esac
+      ;;
+    ""|-h|--help)
+      echo "Usage: $0 <option>"
+      echo "option:"
+      echo "\t-h|--help\tShow this message and exit"
+      echo "\tlaunch|play|pause|stop|rewind|resume|quit"
+      echo "\tmute|unmute\tMute or unmute $APP_NAME"
+      echo "\tnext|previous\tPlay next or previous track"
+      echo "\tshuf|shuffle [on|off|toggle]\tSet shuffled playback. Default: toggle. Note: toggle doesn't support the MiniPlayer."
+      echo "\tvol [0-100|up|down]\tGet or set the volume. 0 to 100 sets the volume. 'up' / 'down' increases / decreases by 10 points. No argument displays current volume."
+      echo "\tplaying|status\tShow what song is currently playing in Music."
+      echo "\tplaylist [playlist name]\t Play specific playlist"
+      return 0
+      ;;
+    *)
+      print "Unknown option: $opt"
+      return 1
+      ;;
+  esac
+  osascript -e "tell application \"$APP_NAME\" to $opt"
+}
+
+function _music() {
+  local app_name
+  case "$words[1]" in
+    itunes) app_name="iTunes" ;;
+    music|*) app_name="Music" ;;
+  esac
+
+  local -a cmds subcmds
+  cmds=(
+    "launch:Launch the ${app_name} app"
+    "play:Play ${app_name}"
+    "pause:Pause ${app_name}"
+    "stop:Stop ${app_name}"
+    "rewind:Rewind ${app_name}"
+    "resume:Resume ${app_name}"
+    "quit:Quit ${app_name}"
+    "mute:Mute the ${app_name} app"
+    "unmute:Unmute the ${app_name} app"
+    "next:Skip to the next song"
+    "previous:Skip to the previous song"
+    "vol:Change the volume"
+    "playlist:Play a specific playlist"
+    {playing,status}":Show what song is currently playing"
+    {shuf,shuff,shuffle}":Set shuffle mode"
+    {-h,--help}":Show usage"
+  )
+
+  if (( CURRENT == 2 )); then
+    _describe 'command' cmds
+  elif (( CURRENT == 3 )); then
+    case "$words[2]" in
+      vol) subcmds=( 'up:Raise the volume' 'down:Lower the volume' )
+        _describe 'command' subcmds ;;
+      shuf|shuff|shuffle) subcmds=('on:Switch on shuffle mode' 'off:Switch off shuffle mode' 'toggle:Toggle shuffle mode (default)')
+        _describe 'command' subcmds ;;
+    esac
+  elif (( CURRENT == 4 )); then
+    case "$words[2]" in
+      playlist) subcmds=('play:Play the playlist (default)' 'stop:Stop the playlist')
+        _describe 'command' subcmds ;;
+    esac
+  fi
+
+  return 0
+}
+
+compdef _music music itunes
diff --git a/plugins/osx/osx.plugin.zsh b/plugins/osx/osx.plugin.zsh
index 03e9c1c8c..7842e9f73 100644
--- a/plugins/osx/osx.plugin.zsh
+++ b/plugins/osx/osx.plugin.zsh
@@ -1,15 +1,22 @@
 # Open the current directory in a Finder window
 alias ofd='open_command $PWD'
 
+# Show/hide hidden files in the Finder
+alias showfiles="defaults write com.apple.finder AppleShowAllFiles -bool true && killall Finder"
+alias hidefiles="defaults write com.apple.finder AppleShowAllFiles -bool false && killall Finder"
+
+# Bluetooth restart
+function btrestart() {
+  sudo kextunload -b com.apple.iokit.BroadcomBluetoothHostControllerUSBTransport
+  sudo kextload -b com.apple.iokit.BroadcomBluetoothHostControllerUSBTransport
+}
+
 function _omz_osx_get_frontmost_app() {
-  local the_app=$(
-    osascript 2>/dev/null <<EOF
-      tell application "System Events"
-        name of first item of (every process whose frontmost is true)
-      end tell
+  osascript 2>/dev/null <<EOF
+    tell application "System Events"
+      name of first item of (every process whose frontmost is true)
+    end tell
 EOF
-  )
-  echo "$the_app"
 }
 
 function tab() {
@@ -27,7 +34,6 @@ function tab() {
       end tell
       tell application "Terminal" to do script "${command}" in front window
 EOF
-
   elif [[ "$the_app" == 'iTerm' ]]; then
     osascript <<EOF
       tell application "iTerm"
@@ -41,32 +47,29 @@ EOF
         end tell
       end tell
 EOF
-
   elif [[ "$the_app" == 'iTerm2' ]]; then
-      osascript <<EOF
-        tell application "iTerm2"
-          tell current window
-            create tab with default profile
-            tell current session to write text "${command}"
-          end tell
+    osascript <<EOF
+      tell application "iTerm2"
+        tell current window
+          create tab with default profile
+          tell current session to write text "${command}"
         end tell
+      end tell
 EOF
   elif [[ "$the_app" == 'Hyper' ]]; then
     osascript >/dev/null <<EOF
-          tell application "System Events"
-            tell process "Hyper" to keystroke "t" using command down
-          end tell
-          delay 1
-          tell application "System Events"
-              keystroke "${command}"
-              key code 36  #(presses enter)
-            end tell
+      tell application "System Events"
+        tell process "Hyper" to keystroke "t" using command down
+      end tell
+      delay 1
+      tell application "System Events"
+        keystroke "${command}"
+        key code 36  #(presses enter)
+      end tell
 EOF
-
   else
-    echo "tab: unsupported terminal app: $the_app"
-    false
-
+    echo "$0: unsupported terminal app: $the_app" >&2
+    return 1
   fi
 }
 
@@ -79,7 +82,6 @@ function vsplit_tab() {
   if [[ "$the_app" == 'iTerm' ]]; then
     osascript <<EOF
       -- tell application "iTerm" to activate
-
       tell application "System Events"
         tell process "iTerm"
           tell menu item "Split Vertically With Current Profile" of menu "Shell" of menu bar item "Shell" of menu bar 1
@@ -89,37 +91,33 @@ function vsplit_tab() {
         keystroke "${command} \n"
       end tell
 EOF
-
   elif [[ "$the_app" == 'iTerm2' ]]; then
-      osascript <<EOF
-        tell application "iTerm2"
-          tell current session of first window
-            set newSession to (split vertically with same profile)
-            tell newSession
-              write text "${command}"
-              select
-            end tell
+    osascript <<EOF
+      tell application "iTerm2"
+        tell current session of first window
+          set newSession to (split vertically with same profile)
+          tell newSession
+            write text "${command}"
+            select
           end tell
         end tell
-EOF
-  
-  elif [[ "$the_app" == 'Hyper' ]]; then
-      osascript >/dev/null <<EOF
-      tell application "System Events"
-        tell process "Hyper"
-          tell menu item "Split Vertically" of menu "Shell" of menu bar 1
-            click
-          end tell
-        end tell
-        delay 1
-        keystroke "${command} \n"
       end tell
 EOF
-
+  elif [[ "$the_app" == 'Hyper' ]]; then
+    osascript >/dev/null <<EOF
+    tell application "System Events"
+      tell process "Hyper"
+        tell menu item "Split Vertically" of menu "Shell" of menu bar 1
+          click
+        end tell
+      end tell
+      delay 1
+      keystroke "${command} \n"
+    end tell
+EOF
   else
     echo "$0: unsupported terminal app: $the_app" >&2
-    false
-
+    return 1
   fi
 }
 
@@ -142,44 +140,40 @@ function split_tab() {
         keystroke "${command} \n"
       end tell
 EOF
-
   elif [[ "$the_app" == 'iTerm2' ]]; then
-      osascript <<EOF
-        tell application "iTerm2"
-          tell current session of first window
-            set newSession to (split horizontally with same profile)
-            tell newSession
-              write text "${command}"
-              select
-            end tell
+    osascript <<EOF
+      tell application "iTerm2"
+        tell current session of first window
+          set newSession to (split horizontally with same profile)
+          tell newSession
+            write text "${command}"
+            select
           end tell
         end tell
-EOF
-
-  elif [[ "$the_app" == 'Hyper' ]]; then
-      osascript >/dev/null <<EOF
-      tell application "System Events"
-        tell process "Hyper"
-          tell menu item "Split Horizontally" of menu "Shell" of menu bar 1
-            click
-          end tell
-        end tell
-        delay 1
-        keystroke "${command} \n"
       end tell
 EOF
-
+  elif [[ "$the_app" == 'Hyper' ]]; then
+    osascript >/dev/null <<EOF
+    tell application "System Events"
+      tell process "Hyper"
+        tell menu item "Split Horizontally" of menu "Shell" of menu bar 1
+          click
+        end tell
+      end tell
+      delay 1
+      keystroke "${command} \n"
+    end tell
+EOF
   else
     echo "$0: unsupported terminal app: $the_app" >&2
-    false
-
+    return 1
   fi
 }
 
 function pfd() {
   osascript 2>/dev/null <<EOF
     tell application "Finder"
-      return POSIX path of (target of window 1 as alias)
+      return POSIX path of (insertion location as alias)
     end tell
 EOF
 }
@@ -205,6 +199,21 @@ function pushdf() {
   pushd "$(pfd)"
 }
 
+function pxd() {
+  dirname $(osascript 2>/dev/null <<EOF
+    if application "Xcode" is running then
+      tell application "Xcode"
+        return path of active workspace document
+      end tell
+    end if
+EOF
+)
+}
+
+function cdx() {
+  cd "$(pxd)"
+}
+
 function quick-look() {
   (( $# > 0 )) && qlmanage -p $* &>/dev/null &
 }
@@ -218,133 +227,13 @@ function vncviewer() {
   open vnc://$@
 }
 
-# iTunes control function
-function itunes music() {
-	local APP_NAME=Music
-
-	autoload is-at-least
-	if is-at-least 10.15 $(sw_vers -productVersion); then
-		if [[ $0 = itunes ]]; then
-			echo >&2 The itunes function name is deprecated. Use \`music\' instead.
-			return 1
-		fi
-	else
-		APP_NAME=iTunes
-	fi
-
-	local opt=$1
-	local playlist=$2
-	shift
-	case "$opt" in
-		launch|play|pause|stop|rewind|resume|quit)
-			;;
-		mute)
-			opt="set mute to true"
-			;;
-		unmute)
-			opt="set mute to false"
-			;;
-		next|previous)
-			opt="$opt track"
-			;;
-		vol)
-			local new_volume volume=$(osascript -e "tell application \"$APP_NAME\" to get sound volume")
-			if [[ $# -eq 0 ]]; then
-				echo "Current volume is ${volume}."
-				return 0
-			fi
-			case $1 in
-				up) new_volume=$((volume + 10 < 100 ? volume + 10 : 100)) ;;
-				down) new_volume=$((volume - 10 > 0 ? volume - 10 : 0)) ;;
-				<0-100>) new_volume=$1 ;;
-				*) echo "'$1' is not valid. Expected <0-100>, up or down."
-				   return 1 ;;
-			esac
-			opt="set sound volume to ${new_volume}"
-			;;
-		playlist)
-			# Inspired by: https://gist.github.com/nakajijapan/ac8b45371064ae98ea7f
-			if [[ ! -z "$playlist" ]]; then
-				osascript -e "tell application \"$APP_NAME\"" -e "set new_playlist to \"$playlist\" as string" -e "play playlist new_playlist" -e "end tell" 2>/dev/null;
-				if [[ $? -eq 0 ]]; then
-					opt="play"
-				else
-					opt="stop"
-				fi
-			else
-				opt="set allPlaylists to (get name of every playlist)"
-			fi
-			;;
-		playing|status)
-			local state=`osascript -e "tell application \"$APP_NAME\" to player state as string"`
-			if [[ "$state" = "playing" ]]; then
-				currenttrack=`osascript -e "tell application \"$APP_NAME\" to name of current track as string"`
-				currentartist=`osascript -e "tell application \"$APP_NAME\" to artist of current track as string"`
-				echo -E "Listening to $fg[yellow]$currenttrack$reset_color by $fg[yellow]$currentartist$reset_color";
-			else
-				echo "$APP_NAME is" $state;
-			fi
-			return 0
-			;;
-		shuf|shuff|shuffle)
-			# The shuffle property of current playlist can't be changed in iTunes 12,
-			# so this workaround uses AppleScript to simulate user input instead.
-			# Defaults to toggling when no options are given.
-			# The toggle option depends on the shuffle button being visible in the Now playing area.
-			# On and off use the menu bar items.
-			local state=$1
-
-			if [[ -n "$state" && ! "$state" =~ "^(on|off|toggle)$" ]]
-			then
-				print "Usage: $0 shuffle [on|off|toggle]. Invalid option."
-				return 1
-			fi
-
-			case "$state" in
-				on|off)
-					# Inspired by: https://stackoverflow.com/a/14675583
-					osascript 1>/dev/null 2>&1 <<-EOF
-					tell application "System Events" to perform action "AXPress" of (menu item "${state}" of menu "Shuffle" of menu item "Shuffle" of menu "Controls" of menu bar item "Controls" of menu bar 1 of application process "iTunes" )
-EOF
-					return 0
-					;;
-				toggle|*)
-					osascript 1>/dev/null 2>&1 <<-EOF
-					tell application "System Events" to perform action "AXPress" of (button 2 of process "iTunes"'s window "iTunes"'s scroll area 1)
-EOF
-					return 0
-					;;
-			esac
-			;;
-		""|-h|--help)
-			echo "Usage: $0 <option>"
-			echo "option:"
-			echo "\tlaunch|play|pause|stop|rewind|resume|quit"
-			echo "\tmute|unmute\tcontrol volume set"
-			echo "\tnext|previous\tplay next or previous track"
-			echo "\tshuf|shuffle [on|off|toggle]\tSet shuffled playback. Default: toggle. Note: toggle doesn't support the MiniPlayer."
-			echo "\tvol [0-100|up|down]\tGet or set the volume. 0 to 100 sets the volume. 'up' / 'down' increases / decreases by 10 points. No argument displays current volume."
-			echo "\tplaying|status\tShow what song is currently playing in Music."
-			echo "\tplaylist [playlist name]\t Play specific playlist"
-			echo "\thelp\tshow this message and exit"
-			return 0
-			;;
-		*)
-			print "Unknown option: $opt"
-			return 1
-			;;
-	esac
-	osascript -e "tell application \"$APP_NAME\" to $opt"
-}
-
-# Spotify control function
-source ${ZSH}/plugins/osx/spotify
-
-# Show/hide hidden files in the Finder
-alias showfiles="defaults write com.apple.finder AppleShowAllFiles -bool true && killall Finder"
-alias hidefiles="defaults write com.apple.finder AppleShowAllFiles -bool false && killall Finder"
-
 # Remove .DS_Store files recursively in a directory, default .
 function rmdsstore() {
-	find "${@:-.}" -type f -name .DS_Store -delete
+  find "${@:-.}" -type f -name .DS_Store -delete
 }
+
+# Music / iTunes control function
+source "${0:h:A}/music"
+
+# Spotify control function
+source "${0:h:A}/spotify"

From 5ffc0d036c587741fd25092e7809dad2b00b3677 Mon Sep 17 00:00:00 2001
From: Ye Shu <chshu@protonmail.ch>
Date: Thu, 18 Jun 2020 08:07:13 +0000
Subject: [PATCH 006/869] init: don't run update check if DISABLE_AUTO_UPDATE
 (#9040)

skip the update check at initialization if DISABLE_AUTO_UPDATE is set to true
---
 oh-my-zsh.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/oh-my-zsh.sh b/oh-my-zsh.sh
index 741bad510..5b057256d 100644
--- a/oh-my-zsh.sh
+++ b/oh-my-zsh.sh
@@ -5,7 +5,9 @@ if [[ -z "$ZSH_CACHE_DIR" ]]; then
 fi
 
 # Check for updates on initial load...
-source $ZSH/tools/check_for_upgrade.sh
+if [ "$DISABLE_AUTO_UPDATE" != "true" ]; then
+  source $ZSH/tools/check_for_upgrade.sh
+fi
 
 # Initializes Oh My Zsh
 

From 8fe48793b525c21580ccfa8ee11af89fbd505bb0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Fri, 19 Jun 2020 23:10:00 +0200
Subject: [PATCH 007/869] Deprecate cloudapp plugin (fixes #8966)

---
 plugins/cloudapp/README.md           |  2 +
 plugins/cloudapp/cloudapp.plugin.zsh | 10 ++---
 plugins/cloudapp/cloudapp.rb         | 60 ----------------------------
 3 files changed, 6 insertions(+), 66 deletions(-)
 delete mode 100755 plugins/cloudapp/cloudapp.rb

diff --git a/plugins/cloudapp/README.md b/plugins/cloudapp/README.md
index fc9fc32bd..ef304edc2 100644
--- a/plugins/cloudapp/README.md
+++ b/plugins/cloudapp/README.md
@@ -1,5 +1,7 @@
 # CloudApp plugin
 
+## The CloudApp API is deprecated, so the plugin will be removed shortly
+
 [CloudApp](https://www.getcloudapp.com) brings screen recording, screenshots, and GIF creation to the cloud, in an easy-to-use enterprise-level app. The CloudApp plugin allows you to upload a file to your CloadApp account from the command line.
 
 To use it, add `cloudapp` to the plugins array of your `~/.zshrc` file:
diff --git a/plugins/cloudapp/cloudapp.plugin.zsh b/plugins/cloudapp/cloudapp.plugin.zsh
index 3b363c81b..a4d92a080 100644
--- a/plugins/cloudapp/cloudapp.plugin.zsh
+++ b/plugins/cloudapp/cloudapp.plugin.zsh
@@ -1,6 +1,4 @@
-alias cloudapp="${0:a:h}/cloudapp.rb"
-
-# Ensure only the owner can access the credentials file
-if [[ -f ~/.cloudapp ]]; then
-  chmod 600 ~/.cloudapp
-fi
+print -Pn "%F{yellow}"
+print "[oh-my-zsh] The CloudApp API no longer works, so the cloudapp plugin will"
+print "[oh-my-zsh] be removed shortly. Please remove it from your plugins list."
+print -Pn "%f"
diff --git a/plugins/cloudapp/cloudapp.rb b/plugins/cloudapp/cloudapp.rb
deleted file mode 100755
index a11cfdb32..000000000
--- a/plugins/cloudapp/cloudapp.rb
+++ /dev/null
@@ -1,60 +0,0 @@
-#!/usr/bin/env ruby
-#
-# cloudapp
-# Zach Holman / @holman
-#
-# Uploads a file from the command line to CloudApp, drops it into your 
-# clipboard (on a Mac, at least).
-#
-# Example:
-#
-#   cloudapp drunk-blake.png
-#
-# This requires Aaron Russell's cloudapp_api gem:
-#
-#   gem install cloudapp_api
-#
-# Requires you set your CloudApp credentials in ~/.cloudapp as a simple file of:
-#
-#   email
-#   password
-
-require 'rubygems'
-begin
-  require 'cloudapp_api'
-rescue LoadError
-  puts "You need to install cloudapp_api: gem install cloudapp_api"
-  exit!(1)
-end
-
-config_file = "#{ENV['HOME']}/.cloudapp"
-unless File.exist?(config_file)
-  puts "You need to type your email and password (one per line) into "+
-       "`~/.cloudapp`"
-  exit!(1)
-end
-
-email,password = File.read(config_file).split("\n")
-
-class HTTParty::Response
-  # Apparently HTTPOK.ok? IS NOT OKAY WTFFFFFFFFFFUUUUUUUUUUUUUU
-  # LETS MONKEY PATCH IT I FEEL OKAY ABOUT IT
-  def ok? ; true end
-end
-
-if ARGV[0].nil?
-   puts "You need to specify a file to upload."
-   exit!(1)
-end
-
-CloudApp.authenticate(email,password)
-url = CloudApp::Item.create(:upload, {:file => ARGV[0]}).url
-
-# Say it for good measure.
-puts "Uploaded to #{url}."
-
-# Get the embed link.
-url = "#{url}/#{ARGV[0].split('/').last}"
-
-# Copy it to your (Mac's) clipboard.
-`echo '#{url}' | tr -d "\n" | pbcopy`

From b706a919172955e16a1ab97f36a95b9ee4d9f1dc Mon Sep 17 00:00:00 2001
From: joshuashaffer <joshua.shaffer@icmrl.net>
Date: Fri, 19 Jun 2020 17:16:31 -0400
Subject: [PATCH 008/869] core: add title support for mlterm (#8303)

---
 lib/termsupport.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/termsupport.zsh b/lib/termsupport.zsh
index 3f71eb06a..e3237ca34 100644
--- a/lib/termsupport.zsh
+++ b/lib/termsupport.zsh
@@ -17,7 +17,7 @@ function title {
   : ${2=$1}
 
   case "$TERM" in
-    cygwin|xterm*|putty*|rxvt*|konsole*|ansi)
+    cygwin|xterm*|putty*|rxvt*|konsole*|ansi|mlterm)
       print -Pn "\e]2;$2:q\a" # set window name
       print -Pn "\e]1;$1:q\a" # set tab name
       ;;

From cea89f54391c810198a7ace05f1063dd7e596bb7 Mon Sep 17 00:00:00 2001
From: Magnus Boman <6226312+kattjevfel@users.noreply.github.com>
Date: Tue, 23 Jun 2020 17:57:04 +0200
Subject: [PATCH 009/869] archlinux: fix pacweb breaking when multiple packages
 found (#9059)

Co-authored-by: Magnus Boman <Kattus@users.noreply.github.com>
---
 plugins/archlinux/archlinux.plugin.zsh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/archlinux/archlinux.plugin.zsh b/plugins/archlinux/archlinux.plugin.zsh
index 2d0c51b3d..4d39bd86b 100644
--- a/plugins/archlinux/archlinux.plugin.zsh
+++ b/plugins/archlinux/archlinux.plugin.zsh
@@ -212,8 +212,8 @@ if (( $+commands[xdg-open] )); then
     if [[ -z "$infos" ]]; then
       return
     fi
-    repo="$(grep '^Repo' <<< "$infos" | grep -oP '[^ ]+$')"
-    arch="$(grep '^Arch' <<< "$infos" | grep -oP '[^ ]+$')"
+    repo="$(grep -m 1 '^Repo' <<< "$infos" | grep -oP '[^ ]+$')"
+    arch="$(grep -m 1 '^Arch' <<< "$infos" | grep -oP '[^ ]+$')"
     xdg-open "https://www.archlinux.org/packages/$repo/$arch/$pkg/" &>/dev/null
   }
 fi

From 6152ac30bede172ba0422a8610dc796948ae1546 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fatih=20Erg=C3=BCven?= <fatih@erguven.org>
Date: Fri, 26 Jun 2020 03:47:30 +0200
Subject: [PATCH 010/869] Add new mvn alias for `mvn fmt:format` (#9053)

* mvn: add mvnfmt alias

* mvn: update README.md
---
 plugins/mvn/README.md      | 1 +
 plugins/mvn/mvn.plugin.zsh | 1 +
 2 files changed, 2 insertions(+)

diff --git a/plugins/mvn/README.md b/plugins/mvn/README.md
index 72cea9cb9..cbe7f30fa 100644
--- a/plugins/mvn/README.md
+++ b/plugins/mvn/README.md
@@ -36,6 +36,7 @@ if it's found, or the mvn command otherwise.
 | `mvndocs`            | `mvn dependency:resolve -Dclassifier=javadoc`   |
 | `mvndt`              | `mvn dependency:tree`                           |
 | `mvne`               | `mvn eclipse:eclipse`                           |
+| `mvnfmt`             | `mvn fmt:format`                                |
 | `mvnjetty`           | `mvn jetty:run`                                 |
 | `mvnp`               | `mvn package`                                   |
 | `mvns`               | `mvn site`                                      |
diff --git a/plugins/mvn/mvn.plugin.zsh b/plugins/mvn/mvn.plugin.zsh
index 0866e5553..7cb94b42f 100644
--- a/plugins/mvn/mvn.plugin.zsh
+++ b/plugins/mvn/mvn.plugin.zsh
@@ -59,6 +59,7 @@ alias mvnd='mvn deploy'
 alias mvndocs='mvn dependency:resolve -Dclassifier=javadoc'
 alias mvndt='mvn dependency:tree'
 alias mvne='mvn eclipse:eclipse'
+alias mvnfmt='mvn fmt:format'
 alias mvnjetty='mvn jetty:run'
 alias mvnp='mvn package'
 alias mvns='mvn site'

From 48b98b957ecfb53a9d2925c03a1524197bd87894 Mon Sep 17 00:00:00 2001
From: alexagnelli <51273591+alexagnelli@users.noreply.github.com>
Date: Sun, 28 Jun 2020 18:34:02 +0200
Subject: [PATCH 011/869] update: only update on a valid affirmative input
 (#9062)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Marc Cornellà <marc.cornella@live.com>
---
 tools/check_for_upgrade.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/check_for_upgrade.sh b/tools/check_for_upgrade.sh
index 872f5e820..368b30d25 100644
--- a/tools/check_for_upgrade.sh
+++ b/tools/check_for_upgrade.sh
@@ -79,8 +79,8 @@ function update_ohmyzsh() {
         read -r -k 1 option
         [[ "$option" != $'\n' ]] && echo
         case "$option" in
+            [yY$'\n']) update_ohmyzsh ;;
             [nN]) update_last-updated_file ;;
-            *) update_ohmyzsh ;;
         esac
     fi
 }

From 97cf0bf4bd7655767e9e5ea27ddb6fbe550a305d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Sun, 28 Jun 2020 18:54:26 +0200
Subject: [PATCH 012/869] update: change dash in function name for sh compat
 (fixes #9064)

---
 tools/check_for_upgrade.sh | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/tools/check_for_upgrade.sh b/tools/check_for_upgrade.sh
index 368b30d25..c91431c25 100644
--- a/tools/check_for_upgrade.sh
+++ b/tools/check_for_upgrade.sh
@@ -19,13 +19,13 @@ function current_epoch() {
     echo $(( EPOCHSECONDS / 60 / 60 / 24 ))
 }
 
-function update_last-updated_file() {
+function update_last_updated_file() {
     echo "LAST_EPOCH=$(current_epoch)" >! "${ZSH_CACHE_DIR}/.zsh-update"
 }
 
 function update_ohmyzsh() {
     ZSH="$ZSH" sh "$ZSH/tools/upgrade.sh"
-    update_last-updated_file
+    update_last_updated_file
 }
 
 () {
@@ -55,7 +55,7 @@ function update_ohmyzsh() {
 
     # Create or update .zsh-update file if missing or malformed
     if ! source "${ZSH_CACHE_DIR}/.zsh-update" 2>/dev/null || [[ -z "$LAST_EPOCH" ]]; then
-        update_last-updated_file
+        update_last_updated_file
         return
     fi
 
@@ -80,9 +80,9 @@ function update_ohmyzsh() {
         [[ "$option" != $'\n' ]] && echo
         case "$option" in
             [yY$'\n']) update_ohmyzsh ;;
-            [nN]) update_last-updated_file ;;
+            [nN]) update_last_updated_file ;;
         esac
     fi
 }
 
-unset -f current_epoch update_last-updated_file update_ohmyzsh
+unset -f current_epoch update_last_updated_file update_ohmyzsh

From ce28ac42c8e9933b1b3ca041bed0a3f1140eada2 Mon Sep 17 00:00:00 2001
From: Larson Carter <larsoncarter@blazermail.net>
Date: Sun, 28 Jun 2020 15:06:13 -0500
Subject: [PATCH 013/869] Modernize install and update banners (#9045)

---
 tools/install.sh | 8 ++++----
 tools/upgrade.sh | 3 ++-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/tools/install.sh b/tools/install.sh
index 08f3db1e3..26b9bf08e 100755
--- a/tools/install.sh
+++ b/tools/install.sh
@@ -269,11 +269,11 @@ main() {
 		                        /____/                       ....is now installed!
 
 
-		Please look over the ~/.zshrc file to select plugins, themes, and options.
+		Before your scream Oh My Zsh! please look over the ~/.zshrc file to select plugins, themes, and options.
 
-		p.s. Follow us on https://twitter.com/ohmyzsh
-
-		p.p.s. Get stickers, shirts, and coffee mugs at https://shop.planetargon.com/collections/oh-my-zsh
+		• Follow us on Twitter: https://twitter.com/ohmyzsh
+		• Join our Discord server: https://discord.gg/ohmyzsh
+		• Get stickers, shirts, coffee mugs and other swag: https://shop.planetargon.com/collections/oh-my-zsh
 
 	EOF
 	printf "$RESET"
diff --git a/tools/upgrade.sh b/tools/upgrade.sh
index 19ac88c73..de7a8419b 100644
--- a/tools/upgrade.sh
+++ b/tools/upgrade.sh
@@ -62,7 +62,8 @@ then
   printf '%s\____/%s_/ /_/ %s /_/ /_/ /_/%s\__, / %s   /___/%s____/%s_/ /_/  %s\n' $RB_RED $RB_ORANGE $RB_YELLOW $RB_GREEN $RB_BLUE $RB_INDIGO $RB_VIOLET $RB_RESET
   printf '%s    %s        %s           %s /____/ %s       %s     %s          %s\n' $RB_RED $RB_ORANGE $RB_YELLOW $RB_GREEN $RB_BLUE $RB_INDIGO $RB_VIOLET $RB_RESET
   printf "${BLUE}%s\n" "Hooray! Oh My Zsh has been updated and/or is at the current version."
-  printf "${BLUE}${BOLD}%s${RESET}\n" "To keep up on the latest news and updates, follow us on twitter: https://twitter.com/ohmyzsh"
+  printf "${BLUE}${BOLD}%s${RESET}\n" "To keep up on the latest news and updates, follow us on Twitter: https://twitter.com/ohmyzsh"
+  printf "${BLUE}${BOLD}%s${RESET}\n" "Want to get involved in the community? Join our Discord: https://discord.gg/ohmyzsh"
   printf "${BLUE}${BOLD}%s${RESET}\n" "Get your Oh My Zsh swag at: https://shop.planetargon.com/collections/oh-my-zsh"
 else
   printf "${RED}%s${RESET}\n" 'There was an error updating. Try again later?'

From c4ac0d43addd4b3108e56a0ec77ce2074d93c25e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9lio?= <insign@gmail.com>
Date: Tue, 30 Jun 2020 13:16:51 -0300
Subject: [PATCH 014/869] encode64: fix typo in README (#9052)

---
 plugins/encode64/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/encode64/README.md b/plugins/encode64/README.md
index a83a3d3d2..86320cffb 100644
--- a/plugins/encode64/README.md
+++ b/plugins/encode64/README.md
@@ -53,6 +53,6 @@ plugins=(... encode64)
   ```console
   $ echo "b2gtbXktenNoCg==" | decode64
   oh-my-zsh
-  $ echo "b2gtbXktenNoCg==" | decode64
+  $ echo "b2gtbXktenNoCg==" | d64
   oh-my-zsh
   ```

From e606ac70514fe31e40af53b818f07a967d185185 Mon Sep 17 00:00:00 2001
From: Patrick Moore <pat@finixpayments.com>
Date: Tue, 30 Jun 2020 09:54:27 -0700
Subject: [PATCH 015/869] Handle unset variables in various parts of the
 codebase (#8944)

DISABLE_UNTRACKED_FILES_DIRTY, DISABLE_AUTO_TITLE, GIT_STATUS_IGNORE_SUBMODULES are not set
Handle these variables not being set with conditional access.

If the user has set -u option to report attempts to use undeclared / unassigned variable, accessing the variables needs to be conditional.
---
 lib/git.zsh         | 4 ++--
 lib/termsupport.zsh | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/git.zsh b/lib/git.zsh
index 00cb00b19..f7d4738ca 100644
--- a/lib/git.zsh
+++ b/lib/git.zsh
@@ -14,10 +14,10 @@ function parse_git_dirty() {
   local -a FLAGS
   FLAGS=('--porcelain')
   if [[ "$(command git config --get oh-my-zsh.hide-dirty)" != "1" ]]; then
-    if [[ "$DISABLE_UNTRACKED_FILES_DIRTY" == "true" ]]; then
+    if [[ "${DISABLE_UNTRACKED_FILES_DIRTY:-}" == "true" ]]; then
       FLAGS+='--untracked-files=no'
     fi
-    case "$GIT_STATUS_IGNORE_SUBMODULES" in
+    case "${GIT_STATUS_IGNORE_SUBMODULES:-}" in
       git)
         # let git decide (this respects per-repo config in .gitmodules)
         ;;
diff --git a/lib/termsupport.zsh b/lib/termsupport.zsh
index e3237ca34..069b7f328 100644
--- a/lib/termsupport.zsh
+++ b/lib/termsupport.zsh
@@ -50,13 +50,13 @@ fi
 
 # Runs before showing the prompt
 function omz_termsupport_precmd {
-  [[ "$DISABLE_AUTO_TITLE" == true ]] && return
+  [[ "${DISABLE_AUTO_TITLE:-}" == true ]] && return
   title $ZSH_THEME_TERM_TAB_TITLE_IDLE $ZSH_THEME_TERM_TITLE_IDLE
 }
 
 # Runs before executing the command
 function omz_termsupport_preexec {
-  [[ "$DISABLE_AUTO_TITLE" == true ]] && return
+  [[ "${DISABLE_AUTO_TITLE:-}" == true ]] && return
 
   emulate -L zsh
   setopt extended_glob

From e751d2519d586a2c022beeb0b40dfe9b7a1ed6eb Mon Sep 17 00:00:00 2001
From: Sayan Roy <sayan98.roy@gmail.com>
Date: Wed, 1 Jul 2020 08:58:27 +0530
Subject: [PATCH 016/869] spacing changed

---
 plugins/ruby/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/ruby/README.md b/plugins/ruby/README.md
index a4a9c5036..a2de11991 100644
--- a/plugins/ruby/README.md
+++ b/plugins/ruby/README.md
@@ -19,7 +19,7 @@ plugins=(... ruby)
 | gun   | `gem uninstall`                        | Uninstall gems from the local repository             |
 | gli   | `gem list`                             | Display gems installed locally                       |
 | gi    | `gem info`                             | Show information for the given gem                   |
-| giall | `gem info --all`                        | Display all gem versions                             |
+| giall | `gem info --all`                       | Display all gem versions                             |
 | gca   | `gem cert --add`                       | Add a trusted certificate                            |
 | gcr   | `gem cert --remove`                    | Remove a trusted certificate                         |
 | gcb   | `gem cert --build`                     | Build private key and self-signed certificate        |

From 999d22bb0e23973abc3d3b88f8b3e7606ddff755 Mon Sep 17 00:00:00 2001
From: Konstantin Gribov <grossws@gmail.com>
Date: Wed, 1 Jul 2020 16:20:41 +0300
Subject: [PATCH 017/869] gradle: force `--console plain` for tasks cache
 generation (#8731)

Fixes #8730
---
 plugins/gradle/_gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/gradle/_gradle b/plugins/gradle/_gradle
index 647626615..e77b23cdb 100644
--- a/plugins/gradle/_gradle
+++ b/plugins/gradle/_gradle
@@ -116,9 +116,9 @@ __gradle-generate-tasks-cache() {
     # Reuse Gradle Daemon if IDLE but don't start a new one.
     local gradle_tasks_output
     if [[ ! -z "$($gradle_cmd --status 2>/dev/null | grep IDLE)" ]]; then
-        gradle_tasks_output="$($gradle_cmd --daemon --build-file $gradle_build_file -q tasks --all 2>/dev/null)"
+        gradle_tasks_output="$($gradle_cmd --daemon --build-file $gradle_build_file --console plain -q tasks --all 2>/dev/null)"
     else
-        gradle_tasks_output="$($gradle_cmd --no-daemon --build-file $gradle_build_file -q tasks --all 2>/dev/null)"
+        gradle_tasks_output="$($gradle_cmd --no-daemon --build-file $gradle_build_file --console plain -q tasks --all 2>/dev/null)"
     fi
     local gradle_all_tasks="" root_tasks="" subproject_tasks="" output_line
     local -a match

From 232cb19859ce9b0698ff8e281dc9e5d01b0aaf27 Mon Sep 17 00:00:00 2001
From: Alex Zdanowicz <Zandwhich@users.noreply.github.com>
Date: Wed, 1 Jul 2020 06:44:14 -0700
Subject: [PATCH 018/869] install: fix typo (#9069)

Changing 'your' to 'you'
---
 tools/install.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/install.sh b/tools/install.sh
index 26b9bf08e..8a93708ca 100755
--- a/tools/install.sh
+++ b/tools/install.sh
@@ -269,7 +269,7 @@ main() {
 		                        /____/                       ....is now installed!
 
 
-		Before your scream Oh My Zsh! please look over the ~/.zshrc file to select plugins, themes, and options.
+		Before you scream Oh My Zsh! please look over the ~/.zshrc file to select plugins, themes, and options.
 
 		• Follow us on Twitter: https://twitter.com/ohmyzsh
 		• Join our Discord server: https://discord.gg/ohmyzsh

From d24a9dbcccd03f4e1dd4549c94e9c3fe76d88f4b Mon Sep 17 00:00:00 2001
From: Kyle Laker <kyle@laker.email>
Date: Wed, 1 Jul 2020 13:05:53 -0400
Subject: [PATCH 019/869] agnoster: fix git working tree check (#9072)

`git rev-parse --is-inside-work-tree` does not have a different exit
code when not within a work tree; the difference is in the output,
either "true" when in a work tree, or "false" when not.

The if was modified similarly to the check for the hide-status config,
which also parses command output rather than exit code.

Co-authored-by: Kyle Laker <klaker@easydynamics.com>
---
 themes/agnoster.zsh-theme | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/themes/agnoster.zsh-theme b/themes/agnoster.zsh-theme
index 8c700d06a..b0a3b7b3f 100644
--- a/themes/agnoster.zsh-theme
+++ b/themes/agnoster.zsh-theme
@@ -106,7 +106,7 @@ prompt_git() {
   }
   local ref dirty mode repo_path
 
-  if $(git rev-parse --is-inside-work-tree >/dev/null 2>&1); then
+   if [[ "$(git rev-parse --is-inside-work-tree 2>/dev/null)" = "true" ]]; then
     repo_path=$(git rev-parse --git-dir 2>/dev/null)
     dirty=$(parse_git_dirty)
     ref=$(git symbolic-ref HEAD 2> /dev/null) || ref="➦ $(git rev-parse --short HEAD 2> /dev/null)"

From 62648d71bb05116287206d83181f9daa5a59ba67 Mon Sep 17 00:00:00 2001
From: Monson Shao <holymonson@gmail.com>
Date: Thu, 2 Jul 2020 02:51:13 +0800
Subject: [PATCH 020/869] lib: enable diff color (#8807)

---
 lib/theme-and-appearance.zsh | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/lib/theme-and-appearance.zsh b/lib/theme-and-appearance.zsh
index 5016d86ca..5c1b6db12 100644
--- a/lib/theme-and-appearance.zsh
+++ b/lib/theme-and-appearance.zsh
@@ -39,6 +39,11 @@ if [[ "$DISABLE_LS_COLORS" != "true" ]]; then
   fi
 fi
 
+# enable diff color if possible.
+if diff --color . . &>/dev/null; then
+  alias diff='diff --color'
+fi
+
 setopt auto_cd
 setopt multios
 setopt prompt_subst

From 3178334a2dd6ead1a42d1728bfa05e001f71693b Mon Sep 17 00:00:00 2001
From: Adam Vandover <adam@vandover.me>
Date: Fri, 3 Jul 2020 13:03:04 -0400
Subject: [PATCH 021/869] git: change main branch naming scheme (#9049)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Marc Cornellà <marc.cornella@live.com>
---
 plugins/git/README.md      | 36 ++++++++++++++++++++++--------------
 plugins/git/git.plugin.zsh | 23 ++++++++++++++++-------
 2 files changed, 38 insertions(+), 21 deletions(-)

diff --git a/plugins/git/README.md b/plugins/git/README.md
index 8642dd055..b7f216813 100644
--- a/plugins/git/README.md
+++ b/plugins/git/README.md
@@ -23,7 +23,7 @@ plugins=(... git)
 | gb                   | git branch                                                                                                                       |
 | gba                  | git branch -a                                                                                                                    |
 | gbd                  | git branch -d                                                                                                                    |
-| gbda                 | git branch --no-color --merged \| command grep -vE "^(\+\|\*\|\s*(master\|development\|develop\|devel\|dev)\s*$)" \| command xargs -n 1 git branch -d |
+| gbda                 | git branch --no-color --merged \| command grep -vE "^(\+\|\*\|\s*($(git_main_branch)\|development\|develop\|devel\|dev)\s*$)" \| command xargs -n 1 git branch -d |
 | gbD                  | git branch -D                                                                                                                    |
 | gbl                  | git blame -b -w                                                                                                                  |
 | gbnm                 | git branch --no-merged                                                                                                           |
@@ -47,7 +47,7 @@ plugins=(... git)
 | gcl                  | git clone --recurse-submodules                                                                                                   |
 | gclean               | git clean -id                                                                                                                    |
 | gpristine            | git reset --hard && git clean -dffx                                                                                              |
-| gcm                  | git checkout master                                                                                                              |
+| gcm                  | git checkout $(git_main_branch)                                                                                                                |
 | gcd                  | git checkout develop                                                                                                             |
 | gcmsg                | git commit -m                                                                                                                    |
 | gco                  | git checkout                                                                                                                     |
@@ -85,7 +85,7 @@ plugins=(... git)
 | ghh                  | git help                                                                                                                         |
 | gignore              | git update-index --assume-unchanged                                                                                              |
 | gignored             | git ls-files -v \| grep "^[[:lower:]]"                                                                                           |
-| git-svn-dcommit-push | git svn dcommit && git push github master:svntrunk                                                                               |
+| git-svn-dcommit-push | git svn dcommit && git push github $(git_main_branch):svntrunk                                                                                 |
 | gk                   | gitk --all --branches                                                                                                            |
 | gke                  | gitk --all $(git log -g --pretty=%h)                                                                                             |
 | gl                   | git pull                                                                                                                         |
@@ -102,12 +102,12 @@ plugins=(... git)
 | glola                | git log --graph --pretty='%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --all                     |
 | glog                 | git log --oneline --decorate --graph                                                                                             |
 | gloga                | git log --oneline --decorate --graph --all                                                                                       |
-| glp                  | git log --pretty=\<format\>                                                                                                       |
+| glp                  | git log --pretty=\<format\>                                                                                                      |
 | gm                   | git merge                                                                                                                        |
-| gmom                 | git merge origin/master                                                                                                          |
+| gmom                 | git merge origin/$(git_main_branch)                                                                                                            |
 | gmt                  | git mergetool --no-prompt                                                                                                        |
 | gmtvim               | git mergetool --no-prompt --tool=vimdiff                                                                                         |
-| gmum                 | git merge upstream/master                                                                                                        |
+| gmum                 | git merge upstream/$(git_main_branch)                                                                                                          |
 | gma                  | git merge --abort                                                                                                                |
 | gp                   | git push                                                                                                                         |
 | gpd                  | git push --dry-run                                                                                                               |
@@ -123,7 +123,7 @@ plugins=(... git)
 | grbc                 | git rebase --continue                                                                                                            |
 | grbd                 | git rebase develop                                                                                                               |
 | grbi                 | git rebase -i                                                                                                                    |
-| grbm                 | git rebase master                                                                                                                |
+| grbm                 | git rebase $(git_main_branch)                                                                                                                  |
 | grbs                 | git rebase --skip                                                                                                                |
 | grev                 | git revert                                                                                                                       |
 | grh                  | git reset                                                                                                                        |
@@ -170,7 +170,7 @@ plugins=(... git)
 | gupv                 | git pull --rebase -v                                                                                                             |
 | gupa                 | git pull --rebase --autostash                                                                                                    |
 | gupav                | git pull --rebase --autostash -v                                                                                                 |
-| glum                 | git pull upstream master                                                                                                         |
+| glum                 | git pull upstream $(git_main_branch)                                                                                                           |
 | gwch                 | git whatchanged -p --abbrev-commit --pretty=medium                                                                               |
 | gwip                 | git add -A; git rm $(git ls-files --deleted) 2> /dev/null; git commit --no-verify --no-gpg-sign -m "--wip-- [skip ci]"           |
 | gam                  | git am                                                                                                                           |
@@ -179,6 +179,13 @@ plugins=(... git)
 | gama                 | git am --abort                                                                                                                   |
 | gamscp               | git am --show-current-patch                                                                                                      |
 
+### Main branch preference
+
+Following the recent push for removing racially-charged words from our technical vocabulary, the git plugin favors using
+a branch name other than `master`. In this case, we favor the shorter, neutral and descriptive term `main`. This means
+that any aliases and functions that previously used `master`, will use `main` if that branch exists. We do this via the
+function `git_main_branch`.
+
 ### Deprecated aliases
 
 These are aliases that have been removed, renamed, or otherwise modified in a way that may, or may not, receive further support.
@@ -201,12 +208,13 @@ These are aliases that have been removed, renamed, or otherwise modified in a wa
 
 ### Current
 
-| Command                | Description                                              |
-|:-----------------------|:---------------------------------------------------------|
-| `grename <old> <new>`  | Rename `old` branch to `new`, including in origin remote |
-| current_branch         | Return the name of the current branch                    |
-| git_current_user_name  | Returns the `user.name` config value                     |
-| git_current_user_email | Returns the `user.email` config value                    |
+| Command                | Description                                                                  |
+|:-----------------------|:-----------------------------------------------------------------------------|
+| `grename <old> <new>`  | Rename `old` branch to `new`, including in origin remote                     |
+| current_branch         | Return the name of the current branch                                        |
+| git_current_user_name  | Returns the `user.name` config value                                         |
+| git_current_user_email | Returns the `user.email` config value                                        |
+| git_main_branch        | Returns the name of the main branch: `main` if it exists, `master` otherwise |
 
 ### Work in Progress (WIP)
 
diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index 1112421bf..5a9ccff5c 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -25,6 +25,15 @@ function work_in_progress() {
   fi
 }
 
+# Check if main exists and use instead of master
+function git_main_branch() {
+  if [[ -n "$(git branch --list main)" ]]; then
+    echo main
+  else
+    echo master
+  fi
+}
+
 #
 # Aliases
 # (sorted alphabetically)
@@ -43,7 +52,7 @@ alias gapt='git apply --3way'
 alias gb='git branch'
 alias gba='git branch -a'
 alias gbd='git branch -d'
-alias gbda='git branch --no-color --merged | command grep -vE "^(\+|\*|\s*(master|development|develop|devel|dev)\s*$)" | command xargs -n 1 git branch -d'
+alias gbda='git branch --no-color --merged | command grep -vE "^(\+|\*|\s*($(git_main_branch)|development|develop|devel|dev)\s*$)" | command xargs -n 1 git branch -d'
 alias gbD='git branch -D'
 alias gbl='git blame -b -w'
 alias gbnm='git branch --no-merged'
@@ -68,7 +77,7 @@ alias gcf='git config --list'
 alias gcl='git clone --recurse-submodules'
 alias gclean='git clean -id'
 alias gpristine='git reset --hard && git clean -dffx'
-alias gcm='git checkout master'
+alias gcm='git checkout $(git_main_branch)'
 alias gcd='git checkout develop'
 alias gcmsg='git commit -m'
 alias gco='git checkout'
@@ -160,7 +169,7 @@ alias ghh='git help'
 
 alias gignore='git update-index --assume-unchanged'
 alias gignored='git ls-files -v | grep "^[[:lower:]]"'
-alias git-svn-dcommit-push='git svn dcommit && git push github master:svntrunk'
+alias git-svn-dcommit-push='git svn dcommit && git push github $(git_main_branch):svntrunk'
 
 alias gk='\gitk --all --branches'
 alias gke='\gitk --all $(git log -g --pretty=%h)'
@@ -182,10 +191,10 @@ alias gloga='git log --oneline --decorate --graph --all'
 alias glp="_git_log_prettily"
 
 alias gm='git merge'
-alias gmom='git merge origin/master'
+alias gmom='git merge origin/$(git_main_branch)'
 alias gmt='git mergetool --no-prompt'
 alias gmtvim='git mergetool --no-prompt --tool=vimdiff'
-alias gmum='git merge upstream/master'
+alias gmum='git merge upstream/$(git_main_branch)'
 alias gma='git merge --abort'
 
 alias gp='git push'
@@ -203,7 +212,7 @@ alias grba='git rebase --abort'
 alias grbc='git rebase --continue'
 alias grbd='git rebase develop'
 alias grbi='git rebase -i'
-alias grbm='git rebase master'
+alias grbm='git rebase $(git_main_branch)'
 alias grbs='git rebase --skip'
 alias grev='git revert'
 alias grh='git reset'
@@ -258,7 +267,7 @@ alias gup='git pull --rebase'
 alias gupv='git pull --rebase -v'
 alias gupa='git pull --rebase --autostash'
 alias gupav='git pull --rebase --autostash -v'
-alias glum='git pull upstream master'
+alias glum='git pull upstream $(git_main_branch)'
 
 alias gwch='git whatchanged -p --abbrev-commit --pretty=medium'
 alias gwip='git add -A; git rm $(git ls-files --deleted) 2> /dev/null; git commit --no-verify --no-gpg-sign -m "--wip-- [skip ci]"'

From a15f0f0e9ff17c1ca5c6d694d732e72c7c03a62b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Fri, 3 Jul 2020 19:05:40 +0200
Subject: [PATCH 022/869] cli: beauty touches on 'omz pr test' command

---
 lib/cli.zsh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/lib/cli.zsh b/lib/cli.zsh
index e25a9f0b1..73ac5a846 100644
--- a/lib/cli.zsh
+++ b/lib/cli.zsh
@@ -181,6 +181,10 @@ function _omz::pr::test {
     # After testing, go back to the previous HEAD if the user wants
     _omz::log prompt "do you want to go back to the previous branch? [Y/n] "
     read -r -k 1
+
+    # If no newline entered, add a newline
+    [[ "$REPLY" != $'\n' ]] && echo
+    # If NO selected, do nothing else
     [[ "$REPLY" = [nN] ]] && return
 
     (

From 7afaee858a4ae5a8d0d8c1f5fe150979842ebefc Mon Sep 17 00:00:00 2001
From: Larson Carter <larsoncarter@blazermail.net>
Date: Sun, 5 Jul 2020 10:59:12 -0500
Subject: [PATCH 023/869] Bug and Feature Request Templates + MLH Theme +
 Readme (#9068)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Marc Cornellà <marc.cornella@live.com>
Co-authored-by: Bartek Pacia <barpac02@gmail.com>
---
 .github/ISSUE_TEMPLATE/bug_report.md      |  8 +++
 .github/ISSUE_TEMPLATE/feature_request.md | 11 +++--
 README.md                                 | 24 ++++-----
 themes/mlh.zsh-theme                      | 59 +++++++++++++++++++++++
 4 files changed, 87 insertions(+), 15 deletions(-)
 create mode 100644 themes/mlh.zsh-theme

diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 7c1cb8967..024231531 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -26,8 +26,16 @@ A brief description of what should happen.
 If applicable, add screenshots to help explain your problem.
 You can also record an asciinema session: https://asciinema.org/
 
+**Self Check**
+Have you tried reaching out on the [Discord server](discord.gg/ohmyzsh)? 
+This can help cut down on filling up issues. We always have a few people
+online that are in a variety of timezones that are willing to help you!
+Also searching existing [GitHub Issues](https://github.com/ohmyzsh/ohmyzsh/issues?q=)
+might help you get quicker support
+
 **Desktop (please complete the following information):**
  - OS / Distro: [e.g. Arch Linux, macOS]
+ - If on Windows what version of WSL: [e.g. WSL1, WSL2]
  - Latest ohmyzsh Update?: [e.g. Yes/No]
  - ZSH Version: [e.g. 5.6]
  - Terminal emulator [e.g. iTerm2]
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
index 346eabaea..0a8a588db 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -11,16 +11,19 @@ an issue where no sections have been filled will be deleted without comment.
 -->
 
 **Is your feature request related to a particular plugin or theme? If so, specify it.**
-The name of the plugin or theme that you would like us to improve. [...]
+The name of the plugin, theme or alias that you would like us to improve. [...]
 
 **Is your feature request related to a problem? Please describe.**
 A description of what the problem is. Ex. I'm always frustrated when [...]
 
 **Describe the solution you'd like**
-A description of what you want to happen.
+A description of what you want to happen. [...]
 
 **Describe alternatives you've considered**
-A description of any alternative solutions or features you've considered. This can also include other plugins or aliases.
+A description of any alternative solutions or features you've considered. This can also include other plugins or themes.
 
 **Additional context**
-Add any other context or screenshots about the feature request here. Also if you have any PRs related to this issue that are already open that you would like us to look at.
+Add any other context, screenshots or discord conversations about the feature request here. Also if you have any PRs related to this issue that are already open that you would like us to look at.
+
+**Related Issues**
+Is there any open or closed issues that is related to this feature request? If so please link them below! [...]
diff --git a/README.md b/README.md
index 9fa0c2049..329eff178 100644
--- a/README.md
+++ b/README.md
@@ -12,7 +12,7 @@ Once installed, your terminal shell will become the talk of the town _or your mo
 
 Finally, you'll begin to get the sort of attention that you have always felt you deserved. ...or maybe you'll use the time that you're saving to start flossing more often. 😬
 
-To learn more, visit [ohmyz.sh](https://ohmyz.sh), follow [@ohmyzsh](https://twitter.com/ohmyzsh) on Twitter, and/or join us on Discord.
+To learn more, visit [ohmyz.sh](https://ohmyz.sh), follow [@ohmyzsh](https://twitter.com/ohmyzsh) on Twitter, and/or join us on [Discord](https://discord.gg/ohmyzsh).
 
 [![CI](https://github.com/ohmyzsh/ohmyzsh/workflows/CI/badge.svg)](https://github.com/ohmyzsh/ohmyzsh/actions?query=workflow%3ACI)
 [![Follow @ohmyzsh](https://img.shields.io/twitter/follow/ohmyzsh?label=Follow+@ohmyzsh&style=flat)](https://twitter.com/intent/follow?screen_name=ohmyzsh)
@@ -22,14 +22,14 @@ To learn more, visit [ohmyz.sh](https://ohmyz.sh), follow [@ohmyzsh](https://twi
 
 ### Prerequisites
 
-* A Unix-like operating system: macOS, Linux, BSD. On Windows: WSL is preferred, but cygwin or msys also mostly work.
-* [Zsh](https://www.zsh.org) should be installed (v4.3.9 or more recent). If not pre-installed (run `zsh --version` to confirm), check the following instructions here: [Installing ZSH](https://github.com/ohmyzsh/ohmyzsh/wiki/Installing-ZSH)
+* A Unix-like operating system: macOS, Linux, BSD. On Windows: WSL2 is preferred, but cygwin or msys also mostly work.
+* [Zsh](https://www.zsh.org) should be installed (v4.3.9 or more recent is fine but we prefer 5.0.8 and newer). If not pre-installed (run `zsh --version` to confirm), check the following wiki instructions here: [Installing ZSH](https://github.com/ohmyzsh/ohmyzsh/wiki/Installing-ZSH)
 * `curl` or `wget` should be installed
-* `git` should be installed (recommended v1.7.2 or higher)
+* `git` should be installed (recommended v2.4.11 or higher)
 
 ### Basic Installation
 
-Oh My Zsh is installed by running one of the following commands in your terminal. You can install this via the command-line with either `curl` or `wget`.
+Oh My Zsh is installed by running one of the following commands in your terminal. You can install this via the command-line with either `curl` or `wget`, whichever is installed on your machine.
 
 #### via curl
 
@@ -58,7 +58,7 @@ sh install.sh
 
 ### Plugins
 
-Oh My Zsh comes with a shitload of plugins to take advantage of. You can take a look in the [plugins](https://github.com/ohmyzsh/ohmyzsh/tree/master/plugins) directory and/or the [wiki](https://github.com/ohmyzsh/ohmyzsh/wiki/Plugins) to see what's currently available.
+Oh My Zsh comes with a shitload of plugins for you to take advantage of. You can take a look in the [plugins](https://github.com/ohmyzsh/ohmyzsh/tree/master/plugins) directory and/or the [wiki](https://github.com/ohmyzsh/ohmyzsh/wiki/Plugins) to see what's currently available.
 
 #### Enabling Plugins
 
@@ -82,15 +82,15 @@ plugins=(
 )
 ```
 
-_Note that the plugins are separated by whitespace. **Do not** use commas between them._
+_Note that the plugins are separated by whitespace (spaces, tabs, new lines...). **Do not** use commas between them or it will break._
 
 #### Using Plugins
 
-Most plugins (should! we're working on this) include a __README__, which documents how to use them.
+Each plugin includes a __README__, documenting it. This README should show the aliases (if the plugin adds any) and extra goodies that are inclued in that particular plugin.
 
 ### Themes
 
-We'll admit it. Early in the Oh My Zsh world, we may have gotten a bit too theme happy. We have over one hundred themes now bundled. Most of them have [screenshots](https://github.com/ohmyzsh/ohmyzsh/wiki/Themes) on the wiki. Check them out!
+We'll admit it. Early in the Oh My Zsh world, we may have gotten a bit too theme happy. We have over one hundred and fifty themes now bundled. Most of them have [screenshots](https://github.com/ohmyzsh/ohmyzsh/wiki/Themes) on the wiki (We are working on updating this!). Check them out!
 
 #### Selecting a Theme
 
@@ -154,7 +154,7 @@ the installer accepts (these settings are also documented at the top of the inst
 
 #### Custom Directory
 
-The default location is `~/.oh-my-zsh` (hidden in your home directory)
+The default location is `~/.oh-my-zsh` (hidden in your home directory, you can access it with `cd ~/.oh-my-zsh`)
 
 If you'd like to change the install directory with the `ZSH` environment variable, either by running
 `export ZSH=/your/path` before installing, or by setting it before the end of the install pipeline
@@ -303,7 +303,9 @@ Thank you so much!
 We're on the social media.
 
 * [@ohmyzsh](https://twitter.com/ohmyzsh) on Twitter. You should follow it.
-* [Oh My Zsh](https://www.facebook.com/Oh-My-Zsh-296616263819290/) on Facebook.
+* [FaceBook](https://www.facebook.com/Oh-My-Zsh-296616263819290/) poke us.
+* [Instagram](https://www.instagram.com/_ohmyzsh/) tag us in your post showing Oh My Zsh!
+* [Discord](https://discord.gg/ohmyzsh) to chat with us!
 
 ## Merchandise
 
diff --git a/themes/mlh.zsh-theme b/themes/mlh.zsh-theme
new file mode 100644
index 000000000..a21a546bc
--- /dev/null
+++ b/themes/mlh.zsh-theme
@@ -0,0 +1,59 @@
+# The Official Theme of 
+##     ## ##       ##     ## 
+###   ### ##       ##     ## 
+#### #### ##       ##     ## 
+## ### ## ##       ######### 
+##     ## ##       ##     ## 
+##     ## ##       ##     ## 
+##     ## ######## ##     ## 
+
+# # # # # # # # # # # # # # # # # #
+# # # Feel free to customize! # # #
+# # # # # # # # # # # # # # # # # #
+
+# To easily discover colors and their codes, type `spectrum_ls` in the terminal
+
+AT_SYMBOL=" @ "
+IN_SYMBOL=" in "
+ON_SYMBOL=" on "
+SYMBOL="$"
+
+USER_COLOR="%F{001}"
+DEVICE_COLOR="%F{033}"
+DIR_COLOR="%F{220}"
+BRANCH_COLOR="%F{001}"
+TIME_COLOR="%F{033}"
+
+username() {
+    echo "$USER_COLOR%n%f"
+}
+
+# Returns device name 
+device() {
+    echo "$DEVICE_COLOR%m%f"
+}
+
+# The current directory
+directory() {
+    echo "$DIR_COLOR%1~%f"
+}
+
+# Current time with milliseconds
+current_time() {
+    echo "$TIME_COLOR%*%f"
+}
+
+# Return status of the last command
+return_status() {
+    echo "%(?..%F{001}out %?)%f"
+}
+
+# Set the git_prompt_info text
+ZSH_THEME_GIT_PROMPT_PREFIX="${ON_SYMBOL}${BRANCH_COLOR}"
+ZSH_THEME_GIT_PROMPT_SUFFIX="%f"
+ZSH_THEME_GIT_PROMPT_DIRTY=""
+ZSH_THEME_GIT_PROMPT_CLEAN=""
+
+# %B and %b make the text bold
+PROMPT='%b$(username)$AT_SYMBOL$(device)$IN_SYMBOL$(directory)$(git_prompt_info)%b $SYMBOL '
+RPROMPT="$(return_status) $(current_time)"

From a8fee4036be264bd21ddf7fbe35f2a2e40eed412 Mon Sep 17 00:00:00 2001
From: Jethro Lee <dlemfh96@gmail.com>
Date: Tue, 7 Jul 2020 00:12:00 +0900
Subject: [PATCH 024/869] Edit for better consistency in template (#8593)

---
 templates/zshrc.zsh-template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/zshrc.zsh-template b/templates/zshrc.zsh-template
index 0fa6d809e..307618104 100644
--- a/templates/zshrc.zsh-template
+++ b/templates/zshrc.zsh-template
@@ -33,7 +33,7 @@ ZSH_THEME="robbyrussell"
 # export UPDATE_ZSH_DAYS=13
 
 # Uncomment the following line if pasting URLs and other text is messed up.
-# DISABLE_MAGIC_FUNCTIONS=true
+# DISABLE_MAGIC_FUNCTIONS="true"
 
 # Uncomment the following line to disable colors in ls.
 # DISABLE_LS_COLORS="true"

From fd9781b4c7036a3ef0a62744b9ecae327f9f2f24 Mon Sep 17 00:00:00 2001
From: MDHD <MDHD.Yee@outlook.com>
Date: Mon, 6 Jul 2020 10:13:49 -0500
Subject: [PATCH 025/869] sudo: make the behavior more in line with
 expectations (#9047)

---
 plugins/sudo/sudo.plugin.zsh | 29 +++++++++++++++++++++--------
 1 file changed, 21 insertions(+), 8 deletions(-)

diff --git a/plugins/sudo/sudo.plugin.zsh b/plugins/sudo/sudo.plugin.zsh
index f405b025f..51579377d 100644
--- a/plugins/sudo/sudo.plugin.zsh
+++ b/plugins/sudo/sudo.plugin.zsh
@@ -13,15 +13,28 @@
 # ------------------------------------------------------------------------------
 
 sudo-command-line() {
-    [[ -z $BUFFER ]] && zle up-history
-    if [[ $BUFFER == sudo\ * ]]; then
-        LBUFFER="${LBUFFER#sudo }"
-    elif [[ $BUFFER == $EDITOR\ * ]]; then
-        LBUFFER="${LBUFFER#$EDITOR }"
-        LBUFFER="sudoedit $LBUFFER"
+    [[ -z $BUFFER ]] && LBUFFER="$(fc -ln -1)"
+    if [[ -n $EDITOR && $BUFFER == $EDITOR\ * ]]; then
+        if [[ ${#LBUFFER} -le ${#EDITOR} ]]; then
+            RBUFFER=" ${BUFFER#$EDITOR }"
+            LBUFFER="sudoedit"
+        else
+            LBUFFER="sudoedit ${LBUFFER#$EDITOR }"
+        fi
     elif [[ $BUFFER == sudoedit\ * ]]; then
-        LBUFFER="${LBUFFER#sudoedit }"
-        LBUFFER="$EDITOR $LBUFFER"
+        if [[ ${#LBUFFER} -le 8 ]]; then
+            RBUFFER=" ${BUFFER#sudoedit }"
+            LBUFFER="$EDITOR"
+        else
+            LBUFFER="$EDITOR ${LBUFFER#sudoedit }"
+        fi
+    elif [[ $BUFFER == sudo\ * ]]; then
+        if [[ ${#LBUFFER} -le 4 ]]; then
+            RBUFFER="${BUFFER#sudo }"
+            LBUFFER=""
+        else
+            LBUFFER="${LBUFFER#sudo }"
+        fi
     else
         LBUFFER="sudo $LBUFFER"
     fi

From d0d01c0bbf32ffe1dc22a66620ca85669c77e6b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Mon, 6 Jul 2020 17:17:40 +0200
Subject: [PATCH 026/869] lib: prefix diff call with command to bypass diff
 aliases

See https://github.com/ohmyzsh/ohmyzsh/pull/8807#issuecomment-652697704
---
 lib/theme-and-appearance.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/theme-and-appearance.zsh b/lib/theme-and-appearance.zsh
index 5c1b6db12..0b71de372 100644
--- a/lib/theme-and-appearance.zsh
+++ b/lib/theme-and-appearance.zsh
@@ -40,7 +40,7 @@ if [[ "$DISABLE_LS_COLORS" != "true" ]]; then
 fi
 
 # enable diff color if possible.
-if diff --color . . &>/dev/null; then
+if command diff --color . . &>/dev/null; then
   alias diff='diff --color'
 fi
 

From 1c58a746af7a67f311ee47f97285a855eaf18b5e Mon Sep 17 00:00:00 2001
From: Robert Estelle <robertestelle@gmail.com>
Date: Mon, 6 Jul 2020 08:31:40 -0700
Subject: [PATCH 027/869] lib: safety fix and speed-ups for git.zsh prompt
 functions (#7804)

---
 lib/git.zsh | 93 ++++++++++++++++++++++++++---------------------------
 1 file changed, 46 insertions(+), 47 deletions(-)

diff --git a/lib/git.zsh b/lib/git.zsh
index f7d4738ca..ffc7c01a1 100644
--- a/lib/git.zsh
+++ b/lib/git.zsh
@@ -1,9 +1,20 @@
+# The git prompt's git commands are read-only and should not interfere with
+# other processes. This environment variable is equivalent to running with `git
+# --no-optional-locks`, but falls back gracefully for older versions of git.
+# See git(1) for and git-status(1) for a description of that flag.
+#
+# We wrap in a local function instead of exporting the variable directly in
+# order to avoid interfering with manually-run git commands by the user.
+function __git_prompt_git() {
+  GIT_OPTIONAL_LOCKS=0 command git "$@"
+}
+
 # Outputs current branch info in prompt format
 function git_prompt_info() {
   local ref
-  if [[ "$(command git config --get oh-my-zsh.hide-status 2>/dev/null)" != "1" ]]; then
-    ref=$(command git symbolic-ref HEAD 2> /dev/null) || \
-    ref=$(command git rev-parse --short HEAD 2> /dev/null) || return 0
+  if [[ "$(__git_prompt_git config --get oh-my-zsh.hide-status 2>/dev/null)" != "1" ]]; then
+    ref=$(__git_prompt_git symbolic-ref HEAD 2> /dev/null) || \
+    ref=$(__git_prompt_git rev-parse --short HEAD 2> /dev/null) || return 0
     echo "$ZSH_THEME_GIT_PROMPT_PREFIX${ref#refs/heads/}$(parse_git_dirty)$ZSH_THEME_GIT_PROMPT_SUFFIX"
   fi
 }
@@ -13,7 +24,7 @@ function parse_git_dirty() {
   local STATUS
   local -a FLAGS
   FLAGS=('--porcelain')
-  if [[ "$(command git config --get oh-my-zsh.hide-dirty)" != "1" ]]; then
+  if [[ "$(__git_prompt_git config --get oh-my-zsh.hide-dirty)" != "1" ]]; then
     if [[ "${DISABLE_UNTRACKED_FILES_DIRTY:-}" == "true" ]]; then
       FLAGS+='--untracked-files=no'
     fi
@@ -27,7 +38,7 @@ function parse_git_dirty() {
         FLAGS+="--ignore-submodules=${GIT_STATUS_IGNORE_SUBMODULES:-dirty}"
         ;;
     esac
-    STATUS=$(command git status ${FLAGS} 2> /dev/null | tail -n1)
+    STATUS=$(__git_prompt_git status ${FLAGS} 2> /dev/null | tail -n1)
   fi
   if [[ -n $STATUS ]]; then
     echo "$ZSH_THEME_GIT_PROMPT_DIRTY"
@@ -39,10 +50,10 @@ function parse_git_dirty() {
 # Gets the difference between the local and remote branches
 function git_remote_status() {
     local remote ahead behind git_remote_status git_remote_status_detailed
-    remote=${$(command git rev-parse --verify ${hook_com[branch]}@{upstream} --symbolic-full-name 2>/dev/null)/refs\/remotes\/}
+    remote=${$(__git_prompt_git rev-parse --verify ${hook_com[branch]}@{upstream} --symbolic-full-name 2>/dev/null)/refs\/remotes\/}
     if [[ -n ${remote} ]]; then
-        ahead=$(command git rev-list ${hook_com[branch]}@{upstream}..HEAD 2>/dev/null | wc -l)
-        behind=$(command git rev-list HEAD..${hook_com[branch]}@{upstream} 2>/dev/null | wc -l)
+        ahead=$(__git_prompt_git rev-list ${hook_com[branch]}@{upstream}..HEAD 2>/dev/null | wc -l)
+        behind=$(__git_prompt_git rev-list HEAD..${hook_com[branch]}@{upstream} 2>/dev/null | wc -l)
 
         if [[ $ahead -eq 0 ]] && [[ $behind -eq 0 ]]; then
             git_remote_status="$ZSH_THEME_GIT_PROMPT_EQUAL_REMOTE"
@@ -71,11 +82,11 @@ function git_remote_status() {
 # it's not a symbolic ref, but in a Git repo.
 function git_current_branch() {
   local ref
-  ref=$(command git symbolic-ref --quiet HEAD 2> /dev/null)
+  ref=$(__git_prompt_git symbolic-ref --quiet HEAD 2> /dev/null)
   local ret=$?
   if [[ $ret != 0 ]]; then
     [[ $ret == 128 ]] && return  # no git repo.
-    ref=$(command git rev-parse --short HEAD 2> /dev/null) || return
+    ref=$(__git_prompt_git rev-parse --short HEAD 2> /dev/null) || return
   fi
   echo ${ref#refs/heads/}
 }
@@ -83,8 +94,8 @@ function git_current_branch() {
 
 # Gets the number of commits ahead from remote
 function git_commits_ahead() {
-  if command git rev-parse --git-dir &>/dev/null; then
-    local commits="$(git rev-list --count @{upstream}..HEAD 2>/dev/null)"
+  if __git_prompt_git rev-parse --git-dir &>/dev/null; then
+    local commits="$(__git_prompt_git rev-list --count @{upstream}..HEAD 2>/dev/null)"
     if [[ -n "$commits" && "$commits" != 0 ]]; then
       echo "$ZSH_THEME_GIT_COMMITS_AHEAD_PREFIX$commits$ZSH_THEME_GIT_COMMITS_AHEAD_SUFFIX"
     fi
@@ -93,8 +104,8 @@ function git_commits_ahead() {
 
 # Gets the number of commits behind remote
 function git_commits_behind() {
-  if command git rev-parse --git-dir &>/dev/null; then
-    local commits="$(git rev-list --count HEAD..@{upstream} 2>/dev/null)"
+  if __git_prompt_git rev-parse --git-dir &>/dev/null; then
+    local commits="$(__git_prompt_git rev-list --count HEAD..@{upstream} 2>/dev/null)"
     if [[ -n "$commits" && "$commits" != 0 ]]; then
       echo "$ZSH_THEME_GIT_COMMITS_BEHIND_PREFIX$commits$ZSH_THEME_GIT_COMMITS_BEHIND_SUFFIX"
     fi
@@ -103,21 +114,21 @@ function git_commits_behind() {
 
 # Outputs if current branch is ahead of remote
 function git_prompt_ahead() {
-  if [[ -n "$(command git rev-list origin/$(git_current_branch)..HEAD 2> /dev/null)" ]]; then
+  if [[ -n "$(__git_prompt_git rev-list origin/$(git_current_branch)..HEAD 2> /dev/null)" ]]; then
     echo "$ZSH_THEME_GIT_PROMPT_AHEAD"
   fi
 }
 
 # Outputs if current branch is behind remote
 function git_prompt_behind() {
-  if [[ -n "$(command git rev-list HEAD..origin/$(git_current_branch) 2> /dev/null)" ]]; then
+  if [[ -n "$(__git_prompt_git rev-list HEAD..origin/$(git_current_branch) 2> /dev/null)" ]]; then
     echo "$ZSH_THEME_GIT_PROMPT_BEHIND"
   fi
 }
 
 # Outputs if current branch exists on remote or not
 function git_prompt_remote() {
-  if [[ -n "$(command git show-ref origin/$(git_current_branch) 2> /dev/null)" ]]; then
+  if [[ -n "$(__git_prompt_git show-ref origin/$(git_current_branch) 2> /dev/null)" ]]; then
     echo "$ZSH_THEME_GIT_PROMPT_REMOTE_EXISTS"
   else
     echo "$ZSH_THEME_GIT_PROMPT_REMOTE_MISSING"
@@ -127,62 +138,50 @@ function git_prompt_remote() {
 # Formats prompt string for current git commit short SHA
 function git_prompt_short_sha() {
   local SHA
-  SHA=$(command git rev-parse --short HEAD 2> /dev/null) && echo "$ZSH_THEME_GIT_PROMPT_SHA_BEFORE$SHA$ZSH_THEME_GIT_PROMPT_SHA_AFTER"
+  SHA=$(__git_prompt_git rev-parse --short HEAD 2> /dev/null) && echo "$ZSH_THEME_GIT_PROMPT_SHA_BEFORE$SHA$ZSH_THEME_GIT_PROMPT_SHA_AFTER"
 }
 
 # Formats prompt string for current git commit long SHA
 function git_prompt_long_sha() {
   local SHA
-  SHA=$(command git rev-parse HEAD 2> /dev/null) && echo "$ZSH_THEME_GIT_PROMPT_SHA_BEFORE$SHA$ZSH_THEME_GIT_PROMPT_SHA_AFTER"
+  SHA=$(__git_prompt_git rev-parse HEAD 2> /dev/null) && echo "$ZSH_THEME_GIT_PROMPT_SHA_BEFORE$SHA$ZSH_THEME_GIT_PROMPT_SHA_AFTER"
 }
 
 # Get the status of the working tree
 function git_prompt_status() {
+  emulate -L zsh
+
   local INDEX STATUS
-  INDEX=$(command git status --porcelain -b 2> /dev/null)
+  INDEX=$(__git_prompt_git status --porcelain -b 2> /dev/null) || return 0
   STATUS=""
-  if $(echo "$INDEX" | command grep -E '^\?\? ' &> /dev/null); then
+  if [[ "${INDEX}" =~ $'(^|\n)\\?\\? ' ]]; then
     STATUS="$ZSH_THEME_GIT_PROMPT_UNTRACKED$STATUS"
   fi
-  if $(echo "$INDEX" | grep '^A  ' &> /dev/null); then
-    STATUS="$ZSH_THEME_GIT_PROMPT_ADDED$STATUS"
-  elif $(echo "$INDEX" | grep '^M  ' &> /dev/null); then
-    STATUS="$ZSH_THEME_GIT_PROMPT_ADDED$STATUS"
-  elif $(echo "$INDEX" | grep '^MM ' &> /dev/null); then
+  if [[ "${INDEX}" =~ $'(^|\n)(A |M |MM) ' ]]; then
     STATUS="$ZSH_THEME_GIT_PROMPT_ADDED$STATUS"
   fi
-  if $(echo "$INDEX" | grep '^ M ' &> /dev/null); then
-    STATUS="$ZSH_THEME_GIT_PROMPT_MODIFIED$STATUS"
-  elif $(echo "$INDEX" | grep '^AM ' &> /dev/null); then
-    STATUS="$ZSH_THEME_GIT_PROMPT_MODIFIED$STATUS"
-  elif $(echo "$INDEX" | grep '^MM ' &> /dev/null); then
-    STATUS="$ZSH_THEME_GIT_PROMPT_MODIFIED$STATUS"
-  elif $(echo "$INDEX" | grep '^ T ' &> /dev/null); then
+  if [[ "${INDEX}" =~ $'(^|\n)([ AM]M| T) ' ]]; then
     STATUS="$ZSH_THEME_GIT_PROMPT_MODIFIED$STATUS"
   fi
-  if $(echo "$INDEX" | grep '^R  ' &> /dev/null); then
+  if [[ "${INDEX}" =~ $'(^|\n)R  ' ]]; then
     STATUS="$ZSH_THEME_GIT_PROMPT_RENAMED$STATUS"
   fi
-  if $(echo "$INDEX" | grep '^ D ' &> /dev/null); then
-    STATUS="$ZSH_THEME_GIT_PROMPT_DELETED$STATUS"
-  elif $(echo "$INDEX" | grep '^D  ' &> /dev/null); then
-    STATUS="$ZSH_THEME_GIT_PROMPT_DELETED$STATUS"
-  elif $(echo "$INDEX" | grep '^AD ' &> /dev/null); then
+  if [[ "${INDEX}" =~ $'(^|\n)([A ]D|D ) ' ]]; then
     STATUS="$ZSH_THEME_GIT_PROMPT_DELETED$STATUS"
   fi
-  if $(command git rev-parse --verify refs/stash >/dev/null 2>&1); then
+  if $(__git_prompt_git rev-parse --verify refs/stash >/dev/null 2>&1); then
     STATUS="$ZSH_THEME_GIT_PROMPT_STASHED$STATUS"
   fi
-  if $(echo "$INDEX" | grep '^UU ' &> /dev/null); then
+  if [[ "${INDEX}" =~ $'(^|\n)UU ' ]]; then
     STATUS="$ZSH_THEME_GIT_PROMPT_UNMERGED$STATUS"
   fi
-  if $(echo "$INDEX" | grep '^## [^ ]\+ .*ahead' &> /dev/null); then
+  if [[ "${INDEX}" =~ $'(^|\n)## [^ ]\+ .*ahead' ]]; then
     STATUS="$ZSH_THEME_GIT_PROMPT_AHEAD$STATUS"
   fi
-  if $(echo "$INDEX" | grep '^## [^ ]\+ .*behind' &> /dev/null); then
+  if [[ "${INDEX}" =~ $'(^|\n)## [^ ]\+ .*behind' ]]; then
     STATUS="$ZSH_THEME_GIT_PROMPT_BEHIND$STATUS"
   fi
-  if $(echo "$INDEX" | grep '^## [^ ]\+ .*diverged' &> /dev/null); then
+  if [[ "${INDEX}" =~ $'(^|\n)## [^ ]\+ .*diverged' ]]; then
     STATUS="$ZSH_THEME_GIT_PROMPT_DIVERGED$STATUS"
   fi
   echo $STATUS
@@ -191,20 +190,20 @@ function git_prompt_status() {
 # Outputs the name of the current user
 # Usage example: $(git_current_user_name)
 function git_current_user_name() {
-  command git config user.name 2>/dev/null
+  __git_prompt_git config user.name 2>/dev/null
 }
 
 # Outputs the email of the current user
 # Usage example: $(git_current_user_email)
 function git_current_user_email() {
-  command git config user.email 2>/dev/null
+  __git_prompt_git config user.email 2>/dev/null
 }
 
 # Output the name of the root directory of the git repository
 # Usage example: $(git_repo_name)
 function git_repo_name() {
   local repo_path
-  if repo_path="$(git rev-parse --show-toplevel 2>/dev/null)" && [[ -n "$repo_path" ]]; then
+  if repo_path="$(__git_prompt_git rev-parse --show-toplevel 2>/dev/null)" && [[ -n "$repo_path" ]]; then
     echo ${repo_path:t}
   fi
 }

From d79941b78997f7c11e247c08678fd57827db3b42 Mon Sep 17 00:00:00 2001
From: Lutz Horn <code@lhorn.de>
Date: Thu, 9 Jul 2020 10:43:59 +0200
Subject: [PATCH 028/869] aws: allow @ in AWS profiles (#9099)

Fixes #9060 by matching a `@` in the AWS profile name.
---
 plugins/aws/aws.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/aws/aws.plugin.zsh b/plugins/aws/aws.plugin.zsh
index 4b5446407..d00c2e56c 100644
--- a/plugins/aws/aws.plugin.zsh
+++ b/plugins/aws/aws.plugin.zsh
@@ -41,7 +41,7 @@ function aws_change_access_key() {
 
 function aws_profiles() {
   [[ -r "${AWS_CONFIG_FILE:-$HOME/.aws/config}" ]] || return 1
-  grep '\[profile' "${AWS_CONFIG_FILE:-$HOME/.aws/config}"|sed -e 's/.*profile \([a-zA-Z0-9_\.-]*\).*/\1/'
+  grep '\[profile' "${AWS_CONFIG_FILE:-$HOME/.aws/config}"|sed -e 's/.*profile \([a-zA-Z0-9@_\.-]*\).*/\1/'
 }
 
 function _aws_profiles() {

From 1db79f97f5523cd2c76b5dfb8185a6d3b7a789d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Thu, 9 Jul 2020 11:16:16 +0200
Subject: [PATCH 029/869] git: use `master` if it exists, otherwise use `main`

See https://github.com/ohmyzsh/ohmyzsh/pull/9049#issuecomment-654537347

Co-authored-by: Yufan You <ouuansteve@gmail.com>
---
 plugins/git/README.md      | 6 +++---
 plugins/git/git.plugin.zsh | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/plugins/git/README.md b/plugins/git/README.md
index b7f216813..e809e1bcd 100644
--- a/plugins/git/README.md
+++ b/plugins/git/README.md
@@ -183,8 +183,8 @@ plugins=(... git)
 
 Following the recent push for removing racially-charged words from our technical vocabulary, the git plugin favors using
 a branch name other than `master`. In this case, we favor the shorter, neutral and descriptive term `main`. This means
-that any aliases and functions that previously used `master`, will use `main` if that branch exists. We do this via the
-function `git_main_branch`.
+that any aliases and functions that previously used `master`, will use `main` if `master` doesn't exist. We do this via
+the function `git_main_branch`.
 
 ### Deprecated aliases
 
@@ -214,7 +214,7 @@ These are aliases that have been removed, renamed, or otherwise modified in a wa
 | current_branch         | Return the name of the current branch                                        |
 | git_current_user_name  | Returns the `user.name` config value                                         |
 | git_current_user_email | Returns the `user.email` config value                                        |
-| git_main_branch        | Returns the name of the main branch: `main` if it exists, `master` otherwise |
+| git_main_branch        | Returns the name of the main branch: `master` if it exists, `main` otherwise |
 
 ### Work in Progress (WIP)
 
diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index 5a9ccff5c..6cae3dac2 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -27,10 +27,10 @@ function work_in_progress() {
 
 # Check if main exists and use instead of master
 function git_main_branch() {
-  if [[ -n "$(git branch --list main)" ]]; then
-    echo main
-  else
+  if [[ -n "$(git branch --list master)" ]]; then
     echo master
+  else
+    echo main
   fi
 }
 

From 327ac697c7542f03c69edca1515656a653f23656 Mon Sep 17 00:00:00 2001
From: Veit Lehmann <levito@users.noreply.github.com>
Date: Thu, 9 Jul 2020 11:23:49 +0200
Subject: [PATCH 030/869] mix-fast: add decriptions to mix-fast completions
 (#8561)

* feat(mix-fast): include desctiptions (#8561)

* feat(mix-fast): improve _mix_generate (no tail, better matching)
---
 plugins/mix-fast/mix-fast.plugin.zsh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/plugins/mix-fast/mix-fast.plugin.zsh b/plugins/mix-fast/mix-fast.plugin.zsh
index e27e30d64..564c50561 100644
--- a/plugins/mix-fast/mix-fast.plugin.zsh
+++ b/plugins/mix-fast/mix-fast.plugin.zsh
@@ -12,7 +12,7 @@ _mix_does_task_list_need_generating () {
 }
 
 _mix_generate () {
-  mix help | grep -v 'iex -S' | tail -n +2 | cut -d " " -f 2 > .mix_tasks
+  mix help | grep '^mix [^ ]' | sed -E "s/mix ([^ ]*) *# (.*)/\1:\2/" > .mix_tasks
 }
 
 _mix () {
@@ -21,7 +21,8 @@ _mix () {
       echo "\nGenerating .mix_tasks..." > /dev/stderr
       _mix_generate
     fi
-    compadd `cat .mix_tasks`
+    local tasks=(${(f)"$(cat .mix_tasks)"})
+    _describe 'tasks' tasks
   fi
 }
 

From 7deaff71a2be08145d83f0177edbf2dfb3e91262 Mon Sep 17 00:00:00 2001
From: Emilien Escalle <neilime@users.noreply.github.com>
Date: Thu, 9 Jul 2020 15:29:26 +0200
Subject: [PATCH 031/869] yarn: add alias for upgrade-interactive to the latest
 version (#8764)

---
 plugins/yarn/README.md       | 65 ++++++++++++++++++------------------
 plugins/yarn/yarn.plugin.zsh |  1 +
 2 files changed, 34 insertions(+), 32 deletions(-)

diff --git a/plugins/yarn/README.md b/plugins/yarn/README.md
index 05f18a499..fd748b742 100644
--- a/plugins/yarn/README.md
+++ b/plugins/yarn/README.md
@@ -11,35 +11,36 @@ plugins=(... yarn)
 
 ## Aliases
 
-| Alias | Command                                   | Description                                                 |
-|-------|-------------------------------------------|-------------------------------------------------------------|
-| y     | `yarn`                                    | The Yarn command                                            |
-| ya    | `yarn add`                                | Install a package in dependencies (`package.json`)          |
-| yad   | `yarn add --dev`                          | Install a package in devDependencies (`package.json`)       |
-| yap   | `yarn add --peer`                         | Install a package in peerDependencies (`package.json`)      |
-| yb    | `yarn build`                              | Run the build script defined in `package.json`              |
-| ycc   | `yarn cache clean`                        | Clean yarn's global cache of packages                       |
-| yd    | `yarn dev`                                | Run the dev script defined in `package.json`                |
-| yga   | `yarn global add`                         | Install packages globally on your operating system          |
-| ygls  | `yarn global list`                        | Lists global installed packages                             |
-| ygrm  | `yarn global remove`                      | Remove global installed packages from your OS               |
-| ygu   | `yarn global upgrade`                     | Upgrade packages installed globally to their latest version |
-| yh    | `yarn help`                               | Show help for a yarn command                                |
-| yi    | `yarn init`                               | Interactively creates or updates a package.json file        |
-| yin   | `yarn install`                            | Install dependencies defined in `package.json`              |
-| yln   | `yarn lint`                               | Run the lint script defined in `package.json`               |
-| yls   | `yarn list`                               | List installed packages                                     |
-| yout  | `yarn outdated`                           | Check for outdated package dependencies                     |
-| yp    | `yarn pack`                               | Create a compressed gzip archive of package dependencies    |
-| yrm   | `yarn remove`                             | Remove installed packages                                   |
-| yrun  | `yarn run`                                | Run a defined package script                                |
-| ys    | `yarn serve`                              | Start the dev server                                        |
-| yst   | `yarn start`                              | Run the start script defined in `package.json`              |
-| yt    | `yarn test`                               | Run the test script defined in `package.json`               |
-| ytc   | `yarn test --coverage`                    | Run the test script defined in `package.json` with coverage |
-| yuc   | `yarn global upgrade && yarn cache clean` | Upgrade global packages and clean yarn's global cache       |
-| yui   | `yarn upgrade-interactive`                | Prompt for which outdated packages to upgrade               |
-| yup   | `yarn upgrade`                            | Upgrade packages to their latest version                    |
-| yv    | `yarn version`                            | Update the version of your package                          |
-| yw    | `yarn workspace`                          | Run a command within a single workspace.                    |
-| yws   | `yarn workspaces`                         | Run a command within all defined workspaces.                |
+| Alias | Command                                   | Description                                                                   |
+| ----- | ----------------------------------------- | ----------------------------------------------------------------------------- |
+| y     | `yarn`                                    | The Yarn command                                                              |
+| ya    | `yarn add`                                | Install a package in dependencies (`package.json`)                            |
+| yad   | `yarn add --dev`                          | Install a package in devDependencies (`package.json`)                         |
+| yap   | `yarn add --peer`                         | Install a package in peerDependencies (`package.json`)                        |
+| yb    | `yarn build`                              | Run the build script defined in `package.json`                                |
+| ycc   | `yarn cache clean`                        | Clean yarn's global cache of packages                                         |
+| yd    | `yarn dev`                                | Run the dev script defined in `package.json`                                  |
+| yga   | `yarn global add`                         | Install packages globally on your operating system                            |
+| ygls  | `yarn global list`                        | Lists global installed packages                                               |
+| ygrm  | `yarn global remove`                      | Remove global installed packages from your OS                                 |
+| ygu   | `yarn global upgrade`                     | Upgrade packages installed globally to their latest version                   |
+| yh    | `yarn help`                               | Show help for a yarn command                                                  |
+| yi    | `yarn init`                               | Interactively creates or updates a package.json file                          |
+| yin   | `yarn install`                            | Install dependencies defined in `package.json`                                |
+| yln   | `yarn lint`                               | Run the lint script defined in `package.json`                                 |
+| yls   | `yarn list`                               | List installed packages                                                       |
+| yout  | `yarn outdated`                           | Check for outdated package dependencies                                       |
+| yp    | `yarn pack`                               | Create a compressed gzip archive of package dependencies                      |
+| yrm   | `yarn remove`                             | Remove installed packages                                                     |
+| yrun  | `yarn run`                                | Run a defined package script                                                  |
+| ys    | `yarn serve`                              | Start the dev server                                                          |
+| yst   | `yarn start`                              | Run the start script defined in `package.json`                                |
+| yt    | `yarn test`                               | Run the test script defined in `package.json`                                 |
+| ytc   | `yarn test --coverage`                    | Run the test script defined in `package.json` with coverage                   |
+| yuc   | `yarn global upgrade && yarn cache clean` | Upgrade global packages and clean yarn's global cache                         |
+| yui   | `yarn upgrade-interactive`                | Prompt for which outdated packages to upgrade                                 |
+| yuil  | `yarn upgrade-interactive --latest`       | Prompt for which outdated packages to upgrade to the latest available version |
+| yup   | `yarn upgrade`                            | Upgrade packages to their latest version                                      |
+| yv    | `yarn version`                            | Update the version of your package                                            |
+| yw    | `yarn workspace`                          | Run a command within a single workspace.                                      |
+| yws   | `yarn workspaces`                         | Run a command within all defined workspaces.                                  |
diff --git a/plugins/yarn/yarn.plugin.zsh b/plugins/yarn/yarn.plugin.zsh
index 9cfcb7539..4a5192c61 100644
--- a/plugins/yarn/yarn.plugin.zsh
+++ b/plugins/yarn/yarn.plugin.zsh
@@ -24,6 +24,7 @@ alias yt="yarn test"
 alias ytc="yarn test --coverage"
 alias yuc="yarn global upgrade && yarn cache clean"
 alias yui="yarn upgrade-interactive"
+alias yuil="yarn upgrade-interactive --latest"
 alias yup="yarn upgrade"
 alias yv="yarn version"
 alias yw="yarn workspace"

From 9cdc2764967f9255fa343e77217d62d2703d5549 Mon Sep 17 00:00:00 2001
From: Jakob Hellermann <jakob.hellermann@protonmail.com>
Date: Sat, 11 Jul 2020 17:34:24 +0200
Subject: [PATCH 032/869] dotenv: add never option to confirmation prompt
 (#9102)

---
 plugins/dotenv/README.md         | 24 +++++++++++++++---------
 plugins/dotenv/dotenv.plugin.zsh | 12 ++++++++++--
 2 files changed, 25 insertions(+), 11 deletions(-)

diff --git a/plugins/dotenv/README.md b/plugins/dotenv/README.md
index f66124731..ab9d329f6 100644
--- a/plugins/dotenv/README.md
+++ b/plugins/dotenv/README.md
@@ -53,24 +53,30 @@ Set `ZSH_DOTENV_PROMPT=false` in your zshrc file if you don't want the confirmat
 You can also choose the `Always` option when prompted to always allow sourcing the .env file
 in that directory. See the next section for more details.
 
-### ZSH_DOTENV_ALLOWED_LIST
+### ZSH_DOTENV_ALLOWED_LIST, ZSH_DOTENV_DISALLOWED_LIST
 
 The default behavior of the plugin is to always ask whether to source a dotenv file. There's
-a **Y**es, **N**o, and **A**lways option. If you choose Always, the directory of the .env file
-will be added to an allowed list. If a directory is found in this list, the plugin won't ask
-for confirmation and will instead source the .env file directly.
+a **Y**es, **N**o, **A**lways and N**e**ver option. If you choose Always, the directory of the .env file
+will be added to an allowed list; if you choose Never, it will be added to a disallowed list.
+If a directory is found in either of those lists, the plugin won't ask for confirmation and will
+instead either source the .env file or proceed without action respectively.
 
-This allowed list is saved by default in `$ZSH_CACHE_DIR/dotenv-allowed.list`. If you want
-to change that location, change the `$ZSH_DOTENV_ALLOWED_LIST` variable, like so:
+The allowed and disallowed lists are saved by default in `$ZSH_CACHE_DIR/dotenv-allowed.list` and
+`$ZSH_CACHE_DIR/dotenv-disallowed.list` respectively. If you want to change that location,
+change the `$ZSH_DOTENV_ALLOWED_LIST` and `$ZSH_DOTENV_DISALLOWED_LIST` variables, like so:
 
 ```zsh
 # in ~/.zshrc, before Oh My Zsh is sourced:
 ZSH_DOTENV_ALLOWED_LIST=/path/to/dotenv/allowed/list
+ZSH_DOTENV_DISALLOWED_LIST=/path/to/dotenv/disallowed/list
 ```
 
-This file is just a list of directories allowed, separated by a newline character. If you want
-to disallow a directory, just edit this file and remove the line for the directory you want to
-disallow.
+The file is just a list of directories, separated by a newline character. If you want
+to change your decision, just edit the file and remove the line for the directory you want to
+change.
+
+NOTE: if a directory is found in both the allowed and disallowed lists, the disallowed list
+takes preference, _i.e._ the .env file will never be sourced.
 
 ## Version Control
 
diff --git a/plugins/dotenv/dotenv.plugin.zsh b/plugins/dotenv/dotenv.plugin.zsh
index ac3210d7f..24f285df5 100644
--- a/plugins/dotenv/dotenv.plugin.zsh
+++ b/plugins/dotenv/dotenv.plugin.zsh
@@ -5,6 +5,7 @@
 
 # Path to the file containing allowed paths
 : ${ZSH_DOTENV_ALLOWED_LIST:="${ZSH_CACHE_DIR:-$ZSH/cache}/dotenv-allowed.list"}
+: ${ZSH_DOTENV_DISALLOWED_LIST:="${ZSH_CACHE_DIR:-$ZSH/cache}/dotenv-disallowed.list"}
 
 
 ## Functions
@@ -14,19 +15,26 @@ source_env() {
     if [[ "$ZSH_DOTENV_PROMPT" != false ]]; then
       local confirmation dirpath="${PWD:A}"
 
-      # make sure there is an allowed file
+      # make sure there is an (dis-)allowed file
       touch "$ZSH_DOTENV_ALLOWED_LIST"
+      touch "$ZSH_DOTENV_DISALLOWED_LIST"
+
+      # early return if disallowed
+      if grep -q "$dirpath" "$ZSH_DOTENV_DISALLOWED_LIST" &>/dev/null; then
+        return;
+      fi
 
       # check if current directory's .env file is allowed or ask for confirmation
       if ! grep -q "$dirpath" "$ZSH_DOTENV_ALLOWED_LIST" &>/dev/null; then
         # print same-line prompt and output newline character if necessary
-        echo -n "dotenv: found '$ZSH_DOTENV_FILE' file. Source it? ([Y]es/[n]o/[a]lways) "
+        echo -n "dotenv: found '$ZSH_DOTENV_FILE' file. Source it? ([Y]es/[n]o/[a]lways/n[e]ver) "
         read -k 1 confirmation; [[ "$confirmation" != $'\n' ]] && echo
 
         # check input
         case "$confirmation" in
           [nN]) return ;;
           [aA]) echo "$dirpath" >> "$ZSH_DOTENV_ALLOWED_LIST" ;;
+          [eE]) echo "$dirpath" >> "$ZSH_DOTENV_DISALLOWED_LIST"; return ;;
           *) ;; # interpret anything else as a yes
         esac
       fi

From 55a98fc06d9ea9d003683dec5aae6cb6b0130ab0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Sat, 11 Jul 2020 20:02:06 +0200
Subject: [PATCH 033/869] git: better algorithm to decide what's the main
 branch

Fixes #9103

Co-authored-by: Yufan You <ouuansteve@gmail.com>
---
 plugins/git/git.plugin.zsh | 27 ++++++++++++++++++++++-----
 1 file changed, 22 insertions(+), 5 deletions(-)

diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index 6cae3dac2..7284cd121 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -25,13 +25,30 @@ function work_in_progress() {
   fi
 }
 
-# Check if main exists and use instead of master
+# Get the default 'main' branch
+# Marc(2020-07-11): I hope to be able to remove this someday
 function git_main_branch() {
-  if [[ -n "$(git branch --list master)" ]]; then
-    echo master
-  else
-    echo main
+  # Get default branch from the origin remote
+  local branch
+  branch="${$(command git symbolic-ref refs/remotes/origin/HEAD 2>/dev/null)#refs/remotes/origin/}"
+
+  if [[ -n "$branch" ]]; then
+    echo "$branch"
+    return
   fi
+
+  # Look up list of local branches and return the first one that exists
+  local -a branches
+  branches=(${(@f)"$(command git for-each-ref --format='%(refname:short)' refs/heads 2>/dev/null)"})
+  for branch in master main; do
+    if (( ${branches[(Ie)$branch]} )); then
+      echo "$branch"
+      return
+    fi
+  done
+
+  echo master
+  return 1
 }
 
 #

From 83f61949292b865a7962f1f0a4a8c0fc6350f313 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Sat, 11 Jul 2020 20:18:05 +0200
Subject: [PATCH 034/869] git: change docs for git_main_branch

Also remove unnecesary dramatic remark
---
 plugins/git/README.md      | 14 +++++++-------
 plugins/git/git.plugin.zsh |  3 +--
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/plugins/git/README.md b/plugins/git/README.md
index e809e1bcd..b92d0bf02 100644
--- a/plugins/git/README.md
+++ b/plugins/git/README.md
@@ -208,13 +208,13 @@ These are aliases that have been removed, renamed, or otherwise modified in a wa
 
 ### Current
 
-| Command                | Description                                                                  |
-|:-----------------------|:-----------------------------------------------------------------------------|
-| `grename <old> <new>`  | Rename `old` branch to `new`, including in origin remote                     |
-| current_branch         | Return the name of the current branch                                        |
-| git_current_user_name  | Returns the `user.name` config value                                         |
-| git_current_user_email | Returns the `user.email` config value                                        |
-| git_main_branch        | Returns the name of the main branch: `master` if it exists, `main` otherwise |
+| Command                | Description                                                                            |
+|:-----------------------|:---------------------------------------------------------------------------------------|
+| `grename <old> <new>`  | Rename `old` branch to `new`, including in origin remote                               |
+| current_branch         | Return the name of the current branch                                                  |
+| git_current_user_name  | Returns the `user.name` config value                                                   |
+| git_current_user_email | Returns the `user.email` config value                                                  |
+| git_main_branch        | Returns the name of the main branch: from origin or from local branches, else 'master' |
 
 ### Work in Progress (WIP)
 
diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index 7284cd121..8f8edcd23 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -25,8 +25,7 @@ function work_in_progress() {
   fi
 }
 
-# Get the default 'main' branch
-# Marc(2020-07-11): I hope to be able to remove this someday
+# Get the default 'main' branch: from origin, from local branches, or else just 'master'
 function git_main_branch() {
   # Get default branch from the origin remote
   local branch

From 71f0189ed57911360b19883cb6211fe621292086 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?D=C5=BEiugas=20Eiva?= <dziugaseiva@gmail.com>
Date: Sat, 11 Jul 2020 21:59:58 +0100
Subject: [PATCH 035/869] vscode: add support for VSCodium (#9080)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Babak K. Shandiz <babak.k.shandiz@gmail.com>
Co-authored-by: Marc Cornellà <marc.cornella@live.com>
---
 plugins/vscode/README.md         | 32 +++++++++++++++++++++++---------
 plugins/vscode/vscode.plugin.zsh | 27 +++++++++++++++++++--------
 2 files changed, 42 insertions(+), 17 deletions(-)

diff --git a/plugins/vscode/README.md b/plugins/vscode/README.md
index 469c57ea8..e95ed5d4f 100644
--- a/plugins/vscode/README.md
+++ b/plugins/vscode/README.md
@@ -1,6 +1,6 @@
 # VS Code
 
-This plugin makes interaction between the command line and the VS Code editor easier.
+This plugin provides useful aliases to simplify the interaction between the command line and VS Code or VSCodium editor.
 
 To start using it, add the `vscode` plugin to your `plugins` array in `~/.zshrc`:
 
@@ -10,23 +10,37 @@ plugins=(... vscode)
 
 ## Requirements
 
-To use VS Code in the terminal **in macOS**, first you need to install the `code` command in the PATH,
-otherwise you might receive this message: `zsh: command not found: code`.
+This plugin requires to have a flavour of VS Code installed and it's executable available in PATH.
 
-[As the docs say](https://code.visualstudio.com/docs/setup/mac#_launching-from-the-command-line), open
+You can install either:
+
+* VS Code (code)
+* VS Code Insiders (code-insiders)
+* VSCodium (codium)
+
+### MacOS
+While Linux installations will add the executable to PATH, MacOS users might still have to do this manually:
+
+[For VS Code and VS Code Insiders](https://code.visualstudio.com/docs/setup/mac#_launching-from-the-command-line), open
 the Command Palette via (F1 or ⇧⌘P) and type shell command to find the Shell Command:
-> Install 'code' command in PATH
+> Shell Command: Install 'code' command in PATH
 
-## VS Code Insiders
+[For VSCodium](https://github.com/VSCodium/vscodium/blob/master/DOCS.md#how-do-i-open-vscodium-from-the-terminal), open
+the Command Palette via (F1 or ⇧⌘P) and type shell command to find the Shell Command:
+> Shell Command: Install 'codium' command in PATH
 
-🍏 **If you are only using [VS Code Insiders](https://code.visualstudio.com/insiders/), the plugin will automatically bind to your Insiders installation.**
+## Using multiple flavours
 
-But, if you have both Stable and Insiders versions and want to configure the plugin to just use the Insiders version, add the following line in the oh-my-zsh settings section (between the `ZSH_THEME` and the `plugins=()` line). This will make the plugin use the Insiders version instead.
+If for any reason, you ever require to use multiple flavours of VS Code i.e. VS Code (stable) and VS Code Insiders, you can 
+manually specify the flavour's executable. Add the following line to the .zshrc file (between the `ZSH_THEME` and the `plugins=()` lines).
+This will make the plugin use your manually defined executable.
 
 ```zsh
 ZSH_THEME=...
 
-# Add this line to use code-insiders instead of code
+# Choose between one [code, code-insiders or codium]
+# The following line will make the plugin to open VS Code Insiders
+# Invalid entries will be ignored, no aliases will be added
 VSCODE=code-insiders
 
 plugins=(... vscode)
diff --git a/plugins/vscode/vscode.plugin.zsh b/plugins/vscode/vscode.plugin.zsh
index 0144e0baa..48d904377 100644
--- a/plugins/vscode/vscode.plugin.zsh
+++ b/plugins/vscode/vscode.plugin.zsh
@@ -1,17 +1,28 @@
-# VScode zsh plugin
+# VS Code (stable / insiders) / VSCodium zsh plugin
 # Authors:
 #   https://github.com/MarsiBarsi (original author)
 #   https://github.com/babakks
+#   https://github.com/SteelShot
 
-# Use the stable VS Code release, unless the Insiders version is the only
-# available installation
-if ! which code > /dev/null && which code-insiders > /dev/null; then
-  : ${VSCODE:=code-insiders}
-else
-  : ${VSCODE:=code}
+# Verify if any manual user choice of VS Code exists first.
+if [[ -n "$VSCODE" ]] && ! which $VSCODE &>/dev/null; then
+  echo "'$VSCODE' flavour of VS Code not detected."
+  unset VSCODE
+fi
+
+# Otherwise, try to detect a flavour of VS Code.
+if [[ -z "$VSCODE" ]]; then
+  if which code &>/dev/null; then
+    VSCODE=code
+  elif which code-insiders &>/dev/null; then
+    VSCODE=code-insiders
+  elif which codium &>/dev/null; then
+    VSCODE=codium
+  else
+    return
+  fi
 fi
 
-# Define aliases
 alias vsc="$VSCODE ."
 alias vsca="$VSCODE --add"
 alias vscd="$VSCODE --diff"

From e3131d98aa056145ed34ef19dfe77efff87be21b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Sun, 12 Jul 2020 16:37:49 +0200
Subject: [PATCH 036/869] Fix self check link

---
 .github/ISSUE_TEMPLATE/bug_report.md | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 024231531..b7f5460c1 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -27,18 +27,20 @@ If applicable, add screenshots to help explain your problem.
 You can also record an asciinema session: https://asciinema.org/
 
 **Self Check**
-Have you tried reaching out on the [Discord server](discord.gg/ohmyzsh)? 
-This can help cut down on filling up issues. We always have a few people
-online that are in a variety of timezones that are willing to help you!
-Also searching existing [GitHub Issues](https://github.com/ohmyzsh/ohmyzsh/issues?q=)
-might help you get quicker support
+
+- Have you tried reaching out on the [Discord server](https://discord.gg/ohmyzsh)? 
+  This can help cut down on filling up issues. We always have a few people
+  online that are in a variety of timezones that are willing to help you!
+
+- Also searching existing [GitHub Issues](https://github.com/ohmyzsh/ohmyzsh/issues?q=) might help you get quicker support
 
 **Desktop (please complete the following information):**
+
  - OS / Distro: [e.g. Arch Linux, macOS]
  - If on Windows what version of WSL: [e.g. WSL1, WSL2]
- - Latest ohmyzsh Update?: [e.g. Yes/No]
+ - Latest ohmyzsh update?: [e.g. Yes/No]
  - ZSH Version: [e.g. 5.6]
- - Terminal emulator [e.g. iTerm2]
+ - Terminal emulator: [e.g. iTerm2]
 
 **Additional context**
 Add any other context about the problem here. This can be themes, plugins, custom configs.

From 5c1a5c6ce924755095020fd829b08f0ee205a723 Mon Sep 17 00:00:00 2001
From: "M. Yas. Davoodeh" <30480116+MYDavoodeh@users.noreply.github.com>
Date: Mon, 13 Jul 2020 14:22:28 +0430
Subject: [PATCH 037/869] update: prefix rm call with command in trap (#9107)

* Suppress the problematic trap output in check_upg

The newly added trap, in systems where `rm` is aliased to `rm="rm -v"`,
shows a message stating that "update.lock" has been removed each time `zsh` is called.
I simply suppressed it with directing the output to `/dev/null`.

* Use `command` instead of >/dev/null to suppress
---
 tools/check_for_upgrade.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/check_for_upgrade.sh b/tools/check_for_upgrade.sh
index c91431c25..cadd5fe49 100644
--- a/tools/check_for_upgrade.sh
+++ b/tools/check_for_upgrade.sh
@@ -51,7 +51,7 @@ function update_ohmyzsh() {
     #  The return status from the function is handled specially. If it is zero, the signal is
     #  assumed to have been handled, and execution continues normally. Otherwise, the shell
     #  will behave as interrupted except that the return status of the trap is retained.
-    trap "rm -rf '$ZSH/log/update.lock'; return 1" EXIT INT QUIT
+    trap "command rm -rf '$ZSH/log/update.lock'; return 1" EXIT INT QUIT
 
     # Create or update .zsh-update file if missing or malformed
     if ! source "${ZSH_CACHE_DIR}/.zsh-update" 2>/dev/null || [[ -z "$LAST_EPOCH" ]]; then

From 93e9b80d3ff160c7d7f5be4c2c1862da97b273dc Mon Sep 17 00:00:00 2001
From: Alexander Schaber <a.schaber@cuegee.com>
Date: Tue, 14 Jul 2020 16:50:18 +0200
Subject: [PATCH 038/869] httpie: add alias for https (#8032)

---
 plugins/httpie/README.md         | 6 ++++++
 plugins/httpie/httpie.plugin.zsh | 7 +++++++
 2 files changed, 13 insertions(+)
 create mode 100644 plugins/httpie/httpie.plugin.zsh

diff --git a/plugins/httpie/README.md b/plugins/httpie/README.md
index 25bdd0c7d..40d60c47d 100644
--- a/plugins/httpie/README.md
+++ b/plugins/httpie/README.md
@@ -11,4 +11,10 @@ plugins=(... httpie)
 
 It uses completion from [zsh-completions](https://github.com/zsh-users/zsh-completions).
 
+## Aliases
+
+| Alias        | Command                                                          |
+| ------------ | ---------------------------------------------------------------- |
+| `https`      | `http --default-scheme=https`                                    |
+
 **Maintainer:** [lululau](https://github.com/lululau)
diff --git a/plugins/httpie/httpie.plugin.zsh b/plugins/httpie/httpie.plugin.zsh
new file mode 100644
index 000000000..088a1f1cf
--- /dev/null
+++ b/plugins/httpie/httpie.plugin.zsh
@@ -0,0 +1,7 @@
+#
+# Aliases
+# (sorted alphabetically)
+#
+
+alias https='http --default-scheme=https'
+

From 8260005dc7bba42d82edd8e606c10d9e7a9bb26e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joaqu=C3=ADn=20Moreira?= <joaquinscript@gmail.com>
Date: Tue, 14 Jul 2020 11:39:33 -0400
Subject: [PATCH 039/869] kubectl: add alias to list pods by namespace (#8604)

---
 plugins/kubectl/README.md          | 3 ++-
 plugins/kubectl/kubectl.plugin.zsh | 3 +++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/plugins/kubectl/README.md b/plugins/kubectl/README.md
index c0db59362..ee05a8af1 100644
--- a/plugins/kubectl/README.md
+++ b/plugins/kubectl/README.md
@@ -33,7 +33,8 @@ plugins=(... kubectl)
 | kep     | `kubectl edit pods`                 | Edit pods from the default editor                                                                |
 | kdp     | `kubectl describe pods`             | Describe all pods                                                                                |
 | kdelp   | `kubectl delete pods`               | Delete all pods matching passed arguments                                                        |
-| kgpl    | `kgp -l`                            | Get pod by label. Example: `kgpl "app=myapp" -n myns`                                            |
+| kgpl    | `kgp -l`                            | Get pods by label. Example: `kgpl "app=myapp" -n myns`                                           |
+| kgpn    | `kgp -n`                            | Get pods by namespace. Example: `kgpn kube-system`                                               |
 |         |                                     | **Service management**                                                                           |
 | kgs     | `kubectl get svc`                   | List all services in ps output format                                                            |
 | kgsw    | `kgs --watch`                       | After listing all services, watch for changes                                                    |
diff --git a/plugins/kubectl/kubectl.plugin.zsh b/plugins/kubectl/kubectl.plugin.zsh
index 92688c53c..647d029c1 100644
--- a/plugins/kubectl/kubectl.plugin.zsh
+++ b/plugins/kubectl/kubectl.plugin.zsh
@@ -47,6 +47,9 @@ alias kdelp='kubectl delete pods'
 # get pod by label: kgpl "app=myapp" -n myns
 alias kgpl='kgp -l'
 
+# get pod by namespace: kgpn kube-system"
+alias kgpn='kgp -n'
+
 # Service management.
 alias kgs='kubectl get svc'
 alias kgsa='kubectl get svc --all-namespaces'

From 68b98c9d53a4dd0c53d25a9595305e2318af0e2b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20Zaj=C4=85c?= <piotr.zajac@unixslayer.pl>
Date: Tue, 14 Jul 2020 17:40:23 +0200
Subject: [PATCH 040/869] docker-compose: add alias for `docker-compose kill`
 (#8997)

---
 plugins/docker-compose/README.md                 | 1 +
 plugins/docker-compose/docker-compose.plugin.zsh | 1 +
 2 files changed, 2 insertions(+)

diff --git a/plugins/docker-compose/README.md b/plugins/docker-compose/README.md
index 1105e03f6..a81c2c78e 100644
--- a/plugins/docker-compose/README.md
+++ b/plugins/docker-compose/README.md
@@ -28,3 +28,4 @@ plugins=(... docker-compose)
 | dclf      | `docker-compose logs -f` | Show logs and follow output                                      |
 | dcpull    | `docker-compose pull`    | Pull image of a service                                          |
 | dcstart   | `docker-compose start`   | Start a container                                                |
+| dck       | `docker-compose kill`    | Kills containers                                                 |
diff --git a/plugins/docker-compose/docker-compose.plugin.zsh b/plugins/docker-compose/docker-compose.plugin.zsh
index 9ffe1edf6..5b25b63b9 100644
--- a/plugins/docker-compose/docker-compose.plugin.zsh
+++ b/plugins/docker-compose/docker-compose.plugin.zsh
@@ -24,3 +24,4 @@ alias dcl='docker-compose logs'
 alias dclf='docker-compose logs -f'
 alias dcpull='docker-compose pull'
 alias dcstart='docker-compose start'
+alias dck='docker-compose kill'

From ff7618cf744a289a9ba9c332be08ed5304d2f45f Mon Sep 17 00:00:00 2001
From: Frederick Zhang <frederick888@tsundere.moe>
Date: Wed, 15 Jul 2020 02:53:37 +1000
Subject: [PATCH 041/869] timer: threshold to show timers only for
 time-consuming commands (#8151)

---
 plugins/timer/README.md        | 1 +
 plugins/timer/timer.plugin.zsh | 8 +++++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/plugins/timer/README.md b/plugins/timer/README.md
index 321307e59..30b0bd00e 100644
--- a/plugins/timer/README.md
+++ b/plugins/timer/README.md
@@ -3,6 +3,7 @@ This plugin allows to display command's execution time in a very nonintrusive wa
 Timer can be tuned by these two variables:
 * `TIMER_PRECISION` allows to control number of decimal places (default `1`)
 * `TIMER_FORMAT` allows to adjust display format (default `'/%d'`)
+* `TIMER_THRESHOLD` allows to set the minimum execution time that causes the timer to be shown (default `0`)
 
 Sample session:
 
diff --git a/plugins/timer/timer.plugin.zsh b/plugins/timer/timer.plugin.zsh
index 728377c5c..1be7516a3 100644
--- a/plugins/timer/timer.plugin.zsh
+++ b/plugins/timer/timer.plugin.zsh
@@ -19,9 +19,11 @@ __timer_display_timer_precmd() {
     local cmd_end_time=$(__timer_current_time)
     local tdiff=$((cmd_end_time - __timer_cmd_start_time))
     unset __timer_cmd_start_time
-    local tdiffstr=$(__timer_format_duration ${tdiff})
-    local cols=$((COLUMNS - ${#tdiffstr} - 1))
-    echo -e "\033[1A\033[${cols}C ${tdiffstr}"
+    if [[ -z "${TIMER_THRESHOLD}" || ${tdiff} -ge "${TIMER_THRESHOLD}" ]]; then
+        local tdiffstr=$(__timer_format_duration ${tdiff})
+        local cols=$((COLUMNS - ${#tdiffstr} - 1))
+        echo -e "\033[1A\033[${cols}C ${tdiffstr}"
+    fi
   fi
 }
 

From c99f3c50fa46a93be28be88632889404fff3b958 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Wed, 15 Jul 2020 17:02:49 +0200
Subject: [PATCH 042/869] git: go back to previous main branch detection logic

Fixes #9114
---
 plugins/git/README.md      | 18 +++++++++---------
 plugins/git/git.plugin.zsh | 26 +++++---------------------
 2 files changed, 14 insertions(+), 30 deletions(-)

diff --git a/plugins/git/README.md b/plugins/git/README.md
index b92d0bf02..b7f216813 100644
--- a/plugins/git/README.md
+++ b/plugins/git/README.md
@@ -183,8 +183,8 @@ plugins=(... git)
 
 Following the recent push for removing racially-charged words from our technical vocabulary, the git plugin favors using
 a branch name other than `master`. In this case, we favor the shorter, neutral and descriptive term `main`. This means
-that any aliases and functions that previously used `master`, will use `main` if `master` doesn't exist. We do this via
-the function `git_main_branch`.
+that any aliases and functions that previously used `master`, will use `main` if that branch exists. We do this via the
+function `git_main_branch`.
 
 ### Deprecated aliases
 
@@ -208,13 +208,13 @@ These are aliases that have been removed, renamed, or otherwise modified in a wa
 
 ### Current
 
-| Command                | Description                                                                            |
-|:-----------------------|:---------------------------------------------------------------------------------------|
-| `grename <old> <new>`  | Rename `old` branch to `new`, including in origin remote                               |
-| current_branch         | Return the name of the current branch                                                  |
-| git_current_user_name  | Returns the `user.name` config value                                                   |
-| git_current_user_email | Returns the `user.email` config value                                                  |
-| git_main_branch        | Returns the name of the main branch: from origin or from local branches, else 'master' |
+| Command                | Description                                                                  |
+|:-----------------------|:-----------------------------------------------------------------------------|
+| `grename <old> <new>`  | Rename `old` branch to `new`, including in origin remote                     |
+| current_branch         | Return the name of the current branch                                        |
+| git_current_user_name  | Returns the `user.name` config value                                         |
+| git_current_user_email | Returns the `user.email` config value                                        |
+| git_main_branch        | Returns the name of the main branch: `main` if it exists, `master` otherwise |
 
 ### Work in Progress (WIP)
 
diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index 8f8edcd23..5a9ccff5c 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -25,29 +25,13 @@ function work_in_progress() {
   fi
 }
 
-# Get the default 'main' branch: from origin, from local branches, or else just 'master'
+# Check if main exists and use instead of master
 function git_main_branch() {
-  # Get default branch from the origin remote
-  local branch
-  branch="${$(command git symbolic-ref refs/remotes/origin/HEAD 2>/dev/null)#refs/remotes/origin/}"
-
-  if [[ -n "$branch" ]]; then
-    echo "$branch"
-    return
+  if [[ -n "$(git branch --list main)" ]]; then
+    echo main
+  else
+    echo master
   fi
-
-  # Look up list of local branches and return the first one that exists
-  local -a branches
-  branches=(${(@f)"$(command git for-each-ref --format='%(refname:short)' refs/heads 2>/dev/null)"})
-  for branch in master main; do
-    if (( ${branches[(Ie)$branch]} )); then
-      echo "$branch"
-      return
-    fi
-  done
-
-  echo master
-  return 1
 }
 
 #

From 322e592c38da2ade0e0db168bb6fdcd3f298600c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thi=20Do=C3=A3n?= <t@thi.im>
Date: Sat, 18 Jul 2020 23:32:50 +0900
Subject: [PATCH 043/869] extract: add IPA to extractable filetypes (#9117)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Marc Cornellà <marc.cornella@live.com>
---
 plugins/extract/README.md          | 1 +
 plugins/extract/_extract           | 2 +-
 plugins/extract/extract.plugin.zsh | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/plugins/extract/README.md b/plugins/extract/README.md
index 81e8e1d23..b2b731e39 100644
--- a/plugins/extract/README.md
+++ b/plugins/extract/README.md
@@ -23,6 +23,7 @@ plugins=(... extract)
 | `bz2`             | Bzip2 file                           |
 | `deb`             | Debian package                       |
 | `gz`              | Gzip file                            |
+| `ipa`             | iOS app package                      |
 | `ipsw`            | iOS firmware file                    |
 | `jar`             | Java Archive                         |
 | `lrz`             | LRZ archive                          |
diff --git a/plugins/extract/_extract b/plugins/extract/_extract
index 1a263a744..f96f0d450 100644
--- a/plugins/extract/_extract
+++ b/plugins/extract/_extract
@@ -3,5 +3,5 @@
 
 _arguments \
   '(-r --remove)'{-r,--remove}'[Remove archive.]' \
-  "*::archive file:_files -g '(#i)*.(7z|Z|apk|aar|bz2|deb|gz|ipsw|jar|lrz|lz4|lzma|rar|rpm|sublime-package|tar|tar.bz2|tar.gz|tar.lrz|tar.lz|tar.lz4|tar.xz|tar.zma|tar.zst|tbz|tbz2|tgz|tlz|txz|tzst|war|whl|xpi|xz|zip|zst)(-.)'" \
+  "*::archive file:_files -g '(#i)*.(7z|Z|apk|aar|bz2|deb|gz|ipa|ipsw|jar|lrz|lz4|lzma|rar|rpm|sublime-package|tar|tar.bz2|tar.gz|tar.lrz|tar.lz|tar.lz4|tar.xz|tar.zma|tar.zst|tbz|tbz2|tgz|tlz|txz|tzst|war|whl|xpi|xz|zip|zst)(-.)'" \
     && return 0
diff --git a/plugins/extract/extract.plugin.zsh b/plugins/extract/extract.plugin.zsh
index a5594b81a..46e69f08d 100644
--- a/plugins/extract/extract.plugin.zsh
+++ b/plugins/extract/extract.plugin.zsh
@@ -55,7 +55,7 @@ extract() {
 			(*.lz4) lz4 -d "$1" ;;
 			(*.lzma) unlzma "$1" ;;
 			(*.z) uncompress "$1" ;;
-			(*.zip|*.war|*.jar|*.sublime-package|*.ipsw|*.xpi|*.apk|*.aar|*.whl) unzip "$1" -d $extract_dir ;;
+			(*.zip|*.war|*.jar|*.sublime-package|*.ipa|*.ipsw|*.xpi|*.apk|*.aar|*.whl) unzip "$1" -d $extract_dir ;;
 			(*.rar) unrar x -ad "$1" ;;
 			(*.rpm) mkdir "$extract_dir" && cd "$extract_dir" && rpm2cpio "../$1" | cpio --quiet -id && cd .. ;;
 			(*.7z) 7za x "$1" ;;

From a3740c34148a7a44d82683d2aa31c98f32b21a96 Mon Sep 17 00:00:00 2001
From: Samuel Terra <samuelterra22@hotmail.com>
Date: Sat, 18 Jul 2020 13:45:59 -0300
Subject: [PATCH 044/869] battery: add acpi requirement to README (#9116)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Marc Cornellà <marc.cornella@live.com>
---
 plugins/battery/README.md | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/plugins/battery/README.md b/plugins/battery/README.md
index b7a13a7ec..c2554a36d 100644
--- a/plugins/battery/README.md
+++ b/plugins/battery/README.md
@@ -9,5 +9,14 @@ To use, add `battery` to the list of plugins in your `.zshrc` file:
 Then, add the `battery_pct_prompt` function to your custom theme. For example:
 
 ```
-RPROMPT='$(battery_pct_prompt)'
+RPROMPT='$(battery_pct_prompt) ...'
+```
+
+## Requirements
+
+On Linux, you must have the `acpi` tool installed on your operating system.
+
+Here's an example of how to install with apt:
+```
+sudo apt-get install acpi
 ```

From db3d05fe7184a523fe4aba120bea962114424573 Mon Sep 17 00:00:00 2001
From: Amir Tahvildaran <amir@bizequity.com>
Date: Sat, 18 Jul 2020 13:06:08 -0400
Subject: [PATCH 045/869] aws: improve check for aws_completer - unhardcode
 path (#9123)

Closes #9122

The current check is assuming that the aws_completer is installed
globally, it then runs the command without that path

I have aws_completer in ~/.local/bin/aws_completer

This changes the check to see if the command exists instead of
concerning itself with where it in installed. This test matches the
behavior of just running the command.
---
 plugins/aws/aws.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/aws/aws.plugin.zsh b/plugins/aws/aws.plugin.zsh
index d00c2e56c..7994963c3 100644
--- a/plugins/aws/aws.plugin.zsh
+++ b/plugins/aws/aws.plugin.zsh
@@ -63,7 +63,7 @@ fi
 # Load awscli completions
 
 # AWS CLI v2 comes with its own autocompletion. Check if that is there, otherwise fall back
-if [[ -x /usr/local/bin/aws_completer ]]; then
+if command -v aws_completer &> /dev/null; then
   autoload -Uz bashcompinit && bashcompinit
   complete -C aws_completer aws
 else

From 95218372402afc9aeafc89c0984310387ce79599 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Thu, 23 Jul 2020 12:55:22 +0200
Subject: [PATCH 046/869] lib: support mlterm-256color

Co-authored-by: Peter J. Schroeder <peterjschroeder@gmail.com>
---
 lib/termsupport.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/termsupport.zsh b/lib/termsupport.zsh
index 069b7f328..682925211 100644
--- a/lib/termsupport.zsh
+++ b/lib/termsupport.zsh
@@ -17,7 +17,7 @@ function title {
   : ${2=$1}
 
   case "$TERM" in
-    cygwin|xterm*|putty*|rxvt*|konsole*|ansi|mlterm)
+    cygwin|xterm*|putty*|rxvt*|konsole*|ansi|mlterm*)
       print -Pn "\e]2;$2:q\a" # set window name
       print -Pn "\e]1;$1:q\a" # set tab name
       ;;

From 8755c5f101f801738dd249c7685dcf30dd03a7b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Thu, 30 Jul 2020 18:20:30 +0200
Subject: [PATCH 047/869] rbenv: fix current_gemset

Fixes #8925
Co-authored-by: Josh Goodall <inopinatus@inopinatus.org>
---
 plugins/rbenv/rbenv.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/rbenv/rbenv.plugin.zsh b/plugins/rbenv/rbenv.plugin.zsh
index 3c964320a..0f2d366e2 100644
--- a/plugins/rbenv/rbenv.plugin.zsh
+++ b/plugins/rbenv/rbenv.plugin.zsh
@@ -34,7 +34,7 @@ if [[ $FOUND_RBENV -eq 1 ]]; then
     }
 
     function current_gemset() {
-        echo "$(rbenv gemset active 2>/dev/null | sed -e ":a" -e '$ s/\n/+/gp;N;b a' | head -n1)"
+        echo "$(rbenv gemset active 2>/dev/null)" | tr ' ' '+'
     }
 
     function gems() {

From 345cb99e5bbdd404e2da0d0e294623eccc130c27 Mon Sep 17 00:00:00 2001
From: John Welsh <john.welsh@gmail.com>
Date: Fri, 31 Jul 2020 06:56:22 -0700
Subject: [PATCH 048/869] colorize: add $ZSH_COLORIZE_CHROMA_FORMATTER config
 env var (#8824)

---
 plugins/colorize/README.md           | 8 ++++++++
 plugins/colorize/colorize.plugin.zsh | 4 ++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/plugins/colorize/README.md b/plugins/colorize/README.md
index ee4ab8036..405bb6d39 100644
--- a/plugins/colorize/README.md
+++ b/plugins/colorize/README.md
@@ -38,6 +38,14 @@ Pygments offers multiple styles. By default, the `default` style is used, but yo
 ZSH_COLORIZE_STYLE="colorful"
 ```
 
+### Chroma Formatter Settings
+
+Chroma supports terminal output in 8 color, 256 color, and true-color. If you need to change the default terminal output style from the standard 8 color output, set the `ZSH_COLORIZE_CHROMA_FORMATTER` environment variable:
+
+```
+ZSH_COLORIZE_CHROMA_FORMATTER=terminal256
+```
+
 ## Usage
 
 * `ccat <file> [files]`: colorize the contents of the file (or files, if more than one are provided).
diff --git a/plugins/colorize/colorize.plugin.zsh b/plugins/colorize/colorize.plugin.zsh
index 6ed9739fa..80b69190f 100644
--- a/plugins/colorize/colorize.plugin.zsh
+++ b/plugins/colorize/colorize.plugin.zsh
@@ -46,7 +46,7 @@ colorize_cat() {
         if [[ "$ZSH_COLORIZE_TOOL" == "pygmentize" ]]; then
             pygmentize -O style="$ZSH_COLORIZE_STYLE" -g
         else
-            chroma --style="$ZSH_COLORIZE_STYLE"
+            chroma --style="$ZSH_COLORIZE_STYLE" --formatter="${ZSH_COLORIZE_CHROMA_FORMATTER:-terminal}"
         fi
         return $?
     fi
@@ -62,7 +62,7 @@ colorize_cat() {
                 pygmentize -O style="$ZSH_COLORIZE_STYLE" -g "$FNAME"
             fi
         else
-            chroma --style="$ZSH_COLORIZE_STYLE" "$FNAME"
+            chroma --style="$ZSH_COLORIZE_STYLE" --formatter="${ZSH_COLORIZE_CHROMA_FORMATTER:-terminal}" "$FNAME"
         fi
     done
 }

From 4ab273e19ad1768163e662831b3418a2fc9b6eee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Sat, 1 Aug 2020 15:26:02 +0200
Subject: [PATCH 049/869] pipenv: toggle pipenv shell on startup

Fixes #9136
---
 plugins/pipenv/pipenv.plugin.zsh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/plugins/pipenv/pipenv.plugin.zsh b/plugins/pipenv/pipenv.plugin.zsh
index e7a9e6b3c..4be61a920 100644
--- a/plugins/pipenv/pipenv.plugin.zsh
+++ b/plugins/pipenv/pipenv.plugin.zsh
@@ -1,6 +1,6 @@
 # Pipenv completion
 _pipenv() {
-  eval $(env COMMANDLINE="${words[1,$CURRENT]}" _PIPENV_COMPLETE=complete-zsh  pipenv)
+  eval $(env COMMANDLINE="${words[1,$CURRENT]}" _PIPENV_COMPLETE=complete-zsh pipenv)
 }
 compdef _pipenv pipenv
 
@@ -25,6 +25,7 @@ _togglePipenvShell() {
 }
 autoload -U add-zsh-hook
 add-zsh-hook chpwd _togglePipenvShell
+_togglePipenvShell
 
 # Aliases
 alias pch="pipenv check"

From f6bc949c05fd18ee557a89c92f82ff556200707d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Sun, 2 Aug 2020 20:48:53 +0200
Subject: [PATCH 050/869] lib: substitute COMPLETION_WAITING_DOTS for ellipsis

Closes #8342
---
 lib/completion.zsh | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/lib/completion.zsh b/lib/completion.zsh
index 43927a277..47a4ed60f 100644
--- a/lib/completion.zsh
+++ b/lib/completion.zsh
@@ -60,11 +60,7 @@ zstyle '*' single-ignored show
 
 if [[ $COMPLETION_WAITING_DOTS = true ]]; then
   expand-or-complete-with-dots() {
-    # toggle line-wrapping off and back on again
-    [[ -n "$terminfo[rmam]" && -n "$terminfo[smam]" ]] && echoti rmam
-    print -Pn "%{%F{red}......%f%}"
-    [[ -n "$terminfo[rmam]" && -n "$terminfo[smam]" ]] && echoti smam
-
+    print -Pn "%F{red}…%f"
     zle expand-or-complete
     zle redisplay
   }

From 69a380771e571eb38f3887adf0d92a99b4309361 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Tue, 4 Aug 2020 15:55:04 +0200
Subject: [PATCH 051/869] Remove non-existing %p prompt sequence from themes

Fixes #8022
---
 themes/arrow.zsh-theme        |  2 +-
 themes/awesomepanda.zsh-theme |  2 +-
 themes/cloud.zsh-theme        |  2 +-
 themes/edvardm.zsh-theme      |  2 +-
 themes/fwalch.zsh-theme       |  2 +-
 themes/gozilla.zsh-theme      |  2 +-
 themes/jbergantine.zsh-theme  |  2 +-
 themes/jnrowe.zsh-theme       |  2 +-
 themes/jtriley.zsh-theme      |  6 ------
 themes/kafeitu.zsh-theme      |  2 +-
 themes/linuxonly.zsh-theme    | 30 +++++-------------------------
 themes/trapd00r.zsh-theme     |  8 ++++----
 12 files changed, 18 insertions(+), 44 deletions(-)

diff --git a/themes/arrow.zsh-theme b/themes/arrow.zsh-theme
index a3e77d65d..76c031fd2 100644
--- a/themes/arrow.zsh-theme
+++ b/themes/arrow.zsh-theme
@@ -1,7 +1,7 @@
 if [ $UID -eq 0 ]; then NCOLOR="red"; else NCOLOR="yellow"; fi
 
 PROMPT='%{$fg[$NCOLOR]%}%c ➤ %{$reset_color%}'
-RPROMPT='%{$fg[$NCOLOR]%}%p $(git_prompt_info)%{$reset_color%}'
+RPROMPT='%{$fg[$NCOLOR]%} $(git_prompt_info)%{$reset_color%}'
 
 ZSH_THEME_GIT_PROMPT_PREFIX="git:"
 ZSH_THEME_GIT_PROMPT_SUFFIX=""
diff --git a/themes/awesomepanda.zsh-theme b/themes/awesomepanda.zsh-theme
index 1c5d06b2d..85036e4ac 100644
--- a/themes/awesomepanda.zsh-theme
+++ b/themes/awesomepanda.zsh-theme
@@ -1,6 +1,6 @@
 # the svn plugin has to be activated for this to work.
 local ret_status="%(?:%{$fg_bold[green]%}➜ :%{$fg_bold[red]%}➜ %s)"
-PROMPT='${ret_status}%{$fg_bold[green]%}%p %{$fg[cyan]%}%c %{$fg_bold[blue]%}$(git_prompt_info)%{$fg_bold[blue]%}$(svn_prompt_info)%{$reset_color%}'
+PROMPT='${ret_status}%{$fg_bold[green]%} %{$fg[cyan]%}%c %{$fg_bold[blue]%}$(git_prompt_info)%{$fg_bold[blue]%}$(svn_prompt_info)%{$reset_color%}'
 
 ZSH_THEME_GIT_PROMPT_PREFIX="git:(%{$fg[red]%}"
 ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}"
diff --git a/themes/cloud.zsh-theme b/themes/cloud.zsh-theme
index 59a3472b6..e26f786e1 100644
--- a/themes/cloud.zsh-theme
+++ b/themes/cloud.zsh-theme
@@ -2,7 +2,7 @@ if [[ -z $ZSH_THEME_CLOUD_PREFIX ]]; then
     ZSH_THEME_CLOUD_PREFIX='☁'
 fi
 
-PROMPT='%{$fg_bold[cyan]%}$ZSH_THEME_CLOUD_PREFIX %{$fg_bold[green]%}%p %{$fg[green]%}%c %{$fg_bold[cyan]%}$(git_prompt_info)%{$fg_bold[blue]%} % %{$reset_color%}'
+PROMPT='%{$fg_bold[cyan]%}$ZSH_THEME_CLOUD_PREFIX %{$fg_bold[green]%} %{$fg[green]%}%c %{$fg_bold[cyan]%}$(git_prompt_info)%{$fg_bold[blue]%} % %{$reset_color%}'
 
 ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[green]%}[%{$fg[cyan]%}"
 ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}"
diff --git a/themes/edvardm.zsh-theme b/themes/edvardm.zsh-theme
index f9ca1a9e2..d41dd4434 100644
--- a/themes/edvardm.zsh-theme
+++ b/themes/edvardm.zsh-theme
@@ -1,4 +1,4 @@
-PROMPT='%{$fg_bold[red]%}➜ %{$fg_bold[green]%}%p %{$fg_bold[white]%}%c %{$fg_bold[blue]%}$(git_prompt_info)%{$fg_bold[blue]%} % %{$reset_color%}'
+PROMPT='%{$fg_bold[red]%}➜ %{$fg_bold[green]%} %{$fg_bold[white]%}%c %{$fg_bold[blue]%}$(git_prompt_info)%{$fg_bold[blue]%} % %{$reset_color%}'
 
 ZSH_THEME_GIT_PROMPT_PREFIX="git:(%{$fg[red]%}"
 ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}"
diff --git a/themes/fwalch.zsh-theme b/themes/fwalch.zsh-theme
index 24edf55c0..33f851c9d 100644
--- a/themes/fwalch.zsh-theme
+++ b/themes/fwalch.zsh-theme
@@ -1,4 +1,4 @@
-PROMPT='%{$fg_bold[green]%}%p %{$fg[cyan]%}%c%{$fg_bold[blue]%}$(git_prompt_info)%{$fg_bold[blue]%} % %{$reset_color%}'
+PROMPT='%{$fg_bold[green]%} %{$fg[cyan]%}%c%{$fg_bold[blue]%}$(git_prompt_info)%{$fg_bold[blue]%} % %{$reset_color%}'
 
 ZSH_THEME_GIT_PROMPT_PREFIX=" (%{$fg[red]%}"
 ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}"
diff --git a/themes/gozilla.zsh-theme b/themes/gozilla.zsh-theme
index c6b752e9b..593b8ec35 100644
--- a/themes/gozilla.zsh-theme
+++ b/themes/gozilla.zsh-theme
@@ -1,4 +1,4 @@
-PROMPT='%{$fg_bold[red]%}➜ %{$fg_bold[green]%}%p %{$fg[cyan]%}%c %{$fg_bold[blue]%}$(git_prompt_info)%{$fg_bold[blue]%} % %{$reset_color%}'
+PROMPT='%{$fg_bold[red]%}➜ %{$fg_bold[green]%} %{$fg[cyan]%}%c %{$fg_bold[blue]%}$(git_prompt_info)%{$fg_bold[blue]%} % %{$reset_color%}'
 
 ZSH_THEME_GIT_PROMPT_PREFIX="("
 ZSH_THEME_GIT_PROMPT_SUFFIX=")"
diff --git a/themes/jbergantine.zsh-theme b/themes/jbergantine.zsh-theme
index d84247cff..8e9a8ee95 100644
--- a/themes/jbergantine.zsh-theme
+++ b/themes/jbergantine.zsh-theme
@@ -1,4 +1,4 @@
-PROMPT='%{$fg_bold[red]%}➜ %{$fg_bold[green]%}%p %{$fg[cyan]%}%c %{$fg_bold[white]%}$(git_prompt_info)%{$fg_bold[white]%} % %{$reset_color%}'
+PROMPT='%{$fg_bold[red]%}➜ %{$fg_bold[green]%} %{$fg[cyan]%}%c %{$fg_bold[white]%}$(git_prompt_info)%{$fg_bold[white]%} % %{$reset_color%}'
 
 ZSH_THEME_GIT_PROMPT_PREFIX="git:(%{$fg[red]%}"
 ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}"
diff --git a/themes/jnrowe.zsh-theme b/themes/jnrowe.zsh-theme
index bae88f7ab..9d8fb2488 100644
--- a/themes/jnrowe.zsh-theme
+++ b/themes/jnrowe.zsh-theme
@@ -33,6 +33,6 @@ function {
 
 local ret_status="%(?:%{$fg_bold[green]%}Ξ:%{$fg_bold[red]%}%S↑%s%?)"
 
-PROMPT='${ret_status}%{$fg[blue]%}${PROMPT_HOST}%{$fg_bold[green]%}%p %{$fg_bold[yellow]%}%2~ ${vcs_info_msg_0_}${dir_status}%{$reset_color%} '
+PROMPT='${ret_status}%{$fg[blue]%}${PROMPT_HOST}%{$fg_bold[green]%} %{$fg_bold[yellow]%}%2~ ${vcs_info_msg_0_}${dir_status}%{$reset_color%} '
 
 #  vim: set ft=zsh ts=4 sw=4 et:
diff --git a/themes/jtriley.zsh-theme b/themes/jtriley.zsh-theme
index 15d77ed23..0f5b16f0a 100644
--- a/themes/jtriley.zsh-theme
+++ b/themes/jtriley.zsh-theme
@@ -1,8 +1,2 @@
-#PROMPT='%{$fg_bold[red]%}➜ %{$fg_bold[green]%}%p %{$fg[cyan]%}%c %{$fg_bold[blue]%}$(git_prompt_info)%{$fg_bold[blue]%} % %{$reset_color%}'
 PROMPT="%{$fg_bold[cyan]%}%T%{$fg_bold[green]%} %{$fg_bold[white]%}%n%{$fg[magenta]%}@%{$fg_bold[white]%}%m %{$fg_bold[green]%}%d
 %{$fg_bold[yellow]%}%% %{$reset_color%}"
-
-#ZSH_THEME_GIT_PROMPT_PREFIX="git:(%{$fg[red]%}"
-#ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}"
-#ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[blue]%}) %{$fg[yellow]%}✗%{$reset_color%}"
-#ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg[blue]%})"
diff --git a/themes/kafeitu.zsh-theme b/themes/kafeitu.zsh-theme
index c4720b24d..af96f5e38 100644
--- a/themes/kafeitu.zsh-theme
+++ b/themes/kafeitu.zsh-theme
@@ -1,4 +1,4 @@
-PROMPT='%{$fg_bold[red]%}➜ %{$fg_bold[green]%}%n%{$fg[cyan]%}@%{$fg_bold[green]%}%m %{$fg_bold[green]%}%p %{$fg[cyan]%}%~ %{$fg_bold[blue]%}$(git_prompt_info)%{$fg_bold[blue]%} % %{$reset_color%}'
+PROMPT='%{$fg_bold[red]%}➜ %{$fg_bold[green]%}%n%{$fg[cyan]%}@%{$fg_bold[green]%}%m %{$fg_bold[green]%} %{$fg[cyan]%}%~ %{$fg_bold[blue]%}$(git_prompt_info)%{$fg_bold[blue]%} % %{$reset_color%}'
 
 ZSH_THEME_GIT_PROMPT_PREFIX="git:(%{$fg[red]%}"
 ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}"
diff --git a/themes/linuxonly.zsh-theme b/themes/linuxonly.zsh-theme
index f9e0aa07d..2afae8fc3 100644
--- a/themes/linuxonly.zsh-theme
+++ b/themes/linuxonly.zsh-theme
@@ -1,7 +1,6 @@
-# vim: set ts=2 textwidth=0
-
 autoload -U add-zsh-hook
 autoload -Uz vcs_info
+
 local c0=$(printf "\033[0m")
 local c1=$(printf "\033[38;5;215m")
 local c2=$(printf "\033[38;5;209m")
@@ -13,7 +12,6 @@ local c7=$(printf "\033[38;5;149m")
 local c8=$(printf "\033[38;5;126m")
 local c9=$(printf "\033[38;5;162m")
 
-
 if [ "$TERM" = "linux" ]; then
     c1=$(printf "\033[34;1m")
     c2=$(printf "\033[35m")
@@ -26,9 +24,6 @@ if [ "$TERM" = "linux" ]; then
     c9=$(printf "\033[34m")
 fi
 
-#local newtv=$(perl $HOME/devel/newtv.pl)
-local newtv=''
-
 zstyle ':vcs_info:*' actionformats \
     '%{$c8%}(%f%s)%{$c7%}-%F{5}[%F{2}%b%F{3}|%F{1}%a%F{5}]%f '
 zstyle ':vcs_info:*' formats \
@@ -42,38 +37,23 @@ prompt_jnrowe_precmd () {
     vcs_info
 
     if [ "${vcs_info_msg_0_}" = "" ]; then
-        #dir_status="|%F{3}%n%F{7}@%F{3}%m%F{7}:%F{9}%l%f"
-        #dir_status="$c1%n%F{7}@%F{9}%m%F{7}:%F{12}%/"
         dir_status="%{$c1%}%n%{$c4%}@%{$c2%}%m%{$c0%}:%{$c3%}%l%{$c6%}->%{$c4%}%/ %{$c0%}(%{$c5%}%?%{$c0%})"
-        #dir_status="%{$c1%}%n%{$c4%}@%{$c2%}%m%{$c0%}:%{$c3%}%l%{$c6%}->%{$foopath%} %{$c0%}(%{$c5%}%?%{$c0%})"
-        
-        PROMPT='%{$fg_bold[green]%}%p%{$reset_color%}${vcs_info_msg_0_}${dir_status} ${ret_status}%{$reset_color%}
+        PROMPT='${dir_status} ${ret_status}%{$reset_color%}
 > '
     elif [[ $(git diff --cached --name-status 2>/dev/null ) != "" ]]; then
         dir_status="%{$c1%}%n%{$c4%}@%{$c2%}%m%{$c0%}:%{$c3%}%l%{$c6%}->%{$c4%}%/ %{$c0%}(%{$c5%}%?%{$c0%})"
         PROMPT='${vcs_info_msg_0_}
-%{$fg_bold[green]%}%p%{$reset_color%}${dir_status} ${vcs_info_msg_0_}%{$reset_color%}
+${dir_status} ${vcs_info_msg_0_}%{$reset_color%}
 > '
-    
     elif [[ $(git diff --name-status 2>/dev/null ) != "" ]]; then
         dir_status="%{$c1%}%n%{$c4%}@%{$c2%}%m%{$c0%}:%{$c3%}%l%{$c6%}->%{$c4%}%/ %{$c0%}(%{$c5%}%?%{$c0%})"
-
         PROMPT='${vcs_info_msg_0_}
-%{$fg_bold[green]%}%p%{$reset_color%}${dir_status}%{$reset_color%}
+${dir_status}%{$reset_color%}
 %{$c9%}·>%{$c0%} '
     else
         dir_status="%{$c1%}%n%{$c4%}@%{$c2%}%m%{$c0%}:%{$c3%}%l%{$c6%}->%{$c4%}%/ %{$c0%}(%{$c5%}%?%{$c0%})"
         PROMPT='${vcs_info_msg_0_}
-%{$fg_bold[green]%}%p%{$reset_color%}${dir_status} ${vcs_info_msg_0_}%{$reset_color%}
+${dir_status} ${vcs_info_msg_0_}%{$reset_color%}
 > '
-        
     fi
 }
-
-
-#PROMPT='${ret_status}%{$fg_bold[green]%}%p %{$reset_color%} ${vcs_info_msg_0_}${dir_status}%{$reset_color%}
-#> '
-
-# vim: set ft=zsh ts=4 sw=4 et:
-
-
diff --git a/themes/trapd00r.zsh-theme b/themes/trapd00r.zsh-theme
index 144d2549a..7a589a699 100644
--- a/themes/trapd00r.zsh-theme
+++ b/themes/trapd00r.zsh-theme
@@ -109,23 +109,23 @@ prompt_jnrowe_precmd () {
   vcs_info
   if [ "${vcs_info_msg_0_}" = "" ]; then
     dir_status="%{$c1%}%n%{$c4%}@%{$c2%}%m%{$c0%}:%{$c3%}%l%{$c6%}->%{$(zsh_path)%} %{$c0%}(%{$c5%}%?%{$c0%})"
-    PROMPT='%{$fg_bold[green]%}%p%{$reset_color%}${vcs_info_msg_0_}${dir_status} ${ret_status}%{$reset_color%}
+    PROMPT='${dir_status} ${ret_status}%{$reset_color%}
 > '
   # modified, to be committed
   elif [[ $(git diff --cached --name-status 2>/dev/null ) != "" ]]; then
     dir_status="%{$c1%}%n%{$c4%}@%{$c2%}%m%{$c0%}:%{$c3%}%l%{$c6%}->%{$(zsh_path)%} %{$c0%}(%{$c5%}%?%{$c0%})"
     PROMPT='${vcs_info_msg_0_}%{$30%} %{$bg_bold[red]%}%{$fg_bold[cyan]%}C%{$fg_bold[black]%}OMMIT%{$reset_color%}
-%{$fg_bold[green]%}%p%{$reset_color%}${dir_status}%{$reset_color%}
+${dir_status}%{$reset_color%}
 > '
   elif [[ $(git diff --name-status 2>/dev/null ) != "" ]]; then
     dir_status="%{$c1%}%n%{$c4%}@%{$c2%}%m%{$c0%}:%{$c3%}%l%{$c6%}->%{$(zsh_path)%} %{$c0%}(%{$c5%}%?%{$c0%})"
     PROMPT='${vcs_info_msg_0_}%{$bg_bold[red]%}%{$fg_bold[blue]%}D%{$fg_bold[black]%}IRTY%{$reset_color%}
-%{$fg_bold[green]%}%p%{$reset_color%}${dir_status}%{$reset_color%}
+${dir_status}%{$reset_color%}
 %{$c13%}>%{$c0%} '
   else
     dir_status="%{$c1%}%n%{$c4%}@%{$c2%}%m%{$c0%}:%{$c3%}%l%{$c6%}->%{$(zsh_path)%} %{$c0%}(%{$c5%}%?%{$c0%})"
     PROMPT='${vcs_info_msg_0_}
-%{$fg_bold[green]%}%p%{$reset_color%}${dir_status}%{$reset_color%}
+${dir_status}%{$reset_color%}
 > '
   fi
 }

From 9703111b820f99bd74a9b6b1c3e7a03d8f429005 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Tue, 4 Aug 2020 15:59:00 +0200
Subject: [PATCH 052/869] pyenv: ignore $PATH pyenv if on WSL

This solves the problem where the used pyenv is actually the one in a
Windows folder, instead of in WSL.

Fixes #9034
---
 plugins/pyenv/pyenv.plugin.zsh | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/plugins/pyenv/pyenv.plugin.zsh b/plugins/pyenv/pyenv.plugin.zsh
index 4c75156bd..b7ae2046f 100644
--- a/plugins/pyenv/pyenv.plugin.zsh
+++ b/plugins/pyenv/pyenv.plugin.zsh
@@ -2,7 +2,11 @@
 # the 'pyenv_prompt_info' function. Also loads pyenv-virtualenv if available.
 
 # Load pyenv only if command not already available
-command -v pyenv &> /dev/null && FOUND_PYENV=1 || FOUND_PYENV=0
+if command -v pyenv &> /dev/null && [[ "$(uname -r)" != *icrosoft* ]]; then
+    FOUND_PYENV=1
+else
+    FOUND_PYENV=0
+fi
 
 if [[ $FOUND_PYENV -ne 1 ]]; then
     pyenvdirs=("$HOME/.pyenv" "/usr/local/pyenv" "/opt/pyenv" "/usr/local/opt/pyenv")

From ec70c0c393e53004b885d146dd77b9a3f136971a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Tue, 4 Aug 2020 16:43:32 +0200
Subject: [PATCH 053/869] lib: bind keys to viins and vicmd keymaps and clean
 up file

Fixes #8468
---
 lib/key-bindings.zsh | 121 +++++++++++++++++++++++++++----------------
 1 file changed, 76 insertions(+), 45 deletions(-)

diff --git a/lib/key-bindings.zsh b/lib/key-bindings.zsh
index 0e056dc72..10053f6f3 100644
--- a/lib/key-bindings.zsh
+++ b/lib/key-bindings.zsh
@@ -15,55 +15,86 @@ if (( ${+terminfo[smkx]} )) && (( ${+terminfo[rmkx]} )); then
   zle -N zle-line-finish
 fi
 
-bindkey -e                                            # Use emacs key bindings
+# Use emacs key bindings
+bindkey -e
+
+# [PageUp] - Up a line of history
+if [[ -n "${terminfo[kpp]}" ]]; then
+  bindkey -M emacs "${terminfo[kpp]}" up-line-or-history
+  bindkey -M viins "${terminfo[kpp]}" up-line-or-history
+  bindkey -M vicmd "${terminfo[kpp]}" up-line-or-history
+fi
+# [PageDown] - Down a line of history
+if [[ -n "${terminfo[knp]}" ]]; then
+  bindkey -M emacs "${terminfo[knp]}" down-line-or-history
+  bindkey -M viins "${terminfo[knp]}" down-line-or-history
+  bindkey -M vicmd "${terminfo[knp]}" down-line-or-history
+fi
+
+# Start typing + [Up-Arrow] - fuzzy find history forward
+if [[ -n "${terminfo[kcuu1]}" ]]; then
+  autoload -U up-line-or-beginning-search
+  zle -N up-line-or-beginning-search
+
+  bindkey -M emacs "${terminfo[kcuu1]}" up-line-or-beginning-search
+  bindkey -M viins "${terminfo[kcuu1]}" up-line-or-beginning-search
+  bindkey -M vicmd "${terminfo[kcuu1]}" up-line-or-beginning-search
+fi
+# Start typing + [Down-Arrow] - fuzzy find history backward
+if [[ -n "${terminfo[kcud1]}" ]]; then
+  autoload -U down-line-or-beginning-search
+  zle -N down-line-or-beginning-search
+
+  bindkey -M emacs "${terminfo[kcud1]}" down-line-or-beginning-search
+  bindkey -M viins "${terminfo[kcud1]}" down-line-or-beginning-search
+  bindkey -M vicmd "${terminfo[kcud1]}" down-line-or-beginning-search
+fi
+
+# [Home] - Go to beginning of line
+if [[ -n "${terminfo[khome]}" ]]; then
+  bindkey -M emacs "${terminfo[khome]}" beginning-of-line
+  bindkey -M viins "${terminfo[khome]}" beginning-of-line
+  bindkey -M vicmd "${terminfo[khome]}" beginning-of-line
+fi
+# [End] - Go to end of line
+if [[ -n "${terminfo[kend]}" ]]; then
+  bindkey -M emacs "${terminfo[kend]}"  end-of-line
+  bindkey -M viins "${terminfo[kend]}"  end-of-line
+  bindkey -M vicmd "${terminfo[kend]}"  end-of-line
+fi
+
+# [Shift-Tab] - move through the completion menu backwards
+if [[ -n "${terminfo[kcbt]}" ]]; then
+  bindkey -M emacs "${terminfo[kcbt]}" reverse-menu-complete
+  bindkey -M viins "${terminfo[kcbt]}" reverse-menu-complete
+  bindkey -M vicmd "${terminfo[kcbt]}" reverse-menu-complete
+fi
+
+# [Backspace] - delete backward
+bindkey '^?' backward-delete-char
+# [Delete] - delete forward
+if [[ -n "${terminfo[kdch1]}" ]]; then
+  bindkey -M emacs "${terminfo[kdch1]}" delete-char            
+  bindkey -M viins "${terminfo[kdch1]}" delete-char            # [Delete] - delete forward
+  bindkey -M vicmd "${terminfo[kdch1]}" delete-char            # [Delete] - delete forward
+else
+  bindkey "^[[3~" delete-char
+  bindkey "^[3;5~" delete-char
+fi
+
+# [Ctrl-RightArrow] - move forward one word
+bindkey -M emacs '^[[1;5C' forward-word
+bindkey -M viins '^[[1;5C' forward-word
+bindkey -M vicmd '^[[1;5C' forward-word
+# [Ctrl-LeftArrow] - move backward one word
+bindkey -M emacs '^[[1;5D' backward-word
+bindkey -M viins '^[[1;5D' backward-word
+bindkey -M vicmd '^[[1;5D' backward-word
 
 bindkey '\ew' kill-region                             # [Esc-w] - Kill from the cursor to the mark
 bindkey -s '\el' 'ls\n'                               # [Esc-l] - run command: ls
 bindkey '^r' history-incremental-search-backward      # [Ctrl-r] - Search backward incrementally for a specified string. The string may begin with ^ to anchor the search to the beginning of the line.
-if [[ "${terminfo[kpp]}" != "" ]]; then
-  bindkey "${terminfo[kpp]}" up-line-or-history       # [PageUp] - Up a line of history
-fi
-if [[ "${terminfo[knp]}" != "" ]]; then
-  bindkey "${terminfo[knp]}" down-line-or-history     # [PageDown] - Down a line of history
-fi
-
-# start typing + [Up-Arrow] - fuzzy find history forward
-if [[ "${terminfo[kcuu1]}" != "" ]]; then
-  autoload -U up-line-or-beginning-search
-  zle -N up-line-or-beginning-search
-  bindkey "${terminfo[kcuu1]}" up-line-or-beginning-search
-fi
-# start typing + [Down-Arrow] - fuzzy find history backward
-if [[ "${terminfo[kcud1]}" != "" ]]; then
-  autoload -U down-line-or-beginning-search
-  zle -N down-line-or-beginning-search
-  bindkey "${terminfo[kcud1]}" down-line-or-beginning-search
-fi
-
-if [[ "${terminfo[khome]}" != "" ]]; then
-  bindkey "${terminfo[khome]}" beginning-of-line      # [Home] - Go to beginning of line
-fi
-if [[ "${terminfo[kend]}" != "" ]]; then
-  bindkey "${terminfo[kend]}"  end-of-line            # [End] - Go to end of line
-fi
-
-bindkey ' ' magic-space                               # [Space] - do history expansion
-
-bindkey '^[[1;5C' forward-word                        # [Ctrl-RightArrow] - move forward one word
-bindkey '^[[1;5D' backward-word                       # [Ctrl-LeftArrow] - move backward one word
-
-if [[ "${terminfo[kcbt]}" != "" ]]; then
-  bindkey "${terminfo[kcbt]}" reverse-menu-complete   # [Shift-Tab] - move through the completion menu backwards
-fi
-
-bindkey '^?' backward-delete-char                     # [Backspace] - delete backward
-if [[ "${terminfo[kdch1]}" != "" ]]; then
-  bindkey "${terminfo[kdch1]}" delete-char            # [Delete] - delete forward
-else
-  bindkey "^[[3~" delete-char
-  bindkey "^[3;5~" delete-char
-  bindkey "\e[3~" delete-char
-fi
+bindkey ' ' magic-space                               # [Space] - don't do history expansion
 
 # Edit the current command line in $EDITOR
 autoload -U edit-command-line

From e04564d52880b39032ca6a1841a48138db185aec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Tue, 4 Aug 2020 17:13:22 +0200
Subject: [PATCH 054/869] lib: add CTRL-backspace and CTRL-delete to delete
 whole words
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixes #7609
Closes #8191

Co-authored-by: Michal Grňo <m93a.cz@gmail.com>
---
 lib/key-bindings.zsh | 24 +++++++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)

diff --git a/lib/key-bindings.zsh b/lib/key-bindings.zsh
index 10053f6f3..ac1adf2e7 100644
--- a/lib/key-bindings.zsh
+++ b/lib/key-bindings.zsh
@@ -71,17 +71,33 @@ if [[ -n "${terminfo[kcbt]}" ]]; then
 fi
 
 # [Backspace] - delete backward
-bindkey '^?' backward-delete-char
+bindkey -M emacs '^?' backward-delete-char
+bindkey -M viins '^?' backward-delete-char
+bindkey -M vicmd '^?' backward-delete-char
 # [Delete] - delete forward
 if [[ -n "${terminfo[kdch1]}" ]]; then
   bindkey -M emacs "${terminfo[kdch1]}" delete-char            
   bindkey -M viins "${terminfo[kdch1]}" delete-char            # [Delete] - delete forward
   bindkey -M vicmd "${terminfo[kdch1]}" delete-char            # [Delete] - delete forward
 else
-  bindkey "^[[3~" delete-char
-  bindkey "^[3;5~" delete-char
+  bindkey -M emacs "^[[3~" delete-char
+  bindkey -M viins "^[[3~" delete-char
+  bindkey -M vicmd "^[[3~" delete-char
+
+  bindkey -M emacs "^[3;5~" delete-char
+  bindkey -M viins "^[3;5~" delete-char
+  bindkey -M vicmd "^[3;5~" delete-char
 fi
 
+# [Ctrl-Backspace] - delete whole backward-word
+bindkey -M emacs '^H' backward-kill-word
+bindkey -M viins '^H' backward-kill-word
+bindkey -M vicmd '^H' backward-kill-word
+# [Ctrl-Delete] - delete whole forward-word
+bindkey -M emacs '^[[3;5~' kill-word
+bindkey -M viins '^[[3;5~' kill-word
+bindkey -M vicmd '^[[3;5~' kill-word
+
 # [Ctrl-RightArrow] - move forward one word
 bindkey -M emacs '^[[1;5C' forward-word
 bindkey -M viins '^[[1;5C' forward-word
@@ -91,11 +107,13 @@ bindkey -M emacs '^[[1;5D' backward-word
 bindkey -M viins '^[[1;5D' backward-word
 bindkey -M vicmd '^[[1;5D' backward-word
 
+
 bindkey '\ew' kill-region                             # [Esc-w] - Kill from the cursor to the mark
 bindkey -s '\el' 'ls\n'                               # [Esc-l] - run command: ls
 bindkey '^r' history-incremental-search-backward      # [Ctrl-r] - Search backward incrementally for a specified string. The string may begin with ^ to anchor the search to the beginning of the line.
 bindkey ' ' magic-space                               # [Space] - don't do history expansion
 
+
 # Edit the current command line in $EDITOR
 autoload -U edit-command-line
 zle -N edit-command-line

From cf347ef3e43eabde5ae86e17d25690ebbeef5e6b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Tue, 4 Aug 2020 17:30:07 +0200
Subject: [PATCH 055/869] lib: bind to all keymaps when COMPLETION_WAITING_DOTS
 is set

Fixes #9050
---
 lib/completion.zsh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lib/completion.zsh b/lib/completion.zsh
index 47a4ed60f..2b62785d5 100644
--- a/lib/completion.zsh
+++ b/lib/completion.zsh
@@ -65,7 +65,10 @@ if [[ $COMPLETION_WAITING_DOTS = true ]]; then
     zle redisplay
   }
   zle -N expand-or-complete-with-dots
-  bindkey "^I" expand-or-complete-with-dots
+  # Set the function as the default tab completion widget
+  bindkey -M emacs "^I" expand-or-complete-with-dots
+  bindkey -M viins "^I" expand-or-complete-with-dots
+  bindkey -M vicmd "^I" expand-or-complete-with-dots
 fi
 
 # automatically load bash completion functions

From 3935ccce647c722bcfdaa771b01613079db20935 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dario=20Vladovi=C4=87?= <d.vladimyr@gmail.com>
Date: Tue, 4 Aug 2020 17:48:29 +0200
Subject: [PATCH 056/869] cli: add update command (#9094)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Marc Cornellà <marc.cornella@live.com>
---
 lib/cli.zsh       | 11 +++++++++++
 lib/functions.zsh |  4 ++--
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/lib/cli.zsh b/lib/cli.zsh
index 73ac5a846..3c09cdab8 100644
--- a/lib/cli.zsh
+++ b/lib/cli.zsh
@@ -23,6 +23,7 @@ function _omz {
     local -a cmds subcmds
     cmds=(
         'help:Usage information'
+        'update:Update Oh My Zsh'
         'pr:Commands for Oh My Zsh Pull Requests'
     )
 
@@ -48,6 +49,7 @@ Usage: omz <command> [options]
 Available commands:
 
     help                Print this help message
+    update              Update Oh My Zsh
     pr <command>        Commands for Oh My Zsh Pull Requests
 
 EOF
@@ -197,3 +199,12 @@ function _omz::pr::test {
         }
     )
 }
+
+function _omz::update {
+    env ZSH="$ZSH" sh "$ZSH/tools/upgrade.sh"
+    # Update last updated file
+    zmodload zsh/datetime
+    echo "LAST_EPOCH=$(( EPOCHSECONDS / 60 / 60 / 24 ))" >! "${ZSH_CACHE_DIR}/.zsh-update"
+    # Remove update lock if it exists
+    command rm -rf "$ZSH/log/update.lock"
+}
diff --git a/lib/functions.zsh b/lib/functions.zsh
index 678e29ce7..e85b867a5 100644
--- a/lib/functions.zsh
+++ b/lib/functions.zsh
@@ -7,8 +7,8 @@ function uninstall_oh_my_zsh() {
 }
 
 function upgrade_oh_my_zsh() {
-  env ZSH="$ZSH" sh "$ZSH/tools/upgrade.sh"
-  command rm -rf "$ZSH/log/update.lock"
+  echo >&2 "${fg[yellow]}Note: \`$0\` is deprecated. Use \`omz update\` instead.$reset_color"
+  omz update
 }
 
 function take() {

From 81eb2089878be5b9cb4a4ba89c2e2f537b14fb7e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Wed, 5 Aug 2020 14:19:26 +0200
Subject: [PATCH 057/869] wd: update to latest version

https://github.com/mfaerevaag/wd/commit/3d20d15d58b9349f872a1abab639aae02374f64c

Fixes #9002
---
 plugins/wd/wd.sh | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)
 mode change 100644 => 100755 plugins/wd/wd.sh

diff --git a/plugins/wd/wd.sh b/plugins/wd/wd.sh
old mode 100644
new mode 100755
index 802ed10ee..618995c63
--- a/plugins/wd/wd.sh
+++ b/plugins/wd/wd.sh
@@ -183,6 +183,11 @@ wd_add()
     then
         wd_remove $point > /dev/null
         printf "%q:%s\n" "${point}" "${PWD/#$HOME/~}" >> $WD_CONFIG
+        if (whence sort >/dev/null); then
+            local config_tmp=$(mktemp "${TMPDIR:-/tmp}/wd.XXXXXXXXXX")
+            # use 'cat' below to ensure we respect $WD_CONFIG as a symlink
+            sort -o "${config_tmp}" $WD_CONFIG  && cat "${config_tmp}" > $WD_CONFIG && rm "${config_tmp}"
+        fi
 
         wd_export_static_named_directories
 
@@ -342,8 +347,8 @@ wd_clean() {
 wd_export_static_named_directories() {
   if [[ -z $WD_SKIP_EXPORT ]]
   then
-    grep '^[0-9a-zA-Z_-]\+:' "$WD_CONFIG" | sed -e "s,~,$HOME," -e 's/:/=/' | while read warpdir ; do
-	    hash -d "$warpdir"
+    command grep '^[0-9a-zA-Z_-]\+:' "$WD_CONFIG" | sed -e "s,~,$HOME," -e 's/:/=/' | while read warpdir ; do
+        hash -d "$warpdir"
     done
   fi
 }
@@ -430,7 +435,10 @@ else
                 break
                 ;;
             "-r"|"--remove"|"rm")
-                wd_remove $2
+                # Loop over all arguments after "rm", separated by whitespace
+                for pointname in "${@:2}" ; do
+                    wd_remove $pointname
+                done
                 break
                 ;;
             "-l"|"list")

From fa5db3444b06533da0662b2ed0881b3e70d0f9a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Wed, 5 Aug 2020 14:20:20 +0200
Subject: [PATCH 058/869] wd: fix permissions

---
 plugins/wd/wd.sh | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 mode change 100755 => 100644 plugins/wd/wd.sh

diff --git a/plugins/wd/wd.sh b/plugins/wd/wd.sh
old mode 100755
new mode 100644

From 39c0073225194cdb11f2e42bb7d5e63cbf9e2955 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Wed, 5 Aug 2020 14:34:14 +0200
Subject: [PATCH 059/869] lib: remove CTRL-Backspace binding for vi keymaps

---
 lib/key-bindings.zsh | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/lib/key-bindings.zsh b/lib/key-bindings.zsh
index ac1adf2e7..4916034b3 100644
--- a/lib/key-bindings.zsh
+++ b/lib/key-bindings.zsh
@@ -76,9 +76,9 @@ bindkey -M viins '^?' backward-delete-char
 bindkey -M vicmd '^?' backward-delete-char
 # [Delete] - delete forward
 if [[ -n "${terminfo[kdch1]}" ]]; then
-  bindkey -M emacs "${terminfo[kdch1]}" delete-char            
-  bindkey -M viins "${terminfo[kdch1]}" delete-char            # [Delete] - delete forward
-  bindkey -M vicmd "${terminfo[kdch1]}" delete-char            # [Delete] - delete forward
+  bindkey -M emacs "${terminfo[kdch1]}" delete-char
+  bindkey -M viins "${terminfo[kdch1]}" delete-char
+  bindkey -M vicmd "${terminfo[kdch1]}" delete-char
 else
   bindkey -M emacs "^[[3~" delete-char
   bindkey -M viins "^[[3~" delete-char
@@ -91,8 +91,6 @@ fi
 
 # [Ctrl-Backspace] - delete whole backward-word
 bindkey -M emacs '^H' backward-kill-word
-bindkey -M viins '^H' backward-kill-word
-bindkey -M vicmd '^H' backward-kill-word
 # [Ctrl-Delete] - delete whole forward-word
 bindkey -M emacs '^[[3;5~' kill-word
 bindkey -M viins '^[[3;5~' kill-word

From f2c8b970eed3e5ddf071c25177da44ea5061a279 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Wed, 5 Aug 2020 17:05:53 +0200
Subject: [PATCH 060/869] meta: add ISSUE_TEMPLATE config.yml

For now, it only adds a link to the Discord server.
---
 .github/ISSUE_TEMPLATE/config.yml | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 .github/ISSUE_TEMPLATE/config.yml

diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
new file mode 100644
index 000000000..c6b4cef42
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -0,0 +1,5 @@
+blank_issues_enabled: true
+contact_links:
+  - name: Get help on Discord
+    url: https://discord.gg/ohmyzsh
+    about: Have a quick question? Join the Discord server and ask on the appropriate channel.

From 079e7bb5e0a79171f3356d55d3f6302a82645a39 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Thu, 6 Aug 2020 08:55:29 +0200
Subject: [PATCH 061/869] lib: remove CTRL-Backspace key binding altogether

It conflicts with normal Backspace behavior. Fixes #9155
---
 lib/key-bindings.zsh | 2 --
 1 file changed, 2 deletions(-)

diff --git a/lib/key-bindings.zsh b/lib/key-bindings.zsh
index 4916034b3..aaa73046e 100644
--- a/lib/key-bindings.zsh
+++ b/lib/key-bindings.zsh
@@ -89,8 +89,6 @@ else
   bindkey -M vicmd "^[3;5~" delete-char
 fi
 
-# [Ctrl-Backspace] - delete whole backward-word
-bindkey -M emacs '^H' backward-kill-word
 # [Ctrl-Delete] - delete whole forward-word
 bindkey -M emacs '^[[3;5~' kill-word
 bindkey -M viins '^[[3;5~' kill-word

From f30daa76efa3e35f269c5a5a993c82e94799a074 Mon Sep 17 00:00:00 2001
From: Rohit Goswami <r95g10@gmail.com>
Date: Fri, 7 Aug 2020 14:35:58 +0000
Subject: [PATCH 062/869] aliases: Don't overshadow fd

---
 plugins/common-aliases/common-aliases.plugin.zsh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/plugins/common-aliases/common-aliases.plugin.zsh b/plugins/common-aliases/common-aliases.plugin.zsh
index 023b1a51e..8f3045db4 100644
--- a/plugins/common-aliases/common-aliases.plugin.zsh
+++ b/plugins/common-aliases/common-aliases.plugin.zsh
@@ -34,7 +34,9 @@ alias -g P="2>&1| pygmentize -l pytb"
 
 alias dud='du -d 1 -h'
 alias duf='du -sh *'
-alias fd='find . -type d -name'
+if ! which fd >/dev/null 2>%1; then
+  alias fd='find . -type d -name'
+fi
 alias ff='find . -type f -name'
 
 alias h='history'

From 613045e7e565a9069568e7f94574701c3d440489 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Mon, 17 Aug 2020 21:47:39 +0200
Subject: [PATCH 063/869] Underline links in install and update script

---
 tools/install.sh | 12 +++++++++---
 tools/upgrade.sh |  8 +++++---
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/tools/install.sh b/tools/install.sh
index 8a93708ca..0fc554786 100755
--- a/tools/install.sh
+++ b/tools/install.sh
@@ -53,6 +53,10 @@ error() {
 	echo ${RED}"Error: $@"${RESET} >&2
 }
 
+underline() {
+	echo "$(printf '\033[4m')$@$(printf '\033[24m')"
+}
+
 setup_color() {
 	# Only use colors if connected to a terminal
 	if [ -t 1 ]; then
@@ -269,11 +273,13 @@ main() {
 		                        /____/                       ....is now installed!
 
 
+	EOF
+	cat <<-EOF
 		Before you scream Oh My Zsh! please look over the ~/.zshrc file to select plugins, themes, and options.
 
-		• Follow us on Twitter: https://twitter.com/ohmyzsh
-		• Join our Discord server: https://discord.gg/ohmyzsh
-		• Get stickers, shirts, coffee mugs and other swag: https://shop.planetargon.com/collections/oh-my-zsh
+		• Follow us on Twitter: $(underline https://twitter.com/ohmyzsh)
+		• Join our Discord server: $(underline https://discord.gg/ohmyzsh)
+		• Get stickers, shirts, coffee mugs and other swag: $(underline https://shop.planetargon.com/collections/oh-my-zsh)
 
 	EOF
 	printf "$RESET"
diff --git a/tools/upgrade.sh b/tools/upgrade.sh
index de7a8419b..a71dec88b 100644
--- a/tools/upgrade.sh
+++ b/tools/upgrade.sh
@@ -14,6 +14,7 @@ if [ -t 1 ]; then
   YELLOW=$(printf '\033[33m')
   BLUE=$(printf '\033[34m')
   BOLD=$(printf '\033[1m')
+  UNDER=$(printf '\033[4m')
   RESET=$(printf '\033[m')
 else
   RB_RED=""
@@ -28,6 +29,7 @@ else
   GREEN=""
   YELLOW=""
   BLUE=""
+  UNDER=""
   BOLD=""
   RESET=""
 fi
@@ -62,9 +64,9 @@ then
   printf '%s\____/%s_/ /_/ %s /_/ /_/ /_/%s\__, / %s   /___/%s____/%s_/ /_/  %s\n' $RB_RED $RB_ORANGE $RB_YELLOW $RB_GREEN $RB_BLUE $RB_INDIGO $RB_VIOLET $RB_RESET
   printf '%s    %s        %s           %s /____/ %s       %s     %s          %s\n' $RB_RED $RB_ORANGE $RB_YELLOW $RB_GREEN $RB_BLUE $RB_INDIGO $RB_VIOLET $RB_RESET
   printf "${BLUE}%s\n" "Hooray! Oh My Zsh has been updated and/or is at the current version."
-  printf "${BLUE}${BOLD}%s${RESET}\n" "To keep up on the latest news and updates, follow us on Twitter: https://twitter.com/ohmyzsh"
-  printf "${BLUE}${BOLD}%s${RESET}\n" "Want to get involved in the community? Join our Discord: https://discord.gg/ohmyzsh"
-  printf "${BLUE}${BOLD}%s${RESET}\n" "Get your Oh My Zsh swag at: https://shop.planetargon.com/collections/oh-my-zsh"
+  printf "${BLUE}${BOLD}%s ${UNDER}%s${RESET}\n" "To keep up on the latest news and updates, follow us on Twitter:" "https://twitter.com/ohmyzsh"
+  printf "${BLUE}${BOLD}%s ${UNDER}%s${RESET}\n" "Want to get involved in the community? Join our Discord:" "https://discord.gg/ohmyzsh"
+  printf "${BLUE}${BOLD}%s ${UNDER}%s${RESET}\n" "Get your Oh My Zsh swag at:" "https://shop.planetargon.com/collections/oh-my-zsh"
 else
   printf "${RED}%s${RESET}\n" 'There was an error updating. Try again later?'
 fi

From 7deda85f8cf7fb3c2f36b771a2e8bd70a28bf0b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Mon, 17 Aug 2020 22:11:02 +0200
Subject: [PATCH 064/869] Fix upgrade_oh_my_zsh function deprecation

---
 lib/cli.zsh       |  4 ++++
 lib/functions.zsh | 16 ++++++++++++++--
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/lib/cli.zsh b/lib/cli.zsh
index 3c09cdab8..d8203f271 100644
--- a/lib/cli.zsh
+++ b/lib/cli.zsh
@@ -201,10 +201,14 @@ function _omz::pr::test {
 }
 
 function _omz::update {
+    # Run update script
     env ZSH="$ZSH" sh "$ZSH/tools/upgrade.sh"
     # Update last updated file
     zmodload zsh/datetime
     echo "LAST_EPOCH=$(( EPOCHSECONDS / 60 / 60 / 24 ))" >! "${ZSH_CACHE_DIR}/.zsh-update"
     # Remove update lock if it exists
     command rm -rf "$ZSH/log/update.lock"
+    # Restart the zsh session
+    _omz::log info "restarting the zsh session..."
+    [[ -z "$SHELL" ]] && exec ${SHELL#-} || exec zsh
 }
diff --git a/lib/functions.zsh b/lib/functions.zsh
index e85b867a5..0556aeb29 100644
--- a/lib/functions.zsh
+++ b/lib/functions.zsh
@@ -7,8 +7,20 @@ function uninstall_oh_my_zsh() {
 }
 
 function upgrade_oh_my_zsh() {
-  echo >&2 "${fg[yellow]}Note: \`$0\` is deprecated. Use \`omz update\` instead.$reset_color"
-  omz update
+  if (( $+functions[_omz::update] )); then
+    echo >&2 "${fg[yellow]}Note: \`$0\` is deprecated. Use \`omz update\` instead.$reset_color"
+  fi
+
+  # Run update script
+  env ZSH="$ZSH" sh "$ZSH/tools/upgrade.sh"
+  # Update last updated file
+  zmodload zsh/datetime
+  echo "LAST_EPOCH=$(( EPOCHSECONDS / 60 / 60 / 24 ))" >! "${ZSH_CACHE_DIR}/.zsh-update"
+  # Remove update lock if it exists
+  command rm -rf "$ZSH/log/update.lock"
+  # Restart the zsh session
+  _omz::log info "restarting the zsh session..."
+  [[ -z "$SHELL" ]] && exec ${SHELL#-} || exec zsh
 }
 
 function take() {

From 89400f156a6e1d64acaeab9ec265f54cdab91817 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Tue, 18 Aug 2020 19:51:19 +0200
Subject: [PATCH 065/869] Remove zsh session restart on omz update and
 upgrade_oh_my_zsh

---
 lib/cli.zsh       | 3 ---
 lib/functions.zsh | 3 ---
 2 files changed, 6 deletions(-)

diff --git a/lib/cli.zsh b/lib/cli.zsh
index d8203f271..c1ae2bdf2 100644
--- a/lib/cli.zsh
+++ b/lib/cli.zsh
@@ -208,7 +208,4 @@ function _omz::update {
     echo "LAST_EPOCH=$(( EPOCHSECONDS / 60 / 60 / 24 ))" >! "${ZSH_CACHE_DIR}/.zsh-update"
     # Remove update lock if it exists
     command rm -rf "$ZSH/log/update.lock"
-    # Restart the zsh session
-    _omz::log info "restarting the zsh session..."
-    [[ -z "$SHELL" ]] && exec ${SHELL#-} || exec zsh
 }
diff --git a/lib/functions.zsh b/lib/functions.zsh
index 0556aeb29..4bc533b7a 100644
--- a/lib/functions.zsh
+++ b/lib/functions.zsh
@@ -18,9 +18,6 @@ function upgrade_oh_my_zsh() {
   echo "LAST_EPOCH=$(( EPOCHSECONDS / 60 / 60 / 24 ))" >! "${ZSH_CACHE_DIR}/.zsh-update"
   # Remove update lock if it exists
   command rm -rf "$ZSH/log/update.lock"
-  # Restart the zsh session
-  _omz::log info "restarting the zsh session..."
-  [[ -z "$SHELL" ]] && exec ${SHELL#-} || exec zsh
 }
 
 function take() {

From 79614908ec5fc6af1151f7c2a17a43844f920e66 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Thu, 20 Aug 2020 11:15:48 +0200
Subject: [PATCH 066/869] meta: don't apply support label on bug reports

Enough users have complained about the bug label not being applied instead. If there is no label applied
this won't be complained about so often.
---
 .github/ISSUE_TEMPLATE/bug_report.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index b7f5460c1..611d8ebae 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -1,7 +1,6 @@
 ---
 name: Bug report
 about: Create a report to help us improve Oh My Zsh
-labels: 'Type: support'
 
 ---
 

From 93f8c0686cd28d3f93810c4824397f21530899c7 Mon Sep 17 00:00:00 2001
From: "Adam G. Emerson" <35545129+AdamGEmerson@users.noreply.github.com>
Date: Thu, 20 Aug 2020 04:26:39 -0500
Subject: [PATCH 067/869] docs: add fetch install command for FreeBSD (#9172)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Marc Cornellà <marc.cornella@live.com>
---
 README.md        | 6 ++++++
 tools/install.sh | 4 +++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 329eff178..8dfa4a139 100644
--- a/README.md
+++ b/README.md
@@ -43,6 +43,12 @@ sh -c "$(curl -fsSL https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/too
 sh -c "$(wget -O- https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)"
 ```
 
+#### via fetch
+
+```shell
+sh -c "$(fetch -o - https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)"
+```
+
 #### Manual inspection
 
 It's a good idea to inspect the install script from projects you don't yet know. You can do
diff --git a/tools/install.sh b/tools/install.sh
index 0fc554786..4e166fef4 100755
--- a/tools/install.sh
+++ b/tools/install.sh
@@ -2,8 +2,10 @@
 #
 # This script should be run via curl:
 #   sh -c "$(curl -fsSL https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)"
-# or wget:
+# or via wget:
 #   sh -c "$(wget -qO- https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)"
+# or via fetch:
+#   sh -c "$(fetch -o - https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)"
 #
 # As an alternative, you can first download the install script and run it afterwards:
 #   wget https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh

From 03b6a72576cb0f0b53abde25d409e8026d5c4ee9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Thu, 20 Aug 2020 11:28:10 +0200
Subject: [PATCH 068/869] docs: document oneline argument passing to install
 script

---
 tools/install.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tools/install.sh b/tools/install.sh
index 4e166fef4..61b21cb9e 100755
--- a/tools/install.sh
+++ b/tools/install.sh
@@ -32,6 +32,8 @@
 #   --keep-zshrc: sets KEEP_ZSHRC to 'yes'
 # For example:
 #   sh install.sh --unattended
+# or:
+#   sh -c "$(curl -fsSL https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)" "" --unattended
 #
 set -e
 

From 2d97e102b27135febd43fc6fdaa5dea84780973d Mon Sep 17 00:00:00 2001
From: hasheddan <georgedanielmangum@gmail.com>
Date: Sat, 22 Aug 2020 09:00:06 -0500
Subject: [PATCH 069/869] Remove missing screenshots from kube-ps1 README

Removes missing screenshots from README for kube-ps1 plugin.

Signed-off-by: hasheddan <georgedanielmangum@gmail.com>
---
 plugins/kube-ps1/README.md | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/plugins/kube-ps1/README.md b/plugins/kube-ps1/README.md
index a14337278..b08997b0f 100644
--- a/plugins/kube-ps1/README.md
+++ b/plugins/kube-ps1/README.md
@@ -6,14 +6,6 @@ configured on `kubectl` to your Bash/Zsh prompt strings (i.e. the `$PS1`).
 
 Inspired by several tools used to simplify usage of `kubectl`.
 
-![prompt](img/screenshot2.png)
-
-![prompt_sol_light](img/screenshot-sol-light.png)
-
-![prompt_img](img/screenshot-img.png)
-
-![prompt demo](img/kube-ps1.gif)
-
 ## Installing
 
 ### MacOS

From c785db621e8bdb9edb897cc7353fe87fb6e550b1 Mon Sep 17 00:00:00 2001
From: Kirill Suslov <kirill.suslov@shopify.com>
Date: Sun, 23 Aug 2020 15:52:11 -0400
Subject: [PATCH 070/869] Update README with new update command (#9203)

Note: `upgrade_oh_my_zsh` is deprecated. Use `omz update` instead.
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 8dfa4a139..8be05b6f1 100644
--- a/README.md
+++ b/README.md
@@ -273,7 +273,7 @@ DISABLE_AUTO_UPDATE=true
 If you'd like to upgrade at any point in time (maybe someone just released a new plugin and you don't want to wait a week?) you just need to run:
 
 ```shell
-upgrade_oh_my_zsh
+omz update
 ```
 
 Magic! 🎉

From cd17aed9e109692273b5c251414ee733cba704f2 Mon Sep 17 00:00:00 2001
From: daddeffe <daddef@gmail.com>
Date: Sun, 23 Aug 2020 22:58:08 +0200
Subject: [PATCH 071/869] sudo: keep space before the command to ignore it in
 the history (#9178)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Marc Cornellà <marc.cornella@live.com>
---
 plugins/sudo/sudo.plugin.zsh | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/plugins/sudo/sudo.plugin.zsh b/plugins/sudo/sudo.plugin.zsh
index 51579377d..b3749eff7 100644
--- a/plugins/sudo/sudo.plugin.zsh
+++ b/plugins/sudo/sudo.plugin.zsh
@@ -14,6 +14,14 @@
 
 sudo-command-line() {
     [[ -z $BUFFER ]] && LBUFFER="$(fc -ln -1)"
+
+    # Save beginning space
+    local WHITESPACE=""
+    if [[ ${LBUFFER:0:1} == " " ]] ; then 
+        WHITESPACE=" "
+        LBUFFER="${LBUFFER:1}"
+    fi
+
     if [[ -n $EDITOR && $BUFFER == $EDITOR\ * ]]; then
         if [[ ${#LBUFFER} -le ${#EDITOR} ]]; then
             RBUFFER=" ${BUFFER#$EDITOR }"
@@ -38,6 +46,9 @@ sudo-command-line() {
     else
         LBUFFER="sudo $LBUFFER"
     fi
+
+    # Preserve beginning space
+    LBUFFER="${WHITESPACE}${LBUFFER}"
 }
 zle -N sudo-command-line
 # Defined shortcut keys: [Esc] [Esc]

From cfb86cd08d3b24fd4b59d0d35b3af1f589c891fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Mon, 24 Aug 2020 17:48:39 +0200
Subject: [PATCH 072/869] zsh_reload: use $SHELL to reload zsh only if it's a
 zsh shell (fixes #9054)

---
 plugins/zsh_reload/zsh_reload.plugin.zsh | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/plugins/zsh_reload/zsh_reload.plugin.zsh b/plugins/zsh_reload/zsh_reload.plugin.zsh
index 83f8da733..0d29a7ce3 100644
--- a/plugins/zsh_reload/zsh_reload.plugin.zsh
+++ b/plugins/zsh_reload/zsh_reload.plugin.zsh
@@ -7,6 +7,16 @@ src() {
 		zrecompile -p $f && command rm -f $f.zwc.old
 	done
 
-	# Use $SHELL if available; remove leading dash if login shell
-	[[ -n "$SHELL" ]] && exec ${SHELL#-} || exec zsh
+	# Use $SHELL if it's available and a zsh shell
+	local shell="$ZSH_ARGZERO"
+	if [[ "${${SHELL:t}#-}" = zsh ]]; then
+		shell="$SHELL"
+	fi
+
+	# Remove leading dash if login shell and run accordingly
+	if [[ "${shell:0:1}" = "-" ]]; then
+		exec -l "${shell#-}"
+	else
+		exec "$shell"
+	fi
 }

From 8d08f1634a7b9782e3722ce770e8630f569afe3f Mon Sep 17 00:00:00 2001
From: Pavol Juhas <pavol.juhas@gmail.com>
Date: Thu, 27 Aug 2020 00:44:25 -0700
Subject: [PATCH 073/869] scd: update to 1.4.0 (#9066)

---
 plugins/scd/README.md      |  54 +++++-
 plugins/scd/_scd           |  60 +++++++
 plugins/scd/scd            | 347 ++++++++++++++++++++++++++-----------
 plugins/scd/scd.plugin.zsh |  16 +-
 4 files changed, 357 insertions(+), 120 deletions(-)
 create mode 100644 plugins/scd/_scd
 mode change 100644 => 100755 plugins/scd/scd

diff --git a/plugins/scd/README.md b/plugins/scd/README.md
index 8c156da1f..d8535f9f2 100644
--- a/plugins/scd/README.md
+++ b/plugins/scd/README.md
@@ -14,8 +14,9 @@ directory aliases, which appear as named directories in zsh session.
 ## INSTALLATION NOTES
 
 Besides oh-my-zsh, `scd` can be used with *bash*, *dash* or *tcsh*
-shells and is also available as [Vim](https://www.vim.org/) plugin and
-[IPython](https://ipython.org/) extension.  For installation details, see
+shells and is also available as Vim plugin
+[scd.vim](https://github.com/pavoljuhas/scd.vim) and
+[IPython](https://ipython.org) extension.  For installation details, see
 https://github.com/pavoljuhas/smart-change-directory.
 
 ## SYNOPSIS
@@ -24,11 +25,31 @@ https://github.com/pavoljuhas/smart-change-directory.
 scd [options] [pattern1 pattern2 ...]
 ```
 
+## PATTERNS
+
+Patterns may use all zsh [glob operators](
+http://zsh.sourceforge.net/Doc/Release/Expansion.html#Glob-Operators)
+available with *extendedglob* option.  Specified patterns must match
+the absolute path and at least one of them must match in the tail.
+Several special patterns are also recognized as follows:
+
+<dl><dt>
+^PAT</dt><dd>
+  PAT must match at the beginning of the path, for example, "^/home"</dd><dt>
+PAT$</dt><dd>
+  require PAT to match the end of the path, "man$"</dd><dt>
+./</dt><dd>
+  match only subdirectories of the current directory</dd><dt>
+:PAT</dt><dd>
+  require PAT to match over the tail component, ":doc", ":re/doc"</dd>
+</dl>
+
+
 ## OPTIONS
 
 <dl><dt>
 -a, --add</dt><dd>
-  add specified directories to the directory index.</dd><dt>
+  add current or specified directories to the directory index.</dd><dt>
 
 --unindex</dt><dd>
   remove current or specified directories from the index.</dd><dt>
@@ -42,11 +63,16 @@ scd [options] [pattern1 pattern2 ...]
 
 --unalias</dt><dd>
   remove ALIAS definition for the current or specified directory from
-  <em>~/.scdalias.zsh</em>.</dd><dt>
+  <em>~/.scdalias.zsh</em>.  Use "OLD" to purge aliases to non-existent
+  directories.</dd><dt>
 
 -A, --all</dt><dd>
-  include all matching directories.  Disregard matching by directory
-  alias and filtering of less likely paths.</dd><dt>
+  display all directories even those excluded by patterns in
+  <em>~/.scdignore</em>.  Disregard the unique matching for a
+  directory alias and filtering of less likely paths.</dd><dt>
+
+-p, --push</dt><dd>
+  use "pushd" to change to the target directory.</dd><dt>
 
 --list</dt><dd>
   show matching directories and exit.</dd><dt>
@@ -58,6 +84,7 @@ scd [options] [pattern1 pattern2 ...]
   display this options summary and exit.</dd>
 </dl>
 
+
 ## Examples
 
 ```sh
@@ -83,17 +110,26 @@ scd --alias=xray
 scd xray
 ```
 
-# FILES
+## FILES
 
 <dl><dt>
 ~/.scdhistory</dt><dd>
     time-stamped index of visited directories.</dd><dt>
 
 ~/.scdalias.zsh</dt><dd>
-    scd-generated definitions of directory aliases.</dd>
+    scd-generated definitions of directory aliases.</dd><dt>
+
+~/.scdignore</dt><dd>
+    <a href="http://zsh.sourceforge.net/Doc/Release/Expansion.html#Glob-Operators">
+    glob patterns</a> for paths to be ignored in the scd search, for example,
+    <code>/mnt/backup/*</code>.  The patterns are specified one per line
+    and are matched assuming the <em>extendedglob</em> zsh option.  Lines
+    starting with "#" are skipped as comments.  The .scdignore patterns
+    are not applied in the <em>--all</em> mode.</dd>
 </dl>
 
-# ENVIRONMENT
+
+## ENVIRONMENT
 
 <dl><dt>
 SCD_HISTFILE</dt><dd>
diff --git a/plugins/scd/_scd b/plugins/scd/_scd
new file mode 100644
index 000000000..39c7fa463
--- /dev/null
+++ b/plugins/scd/_scd
@@ -0,0 +1,60 @@
+#compdef scd
+#description smart change directory
+
+local curcontext="$curcontext" state line expl ret=1
+typeset -A opt_args
+
+local -a indexopts myargs
+indexopts=( --add -a --unindex )
+
+myargs=(
+    # common options
+    "(--help -h)"{--help,-h}"[print help and exit]"
+
+    # options for manipulating directory index
+    - index
+    "(--recursive -r)"{--recursive,-r}"[use recursive --add or --unindex]"
+    "($indexopts)"{--add,-a}"[add specified directories to the index]"
+    "($indexopts)--unindex[remove specified directories from the index]"
+    "*:directory:{ (( ${words[(I)-a|--add|--unindex]} )) && _path_files -/ }"
+
+    # define new directory alias
+    - alias
+    "--alias=[create alias for this or given directory]:directory-alias:()"
+    '1:directory:{ (( words[(I)--alias*] )) && _path_files -/ }'
+
+    # remove definition of directory alias
+    - unalias
+    "--unalias[remove definition of directory alias]"
+    "*::directory alias:->scd-alias-target"
+
+    # act on the directory change
+    - scd
+    "(--all -A)"{--all,-A}"[include less likely and ignored paths]"
+    "--list[print matching directories and exit]"
+    "(--verbose -v)"{--verbose,-v}"[show directory ranking and full paths]"
+    "(--push -p)"{--push,-p}"[change directory with 'pushd']"
+    "1::directory alias:->scd-alias-target"
+    "*:patterns:()"
+)
+
+_arguments -S -C $myargs && ret=0
+
+
+if [[ "$state" == scd-alias-target && -s ~/.scdalias.zsh ]]; then
+    local -a scdaliases
+    scdaliases=( )
+    eval "$(setopt extendedglob
+            phome="(#b)(#s)${HOME}(/*)#(#e)"
+            builtin hash -dr
+            source ~/.scdalias.zsh &&
+            for k v in ${(kv)nameddirs}; do
+                scdaliases+=( $k:${v/${~phome}/"~"${match[1]}} )
+            done
+            complete_unalias=${+opt_args[unalias---unalias]}
+            if (( complete_unalias && ! ${+nameddirs[OLD]} )); then
+                scdaliases+=( 'OLD:all aliases to non-existent paths' )
+            fi
+            typeset -p scdaliases )"
+    _describe -t scdaliases scdalias scdaliases
+fi
diff --git a/plugins/scd/scd b/plugins/scd/scd
old mode 100644
new mode 100755
index 39b28237d..a7db6c265
--- a/plugins/scd/scd
+++ b/plugins/scd/scd
@@ -1,29 +1,39 @@
 #!/bin/zsh -f
 
 emulate -L zsh
+
+local RUNNING_AS_COMMAND=
 local EXIT=return
 if [[ $(whence -w $0) == *:' 'command ]]; then
-    emulate -R zsh
-    local RUNNING_AS_COMMAND=1
+    RUNNING_AS_COMMAND=1
     EXIT=exit
 fi
 
 local DOC='scd -- smart change to a recently used directory
 usage: scd [options] [pattern1 pattern2 ...]
-Go to a directory path that contains all fixed string patterns.  Prefer
-recent or frequently visited directories as found in the directory index.
+Go to a directory path that matches all patterns.  Prefer recent or
+frequently visited directories as found in the directory index.
 Display a selection menu in case of multiple matches.
 
+Special patterns:
+  ^PAT      match at the path root, "^/home"
+  PAT$      match paths ending with PAT, "man$"
+  ./        match paths under the current directory
+  :PAT      require PAT to span the tail, ":doc", ":re/doc"
+
 Options:
-  -a, --add         add specified directories to the directory index.
+  -a, --add         add current or specified directories to the index.
   --unindex         remove current or specified directories from the index.
   -r, --recursive   apply options --add or --unindex recursively.
   --alias=ALIAS     create alias for the current or specified directory and
                     store it in ~/.scdalias.zsh.
   --unalias         remove ALIAS definition for the current or specified
                     directory from ~/.scdalias.zsh.
-  -A, --all         include all matching directories.  Disregard matching by
-                    directory alias and filtering of less likely paths.
+                    Use "OLD" to purge aliases to non-existent directories.
+  -A, --all         display all directories even those excluded by patterns
+                    in ~/.scdignore.  Disregard unique match for a directory
+                    alias and filtering of less likely paths.
+  -p, --push        use "pushd" to change to the target directory.
   --list            show matching directories and exit.
   -v, --verbose     display directory rank in the selection menu.
   -h, --help        display this message and exit.
@@ -36,18 +46,28 @@ local SCD_MEANLIFE=${SCD_MEANLIFE:-86400}
 local SCD_THRESHOLD=${SCD_THRESHOLD:-0.005}
 local SCD_SCRIPT=${RUNNING_AS_COMMAND:+$SCD_SCRIPT}
 local SCD_ALIAS=~/.scdalias.zsh
+local SCD_IGNORE=~/.scdignore
 
-local ICASE a d m p i maxrank threshold
+# Minimum logarithm of probability.  Avoids out of range warning in exp().
+local -r MINLOGPROB=-15
+
+# When false, use case-insensitive globbing to fix PWD capitalization.
+local PWDCASECORRECT=true
+if [[ ${OSTYPE} == darwin* ]]; then
+    PWDCASECORRECT=false
+fi
+
+local a d m p i maxrank threshold
 local opt_help opt_add opt_unindex opt_recursive opt_verbose
-local opt_alias opt_unalias opt_all opt_list
-local -A drank dalias
+local opt_alias opt_unalias opt_all opt_push opt_list
+local -A drank dalias scdignore
 local dmatching
 local last_directory
 
-setopt extendedhistory extendedglob noautonamedirs brace_ccl
+setopt extendedglob noautonamedirs brace_ccl
 
-# If SCD_SCRIPT is defined make sure the file exists and is empty.
-# This removes any previous old commands.
+# If SCD_SCRIPT is defined make sure that that file exists and is empty.
+# This removes any old previous commands from the SCD_SCRIPT file.
 [[ -n "$SCD_SCRIPT" ]] && [[ -s $SCD_SCRIPT || ! -f $SCD_SCRIPT ]] && (
     umask 077
     : >| $SCD_SCRIPT
@@ -56,13 +76,17 @@ setopt extendedhistory extendedglob noautonamedirs brace_ccl
 # process command line options
 zmodload -i zsh/zutil
 zmodload -i zsh/datetime
-zparseopts -D -- a=opt_add -add=opt_add -unindex=opt_unindex \
+zmodload -i zsh/parameter
+zparseopts -D -E -- a=opt_add -add=opt_add -unindex=opt_unindex \
     r=opt_recursive -recursive=opt_recursive \
     -alias:=opt_alias -unalias=opt_unalias \
-    A=opt_all -all=opt_all -list=opt_list \
+    A=opt_all -all=opt_all p=opt_push -push=opt_push -list=opt_list \
     v=opt_verbose -verbose=opt_verbose h=opt_help -help=opt_help \
     || $EXIT $?
 
+# remove the first instance of "--" from positional arguments
+argv[(i)--]=( )
+
 if [[ -n $opt_help ]]; then
     print $DOC
     $EXIT
@@ -71,6 +95,22 @@ fi
 # load directory aliases if they exist
 [[ -r $SCD_ALIAS ]] && source $SCD_ALIAS
 
+# load scd-ignore patterns if available
+if [[ -s $SCD_IGNORE ]]; then
+    setopt noglob
+    <$SCD_IGNORE \
+    while read p; do
+        [[ $p != [\#]* ]] || continue
+        [[ -n $p ]] || continue
+        # expand leading tilde if it has valid expansion
+        if [[ $p == [~]* ]] && ( : ${~p} ) 2>/dev/null; then
+            p=${~p}
+        fi
+        scdignore[$p]=1
+    done
+    setopt glob
+fi
+
 # Private internal functions are prefixed with _scd_Y19oug_.
 # Clean them up when the scd function returns.
 setopt localtraps
@@ -79,9 +119,17 @@ trap 'unfunction -m "_scd_Y19oug_*"' EXIT
 # works faster than the (:a) modifier and is compatible with zsh 4.2.6
 _scd_Y19oug_abspath() {
     set -A $1 ${(ps:\0:)"$(
-        unfunction -m "*"; shift
+        setopt pushdsilent
+        unfunction -m "*"
+        unalias -m "*"
+        unset CDPATH
+        shift
         for d; do
-            cd $d && print -Nr -- $PWD && cd $OLDPWD
+            pushd $d || continue
+            $PWDCASECORRECT &&
+                print -Nr -- $PWD ||
+                print -Nr -- (#i)$PWD
+            popd 2>/dev/null
         done
         )"}
 }
@@ -106,47 +154,76 @@ if [[ -n $opt_alias ]]; then
     $EXIT $?
 fi
 
-# undefine directory alias
+# undefine one or more directory aliases
 if [[ -n $opt_unalias ]]; then
-    if [[ -n $1 && ! -d $1 ]]; then
-        print -u2 "'$1' is not a directory."
-        $EXIT 1
+    local -U uu
+    local ec=0
+    uu=( ${*:-${PWD}} )
+    if (( ${uu[(I)OLD]} && ${+nameddirs[OLD]} == 0 )); then
+        uu=( ${uu:#OLD} ${(ps:\0:)"$(
+            hash -dr
+            if [[ -r $SCD_ALIAS ]]; then
+                source $SCD_ALIAS
+            fi
+            for a d in ${(kv)nameddirs}; do
+                [[ -d $d ]] || print -Nr -- $a
+            done
+            )"}
+        )
     fi
-    _scd_Y19oug_abspath a ${1:-$PWD}
-    a=$(print -rD ${a})
-    if [[ $a != [~][^/]## ]]; then
-        $EXIT
-    fi
-    a=${a#[~]}
-    # unalias in the current shell, update alias file if successful
-    if unhash -d -- $a 2>/dev/null && [[ -r $SCD_ALIAS ]]; then
+    m=( )
+    for p in $uu; do
+        d=$p
+        if [[ ${+nameddirs[$d]} == 0 && -d $d ]]; then
+            _scd_Y19oug_abspath d $d
+        fi
+        a=${(k)nameddirs[$d]:-${(k)nameddirs[(r)$d]}}
+        if [[ -z $a ]]; then
+            ec=1
+            print -u2 "'$p' is neither a directory alias nor an aliased path."
+            continue
+        fi
+        # unalias in the current shell and remember to update the alias file
+        if unhash -d -- $a 2>/dev/null; then
+            m+=( $a )
+        fi
+    done
+    if [[ $#m != 0 && -r $SCD_ALIAS ]]; then
         (
             umask 077
             hash -dr
             source $SCD_ALIAS
-            unhash -d -- $a 2>/dev/null &&
+            for a in $m; do
+                unhash -d -- $a 2>/dev/null
+            done
             hash -dL >| $SCD_ALIAS
-        )
+        ) || ec=$?
     fi
-    $EXIT $?
+    $EXIT $ec
 fi
 
-# The "compress" function collapses repeated directories to
-# one entry with a time stamp that gives equivalent-probability.
+# The "compress" function collapses repeated directories into
+# a single entry with a time-stamp yielding an equivalent probability.
 _scd_Y19oug_compress() {
-    awk -v epochseconds=$EPOCHSECONDS -v meanlife=$SCD_MEANLIFE '
-        BEGIN { FS = "[:;]"; }
-        length($0) < 4096 && $2 > 0 {
+    awk -v epochseconds=$EPOCHSECONDS \
+        -v meanlife=$SCD_MEANLIFE \
+        -v minlogprob=$MINLOGPROB \
+        '
+        BEGIN {
+            FS = "[:;]";
+            pmin = exp(minlogprob);
+        }
+        /^: deleted:0;/ { next; }
+        length($0) < 4096 && $2 > 1000 {
+            df = $0;
+            sub("^[^;]*;", "", df);
+            if (!df)  next;
             tau = 1.0 * ($2 - epochseconds) / meanlife;
-            if (tau < -6.9078)  tau = -6.9078;
-            prob = exp(tau);
-            sub(/^[^;]*;/, "");
-            if (NF)  {
-                dlist[last[$0]] = "";
-                dlist[NR] = $0;
-                last[$0] = NR;
-                ptot[$0] += prob;
-            }
+            prob = (tau < minlogprob) ? pmin : exp(tau);
+            dlist[last[df]] = "";
+            dlist[NR] = df;
+            last[df] = NR;
+            ptot[df] += prob;
         }
         END {
             for (i = 1; i <= NR; ++i) {
@@ -157,26 +234,38 @@ _scd_Y19oug_compress() {
                 }
             }
         }
-    ' $*
+        ' $*
 }
 
-# Rewrite directory index if it is at least 20% oversized
-if [[ -s $SCD_HISTFILE ]] && \
-(( $(wc -l <$SCD_HISTFILE) > 1.2 * $SCD_HISTSIZE )); then
-    # compress repeated entries
-    m=( ${(f)"$(_scd_Y19oug_compress $SCD_HISTFILE)"} )
-    # purge non-existent directories
-    m=( ${(f)"$(
-        for a in $m; do
-            if [[ -d ${a#*;} ]]; then print -r -- $a; fi
-        done
-        )"}
-    )
-    # cut old entries if still oversized
-    if [[ $#m -gt $SCD_HISTSIZE ]]; then
-        m=( ${m[-$SCD_HISTSIZE,-1]} )
-    fi
-    print -lr -- $m >| ${SCD_HISTFILE}
+# Rewrite directory index if it is at least 20% oversized.
+local curhistsize
+if [[ -z $opt_unindex && -s $SCD_HISTFILE ]] && \
+curhistsize=$(wc -l <$SCD_HISTFILE) && \
+(( $curhistsize > 1.2 * $SCD_HISTSIZE )); then
+    # Compress repeated entries in a background process.
+    (
+        m=( ${(f)"$(_scd_Y19oug_compress $SCD_HISTFILE)"} )
+        # purge non-existent and ignored directories
+        m=( ${(f)"$(
+            for a in $m; do
+                d=${a#*;}
+                [[ -z ${scdignore[(k)$d]} ]] || continue
+                [[ -d $d ]] || continue
+                $PWDCASECORRECT || d=( (#i)${d} )
+                t=${a%%;*}
+                print -r -- "${t};${d}"
+            done
+            )"}
+        )
+        # cut old entries if still oversized
+        if [[ $#m -gt $SCD_HISTSIZE ]]; then
+            m=( ${m[-$SCD_HISTSIZE,-1]} )
+        fi
+        # Checking existence of many directories could have taken a while.
+        # Append any index entries added in meantime.
+        m+=( ${(f)"$(sed "1,${curhistsize}d" $SCD_HISTFILE)"} )
+        print -lr -- $m >| ${SCD_HISTFILE}
+    ) &|
 fi
 
 # Determine the last recorded directory
@@ -197,13 +286,8 @@ _scd_Y19oug_record() {
 }
 
 if [[ -n $opt_add ]]; then
-    for d; do
-        if [[ ! -d $d ]]; then
-            print -u2 "Directory '$d' does not exist."
-            $EXIT 2
-        fi
-    done
-    _scd_Y19oug_abspath m ${*:-$PWD}
+    m=( ${^${argv:-$PWD}}(N-/) )
+    _scd_Y19oug_abspath m ${m}
     _scd_Y19oug_record $m
     if [[ -n $opt_recursive ]]; then
         for d in $m; do
@@ -220,6 +304,7 @@ if [[ -n $opt_unindex ]]; then
     if [[ ! -s $SCD_HISTFILE ]]; then
         $EXIT
     fi
+    argv=( ${argv:-$PWD} )
     # expand existing directories in the argument list
     for i in {1..$#}; do
         if [[ -d ${argv[i]} ]]; then
@@ -227,24 +312,28 @@ if [[ -n $opt_unindex ]]; then
             argv[i]=${d}
         fi
     done
+    # strip trailing slashes, but preserve the root path
+    argv=( ${argv/(#m)?\/##(#e)/${MATCH[1]}} )
     m="$(awk -v recursive=${opt_recursive} '
         BEGIN {
             for (i = 2; i < ARGC; ++i) {
                 argset[ARGV[i]] = 1;
                 delete ARGV[i];
             }
+            unindex_root = ("/" in argset);
         }
         1 {
             d = $0;  sub(/^[^;]*;/, "", d);
             if (d in argset)  next;
         }
         recursive {
+            if (unindex_root)  exit;
             for (a in argset) {
                 if (substr(d, 1, length(a) + 1) == a"/")  next;
             }
         }
         { print $0 }
-        ' $SCD_HISTFILE ${*:-$PWD} )" || $EXIT $?
+        ' $SCD_HISTFILE $* )" || $EXIT $?
     : >| ${SCD_HISTFILE}
     [[ ${#m} == 0 ]] || print -r -- $m >> ${SCD_HISTFILE}
     $EXIT
@@ -252,67 +341,113 @@ fi
 
 # The "action" function is called when there is just one target directory.
 _scd_Y19oug_action() {
-    cd $1 || return $?
+    local cdcmd=cd
+    [[ -z ${opt_push} ]] || cdcmd=pushd
+    builtin $cdcmd $1 || return $?
     if [[ -z $SCD_SCRIPT && -n $RUNNING_AS_COMMAND ]]; then
         print -u2 "Warning: running as command with SCD_SCRIPT undefined."
     fi
     if [[ -n $SCD_SCRIPT ]]; then
-        print -r "cd ${(q)1}" >| $SCD_SCRIPT
+        local d=$1
+        if [[ $OSTYPE == cygwin && ${(L)SCD_SCRIPT} == *.bat ]]; then
+            d=$(cygpath -aw .)
+        fi
+        print -r "${cdcmd} ${(qqq)d}" >| $SCD_SCRIPT
     fi
 }
 
-# Match and rank patterns to the index file
-# set global arrays dmatching and drank
+# Select and order indexed directories by matching command-line patterns.
+# Set global arrays dmatching and drank.
 _scd_Y19oug_match() {
     ## single argument that is an existing directory or directory alias
     if [[ -z $opt_all && $# == 1 ]] && \
-        [[ -d ${d::=$1} || -d ${d::=${nameddirs[$1]}} ]] && [[ -x $d ]];
+        [[ -d ${d::=${nameddirs[$1]}} || -d ${d::=$1} ]] && [[ -x $d ]];
     then
         _scd_Y19oug_abspath dmatching $d
         drank[${dmatching[1]}]=1
         return
     fi
 
-    # ignore case unless there is an argument with an uppercase letter
-    [[ "$*" == *[[:upper:]]* ]] || ICASE='(#i)'
-    # support "$" as an anchor for the directory name ending
+    # quote brackets when PWD is /Volumes/[C]/
+    local qpwd=${PWD//(#m)[][]/\\${MATCH}}
+
+    # support "./" as an alias for $PWD to match only subdirectories.
+    argv=( ${argv/(#s).\/(#e)/(#s)${qpwd}(|/*)(#e)} )
+
+    # support "./pat" as an alias for $PWD/pat.
+    argv=( ${argv/(#m)(#s).\/?*/(#s)${qpwd}${MATCH#.}} )
+
+    # support "^" as an anchor for the root directory, e.g., "^$HOME".
+    argv=( ${argv/(#m)(#s)\^?*/(#s)${${~MATCH[2,-1]}}} )
+
+    # support "$" as an anchor at the end of directory name.
     argv=( ${argv/(#m)?[$](#e)/${MATCH[1]}(#e)} )
 
-    # calculate rank of all directories in the SCD_HISTFILE and keep it as drank
-    # include a dummy entry for splitting of an empty string is buggy
+    # support prefix ":" to match over the tail component.
+    argv=( ${argv/(#m)(#s):?*/${MATCH[2,-1]}[^/]#(#e)} )
+
+    # calculate rank of all directories in SCD_HISTFILE and store it in drank.
+    # include a dummy entry to avoid issues with splitting an empty string.
     [[ -s $SCD_HISTFILE ]] && drank=( ${(f)"$(
         print -l /dev/null -10
         <$SCD_HISTFILE \
-        awk -v epochseconds=$EPOCHSECONDS -v meanlife=$SCD_MEANLIFE '
-            BEGIN { FS = "[:;]"; }
-            length($0) < 4096 && $2 > 0 {
-                tau = 1.0 * ($2 - epochseconds) / meanlife;
-                if (tau < -6.9078)  tau = -6.9078;
-                prob = exp(tau);
-                sub(/^[^;]*;/, "");
-                if (NF)  ptot[$0] += prob;
+        awk -v epochseconds=$EPOCHSECONDS \
+            -v meanlife=$SCD_MEANLIFE \
+            -v minlogprob=$MINLOGPROB \
+            '
+            BEGIN {
+                FS = "[:;]";
+                pmin = exp(minlogprob);
             }
-            END { for (di in ptot)  { print di; print ptot[di]; } }'
+            /^: deleted:0;/ {
+                df = $0;
+                sub("^[^;]*;", "", df);
+                delete ptot[df];
+                next;
+            }
+            length($0) < 4096 && $2 > 0 {
+                df = $0;
+                sub("^[^;]*;", "", df);
+                if (!df)  next;
+                dp = df;
+                while (!(dp in ptot)) {
+                    ptot[dp] = pmin;
+                    sub("//*[^/]*$", "", dp);
+                    if (!dp)  break;
+                }
+                if ($2 <= 1000)  next;
+                tau = 1.0 * ($2 - epochseconds) / meanlife;
+                prob = (tau < minlogprob) ? pmin : exp(tau);
+                ptot[df] += prob;
+            }
+            END { for (di in ptot)  { print di; print ptot[di]; } }
+            '
         )"}
     )
     unset "drank[/dev/null]"
 
     # filter drank to the entries that match all arguments
     for a; do
-        p=${ICASE}"*(${a})*"
+        p="(#l)*(${a})*"
         drank=( ${(kv)drank[(I)${~p}]} )
     done
-    # require at least one argument matches the directory name
-    p=${ICASE}"*(${(j:|:)argv})[^/]#"
+    # require that at least one argument matches in directory tail name.
+    p="(#l)*(${(j:|:)argv})[^/]#"
     drank=( ${(kv)drank[(I)${~p}]} )
 
+    # discard ignored directories
+    if [[ -z ${opt_all} ]]; then
+        for d in ${(k)drank}; do
+            [[ -z ${scdignore[(k)$d]} ]] || unset "drank[$d]"
+        done
+    fi
+
     # build a list of matching directories reverse-sorted by their probabilities
     dmatching=( ${(f)"$(
-        for d p in ${(kv)drank}; do
-            print -r -- "$p $d";
-        done | sort -grk1 | cut -d ' ' -f 2-
-        )"}
+        builtin printf "%s %s\n" ${(Oakv)drank} |
+        /usr/bin/sort -grk1 )"}
     )
+    dmatching=( ${dmatching#*[[:blank:]]} )
 
     # do not match $HOME or $PWD when run without arguments
     if [[ $# == 0 ]]; then
@@ -320,12 +455,20 @@ _scd_Y19oug_match() {
     fi
 
     # keep at most SCD_MENUSIZE of matching and valid directories
+    # mark up any deleted entries in the index
+    local -A isdeleted
     m=( )
+    isdeleted=( )
     for d in $dmatching; do
         [[ ${#m} == $SCD_MENUSIZE ]] && break
-        [[ -d $d && -x $d ]] && m+=$d
+        (( ${+isdeleted[$d]} == 0 )) || continue
+        [[ -d $d ]] || { isdeleted[$d]=1; continue }
+        [[ -x $d ]] && m+=$d
     done
     dmatching=( $m )
+    if [[ -n ${isdeleted} ]]; then
+        print -lr -- ": deleted:0;"${^${(k)isdeleted}} >> $SCD_HISTFILE
+    fi
 
     # find the maximum rank
     maxrank=0.0
@@ -343,7 +486,7 @@ _scd_Y19oug_match() {
 
 _scd_Y19oug_match $*
 
-## process whatever directories that remained
+## process matching directories.
 if [[ ${#dmatching} == 0 ]]; then
     print -u2 "No matching directory."
     $EXIT 1
@@ -367,13 +510,13 @@ if [[ -n $opt_list ]]; then
     $EXIT
 fi
 
-## process single directory match
+## handle a single matching directory here.
 if [[ ${#dmatching} == 1 ]]; then
     _scd_Y19oug_action $dmatching
     $EXIT $?
 fi
 
-## here we have multiple matches - display selection menu
+## Here we have multiple matches.  Let's use the selection menu.
 a=( {a-z} {A-Z} )
 a=( ${a[1,${#dmatching}]} )
 p=( )
diff --git a/plugins/scd/scd.plugin.zsh b/plugins/scd/scd.plugin.zsh
index 0197c53a1..1a6c18654 100644
--- a/plugins/scd/scd.plugin.zsh
+++ b/plugins/scd/scd.plugin.zsh
@@ -1,19 +1,17 @@
 ## The scd script should autoload as a shell function.
-autoload scd
+autoload -Uz scd
 
 
 ## If the scd function exists, define a change-directory-hook function
 ## to record visited directories in the scd index.
 if [[ ${+functions[scd]} == 1 ]]; then
-    scd_chpwd_hook() { scd --add $PWD }
-    autoload add-zsh-hook
-    add-zsh-hook chpwd scd_chpwd_hook
+    chpwd_scd() { scd --add $PWD }
+    autoload -Uz add-zsh-hook
+    add-zsh-hook chpwd chpwd_scd
 fi
 
 
-## Allow scd usage with unquoted wildcard characters such as "*" or "?".
-alias scd='noglob scd'
-
-
 ## Load the directory aliases created by scd if any.
-if [[ -s ~/.scdalias.zsh ]]; then source ~/.scdalias.zsh; fi
+if [[ -s ~/.scdalias.zsh ]]; then
+    source ~/.scdalias.zsh
+fi

From 4c9fc2634b3125e2b253de11b5208ccbfcfa8232 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Fri, 28 Aug 2020 23:50:05 +0200
Subject: [PATCH 074/869] vagrant-prompt: replace `grep -P` call with sed and
 clean up

Fixes #9207
---
 .../vagrant-prompt/vagrant-prompt.plugin.zsh  | 25 ++++++++-----------
 1 file changed, 10 insertions(+), 15 deletions(-)

diff --git a/plugins/vagrant-prompt/vagrant-prompt.plugin.zsh b/plugins/vagrant-prompt/vagrant-prompt.plugin.zsh
index 28bf31f91..d7c76c3c9 100644
--- a/plugins/vagrant-prompt/vagrant-prompt.plugin.zsh
+++ b/plugins/vagrant-prompt/vagrant-prompt.plugin.zsh
@@ -16,22 +16,17 @@
 # ZSH_THEME_VAGRANT_PROMPT_NOT_CREATED="%{$fg_no_bold[white]%}○"
 
 function vagrant_prompt_info() {
-  test -d .vagrant && test -f Vagrantfile
-  if [[ "$?" == "0" ]]; then
-    statuses=$(vagrant status 2> /dev/null | grep -P "\w+\s+[\w\s]+\s\(\w+\)")
-    statuses=("${(f)statuses}")
+  local vm_states vm_state
+  if [[ -d .vagrant && -f Vagrantfile ]]; then
+    vm_states=(${(f)"$(vagrant status 2> /dev/null | sed -nE 's/^.*(saved|poweroff|running|not created) \([[:alnum:]_]+\)$/\1/p')"})
     printf '%s' $ZSH_THEME_VAGRANT_PROMPT_PREFIX
-    for vm_details in $statuses; do
-      vm_state=$(echo $vm_details | grep -o -E "saved|poweroff|not created|running")
-      if [[ "$vm_state" == "running" ]]; then
-        printf '%s' $ZSH_THEME_VAGRANT_PROMPT_RUNNING
-      elif [[ "$vm_state" == "saved" ]]; then
-        printf '%s' $ZSH_THEME_VAGRANT_PROMPT_SUSPENDED
-      elif [[ "$vm_state" == "not created" ]]; then
-        printf '%s' $ZSH_THEME_VAGRANT_PROMPT_NOT_CREATED
-      elif [[ "$vm_state" == "poweroff" ]]; then
-        printf '%s' $ZSH_THEME_VAGRANT_PROMPT_POWEROFF
-      fi
+    for vm_state in $vm_states; do
+      case "$vm_state" in
+        saved) printf '%s' $ZSH_THEME_VAGRANT_PROMPT_SUSPENDED ;;
+        running) printf '%s' $ZSH_THEME_VAGRANT_PROMPT_RUNNING ;;
+        poweroff) printf '%s' $ZSH_THEME_VAGRANT_PROMPT_POWEROFF ;;
+        "not created") printf '%s' $ZSH_THEME_VAGRANT_PROMPT_NOT_CREATED ;;
+      esac
     done
     printf '%s' $ZSH_THEME_VAGRANT_PROMPT_SUFFIX
   fi

From 4ed6fd2b8b6a0efb2f84f00a64503282aca260e7 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Sat, 29 Aug 2020 00:27:06 +0200
Subject: [PATCH 075/869] pygmalion: use pure zsh instead of perl (#9210)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

My system doesn't have `perl` in $PATH, so using this theme clutters the
shell output quite a bit.

Turns out, the same thing can be accomplished in pure zsh (with
extendedglob).

Co-Authored-By: Marc Cornellà <marc.cornella@live.com>
---
 themes/pygmalion-virtualenv.zsh-theme | 10 +++++++---
 themes/pygmalion.zsh-theme            | 10 +++++++---
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/themes/pygmalion-virtualenv.zsh-theme b/themes/pygmalion-virtualenv.zsh-theme
index 605e3d10c..47b0b4fb1 100644
--- a/themes/pygmalion-virtualenv.zsh-theme
+++ b/themes/pygmalion-virtualenv.zsh-theme
@@ -17,6 +17,8 @@ function _virtualenv_prompt_info {
 }
 
 prompt_setup_pygmalion(){
+  setopt localoptions extendedglob
+
   ZSH_THEME_GIT_PROMPT_PREFIX="%{$reset_color%}%{$fg[green]%}"
   ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%} "
   ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[yellow]%}⚡%{$reset_color%}"
@@ -25,16 +27,18 @@ prompt_setup_pygmalion(){
   base_prompt='$(_virtualenv_prompt_info)%{$fg[magenta]%}%n%{$reset_color%}%{$fg[cyan]%}@%{$reset_color%}%{$fg[yellow]%}%m%{$reset_color%}%{$fg[red]%}:%{$reset_color%}%{$fg[cyan]%}%0~%{$reset_color%}%{$fg[red]%}|%{$reset_color%}'
   post_prompt='%{$fg[cyan]%}⇒%{$reset_color%}  '
 
-  base_prompt_nocolor=$(echo "$base_prompt" | perl -pe "s/%\{[^}]+\}//g")
-  post_prompt_nocolor=$(echo "$post_prompt" | perl -pe "s/%\{[^}]+\}//g")
+  base_prompt_nocolor=${base_prompt//\%\{[^\}]##\}}
+  post_prompt_nocolor=${post_prompt//\%\{[^\}]##\}}
 
   autoload -U add-zsh-hook
   add-zsh-hook precmd prompt_pygmalion_precmd
 }
 
 prompt_pygmalion_precmd(){
+  setopt localoptions extendedglob
+
   local gitinfo=$(git_prompt_info)
-  local gitinfo_nocolor=$(echo "$gitinfo" | perl -pe "s/%\{[^}]+\}//g")
+  local gitinfo_nocolor=${gitinfo//\%\{[^\}]##\}}
   local exp_nocolor="$(print -P \"$base_prompt_nocolor$gitinfo_nocolor$post_prompt_nocolor\")"
   local prompt_length=${#exp_nocolor}
 
diff --git a/themes/pygmalion.zsh-theme b/themes/pygmalion.zsh-theme
index bd58db5f6..b13adfd5f 100644
--- a/themes/pygmalion.zsh-theme
+++ b/themes/pygmalion.zsh-theme
@@ -1,6 +1,8 @@
 # Yay! High voltage and arrows!
 
 prompt_setup_pygmalion(){
+  setopt localoptions extendedglob
+
   ZSH_THEME_GIT_PROMPT_PREFIX="%{$reset_color%}%{$fg[green]%}"
   ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%} "
   ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[yellow]%}⚡%{$reset_color%}"
@@ -9,16 +11,18 @@ prompt_setup_pygmalion(){
   base_prompt='%{$fg[magenta]%}%n%{$reset_color%}%{$fg[cyan]%}@%{$reset_color%}%{$fg[yellow]%}%m%{$reset_color%}%{$fg[red]%}:%{$reset_color%}%{$fg[cyan]%}%0~%{$reset_color%}%{$fg[red]%}|%{$reset_color%}'
   post_prompt='%{$fg[cyan]%}⇒%{$reset_color%}  '
 
-  base_prompt_nocolor=$(echo "$base_prompt" | perl -pe "s/%\{[^}]+\}//g")
-  post_prompt_nocolor=$(echo "$post_prompt" | perl -pe "s/%\{[^}]+\}//g")
+  base_prompt_nocolor=${base_prompt//\%\{[^\}]##\}}
+  post_prompt_nocolor=${post_prompt//\%\{[^\}]##\}}
 
   autoload -U add-zsh-hook
   add-zsh-hook precmd prompt_pygmalion_precmd
 }
 
 prompt_pygmalion_precmd(){
+  setopt localoptions extendedglob
+
   local gitinfo=$(git_prompt_info)
-  local gitinfo_nocolor=$(echo "$gitinfo" | perl -pe "s/%\{[^}]+\}//g")
+  local gitinfo_nocolor=${gitinfo//\%\{[^\}]##\}}
   local exp_nocolor="$(print -P \"$base_prompt_nocolor$gitinfo_nocolor$post_prompt_nocolor\")"
   local prompt_length=${#exp_nocolor}
 

From 0dc83fe49fa1f645c64fe7dbdb94914093b90aff Mon Sep 17 00:00:00 2001
From: Daniel Dugovic <dandydand@gmail.com>
Date: Tue, 1 Sep 2020 04:41:06 -0500
Subject: [PATCH 076/869] chuck-norris: remove some CN quotes and fix
 formatting (#9220)

---
 plugins/chucknorris/fortunes/chucknorris | 286 +++++++++--------------
 1 file changed, 105 insertions(+), 181 deletions(-)

diff --git a/plugins/chucknorris/fortunes/chucknorris b/plugins/chucknorris/fortunes/chucknorris
index 1f4ca7a60..0eb6e2e99 100644
--- a/plugins/chucknorris/fortunes/chucknorris
+++ b/plugins/chucknorris/fortunes/chucknorris
@@ -20,7 +20,7 @@ Aliens fear that Chuck Norris might abduct them.
 %
 An angry glare from Chuck Norris is known to kill on the spot.
 %
-Behind every successful man is Chuck Norris
+Behind every successful man is Chuck Norris.
 %
 Beware of dogs... Dogs, beware of Chuck Norris.
 %
@@ -34,25 +34,25 @@ Chuck Norris - the new standard.
 %
 Chuck Norris CAN balance the light-switch between ON and OFF.
 %
-Chuck Norris CAN believe it's not butter
+Chuck Norris CAN believe it's not butter.
 %
 Chuck Norris CAN spell with an I before E even after C.
 %
-Chuck Norris Can Play the Theme from the Twilight Zone with His Beard
+Chuck Norris can play the theme from the Twilight Zone with his beard.
 %
-Chuck Norris Can Power Solar Panels. At Night.
+Chuck Norris can power solar panels. At night.
 %
-Chuck Norris Watches "the Nat.Geo. Specials" on Discovery Channel
+Chuck Norris watches "the Nat.Geo. Specials" on Discovery Channel.
 %
-Chuck Norris bowled a 301 after constructing another pin out of his beard hair
+Chuck Norris bowled a 301 after constructing another pin out of his beard hair.
 %
 Chuck Norris burnt a fire proof vest, UNDERWATER!
 %
 Chuck Norris can French kiss his elbow.
 %
-Chuck Norris can bake in a Freezer.
+Chuck Norris can bake in a freezer.
 %
-Chuck Norris can defuse bomb even if he cut the wrong wire
+Chuck Norris can defuse a bomb by cutting the wrong wire.
 %
 Chuck Norris can dig a hole in air.
 %
@@ -60,19 +60,19 @@ Chuck Norris can divide by zero.
 %
 Chuck Norris can do a regime change with a roundhouse kick.
 %
-Chuck Norris can fit 10 gallons of water in a 5 gallon water bucket
+Chuck Norris can fit 10 gallons of water in a 5 gallon bucket.
 %
-Chuck Norris can grill a popsicle
+Chuck Norris can grill a popsicle.
 %
 Chuck Norris can lead a horse to water AND make it drink.
 %
-Chuck Norris can make his own megazord "The Chuck Norris Roundhouse Kickers Ultimate Super Awesome Megazord"
+Chuck Norris can make his own megazord "The Chuck Norris Roundhouse Kickers Ultimate Super Awesome Megazord".
 %
-Chuck Norris can milk an alligator
+Chuck Norris can milk an alligator.
 %
 Chuck Norris can play the death waltz with his chin.
 %
-Chuck Norris can roundhouse kick someone through a window without breaking the glass
+Chuck Norris can roundhouse kick someone through a window without breaking the glass.
 %
 Chuck Norris can roundhouse-kick round houses into squares.
 %
@@ -80,36 +80,30 @@ Chuck Norris can rub two fires together and make a stick!
 %
 Chuck Norris can see in 3D with just one eye.
 %
-Chuck Norris can shoot a person 28 times with an unloaded gun.
-%
 Chuck Norris can slam a revolving door.
 %
 Chuck Norris can terminate a repeating decimal.
 %
-Chuck Norris can turn toast back into bread
+Chuck Norris can turn toast back into bread.
 %
 Chuck Norris can win a game of Connect Four in only three moves.
 %
-Chuck Norris can win in a top spinning tournament with a cube
+Chuck Norris can win in a top spinning tournament with a cube.
 %
-Chuck Norris can't get fired by Donald Trump
-%
-Chuck Norris can't perform Hadoukens, he IS a Hadouken
+Chuck Norris can't perform Hadoukens, he IS a Hadouken.
 %
 Chuck Norris checks under his bed for Fedor Emelianenko because he takes Fedor to the vet regularly.
 %
 Chuck Norris counted to infinity - twice.
 %
-Chuck Norris created Heavy Metal when he was upset
+Chuck Norris created Heavy Metal when he was upset.
 %
 Chuck Norris does not get frostbite. Chuck Norris bites frost.
 %
-Chuck Norris does not have a cell phone because he hears everything
+Chuck Norris does not have a cell phone because he hears everything.
 %
 Chuck Norris does not sleep. He waits.
 %
-Chuck Norris does not teabag the ladies. He potato-sacks them.
-%
 Chuck Norris doesn't bowl strikes, he just knocks down one pin and the other nine faint.
 %
 Chuck Norris doesn't call the wrong number, you just answer the wrong phone.
@@ -118,39 +112,31 @@ Chuck Norris doesn't cheat death, he beats it fair and square.
 %
 Chuck Norris doesn't churn butter. He roundhouse kicks the cows and the butter comes straight out.
 %
-Chuck Norris doesn't eat, he just sucks the energy out of food by staring at it
+Chuck Norris doesn't eat, he just sucks the energy out of food by staring at it.
 %
 Chuck Norris doesn't exhale. The air runs desperately scared out of his lungs.
 %
-Chuck Norris doesn't fight.  He gives motivational seminars to die on their own to avoid a roundhouse kick to the face.
-%
 Chuck Norris doesn't go hunting.... CHUCK NORRIS GOES KILLING.
 %
 Chuck Norris doesn't let it go.
 %
-Chuck Norris doesn't like Mudkipz
+Chuck Norris doesn't like Mudkipz.
 %
 Chuck Norris doesn't look for fun. The fun looks for Chuck Norris.
 %
-Chuck Norris doesn't need a bulletproof vest to be bulletproof
-%
 Chuck Norris doesn't need a bulletproof vest. He catches them with his bare hands.
 %
-Chuck Norris doesn't need air, he is air
+Chuck Norris doesn't need air, he is air.
 %
-Chuck Norris doesn't need sunglasses, the sun needs Chuck Norris glasses
+Chuck Norris doesn't need sunglasses, the sun needs Chuck Norris glasses.
 %
 Chuck Norris doesn't need to brush his teeth, his spit acts as a bleach.
 %
 Chuck Norris doesn't read books. He stares them down until he gets the information he wants.
 %
-Chuck Norris doesn't read. He just stares at the book until he gets the information he wants.
-%
 Chuck Norris doesn't throw up if he drinks too much. Chuck Norris throws down!
 %
-Chuck Norris doesn't brew up tea. He sucks the bag.
-%
-Chuck Norris doesn't eat salad, he eats vegetarians
+Chuck Norris doesn't eat salad, he eats vegetarians.
 %
 Chuck Norris doesn't wash his clothes, he disembowels them.
 %
@@ -162,26 +148,22 @@ Chuck Norris drives an ice cream truck covered in human skulls.
 %
 Chuck Norris drowned a man ON LAND.
 %
-Chuck Norris fed the Hunger Games
+Chuck Norris fed the Hunger Games.
 %
 Chuck Norris found the hay in the needle stack.
 %
-Chuck Norris found the last digit of pie
+Chuck Norris found the last digit of pi.
 %
-Chuck Norris had a knife thrown at him............          the knife didn't impale him, he impaled the knife
+Chuck Norris had a knife thrown at him. The knife didn't impale him; he impaled the knife.
 %
 Chuck Norris has a battle cruiser AND a car.
 %
-Chuck Norris has killed the Dead Sea
+Chuck Norris has killed the Dead Sea.
 %
-Chuck Norris has made a 148 break a snooker.
-%
-Chuck Norris has two speeds. Walk, and Kill.
+Chuck Norris has made a 148 break at snooker.
 %
 Chuck Norris invented Kentucky Fried Chicken's famous secret recipe, with eleven herbs and spices. But nobody ever mentions the twelfth ingredient: Fear.
 %
-Chuck Norris is Chuck Norris
-%
 Chuck Norris is allowed two carry-ons.
 %
 Chuck Norris is currently suing NBC, claiming Law and Order are trademarked names for his left and right legs.
@@ -192,13 +174,11 @@ Chuck Norris is entitled to his own facts.
 %
 Chuck Norris is my Homeboy.
 %
-Chuck Norris is overra...
-%
 Chuck Norris is so fast, he can run around the world and punch himself in the back of the head.
 %
 Chuck Norris is so hard, he uses diamonds as stress balls.
 %
-Chuck Norris is so scary he makes Sharks swim backwards away from him
+Chuck Norris is so scary, he makes sharks swim backwards away from him.
 %
 Chuck Norris is ten feet tall, weighs two-tons, breathes fire, and could eat a hammer and take a shotgun blast standing.
 %
@@ -212,101 +192,81 @@ Chuck Norris is the only man to ever defeat a brick wall in a game of tennis.
 %
 Chuck Norris is the only one who can tear a facebook page!
 %
-Chuck Norris is the reason that the world will end in 2012. He was getting bored with the Earth
+Chuck Norris is the reason that the world will end in 2012. He was getting bored with the Earth.
 %
-Chuck Norris is the reason tumbleweeds tumble
+Chuck Norris is the reason tumbleweeds tumble.
 %
 Chuck Norris is the reason why Waldo is hiding.
 %
 Chuck Norris is waiting for Mt. St. Helens to erupt again. He's hoping the lava is hot enough to soften his beard so he can shave for the first time.
 %
-Chuck Norris isn't allowed at the zoo because when he's there the animals are terriefied to come out their cages
-%
-Chuck Norris isn't appropriate...appropriate isn't Chuck Norris
-%
-Chuck Norris killed Kemper
-%
-Chuck Norris likes everyone on the earth, cause everyone he didn't like... Is dead...
+Chuck Norris isn't allowed at the zoo, because when he's there the animals are too terrified to come out of their cages.
 %
 Chuck Norris made a statue bleed.
 %
-Chuck Norris made the big bang just by clicking his fingers
+Chuck Norris made the big bang just by clicking his fingers.
 %
 Chuck Norris never trains, because he's Chuck Norris.
 %
-Chuck Norris once asked a man to turn down his music, he refused, that man's baby was born deaf.
-%
 Chuck Norris once cried just to see what it was like. The end result was the creation of life.
 %
 Chuck Norris once cut a knife with a stick of butter.
 %
-Chuck Norris once got a 200 yard punt return
+Chuck Norris once got a 200 yard punt return.
 %
-Chuck Norris once had a pet monkey........his name was KING KONG
+Chuck Norris once had a pet monkey named KING KONG.
 %
-Chuck Norris once had a street named after him. But the name removed at once, because nobody crosses Chuck Norris, and lives
+Chuck Norris once had a street named after him. The name removed at once, because nobody crosses Chuck Norris, and lives.
 %
 Chuck Norris once had a weak moment, just to know what it felt like.
 %
-Chuck Norris once played Duck Duck Goose with a group of Kindergarteners. Only one kid made it to first grade
+Chuck Norris once played Duck Duck Goose with a group of Kindergarteners. Only one kid made it to first grade.
 %
 Chuck Norris once proved p^~p by induction on his beard hairs.
 %
-Chuck Norris once punched the ground to stop an earthquake. The resulting aftershock caused the BP oil spill
+Chuck Norris once punched the ground to stop an earthquake. The resulting aftershock caused the BP oil spill.
 %
 Chuck Norris once round-house kicked a salesman. Over the phone.
 %
-Chuck Norris once roundhouse kicked someone so hard that his foot broke the speed of light, went back in time, and killed Amelia Earhart while she was flying over the Pacific Ocean.
-%
-Chuck Norris once rounhouse kicked a football ...... it is now considered as a planet
-%
-Chuck Norris once taught a class of martial arts.Unfortunately Chuck had forgiven to take elephant tranquilizers and killed every one just by saluting
+Chuck Norris once rounhouse kicked a football. The astronomical society now considers it a planet.
 %
 Chuck Norris once thought he was wrong. He was, however, mistaken.
 %
-Chuck Norris once tried to teach a fat, stupid kid Martial Arts. Unsuccessfully. The kid grew up to be Steven Seagal.
-%
 Chuck Norris once walked down a street with his fists in his pockets. He was then arrested for concealing two deadly weapons.
 %
-Chuck Norris once won the tour de france riding a " big wheel"
+Chuck Norris once won the Tour de France riding a "big wheel".
 %
 Chuck Norris originally appeared in the "Street Fighter II" video game, but was removed by Beta Testers because every button caused him to do a roundhouse kick. When asked bout this "glitch," Norris replied, "That's no glitch."
 %
 Chuck Norris owns all number 1 pencils.
 %
-Chuck Norris pees Adamantium
+Chuck Norris pees Adamantium.
 %
-Chuck Norris play's Texas hold em with Zeus, every second Wednesday of the month
+Chuck Norris plays Texas Hold'Em with Zeus, every second Wednesday of the month.
 %
 Chuck Norris played "Got your Nose" with Voldemort and won.
 %
-Chuck Norris played the game of thrones and won
+Chuck Norris played the game of thrones and won.
 %
-Chuck Norris protects his body guards.
+Chuck Norris protects his bodyguards.
 %
 Chuck Norris rolled a 20 on a 6 sided die.
 %
 Chuck Norris roundhouse kicks people in the face first and asks questions later.
 %
-Chuck Norris sent a BBM to an iphone.
+Chuck Norris sent a BBM to an iPhone.
 %
-Chuck Norris shops at Sam's Club, but leaves without having his receipt checked
+Chuck Norris shops at Sam's Club, but leaves without having his receipt checked.
 %
-Chuck Norris shot a man with a knife
-%
-Chuck Norris sleeps in Seattle.
-%
-Chuck Norris splattered tiger blood and Adonis' dna on Charlie Sheen with 1 roundhouse kick!
+Chuck Norris splattered tiger blood and Adonis' DNA on Charlie Sheen with 1 roundhouse kick!
 %
 Chuck Norris started Chuck Norris.
 %
-Chuck Norris starts his day with 6 live chickens two cows, three pigs and a boiling hot cup of pure fury
-%
-Chuck Norris thretened to kill Michael Jackson, MJ got so scared to turned white.
+Chuck Norris starts his day with 6 live chickens, two cows, three pigs, and a boiling hot cup of pure fury.
 %
 Chuck Norris told me to put this here.
 %
-Chuck Norris uses a real mouse to move the cursor, type on the keyboard, write e-mails, code entire websites, use photoshop, bring coffee.
+Chuck Norris uses a real mouse to move the cursor, type on the keyboard, write e-mails, code entire websites, and make coffee.
 %
 Chuck Norris uses pepper spray to spice up his steaks.
 %
@@ -322,21 +282,21 @@ Chuck Norris was the reason why the Great Wall of China was constructed. It fail
 %
 Chuck Norris was what Willis was talking about.
 %
-Chuck Norris wasn't born on his birthday
+Chuck Norris wasn't born on his birthday.
 %
-Chuck Norris watched the first steps on the moon... From his summer home on Mars
+Chuck Norris watched the first steps on the moon... from his summer home on Mars.
 %
-Chuck Norris went up the creek without a paddle... or a canoe
+Chuck Norris went up the creek without a paddle... or a canoe.
 %
 Chuck Norris will attain statehood in 2009. His state flower will be the Magnolia.
 %
 Chuck Norris wins NASCAR races with all right turns.
 %
-Chuck Norris won a stepdance contest by standing on his hands
+Chuck Norris won a stepdance contest by standing on his hands.
 %
-Chuck Norris yells at Drill Sergeants
+Chuck Norris yells at drill Sergeants.
 %
-Chuck Norris' dog pick up after him.
+Chuck Norris' dog picks up after him.
 %
 Chuck Norris' films are factual documentaries.
 %
@@ -346,55 +306,47 @@ Chuck Norris' glass is never half full or half empty. It stays full even after h
 %
 Chuck Norris' hand is the only hand that can beat a Royal Flush.
 %
-Chuck Norris' personal airplane is called Air Force Chuck
+Chuck Norris' personal airplane is called Air Force Chuck.
 %
 Chuck Norris. Enough said.
 %
-Chuck Norris: even Naruto can't believe it
+Chuck Norris: even Naruto can't believe it.
 %
-Chunk Norris can make sour milk turn fresh
+Chunk Norris can make sour milk turn fresh.
 %
-Contrary to popular beleif, Rome WAS built in a day, by Chuck Norris.
+Contrary to popular belief, Rome WAS built in a day, by Chuck Norris.
 %
 Contrary to popular belief, America is not a democracy, it is a Chucktatorship.
 %
-Contrary to popular belief, Chuck Norris, not the box jellyfish of northern Australia, is the most venomous creature on earth.
+Contrary to popular belief, Chuck Norris, not the box jellyfish of northern Australia, is the most venomous creature on Earth.
 %
-Cops don't need a badges in their wallets but only a picture of Chuck Norris.
+Cops don't need badges in their wallets, but only a picture of Chuck Norris.
 %
 Crop circles are Chuck Norris' way of telling the world that sometimes corn needs to lie down.
 %
-Dead bodies were found of people that are still alive. These people will cross Chuck Norris in the future and will be round-house kicked back in time.
-%
-Did you here about the boy who cried Chuck Norris?
-%
-Do you know why Chuck Norris didn't star in The Expandebles? Because all the others guys would have surrended at the beginning.
+Did you hear about the boy who cried Chuck Norris?
 %
 Dog the Bounty Hunter can't track Chuck Norris down.
 %
-Don't get Chuck Norris angry, last time somebody did that Chuck Norris made the Grand Canyon.
-%
-During the Civil War Chuck Norris was a slave, his master would often beg him for mercy
+Don't get Chuck Norris angry. Last time somebody did that, Chuck Norris made the Grand Canyon.
 %
 Earth's rotation is purely governed by the direction that Chuck Norris is walking.
 %
-Ever wonder what really happened to the dinosaurs? They all dug their own graves when they heard Chuck Norris was coming
+Ever wonder what really happened to the dinosaurs? They all dug their own graves when they heard Chuck Norris was coming.
 %
-Every line in a Chuck Norris haiku is "A roundhouse kick to the face."  And they all have the correct number of syllables.
+Every line in a Chuck Norris haiku is "A roundhouse kick to the face." And they all have the correct number of syllables.
 %
-Every phobia known to man has a phobia of Chuck Norris
+Every phobia known to man has a phobia of Chuck Norris.
 %
 Every time there's an earthquake, you know Chuck Norris is hungry. The earthquake is caused by his stomach growling.
 %
-Everyone is so scared of Chuck Norris that they kiss his arse by writing these facts, too right they should
-%
 Evolution's driving mechanism is nature's desperate attempt to escape Chuck Norris.
 %
-Fear of spiders is aracnaphobia, fear of tight spaces is chlaustraphobia, fear of Chuck Norris is called Logic
+Fear of spiders is arachnaphobia. Fear of tight spaces is claustrophobia. Fear of Chuck Norris is called Logic.
 %
 Fool me once, shame on you. Fool Chuck Norris once and he will roundhouse you in the face.
 %
-Ghosts can see Chuck Norris
+Ghosts can see Chuck Norris.
 %
 Guns don't kill people. Chuck Norris kills people.
 %
@@ -404,55 +356,47 @@ If Chuck Norris were a calendar, every month would be named Chucktober, and ever
 %
 If Chuck Norris were to get into a fight with another Chuck Norris, Chuck Norris would win.
 %
-If Chuck was ever captured, he could win a game of Russian Roulette with six bullets in the revolver, he would shoot everyone else!
+If God doesn't know, Chuck does.
 %
-If God doesn't know, Chuck does
-%
-If Goliath listened to Chuck Norris he would have won.
+If Goliath listened to Chuck Norris, he would have won.
 %
 If at first you don't succeed, you're not Chuck Norris.
 %
 If you ask Chuck Norris what time it is, he always says, "Two seconds 'til." After you ask, "Two seconds 'til what?" he roundhouse kicks you in the face.
 %
-If you put in the correct cheat code in Halo 2, you can have Master Cheif play without his helmet; revealing to be Chuck Norris.
+If you put in the correct cheat code in Halo 2, you can have Master Chief play without his helmet, revealing himself to be Chuck Norris.
 %
 If you see a man in the street who looks like Chuck Norris, but isn't, run: you don't want to be caught in the resulting roundhouse kick to his face.
 %
 If you spell Chuck Norris in Scrabble, you win. Forever.
 %
-In 1945 The US army asked if they could clone Chuck Norris. instead he said he could sort out the Japanese.
+In 1945 The US army asked if they could clone Chuck Norris. Instead he said he could sort out the Japanese.
 %
-In Texas, there are five sizes for fountain drinks: small, medium, large, Texas sized, and Chuck Norris Sized.  It is a cup made of a human skull.
+In Texas, there are five sizes for fountain drinks: small, medium, large, Texas sized, and Chuck Norris sized.  It is a cup made of a human skull.
 %
 In a rain storm Chuck Norris stays dry. Rain drops are scared to hit him.
 %
-In fine print on the last page of the Guinness Book of World Records it notes that all world records are held by Chuck Norris, and those listed in the book are simply the closest anyone else has ever gotten.
-%
 In the back of the book of world records, it says "All records are held by Chuck Norris. The ones listed are in second place."
 %
 James Bond has a license to kill. He got it from Chuck Norris.
 %
-Jedis are now taught to use the "Chuck"
+Jedis are now taught to use the "Chuck".
 %
 MacGyver immediately tried to make a bomb out of some Q-Tips and Gatorade, but Chuck Norris roundhouse-kicked him in the solar plexus. MacGyver promptly threw up his own heart.
 %
 Machiavelli said it is better to be feared than loved because he was inspired by Chuck Norris.
 %
-May the Force be with Chuck Norris... for it's own good.
+May the Force be with Chuck Norris... for its own good.
 %
 Merlin was Chuck Norris' assistant.
 %
-More of a question than a fact: in a fight between Chuck Norris and Gordan Freeman who would win?
-%
 Most people have 23 pairs of chromosomes. Chuck Norris has 72... and they're all poisonous.
 %
-Note to everyone: Please do not give beans to Chuck Norris or do you want another atombomb on hiroshima?
+Note to self: Don't be the cashier to tell Chuck Norris his coupons have expired.
 %
-Note to self:  Don't be the cashier to tell Chuck Norris his coupons have expired.
+Chuck Norris' keyboard has no control key. Chuck Norris is always in control.
 %
-On the keyboard there is no control button because Chuck Norris is always in control.
-%
-Once upon a time, Chuck Norris found himself in a town called Shit Creek.....He opened a Paddle Store.
+Once upon a time, Chuck Norris found himself in a town called Shit Creek. He opened a Paddle Store.
 %
 One glance from Chuck Norris and snow turns itself yellow.
 %
@@ -472,11 +416,9 @@ Police label anyone attacking Chuck Norris as a Code 45-11.... a suicide.
 %
 Remember the Soviet Union? They decided to quit after watching a DeltaForce marathon on Satellite TV.
 %
-Simon doesn't say...Chuck Norris says.
+Simon doesn't say... Chuck Norris says.
 %
-Since 1940, the year Chuck Norris was born, roundhouse-kick related deaths have increased 13,000 percent.?
-%
-Some boots were made for walking. Some boots may walk all over you, but Chuck Norris' boot walk THROUGH you.
+Some boots were made for walking. Some boots may walk all over you, but Chuck Norris' boots walk THROUGH you.
 %
 Some kids pee their name in snow. Chuck Norris pees his name in concrete.
 %
@@ -486,9 +428,9 @@ Someone once videotaped Chuck Norris getting pissed off. It was called Walker: T
 %
 Staring at Chuck Norris for extended periods of time without proper eye protection will cause blindess, and possibly foot sized brusies on the face.
 %
-Taking Karate Lessons = $100, Buying MMA DVD's= $150, Subscribing to a UFC event = $50, Getting a Roundhouse Kick from Chuck Norris = PRICELESS
+Taking Karate Lessons = $100, Buying MMA DVD's = $150, Subscribing to a UFC event = $50, Getting a Roundhouse Kick from Chuck Norris = PRICELESS.
 %
-That's not an eclipse....that's the sun hiding from Chuck Norris.
+That's not an eclipse. That's the sun hiding from Chuck Norris.
 %
 The Beatles are on iTunes because Chuck Norris bought a Mac.
 %
@@ -498,29 +440,25 @@ The Earth was almost destroyed by a 50 km wide asteroid in 1984, but Chuck Norri
 %
 The Great Wall of China was originally created to keep Chuck Norris out. It failed miserably.
 %
-The Jone's are trying to keep up with Chuck Norris
+The Joneses are trying to keep up with Chuck Norris.
 %
-The Matrix Trilogy would have ended on the first movie if Keanu Reeves said, “I know Chuck Norris.”
+The Matrix Trilogy would have ended on the first movie had Keanu Reeves said, “I know Chuck Norris.”
 %
-The answer to life, the universe and everything isnt 42. It's Chuck Norris.
+The answer to life, the universe and everything isn't 42. It's Chuck Norris.
 %
-The apple falls far from the tree, when a roundhouse kick is taken to the trunk.
+The apple falls far from the tree, when Chuck's roundhouse kick is taken to the trunk.
 %
-The best part of waking up is not Folgers in your cup, it's knowing that Chuck Norris let you live.
+The best part of waking up is not Folgers in your cup. it's knowing that Chuck Norris let you live.
 %
-The chief export of Chuck Norris is Pain.
+The chief export of Chuck Norris is pain.
 %
 The dictionary references Chuck Norris several times, he is metioned under Fear, Law, Order and Chucktatorship.
 %
-The kids said when Chuck was eating Trix cereal ´´silly Chuck, Trix are for kids´´...what happened next?..............................Darfur happened.
-%
 The leading causes of death in the United States are: 1. Heart Disease 2. Chuck Norris 3. Cancer.
 %
 The letters in Chuck Norris cannot be unscrambled.
 %
-The meaning of life is Chuck Norris
-%
-The only place where the Starship Enterprise refuses to boldly go is Chuck Norris' planet...which is all of them.
+The only place where the Starship Enterprise refuses to boldly go is Chuck Norris' planet... which is all of them.
 %
 The only reason that USA lost the 2011 world cup to Japan is because Chuck Norris wasn't there.
 %
@@ -528,21 +466,19 @@ The only sure things are Death and Taxes, and when Chuck Norris goes to work for
 %
 The only way sharks will come near CN underwater is when CN is inside of a cage.
 %
-The only word that rhymes with orange is Chuck Norris
-%
-The planes in 9/11 were not hijacked. Chuck Norris was just playing with his old radio controller.
+The only word that rhymes with orange is Chuck Norris.
 %
 The producers of the movie "The Last Airbender" are now in talks with Chuck Norris in Order to star him in their next sequal "The Last Skull Bender".
 %
 The quickest way to a man's heart is with Chuck Norris' fist.
 %
-The reason why batman only comes out at night is because he's afraid he might encounter Chuck Norris in the Morning and afternoon.
+The reason why Batman only comes out at night is because he's afraid he might encounter Chuck Norris in the morning and afternoon.
 %
-The red phone in the oval office...Rings directly to Chuck Norris Cell Phone
+The red phone in the oval office rings directly to Chuck Norris' cell phone.
 %
 The show Survivor had the original premise of putting people on an island with Chuck Norris. There were no survivors, and nobody is brave enough to go to the island to retrieve the footage.
 %
-The square root of Chuck Norris is pain.  Do not try to square Chuck Norris.  The result is death
+The square root of Chuck Norris is pain.  Do not try to square Chuck Norris. The result is death.
 %
 The sun only rises every morning because Chuck Norris allows it to.
 %
@@ -550,25 +486,17 @@ The truth hurts, doesn't it? Chuck Norris' truth kills.
 %
 There is no chin behind Chuck Norris' beard. There is only another fist.
 %
-There is no chin behind Chuck Norris' beard. There is only another fist.
-%
-There is no limbo, only a world that doesn't know of Chuck Norris
-%
-There is no such thing as being hard its called the Chuck Norris factor.
+There is no limbo, only a world that doesn't know of Chuck Norris.
 %
 There is no such thing as global warming. Chuck Norris was cold, so he turned the sun up.
 %
-There is no theory of evolution. Just a list of animals Chuck Norris allows to live.
-%
-There is no theory of evolution. Just a list of creatures Chuck Norris has allowed to live.
-%
-They say death by a 1000 lashes was the most painful way to die, that was before they got roundhouse kicked in the face by Chuck Norris
+There is no theory of evolution, just a list of creatures Chuck Norris has allowed to live.
 %
 This one time at band camp... BAM! Chuck Norris.
 %
 Those who ignore history, are doomed by Chuck Norris.
 %
-Trick me once, shame on you, trick Chuck Norris.....rest in peace.
+Trick me once, shame on you, trick Chuck Norris.. rest in peace.
 %
 Unlike Jack Bauer, Chuck Norris doesn't need bullets. A quick roundhouse to the face kills twice as fast.
 %
@@ -580,7 +508,7 @@ Whatever Chuck Norris wants, it will instantly appear.
 %
 When Betty White gets angry, she turns into the Hulk. When Valerie Bertinelli gets mad, she turns into Chuck Norris.
 %
-When Chuck Norris creates a login, it tells him "password not strong enough", he types in his name and it tells him "password too strong."
+When Chuck Norris creates a login, it tells him "password not strong enough." He types in his name and it tells him "password too strong."
 %
 When Chuck Norris does a pushup, he isn't lifting himself up, he's pushing the Earth down.
 %
@@ -590,7 +518,7 @@ When Chuck Norris goes to Vegas, he doesn't have to gamble. The casinos just giv
 %
 When Chuck Norris goes to rodeos, bulls ride him.
 %
-When Chuck Norris goes to the library, he looks for the guinness book of records in the comedy section.
+When Chuck Norris goes to the library, he looks for the Guinness book of records in the comedy section.
 %
 When Chuck Norris inhales helium, his voice doesn't change.
 %
@@ -600,36 +528,32 @@ When Chuck Norris played the card game War with a friend, France surrendered.
 %
 When Chuck Norris pokes the Pillsbury Doughboy, it's not a laughing matter.
 %
-When Chuck Norris roundhouse-kicks you HE decides when you will feel the impact .
+When Chuck Norris roundhouse-kicks you, he decides when you will feel the impact.
 %
 When Chuck Norris sends in his taxes, he sends blank forms and includes only a picture of himself, crouched and ready to attack. Chuck Norris has not had to pay taxes, ever.
 %
-When Chuck Norris tosses a coin, it lands on both head and tail.
+When Chuck Norris tosses a coin, it lands on both heads and tails.
 %
-When God said "Let there be light!", Chuck Norris said "Only for half the day
+When God said "Let there be light!", Chuck Norris said "Only for half the day."
 %
-When President Roosevelt dropped the atomic bomb on Hiroshima, he did so only because it was more human then sending Chuck Norris.
-%
-When Presidents speak, their nation listens. When Chuck Norris blinks, the whole World listens.
+When Presidents speak, their nation listens. When Chuck Norris blinks, the whole world listens.
 %
 When Steven Seagal kills a ninja, he only takes its hide. When Chuck Norris kills a ninja, he uses every part.
 %
 When chuck Norris was in school, he made his PE teacher run laps.
 %
-When does Chuck Norris run out of shotgun bullets?.....whenever he wants to.
+When does Chuck Norris run out of shotgun bullets? whenever he wants to.
 %
 When taking the SAT, write "Chuck Norris" for every answer. You will score over 8000.
 %
 When the Boogeyman goes to sleep every night, he checks his closet for Chuck Norris.
 %
-When things go bump in the night.... it's Chuck Norris
+When things go bump in the night, it's Chuck Norris
 %
-While visiting the hexagon, Chuck Norris was asked to demonstrate his famous roundhouse kick. Henceforth, it has been known as the Pentagon.
+While visiting the Hexagon, Chuck Norris was asked to demonstrate his famous roundhouse kick. Henceforth, it has been known as the Pentagon.
 %
 Why didn't the chicken cross the road? Because Chuck Norris got to it first.
 %
-World War II began because Chuck Norris took a nap.  When he woke up, Hitler found out and killed himself out of fear Chuck Norris would kill him.
-%
 You know Chuck Norris' pet lizard, right? Last I heard, he was in the movie "Godzilla". Oh, and his pet turtle starred in "Gamera" as well.
 %
 http://chucknorrisfacts.com/ is built in Drupal because Chuck Norris knows a good CMS when he sees one.

From a7f5170d68c0b75a9864763a90ac11e51ec67c81 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Mon, 31 Aug 2020 17:38:30 +0200
Subject: [PATCH 077/869] Remove perl dependency

---
 plugins/timer/timer.plugin.zsh |  5 ++++-
 themes/fishy.zsh-theme         | 15 +++++++++------
 themes/trapd00r.zsh-theme      |  2 +-
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/plugins/timer/timer.plugin.zsh b/plugins/timer/timer.plugin.zsh
index 1be7516a3..b261f71c5 100644
--- a/plugins/timer/timer.plugin.zsh
+++ b/plugins/timer/timer.plugin.zsh
@@ -1,5 +1,8 @@
+zmodload zsh/datetime
+
 __timer_current_time() {
-  perl -MTime::HiRes=time -e'print time'
+  zmodload zsh/datetime
+  echo $EPOCHREALTIME
 }
 
 __timer_format_duration() {
diff --git a/themes/fishy.zsh-theme b/themes/fishy.zsh-theme
index 00a60f45b..f6dae6181 100644
--- a/themes/fishy.zsh-theme
+++ b/themes/fishy.zsh-theme
@@ -1,12 +1,15 @@
 # ZSH Theme emulating the Fish shell's default prompt.
 
 _fishy_collapsed_wd() {
-  echo $(pwd | perl -pe '
-   BEGIN {
-      binmode STDIN,  ":encoding(UTF-8)";
-      binmode STDOUT, ":encoding(UTF-8)";
-   }; s|^$ENV{HOME}|~|g; s|/([^/.])[^/]*(?=/)|/$1|g; s|/\.([^/])[^/]*(?=/)|/.$1|g
-')
+  local -a pwd=("${(s:/:)PWD/#$HOME/~}")
+  for i in {1..$(($#pwd-1))}; do
+    if [[ "$pwd[$i]" = .* ]]; then
+      pwd[$i]="${${pwd[$i]}[1,2]}"
+    else
+      pwd[$i]="${${pwd[$i]}[1]}"
+    fi
+  done
+  echo "${(j:/:)pwd}"
 }
 
 local user_color='green'; [ $UID -eq 0 ] && user_color='red'
diff --git a/themes/trapd00r.zsh-theme b/themes/trapd00r.zsh-theme
index 7a589a699..4e3238393 100644
--- a/themes/trapd00r.zsh-theme
+++ b/themes/trapd00r.zsh-theme
@@ -2,7 +2,7 @@
 #
 # This theme needs a terminal supporting 256 colors as well as unicode.
 # In order to avoid external dependencies, it also has a zsh version of
-# the perl script at https://github.com/trapd00r/utils/blob/master/zsh_path,
+# the previously used perl script https://github.com/trapd00r/utils/blob/master/zsh_path,
 # which splits up the current path and makes it fancy.
 #
 # By default it spans over two lines like so:

From 7256c03ce1c54bd08ecab954c91a0231386556a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Wed, 2 Sep 2020 15:15:24 +0200
Subject: [PATCH 078/869] fishy: fix one-level directory bug and bad array
 assignment in zsh 5.0.1

---
 themes/fishy.zsh-theme | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/themes/fishy.zsh-theme b/themes/fishy.zsh-theme
index f6dae6181..2b8d559e5 100644
--- a/themes/fishy.zsh-theme
+++ b/themes/fishy.zsh-theme
@@ -1,14 +1,17 @@
 # ZSH Theme emulating the Fish shell's default prompt.
 
 _fishy_collapsed_wd() {
-  local -a pwd=("${(s:/:)PWD/#$HOME/~}")
-  for i in {1..$(($#pwd-1))}; do
-    if [[ "$pwd[$i]" = .* ]]; then
-      pwd[$i]="${${pwd[$i]}[1,2]}"
-    else
-      pwd[$i]="${${pwd[$i]}[1]}"
-    fi
-  done
+  local i pwd
+  pwd=("${(s:/:)PWD/#$HOME/~}")
+  if (( $#pwd > 1 )); then
+    for i in {1..$(($#pwd-1))}; do
+      if [[ "$pwd[$i]" = .* ]]; then
+        pwd[$i]="${${pwd[$i]}[1,2]}"
+      else
+        pwd[$i]="${${pwd[$i]}[1]}"
+      fi
+    done
+  fi
   echo "${(j:/:)pwd}"
 }
 

From 87edf16e05598505927410f6b06bbc5a6003805b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Thu, 3 Sep 2020 21:57:26 +0200
Subject: [PATCH 079/869] Add sponsor button

---
 .github/FUNDING.yml | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 .github/FUNDING.yml

diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
new file mode 100644
index 000000000..c44bb2475
--- /dev/null
+++ b/.github/FUNDING.yml
@@ -0,0 +1,2 @@
+github: [robbyrussell, mcornella, larson-carter]
+open_collective: ohmyzsh

From 28ee5846bbac56926241fc5ef9f116161ceb6f23 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Fri, 4 Sep 2020 21:50:00 +0200
Subject: [PATCH 080/869] init: define $ZSH if not defined

Closes #9223
---
 oh-my-zsh.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/oh-my-zsh.sh b/oh-my-zsh.sh
index 5b057256d..16e244be5 100644
--- a/oh-my-zsh.sh
+++ b/oh-my-zsh.sh
@@ -1,3 +1,6 @@
+# If ZSH is not defined, use the current script's directory.
+[[ -z "$ZSH" ]] && export ZSH="${${(%):-%x}:a:h}"
+
 # Set ZSH_CACHE_DIR to the path where cache files should be created
 # or else we will use the default cache/
 if [[ -z "$ZSH_CACHE_DIR" ]]; then

From 50dc4ab3574f4e265dff816d8d9a0195cd260152 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Fri, 4 Sep 2020 21:54:05 +0200
Subject: [PATCH 081/869] lib: treat _ and - as part of a word

Fixes #8743
---
 lib/completion.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/completion.zsh b/lib/completion.zsh
index 2b62785d5..a3873cd08 100644
--- a/lib/completion.zsh
+++ b/lib/completion.zsh
@@ -1,7 +1,7 @@
 # fixme - the load process here seems a bit bizarre
 zmodload -i zsh/complist
 
-WORDCHARS=''
+WORDCHARS='_-'
 
 unsetopt menu_complete   # do not autoselect the first completion entry
 unsetopt flowcontrol

From dc59c661ac1e6c7f02382a50008470f9a6eaf636 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Fri, 4 Sep 2020 21:56:04 +0200
Subject: [PATCH 082/869] common-aliases: lazily assign $BROWSER, $EDITOR and
 $XIVIEWER in ext aliases

Fixes #9212
---
 plugins/common-aliases/common-aliases.plugin.zsh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/plugins/common-aliases/common-aliases.plugin.zsh b/plugins/common-aliases/common-aliases.plugin.zsh
index 023b1a51e..a9d4f1a3d 100644
--- a/plugins/common-aliases/common-aliases.plugin.zsh
+++ b/plugins/common-aliases/common-aliases.plugin.zsh
@@ -55,15 +55,15 @@ if is-at-least 4.2.0; then
   # open browser on urls
   if [[ -n "$BROWSER" ]]; then
     _browser_fts=(htm html de org net com at cx nl se dk)
-    for ft in $_browser_fts; do alias -s $ft=$BROWSER; done
+    for ft in $_browser_fts; do alias -s $ft='$BROWSER'; done
   fi
 
   _editor_fts=(cpp cxx cc c hh h inl asc txt TXT tex)
-  for ft in $_editor_fts; do alias -s $ft=$EDITOR; done
+  for ft in $_editor_fts; do alias -s $ft='$EDITOR'; done
 
   if [[ -n "$XIVIEWER" ]]; then
     _image_fts=(jpg jpeg png gif mng tiff tif xpm)
-    for ft in $_image_fts; do alias -s $ft=$XIVIEWER; done
+    for ft in $_image_fts; do alias -s $ft='$XIVIEWER'; done
   fi
 
   _media_fts=(ape avi flv m4a mkv mov mp3 mpeg mpg ogg ogm rm wav webm)

From 415be382caed0bc4d31732aea145f0fd880b8c1d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Fri, 4 Sep 2020 22:12:21 +0200
Subject: [PATCH 083/869] sublime: add Sublime Text 4 path for macOS

Fixes #9153
---
 plugins/sublime/sublime.plugin.zsh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/plugins/sublime/sublime.plugin.zsh b/plugins/sublime/sublime.plugin.zsh
index 179342595..618dd8ee8 100644
--- a/plugins/sublime/sublime.plugin.zsh
+++ b/plugins/sublime/sublime.plugin.zsh
@@ -37,9 +37,11 @@ alias stn=create_project
     _sublime_paths=(
       "/usr/local/bin/subl"
       "/Applications/Sublime Text.app/Contents/SharedSupport/bin/subl"
+      "/Applications/Sublime Text 4.app/Contents/SharedSupport/bin/subl"
       "/Applications/Sublime Text 3.app/Contents/SharedSupport/bin/subl"
       "/Applications/Sublime Text 2.app/Contents/SharedSupport/bin/subl"
       "$HOME/Applications/Sublime Text.app/Contents/SharedSupport/bin/subl"
+      "$HOME/Applications/Sublime Text 4.app/Contents/SharedSupport/bin/subl"
       "$HOME/Applications/Sublime Text 3.app/Contents/SharedSupport/bin/subl"
       "$HOME/Applications/Sublime Text 2.app/Contents/SharedSupport/bin/subl"
     )

From 708ea42384d378343a590fc34a3dee536a1651df Mon Sep 17 00:00:00 2001
From: Alessandro Martini <alessandrofmartini@gmail.com>
Date: Fri, 4 Sep 2020 17:13:45 -0300
Subject: [PATCH 084/869] fzf: setup FZF_DEFAULT_COMMAND based on installed
 tools (#8895)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Marc Cornellà <marc.cornella@live.com>
---
 plugins/fzf/README.md      | 30 ++++++++++++++++++++++--------
 plugins/fzf/fzf.plugin.zsh | 10 ++++++++++
 2 files changed, 32 insertions(+), 8 deletions(-)

diff --git a/plugins/fzf/README.md b/plugins/fzf/README.md
index b3a434347..d9617563a 100644
--- a/plugins/fzf/README.md
+++ b/plugins/fzf/README.md
@@ -2,18 +2,32 @@
 
 This plugin enables [junegunn's fzf](https://github.com/junegunn/fzf) fuzzy auto-completion and key bindings
 
+To use it, add `fzf` to the plugins array in your zshrc file:
+```zsh
+plugins=(... fzf)
+```
+
+## Settings
+
+Add these before the `plugins=()` line in your zshrc file:
+
 ```zsh
 # Set fzf installation directory path
-export FZF_BASE=/path/to/fzf/install/dir
+# export FZF_BASE=/path/to/fzf/install/dir
+
+# Uncomment to set the FZF_DEFAULT_COMMAND
+# export FZF_DEFAULT_COMMAND='<your fzf default commmand>'
 
 # Uncomment the following line to disable fuzzy completion
-# export DISABLE_FZF_AUTO_COMPLETION="true"
+# DISABLE_FZF_AUTO_COMPLETION="true"
 
 # Uncomment the following line to disable key bindings (CTRL-T, CTRL-R, ALT-C)
-# export DISABLE_FZF_KEY_BINDINGS="true"
-
-plugins=(
-  ...
-  fzf
-)
+# DISABLE_FZF_KEY_BINDINGS="true"
 ```
+
+| Setting                     | Example value              | Description                                                 |
+|-----------------------------|----------------------------|-------------------------------------------------------------|
+| FZF_BASE                    | `/path/to/fzf/install/dir` | Set fzf installation directory path (**export**)            |
+| FZF_DEFAULT_COMMAND         | `fd --type f`              | Set default command to use when input is tty (**export**)   |
+| DISABLE_FZF_AUTO_COMPLETION | `true`                     | Set whether to load fzf auto-completion                     |
+| DISABLE_FZF_KEY_BINDINGS    | `true`                     | Set whether to disable key bindings (CTRL-T, CTRL-R, ALT-C) |
diff --git a/plugins/fzf/fzf.plugin.zsh b/plugins/fzf/fzf.plugin.zsh
index 53bdcbc97..0b831b7f7 100644
--- a/plugins/fzf/fzf.plugin.zsh
+++ b/plugins/fzf/fzf.plugin.zsh
@@ -98,3 +98,13 @@ function indicate_error() {
 setup_using_debian_package || setup_using_base_dir || indicate_error
 
 unset -f setup_using_debian_package setup_using_base_dir indicate_error
+
+if [[ -z "$FZF_DEFAULT_COMMAND" ]]; then
+    if (( $+commands[rg] )); then
+        export FZF_DEFAULT_COMMAND='rg --files --hidden'
+    elif (( $+commands[fd] )); then
+        export FZF_DEFAULT_COMMAND='fd --type f --hidden --exclude .git'
+    elif (( $+commands[ag] )); then
+        export FZF_DEFAULT_COMMAND='ag -l --hidden -g ""'
+    fi
+fi

From a55a30ec3933704e1a4a77f533fe7a21266d97fd Mon Sep 17 00:00:00 2001
From: Lucas Larson <91468+LucasLarson@users.noreply.github.com>
Date: Wed, 9 Sep 2020 05:07:46 -0400
Subject: [PATCH 085/869] update: return git error code on failure (#9238)

Fixes #9237
---
 tools/upgrade.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tools/upgrade.sh b/tools/upgrade.sh
index a71dec88b..e005519d6 100644
--- a/tools/upgrade.sh
+++ b/tools/upgrade.sh
@@ -68,6 +68,7 @@ then
   printf "${BLUE}${BOLD}%s ${UNDER}%s${RESET}\n" "Want to get involved in the community? Join our Discord:" "https://discord.gg/ohmyzsh"
   printf "${BLUE}${BOLD}%s ${UNDER}%s${RESET}\n" "Get your Oh My Zsh swag at:" "https://shop.planetargon.com/collections/oh-my-zsh"
 else
+  status=$?
   printf "${RED}%s${RESET}\n" 'There was an error updating. Try again later?'
 fi
 
@@ -76,3 +77,6 @@ case "$resetAutoStash" in
   "") git config --unset rebase.autoStash ;;
   *) git config rebase.autoStash "$resetAutoStash" ;;
 esac
+
+# Exit with `1` if the update failed
+exit $status

From cbb83cbc31af922330af2508276c1adbec391860 Mon Sep 17 00:00:00 2001
From: Atk <atk@aaathats3as.com>
Date: Wed, 9 Sep 2020 13:24:43 +0100
Subject: [PATCH 086/869] wd: update to latest version (v0.5.0) (#9244)

---
 plugins/wd/README.md | 186 ++++++++++++++++++++++++-------------------
 plugins/wd/wd.sh     | 157 +++++++++++++++++-------------------
 2 files changed, 177 insertions(+), 166 deletions(-)

diff --git a/plugins/wd/README.md b/plugins/wd/README.md
index a454a6c1e..8791f9f0e 100644
--- a/plugins/wd/README.md
+++ b/plugins/wd/README.md
@@ -2,19 +2,19 @@
 
 [![Build Status](https://travis-ci.org/mfaerevaag/wd.png?branch=master)](https://travis-ci.org/mfaerevaag/wd)
 
-`wd` (*warp directory*) lets you jump to custom directories in zsh, without using `cd`. Why? Because `cd` seems inefficient when the folder is frequently visited or has a long path.
+`wd` (*warp directory*) lets you jump to custom directories in zsh, without using `cd`.
+Why?
+Because `cd` seems inefficient when the folder is frequently visited or has a long path.
 
 ![tty.gif](https://raw.githubusercontent.com/mfaerevaag/wd/master/tty.gif)
 
-*NEWS*: If you are not using zsh, check out the c-port, [wd-c](https://github.com/mfaerevaag/wd-c), which works with all shells using wrapper functions.
-
 ## Setup
 
-### oh-my-zsh
+### [oh-my-zsh](https://github.com/ohmyzsh/ohmyzsh)
 
-`wd` comes bundled with [oh-my-zsh](https://github.com/ohmyzsh/ohmyzsh)!
+`wd` comes bundled with oh-my-zsh!
 
-Just add the plugin in your `~/.zshrc` file:
+Just add the plugin in your `.zshrc` file:
 
 ```zsh
 plugins=(... wd)
@@ -38,11 +38,21 @@ antibody bundle mfaerevaag/wd
 
 ### Arch ([AUR](https://aur.archlinux.org/packages/zsh-plugin-wd-git/))
 
+1. Install from the AUR
+
 ```zsh
 yay -S zsh-plugin-wd-git
 # or use any other AUR helper
 ```
 
+2. Then add to your `.zshrc`:
+
+```zsh
+wd() {
+    . /usr/share/wd/wd.sh
+}
+```
+
 ### [zplug](https://github.com/zplug/zplug)
 
 ```zsh
@@ -51,7 +61,9 @@ zplug "mfaerevaag/wd", as:command, use:"wd.sh", hook-load:"wd() { . $ZPLUG_REPOS
 
 ### Automatic
 
-Run either in terminal:
+_Note: automatic install does not provide the manpage. It is also poor security practice to run remote code without first reviewing it, so you ought to look [here](https://github.com/mfaerevaag/wd/blob/master/install.sh)_
+
+Run either command in your terminal:
 
 ```zsh
 curl -L https://github.com/mfaerevaag/wd/raw/master/install.sh | sh
@@ -65,28 +77,33 @@ wget --no-check-certificate https://github.com/mfaerevaag/wd/raw/master/install.
 
 ### Manual
 
-* Clone this repo to your liking
+1. Clone this repository on your local machine in a sensible location (if you know what you're doing of course all of this is up to you):
 
-* Add `wd` function to `.zshrc` (or `.profile` etc.):
+```zsh
+git clone git@github.com:mfaerevaag/wd.git ~/.local/wd --depth 1
+```
 
-  ```zsh
-  wd() {
-      . ~/path/to/cloned/repo/wd/wd.sh
-  }
-  ```
+2. Add `wd` function to `.zshrc` (or `.profile` etc.):
 
-* Install manpage. From `wd`'s base directory (requires root permissions):
+```zsh
+wd() {
+    . ~/.local/wd/wd.sh
+}
+```
 
-  ```zsh
-  cp wd.1 /usr/share/man/man1/wd.1
-  chmod 644 /usr/share/man/man1/wd.1
-  ```
+3. Install manpage (optional):
 
-  **Note:** when pulling and updating `wd`, you'll need to do this again in case of changes to the manpage.
+```zsh
+sudo cp ~/.local/wd/wd.1 /usr/share/man/man1/wd.1
+sudo chmod 644 /usr/share/man/man1/wd.1
+```
+
+**Note:** when pulling and updating `wd`, you'll need to repeat step 3 should the manpage change
 
 ## Completion
 
-If you're NOT using [oh-my-zsh](https://github.com/robbyrussell/oh-my-zsh) and you want to utilize the zsh-completion feature, you will also need to add the path to your `wd` installation (`~/bin/wd` if you used the automatic installer) to your `fpath`. E.g. in your `~/.zshrc`:
+If you're NOT using [oh-my-zsh](https://github.com/robbyrussell/oh-my-zsh) and you want to utilize the zsh-completion feature, you will also need to add the path to your `wd` installation (`~/bin/wd` if you used the automatic installer) to your `fpath`.
+E.g. in your `~/.zshrc`:
 
 ```zsh
 fpath=(~/path/to/wd $fpath)
@@ -102,109 +119,110 @@ rm -f ~/.zcompdump; compinit
 
 * Add warp point to current working directory:
 
-  ```zsh
-  wd add foo
-  ```
+```zsh
+wd add foo
+```
 
-  If a warp point with the same name exists, use `wd add! foo` to overwrite it.
+If a warp point with the same name exists, use `wd add foo --force` to overwrite it.
 
-  **Note:** a warp point cannot contain colons, or consist of only spaces and dots. The first will conflict in how `wd` stores the warp points, and the second will conflict with other features, as below.
+**Note:** a warp point cannot contain colons, or consist of only spaces and dots.
+The first will conflict in how `wd` stores the warp points, and the second will conflict with other features, as below.
 
-  You can omit point name to automatically use the current directory's name instead.
+You can omit point name to automatically use the current directory's name instead.
 
 * From any directory, warp to `foo` with:
 
-  ```zsh
-  wd foo
-  ```
+```zsh
+wd foo
+```
 
-* You can also warp to a directory within foo, with autocompletion:
+* You can also warp to a directory within `foo`, with autocompletion:
 
-  ```zsh
-  wd foo some/inner/path
-  ```
+```zsh
+wd foo some/inner/path
+```
 
 * You can warp back to previous directory and higher, with this dot syntax:
 
-  ```zsh
-  wd ..
-  wd ...
-  ```
+```zsh
+wd ..
+wd ...
+```
 
-  This is a wrapper for the zsh's `dirs` function.  
-  _You might need to add `setopt AUTO_PUSHD` to your `.zshrc` if you are not using [oh-my-zsh](https://github.com/ohmyzsh/ohmyzsh))._
+This is a wrapper for the zsh's `dirs` function.  
+_You might need to add `setopt AUTO_PUSHD` to your `.zshrc` if you are not using [oh-my-zsh](https://github.com/ohmyzsh/ohmyzsh)._
 
 * Remove warp point:
 
-  ```zsh
-  wd rm foo
-  ```
+```zsh
+wd rm foo
+```
 
-  You can omit point name to use the current directory's name instead.
+You can omit point name to use the current directory's name instead.
 
-* List all warp points (stored in `~/.warprc`):
+* List all warp points (stored in `~/.warprc` by default):
 
-  ```zsh
-  wd list
-  ```
+```zsh
+wd list
+```
 
 * List files in given warp point:
 
-  ```zsh
-  wd ls foo
-  ```
+```zsh
+wd ls foo
+```
 
 * Show path of given warp point:
 
-  ```zsh
-  wd path foo
-  ```
+```zsh
+wd path foo
+```
 
 * List warp points to current directory, or optionally, path to given warp point:
 
-  ```zsh
-  wd show
-  ```
+```zsh
+wd show
+```
 
 * Remove warp points to non-existent directories.
 
-  ```zsh
-  wd clean
-  ```
+```zsh
+wd clean
+```
 
-  Use `wd clean!` to not be prompted with confirmation (force).
+Use `wd clean --force` to not be prompted with confirmation.
 
 * Print usage info:
 
-  ```zsh
-  wd help
-  ```
+```zsh
+wd help
+```
 
-  The usage will be printed also if you call `wd` with no command
+The usage will be printed also if you call `wd` with no command
 
 * Print the running version of `wd`:
 
-  ```zsh
-  wd --version
-  ```
+```zsh
+wd --version
+```
 
 * Specifically set the config file (default being `~/.warprc`), which is useful for testing:
 
-  ```zsh
-  wd --config ./file <command>
-  ```
+```zsh
+wd --config ./file <command>
+```
 
 * Force `exit` with return code after running. This is not default, as it will *exit your terminal*, though required for testing/debugging.
 
-  ```zsh
-  wd --debug <command>
-  ```
+```zsh
+wd --debug <command>
+```
 
 * Silence all output:
 
-  ```zsh
-  wd --quiet <command>
-  ```
+```zsh
+wd --quiet <command>
+```
 
 ## Configuration
 
@@ -216,7 +234,7 @@ Defines the path where warp points get stored. Defaults to `$HOME/.warprc`.
 
 ## Testing
 
-`wd` comes with a small test suite, run with [shunit2](https://code.google.com/p/shunit2/). This can be used to confirm that things are working as they should on your setup, or to demonstrate an issue.
+`wd` comes with a small test suite, run with [shunit2](https://github.com/kward/shunit2). This can be used to confirm that things are working as they should on your setup, or to demonstrate an issue.
 
 To run, simply `cd` into the `test` directory and run the `tests.sh`.
 
@@ -225,15 +243,17 @@ cd ./test
 ./tests.sh
 ```
 
-## License
+## Maintainers
 
-The project is licensed under the [MIT license](https://github.com/mfaerevaag/wd/blob/master/LICENSE).
+Following @mfaerevaag stepping away from active maintainership of this repository, the following users now are also maintainers of the repo:
 
-## Contributing
+* @alpha-tango-kilo
 
-If you have issues, feedback or improvements, don't hesitate to report it or submit a pull request. In the case of an issue, we would much appreciate if you would include a failing test in `test/tests.sh`. For an explanation on how to run the tests, read the section "Testing" in this README.
+* @MattLewin
 
-----
+Anyone else contributing is greatly appreciated and will be mentioned in the release notes!
+
+---
 
 Credit to [altschuler](https://github.com/altschuler) for an awesome idea.
 
diff --git a/plugins/wd/wd.sh b/plugins/wd/wd.sh
index 618995c63..d5d38f25b 100644
--- a/plugins/wd/wd.sh
+++ b/plugins/wd/wd.sh
@@ -8,7 +8,7 @@
 # @github.com/mfaerevaag/wd
 
 # version
-readonly WD_VERSION=0.4.6
+readonly WD_VERSION=0.5.0
 
 # colors
 readonly WD_BLUE="\033[96m"
@@ -79,8 +79,6 @@ Commands:
     <point> <path>  Warps to the directory specified by the warp point with path appended
     add <point>     Adds the current working directory to your warp points
     add             Adds the current working directory to your warp points with current directory's name
-    add! <point>    Overwrites existing warp point
-    add!            Overwrites existing warp point with current directory's name
     rm <point>      Removes the given warp point
     rm              Removes the given warp point with current directory's name
     show <point>    Print path to given warp point
@@ -88,12 +86,13 @@ Commands:
     list            Print all stored warp points
     ls  <point>     Show files from given warp point (ls)
     path <point>    Show the path to given warp point (pwd)
-    clean!          Remove points warping to nonexistent directories
+    clean           Remove points warping to nonexistent directories (will prompt unless --force is used)
 
     -v | --version  Print version
     -d | --debug    Exit after execution with exit codes (for testing)
     -c | --config   Specify config file (default ~/.warprc)
     -q | --quiet    Suppress all output
+    -f | --force    Allows overwriting without warning (for add & clean)
 
     help            Show this extremely helpful text
 EOF
@@ -103,7 +102,7 @@ wd_exit_fail()
 {
     local msg=$1
 
-    wd_print_msg $WD_RED $msg
+    wd_print_msg "$WD_RED" "$msg"
     WD_EXIT_CODE=1
 }
 
@@ -111,7 +110,7 @@ wd_exit_warn()
 {
     local msg=$1
 
-    wd_print_msg $WD_YELLOW $msg
+    wd_print_msg "$WD_YELLOW" "$msg"
     WD_EXIT_CODE=1
 }
 
@@ -119,7 +118,7 @@ wd_getdir()
 {
     local name_arg=$1
 
-    point=$(wd_show $name_arg)
+    point=$(wd_show "$name_arg")
     dir=${point:28+$#name_arg+7}
 
     if [[ -z $name_arg ]]; then
@@ -162,12 +161,12 @@ wd_warp()
 
 wd_add()
 {
-    local force=$1
-    local point=$2
+    local point=$1
+    local force=$2
 
     if [[ $point == "" ]]
     then
-        point=$(basename $PWD)
+        point=$(basename "$PWD")
     fi
 
     if [[ $point =~ "^[\.]+$" ]]
@@ -179,57 +178,59 @@ wd_add()
     elif [[ $point == *:* ]]
     then
         wd_exit_fail "Warp point cannot contain colons"
-    elif [[ ${points[$point]} == "" ]] || $force
+    elif [[ ${points[$point]} == "" ]] || [ ! -z "$force" ]
     then
-        wd_remove $point > /dev/null
-        printf "%q:%s\n" "${point}" "${PWD/#$HOME/~}" >> $WD_CONFIG
+        wd_remove "$point" > /dev/null
+        printf "%q:%s\n" "${point}" "${PWD/#$HOME/~}" >> "$WD_CONFIG"
         if (whence sort >/dev/null); then
             local config_tmp=$(mktemp "${TMPDIR:-/tmp}/wd.XXXXXXXXXX")
             # use 'cat' below to ensure we respect $WD_CONFIG as a symlink
-            sort -o "${config_tmp}" $WD_CONFIG  && cat "${config_tmp}" > $WD_CONFIG && rm "${config_tmp}"
+            sort -o "${config_tmp}" "$WD_CONFIG"  && cat "${config_tmp}" > "$WD_CONFIG" && rm "${config_tmp}"
         fi
 
         wd_export_static_named_directories
 
-        wd_print_msg $WD_GREEN "Warp point added"
+        wd_print_msg "$WD_GREEN" "Warp point added"
 
         # override exit code in case wd_remove did not remove any points
         # TODO: we should handle this kind of logic better
         WD_EXIT_CODE=0
     else
-        wd_exit_warn "Warp point '${point}' already exists. Use 'add!' to overwrite."
+        wd_exit_warn "Warp point '${point}' already exists. Use 'add --force' to overwrite."
     fi
 }
 
 wd_remove()
 {
-    local point=$1
+    local point_list=$1
 
-    if [[ $point == "" ]]
+    if [[ "$point_list" == "" ]]
     then
-        point=$(basename $PWD)
+        point_list=$(basename "$PWD")
     fi
 
-    if [[ ${points[$point]} != "" ]]
-    then
-        local config_tmp=$(mktemp "${TMPDIR:-/tmp}/wd.XXXXXXXXXX")
-        # Copy and delete in two steps in order to preserve symlinks
-        if sed -n "/^${point}:.*$/!p" $WD_CONFIG > $config_tmp && cp $config_tmp $WD_CONFIG && rm $config_tmp
+    for point_name in $point_list ; do
+        if [[ ${points[$point_name]} != "" ]]
         then
-            wd_print_msg $WD_GREEN "Warp point removed"
+            local config_tmp=$(mktemp "${TMPDIR:-/tmp}/wd.XXXXXXXXXX")
+            # Copy and delete in two steps in order to preserve symlinks
+            if sed -n "/^${point_name}:.*$/!p" "$WD_CONFIG" > "$config_tmp" && command cp "$config_tmp" "$WD_CONFIG" && command rm "$config_tmp"
+            then
+                wd_print_msg "$WD_GREEN" "Warp point removed"
+            else
+                wd_exit_fail "Something bad happened! Sorry."
+            fi
         else
-            wd_exit_fail "Something bad happened! Sorry."
+            wd_exit_fail "Warp point was not found"
         fi
-    else
-        wd_exit_fail "Warp point was not found"
-    fi
+    done
 }
 
 wd_list_all()
 {
-    wd_print_msg $WD_BLUE "All warp points:"
+    wd_print_msg "$WD_BLUE" "All warp points:"
 
-    entries=$(sed "s:${HOME}:~:g" $WD_CONFIG)
+    entries=$(sed "s:${HOME}:~:g" "$WD_CONFIG")
 
     max_warp_point_length=0
     while IFS= read -r line
@@ -242,7 +243,7 @@ wd_list_all()
         then
             max_warp_point_length=$length
         fi
-    done <<< $entries
+    done <<< "$entries"
 
     while IFS= read -r line
     do
@@ -254,35 +255,35 @@ wd_list_all()
 
             if [[ -z $wd_quiet_mode ]]
             then
-                printf "%${max_warp_point_length}s  ->  %s\n" $key $val
+                printf "%${max_warp_point_length}s  ->  %s\n" "$key" "$val"
             fi
         fi
-    done <<< $entries
+    done <<< "$entries"
 }
 
 wd_ls()
 {
-    wd_getdir $1
-    ls ${dir/#\~/$HOME}
+    wd_getdir "$1"
+    ls "${dir/#\~/$HOME}"
 }
 
 wd_path()
 {
-    wd_getdir $1
-    echo $(echo $dir | sed "s:${HOME}:~:g")
+    wd_getdir "$1"
+    echo "$(echo "$dir" | sed "s:${HOME}:~:g")"
 }
 
 wd_show()
 {
     local name_arg=$1
     # if there's an argument we look up the value
-    if [[ ! -z $name_arg ]]
+    if [[ -n $name_arg ]]
     then
         if [[ -z $points[$name_arg] ]]
         then
-            wd_print_msg $WD_BLUE "No warp point named $name_arg"
+            wd_print_msg "$WD_BLUE" "No warp point named $name_arg"
         else
-            wd_print_msg $WD_GREEN "Warp point: ${WD_GREEN}$name_arg${WD_NOC} -> $points[$name_arg]"
+            wd_print_msg "$WD_GREEN" "Warp point: ${WD_GREEN}$name_arg${WD_NOC} -> $points[$name_arg]"
         fi
     else
         # hax to create a local empty array
@@ -290,19 +291,19 @@ wd_show()
         wd_matches=()
         # do a reverse lookup to check whether PWD is in $points
         PWD="${PWD/$HOME/~}"
-        if [[ ${points[(r)$PWD]} == $PWD ]]
+        if [[ ${points[(r)$PWD]} == "$PWD" ]]
         then
             for name in ${(k)points}
             do
-                if [[ $points[$name] == $PWD ]]
+                if [[ $points[$name] == "$PWD" ]]
                 then
                     wd_matches[$(($#wd_matches+1))]=$name
                 fi
             done
 
-            wd_print_msg $WD_BLUE "$#wd_matches warp point(s) to current directory: ${WD_GREEN}$wd_matches${WD_NOC}"
+            wd_print_msg "$WD_BLUE" "$#wd_matches warp point(s) to current directory: ${WD_GREEN}$wd_matches${WD_NOC}"
         else
-            wd_print_msg $WD_YELLOW "No warp point to $(echo $PWD | sed "s:$HOME:~:")"
+            wd_print_msg "$WD_YELLOW" "No warp point to $(echo "$PWD" | sed "s:$HOME:~:")"
         fi
     fi
 }
@@ -312,7 +313,7 @@ wd_clean() {
     local count=0
     local wd_tmp=""
 
-    while read line
+    while read -r line
     do
         if [[ $line != "" ]]
         then
@@ -322,32 +323,32 @@ wd_clean() {
 
             if [ -d "${val/#\~/$HOME}" ]
             then
-                wd_tmp=$wd_tmp"\n"`echo $line`
+                wd_tmp=$wd_tmp"\n"`echo "$line"`
             else
-                wd_print_msg $WD_YELLOW "Nonexistent directory: ${key} -> ${val}"
+                wd_print_msg "$WD_YELLOW" "Nonexistent directory: ${key} -> ${val}"
                 count=$((count+1))
             fi
         fi
-    done < $WD_CONFIG
+    done < "$WD_CONFIG"
 
     if [[ $count -eq 0 ]]
     then
-        wd_print_msg $WD_BLUE "No warp points to clean, carry on!"
+        wd_print_msg "$WD_BLUE" "No warp points to clean, carry on!"
     else
-        if $force || wd_yesorno "Removing ${count} warp points. Continue? (Y/n)"
+        if [ ! -z "$force" ] || wd_yesorno "Removing ${count} warp points. Continue? (y/n)"
         then
-            echo $wd_tmp >! $WD_CONFIG
-            wd_print_msg $WD_GREEN "Cleanup complete. ${count} warp point(s) removed"
+            echo "$wd_tmp" >! "$WD_CONFIG"
+            wd_print_msg "$WD_GREEN" "Cleanup complete. ${count} warp point(s) removed"
         else
-            wd_print_msg $WD_BLUE "Cleanup aborted"
+            wd_print_msg "$WD_BLUE" "Cleanup aborted"
         fi
     fi
 }
 
 wd_export_static_named_directories() {
-  if [[ -z $WD_SKIP_EXPORT ]]
+  if [[ ! -z $WD_EXPORT ]]
   then
-    command grep '^[0-9a-zA-Z_-]\+:' "$WD_CONFIG" | sed -e "s,~,$HOME," -e 's/:/=/' | while read warpdir ; do
+    command grep '^[0-9a-zA-Z_-]\+:' "$WD_CONFIG" | sed -e "s,~,$HOME," -e 's/:/=/' | while read -r warpdir ; do
         hash -d "$warpdir"
     done
   fi
@@ -366,7 +367,8 @@ zparseopts -D -E \
     c:=wd_alt_config -config:=wd_alt_config \
     q=wd_quiet_mode -quiet=wd_quiet_mode \
     v=wd_print_version -version=wd_print_version \
-    d=wd_debug_mode -debug=wd_debug_mode
+    d=wd_debug_mode -debug=wd_debug_mode \
+    f=wd_force_mode -force=wd_force_mode
 
 if [[ ! -z $wd_print_version ]]
 then
@@ -379,10 +381,10 @@ then
 fi
 
 # check if config file exists
-if [ ! -e $WD_CONFIG ]
+if [ ! -e "$WD_CONFIG" ]
 then
     # if not, create config file
-    touch $WD_CONFIG
+    touch "$WD_CONFIG"
 else
     wd_export_static_named_directories
 fi
@@ -397,25 +399,24 @@ do
     val=${(j,:,)arr[2,-1]}
 
     points[$key]=$val
-done < $WD_CONFIG
+done < "$WD_CONFIG"
 
 # get opts
-args=$(getopt -o a:r:c:lhs -l add:,rm:,clean\!,list,ls:,path:,help,show -- $*)
+args=$(getopt -o a:r:c:lhs -l add:,rm:,clean,list,ls:,path:,help,show -- $*)
 
 # check if no arguments were given, and that version is not set
 if [[ ($? -ne 0 || $#* -eq 0) && -z $wd_print_version ]]
 then
     wd_print_usage
 
-    # check if config file is writeable
-elif [ ! -w $WD_CONFIG ]
+# check if config file is writeable
+elif [ ! -w "$WD_CONFIG" ]
 then
     # do nothing
     # can't run `exit`, as this would exit the executing shell
     wd_exit_fail "\'$WD_CONFIG\' is not writeable."
 
 else
-
     # parse rest of options
     local wd_o
     for wd_o
@@ -423,11 +424,7 @@ else
         case "$wd_o"
             in
             "-a"|"--add"|"add")
-                wd_add false $2
-                break
-                ;;
-            "-a!"|"--add!"|"add!")
-                wd_add true $2
+                wd_add "$2" "$wd_force_mode"
                 break
                 ;;
             "-e"|"export")
@@ -435,10 +432,8 @@ else
                 break
                 ;;
             "-r"|"--remove"|"rm")
-                # Loop over all arguments after "rm", separated by whitespace
-                for pointname in "${@:2}" ; do
-                    wd_remove $pointname
-                done
+                # Passes all the arguments as a single string separated by whitespace to wd_remove
+                wd_remove "${@:2}"
                 break
                 ;;
             "-l"|"list")
@@ -446,11 +441,11 @@ else
                 break
                 ;;
             "-ls"|"ls")
-                wd_ls $2
+                wd_ls "$2"
                 break
                 ;;
             "-p"|"--path"|"path")
-                wd_path $2
+                wd_path "$2"
                 break
                 ;;
             "-h"|"--help"|"help")
@@ -458,19 +453,15 @@ else
                 break
                 ;;
             "-s"|"--show"|"show")
-                wd_show $2
+                wd_show "$2"
                 break
                 ;;
             "-c"|"--clean"|"clean")
-                wd_clean false
-                break
-                ;;
-            "-c!"|"--clean!"|"clean!")
-                wd_clean true
+                wd_clean "$wd_force_mode"
                 break
                 ;;
             *)
-                wd_warp $wd_o $2
+                wd_warp "$wd_o" "$2"
                 break
                 ;;
             --)
@@ -502,7 +493,7 @@ unset args
 unset points
 unset val &> /dev/null # fixes issue #1
 
-if [[ ! -z $wd_debug_mode ]]
+if [[ -n $wd_debug_mode ]]
 then
     exit $WD_EXIT_CODE
 else

From 3667f94538c24ebaa9abd46e797a2610f3b67c5e Mon Sep 17 00:00:00 2001
From: Randall Leeds <randall@bleeds.info>
Date: Wed, 9 Sep 2020 05:45:34 -0700
Subject: [PATCH 087/869] pyenv: run pyenv init with --no-rehash (#8917)

Add --no-rehash to the pyenv init command, which was removed in [#4492].

The rehash was likely disabled because it can affect shell startup times.
It should only be necessary when installing or removing Python versions.

See [pyenv/pyenv#784] and [sorin-ionescu/prezto#1603] for more detail.

[#4492]: https://github.com/ohmyzsh/ohmyzsh/pull/4492
[pyenv/pyenv#784]: https://github.com/pyenv/pyenv/issues/784
[sorin-ionescu/prezto#1603]: https://github.com/sorin-ionescu/prezto/pull/1603
---
 plugins/pyenv/pyenv.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/pyenv/pyenv.plugin.zsh b/plugins/pyenv/pyenv.plugin.zsh
index b7ae2046f..82ba6ff8c 100644
--- a/plugins/pyenv/pyenv.plugin.zsh
+++ b/plugins/pyenv/pyenv.plugin.zsh
@@ -29,7 +29,7 @@ if [[ $FOUND_PYENV -ne 1 ]]; then
 fi
 
 if [[ $FOUND_PYENV -eq 1 ]]; then
-    eval "$(pyenv init - zsh)"
+    eval "$(pyenv init - --no-rehash zsh)"
     if (( $+commands[pyenv-virtualenv-init] )); then
         eval "$(pyenv virtualenv-init - zsh)"
     fi

From b3923eded99f7f8991a695198a1512277e47d4ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Sat, 12 Sep 2020 11:58:47 +0200
Subject: [PATCH 088/869] meta: change feature label

---
 .github/ISSUE_TEMPLATE/feature_request.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
index 0a8a588db..8c20544c8 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -1,7 +1,7 @@
 ---
 name: Feature request
 about: Suggest a feature for Oh My Zsh
-labels: 'Type: feature'
+labels: 'feature'
 
 ---
 

From 8a93c89bda7e244ed5d32d5b01bd5f72ab695fbf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Sat, 12 Sep 2020 11:59:06 +0200
Subject: [PATCH 089/869] meta: change support label

---
 .github/ISSUE_TEMPLATE/support.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/ISSUE_TEMPLATE/support.md b/.github/ISSUE_TEMPLATE/support.md
index d2638412e..697f0c0c8 100644
--- a/.github/ISSUE_TEMPLATE/support.md
+++ b/.github/ISSUE_TEMPLATE/support.md
@@ -1,7 +1,7 @@
 ---
 name: Support
 about: Request support for any problem you're having with Oh My Zsh
-labels: 'Type: support'
+labels: 'support'
 
 ---
 

From 814e0b3c25316879b2f86e017701449cc2302ad4 Mon Sep 17 00:00:00 2001
From: 0xflotus <0xflotus@gmail.com>
Date: Mon, 14 Sep 2020 17:14:14 +0200
Subject: [PATCH 090/869] docs: fix small typo in README (#9255)

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 8be05b6f1..eaeae826e 100644
--- a/README.md
+++ b/README.md
@@ -92,7 +92,7 @@ _Note that the plugins are separated by whitespace (spaces, tabs, new lines...).
 
 #### Using Plugins
 
-Each plugin includes a __README__, documenting it. This README should show the aliases (if the plugin adds any) and extra goodies that are inclued in that particular plugin.
+Each plugin includes a __README__, documenting it. This README should show the aliases (if the plugin adds any) and extra goodies that are included in that particular plugin.
 
 ### Themes
 

From 2bc1da7f377e78cdfa74190ffe5baf6c814d0fce Mon Sep 17 00:00:00 2001
From: Alessandro <alessandro.buonerba@ovoenergy.com>
Date: Mon, 14 Sep 2020 19:32:23 +0100
Subject: [PATCH 091/869] brew: replace deprecated brew cask outdated command
 (#9253)

---
 plugins/brew/README.md       | 20 ++++++++++----------
 plugins/brew/brew.plugin.zsh |  4 ++--
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/plugins/brew/README.md b/plugins/brew/README.md
index 44af05225..398d3263c 100644
--- a/plugins/brew/README.md
+++ b/plugins/brew/README.md
@@ -10,16 +10,16 @@ plugins=(... brew)
 
 ## Aliases
 
-| Alias    | Command                                                     | Description                                                         |
-|----------|-------------------------------------------------------------|---------------------------------------------------------------------|
-| `brewp`  | `brew pin`                                                  | Pin a specified formula so that it's not upgraded.                  |
-| `brews`  | `brew list -1`                                              | List installed formulae or the installed files for a given formula. |
-| `brewsp` | `brew list --pinned`                                        | List pinned formulae, or show the version of a given formula.       |
-| `bubo`   | `brew update && brew outdated`                              | Update Homebrew and all formulae, then list outdated formulae.      |
-| `bubc`   | `brew upgrade && brew cleanup`                              | Upgrade outdated formulae, then run cleanup.                        |
-| `bubu`   | `bubo && bubc`                                              | Do the last two operations above.                                   |
-| `bcubo`  | `brew update && brew cask outdated`                         | Update Homebrew and alll formulae, then list outdated casks.        |
-| `bcubc`  | `brew cask reinstall $(brew cask outdated) && brew cleanup` | Update outdated casks, then run cleanup.                            |
+| Alias    | Command                                                       | Description                                                         |
+|----------|-------------------------------------------------------------  |---------------------------------------------------------------------|
+| `brewp`  | `brew pin`                                                    | Pin a specified formula so that it's not upgraded.                  |
+| `brews`  | `brew list -1`                                                | List installed formulae or the installed files for a given formula. |
+| `brewsp` | `brew list --pinned`                                          | List pinned formulae, or show the version of a given formula.       |
+| `bubo`   | `brew update && brew outdated`                                | Update Homebrew and all formulae, then list outdated formulae.      |
+| `bubc`   | `brew upgrade && brew cleanup`                                | Upgrade outdated formulae, then run cleanup.                        |
+| `bubu`   | `bubo && bubc`                                                | Do the last two operations above.                                   |
+| `bcubo`  | `brew update && brew outdated --cask`                         | Update Homebrew and all formulae, then list outdated casks.        |
+| `bcubc`  | `brew cask reinstall $(brew outdated --cask) && brew cleanup` | Update outdated casks, then run cleanup.                            |
 
 ## Completion
 
diff --git a/plugins/brew/brew.plugin.zsh b/plugins/brew/brew.plugin.zsh
index fdea76c74..c8b1e3568 100644
--- a/plugins/brew/brew.plugin.zsh
+++ b/plugins/brew/brew.plugin.zsh
@@ -4,5 +4,5 @@ alias brewsp='brew list --pinned'
 alias bubo='brew update && brew outdated'
 alias bubc='brew upgrade && brew cleanup'
 alias bubu='bubo && bubc'
-alias bcubo='brew update && brew cask outdated'
-alias bcubc='brew cask reinstall $(brew cask outdated) && brew cleanup'
+alias bcubo='brew update && brew outdated --cask'
+alias bcubc='brew cask reinstall $(brew outdated --cask) && brew cleanup'

From bc9d4b89bb3985a250e5a702a0f2d76a8632cd8a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Fri, 18 Sep 2020 19:34:17 +0200
Subject: [PATCH 092/869] Remove racially-charged language from the codebase

The ZSH_THEME_RANDOM_BLACKLIST variable will be deprecated until it's
removed 2 months from now.
---
 README.md               |  4 ++--
 themes/random.zsh-theme | 11 +++++++++--
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index eaeae826e..69862eba5 100644
--- a/README.md
+++ b/README.md
@@ -139,10 +139,10 @@ ZSH_THEME_RANDOM_CANDIDATES=(
 )
 ```
 
-If you only know which themes you don't like, you can add them similarly to a blacklist:
+If you only know which themes you don't like, you can add them similarly to an ignored list:
 
 ```shell
-ZSH_THEME_RANDOM_BLACKLIST=(pygmalion tjkirch_mod)
+ZSH_THEME_RANDOM_IGNORED=(pygmalion tjkirch_mod)
 ```
 
 ### FAQ
diff --git a/themes/random.zsh-theme b/themes/random.zsh-theme
index 6cb7cc579..85a8612b7 100644
--- a/themes/random.zsh-theme
+++ b/themes/random.zsh-theme
@@ -1,3 +1,10 @@
+# Deprecate ZSH_THEME_RANDOM_BLACKLIST
+if [[ -n "$ZSH_THEME_RANDOM_BLACKLIST" ]]; then
+  echo '[oh-my-zsh] ZSH_THEME_RANDOM_BLACKLIST is deprecated. Use `ZSH_THEME_RANDOM_IGNORED` instead.'
+  ZSH_THEME_RANDOM_IGNORED=($ZSH_THEME_RANDOM_BLACKLIST)
+  unset ZSH_THEME_RANDOM_BLACKLIST
+fi
+
 # Make themes a unique array
 typeset -Ua themes
 
@@ -11,8 +18,8 @@ else
     "$ZSH_CUSTOM"/themes/*.zsh-theme(N:t:r)
     "$ZSH"/themes/*.zsh-theme(N:t:r)
   )
-  # Remove blacklisted themes from the list
-  for theme in random ${ZSH_THEME_RANDOM_BLACKLIST[@]}; do
+  # Remove ignored themes from the list
+  for theme in random ${ZSH_THEME_RANDOM_IGNORED[@]}; do
     themes=("${(@)themes:#$theme}")
   done
 fi

From 38f276a732238008a8d0e4a028a4f112bca56221 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Fri, 18 Sep 2020 22:02:10 +0200
Subject: [PATCH 093/869] docker: document option-stacking setting

Fixes #9266
---
 plugins/docker/README.md | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/plugins/docker/README.md b/plugins/docker/README.md
index 241a6a448..fab7aa8f1 100644
--- a/plugins/docker/README.md
+++ b/plugins/docker/README.md
@@ -10,3 +10,25 @@ plugins=(... docker)
 
 A copy of the completion script from the docker/cli git repo:
 https://github.com/docker/cli/blob/master/contrib/completion/zsh/_docker
+
+## Settings
+
+By default, the completion doesn't allow option-stacking, meaning if you try to
+complete `docker run -it <TAB>` it won't work, because you're _stacking_ the
+`-i` and `-t` options.
+
+[You can enable it](https://github.com/docker/cli/commit/b10fb43048) by **adding
+the lines below to your zshrc file**, but be aware of the side effects:
+
+> This enables Zsh to understand commands like `docker run -it
+> ubuntu`. However, by enabling this, this also makes Zsh complete
+> `docker run -u<tab>` with `docker run -uapprox` which is not valid. The
+> users have to put the space or the equal sign themselves before trying
+> to complete.
+>
+> Therefore, this behavior is disabled by default. To enable it:
+>
+> ```
+> zstyle ':completion:*:*:docker:*' option-stacking yes
+> zstyle ':completion:*:*:docker-*:*' option-stacking yes
+> ```

From 93c837fec8e9fe61509b9dff9e909e84f7ebe32d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Sun, 20 Sep 2020 13:41:21 +0200
Subject: [PATCH 094/869] random: add ZSH_THEME_RANDOM_QUIET setting

Fixes #9180

Co-authored-by: James Eapen <jamespeapen@gmail.com>
---
 themes/random.zsh-theme | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/themes/random.zsh-theme b/themes/random.zsh-theme
index 85a8612b7..f0b8e5c18 100644
--- a/themes/random.zsh-theme
+++ b/themes/random.zsh-theme
@@ -42,4 +42,6 @@ else
   return 1
 fi
 
-echo "[oh-my-zsh] Random theme '${RANDOM_THEME}' loaded"
+if [[ -z "$ZSH_THEME_RANDOM_QUIET" ]]; then
+  echo "[oh-my-zsh] Random theme '${RANDOM_THEME}' loaded"
+fi

From bcc859e012a8f259971d1fd531535a261838c0c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Sat, 26 Sep 2020 12:15:59 +0200
Subject: [PATCH 095/869] avit: reenable use of $fg instead of prompt sequence
 colors to fix weird bug

Fixes #9232
---
 themes/avit.zsh-theme | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/themes/avit.zsh-theme b/themes/avit.zsh-theme
index 05b3fb212..921ed99d3 100644
--- a/themes/avit.zsh-theme
+++ b/themes/avit.zsh-theme
@@ -7,9 +7,9 @@ typeset +H _hist_no="%{$fg[grey]%}%h%{$reset_color%}"
 
 PROMPT='
 $(_user_host)${_current_dir} $(git_prompt_info) $(ruby_prompt_info)
-%{%(!.%F{red}.%F{white})%}▶%{$reset_color%} '
+%{%(!.${fg[red]}.${fg[white]})%}▶%{$reset_color%} '
 
-PROMPT2='%{%(!.%F{red}.%F{white})%}◀%{$reset_color%} '
+PROMPT2='%{%(!.${fg[red]}.${fg[white]})%}◀%{$reset_color%} '
 
 RPROMPT='$(vi_mode_prompt_info)%{$(echotc UP 1)%}$(_git_time_since_commit) $(git_prompt_status) ${_return_status}%{$(echotc DO 1)%}'
 

From caff704f41d7a8cd01aa54b1202d6e3123e33fe6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Sat, 26 Sep 2020 12:17:12 +0200
Subject: [PATCH 096/869] lib: clean up zsh_stats function

---
 lib/functions.zsh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/functions.zsh b/lib/functions.zsh
index 4bc533b7a..58f0e3fb0 100644
--- a/lib/functions.zsh
+++ b/lib/functions.zsh
@@ -1,5 +1,7 @@
 function zsh_stats() {
-  fc -l 1 | awk '{CMD[$2]++;count++;}END { for (a in CMD)print CMD[a] " " CMD[a]/count*100 "% " a;}' | grep -v "./" | column -c3 -s " " -t | sort -nr | nl |  head -n20
+  fc -l 1 \
+    | awk '{ CMD[$2]++; count++; } END { for (a in CMD) print CMD[a] " " CMD[a]*100/count "% " a }' \
+    | grep -v "./" | sort -nr | head -n20 | column -c3 -s " " -t | nl
 }
 
 function uninstall_oh_my_zsh() {

From d14bddf6d7481e8ba73ccd0f6ce5cf3d8a8bc207 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Sat, 26 Sep 2020 12:25:30 +0200
Subject: [PATCH 097/869] agnoster: allow disabling AWS prompt with
 SHOW_AWS_PROMPT=false

Fixes #8040
---
 themes/agnoster.zsh-theme | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/themes/agnoster.zsh-theme b/themes/agnoster.zsh-theme
index b0a3b7b3f..79748e45e 100644
--- a/themes/agnoster.zsh-theme
+++ b/themes/agnoster.zsh-theme
@@ -235,7 +235,7 @@ prompt_status() {
 #   ends in '-prod'
 # - displays black on green otherwise
 prompt_aws() {
-  [[ -z "$AWS_PROFILE" ]] && return
+  [[ -z "$AWS_PROFILE" || "$SHOW_AWS_PROMPT" = false ]] && return
   case "$AWS_PROFILE" in
     *-prod|*production*) prompt_segment red yellow  "AWS: $AWS_PROFILE" ;;
     *) prompt_segment green black "AWS: $AWS_PROFILE" ;;

From 73696c6faa9824846996320d1a533ddf412216b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Sat, 26 Sep 2020 12:38:31 +0200
Subject: [PATCH 098/869] laravel5: clean up

---
 plugins/laravel5/laravel5.plugin.zsh | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/plugins/laravel5/laravel5.plugin.zsh b/plugins/laravel5/laravel5.plugin.zsh
index 487a0742b..70dc4ed02 100644
--- a/plugins/laravel5/laravel5.plugin.zsh
+++ b/plugins/laravel5/laravel5.plugin.zsh
@@ -1,20 +1,19 @@
+# Alias
+alias la5='php artisan'
+alias la5cache='php artisan cache:clear'
+alias la5routes='php artisan route:list'
+alias la5vendor='php artisan vendor:publish'
+
 # Laravel5 basic command completion
 _laravel5_get_command_list () {
-	php artisan --raw --no-ansi list | sed "s/[[:space:]].*//g"
+  php artisan --raw --no-ansi list | sed "s/[[:space:]].*//g"
 }
 
 _laravel5 () {
-  if [ -f artisan ]; then
-    compadd `_laravel5_get_command_list`
+  if [[ -f artisan ]]; then
+    compadd $(_laravel5_get_command_list)
   fi
 }
 
 compdef _laravel5 artisan
 compdef _laravel5 la5
-
-#Alias
-alias la5='php artisan'
-
-alias la5cache='php artisan cache:clear'
-alias la5routes='php artisan route:list'
-alias la5vendor='php artisan vendor:publish'

From 671745f4964df5e6c0282fde9020c3f945b68b43 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Sat, 26 Sep 2020 13:05:31 +0200
Subject: [PATCH 099/869] A few README tweaks

---
 README.md | 61 +++++++++++++++++++++----------------------------------
 1 file changed, 23 insertions(+), 38 deletions(-)

diff --git a/README.md b/README.md
index 69862eba5..b5403f63a 100644
--- a/README.md
+++ b/README.md
@@ -1,18 +1,16 @@
-<p align="center">
-  <img src="https://s3.amazonaws.com/ohmyzsh/oh-my-zsh-logo.png" alt="Oh My Zsh">
-</p>
+<center><img src="https://s3.amazonaws.com/ohmyzsh/oh-my-zsh-logo.png" alt="Oh My Zsh"></center>
 
 Oh My Zsh is an open source, community-driven framework for managing your [zsh](https://www.zsh.org/) configuration.
 
 Sounds boring. Let's try again.
 
-__Oh My Zsh will not make you a 10x developer...but you may feel like one.__
+**Oh My Zsh will not make you a 10x developer...but you may feel like one.**
 
 Once installed, your terminal shell will become the talk of the town _or your money back!_ With each keystroke in your command prompt, you'll take advantage of the hundreds of powerful plugins and beautiful themes. Strangers will come up to you in cafés and ask you, _"that is amazing! are you some sort of genius?"_
 
 Finally, you'll begin to get the sort of attention that you have always felt you deserved. ...or maybe you'll use the time that you're saving to start flossing more often. 😬
 
-To learn more, visit [ohmyz.sh](https://ohmyz.sh), follow [@ohmyzsh](https://twitter.com/ohmyzsh) on Twitter, and/or join us on [Discord](https://discord.gg/ohmyzsh).
+To learn more, visit [ohmyz.sh](https://ohmyz.sh), follow [@ohmyzsh](https://twitter.com/ohmyzsh) on Twitter, and join us on [Discord](https://discord.gg/ohmyzsh).
 
 [![CI](https://github.com/ohmyzsh/ohmyzsh/workflows/CI/badge.svg)](https://github.com/ohmyzsh/ohmyzsh/actions?query=workflow%3ACI)
 [![Follow @ohmyzsh](https://img.shields.io/twitter/follow/ohmyzsh?label=Follow+@ohmyzsh&style=flat)](https://twitter.com/intent/follow?screen_name=ohmyzsh)
@@ -22,32 +20,20 @@ To learn more, visit [ohmyz.sh](https://ohmyz.sh), follow [@ohmyzsh](https://twi
 
 ### Prerequisites
 
-* A Unix-like operating system: macOS, Linux, BSD. On Windows: WSL2 is preferred, but cygwin or msys also mostly work.
-* [Zsh](https://www.zsh.org) should be installed (v4.3.9 or more recent is fine but we prefer 5.0.8 and newer). If not pre-installed (run `zsh --version` to confirm), check the following wiki instructions here: [Installing ZSH](https://github.com/ohmyzsh/ohmyzsh/wiki/Installing-ZSH)
-* `curl` or `wget` should be installed
-* `git` should be installed (recommended v2.4.11 or higher)
+- A Unix-like operating system: macOS, Linux, BSD. On Windows: WSL2 is preferred, but cygwin or msys also mostly work.
+- [Zsh](https://www.zsh.org) should be installed (v4.3.9 or more recent is fine but we prefer 5.0.8 and newer). If not pre-installed (run `zsh --version` to confirm), check the following wiki instructions here: [Installing ZSH](https://github.com/ohmyzsh/ohmyzsh/wiki/Installing-ZSH)
+- `curl` or `wget` should be installed
+- `git` should be installed (recommended v2.4.11 or higher)
 
 ### Basic Installation
 
-Oh My Zsh is installed by running one of the following commands in your terminal. You can install this via the command-line with either `curl` or `wget`, whichever is installed on your machine.
+Oh My Zsh is installed by running one of the following commands in your terminal. You can install this via the command-line with either `curl`, `wget` or another similar tool.
 
-#### via curl
-
-```shell
-sh -c "$(curl -fsSL https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)"
-```
-
-#### via wget
-
-```shell
-sh -c "$(wget -O- https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)"
-```
-
-#### via fetch
-
-```shell
-sh -c "$(fetch -o - https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)"
-```
+| Method    | Command                                                                                           |
+|-----------|---------------------------------------------------------------------------------------------------|
+| **curl**  | `sh -c "$(curl -fsSL https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)"` |
+| **wget**  | `sh -c "$(wget -O- https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)"`   |
+| **fetch** | `sh -c "$(fetch -o - https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)"` |
 
 #### Manual inspection
 
@@ -56,7 +42,7 @@ that by downloading the install script first, looking through it so everything l
 then running it:
 
 ```shell
-curl -Lo install.sh https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh
+wget https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh
 sh install.sh
 ```
 
@@ -125,7 +111,6 @@ In case you did not find a suitable theme for your needs, please have a look at
 
 If you're feeling feisty, you can let the computer select one randomly for you each time you open a new terminal window.
 
-
 ```shell
 ZSH_THEME="random" # (...please let it be pie... please be some pie..)
 ```
@@ -205,13 +190,13 @@ REPO=apjanke/oh-my-zsh BRANCH=edge sh install.sh
 
 #### Manual Installation
 
-##### 1. Clone the repository:
+##### 1. Clone the repository
 
 ```shell
 git clone https://github.com/ohmyzsh/ohmyzsh.git ~/.oh-my-zsh
 ```
 
-##### 2. *Optionally*, backup your existing `~/.zshrc` file:
+##### 2. *Optionally*, backup your existing `~/.zshrc` file
 
 ```shell
 cp ~/.zshrc ~/.zshrc.orig
@@ -241,9 +226,9 @@ Once you open up a new terminal window, it should load zsh with Oh My Zsh's conf
 
 If you have any hiccups installing, here are a few common fixes.
 
-* You _might_ need to modify your `PATH` in `~/.zshrc` if you're not able to find some commands after
+- You _might_ need to modify your `PATH` in `~/.zshrc` if you're not able to find some commands after
 switching to `oh-my-zsh`.
-* If you installed manually or changed the install location, check the `ZSH` environment variable in
+- If you installed manually or changed the install location, check the `ZSH` environment variable in
 `~/.zshrc`.
 
 ### Custom Plugins and Themes
@@ -306,12 +291,12 @@ Thank you so much!
 
 ## Follow Us
 
-We're on the social media.
+We're on social media:
 
-* [@ohmyzsh](https://twitter.com/ohmyzsh) on Twitter. You should follow it.
-* [FaceBook](https://www.facebook.com/Oh-My-Zsh-296616263819290/) poke us.
-* [Instagram](https://www.instagram.com/_ohmyzsh/) tag us in your post showing Oh My Zsh!
-* [Discord](https://discord.gg/ohmyzsh) to chat with us!
+- [@ohmyzsh](https://twitter.com/ohmyzsh) on Twitter. You should follow it.
+- [FaceBook](https://www.facebook.com/Oh-My-Zsh-296616263819290/) poke us.
+- [Instagram](https://www.instagram.com/_ohmyzsh/) tag us in your post showing Oh My Zsh!
+- [Discord](https://discord.gg/ohmyzsh) to chat with us!
 
 ## Merchandise
 

From 1be75bbc275a92cd47b0327bb1a688eb013934ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Sat, 26 Sep 2020 13:07:14 +0200
Subject: [PATCH 100/869] Right-align table in README

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index b5403f63a..ba14d17a8 100644
--- a/README.md
+++ b/README.md
@@ -30,7 +30,7 @@ To learn more, visit [ohmyz.sh](https://ohmyz.sh), follow [@ohmyzsh](https://twi
 Oh My Zsh is installed by running one of the following commands in your terminal. You can install this via the command-line with either `curl`, `wget` or another similar tool.
 
 | Method    | Command                                                                                           |
-|-----------|---------------------------------------------------------------------------------------------------|
+|:----------|:--------------------------------------------------------------------------------------------------|
 | **curl**  | `sh -c "$(curl -fsSL https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)"` |
 | **wget**  | `sh -c "$(wget -O- https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)"`   |
 | **fetch** | `sh -c "$(fetch -o - https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)"` |

From cacf5d0435cbd33d1b9460d118720c6a9b5f6420 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Sat, 26 Sep 2020 13:08:03 +0200
Subject: [PATCH 101/869] Fix image alignment

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index ba14d17a8..0c292e100 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-<center><img src="https://s3.amazonaws.com/ohmyzsh/oh-my-zsh-logo.png" alt="Oh My Zsh"></center>
+<p align="center"><img src="https://s3.amazonaws.com/ohmyzsh/oh-my-zsh-logo.png" alt="Oh My Zsh"></p>
 
 Oh My Zsh is an open source, community-driven framework for managing your [zsh](https://www.zsh.org/) configuration.
 

From 765966606de9f1fc337818984220268af62926d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Sun, 27 Sep 2020 14:15:50 +0200
Subject: [PATCH 102/869] lib: correct :q syntax in title function for clarity

---
 lib/termsupport.zsh | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/termsupport.zsh b/lib/termsupport.zsh
index 682925211..235efec6a 100644
--- a/lib/termsupport.zsh
+++ b/lib/termsupport.zsh
@@ -18,16 +18,16 @@ function title {
 
   case "$TERM" in
     cygwin|xterm*|putty*|rxvt*|konsole*|ansi|mlterm*)
-      print -Pn "\e]2;$2:q\a" # set window name
-      print -Pn "\e]1;$1:q\a" # set tab name
+      print -Pn "\e]2;${2:q}\a" # set window name
+      print -Pn "\e]1;${1:q}\a" # set tab name
       ;;
     screen*|tmux*)
-      print -Pn "\ek$1:q\e\\" # set screen hardstatus
+      print -Pn "\ek${1:q}\e\\" # set screen hardstatus
       ;;
     *)
       if [[ "$TERM_PROGRAM" == "iTerm.app" ]]; then
-        print -Pn "\e]2;$2:q\a" # set window name
-        print -Pn "\e]1;$1:q\a" # set tab name
+        print -Pn "\e]2;${2:q}\a" # set window name
+        print -Pn "\e]1;${1:q}\a" # set tab name
       else
         # Try to use terminfo to set the title
         # If the feature is available set title

From 53259f628b81040051afbec13313769d24c96410 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Mon, 28 Sep 2020 12:09:20 +0200
Subject: [PATCH 103/869] bgnotify: use $2 in preexec hook if $1 is empty

Fixes #5803
---
 plugins/bgnotify/bgnotify.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/bgnotify/bgnotify.plugin.zsh b/plugins/bgnotify/bgnotify.plugin.zsh
index b3a6890b8..aecde20ea 100644
--- a/plugins/bgnotify/bgnotify.plugin.zsh
+++ b/plugins/bgnotify/bgnotify.plugin.zsh
@@ -53,7 +53,7 @@ bgnotify () { ## args: (title, subtitle)
 
 bgnotify_begin() {
   bgnotify_timestamp=$EPOCHSECONDS
-  bgnotify_lastcmd="$1"
+  bgnotify_lastcmd="${1:-$2}"
   bgnotify_windowid=$(currentWindowId)
 }
 

From cd7162f3d17cf8883b8d205ea31e34012e050d36 Mon Sep 17 00:00:00 2001
From: Pierre-Luc Paour <github@paour.com>
Date: Mon, 28 Sep 2020 22:24:31 +0200
Subject: [PATCH 104/869] brew: add alias for brew to avoid upgrading casks
 (#9280)

---
 plugins/brew/README.md       | 7 ++++---
 plugins/brew/brew.plugin.zsh | 1 +
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/plugins/brew/README.md b/plugins/brew/README.md
index 398d3263c..b714b7ac0 100644
--- a/plugins/brew/README.md
+++ b/plugins/brew/README.md
@@ -15,10 +15,11 @@ plugins=(... brew)
 | `brewp`  | `brew pin`                                                    | Pin a specified formula so that it's not upgraded.                  |
 | `brews`  | `brew list -1`                                                | List installed formulae or the installed files for a given formula. |
 | `brewsp` | `brew list --pinned`                                          | List pinned formulae, or show the version of a given formula.       |
-| `bubo`   | `brew update && brew outdated`                                | Update Homebrew and all formulae, then list outdated formulae.      |
-| `bubc`   | `brew upgrade && brew cleanup`                                | Upgrade outdated formulae, then run cleanup.                        |
+| `bubo`   | `brew update && brew outdated`                                | Update Homebrew data, then list outdated formulae and casks.        |
+| `bubc`   | `brew upgrade && brew cleanup`                                | Upgrade outdated formulae and casks, then run cleanup.              |
 | `bubu`   | `bubo && bubc`                                                | Do the last two operations above.                                   |
-| `bcubo`  | `brew update && brew outdated --cask`                         | Update Homebrew and all formulae, then list outdated casks.        |
+| `buf`    | `brew upgrade --formula`                                      | Upgrade only formulas (not casks).                                  |
+| `bcubo`  | `brew update && brew outdated --cask`                         | Update Homebrew data, then list outdated casks.                     |
 | `bcubc`  | `brew cask reinstall $(brew outdated --cask) && brew cleanup` | Update outdated casks, then run cleanup.                            |
 
 ## Completion
diff --git a/plugins/brew/brew.plugin.zsh b/plugins/brew/brew.plugin.zsh
index c8b1e3568..30eb135bb 100644
--- a/plugins/brew/brew.plugin.zsh
+++ b/plugins/brew/brew.plugin.zsh
@@ -4,5 +4,6 @@ alias brewsp='brew list --pinned'
 alias bubo='brew update && brew outdated'
 alias bubc='brew upgrade && brew cleanup'
 alias bubu='bubo && bubc'
+alias buf='brew upgrade --formula'
 alias bcubo='brew update && brew outdated --cask'
 alias bcubc='brew cask reinstall $(brew outdated --cask) && brew cleanup'

From 4ec055b890dc52749f6f9f076aa5da24c3266c8d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Mon, 28 Sep 2020 20:39:56 +0200
Subject: [PATCH 105/869] lib: support alacritty $TERM in title function

---
 lib/termsupport.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/termsupport.zsh b/lib/termsupport.zsh
index 235efec6a..1bab61b2a 100644
--- a/lib/termsupport.zsh
+++ b/lib/termsupport.zsh
@@ -17,7 +17,7 @@ function title {
   : ${2=$1}
 
   case "$TERM" in
-    cygwin|xterm*|putty*|rxvt*|konsole*|ansi|mlterm*)
+    cygwin|xterm*|putty*|rxvt*|konsole*|ansi|mlterm*|alacritty)
       print -Pn "\e]2;${2:q}\a" # set window name
       print -Pn "\e]1;${1:q}\a" # set tab name
       ;;

From 2b59d052ef34b9290f7951ce08cebae189bd9dde Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Tue, 29 Sep 2020 12:06:21 +0200
Subject: [PATCH 106/869] composer: autoload cache functions

Fixes #9236
---
 plugins/composer/composer.plugin.zsh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/plugins/composer/composer.plugin.zsh b/plugins/composer/composer.plugin.zsh
index 330360cdd..75b03ffe7 100644
--- a/plugins/composer/composer.plugin.zsh
+++ b/plugins/composer/composer.plugin.zsh
@@ -51,6 +51,8 @@ alias cget='curl -s https://getcomposer.org/installer | php'
 
 # Add Composer's global binaries to PATH, using Composer if available.
 if (( $+commands[composer] )); then
+    autoload -Uz _store_cache _retrieve_cache
+
     _retrieve_cache composer
 
     if [[ -z $__composer_bin_dir ]]; then

From 274df9dc2921deb0a773c4aee70a0c3d0542c31b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Tue, 29 Sep 2020 18:34:35 +0200
Subject: [PATCH 107/869] lib: support simple terminal in title function

Fixes #9295
---
 lib/termsupport.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/termsupport.zsh b/lib/termsupport.zsh
index 1bab61b2a..8cb2389e2 100644
--- a/lib/termsupport.zsh
+++ b/lib/termsupport.zsh
@@ -17,7 +17,7 @@ function title {
   : ${2=$1}
 
   case "$TERM" in
-    cygwin|xterm*|putty*|rxvt*|konsole*|ansi|mlterm*|alacritty)
+    cygwin|xterm*|putty*|rxvt*|konsole*|ansi|mlterm*|alacritty|st*)
       print -Pn "\e]2;${2:q}\a" # set window name
       print -Pn "\e]1;${1:q}\a" # set tab name
       ;;

From 71cc861806f30d8f7fd3d0040db86737cab62581 Mon Sep 17 00:00:00 2001
From: Olivier Lemasle <o.lemasle@gmail.com>
Date: Tue, 29 Sep 2020 23:35:29 +0200
Subject: [PATCH 108/869] minikube: fix spelling (#9270)

---
 plugins/minikube/minikube.plugin.zsh | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/plugins/minikube/minikube.plugin.zsh b/plugins/minikube/minikube.plugin.zsh
index f7b365c7f..e87abceaf 100644
--- a/plugins/minikube/minikube.plugin.zsh
+++ b/plugins/minikube/minikube.plugin.zsh
@@ -1,13 +1,13 @@
 # Autocompletion for Minikube.
 #
 if (( $+commands[minikube] )); then
-    __MINICUBE_COMPLETION_FILE="${ZSH_CACHE_DIR}/minicube_completion"
+    __MINIKUBE_COMPLETION_FILE="${ZSH_CACHE_DIR}/minikube_completion"
 
-    if [[ ! -f $__MINICUBE_COMPLETION_FILE ]]; then
-        minikube completion zsh >! $__MINICUBE_COMPLETION_FILE
+    if [[ ! -f $__MINIKUBE_COMPLETION_FILE ]]; then
+        minikube completion zsh >! $__MINIKUBE_COMPLETION_FILE
     fi
 
-    [[ -f $__MINICUBE_COMPLETION_FILE ]] && source $__MINICUBE_COMPLETION_FILE
+    [[ -f $__MINIKUBE_COMPLETION_FILE ]] && source $__MINIKUBE_COMPLETION_FILE
 
-    unset __MINICUBE_COMPLETION_FILE
+    unset __MINIKUBE_COMPLETION_FILE
 fi

From a8828aad87a900605044da2bdda7994518ddf74e Mon Sep 17 00:00:00 2001
From: Andrew Babichev <andrew.babichev@gmail.com>
Date: Wed, 30 Sep 2020 11:50:33 +0300
Subject: [PATCH 109/869] terraform: add tf Alias (#8206)

---
 plugins/terraform/README.md            | 3 ++-
 plugins/terraform/terraform.plugin.zsh | 2 ++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/plugins/terraform/README.md b/plugins/terraform/README.md
index 471aef24e..9e9f0cdfb 100644
--- a/plugins/terraform/README.md
+++ b/plugins/terraform/README.md
@@ -2,7 +2,7 @@
 
 Plugin for Terraform, a tool from Hashicorp for managing infrastructure safely and efficiently.
 
-Current as of Terraform v0.11.7
+Current as of Terraform v0.13
 
 ### Requirements
 
@@ -17,6 +17,7 @@ plugins=(... terraform)
 ```
 
  * Type `terraform` into your prompt and hit `TAB` to see available completion options
+ * Type `tf` into your prompt as a short alias to `terraform`
 
 ### Expanding ZSH prompt with current Terraform workspace name
 
diff --git a/plugins/terraform/terraform.plugin.zsh b/plugins/terraform/terraform.plugin.zsh
index d727c1ee0..2c42d394d 100644
--- a/plugins/terraform/terraform.plugin.zsh
+++ b/plugins/terraform/terraform.plugin.zsh
@@ -7,3 +7,5 @@ function tf_prompt_info() {
       echo "[${workspace}]"
     fi
 }
+
+alias tf='terraform'

From f776af2a1f5d5ced17bdeb00f7adb64ccfaa99a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Wed, 30 Sep 2020 19:00:51 +0200
Subject: [PATCH 110/869] Remove redundant bashcompinit calls

Fixes #9246
---
 plugins/aws/aws.plugin.zsh           | 1 -
 plugins/compleat/compleat.plugin.zsh | 7 ++-----
 plugins/drush/drush.plugin.zsh       | 2 --
 plugins/stack/stack.plugin.zsh       | 1 -
 plugins/wp-cli/wp-cli.plugin.zsh     | 1 -
 5 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/plugins/aws/aws.plugin.zsh b/plugins/aws/aws.plugin.zsh
index 7994963c3..ecf78b2c2 100644
--- a/plugins/aws/aws.plugin.zsh
+++ b/plugins/aws/aws.plugin.zsh
@@ -64,7 +64,6 @@ fi
 
 # AWS CLI v2 comes with its own autocompletion. Check if that is there, otherwise fall back
 if command -v aws_completer &> /dev/null; then
-  autoload -Uz bashcompinit && bashcompinit
   complete -C aws_completer aws
 else
   function _awscli-homebrew-installed() {
diff --git a/plugins/compleat/compleat.plugin.zsh b/plugins/compleat/compleat.plugin.zsh
index 38f1b396a..247240c20 100644
--- a/plugins/compleat/compleat.plugin.zsh
+++ b/plugins/compleat/compleat.plugin.zsh
@@ -10,11 +10,8 @@ if (( ${+commands[compleat]} )); then
   local setup="${prefix}/share/compleat-1.0/compleat_setup" 
 
   if [[ -f "$setup" ]]; then
-    if ! bashcompinit >/dev/null 2>&1; then
-      autoload -U bashcompinit
-      bashcompinit -i
-    fi
-
     source "$setup" 
   fi
+
+  unset prefix setup
 fi
diff --git a/plugins/drush/drush.plugin.zsh b/plugins/drush/drush.plugin.zsh
index 8a20d79f2..178750c24 100644
--- a/plugins/drush/drush.plugin.zsh
+++ b/plugins/drush/drush.plugin.zsh
@@ -99,6 +99,4 @@ alias drvg="drush variable-get"
 alias drvs="drush variable-set"
 
 # Enable drush autocomplete support
-autoload bashcompinit
-bashcompinit
 source $(dirname $0)/drush.complete.sh
diff --git a/plugins/stack/stack.plugin.zsh b/plugins/stack/stack.plugin.zsh
index 45ef38761..e3b6503a5 100644
--- a/plugins/stack/stack.plugin.zsh
+++ b/plugins/stack/stack.plugin.zsh
@@ -1,4 +1,3 @@
 (( $+commands[stack] )) || return
 
-autoload -U +X bashcompinit && bashcompinit
 source <(stack --bash-completion-script stack)
diff --git a/plugins/wp-cli/wp-cli.plugin.zsh b/plugins/wp-cli/wp-cli.plugin.zsh
index 97bed406e..05ecc4b8a 100644
--- a/plugins/wp-cli/wp-cli.plugin.zsh
+++ b/plugins/wp-cli/wp-cli.plugin.zsh
@@ -138,7 +138,6 @@ alias wpwm='wp widget move'
 alias wpwu='wp widget update'
 
 
-autoload -U +X bashcompinit && bashcompinit
 # bash completion for the `wp` command
 
 _wp_complete() {

From 1617f4ffafd6114fb3ccbdbb782eeaf25a7f2905 Mon Sep 17 00:00:00 2001
From: Goose <52642831+rekaerst@users.noreply.github.com>
Date: Thu, 1 Oct 2020 21:44:59 +0800
Subject: [PATCH 111/869] pip: move plugin cache to XDG folder (#9299)

---
 plugins/pip/pip.plugin.zsh | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/plugins/pip/pip.plugin.zsh b/plugins/pip/pip.plugin.zsh
index aaae90185..a46e7658c 100644
--- a/plugins/pip/pip.plugin.zsh
+++ b/plugins/pip/pip.plugin.zsh
@@ -9,7 +9,11 @@
 # If you would like to clear your cache, go ahead and do a
 # "zsh-pip-clear-cache".
 
-ZSH_PIP_CACHE_FILE=~/.pip/zsh-cache
+if [[ -d "${XDG_CACHE_HOME:-$HOME/.cache}/pip" ]]; then
+  ZSH_PIP_CACHE_FILE="${XDG_CACHE_HOME:-$HOME/.cache}/pip/zsh-cache"
+else
+  ZSH_PIP_CACHE_FILE=~/.pip/zsh-cache
+fi
 ZSH_PIP_INDEXES=(https://pypi.org/simple/)
 
 zsh-pip-clear-cache() {

From d5dc9f71534e95547d73feff366a4437f6d7ef31 Mon Sep 17 00:00:00 2001
From: Amir Masoud Abdol <amirmasoudabdol@icloud.com>
Date: Sat, 3 Oct 2020 11:47:18 +0200
Subject: [PATCH 112/869] Add sublime-merge plugin (#7228)

---
 plugins/sublime-merge/README.md               | 17 ++++++
 .../sublime-merge/sublime-merge.plugin.zsh    | 55 +++++++++++++++++++
 2 files changed, 72 insertions(+)
 create mode 100644 plugins/sublime-merge/README.md
 create mode 100644 plugins/sublime-merge/sublime-merge.plugin.zsh

diff --git a/plugins/sublime-merge/README.md b/plugins/sublime-merge/README.md
new file mode 100644
index 000000000..534479179
--- /dev/null
+++ b/plugins/sublime-merge/README.md
@@ -0,0 +1,17 @@
+## sublime-merge
+
+Plugin for Sublime Merge, a cross platform text and code editor, available for Linux, Mac OS X, and Windows.
+
+### Requirements
+
+ * [Sublime Merge](https://www.sublimemerge.com)
+
+### Usage
+
+ * If `sm` command is called without an argument, launch Sublime Merge
+
+ * If `sm` is passed a directory, `cd` to it and open the existing git repository in Sublime Merge
+
+ * If `smt` command is called, it is equivalent to `sm .`, opening the existing git repository in the current folder in Sublime Merge
+
+ * If `ssm` command is called, it is like `sudo sm`, opening the git repository in Sublime Merge. Useful for editing system protected repositories.
\ No newline at end of file
diff --git a/plugins/sublime-merge/sublime-merge.plugin.zsh b/plugins/sublime-merge/sublime-merge.plugin.zsh
new file mode 100644
index 000000000..15452e61a
--- /dev/null
+++ b/plugins/sublime-merge/sublime-merge.plugin.zsh
@@ -0,0 +1,55 @@
+# Sublime Merge Aliases
+
+() {
+
+	if [[ "$OSTYPE" == linux* ]]; then
+		local _sublime_linux_paths
+		_sublime_linux_paths=(
+			"$HOME/bin/sublime_merge"
+			"/opt/sublime_merge/sublime_merge"
+			"/usr/bin/sublime_merge"
+			"/usr/local/bin/sublime_merge"
+			"/usr/bin/sublime_merge"
+			"/usr/local/bin/smerge"
+			"/usr/bin/smerge"
+			)
+		for _sublime_merge_path in $_sublime_linux_paths; do
+			if [[ -a $_sublime_merge_path ]]; then
+				sm_run() { $_sublime_merge_path "$@" >/dev/null 2>&1 &| }
+				ssm_run_sudo() {sudo $_sublime_merge_path "$@" >/dev/null 2>&1}
+				alias ssm=ssm_run_sudo
+				alias sm=sm_run
+				break
+			fi
+		done
+	elif  [[ "$OSTYPE" = darwin* ]]; then
+		local _sublime_darwin_paths
+		_sublime_darwin_paths=(
+			"/usr/local/bin/smerge"
+			"/Applications/Sublime Merge.app/Contents/SharedSupport/bin/smerge"
+			"$HOME/Applications/Sublime Merge.app/Contents/SharedSupport/bin/smerge"
+			)
+		for _sublime_merge_path in $_sublime_darwin_paths; do
+			if [[ -a $_sublime_merge_path ]]; then
+				subm () { "$_sublime_merge_path" "$@" }
+				alias sm=subm
+				break
+			fi
+		done
+	elif [[ "$OSTYPE" = 'cygwin' ]]; then
+		local sublime_merge_cygwin_paths
+		sublime_merge_cygwin_paths=(
+			"$(cygpath $ProgramW6432/Sublime\ Merge)/sublime_merge.exe"
+			)
+		for _sublime_merge_path in $_sublime_merge_cygwin_paths; do
+			if [[ -a $_sublime_merge_path ]]; then
+				subm () { "$_sublime_merge_path" "$@" }
+				alias sm=subm
+				break
+			fi
+		done
+	fi
+
+}
+
+alias smt='sm .'

From 7fce07a50cce6897efabe094b7c3272326955eb0 Mon Sep 17 00:00:00 2001
From: Angel Ramboi <angel@ramboi.com>
Date: Sat, 3 Oct 2020 11:49:42 +0200
Subject: [PATCH 113/869] Add completion plugin for IPFS (InterPlanetary File
 System) (#4737)

---
 plugins/ipfs/LICENSE   |  22 ++
 plugins/ipfs/README.md |  17 +
 plugins/ipfs/_ipfs     | 717 +++++++++++++++++++++++++++++++++++++++++
 3 files changed, 756 insertions(+)
 create mode 100644 plugins/ipfs/LICENSE
 create mode 100644 plugins/ipfs/README.md
 create mode 100644 plugins/ipfs/_ipfs

diff --git a/plugins/ipfs/LICENSE b/plugins/ipfs/LICENSE
new file mode 100644
index 000000000..cf84491bb
--- /dev/null
+++ b/plugins/ipfs/LICENSE
@@ -0,0 +1,22 @@
+The MIT License (MIT)
+
+Copyright (c) 2015 Angel Ramboi
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
diff --git a/plugins/ipfs/README.md b/plugins/ipfs/README.md
new file mode 100644
index 000000000..0808a26c1
--- /dev/null
+++ b/plugins/ipfs/README.md
@@ -0,0 +1,17 @@
+# zsh-ipfs
+
+zsh completion plugin for [The InterPlanetary File System (IPFS)][1]
+
+Please submit issues and pull requests to the [main zsh-ipfs repo][2].
+
+### About
+
+[IPFS (InterPlanetary File System)][1] is a peer-to-peer hypermedia protocol
+designed to make the web faster, safer, and more open.
+
+### License
+
+See: https://github.com/hellounicorn/zsh-ipfs/blob/master/LICENSE
+
+[1]: http://ipfs.io/
+[2]: https://github.com/hellounicorn/zsh-ipfs
diff --git a/plugins/ipfs/_ipfs b/plugins/ipfs/_ipfs
new file mode 100644
index 000000000..9ee8bd79c
--- /dev/null
+++ b/plugins/ipfs/_ipfs
@@ -0,0 +1,717 @@
+#compdef ipfs
+#autoload
+
+local -a _1st_arguments
+_1st_arguments=(
+  'add:Add a file or directory to ipfs.'
+  'bitswap:Interact with the bitswap agent.'
+  'block:Interact with raw IPFS blocks.'
+  'bootstrap:Show or edit the list of bootstrap peers.'
+  'cat:Show IPFS object data.'
+  'cid:Convert and discover properties of CIDs'
+  'commands:List all available commands.'
+  'config:Get and set ipfs config values.'
+  'daemon:Run a network-connected IPFS node.'
+  'dag:Interact with ipld dag objects. (experimental)'
+  'dht:Issue commands directly through the DHT.'
+  'diag:Generate diagnostic reports.'
+  'dns:Resolve DNS links.'
+  'files:Interact with unixfs files.'
+  'filestore:Interact with filestore objects. (experimental)'
+  'get:Download IPFS objects.'
+  'id:Show ipfs node id info.'
+  'init:Initializes ipfs config file.'
+  'key:Create and list IPNS name keypairs.'
+  'log:Interact with the daemon log output.'
+  'ls:List directory contents for Unix filesystem objects.'
+  'mount:Mounts IPFS to the filesystem (read-only).'
+  'name:Publish and resolve IPNS names.'
+  'object:Interact with IPFS objects.'
+  'p2p:Libp2p stream mounting.'
+  'pin:Pin (and unpin) objects to local storage.'
+  'ping:Send echo request packets to IPFS hosts.'
+  'refs:List links (references) from an object.'
+  'repo:Manipulate the IPFS repo.'
+  'resolve:Resolve the value of names to IPFS.'
+  'stats:Query IPFS statistics.'
+  'swarm:Interact with the swarm.'
+  'tar:Utility functions for tar files in ipfs.'
+  'update:Download and apply go-ipfs updates'
+  'version:Show ipfs version information.'
+)
+
+_ipfs_subcommand(){
+  local curcontext="$curcontext" state line
+  typeset -A opt_args
+  _arguments -C ':command:->command' '*::options:->options'
+  case $state in
+    (command)
+      _describe -t commands "ipfs subcommand" $1
+      return
+    ;;
+    (options)
+      case $line[1] in
+        (wantlist)
+          case $MAIN_SUBCOMMAND in
+            (bitswap)
+              _arguments '(-p --peer)'{-p,--peer}'[Specify which peer to show wantlist for. Default: self.]'
+            ;;
+          esac
+        ;;
+        (add)
+          case $MAIN_SUBCOMMAND in
+            (pin)
+              _arguments \
+                '(-r --recursive)'{-r,--recursive}'[Recursively pin the object linked to by the specified object(s). Default: true.]' \
+                '--progress[Show progress.]'
+            ;;
+            (bootstrap)
+              local -a _bootstrap_rm_arguments
+              _bootstrap_rm_arguments=(
+                'default:Add default peers to the bootstrap list.'
+              )
+              _ipfs_subcommand _bootstrap_rm_arguments
+            ;;
+          esac
+        ;;
+        (rm)
+          case $MAIN_SUBCOMMAND in
+            (pin)
+              _arguments '(-r --recursive)'{-r,--recursive}'[Recursively unpin the object linked to by the specified object(s). Default: true.]'
+            ;;
+            (bootstrap)
+              local -a _bootstrap_rm_arguments
+              _bootstrap_rm_arguments=(
+                'all:Remove all peers from the bootstrap list.'
+              )
+              _ipfs_subcommand _bootstrap_rm_arguments
+            ;;
+          esac
+        ;;
+        (ls)
+          case $MAIN_SUBCOMMAND in
+            (pin)
+              _arguments \
+                '(-t --type)'{-t,--type}'[The type of pinned keys to list. Can be "direct", "indirect", "recursive", or "all". Default: all.]' \
+                '(-q --quiet)'{-q,--quiet}'[Write just hashes of objects.]'
+            ;;
+            (p2p)
+              _arguments '(-v --headers)'{-v,--headers}'[Print table headers (Protocol, Listen, Target).]'
+            ;;
+          esac
+        ;;
+        (update)
+          case $MAIN_SUBCOMMAND in
+            (pin)
+              _arguments '--unpin[Remove the old pin. Default: true.]'
+            ;;
+          esac
+        ;;
+        (verify)
+          case $MAIN_SUBCOMMAND in
+            (pin)
+              _arguments \
+                '--verbose[Also write the hashes of non-broken pins.]' \
+                '(-q --quiet)'{-q,--quiet}'[Write just hashes of broken pins.]'
+            ;;
+          esac
+        ;;
+        (get|query|findpeer)
+          case $MAIN_SUBCOMMAND in
+            (dht)
+              _arguments '(-v --verbose)'{-v,--verbose}'[Print extra information.]'
+            ;;
+            (object)
+              _arguments '--data-encoding[Encoding type of the data field, either "text" or "base64". Default: text.]'
+            ;;
+          esac
+        ;;
+        (put)
+          case $MAIN_SUBCOMMAND in
+            (dht)
+              _arguments '(-v --verbose)'{-v,--verbose}'[Print extra information.]'
+            ;;
+            (object)
+              _arguments \
+                '--inputenc[Encoding type of input data. One of: {"protobuf", "json"}. Default: json.]' \
+                '--datafieldenc[Encoding type of the data field, either "text" or "base64". Default: text.]' \
+                '--pin[Pin this object when adding.]' \
+                '(-q --quiet)'{-q,--quiet}'[Write minimal output]'
+            ;;
+          esac
+        ;;
+        (findprovs)
+          case $MAIN_SUBCOMMAND in
+            (dht)
+              _arguments \
+                '(-v --verbose)'{-v,--verbose}'[Print extra information.]' \
+                '(-n --num-providers)'{-n,--num-providers}'[The number of providers to find. Default: 20.]'
+            ;;
+          esac
+        ;;
+        (provide)
+          case $MAIN_SUBCOMMAND in
+            (dht)
+              _arguments \
+                '(-v --verbose)'{-v,--verbose}'[Print extra information.]' \
+                '(-r --recursive)'{-r,--recursive}'[Recursively provide entire graph.]'
+            ;;
+          esac
+        ;;
+        (cmds|diff)
+          case $MAIN_SUBCOMMAND in
+            (diag|object)
+              _arguments '(-v --verbose)'{-v,--verbose}'[Print extra information.]'
+            ;;
+          esac
+        ;;
+        (stat)
+          case $MAIN_SUBCOMMAND in
+            (object)
+              _arguments '--human[Print sizes in human readable format (e.g., 1K 234M 2G).]'
+            ;;
+            (repo)
+              _arguments \
+                '--size-only[Only report RepoSize and StorageMax.]' \
+                '--human[Print sizes in human readable format (e.g., 1K 234M 2G).]'
+            ;;
+          esac
+        ;;
+        (publish)
+          case $MAIN_SUBCOMMAND in
+            (name)
+              _arguments \
+                '--resolve[Check if the given path can be resolved before publishing. Default: true.]' \
+                '(-t --lifetime)'{-t,--lifetime}'[Time duration that the record will be valid for. Default: 24h.]' \
+                '--allow-offline[When offline, save the IPNS record to the the local datastore without broadcasting to the network instead of simply failing.]' \
+                '--ttl[Time duration this record should be cached for. Uses the same syntax as the lifetime option. (caution: experimental).]' \
+                '(-k --key)'{-k,--key}"[Name of the key to be used or a valid PeerID, as listed by 'ipfs key list -l'. Default: self.]" \
+                '(-Q --quieter)'{-Q,--quieter}'[Write only final hash.]'
+            ;;
+          esac
+        ;;
+        (pubsub)
+          case $MAIN_SUBCOMMAND in
+            (name)
+              local -a _name_pubsub_arguments
+              _name_pubsub_arguments=(
+                'cancel:Cancel a name subscription'
+                'state:Query the state of IPNS pubsub'
+                'subs:Show current name subscriptions'
+              )
+              _ipfs_subcommand _name_pubsub_arguments
+            ;;
+          esac
+        ;;
+        (resolve)
+          case $MAIN_SUBCOMMAND in
+            (name)
+              _arguments \
+                '(-r --recursive)'{-r,--recursive}'[Resolve until the result is not an IPNS name. Default: true.]' \
+                '(-n --nocache)'{-n,--nocache}'[Do not use cached entries.]' \
+                '(--dhtrc --dht-record-count)'{--dhtrc,--dht-record-count}'[Number of records to request for DHT resolution.]' \
+                '(--dhtt --dht-timeout)'{--dhtt,--dht-timeout}'[Max time to collect values during DHT resolution eg "30s". Pass 0 for no timeout.]' \
+                '(-s --stream)'{-s,--stream}'[Stream entries as they are found.]'
+            ;;
+          esac
+        ;;
+        (patch)
+          case $MAIN_SUBCOMMAND in
+            (object)
+              local -a _object_patch_arguments
+              _object_patch_arguments=(
+                'add-link:Add a link to a given object.'
+                'append-data:Append data to the data segment of a dag node.'
+                'rm-link:Remove a link from a given object.'
+                'set-data:Set the data field of an IPFS object.'
+              )
+              _ipfs_subcommand _object_patch_arguments
+            ;;
+          esac
+        ;;
+        (gc)
+          case $MAIN_SUBCOMMAND in
+            (repo)
+              _arguments \
+                '--stream-errors[Stream errors.]' \
+                '(-q --quiet)'{-q,--quiet}'[Write minimal output.]'
+            ;;
+          esac
+        ;;
+        (bitswap)
+          case $MAIN_SUBCOMMAND in
+            (stats)
+              _arguments \
+                '(-v --verbose)'{-v,--verbose}'[Print extra information.]' \
+                '--human[Print sizes in human readable format (e.g., 1K 234M 2G).]'
+            ;;
+          esac
+        ;;
+        (bw)
+          case $MAIN_SUBCOMMAND in
+            (stats)
+              _arguments \
+                '(-p --peer)'{-p,--peer}'[Specify a peer to print bandwidth for.]' \
+                '(-t --proto)'{-t,--proto}'[Specify a protocol to print bandwidth for.]' \
+                '--poll[Print bandwidth at an interval.]' \
+                '(-i --interval)'{-i,--interval}'[Time interval to wait between updating output, if 'poll' is true.]'
+            ;;
+          esac
+        ;;
+        (repo)
+          case $MAIN_SUBCOMMAND in
+            (stats)
+              _arguments \
+                '--size-only[Only report RepoSize and StorageMax.]' \
+                '--human[Print sizes in human readable format (e.g., 1K 234M 2G).]'
+            ;;
+          esac
+        ;;
+        (bases)
+          case $MAIN_SUBCOMMAND in
+            (cid)
+              _arguments \
+                '--prefix[also include the single leter prefixes in addition to the code.]' \
+                '--numeric[also include numeric codes.]'
+            ;;
+          esac
+        ;;
+        (codecs|hashes)
+          case $MAIN_SUBCOMMAND in
+            (cid)
+              _arguments '--numeric[also include numeric codes.]'
+            ;;
+          esac
+        ;;
+        (format)
+          case $MAIN_SUBCOMMAND in
+            (cid)
+              _arguments \
+                '-f[Printf style format string. Default: %s.]' \
+                '-v[CID version to convert to.]' \
+                '-b[Multibase to display CID in.]'
+            ;;
+          esac
+        ;;
+        (close)
+          case $MAIN_SUBCOMMAND in
+            (p2p)
+              _arguments \
+                '(-a --all)'{-a,--all}'[Close all listeners.]' \
+                '(-p --protocol)'{-p,--protocol}'[Match protocol name.]' \
+                '(-l --listen-address)'{-l,--listen-address}'[Match listen address.]' \
+                '(-t --target-address)'{-t,--target-address}'[Match target address.]'
+            ;;
+          esac
+        ;;
+        (forward)
+          case $MAIN_SUBCOMMAND in
+            (p2p)
+              _arguments "--allow-custom-protocol[Don't require /x/ prefix.]"
+            ;;
+          esac
+        ;;
+        (listen)
+          case $MAIN_SUBCOMMAND in
+            (p2p)
+              _arguments \
+                "--allow-custom-protocol[Don't require /x/ prefix.]" \
+                '(-r --report-peer-id)'{-r,--report-peer-id}'[Send remote base58 peerid to target when a new connection is established.]'
+            ;;
+          esac
+        ;;
+        (stream)
+          case $MAIN_SUBCOMMAND in
+            (p2p)
+              local -a _p2p_stream_arguments
+              _p2p_stream_arguments=(
+                'close:Close active p2p stream.'
+                'ls:List active p2p streams.'
+              )
+              _ipfs_subcommand _p2p_stream_arguments
+            ;;
+          esac
+        ;;
+        (addrs)
+          case $MAIN_SUBCOMMAND in
+            (swarm)
+              local -a _swarm_addrs_arguments
+              _swarm_addrs_arguments=(
+                'listen:List interface listening addresses.'
+                'local:List local addresses.'
+              )
+              _ipfs_subcommand _swarm_addrs_arguments
+            ;;
+          esac
+        ;;
+        (filters)
+          case $MAIN_SUBCOMMAND in
+            (swarm)
+              local -a _swarm_filters_arguments
+              _swarm_filters_arguments=(
+                'add:Add an address filter.'
+                'rm:Remove an address filter.'
+              )
+              _ipfs_subcommand _swarm_filters_arguments
+            ;;
+          esac
+        ;;
+        (peers)
+          case $MAIN_SUBCOMMAND in
+            (swarm)
+              _arguments \
+                '(-v --verbose)'{-v,--verbose}'[display all extra information.]' \
+                '--streams[Also list information about open streams for each peer.]' \
+                '--latency[Also list information about latency to each peer.]' \
+                '--direction[Also list information about the direction of connection.]'
+            ;;
+          esac
+        ;;
+      esac
+    ;;
+  esac
+}
+
+local expl
+
+_arguments \
+  '(-c --config)'{-c,--config}'[Path to the configuration file to use.]' \
+  '(-D --debug)'{-D,--debug}'[Operate in debug mode.]' \
+  '(--help)--help[Show the full command help text.]' \
+  '(--h)-h[Show a short version of the command help text.]' \
+  '(-L --local)'{-L,--local}'[Run the command locally, instead of using the daemon. DEPRECATED: use --offline.]' \
+  '(--offline)--offline[Run the command offline.]' \
+  '(--api)--api[Use a specific API instance (defaults to /ip4/127.0.0.1/tcp/5001).]' \
+  '(--cid-base)--cid-base[Multibase encoding used for version 1 CIDs in output.]' \
+  '(--upgrade-cidv0-in-output)--upgrade-cidv0-in-output[Upgrade version 0 to version 1 CIDs in output.]' \
+  '(--enc --encoding)'{--enc,--encoding}'[The encoding type the output should be encoded with (json, xml, or text). Default: text.]' \
+  '(--stream-channels)--stream-channels[Stream channel output.]' \
+  '(--timeout)--timeout[Set a global timeout on the command.]' \
+  '*:: :->subcmds' && return 0
+
+if (( CURRENT == 1 )); then
+  _describe -t commands "ipfs subcommand" _1st_arguments
+  return
+fi
+
+MAIN_SUBCOMMAND="$words[1]"
+case $MAIN_SUBCOMMAND in
+  (add)
+    _arguments \
+      '(-r --recursive)'{-r,--recursive}'[Add directory paths recursively.]' \
+      '(--dereference-args)--dereference-args[Symlinks supplied in arguments are dereferenced.]' \
+      '(--stdin-name)--stdin-name[Assign a name if the file source is stdin.]' \
+      '(-H --hidden)'{-H,--hidden}'[Include files that are hidden. Only takes effect on recursive add.]' \
+      '(-q --quiet)'{-q,--quiet}'[Write minimal output.]' \
+      '(-Q --quieter)'{-Q,--quieter}'[Write only final hash.]' \
+      '(--silent)--silent[Write no output.]' \
+      '(-p --progress)'{-p,--progress}'[Stream progress data.]' \
+      '(-t --trickle)'{-t,--trickle}'[Use trickle-dag format for dag generation.]' \
+      '(-n --only-hash)'{-n,--only-hash}'[Only chunk and hash - do not write to disk.]' \
+      '(-w --wrap-with-directory)'{-w,--wrap-with-directory}'[Wrap files with a directory object.]' \
+      '(-s --chunker)'{-s,--chunker}'[Chunking algorithm, size-(bytes) or rabin-(min)-(avg)-(max). Default: size-262144.]' \
+      '(--pin)--pin[Pin this object when adding. Default: true.]' \
+      '(--raw-leaves)--raw-leaves[Use raw blocks for leaf nodes. (experimental).]' \
+      '(--nocopy)--nocopy[Add the file using filestore. Implies raw-leaves. (experimental).]' \
+      '(--fscache)--fscache[Check the filestore for pre-existing blocks. (experimental).]' \
+      '(--cid-version)--cid-version[CID version. Defaults to 0 unless an option that depends on CIDv1 is passed. (experimental).]' \
+      '(--hash)--hash[Hash function to use. Implies CIDv1 if not sha2-256. (experimental). Default: sha2-256.]' \
+      '(--inline)--inline[Inline small blocks into CIDs. (experimental).]' \
+      '(--inline-limit)--inline-limit[Maximum block size to inline. (experimental). Default: 32.]'
+  ;;
+  (bitswap)
+    local -a _bitswap_arguments
+    _bitswap_arguments=(
+      'ledger:Show the current ledger for a peer.'
+      'reprovide:Trigger reprovider.'
+      'stat:Show some diagnostic information on the bitswap agent.'
+      'wantlist:Show blocks currently on the wantlist.'
+    )
+    _ipfs_subcommand _bitswap_arguments
+  ;;
+  (block)
+    local -a _block_arguments
+    _block_arguments=(
+      'get:Get a raw IPFS block.'
+      'put:Store input as an IPFS block.'
+      'rm:Remove IPFS block(s).'
+      'stat:Print information of a raw IPFS block.'
+    )
+    _ipfs_subcommand _block_arguments
+  ;;
+  (bootstrap)
+    local -a _bootstrap_arguments
+    _bootstrap_arguments=(
+      'add:Add peers to the bootstrap list.'
+      'list:Show peers in the bootstrap list.'
+      'rm:Remove peers from the bootstrap list.'
+    )
+    _ipfs_subcommand _bootstrap_arguments
+  ;;
+  (cat)
+    _arguments \
+      '(-o --offset)'{-o,--offset}'[Byte offset to begin reading from.]' \
+      '(-l --length)'{-l,--length}'[Maximum number of bytes to read.]'
+  ;;
+  (cid)
+    local -a _cid_arguments
+    _cid_arguments=(
+      'base32:Convert CIDs to Base32 CID version 1.'
+      'bases:List available multibase encodings.'
+      'codecs:List available CID codecs.'
+      'format:Format and convert a CID in various useful ways.'
+      'hashes:List available multihashes.'
+    )
+    _ipfs_subcommand _cid_arguments
+  ;;
+  (commands)
+    _arguments '(-f --flags)'{-f,--flags}'[Show command flags.]'
+  ;;
+  (config)
+    _arguments \
+      '--bool[Set a boolean value.]' \
+      '--json[Parse stringified JSON.]'
+    local -a _config_arguments
+    _config_arguments=(
+      'edit:Open the config file for editing in $EDITOR.'
+      'profile:Apply profiles to config.'
+      'replace:Replace the config with <file>.'
+      'show:Output config file contents.'
+    )
+    _ipfs_subcommand _config_arguments
+  ;;
+  (daemon)
+    _arguments \
+      '--init[Initialize ipfs with default settings if not already initialized.]' \
+      '--init-profile[Configuration profiles to apply for --init. See ipfs init --help for more.]' \
+      '--routing[Overrides the routing option. Default: default.]' \
+      '--mount[Mounts IPFS to the filesystem.]' \
+      '--writable[Enable writing objects (with POST, PUT and DELETE).]' \
+      '--mount-ipfs[Path to the mountpoint for IPFS (if using --mount). Defaults to config setting.]' \
+      '--mount-ipns[Path to the mountpoint for IPNS (if using --mount). Defaults to config setting.]' \
+      '--unrestricted-api[Allow API access to unlisted hashes.]' \
+      '--disable-transport-encryption[Disable transport encryption (for debugging protocols).]' \
+      '--enable-gc[Enable automatic periodic repo garbage collection.]' \
+      '--manage-fdlimit[Check and raise file descriptor limits if needed. Default: true.]' \
+      '--migrate[If true, assume yes at the migrate prompt. If false, assume no.]' \
+      '--enable-pubsub-experiment[Instantiate the ipfs daemon with the experimental pubsub feature enabled.]' \
+      '--enable-namesys-pubsub[Enable IPNS record distribution through pubsub; enables pubsub.]' \
+      '--enable-mplex-experiment[Add the experimental 'go-multiplex' stream muxer to libp2p on construction. Default: true.]'
+  ;;
+  (dag)
+    local -a _dag_arguments
+    _dag_arguments=(
+      'get:Get a dag node from ipfs.'
+      'put:Add a dag node to ipfs.'
+      'resolve:Resolve ipld block.'
+    )
+    _ipfs_subcommand _dag_arguments
+  ;;
+  (dht)
+    local -a _dht_arguments
+    _dht_arguments=(
+      'findpeer:Find the multiaddresses associated with a Peer ID.'
+      'findprovs:Find peers that can provide a specific value, given a key.'
+      'get:Given a key, query the routing system for its best value.'
+      'provide:Announce to the network that you are providing given values.'
+      'put:Write a key/value pair to the routing system.'
+      'query:Find the closest Peer IDs to a given Peer ID by querying the DHT.'
+    )
+    _ipfs_subcommand _dht_arguments
+  ;;
+  (diag)
+    local -a _diag_arguments
+    _diag_arguments=(
+      'cmds:List commands run on this IPFS node.'
+      'sys:Print system diagnostic information.'
+    )
+    _ipfs_subcommand _diag_arguments
+  ;;
+  (dns)
+    _arguments '(-r --recursive)'{-r,--recursive}'[Resolve until the result is not a DNS link. Default: true.]'
+  ;;
+  (files)
+    _arguments '(-f --flush)'{-f,--flush}'[Flush target and ancestors after write. Default: true.]'
+    local -a _files_arguments
+    _files_arguments=(
+      'chcid:Change the cid version or hash function of the root node of a given path.'
+      'cp:Copy files into mfs.'
+      "flush:Flush a given path's data to disk."
+      'ls:List directories in the local mutable namespace.'
+      'mkdir:Make directories.'
+      'mv:Move files.'
+      'read:Read a file in a given mfs.'
+      'rm:Remove a file.'
+      'stat:Display file status.'
+      'write:Write to a mutable file in a given filesystem.'
+    )
+    _ipfs_subcommand _files_arguments
+  ;;
+  (filestore)
+    local -a _filestore_arguments
+    _filestore_arguments=(
+      'dups:List blocks that are both in the filestore and standard block storage.'
+      'ls:List objects in filestore.'
+      'verify:Verify objects in filestore.'
+    )
+    _ipfs_subcommand _filestore_arguments
+  ;;
+  (get)
+    _arguments \
+      '(-o --output)'{-o,--output}'[The path where the output should be stored.]'\
+      '(-a --archive)'{-a,--archive}'[Output a TAR archive.]' \
+      '(-C --compress)'{-C,--compress}'[Compress the output with GZIP compression.]' \
+      '(-l --compression-level)'{-l,--compression-level}'[The level of compression (1-9).]'
+  ;;
+  (id)
+    _arguments '(-f --format)'{-f,--format}'[Optional output format.]'
+  ;;
+  (init)
+    _arguments \
+      '(-b --bits)'{-b,--bits}'[Number of bits to use in the generated RSA private key. Default: 2048.]' \
+      '(-e --empty-repo)'{-e,--empty-repo}"[Don't add and pin help files to the local storage.]" \
+      '(-p --profile)'{-p,--profile}"[Apply profile settings to config. Multiple profiles can be separated by ','.]"
+  ;;
+  (key)
+    local -a _key_arguments
+    _key_arguments=(
+      'gen:Create a new keypair'
+      'list:List all local keypairs'
+      'rename:Rename a keypair'
+      'rm:Remove a keypair'
+    )
+    _ipfs_subcommand _key_arguments
+  ;;
+  (log)
+    local -a _log_arguments
+    _log_arguments=(
+      'level:Change the logging level.'
+      'ls:List the logging subsystems.'
+      'tail:Read the event log.'
+    )
+    _ipfs_subcommand _log_arguments
+  ;;
+  (ls)
+    _arguments \
+      '(-v --headers)'{-v,--headers}'[Print table headers (Hash, Size, Name).]' \
+      '--resolve-type[Resolve linked objects to find out their types. Default: true.]' \
+      '--size[Resolve linked objects to find out their file size. Default: true.]' \
+      '(-s --stream)'{-s,--stream}'[Enable exprimental streaming of directory entries as they are traversed.]' \
+  ;;
+  (mount)
+    _arguments \
+      '(-f --ipfs-path)'{-f,--ipfs-path}'[The path where IPFS should be mounted.]' \
+      '(-n --ipns-path)'{-n,--ipns-path}'[The path where IPNS should be mounted.]'
+  ;;
+  (name)
+    local -a _name_arguments
+    _name_arguments=(
+      'publish:Publish IPNS names.'
+      'pubsub:IPNS pubsub management.'
+      'resolve:Resolve IPNS names.'
+    )
+    _ipfs_subcommand _name_arguments
+  ;;
+  (object)
+    local -a _object_arguments
+    _object_arguments=(
+      'data:Output the raw bytes of an IPFS object.'
+      'diff:Display the diff between two ipfs objects.'
+      'get:Get and serialize the DAG node named by <key>.'
+      'links:Output the links pointed to by the specified object.'
+      'new:Create a new object from an ipfs template.'
+      'patch:Create a new merkledag object based on an existing one.'
+      'put:Store input as a DAG object, print its key.'
+      'stat:Get stats for the DAG node named by <key>.'
+    )
+    _ipfs_subcommand _object_arguments
+  ;;
+  (p2p)
+    local -a _p2p_arguments
+    _p2p_arguments=(
+      'close:Stop listening for new connections to forward.'
+      'forward:Forward connections to libp2p service'
+      'listen:Create libp2p service'
+      'ls:List active p2p listeners.'
+      'stream:P2P stream management.'
+    )
+    _ipfs_subcommand _p2p_arguments
+  ;;
+  (pin)
+    local -a _pin_arguments
+    _pin_arguments=(
+      'add:Pin objects to local storage.'
+      'ls:List objects pinned to local storage.'
+      'rm:Remove pinned objects from local storage.'
+      'update:Update a recursive pin'
+      'verify:Verify that recursive pins are complete.'
+    )
+    _ipfs_subcommand _pin_arguments
+  ;;
+  (ping)
+    _arguments '(-n --count)'{-n,--count}'[Number of ping messages to send. Default: 10.]'
+  ;;
+  (refs)
+    _arguments \
+      '--format[Emit edges with given format. Available tokens: <src> <dst> <linkname>. Default: <dst>.]' \
+      '(-e --edges)'{-e,--edges}'[Emit edge format: `<from> -> <to>`.]' \
+      '(-u --unique)'{-u,--unique}'[Omit duplicate refs from output.]' \
+      '(-r --recursive)'{-r,--recursive}'[Recursively list links of child nodes.]' \
+      '--max-depth[Only for recursive refs, limits fetch and listing to the given depth. Default: -1.]'
+    local -a _refs_arguments
+    _refs_arguments='local:List all local references.'
+    _ipfs_subcommand _refs_arguments
+  ;;
+  (repo)
+    local -a _repo_arguments
+    _repo_arguments=(
+      'fsck:Remove repo lockfiles.'
+      'gc:Perform a garbage collection sweep on the repo.'
+      'stat:Get stats for the currently used repo.'
+      'verify:Verify all blocks in repo are not corrupted.'
+      'version:Show the repo version.'
+    )
+    _ipfs_subcommand _repo_arguments
+  ;;
+  (resolve)
+    _arguments \
+      '(-r --recursive)'{-r,--recursive}'[Resolve until the result is an IPFS name. Default: true.]' \
+      '(--dhtrc --dht-record-count)'{--dhtrc,--dht-record-count}'[Number of records to request for DHT resolution.]' \
+      '(--dhtt --dht-timeout)'{--dhtt,--dht-timeout}'[Max time to collect values during DHT resolution eg "30s". Pass 0 for no timeout.]'
+  ;;
+  (stats)
+    local -a _stats_arguments
+    _stats_arguments=(
+      'bitswap:Show some diagnostic information on the bitswap agent.'
+      'bw:Print ipfs bandwidth information.'
+      'repo:Get stats for the currently used repo.'
+    )
+    _ipfs_subcommand _stats_arguments
+  ;;
+  (swarm)
+    local -a _swarm_arguments
+    _swarm_arguments=(
+      'addrs:List known addresses. Useful for debugging.'
+      'connect:Open connection to a given address.'
+      'disconnect:Close connection to a given address.'
+      'filters:Manipulate address filters.'
+      'peers:List peers with open connections.'
+    )
+    _ipfs_subcommand _swarm_arguments
+  ;;
+  (tar)
+    local -a _tar_arguments
+    _tar_arguments=(
+      'add:Import a tar file into ipfs.'
+      'cat:Export a tar file from IPFS.'
+    )
+    _ipfs_subcommand _tar_arguments
+  ;;
+  (version)
+    _arguments \
+      '(-n --number)'{-n,--number}'[Only show the version number.]' \
+      '--commit[Show the commit hash.]' \
+      '--repo[Show repo version.]' \
+      '--all[Show all version information.]'
+  ;;
+esac

From e09aac3751ab1f489aed2dc7ef1d7a7a2fcecd5d Mon Sep 17 00:00:00 2001
From: Sandip Subedi <sandipsubedi@outlook.com>
Date: Sat, 3 Oct 2020 11:38:44 -0500
Subject: [PATCH 114/869] bundler: format aliases table and clean up README
 (#9300)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Marc Cornellà <marc.cornella@live.com>
---
 plugins/bundler/README.md | 75 +++++++++++++++++++++++----------------
 1 file changed, 44 insertions(+), 31 deletions(-)

diff --git a/plugins/bundler/README.md b/plugins/bundler/README.md
index a3bceb0ae..7b79cbcdc 100644
--- a/plugins/bundler/README.md
+++ b/plugins/bundler/README.md
@@ -1,34 +1,48 @@
 # Bundler
 
-- Adds completion for basic bundler commands
+This plugin adds completion for basic bundler commands, as well as aliases and helper functions for
+an easier experience with bundler.
 
-- Adds short aliases for common bundler commands
-  - `ba` aliased to `bundle add`
-  - `be` aliased to `bundle exec`.
-    It also supports aliases (if `rs` is `rails server`, `be rs` will bundle-exec `rails server`).
-  - `bl` aliased to `bundle list`
-  - `bp` aliased to `bundle package`
-  - `bo` aliased to `bundle open`
-  - `bout` aliased to `bundle outdated`
-  - `bu` aliased to `bundle update`
-  - `bi` aliased to `bundle install --jobs=<cpu core count>` (only for bundler `>= 1.4.0`)
-  - `bcn` aliased to `bundle clean`
-  - `bck` aliased to `bundle check`
+To use it, add `bundler` to the plugins array in your zshrc file:
 
-- Adds a wrapper for common gems:
-  - Looks for a binstub under `./bin/` and executes it (if present)
-  - Calls `bundle exec <gem executable>` otherwise
+```zsh
+plugins=(... bundler)
+```
+
+## Aliases
+
+| Alias  | Command                              | Description                                                                              |
+|--------|--------------------------------------|------------------------------------------------------------------------------------------|
+| `ba`   | `bundle add`                         | Add gem to the Gemfile and run bundle install                                            |
+| `bck`  | `bundle check`                       | Verifies if dependencies are satisfied by installed gems                                 |
+| `bcn`  | `bundle clean`                       | Cleans up unused gems in your bundler directory                                          |
+| `be`   | `bundle exec`                        | Execute a command in the context of the bundle                                           |
+| `bi`   | `bundle install --jobs=<core_count>` | Install the dependencies specified in your Gemfile (using all cores in bundler >= 1.4.0) |
+| `bl`   | `bundle list`                        | List all the gems in the bundle                                                          |
+| `bo`   | `bundle open`                        | Opens the source directory for a gem in your bundle                                      |
+| `bout` | `bundle outdated`                    | List installed gems with newer versions available                                        |
+| `bp`   | `bundle package`                     | Package your needed .gem files into your application                                     |
+| `bu`   | `bundle update`                      | Update your gems to the latest available versions                                        |
+
+## Gem wrapper
+
+The plugin adds a wrapper for common gems, which:
+
+- Looks for a binstub under `./bin/` and executes it if present.
+- Calls `bundle exec <gem>` otherwise.
 
 Common gems wrapped by default (by name of the executable):
+
 `annotate`, `cap`, `capify`, `cucumber`, `foodcritic`, `guard`, `hanami`, `irb`, `jekyll`, `kitchen`, `knife`, `middleman`, `nanoc`, `pry`, `puma`, `rackup`, `rainbows`, `rake`, `rspec`, `rubocop`, `shotgun`, `sidekiq`, `spec`, `spork`, `spring`, `strainer`, `tailor`, `taps`, `thin`, `thor`, `unicorn` and `unicorn_rails`.
 
-## Configuration
+### Settings
 
-Please use the exact name of the executable and not the gem name.
+You can add or remove gems from the list of wrapped commands.
+Please **use the exact name of the executable** and not the gem name.
 
-### Add additional gems to be wrapped
+#### Include gems to be wrapped (`BUNDLED_COMMANDS`)
 
-Add this before the plugin-list in your `.zshrc`:
+Add this before the plugin list in your `.zshrc`:
 
 ```sh
 BUNDLED_COMMANDS=(rubocop)
@@ -37,10 +51,9 @@ plugins=(... bundler ...)
 
 This will add the wrapper for the `rubocop` gem (i.e. the executable).
 
+#### Exclude gems from being wrapped (`UNBUNDLED_COMMANDS`)
 
-### Exclude gems from being wrapped
-
-Add this before the plugin-list in your `.zshrc`:
+Add this before the plugin list in your `.zshrc`:
 
 ```sh
 UNBUNDLED_COMMANDS=(foreman spin)
@@ -49,13 +62,13 @@ plugins=(... bundler ...)
 
 This will exclude the `foreman` and `spin` gems (i.e. their executable) from being wrapped.
 
-## Excluded gems
+### Excluded gems
 
-These gems should not be called with `bundle exec`. Please see [issue #2923](https://github.com/ohmyzsh/ohmyzsh/pull/2923) on GitHub for clarification.
+These gems should not be called with `bundle exec`. Please see [issue #2923](https://github.com/ohmyzsh/ohmyzsh/pull/2923) on GitHub for clarification:
 
-`berks`
-`foreman`
-`mailcatcher`
-`rails`
-`ruby`
-`spin`
+- `berks`
+- `foreman`
+- `mailcatcher`
+- `rails`
+- `ruby`
+- `spin`

From 89278c71b2c3fe6b98db1d22d8ca742447aae406 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Sat, 3 Oct 2020 18:41:42 +0200
Subject: [PATCH 115/869] bundler: refactor bundler plugin and clean up gem
 wrappers

---
 plugins/bundler/bundler.plugin.zsh | 116 ++++++++++++++++-------------
 1 file changed, 64 insertions(+), 52 deletions(-)

diff --git a/plugins/bundler/bundler.plugin.zsh b/plugins/bundler/bundler.plugin.zsh
index 65b0ffa6e..6293dc28a 100644
--- a/plugins/bundler/bundler.plugin.zsh
+++ b/plugins/bundler/bundler.plugin.zsh
@@ -1,13 +1,49 @@
+## Aliases
+
 alias ba="bundle add"
+alias bck="bundle check"
+alias bcn="bundle clean"
 alias be="bundle exec"
+alias bi="bundle_install"
 alias bl="bundle list"
-alias bp="bundle package"
 alias bo="bundle open"
 alias bout="bundle outdated"
+alias bp="bundle package"
 alias bu="bundle update"
-alias bi="bundle_install"
-alias bcn="bundle clean"
-alias bck="bundle check"
+
+## Functions
+
+bundle_install() {
+  # Bail out if bundler is not installed
+  if (( ! $+commands[bundle] )); then
+    echo "Bundler is not installed"
+    return 1
+  fi
+
+  # Bail out if not in a bundled project
+  if ! _within-bundled-project; then
+    echo "Can't 'bundle install' outside a bundled project"
+    return 1
+  fi
+
+  # Check the bundler version is at least 1.4.0
+  autoload -Uz is-at-least
+  local bundler_version=$(bundle version | cut -d' ' -f3)
+  if ! is-at-least 1.4.0 "$bundler_version"; then
+    bundle install "$@"
+    return $?
+  fi
+
+  # If bundler is at least 1.4.0, use all the CPU cores to bundle install
+  if [[ "$OSTYPE" = (darwin|freebsd)* ]]; then
+    local cores_num="$(sysctl -n hw.ncpu)"
+  else
+    local cores_num="$(nproc)"
+  fi
+  bundle install --jobs="$cores_num" "$@"
+}
+
+## Gem wrapper
 
 bundled_commands=(
   annotate
@@ -54,65 +90,41 @@ for cmd in $BUNDLED_COMMANDS; do
   bundled_commands+=($cmd);
 done
 
-## Functions
-
-bundle_install() {
-  if ! _bundler-installed; then
-    echo "Bundler is not installed"
-  elif ! _within-bundled-project; then
-    echo "Can't 'bundle install' outside a bundled project"
-  else
-    local bundler_version=`bundle version | cut -d' ' -f3`
-    if [[ $bundler_version > '1.4.0' || $bundler_version = '1.4.0' ]]; then
-      if [[ "$OSTYPE" = (darwin|freebsd)* ]]
-      then
-        local cores_num="$(sysctl -n hw.ncpu)"
-      else
-        local cores_num="$(nproc)"
-      fi
-      bundle install --jobs=$cores_num $@
-    else
-      bundle install $@
-    fi
-  fi
-}
-
-_bundler-installed() {
-  which bundle > /dev/null 2>&1
-}
-
+# Check if in the root or a subdirectory of a bundled project
 _within-bundled-project() {
   local check_dir="$PWD"
-  while [ "$check_dir" != "/" ]; do
-    [ -f "$check_dir/Gemfile" -o -f "$check_dir/gems.rb" ] && return
-    check_dir="$(dirname $check_dir)"
+  while [[ "$check_dir" != "/" ]]; do
+    if [[ -f "$check_dir/Gemfile" || -f "$check_dir/gems.rb" ]]; then
+      return 0
+    fi
+    check_dir="${check_dir:h}"
   done
-  false
-}
-
-_binstubbed() {
-  [ -f "./bin/${1}" ]
+  return 1
 }
 
 _run-with-bundler() {
-  if _bundler-installed && _within-bundled-project; then
-    if _binstubbed $1; then
-      ./bin/${^^@}
-    else
-      bundle exec $@
-    fi
+  if (( ! $+commands[bundle] )) || ! _within-bundled-project; then
+    "$@"
+    return $?
+  fi
+
+  if [[ -f "./bin/${1}" ]]; then
+    ./bin/${^^@}
   else
-    $@
+    bundle exec "$@"
   fi
 }
 
-## Main program
 for cmd in $bundled_commands; do
-  eval "function unbundled_$cmd () { $cmd \$@ }"
-  eval "function bundled_$cmd () { _run-with-bundler $cmd \$@}"
-  alias $cmd=bundled_$cmd
+  # Create wrappers for bundled and unbundled execution
+  eval "function unbundled_$cmd () { \"$cmd\" \"\$@\"; }"
+  eval "function bundled_$cmd () { _run-with-bundler \"$cmd\" \"\$@\"; }"
+  alias "$cmd"="bundled_$cmd"
 
-  if which _$cmd > /dev/null 2>&1; then
-    compdef _$cmd bundled_$cmd=$cmd
+  # Bind completion function to wrapped gem if available
+  if (( $+functions[_$cmd] )); then
+    compdef "_$cmd" "bundled_$cmd"="$cmd"
   fi
 done
+
+unset cmd bundled_commands

From d81b4ac9f29b2f28e23633ed22bceee11d8d605f Mon Sep 17 00:00:00 2001
From: Fabian Bonk <mail@fabianbonk.de>
Date: Sat, 3 Oct 2020 20:29:26 +0200
Subject: [PATCH 116/869] git: run gfa with --jobs=10 (fetch remotes in
 parallel) (#9268)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Marc Cornellà <marc.cornella@live.com>
---
 plugins/git/git.plugin.zsh | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index 5a9ccff5c..8255a03ee 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -1,3 +1,7 @@
+# Git version checking
+autoload -Uz is-at-least
+git_version="${(As: :)$(git version 2>/dev/null)[3]}"
+
 #
 # Functions
 #
@@ -104,7 +108,10 @@ function gdv() { git diff -w "$@" | view - }
 compdef _git gdv=git-diff
 
 alias gf='git fetch'
-alias gfa='git fetch --all --prune'
+# --jobs=<n> was added in git 2.8
+is-at-least 2.8 "$git_version" \
+  && alias gfa='git fetch --all --prune --jobs=10' \
+  || alias gfa='git fetch --all --prune'
 alias gfo='git fetch origin'
 
 alias gfg='git ls-files | grep'
@@ -240,8 +247,7 @@ alias gss='git status -s'
 alias gst='git status'
 
 # use the default stash push on git 2.13 and newer
-autoload -Uz is-at-least
-is-at-least 2.13 "$(git --version 2>/dev/null | awk '{print $3}')" \
+is-at-least 2.13 "$git_version" \
   && alias gsta='git stash push' \
   || alias gsta='git stash save'
 
@@ -291,3 +297,5 @@ function grename() {
     git push --set-upstream origin "$2"
   fi
 }
+
+unset git_version

From c549387745205d7fa8e91c1e6dcdae6901d9dd1d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Sun, 4 Oct 2020 13:09:32 +0200
Subject: [PATCH 117/869] git: fix version check

---
 plugins/git/git.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index 8255a03ee..ccb9d8461 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -1,6 +1,6 @@
 # Git version checking
 autoload -Uz is-at-least
-git_version="${(As: :)$(git version 2>/dev/null)[3]}"
+git_version="${${(As: :)$(git version 2>/dev/null)}[3]}"
 
 #
 # Functions

From b4093819a801e9c982b61718af75a188f34bd2bd Mon Sep 17 00:00:00 2001
From: "Matsievskiy S.V" <seregaxvm.main@gmail.com>
Date: Mon, 5 Oct 2020 12:42:22 +0300
Subject: [PATCH 118/869] fino: fix dangling "using" and clean up (#9307)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Matsievskiy S.V <matsievskiysv@gmail.com>
Co-authored-by: Marc Cornellà <marc.cornella@live.com>
---
 themes/fino.zsh-theme | 29 +++++++++++++++++++----------
 1 file changed, 19 insertions(+), 10 deletions(-)

diff --git a/themes/fino.zsh-theme b/themes/fino.zsh-theme
index 1d8bb30e1..c5589f13a 100644
--- a/themes/fino.zsh-theme
+++ b/themes/fino.zsh-theme
@@ -11,26 +11,35 @@
 #
 # Also borrowing from http://stevelosh.com/blog/2010/02/my-extravagant-zsh-prompt/
 
+function virtualenv_prompt_info {
+  [[ -n ${VIRTUAL_ENV} ]] || return
+  echo "${ZSH_THEME_VIRTUALENV_PREFIX:=[}${VIRTUAL_ENV:t}${ZSH_THEME_VIRTUALENV_SUFFIX:=]}"
+}
+
 function prompt_char {
-  git branch >/dev/null 2>/dev/null && echo "±" && return
-  echo '○'
+  command git branch &>/dev/null && echo "±" || echo '○'
 }
 
 function box_name {
-    [ -f ~/.box-name ] && cat ~/.box-name || echo ${SHORT_HOST:-$HOST}
+  [ -f ~/.box-name ] && cat ~/.box-name || echo ${SHORT_HOST:-$HOST}
 }
 
-local ruby_env='using%{$FG[243]%} $(ruby_prompt_info)'
+local ruby_env='$(ruby_prompt_info)'
 local git_info='$(git_prompt_info)'
+local virtualenv_info='$(virtualenv_prompt_info)'
 local prompt_char='$(prompt_char)'
 
-
-PROMPT="╭─%{$FG[040]%}%n%{$reset_color%} %{$FG[239]%}at%{$reset_color%} %{$FG[033]%}$(box_name)%{$reset_color%} %{$FG[239]%}in%{$reset_color%} %{$terminfo[bold]$FG[226]%}%~%{$reset_color%}${git_info} %{$FG[239]%}${ruby_env}
+PROMPT="╭─${FG[040]}%n ${FG[239]}at ${FG[033]}$(box_name) ${FG[239]}in %B${FG[226]}%~%{$reset_color%}${git_info}${ruby_env}${virtualenv_info}
 ╰─${prompt_char}%{$reset_color%} "
 
-ZSH_THEME_GIT_PROMPT_PREFIX=" %{$FG[239]%}on%{$reset_color%} %{$fg[255]%}"
+ZSH_THEME_GIT_PROMPT_PREFIX=" ${FG[239]}on%{$reset_color%} ${FG[255]}"
 ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}"
-ZSH_THEME_GIT_PROMPT_DIRTY="%{$FG[202]%}✘✘✘"
-ZSH_THEME_GIT_PROMPT_CLEAN="%{$FG[040]%}✔"
-ZSH_THEME_RUBY_PROMPT_PREFIX="‹"
+ZSH_THEME_GIT_PROMPT_DIRTY="${FG[202]}✘✘✘"
+ZSH_THEME_GIT_PROMPT_CLEAN="${FG[040]}✔"
+
+ZSH_THEME_RUBY_PROMPT_PREFIX=" ${FG[239]}using${FG[243]} ‹"
 ZSH_THEME_RUBY_PROMPT_SUFFIX="›%{$reset_color%}"
+
+export VIRTUAL_ENV_DISABLE_PROMPT=1
+ZSH_THEME_VIRTUALENV_PREFIX=" ${FG[239]}using${FG[243]} «"
+ZSH_THEME_VIRTUALENV_SUFFIX="»%{$reset_color%}"

From fbb2b56c7ecd3c4873be805e004f70fa442e7c45 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Mon, 5 Oct 2020 12:05:47 +0200
Subject: [PATCH 119/869] fino: stop bold with prompt sequence

Fixes weird bug when completing.
---
 themes/fino.zsh-theme | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/themes/fino.zsh-theme b/themes/fino.zsh-theme
index c5589f13a..2523c1776 100644
--- a/themes/fino.zsh-theme
+++ b/themes/fino.zsh-theme
@@ -29,7 +29,7 @@ local git_info='$(git_prompt_info)'
 local virtualenv_info='$(virtualenv_prompt_info)'
 local prompt_char='$(prompt_char)'
 
-PROMPT="╭─${FG[040]}%n ${FG[239]}at ${FG[033]}$(box_name) ${FG[239]}in %B${FG[226]}%~%{$reset_color%}${git_info}${ruby_env}${virtualenv_info}
+PROMPT="╭─${FG[040]}%n ${FG[239]}at ${FG[033]}$(box_name) ${FG[239]}in %B${FG[226]}%~%b${git_info}${ruby_env}${virtualenv_info}
 ╰─${prompt_char}%{$reset_color%} "
 
 ZSH_THEME_GIT_PROMPT_PREFIX=" ${FG[239]}on%{$reset_color%} ${FG[255]}"

From 6ebf27b8d34c760e25749790ea78dcb0c220d76b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Mon, 5 Oct 2020 17:20:02 +0200
Subject: [PATCH 120/869] Revert "Remove redundant bashcompinit calls"

This reverts commit f776af2a1f5d5ced17bdeb00f7adb64ccfaa99a6.

Fixes #9314
---
 plugins/aws/aws.plugin.zsh           | 1 +
 plugins/compleat/compleat.plugin.zsh | 7 +++++--
 plugins/drush/drush.plugin.zsh       | 2 ++
 plugins/stack/stack.plugin.zsh       | 1 +
 plugins/wp-cli/wp-cli.plugin.zsh     | 1 +
 5 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/plugins/aws/aws.plugin.zsh b/plugins/aws/aws.plugin.zsh
index ecf78b2c2..7994963c3 100644
--- a/plugins/aws/aws.plugin.zsh
+++ b/plugins/aws/aws.plugin.zsh
@@ -64,6 +64,7 @@ fi
 
 # AWS CLI v2 comes with its own autocompletion. Check if that is there, otherwise fall back
 if command -v aws_completer &> /dev/null; then
+  autoload -Uz bashcompinit && bashcompinit
   complete -C aws_completer aws
 else
   function _awscli-homebrew-installed() {
diff --git a/plugins/compleat/compleat.plugin.zsh b/plugins/compleat/compleat.plugin.zsh
index 247240c20..38f1b396a 100644
--- a/plugins/compleat/compleat.plugin.zsh
+++ b/plugins/compleat/compleat.plugin.zsh
@@ -10,8 +10,11 @@ if (( ${+commands[compleat]} )); then
   local setup="${prefix}/share/compleat-1.0/compleat_setup" 
 
   if [[ -f "$setup" ]]; then
+    if ! bashcompinit >/dev/null 2>&1; then
+      autoload -U bashcompinit
+      bashcompinit -i
+    fi
+
     source "$setup" 
   fi
-
-  unset prefix setup
 fi
diff --git a/plugins/drush/drush.plugin.zsh b/plugins/drush/drush.plugin.zsh
index 178750c24..8a20d79f2 100644
--- a/plugins/drush/drush.plugin.zsh
+++ b/plugins/drush/drush.plugin.zsh
@@ -99,4 +99,6 @@ alias drvg="drush variable-get"
 alias drvs="drush variable-set"
 
 # Enable drush autocomplete support
+autoload bashcompinit
+bashcompinit
 source $(dirname $0)/drush.complete.sh
diff --git a/plugins/stack/stack.plugin.zsh b/plugins/stack/stack.plugin.zsh
index e3b6503a5..45ef38761 100644
--- a/plugins/stack/stack.plugin.zsh
+++ b/plugins/stack/stack.plugin.zsh
@@ -1,3 +1,4 @@
 (( $+commands[stack] )) || return
 
+autoload -U +X bashcompinit && bashcompinit
 source <(stack --bash-completion-script stack)
diff --git a/plugins/wp-cli/wp-cli.plugin.zsh b/plugins/wp-cli/wp-cli.plugin.zsh
index 05ecc4b8a..97bed406e 100644
--- a/plugins/wp-cli/wp-cli.plugin.zsh
+++ b/plugins/wp-cli/wp-cli.plugin.zsh
@@ -138,6 +138,7 @@ alias wpwm='wp widget move'
 alias wpwu='wp widget update'
 
 
+autoload -U +X bashcompinit && bashcompinit
 # bash completion for the `wp` command
 
 _wp_complete() {

From 01ce52e6814c27a61945ed4406059c14f0c5d548 Mon Sep 17 00:00:00 2001
From: Michele Bologna <michele.bologna@gmail.com>
Date: Wed, 7 Oct 2020 17:15:29 +0200
Subject: [PATCH 121/869] z: upgrade plugin to the latest version (#9310)

Commit-id: 125f4dc47e15891739dd8262d5b23077fe8fb9ab
https://github.com/rupa/z/commit/125f4dc47e15891739dd8262d5b23077fe8fb9ab
---
 plugins/z/README |  8 ++++++--
 plugins/z/z.1    |  3 +++
 plugins/z/z.sh   | 44 ++++++++++++++++++++++++--------------------
 3 files changed, 33 insertions(+), 22 deletions(-)

diff --git a/plugins/z/README b/plugins/z/README
index 56261cff4..47e54c57a 100644
--- a/plugins/z/README
+++ b/plugins/z/README
@@ -23,6 +23,8 @@ DESCRIPTION
 OPTIONS
        -c     restrict matches to subdirectories of the current directory
 
+       -e     echo the best match, don't cd
+
        -h     show a brief help message
 
        -l     list only
@@ -57,6 +59,8 @@ NOTES
        Optionally:
               Set $_Z_CMD to change the command name (default z).
               Set $_Z_DATA to change the datafile (default $HOME/.z).
+              Set  $_Z_MAX_SCORE  lower  to  age  entries  out faster (default
+              9000).
               Set $_Z_NO_RESOLVE_SYMLINKS to prevent symlink resolution.
               Set $_Z_NO_PROMPT_COMMAND to handle PROMPT_COMMAND/precmd  your-
               self.
@@ -64,8 +68,8 @@ NOTES
               Set $_Z_OWNER to allow usage when in 'sudo -s' mode.
               (These  settings  should  go  in  .bashrc/.zshrc before the line
               added above.)
-              Install   the   provided   man   page   z.1    somewhere    like
-              /usr/local/man/man1.
+              Install the provided man page z.1  somewhere  in  your  MANPATH,
+              like /usr/local/man/man1.
 
    Aging:
        The rank of directories maintained by z undergoes aging based on a sim-
diff --git a/plugins/z/z.1 b/plugins/z/z.1
index d4cac1ac2..182f98176 100644
--- a/plugins/z/z.1
+++ b/plugins/z/z.1
@@ -78,6 +78,9 @@ Set \fB$_Z_CMD\fR to change the command name (default \fBz\fR).
 Set \fB$_Z_DATA\fR to change the datafile (default \fB$HOME/.z\fR).
 .RE
 .RS
+Set \fB$_Z_MAX_SCORE\fR lower to age entries out faster (default \fB9000\fR).
+.RE
+.RS
 Set \fB$_Z_NO_RESOLVE_SYMLINKS\fR to prevent symlink resolution.
 .RE
 .RS
diff --git a/plugins/z/z.sh b/plugins/z/z.sh
index 5c5771d62..13008a60e 100644
--- a/plugins/z/z.sh
+++ b/plugins/z/z.sh
@@ -10,6 +10,7 @@
 #     * optionally:
 #         set $_Z_CMD in .bashrc/.zshrc to change the command (default z).
 #         set $_Z_DATA in .bashrc/.zshrc to change the datafile (default ~/.z).
+#         set $_Z_MAX_SCORE lower to age entries out faster (default 9000).
 #         set $_Z_NO_RESOLVE_SYMLINKS to prevent symlink resolution.
 #         set $_Z_NO_PROMPT_COMMAND if you're handling PROMPT_COMMAND yourself.
 #         set $_Z_EXCLUDE_DIRS to an array of directories to exclude.
@@ -23,6 +24,8 @@
 #     * z -l foo  # list matches instead of cd
 #     * z -e foo  # echo the best match, don't cd
 #     * z -c foo  # restrict matches to subdirs of $PWD
+#     * z -x      # remove the current directory from the datafile
+#     * z -h      # show a brief help message
 
 [ -d "${_Z_DATA:-$HOME/.z}" ] && {
     echo "ERROR: z.sh's datafile (${_Z_DATA:-$HOME/.z}) is a directory."
@@ -62,7 +65,8 @@ _z() {
 
         # maintain the data file
         local tempfile="$datafile.$RANDOM"
-        _z_dirs | awk -v path="$*" -v now="$(date +%s)" -F"|" '
+        local score=${_Z_MAX_SCORE:-9000}
+        _z_dirs | awk -v path="$*" -v now="$(date +%s)" -v score=$score -F"|" '
             BEGIN {
                 rank[path] = 1
                 time[path] = now
@@ -79,7 +83,7 @@ _z() {
                 count += $2
             }
             END {
-                if( count > 9000 ) {
+                if( count > score ) {
                     # aging
                     for( x in rank ) print x "|" 0.99*rank[x] "|" time[x]
                 } else for( x in rank ) print x "|" rank[x] "|" time[x]
@@ -138,27 +142,24 @@ _z() {
         local cd
         cd="$( < <( _z_dirs ) awk -v t="$(date +%s)" -v list="$list" -v typ="$typ" -v q="$fnd" -F"|" '
             function frecent(rank, time) {
-                # relate frequency and time
-                dx = t - time
-                if( dx < 3600 ) return rank * 4
-                if( dx < 86400 ) return rank * 2
-                if( dx < 604800 ) return rank / 2
-                return rank / 4
+              # relate frequency and time
+              dx = t - time
+              return int(10000 * rank * (3.75/((0.0001 * dx + 1) + 0.25)))
             }
             function output(matches, best_match, common) {
                 # list or return the desired directory
                 if( list ) {
-                    cmd = "sort -g >&2"
+                    if( common ) {
+                        printf "%-10s %s\n", "common:", common > "/dev/stderr"
+                    }
+                    cmd = "sort -n >&2"
                     for( x in matches ) {
                         if( matches[x] ) {
                             printf "%-10s %s\n", matches[x], x | cmd
                         }
                     }
-                    if( common ) {
-                        printf "%-10s %s\n", "common:", common > "/dev/stderr"
-                    }
                 } else {
-                    if( common ) best_match = common
+                    if( common && !typ ) best_match = common
                     print best_match
                 }
             }
@@ -200,15 +201,22 @@ _z() {
                 # prefer case sensitive
                 if( best_match ) {
                     output(matches, best_match, common(matches))
+                    exit
                 } else if( ibest_match ) {
                     output(imatches, ibest_match, common(imatches))
+                    exit
                 }
+                exit(1)
             }
         ')"
 
-        [ $? -eq 0 ] && [ "$cd" ] && {
-          if [ "$echo" ]; then echo "$cd"; else builtin cd "$cd"; fi
-        }
+        if [ "$?" -eq 0 ]; then
+          if [ "$cd" ]; then
+            if [ "$echo" ]; then echo "$cd"; else builtin cd "$cd"; fi
+          fi
+        else
+          return $?
+        fi
     fi
 }
 
@@ -223,15 +231,11 @@ if type compctl >/dev/null 2>&1; then
         if [ "$_Z_NO_RESOLVE_SYMLINKS" ]; then
             _z_precmd() {
                 (_z --add "${PWD:a}" &)
-                # Reference $RANDOM to refresh its value inside the subshell
-                # Otherwise, multiple runs get the same value
                 : $RANDOM
             }
         else
             _z_precmd() {
                 (_z --add "${PWD:A}" &)
-                # Reference $RANDOM to refresh its value inside the subshell
-                # Otherwise, multiple runs get the same value
                 : $RANDOM
             }
         fi

From 27857e66d0dab0bd05790307dfe5388f3cb2c51a Mon Sep 17 00:00:00 2001
From: davidfmatheson <david.f.matheson@gmail.com>
Date: Thu, 8 Oct 2020 11:21:34 -0400
Subject: [PATCH 122/869] nvm: add Homebrew's nvm setup (#8316)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Marc Cornellà <marc.cornella@live.com>
---
 plugins/nvm/README.md      | 11 ++++++++++-
 plugins/nvm/nvm.plugin.zsh | 23 +++++++++++++++++++----
 2 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/plugins/nvm/README.md b/plugins/nvm/README.md
index 079cf0009..2515da9e8 100644
--- a/plugins/nvm/README.md
+++ b/plugins/nvm/README.md
@@ -1,9 +1,18 @@
 # nvm plugin
 
-This plugin adds autocompletions for [nvm](https://github.com/creationix/nvm) — a Node.js version manager.
+This plugin adds autocompletions for [nvm](https://github.com/nvm-sh/nvm) — a Node.js version manager.
 It also automatically sources nvm, so you don't need to do it manually in your `.zshrc`.
 
 To use it, add `nvm` to the plugins array of your zshrc file:
+
 ```zsh
 plugins=(... nvm)
 ```
+
+## Settings
+
+- **`NVM_DIR`**: if you have installed nvm in a directory other than `$HOME/.nvm`, set and export `NVM_DIR`
+  to be the directory where you installed nvm.
+  
+- **`NVM_HOMEBREW`**: if you installed nvm via Homebrew, in a directory other than `/usr/local/opt/nvm`, you
+  can set `NVM_HOMEBREW` to be the directory where you installed it.
diff --git a/plugins/nvm/nvm.plugin.zsh b/plugins/nvm/nvm.plugin.zsh
index 4bab8e9d7..2264a2420 100644
--- a/plugins/nvm/nvm.plugin.zsh
+++ b/plugins/nvm/nvm.plugin.zsh
@@ -1,8 +1,23 @@
 # Set NVM_DIR if it isn't already defined
 [[ -z "$NVM_DIR" ]] && export NVM_DIR="$HOME/.nvm"
 
-# Try to load nvm only if command not already available
-if ! type "nvm" &> /dev/null; then
-    # Load nvm if it exists
-    [[ -f "$NVM_DIR/nvm.sh" ]] && source "$NVM_DIR/nvm.sh"
+# Don't try to load nvm if command already available
+type "nvm" &> /dev/null && return
+
+# Load nvm if it exists in $NVM_DIR
+if [[ -f "$NVM_DIR/nvm.sh" ]]; then
+    source "$NVM_DIR/nvm.sh"
+    return
+fi
+
+# Otherwise try to load nvm installed via Homebrew
+
+# User can set this if they have an unusual Homebrew setup
+NVM_HOMEBREW="${NVM_HOMEBREW:-/usr/local/opt/nvm}"
+# Load nvm from Homebrew location if it exists
+[[ -f "$NVM_HOMEBREW/nvm.sh" ]] && source "$NVM_HOMEBREW/nvm.sh"
+# Load nvm bash completion from Homebrew if it exists
+if [[ -f "$NVM_HOMEBREW/etc/bash_completion.d/nvm" ]]; then
+    autoload -U +X bashcompinit && bashcompinit
+    source "$NVM_HOMEBREW/etc/bash_completion.d/nvm"
 fi

From 68f809448a08d2c93d13650157fd0500a329a16a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rapha=C3=ABl=20Pinson?= <github+aem1eeshi1@raphink.net>
Date: Thu, 8 Oct 2020 19:18:43 +0200
Subject: [PATCH 123/869] kubectl: add wrappers for colorized output in JSON
 and YAML (#9316)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Marc Cornellà <marc.cornella@live.com>
---
 plugins/kubectl/README.md          |  8 ++++++++
 plugins/kubectl/kubectl.plugin.zsh | 16 ++++++++++++++++
 2 files changed, 24 insertions(+)

diff --git a/plugins/kubectl/README.md b/plugins/kubectl/README.md
index ee05a8af1..84f5f8d89 100644
--- a/plugins/kubectl/README.md
+++ b/plugins/kubectl/README.md
@@ -106,3 +106,11 @@ plugins=(... kubectl)
 | kdelss  | `kubectl delete statefulset`        | Delete the statefulset                                                                           |
 | ksss    | `kubectl scale statefulset`         | Scale a statefulset                                                                              |
 | krsss   | `kubectl rollout status statefulset`| Check the rollout status of a deployment                                                         |
+
+## Wrappers
+
+This plugin provides 3 wrappers to colorize kubectl output in JSON and YAML using various tools (which must be installed):
+
+- `kj`: JSON, colorized with [`jq`](https://stedolan.github.io/jq/).
+- `kjx`: JSON, colorized with [`fx`](https://github.com/antonmedv/fx).
+- `ky`: YAML, colorized with [`yh`](https://github.com/andreazorzetto/yh).
diff --git a/plugins/kubectl/kubectl.plugin.zsh b/plugins/kubectl/kubectl.plugin.zsh
index 647d029c1..6292a0b2f 100644
--- a/plugins/kubectl/kubectl.plugin.zsh
+++ b/plugins/kubectl/kubectl.plugin.zsh
@@ -150,3 +150,19 @@ alias kepvc='kubectl edit pvc'
 alias kdpvc='kubectl describe pvc'
 alias kdelpvc='kubectl delete pvc'
 
+# Colored JSON output
+kj() {
+  kubectl "$@" -o json | jq
+}
+compdef kj=kubectl
+
+kjx() {
+  kubectl "$@" -o json | fx
+}
+compdef kjx=kubectl
+
+# Colored YAML output
+ky() {
+  kubectl "$@" -o yaml | yh
+}
+compdef ky=kubectl

From 58ff4e1d2e6a81ea97a05b142c28a931a9924b70 Mon Sep 17 00:00:00 2001
From: Michele Bologna <michele.bologna@gmail.com>
Date: Thu, 8 Oct 2020 19:20:47 +0200
Subject: [PATCH 124/869] lib: follow standards in window title (#9320)

In Ubuntu and Debian, in scp, and in rsync the prompt is by default specified as in

  user@hostname:/path/to/directory

while the previous title in ohmyzsh was

  user@hostname: /path/to/directory
---
 lib/termsupport.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/termsupport.zsh b/lib/termsupport.zsh
index 8cb2389e2..778f12bca 100644
--- a/lib/termsupport.zsh
+++ b/lib/termsupport.zsh
@@ -42,7 +42,7 @@ function title {
 }
 
 ZSH_THEME_TERM_TAB_TITLE_IDLE="%15<..<%~%<<" #15 char left truncated PWD
-ZSH_THEME_TERM_TITLE_IDLE="%n@%m: %~"
+ZSH_THEME_TERM_TITLE_IDLE="%n@%m:%~"
 # Avoid duplication of directory in terminals with independent dir display
 if [[ "$TERM_PROGRAM" == Apple_Terminal ]]; then
   ZSH_THEME_TERM_TITLE_IDLE="%n@%m"

From 8ad9b315a389c741d93aece3ed6eae6b6829f951 Mon Sep 17 00:00:00 2001
From: Duc Nguyen <vietduc01100001@gmail.com>
Date: Fri, 9 Oct 2020 17:35:13 +0700
Subject: [PATCH 125/869] Add git-lfs plugin (#9077)

---
 .github/CODEOWNERS                 |  1 +
 plugins/git-lfs/README.md          | 24 ++++++++++++++++++++++++
 plugins/git-lfs/git-lfs.plugin.zsh | 17 +++++++++++++++++
 3 files changed, 42 insertions(+)
 create mode 100644 plugins/git-lfs/README.md
 create mode 100644 plugins/git-lfs/git-lfs.plugin.zsh

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index cba8e93af..c3990c4ee 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1,3 +1,4 @@
 # Plugin owners
 plugins/gitfast/ @felipec
 plugins/sdk/ @rgoldberg
+plugins/git-lfs/ @vietduc01100001
diff --git a/plugins/git-lfs/README.md b/plugins/git-lfs/README.md
new file mode 100644
index 000000000..1222b2767
--- /dev/null
+++ b/plugins/git-lfs/README.md
@@ -0,0 +1,24 @@
+# git lfs plugin
+
+The git lfs plugin provides [aliases](#aliases) and [functions](#functions) for [git-lfs](https://github.com/git-lfs/git-lfs).
+
+To use it, add `git-lfs` to the plugins array in your zshrc file:
+
+```zsh
+plugins=(... git-lfs)
+```
+
+## Aliases
+
+| Alias    | Command                             |
+| :------- | :---------------------------------- |
+| `glfsi`  | `git lfs install`                   |
+| `glfst`  | `git lfs track`                     |
+| `glfsls` | `git lfs ls-files`                  |
+| `glfsmi` | `git lfs migrate import --include=` |
+
+## Functions
+
+| Function | Command                                         |
+| :------- | :---------------------------------------------- |
+| `gplfs`  | `git lfs push origin "$(current_branch)" --all` |
diff --git a/plugins/git-lfs/git-lfs.plugin.zsh b/plugins/git-lfs/git-lfs.plugin.zsh
new file mode 100644
index 000000000..e7bb67603
--- /dev/null
+++ b/plugins/git-lfs/git-lfs.plugin.zsh
@@ -0,0 +1,17 @@
+#
+# Aliases
+#
+
+alias glfsi='git lfs install'
+alias glfst='git lfs track'
+alias glfsls='git lfs ls-files'
+alias glfsmi='git lfs migrate import --include='
+
+#
+# Functions
+#
+
+function gplfs() {
+  local b="$(git_current_branch)"
+  git lfs push origin "$b" --all
+}

From df58625ca62ebb6ff5b7730717fdd55afdd28e63 Mon Sep 17 00:00:00 2001
From: Tom Hale <HaleTom@users.noreply.github.com>
Date: Fri, 9 Oct 2020 17:39:23 +0700
Subject: [PATCH 126/869] safe-paste: refresh plugin (update for zsh 5.1 and vi
 keymaps) (#7887)

---
 plugins/safe-paste/safe-paste.plugin.zsh | 122 ++++++++++++++++-------
 1 file changed, 84 insertions(+), 38 deletions(-)

diff --git a/plugins/safe-paste/safe-paste.plugin.zsh b/plugins/safe-paste/safe-paste.plugin.zsh
index 75f1791d7..db524538c 100644
--- a/plugins/safe-paste/safe-paste.plugin.zsh
+++ b/plugins/safe-paste/safe-paste.plugin.zsh
@@ -1,54 +1,100 @@
+# A good summary of the zsh 5.1 Bracketed Paste Mode changes is at:
+# https://archive.zhimingwang.org/blog/2015-09-21-zsh-51-and-bracketed-paste.html
+
+# zsh 5.1 (September 2015) introduced built-in support for Bracketed Paste Mode
+# https://github.com/zsh-users/zsh/blob/68405f31a043bdd5bf338eb06688ed3e1f740937/README#L38-L45
+#
+# zsh 5.1 breaks url-quote-magic and other widgets replacing self-insert
+# zsh-users' bracketed-paste-magic resolves these issues:
+# https://github.com/zsh-users/zsh/blob/f702e17b14d75aa21bff014168fa9048124db286/Functions/Zle/bracketed-paste-magic#L9-L12
+
+# Load bracketed-paste-magic if zsh version is >= 5.1
+if [[ ${ZSH_VERSION:0:3} -ge 5.1 ]]; then
+  set zle_bracketed_paste  # Explicitly restore this zsh default
+  autoload -Uz bracketed-paste-magic
+  zle -N bracketed-paste bracketed-paste-magic
+  return  ### The rest of this file is NOT executed on zsh version >= 5.1 ###
+fi
+
+######################################################################
+#    The rest of this file is ONLY executed if zsh version < 5.1
+######################################################################
+
 # Code from Mikael Magnusson: https://www.zsh.org/mla/users/2011/msg00367.html
 #
-# Requires xterm, urxvt, iTerm2 or any other terminal that supports bracketed
-# paste mode as documented: https://www.xfree86.org/current/ctlseqs.html
+# Requires xterm, urxvt, iTerm2 or any other terminal that supports
+# Bracketed Paste Mode as documented:
+# https://www.xfree86.org/current/ctlseqs.html#Bracketed%20Paste%20Mode
+#
+# For tmux, use:   bind ] paste-buffer -p
+#
+# Additional technical details: https://cirw.in/blog/bracketed-paste
 
-# create a new keymap to use while pasting
-bindkey -N paste
-# make everything in this keymap call our custom widget
-bindkey -R -M paste "^@"-"\M-^?" paste-insert
-# these are the codes sent around the pasted text in bracketed
-# paste mode.
-# do the first one with both -M viins and -M vicmd in vi mode
-bindkey '^[[200~' _start_paste
-bindkey -M paste '^[[201~' _end_paste
-# insert newlines rather than carriage returns when pasting newlines
-bindkey -M paste -s '^M' '^J'
+# Create a new keymap to use while pasting
+bindkey -N bracketed-paste
+# Make everything in this new keymap enqueue characters for pasting
+bindkey -RM bracketed-paste '\x00-\xFF' bracketed-paste-enqueue
+# These are the codes sent around the pasted text in bracketed paste mode
+bindkey -M main            '^[[200~' _bracketed_paste_begin
+bindkey -M bracketed-paste '^[[201~' _bracketed_paste_end
+# Insert newlines rather than carriage returns when pasting newlines
+bindkey -M bracketed-paste -s '^M' '^J'
 
-zle -N _start_paste
-zle -N _end_paste
-zle -N zle-line-init _zle_line_init
-zle -N zle-line-finish _zle_line_finish
-zle -N paste-insert _paste_insert
+zle -N _bracketed_paste_begin
+zle -N _bracketed_paste_end
+zle -N bracketed-paste-enqueue _bracketed_paste_enqueue
 
-# switch the active keymap to paste mode
-function _start_paste() {
-  bindkey -A paste main
+# Attempt to not clobber zle_line_{init,finish}
+# Use https://github.com/willghatch/zsh-hooks if available
+if typeset -f hooks-add-hook > /dev/null; then
+  hooks-add-hook zle_line_init_hook   _bracketed_paste_zle_init
+  hooks-add-hook zle_line_finish_hook _bracketed_paste_zle_finish
+else
+  zle -N zle-line-init   _bracketed_paste_zle_init
+  zle -N zle-line-finish _bracketed_paste_zle_finish
+fi
+
+# Switch the active keymap to paste mode
+_bracketed_paste_begin() {
+  # Save the bindkey command to restore the active ("main") keymap
+  # Tokenise the restorative bindkey command into an array
+  _bracketed_paste_restore_keymap=( ${(z)"$(bindkey -lL main)"} )
+  bindkey -A bracketed-paste main
 }
 
-# go back to our normal keymap, and insert all the pasted text in the
-# command line. this has the nice effect of making the whole paste be
+# Go back to our normal keymap, and insert all the pasted text in the
+# command line. This has the nice effect of making the whole paste be
 # a single undo/redo event.
-function _end_paste() {
-#use bindkey -v here with vi mode probably. maybe you want to track
-#if you were in ins or cmd mode and restore the right one.
-  bindkey -e
-  LBUFFER+=$_paste_content
-  unset _paste_content
+_bracketed_paste_end() {
+  # Only execute the restore command if it starts with 'bindkey'
+  # Allow for option KSH_ARRAYS being set (indexing starts at 0)
+  if [ ${_bracketed_paste_restore_keymap[@]:0:1} = 'bindkey' ]; then
+    $_bracketed_paste_restore_keymap
+  fi
+  LBUFFER+=$_bracketed_paste_content
+  unset _bracketed_paste_content _bracketed_paste_restore_keymap
 }
 
-function _paste_insert() {
-  _paste_content+=$KEYS
+# Append a pasted character to the content which is later inserted as a whole
+_bracketed_paste_enqueue() {
+  _bracketed_paste_content+=$KEYS
 }
 
-function _zle_line_init() {
-  # Tell terminal to send escape codes around pastes.
-  [[ $TERM == rxvt-unicode || $TERM == xterm || $TERM = xterm-256color || $TERM = screen || $TERM = screen-256color ]] && printf '\e[?2004h'
+# Run at zle-line-init
+_bracketed_paste_zle_init() {
+  _bracketed_paste_content=''
+  # Tell terminal to send escape codes around pastes
+  if [ $TERM =~ '^(rxvt-unicode|xterm(-256color)?|screen(-256color)?)$' ]; then
+    printf '\e[?2004h'
+  fi
 }
 
-function _zle_line_finish() {
-  # Tell it to stop when we leave zle, so pasting in other programs
-  # doesn't get the ^[[200~ codes around the pasted text.
-  [[ $TERM == rxvt-unicode || $TERM == xterm || $TERM = xterm-256color || $TERM = screen || $TERM = screen-256color ]] && printf '\e[?2004l'
+# Run at zle-line-finish
+_bracketed_paste_zle_finish() {
+  # Turn off bracketed paste when we leave ZLE, so pasting in other programs
+  # doesn't get the ^[[200~ codes around the pasted text
+  if [ $TERM =~ '^(rxvt-unicode|xterm(-256color)?|screen(-256color)?)$' ]; then
+    printf '\e[?2004l'
+  fi
 }
 

From 297238b739fd51f03ab9b3ffcc6c644daa4a1401 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20D=C4=99bski?= <debski.mi.zd@gmail.com>
Date: Fri, 11 Mar 2016 16:59:40 +0100
Subject: [PATCH 127/869] lib: hide git_prompt_status when hide-status is set

Closes #4912
Closes #5137
Closes #8071
---
 lib/git.zsh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/git.zsh b/lib/git.zsh
index ffc7c01a1..b3b25f802 100644
--- a/lib/git.zsh
+++ b/lib/git.zsh
@@ -151,6 +151,8 @@ function git_prompt_long_sha() {
 function git_prompt_status() {
   emulate -L zsh
 
+  [[ "$(__git_prompt_git config --get oh-my-zsh.hide-status 2>/dev/null)" = 1 ]] && return
+
   local INDEX STATUS
   INDEX=$(__git_prompt_git status --porcelain -b 2> /dev/null) || return 0
   STATUS=""

From 45a954cb0f8b67e35529efbcdf60f0621d95f4a1 Mon Sep 17 00:00:00 2001
From: Billy Conn <billyconn@leadify.net>
Date: Thu, 13 Oct 2016 22:31:44 -0500
Subject: [PATCH 128/869] git_prompt_status now uses hash lookups instead of
 multiple greps

---
 lib/git.zsh | 124 ++++++++++++++++++++++++++++++++++++++--------------
 1 file changed, 91 insertions(+), 33 deletions(-)

diff --git a/lib/git.zsh b/lib/git.zsh
index b3b25f802..578f319e4 100644
--- a/lib/git.zsh
+++ b/lib/git.zsh
@@ -147,46 +147,104 @@ function git_prompt_long_sha() {
   SHA=$(__git_prompt_git rev-parse HEAD 2> /dev/null) && echo "$ZSH_THEME_GIT_PROMPT_SHA_BEFORE$SHA$ZSH_THEME_GIT_PROMPT_SHA_AFTER"
 }
 
-# Get the status of the working tree
 function git_prompt_status() {
-  emulate -L zsh
-
   [[ "$(__git_prompt_git config --get oh-my-zsh.hide-status 2>/dev/null)" = 1 ]] && return
 
-  local INDEX STATUS
-  INDEX=$(__git_prompt_git status --porcelain -b 2> /dev/null) || return 0
-  STATUS=""
-  if [[ "${INDEX}" =~ $'(^|\n)\\?\\? ' ]]; then
-    STATUS="$ZSH_THEME_GIT_PROMPT_UNTRACKED$STATUS"
-  fi
-  if [[ "${INDEX}" =~ $'(^|\n)(A |M |MM) ' ]]; then
-    STATUS="$ZSH_THEME_GIT_PROMPT_ADDED$STATUS"
-  fi
-  if [[ "${INDEX}" =~ $'(^|\n)([ AM]M| T) ' ]]; then
-    STATUS="$ZSH_THEME_GIT_PROMPT_MODIFIED$STATUS"
-  fi
-  if [[ "${INDEX}" =~ $'(^|\n)R  ' ]]; then
-    STATUS="$ZSH_THEME_GIT_PROMPT_RENAMED$STATUS"
-  fi
-  if [[ "${INDEX}" =~ $'(^|\n)([A ]D|D ) ' ]]; then
-    STATUS="$ZSH_THEME_GIT_PROMPT_DELETED$STATUS"
+  local status_prompt=""
+
+  # A lookup table of each git status encountered
+  local -A statuses_seen
+
+  # Maps a git status prefix to an internal constant
+  # This cannot use the prompt constants, as they may be empty
+  local -A prefix_constant_map=(
+    '?? '       'UNTRACKED'
+    'A  '       'ADDED'
+    'M  '       'ADDED'
+    'MM '       'ADDED'
+    ' M '       'MODIFIED'
+    'AM '       'MODIFIED'
+    ' T '       'MODIFIED'
+    'R  '       'RENAMED'
+    ' D '       'DELETED'
+    'D  '       'DELETED'
+    'UU '       'UNMERGED'
+    'ahead'     'AHEAD'
+    'behind'    'BEHIND'
+    'diverged'  'DIVERGED'
+    'stashed'   'STASHED'
+  )
+
+  # Maps the internal constant to the prompt theme
+  local -A constant_prompt_map=(
+    'UNTRACKED' "$ZSH_THEME_GIT_PROMPT_UNTRACKED"
+    'ADDED'     "$ZSH_THEME_GIT_PROMPT_ADDED"
+    'MODIFIED'  "$ZSH_THEME_GIT_PROMPT_MODIFIED"
+    'RENAMED'   "$ZSH_THEME_GIT_PROMPT_RENAMED"
+    'DELETED'   "$ZSH_THEME_GIT_PROMPT_DELETED"
+    'UNMERGED'  "$ZSH_THEME_GIT_PROMPT_UNMERGED"
+    'AHEAD'     "$ZSH_THEME_GIT_PROMPT_AHEAD"
+    'BEHIND'    "$ZSH_THEME_GIT_PROMPT_BEHIND"
+    'DIVERGED'  "$ZSH_THEME_GIT_PROMPT_DIVERGED"
+    'STASHED'   "$ZSH_THEME_GIT_PROMPT_STASHED"
+  )
+
+  # The order that the prompt displays should be added to the prompt
+  local status_constants=(UNTRACKED ADDED MODIFIED RENAMED DELETED STASHED
+                          UNMERGED AHEAD BEHIND DIVERGED)
+
+  local status_text=$(__git_prompt_git status --porcelain -b 2> /dev/null)
+
+  # Don't continue on a catastrophic failure
+  if [[ $? -eq 128 ]]; then
+    return 1
   fi
+
   if $(__git_prompt_git rev-parse --verify refs/stash >/dev/null 2>&1); then
-    STATUS="$ZSH_THEME_GIT_PROMPT_STASHED$STATUS"
+    statuses_seen['STASHED']=1
   fi
-  if [[ "${INDEX}" =~ $'(^|\n)UU ' ]]; then
-    STATUS="$ZSH_THEME_GIT_PROMPT_UNMERGED$STATUS"
+
+  local status_lines=("${(@f)${status_text}}");
+
+  # If the tracking line exists, get and parse it
+  if [[ $status_lines[1] =~ "^## [^ ]+ \[(.*)\]" ]]; then
+    local branch_statuses=("${(@s/,/)match}")
+    for branch_status in $branch_statuses; do
+      if [[ ! $branch_status =~ "(behind|diverged|ahead) ([0-9]+)?" ]]; then
+        continue
+      fi
+      local last_parsed_status=$prefix_constant_map[$match[1]]
+      statuses_seen[$last_parsed_status]=$match[2]
+    done
+    shift status_lines
   fi
-  if [[ "${INDEX}" =~ $'(^|\n)## [^ ]\+ .*ahead' ]]; then
-    STATUS="$ZSH_THEME_GIT_PROMPT_AHEAD$STATUS"
-  fi
-  if [[ "${INDEX}" =~ $'(^|\n)## [^ ]\+ .*behind' ]]; then
-    STATUS="$ZSH_THEME_GIT_PROMPT_BEHIND$STATUS"
-  fi
-  if [[ "${INDEX}" =~ $'(^|\n)## [^ ]\+ .*diverged' ]]; then
-    STATUS="$ZSH_THEME_GIT_PROMPT_DIVERGED$STATUS"
-  fi
-  echo $STATUS
+
+  # This not only gives us a status lookup, but the count of each type
+  for status_line in ${status_lines}; do
+    local status_prefix=${status_line[1, 3]}
+    local status_constant=${(v)prefix_constant_map[$status_prefix]}
+
+    if [[ -z $status_constant ]]; then
+      continue
+    fi
+
+    (( statuses_seen[$status_constant]++ ))
+  done
+
+  # At this point, the statuses_seen hash contains:
+  # - Tracking      => The difference between tracked and current
+  # - Modifications => The count of that type of modification
+  # - Stash         => Whether or not a stash exists
+  # Might be useful for someone?
+
+  for status_constant in $status_constants; do
+    if [[ ${+statuses_seen[$status_constant]} -eq 1 ]]; then
+      local next_display=$constant_prompt_map[$status_constant]
+      status_prompt="$next_display$status_prompt"
+    fi
+  done
+
+  echo $status_prompt
 }
 
 # Outputs the name of the current user

From 865f6572d586e7ba1231333cadf808002688603e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Sat, 14 Apr 2018 23:37:45 +0200
Subject: [PATCH 129/869] Fix performance drop of iterating over lines and
 other stuff

- Fix 'STASHED' key and unsupported syntax in 5.0.2
- Optimise `if` statement to make it more idiomatic.
---
 lib/git.zsh | 62 ++++++++++++++++++++++++++---------------------------
 1 file changed, 30 insertions(+), 32 deletions(-)

diff --git a/lib/git.zsh b/lib/git.zsh
index 578f319e4..f9b27949e 100644
--- a/lib/git.zsh
+++ b/lib/git.zsh
@@ -150,15 +150,11 @@ function git_prompt_long_sha() {
 function git_prompt_status() {
   [[ "$(__git_prompt_git config --get oh-my-zsh.hide-status 2>/dev/null)" = 1 ]] && return
 
-  local status_prompt=""
-
-  # A lookup table of each git status encountered
-  local -A statuses_seen
-
   # Maps a git status prefix to an internal constant
   # This cannot use the prompt constants, as they may be empty
-  local -A prefix_constant_map=(
-    '?? '       'UNTRACKED'
+  local -A prefix_constant_map
+  prefix_constant_map=(
+    '\?\? '     'UNTRACKED'
     'A  '       'ADDED'
     'M  '       'ADDED'
     'MM '       'ADDED'
@@ -176,7 +172,8 @@ function git_prompt_status() {
   )
 
   # Maps the internal constant to the prompt theme
-  local -A constant_prompt_map=(
+  local -A constant_prompt_map
+  constant_prompt_map=(
     'UNTRACKED' "$ZSH_THEME_GIT_PROMPT_UNTRACKED"
     'ADDED'     "$ZSH_THEME_GIT_PROMPT_ADDED"
     'MODIFIED'  "$ZSH_THEME_GIT_PROMPT_MODIFIED"
@@ -190,25 +187,33 @@ function git_prompt_status() {
   )
 
   # The order that the prompt displays should be added to the prompt
-  local status_constants=(UNTRACKED ADDED MODIFIED RENAMED DELETED STASHED
-                          UNMERGED AHEAD BEHIND DIVERGED)
+  local status_constants
+  status_constants=(
+    UNTRACKED ADDED MODIFIED RENAMED DELETED
+    STASHED UNMERGED AHEAD BEHIND DIVERGED
+  )
 
-  local status_text=$(__git_prompt_git status --porcelain -b 2> /dev/null)
+  local status_text="$(__git_prompt_git status --porcelain -b 2> /dev/null)"
 
   # Don't continue on a catastrophic failure
   if [[ $? -eq 128 ]]; then
     return 1
   fi
 
-  if $(__git_prompt_git rev-parse --verify refs/stash >/dev/null 2>&1); then
-    statuses_seen['STASHED']=1
+  # A lookup table of each git status encountered
+  local -A statuses_seen
+
+  if __git_prompt_git rev-parse --verify refs/stash &>/dev/null; then
+    statuses_seen[STASHED]=1
   fi
 
-  local status_lines=("${(@f)${status_text}}");
+  local status_lines
+  status_lines=("${(@f)${status_text}}")
 
   # If the tracking line exists, get and parse it
-  if [[ $status_lines[1] =~ "^## [^ ]+ \[(.*)\]" ]]; then
-    local branch_statuses=("${(@s/,/)match}")
+  if [[ "$status_lines[1]" =~ "^## [^ ]+ \[(.*)\]" ]]; then
+    local branch_statuses
+    branch_statuses=("${(@s/,/)match}")
     for branch_status in $branch_statuses; do
       if [[ ! $branch_status =~ "(behind|diverged|ahead) ([0-9]+)?" ]]; then
         continue
@@ -216,29 +221,22 @@ function git_prompt_status() {
       local last_parsed_status=$prefix_constant_map[$match[1]]
       statuses_seen[$last_parsed_status]=$match[2]
     done
-    shift status_lines
   fi
 
-  # This not only gives us a status lookup, but the count of each type
-  for status_line in ${status_lines}; do
-    local status_prefix=${status_line[1, 3]}
-    local status_constant=${(v)prefix_constant_map[$status_prefix]}
+  # For each status prefix, do a regex comparison
+  for status_prefix in ${(k)prefix_constant_map}; do
+    local status_constant="${prefix_constant_map[$status_prefix]}"
+    local status_regex="(^|\n)$status_prefix"
 
-    if [[ -z $status_constant ]]; then
-      continue
+    if [[ "$status_text" =~ $status_regex ]]; then
+      statuses_seen[$status_constant]=1
     fi
-
-    (( statuses_seen[$status_constant]++ ))
   done
 
-  # At this point, the statuses_seen hash contains:
-  # - Tracking      => The difference between tracked and current
-  # - Modifications => The count of that type of modification
-  # - Stash         => Whether or not a stash exists
-  # Might be useful for someone?
-
+  # Display the seen statuses in the order specified
+  local status_prompt
   for status_constant in $status_constants; do
-    if [[ ${+statuses_seen[$status_constant]} -eq 1 ]]; then
+    if (( ${+statuses_seen[$status_constant]} )); then
       local next_display=$constant_prompt_map[$status_constant]
       status_prompt="$next_display$status_prompt"
     fi

From 1bb402190d53c118f47a0851f5714dd4faa52809 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Fri, 9 Oct 2020 13:55:56 +0200
Subject: [PATCH 130/869] lib: add plugin and theme subcommands and fix `omz pr
 clean`

- Add plugin and theme subcommand

  Fixes #8961

- Add confirmation prompt to `omz pr clean` command

- Correct behavior on invalid answers on confirmation prompts

  If an invalid option is supplied, don't proceed with the potentially
  destructive action.

Co-authored-by: Rishabh Bohra <rishabhbohra01@gmail.com>
---
 lib/cli.zsh | 174 ++++++++++++++++++++++++++++++++++++++++++++++------
 1 file changed, 156 insertions(+), 18 deletions(-)

diff --git a/lib/cli.zsh b/lib/cli.zsh
index c1ae2bdf2..0c0f3f623 100644
--- a/lib/cli.zsh
+++ b/lib/cli.zsh
@@ -23,16 +23,27 @@ function _omz {
     local -a cmds subcmds
     cmds=(
         'help:Usage information'
+        'plugin:Commands for Oh My Zsh plugins management'
+        'pr:Commands for Oh My Zsh Pull Requests management'
+        'theme:Commands for Oh My Zsh themes management'
         'update:Update Oh My Zsh'
-        'pr:Commands for Oh My Zsh Pull Requests'
     )
 
     if (( CURRENT == 2 )); then
         _describe 'command' cmds
     elif (( CURRENT == 3 )); then
         case "$words[2]" in
-            pr) subcmds=( 'test:Test a Pull Request' 'clean:Delete all Pull Request branches' )
+            plugin) subcmds=('list:List plugins')
                 _describe 'command' subcmds ;;
+            pr) subcmds=('test:Test a Pull Request' 'clean:Delete all Pull Request branches')
+                _describe 'command' subcmds ;;
+            theme) subcmds=('use:Load a theme' 'list:List themes')
+                _describe 'command' subcmds ;;
+        esac
+    elif (( CURRENT == 4 )); then
+        case "$words[2]::$words[3]" in
+            theme::use) compadd "$ZSH"/themes/*.zsh-theme(.N:t:r) \
+                "$ZSH_CUSTOM"/**/*.zsh-theme(.N:r:gs:"$ZSH_CUSTOM"/themes/:::gs:"$ZSH_CUSTOM"/:::) ;;
         esac
     fi
 
@@ -49,23 +60,40 @@ Usage: omz <command> [options]
 Available commands:
 
     help                Print this help message
+    pr <command>        Commands for Oh My Zsh Pull Requests management
+    theme <command>     Commands for Oh My Zsh themes management
     update              Update Oh My Zsh
-    pr <command>        Commands for Oh My Zsh Pull Requests
 
 EOF
 }
 
+function _omz::confirm {
+    # If question supplied, ask it before reading the answer
+    # NOTE: uses the logname of the caller function
+    if [[ -n "$1" ]]; then
+        _omz::log prompt "$1" "${${functrace[1]#_}%:*}"
+    fi
+
+    # Read one character
+    read -r -k 1
+
+    # If no newline entered, add a newline
+    if [[ "$REPLY" != $'\n' ]]; then
+        echo
+    fi
+}
+
 function _omz::log {
     # if promptsubst is set, a message with `` or $()
     # will be run even if quoted due to `print -P`
     setopt localoptions nopromptsubst
 
     # $1 = info|warn|error|debug
-    # $@ = text
+    # $2 = text
+    # $3 = (optional) name of the logger
 
     local logtype=$1
-    local logname=${${functrace[1]#_}%:*}
-    shift
+    local logname=${3:-${${functrace[1]#_}%:*}}
 
     # Don't print anything if debug is not active
     if [[ $logtype = debug && -z $_OMZ_DEBUG ]]; then
@@ -74,14 +102,52 @@ function _omz::log {
 
     # Choose coloring based on log type
     case "$logtype" in
-        prompt) print -Pn "%S%F{blue}$logname%f%s: $@" ;;
-        debug) print -P "%F{white}$logname%f: $@" ;;
-        info) print -P "%F{green}$logname%f: $@" ;;
-        warn) print -P "%S%F{yellow}$logname%f%s: $@" ;;
-        error) print -P "%S%F{red}$logname%f%s: $@" ;;
+        prompt) print -Pn "%S%F{blue}$logname%f%s: $2" ;;
+        debug) print -P "%F{white}$logname%f: $2" ;;
+        info) print -P "%F{green}$logname%f: $2" ;;
+        warn) print -P "%S%F{yellow}$logname%f%s: $2" ;;
+        error) print -P "%S%F{red}$logname%f%s: $2" ;;
     esac >&2
 }
 
+function _omz::plugin {
+    (( $# > 0 && $+functions[_omz::plugin::$1] )) || {
+        cat <<EOF
+Usage: omz plugin <command> [options]
+
+Available commands:
+
+    list            List all available Oh My Zsh plugins
+
+EOF
+        return 1
+    }
+
+    local command="$1"
+    shift
+
+    _omz::plugin::$command "$@"
+}
+
+function _omz::plugin::list {
+    local -a custom_plugins builtin_plugins
+    custom_plugins=("$ZSH_CUSTOM"/plugins/*(/N:t))
+    builtin_plugins=("$ZSH"/plugins/*(/N:t))
+
+    (( ${#custom_plugins} )) && {
+        print -Pn "%U%BCustom plugins%b%u: "
+        print -l ${(q-)custom_plugins}
+    } | fmt -w $COLUMNS
+
+    (( ${#builtin_plugins} )) && {
+        # add a line of separation
+        (( ${#custom_plugins} )) && echo
+
+        print -Pn "%U%BBuilt-in plugins%b%u: "
+        print -l ${(q-)builtin_plugins}
+    } | fmt -w $COLUMNS
+}
+
 function _omz::pr {
     (( $# > 0 && $+functions[_omz::pr::$1] )) || {
         cat <<EOF
@@ -107,6 +173,24 @@ function _omz::pr::clean {
         set -e
         builtin cd -q "$ZSH"
 
+        # Check if there are PR branches
+        local fmt branches
+        fmt="%(align:19,right)%(color:bold blue)%(refname:short)%(end)%(color:reset) %(color:dim bold red)%(objectname:short)%(color:reset)  %(color:yellow)%(contents:subject)"
+        branches="$(command git for-each-ref --sort=-committerdate --color --format="$fmt" "refs/heads/ohmyzsh/pull-*")"
+
+        # Exit if there are no PR branches
+        if [[ -z "$branches" ]]; then
+            _omz::log info "there are no Pull Request branches to remove."
+            return
+        fi
+
+        # Print found PR branches
+        echo "$branches\n"
+        # Confirm before removing the branches
+        _omz::confirm "do you want remove these Pull Request branches? [Y/n] "
+        # Only proceed if the answer is a valid yes option
+        [[ "$REPLY" != [yY$'\n'] ]] && return
+
         _omz::log info "removing all Oh My Zsh Pull Request branches..."
         command git branch --list 'ohmyzsh/pull-*' | while read branch; do
             command git branch -D "$branch"
@@ -181,13 +265,9 @@ function _omz::pr::test {
     command zsh -l
 
     # After testing, go back to the previous HEAD if the user wants
-    _omz::log prompt "do you want to go back to the previous branch? [Y/n] "
-    read -r -k 1
-
-    # If no newline entered, add a newline
-    [[ "$REPLY" != $'\n' ]] && echo
-    # If NO selected, do nothing else
-    [[ "$REPLY" = [nN] ]] && return
+    _omz::confirm "do you want to go back to the previous branch? [Y/n] "
+    # Only proceed if the answer is a valid yes option
+    [[ "$REPLY" != [yY$'\n'] ]] && return
 
     (
         set -e
@@ -200,6 +280,64 @@ function _omz::pr::test {
     )
 }
 
+function _omz::theme {
+    (( $# > 0 && $+functions[_omz::theme::$1] )) || {
+        cat <<EOF
+Usage: omz theme <command> [options]
+
+Available commands:
+
+    list            List all available Oh My Zsh themes
+    use <theme>     Load an Oh My Zsh theme
+
+EOF
+        return 1
+    }
+
+    local command="$1"
+    shift
+
+    _omz::theme::$command "$@"
+}
+
+function _omz::theme::list {
+    local -a custom_themes builtin_themes
+    custom_themes=("$ZSH_CUSTOM"/**/*.zsh-theme(.N:r:gs:"$ZSH_CUSTOM"/themes/:::gs:"$ZSH_CUSTOM"/:::))
+    builtin_themes=("$ZSH"/themes/*.zsh-theme(.N:t:r))
+
+    (( ${#custom_themes} )) && {
+        print -Pn "%U%BCustom themes%b%u: "
+        print -l ${(q-)custom_themes}
+    } | fmt -w $COLUMNS
+
+    (( ${#builtin_themes} )) && {
+        # add a line of separation
+        (( ${#custom_themes} )) && echo
+
+        print -Pn "%U%BBuilt-in themes%b%u: "
+        print -l ${(q-)builtin_themes}
+    } | fmt -w $COLUMNS
+}
+
+function _omz::theme::use {
+    if [[ -z "$1" ]]; then
+        echo >&2 "Usage: omz theme use <theme>"
+        return 1
+    fi
+
+    # Respect compatibility with old lookup order
+    if [[ -f "$ZSH_CUSTOM/$1.zsh-theme" ]]; then
+        source "$ZSH_CUSTOM/$1.zsh-theme"
+    elif [[ -f "$ZSH_CUSTOM/themes/$1.zsh-theme" ]]; then
+        source "$ZSH_CUSTOM/themes/$1.zsh-theme"
+    elif [[ -f "$ZSH/themes/$1.zsh-theme" ]]; then
+        source "$ZSH/themes/$1.zsh-theme"
+    else
+        _omz::log error "theme '$1' not found"
+        return 1
+    fi
+}
+
 function _omz::update {
     # Run update script
     env ZSH="$ZSH" sh "$ZSH/tools/upgrade.sh"

From fc6c9ca4b40ee1c9ba7fb4b1c8862fb54a8cb1f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Fri, 9 Oct 2020 15:03:03 +0200
Subject: [PATCH 131/869] lib: fix formatting in `omz pr clean` CLI command

---
 lib/cli.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/cli.zsh b/lib/cli.zsh
index 0c0f3f623..5d6c31aef 100644
--- a/lib/cli.zsh
+++ b/lib/cli.zsh
@@ -175,7 +175,7 @@ function _omz::pr::clean {
 
         # Check if there are PR branches
         local fmt branches
-        fmt="%(align:19,right)%(color:bold blue)%(refname:short)%(end)%(color:reset) %(color:dim bold red)%(objectname:short)%(color:reset)  %(color:yellow)%(contents:subject)"
+        fmt="%(color:bold blue)%(align:18,right)%(refname:short)%(end)%(color:reset) %(color:dim bold red)%(objectname:short)%(color:reset) %(color:yellow)%(contents:subject)"
         branches="$(command git for-each-ref --sort=-committerdate --color --format="$fmt" "refs/heads/ohmyzsh/pull-*")"
 
         # Exit if there are no PR branches

From ef44416df2e2ae819b13764dbf6ca87ce099ec36 Mon Sep 17 00:00:00 2001
From: Andrew Janke <andrew@apjanke.net>
Date: Thu, 10 Sep 2015 04:10:18 -0400
Subject: [PATCH 132/869] nvm: use `nvm current` in nvm_prompt_info and look in
 alternate install locations

This makes it work regardless of where nvm is loaded from. And it uses nvm's
version strings, which distinguish the "system" and "none" NVM environments,
instead of reporting the specific version of the system node.js or erroring,
respectively.

Fixes #4336
Closes #4338
---
 lib/nvm.zsh                |  9 +++---
 plugins/nvm/nvm.plugin.zsh | 62 ++++++++++++++++++++++++++------------
 2 files changed, 46 insertions(+), 25 deletions(-)

diff --git a/lib/nvm.zsh b/lib/nvm.zsh
index 4a8b6811e..c4f70c849 100644
--- a/lib/nvm.zsh
+++ b/lib/nvm.zsh
@@ -1,9 +1,8 @@
-# get the node.js version
+# get the nvm-controlled node.js version
 function nvm_prompt_info() {
-  [[ -f "$NVM_DIR/nvm.sh" ]] || return
   local nvm_prompt
-  nvm_prompt=$(node -v 2>/dev/null)
-  [[ "${nvm_prompt}x" == "x" ]] && return
-  nvm_prompt=${nvm_prompt:1}
+  which nvm &>/dev/null || return
+  nvm_prompt=$(nvm current)
+  nvm_prompt=${nvm_prompt#v}
   echo "${ZSH_THEME_NVM_PROMPT_PREFIX}${nvm_prompt}${ZSH_THEME_NVM_PROMPT_SUFFIX}"
 }
diff --git a/plugins/nvm/nvm.plugin.zsh b/plugins/nvm/nvm.plugin.zsh
index 2264a2420..ee8d2324b 100644
--- a/plugins/nvm/nvm.plugin.zsh
+++ b/plugins/nvm/nvm.plugin.zsh
@@ -1,23 +1,45 @@
-# Set NVM_DIR if it isn't already defined
-[[ -z "$NVM_DIR" ]] && export NVM_DIR="$HOME/.nvm"
+# nvm
+#
+# This plugin locates and loads nvm, looking for it in well-known locations.
 
-# Don't try to load nvm if command already available
-type "nvm" &> /dev/null && return
+() {
+  emulate -L zsh
+  local nvm_install_dir="" dir install_locations
+  if [[ -n $NVM_INSTALL_DIR ]]; then
+    # User-specified path
+    nvm_install_dir=$NVM_INSTALL_DIR
+  else
+    # Well-known common installation locations for NVM
+    install_locations=( ~/.nvm )
+    [[ -n $NVM_DIR ]] && install_locations=($NVM_DIR $install_locations)
+    # Mac Homebrew sticks 
+    which brew &>/dev/null && install_locations+=$(brew --prefix nvm)
+    for dir ($install_locations); do
+      if [[ -s $dir/nvm.sh ]]; then
+        nvm_install_dir=$dir
+        break
+      fi
+    done
+  fi
 
-# Load nvm if it exists in $NVM_DIR
-if [[ -f "$NVM_DIR/nvm.sh" ]]; then
-    source "$NVM_DIR/nvm.sh"
-    return
-fi
+  if [[ -n $nvm_install_dir ]]; then
+    source $nvm_install_dir/nvm.sh
+  else
+    # No NVM installation found
+    return 0
+  fi
 
-# Otherwise try to load nvm installed via Homebrew
-
-# User can set this if they have an unusual Homebrew setup
-NVM_HOMEBREW="${NVM_HOMEBREW:-/usr/local/opt/nvm}"
-# Load nvm from Homebrew location if it exists
-[[ -f "$NVM_HOMEBREW/nvm.sh" ]] && source "$NVM_HOMEBREW/nvm.sh"
-# Load nvm bash completion from Homebrew if it exists
-if [[ -f "$NVM_HOMEBREW/etc/bash_completion.d/nvm" ]]; then
-    autoload -U +X bashcompinit && bashcompinit
-    source "$NVM_HOMEBREW/etc/bash_completion.d/nvm"
-fi
+  # Locate and use the completion file shipped with NVM, instead of this
+  # plugin's completion
+  # (Their bash completion file has zsh portability support)
+  if [[ $ZSH_NVM_BUNDLED_COMPLETION == true ]]; then
+    local bash_comp_file
+    # Homebrew relocates the bash completion file, so look multiple places
+    for bash_comp_file ( bash_completion etc/bash_completion.d/nvm ); do
+      if [[ -s $nvm_install_dir/$bash_comp_file ]]; then
+        source $nvm_install_dir/$bash_comp_file
+        break;
+      fi
+    done
+  fi
+}

From d8cb67023540c1e2e7e4e211e2f7c9fc2d4e0c3c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Fri, 9 Oct 2020 16:12:03 +0200
Subject: [PATCH 133/869] nvm: simplify nvm.sh and bash completion loading

---
 lib/nvm.zsh                |  4 +--
 plugins/nvm/nvm.plugin.zsh | 67 +++++++++++++++-----------------------
 2 files changed, 27 insertions(+), 44 deletions(-)

diff --git a/lib/nvm.zsh b/lib/nvm.zsh
index c4f70c849..2fe57a8f4 100644
--- a/lib/nvm.zsh
+++ b/lib/nvm.zsh
@@ -1,8 +1,6 @@
 # get the nvm-controlled node.js version
 function nvm_prompt_info() {
-  local nvm_prompt
   which nvm &>/dev/null || return
-  nvm_prompt=$(nvm current)
-  nvm_prompt=${nvm_prompt#v}
+  local nvm_prompt=${$(nvm current)#v}
   echo "${ZSH_THEME_NVM_PROMPT_PREFIX}${nvm_prompt}${ZSH_THEME_NVM_PROMPT_SUFFIX}"
 }
diff --git a/plugins/nvm/nvm.plugin.zsh b/plugins/nvm/nvm.plugin.zsh
index ee8d2324b..2c137894b 100644
--- a/plugins/nvm/nvm.plugin.zsh
+++ b/plugins/nvm/nvm.plugin.zsh
@@ -1,45 +1,30 @@
-# nvm
-#
-# This plugin locates and loads nvm, looking for it in well-known locations.
+# Set NVM_DIR if it isn't already defined
+[[ -z "$NVM_DIR" ]] && export NVM_DIR="$HOME/.nvm"
 
-() {
-  emulate -L zsh
-  local nvm_install_dir="" dir install_locations
-  if [[ -n $NVM_INSTALL_DIR ]]; then
-    # User-specified path
-    nvm_install_dir=$NVM_INSTALL_DIR
-  else
-    # Well-known common installation locations for NVM
-    install_locations=( ~/.nvm )
-    [[ -n $NVM_DIR ]] && install_locations=($NVM_DIR $install_locations)
-    # Mac Homebrew sticks 
-    which brew &>/dev/null && install_locations+=$(brew --prefix nvm)
-    for dir ($install_locations); do
-      if [[ -s $dir/nvm.sh ]]; then
-        nvm_install_dir=$dir
-        break
-      fi
-    done
-  fi
+# Don't try to load nvm if command already available
+which nvm &> /dev/null && return
 
-  if [[ -n $nvm_install_dir ]]; then
-    source $nvm_install_dir/nvm.sh
-  else
-    # No NVM installation found
-    return 0
-  fi
+if [[ -f "$NVM_DIR/nvm.sh" ]]; then
+  # Load nvm if it exists in $NVM_DIR
+  source "$NVM_DIR/nvm.sh"
+else
+  # Otherwise try to load nvm installed via Homebrew
+  # User can set this if they have an unusual Homebrew setup
+  NVM_HOMEBREW="${NVM_HOMEBREW:-/usr/local/opt/nvm}"
+  # Load nvm from Homebrew location if it exists
+  [[ -f "$NVM_HOMEBREW/nvm.sh" ]] && source "$NVM_HOMEBREW/nvm.sh"
+fi
 
-  # Locate and use the completion file shipped with NVM, instead of this
-  # plugin's completion
-  # (Their bash completion file has zsh portability support)
-  if [[ $ZSH_NVM_BUNDLED_COMPLETION == true ]]; then
-    local bash_comp_file
-    # Homebrew relocates the bash completion file, so look multiple places
-    for bash_comp_file ( bash_completion etc/bash_completion.d/nvm ); do
-      if [[ -s $nvm_install_dir/$bash_comp_file ]]; then
-        source $nvm_install_dir/$bash_comp_file
-        break;
-      fi
-    done
+# Load nvm bash completion
+for nvm_completion in "$NVM_DIR/bash_completion" "$NVM_HOMEBREW/etc/bash_completion.d/nvm"; do
+  if [[ -f "$nvm_completion" ]]; then
+    # Load bashcompinit
+    autoload -U +X bashcompinit && bashcompinit
+    # Bypass compinit call in nvm bash completion script. See:
+    # https://github.com/nvm-sh/nvm/blob/4436638/bash_completion#L86-L93
+    ZSH_VERSION= source "$nvm_completion"
+    break
   fi
-}
+done
+
+unset NVM_HOMEBREW nvm_completion

From d6f3630932f364370c08b5a02b88c74aed577463 Mon Sep 17 00:00:00 2001
From: Chigozirim C <nobleman.code@gmx.com>
Date: Sat, 27 Apr 2019 01:38:14 -0600
Subject: [PATCH 134/869] nvm: check $XDG_CONFIG_HOME/nvm for an nvm
 installation
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Closes #7807

Co-authored-by: Marc Cornellà <marc.cornella@live.com>
---
 plugins/nvm/nvm.plugin.zsh | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/plugins/nvm/nvm.plugin.zsh b/plugins/nvm/nvm.plugin.zsh
index 2c137894b..21fb3112b 100644
--- a/plugins/nvm/nvm.plugin.zsh
+++ b/plugins/nvm/nvm.plugin.zsh
@@ -1,5 +1,11 @@
-# Set NVM_DIR if it isn't already defined
-[[ -z "$NVM_DIR" ]] && export NVM_DIR="$HOME/.nvm"
+# See https://github.com/nvm-sh/nvm#installation-and-update
+if [[ -z "$NVM_DIR" ]]; then
+  if [[ -d "$HOME/.nvm" ]]; then
+    export NVM_DIR="$HOME/.nvm"
+  elif [[ -d "${XDG_CONFIG_HOME:-$HOME/.config}/nvm" ]]; then
+    export NVM_DIR="${XDG_CONFIG_HOME:-$HOME/.config}/nvm"
+  fi
+fi
 
 # Don't try to load nvm if command already available
 which nvm &> /dev/null && return

From 3e973080037ae68ac25a08545e7cdc60ba128900 Mon Sep 17 00:00:00 2001
From: Keith Yao <i@yaofur.com>
Date: Mon, 17 Sep 2018 11:14:29 +0200
Subject: [PATCH 135/869] nvm: speed-up nvm loading with `--no-use`
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Closes #7138

Co-authored-by: Marc Cornellà <marc.cornella@live.com>
---
 plugins/nvm/nvm.plugin.zsh | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/plugins/nvm/nvm.plugin.zsh b/plugins/nvm/nvm.plugin.zsh
index 21fb3112b..640f1d45c 100644
--- a/plugins/nvm/nvm.plugin.zsh
+++ b/plugins/nvm/nvm.plugin.zsh
@@ -12,15 +12,22 @@ which nvm &> /dev/null && return
 
 if [[ -f "$NVM_DIR/nvm.sh" ]]; then
   # Load nvm if it exists in $NVM_DIR
-  source "$NVM_DIR/nvm.sh"
+  source "$NVM_DIR/nvm.sh" --no-use
 else
   # Otherwise try to load nvm installed via Homebrew
   # User can set this if they have an unusual Homebrew setup
   NVM_HOMEBREW="${NVM_HOMEBREW:-/usr/local/opt/nvm}"
   # Load nvm from Homebrew location if it exists
-  [[ -f "$NVM_HOMEBREW/nvm.sh" ]] && source "$NVM_HOMEBREW/nvm.sh"
+  [[ -f "$NVM_HOMEBREW/nvm.sh" ]] && source "$NVM_HOMEBREW/nvm.sh" --no-use
 fi
 
+# Call nvm when first using node, npm or yarn
+function node npm yarn {
+  unfunction node npm yarn
+  nvm use default
+  command "$0" "$@"
+}
+
 # Load nvm bash completion
 for nvm_completion in "$NVM_DIR/bash_completion" "$NVM_HOMEBREW/etc/bash_completion.d/nvm"; do
   if [[ -f "$nvm_completion" ]]; then

From a33c0cdb46badcc1df9a37da015a82f7f7b0a7e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Fri, 9 Oct 2020 16:35:47 +0200
Subject: [PATCH 136/869] nvm: only lazy-load nvm if the NVM_LAZY setting is
 set

---
 plugins/nvm/README.md      |  4 ++++
 plugins/nvm/nvm.plugin.zsh | 16 +++++++++-------
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/plugins/nvm/README.md b/plugins/nvm/README.md
index 2515da9e8..ab71185cb 100644
--- a/plugins/nvm/README.md
+++ b/plugins/nvm/README.md
@@ -16,3 +16,7 @@ plugins=(... nvm)
   
 - **`NVM_HOMEBREW`**: if you installed nvm via Homebrew, in a directory other than `/usr/local/opt/nvm`, you
   can set `NVM_HOMEBREW` to be the directory where you installed it.
+
+- **`NVM_LAZY`**: if you want the plugin to defer the load of nvm to speed-up the start of your zsh session,
+  set `NVM_LAZY` to `1`. This will use the `--no-use` parameter when loading nvm, and will create a function
+  for `node`, `npm` and `yarn`, so when you call either of these three, nvm will load with `nvm use default`.
diff --git a/plugins/nvm/nvm.plugin.zsh b/plugins/nvm/nvm.plugin.zsh
index 640f1d45c..164be5907 100644
--- a/plugins/nvm/nvm.plugin.zsh
+++ b/plugins/nvm/nvm.plugin.zsh
@@ -12,21 +12,23 @@ which nvm &> /dev/null && return
 
 if [[ -f "$NVM_DIR/nvm.sh" ]]; then
   # Load nvm if it exists in $NVM_DIR
-  source "$NVM_DIR/nvm.sh" --no-use
+  source "$NVM_DIR/nvm.sh" ${NVM_LAZY+"--no-use"}
 else
   # Otherwise try to load nvm installed via Homebrew
   # User can set this if they have an unusual Homebrew setup
   NVM_HOMEBREW="${NVM_HOMEBREW:-/usr/local/opt/nvm}"
   # Load nvm from Homebrew location if it exists
-  [[ -f "$NVM_HOMEBREW/nvm.sh" ]] && source "$NVM_HOMEBREW/nvm.sh" --no-use
+  [[ -f "$NVM_HOMEBREW/nvm.sh" ]] && source "$NVM_HOMEBREW/nvm.sh" ${NVM_LAZY+"--no-use"}
 fi
 
 # Call nvm when first using node, npm or yarn
-function node npm yarn {
-  unfunction node npm yarn
-  nvm use default
-  command "$0" "$@"
-}
+if (( $+NVM_LAZY )); then
+  function node npm yarn {
+    unfunction node npm yarn
+    nvm use default
+    command "$0" "$@"
+  }
+fi
 
 # Load nvm bash completion
 for nvm_completion in "$NVM_DIR/bash_completion" "$NVM_HOMEBREW/etc/bash_completion.d/nvm"; do

From 8163f65084b86d5e63c1867d076ecdc8faca2f33 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Fri, 9 Oct 2020 16:40:13 +0200
Subject: [PATCH 137/869] nvm: exit the plugin if the nvm loading script wasn't
 found

---
 plugins/nvm/nvm.plugin.zsh | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/plugins/nvm/nvm.plugin.zsh b/plugins/nvm/nvm.plugin.zsh
index 164be5907..b2355b7ef 100644
--- a/plugins/nvm/nvm.plugin.zsh
+++ b/plugins/nvm/nvm.plugin.zsh
@@ -18,7 +18,12 @@ else
   # User can set this if they have an unusual Homebrew setup
   NVM_HOMEBREW="${NVM_HOMEBREW:-/usr/local/opt/nvm}"
   # Load nvm from Homebrew location if it exists
-  [[ -f "$NVM_HOMEBREW/nvm.sh" ]] && source "$NVM_HOMEBREW/nvm.sh" ${NVM_LAZY+"--no-use"}
+  if [[ -f "$NVM_HOMEBREW/nvm.sh" ]]; then
+    source "$NVM_HOMEBREW/nvm.sh" ${NVM_LAZY+"--no-use"}
+  else
+    # Exit the plugin if we couldn't find nvm
+    return
+  fi
 fi
 
 # Call nvm when first using node, npm or yarn
@@ -42,4 +47,4 @@ for nvm_completion in "$NVM_DIR/bash_completion" "$NVM_HOMEBREW/etc/bash_complet
   fi
 done
 
-unset NVM_HOMEBREW nvm_completion
+unset NVM_HOMEBREW NVM_LAZY nvm_completion

From 8c8fe2a1715df916f0b5d785fee32c8a4a40c05b Mon Sep 17 00:00:00 2001
From: Danny Grove <groved@google.com>
Date: Fri, 13 Jan 2017 17:15:12 -0800
Subject: [PATCH 138/869] nvm: add autoloading of nvm version in .nvmrc

Closes #5782
Fixes #8959
Closes #8976
---
 plugins/nvm/README.md      |  4 ++++
 plugins/nvm/nvm.plugin.zsh | 29 ++++++++++++++++++++++++++++-
 2 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/plugins/nvm/README.md b/plugins/nvm/README.md
index ab71185cb..749a43403 100644
--- a/plugins/nvm/README.md
+++ b/plugins/nvm/README.md
@@ -20,3 +20,7 @@ plugins=(... nvm)
 - **`NVM_LAZY`**: if you want the plugin to defer the load of nvm to speed-up the start of your zsh session,
   set `NVM_LAZY` to `1`. This will use the `--no-use` parameter when loading nvm, and will create a function
   for `node`, `npm` and `yarn`, so when you call either of these three, nvm will load with `nvm use default`.
+
+- **`NVM_AUTOLOAD`**: if `NVM_AUTOLOAD` is set to `1`, the plugin will automatically load a node version when
+  if finds a [`.nvmrc` file](https://github.com/nvm-sh/nvm#nvmrc) in the current working directory indicating
+  which node version to load.
diff --git a/plugins/nvm/nvm.plugin.zsh b/plugins/nvm/nvm.plugin.zsh
index b2355b7ef..1e9b26e7a 100644
--- a/plugins/nvm/nvm.plugin.zsh
+++ b/plugins/nvm/nvm.plugin.zsh
@@ -35,6 +35,33 @@ if (( $+NVM_LAZY )); then
   }
 fi
 
+# Autoload nvm when finding a .nvmrc file in the current directory
+# Adapted from: https://github.com/nvm-sh/nvm#zsh
+if (( $+NVM_AUTOLOAD )); then
+  load-nvmrc() {
+    local node_version="$(nvm version)"
+    local nvmrc_path="$(nvm_find_nvmrc)"
+
+    if [[ -n "$nvmrc_path" ]]; then
+      local nvmrc_node_version=$(nvm version "$(cat "${nvmrc_path}")")
+
+      if [[ "$nvmrc_node_version" = "N/A" ]]; then
+        nvm install
+      elif [[ "$nvmrc_node_version" != "$node_version" ]]; then
+        nvm use
+      fi
+    elif [[ "$node_version" != "$(nvm version default)" ]]; then
+      echo "Reverting to nvm default version"
+      nvm use default
+    fi
+  }
+
+  autoload -U add-zsh-hook
+  add-zsh-hook chpwd load-nvmrc
+
+  load-nvmrc
+fi
+
 # Load nvm bash completion
 for nvm_completion in "$NVM_DIR/bash_completion" "$NVM_HOMEBREW/etc/bash_completion.d/nvm"; do
   if [[ -f "$nvm_completion" ]]; then
@@ -47,4 +74,4 @@ for nvm_completion in "$NVM_DIR/bash_completion" "$NVM_HOMEBREW/etc/bash_complet
   fi
 done
 
-unset NVM_HOMEBREW NVM_LAZY nvm_completion
+unset NVM_HOMEBREW NVM_LAZY NVM_AUTOLOAD nvm_completion

From 2abe4d6a2576f064c09ce78b32005e7437a93ee0 Mon Sep 17 00:00:00 2001
From: Atk <atk@aaathats3as.com>
Date: Fri, 9 Oct 2020 16:38:02 +0100
Subject: [PATCH 139/869] wd: update to v0.5.1 (#9273)

---
 plugins/wd/wd.sh | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/plugins/wd/wd.sh b/plugins/wd/wd.sh
index d5d38f25b..9085c5b7b 100644
--- a/plugins/wd/wd.sh
+++ b/plugins/wd/wd.sh
@@ -71,7 +71,7 @@ wd_print_msg()
 
 wd_print_usage()
 {
-    cat <<- EOF
+    command cat <<- EOF
 Usage: wd [command] [point]
 
 Commands:
@@ -175,9 +175,9 @@ wd_add()
     elif [[ $point =~ "[[:space:]]+" ]]
     then
         wd_exit_fail "Warp point should not contain whitespace"
-    elif [[ $point == *:* ]]
+    elif [[ $point =~ : ]] || [[ $point =~ / ]]
     then
-        wd_exit_fail "Warp point cannot contain colons"
+        wd_exit_fail "Warp point contains illegal character (:/)"
     elif [[ ${points[$point]} == "" ]] || [ ! -z "$force" ]
     then
         wd_remove "$point" > /dev/null
@@ -185,7 +185,7 @@ wd_add()
         if (whence sort >/dev/null); then
             local config_tmp=$(mktemp "${TMPDIR:-/tmp}/wd.XXXXXXXXXX")
             # use 'cat' below to ensure we respect $WD_CONFIG as a symlink
-            sort -o "${config_tmp}" "$WD_CONFIG"  && cat "${config_tmp}" > "$WD_CONFIG" && rm "${config_tmp}"
+            command sort -o "${config_tmp}" "$WD_CONFIG" && command cat "${config_tmp}" > "$WD_CONFIG" && command rm "${config_tmp}"
         fi
 
         wd_export_static_named_directories
@@ -270,7 +270,7 @@ wd_ls()
 wd_path()
 {
     wd_getdir "$1"
-    echo "$(echo "$dir" | sed "s:${HOME}:~:g")"
+    echo "$(echo "$dir" | sed "s:~:${HOME}:g")"
 }
 
 wd_show()

From e93a2dca0e893cd1518e98cce44b55a6dbf29c1a Mon Sep 17 00:00:00 2001
From: Geoffrey GREBERT <geoffrey.grebert@gmail.com>
Date: Fri, 9 Oct 2020 17:42:44 +0200
Subject: [PATCH 140/869] mvn: add Quarkus support in mvn completion (#9037)

Co-authored-by: Geoffrey GREBERT <ggrebert@sii.fr>
---
 plugins/mvn/README.md      | 1 +
 plugins/mvn/mvn.plugin.zsh | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/plugins/mvn/README.md b/plugins/mvn/README.md
index cbe7f30fa..815dfd57c 100644
--- a/plugins/mvn/README.md
+++ b/plugins/mvn/README.md
@@ -19,6 +19,7 @@ if it's found, or the mvn command otherwise.
 | `mvn!`               | `mvn -f <root>/pom.xml`                         |
 | `mvnag`              | `mvn archetype:generate`                        |
 | `mvnboot`            | `mvn spring-boot:run`                           |
+| `mvnqdev`            | `mvn quarkus:dev`                               |
 | `mvnc`               | `mvn clean`                                     |
 | `mvncd`              | `mvn clean deploy`                              |
 | `mvnce`              | `mvn clean eclipse:clean eclipse:eclipse`       |
diff --git a/plugins/mvn/mvn.plugin.zsh b/plugins/mvn/mvn.plugin.zsh
index 7cb94b42f..c616da789 100644
--- a/plugins/mvn/mvn.plugin.zsh
+++ b/plugins/mvn/mvn.plugin.zsh
@@ -62,6 +62,7 @@ alias mvne='mvn eclipse:eclipse'
 alias mvnfmt='mvn fmt:format'
 alias mvnjetty='mvn jetty:run'
 alias mvnp='mvn package'
+alias mvnqdev='mvn quarkus:dev'
 alias mvns='mvn site'
 alias mvnsrc='mvn dependency:sources'
 alias mvnt='mvn test'
@@ -184,6 +185,8 @@ function listMavenCompletions {
 		tomee:run tomee:run-war tomee:run-war-only tomee:stop tomee:deploy tomee:undeploy
 		# spring-boot
 		spring-boot:run spring-boot:repackage
+		# quarkus
+		quarkus:dev quarkus:list-extensions quarkus:add-extension quarkus:add-extensions quarkus:generate-config quarkus:help
 		# exec
 		exec:exec exec:java
 		# versions

From a5e706d749e4218820391cb7ea374c6ddd248933 Mon Sep 17 00:00:00 2001
From: James Zhang <crazyzh1984@gmail.com>
Date: Fri, 9 Oct 2020 23:45:30 +0800
Subject: [PATCH 141/869] mvn: list modules (directories with pom.xml) (#8478)

Co-authored-by: zhangjinyan1 <zhangjinyan1@guazi.com>
---
 plugins/mvn/mvn.plugin.zsh | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/plugins/mvn/mvn.plugin.zsh b/plugins/mvn/mvn.plugin.zsh
index c616da789..27d63a6f9 100644
--- a/plugins/mvn/mvn.plugin.zsh
+++ b/plugins/mvn/mvn.plugin.zsh
@@ -73,7 +73,7 @@ alias mvn-updates='mvn versions:display-dependency-updates'
 
 function listMavenCompletions {
 	local file new_file
-	local -a profiles POM_FILES
+	local -a profiles POM_FILES modules
 
 	# Root POM
 	POM_FILES=(~/.m2/settings.xml)
@@ -109,6 +109,9 @@ function listMavenCompletions {
 		profiles+=($(sed 's/<!--.*-->//' "$file" | sed '/<!--/,/-->/d' | grep -e "<profile>" -A 1 | grep -e "<id>.*</id>" | sed 's?.*<id>\(.*\)<\/id>.*?-P\1?'))
 	done
 
+	# List modules
+	modules=($(find **/pom.xml -type f | grep -v '/target/classes/META-INF/' | grep '/pom.xml' |sed 's|\(.*\)/pom\.xml|\1|'))
+
 	reply=(
 		# common lifecycle
 		clean initialize process-resources compile process-test-resources test-compile test package verify install deploy site
@@ -271,8 +274,8 @@ function listMavenCompletions {
 		stage:copy
 		# toolchain
 		toolchain:toolchain
-                #liberty
-                liberty:clean-server liberty:compile-jsp liberty:configure-arquillian liberty:create-server liberty:debug liberty:debug-server liberty:deploy liberty:dev liberty:display-url liberty:dump-server liberty:install-apps liberty:install-feature liberty:install-server liberty:java-dump-server liberty:package-server liberty:run liberty:run-server liberty:server-status liberty:start liberty:start-server liberty:status liberty:stop liberty:stop-server liberty:test-start-server liberty:test-stop-server liberty:undeploy liberty:uninstall-feature
+		#liberty
+		liberty:clean-server liberty:compile-jsp liberty:configure-arquillian liberty:create-server liberty:debug liberty:debug-server liberty:deploy liberty:dev liberty:display-url liberty:dump-server liberty:install-apps liberty:install-feature liberty:install-server liberty:java-dump-server liberty:package-server liberty:run liberty:run-server liberty:server-status liberty:start liberty:start-server liberty:status liberty:stop liberty:stop-server liberty:test-start-server liberty:test-stop-server liberty:undeploy liberty:uninstall-feature
 
 		# options
 		"-Dmaven.test.skip=true" -DskipTests -DskipITs -Dmaven.surefire.debug -DenableCiProfile "-Dpmd.skip=true" "-Dcheckstyle.skip=true" "-Dtycho.mode=maven" "-Dmaven.test.failure.ignore=true" "-DgroupId=" "-DartifactId=" "-Dversion=" "-Dpackaging=jar" "-Dfile="
@@ -323,6 +326,7 @@ function listMavenCompletions {
 		-Dit.test=$(if [ -d ./src/test/java ] ; then find ./src/test/java -type f -name '*.java' | grep -v svn | sed 's?.*/\([^/]*\)\..*?-Dit.test=\1?' ; fi)
 
 		$profiles
+		$modules
 	)
 }
 

From 4cd5f7f9202bd062871662836ea837c9abea6e5d Mon Sep 17 00:00:00 2001
From: Joshua Bedford <joshua@joshuabedford.com>
Date: Fri, 9 Oct 2020 16:13:00 -0500
Subject: [PATCH 142/869] Add lando plugin (#8748)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Joshua Bedford <joshua.bedford@hurstreview.com>
Co-authored-by: Marc Cornellà <marc.cornella@live.com>
---
 plugins/lando/LICENSE          | 21 ++++++++++++++++++
 plugins/lando/README.md        | 37 +++++++++++++++++++++++++++++++
 plugins/lando/lando.plugin.zsh | 40 ++++++++++++++++++++++++++++++++++
 3 files changed, 98 insertions(+)
 create mode 100644 plugins/lando/LICENSE
 create mode 100644 plugins/lando/README.md
 create mode 100644 plugins/lando/lando.plugin.zsh

diff --git a/plugins/lando/LICENSE b/plugins/lando/LICENSE
new file mode 100644
index 000000000..1d4983163
--- /dev/null
+++ b/plugins/lando/LICENSE
@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2019 Joshua Bedford
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
\ No newline at end of file
diff --git a/plugins/lando/README.md b/plugins/lando/README.md
new file mode 100644
index 000000000..928a42bca
--- /dev/null
+++ b/plugins/lando/README.md
@@ -0,0 +1,37 @@
+# Lando ZSH (lando-zsh)
+
+This plugin adds aliases for using various languages and frameworks with [Lando](https://docs.lando.dev/basics/) for Docker. It will only run within lando-driven project directories.
+
+To use it, add `lando` to the plugins array in your zshrc file:
+
+```zsh
+plugins=(... lando)
+```
+
+## ALIASES:
+
+| Alias      | Description      |
+|:----------:|:----------------:|
+| `artisan`  | `lando artisan`  |
+| `composer` | `lando composer` |
+| `drush`    | `lando drush`    |
+| `gulp`     | `lando gulp`     |
+| `npm`      | `lando npm`      |
+| `wp`       | `lando wp`       |
+| `yarn`     | `lando yarn`     |
+
+## How It Works:
+
+This plugin removes the requirement to type `lando` before a command. It utilizes the lando version of supported commands run within directories with the following criteria:
+- The `.lando.yml` file is found in the current directory or any parent directory within `$LANDO_ZSH_SITES_DIRECTORY`.
+- The current directory is within `$LANDO_ZSH_SITES_DIRECTORY` but is not `$LANDO_ZSH_SITES_DIRECTORY` itself.
+
+## Settings:
+
+- `LANDO_ZSH_SITES_DIRECTORY`: The plugin will stop searching through parents for `CONFIG_FILE` once it hits this directory.
+- `LANDO_ZSH_CONFIG_FILE`: The plugin will check to see if this provided file exists to check for presence of Lando.
+
+## Author:
+
+- Author: Joshua Bedford
+- URL: [https://github.com/joshuabedford/lando-zsh](https://github.com/joshuabedford/lando-zsh)
diff --git a/plugins/lando/lando.plugin.zsh b/plugins/lando/lando.plugin.zsh
new file mode 100644
index 000000000..aa74c9924
--- /dev/null
+++ b/plugins/lando/lando.plugin.zsh
@@ -0,0 +1,40 @@
+# Settings
+: ${LANDO_ZSH_SITES_DIRECTORY:="$HOME/Sites"}
+: ${LANDO_ZSH_CONFIG_FILE:=.lando.yml}
+
+# Enable multiple commands with lando.
+function artisan \
+         composer \
+         drush \
+         gulp \
+         npm \
+         wp \
+         yarn {
+  if checkForLandoFile; then
+    lando "$0" "$@"
+  else
+    command "$0" "$@"
+  fi
+}
+
+# Check for the file in the current and parent directories.
+checkForLandoFile() {
+  # Only bother checking for lando within the Sites directory.
+  if [[ "$PWD/" != "$LANDO_ZSH_SITES_DIRECTORY"/* ]]; then
+    # Not within $LANDO_ZSH_SITES_DIRECTORY
+    return 1
+  fi
+
+  local curr_dir="$PWD"
+  # Checking for file: $LANDO_ZSH_CONFIG_FILE within $LANDO_ZSH_SITES_DIRECTORY...
+  while [[ "$curr_dir" != "$LANDO_ZSH_SITES_DIRECTORY" ]]; do
+    if [[ -f "$curr_dir/$LANDO_ZSH_CONFIG_FILE" ]]; then
+      return 0
+    fi
+    curr_dir="${curr_dir:h}"
+  done
+
+  # Could not find $LANDO_ZSH_CONFIG_FILE in the current directory
+  # or in any of its parents up to $LANDO_ZSH_SITES_DIRECTORY.
+  return 1
+}
\ No newline at end of file

From 982d010be5fdb1cff471978634f8ff374deba9ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Sat, 10 Oct 2020 11:47:09 +0200
Subject: [PATCH 143/869] lib: fix fmt removing ESC characters in theme and
 plugin list CLI commands

---
 lib/cli.zsh | 44 ++++++++++++++++++++++++--------------------
 1 file changed, 24 insertions(+), 20 deletions(-)

diff --git a/lib/cli.zsh b/lib/cli.zsh
index 5d6c31aef..c9ee159bc 100644
--- a/lib/cli.zsh
+++ b/lib/cli.zsh
@@ -134,18 +134,20 @@ function _omz::plugin::list {
     custom_plugins=("$ZSH_CUSTOM"/plugins/*(/N:t))
     builtin_plugins=("$ZSH"/plugins/*(/N:t))
 
-    (( ${#custom_plugins} )) && {
-        print -Pn "%U%BCustom plugins%b%u: "
-        print -l ${(q-)custom_plugins}
-    } | fmt -w $COLUMNS
+    {
+        (( ${#custom_plugins} )) && {
+            print -Pn "%U%BCustom plugins%b%u: "
+            print -l ${(q-)custom_plugins}
+        }
 
-    (( ${#builtin_plugins} )) && {
-        # add a line of separation
-        (( ${#custom_plugins} )) && echo
+        (( ${#builtin_plugins} )) && {
+            # add a line of separation
+            (( ${#custom_plugins} )) && echo
 
-        print -Pn "%U%BBuilt-in plugins%b%u: "
-        print -l ${(q-)builtin_plugins}
-    } | fmt -w $COLUMNS
+            print -Pn "%U%BBuilt-in plugins%b%u: "
+            print -l ${(q-)builtin_plugins}
+        }
+    } | fmt -w $COLUMNS | sed -E $'s/\e?(\\[[0-9]*m)/\e\\1/g' # deal with fmt removing ESC
 }
 
 function _omz::pr {
@@ -305,18 +307,20 @@ function _omz::theme::list {
     custom_themes=("$ZSH_CUSTOM"/**/*.zsh-theme(.N:r:gs:"$ZSH_CUSTOM"/themes/:::gs:"$ZSH_CUSTOM"/:::))
     builtin_themes=("$ZSH"/themes/*.zsh-theme(.N:t:r))
 
-    (( ${#custom_themes} )) && {
-        print -Pn "%U%BCustom themes%b%u: "
-        print -l ${(q-)custom_themes}
-    } | fmt -w $COLUMNS
+    {
+        (( ${#custom_themes} )) && {
+            print -Pn "%U%BCustom themes%b%u: "
+            print -l ${(q-)custom_themes}
+        }
 
-    (( ${#builtin_themes} )) && {
-        # add a line of separation
-        (( ${#custom_themes} )) && echo
+        (( ${#builtin_themes} )) && {
+            # add a line of separation
+            (( ${#custom_themes} )) && echo
 
-        print -Pn "%U%BBuilt-in themes%b%u: "
-        print -l ${(q-)builtin_themes}
-    } | fmt -w $COLUMNS
+            print -Pn "%U%BBuilt-in themes%b%u: "
+            print -l ${(q-)builtin_themes}
+        }
+    } | fmt -w $COLUMNS | sed -E $'s/\e?(\\[[0-9]*m)/\e\\1/g' # deal with fmt removing ESC
 }
 
 function _omz::theme::use {

From 75ae0e905fcb928555df122ec1ec29a8a546130d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Sat, 10 Oct 2020 12:12:22 +0200
Subject: [PATCH 144/869] lib: fix `omz help` and reword

---
 lib/cli.zsh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/cli.zsh b/lib/cli.zsh
index c9ee159bc..ff865093d 100644
--- a/lib/cli.zsh
+++ b/lib/cli.zsh
@@ -60,8 +60,9 @@ Usage: omz <command> [options]
 Available commands:
 
     help                Print this help message
-    pr <command>        Commands for Oh My Zsh Pull Requests management
-    theme <command>     Commands for Oh My Zsh themes management
+    plugin <command>    Manage plugins
+    pr <command>        Manage Oh My Zsh Pull Requests
+    theme <command>     Manage themes
     update              Update Oh My Zsh
 
 EOF

From 23760228908d14a4644718869d5ebfb7b0dde6a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Sat, 10 Oct 2020 12:38:17 +0200
Subject: [PATCH 145/869] lib: remove share_history

Related: #2537, #9324
---
 lib/history.zsh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lib/history.zsh b/lib/history.zsh
index 0ee8cfe7a..8d922a30b 100644
--- a/lib/history.zsh
+++ b/lib/history.zsh
@@ -36,4 +36,3 @@ setopt hist_expire_dups_first # delete duplicates first when HISTFILE size excee
 setopt hist_ignore_dups       # ignore duplicated commands history list
 setopt hist_ignore_space      # ignore commands that start with space
 setopt hist_verify            # show command with history expansion to user before running it
-setopt share_history          # share command history data

From 6e7b861675c4568931e91255abc62a7c45660e28 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Sat, 10 Oct 2020 19:14:30 +0200
Subject: [PATCH 146/869] lib: fix regex bug in git_prompt_status

Fixes #9326
---
 lib/git.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/git.zsh b/lib/git.zsh
index f9b27949e..53d39609e 100644
--- a/lib/git.zsh
+++ b/lib/git.zsh
@@ -226,7 +226,7 @@ function git_prompt_status() {
   # For each status prefix, do a regex comparison
   for status_prefix in ${(k)prefix_constant_map}; do
     local status_constant="${prefix_constant_map[$status_prefix]}"
-    local status_regex="(^|\n)$status_prefix"
+    local status_regex=$'(^|\n)'"$status_prefix"
 
     if [[ "$status_text" =~ $status_regex ]]; then
       statuses_seen[$status_constant]=1

From c66d8a841d231895be37721220f23b537d90c5a5 Mon Sep 17 00:00:00 2001
From: Sreekanth S <s.sreekanth@outlook.com>
Date: Sat, 10 Oct 2020 12:39:21 -0700
Subject: [PATCH 147/869] agnoster: fix icon for unstaged git status (#9164)

---
 themes/agnoster.zsh-theme | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/themes/agnoster.zsh-theme b/themes/agnoster.zsh-theme
index 79748e45e..99707f684 100644
--- a/themes/agnoster.zsh-theme
+++ b/themes/agnoster.zsh-theme
@@ -131,7 +131,7 @@ prompt_git() {
     zstyle ':vcs_info:*' get-revision true
     zstyle ':vcs_info:*' check-for-changes true
     zstyle ':vcs_info:*' stagedstr '✚'
-    zstyle ':vcs_info:*' unstagedstr '●'
+    zstyle ':vcs_info:*' unstagedstr '±'
     zstyle ':vcs_info:*' formats ' %u%c'
     zstyle ':vcs_info:*' actionformats ' %u%c'
     vcs_info

From 1744277a68101916d51cda2c67951f5981f1f216 Mon Sep 17 00:00:00 2001
From: Joshua Pratt <jp10010101010000@gmail.com>
Date: Sun, 11 Oct 2020 23:17:21 +1100
Subject: [PATCH 148/869] systemadmin: correct sort order for psmem aliases
 (#6253)

---
 plugins/systemadmin/README.md              | 4 ++--
 plugins/systemadmin/systemadmin.plugin.zsh | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/plugins/systemadmin/README.md b/plugins/systemadmin/README.md
index edca4d87d..243db03f2 100644
--- a/plugins/systemadmin/README.md
+++ b/plugins/systemadmin/README.md
@@ -16,8 +16,8 @@ plugins=(... systemadmin)
 | clr     | `clear; echo Currently logged in on $TTY, as $USER in directory $PWD.` | Clears the screen and prints the current user, TTY, and directory  |
 | path    | `print -l $path`                                                       | Displays PATH with each entry on a separate line                   |
 | mkdir   | `mkdir -pv`                                                            | Automatically create parent directories and display verbose output |
-| psmem   | `ps -e -orss=,args= \| sort -b -k1,1n`                                 | Display the processes using the most memory                        |
-| psmem10 | `ps -e -orss=,args= \| sort -b -k1,1n \| head -10`                     | Display the top 10 processes using the most memory                 |
+| psmem   | `ps -e -orss=,args= \| sort -b -k1 -nr`                                | Display the processes using the most memory                        |
+| psmem10 | `ps -e -orss=,args= \| sort -b -k1 -nr \| head -10`                    | Display the top 10 processes using the most memory                 |
 | pscpu   | `ps -e -o pcpu,cpu,nice,state,cputime,args \|sort -k1 -nr`             | Display the top processes using the most CPU                       |
 | pscpu10 | `ps -e -o pcpu,cpu,nice,state,cputime,args \|sort -k1 -nr \| head -10` | Display the top 10 processes using the most CPU                    |
 | hist10  | `print -l ${(o)history%% *} \| uniq -c \| sort -nr \| head -n 10`      | Display the top 10 most used commands in the history               |
diff --git a/plugins/systemadmin/systemadmin.plugin.zsh b/plugins/systemadmin/systemadmin.plugin.zsh
index ded25c3a9..03064c035 100644
--- a/plugins/systemadmin/systemadmin.plugin.zsh
+++ b/plugins/systemadmin/systemadmin.plugin.zsh
@@ -25,8 +25,8 @@ alias clr='clear; echo Currently logged in on $TTY, as $USER in directory $PWD.'
 alias path='print -l $path'
 alias mkdir='mkdir -pv'
 # get top process eating memory
-alias psmem='ps -e -orss=,args= | sort -b -k1,1n'
-alias psmem10='ps -e -orss=,args= | sort -b -k1,1n| head -10'
+alias psmem='ps -e -orss=,args= | sort -b -k1 -nr'
+alias psmem10='ps -e -orss=,args= | sort -b -k1 -nr | head -10'
 # get top process eating cpu if not work try excute : export LC_ALL='C'
 alias pscpu='ps -e -o pcpu,cpu,nice,state,cputime,args|sort -k1,1n -nr'
 alias pscpu10='ps -e -o pcpu,cpu,nice,state,cputime,args|sort -k1,1n -nr | head -10'

From fb80eb8e05e13cfb224114688fc7d20960e26b5f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ivan=20Dario=20Piernagorda=20Pe=C3=B1a?=
 <48845582+IVAN-DPP@users.noreply.github.com>
Date: Sun, 11 Oct 2020 11:05:14 -0500
Subject: [PATCH 149/869] emacs: add ansi-term directory tracking (#9218)

---
 plugins/emacs/emacs.plugin.zsh | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/plugins/emacs/emacs.plugin.zsh b/plugins/emacs/emacs.plugin.zsh
index db0ab13af..0b602d12a 100644
--- a/plugins/emacs/emacs.plugin.zsh
+++ b/plugins/emacs/emacs.plugin.zsh
@@ -26,6 +26,16 @@ if "$ZSH/tools/require_tool.sh" emacsclient 24 2>/dev/null ; then
     # create a new X frame
     alias eframe='emacsclient --alternate-editor "" --create-frame'
 
+    # Emacs ANSI Term tracking
+    if [[ -n "$INSIDE_EMACS" ]]; then
+        chpwd_emacs() { print -P "\033AnSiTc %d"; }
+        print -P "\033AnSiTc %d"    # Track current working directory
+        print -P "\033AnSiTu %n"    # Track username        
+
+        # add chpwd hook
+        autoload -Uz add-zsh-hook
+        add-zsh-hook chpwd chpwd_emacs
+    fi    
 
     # Write to standard output the path to the file
     # opened in the current buffer.

From 82856bfbd86ac77f0f28ab741a399a04495ed3bc Mon Sep 17 00:00:00 2001
From: VectorW <15570764+VectorWpl@users.noreply.github.com>
Date: Sun, 11 Oct 2020 21:23:21 +0200
Subject: [PATCH 150/869] globalias: allow filtering values not to be expanded
 (#9331)

---
 plugins/globalias/README.md            | 19 ++++++++++++++++++-
 plugins/globalias/globalias.plugin.zsh |  6 ++++--
 2 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/plugins/globalias/README.md b/plugins/globalias/README.md
index 0b064105d..cd7fc3cb2 100644
--- a/plugins/globalias/README.md
+++ b/plugins/globalias/README.md
@@ -17,6 +17,9 @@ Then just press `SPACE` to trigger the expansion of a command you've written.
 If you only want to insert a space without expanding the command line, press
 `CTRL`+`SPACE`.
 
+if you would like to filter out any values from expanding set `GLOBALIAS_FILTER_VALUES` to
+an array of said values. See [Filtered values](#filtered-values).
+
 ## Examples
 
 #### Glob expressions
@@ -37,7 +40,6 @@ $ ls folder/file.json anotherfolder/another.json
 $ mkdir "`date -R`"
 # expands to
 $ mkdir Tue,\ 04\ Oct\ 2016\ 13:54:03\ +0300
-
 ```
 
 #### Aliases
@@ -60,3 +62,18 @@ $ S<space>
 # expands to:
 $ sudo systemctl
 ```
+
+#### Filtered values
+
+```
+# .zshrc
+alias l='ls -lh'
+alias la='ls --color=auto -lah'
+GLOBALIAS_FILTER_VALUES=(l)
+
+$ l<space>
+# does not expand
+$ la<space>
+# expands to:
+$ ls --color=auto -lah
+```
diff --git a/plugins/globalias/globalias.plugin.zsh b/plugins/globalias/globalias.plugin.zsh
index 9602a9606..f8c07ce43 100644
--- a/plugins/globalias/globalias.plugin.zsh
+++ b/plugins/globalias/globalias.plugin.zsh
@@ -1,6 +1,8 @@
 globalias() {
-   zle _expand_alias
-   zle expand-word
+   if [[ $GLOBALIAS_FILTER_VALUES[(Ie)$LBUFFER] -eq 0 ]]; then
+      zle _expand_alias
+      zle expand-word
+   fi
    zle self-insert
 }
 zle -N globalias

From 2657c87f0aa1fe7f66062bc3452ad68347be356f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Sun, 11 Oct 2020 20:12:16 +0200
Subject: [PATCH 151/869] Add gitpod integration

Fixes #8212

Co-authored-by: Sean Hellum <seanhellum45@gmail.com>
---
 .gitpod.Dockerfile | 5 +++++
 .gitpod.yml        | 9 +++++++++
 README.md          | 1 +
 3 files changed, 15 insertions(+)
 create mode 100644 .gitpod.Dockerfile
 create mode 100644 .gitpod.yml

diff --git a/.gitpod.Dockerfile b/.gitpod.Dockerfile
new file mode 100644
index 000000000..b35c80dfb
--- /dev/null
+++ b/.gitpod.Dockerfile
@@ -0,0 +1,5 @@
+FROM gitpod/workspace-full
+
+RUN sudo apt-get update && \
+    sudo apt-get install -y zsh && \
+    sudo rm -rf /var/lib/apt/lists/*
diff --git a/.gitpod.yml b/.gitpod.yml
new file mode 100644
index 000000000..ccc57242c
--- /dev/null
+++ b/.gitpod.yml
@@ -0,0 +1,9 @@
+image:
+  file: .gitpod.Dockerfile
+
+tasks:
+  - init: |
+      export EDITOR="command gp open -w" VISUAL="command gp open -w"
+      cp -f /workspace/ohmyzsh/templates/zshrc.zsh-template ~/.zshrc
+      ln -sf /workspace/ohmyzsh ~/.oh-my-zsh
+    command: exec zsh
diff --git a/README.md b/README.md
index 0c292e100..86037f199 100644
--- a/README.md
+++ b/README.md
@@ -15,6 +15,7 @@ To learn more, visit [ohmyz.sh](https://ohmyz.sh), follow [@ohmyzsh](https://twi
 [![CI](https://github.com/ohmyzsh/ohmyzsh/workflows/CI/badge.svg)](https://github.com/ohmyzsh/ohmyzsh/actions?query=workflow%3ACI)
 [![Follow @ohmyzsh](https://img.shields.io/twitter/follow/ohmyzsh?label=Follow+@ohmyzsh&style=flat)](https://twitter.com/intent/follow?screen_name=ohmyzsh)
 [![Discord server](https://img.shields.io/discord/642496866407284746)](https://discord.gg/ohmyzsh)
+[![Gitpod ready](https://img.shields.io/badge/Gitpod-ready-blue?logo=gitpod)](https://gitpod.io/#https://github.com/ohmyzsh/ohmyzsh)
 
 ## Getting Started
 

From 1e25abacad6cdf380b7b1df9fc758290d969d99e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Tue, 13 Oct 2020 11:27:14 +0200
Subject: [PATCH 152/869] meta: add checklist instructions on Pull Request
 template

---
 .github/PULL_REQUEST_TEMPLATE.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 6bcb90efe..1abae8913 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,5 +1,7 @@
 ## Standards checklist:
 
+<!-- Fill with an x the ones that apply. Example: [x] -->
+
 - [ ] The PR title is descriptive.
 - [ ] The PR doesn't replicate another PR which is already open.
 - [ ] I have read the contribution guide and followed all the instructions.

From a39bee8d11aca960651403dddbb7dba38b00183e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gon=C3=A7alo=20Queir=C3=B3s?= <mail@goncaloqueiros.net>
Date: Tue, 13 Oct 2020 10:28:51 +0100
Subject: [PATCH 153/869] git-prompt: document Python prerequisite in README
 (#9336)

---
 plugins/git-prompt/README.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/plugins/git-prompt/README.md b/plugins/git-prompt/README.md
index e3b2d623a..83948f536 100644
--- a/plugins/git-prompt/README.md
+++ b/plugins/git-prompt/README.md
@@ -11,6 +11,9 @@ plugins=(... git-prompt)
 
 See the [original repository](https://github.com/olivierverdier/zsh-git-prompt).
 
+## Prerequisites
+This plugin uses `python`, so your host needs to have it installed
+
 ## Examples
 
 The prompt may look like the following:

From 568a977d2076b4210a9a925c53abcf0a831e4003 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Tue, 13 Oct 2020 20:32:42 +0200
Subject: [PATCH 154/869] safe-paste: fix _bracketed_paste_zle_init/finish
 error

Fixes #9337
---
 plugins/safe-paste/safe-paste.plugin.zsh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/safe-paste/safe-paste.plugin.zsh b/plugins/safe-paste/safe-paste.plugin.zsh
index db524538c..d443ae8a2 100644
--- a/plugins/safe-paste/safe-paste.plugin.zsh
+++ b/plugins/safe-paste/safe-paste.plugin.zsh
@@ -84,7 +84,7 @@ _bracketed_paste_enqueue() {
 _bracketed_paste_zle_init() {
   _bracketed_paste_content=''
   # Tell terminal to send escape codes around pastes
-  if [ $TERM =~ '^(rxvt-unicode|xterm(-256color)?|screen(-256color)?)$' ]; then
+  if [[ $TERM =~ '^(rxvt-unicode|xterm(-256color)?|screen(-256color)?)$' ]]; then
     printf '\e[?2004h'
   fi
 }
@@ -93,7 +93,7 @@ _bracketed_paste_zle_init() {
 _bracketed_paste_zle_finish() {
   # Turn off bracketed paste when we leave ZLE, so pasting in other programs
   # doesn't get the ^[[200~ codes around the pasted text
-  if [ $TERM =~ '^(rxvt-unicode|xterm(-256color)?|screen(-256color)?)$' ]; then
+  if [[ $TERM =~ '^(rxvt-unicode|xterm(-256color)?|screen(-256color)?)$' ]]; then
     printf '\e[?2004l'
   fi
 }

From e75aa2875eea94fcf7ceb3f246db96cc3bc61a2e Mon Sep 17 00:00:00 2001
From: "Patrick W. Healy" <phealy@phealy.com>
Date: Wed, 14 Oct 2020 09:57:59 -0500
Subject: [PATCH 155/869] globalias: expand filtering to anywhere in the
 command (#9338)

---
 plugins/globalias/globalias.plugin.zsh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/plugins/globalias/globalias.plugin.zsh b/plugins/globalias/globalias.plugin.zsh
index f8c07ce43..d4d40c863 100644
--- a/plugins/globalias/globalias.plugin.zsh
+++ b/plugins/globalias/globalias.plugin.zsh
@@ -1,5 +1,7 @@
 globalias() {
-   if [[ $GLOBALIAS_FILTER_VALUES[(Ie)$LBUFFER] -eq 0 ]]; then
+   # Get last word to the left of the cursor
+   local word=${${(A)=LBUFFER}[-1]}
+   if [[ $GLOBALIAS_FILTER_VALUES[(Ie)$word] -eq 0 ]]; then
       zle _expand_alias
       zle expand-word
    fi

From 53cbd658f5ae6874af0d804cee6748dfba69e786 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Wed, 14 Oct 2020 17:23:03 +0200
Subject: [PATCH 156/869] globalias: use ${(z)var} to split into words using
 shell parsing

---
 plugins/globalias/globalias.plugin.zsh | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/plugins/globalias/globalias.plugin.zsh b/plugins/globalias/globalias.plugin.zsh
index d4d40c863..bd27d589d 100644
--- a/plugins/globalias/globalias.plugin.zsh
+++ b/plugins/globalias/globalias.plugin.zsh
@@ -1,6 +1,8 @@
 globalias() {
-   # Get last word to the left of the cursor
-   local word=${${(A)=LBUFFER}[-1]}
+   # Get last word to the left of the cursor:
+   # (z) splits into words using shell parsing
+   # (A) makes it an array even if there's only one element
+   local word=${${(Az)LBUFFER}[-1]}
    if [[ $GLOBALIAS_FILTER_VALUES[(Ie)$word] -eq 0 ]]; then
       zle _expand_alias
       zle expand-word

From 5b717ab3e4bfb627a936d7c04367a39867734d63 Mon Sep 17 00:00:00 2001
From: IsThisTheMatrix <46820823+causalityloop@users.noreply.github.com>
Date: Thu, 15 Oct 2020 18:52:34 -0400
Subject: [PATCH 157/869] kubectl: verify kubectl is installed before running
 compdef (#9346)

---
 plugins/kubectl/kubectl.plugin.zsh | 24 +++++++++---------------
 1 file changed, 9 insertions(+), 15 deletions(-)

diff --git a/plugins/kubectl/kubectl.plugin.zsh b/plugins/kubectl/kubectl.plugin.zsh
index 6292a0b2f..7a0c47945 100644
--- a/plugins/kubectl/kubectl.plugin.zsh
+++ b/plugins/kubectl/kubectl.plugin.zsh
@@ -150,19 +150,13 @@ alias kepvc='kubectl edit pvc'
 alias kdpvc='kubectl describe pvc'
 alias kdelpvc='kubectl delete pvc'
 
-# Colored JSON output
-kj() {
-  kubectl "$@" -o json | jq
-}
-compdef kj=kubectl
+# Only run if the user actually has kubectl installed
+if (( $+commands[kubectl] )); then
+  kj() { kubectl "$@" -o json | jq; }
+  kjx() { kubectl "$@" -o json | fx; }
+  ky() { kubectl "$@" -o yaml | yh; }
 
-kjx() {
-  kubectl "$@" -o json | fx
-}
-compdef kjx=kubectl
-
-# Colored YAML output
-ky() {
-  kubectl "$@" -o yaml | yh
-}
-compdef ky=kubectl
+  compdef kj=kubectl
+  compdef kjx=kubectl
+  compdef ky=kubectl
+fi

From 176376cbc026bb5339a00a6486882649d250469a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Sat, 17 Oct 2020 23:14:58 +0200
Subject: [PATCH 158/869] kubectl: check for empty cache completion file

---
 plugins/kubectl/kubectl.plugin.zsh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/kubectl/kubectl.plugin.zsh b/plugins/kubectl/kubectl.plugin.zsh
index 7a0c47945..0b1edb450 100644
--- a/plugins/kubectl/kubectl.plugin.zsh
+++ b/plugins/kubectl/kubectl.plugin.zsh
@@ -1,7 +1,7 @@
 if (( $+commands[kubectl] )); then
     __KUBECTL_COMPLETION_FILE="${ZSH_CACHE_DIR}/kubectl_completion"
 
-    if [[ ! -f $__KUBECTL_COMPLETION_FILE ]]; then
+    if [[ ! -f $__KUBECTL_COMPLETION_FILE || ! -s $__KUBECTL_COMPLETION_FILE ]]; then
         kubectl completion zsh >! $__KUBECTL_COMPLETION_FILE
     fi
 
@@ -151,7 +151,7 @@ alias kdpvc='kubectl describe pvc'
 alias kdelpvc='kubectl delete pvc'
 
 # Only run if the user actually has kubectl installed
-if (( $+commands[kubectl] )); then
+if (( ${+_comps[kubectl]} )); then
   kj() { kubectl "$@" -o json | jq; }
   kjx() { kubectl "$@" -o json | fx; }
   ky() { kubectl "$@" -o yaml | yh; }

From 902954d1cc4438e98149d72c878a4fbac3b3d7c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Sun, 18 Oct 2020 21:14:05 +0200
Subject: [PATCH 159/869] lib: use `column` to format plugin and theme list CLI
 commands

---
 lib/cli.zsh | 42 ++++++++++++++++++------------------------
 1 file changed, 18 insertions(+), 24 deletions(-)

diff --git a/lib/cli.zsh b/lib/cli.zsh
index ff865093d..9421fd19a 100644
--- a/lib/cli.zsh
+++ b/lib/cli.zsh
@@ -135,20 +135,17 @@ function _omz::plugin::list {
     custom_plugins=("$ZSH_CUSTOM"/plugins/*(/N:t))
     builtin_plugins=("$ZSH"/plugins/*(/N:t))
 
-    {
-        (( ${#custom_plugins} )) && {
-            print -Pn "%U%BCustom plugins%b%u: "
-            print -l ${(q-)custom_plugins}
-        }
+    if (( ${#custom_plugins} )); then
+        print -P "%U%BCustom plugins%b%u:"
+        print -l ${(q-)custom_plugins} | column
+    fi
 
-        (( ${#builtin_plugins} )) && {
-            # add a line of separation
-            (( ${#custom_plugins} )) && echo
+    if (( ${#builtin_plugins} )); then
+        (( ${#custom_plugins} )) && echo # add a line of separation
 
-            print -Pn "%U%BBuilt-in plugins%b%u: "
-            print -l ${(q-)builtin_plugins}
-        }
-    } | fmt -w $COLUMNS | sed -E $'s/\e?(\\[[0-9]*m)/\e\\1/g' # deal with fmt removing ESC
+        print -P "%U%BBuilt-in plugins%b%u:"
+        print -l ${(q-)builtin_plugins} | column
+    fi
 }
 
 function _omz::pr {
@@ -308,20 +305,17 @@ function _omz::theme::list {
     custom_themes=("$ZSH_CUSTOM"/**/*.zsh-theme(.N:r:gs:"$ZSH_CUSTOM"/themes/:::gs:"$ZSH_CUSTOM"/:::))
     builtin_themes=("$ZSH"/themes/*.zsh-theme(.N:t:r))
 
-    {
-        (( ${#custom_themes} )) && {
-            print -Pn "%U%BCustom themes%b%u: "
-            print -l ${(q-)custom_themes}
-        }
+    if (( ${#custom_themes} )); then
+        print -P "%U%BCustom themes%b%u:"
+        print -l ${(q-)custom_themes} | column
+    fi
 
-        (( ${#builtin_themes} )) && {
-            # add a line of separation
-            (( ${#custom_themes} )) && echo
+    if (( ${#builtin_themes} )); then
+        (( ${#custom_themes} )) && echo # add a line of separation
 
-            print -Pn "%U%BBuilt-in themes%b%u: "
-            print -l ${(q-)builtin_themes}
-        }
-    } | fmt -w $COLUMNS | sed -E $'s/\e?(\\[[0-9]*m)/\e\\1/g' # deal with fmt removing ESC
+        print -P "%U%BBuilt-in themes%b%u:"
+        print -l ${(q-)builtin_themes} | column
+    fi
 }
 
 function _omz::theme::use {

From 7525b1d533b927bc40e3cfb29e399e5f2e0828d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Sun, 18 Oct 2020 21:25:03 +0200
Subject: [PATCH 160/869] lib: allow bare output in theme and plugins list
 command

---
 lib/cli.zsh | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/lib/cli.zsh b/lib/cli.zsh
index 9421fd19a..82a2a3985 100644
--- a/lib/cli.zsh
+++ b/lib/cli.zsh
@@ -135,6 +135,12 @@ function _omz::plugin::list {
     custom_plugins=("$ZSH_CUSTOM"/plugins/*(/N:t))
     builtin_plugins=("$ZSH"/plugins/*(/N:t))
 
+    # If the command is being piped, print all found line by line
+    if [[ ! -t 1 ]]; then
+        print -l ${(q-)custom_plugins} ${(q-)builtin_plugins}
+        return
+    fi
+
     if (( ${#custom_plugins} )); then
         print -P "%U%BCustom plugins%b%u:"
         print -l ${(q-)custom_plugins} | column
@@ -305,6 +311,12 @@ function _omz::theme::list {
     custom_themes=("$ZSH_CUSTOM"/**/*.zsh-theme(.N:r:gs:"$ZSH_CUSTOM"/themes/:::gs:"$ZSH_CUSTOM"/:::))
     builtin_themes=("$ZSH"/themes/*.zsh-theme(.N:t:r))
 
+    # If the command is being piped, print all found line by line
+    if [[ ! -t 1 ]]; then
+        print -l ${(q-)custom_themes} ${(q-)builtin_themes}
+        return
+    fi
+
     if (( ${#custom_themes} )); then
         print -P "%U%BCustom themes%b%u:"
         print -l ${(q-)custom_themes} | column

From f9f45ca222a0ec6fa867ab3733f15911d1b894e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Tue, 20 Oct 2020 15:57:11 +0200
Subject: [PATCH 161/869] lib: follow symlinked plugins in `plugin list` CLI
 command

See https://github.com/ohmyzsh/ohmyzsh/issues/9087#issuecomment-712460275
---
 lib/cli.zsh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/cli.zsh b/lib/cli.zsh
index 82a2a3985..b1478a89f 100644
--- a/lib/cli.zsh
+++ b/lib/cli.zsh
@@ -132,8 +132,8 @@ EOF
 
 function _omz::plugin::list {
     local -a custom_plugins builtin_plugins
-    custom_plugins=("$ZSH_CUSTOM"/plugins/*(/N:t))
-    builtin_plugins=("$ZSH"/plugins/*(/N:t))
+    custom_plugins=("$ZSH_CUSTOM"/plugins/*(-/N:t))
+    builtin_plugins=("$ZSH"/plugins/*(-/N:t))
 
     # If the command is being piped, print all found line by line
     if [[ ! -t 1 ]]; then

From 7d73908223222d3df7f36ed5a362fcfccd770ca5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Tue, 20 Oct 2020 23:48:59 +0200
Subject: [PATCH 162/869] fzf: add check for OpenSUSE and OpenBSD packages
 (#9327)

---
 plugins/fzf/README.md      |  57 ++++++++++------
 plugins/fzf/fzf.plugin.zsh | 133 ++++++++++++++++++++++++++-----------
 2 files changed, 131 insertions(+), 59 deletions(-)

diff --git a/plugins/fzf/README.md b/plugins/fzf/README.md
index d9617563a..791a3eb6f 100644
--- a/plugins/fzf/README.md
+++ b/plugins/fzf/README.md
@@ -1,33 +1,52 @@
 # fzf
 
-This plugin enables [junegunn's fzf](https://github.com/junegunn/fzf) fuzzy auto-completion and key bindings
+This plugin tries to find [junegunn's fzf](https://github.com/junegunn/fzf) based on where
+it's been installed, and enables its fuzzy auto-completion and key bindings.
 
 To use it, add `fzf` to the plugins array in your zshrc file:
+
 ```zsh
 plugins=(... fzf)
 ```
 
 ## Settings
 
-Add these before the `plugins=()` line in your zshrc file:
+All these settings should go in your zshrc file, before Oh My Zsh is sourced.
+
+### `FZF_BASE`
+
+Set to fzf installation directory path:
 
 ```zsh
-# Set fzf installation directory path
-# export FZF_BASE=/path/to/fzf/install/dir
-
-# Uncomment to set the FZF_DEFAULT_COMMAND
-# export FZF_DEFAULT_COMMAND='<your fzf default commmand>'
-
-# Uncomment the following line to disable fuzzy completion
-# DISABLE_FZF_AUTO_COMPLETION="true"
-
-# Uncomment the following line to disable key bindings (CTRL-T, CTRL-R, ALT-C)
-# DISABLE_FZF_KEY_BINDINGS="true"
+export FZF_BASE=/path/to/fzf/install/dir
 ```
 
-| Setting                     | Example value              | Description                                                 |
-|-----------------------------|----------------------------|-------------------------------------------------------------|
-| FZF_BASE                    | `/path/to/fzf/install/dir` | Set fzf installation directory path (**export**)            |
-| FZF_DEFAULT_COMMAND         | `fd --type f`              | Set default command to use when input is tty (**export**)   |
-| DISABLE_FZF_AUTO_COMPLETION | `true`                     | Set whether to load fzf auto-completion                     |
-| DISABLE_FZF_KEY_BINDINGS    | `true`                     | Set whether to disable key bindings (CTRL-T, CTRL-R, ALT-C) |
+### `FZF_DEFAULT_COMMAND`
+
+Set default command to use when input is tty:
+
+```zsh
+export FZF_DEFAULT_COMMAND='<your fzf default commmand>'
+```
+
+If not set, the plugin will try to set it to these, in the order in which they're found:
+
+- [`rg`](https://github.com/BurntSushi/ripgrep)
+- [`fd`](https://github.com/sharkdp/fd)
+- [`ag`](https://github.com/ggreer/the_silver_searcher)
+
+### `DISABLE_FZF_AUTO_COMPLETION`
+
+Set whether to load fzf auto-completion:
+
+```zsh
+DISABLE_FZF_AUTO_COMPLETION="true"
+```
+
+### `DISABLE_FZF_KEY_BINDINGS`
+
+Set whether to disable key bindings (CTRL-T, CTRL-R, ALT-C):
+
+```zsh
+DISABLE_FZF_KEY_BINDINGS="true"
+```
diff --git a/plugins/fzf/fzf.plugin.zsh b/plugins/fzf/fzf.plugin.zsh
index 0b831b7f7..2f48215d5 100644
--- a/plugins/fzf/fzf.plugin.zsh
+++ b/plugins/fzf/fzf.plugin.zsh
@@ -1,9 +1,5 @@
 function setup_using_base_dir() {
-    # Declare all variables local not no mess with outside env in any way
-    local fzf_base
-    local fzf_shell
-    local fzfdirs
-    local dir
+    local fzf_base fzf_shell fzfdirs dir
 
     test -d "${FZF_BASE}" && fzf_base="${FZF_BASE}"
 
@@ -31,38 +27,37 @@ function setup_using_base_dir() {
         fi
     fi
 
-    if [[ -d "${fzf_base}" ]]; then
-        # Fix fzf shell directory for Arch Linux, NixOS or Void Linux packages
-        if [[ ! -d "${fzf_base}/shell" ]]; then
-          fzf_shell="${fzf_base}"
-        else
-          fzf_shell="${fzf_base}/shell"
-        fi
-
-        # Setup fzf binary path
-        if ! (( ${+commands[fzf]} )) && [[ ! "$PATH" == *$fzf_base/bin* ]]; then
-          export PATH="$PATH:$fzf_base/bin"
-        fi
-
-        # Auto-completion
-        if [[ ! "$DISABLE_FZF_AUTO_COMPLETION" == "true" ]]; then
-          [[ $- == *i* ]] && source "${fzf_shell}/completion.zsh" 2> /dev/null
-        fi
-
-        # Key bindings
-        if [[ ! "$DISABLE_FZF_KEY_BINDINGS" == "true" ]]; then
-          source "${fzf_shell}/key-bindings.zsh"
-        fi
-    else
+    if [[ ! -d "${fzf_base}" ]]; then
         return 1
     fi
+
+    # Fix fzf shell directory for Arch Linux, NixOS or Void Linux packages
+    if [[ ! -d "${fzf_base}/shell" ]]; then
+        fzf_shell="${fzf_base}"
+    else
+        fzf_shell="${fzf_base}/shell"
+    fi
+
+    # Setup fzf binary path
+    if (( ! ${+commands[fzf]} )) && [[ "$PATH" != *$fzf_base/bin* ]]; then
+        export PATH="$PATH:$fzf_base/bin"
+    fi
+
+    # Auto-completion
+    if [[ -o interactive && "$DISABLE_FZF_AUTO_COMPLETION" != "true" ]]; then
+        source "${fzf_shell}/completion.zsh" 2> /dev/null
+    fi
+
+    # Key bindings
+    if [[ "$DISABLE_FZF_KEY_BINDINGS" != "true" ]]; then
+        source "${fzf_shell}/key-bindings.zsh"
+    fi
 }
 
 
 function setup_using_debian_package() {
-    (( $+commands[dpkg] )) && dpkg -s fzf &> /dev/null
-    if (( $? )); then
-        # Either not a debian based distro, or no fzf installed. In any case skip ahead
+    if (( ! $+commands[dpkg] )) || ! dpkg -s fzf &>/dev/null; then
+        # Either not a debian based distro, or no fzf installed
         return 1
     fi
 
@@ -76,8 +71,8 @@ function setup_using_debian_package() {
     local key_bindings="/usr/share/doc/fzf/examples/key-bindings.zsh"
 
     # Auto-completion
-    if [[ $- == *i* ]] && [[ ! "$DISABLE_FZF_AUTO_COMPLETION" == "true" ]]; then
-         source $completions 2> /dev/null
+    if [[ -o interactive && "$DISABLE_FZF_AUTO_COMPLETION" != "true" ]]; then
+        source $completions 2> /dev/null
     fi
 
     # Key bindings
@@ -88,16 +83,74 @@ function setup_using_debian_package() {
     return 0
 }
 
-function indicate_error() {
-    print "[oh-my-zsh] fzf plugin: Cannot find fzf installation directory.\n"\
-          "Please add \`export FZF_BASE=/path/to/fzf/install/dir\` to your .zshrc" >&2
+function setup_using_opensuse_package() {
+    # OpenSUSE installs fzf in /usr/bin/fzf
+    # If the command is not found, the package isn't installed
+    (( $+commands[fzf] )) || return 1
+
+    # The fzf-zsh-completion package installs the auto-completion in
+    local completions="/usr/share/zsh/site-functions/_fzf"
+    # The fzf-zsh-completion package installs the key-bindings file in
+    local key_bindings="/etc/zsh_completion.d/fzf-key-bindings"
+
+    # If these are not found: (1) maybe we're not on OpenSUSE, or
+    # (2) maybe the fzf-zsh-completion package isn't installed.
+    if [[ ! -f "$completions" || ! -f "$key_bindings" ]]; then
+        return 1
+    fi
+
+    # Auto-completion
+    if [[ -o interactive && "$DISABLE_FZF_AUTO_COMPLETION" != "true" ]]; then
+        source "$completions" 2>/dev/null
+    fi
+
+    # Key bindings
+    if [[ "$DISABLE_FZF_KEY_BINDINGS" != "true" ]]; then
+        source "$key_bindings" 2>/dev/null
+    fi
+
+    return 0
 }
 
-# Check for debian package first, because it easy to short cut
-# Indicate to user that fzf installation not found if nothing worked
-setup_using_debian_package || setup_using_base_dir || indicate_error
+function setup_using_openbsd_package() {
+    # openBSD installs fzf in /usr/local/bin/fzf
+    if [[ "$OSTYPE" != openbsd* ]] || (( ! $+commands[fzf] )); then
+        return 1
+    fi
 
-unset -f setup_using_debian_package setup_using_base_dir indicate_error
+    # The fzf package installs the auto-completion in
+    local completions="/usr/local/share/zsh/site-functions/_fzf_completion"
+    # The fzf package installs the key-bindings file in
+    local key_bindings="/usr/local/share/zsh/site-functions/_fzf_key_bindings"
+
+    # Auto-completion
+    if [[ -o interactive && "$DISABLE_FZF_AUTO_COMPLETION" != "true" ]]; then
+        source "$completions" 2>/dev/null
+    fi
+
+    # Key bindings
+    if [[ "$DISABLE_FZF_KEY_BINDINGS" != "true" ]]; then
+        source "$key_bindings" 2>/dev/null
+    fi
+
+    return 0
+}
+
+function indicate_error() {
+    cat >&2 <<EOF
+[oh-my-zsh] fzf plugin: Cannot find fzf installation directory.
+Please add \`export FZF_BASE=/path/to/fzf/install/dir\` to your .zshrc
+EOF
+}
+
+# Indicate to user that fzf installation not found if nothing worked
+setup_using_openbsd_package \
+    || setup_using_debian_package \
+    || setup_using_opensuse_package \
+    || setup_using_base_dir \
+    || indicate_error
+
+unset -f setup_using_opensuse_package setup_using_debian_package setup_using_base_dir indicate_error
 
 if [[ -z "$FZF_DEFAULT_COMMAND" ]]; then
     if (( $+commands[rg] )); then

From 3f42700c0d65cf26470d1e165b8ed80dfff9efca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Wed, 21 Oct 2020 16:01:36 +0200
Subject: [PATCH 163/869] Revert "lib: treat _ and - as part of a word"

This reverts commit 50dc4ab3574f4e265dff816d8d9a0195cd260152.

The community has spoken:
- https://github.com/ohmyzsh/ohmyzsh/issues/9367
- https://github.com/ohmyzsh/ohmyzsh/issues/8743

Fixes #9367
---
 lib/completion.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/completion.zsh b/lib/completion.zsh
index a3873cd08..2b62785d5 100644
--- a/lib/completion.zsh
+++ b/lib/completion.zsh
@@ -1,7 +1,7 @@
 # fixme - the load process here seems a bit bizarre
 zmodload -i zsh/complist
 
-WORDCHARS='_-'
+WORDCHARS=''
 
 unsetopt menu_complete   # do not autoselect the first completion entry
 unsetopt flowcontrol

From bf5574fc93166d7c1915b9f3ae78aba1959a8403 Mon Sep 17 00:00:00 2001
From: Wenli Wan <swwl1992@gmail.com>
Date: Wed, 21 Oct 2020 22:09:54 +0800
Subject: [PATCH 164/869] kubectl: add aliases for serviceaccount, daemonsets
 and cronjob (#9344)

---
 plugins/kubectl/README.md          | 23 +++++++++++++++++++----
 plugins/kubectl/kubectl.plugin.zsh | 18 ++++++++++++++++++
 2 files changed, 37 insertions(+), 4 deletions(-)

diff --git a/plugins/kubectl/README.md b/plugins/kubectl/README.md
index 84f5f8d89..7a6cdaa59 100644
--- a/plugins/kubectl/README.md
+++ b/plugins/kubectl/README.md
@@ -22,7 +22,7 @@ plugins=(... kubectl)
 | kcsc    | `kubectl config set-context`        | Set a context entry in kubeconfig                                                                |
 | kcdc    | `kubectl config delete-context`     | Delete the specified context from the kubeconfig                                                 |
 | kccc    | `kubectl config current-context`    | Display the current-context                                                                      |
-| kcgc    | `kubectl config get-contexts` | List of contexts available
+| kcgc    | `kubectl config get-contexts`       | List of contexts available
 |         |                                     | **General aliases**                                                                              |
 | kdel    | `kubectl delete`                    | Delete resources by filenames, stdin, resources and names, or by resources and label selector    |
 | kdelf   | `kubectl delete -f`                 | Delete a pod using the type and name specified in -f argument                                    |
@@ -91,13 +91,13 @@ plugins=(... kubectl)
 | keno    | `kubectl edit node`                 | Edit nodes resource from the default editor                                                      |
 | kdno    | `kubectl describe node`             | Describe node resource in detail                                                                 |
 | kdelno  | `kubectl delete node`               | Delete the node                                                                                  |
-|         |                                   | **Persistent Volume Claim management**                                                           |
+|         |                                     | **Persistent Volume Claim management**                                                           |
 | kgpvc   | `kubectl get pvc`                   | List all PVCs                                                                                    |
 | kgpvcw  | `kgpvc --watch`                     | After listing/getting the requested object, watch for changes                                    |
 | kepvc   | `kubectl edit pvc`                  | Edit pvcs from the default editor                                                                |
-| kdpvc   | `kubectl describe pvc`              | Descirbe all pvcs                                                                                |
+| kdpvc   | `kubectl describe pvc`              | Describe all pvcs                                                                                |
 | kdelpvc | `kubectl delete pvc`                | Delete all pvcs matching passed arguments                                                        |
-|         |                                     |                                                                                                  |
+|         |                                     | **StatefulSets management**                                                                      |
 | kgss    | `kubectl get statefulset`           | List the statefulsets in ps format                                                               |
 | kgssw   | `kgss --watch`                      | After getting the list of statefulsets, watch for changes                                        |
 | kgsswide| `kgss -o wide`                      | After getting the statefulsets, output in plain-text format with any additional information      |
@@ -106,6 +106,21 @@ plugins=(... kubectl)
 | kdelss  | `kubectl delete statefulset`        | Delete the statefulset                                                                           |
 | ksss    | `kubectl scale statefulset`         | Scale a statefulset                                                                              |
 | krsss   | `kubectl rollout status statefulset`| Check the rollout status of a deployment                                                         |
+|         |                                     | **Service Accounts management**                                                                  |
+| kgsa    | `kubectl get sa`                    | List all service accounts                                                                        |
+| kdsa    | `kubectl describe sa`               | Describe a service account in details                                                            |
+| kdelsa  | `kubectl delete sa`                 | Delete the service account                                                                       |
+|         |                                     | **DaemonSet management**                                                                         |
+| kgds    | `kubectl get daemonset`             | List all DaemonSets in ps output format                                                          |
+| kgdsw   | `kgds --watch`                      | After listing all DaemonSets, watch for changes                                                  |
+| keds    | `kubectl edit daemonset`            | Edit DaemonSets from the default editor                                                          |
+| kdds    | `kubectl describe daemonset`        | Describe all DaemonSets in detail                                                                |
+| kdelds  | `kubectl delete daemonset`          | Delete all DaemonSets matching passed argument                                                   |
+|         |                                     | **CronJob management**                                                                           |
+| kgcj    | `kubectl get cronjob`               | List all CronJobs in ps output format                                                            |
+| kecj    | `kubectl edit cronjob`              | Edit CronJob from the default editor                                                             |
+| kdcj    | `kubectl describe cronjob`          | Describe a CronJob in details                                                                    |
+| kdelcj  | `kubectl delete cronjob`            | Delete the CronJob                                                                               |
 
 ## Wrappers
 
diff --git a/plugins/kubectl/kubectl.plugin.zsh b/plugins/kubectl/kubectl.plugin.zsh
index 0b1edb450..d509d8795 100644
--- a/plugins/kubectl/kubectl.plugin.zsh
+++ b/plugins/kubectl/kubectl.plugin.zsh
@@ -150,6 +150,24 @@ alias kepvc='kubectl edit pvc'
 alias kdpvc='kubectl describe pvc'
 alias kdelpvc='kubectl delete pvc'
 
+# Service account management.
+alias kgsa="kubectl get sa"
+alias kdsa="kubectl describe sa"
+alias kdelsa="kubectl delete sa"
+
+# DaemonSet management.
+alias kgds='kubectl get daemonset'
+alias kgdsw='kgds --watch'
+alias keds='kubectl edit daemonset'
+alias kdds='kubectl describe daemonset'
+alias kdelds='kubectl delete daemonset'
+
+# CronJob management.
+alias kgcj='kubectl get cronjob'
+alias kecj='kubectl edit cronjob'
+alias kdcj='kubectl describe cronjob'
+alias kdelcj='kubectl delete cronjob'
+
 # Only run if the user actually has kubectl installed
 if (( ${+_comps[kubectl]} )); then
   kj() { kubectl "$@" -o json | jq; }

From 80d2e4336b85c070e021571f8724032b204f3c4f Mon Sep 17 00:00:00 2001
From: Lucas Larson <91468+LucasLarson@users.noreply.github.com>
Date: Wed, 21 Oct 2020 10:22:32 -0400
Subject: [PATCH 165/869] =?UTF-8?q?Grammar:=20remove=20hyphens=20from=20pr?=
 =?UTF-8?q?edicate=C2=A0adjective=C2=A0=E2=80=9Cup=C2=A0to=C2=A0date?=
 =?UTF-8?q?=E2=80=9D=20(#9356)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://english.stackexchange.com/a/180617
https://web.archive.org/web/20190728053012id_/grammarist.com/usage/up-to-date/#text-60
---
 plugins/cargo/_cargo             | 4 ++--
 plugins/golang/golang.plugin.zsh | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/plugins/cargo/_cargo b/plugins/cargo/_cargo
index 12694901e..ffc9fcdc8 100644
--- a/plugins/cargo/_cargo
+++ b/plugins/cargo/_cargo
@@ -12,8 +12,8 @@ _cargo() {
         '(-q --quiet)*'{-v,--verbose}'[use verbose output]'
         '(-q --quiet -v --verbose)'{-q,--quiet}'[no output printed to stdout]'
         '-Z+[pass unstable (nightly-only) flags to cargo]: :_cargo_unstable_flags'
-        '--frozen[require that Cargo.lock and cache are up-to-date]'
-        '--locked[require that Cargo.lock is up-to-date]'
+        '--frozen[require that Cargo.lock and cache are up to date]'
+        '--locked[require that Cargo.lock is up to date]'
         '--color=[specify colorization option]:coloring:(auto always never)'
         '(- 1 *)'{-h,--help}'[show help message]'
     )
diff --git a/plugins/golang/golang.plugin.zsh b/plugins/golang/golang.plugin.zsh
index 47b10988e..398bd966f 100644
--- a/plugins/golang/golang.plugin.zsh
+++ b/plugins/golang/golang.plugin.zsh
@@ -41,7 +41,7 @@ __go_tool_complete() {
     return
   fi
   build_flags=(
-    '-a[force reinstallation of packages that are already up-to-date]'
+    '-a[force reinstallation of packages that are already up to date]'
     '-n[print the commands but do not run them]'
     '-p[number of parallel builds]:number'
     '-race[enable data race detection]'

From 3b1699b59527ee8095397b9909a37d55689a0481 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Wed, 21 Oct 2020 20:01:10 +0200
Subject: [PATCH 166/869] npx: deprecate plugin

Fixes #9366
---
 plugins/npx/README.md | 28 ++++++++++++++++++----------
 1 file changed, 18 insertions(+), 10 deletions(-)

diff --git a/plugins/npx/README.md b/plugins/npx/README.md
index 1c052930b..41e4c1352 100644
--- a/plugins/npx/README.md
+++ b/plugins/npx/README.md
@@ -1,21 +1,15 @@
 # NPX Plugin
-> npx(1) -- execute npm package binaries. ([more info](https://github.com/zkat/npx))
+
+> npx(1) -- execute npm package binaries. ([more info](https://github.com/npm/npx))
 
 This plugin automatically registers npx command-not-found handler if `npx` exists in your `$PATH`.
 
-## Setup
+To use it, add `npx` to the plugins array in your zshrc file:
 
-- Add plugin to `~/.zshrc`
-
-```bash
+```zsh
 plugins=(.... npx)
 ```
 
-- Globally install npx binary (npx will be auto installed with recent versions of Node.js)
-```bash
-sudo npm install -g npx
-```
-
 ## Note
 
 The shell auto-fallback doesn't auto-install plain packages. In order to get it to install something, you need to add `@`:
@@ -29,3 +23,17 @@ Started
 
 It does it this way so folks using the fallback don't accidentally try to install regular typoes.
 
+## Deprecation
+
+Since npm v7, `npx` has been moved to `npm exec`. With the move, [the `--shell-auto-fallback` argument
+for `npx` has been removed](https://github.com/npm/cli/blob/v7.0.0/docs/content/cli-commands/npm-exec.md#compatibility-with-older-npx-versions):
+
+> Shell fallback functionality is removed, as it is not advisable.
+
+When using npm v7, you'll get this error:
+
+> npx: the --shell-auto-fallback argument has been removed
+
+If you get this error, just disable the plugin by removing it from the plugins array in your zshrc file.
+This plugin will no longer be maintained and will be removed in the future, when the older `npx` versions
+are no longer available.

From a32564e0ae87686702570f3f942977bc9280f178 Mon Sep 17 00:00:00 2001
From: Felipe Contreras <felipe.contreras@gmail.com>
Date: Sat, 24 Oct 2020 07:12:23 -0500
Subject: [PATCH 167/869] gitfast: update to latest upstream and more (#9382)

---
 plugins/gitfast/_git                |  128 +-
 plugins/gitfast/git-completion.bash | 2218 +++++++++++++++------------
 plugins/gitfast/git-prompt.sh       |   72 +-
 plugins/gitfast/update              |   11 +-
 plugins/gitfast/updates.patch       |   56 -
 5 files changed, 1423 insertions(+), 1062 deletions(-)
 delete mode 100644 plugins/gitfast/updates.patch

diff --git a/plugins/gitfast/_git b/plugins/gitfast/_git
index 78a6dbb3d..46d10d6f9 100644
--- a/plugins/gitfast/_git
+++ b/plugins/gitfast/_git
@@ -2,25 +2,24 @@
 
 # zsh completion wrapper for git
 #
-# Copyright (c) 2012-2013 Felipe Contreras <felipe.contreras@gmail.com>
+# Copyright (c) 2012-2020 Felipe Contreras <felipe.contreras@gmail.com>
 #
-# You need git's bash completion script installed somewhere, by default it
-# would be the location bash-completion uses.
+# The recommended way to install this script is to make a copy of it as a
+# file named '_git' inside any directory in your fpath.
 #
-# If your script is somewhere else, you can configure it on your ~/.zshrc:
-#
-#  zstyle ':completion:*:*:git:*' script ~/.git-completion.zsh
-#
-# The recommended way to install this script is to copy to '~/.zsh/_git', and
-# then add the following to your ~/.zshrc file:
+# For example, create a directory '~/.zsh/', copy this file to '~/.zsh/_git',
+# and then add the following to your ~/.zshrc file:
 #
 #  fpath=(~/.zsh $fpath)
-
-complete ()
-{
-	# do nothing
-	return 0
-}
+#
+# You need git's bash completion script installed. By default bash-completion's
+# location will be used (e.g. pkg-config --variable=completionsdir bash-completion).
+#
+# If your bash completion script is somewhere else, you can specify the
+# location in your ~/.zshrc:
+#
+#  zstyle ':completion:*:*:git:*' script ~/.git-completion.bash
+#
 
 zstyle -T ':completion:*:*:git:*' tag-order && \
 	zstyle ':completion:*:*:git:*' tag-order 'common-commands'
@@ -30,16 +29,17 @@ if [ -z "$script" ]; then
 	local -a locations
 	local e
 	locations=(
-		"$(dirname ${funcsourcetrace[1]%:*})/git-completion.bash"
-		'/etc/bash_completion.d/git' # fedora, old debian
-		'/usr/share/bash-completion/completions/git' # arch, ubuntu, new debian
-		'/usr/share/bash-completion/git' # gentoo
+		"$(dirname ${funcsourcetrace[1]%:*})"/git-completion.bash
+		"$HOME/.local/share/bash-completion/completions/git"
+		"$(pkg-config --variable=completionsdir bash-completion)"/git
+		'/usr/share/bash-completion/completions/git'
+		'/etc/bash_completion.d/git' # old debian
 		)
 	for e in $locations; do
 		test -f $e && script="$e" && break
 	done
 fi
-ZSH_VERSION='' . "$script"
+GIT_SOURCING_ZSH_COMPLETION=y . "$script"
 
 __gitcomp ()
 {
@@ -50,13 +50,35 @@ __gitcomp ()
 	case "$cur_" in
 	--*=)
 		;;
+	--no-*)
+		local c IFS=$' \t\n'
+		local -a array
+		for c in ${=1}; do
+			if [[ $c == "--" ]]; then
+				continue
+			fi
+			c="$c${4-}"
+			case $c in
+			--*=|*.) ;;
+			*) c="$c " ;;
+			esac
+			array+=("$c")
+		done
+		compset -P '*[=:]'
+		compadd -Q -S '' -p "${2-}" -a -- array && _ret=0
+		;;
 	*)
 		local c IFS=$' \t\n'
 		local -a array
 		for c in ${=1}; do
+			if [[ $c == "--" ]]; then
+				c="--no-...${4-}"
+				array+=("$c ")
+				break
+			fi
 			c="$c${4-}"
 			case $c in
-			--*=*|*.) ;;
+			--*=|*.) ;;
 			*) c="$c " ;;
 			esac
 			array+=("$c")
@@ -71,35 +93,57 @@ __gitcomp_direct ()
 {
 	emulate -L zsh
 
-	local IFS=$'\n'
 	compset -P '*[=:]'
-	compadd -Q -- ${=1} && _ret=0
+	compadd -Q -S '' -- ${(f)1} && _ret=0
 }
 
 __gitcomp_nl ()
 {
 	emulate -L zsh
 
-	local IFS=$'\n'
 	compset -P '*[=:]'
-	compadd -Q -S "${4- }" -p "${2-}" -- ${=1} && _ret=0
+	compadd -Q -S "${4- }" -p "${2-}" -- ${(f)1} && _ret=0
 }
 
 __gitcomp_nl_append ()
 {
 	emulate -L zsh
 
-	local IFS=$'\n'
-	compadd -Q -S "${4- }" -p "${2-}" -- ${=1} && _ret=0
+	compset -P '*[=:]'
+	compadd -Q -S "${4- }" -p "${2-}" -- ${(f)1} && _ret=0
+}
+
+__gitcomp_file_direct ()
+{
+	emulate -L zsh
+
+	compadd -f -- ${(f)1} && _ret=0
 }
 
 __gitcomp_file ()
 {
 	emulate -L zsh
 
-	local IFS=$'\n'
-	compset -P '*[=:]'
-	compadd -Q -p "${2-}" -f -- ${=1} && _ret=0
+	compadd -f -p "${2-}" -- ${(f)1} && _ret=0
+}
+
+_git_zsh ()
+{
+	__gitcomp "v1.0"
+}
+
+__git_complete_command ()
+{
+	emulate -L zsh
+
+	local command="$1"
+	local completion_func="_git_${command//-/_}"
+	if (( $+functions[$completion_func] )); then
+		emulate ksh -c $completion_func
+		return 0
+	else
+		return 1
+	fi
 }
 
 __git_zsh_bash_func ()
@@ -108,14 +152,12 @@ __git_zsh_bash_func ()
 
 	local command=$1
 
-	local completion_func="_git_${command//-/_}"
-	declare -f $completion_func >/dev/null && $completion_func && return
+	__git_complete_command "$command" && return
 
 	local expansion=$(__git_aliased_command "$command")
 	if [ -n "$expansion" ]; then
 		words[1]=$expansion
-		completion_func="_git_${expansion//-/_}"
-		declare -f $completion_func >/dev/null && $completion_func
+		__git_complete_command "$expansion"
 	fi
 }
 
@@ -140,9 +182,11 @@ __git_zsh_cmd_common ()
 	push:'update remote refs along with associated objects'
 	rebase:'forward-port local commits to the updated upstream head'
 	reset:'reset current HEAD to the specified state'
+	restore:'restore working tree files'
 	rm:'remove files from the working tree and from the index'
 	show:'show various types of objects'
 	status:'show the working tree status'
+	switch:'switch branches'
 	tag:'create, list, delete or verify a tag object signed with GPG')
 	_describe -t common-commands 'common commands' list && _ret=0
 }
@@ -150,8 +194,9 @@ __git_zsh_cmd_common ()
 __git_zsh_cmd_alias ()
 {
 	local -a list
-	list=(${${${(0)"$(git config -z --get-regexp '^alias\.')"}#alias.}%$'\n'*})
-	_describe -t alias-commands 'aliases' list $* && _ret=0
+	list=(${${(0)"$(git config -z --get-regexp '^alias\.*')"}#alias.})
+	list=(${(f)"$(printf "%s:alias for '%s'\n" ${(f@)list})"})
+	_describe -t alias-commands 'aliases' list && _ret=0
 }
 
 __git_zsh_cmd_all ()
@@ -189,10 +234,13 @@ __git_zsh_main ()
 
 	case $state in
 	(command)
-		_alternative \
-                         'alias-commands:alias:__git_zsh_cmd_alias' \
-                         'common-commands:common:__git_zsh_cmd_common' \
-                         'all-commands:all:__git_zsh_cmd_all' && _ret=0
+		_tags common-commands alias-commands all-commands
+		while _tags; do
+			_requested common-commands && __git_zsh_cmd_common
+			_requested alias-commands && __git_zsh_cmd_alias
+			_requested all-commands && __git_zsh_cmd_all
+			let _ret || break
+		done
 		;;
 	(arg)
 		local command="${words[1]}" __git_dir
diff --git a/plugins/gitfast/git-completion.bash b/plugins/gitfast/git-completion.bash
index b6ff5dc08..76ba7e79f 100644
--- a/plugins/gitfast/git-completion.bash
+++ b/plugins/gitfast/git-completion.bash
@@ -29,13 +29,21 @@
 # tell the completion to use commit completion.  This also works with aliases
 # of form "!sh -c '...'".  For example, "!sh -c ': git commit ; ... '".
 #
+# Compatible with bash 3.2.57.
+#
 # You can set the following environment variables to influence the behavior of
 # the completion routines:
 #
 #   GIT_COMPLETION_CHECKOUT_NO_GUESS
 #
 #     When set to "1", do not include "DWIM" suggestions in git-checkout
-#     completion (e.g., completing "foo" when "origin/foo" exists).
+#     and git-switch completion (e.g., completing "foo" when "origin/foo"
+#     exists).
+#
+#   GIT_COMPLETION_SHOW_ALL
+#
+#     When set to "1" suggest all options, including options which are
+#     typically hidden (e.g. '--allow-empty' for 'git commit').
 
 case "$COMP_WORDBREAKS" in
 *:*) : great ;;
@@ -47,7 +55,7 @@ esac
 # variable.
 __git_find_repo_path ()
 {
-	if [ -n "$__git_repo_path" ]; then
+	if [ -n "${__git_repo_path-}" ]; then
 		# we already know where it is
 		return
 	fi
@@ -92,6 +100,70 @@ __git ()
 		${__git_dir:+--git-dir="$__git_dir"} "$@" 2>/dev/null
 }
 
+# Removes backslash escaping, single quotes and double quotes from a word,
+# stores the result in the variable $dequoted_word.
+# 1: The word to dequote.
+__git_dequote ()
+{
+	local rest="$1" len ch
+
+	dequoted_word=""
+
+	while test -n "$rest"; do
+		len=${#dequoted_word}
+		dequoted_word="$dequoted_word${rest%%[\\\'\"]*}"
+		rest="${rest:$((${#dequoted_word}-$len))}"
+
+		case "${rest:0:1}" in
+		\\)
+			ch="${rest:1:1}"
+			case "$ch" in
+			$'\n')
+				;;
+			*)
+				dequoted_word="$dequoted_word$ch"
+				;;
+			esac
+			rest="${rest:2}"
+			;;
+		\')
+			rest="${rest:1}"
+			len=${#dequoted_word}
+			dequoted_word="$dequoted_word${rest%%\'*}"
+			rest="${rest:$((${#dequoted_word}-$len+1))}"
+			;;
+		\")
+			rest="${rest:1}"
+			while test -n "$rest" ; do
+				len=${#dequoted_word}
+				dequoted_word="$dequoted_word${rest%%[\\\"]*}"
+				rest="${rest:$((${#dequoted_word}-$len))}"
+				case "${rest:0:1}" in
+				\\)
+					ch="${rest:1:1}"
+					case "$ch" in
+					\"|\\|\$|\`)
+						dequoted_word="$dequoted_word$ch"
+						;;
+					$'\n')
+						;;
+					*)
+						dequoted_word="$dequoted_word\\$ch"
+						;;
+					esac
+					rest="${rest:2}"
+					;;
+				\")
+					rest="${rest:1}"
+					break
+					;;
+				esac
+			done
+			;;
+		esac
+	done
+}
+
 # The following function is based on code from:
 #
 #   bash_completion - programmable completion functions for bash 3.2+
@@ -234,6 +306,19 @@ __gitcomp_direct ()
 	COMPREPLY=($1)
 }
 
+# Similar to __gitcomp_direct, but appends to COMPREPLY instead.
+# Callers must take care of providing only words that match the current word
+# to be completed and adding any prefix and/or suffix (trailing space!), if
+# necessary.
+# 1: List of newline-separated matching completion words, complete with
+#    prefix and suffix.
+__gitcomp_direct_append ()
+{
+	local IFS=$'\n'
+
+	COMPREPLY+=($1)
+}
+
 __gitcompappend ()
 {
 	local x i=${#COMPREPLY[@]}
@@ -264,13 +349,36 @@ __gitcomp ()
 	case "$cur_" in
 	--*=)
 		;;
-	*)
+	--no-*)
 		local c i=0 IFS=$' \t\n'
 		for c in $1; do
+			if [[ $c == "--" ]]; then
+				continue
+			fi
 			c="$c${4-}"
 			if [[ $c == "$cur_"* ]]; then
 				case $c in
-				--*=*|*.) ;;
+				--*=|*.) ;;
+				*) c="$c " ;;
+				esac
+				COMPREPLY[i++]="${2-}$c"
+			fi
+		done
+		;;
+	*)
+		local c i=0 IFS=$' \t\n'
+		for c in $1; do
+			if [[ $c == "--" ]]; then
+				c="--no-...${4-}"
+				if [[ $c == "$cur_"* ]]; then
+					COMPREPLY[i++]="${2-}$c "
+				fi
+				break
+			fi
+			c="$c${4-}"
+			if [[ $c == "$cur_"* ]]; then
+				case $c in
+				*=|*.) ;;
 				*) c="$c " ;;
 				esac
 				COMPREPLY[i++]="${2-}$c"
@@ -280,6 +388,163 @@ __gitcomp ()
 	esac
 }
 
+# Clear the variables caching builtins' options when (re-)sourcing
+# the completion script.
+if [[ -n ${ZSH_VERSION-} ]]; then
+	unset ${(M)${(k)parameters[@]}:#__gitcomp_builtin_*} 2>/dev/null
+else
+	unset $(compgen -v __gitcomp_builtin_)
+fi
+
+__gitcomp_builtin_add_default=" --dry-run --verbose --interactive --patch --edit --force --update --renormalize --intent-to-add --all --ignore-removal --refresh --ignore-errors --ignore-missing --chmod= --pathspec-from-file= --pathspec-file-nul --no-dry-run -- --no-verbose --no-interactive --no-patch --no-edit --no-force --no-update --no-renormalize --no-intent-to-add --no-all --no-ignore-removal --no-refresh --no-ignore-errors --no-ignore-missing --no-chmod --no-pathspec-from-file --no-pathspec-file-nul"
+__gitcomp_builtin_am_default=" --interactive --3way --quiet --signoff --utf8 --keep --keep-non-patch --message-id --keep-cr --no-keep-cr --scissors --whitespace= --ignore-space-change --ignore-whitespace --directory= --exclude= --include= --patch-format= --reject --resolvemsg= --continue --resolved --skip --abort --quit --show-current-patch --committer-date-is-author-date --ignore-date --rerere-autoupdate --gpg-sign -- --no-interactive --no-3way --no-quiet --no-signoff --no-utf8 --no-keep --no-keep-non-patch --no-message-id --no-scissors --no-whitespace --no-ignore-space-change --no-ignore-whitespace --no-directory --no-exclude --no-include --no-patch-format --no-reject --no-resolvemsg --no-committer-date-is-author-date --no-ignore-date --no-rerere-autoupdate --no-gpg-sign"
+__gitcomp_builtin_apply_default=" --exclude= --include= --no-add --stat --numstat --summary --check --index --intent-to-add --cached --apply --3way --build-fake-ancestor= --whitespace= --ignore-space-change --ignore-whitespace --reverse --unidiff-zero --reject --allow-overlap --verbose --inaccurate-eof --recount --directory= --add -- --no-stat --no-numstat --no-summary --no-check --no-index --no-intent-to-add --no-cached --no-apply --no-3way --no-build-fake-ancestor --no-whitespace --no-ignore-space-change --no-ignore-whitespace --no-reverse --no-unidiff-zero --no-reject --no-allow-overlap --no-verbose --no-inaccurate-eof --no-recount --no-directory"
+__gitcomp_builtin_archive_default=" --output= --remote= --exec= --no-output -- --no-remote --no-exec"
+__gitcomp_builtin_bisect__helper_default=" --next-all --write-terms --bisect-clean-state --check-expected-revs --bisect-reset --bisect-write --check-and-set-terms --bisect-next-check --bisect-terms --bisect-start --bisect-next --bisect-auto-next --bisect-autostart --no-log --log"
+__gitcomp_builtin_blame_default=" --incremental --root --show-stats --progress --score-debug --show-name --show-number --porcelain --line-porcelain --show-email --ignore-rev= --ignore-revs-file= --color-lines --color-by-age --minimal --contents= --abbrev --no-incremental -- --no-root --no-show-stats --no-progress --no-score-debug --no-show-name --no-show-number --no-porcelain --no-line-porcelain --no-show-email --no-ignore-rev --no-ignore-revs-file --no-color-lines --no-color-by-age --no-minimal --no-contents --no-abbrev"
+__gitcomp_builtin_branch_default=" --verbose --quiet --track --set-upstream-to= --unset-upstream --color --remotes --contains --no-contains --abbrev --all --delete --move --copy --list --show-current --create-reflog --edit-description --merged --no-merged --column --sort= --points-at= --ignore-case --format= -- --no-verbose --no-quiet --no-track --no-set-upstream-to --no-unset-upstream --no-color --no-remotes --no-abbrev --no-all --no-delete --no-move --no-copy --no-list --no-show-current --no-create-reflog --no-edit-description --no-column --no-points-at --no-ignore-case --no-format"
+__gitcomp_builtin_bugreport_default=" --output-directory= --suffix= --no-output-directory -- --no-suffix"
+__gitcomp_builtin_cat_file_default=" --textconv --filters --path= --allow-unknown-type --buffer --batch --batch-check --follow-symlinks --batch-all-objects --unordered --no-path -- --no-allow-unknown-type --no-buffer --no-follow-symlinks --no-batch-all-objects --no-unordered"
+__gitcomp_builtin_check_attr_default=" --all --cached --stdin --no-all -- --no-cached --no-stdin"
+__gitcomp_builtin_check_ignore_default=" --quiet --verbose --stdin --non-matching --no-index --index -- --no-quiet --no-verbose --no-stdin --no-non-matching"
+__gitcomp_builtin_check_mailmap_default=" --stdin --no-stdin"
+__gitcomp_builtin_checkout_default=" --guess --overlay --quiet --recurse-submodules --progress --merge --conflict= --detach --track --orphan= --ignore-other-worktrees --ours --theirs --patch --ignore-skip-worktree-bits --pathspec-from-file= --pathspec-file-nul --no-guess -- --no-overlay --no-quiet --no-recurse-submodules --no-progress --no-merge --no-conflict --no-detach --no-track --no-orphan --no-ignore-other-worktrees --no-patch --no-ignore-skip-worktree-bits --no-pathspec-from-file --no-pathspec-file-nul"
+__gitcomp_builtin_checkout_index_default=" --all --force --quiet --no-create --index --stdin --temp --prefix= --stage= --create -- --no-all --no-force --no-quiet --no-index --no-stdin --no-temp --no-prefix"
+__gitcomp_builtin_cherry_default=" --abbrev --verbose --no-abbrev -- --no-verbose"
+__gitcomp_builtin_cherry_pick_default=" --quit --continue --abort --skip --cleanup= --no-commit --edit --signoff --mainline= --rerere-autoupdate --strategy= --strategy-option= --gpg-sign --ff --allow-empty --allow-empty-message --keep-redundant-commits --commit -- --no-cleanup --no-edit --no-signoff --no-mainline --no-rerere-autoupdate --no-strategy --no-strategy-option --no-gpg-sign --no-ff --no-allow-empty --no-allow-empty-message --no-keep-redundant-commits"
+__gitcomp_builtin_clean_default=" --quiet --dry-run --interactive --exclude= --no-quiet -- --no-dry-run --no-interactive"
+__gitcomp_builtin_clone_default=" --verbose --quiet --progress --no-checkout --bare --mirror --local --no-hardlinks --shared --recurse-submodules --recursive --jobs= --template= --reference= --reference-if-able= --dissociate --origin= --branch= --upload-pack= --depth= --shallow-since= --shallow-exclude= --single-branch --no-tags --shallow-submodules --separate-git-dir= --config= --server-option= --ipv4 --ipv6 --filter= --remote-submodules --sparse --checkout --hardlinks --tags -- --no-verbose --no-quiet --no-progress --no-bare --no-mirror --no-local --no-shared --no-recurse-submodules --no-recursive --no-jobs --no-template --no-reference --no-reference-if-able --no-dissociate --no-origin --no-branch --no-upload-pack --no-depth --no-shallow-since --no-shallow-exclude --no-single-branch --no-shallow-submodules --no-separate-git-dir --no-config --no-server-option --no-ipv4 --no-ipv6 --no-filter --no-remote-submodules --no-sparse"
+__gitcomp_builtin_column_default=" --command= --mode --raw-mode= --width= --indent= --nl= --padding= --no-command -- --no-mode --no-raw-mode --no-width --no-indent --no-nl --no-padding"
+__gitcomp_builtin_commit_default=" --quiet --verbose --file= --author= --date= --message= --reedit-message= --reuse-message= --fixup= --squash= --reset-author --signoff --template= --edit --cleanup= --status --gpg-sign --all --include --interactive --patch --only --no-verify --dry-run --short --branch --ahead-behind --porcelain --long --null --amend --no-post-rewrite --untracked-files --pathspec-from-file= --pathspec-file-nul --verify --post-rewrite -- --no-quiet --no-verbose --no-file --no-author --no-date --no-message --no-reedit-message --no-reuse-message --no-fixup --no-squash --no-reset-author --no-signoff --no-template --no-edit --no-cleanup --no-status --no-gpg-sign --no-all --no-include --no-interactive --no-patch --no-only --no-dry-run --no-short --no-branch --no-ahead-behind --no-porcelain --no-long --no-null --no-amend --no-untracked-files --no-pathspec-from-file --no-pathspec-file-nul"
+__gitcomp_builtin_commit_graph_default=" --object-dir= --no-object-dir"
+__gitcomp_builtin_config_default=" --global --system --local --worktree --file= --blob= --get --get-all --get-regexp --get-urlmatch --replace-all --add --unset --unset-all --rename-section --remove-section --list --edit --get-color --get-colorbool --type= --bool --int --bool-or-int --bool-or-str --path --expiry-date --null --name-only --includes --show-origin --show-scope --default= --no-global -- --no-system --no-local --no-worktree --no-file --no-blob --no-get --no-get-all --no-get-regexp --no-get-urlmatch --no-replace-all --no-add --no-unset --no-unset-all --no-rename-section --no-remove-section --no-list --no-edit --no-get-color --no-get-colorbool --no-type --no-null --no-name-only --no-includes --no-show-origin --no-show-scope --no-default"
+__gitcomp_builtin_count_objects_default=" --verbose --human-readable --no-verbose -- --no-human-readable"
+__gitcomp_builtin_credential_cache_default=" --timeout= --socket= --no-timeout -- --no-socket"
+__gitcomp_builtin_credential_cache__daemon_default=" --debug --no-debug"
+__gitcomp_builtin_credential_store_default=" --file= --no-file"
+__gitcomp_builtin_describe_default=" --contains --debug --all --tags --long --first-parent --abbrev --exact-match --candidates= --match= --exclude= --always --dirty --broken --no-contains -- --no-debug --no-all --no-tags --no-long --no-first-parent --no-abbrev --no-exact-match --no-candidates --no-match --no-exclude --no-always --no-dirty --no-broken"
+__gitcomp_builtin_difftool_default=" --gui --dir-diff --no-prompt --symlinks --tool= --tool-help --trust-exit-code --extcmd= --no-index -- --no-gui --no-dir-diff --no-symlinks --no-tool --no-tool-help --no-trust-exit-code --no-extcmd"
+__gitcomp_builtin_env__helper_default=" --type= --default= --exit-code --no-default -- --no-exit-code"
+__gitcomp_builtin_fast_export_default=" --progress= --signed-tags= --tag-of-filtered-object= --reencode= --export-marks= --import-marks= --import-marks-if-exists= --fake-missing-tagger --full-tree --use-done-feature --no-data --refspec= --anonymize --anonymize-map= --reference-excluded-parents --show-original-ids --mark-tags --data -- --no-progress --no-signed-tags --no-tag-of-filtered-object --no-reencode --no-export-marks --no-import-marks --no-import-marks-if-exists --no-fake-missing-tagger --no-full-tree --no-use-done-feature --no-refspec --no-anonymize --no-reference-excluded-parents --no-show-original-ids --no-mark-tags"
+__gitcomp_builtin_fetch_default=" --verbose --quiet --all --set-upstream --append --upload-pack= --force --multiple --tags --jobs= --prune --prune-tags --recurse-submodules --dry-run --write-fetch-head --keep --update-head-ok --progress --depth= --shallow-since= --shallow-exclude= --deepen= --unshallow --update-shallow --refmap= --server-option= --ipv4 --ipv6 --negotiation-tip= --filter= --auto-maintenance --auto-gc --show-forced-updates --write-commit-graph --stdin --no-verbose -- --no-quiet --no-all --no-set-upstream --no-append --no-upload-pack --no-force --no-multiple --no-tags --no-jobs --no-prune --no-prune-tags --no-recurse-submodules --no-dry-run --no-write-fetch-head --no-keep --no-update-head-ok --no-progress --no-depth --no-shallow-since --no-shallow-exclude --no-deepen --no-update-shallow --no-server-option --no-ipv4 --no-ipv6 --no-negotiation-tip --no-filter --no-auto-maintenance --no-auto-gc --no-show-forced-updates --no-write-commit-graph --no-stdin"
+__gitcomp_builtin_fmt_merge_msg_default=" --log --message= --file= --no-log -- --no-message --no-file"
+__gitcomp_builtin_for_each_ref_default=" --shell --perl --python --tcl --count= --format= --color --sort= --points-at= --merged --no-merged --contains --no-contains --ignore-case -- --no-shell --no-perl --no-python --no-tcl --no-count --no-format --no-color --no-points-at --no-ignore-case"
+__gitcomp_builtin_format_patch_default=" --numbered --no-numbered --signoff --stdout --cover-letter --numbered-files --suffix= --start-number= --reroll-count= --rfc --cover-from-description= --subject-prefix= --output-directory= --keep-subject --no-binary --zero-commit --ignore-if-in-upstream --no-stat --add-header= --to= --cc= --from --in-reply-to= --attach --inline --thread --signature= --base= --signature-file= --quiet --progress --interdiff= --range-diff= --creation-factor= --binary -- --no-numbered --no-signoff --no-stdout --no-cover-letter --no-numbered-files --no-suffix --no-start-number --no-reroll-count --no-cover-from-description --no-zero-commit --no-ignore-if-in-upstream --no-add-header --no-to --no-cc --no-from --no-in-reply-to --no-attach --no-thread --no-signature --no-base --no-signature-file --no-quiet --no-progress --no-interdiff --no-range-diff --no-creation-factor"
+__gitcomp_builtin_fsck_default=" --verbose --unreachable --dangling --tags --root --cache --reflogs --full --connectivity-only --strict --lost-found --progress --name-objects --no-verbose -- --no-unreachable --no-dangling --no-tags --no-root --no-cache --no-reflogs --no-full --no-connectivity-only --no-strict --no-lost-found --no-progress --no-name-objects"
+__gitcomp_builtin_fsck_objects_default=" --verbose --unreachable --dangling --tags --root --cache --reflogs --full --connectivity-only --strict --lost-found --progress --name-objects --no-verbose -- --no-unreachable --no-dangling --no-tags --no-root --no-cache --no-reflogs --no-full --no-connectivity-only --no-strict --no-lost-found --no-progress --no-name-objects"
+__gitcomp_builtin_gc_default=" --quiet --prune --aggressive --keep-largest-pack --no-quiet -- --no-prune --no-aggressive --no-keep-largest-pack"
+__gitcomp_builtin_grep_default=" --cached --no-index --untracked --exclude-standard --recurse-submodules --invert-match --ignore-case --word-regexp --text --textconv --recursive --max-depth= --extended-regexp --basic-regexp --fixed-strings --perl-regexp --line-number --column --full-name --files-with-matches --name-only --files-without-match --only-matching --count --color --break --heading --context= --before-context= --after-context= --threads= --show-function --function-context --and --or --not --quiet --all-match --index -- --no-cached --no-untracked --no-exclude-standard --no-recurse-submodules --no-invert-match --no-ignore-case --no-word-regexp --no-text --no-textconv --no-recursive --no-extended-regexp --no-basic-regexp --no-fixed-strings --no-perl-regexp --no-line-number --no-column --no-full-name --no-files-with-matches --no-name-only --no-files-without-match --no-only-matching --no-count --no-color --no-break --no-heading --no-context --no-before-context --no-after-context --no-threads --no-show-function --no-function-context --no-or --no-quiet --no-all-match"
+__gitcomp_builtin_hash_object_default=" --stdin --stdin-paths --no-filters --literally --path= --filters -- --no-stdin --no-stdin-paths --no-literally --no-path"
+__gitcomp_builtin_help_default=" --all --guides --config --man --web --info --verbose --no-all -- --no-guides --no-config --no-man --no-web --no-info --no-verbose"
+__gitcomp_builtin_init_default=" --template= --bare --shared --quiet --separate-git-dir= --initial-branch= --object-format= --no-template -- --no-bare --no-quiet --no-separate-git-dir --no-initial-branch --no-object-format"
+__gitcomp_builtin_init_db_default=" --template= --bare --shared --quiet --separate-git-dir= --initial-branch= --object-format= --no-template -- --no-bare --no-quiet --no-separate-git-dir --no-initial-branch --no-object-format"
+__gitcomp_builtin_interpret_trailers_default=" --in-place --trim-empty --where= --if-exists= --if-missing= --only-trailers --only-input --unfold --parse --no-divider --trailer= --divider -- --no-in-place --no-trim-empty --no-where --no-if-exists --no-if-missing --no-only-trailers --no-only-input --no-unfold --no-trailer"
+__gitcomp_builtin_log_default=" --quiet --source --use-mailmap --mailmap --decorate-refs= --decorate-refs-exclude= --decorate --no-quiet -- --no-source --no-use-mailmap --no-mailmap --no-decorate-refs --no-decorate-refs-exclude --no-decorate"
+__gitcomp_builtin_ls_files_default=" --cached --deleted --modified --others --ignored --stage --killed --directory --eol --empty-directory --unmerged --resolve-undo --exclude= --exclude-from= --exclude-per-directory= --exclude-standard --full-name --recurse-submodules --error-unmatch --with-tree= --abbrev --debug --no-cached -- --no-deleted --no-modified --no-others --no-ignored --no-stage --no-killed --no-directory --no-eol --no-empty-directory --no-unmerged --no-resolve-undo --no-exclude-per-directory --no-recurse-submodules --no-error-unmatch --no-with-tree --no-abbrev --no-debug"
+__gitcomp_builtin_ls_remote_default=" --quiet --upload-pack= --tags --heads --refs --get-url --sort= --symref --server-option= --no-quiet -- --no-upload-pack --no-tags --no-heads --no-refs --no-get-url --no-symref --no-server-option"
+__gitcomp_builtin_ls_tree_default=" --long --name-only --name-status --full-name --full-tree --abbrev --no-long -- --no-name-only --no-name-status --no-full-name --no-full-tree --no-abbrev"
+__gitcomp_builtin_merge_default=" --stat --summary --log --squash --commit --edit --cleanup= --ff --ff-only --rerere-autoupdate --verify-signatures --strategy= --strategy-option= --message= --file --verbose --quiet --abort --quit --continue --allow-unrelated-histories --progress --gpg-sign --autostash --overwrite-ignore --signoff --no-verify --verify -- --no-stat --no-summary --no-log --no-squash --no-commit --no-edit --no-cleanup --no-ff --no-rerere-autoupdate --no-verify-signatures --no-strategy --no-strategy-option --no-message --no-verbose --no-quiet --no-abort --no-quit --no-continue --no-allow-unrelated-histories --no-progress --no-gpg-sign --no-autostash --no-overwrite-ignore --no-signoff"
+__gitcomp_builtin_merge_base_default=" --all --octopus --independent --is-ancestor --fork-point --no-all"
+__gitcomp_builtin_merge_file_default=" --stdout --diff3 --ours --theirs --union --marker-size= --quiet --no-stdout -- --no-diff3 --no-ours --no-theirs --no-union --no-marker-size --no-quiet"
+__gitcomp_builtin_mktree_default=" --missing --batch --no-missing -- --no-batch"
+__gitcomp_builtin_multi_pack_index_default=" --object-dir= --progress --batch-size= --no-object-dir -- --no-progress"
+__gitcomp_builtin_mv_default=" --verbose --dry-run --no-verbose -- --no-dry-run"
+__gitcomp_builtin_name_rev_default=" --name-only --tags --refs= --exclude= --all --stdin --undefined --always --no-name-only -- --no-tags --no-refs --no-exclude --no-all --no-stdin --no-undefined --no-always"
+__gitcomp_builtin_notes_default=" --ref= --no-ref"
+__gitcomp_builtin_pack_objects_default=" --quiet --progress --all-progress --all-progress-implied --index-version= --max-pack-size= --local --incremental --window= --window-memory= --depth= --reuse-delta --reuse-object --delta-base-offset --threads= --non-empty --revs --unpacked --all --reflog --indexed-objects --stdout --include-tag --keep-unreachable --pack-loose-unreachable --unpack-unreachable --sparse --thin --shallow --honor-pack-keep --keep-pack= --compression= --keep-true-parents --use-bitmap-index --write-bitmap-index --filter= --missing= --exclude-promisor-objects --delta-islands --uri-protocol= --no-quiet -- --no-progress --no-all-progress --no-all-progress-implied --no-local --no-incremental --no-window --no-depth --no-reuse-delta --no-reuse-object --no-delta-base-offset --no-threads --no-non-empty --no-revs --no-stdout --no-include-tag --no-keep-unreachable --no-pack-loose-unreachable --no-unpack-unreachable --no-sparse --no-thin --no-shallow --no-honor-pack-keep --no-keep-pack --no-compression --no-keep-true-parents --no-use-bitmap-index --no-write-bitmap-index --no-filter --no-exclude-promisor-objects --no-delta-islands --no-uri-protocol"
+__gitcomp_builtin_pack_refs_default=" --all --prune --no-all -- --no-prune"
+__gitcomp_builtin_pickaxe_default=" --incremental --root --show-stats --progress --score-debug --show-name --show-number --porcelain --line-porcelain --show-email --ignore-rev= --ignore-revs-file= --color-lines --color-by-age --minimal --contents= --abbrev --no-incremental -- --no-root --no-show-stats --no-progress --no-score-debug --no-show-name --no-show-number --no-porcelain --no-line-porcelain --no-show-email --no-ignore-rev --no-ignore-revs-file --no-color-lines --no-color-by-age --no-minimal --no-contents --no-abbrev"
+__gitcomp_builtin_prune_default=" --dry-run --verbose --progress --expire= --exclude-promisor-objects --no-dry-run -- --no-verbose --no-progress --no-expire --no-exclude-promisor-objects"
+__gitcomp_builtin_prune_packed_default=" --dry-run --quiet --no-dry-run -- --no-quiet"
+__gitcomp_builtin_pull_default=" --verbose --quiet --progress --recurse-submodules --rebase --stat --log --signoff --squash --commit --edit --cleanup= --ff --ff-only --verify-signatures --autostash --strategy= --strategy-option= --gpg-sign --allow-unrelated-histories --all --append --upload-pack= --force --tags --prune --jobs --dry-run --keep --depth= --shallow-since= --shallow-exclude= --deepen= --unshallow --update-shallow --refmap= --server-option= --ipv4 --ipv6 --negotiation-tip= --show-forced-updates --set-upstream --no-verbose -- --no-quiet --no-progress --no-recurse-submodules --no-rebase --no-stat --no-log --no-signoff --no-squash --no-commit --no-edit --no-cleanup --no-ff --no-verify-signatures --no-autostash --no-strategy --no-strategy-option --no-gpg-sign --no-allow-unrelated-histories --no-all --no-append --no-upload-pack --no-force --no-tags --no-prune --no-jobs --no-dry-run --no-keep --no-depth --no-shallow-since --no-shallow-exclude --no-deepen --no-update-shallow --no-server-option --no-ipv4 --no-ipv6 --no-negotiation-tip --no-show-forced-updates --no-set-upstream"
+__gitcomp_builtin_push_default=" --verbose --quiet --repo= --all --mirror --delete --tags --dry-run --porcelain --force --force-with-lease --recurse-submodules= --receive-pack= --exec= --set-upstream --progress --prune --no-verify --follow-tags --signed --atomic --push-option= --ipv4 --ipv6 --verify -- --no-verbose --no-quiet --no-repo --no-all --no-mirror --no-delete --no-tags --no-dry-run --no-porcelain --no-force --no-force-with-lease --no-recurse-submodules --no-receive-pack --no-exec --no-set-upstream --no-progress --no-prune --no-follow-tags --no-signed --no-atomic --no-push-option --no-ipv4 --no-ipv6"
+__gitcomp_builtin_range_diff_default=" --creation-factor= --no-dual-color --notes --patch --no-patch --unified --function-context --raw --patch-with-raw --patch-with-stat --numstat --shortstat --dirstat --cumulative --dirstat-by-file --check --summary --name-only --name-status --stat --stat-width= --stat-name-width= --stat-graph-width= --stat-count= --compact-summary --binary --full-index --color --ws-error-highlight= --abbrev --src-prefix= --dst-prefix= --line-prefix= --no-prefix --inter-hunk-context= --output-indicator-new= --output-indicator-old= --output-indicator-context= --break-rewrites --find-renames --irreversible-delete --find-copies --find-copies-harder --no-renames --rename-empty --follow --minimal --ignore-all-space --ignore-space-change --ignore-space-at-eol --ignore-cr-at-eol --ignore-blank-lines --indent-heuristic --patience --histogram --diff-algorithm= --anchored= --word-diff --word-diff-regex= --color-words --color-moved --color-moved-ws= --relative --text --exit-code --quiet --ext-diff --textconv --ignore-submodules --submodule --ita-invisible-in-index --ita-visible-in-index --pickaxe-all --pickaxe-regex --find-object= --diff-filter= --output= --dual-color -- --no-creation-factor --no-notes --no-function-context --no-compact-summary --no-full-index --no-color --no-abbrev --no-find-copies-harder --no-rename-empty --no-follow --no-minimal --no-indent-heuristic --no-color-moved --no-color-moved-ws --no-relative --no-text --no-exit-code --no-quiet --no-ext-diff --no-textconv"
+__gitcomp_builtin_read_tree_default=" --index-output= --empty --verbose --trivial --aggressive --reset --prefix= --exclude-per-directory= --dry-run --no-sparse-checkout --debug-unpack --recurse-submodules --quiet --sparse-checkout -- --no-empty --no-verbose --no-trivial --no-aggressive --no-reset --no-dry-run --no-debug-unpack --no-recurse-submodules --no-quiet"
+__gitcomp_builtin_rebase_default=" --onto= --keep-base --no-verify --quiet --verbose --no-stat --signoff --committer-date-is-author-date --reset-author-date --ignore-whitespace --whitespace= --force-rebase --no-ff --continue --skip --abort --quit --edit-todo --show-current-patch --apply --merge --interactive --rerere-autoupdate --empty= --autosquash --gpg-sign --autostash --exec= --rebase-merges --fork-point --strategy= --strategy-option= --root --reschedule-failed-exec --reapply-cherry-picks --verify --stat --ff -- --no-onto --no-keep-base --no-quiet --no-verbose --no-signoff --no-committer-date-is-author-date --no-reset-author-date --no-ignore-whitespace --no-whitespace --no-force-rebase --no-rerere-autoupdate --no-autosquash --no-gpg-sign --no-autostash --no-exec --no-rebase-merges --no-fork-point --no-strategy --no-strategy-option --no-root --no-reschedule-failed-exec --no-reapply-cherry-picks"
+__gitcomp_builtin_rebase__interactive_default=" --ff --rebase-merges --rebase-cousins --autosquash --signoff --verbose --continue --skip --edit-todo --show-current-patch --shorten-ids --expand-ids --check-todo-list --rearrange-squash --add-exec-commands --onto= --restrict-revision= --squash-onto= --upstream= --head-name= --gpg-sign --strategy= --strategy-opts= --switch-to= --onto-name= --cmd= --rerere-autoupdate --reschedule-failed-exec --no-ff -- --no-rebase-merges --no-rebase-cousins --no-autosquash --no-signoff --no-verbose --no-head-name --no-gpg-sign --no-strategy --no-strategy-opts --no-switch-to --no-onto-name --no-cmd --no-rerere-autoupdate --no-reschedule-failed-exec"
+__gitcomp_builtin_receive_pack_default=" --quiet --no-quiet"
+__gitcomp_builtin_reflog_default=" --quiet --source --use-mailmap --mailmap --decorate-refs= --decorate-refs-exclude= --decorate --no-quiet -- --no-source --no-use-mailmap --no-mailmap --no-decorate-refs --no-decorate-refs-exclude --no-decorate"
+__gitcomp_builtin_remote_default=" --verbose --no-verbose"
+__gitcomp_builtin_repack_default=" --quiet --local --write-bitmap-index --delta-islands --unpack-unreachable= --keep-unreachable --window= --window-memory= --depth= --threads= --max-pack-size= --pack-kept-objects --keep-pack= --no-quiet -- --no-local --no-write-bitmap-index --no-delta-islands --no-unpack-unreachable --no-keep-unreachable --no-window --no-window-memory --no-depth --no-threads --no-max-pack-size --no-pack-kept-objects --no-keep-pack"
+__gitcomp_builtin_replace_default=" --list --delete --edit --graft --convert-graft-file --raw --format= --no-raw -- --no-format"
+__gitcomp_builtin_rerere_default=" --rerere-autoupdate --no-rerere-autoupdate"
+__gitcomp_builtin_reset_default=" --quiet --mixed --soft --hard --merge --keep --recurse-submodules --patch --intent-to-add --pathspec-from-file= --pathspec-file-nul --no-quiet -- --no-mixed --no-soft --no-hard --no-merge --no-keep --no-recurse-submodules --no-patch --no-intent-to-add --no-pathspec-from-file --no-pathspec-file-nul"
+__gitcomp_builtin_restore_default=" --source= --staged --worktree --ignore-unmerged --overlay --quiet --recurse-submodules --progress --merge --conflict= --ours --theirs --patch --ignore-skip-worktree-bits --pathspec-from-file= --pathspec-file-nul --no-source -- --no-staged --no-worktree --no-ignore-unmerged --no-overlay --no-quiet --no-recurse-submodules --no-progress --no-merge --no-conflict --no-patch --no-ignore-skip-worktree-bits --no-pathspec-from-file --no-pathspec-file-nul"
+__gitcomp_builtin_revert_default=" --quit --continue --abort --skip --cleanup= --no-commit --edit --signoff --mainline= --rerere-autoupdate --strategy= --strategy-option= --gpg-sign --commit -- --no-cleanup --no-edit --no-signoff --no-mainline --no-rerere-autoupdate --no-strategy --no-strategy-option --no-gpg-sign"
+__gitcomp_builtin_rm_default=" --dry-run --quiet --cached --ignore-unmatch --pathspec-from-file= --pathspec-file-nul --no-dry-run -- --no-quiet --no-cached --no-ignore-unmatch --no-pathspec-from-file --no-pathspec-file-nul"
+__gitcomp_builtin_send_pack_default=" --verbose --quiet --receive-pack= --exec= --remote= --all --dry-run --mirror --force --signed --push-option= --progress --thin --atomic --stateless-rpc --stdin --helper-status --force-with-lease --no-verbose -- --no-quiet --no-receive-pack --no-exec --no-remote --no-all --no-dry-run --no-mirror --no-force --no-signed --no-push-option --no-progress --no-thin --no-atomic --no-stateless-rpc --no-stdin --no-helper-status --no-force-with-lease"
+__gitcomp_builtin_shortlog_default=" --committer --numbered --summary --email --group= --no-committer -- --no-numbered --no-summary --no-email --no-group"
+__gitcomp_builtin_show_default=" --quiet --source --use-mailmap --mailmap --decorate-refs= --decorate-refs-exclude= --decorate --no-quiet -- --no-source --no-use-mailmap --no-mailmap --no-decorate-refs --no-decorate-refs-exclude --no-decorate"
+__gitcomp_builtin_show_branch_default=" --all --remotes --color --more --list --no-name --current --sha1-name --merge-base --independent --topo-order --topics --sparse --date-order --reflog --name -- --no-all --no-remotes --no-color --no-more --no-list --no-current --no-sha1-name --no-merge-base --no-independent --no-topo-order --no-topics --no-sparse --no-date-order"
+__gitcomp_builtin_show_index_default=" --object-format= --no-object-format"
+__gitcomp_builtin_show_ref_default=" --tags --heads --verify --head --dereference --hash --abbrev --quiet --exclude-existing --no-tags -- --no-heads --no-verify --no-head --no-dereference --no-hash --no-abbrev --no-quiet"
+__gitcomp_builtin_sparse_checkout_default=""
+__gitcomp_builtin_stage_default=" --dry-run --verbose --interactive --patch --edit --force --update --renormalize --intent-to-add --all --ignore-removal --refresh --ignore-errors --ignore-missing --chmod= --pathspec-from-file= --pathspec-file-nul --no-dry-run -- --no-verbose --no-interactive --no-patch --no-edit --no-force --no-update --no-renormalize --no-intent-to-add --no-all --no-ignore-removal --no-refresh --no-ignore-errors --no-ignore-missing --no-chmod --no-pathspec-from-file --no-pathspec-file-nul"
+__gitcomp_builtin_stash_default=""
+__gitcomp_builtin_status_default=" --verbose --short --branch --show-stash --ahead-behind --porcelain --long --null --untracked-files --ignored --ignore-submodules --column --no-renames --find-renames --renames -- --no-verbose --no-short --no-branch --no-show-stash --no-ahead-behind --no-porcelain --no-long --no-null --no-untracked-files --no-ignored --no-ignore-submodules --no-column"
+__gitcomp_builtin_stripspace_default=" --strip-comments --comment-lines"
+__gitcomp_builtin_switch_default=" --create= --force-create= --guess --discard-changes --quiet --recurse-submodules --progress --merge --conflict= --detach --track --orphan= --ignore-other-worktrees --no-create -- --no-force-create --no-guess --no-discard-changes --no-quiet --no-recurse-submodules --no-progress --no-merge --no-conflict --no-detach --no-track --no-orphan --no-ignore-other-worktrees"
+__gitcomp_builtin_symbolic_ref_default=" --quiet --delete --short --no-quiet -- --no-delete --no-short"
+__gitcomp_builtin_tag_default=" --list --delete --verify --annotate --message= --file= --edit --sign --cleanup= --local-user= --force --create-reflog --column --contains --no-contains --merged --no-merged --sort= --points-at --format= --color --ignore-case -- --no-annotate --no-file --no-edit --no-sign --no-cleanup --no-local-user --no-force --no-create-reflog --no-column --no-points-at --no-format --no-color --no-ignore-case"
+__gitcomp_builtin_update_index_default=" --ignore-submodules --add --replace --remove --unmerged --refresh --really-refresh --cacheinfo --chmod= --assume-unchanged --no-assume-unchanged --skip-worktree --no-skip-worktree --ignore-skip-worktree-entries --info-only --force-remove --stdin --index-info --unresolve --again --ignore-missing --verbose --clear-resolve-undo --index-version= --split-index --untracked-cache --test-untracked-cache --force-untracked-cache --force-write-index --fsmonitor --fsmonitor-valid --no-fsmonitor-valid -- --no-ignore-submodules --no-add --no-replace --no-remove --no-unmerged --no-ignore-skip-worktree-entries --no-info-only --no-force-remove --no-ignore-missing --no-verbose --no-index-version --no-split-index --no-untracked-cache --no-test-untracked-cache --no-force-untracked-cache --no-force-write-index --no-fsmonitor"
+__gitcomp_builtin_update_ref_default=" --no-deref --stdin --create-reflog --deref -- --no-stdin --no-create-reflog"
+__gitcomp_builtin_update_server_info_default=" --force --no-force"
+__gitcomp_builtin_upload_pack_default=" --stateless-rpc --advertise-refs --strict --timeout= --no-stateless-rpc -- --no-advertise-refs --no-strict --no-timeout"
+__gitcomp_builtin_verify_commit_default=" --verbose --raw --no-verbose -- --no-raw"
+__gitcomp_builtin_verify_pack_default=" --verbose --stat-only --object-format= --no-verbose -- --no-stat-only --no-object-format"
+__gitcomp_builtin_verify_tag_default=" --verbose --raw --format= --no-verbose -- --no-raw --no-format"
+__gitcomp_builtin_version_default=" --build-options --no-build-options"
+__gitcomp_builtin_whatchanged_default=" --quiet --source --use-mailmap --mailmap --decorate-refs= --decorate-refs-exclude= --decorate --no-quiet -- --no-source --no-use-mailmap --no-mailmap --no-decorate-refs --no-decorate-refs-exclude --no-decorate"
+__gitcomp_builtin_write_tree_default=" --missing-ok --prefix= --no-missing-ok -- --no-prefix"
+__gitcomp_builtin_send_email_default=" --numbered --no-numbered --signoff --stdout --cover-letter --numbered-files --suffix= --start-number= --reroll-count= --rfc --cover-from-description= --subject-prefix= --output-directory= --keep-subject --no-binary --zero-commit --ignore-if-in-upstream --no-stat --add-header= --to= --cc= --from --in-reply-to= --attach --inline --thread --signature= --base= --signature-file= --quiet --progress --interdiff= --range-diff= --creation-factor= --binary -- --no-numbered --no-signoff --no-stdout --no-cover-letter --no-numbered-files --no-suffix --no-start-number --no-reroll-count --no-cover-from-description --no-zero-commit --no-ignore-if-in-upstream --no-add-header --no-to --no-cc --no-from --no-in-reply-to --no-attach --no-thread --no-signature --no-base --no-signature-file --no-quiet --no-progress --no-interdiff --no-range-diff --no-creation-factor"
+
+__gitcomp_builtin_get_default ()
+{
+	eval "test -n \"\$${1}_default\" && echo \"\$${1}_default\""
+}
+
+# This function is equivalent to
+#
+#    __gitcomp "$(git xxx --git-completion-helper) ..."
+#
+# except that the output is cached. Accept 1-3 arguments:
+# 1: the git command to execute, this is also the cache key
+# 2: extra options to be added on top (e.g. negative forms)
+# 3: options to be excluded
+__gitcomp_builtin ()
+{
+	# spaces must be replaced with underscore for multi-word
+	# commands, e.g. "git remote add" becomes remote_add.
+	local cmd="$1"
+	local incl="${2-}"
+	local excl="${3-}"
+
+	local var=__gitcomp_builtin_"${cmd/-/_}"
+	local options
+	eval "options=\${$var-}"
+
+	if [ -z "$options" ]; then
+		local completion_helper
+		if [ "$GIT_COMPLETION_SHOW_ALL" = "1" ]; then
+			completion_helper="--git-completion-helper-all"
+		else
+			completion_helper="--git-completion-helper"
+		fi
+		completion="$(__git ${cmd/_/ } $completion_helper ||
+			__gitcomp_builtin_get_default $var)" || return
+		# leading and trailing spaces are significant to make
+		# option removal work correctly.
+		options=" $incl $completion "
+
+		for i in $excl; do
+			options="${options/ $i / }"
+		done
+		eval "$var=\"$options\""
+	fi
+
+	__gitcomp "$options"
+}
+
 # Variation of __gitcomp_nl () that appends to the existing list of
 # completion candidates, COMPREPLY.
 __gitcomp_nl_append ()
@@ -303,6 +568,24 @@ __gitcomp_nl ()
 	__gitcomp_nl_append "$@"
 }
 
+# Fills the COMPREPLY array with prefiltered paths without any additional
+# processing.
+# Callers must take care of providing only paths that match the current path
+# to be completed and adding any prefix path components, if necessary.
+# 1: List of newline-separated matching paths, complete with all prefix
+#    path components.
+__gitcomp_file_direct ()
+{
+	local IFS=$'\n'
+
+	COMPREPLY=($1)
+
+	# use a hack to enable file mode in bash < 4
+	compopt -o filenames +o nospace 2>/dev/null ||
+	compgen -f /non-existing-dir/ >/dev/null ||
+	true
+}
+
 # Generates completion reply with compgen from newline-separated possible
 # completion filenames.
 # It accepts 1 to 3 arguments:
@@ -322,7 +605,8 @@ __gitcomp_file ()
 
 	# use a hack to enable file mode in bash < 4
 	compopt -o filenames +o nospace 2>/dev/null ||
-	compgen -f /non-existing-dir/ > /dev/null
+	compgen -f /non-existing-dir/ >/dev/null ||
+	true
 }
 
 # Execute 'git ls-files', unless the --committable option is specified, in
@@ -332,10 +616,12 @@ __gitcomp_file ()
 __git_ls_files_helper ()
 {
 	if [ "$2" == "--committable" ]; then
-		__git -C "$1" diff-index --name-only --relative HEAD
+		__git -C "$1" -c core.quotePath=false diff-index \
+			--name-only --relative HEAD -- "${3//\\/\\\\}*"
 	else
 		# NOTE: $2 is not quoted in order to support multiple options
-		__git -C "$1" ls-files --exclude-standard $2
+		__git -C "$1" -c core.quotePath=false ls-files \
+			--exclude-standard $2 -- "${3//\\/\\\\}*"
 	fi
 }
 
@@ -346,17 +632,103 @@ __git_ls_files_helper ()
 #    If provided, only files within the specified directory are listed.
 #    Sub directories are never recursed.  Path must have a trailing
 #    slash.
+# 3: List only paths matching this path component (optional).
 __git_index_files ()
 {
-	local root="${2-.}" file
+	local root="$2" match="$3"
 
-	__git_ls_files_helper "$root" "$1" |
-	while read -r file; do
-		case "$file" in
-		?*/*) echo "${file%%/*}" ;;
-		*) echo "$file" ;;
-		esac
-	done | sort | uniq
+	__git_ls_files_helper "$root" "$1" "${match:-?}" |
+	awk -F / -v pfx="${2//\\/\\\\}" '{
+		paths[$1] = 1
+	}
+	END {
+		for (p in paths) {
+			if (substr(p, 1, 1) != "\"") {
+				# No special characters, easy!
+				print pfx p
+				continue
+			}
+
+			# The path is quoted.
+			p = dequote(p)
+			if (p == "")
+				continue
+
+			# Even when a directory name itself does not contain
+			# any special characters, it will still be quoted if
+			# any of its (stripped) trailing path components do.
+			# Because of this we may have seen the same directory
+			# both quoted and unquoted.
+			if (p in paths)
+				# We have seen the same directory unquoted,
+				# skip it.
+				continue
+			else
+				print pfx p
+		}
+	}
+	function dequote(p,    bs_idx, out, esc, esc_idx, dec) {
+		# Skip opening double quote.
+		p = substr(p, 2)
+
+		# Interpret backslash escape sequences.
+		while ((bs_idx = index(p, "\\")) != 0) {
+			out = out substr(p, 1, bs_idx - 1)
+			esc = substr(p, bs_idx + 1, 1)
+			p = substr(p, bs_idx + 2)
+
+			if ((esc_idx = index("abtvfr\"\\", esc)) != 0) {
+				# C-style one-character escape sequence.
+				out = out substr("\a\b\t\v\f\r\"\\",
+						 esc_idx, 1)
+			} else if (esc == "n") {
+				# Uh-oh, a newline character.
+				# We cannot reliably put a pathname
+				# containing a newline into COMPREPLY,
+				# and the newline would create a mess.
+				# Skip this path.
+				return ""
+			} else {
+				# Must be a \nnn octal value, then.
+				dec = esc             * 64 + \
+				      substr(p, 1, 1) * 8  + \
+				      substr(p, 2, 1)
+				out = out sprintf("%c", dec)
+				p = substr(p, 3)
+			}
+		}
+		# Drop closing double quote, if there is one.
+		# (There is not any if this is a directory, as it was
+		# already stripped with the trailing path components.)
+		if (substr(p, length(p), 1) == "\"")
+			out = out substr(p, 1, length(p) - 1)
+		else
+			out = out p
+
+		return out
+	}'
+}
+
+# __git_complete_index_file requires 1 argument:
+# 1: the options to pass to ls-file
+#
+# The exception is --committable, which finds the files appropriate commit.
+__git_complete_index_file ()
+{
+	local dequoted_word pfx="" cur_
+
+	__git_dequote "$cur"
+
+	case "$dequoted_word" in
+	?*/*)
+		pfx="${dequoted_word%/*}/"
+		cur_="${dequoted_word##*/}"
+		;;
+	*)
+		cur_="$dequoted_word"
+	esac
+
+	__gitcomp_file_direct "$(__git_index_files "$1" "$pfx" "$cur_")"
 }
 
 # Lists branches from the local repository.
@@ -372,6 +744,19 @@ __git_heads ()
 			"refs/heads/$cur_*" "refs/heads/$cur_*/**"
 }
 
+# Lists branches from remote repositories.
+# 1: A prefix to be added to each listed branch (optional).
+# 2: List only branches matching this word (optional; list all branches if
+#    unset or empty).
+# 3: A suffix to be appended to each listed branch (optional).
+__git_remote_heads ()
+{
+	local pfx="${1-}" cur_="${2-}" sfx="${3-}"
+
+	__git for-each-ref --format="${pfx//\%/%%}%(refname:strip=2)$sfx" \
+			"refs/remotes/$cur_*" "refs/remotes/$cur_*/**"
+}
+
 # Lists tags from the local repository.
 # Accepts the same positional parameters as __git_heads() above.
 __git_tags ()
@@ -382,6 +767,26 @@ __git_tags ()
 			"refs/tags/$cur_*" "refs/tags/$cur_*/**"
 }
 
+# List unique branches from refs/remotes used for 'git checkout' and 'git
+# switch' tracking DWIMery.
+# 1: A prefix to be added to each listed branch (optional)
+# 2: List only branches matching this word (optional; list all branches if
+#    unset or empty).
+# 3: A suffix to be appended to each listed branch (optional).
+__git_dwim_remote_heads ()
+{
+	local pfx="${1-}" cur_="${2-}" sfx="${3-}"
+	local fer_pfx="${pfx//\%/%%}" # "escape" for-each-ref format specifiers
+
+	# employ the heuristic used by git checkout and git switch
+	# Try to find a remote branch that cur_es the completion word
+	# but only output if the branch name is unique
+	__git for-each-ref --format="$fer_pfx%(refname:strip=3)$sfx" \
+		--sort="refname:strip=3" \
+		"refs/remotes/*/$cur_*" "refs/remotes/*/$cur_*/**" | \
+	uniq -u
+}
+
 # Lists refs from the local (by default) or from a remote repository.
 # It accepts 0, 1 or 2 arguments:
 # 1: The remote to list refs from (optional; ignored, if set but empty).
@@ -439,7 +844,7 @@ __git_refs ()
 			track=""
 			;;
 		*)
-			for i in HEAD FETCH_HEAD ORIG_HEAD MERGE_HEAD; do
+			for i in HEAD FETCH_HEAD ORIG_HEAD MERGE_HEAD REBASE_HEAD; do
 				case "$i" in
 				$match*)
 					if [ -e "$dir/$i" ]; then
@@ -457,13 +862,7 @@ __git_refs ()
 		__git_dir="$dir" __git for-each-ref --format="$fer_pfx%($format)$sfx" \
 			"${refs[@]}"
 		if [ -n "$track" ]; then
-			# employ the heuristic used by git checkout
-			# Try to find a remote branch that matches the completion word
-			# but only output if the branch name is unique
-			__git for-each-ref --format="$fer_pfx%(refname:strip=3)$sfx" \
-				--sort="refname:strip=3" \
-				"refs/remotes/*/$match*" "refs/remotes/*/$match*/**" | \
-			uniq -u
+			__git_dwim_remote_heads "$pfx" "$match" "$sfx"
 		fi
 		return
 	fi
@@ -510,29 +909,51 @@ __git_refs ()
 # Usage: __git_complete_refs [<option>]...
 # --remote=<remote>: The remote to list refs from, can be the name of a
 #                    configured remote, a path, or a URL.
-# --track: List unique remote branches for 'git checkout's tracking DWIMery.
+# --dwim: List unique remote branches for 'git switch's tracking DWIMery.
 # --pfx=<prefix>: A prefix to be added to each ref.
 # --cur=<word>: The current ref to be completed.  Defaults to the current
 #               word to be completed.
 # --sfx=<suffix>: A suffix to be appended to each ref instead of the default
 #                 space.
+# --mode=<mode>: What set of refs to complete, one of 'refs' (the default) to
+#                complete all refs, 'heads' to complete only branches, or
+#                'remote-heads' to complete only remote branches. Note that
+#                --remote is only compatible with --mode=refs.
 __git_complete_refs ()
 {
-	local remote track pfx cur_="$cur" sfx=" "
+	local remote= dwim= pfx= cur_="$cur" sfx=" " mode="refs"
 
 	while test $# != 0; do
 		case "$1" in
 		--remote=*)	remote="${1##--remote=}" ;;
-		--track)	track="yes" ;;
+		--dwim)		dwim="yes" ;;
+		# --track is an old spelling of --dwim
+		--track)	dwim="yes" ;;
 		--pfx=*)	pfx="${1##--pfx=}" ;;
 		--cur=*)	cur_="${1##--cur=}" ;;
 		--sfx=*)	sfx="${1##--sfx=}" ;;
+		--mode=*)	mode="${1##--mode=}" ;;
 		*)		return 1 ;;
 		esac
 		shift
 	done
 
-	__gitcomp_direct "$(__git_refs "$remote" "$track" "$pfx" "$cur_" "$sfx")"
+	# complete references based on the specified mode
+	case "$mode" in
+		refs)
+			__gitcomp_direct "$(__git_refs "$remote" "" "$pfx" "$cur_" "$sfx")" ;;
+		heads)
+			__gitcomp_direct "$(__git_heads "$pfx" "$cur_" "$sfx")" ;;
+		remote-heads)
+			__gitcomp_direct "$(__git_remote_heads "$pfx" "$cur_" "$sfx")" ;;
+		*)
+			return 1 ;;
+	esac
+
+	# Append DWIM remote branch names if requested
+	if [ "$dwim" = "yes" ]; then
+		__gitcomp_direct_append "$(__git_dwim_remote_heads "$pfx" "$cur_" "$sfx")"
+	fi
 }
 
 # __git_refs2 requires 1 argument (to pass to __git_refs)
@@ -594,7 +1015,7 @@ __git_is_configured_remote ()
 
 __git_list_merge_strategies ()
 {
-	git merge -s help 2>&1 |
+	LANG=C LC_ALL=C git merge -s help 2>&1 |
 	sed -n -e '/[Aa]vailable strategies are: /,/^$/{
 		s/\.$//
 		s/.*://
@@ -604,6 +1025,7 @@ __git_list_merge_strategies ()
 	}'
 }
 
+__git_merge_strategies_default='octopus ours recursive resolve subtree'
 __git_merge_strategies=
 # 'git merge -s help' (and thus detection of the merge strategy
 # list) fails, unfortunately, if run outside of any git working
@@ -613,12 +1035,18 @@ __git_merge_strategies=
 __git_compute_merge_strategies ()
 {
 	test -n "$__git_merge_strategies" ||
-	__git_merge_strategies=$(__git_list_merge_strategies)
+	{ __git_merge_strategies=$(__git_list_merge_strategies);
+		__git_merge_strategies="${__git_merge_strategies:-__git_merge_strategies_default}"; }
 }
 
+__git_merge_strategy_options="ours theirs subtree subtree= patience
+	histogram diff-algorithm= ignore-space-change ignore-all-space
+	ignore-space-at-eol renormalize no-renormalize no-renames
+	find-renames find-renames= rename-threshold="
+
 __git_complete_revlist_file ()
 {
-	local pfx ls ref cur_="$cur"
+	local dequoted_word pfx ls ref cur_="$cur"
 	case "$cur_" in
 	*..?*:*)
 		return
@@ -626,14 +1054,18 @@ __git_complete_revlist_file ()
 	?*:*)
 		ref="${cur_%%:*}"
 		cur_="${cur_#*:}"
-		case "$cur_" in
+
+		__git_dequote "$cur_"
+
+		case "$dequoted_word" in
 		?*/*)
-			pfx="${cur_%/*}"
-			cur_="${cur_##*/}"
+			pfx="${dequoted_word%/*}"
+			cur_="${dequoted_word##*/}"
 			ls="$ref:$pfx"
 			pfx="$pfx/"
 			;;
 		*)
+			cur_="$dequoted_word"
 			ls="$ref"
 			;;
 		esac
@@ -643,21 +1075,10 @@ __git_complete_revlist_file ()
 		*)   pfx="$ref:$pfx" ;;
 		esac
 
-		__gitcomp_nl "$(__git ls-tree "$ls" \
-				| sed '/^100... blob /{
-				           s,^.*	,,
-				           s,$, ,
-				       }
-				       /^120000 blob /{
-				           s,^.*	,,
-				           s,$, ,
-				       }
-				       /^040000 tree /{
-				           s,^.*	,,
-				           s,$,/,
-				       }
-				       s/^.*	//')" \
-			"$pfx" "$cur_" ""
+		__gitcomp_file "$(__git ls-tree "$ls" \
+				| sed 's/^.*	//
+				       s/$//')" \
+			"$pfx" "$cur_"
 		;;
 	*...*)
 		pfx="${cur_%...*}..."
@@ -675,26 +1096,6 @@ __git_complete_revlist_file ()
 	esac
 }
 
-
-# __git_complete_index_file requires 1 argument:
-# 1: the options to pass to ls-file
-#
-# The exception is --committable, which finds the files appropriate commit.
-__git_complete_index_file ()
-{
-	local pfx="" cur_="$cur"
-
-	case "$cur_" in
-	?*/*)
-		pfx="${cur_%/*}"
-		cur_="${cur_##*/}"
-		pfx="${pfx}/"
-		;;
-	esac
-
-	__gitcomp_file "$(__git_index_files "$1" ${pfx:+"$pfx"})" "$pfx" "$cur_"
-}
-
 __git_complete_file ()
 {
 	__git_complete_revlist_file
@@ -726,6 +1127,7 @@ __git_complete_remote_or_refspec ()
 			*) ;;
 			esac
 			;;
+		--multiple) no_complete_refspec=1; break ;;
 		-*) ;;
 		*) remote="$i"; break ;;
 		esac
@@ -785,136 +1187,30 @@ __git_complete_strategy ()
 	-s|--strategy)
 		__gitcomp "$__git_merge_strategies"
 		return 0
+		;;
+	-X)
+		__gitcomp "$__git_merge_strategy_options"
+		return 0
+		;;
 	esac
 	case "$cur" in
 	--strategy=*)
 		__gitcomp "$__git_merge_strategies" "" "${cur##--strategy=}"
 		return 0
 		;;
+	--strategy-option=*)
+		__gitcomp "$__git_merge_strategy_options" "" "${cur##--strategy-option=}"
+		return 0
+		;;
 	esac
 	return 1
 }
 
-__git_commands () {
-	if test -n "${GIT_TESTING_COMMAND_COMPLETION:-}"
-	then
-		printf "%s" "${GIT_TESTING_COMMAND_COMPLETION}"
-	else
-		git help -a|egrep '^  [a-zA-Z0-9]'
-	fi
-}
-
-__git_list_all_commands ()
-{
-	local i IFS=" "$'\n'
-	for i in $(__git_commands)
-	do
-		case $i in
-		*--*)             : helper pattern;;
-		*) echo $i;;
-		esac
-	done
-}
-
 __git_all_commands=
 __git_compute_all_commands ()
 {
 	test -n "$__git_all_commands" ||
-	__git_all_commands=$(__git_list_all_commands)
-}
-
-__git_list_porcelain_commands ()
-{
-	local i IFS=" "$'\n'
-	__git_compute_all_commands
-	for i in $__git_all_commands
-	do
-		case $i in
-		*--*)             : helper pattern;;
-		applymbox)        : ask gittus;;
-		applypatch)       : ask gittus;;
-		archimport)       : import;;
-		cat-file)         : plumbing;;
-		check-attr)       : plumbing;;
-		check-ignore)     : plumbing;;
-		check-mailmap)    : plumbing;;
-		check-ref-format) : plumbing;;
-		checkout-index)   : plumbing;;
-		column)           : internal helper;;
-		commit-tree)      : plumbing;;
-		count-objects)    : infrequent;;
-		credential)       : credentials;;
-		credential-*)     : credentials helper;;
-		cvsexportcommit)  : export;;
-		cvsimport)        : import;;
-		cvsserver)        : daemon;;
-		daemon)           : daemon;;
-		diff-files)       : plumbing;;
-		diff-index)       : plumbing;;
-		diff-tree)        : plumbing;;
-		fast-import)      : import;;
-		fast-export)      : export;;
-		fsck-objects)     : plumbing;;
-		fetch-pack)       : plumbing;;
-		fmt-merge-msg)    : plumbing;;
-		for-each-ref)     : plumbing;;
-		hash-object)      : plumbing;;
-		http-*)           : transport;;
-		index-pack)       : plumbing;;
-		init-db)          : deprecated;;
-		local-fetch)      : plumbing;;
-		ls-files)         : plumbing;;
-		ls-remote)        : plumbing;;
-		ls-tree)          : plumbing;;
-		mailinfo)         : plumbing;;
-		mailsplit)        : plumbing;;
-		merge-*)          : plumbing;;
-		mktree)           : plumbing;;
-		mktag)            : plumbing;;
-		pack-objects)     : plumbing;;
-		pack-redundant)   : plumbing;;
-		pack-refs)        : plumbing;;
-		parse-remote)     : plumbing;;
-		patch-id)         : plumbing;;
-		prune)            : plumbing;;
-		prune-packed)     : plumbing;;
-		quiltimport)      : import;;
-		read-tree)        : plumbing;;
-		receive-pack)     : plumbing;;
-		remote-*)         : transport;;
-		rerere)           : plumbing;;
-		rev-list)         : plumbing;;
-		rev-parse)        : plumbing;;
-		runstatus)        : plumbing;;
-		sh-setup)         : internal;;
-		shell)            : daemon;;
-		show-ref)         : plumbing;;
-		send-pack)        : plumbing;;
-		show-index)       : plumbing;;
-		ssh-*)            : transport;;
-		stripspace)       : plumbing;;
-		symbolic-ref)     : plumbing;;
-		unpack-file)      : plumbing;;
-		unpack-objects)   : plumbing;;
-		update-index)     : plumbing;;
-		update-ref)       : plumbing;;
-		update-server-info) : daemon;;
-		upload-archive)   : plumbing;;
-		upload-pack)      : plumbing;;
-		write-tree)       : plumbing;;
-		var)              : infrequent;;
-		verify-pack)      : infrequent;;
-		verify-tag)       : plumbing;;
-		*) echo $i;;
-		esac
-	done
-}
-
-__git_porcelain_commands=
-__git_compute_porcelain_commands ()
-{
-	test -n "$__git_porcelain_commands" ||
-	__git_porcelain_commands=$(__git_list_porcelain_commands)
+	__git_all_commands=$(__git --list-cmds=main,others,alias,nohelpers)
 }
 
 # Lists all set config variables starting with the given section prefix,
@@ -932,11 +1228,6 @@ __git_pretty_aliases ()
 	__git_get_config_variables "pretty"
 }
 
-__git_aliases ()
-{
-	__git_get_config_variables "alias"
-}
-
 # __git_aliased_command requires 1 argument
 __git_aliased_command ()
 {
@@ -962,15 +1253,32 @@ __git_aliased_command ()
 	done
 }
 
-# __git_find_on_cmdline requires 1 argument
+# Check whether one of the given words is present on the command line,
+# and print the first word found.
+#
+# Usage: __git_find_on_cmdline [<option>]... "<wordlist>"
+# --show-idx: Optionally show the index of the found word in the $words array.
 __git_find_on_cmdline ()
 {
-	local word subcommand c=1
+	local word c=1 show_idx
+
+	while test $# -gt 1; do
+		case "$1" in
+		--show-idx)	show_idx=y ;;
+		*)		return 1 ;;
+		esac
+		shift
+	done
+	local wordlist="$1"
+
 	while [ $c -lt $cword ]; do
-		word="${words[c]}"
-		for subcommand in $1; do
-			if [ "$subcommand" = "$word" ]; then
-				echo "$subcommand"
+		for word in $wordlist; do
+			if [ "$word" = "${words[c]}" ]; then
+				if [ -n "${show_idx-}" ]; then
+					echo "$c $word"
+				else
+					echo "$word"
+				fi
 				return
 			fi
 		done
@@ -978,6 +1286,40 @@ __git_find_on_cmdline ()
 	done
 }
 
+# Similar to __git_find_on_cmdline, except that it loops backwards and thus
+# prints the *last* word found. Useful for finding which of two options that
+# supersede each other came last, such as "--guess" and "--no-guess".
+#
+# Usage: __git_find_last_on_cmdline [<option>]... "<wordlist>"
+# --show-idx: Optionally show the index of the found word in the $words array.
+__git_find_last_on_cmdline ()
+{
+	local word c=$cword show_idx
+
+	while test $# -gt 1; do
+		case "$1" in
+		--show-idx)	show_idx=y ;;
+		*)		return 1 ;;
+		esac
+		shift
+	done
+	local wordlist="$1"
+
+	while [ $c -gt 1 ]; do
+		((c--))
+		for word in $wordlist; do
+			if [ "$word" = "${words[c]}" ]; then
+				if [ -n "$show_idx" ]; then
+					echo "$c $word"
+				else
+					echo "$word"
+				fi
+				return
+			fi
+		done
+	done
+}
+
 # Echo the value of an option set on the command line or config
 #
 # $1: short option name
@@ -1072,12 +1414,15 @@ __git_count_arguments ()
 }
 
 __git_whitespacelist="nowarn warn error error-all fix"
+__git_patchformat="mbox stgit stgit-series hg mboxrd"
+__git_showcurrentpatch="diff raw"
+__git_am_inprogress_options="--skip --continue --resolved --abort --quit --show-current-patch"
 
 _git_am ()
 {
 	__git_find_repo_path
 	if [ -d "$__git_repo_path"/rebase-apply ]; then
-		__gitcomp "--skip --continue --resolved --abort"
+		__gitcomp "$__git_am_inprogress_options"
 		return
 	fi
 	case "$cur" in
@@ -1085,13 +1430,17 @@ _git_am ()
 		__gitcomp "$__git_whitespacelist" "" "${cur##--whitespace=}"
 		return
 		;;
+	--patch-format=*)
+		__gitcomp "$__git_patchformat" "" "${cur##--patch-format=}"
+		return
+		;;
+	--show-current-patch=*)
+		__gitcomp "$__git_showcurrentpatch" "" "${cur##--show-current-patch=}"
+		return
+		;;
 	--*)
-		__gitcomp "
-			--3way --committer-date-is-author-date --ignore-date
-			--ignore-whitespace --ignore-space-change
-			--interactive --keep --no-utf8 --signoff --utf8
-			--whitespace= --scissors
-			"
+		__gitcomp_builtin am "" \
+			"$__git_am_inprogress_options"
 		return
 	esac
 }
@@ -1104,14 +1453,7 @@ _git_apply ()
 		return
 		;;
 	--*)
-		__gitcomp "
-			--stat --numstat --summary --check --index
-			--cached --index-info --reverse --reject --unidiff-zero
-			--apply --no-add --exclude=
-			--ignore-whitespace --ignore-space-change
-			--whitespace= --inaccurate-eof --verbose
-			--recount --directory=
-			"
+		__gitcomp_builtin apply
 		return
 	esac
 }
@@ -1119,11 +1461,12 @@ _git_apply ()
 _git_add ()
 {
 	case "$cur" in
+	--chmod=*)
+		__gitcomp "+x -x" "" "${cur##--chmod=}"
+		return
+		;;
 	--*)
-		__gitcomp "
-			--interactive --refresh --patch --update --dry-run
-			--ignore-errors --intent-to-add --force --edit --chmod=
-			"
+		__gitcomp_builtin add
 		return
 	esac
 
@@ -1147,10 +1490,7 @@ _git_archive ()
 		return
 		;;
 	--*)
-		__gitcomp "
-			--format= --list --verbose
-			--prefix= --remote= --exec= --output
-			"
+		__gitcomp_builtin archive "--format= --list --verbose --prefix= --worktree-attributes"
 		return
 		;;
 	esac
@@ -1182,6 +1522,8 @@ _git_bisect ()
 	esac
 }
 
+__git_ref_fieldlist="refname objecttype objectsize objectname upstream push HEAD symref"
+
 _git_branch ()
 {
 	local i c=1 only_local_ref="n" has_r="n"
@@ -1200,13 +1542,7 @@ _git_branch ()
 		__git_complete_refs --cur="${cur##--set-upstream-to=}"
 		;;
 	--*)
-		__gitcomp "
-			--color --no-color --verbose --abbrev= --no-abbrev
-			--track --no-track --contains --no-contains --merged --no-merged
-			--set-upstream-to= --edit-description --list
-			--unset-upstream --delete --move --copy --remotes
-			--column --no-column --sort= --points-at
-			"
+		__gitcomp_builtin branch
 		;;
 	*)
 		if [ $only_local_ref = "y" -a $has_r = "n" ]; then
@@ -1238,49 +1574,111 @@ _git_bundle ()
 	esac
 }
 
+# Helper function to decide whether or not we should enable DWIM logic for
+# git-switch and git-checkout.
+#
+# To decide between the following rules in priority order
+# 1) the last provided of "--guess" or "--no-guess" explicitly enable or
+#    disable completion of DWIM logic respectively.
+# 2) If the --no-track option is provided, take this as a hint to disable the
+#    DWIM completion logic
+# 3) If GIT_COMPLETION_CHECKOUT_NO_GUESS is set, disable the DWIM completion
+#    logic, as requested by the user.
+# 4) Enable DWIM logic otherwise.
+#
+__git_checkout_default_dwim_mode ()
+{
+	local last_option dwim_opt="--dwim"
+
+	if [ "${GIT_COMPLETION_CHECKOUT_NO_GUESS-}" = "1" ]; then
+		dwim_opt=""
+	fi
+
+	# --no-track disables DWIM, but with lower priority than
+	# --guess/--no-guess
+	if [ -n "$(__git_find_on_cmdline "--no-track")" ]; then
+		dwim_opt=""
+	fi
+
+	# Find the last provided --guess or --no-guess
+	last_option="$(__git_find_last_on_cmdline "--guess --no-guess")"
+	case "$last_option" in
+		--guess)
+			dwim_opt="--dwim"
+			;;
+		--no-guess)
+			dwim_opt=""
+			;;
+	esac
+
+	echo "$dwim_opt"
+}
+
 _git_checkout ()
 {
 	__git_has_doubledash && return
 
+	local dwim_opt="$(__git_checkout_default_dwim_mode)"
+
+	case "$prev" in
+	-b|-B|--orphan)
+		# Complete local branches (and DWIM branch
+		# remote branch names) for an option argument
+		# specifying a new branch name. This is for
+		# convenience, assuming new branches are
+		# possibly based on pre-existing branch names.
+		__git_complete_refs $dwim_opt --mode="heads"
+		return
+		;;
+	*)
+		;;
+	esac
+
 	case "$cur" in
 	--conflict=*)
 		__gitcomp "diff3 merge" "" "${cur##--conflict=}"
 		;;
 	--*)
-		__gitcomp "
-			--quiet --ours --theirs --track --no-track --merge
-			--conflict= --orphan --patch --detach --ignore-skip-worktree-bits
-			--recurse-submodules --no-recurse-submodules
-			"
+		__gitcomp_builtin checkout
 		;;
 	*)
-		# check if --track, --no-track, or --no-guess was specified
-		# if so, disable DWIM mode
-		local flags="--track --no-track --no-guess" track_opt="--track"
-		if [ "$GIT_COMPLETION_CHECKOUT_NO_GUESS" = "1" ] ||
-		   [ -n "$(__git_find_on_cmdline "$flags")" ]; then
-			track_opt=''
+		# At this point, we've already handled special completion for
+		# the arguments to -b/-B, and --orphan. There are 3 main
+		# things left we can possibly complete:
+		# 1) a start-point for -b/-B, -d/--detach, or --orphan
+		# 2) a remote head, for --track
+		# 3) an arbitrary reference, possibly including DWIM names
+		#
+
+		if [ -n "$(__git_find_on_cmdline "-b -B -d --detach --orphan")" ]; then
+			__git_complete_refs --mode="refs"
+		elif [ -n "$(__git_find_on_cmdline "--track")" ]; then
+			__git_complete_refs --mode="remote-heads"
+		else
+			__git_complete_refs $dwim_opt --mode="refs"
 		fi
-		__git_complete_refs $track_opt
 		;;
 	esac
 }
 
-_git_cherry ()
-{
-	__git_complete_refs
-}
+__git_sequencer_inprogress_options="--continue --quit --abort --skip"
+
+__git_cherry_pick_inprogress_options=$__git_sequencer_inprogress_options
 
 _git_cherry_pick ()
 {
 	__git_find_repo_path
 	if [ -f "$__git_repo_path"/CHERRY_PICK_HEAD ]; then
-		__gitcomp "--continue --quit --abort"
+		__gitcomp "$__git_cherry_pick_inprogress_options"
 		return
 	fi
+
+	__git_complete_strategy && return
+
 	case "$cur" in
 	--*)
-		__gitcomp "--edit --no-commit --signoff --strategy= --mainline"
+		__gitcomp_builtin cherry-pick "" \
+			"$__git_cherry_pick_inprogress_options"
 		;;
 	*)
 		__git_complete_refs
@@ -1292,7 +1690,7 @@ _git_clean ()
 {
 	case "$cur" in
 	--*)
-		__gitcomp "--dry-run --quiet"
+		__gitcomp_builtin clean
 		return
 		;;
 	esac
@@ -1303,28 +1701,20 @@ _git_clean ()
 
 _git_clone ()
 {
+	case "$prev" in
+	-c|--config)
+		__git_complete_config_variable_name_and_value
+		return
+		;;
+	esac
 	case "$cur" in
+	--config=*)
+		__git_complete_config_variable_name_and_value \
+			--cur="${cur##--config=}"
+		return
+		;;
 	--*)
-		__gitcomp "
-			--local
-			--no-hardlinks
-			--shared
-			--reference
-			--quiet
-			--no-checkout
-			--bare
-			--mirror
-			--origin
-			--upload-pack
-			--template=
-			--depth
-			--single-branch
-			--no-tags
-			--branch
-			--recurse-submodules
-			--no-single-branch
-			--shallow-submodules
-			"
+		__gitcomp_builtin clone
 		return
 		;;
 	esac
@@ -1357,16 +1747,7 @@ _git_commit ()
 		return
 		;;
 	--*)
-		__gitcomp "
-			--all --author= --signoff --verify --no-verify
-			--edit --no-edit
-			--amend --include --only --interactive
-			--dry-run --reuse-message= --reedit-message=
-			--reset-author --file= --message= --template=
-			--cleanup= --untracked-files --untracked-files=
-			--verbose --quiet --fixup= --squash=
-			--patch --short --date --allow-empty
-			"
+		__gitcomp_builtin commit
 		return
 	esac
 
@@ -1382,11 +1763,7 @@ _git_describe ()
 {
 	case "$cur" in
 	--*)
-		__gitcomp "
-			--all --tags --contains --abbrev= --candidates=
-			--exact-match --debug --long --match --always --first-parent
-			--exclude --dirty --broken
-			"
+		__gitcomp_builtin describe
 		return
 	esac
 	__git_complete_refs
@@ -1396,9 +1773,16 @@ __git_diff_algorithms="myers minimal patience histogram"
 
 __git_diff_submodule_formats="diff log short"
 
+__git_color_moved_opts="no default plain blocks zebra dimmed-zebra"
+
+__git_color_moved_ws_opts="no ignore-space-at-eol ignore-space-change
+			ignore-all-space allow-indentation-change"
+
 __git_diff_common_options="--stat --numstat --shortstat --summary
 			--patch-with-stat --name-only --name-status --color
 			--no-color --color-words --no-renames --check
+			--color-moved --color-moved= --no-color-moved
+			--color-moved-ws= --no-color-moved-ws
 			--full-index --binary --abbrev --diff-filter=
 			--find-copies-harder --ignore-cr-at-eol
 			--text --ignore-space-at-eol --ignore-space-change
@@ -1411,7 +1795,9 @@ __git_diff_common_options="--stat --numstat --shortstat --summary
 			--dirstat --dirstat= --dirstat-by-file
 			--dirstat-by-file= --cumulative
 			--diff-algorithm=
-			--submodule --submodule=
+			--submodule --submodule= --ignore-submodules
+			--indent-heuristic --no-indent-heuristic
+			--textconv --no-textconv
 "
 
 _git_diff ()
@@ -1427,6 +1813,14 @@ _git_diff ()
 		__gitcomp "$__git_diff_submodule_formats" "" "${cur##--submodule=}"
 		return
 		;;
+	--color-moved=*)
+		__gitcomp "$__git_color_moved_opts" "" "${cur##--color-moved=}"
+		return
+		;;
+	--color-moved-ws=*)
+		__gitcomp "$__git_color_moved_ws_opts" "" "${cur##--color-moved-ws=}"
+		return
+		;;
 	--*)
 		__gitcomp "--cached --staged --pickaxe-all --pickaxe-regex
 			--base --ours --theirs --no-index
@@ -1439,7 +1833,8 @@ _git_diff ()
 }
 
 __git_mergetools_common="diffuse diffmerge ecmerge emerge kdiff3 meld opendiff
-			tkdiff vimdiff gvimdiff xxdiff araxis p4merge bc codecompare
+			tkdiff vimdiff nvimdiff gvimdiff xxdiff araxis p4merge
+			bc codecompare smerge
 "
 
 _git_difftool ()
@@ -1452,11 +1847,11 @@ _git_difftool ()
 		return
 		;;
 	--*)
-		__gitcomp "--cached --staged --pickaxe-all --pickaxe-regex
-			--base --ours --theirs
-			--no-renames --diff-filter= --find-copies-harder
-			--relative --ignore-submodules
-			--tool="
+		__gitcomp_builtin difftool "$__git_diff_common_options
+					--base --cached --ours --theirs
+					--pickaxe-all --pickaxe-regex
+					--relative --staged
+					"
 		return
 		;;
 	esac
@@ -1465,12 +1860,6 @@ _git_difftool ()
 
 __git_fetch_recurse_submodules="yes on-demand no"
 
-__git_fetch_options="
-	--quiet --verbose --append --upload-pack --force --keep --depth=
-	--tags --no-tags --all --prune --dry-run --recurse-submodules=
-	--unshallow --update-shallow
-"
-
 _git_fetch ()
 {
 	case "$cur" in
@@ -1478,21 +1867,21 @@ _git_fetch ()
 		__gitcomp "$__git_fetch_recurse_submodules" "" "${cur##--recurse-submodules=}"
 		return
 		;;
+	--filter=*)
+		__gitcomp "blob:none blob:limit= sparse:oid=" "" "${cur##--filter=}"
+		return
+		;;
 	--*)
-		__gitcomp "$__git_fetch_options"
+		__gitcomp_builtin fetch
 		return
 		;;
 	esac
 	__git_complete_remote_or_refspec
 }
 
-__git_format_patch_options="
-	--stdout --attach --no-attach --thread --thread= --no-thread
-	--numbered --start-number --numbered-files --keep-subject --signoff
-	--signature --no-signature --in-reply-to= --cc= --full-index --binary
-	--not --all --cover-letter --no-prefix --src-prefix= --dst-prefix=
-	--inline --suffix= --ignore-if-in-upstream --subject-prefix=
-	--output-directory --reroll-count --to= --quiet --notes
+__git_format_patch_extra_options="
+	--full-index --not --all --no-prefix --src-prefix=
+	--dst-prefix= --notes
 "
 
 _git_format_patch ()
@@ -1504,8 +1893,12 @@ _git_format_patch ()
 			" "" "${cur##--thread=}"
 		return
 		;;
+	--base=*|--interdiff=*|--range-diff=*)
+		__git_complete_refs --cur="${cur#--*=}"
+		return
+		;;
 	--*)
-		__gitcomp "$__git_format_patch_options"
+		__gitcomp_builtin format-patch "$__git_format_patch_extra_options"
 		return
 		;;
 	esac
@@ -1516,20 +1909,7 @@ _git_fsck ()
 {
 	case "$cur" in
 	--*)
-		__gitcomp "
-			--tags --root --unreachable --cache --no-reflogs --full
-			--strict --verbose --lost-found --name-objects
-			"
-		return
-		;;
-	esac
-}
-
-_git_gc ()
-{
-	case "$cur" in
-	--*)
-		__gitcomp "--prune --aggressive"
+		__gitcomp_builtin fsck
 		return
 		;;
 	esac
@@ -1585,21 +1965,7 @@ _git_grep ()
 
 	case "$cur" in
 	--*)
-		__gitcomp "
-			--cached
-			--text --ignore-case --word-regexp --invert-match
-			--full-name --line-number
-			--extended-regexp --basic-regexp --fixed-strings
-			--perl-regexp
-			--threads
-			--files-with-matches --name-only
-			--files-without-match
-			--max-depth
-			--count
-			--and --or --not --all-match
-			--break --heading --show-function --function-context
-			--untracked --no-index
-			"
+		__gitcomp_builtin grep
 		return
 		;;
 	esac
@@ -1617,17 +1983,16 @@ _git_help ()
 {
 	case "$cur" in
 	--*)
-		__gitcomp "--all --guides --info --man --web"
+		__gitcomp_builtin help
 		return
 		;;
 	esac
-	__git_compute_all_commands
-	__gitcomp "$__git_all_commands $(__git_aliases)
-		attributes cli core-tutorial cvs-migration
-		diffcore everyday gitk glossary hooks ignore modules
-		namespaces repository-layout revisions tutorial tutorial-2
-		workflows
-		"
+	if test -n "$GIT_TESTING_ALL_COMMAND_LIST"
+	then
+		__gitcomp "$GIT_TESTING_ALL_COMMAND_LIST $(__git --list-cmds=alias,list-guide) gitk"
+	else
+		__gitcomp "$(__git --list-cmds=main,nohelpers,alias,list-guide) gitk"
+	fi
 }
 
 _git_init ()
@@ -1640,7 +2005,7 @@ _git_init ()
 		return
 		;;
 	--*)
-		__gitcomp "--quiet --bare --template= --shared --shared="
+		__gitcomp_builtin init
 		return
 		;;
 	esac
@@ -1650,13 +2015,7 @@ _git_ls_files ()
 {
 	case "$cur" in
 	--*)
-		__gitcomp "--cached --deleted --modified --others --ignored
-			--stage --directory --no-empty-directory --unmerged
-			--killed --exclude= --exclude-from=
-			--exclude-per-directory= --exclude-standard
-			--error-unmatch --with-tree= --full-name
-			--abbrev --ignored --exclude-per-directory
-			"
+		__gitcomp_builtin ls-files
 		return
 		;;
 	esac
@@ -1670,7 +2029,7 @@ _git_ls_remote ()
 {
 	case "$cur" in
 	--*)
-		__gitcomp "--heads --tags --refs --get-url --symref"
+		__gitcomp_builtin ls-remote
 		return
 		;;
 	esac
@@ -1679,6 +2038,13 @@ _git_ls_remote ()
 
 _git_ls_tree ()
 {
+	case "$cur" in
+	--*)
+		__gitcomp_builtin ls-tree
+		return
+		;;
+	esac
+
 	__git_complete_file
 }
 
@@ -1705,8 +2071,8 @@ __git_log_shortlog_options="
 	--all-match --invert-grep
 "
 
-__git_log_pretty_formats="oneline short medium full fuller email raw format:"
-__git_log_date_formats="relative iso8601 rfc2822 short local default raw"
+__git_log_pretty_formats="oneline short medium full fuller reference email raw format: tformat: mboxrd"
+__git_log_date_formats="relative iso8601 iso8601-strict rfc2822 short local default raw unix format:"
 
 _git_log ()
 {
@@ -1752,6 +2118,10 @@ _git_log ()
 		__gitcomp "$__git_diff_submodule_formats" "" "${cur##--submodule=}"
 		return
 		;;
+	--no-walk=*)
+		__gitcomp "sorted unsorted" "" "${cur##--no-walk=}"
+		return
+		;;
 	--*)
 		__gitcomp "
 			$__git_log_common_options
@@ -1759,19 +2129,23 @@ _git_log ()
 			$__git_log_gitk_options
 			--root --topo-order --date-order --reverse
 			--follow --full-diff
-			--abbrev-commit --abbrev=
+			--abbrev-commit --no-abbrev-commit --abbrev=
 			--relative-date --date=
 			--pretty= --format= --oneline
 			--show-signature
 			--cherry-mark
 			--cherry-pick
 			--graph
-			--decorate --decorate=
+			--decorate --decorate= --no-decorate
 			--walk-reflogs
+			--no-walk --no-walk= --do-walk
 			--parents --children
+			--expand-tabs --expand-tabs= --no-expand-tabs
+			--patch
 			$merge
 			$__git_diff_common_options
 			--pickaxe-all --pickaxe-regex
+			--patch --no-patch
 			"
 		return
 		;;
@@ -1794,22 +2168,13 @@ _git_log ()
 	__git_complete_revlist
 }
 
-# Common merge options shared by git-merge(1) and git-pull(1).
-__git_merge_options="
-	--no-commit --no-stat --log --no-log --squash --strategy
-	--commit --stat --no-squash --ff --no-ff --ff-only --edit --no-edit
-	--verify-signatures --no-verify-signatures --gpg-sign
-	--quiet --verbose --progress --no-progress
-"
-
 _git_merge ()
 {
 	__git_complete_strategy && return
 
 	case "$cur" in
 	--*)
-		__gitcomp "$__git_merge_options
-			--rerere-autoupdate --no-rerere-autoupdate --abort --continue"
+		__gitcomp_builtin merge
 		return
 	esac
 	__git_complete_refs
@@ -1823,7 +2188,7 @@ _git_mergetool ()
 		return
 		;;
 	--*)
-		__gitcomp "--tool= --prompt --no-prompt"
+		__gitcomp "--tool= --prompt --no-prompt --gui --no-gui"
 		return
 		;;
 	esac
@@ -1833,7 +2198,7 @@ _git_merge_base ()
 {
 	case "$cur" in
 	--*)
-		__gitcomp "--octopus --independent --is-ancestor --fork-point"
+		__gitcomp_builtin merge-base
 		return
 		;;
 	esac
@@ -1844,7 +2209,7 @@ _git_mv ()
 {
 	case "$cur" in
 	--*)
-		__gitcomp "--dry-run"
+		__gitcomp_builtin mv
 		return
 		;;
 	esac
@@ -1858,19 +2223,14 @@ _git_mv ()
 	fi
 }
 
-_git_name_rev ()
-{
-	__gitcomp "--tags --all --stdin"
-}
-
 _git_notes ()
 {
-	local subcommands='add append copy edit list prune remove show'
+	local subcommands='add append copy edit get-ref list merge prune remove show'
 	local subcommand="$(__git_find_on_cmdline "$subcommands")"
 
 	case "$subcommand,$cur" in
 	,--*)
-		__gitcomp '--ref'
+		__gitcomp_builtin notes
 		;;
 	,*)
 		case "$prev" in
@@ -1882,21 +2242,14 @@ _git_notes ()
 			;;
 		esac
 		;;
-	add,--reuse-message=*|append,--reuse-message=*|\
-	add,--reedit-message=*|append,--reedit-message=*)
+	*,--reuse-message=*|*,--reedit-message=*)
 		__git_complete_refs --cur="${cur#*=}"
 		;;
-	add,--*|append,--*)
-		__gitcomp '--file= --message= --reedit-message=
-				--reuse-message='
+	*,--*)
+		__gitcomp_builtin notes_$subcommand
 		;;
-	copy,--*)
-		__gitcomp '--stdin'
-		;;
-	prune,--*)
-		__gitcomp '--dry-run --verbose'
-		;;
-	prune,*)
+	prune,*|get-ref,*)
+		# this command does not take a ref, do not complete it
 		;;
 	*)
 		case "$prev" in
@@ -1920,12 +2273,8 @@ _git_pull ()
 		return
 		;;
 	--*)
-		__gitcomp "
-			--rebase --no-rebase
-			--autostash --no-autostash
-			$__git_merge_options
-			$__git_fetch_options
-		"
+		__gitcomp_builtin pull
+
 		return
 		;;
 	esac
@@ -1976,27 +2325,39 @@ _git_push ()
 		return
 		;;
 	--*)
-		__gitcomp "
-			--all --mirror --tags --dry-run --force --verbose
-			--quiet --prune --delete --follow-tags
-			--receive-pack= --repo= --set-upstream
-			--force-with-lease --force-with-lease= --recurse-submodules=
-		"
+		__gitcomp_builtin push
 		return
 		;;
 	esac
 	__git_complete_remote_or_refspec
 }
 
+_git_range_diff ()
+{
+	case "$cur" in
+	--*)
+		__gitcomp "
+			--creation-factor= --no-dual-color
+			$__git_diff_common_options
+		"
+		return
+		;;
+	esac
+	__git_complete_revlist
+}
+
+__git_rebase_inprogress_options="--continue --skip --abort --quit --show-current-patch"
+__git_rebase_interactive_inprogress_options="$__git_rebase_inprogress_options --edit-todo"
+
 _git_rebase ()
 {
 	__git_find_repo_path
 	if [ -f "$__git_repo_path"/rebase-merge/interactive ]; then
-		__gitcomp "--continue --skip --abort --quit --edit-todo"
+		__gitcomp "$__git_rebase_interactive_inprogress_options"
 		return
 	elif [ -d "$__git_repo_path"/rebase-apply ] || \
 	     [ -d "$__git_repo_path"/rebase-merge ]; then
-		__gitcomp "--continue --skip --abort --quit"
+		__gitcomp "$__git_rebase_inprogress_options"
 		return
 	fi
 	__git_complete_strategy && return
@@ -2005,19 +2366,13 @@ _git_rebase ()
 		__gitcomp "$__git_whitespacelist" "" "${cur##--whitespace=}"
 		return
 		;;
+	--onto=*)
+		__git_complete_refs --cur="${cur##--onto=}"
+		return
+		;;
 	--*)
-		__gitcomp "
-			--onto --merge --strategy --interactive
-			--preserve-merges --stat --no-stat
-			--committer-date-is-author-date --ignore-date
-			--ignore-whitespace --whitespace=
-			--autosquash --no-autosquash
-			--fork-point --no-fork-point
-			--autostash --no-autostash
-			--verify --no-verify
-			--keep-empty --root --force-rebase --no-ff
-			--exec
-			"
+		__gitcomp_builtin rebase "" \
+			"$__git_rebase_interactive_inprogress_options"
 
 		return
 	esac
@@ -2077,16 +2432,16 @@ _git_send_email ()
 		return
 		;;
 	--*)
-		__gitcomp "--annotate --bcc --cc --cc-cmd --chain-reply-to
+		__gitcomp_builtin send-email "--annotate --bcc --cc --cc-cmd --chain-reply-to
 			--compose --confirm= --dry-run --envelope-sender
 			--from --identity
 			--in-reply-to --no-chain-reply-to --no-signed-off-by-cc
-			--no-suppress-from --no-thread --quiet
+			--no-suppress-from --no-thread --quiet --reply-to
 			--signed-off-by-cc --smtp-pass --smtp-server
 			--smtp-server-port --smtp-encryption= --smtp-user
 			--subject --suppress-cc= --suppress-from --thread --to
 			--validate --no-validate
-			$__git_format_patch_options"
+			$__git_format_patch_extra_options"
 		return
 		;;
 	esac
@@ -2119,11 +2474,7 @@ _git_status ()
 		return
 		;;
 	--*)
-		__gitcomp "
-			--short --branch --porcelain --long --verbose
-			--untracked-files= --ignore-submodules= --ignored
-			--column= --no-column
-			"
+		__gitcomp_builtin status
 		return
 		;;
 	esac
@@ -2148,6 +2499,57 @@ _git_status ()
 	__git_complete_index_file "$complete_opt"
 }
 
+_git_switch ()
+{
+	local dwim_opt="$(__git_checkout_default_dwim_mode)"
+
+	case "$prev" in
+	-c|-C|--orphan)
+		# Complete local branches (and DWIM branch
+		# remote branch names) for an option argument
+		# specifying a new branch name. This is for
+		# convenience, assuming new branches are
+		# possibly based on pre-existing branch names.
+		__git_complete_refs $dwim_opt --mode="heads"
+		return
+		;;
+	*)
+		;;
+	esac
+
+	case "$cur" in
+	--conflict=*)
+		__gitcomp "diff3 merge" "" "${cur##--conflict=}"
+		;;
+	--*)
+		__gitcomp_builtin switch
+		;;
+	*)
+		# Unlike in git checkout, git switch --orphan does not take
+		# a start point. Thus we really have nothing to complete after
+		# the branch name.
+		if [ -n "$(__git_find_on_cmdline "--orphan")" ]; then
+			return
+		fi
+
+		# At this point, we've already handled special completion for
+		# -c/-C, and --orphan. There are 3 main things left to
+		# complete:
+		# 1) a start-point for -c/-C or -d/--detach
+		# 2) a remote head, for --track
+		# 3) a branch name, possibly including DWIM remote branches
+
+		if [ -n "$(__git_find_on_cmdline "-c -C -d --detach")" ]; then
+			__git_complete_refs --mode="refs"
+		elif [ -n "$(__git_find_on_cmdline "--track")" ]; then
+			__git_complete_refs --mode="remote-heads"
+		else
+			__git_complete_refs $dwim_opt --mode="heads"
+		fi
+		;;
+	esac
+}
+
 __git_config_get_set_variables ()
 {
 	local prevword word config_file= c=$cword
@@ -2170,496 +2572,287 @@ __git_config_get_set_variables ()
 	__git config $config_file --name-only --list
 }
 
-_git_config ()
+__git_config_vars=
+__git_compute_config_vars ()
 {
-	case "$prev" in
+	test -n "$__git_config_vars" ||
+	__git_config_vars="$(git help --config-for-completion | sort -u)"
+}
+
+# Completes possible values of various configuration variables.
+#
+# Usage: __git_complete_config_variable_value [<option>]...
+# --varname=<word>: The name of the configuration variable whose value is
+#                   to be completed.  Defaults to the previous word on the
+#                   command line.
+# --cur=<word>: The current value to be completed.  Defaults to the current
+#               word to be completed.
+__git_complete_config_variable_value ()
+{
+	local varname="$prev" cur_="$cur"
+
+	while test $# != 0; do
+		case "$1" in
+		--varname=*)	varname="${1##--varname=}" ;;
+		--cur=*)	cur_="${1##--cur=}" ;;
+		*)		return 1 ;;
+		esac
+		shift
+	done
+
+	if [ "${BASH_VERSINFO[0]:-0}" -ge 4 ]; then
+		varname="${varname,,}"
+	else
+		varname="$(echo "$varname" |tr A-Z a-z)"
+	fi
+
+	case "$varname" in
 	branch.*.remote|branch.*.pushremote)
-		__gitcomp_nl "$(__git_remotes)"
+		__gitcomp_nl "$(__git_remotes)" "" "$cur_"
 		return
 		;;
 	branch.*.merge)
-		__git_complete_refs
+		__git_complete_refs --cur="$cur_"
 		return
 		;;
 	branch.*.rebase)
-		__gitcomp "false true preserve interactive"
+		__gitcomp "false true merges preserve interactive" "" "$cur_"
 		return
 		;;
 	remote.pushdefault)
-		__gitcomp_nl "$(__git_remotes)"
+		__gitcomp_nl "$(__git_remotes)" "" "$cur_"
 		return
 		;;
 	remote.*.fetch)
-		local remote="${prev#remote.}"
+		local remote="${varname#remote.}"
 		remote="${remote%.fetch}"
-		if [ -z "$cur" ]; then
+		if [ -z "$cur_" ]; then
 			__gitcomp_nl "refs/heads/" "" "" ""
 			return
 		fi
-		__gitcomp_nl "$(__git_refs_remotes "$remote")"
+		__gitcomp_nl "$(__git_refs_remotes "$remote")" "" "$cur_"
 		return
 		;;
 	remote.*.push)
-		local remote="${prev#remote.}"
+		local remote="${varname#remote.}"
 		remote="${remote%.push}"
 		__gitcomp_nl "$(__git for-each-ref \
-			--format='%(refname):%(refname)' refs/heads)"
+			--format='%(refname):%(refname)' refs/heads)" "" "$cur_"
 		return
 		;;
 	pull.twohead|pull.octopus)
 		__git_compute_merge_strategies
-		__gitcomp "$__git_merge_strategies"
-		return
-		;;
-	color.branch|color.diff|color.interactive|\
-	color.showbranch|color.status|color.ui)
-		__gitcomp "always never auto"
+		__gitcomp "$__git_merge_strategies" "" "$cur_"
 		return
 		;;
 	color.pager)
-		__gitcomp "false true"
+		__gitcomp "false true" "" "$cur_"
 		return
 		;;
 	color.*.*)
 		__gitcomp "
 			normal black red green yellow blue magenta cyan white
 			bold dim ul blink reverse
-			"
+			" "" "$cur_"
+		return
+		;;
+	color.*)
+		__gitcomp "false true always never auto" "" "$cur_"
 		return
 		;;
 	diff.submodule)
-		__gitcomp "log short"
+		__gitcomp "$__git_diff_submodule_formats" "" "$cur_"
 		return
 		;;
 	help.format)
-		__gitcomp "man info web html"
+		__gitcomp "man info web html" "" "$cur_"
 		return
 		;;
 	log.date)
-		__gitcomp "$__git_log_date_formats"
+		__gitcomp "$__git_log_date_formats" "" "$cur_"
 		return
 		;;
-	sendemail.aliasesfiletype)
-		__gitcomp "mutt mailrc pine elm gnus"
+	sendemail.aliasfiletype)
+		__gitcomp "mutt mailrc pine elm gnus" "" "$cur_"
 		return
 		;;
 	sendemail.confirm)
-		__gitcomp "$__git_send_email_confirm_options"
+		__gitcomp "$__git_send_email_confirm_options" "" "$cur_"
 		return
 		;;
 	sendemail.suppresscc)
-		__gitcomp "$__git_send_email_suppresscc_options"
+		__gitcomp "$__git_send_email_suppresscc_options" "" "$cur_"
 		return
 		;;
 	sendemail.transferencoding)
-		__gitcomp "7bit 8bit quoted-printable base64"
-		return
-		;;
-	--get|--get-all|--unset|--unset-all)
-		__gitcomp_nl "$(__git_config_get_set_variables)"
+		__gitcomp "7bit 8bit quoted-printable base64" "" "$cur_"
 		return
 		;;
 	*.*)
 		return
 		;;
 	esac
-	case "$cur" in
-	--*)
-		__gitcomp "
-			--system --global --local --file=
-			--list --replace-all
-			--get --get-all --get-regexp
-			--add --unset --unset-all
-			--remove-section --rename-section
-			--name-only
-			"
-		return
-		;;
+}
+
+# Completes configuration sections, subsections, variable names.
+#
+# Usage: __git_complete_config_variable_name [<option>]...
+# --cur=<word>: The current configuration section/variable name to be
+#               completed.  Defaults to the current word to be completed.
+# --sfx=<suffix>: A suffix to be appended to each fully completed
+#                 configuration variable name (but not to sections or
+#                 subsections) instead of the default space.
+__git_complete_config_variable_name ()
+{
+	local cur_="$cur" sfx
+
+	while test $# != 0; do
+		case "$1" in
+		--cur=*)	cur_="${1##--cur=}" ;;
+		--sfx=*)	sfx="${1##--sfx=}" ;;
+		*)		return 1 ;;
+		esac
+		shift
+	done
+
+	case "$cur_" in
 	branch.*.*)
-		local pfx="${cur%.*}." cur_="${cur##*.}"
-		__gitcomp "remote pushremote merge mergeoptions rebase" "$pfx" "$cur_"
+		local pfx="${cur_%.*}."
+		cur_="${cur_##*.}"
+		__gitcomp "remote pushRemote merge mergeOptions rebase" "$pfx" "$cur_" "$sfx"
 		return
 		;;
 	branch.*)
-		local pfx="${cur%.*}." cur_="${cur#*.}"
+		local pfx="${cur%.*}."
+		cur_="${cur#*.}"
 		__gitcomp_direct "$(__git_heads "$pfx" "$cur_" ".")"
-		__gitcomp_nl_append $'autosetupmerge\nautosetuprebase\n' "$pfx" "$cur_"
+		__gitcomp_nl_append $'autoSetupMerge\nautoSetupRebase\n' "$pfx" "$cur_" "$sfx"
 		return
 		;;
 	guitool.*.*)
-		local pfx="${cur%.*}." cur_="${cur##*.}"
+		local pfx="${cur_%.*}."
+		cur_="${cur_##*.}"
 		__gitcomp "
-			argprompt cmd confirm needsfile noconsole norescan
-			prompt revprompt revunmerged title
-			" "$pfx" "$cur_"
+			argPrompt cmd confirm needsFile noConsole noRescan
+			prompt revPrompt revUnmerged title
+			" "$pfx" "$cur_" "$sfx"
 		return
 		;;
 	difftool.*.*)
-		local pfx="${cur%.*}." cur_="${cur##*.}"
-		__gitcomp "cmd path" "$pfx" "$cur_"
+		local pfx="${cur_%.*}."
+		cur_="${cur_##*.}"
+		__gitcomp "cmd path" "$pfx" "$cur_" "$sfx"
 		return
 		;;
 	man.*.*)
-		local pfx="${cur%.*}." cur_="${cur##*.}"
-		__gitcomp "cmd path" "$pfx" "$cur_"
+		local pfx="${cur_%.*}."
+		cur_="${cur_##*.}"
+		__gitcomp "cmd path" "$pfx" "$cur_" "$sfx"
 		return
 		;;
 	mergetool.*.*)
-		local pfx="${cur%.*}." cur_="${cur##*.}"
-		__gitcomp "cmd path trustExitCode" "$pfx" "$cur_"
+		local pfx="${cur_%.*}."
+		cur_="${cur_##*.}"
+		__gitcomp "cmd path trustExitCode" "$pfx" "$cur_" "$sfx"
 		return
 		;;
 	pager.*)
-		local pfx="${cur%.*}." cur_="${cur#*.}"
+		local pfx="${cur_%.*}."
+		cur_="${cur_#*.}"
 		__git_compute_all_commands
-		__gitcomp_nl "$__git_all_commands" "$pfx" "$cur_"
+		__gitcomp_nl "$__git_all_commands" "$pfx" "$cur_" "$sfx"
 		return
 		;;
 	remote.*.*)
-		local pfx="${cur%.*}." cur_="${cur##*.}"
+		local pfx="${cur_%.*}."
+		cur_="${cur_##*.}"
 		__gitcomp "
 			url proxy fetch push mirror skipDefaultUpdate
-			receivepack uploadpack tagopt pushurl
-			" "$pfx" "$cur_"
+			receivepack uploadpack tagOpt pushurl
+			" "$pfx" "$cur_" "$sfx"
 		return
 		;;
 	remote.*)
-		local pfx="${cur%.*}." cur_="${cur#*.}"
+		local pfx="${cur_%.*}."
+		cur_="${cur_#*.}"
 		__gitcomp_nl "$(__git_remotes)" "$pfx" "$cur_" "."
-		__gitcomp_nl_append "pushdefault" "$pfx" "$cur_"
+		__gitcomp_nl_append "pushDefault" "$pfx" "$cur_" "$sfx"
 		return
 		;;
 	url.*.*)
-		local pfx="${cur%.*}." cur_="${cur##*.}"
-		__gitcomp "insteadOf pushInsteadOf" "$pfx" "$cur_"
+		local pfx="${cur_%.*}."
+		cur_="${cur_##*.}"
+		__gitcomp "insteadOf pushInsteadOf" "$pfx" "$cur_" "$sfx"
+		return
+		;;
+	*.*)
+		__git_compute_config_vars
+		__gitcomp "$__git_config_vars" "" "$cur_" "$sfx"
+		;;
+	*)
+		__git_compute_config_vars
+		__gitcomp "$(echo "$__git_config_vars" |
+				awk -F . '{
+					sections[$1] = 1
+				}
+				END {
+					for (s in sections)
+						print s "."
+				}
+				')" "" "$cur_"
+		;;
+	esac
+}
+
+# Completes '='-separated configuration sections/variable names and values
+# for 'git -c section.name=value'.
+#
+# Usage: __git_complete_config_variable_name_and_value [<option>]...
+# --cur=<word>: The current configuration section/variable name/value to be
+#               completed. Defaults to the current word to be completed.
+__git_complete_config_variable_name_and_value ()
+{
+	local cur_="$cur"
+
+	while test $# != 0; do
+		case "$1" in
+		--cur=*)	cur_="${1##--cur=}" ;;
+		*)		return 1 ;;
+		esac
+		shift
+	done
+
+	case "$cur_" in
+	*=*)
+		__git_complete_config_variable_value \
+			--varname="${cur_%%=*}" --cur="${cur_#*=}"
+		;;
+	*)
+		__git_complete_config_variable_name --cur="$cur_" --sfx='='
+		;;
+	esac
+}
+
+_git_config ()
+{
+	case "$prev" in
+	--get|--get-all|--unset|--unset-all)
+		__gitcomp_nl "$(__git_config_get_set_variables)"
+		return
+		;;
+	*.*)
+		__git_complete_config_variable_value
 		return
 		;;
 	esac
-	__gitcomp "
-		add.ignoreErrors
-		advice.amWorkDir
-		advice.commitBeforeMerge
-		advice.detachedHead
-		advice.implicitIdentity
-		advice.pushAlreadyExists
-		advice.pushFetchFirst
-		advice.pushNeedsForce
-		advice.pushNonFFCurrent
-		advice.pushNonFFMatching
-		advice.pushUpdateRejected
-		advice.resolveConflict
-		advice.rmHints
-		advice.statusHints
-		advice.statusUoption
-		advice.ignoredHook
-		alias.
-		am.keepcr
-		am.threeWay
-		apply.ignorewhitespace
-		apply.whitespace
-		branch.autosetupmerge
-		branch.autosetuprebase
-		browser.
-		clean.requireForce
-		color.branch
-		color.branch.current
-		color.branch.local
-		color.branch.plain
-		color.branch.remote
-		color.decorate.HEAD
-		color.decorate.branch
-		color.decorate.remoteBranch
-		color.decorate.stash
-		color.decorate.tag
-		color.diff
-		color.diff.commit
-		color.diff.frag
-		color.diff.func
-		color.diff.meta
-		color.diff.new
-		color.diff.old
-		color.diff.plain
-		color.diff.whitespace
-		color.grep
-		color.grep.context
-		color.grep.filename
-		color.grep.function
-		color.grep.linenumber
-		color.grep.match
-		color.grep.selected
-		color.grep.separator
-		color.interactive
-		color.interactive.error
-		color.interactive.header
-		color.interactive.help
-		color.interactive.prompt
-		color.pager
-		color.showbranch
-		color.status
-		color.status.added
-		color.status.changed
-		color.status.header
-		color.status.localBranch
-		color.status.nobranch
-		color.status.remoteBranch
-		color.status.unmerged
-		color.status.untracked
-		color.status.updated
-		color.ui
-		commit.cleanup
-		commit.gpgSign
-		commit.status
-		commit.template
-		commit.verbose
-		core.abbrev
-		core.askpass
-		core.attributesfile
-		core.autocrlf
-		core.bare
-		core.bigFileThreshold
-		core.checkStat
-		core.commentChar
-		core.compression
-		core.createObject
-		core.deltaBaseCacheLimit
-		core.editor
-		core.eol
-		core.excludesfile
-		core.fileMode
-		core.fsyncobjectfiles
-		core.gitProxy
-		core.hideDotFiles
-		core.hooksPath
-		core.ignoreStat
-		core.ignorecase
-		core.logAllRefUpdates
-		core.loosecompression
-		core.notesRef
-		core.packedGitLimit
-		core.packedGitWindowSize
-		core.packedRefsTimeout
-		core.pager
-		core.precomposeUnicode
-		core.preferSymlinkRefs
-		core.preloadindex
-		core.protectHFS
-		core.protectNTFS
-		core.quotepath
-		core.repositoryFormatVersion
-		core.safecrlf
-		core.sharedRepository
-		core.sparseCheckout
-		core.splitIndex
-		core.sshCommand
-		core.symlinks
-		core.trustctime
-		core.untrackedCache
-		core.warnAmbiguousRefs
-		core.whitespace
-		core.worktree
-		credential.helper
-		credential.useHttpPath
-		credential.username
-		credentialCache.ignoreSIGHUP
-		diff.autorefreshindex
-		diff.external
-		diff.ignoreSubmodules
-		diff.mnemonicprefix
-		diff.noprefix
-		diff.renameLimit
-		diff.renames
-		diff.statGraphWidth
-		diff.submodule
-		diff.suppressBlankEmpty
-		diff.tool
-		diff.wordRegex
-		diff.algorithm
-		difftool.
-		difftool.prompt
-		fetch.recurseSubmodules
-		fetch.unpackLimit
-		format.attach
-		format.cc
-		format.coverLetter
-		format.from
-		format.headers
-		format.numbered
-		format.pretty
-		format.signature
-		format.signoff
-		format.subjectprefix
-		format.suffix
-		format.thread
-		format.to
-		gc.
-		gc.aggressiveDepth
-		gc.aggressiveWindow
-		gc.auto
-		gc.autoDetach
-		gc.autopacklimit
-		gc.logExpiry
-		gc.packrefs
-		gc.pruneexpire
-		gc.reflogexpire
-		gc.reflogexpireunreachable
-		gc.rerereresolved
-		gc.rerereunresolved
-		gc.worktreePruneExpire
-		gitcvs.allbinary
-		gitcvs.commitmsgannotation
-		gitcvs.dbTableNamePrefix
-		gitcvs.dbdriver
-		gitcvs.dbname
-		gitcvs.dbpass
-		gitcvs.dbuser
-		gitcvs.enabled
-		gitcvs.logfile
-		gitcvs.usecrlfattr
-		guitool.
-		gui.blamehistoryctx
-		gui.commitmsgwidth
-		gui.copyblamethreshold
-		gui.diffcontext
-		gui.encoding
-		gui.fastcopyblame
-		gui.matchtrackingbranch
-		gui.newbranchtemplate
-		gui.pruneduringfetch
-		gui.spellingdictionary
-		gui.trustmtime
-		help.autocorrect
-		help.browser
-		help.format
-		http.lowSpeedLimit
-		http.lowSpeedTime
-		http.maxRequests
-		http.minSessions
-		http.noEPSV
-		http.postBuffer
-		http.proxy
-		http.sslCipherList
-		http.sslVersion
-		http.sslCAInfo
-		http.sslCAPath
-		http.sslCert
-		http.sslCertPasswordProtected
-		http.sslKey
-		http.sslVerify
-		http.useragent
-		i18n.commitEncoding
-		i18n.logOutputEncoding
-		imap.authMethod
-		imap.folder
-		imap.host
-		imap.pass
-		imap.port
-		imap.preformattedHTML
-		imap.sslverify
-		imap.tunnel
-		imap.user
-		init.templatedir
-		instaweb.browser
-		instaweb.httpd
-		instaweb.local
-		instaweb.modulepath
-		instaweb.port
-		interactive.singlekey
-		log.date
-		log.decorate
-		log.showroot
-		mailmap.file
-		man.
-		man.viewer
-		merge.
-		merge.conflictstyle
-		merge.log
-		merge.renameLimit
-		merge.renormalize
-		merge.stat
-		merge.tool
-		merge.verbosity
-		mergetool.
-		mergetool.keepBackup
-		mergetool.keepTemporaries
-		mergetool.prompt
-		notes.displayRef
-		notes.rewrite.
-		notes.rewrite.amend
-		notes.rewrite.rebase
-		notes.rewriteMode
-		notes.rewriteRef
-		pack.compression
-		pack.deltaCacheLimit
-		pack.deltaCacheSize
-		pack.depth
-		pack.indexVersion
-		pack.packSizeLimit
-		pack.threads
-		pack.window
-		pack.windowMemory
-		pager.
-		pretty.
-		pull.octopus
-		pull.twohead
-		push.default
-		push.followTags
-		rebase.autosquash
-		rebase.stat
-		receive.autogc
-		receive.denyCurrentBranch
-		receive.denyDeleteCurrent
-		receive.denyDeletes
-		receive.denyNonFastForwards
-		receive.fsckObjects
-		receive.unpackLimit
-		receive.updateserverinfo
-		remote.pushdefault
-		remotes.
-		repack.usedeltabaseoffset
-		rerere.autoupdate
-		rerere.enabled
-		sendemail.
-		sendemail.aliasesfile
-		sendemail.aliasfiletype
-		sendemail.bcc
-		sendemail.cc
-		sendemail.cccmd
-		sendemail.chainreplyto
-		sendemail.confirm
-		sendemail.envelopesender
-		sendemail.from
-		sendemail.identity
-		sendemail.multiedit
-		sendemail.signedoffbycc
-		sendemail.smtpdomain
-		sendemail.smtpencryption
-		sendemail.smtppass
-		sendemail.smtpserver
-		sendemail.smtpserveroption
-		sendemail.smtpserverport
-		sendemail.smtpuser
-		sendemail.suppresscc
-		sendemail.suppressfrom
-		sendemail.thread
-		sendemail.to
-		sendemail.tocmd
-		sendemail.validate
-		sendemail.smtpbatchsize
-		sendemail.smtprelogindelay
-		showbranch.default
-		status.relativePaths
-		status.showUntrackedFiles
-		status.submodulesummary
-		submodule.
-		tar.umask
-		transfer.unpackLimit
-		url.
-		user.email
-		user.name
-		user.signingkey
-		web.browser
-		branch. remote.
-	"
+	case "$cur" in
+	--*)
+		__gitcomp_builtin config
+		;;
+	*)
+		__git_complete_config_variable_name
+		;;
+	esac
 }
 
 _git_remote ()
@@ -2672,7 +2865,7 @@ _git_remote ()
 	if [ -z "$subcommand" ]; then
 		case "$cur" in
 		--*)
-			__gitcomp "--verbose"
+			__gitcomp_builtin remote
 			;;
 		*)
 			__gitcomp "$subcommands"
@@ -2683,33 +2876,33 @@ _git_remote ()
 
 	case "$subcommand,$cur" in
 	add,--*)
-		__gitcomp "--track --master --fetch --tags --no-tags --mirror="
+		__gitcomp_builtin remote_add
 		;;
 	add,*)
 		;;
 	set-head,--*)
-		__gitcomp "--auto --delete"
+		__gitcomp_builtin remote_set-head
 		;;
 	set-branches,--*)
-		__gitcomp "--add"
+		__gitcomp_builtin remote_set-branches
 		;;
 	set-head,*|set-branches,*)
 		__git_complete_remote_or_refspec
 		;;
 	update,--*)
-		__gitcomp "--prune"
+		__gitcomp_builtin remote_update
 		;;
 	update,*)
-		__gitcomp "$(__git_get_config_variables "remotes")"
+		__gitcomp "$(__git_remotes) $(__git_get_config_variables "remotes")"
 		;;
 	set-url,--*)
-		__gitcomp "--push --add --delete"
+		__gitcomp_builtin remote_set-url
 		;;
 	get-url,--*)
-		__gitcomp "--push --all"
+		__gitcomp_builtin remote_get-url
 		;;
 	prune,--*)
-		__gitcomp "--dry-run"
+		__gitcomp_builtin remote_prune
 		;;
 	*)
 		__gitcomp_nl "$(__git_remotes)"
@@ -2720,8 +2913,12 @@ _git_remote ()
 _git_replace ()
 {
 	case "$cur" in
+	--format=*)
+		__gitcomp "short medium long" "" "${cur##--format=}"
+		return
+		;;
 	--*)
-		__gitcomp "--edit --graft --format= --list --delete"
+		__gitcomp_builtin replace
 		return
 		;;
 	esac
@@ -2745,26 +2942,49 @@ _git_reset ()
 
 	case "$cur" in
 	--*)
-		__gitcomp "--merge --mixed --hard --soft --patch --keep"
+		__gitcomp_builtin reset
 		return
 		;;
 	esac
 	__git_complete_refs
 }
 
+_git_restore ()
+{
+	case "$prev" in
+	-s)
+		__git_complete_refs
+		return
+		;;
+	esac
+
+	case "$cur" in
+	--conflict=*)
+		__gitcomp "diff3 merge" "" "${cur##--conflict=}"
+		;;
+	--source=*)
+		__git_complete_refs --cur="${cur##--source=}"
+		;;
+	--*)
+		__gitcomp_builtin restore
+		;;
+	esac
+}
+
+__git_revert_inprogress_options=$__git_sequencer_inprogress_options
+
 _git_revert ()
 {
 	__git_find_repo_path
 	if [ -f "$__git_repo_path"/REVERT_HEAD ]; then
-		__gitcomp "--continue --quit --abort"
+		__gitcomp "$__git_revert_inprogress_options"
 		return
 	fi
+	__git_complete_strategy && return
 	case "$cur" in
 	--*)
-		__gitcomp "
-			--edit --mainline --no-edit --no-commit --signoff
-			--strategy= --strategy-option=
-			"
+		__gitcomp_builtin revert "" \
+			"$__git_revert_inprogress_options"
 		return
 		;;
 	esac
@@ -2775,7 +2995,7 @@ _git_rm ()
 {
 	case "$cur" in
 	--*)
-		__gitcomp "--cached --dry-run --ignore-unmatch --quiet"
+		__gitcomp_builtin rm
 		return
 		;;
 	esac
@@ -2818,9 +3038,18 @@ _git_show ()
 		__gitcomp "$__git_diff_submodule_formats" "" "${cur##--submodule=}"
 		return
 		;;
+	--color-moved=*)
+		__gitcomp "$__git_color_moved_opts" "" "${cur##--color-moved=}"
+		return
+		;;
+	--color-moved-ws=*)
+		__gitcomp "$__git_color_moved_ws_opts" "" "${cur##--color-moved-ws=}"
+		return
+		;;
 	--*)
-		__gitcomp "--pretty= --format= --abbrev-commit --oneline
-			--show-signature
+		__gitcomp "--pretty= --format= --abbrev-commit --no-abbrev-commit
+			--oneline --show-signature --patch
+			--expand-tabs --expand-tabs= --no-expand-tabs
 			$__git_diff_common_options
 			"
 		return
@@ -2833,28 +3062,52 @@ _git_show_branch ()
 {
 	case "$cur" in
 	--*)
-		__gitcomp "
-			--all --remotes --topo-order --date-order --current --more=
-			--list --independent --merge-base --no-name
-			--color --no-color
-			--sha1-name --sparse --topics --reflog
-			"
+		__gitcomp_builtin show-branch
 		return
 		;;
 	esac
 	__git_complete_revlist
 }
 
+_git_sparse_checkout ()
+{
+	local subcommands="list init set disable"
+	local subcommand="$(__git_find_on_cmdline "$subcommands")"
+	if [ -z "$subcommand" ]; then
+		__gitcomp "$subcommands"
+		return
+	fi
+
+	case "$subcommand,$cur" in
+	init,--*)
+		__gitcomp "--cone"
+		;;
+	set,--*)
+		__gitcomp "--stdin"
+		;;
+	*)
+		;;
+	esac
+}
+
 _git_stash ()
 {
 	local save_opts='--all --keep-index --no-keep-index --quiet --patch --include-untracked'
-	local subcommands='push save list show apply clear drop pop create branch'
-	local subcommand="$(__git_find_on_cmdline "$subcommands")"
+	local subcommands='push list show apply clear drop pop create branch'
+	local subcommand="$(__git_find_on_cmdline "$subcommands save")"
+	if [ -z "$subcommand" -a -n "$(__git_find_on_cmdline "-p")" ]; then
+		subcommand="push"
+	fi
 	if [ -z "$subcommand" ]; then
 		case "$cur" in
 		--*)
 			__gitcomp "$save_opts"
 			;;
+		sa*)
+			if [ -z "$(__git_find_on_cmdline "$save_opts")" ]; then
+				__gitcomp "save"
+			fi
+			;;
 		*)
 			if [ -z "$(__git_find_on_cmdline "$save_opts")" ]; then
 				__gitcomp "$subcommands"
@@ -2875,6 +3128,9 @@ _git_stash ()
 		drop,--*)
 			__gitcomp "--quiet"
 			;;
+		list,--*)
+			__gitcomp "--name-status --oneline --patch-with-stat"
+			;;
 		show,--*|branch,--*)
 			;;
 		branch,*)
@@ -2899,7 +3155,7 @@ _git_submodule ()
 {
 	__git_has_doubledash && return
 
-	local subcommands="add status init deinit update summary foreach sync"
+	local subcommands="add status init deinit update set-branch set-url summary foreach sync absorbgitdirs"
 	local subcommand="$(__git_find_on_cmdline "$subcommands")"
 	if [ -z "$subcommand" ]; then
 		case "$cur" in
@@ -2930,6 +3186,9 @@ _git_submodule ()
 			--force --rebase --merge --reference --depth --recursive --jobs
 		"
 		;;
+	set-branch,--*)
+		__gitcomp "--default --branch"
+		;;
 	summary,--*)
 		__gitcomp "--cached --files --summary-limit"
 		;;
@@ -2960,6 +3219,7 @@ _git_svn ()
 			--log-window-size= --no-checkout --quiet
 			--repack-flags --use-log-author --localtime
 			--add-author-from
+			--recursive
 			--ignore-paths= --include-paths= $remote_opts
 			"
 		local init_opts="
@@ -3045,7 +3305,7 @@ _git_tag ()
 	while [ $c -lt $cword ]; do
 		i="${words[c]}"
 		case "$i" in
-		-d|-v)
+		-d|--delete|-v|--verify)
 			__gitcomp_direct "$(__git_tags "" "$cur" " ")"
 			return
 			;;
@@ -3071,11 +3331,7 @@ _git_tag ()
 
 	case "$cur" in
 	--*)
-		__gitcomp "
-			--list --delete --verify --annotate --message --file
-			--sign --cleanup --local-user --force --column --sort=
-			--contains --no-contains --points-at --merged --no-merged --create-reflog
-			"
+		__gitcomp_builtin tag
 		;;
 	esac
 }
@@ -3085,29 +3341,128 @@ _git_whatchanged ()
 	_git_log
 }
 
+__git_complete_worktree_paths ()
+{
+	local IFS=$'\n'
+	__gitcomp_nl "$(git worktree list --porcelain |
+		# Skip the first entry: it's the path of the main worktree,
+		# which can't be moved, removed, locked, etc.
+		sed -n -e '2,$ s/^worktree //p')"
+}
+
 _git_worktree ()
 {
-	local subcommands="add list lock prune unlock"
-	local subcommand="$(__git_find_on_cmdline "$subcommands")"
-	if [ -z "$subcommand" ]; then
+	local subcommands="add list lock move prune remove unlock"
+	local subcommand subcommand_idx
+
+	subcommand="$(__git_find_on_cmdline --show-idx "$subcommands")"
+	subcommand_idx="${subcommand% *}"
+	subcommand="${subcommand#* }"
+
+	case "$subcommand,$cur" in
+	,*)
 		__gitcomp "$subcommands"
-	else
-		case "$subcommand,$cur" in
-		add,--*)
-			__gitcomp "--detach"
+		;;
+	*,--*)
+		__gitcomp_builtin worktree_$subcommand
+		;;
+	add,*)	# usage: git worktree add [<options>] <path> [<commit-ish>]
+		# Here we are not completing an --option, it's either the
+		# path or a ref.
+		case "$prev" in
+		-b|-B)	# Complete refs for branch to be created/reseted.
+			__git_complete_refs
 			;;
-		list,--*)
-			__gitcomp "--porcelain"
+		-*)	# The previous word is an -o|--option without an
+			# unstuck argument: have to complete the path for
+			# the new worktree, so don't list anything, but let
+			# Bash fall back to filename completion.
 			;;
-		lock,--*)
-			__gitcomp "--reason"
-			;;
-		prune,--*)
-			__gitcomp "--dry-run --expire --verbose"
-			;;
-		*)
+		*)	# The previous word is not an --option, so it must
+			# be either the 'add' subcommand, the unstuck
+			# argument of an option (e.g. branch for -b|-B), or
+			# the path for the new worktree.
+			if [ $cword -eq $((subcommand_idx+1)) ]; then
+				# Right after the 'add' subcommand: have to
+				# complete the path, so fall back to Bash
+				# filename completion.
+				:
+			else
+				case "${words[cword-2]}" in
+				-b|-B)	# After '-b <branch>': have to
+					# complete the path, so fall back
+					# to Bash filename completion.
+					;;
+				*)	# After the path: have to complete
+					# the ref to be checked out.
+					__git_complete_refs
+					;;
+				esac
+			fi
 			;;
 		esac
+		;;
+	lock,*|remove,*|unlock,*)
+		__git_complete_worktree_paths
+		;;
+	move,*)
+		if [ $cword -eq $((subcommand_idx+1)) ]; then
+			# The first parameter must be an existing working
+			# tree to be moved.
+			__git_complete_worktree_paths
+		else
+			# The second parameter is the destination: it could
+			# be any path, so don't list anything, but let Bash
+			# fall back to filename completion.
+			:
+		fi
+		;;
+	esac
+}
+
+__git_complete_common () {
+	local command="$1"
+
+	case "$cur" in
+	--*)
+		__gitcomp_builtin "$command"
+		;;
+	esac
+}
+
+__git_cmds_with_parseopt_helper=
+__git_support_parseopt_helper () {
+	test -n "$__git_cmds_with_parseopt_helper" ||
+		__git_cmds_with_parseopt_helper="$(__git --list-cmds=parseopt)"
+
+	case " $__git_cmds_with_parseopt_helper " in
+	*" $1 "*)
+		return 0
+		;;
+	*)
+		return 1
+		;;
+	esac
+}
+
+__git_complete_command () {
+	local command="$1"
+	local completion_func="_git_${command//-/_}"
+	if ! declare -f $completion_func >/dev/null 2>/dev/null &&
+		declare -f _completion_loader >/dev/null 2>/dev/null
+	then
+		_completion_loader "git-$command"
+	fi
+	if declare -f $completion_func >/dev/null 2>/dev/null
+	then
+		$completion_func
+		return 0
+	elif __git_support_parseopt_helper "$command"
+	then
+		__git_complete_common "$command"
+		return 0
+	else
+		return 1
 	fi
 }
 
@@ -3134,14 +3489,18 @@ __git_main ()
 		((c++))
 	done
 
-	if [ -z "$command" ]; then
+	if [ -z "${command-}" ]; then
 		case "$prev" in
 		--git-dir|-C|--work-tree)
 			# these need a path argument, let's fall back to
 			# Bash filename completion
 			return
 			;;
-		-c|--namespace)
+		-c)
+			__git_complete_config_variable_name_and_value
+			return
+			;;
+		--namespace)
 			# we don't support completing these options' arguments
 			return
 			;;
@@ -3164,20 +3523,24 @@ __git_main ()
 			--help
 			"
 			;;
-		*)     __git_compute_porcelain_commands
-		       __gitcomp "$__git_porcelain_commands $(__git_aliases)" ;;
+		*)
+			if test -n "${GIT_TESTING_PORCELAIN_COMMAND_LIST-}"
+			then
+				__gitcomp "$GIT_TESTING_PORCELAIN_COMMAND_LIST"
+			else
+				__gitcomp "$(__git --list-cmds=list-mainporcelain,others,nohelpers,alias,list-complete,config)"
+			fi
+			;;
 		esac
 		return
 	fi
 
-	local completion_func="_git_${command//-/_}"
-	declare -f $completion_func >/dev/null 2>/dev/null && $completion_func && return
+	__git_complete_command "$command" && return
 
 	local expansion=$(__git_aliased_command "$command")
 	if [ -n "$expansion" ]; then
 		words[1]=$expansion
-		completion_func="_git_${expansion//-/_}"
-		declare -f $completion_func >/dev/null 2>/dev/null && $completion_func
+		__git_complete_command "$expansion"
 	fi
 }
 
@@ -3205,76 +3568,8 @@ __gitk_main ()
 	__git_complete_revlist
 }
 
-if [[ -n ${ZSH_VERSION-} ]]; then
-	echo "WARNING: this script is deprecated, please see git-completion.zsh" 1>&2
-
-	autoload -U +X compinit && compinit
-
-	__gitcomp ()
-	{
-		emulate -L zsh
-
-		local cur_="${3-$cur}"
-
-		case "$cur_" in
-		--*=)
-			;;
-		*)
-			local c IFS=$' \t\n'
-			local -a array
-			for c in ${=1}; do
-				c="$c${4-}"
-				case $c in
-				--*=*|*.) ;;
-				*) c="$c " ;;
-				esac
-				array[${#array[@]}+1]="$c"
-			done
-			compset -P '*[=:]'
-			compadd -Q -S '' -p "${2-}" -a -- array && _ret=0
-			;;
-		esac
-	}
-
-	__gitcomp_direct ()
-	{
-		emulate -L zsh
-
-		local IFS=$'\n'
-		compset -P '*[=:]'
-		compadd -Q -- ${=1} && _ret=0
-	}
-
-	__gitcomp_nl ()
-	{
-		emulate -L zsh
-
-		local IFS=$'\n'
-		compset -P '*[=:]'
-		compadd -Q -S "${4- }" -p "${2-}" -- ${=1} && _ret=0
-	}
-
-	__gitcomp_file ()
-	{
-		emulate -L zsh
-
-		local IFS=$'\n'
-		compset -P '*[=:]'
-		compadd -Q -p "${2-}" -f -- ${=1} && _ret=0
-	}
-
-	_git ()
-	{
-		local _ret=1 cur cword prev
-		cur=${words[CURRENT]}
-		prev=${words[CURRENT-1]}
-		let cword=CURRENT-1
-		emulate ksh -c __${service}_main
-		let _ret && _default && _ret=0
-		return _ret
-	}
-
-	compdef _git git gitk
+if [[ -n ${ZSH_VERSION-} && -z ${GIT_SOURCING_ZSH_COMPLETION-} ]]; then
+	echo "ERROR: this script is obsolete, please see git-completion.zsh" 1>&2
 	return
 fi
 
@@ -3290,23 +3585,50 @@ __git_func_wrap ()
 # This is NOT a public function; use at your own risk.
 __git_complete ()
 {
+	test -n "$ZSH_VERSION" && return
 	local wrapper="__git_wrap${2}"
 	eval "$wrapper () { __git_func_wrap $2 ; }"
 	complete -o bashdefault -o default -o nospace -F $wrapper $1 2>/dev/null \
 		|| complete -o default -o nospace -F $wrapper $1
 }
 
-# wrapper for backwards compatibility
-_git ()
-{
-	__git_wrap__git_main
-}
+if ! git --list-cmds=main >/dev/null 2>&1; then
 
-# wrapper for backwards compatibility
-_gitk ()
-{
-	__git_wrap__gitk_main
-}
+	declare -A __git_cmds
+	__git_cmds[list-complete]="apply blame cherry config difftool fsck help instaweb mergetool prune reflog remote repack replace request-pull send-email show-branch stage whatchanged"
+	__git_cmds[list-guide]="attributes cli core-tutorial credentials cvs-migration diffcore everyday faq glossary hooks ignore modules namespaces remote-helpers repository-layout revisions submodules tutorial-2 tutorial workflows"
+	__git_cmds[list-mainporcelain]="add am archive bisect branch bundle checkout cherry-pick citool clean clone commit describe diff fetch format-patch gc grep gui init gitk log maintenance merge mv notes pull push range-diff rebase reset restore revert rm shortlog show sparse-checkout stash status submodule switch tag worktree"
+	__git_cmds[main]="add add--interactive am annotate apply archimport archive bisect bisect--helper blame branch bugreport bundle cat-file check-attr check-ignore check-mailmap check-ref-format checkout checkout-index cherry cherry-pick citool clean clone column commit commit-graph commit-tree config count-objects credential credential-cache credential-cache--daemon credential-gnome-keyring credential-libsecret credential-store cvsexportcommit cvsimport cvsserver daemon describe diff diff-files diff-index diff-tree difftool difftool--helper env--helper fast-export fast-import fetch fetch-pack filter-branch fmt-merge-msg for-each-ref format-patch fsck fsck-objects gc get-tar-commit-id grep gui gui--askpass hash-object help http-backend http-fetch http-push imap-send index-pack init init-db instaweb interpret-trailers log ls-files ls-remote ls-tree mailinfo mailsplit maintenance merge merge-base merge-file merge-index merge-octopus merge-one-file merge-ours merge-recursive merge-recursive-ours merge-recursive-theirs merge-resolve merge-subtree merge-tree mergetool mktag mktree multi-pack-index mv mw name-rev notes p4 pack-objects pack-redundant pack-refs patch-id pickaxe prune prune-packed pull push quiltimport range-diff read-tree rebase rebase--interactive receive-pack reflog remote remote-ext remote-fd remote-ftp remote-ftps remote-http remote-https remote-mediawiki repack replace request-pull rerere reset restore rev-list rev-parse revert rm send-email send-pack sh-i18n--envsubst shell shortlog show show-branch show-index show-ref sparse-checkout stage stash status stripspace submodule submodule--helper subtree svn switch symbolic-ref tag unpack-file unpack-objects update-index update-ref update-server-info upload-archive upload-archive--writer upload-pack var verify-commit verify-pack verify-tag version web--browse whatchanged worktree write-tree"
+	__git_cmds[others]="compare reintegrate related remote-hg remote-sync send-series smartlist"
+	__git_cmds[parseopt]="add am apply archive bisect--helper blame branch bugreport cat-file check-attr check-ignore check-mailmap checkout checkout-index cherry cherry-pick clean clone column commit commit-graph config count-objects credential-cache credential-cache--daemon credential-store describe difftool env--helper fast-export fetch fmt-merge-msg for-each-ref format-patch fsck fsck-objects gc grep hash-object help init init-db interpret-trailers log ls-files ls-remote ls-tree merge merge-base merge-file mktree multi-pack-index mv name-rev notes pack-objects pack-refs pickaxe prune prune-packed pull push range-diff read-tree rebase rebase--interactive receive-pack reflog remote repack replace rerere reset restore revert rm send-pack shortlog show show-branch show-index show-ref sparse-checkout stage stash status stripspace switch symbolic-ref tag update-index update-ref update-server-info upload-pack verify-commit verify-pack verify-tag version whatchanged write-tree "
+
+	# Override __git
+	__git ()
+	{
+		case "$1" in
+		--list-cmds=*)
+			IFS=, read -r -a cmds <<< "${1##--list-cmds=}"
+			for x in ${cmds[@]}; do
+				case "$x" in
+				nohelpers)
+					;;
+				alias)
+					;;
+				config)
+					;;
+				*)
+					echo ${__git_cmds[$x]}
+					;;
+				esac
+			done
+			return
+			;;
+		esac
+		git ${__git_C_args:+"${__git_C_args[@]}"} \
+			${__git_dir:+--git-dir="$__git_dir"} "$@" 2>/dev/null
+	}
+
+fi
 
 __git_complete git __git_main
 __git_complete gitk __gitk_main
@@ -3315,6 +3637,6 @@ __git_complete gitk __gitk_main
 # when the user has tab-completed the executable name and consequently
 # included the '.exe' suffix.
 #
-if [[ "$OSTYPE" = cygwin* ]]; then
-__git_complete git.exe __git_main
+if [ "$OSTYPE" = cygwin ]; then
+	__git_complete git.exe __git_main
 fi
diff --git a/plugins/gitfast/git-prompt.sh b/plugins/gitfast/git-prompt.sh
index fd2b049db..54e123d63 100644
--- a/plugins/gitfast/git-prompt.sh
+++ b/plugins/gitfast/git-prompt.sh
@@ -70,6 +70,15 @@
 # state symbols by setting GIT_PS1_STATESEPARATOR. The default separator
 # is SP.
 #
+# When there is an in-progress operation such as a merge, rebase,
+# revert, cherry-pick, or bisect, the prompt will include information
+# related to the operation, often in the form "|<OPERATION-NAME>".
+#
+# When the repository has a sparse-checkout, a notification of the form
+# "|SPARSE" will be included in the prompt.  This can be shortened to a
+# single '?' character by setting GIT_PS1_COMPRESSSPARSESTATE, or omitted
+# by setting GIT_PS1_OMITSPARSESTATE.
+#
 # By default, __git_ps1 will compare HEAD to your SVN upstream if it can
 # find one, or @{upstream} otherwise.  Once you have set
 # GIT_PS1_SHOWUPSTREAM, you can override it on a per-repository basis by
@@ -88,7 +97,8 @@
 # If you would like a colored hint about the current dirty state, set
 # GIT_PS1_SHOWCOLORHINTS to a nonempty value. The colors are based on
 # the colored output of "git status -sb" and are available only when
-# using __git_ps1 for PROMPT_COMMAND or precmd.
+# using __git_ps1 for PROMPT_COMMAND or precmd in Bash,
+# but always available in Zsh.
 #
 # If you would like __git_ps1 to do nothing in the case when the current
 # directory is set up to be ignored by git, then set
@@ -286,6 +296,37 @@ __git_eread ()
 	test -r "$1" && IFS=$'\r\n' read "$2" <"$1"
 }
 
+# see if a cherry-pick or revert is in progress, if the user has committed a
+# conflict resolution with 'git commit' in the middle of a sequence of picks or
+# reverts then CHERRY_PICK_HEAD/REVERT_HEAD will not exist so we have to read
+# the todo file.
+__git_sequencer_status ()
+{
+	local todo
+	if test -f "$g/CHERRY_PICK_HEAD"
+	then
+		r="|CHERRY-PICKING"
+		return 0;
+	elif test -f "$g/REVERT_HEAD"
+	then
+		r="|REVERTING"
+		return 0;
+	elif __git_eread "$g/sequencer/todo" todo
+	then
+		case "$todo" in
+		p[\ \	]|pick[\ \	]*)
+			r="|CHERRY-PICKING"
+			return 0
+		;;
+		revert[\ \	]*)
+			r="|REVERTING"
+			return 0
+		;;
+		esac
+	fi
+	return 1
+}
+
 # __git_ps1 accepts 0 or 1 arguments (i.e., format string)
 # when called from PS1 using command substitution
 # in this mode it prints text to add to bash PS1 prompt (includes branch name)
@@ -390,6 +431,13 @@ __git_ps1 ()
 		return $exit
 	fi
 
+	local sparse=""
+	if [ -z "${GIT_PS1_COMPRESSSPARSESTATE}" ] &&
+	   [ -z "${GIT_PS1_OMITSPARSESTATE}" ] &&
+	   [ "$(git config --bool core.sparseCheckout)" = "true" ]; then
+		sparse="|SPARSE"
+	fi
+
 	local r=""
 	local b=""
 	local step=""
@@ -398,11 +446,7 @@ __git_ps1 ()
 		__git_eread "$g/rebase-merge/head-name" b
 		__git_eread "$g/rebase-merge/msgnum" step
 		__git_eread "$g/rebase-merge/end" total
-		if [ -f "$g/rebase-merge/interactive" ]; then
-			r="|REBASE-i"
-		else
-			r="|REBASE-m"
-		fi
+		r="|REBASE"
 	else
 		if [ -d "$g/rebase-apply" ]; then
 			__git_eread "$g/rebase-apply/next" step
@@ -417,10 +461,8 @@ __git_ps1 ()
 			fi
 		elif [ -f "$g/MERGE_HEAD" ]; then
 			r="|MERGING"
-		elif [ -f "$g/CHERRY_PICK_HEAD" ]; then
-			r="|CHERRY-PICKING"
-		elif [ -f "$g/REVERT_HEAD" ]; then
-			r="|REVERTING"
+		elif __git_sequencer_status; then
+			:
 		elif [ -f "$g/BISECT_LOG" ]; then
 			r="|BISECTING"
 		fi
@@ -467,6 +509,7 @@ __git_ps1 ()
 	local i=""
 	local s=""
 	local u=""
+	local h=""
 	local c=""
 	local p=""
 
@@ -499,6 +542,11 @@ __git_ps1 ()
 			u="%${ZSH_VERSION+%}"
 		fi
 
+		if [ -n "${GIT_PS1_COMPRESSSPARSESTATE}" ] &&
+		   [ "$(git config --bool core.sparseCheckout)" = "true" ]; then
+			h="?"
+		fi
+
 		if [ -n "${GIT_PS1_SHOWUPSTREAM-}" ]; then
 			__git_ps1_show_upstream
 		fi
@@ -519,8 +567,8 @@ __git_ps1 ()
 		b="\${__git_ps1_branch_name}"
 	fi
 
-	local f="$w$i$s$u"
-	local gitstring="$c$b${f:+$z$f}$r$p"
+	local f="$h$w$i$s$u"
+	local gitstring="$c$b${f:+$z$f}${sparse}$r$p"
 
 	if [ $pcmode = yes ]; then
 		if [ "${__git_printf_supports_v-}" != yes ]; then
diff --git a/plugins/gitfast/update b/plugins/gitfast/update
index 05054245f..d0947e7d8 100755
--- a/plugins/gitfast/update
+++ b/plugins/gitfast/update
@@ -1,9 +1,8 @@
 #!/bin/sh
 
-url="https://git.kernel.org/pub/scm/git/git.git/plain/contrib/completion"
-version="2.16.0"
+url="https://raw.githubusercontent.com/felipec/git-completion"
+version="1.0"
 
-curl -s -o _git "${url}/git-completion.zsh?h=v${version}" &&
-curl -s -o git-completion.bash "${url}/git-completion.bash?h=v${version}" &&
-curl -s -o git-prompt.sh "${url}/git-prompt.sh?h=v${version}" &&
-git apply updates.patch
+curl -s -o _git "${url}/v${version}/git-completion.zsh" &&
+curl -s -o git-completion.bash "${url}/v${version}/git-completion.bash" &&
+curl -s -o git-prompt.sh "${url}/v${version}/git-prompt.sh"
diff --git a/plugins/gitfast/updates.patch b/plugins/gitfast/updates.patch
deleted file mode 100644
index 28a31f859..000000000
--- a/plugins/gitfast/updates.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-diff --git b/plugins/gitfast/_git a/plugins/gitfast/_git
-index e2554130..a2e3bef5 100644
---- b/plugins/gitfast/_git
-+++ a/plugins/gitfast/_git
-@@ -30,7 +30,7 @@ if [ -z "$script" ]; then
- 	local -a locations
- 	local e
- 	locations=(
--		$(dirname ${funcsourcetrace[1]%:*})/git-completion.bash
-+		"$(dirname ${funcsourcetrace[1]%:*})/git-completion.bash"
- 		'/etc/bash_completion.d/git' # fedora, old debian
- 		'/usr/share/bash-completion/completions/git' # arch, ubuntu, new debian
- 		'/usr/share/bash-completion/git' # gentoo
-@@ -214,8 +214,10 @@ _git ()
- 
- 	if (( $+functions[__${service}_zsh_main] )); then
- 		__${service}_zsh_main
--	else
-+	elif (( $+functions[__${service}_main] )); then
- 		emulate ksh -c __${service}_main
-+	elif (( $+functions[_${service}] )); then
-+		emulate ksh -c _${service}
- 	fi
- 
- 	let _ret && _default && _ret=0
-diff --git b/plugins/gitfast/git-completion.bash a/plugins/gitfast/git-completion.bash
-index 9c8f7380..14012cab 100644
---- b/plugins/gitfast/git-completion.bash
-+++ a/plugins/gitfast/git-completion.bash
-@@ -2915,6 +2915,6 @@ __git_complete gitk __gitk_main
- # when the user has tab-completed the executable name and consequently
- # included the '.exe' suffix.
- #
--if [ Cygwin = "$(uname -o 2>/dev/null)" ]; then
-+if [[ "$OSTYPE" = cygwin* ]]; then
- __git_complete git.exe __git_main
- fi
-diff --git b/plugins/gitfast/git-prompt.sh a/plugins/gitfast/git-prompt.sh
-index 97eacd78..c1de34eb 100644
---- b/plugins/gitfast/git-prompt.sh
-+++ a/plugins/gitfast/git-prompt.sh
-@@ -502,9 +502,11 @@ __git_ps1 ()
- 
- 	local z="${GIT_PS1_STATESEPARATOR-" "}"
- 
--	# NO color option unless in PROMPT_COMMAND mode
--	if [ $pcmode = yes ] && [ -n "${GIT_PS1_SHOWCOLORHINTS-}" ]; then
--		__git_ps1_colorize_gitstring
-+	# NO color option unless in PROMPT_COMMAND mode or it's Zsh
-+	if [ -n "${GIT_PS1_SHOWCOLORHINTS-}" ]; then
-+		if [ $pcmode = yes ] || [ -n "${ZSH_VERSION-}" ]; then
-+			__git_ps1_colorize_gitstring
-+		fi
- 	fi
- 
- 	b=${b##refs/heads/}

From 66f9fdabc1d08374c3eef212928f81ff32e2241e Mon Sep 17 00:00:00 2001
From: Felipe Contreras <felipe.contreras@gmail.com>
Date: Sat, 24 Oct 2020 09:33:43 -0500
Subject: [PATCH 168/869] gitfast: improve command aliases (#9385)

So that compdefs with dashes work as well as underscores:

  compdef _git gc=git_commit

Or:

  compdef _git gc=git-commit

The official Zsh Git completion uses dashes, and this way people don't
have to change their existing definitions.

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
---
 plugins/gitfast/_git | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/plugins/gitfast/_git b/plugins/gitfast/_git
index 46d10d6f9..6ca63ed87 100644
--- a/plugins/gitfast/_git
+++ b/plugins/gitfast/_git
@@ -275,6 +275,8 @@ _git ()
 		emulate ksh -c __${service}_main
 	elif (( $+functions[_${service}] )); then
 		emulate ksh -c _${service}
+	elif ((	$+functions[_${service//-/_}] )); then
+		emulate ksh -c _${service//-/_}
 	fi
 
 	let _ret && _default && _ret=0

From fcb6fa78a1304f9a8eff2a7563658de04a13d499 Mon Sep 17 00:00:00 2001
From: Maksym <maksyms@users.noreply.github.com>
Date: Sat, 24 Oct 2020 22:07:49 +0100
Subject: [PATCH 169/869] aws: add role delegation and MFA support as per IAM
 Best Practices (#8419)

* Added role delegation support and MFA support as per IAM Best Practices

* fix: grep with color enabled breaks profile parsing

* fix: compatible with MacOS basic sed

* docs: Added jq as a dependency

* feat: added variable session duration, if the role to be assumed permits it.

* bug: incorrect assigment for session length

* fix: profile extraction failed with some versions of sed

Fixed the issue that resulted from merging upstream changes to allow "." in the profile name

* fix: broken profile parsing when profile name contains "@"
---
 plugins/aws/README.md      |  2 +-
 plugins/aws/aws.plugin.zsh | 62 +++++++++++++++++++++++++++++++++++---
 2 files changed, 58 insertions(+), 6 deletions(-)

diff --git a/plugins/aws/README.md b/plugins/aws/README.md
index 57c3b54ac..4ceb71425 100644
--- a/plugins/aws/README.md
+++ b/plugins/aws/README.md
@@ -3,7 +3,7 @@
 This plugin provides completion support for [awscli](https://docs.aws.amazon.com/cli/latest/reference/index.html)
 and a few utilities to manage AWS profiles and display them in the prompt.
 
-To use it, add `aws` to the plugins array in your zshrc file.
+To use it, make sure [jq](https://stedolan.github.io/jq/download/) is installed, and add `aws` to the plugins array in your zshrc file.
 
 ```zsh
 plugins=(... aws)
diff --git a/plugins/aws/aws.plugin.zsh b/plugins/aws/aws.plugin.zsh
index 7994963c3..8a68bf0d8 100644
--- a/plugins/aws/aws.plugin.zsh
+++ b/plugins/aws/aws.plugin.zsh
@@ -5,7 +5,7 @@ function agp() {
 # AWS profile selection
 function asp() {
   if [[ -z "$1" ]]; then
-    unset AWS_DEFAULT_PROFILE AWS_PROFILE AWS_EB_PROFILE
+    unset AWS_DEFAULT_PROFILE AWS_PROFILE AWS_EB_PROFILE AWS_ACCESS_KEY_ID AWS_SECRET_ACCESS_KEY AWS_SESSION_TOKEN
     echo AWS profile cleared.
     return
   fi
@@ -18,9 +18,61 @@ function asp() {
     return 1
   fi
 
-  export AWS_DEFAULT_PROFILE=$1
-  export AWS_PROFILE=$1
-  export AWS_EB_PROFILE=$1
+  local exists="$(aws configure get aws_access_key_id --profile $1)"
+  local role_arn="$(aws configure get role_arn --profile $1)"
+  local aws_access_key_id=""
+  local aws_secret_access_key=""
+  local aws_session_token=""
+  if [[ -n $exists || -n $role_arn ]]; then
+    if [[ -n $role_arn ]]; then
+      local mfa_serial="$(aws configure get mfa_serial --profile $1)"
+      local mfa_token=""
+      local mfa_opt=""
+      if [[ -n $mfa_serial ]]; then
+        echo "Please enter your MFA token for $mfa_serial:"
+        read mfa_token
+        echo "Please enter the session duration in seconds (900-43200; default: 3600, which is the default maximum for a role):"
+        read sess_duration
+        if [[ -z $sess_duration ]]; then
+          sess_duration = 3600
+        fi
+        mfa_opt="--serial-number $mfa_serial --token-code $mfa_token --duration-seconds $sess_duration"
+      fi
+
+      local ext_id="$(aws configure get external_id --profile $1)"
+      local extid_opt=""
+      if [[ -n $ext_id ]]; then
+        extid_opt="--external-id $ext_id"
+      fi
+
+      local profile=$1
+      local source_profile="$(aws configure get source_profile --profile $1)"
+      if [[ -n $source_profile ]]; then
+        profile=$source_profile
+      fi
+
+      echo "Assuming role $role_arn using profile $profile"
+      local assume_cmd=(aws sts assume-role "--profile=$profile" "--role-arn $role_arn" "--role-session-name "$profile"" "$mfa_opt" "$extid_opt")
+      local JSON="$(eval ${assume_cmd[@]})"
+
+      aws_access_key_id="$(echo $JSON | jq -r '.Credentials.AccessKeyId')"
+      aws_secret_access_key="$(echo $JSON | jq -r '.Credentials.SecretAccessKey')"
+      aws_session_token="$(echo $JSON | jq -r '.Credentials.SessionToken')"
+    else
+      aws_access_key_id="$(aws configure get aws_access_key_id --profile $1)"
+      aws_secret_access_key="$(aws configure get aws_secret_access_key --profile $1)"
+      aws_session_token=""
+    fi
+
+    export AWS_DEFAULT_PROFILE=$1
+    export AWS_PROFILE=$1
+    export AWS_EB_PROFILE=$1
+    export AWS_ACCESS_KEY_ID=$aws_access_key_id
+    export AWS_SECRET_ACCESS_KEY=$aws_secret_access_key
+    [[ -z "$aws_session_token" ]] && unset AWS_SESSION_TOKEN || export AWS_SESSION_TOKEN=$aws_session_token
+
+    echo "Switched to AWS Profile: $1";
+  fi
 }
 
 function aws_change_access_key() {
@@ -41,7 +93,7 @@ function aws_change_access_key() {
 
 function aws_profiles() {
   [[ -r "${AWS_CONFIG_FILE:-$HOME/.aws/config}" ]] || return 1
-  grep '\[profile' "${AWS_CONFIG_FILE:-$HOME/.aws/config}"|sed -e 's/.*profile \([a-zA-Z0-9@_\.-]*\).*/\1/'
+  grep --color=never -Eo '\[.*\]' "${AWS_CONFIG_FILE:-$HOME/.aws/config}" | sed -E 's/^[[:space:]]*\[(profile)?[[:space:]]*([-_[:alnum:]\.@]+)\][[:space:]]*$/\2/g'
 }
 
 function _aws_profiles() {

From bad9ee00042cc7f63f5271646d31e531a9e8c48c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Tue, 27 Oct 2020 10:33:21 +0100
Subject: [PATCH 170/869] lib: delete zsh session history list

NOTE: it still lives somewhere in the current zsh process. Run `fc -P` to
restore it.
---
 lib/history.zsh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/history.zsh b/lib/history.zsh
index 8d922a30b..1f0f3cc24 100644
--- a/lib/history.zsh
+++ b/lib/history.zsh
@@ -6,7 +6,8 @@ function omz_history {
   if [[ -n "$clear" ]]; then
     # if -c provided, clobber the history file
     echo -n >| "$HISTFILE"
-    echo >&2 History file deleted. Reload the session to see its effects.
+    fc -p "$HISTFILE"
+    echo >&2 History file deleted.
   elif [[ -n "$list" ]]; then
     # if -l provided, run as if calling `fc' directly
     builtin fc "$@"

From d05544562532fdf4d5f4a4d4eba01f4263e17cc7 Mon Sep 17 00:00:00 2001
From: Felipe Contreras <felipe.contreras@gmail.com>
Date: Tue, 27 Oct 2020 04:14:39 -0600
Subject: [PATCH 171/869] gitfast: fetch latest fixes from git-completion
 (#9390)

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
---
 plugins/gitfast/_git                | 43 +++++++++++++++++------------
 plugins/gitfast/git-completion.bash |  6 ++--
 2 files changed, 27 insertions(+), 22 deletions(-)

diff --git a/plugins/gitfast/_git b/plugins/gitfast/_git
index 6ca63ed87..aaea581d5 100644
--- a/plugins/gitfast/_git
+++ b/plugins/gitfast/_git
@@ -27,19 +27,26 @@ zstyle -T ':completion:*:*:git:*' tag-order && \
 zstyle -s ":completion:*:*:git:*" script script
 if [ -z "$script" ]; then
 	local -a locations
-	local e
+	local e bash_completion
+
+	bash_completion=$(pkg-config --variable=completionsdir bash-completion 2>/dev/null) ||
+		bash_completion='/usr/share/bash-completion/completions/'
+
 	locations=(
 		"$(dirname ${funcsourcetrace[1]%:*})"/git-completion.bash
 		"$HOME/.local/share/bash-completion/completions/git"
-		"$(pkg-config --variable=completionsdir bash-completion)"/git
-		'/usr/share/bash-completion/completions/git'
+		"$bash_completion/git"
 		'/etc/bash_completion.d/git' # old debian
 		)
 	for e in $locations; do
 		test -f $e && script="$e" && break
 	done
 fi
+
+local old_complete="$functions[complete]"
+functions[complete]=:
 GIT_SOURCING_ZSH_COMPLETION=y . "$script"
+functions[complete]="$old_complete"
 
 __gitcomp ()
 {
@@ -105,21 +112,6 @@ __gitcomp_nl ()
 	compadd -Q -S "${4- }" -p "${2-}" -- ${(f)1} && _ret=0
 }
 
-__gitcomp_nl_append ()
-{
-	emulate -L zsh
-
-	compset -P '*[=:]'
-	compadd -Q -S "${4- }" -p "${2-}" -- ${(f)1} && _ret=0
-}
-
-__gitcomp_file_direct ()
-{
-	emulate -L zsh
-
-	compadd -f -- ${(f)1} && _ret=0
-}
-
 __gitcomp_file ()
 {
 	emulate -L zsh
@@ -127,6 +119,21 @@ __gitcomp_file ()
 	compadd -f -p "${2-}" -- ${(f)1} && _ret=0
 }
 
+__gitcomp_direct_append ()
+{
+	__gitcomp_direct "$@"
+}
+
+__gitcomp_nl_append ()
+{
+	__gitcomp_nl "$@"
+}
+
+__gitcomp_file_direct ()
+{
+	__gitcomp_file "$1" ""
+}
+
 _git_zsh ()
 {
 	__gitcomp "v1.0"
diff --git a/plugins/gitfast/git-completion.bash b/plugins/gitfast/git-completion.bash
index 76ba7e79f..b93706d17 100644
--- a/plugins/gitfast/git-completion.bash
+++ b/plugins/gitfast/git-completion.bash
@@ -3585,7 +3585,6 @@ __git_func_wrap ()
 # This is NOT a public function; use at your own risk.
 __git_complete ()
 {
-	test -n "$ZSH_VERSION" && return
 	local wrapper="__git_wrap${2}"
 	eval "$wrapper () { __git_func_wrap $2 ; }"
 	complete -o bashdefault -o default -o nospace -F $wrapper $1 2>/dev/null \
@@ -3607,8 +3606,7 @@ if ! git --list-cmds=main >/dev/null 2>&1; then
 	{
 		case "$1" in
 		--list-cmds=*)
-			IFS=, read -r -a cmds <<< "${1##--list-cmds=}"
-			for x in ${cmds[@]}; do
+			while read -r -d ',' x; do
 				case "$x" in
 				nohelpers)
 					;;
@@ -3620,7 +3618,7 @@ if ! git --list-cmds=main >/dev/null 2>&1; then
 					echo ${__git_cmds[$x]}
 					;;
 				esac
-			done
+			done <<< "${1##--list-cmds=},"
 			return
 			;;
 		esac

From 63922b5ec435d04ea31ee33138061f1d812beefe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Wed, 28 Oct 2020 23:08:19 +0100
Subject: [PATCH 172/869] Fix labels in issue templates

---
 .github/ISSUE_TEMPLATE/feature_request.md | 2 +-
 .github/ISSUE_TEMPLATE/support.md         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
index 8c20544c8..788f77368 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -1,7 +1,7 @@
 ---
 name: Feature request
 about: Suggest a feature for Oh My Zsh
-labels: 'feature'
+labels: 'Feature'
 
 ---
 
diff --git a/.github/ISSUE_TEMPLATE/support.md b/.github/ISSUE_TEMPLATE/support.md
index 697f0c0c8..8c4f08044 100644
--- a/.github/ISSUE_TEMPLATE/support.md
+++ b/.github/ISSUE_TEMPLATE/support.md
@@ -1,7 +1,7 @@
 ---
 name: Support
 about: Request support for any problem you're having with Oh My Zsh
-labels: 'support'
+labels: 'Support'
 
 ---
 

From 47d30784c53ed3159fb317d4a1a1cedb105aa278 Mon Sep 17 00:00:00 2001
From: spreiter <36988897+spreiter@users.noreply.github.com>
Date: Thu, 29 Oct 2020 11:54:29 +0100
Subject: [PATCH 173/869] colorize: add compatibility for zsh < 5.1 (#9400)

The direct assignment of a local array is not possible in older ZSH version, as used by RHEL/CentOS 7.
---
 plugins/colorize/colorize.plugin.zsh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/plugins/colorize/colorize.plugin.zsh b/plugins/colorize/colorize.plugin.zsh
index 80b69190f..cb5ac36f5 100644
--- a/plugins/colorize/colorize.plugin.zsh
+++ b/plugins/colorize/colorize.plugin.zsh
@@ -6,7 +6,8 @@ alias cless="colorize_less"
 ZSH_COLORIZE_PLUGIN_PATH=$0:A
 
 colorize_check_requirements() {
-    local available_tools=("chroma" "pygmentize")
+    local -a available_tools
+    available_tools=("chroma" "pygmentize")
 
     if [ -z "$ZSH_COLORIZE_TOOL" ]; then
         if (( $+commands[pygmentize] )); then

From 77f74570512ab9fef0669c23e8613f204c992d48 Mon Sep 17 00:00:00 2001
From: Setu Shah <setu4993@yahoo.co.in>
Date: Thu, 29 Oct 2020 03:55:41 -0700
Subject: [PATCH 174/869] aws: get and set session token if available (#9397)

---
 plugins/aws/aws.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/aws/aws.plugin.zsh b/plugins/aws/aws.plugin.zsh
index 8a68bf0d8..fe1f098e8 100644
--- a/plugins/aws/aws.plugin.zsh
+++ b/plugins/aws/aws.plugin.zsh
@@ -61,7 +61,7 @@ function asp() {
     else
       aws_access_key_id="$(aws configure get aws_access_key_id --profile $1)"
       aws_secret_access_key="$(aws configure get aws_secret_access_key --profile $1)"
-      aws_session_token=""
+      aws_session_token="$(aws configure get aws_session_token --profile $1)"
     fi
 
     export AWS_DEFAULT_PROFILE=$1

From 39c79493feb71da4ba3b69eb82229804b27209cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Thu, 29 Oct 2020 12:22:50 +0100
Subject: [PATCH 175/869] Add maintainer for aws plugin

---
 .github/CODEOWNERS | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index c3990c4ee..e16ebb39b 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1,4 +1,5 @@
 # Plugin owners
-plugins/gitfast/ @felipec
-plugins/sdk/ @rgoldberg
-plugins/git-lfs/ @vietduc01100001
+plugins/aws/                        @maksyms
+plugins/git-lfs/                    @vietduc01100001
+plugins/gitfast/                    @felipec
+plugins/sdk/                        @rgoldberg

From 852a44094a3bb4df39f8f778bc7ada2ddda09727 Mon Sep 17 00:00:00 2001
From: Maksym <maksyms@users.noreply.github.com>
Date: Thu, 29 Oct 2020 21:13:36 +0000
Subject: [PATCH 176/869] aws: split setting profile from changing profile
 (#9402)

the change to assume a role when it is specified in configuration broke some workflows. This fix addresses that

Fixes #9394
---
 plugins/aws/README.md      |  7 +++++++
 plugins/aws/aws.plugin.zsh | 24 +++++++++++++++++++++++-
 2 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/plugins/aws/README.md b/plugins/aws/README.md
index 4ceb71425..851f586dd 100644
--- a/plugins/aws/README.md
+++ b/plugins/aws/README.md
@@ -15,6 +15,13 @@ plugins=(... aws)
   It also sets `$AWS_EB_PROFILE` to `<profile>` for the Elastic Beanstalk CLI.
   Run `asp` without arguments to clear the profile.
 
+* `acp [<profile>]`: in addition to `asp` functionality, it actually changes the profile by
+   assuming the role specified in the `<profile>` configuration. It supports MFA and sets
+   `$AWS_ACCESS_KEY_ID`, `$AWS_SECRET_ACCESS_KEY` and `$AWS_SESSION_TOKEN`, if obtained. It
+   requires the roles to be configured as per the
+   [official guide](https://docs.aws.amazon.com/cli/latest/userguide/cli-configure-role.html).
+   Run `acp` without arguments to clear the profile.
+
 * `agp`: gets the current value of `$AWS_PROFILE`.
 
 * `aws_change_access_key`: changes the AWS access key of a profile.
diff --git a/plugins/aws/aws.plugin.zsh b/plugins/aws/aws.plugin.zsh
index fe1f098e8..8149ba121 100644
--- a/plugins/aws/aws.plugin.zsh
+++ b/plugins/aws/aws.plugin.zsh
@@ -4,6 +4,27 @@ function agp() {
 
 # AWS profile selection
 function asp() {
+  if [[ -z "$1" ]]; then
+    unset AWS_DEFAULT_PROFILE AWS_PROFILE AWS_EB_PROFILE
+    echo AWS profile cleared.
+    return
+  fi
+
+  local -a available_profiles
+  available_profiles=($(aws_profiles))
+  if [[ -z "${available_profiles[(r)$1]}" ]]; then
+    echo "${fg[red]}Profile '$1' not found in '${AWS_CONFIG_FILE:-$HOME/.aws/config}'" >&2
+    echo "Available profiles: ${(j:, :)available_profiles:-no profiles found}${reset_color}" >&2
+    return 1
+  fi
+
+  export AWS_DEFAULT_PROFILE=$1
+  export AWS_PROFILE=$1
+  export AWS_EB_PROFILE=$1
+}
+
+# AWS profile switch
+function acp() {
   if [[ -z "$1" ]]; then
     unset AWS_DEFAULT_PROFILE AWS_PROFILE AWS_EB_PROFILE AWS_ACCESS_KEY_ID AWS_SECRET_ACCESS_KEY AWS_SESSION_TOKEN
     echo AWS profile cleared.
@@ -34,7 +55,7 @@ function asp() {
         echo "Please enter the session duration in seconds (900-43200; default: 3600, which is the default maximum for a role):"
         read sess_duration
         if [[ -z $sess_duration ]]; then
-          sess_duration = 3600
+          sess_duration="3600"
         fi
         mfa_opt="--serial-number $mfa_serial --token-code $mfa_token --duration-seconds $sess_duration"
       fi
@@ -100,6 +121,7 @@ function _aws_profiles() {
   reply=($(aws_profiles))
 }
 compctl -K _aws_profiles asp aws_change_access_key
+compctl -K _aws_profiles acp aws_change_access_key
 
 # AWS prompt
 function aws_prompt_info() {

From 3e6ee85a161c8089955c19364728e167025a911d Mon Sep 17 00:00:00 2001
From: Maksym <maksyms@users.noreply.github.com>
Date: Wed, 4 Nov 2020 21:10:22 +0000
Subject: [PATCH 177/869] fix(aws): support MFA for profiles without role to
 assume (#9411)

Previously, the plugin only supported MFA for profiles that had a role to assume, specified in role_arn. Now, the plugin supports MFA for profiles without a role to assume.

Closes #9408

* refactor(aws plugin): remove dependency on jq

Previously, acp command relied on jq. Now that dependency has been removed, as well as some linter suggestions implemented.
---
 plugins/aws/README.md      |  6 +--
 plugins/aws/aws.plugin.zsh | 98 +++++++++++++++++++++-----------------
 2 files changed, 58 insertions(+), 46 deletions(-)

diff --git a/plugins/aws/README.md b/plugins/aws/README.md
index 851f586dd..4c2ae96e5 100644
--- a/plugins/aws/README.md
+++ b/plugins/aws/README.md
@@ -3,7 +3,7 @@
 This plugin provides completion support for [awscli](https://docs.aws.amazon.com/cli/latest/reference/index.html)
 and a few utilities to manage AWS profiles and display them in the prompt.
 
-To use it, make sure [jq](https://stedolan.github.io/jq/download/) is installed, and add `aws` to the plugins array in your zshrc file.
+To use it, add `aws` to the plugins array in your zshrc file.
 
 ```zsh
 plugins=(... aws)
@@ -40,6 +40,6 @@ plugins=(... aws)
 The plugin creates an `aws_prompt_info` function that you can use in your theme, which displays
 the current `$AWS_PROFILE`. It uses two variables to control how that is shown:
 
-- ZSH_THEME_AWS_PREFIX: sets the prefix of the AWS_PROFILE. Defaults to `<aws:`.
+* ZSH_THEME_AWS_PREFIX: sets the prefix of the AWS_PROFILE. Defaults to `<aws:`.
 
-- ZSH_THEME_AWS_SUFFIX: sets the suffix of the AWS_PROFILE. Defaults to `>`.
+* ZSH_THEME_AWS_SUFFIX: sets the suffix of the AWS_PROFILE. Defaults to `>`.
diff --git a/plugins/aws/aws.plugin.zsh b/plugins/aws/aws.plugin.zsh
index 8149ba121..e6959759e 100644
--- a/plugins/aws/aws.plugin.zsh
+++ b/plugins/aws/aws.plugin.zsh
@@ -39,60 +39,73 @@ function acp() {
     return 1
   fi
 
-  local exists="$(aws configure get aws_access_key_id --profile $1)"
+  local aws_access_key_id="$(aws configure get aws_access_key_id --profile $1)"
+  local aws_secret_access_key="$(aws configure get aws_secret_access_key --profile $1)"
+  local aws_session_token="$(aws configure get aws_session_token --profile $1)"
+  local mfa_serial="$(aws configure get mfa_serial --profile $1)"
   local role_arn="$(aws configure get role_arn --profile $1)"
-  local aws_access_key_id=""
-  local aws_secret_access_key=""
-  local aws_session_token=""
-  if [[ -n $exists || -n $role_arn ]]; then
-    if [[ -n $role_arn ]]; then
-      local mfa_serial="$(aws configure get mfa_serial --profile $1)"
-      local mfa_token=""
-      local mfa_opt=""
-      if [[ -n $mfa_serial ]]; then
-        echo "Please enter your MFA token for $mfa_serial:"
-        read mfa_token
-        echo "Please enter the session duration in seconds (900-43200; default: 3600, which is the default maximum for a role):"
-        read sess_duration
-        if [[ -z $sess_duration ]]; then
-          sess_duration="3600"
-        fi
-        mfa_opt="--serial-number $mfa_serial --token-code $mfa_token --duration-seconds $sess_duration"
-      fi
 
-      local ext_id="$(aws configure get external_id --profile $1)"
-      local extid_opt=""
-      if [[ -n $ext_id ]]; then
-        extid_opt="--external-id $ext_id"
-      fi
+  # First, if the profile has MFA configured, lets get the token and session duration
+  local mfa_opt=""
 
-      local profile=$1
-      local source_profile="$(aws configure get source_profile --profile $1)"
-      if [[ -n $source_profile ]]; then
-        profile=$source_profile
-      fi
+  if [[ -n $mfa_serial ]]; then
+    local mfa_token=""
+    echo "Please enter your MFA token for $mfa_serial:"
+    read -r mfa_token
+    echo "Please enter the session duration in seconds (900-43200; default: 3600, which is the default maximum for a role):"
+    read -r sess_duration
+    if [[ -z $sess_duration ]]; then
+      sess_duration="3600"
+    fi
+    mfa_opt="--serial-number $mfa_serial --token-code $mfa_token --duration-seconds $sess_duration"
+  fi
 
-      echo "Assuming role $role_arn using profile $profile"
-      local assume_cmd=(aws sts assume-role "--profile=$profile" "--role-arn $role_arn" "--role-session-name "$profile"" "$mfa_opt" "$extid_opt")
-      local JSON="$(eval ${assume_cmd[@]})"
+  # Now see whether we need to just MFA for the current role, or assume a different one
+  local credentials_output=""
+  if [[ -n $role_arn ]]; then
+    # Means we need to assume a specified role
 
-      aws_access_key_id="$(echo $JSON | jq -r '.Credentials.AccessKeyId')"
-      aws_secret_access_key="$(echo $JSON | jq -r '.Credentials.SecretAccessKey')"
-      aws_session_token="$(echo $JSON | jq -r '.Credentials.SessionToken')"
-    else
-      aws_access_key_id="$(aws configure get aws_access_key_id --profile $1)"
-      aws_secret_access_key="$(aws configure get aws_secret_access_key --profile $1)"
-      aws_session_token="$(aws configure get aws_session_token --profile $1)"
+    # Check whether external_id is configured to use while assuming the role
+    local ext_id="$(aws configure get external_id --profile $1)"
+    local extid_opt=""
+    if [[ -n $ext_id ]]; then
+      extid_opt="--external-id $ext_id"
     fi
 
+    # Get source profile to use to assume role
+    local profile=$1
+    local source_profile="$(aws configure get source_profile --profile "$1")"
+    if [[ -n $source_profile ]]; then
+      profile=$source_profile
+    fi
+
+    echo "Assuming role $role_arn using profile $profile"
+    local assume_cmd=(aws sts assume-role "--profile=$profile" "--role-arn $role_arn" "--role-session-name $profile" "$mfa_opt" "$extid_opt"
+      "--query '[Credentials.AccessKeyId,Credentials.SecretAccessKey,Credentials.SessionToken]' --output text | tr '\t' '\n'")
+    credentials_output="$(eval "${assume_cmd[@]}")"
+  elif [[ -n $mfa_opt ]]; then
+    # Means we only need to do MFA
+    echo "Obtaining session token for profile $profile"
+    local get_token_cmd=(aws sts get-session-token "--profile=$profile" "$mfa_opt"
+      "--query '[Credentials.AccessKeyId,Credentials.SecretAccessKey,Credentials.SessionToken]' --output text | tr '\t' '\n'")
+    credentials_output="$(eval "${get_token_cmd[@]}")"
+  fi
+
+  if [[ -n $credentials_output ]]; then
+    local credentials=("${(f)credentials_output}")
+    aws_access_key_id=${credentials[1]}
+    aws_secret_access_key=${credentials[2]}
+    aws_session_token=${credentials[3]}
+  fi
+
+  if [[ -n $aws_access_key_id && -n $aws_secret_access_key ]]; then
     export AWS_DEFAULT_PROFILE=$1
     export AWS_PROFILE=$1
     export AWS_EB_PROFILE=$1
     export AWS_ACCESS_KEY_ID=$aws_access_key_id
     export AWS_SECRET_ACCESS_KEY=$aws_secret_access_key
     [[ -z "$aws_session_token" ]] && unset AWS_SESSION_TOKEN || export AWS_SESSION_TOKEN=$aws_session_token
-
-    echo "Switched to AWS Profile: $1";
+    echo "Switched to AWS Profile: $1"
   fi
 }
 
@@ -120,8 +133,7 @@ function aws_profiles() {
 function _aws_profiles() {
   reply=($(aws_profiles))
 }
-compctl -K _aws_profiles asp aws_change_access_key
-compctl -K _aws_profiles acp aws_change_access_key
+compctl -K _aws_profiles asp acp aws_change_access_key
 
 # AWS prompt
 function aws_prompt_info() {

From 28ed2880c766eb5a360354fb71d597dbc07abaa0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Mon, 9 Nov 2020 12:00:06 +0100
Subject: [PATCH 178/869] Revert "lib: remove share_history"

This reverts commit 23760228908d14a4644718869d5ebfb7b0dde6a7.

Fixes #9430
---
 lib/history.zsh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/history.zsh b/lib/history.zsh
index 1f0f3cc24..794076904 100644
--- a/lib/history.zsh
+++ b/lib/history.zsh
@@ -37,3 +37,4 @@ setopt hist_expire_dups_first # delete duplicates first when HISTFILE size excee
 setopt hist_ignore_dups       # ignore duplicated commands history list
 setopt hist_ignore_space      # ignore commands that start with space
 setopt hist_verify            # show command with history expansion to user before running it
+setopt share_history          # share command history data

From fa780867d9745bfbd6c190859645d4c92405d961 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ely=C3=A9zer=20Rezende?= <elyezermr@gmail.com>
Date: Mon, 9 Nov 2020 06:09:10 -0500
Subject: [PATCH 179/869] fix(fzf): consistently ignore .git directory in
 `FZF_DEFAULT_COMMAND` (#9421)

Be consistent and ignore contents of `.git` directory no matter how FZF_DEFAULT_COMMAND is set.
---
 plugins/fzf/fzf.plugin.zsh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/fzf/fzf.plugin.zsh b/plugins/fzf/fzf.plugin.zsh
index 2f48215d5..524089983 100644
--- a/plugins/fzf/fzf.plugin.zsh
+++ b/plugins/fzf/fzf.plugin.zsh
@@ -154,10 +154,10 @@ unset -f setup_using_opensuse_package setup_using_debian_package setup_using_bas
 
 if [[ -z "$FZF_DEFAULT_COMMAND" ]]; then
     if (( $+commands[rg] )); then
-        export FZF_DEFAULT_COMMAND='rg --files --hidden'
+        export FZF_DEFAULT_COMMAND='rg --files --hidden --glob "!.git/*"'
     elif (( $+commands[fd] )); then
         export FZF_DEFAULT_COMMAND='fd --type f --hidden --exclude .git'
     elif (( $+commands[ag] )); then
-        export FZF_DEFAULT_COMMAND='ag -l --hidden -g ""'
+        export FZF_DEFAULT_COMMAND='ag -l --hidden -g "" --ignore .git'
     fi
 fi

From a3e0f4f2afe03a207b98d4c0aaecb5bbaa796883 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Mon, 9 Nov 2020 18:33:59 +0100
Subject: [PATCH 180/869] fix(lib): make opts local in omz_urlencode to fix
 scoping bug

Fixes error message when using zplug, due to $opts having been declared
as an associative array:

  omz_urlencode:2: bad set of key/value pairs for associative array

Fixes #9429
---
 lib/functions.zsh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/functions.zsh b/lib/functions.zsh
index 58f0e3fb0..15526cd5f 100644
--- a/lib/functions.zsh
+++ b/lib/functions.zsh
@@ -134,6 +134,7 @@ zmodload zsh/langinfo
 #    -P causes spaces to be encoded as '%20' instead of '+'
 function omz_urlencode() {
   emulate -L zsh
+  local -a opts
   zparseopts -D -E -a opts r m P
 
   local in_str=$1

From eef04c62c2dfbd81f9fee6752e3b7e0b9c3bf617 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Sat, 31 Oct 2020 23:53:03 +0100
Subject: [PATCH 181/869] fix(installer): fix error message if $ZSH exists when
 installing

Also prefix all formatting functions with fmt_

Related: #9427
---
 .editorconfig    |   6 +-
 tools/install.sh | 365 +++++++++++++++++++++++++----------------------
 2 files changed, 195 insertions(+), 176 deletions(-)

diff --git a/.editorconfig b/.editorconfig
index aa18e0e5c..b5321de59 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -4,7 +4,5 @@ root = true
 end_of_line = lf
 insert_final_newline = true
 charset = utf-8
-
-[*.sh]
-indent_size = 4
-indent_style = tab
+indent_size = 2
+indent_style = space
diff --git a/tools/install.sh b/tools/install.sh
index 61b21cb9e..953c68baf 100755
--- a/tools/install.sh
+++ b/tools/install.sh
@@ -37,6 +37,9 @@
 #
 set -e
 
+# Track if $ZSH was provided
+custom_zsh=${ZSH:+yes}
+
 # Default settings
 ZSH=${ZSH:-~/.oh-my-zsh}
 REPO=${REPO:-ohmyzsh/ohmyzsh}
@@ -53,12 +56,16 @@ command_exists() {
 	command -v "$@" >/dev/null 2>&1
 }
 
-error() {
-	echo ${RED}"Error: $@"${RESET} >&2
+fmt_error() {
+  echo ${RED}"Error: $@"${RESET} >&2
 }
 
-underline() {
-	echo "$(printf '\033[4m')$@$(printf '\033[24m')"
+fmt_underline() {
+  echo "$(printf '\033[4m')$@$(printf '\033[24m')"
+}
+
+fmt_code() {
+  echo "\`$(printf '\033[38;5;247m')$@${RESET}\`"
 }
 
 setup_color() {
@@ -81,71 +88,71 @@ setup_color() {
 }
 
 setup_ohmyzsh() {
-	# Prevent the cloned repository from having insecure permissions. Failing to do
-	# so causes compinit() calls to fail with "command not found: compdef" errors
-	# for users with insecure umasks (e.g., "002", allowing group writability). Note
-	# that this will be ignored under Cygwin by default, as Windows ACLs take
-	# precedence over umasks except for filesystems mounted with option "noacl".
-	umask g-w,o-w
+  # Prevent the cloned repository from having insecure permissions. Failing to do
+  # so causes compinit() calls to fail with "command not found: compdef" errors
+  # for users with insecure umasks (e.g., "002", allowing group writability). Note
+  # that this will be ignored under Cygwin by default, as Windows ACLs take
+  # precedence over umasks except for filesystems mounted with option "noacl".
+  umask g-w,o-w
 
-	echo "${BLUE}Cloning Oh My Zsh...${RESET}"
+  echo "${BLUE}Cloning Oh My Zsh...${RESET}"
 
-	command_exists git || {
-		error "git is not installed"
-		exit 1
-	}
+  command_exists git || {
+    fmt_error "git is not installed"
+    exit 1
+  }
 
-	if [ "$OSTYPE" = cygwin ] && git --version | grep -q msysgit; then
-		error "Windows/MSYS Git is not supported on Cygwin"
-		error "Make sure the Cygwin git package is installed and is first on the \$PATH"
-		exit 1
-	fi
+  if [ "$OSTYPE" = cygwin ] && git --version | grep -q msysgit; then
+    fmt_error "Windows/MSYS Git is not supported on Cygwin"
+    fmt_error "Make sure the Cygwin git package is installed and is first on the \$PATH"
+    exit 1
+  fi
 
-	git clone -c core.eol=lf -c core.autocrlf=false \
-		-c fsck.zeroPaddedFilemode=ignore \
-		-c fetch.fsck.zeroPaddedFilemode=ignore \
-		-c receive.fsck.zeroPaddedFilemode=ignore \
-		--depth=1 --branch "$BRANCH" "$REMOTE" "$ZSH" || {
-		error "git clone of oh-my-zsh repo failed"
-		exit 1
-	}
+  git clone -c core.eol=lf -c core.autocrlf=false \
+    -c fsck.zeroPaddedFilemode=ignore \
+    -c fetch.fsck.zeroPaddedFilemode=ignore \
+    -c receive.fsck.zeroPaddedFilemode=ignore \
+    --depth=1 --branch "$BRANCH" "$REMOTE" "$ZSH" || {
+    fmt_error "git clone of oh-my-zsh repo failed"
+    exit 1
+  }
 
-	echo
+  echo
 }
 
 setup_zshrc() {
-	# Keep most recent old .zshrc at .zshrc.pre-oh-my-zsh, and older ones
-	# with datestamp of installation that moved them aside, so we never actually
-	# destroy a user's original zshrc
-	echo "${BLUE}Looking for an existing zsh config...${RESET}"
+  # Keep most recent old .zshrc at .zshrc.pre-oh-my-zsh, and older ones
+  # with datestamp of installation that moved them aside, so we never actually
+  # destroy a user's original zshrc
+  echo "${BLUE}Looking for an existing zsh config...${RESET}"
 
-	# Must use this exact name so uninstall.sh can find it
-	OLD_ZSHRC=~/.zshrc.pre-oh-my-zsh
-	if [ -f ~/.zshrc ] || [ -h ~/.zshrc ]; then
-		# Skip this if the user doesn't want to replace an existing .zshrc
-		if [ $KEEP_ZSHRC = yes ]; then
-			echo "${YELLOW}Found ~/.zshrc.${RESET} ${GREEN}Keeping...${RESET}"
-			return
-		fi
-		if [ -e "$OLD_ZSHRC" ]; then
-			OLD_OLD_ZSHRC="${OLD_ZSHRC}-$(date +%Y-%m-%d_%H-%M-%S)"
-			if [ -e "$OLD_OLD_ZSHRC" ]; then
-				error "$OLD_OLD_ZSHRC exists. Can't back up ${OLD_ZSHRC}"
-				error "re-run the installer again in a couple of seconds"
-				exit 1
-			fi
-			mv "$OLD_ZSHRC" "${OLD_OLD_ZSHRC}"
+  # Must use this exact name so uninstall.sh can find it
+  OLD_ZSHRC=~/.zshrc.pre-oh-my-zsh
+  if [ -f ~/.zshrc ] || [ -h ~/.zshrc ]; then
+    # Skip this if the user doesn't want to replace an existing .zshrc
+    if [ $KEEP_ZSHRC = yes ]; then
+      echo "${YELLOW}Found ~/.zshrc.${RESET} ${GREEN}Keeping...${RESET}"
+      return
+    fi
+    if [ -e "$OLD_ZSHRC" ]; then
+      OLD_OLD_ZSHRC="${OLD_ZSHRC}-$(date +%Y-%m-%d_%H-%M-%S)"
+      if [ -e "$OLD_OLD_ZSHRC" ]; then
+        fmt_error "$OLD_OLD_ZSHRC exists. Can't back up ${OLD_ZSHRC}"
+        fmt_error "re-run the installer again in a couple of seconds"
+        exit 1
+      fi
+      mv "$OLD_ZSHRC" "${OLD_OLD_ZSHRC}"
 
-			echo "${YELLOW}Found old ~/.zshrc.pre-oh-my-zsh." \
-				"${GREEN}Backing up to ${OLD_OLD_ZSHRC}${RESET}"
-		fi
-		echo "${YELLOW}Found ~/.zshrc.${RESET} ${GREEN}Backing up to ${OLD_ZSHRC}${RESET}"
-		mv ~/.zshrc "$OLD_ZSHRC"
-	fi
+      echo "${YELLOW}Found old ~/.zshrc.pre-oh-my-zsh." \
+        "${GREEN}Backing up to ${OLD_OLD_ZSHRC}${RESET}"
+    fi
+    echo "${YELLOW}Found ~/.zshrc.${RESET} ${GREEN}Backing up to ${OLD_ZSHRC}${RESET}"
+    mv ~/.zshrc "$OLD_ZSHRC"
+  fi
 
-	echo "${GREEN}Using the Oh My Zsh template file and adding it to ~/.zshrc.${RESET}"
+  echo "${GREEN}Using the Oh My Zsh template file and adding it to ~/.zshrc.${RESET}"
 
-	sed "/^export ZSH=/ c\\
+  sed "/^export ZSH=/ c\\
 export ZSH=\"$ZSH\"
 " "$ZSH/templates/zshrc.zsh-template" > ~/.zshrc-omztemp
 	mv -f ~/.zshrc-omztemp ~/.zshrc
@@ -154,146 +161,160 @@ export ZSH=\"$ZSH\"
 }
 
 setup_shell() {
-	# Skip setup if the user wants or stdin is closed (not running interactively).
-	if [ $CHSH = no ]; then
-		return
-	fi
+  # Skip setup if the user wants or stdin is closed (not running interactively).
+  if [ $CHSH = no ]; then
+    return
+  fi
 
-	# If this user's login shell is already "zsh", do not attempt to switch.
-	if [ "$(basename "$SHELL")" = "zsh" ]; then
-		return
-	fi
+  # If this user's login shell is already "zsh", do not attempt to switch.
+  if [ "$(basename -- "$SHELL")" = "zsh" ]; then
+    return
+  fi
 
-	# If this platform doesn't provide a "chsh" command, bail out.
-	if ! command_exists chsh; then
-		cat <<-EOF
-			I can't change your shell automatically because this system does not have chsh.
-			${BLUE}Please manually change your default shell to zsh${RESET}
-		EOF
-		return
-	fi
+  # If this platform doesn't provide a "chsh" command, bail out.
+  if ! command_exists chsh; then
+    cat <<EOF
+I can't change your shell automatically because this system does not have chsh.
+${BLUE}Please manually change your default shell to zsh${RESET}
+EOF
+    return
+  fi
 
-	echo "${BLUE}Time to change your default shell to zsh:${RESET}"
+  echo "${BLUE}Time to change your default shell to zsh:${RESET}"
 
-	# Prompt for user choice on changing the default login shell
-	printf "${YELLOW}Do you want to change your default shell to zsh? [Y/n]${RESET} "
-	read opt
-	case $opt in
-		y*|Y*|"") echo "Changing the shell..." ;;
-		n*|N*) echo "Shell change skipped."; return ;;
-		*) echo "Invalid choice. Shell change skipped."; return ;;
-	esac
+  # Prompt for user choice on changing the default login shell
+  printf "${YELLOW}Do you want to change your default shell to zsh? [Y/n]${RESET} "
+  read opt
+  case $opt in
+    y*|Y*|"") echo "Changing the shell..." ;;
+    n*|N*) echo "Shell change skipped."; return ;;
+    *) echo "Invalid choice. Shell change skipped."; return ;;
+  esac
 
-	# Check if we're running on Termux
-	case "$PREFIX" in
-		*com.termux*) termux=true; zsh=zsh ;;
-		*) termux=false ;;
-	esac
+  # Check if we're running on Termux
+  case "$PREFIX" in
+    *com.termux*) termux=true; zsh=zsh ;;
+    *) termux=false ;;
+  esac
 
-	if [ "$termux" != true ]; then
-		# Test for the right location of the "shells" file
-		if [ -f /etc/shells ]; then
-			shells_file=/etc/shells
-		elif [ -f /usr/share/defaults/etc/shells ]; then # Solus OS
-			shells_file=/usr/share/defaults/etc/shells
-		else
-			error "could not find /etc/shells file. Change your default shell manually."
-			return
-		fi
+  if [ "$termux" != true ]; then
+    # Test for the right location of the "shells" file
+    if [ -f /etc/shells ]; then
+      shells_file=/etc/shells
+    elif [ -f /usr/share/defaults/etc/shells ]; then # Solus OS
+      shells_file=/usr/share/defaults/etc/shells
+    else
+      fmt_error "could not find /etc/shells file. Change your default shell manually."
+      return
+    fi
 
-		# Get the path to the right zsh binary
-		# 1. Use the most preceding one based on $PATH, then check that it's in the shells file
-		# 2. If that fails, get a zsh path from the shells file, then check it actually exists
-		if ! zsh=$(which zsh) || ! grep -qx "$zsh" "$shells_file"; then
-			if ! zsh=$(grep '^/.*/zsh$' "$shells_file" | tail -1) || [ ! -f "$zsh" ]; then
-				error "no zsh binary found or not present in '$shells_file'"
-				error "change your default shell manually."
-				return
-			fi
-		fi
-	fi
+    # Get the path to the right zsh binary
+    # 1. Use the most preceding one based on $PATH, then check that it's in the shells file
+    # 2. If that fails, get a zsh path from the shells file, then check it actually exists
+    if ! zsh=$(which zsh) || ! grep -qx "$zsh" "$shells_file"; then
+      if ! zsh=$(grep '^/.*/zsh$' "$shells_file" | tail -1) || [ ! -f "$zsh" ]; then
+        fmt_error "no zsh binary found or not present in '$shells_file'"
+        fmt_error "change your default shell manually."
+        return
+      fi
+    fi
+  fi
 
-	# We're going to change the default shell, so back up the current one
-	if [ -n "$SHELL" ]; then
-		echo $SHELL > ~/.shell.pre-oh-my-zsh
-	else
-		grep "^$USER:" /etc/passwd | awk -F: '{print $7}' > ~/.shell.pre-oh-my-zsh
-	fi
+  # We're going to change the default shell, so back up the current one
+  if [ -n "$SHELL" ]; then
+    echo $SHELL > ~/.shell.pre-oh-my-zsh
+  else
+    grep "^$USER:" /etc/passwd | awk -F: '{print $7}' > ~/.shell.pre-oh-my-zsh
+  fi
 
-	# Actually change the default shell to zsh
-	if ! chsh -s "$zsh"; then
-		error "chsh command unsuccessful. Change your default shell manually."
-	else
-		export SHELL="$zsh"
-		echo "${GREEN}Shell successfully changed to '$zsh'.${RESET}"
-	fi
+  # Actually change the default shell to zsh
+  if ! chsh -s "$zsh"; then
+    fmt_error "chsh command unsuccessful. Change your default shell manually."
+  else
+    export SHELL="$zsh"
+    echo "${GREEN}Shell successfully changed to '$zsh'.${RESET}"
+  fi
 
-	echo
+  echo
 }
 
 main() {
-	# Run as unattended if stdin is closed
-	if [ ! -t 0 ]; then
-		RUNZSH=no
-		CHSH=no
-	fi
+  # Run as unattended if stdin is not a tty
+  if [ ! -t 0 ]; then
+    RUNZSH=no
+    CHSH=no
+  fi
 
-	# Parse arguments
-	while [ $# -gt 0 ]; do
-		case $1 in
-			--unattended) RUNZSH=no; CHSH=no ;;
-			--skip-chsh) CHSH=no ;;
-			--keep-zshrc) KEEP_ZSHRC=yes ;;
-		esac
-		shift
-	done
+  # Parse arguments
+  while [ $# -gt 0 ]; do
+    case $1 in
+      --unattended) RUNZSH=no; CHSH=no ;;
+      --skip-chsh) CHSH=no ;;
+      --keep-zshrc) KEEP_ZSHRC=yes ;;
+    esac
+    shift
+  done
 
-	setup_color
+  setup_color
 
-	if ! command_exists zsh; then
-		echo "${YELLOW}Zsh is not installed.${RESET} Please install zsh first."
-		exit 1
-	fi
+  if ! command_exists zsh; then
+    echo "${YELLOW}Zsh is not installed.${RESET} Please install zsh first."
+    exit 1
+  fi
 
-	if [ -d "$ZSH" ]; then
-		cat <<-EOF
-			${YELLOW}You already have Oh My Zsh installed.${RESET}
-			You'll need to remove '$ZSH' if you want to reinstall.
-		EOF
-		exit 1
-	fi
+  if [ -d "$ZSH" ]; then
+    echo "${YELLOW}The \$ZSH folder already exists ($ZSH).${RESET}"
+    if [ "$custom_zsh" = yes ]; then
+      cat <<EOF
 
-	setup_ohmyzsh
-	setup_zshrc
-	setup_shell
+You ran the installer with the \$ZSH setting or the \$ZSH variable is
+exported. You have 3 options:
 
-	printf "$GREEN"
-	cat <<-'EOF'
-		         __                                     __
-		  ____  / /_     ____ ___  __  __   ____  _____/ /_
-		 / __ \/ __ \   / __ `__ \/ / / /  /_  / / ___/ __ \
-		/ /_/ / / / /  / / / / / / /_/ /    / /_(__  ) / / /
-		\____/_/ /_/  /_/ /_/ /_/\__, /    /___/____/_/ /_/
-		                        /____/                       ....is now installed!
+1. Unset the ZSH variable when calling the installer:
+   $(fmt_code "ZSH= sh install.sh")
+2. Install Oh My Zsh to a directory that doesn't exist yet:
+   $(fmt_code "ZSH=path/to/new/ohmyzsh/folder sh install.sh")
+3. (Caution) If the folder doesn't contain important information,
+   you can just remove it with $(fmt_code "rm -r $ZSH")
+
+EOF
+    else
+      echo "You'll need to remove it if you want to reinstall."
+    fi
+    exit 1
+  fi
+
+  setup_ohmyzsh
+  setup_zshrc
+  setup_shell
+
+  printf "$GREEN"
+  cat <<'EOF'
+         __                                     __
+  ____  / /_     ____ ___  __  __   ____  _____/ /_
+ / __ \/ __ \   / __ `__ \/ / / /  /_  / / ___/ __ \
+/ /_/ / / / /  / / / / / / /_/ /    / /_(__  ) / / /
+\____/_/ /_/  /_/ /_/ /_/\__, /    /___/____/_/ /_/
+                        /____/                       ....is now installed!
 
 
-	EOF
-	cat <<-EOF
-		Before you scream Oh My Zsh! please look over the ~/.zshrc file to select plugins, themes, and options.
+EOF
+  cat <<EOF
+Before you scream Oh My Zsh! please look over the ~/.zshrc file to select plugins, themes, and options.
 
-		• Follow us on Twitter: $(underline https://twitter.com/ohmyzsh)
-		• Join our Discord server: $(underline https://discord.gg/ohmyzsh)
-		• Get stickers, shirts, coffee mugs and other swag: $(underline https://shop.planetargon.com/collections/oh-my-zsh)
+• Follow us on Twitter: $(fmt_underline https://twitter.com/ohmyzsh)
+• Join our Discord server: $(fmt_underline https://discord.gg/ohmyzsh)
+• Get stickers, shirts, coffee mugs and other swag: $(fmt_underline https://shop.planetargon.com/collections/oh-my-zsh)
 
-	EOF
-	printf "$RESET"
+EOF
+  printf "$RESET"
 
-	if [ $RUNZSH = no ]; then
-		echo "${YELLOW}Run zsh to try it out.${RESET}"
-		exit
-	fi
+  if [ $RUNZSH = no ]; then
+    echo "${YELLOW}Run zsh to try it out.${RESET}"
+    exit
+  fi
 
-	exec zsh -l
+  exec zsh -l
 }
 
 main "$@"

From 5d8e1f82670e14b45a81e41e46467df51e193e77 Mon Sep 17 00:00:00 2001
From: aimuz <mr.imuz@gmail.com>
Date: Wed, 11 Nov 2020 00:14:30 +0800
Subject: [PATCH 182/869] fix(battery): use `pmset` for battery percentage in
 macOS (#9364)

Returns the battery charge consistent with the system battery manager
---
 plugins/battery/battery.plugin.zsh | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/plugins/battery/battery.plugin.zsh b/plugins/battery/battery.plugin.zsh
index 755ec8d64..a525fd7da 100644
--- a/plugins/battery/battery.plugin.zsh
+++ b/plugins/battery/battery.plugin.zsh
@@ -18,10 +18,7 @@ if [[ "$OSTYPE" = darwin* ]]; then
   }
 
   function battery_pct() {
-    local battery_status="$(ioreg -rc AppleSmartBattery)"
-    local -i capacity=$(sed -n -e '/MaxCapacity/s/^.*"MaxCapacity"\ =\ //p' <<< $battery_status)
-    local -i current=$(sed -n -e '/CurrentCapacity/s/^.*"CurrentCapacity"\ =\ //p' <<< $battery_status)
-    echo $(( current * 100 / capacity ))
+    pmset -g batt | grep -Eo "\d+%" | cut -d% -f1
   }
 
   function battery_pct_remaining() {

From fc82aff77c14418df33d4d2d8c946d3adf023706 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nacho=20Gonz=C3=A1lez-Garilleti?=
 <Nachox07@users.noreply.github.com>
Date: Tue, 10 Nov 2020 17:15:54 +0100
Subject: [PATCH 183/869] docs(thefuck): add description for enabling the
 plugin (#9433)

Add a description about adding thefuck to the plugins list
---
 plugins/thefuck/README.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/plugins/thefuck/README.md b/plugins/thefuck/README.md
index bd407b316..84f7255ce 100644
--- a/plugins/thefuck/README.md
+++ b/plugins/thefuck/README.md
@@ -2,6 +2,10 @@
 
 [The Fuck](https://github.com/nvbn/thefuck) plugin — magnificent app which corrects your previous console command.
 
+To use it, add thefuck to the plugins array of your zshrc file:
+
+plugins=(... thefuck)
+
 ## Usage
 Press `ESC` twice to correct previous console command.
 

From dc4692b53e4a1dc512d405f36f2d2af30c66304b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Tue, 10 Nov 2020 23:20:51 +0100
Subject: [PATCH 184/869] fix(aws): fix acp function for MFA without role and
 other fixes (#9426)

* fix(aws): don't duplicate aws_prompt_info function in RPROMPT

* refactor(aws): clean up logic in acp function and fix session duration input

Fixes #9409
---
 plugins/aws/aws.plugin.zsh | 123 ++++++++++++++++++++-----------------
 1 file changed, 65 insertions(+), 58 deletions(-)

diff --git a/plugins/aws/aws.plugin.zsh b/plugins/aws/aws.plugin.zsh
index e6959759e..ef435fe3b 100644
--- a/plugins/aws/aws.plugin.zsh
+++ b/plugins/aws/aws.plugin.zsh
@@ -26,7 +26,8 @@ function asp() {
 # AWS profile switch
 function acp() {
   if [[ -z "$1" ]]; then
-    unset AWS_DEFAULT_PROFILE AWS_PROFILE AWS_EB_PROFILE AWS_ACCESS_KEY_ID AWS_SECRET_ACCESS_KEY AWS_SESSION_TOKEN
+    unset AWS_DEFAULT_PROFILE AWS_PROFILE AWS_EB_PROFILE
+    unset AWS_ACCESS_KEY_ID AWS_SECRET_ACCESS_KEY AWS_SESSION_TOKEN
     echo AWS profile cleared.
     return
   fi
@@ -39,73 +40,79 @@ function acp() {
     return 1
   fi
 
-  local aws_access_key_id="$(aws configure get aws_access_key_id --profile $1)"
-  local aws_secret_access_key="$(aws configure get aws_secret_access_key --profile $1)"
-  local aws_session_token="$(aws configure get aws_session_token --profile $1)"
-  local mfa_serial="$(aws configure get mfa_serial --profile $1)"
-  local role_arn="$(aws configure get role_arn --profile $1)"
+  local profile="$1"
+
+  # Get fallback credentials for if the aws command fails or no command is run
+  local aws_access_key_id="$(aws configure get aws_access_key_id --profile $profile)"
+  local aws_secret_access_key="$(aws configure get aws_secret_access_key --profile $profile)"
+  local aws_session_token="$(aws configure get aws_session_token --profile $profile)"
+
 
   # First, if the profile has MFA configured, lets get the token and session duration
-  local mfa_opt=""
+  local mfa_serial="$(aws configure get mfa_serial --profile $profile)"
 
-  if [[ -n $mfa_serial ]]; then
-    local mfa_token=""
-    echo "Please enter your MFA token for $mfa_serial:"
+  if [[ -n "$mfa_serial" ]]; then
+    local -a mfa_opt
+    local mfa_token sess_duration
+    echo -n "Please enter your MFA token for $mfa_serial: "
     read -r mfa_token
-    echo "Please enter the session duration in seconds (900-43200; default: 3600, which is the default maximum for a role):"
+    echo -n "Please enter the session duration in seconds (900-43200; default: 3600, which is the default maximum for a role): "
     read -r sess_duration
-    if [[ -z $sess_duration ]]; then
-      sess_duration="3600"
-    fi
-    mfa_opt="--serial-number $mfa_serial --token-code $mfa_token --duration-seconds $sess_duration"
-  fi
+    mfa_opt=(--serial-number "$mfa_serial" --token-code "$mfa_token" --duration-seconds "${sess_duration:-3600}")
 
-  # Now see whether we need to just MFA for the current role, or assume a different one
-  local credentials_output=""
-  if [[ -n $role_arn ]]; then
-    # Means we need to assume a specified role
+    # Now see whether we need to just MFA for the current role, or assume a different one
+    local role_arn="$(aws configure get role_arn --profile $profile)"
 
-    # Check whether external_id is configured to use while assuming the role
-    local ext_id="$(aws configure get external_id --profile $1)"
-    local extid_opt=""
-    if [[ -n $ext_id ]]; then
-      extid_opt="--external-id $ext_id"
+    if [[ -n "$role_arn" ]]; then
+      # Means we need to assume a specified role
+      aws_command=(aws sts assume-role --role-arn "$role_arn" "${mfa_opt[@]}")
+
+      # Check whether external_id is configured to use while assuming the role
+      local external_id="$(aws configure get external_id --profile "$profile")"
+      if [[ -n "$external_id" ]]; then
+        aws_command+=(--external-id "$external_id")
+      fi
+
+      # Get source profile to use to assume role
+      local source_profile="$(aws configure get source_profile --profile "$profile")"
+      aws_command+=(--profile="${source_profile:-profile}" --role-session-name "${source_profile:-profile}")
+
+      echo "Assuming role $role_arn using profile ${source_profile:-profile}"
+    else
+      # Means we only need to do MFA
+      aws_command=(aws sts get-session-token --profile="$profile" "${mfa_opt[@]}")
+      echo "Obtaining session token for profile $profile"
     fi
 
-    # Get source profile to use to assume role
-    local profile=$1
-    local source_profile="$(aws configure get source_profile --profile "$1")"
-    if [[ -n $source_profile ]]; then
-      profile=$source_profile
+    # Format output of aws command for easier processing
+    aws_command+=(--query '[Credentials.AccessKeyId,Credentials.SecretAccessKey,Credentials.SessionToken]' --output text)
+
+    # Run the aws command to obtain credentials
+    local -a credentials
+    credentials=(${(ps:\t:)"$(${aws_command[@]})"})
+
+    if [[ -n "$credentials" ]]; then
+      aws_access_key_id="${credentials[1]}"
+      aws_secret_access_key="${credentials[2]}"
+      aws_session_token="${credentials[3]}"
+    fi
+  fi
+
+  # Switch to AWS profile
+  if [[ -n "${aws_access_key_id}" && -n "$aws_secret_access_key" ]]; then
+    export AWS_DEFAULT_PROFILE="$profile"
+    export AWS_PROFILE="$profile"
+    export AWS_EB_PROFILE="$profile"
+    export AWS_ACCESS_KEY_ID="$aws_access_key_id"
+    export AWS_SECRET_ACCESS_KEY="$aws_secret_access_key"
+
+    if [[ -n "$aws_session_token" ]]; then
+      export AWS_SESSION_TOKEN="$aws_session_token"
+    else
+      unset AWS_SESSION_TOKEN
     fi
 
-    echo "Assuming role $role_arn using profile $profile"
-    local assume_cmd=(aws sts assume-role "--profile=$profile" "--role-arn $role_arn" "--role-session-name $profile" "$mfa_opt" "$extid_opt"
-      "--query '[Credentials.AccessKeyId,Credentials.SecretAccessKey,Credentials.SessionToken]' --output text | tr '\t' '\n'")
-    credentials_output="$(eval "${assume_cmd[@]}")"
-  elif [[ -n $mfa_opt ]]; then
-    # Means we only need to do MFA
-    echo "Obtaining session token for profile $profile"
-    local get_token_cmd=(aws sts get-session-token "--profile=$profile" "$mfa_opt"
-      "--query '[Credentials.AccessKeyId,Credentials.SecretAccessKey,Credentials.SessionToken]' --output text | tr '\t' '\n'")
-    credentials_output="$(eval "${get_token_cmd[@]}")"
-  fi
-
-  if [[ -n $credentials_output ]]; then
-    local credentials=("${(f)credentials_output}")
-    aws_access_key_id=${credentials[1]}
-    aws_secret_access_key=${credentials[2]}
-    aws_session_token=${credentials[3]}
-  fi
-
-  if [[ -n $aws_access_key_id && -n $aws_secret_access_key ]]; then
-    export AWS_DEFAULT_PROFILE=$1
-    export AWS_PROFILE=$1
-    export AWS_EB_PROFILE=$1
-    export AWS_ACCESS_KEY_ID=$aws_access_key_id
-    export AWS_SECRET_ACCESS_KEY=$aws_secret_access_key
-    [[ -z "$aws_session_token" ]] && unset AWS_SESSION_TOKEN || export AWS_SESSION_TOKEN=$aws_session_token
-    echo "Switched to AWS Profile: $1"
+    echo "Switched to AWS Profile: $profile"
   fi
 }
 
@@ -141,7 +148,7 @@ function aws_prompt_info() {
   echo "${ZSH_THEME_AWS_PREFIX:=<aws:}${AWS_PROFILE}${ZSH_THEME_AWS_SUFFIX:=>}"
 }
 
-if [ "$SHOW_AWS_PROMPT" != false ]; then
+if [[ "$SHOW_AWS_PROMPT" != false && "$RPROMPT" != *'$(aws_prompt_info)'* ]]; then
   RPROMPT='$(aws_prompt_info)'"$RPROMPT"
 fi
 

From 1beac5958ede29855ef2ac4313ada83ed37f5ea8 Mon Sep 17 00:00:00 2001
From: Rob Vadai <rvadai@segence.com>
Date: Wed, 11 Nov 2020 15:14:57 +0000
Subject: [PATCH 185/869] docs(aws): add config examples (#9422)

---
 plugins/aws/README.md | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/plugins/aws/README.md b/plugins/aws/README.md
index 4c2ae96e5..011bbd8b4 100644
--- a/plugins/aws/README.md
+++ b/plugins/aws/README.md
@@ -43,3 +43,33 @@ the current `$AWS_PROFILE`. It uses two variables to control how that is shown:
 * ZSH_THEME_AWS_PREFIX: sets the prefix of the AWS_PROFILE. Defaults to `<aws:`.
 
 * ZSH_THEME_AWS_SUFFIX: sets the suffix of the AWS_PROFILE. Defaults to `>`.
+
+## Configuration
+
+[Configuration and credential file settings](https://docs.aws.amazon.com/cli/latest/userguide/cli-configure-files.html) by AWS
+
+### Scenario: IAM roles with a source profile and MFA authentication
+
+Source profile credentials in `~/.aws/credentials`:
+
+```
+[source-profile-name]
+aws_access_key_id = ...
+aws_secret_access_key = ...
+```
+
+Role configuration in `~/.aws/config`:
+
+```
+[profile source-profile-name]
+mfa_serial = arn:aws:iam::111111111111:mfa/myuser
+region = us-east-1
+output = json
+
+[profile profile-with-role]
+role_arn = arn:aws:iam::9999999999999:role/myrole
+mfa_serial = arn:aws:iam::111111111111:mfa/myuser
+source_profile = source-profile-name
+region = us-east-1
+output = json
+```

From 874d83f7b86afbc395915e796cff4e4fe949a204 Mon Sep 17 00:00:00 2001
From: Subhaditya Nath <56714626+subnut@users.noreply.github.com>
Date: Thu, 12 Nov 2020 01:55:32 +0530
Subject: [PATCH 186/869] feat(sudo): support aliases to $EDITOR (#9431)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Marc Cornellà <marc.cornella@live.com>
---
 plugins/sudo/sudo.plugin.zsh | 52 +++++++++++++++++++++---------------
 1 file changed, 31 insertions(+), 21 deletions(-)

diff --git a/plugins/sudo/sudo.plugin.zsh b/plugins/sudo/sudo.plugin.zsh
index b3749eff7..f2445a762 100644
--- a/plugins/sudo/sudo.plugin.zsh
+++ b/plugins/sudo/sudo.plugin.zsh
@@ -9,40 +9,48 @@
 # -------
 #
 # * Dongweiming <ciici123@gmail.com>
+# * Subhaditya Nath <github.com/subnut>
+# * Marc Cornellà <github.com/mcornella>
 #
 # ------------------------------------------------------------------------------
 
+__sudo-replace-buffer() {
+    local old=$1 new=$2 space=${2:+ }
+    if [[ ${#LBUFFER} -le ${#old} ]]; then
+        RBUFFER="${space}${BUFFER#$old }"
+        LBUFFER="${new}"
+    else
+        LBUFFER="${new}${space}${LBUFFER#$old }"
+    fi
+}
+
 sudo-command-line() {
     [[ -z $BUFFER ]] && LBUFFER="$(fc -ln -1)"
 
     # Save beginning space
     local WHITESPACE=""
-    if [[ ${LBUFFER:0:1} == " " ]] ; then 
+    if [[ ${LBUFFER:0:1} = " " ]]; then
         WHITESPACE=" "
         LBUFFER="${LBUFFER:1}"
     fi
 
-    if [[ -n $EDITOR && $BUFFER == $EDITOR\ * ]]; then
-        if [[ ${#LBUFFER} -le ${#EDITOR} ]]; then
-            RBUFFER=" ${BUFFER#$EDITOR }"
-            LBUFFER="sudoedit"
-        else
-            LBUFFER="sudoedit ${LBUFFER#$EDITOR }"
-        fi
-    elif [[ $BUFFER == sudoedit\ * ]]; then
-        if [[ ${#LBUFFER} -le 8 ]]; then
-            RBUFFER=" ${BUFFER#sudoedit }"
-            LBUFFER="$EDITOR"
-        else
-            LBUFFER="$EDITOR ${LBUFFER#sudoedit }"
-        fi
-    elif [[ $BUFFER == sudo\ * ]]; then
-        if [[ ${#LBUFFER} -le 4 ]]; then
-            RBUFFER="${BUFFER#sudo }"
-            LBUFFER=""
-        else
-            LBUFFER="${LBUFFER#sudo }"
+    # Get the first part of the typed command and check if it's an alias to $EDITOR
+    # If so, locally change $EDITOR to the alias so that it matches below
+    if [[ -n "$EDITOR" ]]; then
+        local cmd="${${(Az)BUFFER}[1]}"
+        if [[ "${aliases[$cmd]} " = (\$EDITOR|$EDITOR)\ * ]]; then
+            local EDITOR="$cmd"
         fi
+    fi
+
+    if [[ -n $EDITOR && $BUFFER = $EDITOR\ * ]]; then
+        __sudo-replace-buffer "$EDITOR" "sudoedit"
+    elif [[ -n $EDITOR && $BUFFER = \$EDITOR\ * ]]; then
+        __sudo-replace-buffer "\$EDITOR" "sudoedit"
+    elif [[ $BUFFER = sudoedit\ * ]]; then
+        __sudo-replace-buffer "sudoedit" "$EDITOR"
+    elif [[ $BUFFER = sudo\ * ]]; then
+        __sudo-replace-buffer "sudo" ""
     else
         LBUFFER="sudo $LBUFFER"
     fi
@@ -50,7 +58,9 @@ sudo-command-line() {
     # Preserve beginning space
     LBUFFER="${WHITESPACE}${LBUFFER}"
 }
+
 zle -N sudo-command-line
+
 # Defined shortcut keys: [Esc] [Esc]
 bindkey -M emacs '\e\e' sudo-command-line
 bindkey -M vicmd '\e\e' sudo-command-line

From 51772732f54f01522ad5720e8ed0ba16ca3147ae Mon Sep 17 00:00:00 2001
From: "Alisson B. Santos" <alissonbruno.sa@gmail.com>
Date: Thu, 12 Nov 2020 16:17:28 +0100
Subject: [PATCH 187/869] feat(git): support trunk branches in
 `git_main_branch` (#9417)

---
 plugins/git/git.plugin.zsh | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index ccb9d8461..bf2619976 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -31,11 +31,14 @@ function work_in_progress() {
 
 # Check if main exists and use instead of master
 function git_main_branch() {
-  if [[ -n "$(git branch --list main)" ]]; then
-    echo main
-  else
-    echo master
-  fi
+  local branch
+  for branch in main trunk; do
+    if command git show-ref -q --verify refs/heads/$branch; then
+      echo $branch
+      return
+    fi
+  done
+  echo master
 }
 
 #

From 9b119866dd0e2d5054abd992f4dfbf346ac81b0d Mon Sep 17 00:00:00 2001
From: ratijas <me@ratijas.tk>
Date: Thu, 12 Nov 2020 21:32:17 +0300
Subject: [PATCH 188/869] refactor(colored-man-pages): move nroff wrapper and
 refactor logic in `colored` function (#9437)

---
 plugins/colored-man-pages/README.md           | 14 ++++
 .../colored-man-pages.plugin.zsh              | 73 +++++++++++--------
 plugins/colored-man-pages/nroff               | 12 +++
 3 files changed, 67 insertions(+), 32 deletions(-)
 create mode 100755 plugins/colored-man-pages/nroff

diff --git a/plugins/colored-man-pages/README.md b/plugins/colored-man-pages/README.md
index f34941e73..4cbf64d3e 100644
--- a/plugins/colored-man-pages/README.md
+++ b/plugins/colored-man-pages/README.md
@@ -16,3 +16,17 @@ You can also try to color other pages by prefixing the respective command with `
 ```zsh
 colored git help clone
 ```
+
+## Customization
+
+The plugin declares global associative array `less_termcap`, which maps termcap capabilities to escape
+sequences for the `less` pager. This mapping can be further customized by the user after the plugin is
+loaded. Check out sources for more.
+
+For example: `less_termcap[md]` maps to `LESS_TERMCAP_md` which is the escape sequence that tells `less`
+how to print something in bold. It's currently shown in bold red, but if you want to change it, you
+can redefine `less_termcap[md]` in your zshrc file, after OMZ is sourced:
+
+```zsh
+less_termcap[md]="${fg_bold[blue]}" # this tells less to print bold text in bold blue
+```
diff --git a/plugins/colored-man-pages/colored-man-pages.plugin.zsh b/plugins/colored-man-pages/colored-man-pages.plugin.zsh
index ec518472c..37faed672 100644
--- a/plugins/colored-man-pages/colored-man-pages.plugin.zsh
+++ b/plugins/colored-man-pages/colored-man-pages.plugin.zsh
@@ -1,39 +1,48 @@
-if [[ "$OSTYPE" = solaris* ]]
-then
-	if [[ ! -x "$HOME/bin/nroff" ]]
-	then
-		mkdir -p "$HOME/bin"
-		cat > "$HOME/bin/nroff" <<EOF
-#!/bin/sh
-if [ -n "\$_NROFF_U" -a "\$1,\$2,\$3" = "-u0,-Tlp,-man" ]; then
-	shift
-	exec /usr/bin/nroff -u\$_NROFF_U "\$@"
-fi
-#-- Some other invocation of nroff
-exec /usr/bin/nroff "\$@"
-EOF
-		chmod +x "$HOME/bin/nroff"
-	fi
-fi
+# Requires colors autoload.
+# See termcap(5).
+
+# Set up once, and then reuse. This way it supports user overrides after the
+# plugin is loaded.
+typeset -AHg less_termcap
+
+# bold & blinking mode
+less_termcap[mb]="${fg_bold[red]}"
+less_termcap[md]="${fg_bold[red]}"
+less_termcap[me]="${reset_color}"
+# standout mode
+less_termcap[so]="${fg_bold[yellow]}${bg[blue]}"
+less_termcap[se]="${reset_color}"
+# underlining
+less_termcap[us]="${fg_bold[green]}"
+less_termcap[ue]="${reset_color}"
+
+# Absolute path to this file's directory.
+typeset __colored_man_pages_dir="${0:A:h}"
 
 function colored() {
-	command env \
-		LESS_TERMCAP_mb=$(printf "\e[1;31m") \
-		LESS_TERMCAP_md=$(printf "\e[1;31m") \
-		LESS_TERMCAP_me=$(printf "\e[0m") \
-		LESS_TERMCAP_se=$(printf "\e[0m") \
-		LESS_TERMCAP_so=$(printf "\e[1;44;33m") \
-		LESS_TERMCAP_ue=$(printf "\e[0m") \
-		LESS_TERMCAP_us=$(printf "\e[1;32m") \
-		PAGER="${commands[less]:-$PAGER}" \
-		_NROFF_U=1 \
-		PATH="$HOME/bin:$PATH" \
-			"$@"
+  local -a environment
+
+  # Convert associative array to plain array of NAME=VALUE items.
+  local k v
+  for k v in "${(@kv)less_termcap}"; do
+    environment+=( "LESS_TERMCAP_${k}=${v}" )
+  done
+
+  # Prefer `less` whenever available, since we specifically configured
+  # environment for it.
+  environment+=( PAGER="${commands[less]:-$PAGER}" )
+
+  # See ./nroff script.
+  if [[ "$OSTYPE" = solaris* ]]; then
+    environment+=( PATH="${__colored_man_pages_dir}:$PATH" )
+  fi
+
+  command env $environment "$@"
 }
 
 # Colorize man and dman/debman (from debian-goodies)
 function man \
-	dman \
-	debman {
-	colored $0 "$@"
+  dman \
+  debman {
+  colored $0 "$@"
 }
diff --git a/plugins/colored-man-pages/nroff b/plugins/colored-man-pages/nroff
new file mode 100755
index 000000000..4ae155d29
--- /dev/null
+++ b/plugins/colored-man-pages/nroff
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+# The whole point of this wrapper is to replace emboldening factor -u0 with
+# -u1 under certain circumstances on Solaris.
+
+if [ "$1,$2,$3" = "-u0,-Tlp,-man" ]; then
+  shift
+  exec /usr/bin/nroff -u1 "$@"
+else
+  # Some other invocation of nroff
+  exec /usr/bin/nroff "$@"
+fi

From ce836647e5e8b11246e2ef7069001287dc7cdd2b Mon Sep 17 00:00:00 2001
From: Roman Danyk <17525890+RomanDanyk@users.noreply.github.com>
Date: Thu, 19 Nov 2020 18:24:09 +0200
Subject: [PATCH 189/869] feat(aws): respect optional parameters from the AWS
 CLI config file (#9453)

---
 plugins/aws/aws.plugin.zsh | 25 ++++++++++++++++---------
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/plugins/aws/aws.plugin.zsh b/plugins/aws/aws.plugin.zsh
index ef435fe3b..e1566b113 100644
--- a/plugins/aws/aws.plugin.zsh
+++ b/plugins/aws/aws.plugin.zsh
@@ -50,32 +50,39 @@ function acp() {
 
   # First, if the profile has MFA configured, lets get the token and session duration
   local mfa_serial="$(aws configure get mfa_serial --profile $profile)"
+  local sess_duration="$(aws configure get duration_seconds --profile $profile)"
 
   if [[ -n "$mfa_serial" ]]; then
     local -a mfa_opt
-    local mfa_token sess_duration
+    local mfa_token
     echo -n "Please enter your MFA token for $mfa_serial: "
     read -r mfa_token
-    echo -n "Please enter the session duration in seconds (900-43200; default: 3600, which is the default maximum for a role): "
-    read -r sess_duration
+    if [[ -z "$sess_duration" ]]; then
+      echo -n "Please enter the session duration in seconds (900-43200; default: 3600, which is the default maximum for a role): "
+      read -r sess_duration
+    fi
     mfa_opt=(--serial-number "$mfa_serial" --token-code "$mfa_token" --duration-seconds "${sess_duration:-3600}")
 
     # Now see whether we need to just MFA for the current role, or assume a different one
     local role_arn="$(aws configure get role_arn --profile $profile)"
+    local sess_name="$(aws configure get role_session_name --profile $profile)"
 
     if [[ -n "$role_arn" ]]; then
       # Means we need to assume a specified role
       aws_command=(aws sts assume-role --role-arn "$role_arn" "${mfa_opt[@]}")
 
       # Check whether external_id is configured to use while assuming the role
-      local external_id="$(aws configure get external_id --profile "$profile")"
+      local external_id="$(aws configure get external_id --profile $profile)"
       if [[ -n "$external_id" ]]; then
         aws_command+=(--external-id "$external_id")
       fi
 
       # Get source profile to use to assume role
-      local source_profile="$(aws configure get source_profile --profile "$profile")"
-      aws_command+=(--profile="${source_profile:-profile}" --role-session-name "${source_profile:-profile}")
+      local source_profile="$(aws configure get source_profile --profile $profile)"
+      if [[ -z "$sess_name" ]]; then
+        sess_name="${source_profile:-profile}"
+      fi
+      aws_command+=(--profile="${source_profile:-profile}" --role-session-name "${sess_name}")
 
       echo "Assuming role $role_arn using profile ${source_profile:-profile}"
     else
@@ -122,13 +129,13 @@ function aws_change_access_key() {
     return 1
   fi
 
-  echo Insert the credentials when asked.
+  echo "Insert the credentials when asked."
   asp "$1" || return 1
   AWS_PAGER="" aws iam create-access-key
   AWS_PAGER="" aws configure --profile "$1"
 
-  echo You can now safely delete the old access key running \`aws iam delete-access-key --access-key-id ID\`
-  echo Your current keys are:
+  echo "You can now safely delete the old access key running \`aws iam delete-access-key --access-key-id ID\`"
+  echo "Your current keys are:"
   AWS_PAGER="" aws iam list-access-keys
 }
 

From e92a4667cbd65e9567dc962b5a482e10f319596a Mon Sep 17 00:00:00 2001
From: Felipe Contreras <felipe.contreras@gmail.com>
Date: Thu, 19 Nov 2020 12:45:19 -0600
Subject: [PATCH 190/869] feat(gitfast): update to git-completion 1.2 (#9458)

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
---
 plugins/gitfast/_git                | 135 ++++++++++++++--------------
 plugins/gitfast/git-completion.bash |  73 ++++++++-------
 plugins/gitfast/update              |   2 +-
 3 files changed, 111 insertions(+), 99 deletions(-)

diff --git a/plugins/gitfast/_git b/plugins/gitfast/_git
index aaea581d5..988f5b1c6 100644
--- a/plugins/gitfast/_git
+++ b/plugins/gitfast/_git
@@ -45,71 +45,49 @@ fi
 
 local old_complete="$functions[complete]"
 functions[complete]=:
+COMP_WORDBREAKS=':'
 GIT_SOURCING_ZSH_COMPLETION=y . "$script"
 functions[complete]="$old_complete"
 
+__gitcompadd ()
+{
+	compadd -Q -p "${2-}" -S "${3- }" ${@[4,-1]} -- ${=1} && _ret=0
+}
+
 __gitcomp ()
 {
 	emulate -L zsh
 
 	local cur_="${3-$cur}"
 
-	case "$cur_" in
-	--*=)
-		;;
-	--no-*)
-		local c IFS=$' \t\n'
-		local -a array
-		for c in ${=1}; do
-			if [[ $c == "--" ]]; then
-				continue
-			fi
-			c="$c${4-}"
-			case $c in
-			--*=|*.) ;;
-			*) c="$c " ;;
-			esac
-			array+=("$c")
-		done
-		compset -P '*[=:]'
-		compadd -Q -S '' -p "${2-}" -a -- array && _ret=0
-		;;
-	*)
-		local c IFS=$' \t\n'
-		local -a array
-		for c in ${=1}; do
-			if [[ $c == "--" ]]; then
-				c="--no-...${4-}"
-				array+=("$c ")
-				break
-			fi
-			c="$c${4-}"
-			case $c in
-			--*=|*.) ;;
-			*) c="$c " ;;
-			esac
-			array+=("$c")
-		done
-		compset -P '*[=:]'
-		compadd -Q -S '' -p "${2-}" -a -- array && _ret=0
-		;;
-	esac
-}
+	[[ "$cur_" == *= ]] && return
 
-__gitcomp_direct ()
-{
-	emulate -L zsh
+	local c IFS=$' \t\n' sfx
+	for c in ${=1}; do
+		if [[ $c == "--" ]]; then
+			[[ "$cur_" == --no-* ]] && continue
+			__gitcompadd "--no-..."
+			break
+		fi
 
-	compset -P '*[=:]'
-	compadd -Q -S '' -- ${(f)1} && _ret=0
+		if [[ -z "${4-}" ]]; then
+			case $c in
+			*=) c="${c%=}"; sfx="=" ;;
+			*.) sfx="" ;;
+			*) sfx=" " ;;
+			esac
+		else
+			sfx="$4"
+		fi
+		__gitcompadd "$c" "${2-}" "$sfx" -q
+	done
 }
 
 __gitcomp_nl ()
 {
 	emulate -L zsh
 
-	compset -P '*[=:]'
-	compadd -Q -S "${4- }" -p "${2-}" -- ${(f)1} && _ret=0
+	IFS=$'\n' __gitcompadd "$1" "${2-}" "${4- }"
 }
 
 __gitcomp_file ()
@@ -119,14 +97,9 @@ __gitcomp_file ()
 	compadd -f -p "${2-}" -- ${(f)1} && _ret=0
 }
 
-__gitcomp_direct_append ()
+__gitcomp_direct ()
 {
-	__gitcomp_direct "$@"
-}
-
-__gitcomp_nl_append ()
-{
-	__gitcomp_nl "$@"
+	__gitcomp_nl "$1" "" "" ""
 }
 
 __gitcomp_file_direct ()
@@ -134,20 +107,35 @@ __gitcomp_file_direct ()
 	__gitcomp_file "$1" ""
 }
 
+__gitcomp_nl_append ()
+{
+	__gitcomp_nl "$@"
+}
+
+__gitcomp_direct_append ()
+{
+	__gitcomp_direct "$@"
+}
+
 _git_zsh ()
 {
-	__gitcomp "v1.0"
+	__gitcomp "v1.2"
 }
 
 __git_complete_command ()
 {
 	emulate -L zsh
 
+	compset -P '*[=:]'
+
 	local command="$1"
 	local completion_func="_git_${command//-/_}"
 	if (( $+functions[$completion_func] )); then
 		emulate ksh -c $completion_func
 		return 0
+	elif emulate ksh -c "__git_support_parseopt_helper $command"; then
+		emulate ksh -c "__git_complete_common $command"
+		return 0
 	else
 		return 1
 	fi
@@ -218,24 +206,27 @@ __git_zsh_main ()
 {
 	local curcontext="$curcontext" state state_descr line
 	typeset -A opt_args
-	local -a orig_words
+	local -a orig_words __git_C_args
 
 	orig_words=( ${words[@]} )
 
 	_arguments -C \
-		'(-p --paginate --no-pager)'{-p,--paginate}'[pipe all output into ''less'']' \
-		'(-p --paginate)--no-pager[do not pipe git output into a pager]' \
-		'--git-dir=-[set the path to the repository]: :_directories' \
-		'--bare[treat the repository as a bare repository]' \
+		'(-p --paginate -P --no-pager)'{-p,--paginate}'[pipe all output into ''less'']' \
+		'(-p --paginate -P --no-pager)'{-P,--no-pager}'[do not pipe git output into a pager]' \
+		'(--bare)--git-dir=[set the path to the repository]: :_directories' \
+		'(--git-dir)--bare[treat the repository as a bare repository]' \
 		'(- :)--version[prints the git suite version]' \
-		'--exec-path=-[path to where your core git programs are installed]:: :_directories' \
-		'--html-path[print the path where git''s HTML documentation is installed]' \
-		'--info-path[print the path where the Info files are installed]' \
-		'--man-path[print the manpath (see `man(1)`) for the man pages]' \
-		'--work-tree=-[set the path to the working tree]: :_directories' \
-		'--namespace=-[set the git namespace]' \
+		'--exec-path=[path to where your core git programs are installed]: :_directories' \
+		'(- :)--exec-path[print the path where your core git programs are installed]' \
+		'(- :)--html-path[print the path where git''s HTML documentation is installed]' \
+		'(- :)--info-path[print the path where the Info files are installed]' \
+		'(- :)--man-path[print the manpath (see `man(1)`) for the man pages]' \
+		'--work-tree=[set the path to the working tree]: :_directories' \
+		'--namespace=[set the git namespace]:' \
 		'--no-replace-objects[do not use replacement refs to replace git objects]' \
 		'(- :)--help[prints the synopsis and a list of the most commonly used commands]: :->arg' \
+		'*-C[run as if git was started in the given path]: :_directories' \
+		'*-c[pass a configuration parameter to the command]: :->config' \
 		'(-): :->command' \
 		'(-)*:: :->arg' && return
 
@@ -249,15 +240,23 @@ __git_zsh_main ()
 			let _ret || break
 		done
 		;;
+	(config)
+		compset -P '*[=:]'
+		emulate ksh -c __git_complete_config_variable_name_and_value
+		;;
 	(arg)
 		local command="${words[1]}" __git_dir
 
 		if (( $+opt_args[--bare] )); then
 			__git_dir='.'
 		else
-			__git_dir=${opt_args[--git-dir]}
+			__git_dir=${~opt_args[--git-dir]}
 		fi
 
+		for x in ${(s.:.)opt_args[-C]}; do
+			__git_C_args+=('-C' ${~x})
+		done
+
 		(( $+opt_args[--help] )) && command='help'
 
 		words=( ${orig_words[@]} )
diff --git a/plugins/gitfast/git-completion.bash b/plugins/gitfast/git-completion.bash
index b93706d17..4497a294f 100644
--- a/plugins/gitfast/git-completion.bash
+++ b/plugins/gitfast/git-completion.bash
@@ -45,11 +45,6 @@
 #     When set to "1" suggest all options, including options which are
 #     typically hidden (e.g. '--allow-empty' for 'git commit').
 
-case "$COMP_WORDBREAKS" in
-*:*) : great ;;
-*)   COMP_WORDBREAKS="$COMP_WORDBREAKS:"
-esac
-
 # Discovers the path to the git repository taking any '--git-dir=<path>' and
 # '-C <path>' options into account and stores it in the $__git_repo_path
 # variable.
@@ -347,7 +342,7 @@ __gitcomp ()
 	local cur_="${3-$cur}"
 
 	case "$cur_" in
-	--*=)
+	*=)
 		;;
 	--no-*)
 		local c i=0 IFS=$' \t\n'
@@ -519,7 +514,7 @@ __gitcomp_builtin ()
 	local incl="${2-}"
 	local excl="${3-}"
 
-	local var=__gitcomp_builtin_"${cmd/-/_}"
+	local var=__gitcomp_builtin_"${cmd//-/_}"
 	local options
 	eval "options=\${$var-}"
 
@@ -1231,26 +1226,44 @@ __git_pretty_aliases ()
 # __git_aliased_command requires 1 argument
 __git_aliased_command ()
 {
-	local word cmdline=$(__git config --get "alias.$1")
-	for word in $cmdline; do
-		case "$word" in
-		\!gitk|gitk)
-			echo "gitk"
+	local cur=$1 last list word cmdline
+
+	while [[ -n "$cur" ]]; do
+		if [[ "$list" == *" $cur "* ]]; then
+			# loop detected
 			return
-			;;
-		\!*)	: shell command alias ;;
-		-*)	: option ;;
-		*=*)	: setting env ;;
-		git)	: git itself ;;
-		\(\))   : skip parens of shell function definition ;;
-		{)	: skip start of shell helper function ;;
-		:)	: skip null command ;;
-		\'*)	: skip opening quote after sh -c ;;
-		*)
-			echo "$word"
-			return
-		esac
+		fi
+
+		cmdline=$(__git config --get "alias.$cur")
+		list=" $cur $list"
+		last=$cur
+		cur=
+
+		for word in $cmdline; do
+			case "$word" in
+			\!gitk|gitk)
+				cur="gitk"
+				break
+				;;
+			\!*)	: shell command alias ;;
+			-*)	: option ;;
+			*=*)	: setting env ;;
+			git)	: git itself ;;
+			\(\))   : skip parens of shell function definition ;;
+			{)	: skip start of shell helper function ;;
+			:)	: skip null command ;;
+			\'*)	: skip opening quote after sh -c ;;
+			*)
+				cur="$word"
+				break
+			esac
+		done
 	done
+
+	cur=$last
+	if [[ "$cur" != "$1" ]]; then
+		echo "$cur"
+	fi
 }
 
 # Check whether one of the given words is present on the command line,
@@ -2723,10 +2736,10 @@ __git_complete_config_variable_name ()
 		return
 		;;
 	branch.*)
-		local pfx="${cur%.*}."
-		cur_="${cur#*.}"
+		local pfx="${cur_%.*}."
+		cur_="${cur_#*.}"
 		__gitcomp_direct "$(__git_heads "$pfx" "$cur_" ".")"
-		__gitcomp_nl_append $'autoSetupMerge\nautoSetupRebase\n' "$pfx" "$cur_" "$sfx"
+		__gitcomp_nl_append $'autoSetupMerge\nautoSetupRebase\n' "$pfx" "$cur_" "${sfx:- }"
 		return
 		;;
 	guitool.*.*)
@@ -2760,7 +2773,7 @@ __git_complete_config_variable_name ()
 		local pfx="${cur_%.*}."
 		cur_="${cur_#*.}"
 		__git_compute_all_commands
-		__gitcomp_nl "$__git_all_commands" "$pfx" "$cur_" "$sfx"
+		__gitcomp_nl "$__git_all_commands" "$pfx" "$cur_" "${sfx:- }"
 		return
 		;;
 	remote.*.*)
@@ -2776,7 +2789,7 @@ __git_complete_config_variable_name ()
 		local pfx="${cur_%.*}."
 		cur_="${cur_#*.}"
 		__gitcomp_nl "$(__git_remotes)" "$pfx" "$cur_" "."
-		__gitcomp_nl_append "pushDefault" "$pfx" "$cur_" "$sfx"
+		__gitcomp_nl_append "pushDefault" "$pfx" "$cur_" "${sfx:- }"
 		return
 		;;
 	url.*.*)
diff --git a/plugins/gitfast/update b/plugins/gitfast/update
index d0947e7d8..5311065a1 100755
--- a/plugins/gitfast/update
+++ b/plugins/gitfast/update
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 url="https://raw.githubusercontent.com/felipec/git-completion"
-version="1.0"
+version="1.2"
 
 curl -s -o _git "${url}/v${version}/git-completion.zsh" &&
 curl -s -o git-completion.bash "${url}/v${version}/git-completion.bash" &&

From d57131dc49500a056c5b78b0fb444c7cb1ca83cd Mon Sep 17 00:00:00 2001
From: Septs <github@septs.pw>
Date: Fri, 20 Nov 2020 03:42:51 -0800
Subject: [PATCH 191/869] fix(shell-proxy): change NAME env variable for WSL
 clash (#9447)

---
 plugins/shell-proxy/proxy.py     | 2 +-
 plugins/shell-proxy/ssh-agent.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/shell-proxy/proxy.py b/plugins/shell-proxy/proxy.py
index 2b62f6cb5..d2e5361cb 100755
--- a/plugins/shell-proxy/proxy.py
+++ b/plugins/shell-proxy/proxy.py
@@ -30,7 +30,7 @@ def merge(mapping: dict):
 class CommandSet:
     proxies = make_proxies(get_http_proxy())
     aliases = {
-        _: "env NAME=%s %s" % (_, ssh_agent)
+        _: "env __SSH_PROGRAM_NAME__=%s %s" % (_, ssh_agent)
         for _ in ("ssh", "sftp", "scp", "slogin", "ssh-copy-id")
     }
 
diff --git a/plugins/shell-proxy/ssh-agent.py b/plugins/shell-proxy/ssh-agent.py
index 61cf84c0b..4ee24b755 100755
--- a/plugins/shell-proxy/ssh-agent.py
+++ b/plugins/shell-proxy/ssh-agent.py
@@ -6,7 +6,7 @@ import sys
 ssh_proxy = os.path.join(os.path.dirname(__file__), "ssh-proxy.py")
 
 argv = [
-    os.environ.get("NAME", "ssh"),
+    os.environ.get("__SSH_PROGRAM_NAME__", "ssh"),
     "-o",
     "ProxyCommand={} %h %p".format(ssh_proxy),
     "-o",

From 88b3f028f4a2ffa4f3853a11e4b8e0d78008ca34 Mon Sep 17 00:00:00 2001
From: Mohamed El Mouctar Haidara <elmhaidara@gmail.com>
Date: Fri, 20 Nov 2020 18:45:31 +0100
Subject: [PATCH 192/869] feat(terraform): add autocompletion for Terraform
 0.13 (#9226)

---
 plugins/terraform/_terraform | 228 +++++++++++++++++++++--------------
 1 file changed, 140 insertions(+), 88 deletions(-)

diff --git a/plugins/terraform/_terraform b/plugins/terraform/_terraform
index e4298f2ab..a19e50670 100644
--- a/plugins/terraform/_terraform
+++ b/plugins/terraform/_terraform
@@ -6,14 +6,16 @@ _terraform_cmds=(
     'console:Interactive console for Terraform interpolations'
     'destroy:Destroy Terraform-managed infrastructure'
     'fmt:Rewrites config files to canonical format'
+    'force-unlock:Manually unlock the terraform state'
     'get:Download and install modules for the configuration'
     'graph:Create a visual graph of Terraform resources'
     'import:Import existing infrastructure into Terraform'
     'init:Initialize a Terraform working directory'
+    'login:Obtain and save credentials for a remote host'
+    'logout:Remove locally-stored credentials for a remote host'
     'output:Read an output from a state file'
     'plan:Generate and show an execution plan'
     'providers:Prints a tree of the providers used in the configuration'
-    'push:Upload this Terraform module to Atlas to run'
     'refresh:Update local state file against real resources'
     'show:Inspect Terraform state or plan'
     'state:Advanced state management'
@@ -23,6 +25,7 @@ _terraform_cmds=(
     'version:Prints the Terraform version'
     'workspace:Workspace management'
     '0.12upgrade:Rewrites pre-0.12 module source code for v0.12'
+    '0.13upgrade:Rewrites pre-0.13 module source code for v0.13'
 )
 
 __012upgrade() {
@@ -31,45 +34,51 @@ __012upgrade() {
     '-force[ Override the heuristic that attempts to detect if a configuration is already written for v0.12 or later.  Some of the transformations made by this command are not idempotent, so re-running against the same module may change the meanings expressions in the module.]'
 }
 
+__013upgrade() {
+  _arguments \
+    '-yes[Skip the initial introduction messages and interactive confirmation. This can be used to run this command in batch from a script.]'
+}
+
 __apply() {
     _arguments \
-        '-backup=[(path) Path to backup the existing state file before modifying. Defaults to the "-state-out" path with ".backup" extension. Set to "-" to disable backup.]' \
         '-auto-approve[Skip interactive approval of plan before applying.]' \
-        '-lock=[(true) Lock the state file when locking is supported.]' \
+        '-backup=[(path) Path to backup the existing state file before modifying. Defaults to the "-state-out" path with ".backup" extension. Set to "-" to disable backup.]:backupfile:_files -g "*.backup"' \
+        '-compact-warnings[If Terraform produces any warnings that are not accompanied by errors, show them in a more compact form that includes only the summary messages.]' \
+        '-lock=[(true) Lock the state file when locking is supported.]:lock:(true false)' \
         '-lock-timeout=[(0s) Duration to retry a state lock.]' \
         '-input=[(true) Ask for input for variables if not directly set.]' \
         '-no-color[If specified, output wil be colorless.]' \
         '-parallelism=[(10) Limit the number of parallel resource operations.]' \
         '-refresh=[(true) Update state prior to checking for differences. This has no effect if a plan file is given to apply.]' \
-        '-state=[(terraform.tfstate) Path to read and save state (unless state-out is specified).]' \
-        '-state-out=[(path) Path to write state to that is different than "-state". This can be used to preserve the old state.]' \
-        '-target=[(resource) Resource to target. Operation will be limited to this resource and its dependencies. This flag can be used multiple times.]:target:__statelist' \
-        '-var[("foo=bar") Set a variable in the Terraform configuration. This flag can be set multiple times.]' \
-        '-var-file=[(foo) Set variables in the Terraform configuration from a file. If "terraform.tfvars" or any ".auto.tfvars" files are present, they will be automatically loaded.]'
+        '-state=[(terraform.tfstate) Path to read and save state (unless state-out is specified).]:statefile:_files -g "*.tfstate"' \
+        '-state-out=[(path) Path to write state to that is different than "-state". This can be used to preserve the old state.]:statefile:_files -g "*.tfstate"' \
+        '*-target=[(resource) Resource to target. Operation will be limited to this resource and its dependencies. This flag can be used multiple times.]:target:__statelist' \
+        '*-var[("foo=bar") Set a variable in the Terraform configuration. This flag can be set multiple times.]' \
+        '*-var-file=[(foo) Set variables in the Terraform configuration from a file. If "terraform.tfvars" or any ".auto.tfvars" files are present, they will be automatically loaded.]:file:_files -g "*.tfvars{,.json}"'
 }
 
 __console() {
     _arguments \
         '-state=[(terraform.tfstate) Path to read state.]' \
-        '-var[("foo=bar") Set a variable in the Terraform configuration. This flag can be set multiple times.]' \
-        '-var-file=[(foo) Set variables in the Terraform configuration from a file. If "terraform.tfvars" or any ".auto.tfvars" files are present, they will be automatically loaded.]'
+        '*-var[("foo=bar") Set a variable in the Terraform configuration. This flag can be set multiple times.]' \
+        '*-var-file=[(foo) Set variables in the Terraform configuration from a file. If "terraform.tfvars" or any ".auto.tfvars" files are present, they will be automatically loaded.]:file:_files -g "*.tfvars{,.json}"'
 }
 
 __destroy() {
     _arguments \
-        '-backup=[(path) Path to backup the existing state file before modifying. Defaults to the "-state-out" path with ".backup" extension. Set to "-" to disable backup.]' \
+        '-backup=[(path) Path to backup the existing state file before modifying. Defaults to the "-state-out" path with ".backup" extension. Set to "-" to disable backup.]:backupfile:_files -g "*.backup"' \
         '-auto-approve[Skip interactive approval before destroying.]' \
         '-force[Deprecated: same as auto-approve.]' \
-        '-lock=[(true) Lock the state file when locking is supported.]' \
+        '-lock=[(true) Lock the state file when locking is supported.]:lock:(true false)' \
         '-lock-timeout=[(0s) Duration to retry a state lock.]' \
         '-no-color[If specified, output will contain no color.]' \
         '-parallelism=[(10) Limit the number of concurrent operations.]' \
         '-refresh=[(true) Update state prior to checking for differences. This has no effect if a plan file is given to apply.]' \
-        '-state=[(terraform.tfstate) Path to read and save state (unless state-out is specified).]' \
-        '-state-out=[(path) Path to write state to that is different than "-state". This can be used to preserve the old state.]' \
-        '-target=[(resource) Resource to target. Operation will be limited to this resource and its dependencies. This flag can be used multiple times.]:target:__statelist' \
-        '-var[("foo=bar") Set a variable in the Terraform configuration. This flag can be set multiple times.]' \
-        '-var-file=[(foo) Set variables in the Terraform configuration from a file. If "terraform.tfvars" or any ".auto.tfvars" files are present, they will be automatically loaded.]'
+        '-state=[(terraform.tfstate) Path to read and save state (unless state-out is specified).]:statefile:_files -g "*.tfstate"' \
+        '-state-out=[(path) Path to write state to that is different than "-state". This can be used to preserve the old state.]:statefile:_files -g "*.tfstate"' \
+        '*-target=[(resource) Resource to target. Operation will be limited to this resource and its dependencies. This flag can be used multiple times.]:target:__statelist' \
+        '*-var[("foo=bar") Set a variable in the Terraform configuration. This flag can be set multiple times.]' \
+        '*-var-file=[(foo) Set variables in the Terraform configuration from a file. If "terraform.tfvars" or any ".auto.tfvars" files are present, they will be automatically loaded.]:file:_files -g "*.tfvars{,.json}"'
 }
 
 __fmt() {
@@ -81,33 +90,36 @@ __fmt() {
         '-recursive=[(false) Also process files in subdirectories. By default, only the given directory (or current directory) is processed.]'
 }
 
+__force_unlock() {
+    _arguments \
+        "-force[Don't ask for input for unlock confirmation.]"
+}
+
 __get() {
     _arguments \
         '-update=[(false) If true, modules already downloaded will be checked for updates and updated if necessary.]' \
-        '-no-color[If specified, output will contain no color.]'
+        '-no-color[Disable text coloring in the output.]'
 }
 
 __graph() {
     _arguments \
         '-draw-cycles[Highlight any cycles in the graph with colored edges. This helps when diagnosing cycle errors.]' \
-        '-no-color[If specified, output will contain no color.]' \
         '-type=[(plan) Type of graph to output. Can be: plan, plan-destroy, apply, validate, input, refresh.]'
 }
 
 __import() {
     _arguments \
-        '-backup=[(path) Path to backup the existing state file before modifying. Defaults to the "-state-out" path with ".backup" extension. Set to "-" to disable backup.]' \
+        '-backup=[(path) Path to backup the existing state file before modifying. Defaults to the "-state-out" path with ".backup" extension. Set to "-" to disable backup.]:backupfile:_files -g "*.backup"' \
         '-config=[(path) Path to a directory of Terraform configuration files to use to configure the provider. Defaults to pwd. If no config files are present, they must be provided via the input prompts or env vars.]' \
         '-allow-missing-config[Allow import when no resource configuration block exists.]' \
         '-input=[(true) Ask for input for variables if not directly set.]' \
-        '-lock=[(true) Lock the state file when locking is supported.]' \
+        '-lock=[(true) Lock the state file when locking is supported.]:lock:(true false)' \
         '-lock-timeout=[(0s) Duration to retry a state lock.]' \
         '-no-color[If specified, output will contain no color.]' \
-        '-provider=[(provider) Specific provider to use for import. This is used for specifying aliases, such as "aws.eu". Defaults to the normal provider prefix of the resource being imported.]' \
-        '-state=[(PATH) Path to the source state file. Defaults to the configured backend, or "terraform.tfstate"]' \
-        '-state-out=[(PATH) Path to the destination state file to write to. If this is not specified, the source state file will be used. This can be a new or existing path.]' \
-        '-var[("foo=bar") Set a variable in the Terraform configuration. This flag can be set multiple times. This is only useful with the "-config" flag.]' \
-        '-var-file=[(foo) Set variables in the Terraform configuration from a file. If "terraform.tfvars" or any ".auto.tfvars" files are present, they will be automatically loaded.]'
+        '-state=[(PATH) Path to the source state file. Defaults to the configured backend, or "terraform.tfstate"]:statefile:_files -g "*.tfstate"' \
+        '-state-out=[(PATH) Path to the destination state file to write to. If this is not specified, the source state file will be used. This can be a new or existing path.]:statefile:_files -g "*.tfstate"' \
+        '*-var[("foo=bar") Set a variable in the Terraform configuration. This flag can be set multiple times. This is only useful with the "-config" flag.]' \
+        '*-var-file=[(foo) Set variables in the Terraform configuration from a file. If "terraform.tfvars" or any ".auto.tfvars" files are present, they will be automatically loaded.]:file:_files -g "*.tfvars{,.json}"'
 }
 
 __init() {
@@ -115,80 +127,94 @@ __init() {
         '-backend=[(true) Configure the backend for this configuration.]' \
         '-backend-config=[This can be either a path to an HCL file with key/value assignments (same format as terraform.tfvars) or a 'key=value' format. This is merged with what is in the configuration file. This can be specified multiple times. The backend type must be in the configuration itself.]' \
         '-force-copy[Suppress prompts about copying state data. This is equivalent to providing a "yes" to all confirmation prompts.]' \
-        '-from-module=[Copy the contents of the given module into the target directory before initialization.]' \
+        '-from-module=[(SOURCE) Copy the contents of the given module into the target directory before initialization.]' \
         '-get=[(true) Download any modules for this configuration.]' \
         '-get-plugins=[(true) Download any missing plugins for this configuration.]' \
         '-input=[(true) Ask for input if necessary. If false, will error if input was required.]' \
-        '-lock=[(true) Lock the state file when locking is supported.]' \
+        '-lock=[(true) Lock the state file when locking is supported.]:lock:(true false)' \
         '-lock-timeout=[(0s) Duration to retry a state lock.]' \
         '-no-color[If specified, output will contain no color.]' \
-        '-plugin-dir[Directory containing plugin binaries. This overrides all default search paths for plugins, and prevents the automatic installation of plugins. This flag can be used multiple times.]' \
+        '-plugin-dir[Directory containing plugin binaries. This overrides all default search paths for plugins, and prevents the automatic installation of plugins. This flag can be used multiple times.]:plugin_dir:_files -/' \
         '-reconfigure[Reconfigure the backend, ignoring any saved configuration.]' \
         '-upgrade=[(false) If installing modules (-get) or plugins (-get-plugins), ignore previously-downloaded objects and install the latest version allowed within configured constraints.]' \
         '-verify-plugins=[(true) Verify the authenticity and integrity of automatically downloaded plugins.]'
 }
 
+__login() {
+    _arguments \
+
+}
+
+__logout() {
+    _arguments \
+
+}
+
 __output() {
     _arguments \
-        '-state=[(path) Path to the state file to read. Defaults to "terraform.tfstate".]' \
-        '-no-color[ If specified, output will contain no color.]' \
-        '-module=[(name) If specified, returns the outputs for a specific module]' \
+        '-state=[(path) Path to the state file to read. Defaults to "terraform.tfstate".]:statefile:_files -g "*.tfstate"' \
+        '-no-color[If specified, output will contain no color.]' \
         '-json[If specified, machine readable output will be printed in JSON format]'
 }
 
 __plan() {
     _arguments \
-        '-destroy[() If set, a plan will be generated to destroy all resources managed by the given configuration and state.]' \
+        '-compact-warnings[If Terraform produces any warnings that are not accompanied by errors, show them in a more compact form that includes only the summary messages.]' \
+        '-destroy[If set, a plan will be generated to destroy all resources managed by the given configuration and state.]' \
         '-detailed-exitcode[() Return detailed exit codes when the command exits. This will change the meaning of exit codes to: 0 - Succeeded, diff is empty (no changes); 1 - Errored, 2 - Succeeded; there is a diff]' \
         '-input=[(true) Ask for input for variables if not directly set.]' \
-        '-lock=[(true) Lock the state file when locking is supported.]' \
+        '-lock=[(true) Lock the state file when locking is supported.]:lock:(true false)' \
         '-lock-timeout=[(0s) Duration to retry a state lock.]' \
-        '-module-depth=[(n) Specifies the depth of modules to show in the output. This does not affect the plan itself, only the output shown. By default, this is -1, which will expand all.]' \
         '-no-color[() If specified, output will contain no color.]' \
         '-out=[(path) Write a plan file to the given path. This can be used as input to the "apply" command.]' \
         '-parallelism=[(10) Limit the number of concurrent operations.]' \
         '-refresh=[(true) Update state prior to checking for differences.]' \
-        '-state=[(statefile) Path to a Terraform state file to use to look up Terraform-managed resources. By default it will use the state "terraform.tfstate" if it exists.]' \
-        '-target=[(resource) Resource to target. Operation will be limited to this resource and its dependencies. This flag can be used multiple times.]:target:__statelist' \
-        '-var[("foo=bar") Set a variable in the Terraform configuration. This flag can be set multiple times.]' \
-        '-var-file=[(foo) Set variables in the Terraform configuration from a file. If "terraform.tfvars" or any ".auto.tfvars" files are present, they will be automatically loaded.]' \
+        '-state=[(statefile) Path to a Terraform state file to use to look up Terraform-managed resources. By default it will use the state "terraform.tfstate" if it exists.]:statefile:_files -g "*.tfstate"' \
+        '*-target=[(resource) Resource to target. Operation will be limited to this resource and its dependencies. This flag can be used multiple times.]:target:__statelist' \
+        '*-var[("foo=bar") Set a variable in the Terraform configuration. This flag can be set multiple times.]' \
+        '*-var-file=[(foo) Set variables in the Terraform configuration from a file. If "terraform.tfvars" or any ".auto.tfvars" files are present, they will be automatically loaded.]:file:_files -g "*.tfvars{,.json}"'
 }
 
 __providers() {
-    _arguments \
+    local -a __providers_cmds
+    __providers_cmds=(
+      'mirror:Mirrors the provider plugins needed for the current configuration'
+      'schema:Prints the schemas of the providers used in the configuration'
+    )
+    _describe -t providers "providers commands" __providers_cmds
 
 }
 
-__push() {
+__providers_mirror() {
     _arguments \
-        '-atlas-address=[(url) An alternate address to an Atlas instance. Defaults to https://atlas.hashicorp.com.]' \
-        '-upload-modules=[(true) If true (default), then the modules being used are all locked at their current checkout and uploaded completely to Atlas. This prevents Atlas from running terraform get for you.]' \
-        '-name=[(name) Name of the infrastructure configuration in Atlas. The format of this is: "username/name" so that you can upload configurations not just to your account but to other accounts and organizations. This setting can also be set in the configuration in the Atlas section.]' \
-        '-no-color[Disables output with coloring]' \
-        '-overwrite=[(foo) Marks a specific variable to be updated on Atlas. Normally, if a variable is already set in Atlas, Terraform will not send the local value (even if it is different). This forces it to send the local value to Atlas. This flag can be repeated multiple times.]' \
-        '-token=[(token) Atlas API token to use to authorize the upload. If blank or unspecified, the ATLAS_TOKEN environmental variable will be used.]' \
-        '-var=[("foo=bar") Set the value of a variable for the Terraform configuration.]' \
-        '-var-file=[(foo) Set the value of variables using a variable file.]' \
-        '-vcs=[(true) If true (default), then Terraform will detect if a VCS is in use, such as Git, and will only upload files that are committed to version control. If no version control system is detected, Terraform will upload all files in path (parameter to the command).]'
+      '-platform=[(os_arch) Choose which target platform to build a mirror for.]' \
+      "*:target_dir:_files -/"
+}
+
+__providers_schema() {
+    _arguments \
+      '-json[]' \
+      '::'
 }
 
 __refresh() {
     _arguments \
-        '-backup=[(path) Path to backup the existing state file before modifying. Defaults to the "-state-out" path with ".backup" extension. Set to "-" to disable backup.]' \
+        '-backup=[(path) Path to backup the existing state file before modifying. Defaults to the "-state-out" path with ".backup" extension. Set to "-" to disable backup.]::backupfile:_files -g "*.backup"' \
+        '-compact-warnings[If Terraform produces any warnings that are not accompanied by errors, show them in a more compact form that includes only the summary messages.]' \
         '-input=[(true) Ask for input for variables if not directly set.]' \
-        '-lock=[(true) Lock the state file when locking is supported.]' \
+        '-lock=[(true) Lock the state file when locking is supported.]:lock:(true false)' \
         '-lock-timeout=[(0s) Duration to retry a state lock.]' \
         '-no-color[If specified, output will not contain any color.]' \
-        '-state=[(path) Path to read and save state (unless state-out is specified). Defaults to "terraform.tfstate".]' \
-        '-state-out=[(path) Path to write state to that is different than "-state". This can be used to preserve the old state.]' \
-        '-target=[(resource) A Resource Address to target. Operation will be limited to this resource and its dependencies. This flag can be used multiple times.]:target:__statelist' \
-        '-var[("foo=bar") Set a variable in the Terraform configuration. This flag can be set multiple times.]' \
-        '-var-file=[(path) Set variables in the Terraform configuration from a file. If "terraform.tfvars" is present, it will be automatically loaded if this flag is not specified.]'
+        '-state=[(path) Path to read and save state (unless state-out is specified). Defaults to "terraform.tfstate".]:statefile:_files -g "*.tfstate"' \
+        '-state-out=[(path) Path to write state to that is different than "-state". This can be used to preserve the old state.]:statefile:_files -g "*.tfstate"' \
+        '*-target=[(resource) A Resource Address to target. Operation will be limited to this resource and its dependencies. This flag can be used multiple times.]:target:__statelist' \
+        '*-var[("foo=bar") Set a variable in the Terraform configuration. This flag can be set multiple times.]' \
+        '*-var-file=[(foo) Set variables in the Terraform configuration from a file. If "terraform.tfvars" or any ".auto.tfvars" files are present, they will be automatically loaded.]:file:_files -g "*.tfvars{,.json}"'
 }
 
 __show() {
     _arguments \
-        '-module-depth=[(n) The maximum depth to expand modules. By default this is zero, which will not expand modules at all.]' \
+        '-json[If specified, output the Terraform plan or state in a machine-readable form.]' \
         '-no-color[If specified, output will not contain any color.]'
 }
 
@@ -199,6 +225,7 @@ __state() {
       'mv:Move an item in the state'
       'pull:Pull current state and output to stdout'
       'push:Update remote state from a local state file'
+      'replace-provider:Replace provider for resources in the Terraform state'
       'rm:Remove instances from the state' 
       'show:Show a resource in the state'
     )
@@ -207,7 +234,7 @@ __state() {
 
 __state_list() {
   _arguments \
-    '-state=[(path) Path to a Terraform state file to use to look up Terraform-managed resources. By default it will use the state "terraform.tfstate" if it exists.]' \
+    '-state=[(statefile) Path to a Terraform state file to use to look up Terraform-managed resources. By default, Terraform will consult the state of the currently-selected workspace.]' \
     '-id=[(id) Filters the results to include only instances whose resource types have an attribute named id whose value equals the given id string.]' \
     "*:address:__statelist" 
 }
@@ -215,12 +242,12 @@ __state_list() {
 __state_mv() {
   _arguments \
     "-dry-run[If set, prints out what would've been moved but doesn't actually move anything.]" \
-    "-backup=[(path) Path where Terraform should write the backup for the original state. This can't be disabled. If not set, Terraform will write it to the same path as the statefile with a \".backup\" extension.]:file:_files" \
-    "-backup-out=[(path) Path where Terraform should write the backup for the destination state. This can't be disabled. If not set, Terraform will write it to the same path as the destination state file with a backup extension. This only needs to be specified if -state-out is set to a different path than -state.]:file:_files" \
-    "-lock=[(true|false) Lock the state files when locking is supported.]:lock:(true false)" \
-    "-lock-timeout=[(seconds) Duration to retry a state lock.]" \
-    '-state=[(path) Path to the source state file. Defaults to the configured backend, or "terraform.tfstate"]:file:_files' \
-    "-state-out=[(path) Path to the destination state file to write to. If this isn't specified, the source state file will be used. This can be a new or existing path.]:file:_files" \
+    '-backup=[(PATH) Path where Terraform should write the backup for the original state. This can"t be disabled. If not set, Terraform will write it to the same path as the statefile with a ".backup" extension.]:backupfile:_files -g "*.backup"' \
+    '-backup-out=[(PATH) Path where Terraform should write the backup for the destination state. This can"t be disabled. If not set, Terraform will write it to the same path as the destination state file with a backup extension. This only needs to be specified if -state-out is set to a different path than -state.]:backupfile:_files -g "*.backup"' \
+    "-lock=[(true) Lock the state files when locking is supported.]:lock:(true false)" \
+    "-lock-timeout=[(0s) Duration to retry a state lock.]" \
+    '-state=[(path) Path to the source state file. Defaults to the configured backend, or "terraform.tfstate"]:statefile:_files -g "*.tfstate"' \
+    '-state-out=[(path) Path to the destination state file to write to. If this isn"t specified, the source state file will be used. This can be a new or existing path.]:statefile:_files -g "*.tfstate"' \
     "::" \
     ":source:__statelist" \
     ":destination: " 
@@ -229,26 +256,37 @@ __state_mv() {
 __state_push() {
   _arguments \
     "-force[Write the state even if lineages don't match or the remote serial is higher.]" \
-    '-lock=[(true|false) Lock the state file when locking is supported.]:lock:(true false)' \
-    "-lock-timeout=[(seconds) Duration to retry a state lock.]" \
+    '-lock=[(true) Lock the state file when locking is supported.]:lock:(true false)' \
+    "-lock-timeout=[(0s) Duration to retry a state lock.]" \
     "::" \
     ":destination:_files"
 }
 
+__state_replace_provider() {
+  _arguments \
+    '-auto-approve[Skip interactive approval.]' \
+    '-backup=[(PATH) Path where Terraform should write the backup for the state file. This can"t be disabled. If not set, Terraform will write it to the same path as the state file with a ".backup" extension.]:backupfile:_files -g "*.backup"' \
+    "-lock=[(true) Lock the state files when locking is supported.]:lock:(true false)" \
+    "-lock-timeout=[(0s) Duration to retry a state lock.]" \
+    '-state=[(PATH) Path to the source state file. Defaults to the configured backend, or "terraform.tfstate"]:statefile:_files -g "*.tfstate"' \
+    ":from_provider_fqn:" \
+    ":to_provider_fqn:"
+}
+
 __state_rm() {
   _arguments \
     "-dry-run[If set, prints out what would've been removed but doesn't actually remove anything.]" \
-    "-backup=[(path) Path where Terraform should write the backup for the original state.]:file:_files" \
-    "-lock=[(true|false) Lock the state files when locking is supported.]:lock:(true false)" \
-    "-lock-timeout=[(seconds) Duration to retry a state lock.]" \
-    '-state=[(path) Path to the state file to update. Defaults to the current workspace state.]:file:_files' \
+    '-backup=[(PATH) Path where Terraform should write the backup for the original state.]::backupfile:_files -g "*.backup"' \
+    "-lock=[(true) Lock the state file when locking is supported.]:lock:(true false)" \
+    "-lock-timeout=[(0s) Duration to retry a state lock.]" \
+    '-state=[(PATH) Path to the state file to update. Defaults to the current workspace state.]:statefile:_files -g "*.tfstate"' \
     "*:address:__statelist" 
 }
 
 
 __state_show() {
   _arguments \
-    '-state=[(path) Path to a Terraform state file to use to look up Terraform-managed resources. By default it will use the state "terraform.tfstate" if it exists.]' \
+    '-state=[(statefile) Path to a Terraform state file to use to look up Terraform-managed resources. By default it will use the state "terraform.tfstate" if it exists.]:statefile:_files -g "*.tfstate"' \
     "*:address:__statelist" 
 }
 
@@ -259,34 +297,36 @@ __statelist() {
 __taint() {
     _arguments \
         '-allow-missing[If specified, the command will succeed (exit code 0) even if the resource is missing.]' \
-        '-backup=[(path) Path to backup the existing state file before modifying. Defaults to the "-state-out" path with ".backup" extension. Set to "-" to disable backup.]' \
-        '-lock=[(true) Lock the state file when locking is supported.]' \
+        '-backup=[(path) Path to backup the existing state file before modifying. Defaults to the "-state-out" path with ".backup" extension. Set to "-" to disable backup.]:backupfile:_files -g "*.backup"' \
+        '-lock=[(true) Lock the state file when locking is supported.]:lock:(true false)' \
         '-lock-timeout=[(0s) Duration to retry a state lock.]' \
         '-module=[(path)  The module path where the resource lives. By default this will be root. Child modules can be specified by names. Ex. "consul" or "consul.vpc" (nested modules).]' \
-        '-no-color[If specified, output will not contain any color.]' \
-        '-state=[(path) Path to read and save state (unless state-out is  specified). Defaults to "terraform.tfstate".]' \
-        '-state-out=[(path) Path to write updated state file. By default, the "-state" path will be used.]' \
+        '-state=[(path) Path to read and save state (unless state-out is  specified). Defaults to "terraform.tfstate".]:statefile:_files -g "*.tfstate"' \
+        '-state-out=[(path) Path to write updated state file. By default, the "-state" path will be used.]:statefile:_files -g "*.tfstate"' \
         "*:address:__statelist" 
 }
 
 __untaint() {
     _arguments \
     '-allow-missing[If specified, the command will succeed (exit code 0) even if the resource is missing.]' \
-    '-backup=[(path) Path to backup the existing state file before modifying. Defaults to the "-state-out" path with ".backup" extension. Set to "-" to disable backup.]' \
-    '-lock=[(true) Lock the state file when locking is supported.]' \
+    '-backup=[(path) Path to backup the existing state file before modifying. Defaults to the "-state-out" path with ".backup" extension. Set to "-" to disable backup.]:backupfile:_files -g "*.backup"' \
+    '-lock=[(true) Lock the state file when locking is supported.]:lock:(true false)' \
     '-lock-timeout=[(0s) Duration to retry a state lock.]' \
     '-module=[(path)  The module path where the resource lives. By default this will be root. Child modules can be specified by names. Ex. "consul" or "consul.vpc" (nested modules).]' \
-    '-no-color[If specified, output will not contain any color.]' \
-    '-state=[(path) Path to read and save state (unless state-out is  specified). Defaults to "terraform.tfstate".]' \
-    '-state-out=[(path) Path to write updated state file. By default, the "-state" path will be used.]'
+    '-state=[(path) Path to read and save state (unless state-out is  specified). Defaults to "terraform.tfstate".]:statefile:_files -g "*.tfstate"' \
+    '-state-out=[(path) Path to write updated state file. By default, the "-state" path will be used.]:statefile:_files -g "*.tfstate"'
 }
 
 __validate() {
     _arguments \
-    '-check-variables=[(true) If set to true (default), the command will check whether all required variables have been specified.]' \
     '-no-color[If specified, output will not contain any color.]' \
-    '-var[("foo=bar") Set a variable in the Terraform configuration. This flag can be set multiple times.]' \
-    '-var-file=[(path) Set variables in the Terraform configuration from a file. If "terraform.tfvars" is present, it will be automatically loaded if this flag is not specified.]'
+    '-json[Produce output in a machine-readable JSON format, suitable for use in text editor integrations and other automated systems.]' \
+    ':dir:_files -/'
+}
+
+__version() {
+    _arguments \
+    '-json[Output the version information as a JSON object.]'
 }
 
 __workspace() {
@@ -312,6 +352,8 @@ local -a _command_args
 case "$words[1]" in
   0.12upgrade)
     __012upgrade ;;
+  0.13upgrade)
+    __013upgrade ;;
   apply)
     __apply ;;
   console)
@@ -320,6 +362,8 @@ case "$words[1]" in
     __destroy ;;
   fmt)
     __fmt;;
+  force-unlock)
+    __force_unlock;;
   get)
     __get ;;
   graph)
@@ -328,14 +372,19 @@ case "$words[1]" in
     __import;;
   init)
     __init ;;
+  login)
+    __login ;;
+  logout)
+    __logout ;;
   output)
     __output ;;
   plan)
     __plan ;;
   providers)
-    __providers ;;
-  push)
-    __push ;;
+    test $CURRENT -lt 3 && __providers
+    [[ $words[2] = "mirror" ]] && __providers_mirror
+    [[ $words[2] = "schema" ]] && __providers_schema
+    ;;
   refresh)
     __refresh ;;
   show)
@@ -345,6 +394,7 @@ case "$words[1]" in
     [[ $words[2] = "list" ]] && __state_list
     [[ $words[2] = "mv" ]] && __state_mv
     [[ $words[2] = "push" ]] && __state_push
+    [[ $words[2] = "replace-provider" ]] && __state_replace_provider
     [[ $words[2] = "rm" ]] && __state_rm
     [[ $words[2] = "show" ]] && __state_show
     ;;
@@ -354,6 +404,8 @@ case "$words[1]" in
     __untaint ;;
   validate)
     __validate ;;
+  version)
+    __version ;;
   workspace)
     test $CURRENT -lt 3 && __workspace ;;
 esac

From 7a76afd61e5daab6fb33f955930efa7f4cf16021 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eug=C3=A9ne=20Roux?= <jabofh@users.noreply.github.com>
Date: Sun, 22 Nov 2020 16:42:39 +0200
Subject: [PATCH 193/869] style(ansible): minor style change (#8356)

---
 plugins/ansible/ansible.plugin.zsh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/ansible/ansible.plugin.zsh b/plugins/ansible/ansible.plugin.zsh
index f68ff23a5..75393b704 100644
--- a/plugins/ansible/ansible.plugin.zsh
+++ b/plugins/ansible/ansible.plugin.zsh
@@ -4,7 +4,7 @@ function ansible-version(){
 }
 
 function ansible-role-init(){
-    if ! [ -z $1] ; then
+    if ! [ -z $1 ] ; then
         echo "Ansible Role : $1 Creating...."
         ansible-galaxy init $1
         tree $1
@@ -25,4 +25,4 @@ alias ainv='ansible-inventory '
 alias adoc='ansible-doc '
 alias agal='ansible-galaxy '
 alias apull='ansible-pull '
-alias aval='ansible-vault'
\ No newline at end of file
+alias aval='ansible-vault'

From d88887195fd5535ef2fd95180baa73af2a8c88f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Wed, 25 Nov 2020 20:14:28 +0100
Subject: [PATCH 194/869] fix(magic-enter): fix various bugs in the plugin
 (#9466)

---
 plugins/magic-enter/magic-enter.plugin.zsh | 53 +++++++++++++---------
 1 file changed, 32 insertions(+), 21 deletions(-)

diff --git a/plugins/magic-enter/magic-enter.plugin.zsh b/plugins/magic-enter/magic-enter.plugin.zsh
index 2d4d578b6..55b893535 100644
--- a/plugins/magic-enter/magic-enter.plugin.zsh
+++ b/plugins/magic-enter/magic-enter.plugin.zsh
@@ -1,27 +1,38 @@
-# Bind quick stuff to enter!
-#
-# Pressing enter in a git directory runs `git status`
-# in other directories `ls`
-magic-enter () {
-  # If commands are not already set, use the defaults
-  [ -z "$MAGIC_ENTER_GIT_COMMAND" ] && MAGIC_ENTER_GIT_COMMAND="git status -u ."
-  [ -z "$MAGIC_ENTER_OTHER_COMMAND" ] && MAGIC_ENTER_OTHER_COMMAND="ls -lh ."
+# Default commands
+: ${MAGIC_ENTER_GIT_COMMAND:="git status -u ."} # run when in a git repository
+: ${MAGIC_ENTER_OTHER_COMMAND:="ls -lh ."}      # run anywhere else
 
-  if [[ -z $BUFFER ]]; then
-    echo ""
-    if git rev-parse --is-inside-work-tree &>/dev/null; then
-      eval "$MAGIC_ENTER_GIT_COMMAND"
-    else
-      eval "$MAGIC_ENTER_OTHER_COMMAND"
-    fi
-    zle redisplay
+magic-enter() {
+  # Only run MAGIC_ENTER commands when in PS1 and command line is empty
+  # http://zsh.sourceforge.net/Doc/Release/Zsh-Line-Editor.html#User_002dDefined-Widgets
+  if [[ -n "$BUFFER" || "$CONTEXT" != start ]]; then
+    return
+  fi
+
+  if command git rev-parse --is-inside-work-tree &>/dev/null; then
+    BUFFER="$MAGIC_ENTER_GIT_COMMAND"
   else
-    zle accept-line
+    BUFFER="$MAGIC_ENTER_OTHER_COMMAND"
   fi
 }
 
-zle -N magic-enter
+# Wrapper for the accept-line zle widget (run when pressing Enter)
 
-bindkey -M emacs "^M" magic-enter
-bindkey -M vicmd "^M" magic-enter
-bindkey -M viins "^M" magic-enter
+# If the wrapper already exists don't redefine it
+(( ! ${+functions[_magic-enter_accept-line]} )) || return 0
+
+case "$widgets[accept-line]" in
+  # Override the current accept-line widget, calling the old one
+  user:*) zle -N _magic-enter_orig_accept-line "${widgets[accept-line]#user:}"
+    function _magic-enter_accept-line() {
+      magic-enter
+      zle _magic-enter_orig_accept-line -- "$@"
+    } ;;
+  # If no user widget defined, call the original accept-line widget
+  builtin) function _magic-enter_accept-line() {
+      magic-enter
+      zle .accept-line
+    } ;;
+esac
+
+zle -N accept-line _magic-enter_accept-line

From 05e2956dc61198d4767b96d97c5d10c93cedd6e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Thu, 26 Nov 2020 22:27:07 +0100
Subject: [PATCH 195/869] fix(git-auto-fetch): background `git-fetch-all` and
 other fixes (#9468)

---
 plugins/git-auto-fetch/README.md              | 45 ++++++++---
 .../git-auto-fetch/git-auto-fetch.plugin.zsh  | 81 ++++++++++++-------
 2 files changed, 85 insertions(+), 41 deletions(-)

diff --git a/plugins/git-auto-fetch/README.md b/plugins/git-auto-fetch/README.md
index 35f3c2f71..e96ab42a3 100644
--- a/plugins/git-auto-fetch/README.md
+++ b/plugins/git-auto-fetch/README.md
@@ -1,26 +1,29 @@
 # Git auto-fetch
 
-Automatically fetches all changes from all remotes while you are working in git-initialized directory.
+Automatically fetches all changes from all remotes while you are working in a git-initialized directory.
 
-#### Usage
-
-Add `git-auto-fetch` to the plugins array in your zshrc file:
+To use it, add `git-auto-fetch` to the plugins array in your zshrc file:
 
 ```shell
 plugins=(... git-auto-fetch)
 ```
 
-Every time you launch a command in your shell all remotes will be fetched in background.
-By default autofetch will be triggered only if last fetch was done at least 60 seconds ago.
-You can change fetch interval in your .zshrc:
-```
-GIT_AUTO_FETCH_INTERVAL=1200 #in seconds
-```
-Log of `git fetch --all` will be saved into `.git/FETCH_LOG`
+## Usage
 
+Every time the command prompt is shown all remotes will be fetched in the background. By default,
+`git-auto-fetch` will be triggered only if the last auto-fetch was done at least 60 seconds ago.
+You can change the fetch interval in your .zshrc:
 
-#### Toggle auto fetch per folder
-If you are using mobile connection or for any other reason you can disable git-auto-fetch for any folder:
+```sh
+GIT_AUTO_FETCH_INTERVAL=1200 # in seconds
+```
+
+A log of `git fetch --all` will be saved in `.git/FETCH_LOG`.
+
+## Toggle auto-fetch per folder
+
+If you are using a mobile connection or for any other reason you can disable git-auto-fetch
+for any folder:
 
 ```shell
 $ cd to/your/project
@@ -29,3 +32,19 @@ disabled
 $ git-auto-fetch
 enabled
 ```
+
+## Caveats
+
+Automatically fetching all changes defeats the purpose of `git push --force-with-lease`,
+and makes it behave like `git push --force` in some cases. For example:
+
+Consider that you made some changes and possibly rebased some stuff, which means you'll
+need to use `--force-with-lease` to overwrite the remote history of a branch. Between the
+time when you make the changes (maybe do a `git log`) and the time when you `git push`,
+it's possible that someone else updates the branch you're working on.
+
+If `git-auto-fetch` triggers then, you'll have fetched the remote changes without knowing
+it, and even though you're running the push with `--force-with-lease`, git will overwrite
+the recent changes because you already have them in your local repository. The
+[`git push --force-with-lease` docs](https://git-scm.com/docs/git-push) talk about possible
+solutions to this problem.
diff --git a/plugins/git-auto-fetch/git-auto-fetch.plugin.zsh b/plugins/git-auto-fetch/git-auto-fetch.plugin.zsh
index 5c42c21a7..0da84f2f5 100644
--- a/plugins/git-auto-fetch/git-auto-fetch.plugin.zsh
+++ b/plugins/git-auto-fetch/git-auto-fetch.plugin.zsh
@@ -1,36 +1,61 @@
-GIT_AUTO_FETCH_INTERVAL=${GIT_AUTO_FETCH_INTERVAL:=60}
+# Default auto-fetch interval: 60 seconds
+: ${GIT_AUTO_FETCH_INTERVAL:=60}
+
+# Necessary for the git-fetch-all function
+zmodload zsh/datetime zsh/stat
 
 function git-fetch-all {
-  (`command git rev-parse --is-inside-work-tree 2>/dev/null` &&
-  dir=`command git rev-parse --git-dir` &&
-  [[ ! -f $dir/NO_AUTO_FETCH ]] &&
-  (( `date +%s` - `date -r $dir/FETCH_LOG +%s 2>/dev/null || echo 0` > $GIT_AUTO_FETCH_INTERVAL )) &&
-  GIT_SSH_COMMAND="command ssh -o BatchMode=yes" \
-    command git fetch --all 2>/dev/null &>! $dir/FETCH_LOG &)
+  (
+    # Get git root directory
+    if ! gitdir="$(command git rev-parse --git-dir 2>/dev/null)"; then
+      return 0
+    fi
+
+    # Do nothing if auto-fetch disabled
+    if [[ -z "$gitdir" || -f "$gitdir/NO_AUTO_FETCH" ]]; then
+      return 0
+    fi
+
+    # Get time (seconds) when auto-fetch was last run
+    lastrun="$(zstat +mtime "$gitdir/FETCH_LOG" 2>/dev/null || echo 0)"
+    # Do nothing if not enough time has passed since last auto-fetch
+    if (( EPOCHSECONDS - lastrun < $GIT_AUTO_FETCH_INTERVAL )); then
+      return 0
+    fi
+
+    # Fetch all remotes (avoid ssh passphrase prompt)
+    GIT_SSH_COMMAND="command ssh -o BatchMode=yes" \
+      command git fetch --all 2>/dev/null &>! "$gitdir/FETCH_LOG"
+  ) &|
 }
 
 function git-auto-fetch {
-  `command git rev-parse --is-inside-work-tree 2>/dev/null` || return
-  guard="`command git rev-parse --git-dir`/NO_AUTO_FETCH"
+  # Do nothing if not in a git repository
+  command git rev-parse --is-inside-work-tree &>/dev/null || return 0
 
-  (rm $guard 2>/dev/null &&
-    echo "${fg_bold[green]}enabled${reset_color}") ||
-  (touch $guard &&
-    echo "${fg_bold[red]}disabled${reset_color}")
+  # Remove or create guard file depending on its existence
+  local guard="$(command git rev-parse --git-dir)/NO_AUTO_FETCH"
+  if [[ -f "$guard" ]]; then
+    command rm "$guard" && echo "${fg_bold[green]}enabled${reset_color}"
+  else
+    command touch "$guard" && echo "${fg_bold[red]}disabled${reset_color}"
+  fi
 }
 
-# Override zle-line-init if it exists
-if (( $+functions[zle-line-init] )); then
-  eval "override-git-auto-fetch-$(declare -f zle-line-init)"
-  
-  function zle-line-init () {
-    git-fetch-all
-    override-git-auto-fetch-zle-line-init
-  }
-else
-  function zle-line-init () {
-    git-fetch-all
-  }
-fi
-  
-zle -N zle-line-init
+# zle-line-init widget (don't redefine if already defined)
+(( ! ${+functions[_git-auto-fetch_zle-line-init]} )) || return 0
+
+case "$widgets[zle-line-init]" in
+  # Simply define the function if zle-line-init doesn't yet exist
+  builtin|"") function _git-auto-fetch_zle-line-init() {
+      git-fetch-all
+    } ;;
+  # Override the current zle-line-init widget, calling the old one
+  user:*) zle -N _git-auto-fetch_orig_zle-line-init "${widgets[zle-line-init]#user:}"
+    function _git-auto-fetch_zle-line-init() {
+      git-fetch-all
+      zle _git-auto-fetch_orig_zle-line-init -- "$@"
+    } ;;
+esac
+
+zle -N zle-line-init _git-auto-fetch_zle-line-init

From 889cd7acf349f1cae81c07378986157b382f7f1d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Sat, 31 Oct 2020 23:14:24 +0100
Subject: [PATCH 196/869] refactor(updater): switch to Zsh execution and fix
 git remote detection logic

---
 lib/cli.zsh                |   2 +-
 lib/functions.zsh          |   2 +-
 tools/check_for_upgrade.sh | 110 +++++++++++++++++++------------------
 tools/upgrade.sh           |  98 ++++++++++++++++++---------------
 4 files changed, 112 insertions(+), 100 deletions(-)
 mode change 100644 => 100755 tools/upgrade.sh

diff --git a/lib/cli.zsh b/lib/cli.zsh
index b1478a89f..30790bec7 100644
--- a/lib/cli.zsh
+++ b/lib/cli.zsh
@@ -351,7 +351,7 @@ function _omz::theme::use {
 
 function _omz::update {
     # Run update script
-    env ZSH="$ZSH" sh "$ZSH/tools/upgrade.sh"
+    env ZSH="$ZSH" zsh -f "$ZSH/tools/upgrade.sh"
     # Update last updated file
     zmodload zsh/datetime
     echo "LAST_EPOCH=$(( EPOCHSECONDS / 60 / 60 / 24 ))" >! "${ZSH_CACHE_DIR}/.zsh-update"
diff --git a/lib/functions.zsh b/lib/functions.zsh
index 15526cd5f..f6f34e851 100644
--- a/lib/functions.zsh
+++ b/lib/functions.zsh
@@ -14,7 +14,7 @@ function upgrade_oh_my_zsh() {
   fi
 
   # Run update script
-  env ZSH="$ZSH" sh "$ZSH/tools/upgrade.sh"
+  env ZSH="$ZSH" zsh -f "$ZSH/tools/upgrade.sh"
   # Update last updated file
   zmodload zsh/datetime
   echo "LAST_EPOCH=$(( EPOCHSECONDS / 60 / 60 / 24 ))" >! "${ZSH_CACHE_DIR}/.zsh-update"
diff --git a/tools/check_for_upgrade.sh b/tools/check_for_upgrade.sh
index cadd5fe49..17925af8b 100644
--- a/tools/check_for_upgrade.sh
+++ b/tools/check_for_upgrade.sh
@@ -1,6 +1,6 @@
 # Migrate .zsh-update file to $ZSH_CACHE_DIR
 if [[ -f ~/.zsh-update && ! -f "${ZSH_CACHE_DIR}/.zsh-update" ]]; then
-    mv ~/.zsh-update "${ZSH_CACHE_DIR}/.zsh-update"
+  mv ~/.zsh-update "${ZSH_CACHE_DIR}/.zsh-update"
 fi
 
 # Cancel update if:
@@ -10,79 +10,81 @@ fi
 if [[ "$DISABLE_AUTO_UPDATE" = true ]] \
    || [[ ! -w "$ZSH" || ! -O "$ZSH" ]] \
    || ! command -v git &>/dev/null; then
-    return
+  return
 fi
 
 
 function current_epoch() {
-    zmodload zsh/datetime
-    echo $(( EPOCHSECONDS / 60 / 60 / 24 ))
+  zmodload zsh/datetime
+  echo $(( EPOCHSECONDS / 60 / 60 / 24 ))
 }
 
 function update_last_updated_file() {
-    echo "LAST_EPOCH=$(current_epoch)" >! "${ZSH_CACHE_DIR}/.zsh-update"
+  echo "LAST_EPOCH=$(current_epoch)" >! "${ZSH_CACHE_DIR}/.zsh-update"
 }
 
 function update_ohmyzsh() {
-    ZSH="$ZSH" sh "$ZSH/tools/upgrade.sh"
-    update_last_updated_file
+  ZSH="$ZSH" zsh -f "$ZSH/tools/upgrade.sh"
+  update_last_updated_file
 }
 
 () {
-    emulate -L zsh
+  emulate -L zsh
 
-    local epoch_target mtime option LAST_EPOCH
+  local epoch_target mtime option LAST_EPOCH
 
-    # Remove lock directory if older than a day
-    zmodload zsh/datetime
-    zmodload -F zsh/stat b:zstat
-    if mtime=$(zstat +mtime "$ZSH/log/update.lock" 2>/dev/null); then
-        if (( (mtime + 3600 * 24) < EPOCHSECONDS )); then
-            command rm -rf "$ZSH/log/update.lock"
-        fi
+  # Remove lock directory if older than a day
+  zmodload zsh/datetime
+  zmodload -F zsh/stat b:zstat
+  if mtime=$(zstat +mtime "$ZSH/log/update.lock" 2>/dev/null); then
+    if (( (mtime + 3600 * 24) < EPOCHSECONDS )); then
+      command rm -rf "$ZSH/log/update.lock"
     fi
+  fi
 
-    # Check for lock directory
-    if ! command mkdir "$ZSH/log/update.lock" 2>/dev/null; then
-        return
-    fi
+  # Check for lock directory
+  if ! command mkdir "$ZSH/log/update.lock" 2>/dev/null; then
+    return
+  fi
 
-    # Remove lock directory on exit. `return 1` is important for when trapping a SIGINT:
-    #  The return status from the function is handled specially. If it is zero, the signal is
-    #  assumed to have been handled, and execution continues normally. Otherwise, the shell
-    #  will behave as interrupted except that the return status of the trap is retained.
-    trap "command rm -rf '$ZSH/log/update.lock'; return 1" EXIT INT QUIT
+  # Remove lock directory on exit. `return 1` is important for when trapping a SIGINT:
+  #  The return status from the function is handled specially. If it is zero, the signal is
+  #  assumed to have been handled, and execution continues normally. Otherwise, the shell
+  #  will behave as interrupted except that the return status of the trap is retained.
+  trap "
+  unset -f current_epoch update_last_updated_file update_ohmyzsh
+  command rm -rf '$ZSH/log/update.lock'
+  return 1
+  " EXIT INT QUIT
 
-    # Create or update .zsh-update file if missing or malformed
-    if ! source "${ZSH_CACHE_DIR}/.zsh-update" 2>/dev/null || [[ -z "$LAST_EPOCH" ]]; then
-        update_last_updated_file
-        return
-    fi
+  # Create or update .zsh-update file if missing or malformed
+  if ! source "${ZSH_CACHE_DIR}/.zsh-update" 2>/dev/null || [[ -z "$LAST_EPOCH" ]]; then
+    update_last_updated_file
+    return
+  fi
 
-    # Number of days before trying to update again
-    epoch_target=${UPDATE_ZSH_DAYS:-13}
-    # Test if enough time has passed until the next update
-    if (( ( $(current_epoch) - $LAST_EPOCH ) < $epoch_target )); then
-        return
-    fi
+  # Number of days before trying to update again
+  epoch_target=${UPDATE_ZSH_DAYS:-13}
+  # Test if enough time has passed until the next update
+  if (( ( $(current_epoch) - $LAST_EPOCH ) < $epoch_target )); then
+    return
+  fi
 
-    # Ask for confirmation before updating unless disabled
-    if [[ "$DISABLE_UPDATE_PROMPT" = true ]]; then
-        update_ohmyzsh
-    else
-        # input sink to swallow all characters typed before the prompt
-        # and add a newline if there wasn't one after characters typed
-        while read -t -k 1 option; do true; done
-        [[ "$option" != ($'\n'|"") ]] && echo
+  # Ask for confirmation before updating unless disabled
+  if [[ "$DISABLE_UPDATE_PROMPT" = true ]]; then
+    update_ohmyzsh
+  else
+    # input sink to swallow all characters typed before the prompt
+    # and add a newline if there wasn't one after characters typed
+    while read -t -k 1 option; do true; done
+    [[ "$option" != ($'\n'|"") ]] && echo
 
-        echo -n "[oh-my-zsh] Would you like to update? [Y/n] "
-        read -r -k 1 option
-        [[ "$option" != $'\n' ]] && echo
-        case "$option" in
-            [yY$'\n']) update_ohmyzsh ;;
-            [nN]) update_last_updated_file ;;
-        esac
-    fi
+    echo -n "[oh-my-zsh] Would you like to update? [Y/n] "
+    read -r -k 1 option
+    [[ "$option" != $'\n' ]] && echo
+    case "$option" in
+      [yY$'\n']) update_ohmyzsh ;;
+      [nN]) update_last_updated_file ;;
+    esac
+  fi
 }
-
-unset -f current_epoch update_last_updated_file update_ohmyzsh
diff --git a/tools/upgrade.sh b/tools/upgrade.sh
old mode 100644
new mode 100755
index e005519d6..634d5c03d
--- a/tools/upgrade.sh
+++ b/tools/upgrade.sh
@@ -1,13 +1,23 @@
-# Use colors, but only if connected to a terminal, and that terminal
-# supports them.
+#!/usr/bin/env zsh
+
+cd "$ZSH"
+
+# Use colors, but only if connected to a terminal
+# and that terminal supports them.
+
+local -a RAINBOW
+local RED GREEN YELLOW BLUE UNDER BOLD RESET
+
 if [ -t 1 ]; then
-  RB_RED=$(printf '\033[38;5;196m')
-  RB_ORANGE=$(printf '\033[38;5;202m')
-  RB_YELLOW=$(printf '\033[38;5;226m')
-  RB_GREEN=$(printf '\033[38;5;082m')
-  RB_BLUE=$(printf '\033[38;5;021m')
-  RB_INDIGO=$(printf '\033[38;5;093m')
-  RB_VIOLET=$(printf '\033[38;5;163m')
+  RAINBOW=(
+    "$(printf '\033[38;5;196m')"
+    "$(printf '\033[38;5;202m')"
+    "$(printf '\033[38;5;226m')"
+    "$(printf '\033[38;5;082m')"
+    "$(printf '\033[38;5;021m')"
+    "$(printf '\033[38;5;093m')"
+    "$(printf '\033[38;5;163m')"
+  )
 
   RED=$(printf '\033[31m')
   GREEN=$(printf '\033[32m')
@@ -16,25 +26,19 @@ if [ -t 1 ]; then
   BOLD=$(printf '\033[1m')
   UNDER=$(printf '\033[4m')
   RESET=$(printf '\033[m')
-else
-  RB_RED=""
-  RB_ORANGE=""
-  RB_YELLOW=""
-  RB_GREEN=""
-  RB_BLUE=""
-  RB_INDIGO=""
-  RB_VIOLET=""
-
-  RED=""
-  GREEN=""
-  YELLOW=""
-  BLUE=""
-  UNDER=""
-  BOLD=""
-  RESET=""
 fi
 
-cd "$ZSH"
+# Update upstream remote to ohmyzsh org
+git remote -v | while read remote url _; do
+  case "$url" in
+  https://github.com/robbyrussell/oh-my-zsh(|.git))
+    git remote set-url "$remote" "https://github.com/ohmyzsh/ohmyzsh.git"
+    break ;;
+  git@github.com:robbyrussell/oh-my-zsh(|.git))
+    git remote set-url "$remote" "git@github.com:ohmyzsh/ohmyzsh.git"
+    break ;;
+  esac
+done
 
 # Set git-config values known to fix git errors
 # Line endings (#4069)
@@ -45,30 +49,36 @@ git config fsck.zeroPaddedFilemode ignore
 git config fetch.fsck.zeroPaddedFilemode ignore
 git config receive.fsck.zeroPaddedFilemode ignore
 # autostash on rebase (#7172)
-resetAutoStash=$(git config --bool rebase.autoStash 2>&1)
+resetAutoStash=$(git config --bool rebase.autoStash 2>/dev/null)
 git config rebase.autoStash true
 
-# Update upstream remote to ohmyzsh org
-remote=$(git remote -v | awk '/https:\/\/github\.com\/robbyrussell\/oh-my-zsh\.git/{ print $1; exit }')
-if [ -n "$remote" ]; then
-  git remote set-url "$remote" "https://github.com/ohmyzsh/ohmyzsh.git"
-fi
+local ret=0
 
+# Update Oh My Zsh
 printf "${BLUE}%s${RESET}\n" "Updating Oh My Zsh"
-if git pull --rebase --stat origin master
-then
-  printf '%s         %s__      %s           %s        %s       %s     %s__   %s\n' $RB_RED $RB_ORANGE $RB_YELLOW $RB_GREEN $RB_BLUE $RB_INDIGO $RB_VIOLET $RB_RESET
-  printf '%s  ____  %s/ /_    %s ____ ___  %s__  __  %s ____  %s_____%s/ /_  %s\n' $RB_RED $RB_ORANGE $RB_YELLOW $RB_GREEN $RB_BLUE $RB_INDIGO $RB_VIOLET $RB_RESET
-  printf '%s / __ \%s/ __ \  %s / __ `__ \%s/ / / / %s /_  / %s/ ___/%s __ \ %s\n' $RB_RED $RB_ORANGE $RB_YELLOW $RB_GREEN $RB_BLUE $RB_INDIGO $RB_VIOLET $RB_RESET
-  printf '%s/ /_/ /%s / / / %s / / / / / /%s /_/ / %s   / /_%s(__  )%s / / / %s\n' $RB_RED $RB_ORANGE $RB_YELLOW $RB_GREEN $RB_BLUE $RB_INDIGO $RB_VIOLET $RB_RESET
-  printf '%s\____/%s_/ /_/ %s /_/ /_/ /_/%s\__, / %s   /___/%s____/%s_/ /_/  %s\n' $RB_RED $RB_ORANGE $RB_YELLOW $RB_GREEN $RB_BLUE $RB_INDIGO $RB_VIOLET $RB_RESET
-  printf '%s    %s        %s           %s /____/ %s       %s     %s          %s\n' $RB_RED $RB_ORANGE $RB_YELLOW $RB_GREEN $RB_BLUE $RB_INDIGO $RB_VIOLET $RB_RESET
-  printf "${BLUE}%s\n" "Hooray! Oh My Zsh has been updated and/or is at the current version."
-  printf "${BLUE}${BOLD}%s ${UNDER}%s${RESET}\n" "To keep up on the latest news and updates, follow us on Twitter:" "https://twitter.com/ohmyzsh"
+last_commit=$(git rev-parse HEAD)
+if git pull --rebase --stat origin master; then
+  # Check if it was really updated or not
+  if [[ "$(git rev-parse HEAD)" = "$last_commit" ]]; then
+    message="Oh My Zsh is already at the latest version."
+    ret=80 # non-zero exit code to indicate no changes pulled
+  else
+    message="Hooray! Oh My Zsh has been updated!"
+  fi
+
+  printf '%s         %s__      %s           %s        %s       %s     %s__   %s\n' $RAINBOW $RESET
+  printf '%s  ____  %s/ /_    %s ____ ___  %s__  __  %s ____  %s_____%s/ /_  %s\n' $RAINBOW $RESET
+  printf '%s / __ \%s/ __ \  %s / __ `__ \%s/ / / / %s /_  / %s/ ___/%s __ \ %s\n' $RAINBOW $RESET
+  printf '%s/ /_/ /%s / / / %s / / / / / /%s /_/ / %s   / /_%s(__  )%s / / / %s\n' $RAINBOW $RESET
+  printf '%s\____/%s_/ /_/ %s /_/ /_/ /_/%s\__, / %s   /___/%s____/%s_/ /_/  %s\n' $RAINBOW $RESET
+  printf '%s    %s        %s           %s /____/ %s       %s     %s          %s\n' $RAINBOW $RESET
+  printf '\n'
+  printf "${BLUE}%s${RESET}\n" "$message"
+  printf "${BLUE}${BOLD}%s ${UNDER}%s${RESET}\n" "To keep up with the latest news and updates, follow us on Twitter:" "https://twitter.com/ohmyzsh"
   printf "${BLUE}${BOLD}%s ${UNDER}%s${RESET}\n" "Want to get involved in the community? Join our Discord:" "https://discord.gg/ohmyzsh"
   printf "${BLUE}${BOLD}%s ${UNDER}%s${RESET}\n" "Get your Oh My Zsh swag at:" "https://shop.planetargon.com/collections/oh-my-zsh"
 else
-  status=$?
+  ret=$?
   printf "${RED}%s${RESET}\n" 'There was an error updating. Try again later?'
 fi
 
@@ -79,4 +89,4 @@ case "$resetAutoStash" in
 esac
 
 # Exit with `1` if the update failed
-exit $status
+exit $ret

From e093a4cf62d494dc46a8b68de1cb039c0bcf007a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Mon, 2 Nov 2020 11:17:41 +0100
Subject: [PATCH 197/869] fix(updater): correctly restart the zsh session when
 the update pulled changes

---
 lib/cli.zsh       | 460 +++++++++++++++++++++++-----------------------
 lib/functions.zsh |   6 +
 2 files changed, 239 insertions(+), 227 deletions(-)

diff --git a/lib/cli.zsh b/lib/cli.zsh
index 30790bec7..e8ce26131 100644
--- a/lib/cli.zsh
+++ b/lib/cli.zsh
@@ -1,22 +1,22 @@
 #!/usr/bin/env zsh
 
 function omz {
-    [[ $# -gt 0 ]] || {
-        _omz::help
-        return 1
-    }
+  [[ $# -gt 0 ]] || {
+    _omz::help
+    return 1
+  }
 
-    local command="$1"
-    shift
+  local command="$1"
+  shift
 
-    # Subcommand functions start with _ so that they don't
-    # appear as completion entries when looking for `omz`
-    (( $+functions[_omz::$command] )) || {
-        _omz::help
-        return 1
-    }
+  # Subcommand functions start with _ so that they don't
+  # appear as completion entries when looking for `omz`
+  (( $+functions[_omz::$command] )) || {
+    _omz::help
+    return 1
+  }
 
-    _omz::$command "$@"
+  _omz::$command "$@"
 }
 
 function _omz {
@@ -69,292 +69,298 @@ EOF
 }
 
 function _omz::confirm {
-    # If question supplied, ask it before reading the answer
-    # NOTE: uses the logname of the caller function
-    if [[ -n "$1" ]]; then
-        _omz::log prompt "$1" "${${functrace[1]#_}%:*}"
-    fi
+  # If question supplied, ask it before reading the answer
+  # NOTE: uses the logname of the caller function
+  if [[ -n "$1" ]]; then
+    _omz::log prompt "$1" "${${functrace[1]#_}%:*}"
+  fi
 
-    # Read one character
-    read -r -k 1
+  # Read one character
+  read -r -k 1
 
-    # If no newline entered, add a newline
-    if [[ "$REPLY" != $'\n' ]]; then
-        echo
-    fi
+  # If no newline entered, add a newline
+  if [[ "$REPLY" != $'\n' ]]; then
+    echo
+  fi
 }
 
 function _omz::log {
-    # if promptsubst is set, a message with `` or $()
-    # will be run even if quoted due to `print -P`
-    setopt localoptions nopromptsubst
+  # if promptsubst is set, a message with `` or $()
+  # will be run even if quoted due to `print -P`
+  setopt localoptions nopromptsubst
 
-    # $1 = info|warn|error|debug
-    # $2 = text
-    # $3 = (optional) name of the logger
+  # $1 = info|warn|error|debug
+  # $2 = text
+  # $3 = (optional) name of the logger
 
-    local logtype=$1
-    local logname=${3:-${${functrace[1]#_}%:*}}
+  local logtype=$1
+  local logname=${3:-${${functrace[1]#_}%:*}}
 
-    # Don't print anything if debug is not active
-    if [[ $logtype = debug && -z $_OMZ_DEBUG ]]; then
-        return
-    fi
+  # Don't print anything if debug is not active
+  if [[ $logtype = debug && -z $_OMZ_DEBUG ]]; then
+    return
+  fi
 
-    # Choose coloring based on log type
-    case "$logtype" in
-        prompt) print -Pn "%S%F{blue}$logname%f%s: $2" ;;
-        debug) print -P "%F{white}$logname%f: $2" ;;
-        info) print -P "%F{green}$logname%f: $2" ;;
-        warn) print -P "%S%F{yellow}$logname%f%s: $2" ;;
-        error) print -P "%S%F{red}$logname%f%s: $2" ;;
-    esac >&2
+  # Choose coloring based on log type
+  case "$logtype" in
+    prompt) print -Pn "%S%F{blue}$logname%f%s: $2" ;;
+    debug) print -P "%F{white}$logname%f: $2" ;;
+    info) print -P "%F{green}$logname%f: $2" ;;
+    warn) print -P "%S%F{yellow}$logname%f%s: $2" ;;
+    error) print -P "%S%F{red}$logname%f%s: $2" ;;
+  esac >&2
 }
 
 function _omz::plugin {
-    (( $# > 0 && $+functions[_omz::plugin::$1] )) || {
-        cat <<EOF
+  (( $# > 0 && $+functions[_omz::plugin::$1] )) || {
+    cat <<EOF
 Usage: omz plugin <command> [options]
 
 Available commands:
 
-    list            List all available Oh My Zsh plugins
+  list            List all available Oh My Zsh plugins
 
 EOF
-        return 1
-    }
+    return 1
+  }
 
-    local command="$1"
-    shift
+  local command="$1"
+  shift
 
-    _omz::plugin::$command "$@"
+  _omz::plugin::$command "$@"
 }
 
 function _omz::plugin::list {
-    local -a custom_plugins builtin_plugins
-    custom_plugins=("$ZSH_CUSTOM"/plugins/*(-/N:t))
-    builtin_plugins=("$ZSH"/plugins/*(-/N:t))
+  local -a custom_plugins builtin_plugins
+  custom_plugins=("$ZSH_CUSTOM"/plugins/*(-/N:t))
+  builtin_plugins=("$ZSH"/plugins/*(-/N:t))
 
-    # If the command is being piped, print all found line by line
-    if [[ ! -t 1 ]]; then
-        print -l ${(q-)custom_plugins} ${(q-)builtin_plugins}
-        return
-    fi
+  # If the command is being piped, print all found line by line
+  if [[ ! -t 1 ]]; then
+    print -l ${(q-)custom_plugins} ${(q-)builtin_plugins}
+    return
+  fi
 
-    if (( ${#custom_plugins} )); then
-        print -P "%U%BCustom plugins%b%u:"
-        print -l ${(q-)custom_plugins} | column
-    fi
+  if (( ${#custom_plugins} )); then
+    print -P "%U%BCustom plugins%b%u:"
+    print -l ${(q-)custom_plugins} | column
+  fi
 
-    if (( ${#builtin_plugins} )); then
-        (( ${#custom_plugins} )) && echo # add a line of separation
+  if (( ${#builtin_plugins} )); then
+    (( ${#custom_plugins} )) && echo # add a line of separation
 
-        print -P "%U%BBuilt-in plugins%b%u:"
-        print -l ${(q-)builtin_plugins} | column
-    fi
+    print -P "%U%BBuilt-in plugins%b%u:"
+    print -l ${(q-)builtin_plugins} | column
+  fi
 }
 
 function _omz::pr {
-    (( $# > 0 && $+functions[_omz::pr::$1] )) || {
-        cat <<EOF
+  (( $# > 0 && $+functions[_omz::pr::$1] )) || {
+    cat <<EOF
 Usage: omz pr <command> [options]
 
 Available commands:
 
-    clean                       Delete all PR branches (ohmyzsh/pull-*)
-    test <PR_number_or_URL>     Fetch PR #NUMBER and rebase against master
+  clean                       Delete all PR branches (ohmyzsh/pull-*)
+  test <PR_number_or_URL>     Fetch PR #NUMBER and rebase against master
 
 EOF
-        return 1
-    }
+    return 1
+  }
 
-    local command="$1"
-    shift
+  local command="$1"
+  shift
 
-    _omz::pr::$command "$@"
+  _omz::pr::$command "$@"
 }
 
 function _omz::pr::clean {
-    (
-        set -e
-        builtin cd -q "$ZSH"
+  (
+    set -e
+    builtin cd -q "$ZSH"
 
-        # Check if there are PR branches
-        local fmt branches
-        fmt="%(color:bold blue)%(align:18,right)%(refname:short)%(end)%(color:reset) %(color:dim bold red)%(objectname:short)%(color:reset) %(color:yellow)%(contents:subject)"
-        branches="$(command git for-each-ref --sort=-committerdate --color --format="$fmt" "refs/heads/ohmyzsh/pull-*")"
+    # Check if there are PR branches
+    local fmt branches
+    fmt="%(color:bold blue)%(align:18,right)%(refname:short)%(end)%(color:reset) %(color:dim bold red)%(objectname:short)%(color:reset) %(color:yellow)%(contents:subject)"
+    branches="$(command git for-each-ref --sort=-committerdate --color --format="$fmt" "refs/heads/ohmyzsh/pull-*")"
 
-        # Exit if there are no PR branches
-        if [[ -z "$branches" ]]; then
-            _omz::log info "there are no Pull Request branches to remove."
-            return
-        fi
-
-        # Print found PR branches
-        echo "$branches\n"
-        # Confirm before removing the branches
-        _omz::confirm "do you want remove these Pull Request branches? [Y/n] "
-        # Only proceed if the answer is a valid yes option
-        [[ "$REPLY" != [yY$'\n'] ]] && return
-
-        _omz::log info "removing all Oh My Zsh Pull Request branches..."
-        command git branch --list 'ohmyzsh/pull-*' | while read branch; do
-            command git branch -D "$branch"
-        done
-    )
-}
-
-function _omz::pr::test {
-    # Allow $1 to be a URL to the pull request
-    if [[ "$1" = https://* ]]; then
-        1="${1:t}"
+    # Exit if there are no PR branches
+    if [[ -z "$branches" ]]; then
+      _omz::log info "there are no Pull Request branches to remove."
+      return
     fi
 
-    # Check the input
-    if ! [[ -n "$1" && "$1" =~ ^[[:digit:]]+$ ]]; then
-        echo >&2 "Usage: omz pr test <PR_NUMBER_or_URL>"
-        return 1
-    fi
-
-    # Save current git HEAD
-    local branch
-    branch=$(builtin cd -q "$ZSH"; git symbolic-ref --short HEAD) || {
-        _omz::log error "error when getting the current git branch. Aborting..."
-        return 1
-    }
-
-
-    # Fetch PR onto ohmyzsh/pull-<PR_NUMBER> branch and rebase against master
-    # If any of these operations fail, undo the changes made
-    (
-        set -e
-        builtin cd -q "$ZSH"
-
-        # Get the ohmyzsh git remote
-        command git remote -v | while read remote url _; do
-            case "$url" in
-            https://github.com/ohmyzsh/ohmyzsh(|.git)) found=1; break ;;
-            git@github.com:ohmyzsh/ohmyzsh(|.git)) found=1; break ;;
-            esac
-        done
-
-        (( $found )) || {
-            _omz::log error "could not found the ohmyzsh git remote. Aborting..."
-            return 1
-        }
-
-        # Fetch pull request head
-        _omz::log info "fetching PR #$1 to ohmyzsh/pull-$1..."
-        command git fetch -f "$remote" refs/pull/$1/head:ohmyzsh/pull-$1 || {
-            _omz::log error "error when trying to fetch PR #$1."
-            return 1
-        }
-
-        # Rebase pull request branch against the current master
-        _omz::log info "rebasing PR #$1..."
-        command git rebase master ohmyzsh/pull-$1 || {
-            command git rebase --abort &>/dev/null
-            _omz::log warn "could not rebase PR #$1 on top of master."
-            _omz::log warn "you might not see the latest stable changes."
-            _omz::log info "run \`zsh\` to test the changes."
-            return 1
-        }
-
-        _omz::log info "fetch of PR #${1} successful."
-    )
-
-    # If there was an error, abort running zsh to test the PR
-    [[ $? -eq 0 ]] || return 1
-
-    # Run zsh to test the changes
-    _omz::log info "running \`zsh\` to test the changes. Run \`exit\` to go back."
-    command zsh -l
-
-    # After testing, go back to the previous HEAD if the user wants
-    _omz::confirm "do you want to go back to the previous branch? [Y/n] "
+    # Print found PR branches
+    echo "$branches\n"
+    # Confirm before removing the branches
+    _omz::confirm "do you want remove these Pull Request branches? [Y/n] "
     # Only proceed if the answer is a valid yes option
     [[ "$REPLY" != [yY$'\n'] ]] && return
 
-    (
-        set -e
-        builtin cd -q "$ZSH"
+    _omz::log info "removing all Oh My Zsh Pull Request branches..."
+    command git branch --list 'ohmyzsh/pull-*' | while read branch; do
+      command git branch -D "$branch"
+    done
+  )
+}
 
-        command git checkout "$branch" -- || {
-            _omz::log error "could not go back to the previous branch ('$branch')."
-            return 1
-        }
-    )
+function _omz::pr::test {
+  # Allow $1 to be a URL to the pull request
+  if [[ "$1" = https://* ]]; then
+    1="${1:t}"
+  fi
+
+  # Check the input
+  if ! [[ -n "$1" && "$1" =~ ^[[:digit:]]+$ ]]; then
+    echo >&2 "Usage: omz pr test <PR_NUMBER_or_URL>"
+    return 1
+  fi
+
+  # Save current git HEAD
+  local branch
+  branch=$(builtin cd -q "$ZSH"; git symbolic-ref --short HEAD) || {
+    _omz::log error "error when getting the current git branch. Aborting..."
+    return 1
+  }
+
+
+  # Fetch PR onto ohmyzsh/pull-<PR_NUMBER> branch and rebase against master
+  # If any of these operations fail, undo the changes made
+  (
+    set -e
+    builtin cd -q "$ZSH"
+
+    # Get the ohmyzsh git remote
+    command git remote -v | while read remote url _; do
+      case "$url" in
+      https://github.com/ohmyzsh/ohmyzsh(|.git)) found=1; break ;;
+      git@github.com:ohmyzsh/ohmyzsh(|.git)) found=1; break ;;
+      esac
+    done
+
+    (( $found )) || {
+      _omz::log error "could not found the ohmyzsh git remote. Aborting..."
+      return 1
+    }
+
+    # Fetch pull request head
+    _omz::log info "fetching PR #$1 to ohmyzsh/pull-$1..."
+    command git fetch -f "$remote" refs/pull/$1/head:ohmyzsh/pull-$1 || {
+      _omz::log error "error when trying to fetch PR #$1."
+      return 1
+    }
+
+    # Rebase pull request branch against the current master
+    _omz::log info "rebasing PR #$1..."
+    command git rebase master ohmyzsh/pull-$1 || {
+      command git rebase --abort &>/dev/null
+      _omz::log warn "could not rebase PR #$1 on top of master."
+      _omz::log warn "you might not see the latest stable changes."
+      _omz::log info "run \`zsh\` to test the changes."
+      return 1
+    }
+
+    _omz::log info "fetch of PR #${1} successful."
+  )
+
+  # If there was an error, abort running zsh to test the PR
+  [[ $? -eq 0 ]] || return 1
+
+  # Run zsh to test the changes
+  _omz::log info "running \`zsh\` to test the changes. Run \`exit\` to go back."
+  command zsh -l
+
+  # After testing, go back to the previous HEAD if the user wants
+  _omz::confirm "do you want to go back to the previous branch? [Y/n] "
+  # Only proceed if the answer is a valid yes option
+  [[ "$REPLY" != [yY$'\n'] ]] && return
+
+  (
+    set -e
+    builtin cd -q "$ZSH"
+
+    command git checkout "$branch" -- || {
+      _omz::log error "could not go back to the previous branch ('$branch')."
+      return 1
+    }
+  )
 }
 
 function _omz::theme {
-    (( $# > 0 && $+functions[_omz::theme::$1] )) || {
-        cat <<EOF
+  (( $# > 0 && $+functions[_omz::theme::$1] )) || {
+    cat <<EOF
 Usage: omz theme <command> [options]
 
 Available commands:
 
-    list            List all available Oh My Zsh themes
-    use <theme>     Load an Oh My Zsh theme
+  list            List all available Oh My Zsh themes
+  use <theme>     Load an Oh My Zsh theme
 
 EOF
-        return 1
-    }
+    return 1
+  }
 
-    local command="$1"
-    shift
+  local command="$1"
+  shift
 
-    _omz::theme::$command "$@"
+  _omz::theme::$command "$@"
 }
 
 function _omz::theme::list {
-    local -a custom_themes builtin_themes
-    custom_themes=("$ZSH_CUSTOM"/**/*.zsh-theme(.N:r:gs:"$ZSH_CUSTOM"/themes/:::gs:"$ZSH_CUSTOM"/:::))
-    builtin_themes=("$ZSH"/themes/*.zsh-theme(.N:t:r))
+  local -a custom_themes builtin_themes
+  custom_themes=("$ZSH_CUSTOM"/**/*.zsh-theme(.N:r:gs:"$ZSH_CUSTOM"/themes/:::gs:"$ZSH_CUSTOM"/:::))
+  builtin_themes=("$ZSH"/themes/*.zsh-theme(.N:t:r))
 
-    # If the command is being piped, print all found line by line
-    if [[ ! -t 1 ]]; then
-        print -l ${(q-)custom_themes} ${(q-)builtin_themes}
-        return
-    fi
+  # If the command is being piped, print all found line by line
+  if [[ ! -t 1 ]]; then
+    print -l ${(q-)custom_themes} ${(q-)builtin_themes}
+    return
+  fi
 
-    if (( ${#custom_themes} )); then
-        print -P "%U%BCustom themes%b%u:"
-        print -l ${(q-)custom_themes} | column
-    fi
+  if (( ${#custom_themes} )); then
+    print -P "%U%BCustom themes%b%u:"
+    print -l ${(q-)custom_themes} | column
+  fi
 
-    if (( ${#builtin_themes} )); then
-        (( ${#custom_themes} )) && echo # add a line of separation
+  if (( ${#builtin_themes} )); then
+    (( ${#custom_themes} )) && echo # add a line of separation
 
-        print -P "%U%BBuilt-in themes%b%u:"
-        print -l ${(q-)builtin_themes} | column
-    fi
+    print -P "%U%BBuilt-in themes%b%u:"
+    print -l ${(q-)builtin_themes} | column
+  fi
 }
 
 function _omz::theme::use {
-    if [[ -z "$1" ]]; then
-        echo >&2 "Usage: omz theme use <theme>"
-        return 1
-    fi
+  if [[ -z "$1" ]]; then
+    echo >&2 "Usage: omz theme use <theme>"
+    return 1
+  fi
 
-    # Respect compatibility with old lookup order
-    if [[ -f "$ZSH_CUSTOM/$1.zsh-theme" ]]; then
-        source "$ZSH_CUSTOM/$1.zsh-theme"
-    elif [[ -f "$ZSH_CUSTOM/themes/$1.zsh-theme" ]]; then
-        source "$ZSH_CUSTOM/themes/$1.zsh-theme"
-    elif [[ -f "$ZSH/themes/$1.zsh-theme" ]]; then
-        source "$ZSH/themes/$1.zsh-theme"
-    else
-        _omz::log error "theme '$1' not found"
-        return 1
-    fi
+  # Respect compatibility with old lookup order
+  if [[ -f "$ZSH_CUSTOM/$1.zsh-theme" ]]; then
+    source "$ZSH_CUSTOM/$1.zsh-theme"
+  elif [[ -f "$ZSH_CUSTOM/themes/$1.zsh-theme" ]]; then
+    source "$ZSH_CUSTOM/themes/$1.zsh-theme"
+  elif [[ -f "$ZSH/themes/$1.zsh-theme" ]]; then
+    source "$ZSH/themes/$1.zsh-theme"
+  else
+    _omz::log error "theme '$1' not found"
+    return 1
+  fi
 }
 
 function _omz::update {
-    # Run update script
-    env ZSH="$ZSH" zsh -f "$ZSH/tools/upgrade.sh"
-    # Update last updated file
-    zmodload zsh/datetime
-    echo "LAST_EPOCH=$(( EPOCHSECONDS / 60 / 60 / 24 ))" >! "${ZSH_CACHE_DIR}/.zsh-update"
-    # Remove update lock if it exists
-    command rm -rf "$ZSH/log/update.lock"
+  # Run update script
+  env ZSH="$ZSH" zsh -f "$ZSH/tools/upgrade.sh"
+  local ret=$?
+  # Update last updated file
+  zmodload zsh/datetime
+  echo "LAST_EPOCH=$(( EPOCHSECONDS / 60 / 60 / 24 ))" >! "${ZSH_CACHE_DIR}/.zsh-update"
+  # Remove update lock if it exists
+  command rm -rf "$ZSH/log/update.lock"
+  # Restart the zsh session
+  if [[ $ret -eq 0 ]]; then
+    # Check whether to run a login shell
+    [[ "$ZSH_ARGZERO" = -* ]] && exec -l "${ZSH_ARGZERO#-}" || exec "$ZSH_ARGZERO"
+  fi
 }
diff --git a/lib/functions.zsh b/lib/functions.zsh
index f6f34e851..b0582b32b 100644
--- a/lib/functions.zsh
+++ b/lib/functions.zsh
@@ -15,11 +15,17 @@ function upgrade_oh_my_zsh() {
 
   # Run update script
   env ZSH="$ZSH" zsh -f "$ZSH/tools/upgrade.sh"
+  local ret=$?
   # Update last updated file
   zmodload zsh/datetime
   echo "LAST_EPOCH=$(( EPOCHSECONDS / 60 / 60 / 24 ))" >! "${ZSH_CACHE_DIR}/.zsh-update"
   # Remove update lock if it exists
   command rm -rf "$ZSH/log/update.lock"
+  # Restart the zsh session
+  if [[ $ret -eq 0 ]]; then
+    # Check whether to run a login shell
+    [[ "$ZSH_ARGZERO" = -* ]] && exec -l "${ZSH_ARGZERO#-}" || exec "$ZSH_ARGZERO"
+  fi
 }
 
 function take() {

From eeab4e5186961f9af591d0264d96f0e39d154886 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Sun, 1 Nov 2020 00:26:03 +0100
Subject: [PATCH 198/869] feat(updater): add changelog display by parsing the
 commit list

---
 tools/changelog.sh | 418 +++++++++++++++++++++++++++++++++++++++++++++
 tools/upgrade.sh   |   7 +
 2 files changed, 425 insertions(+)
 create mode 100755 tools/changelog.sh

diff --git a/tools/changelog.sh b/tools/changelog.sh
new file mode 100755
index 000000000..015b26c4b
--- /dev/null
+++ b/tools/changelog.sh
@@ -0,0 +1,418 @@
+#!/usr/bin/env zsh
+
+##############################
+# CHANGELOG SCRIPT CONSTANTS #
+##############################
+
+#* Holds the list of valid types recognized in a commit subject
+#* and the display string of such type
+local -A TYPES
+TYPES=(
+  [build]="Build system"
+  [chore]="Chore"
+  [ci]="CI"
+  [docs]="Documentation"
+  [feat]="Features"
+  [fix]="Bug fixes"
+  [perf]="Performance"
+  [refactor]="Refactor"
+  [style]="Style"
+  [test]="Testing"
+)
+
+#* Types that will be displayed in their own section,
+#* in the order specified here.
+local -a MAIN_TYPES
+MAIN_TYPES=(feat fix perf docs)
+
+#* Types that will be displayed under the category of other changes
+local -a OTHER_TYPES
+OTHER_TYPES=(refactor style other)
+
+#* Commit types that don't appear in $MAIN_TYPES nor $OTHER_TYPES
+#* will not be displayed and will simply be ignored.
+
+
+############################
+# COMMIT PARSING UTILITIES #
+############################
+
+function parse-commit {
+
+  # This function uses the following globals as output: commits (A),
+  # subjects (A), scopes (A) and breaking (A). All associative arrays (A)
+  # have $hash as the key.
+  # - commits holds the commit type
+  # - subjects holds the commit subject
+  # - scopes holds the scope of a commit
+  # - breaking holds the breaking change warning if a commit does
+  #   make a breaking change
+
+  function commit:type {
+    local type="$(sed -E 's/^([a-zA-Z_\-]+)(\(.+\))?!?: .+$/\1/' <<< "$1")"
+
+    # If $type doesn't appear in $TYPES array mark it as 'other'
+    if [[ -n "${(k)TYPES[(i)$type]}" ]]; then
+      echo $type
+    else
+      echo other
+    fi
+  }
+
+  function commit:scope {
+    local scope
+
+    # Try to find scope in "type(<scope>):" format
+    scope=$(sed -nE 's/^[a-zA-Z_\-]+\((.+)\)!?: .+$/\1/p' <<< "$1")
+    if [[ -n "$scope" ]]; then
+      echo "$scope"
+      return
+    fi
+
+    # If no scope found, try to find it in "<scope>:" format
+    # Make sure it's not a type before printing it
+    scope=$(sed -nE 's/^([a-zA-Z_\-]+): .+$/\1/p' <<< "$1")
+    if [[ -z "${(k)TYPES[(i)$scope]}" ]]; then
+      echo "$scope"
+    fi
+  }
+
+  function commit:subject {
+    # Only display the relevant part of the commit, i.e. if it has the format
+    # type[(scope)!]: subject, where the part between [] is optional, only
+    # displays subject. If it doesn't match the format, returns the whole string.
+    sed -E 's/^[a-zA-Z_\-]+(\(.+\))?!?: (.+)$/\2/' <<< "$1"
+  }
+
+  # Return subject if the body or subject match the breaking change format
+  function commit:is-breaking {
+    local subject="$1" body="$2"
+
+    if [[ "$body" =~ "BREAKING CHANGE: (.*)" || \
+      "$subject" =~ '^[^ :\)]+\)?!: (.*)$' ]]; then
+      echo "${match[1]}"
+    else
+      return 1
+    fi
+  }
+
+  # Return truncated hash of the reverted commit
+  function commit:is-revert {
+    local subject="$1" body="$2"
+
+    if [[ "$subject" = Revert* && \
+      "$body" =~ "This reverts commit ([^.]+)\." ]]; then
+      echo "${match[1]:0:7}"
+    else
+      return 1
+    fi
+  }
+
+  # Parse commit with hash $1
+  local hash="$1" subject body warning rhash
+  subject="$(command git show -s --format=%s $hash)"
+  body="$(command git show -s --format=%b $hash)"
+
+  # Commits following Conventional Commits (https://www.conventionalcommits.org/)
+  # have the following format, where parts between [] are optional:
+  #
+  #  type[(scope)][!]: subject
+  #
+  #  commit body
+  #  [BREAKING CHANGE: warning]
+
+  # commits holds the commit type
+  commits[$hash]="$(commit:type "$subject")"
+  # scopes holds the commit scope
+  scopes[$hash]="$(commit:scope "$subject")"
+  # subjects holds the commit subject
+  subjects[$hash]="$(commit:subject "$subject")"
+
+  # breaking holds whether a commit has breaking changes
+  # and its warning message if it does
+  if warning=$(commit:is-breaking "$subject" "$body"); then
+    breaking[$hash]="$warning"
+  fi
+
+  # reverts holds commits reverted in the same release
+  if rhash=$(commit:is-revert "$subject" "$body"); then
+    reverts[$hash]=$rhash
+  fi
+}
+
+#############################
+# RELEASE CHANGELOG DISPLAY #
+#############################
+
+function display-release {
+
+  # This function uses the following globals: output, version,
+  # commits (A), subjects (A), scopes (A), breaking (A) and reverts (A).
+  #
+  # - output is the output format to use when formatting (raw|text|md)
+  # - version is the version in which the commits are made
+  # - commits, subjects, scopes, breaking, and reverts are associative arrays
+  #   with commit hashes as keys
+
+  # Remove commits that were reverted
+  local hash rhash
+  for hash rhash in ${(kv)reverts}; do
+    if (( ${+commits[$rhash]} )); then
+      # Remove revert commit
+      unset "commits[$hash]" "subjects[$hash]" "scopes[$hash]" "breaking[$hash]"
+      # Remove reverted commit
+      unset "commits[$rhash]" "subjects[$rhash]" "scopes[$rhash]" "breaking[$rhash]"
+    fi
+  done
+
+  # If no commits left skip displaying the release
+  if (( $#commits == 0 )); then
+    return
+  fi
+
+  ##* Formatting functions
+
+  # Format the hash according to output format
+  # If no parameter is passed, assume it comes from `$hash`
+  function fmt:hash {
+    #* Uses $hash from outer scope
+    local hash="${1:-$hash}"
+    case "$output" in
+    raw) printf "$hash" ;;
+    text) printf "\e[33m$hash\e[0m" ;; # red
+    md) printf "[\`$hash\`](https://github.com/ohmyzsh/ohmyzsh/commit/$hash)" ;;
+    esac
+  }
+
+  # Format headers according to output format
+  # Levels 1 to 2 are considered special, the rest are formatted
+  # the same, except in md output format.
+  function fmt:header {
+    local header="$1" level="$2"
+    case "$output" in
+    raw)
+      case "$level" in
+      1) printf "$header\n$(printf '%.0s=' {1..${#header}})\n\n" ;;
+      2) printf "$header\n$(printf '%.0s-' {1..${#header}})\n\n" ;;
+      *) printf "$header:\n\n" ;;
+      esac ;;
+    text)
+      case "$level" in
+      1|2) printf "\e[1;4m$header\e[0m\n\n" ;; # bold, underlined
+      *) printf "\e[1m$header:\e[0m\n\n" ;; # bold
+      esac ;;
+    md) printf "$(printf '%.0s#' {1..${level}}) $header\n\n" ;;
+    esac
+  }
+
+  function fmt:scope {
+    #* Uses $scopes (A) and $hash from outer scope
+    local scope="${1:-${scopes[$hash]}}"
+
+    # Get length of longest scope for padding
+    local max_scope=0 padding=0
+    for hash in ${(k)scopes}; do
+      max_scope=$(( max_scope < ${#scopes[$hash]} ? ${#scopes[$hash]} : max_scope ))
+    done
+
+    # If no scopes, exit the function
+    if [[ $max_scope -eq 0 ]]; then
+      return
+    fi
+
+    # Get how much padding is required for this scope
+    padding=$(( max_scope < ${#scope} ? 0 : max_scope - ${#scope} ))
+    padding="${(r:$padding:: :):-}"
+
+    # If no scope, print padding and 3 spaces (equivalent to "[] ")
+    if [[ -z "$scope" ]]; then
+      printf "${padding}   "
+      return
+    fi
+
+    # Print [scope]
+    case "$output" in
+    raw|md) printf "[$scope]${padding} " ;;
+    text) printf "[\e[38;5;9m$scope\e[0m]${padding} " ;; # red 9
+    esac
+  }
+
+  # If no parameter is passed, assume it comes from `$subjects[$hash]`
+  function fmt:subject {
+    #* Uses $subjects (A) and $hash from outer scope
+    local subject="${1:-${subjects[$hash]}}"
+
+    # Capitalize first letter of the subject
+    subject="${(U)subject:0:1}${subject:1}"
+
+    case "$output" in
+    raw) printf "$subject" ;;
+    # In text mode, highlight (#<issue>) and dim text between `backticks`
+    text) sed -E $'s|#([0-9]+)|\e[32m#\\1\e[0m|g;s|`(.+)`|`\e[2m\\1\e[0m`|g' <<< "$subject" ;;
+    # In markdown mode, link to (#<issue>) issues
+    md) sed -E 's|#([0-9]+)|[#\1](https://github.com/ohmyzsh/ohmyzsh/issues/\1)|g' <<< "$subject" ;;
+    esac
+  }
+
+  function fmt:type {
+    #* Uses $type from outer scope
+    local type="${1:-${TYPES[$type]:-${(C)type}}}"
+    [[ -z "$type" ]] && return 0
+    case "$output" in
+    raw|md) printf "$type: " ;;
+    text) printf "\e[4m$type\e[24m: " ;; # underlined
+    esac
+  }
+
+  ##* Section functions
+
+  function display:version {
+    fmt:header "$version" 2
+  }
+
+  function display:breaking {
+    (( $#breaking != 0 )) || return 0
+
+    case "$output" in
+    raw) display:type-header "BREAKING CHANGES" ;;
+    text|md) display:type-header "⚠ BREAKING CHANGES" ;;
+    esac
+
+    local hash subject
+    for hash message in ${(kv)breaking}; do
+      echo " - $(fmt:hash) $(fmt:subject "${message}")"
+    done | sort
+    echo
+  }
+
+  function display:type {
+    local hash type="$1"
+
+    local -a hashes
+    hashes=(${(k)commits[(R)$type]})
+
+    # If no commits found of type $type, go to next type
+    (( $#hashes != 0 )) || return 0
+
+    fmt:header "${TYPES[$type]}" 3
+    for hash in $hashes; do
+      echo " - $(fmt:hash) $(fmt:scope)$(fmt:subject)"
+    done | sort -k3 # sort by scope
+    echo
+  }
+
+  function display:others {
+    local hash type
+
+    # Commits made under types considered other changes
+    local -A changes
+    changes=(${(kv)commits[(R)${(j:|:)OTHER_TYPES}]})
+
+    # If no commits found under "other" types, don't display anything
+    (( $#changes != 0 )) || return 0
+
+    fmt:header "Other changes" 3
+    for hash type in ${(kv)changes}; do
+      case "$type" in
+      other) echo " - $(fmt:hash) $(fmt:scope)$(fmt:subject)" ;;
+      *) echo " - $(fmt:hash) $(fmt:scope)$(fmt:type)$(fmt:subject)" ;;
+      esac
+    done | sort -k3 # sort by scope
+    echo
+  }
+
+  ##* Release sections order
+
+  # Display version header
+  display:version
+
+  # Display breaking changes first
+  display:breaking
+
+  # Display changes for commit types in the order specified
+  for type in $MAIN_TYPES; do
+    display:type "$type"
+  done
+
+  # Display other changes
+  display:others
+}
+
+function main {
+  # $1 = until commit, $2 = since commit
+  # $3 = output format (--raw|--text|--md)
+  local until="$1" since="$2"
+  local output=${${3:-"--text"}#--*}
+
+  if [[ -z "$until" ]]; then
+    until=HEAD
+  fi
+
+  # If $since is not specified, look up first version tag before $until
+  if [[ -z "$since" ]]; then
+    since=$(command git describe --abbrev=0 --tags "$until^" 2>/dev/null) || \
+    unset since
+  elif [[ "$since" = --all ]]; then
+    unset since
+  fi
+
+  # Commit classification arrays
+  local -A commits subjects scopes breaking reverts
+  local truncate=0 read_commits=0
+  local hash version tag
+
+  # Get the first version name:
+  # 1) try tag-like version, or
+  # 2) try name-rev, or
+  # 3) try branch name, or
+  # 4) try short hash
+  version=$(command git describe --tags $until 2>/dev/null) \
+    || version=$(command git name-rev --no-undefined --name-only --exclude="remotes/*" $until 2>/dev/null) \
+    || version=$(command git symbolic-ref --quiet --short $until 2>/dev/null) \
+    || version=$(command git rev-parse --short $until 2>/dev/null)
+
+  # Get commit list from $until commit until $since commit, or until root
+  # commit if $since is unset, in short hash form.
+  # --first-parent is used when dealing with merges: it only prints the
+  # merge commit, not the commits of the merged branch.
+  command git rev-list --first-parent --abbrev-commit --abbrev=7 ${since:+$since..}$until | while read hash; do
+    # Truncate list on versions with a lot of commits
+    if [[ -z "$since" ]] && (( ++read_commits > 35 )); then
+      truncate=1
+      break
+    fi
+
+    # If we find a new release (exact tag)
+    if tag=$(command git describe --exact-match --tags $hash 2>/dev/null); then
+      # Output previous release
+      display-release
+      # Reinitialize commit storage
+      commits=()
+      subjects=()
+      scopes=()
+      breaking=()
+      reverts=()
+      # Start work on next release
+      version="$tag"
+      read_commits=1
+    fi
+
+    parse-commit "$hash"
+  done
+
+  display-release
+
+  if (( truncate )); then
+    echo " ...more commits omitted"
+    echo
+  fi
+}
+
+cd "$ZSH"
+
+# Use raw output if stdout is not a tty
+if [[ ! -t 1 && -z "$3" ]]; then
+  main "$1" "$2" --raw
+else
+  main "$@"
+fi
diff --git a/tools/upgrade.sh b/tools/upgrade.sh
index 634d5c03d..5d593b6c6 100755
--- a/tools/upgrade.sh
+++ b/tools/upgrade.sh
@@ -64,6 +64,13 @@ if git pull --rebase --stat origin master; then
     ret=80 # non-zero exit code to indicate no changes pulled
   else
     message="Hooray! Oh My Zsh has been updated!"
+
+    # Display changelog with less if available, otherwise just print it to the terminal
+    if (( $+commands[less] )); then
+      command less -R <("$ZSH/tools/changelog.sh" HEAD "$last_commit")
+    else
+      "$ZSH/tools/changelog.sh" HEAD "$last_commit"
+    fi
   fi
 
   printf '%s         %s__      %s           %s        %s       %s     %s__   %s\n' $RAINBOW $RESET

From 7712da89ee841f4773d0158370174200813169e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Wed, 4 Nov 2020 11:35:01 +0100
Subject: [PATCH 199/869] feat(CLI): add `omz changelog` command

---
 lib/cli.zsh | 107 ++++++++++++++++++++++++++++++++--------------------
 1 file changed, 66 insertions(+), 41 deletions(-)

diff --git a/lib/cli.zsh b/lib/cli.zsh
index e8ce26131..253c554c1 100644
--- a/lib/cli.zsh
+++ b/lib/cli.zsh
@@ -20,53 +20,43 @@ function omz {
 }
 
 function _omz {
-    local -a cmds subcmds
-    cmds=(
-        'help:Usage information'
-        'plugin:Commands for Oh My Zsh plugins management'
-        'pr:Commands for Oh My Zsh Pull Requests management'
-        'theme:Commands for Oh My Zsh themes management'
-        'update:Update Oh My Zsh'
-    )
+  local -a cmds subcmds
+  cmds=(
+    'changelog:Print the changelog'
+    'help:Usage information'
+    'plugin:Manage plugins'
+    'pr:Manage Oh My Zsh Pull Requests'
+    'theme:Manage themes'
+    'update:Update Oh My Zsh'
+  )
 
-    if (( CURRENT == 2 )); then
-        _describe 'command' cmds
-    elif (( CURRENT == 3 )); then
-        case "$words[2]" in
-            plugin) subcmds=('list:List plugins')
-                _describe 'command' subcmds ;;
-            pr) subcmds=('test:Test a Pull Request' 'clean:Delete all Pull Request branches')
-                _describe 'command' subcmds ;;
-            theme) subcmds=('use:Load a theme' 'list:List themes')
-                _describe 'command' subcmds ;;
-        esac
-    elif (( CURRENT == 4 )); then
-        case "$words[2]::$words[3]" in
-            theme::use) compadd "$ZSH"/themes/*.zsh-theme(.N:t:r) \
-                "$ZSH_CUSTOM"/**/*.zsh-theme(.N:r:gs:"$ZSH_CUSTOM"/themes/:::gs:"$ZSH_CUSTOM"/:::) ;;
-        esac
-    fi
+  if (( CURRENT == 2 )); then
+    _describe 'command' cmds
+  elif (( CURRENT == 3 )); then
+    case "$words[2]" in
+      changelog) local -a refs
+        refs=("${(@f)$(command git for-each-ref --format="%(refname:short):%(subject)" refs/heads refs/tags)}")
+        _describe 'command' refs ;;
+      plugin) subcmds=('list:List plugins')
+        _describe 'command' subcmds ;;
+      pr) subcmds=('test:Test a Pull Request' 'clean:Delete all Pull Request branches')
+        _describe 'command' subcmds ;;
+      theme) subcmds=('use:Load a theme' 'list:List themes')
+        _describe 'command' subcmds ;;
+    esac
+  elif (( CURRENT == 4 )); then
+    case "$words[2]::$words[3]" in
+      theme::use) compadd "$ZSH"/themes/*.zsh-theme(.N:t:r) \
+        "$ZSH_CUSTOM"/**/*.zsh-theme(.N:r:gs:"$ZSH_CUSTOM"/themes/:::gs:"$ZSH_CUSTOM"/:::) ;;
+    esac
+  fi
 
-    return 0
+  return 0
 }
 
 compdef _omz omz
 
-
-function _omz::help {
-    cat <<EOF
-Usage: omz <command> [options]
-
-Available commands:
-
-    help                Print this help message
-    plugin <command>    Manage plugins
-    pr <command>        Manage Oh My Zsh Pull Requests
-    theme <command>     Manage themes
-    update              Update Oh My Zsh
-
-EOF
-}
+## Utility functions
 
 function _omz::confirm {
   # If question supplied, ask it before reading the answer
@@ -111,6 +101,41 @@ function _omz::log {
   esac >&2
 }
 
+## User-facing commands
+
+function _omz::help {
+  cat <<EOF
+Usage: omz <command> [options]
+
+Available commands:
+
+  help                Print this help message
+  changelog           Print the changelog
+  plugin <command>    Manage plugins
+  pr     <command>    Manage Oh My Zsh Pull Requests
+  theme  <command>    Manage themes
+  update              Update Oh My Zsh
+
+EOF
+}
+
+function _omz::changelog {
+  local version=${1:-HEAD} format=${3:-"--text"}
+
+  if ! command git -C "$ZSH" show-ref --verify refs/heads/$version &>/dev/null && \
+    ! command git -C "$ZSH" show-ref --verify refs/tags/$version &>/dev/null && \
+    ! command git -C "$ZSH" rev-parse --verify "${version}^{commit}" &>/dev/null; then
+    cat <<EOF
+Usage: omz changelog [version]
+
+NOTE: <version> must be a valid branch, tag or commit.
+EOF
+    return 1
+  fi
+
+  "$ZSH/tools/changelog.sh" "$version" "${2:-}" "$format"
+}
+
 function _omz::plugin {
   (( $# > 0 && $+functions[_omz::plugin::$1] )) || {
     cat <<EOF

From 021f0251e072b0cd2c2f1bfb5b0d2f57fbdfdc50 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Tue, 1 Dec 2020 11:12:31 +0100
Subject: [PATCH 200/869] fix(updater): make sure to run it with zsh

---
 tools/upgrade.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tools/upgrade.sh b/tools/upgrade.sh
index 5d593b6c6..e41817885 100755
--- a/tools/upgrade.sh
+++ b/tools/upgrade.sh
@@ -1,5 +1,9 @@
 #!/usr/bin/env zsh
 
+if [ -z "$ZSH_VERSION" ]; then
+  exec zsh "$0"
+fi
+
 cd "$ZSH"
 
 # Use colors, but only if connected to a terminal

From 3f8af040e9ed2d940451a5259e9c44308b695e60 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Wed, 2 Dec 2020 11:57:37 +0100
Subject: [PATCH 201/869] fix(updater): fix ignored variable name in read

I used _ which is a convention in other languages, but in shell scripting
$_ is a special variable set by the shell, and in Zsh versions older than
5.0.6 it complains for being a `read-only variable`.

Fixes #9482
---
 tools/upgrade.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/upgrade.sh b/tools/upgrade.sh
index e41817885..2edf5b059 100755
--- a/tools/upgrade.sh
+++ b/tools/upgrade.sh
@@ -33,7 +33,7 @@ if [ -t 1 ]; then
 fi
 
 # Update upstream remote to ohmyzsh org
-git remote -v | while read remote url _; do
+git remote -v | while read remote url extra; do
   case "$url" in
   https://github.com/robbyrussell/oh-my-zsh(|.git))
     git remote set-url "$remote" "https://github.com/ohmyzsh/ohmyzsh.git"

From 1ac40cd4456230f09bf0258b173304929d118992 Mon Sep 17 00:00:00 2001
From: Stimim Chen <106878+Stimim@users.noreply.github.com>
Date: Thu, 3 Dec 2020 19:00:56 +0800
Subject: [PATCH 202/869] fix(git-prompt): make `gitstatus.py`
 python3-compatible (#9186)

check_output() in get_tagname_or_hash() returns bytes instead of str in
python3.  Decode the return value to utf-8, this works in both python2
and python3.

Co-authored-by: Stimim Chen <stimim@google.com>
---
 plugins/git-prompt/gitstatus.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/git-prompt/gitstatus.py b/plugins/git-prompt/gitstatus.py
index 300365d71..bf3173614 100644
--- a/plugins/git-prompt/gitstatus.py
+++ b/plugins/git-prompt/gitstatus.py
@@ -11,11 +11,11 @@ def get_tagname_or_hash():
     """return tagname if exists else hash"""
     # get hash
     hash_cmd = ['git', 'rev-parse', '--short', 'HEAD']
-    hash_ = check_output(hash_cmd).strip()
+    hash_ = check_output(hash_cmd).decode('utf-8').strip()
 
     # get tagname
     tags_cmd = ['git', 'for-each-ref', '--points-at=HEAD', '--count=2', '--sort=-version:refname', '--format=%(refname:short)', 'refs/tags']
-    tags = check_output(tags_cmd).split()
+    tags = check_output(tags_cmd).decode('utf-8').split()
 
     if tags:
         return tags[0] + ('+' if len(tags) > 1 else '')

From 81bbe86db0fd039c2b781b7466214ffaf19e3ca0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Fri, 4 Dec 2020 12:33:36 +0100
Subject: [PATCH 203/869] fix(updater): properly show changelog via `less`

---
 tools/upgrade.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/upgrade.sh b/tools/upgrade.sh
index 2edf5b059..0e4c368bc 100755
--- a/tools/upgrade.sh
+++ b/tools/upgrade.sh
@@ -71,7 +71,7 @@ if git pull --rebase --stat origin master; then
 
     # Display changelog with less if available, otherwise just print it to the terminal
     if (( $+commands[less] )); then
-      command less -R <("$ZSH/tools/changelog.sh" HEAD "$last_commit")
+      "$ZSH/tools/changelog.sh" HEAD "$last_commit" --text | command less -R
     else
       "$ZSH/tools/changelog.sh" HEAD "$last_commit"
     fi

From 1aa2b18e293db8278a013322e42fd7aaa002a780 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Fri, 4 Dec 2020 12:34:01 +0100
Subject: [PATCH 204/869] feat(CLI): add `--unattended` flag to `omz update` to
 not reload zsh (#9187)

---
 lib/cli.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/cli.zsh b/lib/cli.zsh
index 253c554c1..38cdc449c 100644
--- a/lib/cli.zsh
+++ b/lib/cli.zsh
@@ -384,7 +384,7 @@ function _omz::update {
   # Remove update lock if it exists
   command rm -rf "$ZSH/log/update.lock"
   # Restart the zsh session
-  if [[ $ret -eq 0 ]]; then
+  if [[ $ret -eq 0 && "$1" != --unattended ]]; then
     # Check whether to run a login shell
     [[ "$ZSH_ARGZERO" = -* ]] && exec -l "${ZSH_ARGZERO#-}" || exec "$ZSH_ARGZERO"
   fi

From 4f8964d8fff25b67e79029d570d171c8cdf3f833 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Fri, 4 Dec 2020 12:38:32 +0100
Subject: [PATCH 205/869] fix(changelog): fix highlight of codeblocks in
 subject

---
 tools/changelog.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/changelog.sh b/tools/changelog.sh
index 015b26c4b..55b86f923 100755
--- a/tools/changelog.sh
+++ b/tools/changelog.sh
@@ -248,7 +248,7 @@ function display-release {
     case "$output" in
     raw) printf "$subject" ;;
     # In text mode, highlight (#<issue>) and dim text between `backticks`
-    text) sed -E $'s|#([0-9]+)|\e[32m#\\1\e[0m|g;s|`(.+)`|`\e[2m\\1\e[0m`|g' <<< "$subject" ;;
+    text) sed -E $'s|#([0-9]+)|\e[32m#\\1\e[0m|g;s|`([^`]+)`|`\e[2m\\1\e[0m`|g' <<< "$subject" ;;
     # In markdown mode, link to (#<issue>) issues
     md) sed -E 's|#([0-9]+)|[#\1](https://github.com/ohmyzsh/ohmyzsh/issues/\1)|g' <<< "$subject" ;;
     esac

From fa1911f89eab6d8d753e302546c6ecd5d0db9e08 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=B4=87=E5=BB=B6?=
 <47052088+ZhaoChongyan@users.noreply.github.com>
Date: Sat, 5 Dec 2020 22:42:45 +0800
Subject: [PATCH 206/869] fix(command-not-found): show error in Ubuntu when no
 package is found (#9418)

---
 .../command-not-found.plugin.zsh              | 24 +++++++++++++++----
 1 file changed, 19 insertions(+), 5 deletions(-)

diff --git a/plugins/command-not-found/command-not-found.plugin.zsh b/plugins/command-not-found/command-not-found.plugin.zsh
index 81d76e638..aea1e1b4c 100644
--- a/plugins/command-not-found/command-not-found.plugin.zsh
+++ b/plugins/command-not-found/command-not-found.plugin.zsh
@@ -2,7 +2,22 @@
 # as seen in https://www.porcheron.info/command-not-found-for-zsh/
 # this is installed in Ubuntu
 
-[[ -e /etc/zsh_command_not_found ]] && source /etc/zsh_command_not_found
+if [ -x /usr/lib/command-not-found -o -x /usr/share/command-not-found/command-not-found ]; then
+    function command_not_found_handler {
+        # check because c-n-f could've been removed in the meantime
+        if [ -x /usr/lib/command-not-found ]; then
+            /usr/lib/command-not-found -- "$1"
+            return $?
+        elif [ -x /usr/share/command-not-found/command-not-found ]; then
+            /usr/share/command-not-found/command-not-found -- "$1"
+            return $?
+        else
+            printf "zsh: command not found: %s\n" "$1" >&2
+            return 127
+        fi
+        return 0
+    }
+fi
 
 # Arch Linux command-not-found support, you must have package pkgfile installed
 # https://wiki.archlinux.org/index.php/Pkgfile#.22Command_not_found.22_hook
@@ -10,13 +25,12 @@
 
 # Fedora command-not-found support
 if [ -f /usr/libexec/pk-command-not-found ]; then
-    command_not_found_handler () {
+    command_not_found_handler() {
         runcnf=1
         retval=127
         [ ! -S /var/run/dbus/system_bus_socket ] && runcnf=0
         [ ! -x /usr/libexec/packagekitd ] && runcnf=0
-        if [ $runcnf -eq 1 ]
-            then
+        if [ $runcnf -eq 1 ]; then
             /usr/libexec/pk-command-not-found $@
             retval=$?
         fi
@@ -32,7 +46,7 @@ fi
 
 # NixOS command-not-found support
 if [ -x /run/current-system/sw/bin/command-not-found ]; then
-    command_not_found_handler () {
+    command_not_found_handler() {
         /run/current-system/sw/bin/command-not-found $@
     }
 fi

From 5a888ff4ac58798ccdff0f32c4609fd153edc217 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Mon, 7 Dec 2020 19:53:07 +0100
Subject: [PATCH 207/869] fix(updater): don't show changelog when running
 unattended update (#9495)

Fixes #9495
---
 lib/cli.zsh                |  8 +++++++-
 lib/functions.zsh          |  2 +-
 tools/check_for_upgrade.sh |  2 +-
 tools/upgrade.sh           | 10 ++++++----
 4 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/lib/cli.zsh b/lib/cli.zsh
index 38cdc449c..92d447a8e 100644
--- a/lib/cli.zsh
+++ b/lib/cli.zsh
@@ -376,13 +376,19 @@ function _omz::theme::use {
 
 function _omz::update {
   # Run update script
-  env ZSH="$ZSH" zsh -f "$ZSH/tools/upgrade.sh"
+  if [[ "$1" != --unattended ]]; then
+    ZSH="$ZSH" zsh -f "$ZSH/tools/upgrade.sh" --interactive
+  else
+    ZSH="$ZSH" zsh -f "$ZSH/tools/upgrade.sh"
+  fi
   local ret=$?
+
   # Update last updated file
   zmodload zsh/datetime
   echo "LAST_EPOCH=$(( EPOCHSECONDS / 60 / 60 / 24 ))" >! "${ZSH_CACHE_DIR}/.zsh-update"
   # Remove update lock if it exists
   command rm -rf "$ZSH/log/update.lock"
+
   # Restart the zsh session
   if [[ $ret -eq 0 && "$1" != --unattended ]]; then
     # Check whether to run a login shell
diff --git a/lib/functions.zsh b/lib/functions.zsh
index b0582b32b..0fc758070 100644
--- a/lib/functions.zsh
+++ b/lib/functions.zsh
@@ -14,7 +14,7 @@ function upgrade_oh_my_zsh() {
   fi
 
   # Run update script
-  env ZSH="$ZSH" zsh -f "$ZSH/tools/upgrade.sh"
+  env ZSH="$ZSH" zsh -f "$ZSH/tools/upgrade.sh" --interactive
   local ret=$?
   # Update last updated file
   zmodload zsh/datetime
diff --git a/tools/check_for_upgrade.sh b/tools/check_for_upgrade.sh
index 17925af8b..d0ceba92d 100644
--- a/tools/check_for_upgrade.sh
+++ b/tools/check_for_upgrade.sh
@@ -24,7 +24,7 @@ function update_last_updated_file() {
 }
 
 function update_ohmyzsh() {
-  ZSH="$ZSH" zsh -f "$ZSH/tools/upgrade.sh"
+  ZSH="$ZSH" zsh -f "$ZSH/tools/upgrade.sh" --interactive
   update_last_updated_file
 }
 
diff --git a/tools/upgrade.sh b/tools/upgrade.sh
index 0e4c368bc..cfd424527 100755
--- a/tools/upgrade.sh
+++ b/tools/upgrade.sh
@@ -70,10 +70,12 @@ if git pull --rebase --stat origin master; then
     message="Hooray! Oh My Zsh has been updated!"
 
     # Display changelog with less if available, otherwise just print it to the terminal
-    if (( $+commands[less] )); then
-      "$ZSH/tools/changelog.sh" HEAD "$last_commit" --text | command less -R
-    else
-      "$ZSH/tools/changelog.sh" HEAD "$last_commit"
+    if [[ "$1" = --interactive ]]; then
+      if (( $+commands[less] )); then
+        "$ZSH/tools/changelog.sh" HEAD "$last_commit" --text | LESS= command less -R
+      else
+        "$ZSH/tools/changelog.sh" HEAD "$last_commit"
+      fi
     fi
   fi
 

From 92fa8153d5e7e2e0d317f766f608e2062c76b390 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Mon, 7 Dec 2020 19:53:11 +0100
Subject: [PATCH 208/869] fix(changelog): fix assoc array syntax for zsh 5.4.2
 and older (#9495)

Also fixed a call to a defunct display:type-header function in displaying
breaking changes.
---
 tools/changelog.sh | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/tools/changelog.sh b/tools/changelog.sh
index 55b86f923..4ce42e5a3 100755
--- a/tools/changelog.sh
+++ b/tools/changelog.sh
@@ -8,16 +8,16 @@
 #* and the display string of such type
 local -A TYPES
 TYPES=(
-  [build]="Build system"
-  [chore]="Chore"
-  [ci]="CI"
-  [docs]="Documentation"
-  [feat]="Features"
-  [fix]="Bug fixes"
-  [perf]="Performance"
-  [refactor]="Refactor"
-  [style]="Style"
-  [test]="Testing"
+  build     "Build system"
+  chore     "Chore"
+  ci        "CI"
+  docs      "Documentation"
+  feat      "Features"
+  fix       "Bug fixes"
+  perf      "Performance"
+  refactor  "Refactor"
+  style     "Style"
+  test      "Testing"
 )
 
 #* Types that will be displayed in their own section,
@@ -274,8 +274,8 @@ function display-release {
     (( $#breaking != 0 )) || return 0
 
     case "$output" in
-    raw) display:type-header "BREAKING CHANGES" ;;
-    text|md) display:type-header "⚠ BREAKING CHANGES" ;;
+    raw) fmt:header "BREAKING CHANGES" 3 ;;
+    text|md) fmt:header "⚠ BREAKING CHANGES" 3 ;;
     esac
 
     local hash subject

From 4b7dba5b75cf5ed9e047d18c0a1588a52fa7f83b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Mon, 7 Dec 2020 19:57:35 +0100
Subject: [PATCH 209/869] feat(lib)!: soft-deprecate `upgrade_oh_my_zsh`
 function for everybody

BREAKING CHANGE: the `upgrade_oh_my_zsh` function now calls `omz update` directly.
---
 lib/functions.zsh | 19 ++-----------------
 1 file changed, 2 insertions(+), 17 deletions(-)

diff --git a/lib/functions.zsh b/lib/functions.zsh
index 0fc758070..7beb62ad9 100644
--- a/lib/functions.zsh
+++ b/lib/functions.zsh
@@ -9,23 +9,8 @@ function uninstall_oh_my_zsh() {
 }
 
 function upgrade_oh_my_zsh() {
-  if (( $+functions[_omz::update] )); then
-    echo >&2 "${fg[yellow]}Note: \`$0\` is deprecated. Use \`omz update\` instead.$reset_color"
-  fi
-
-  # Run update script
-  env ZSH="$ZSH" zsh -f "$ZSH/tools/upgrade.sh" --interactive
-  local ret=$?
-  # Update last updated file
-  zmodload zsh/datetime
-  echo "LAST_EPOCH=$(( EPOCHSECONDS / 60 / 60 / 24 ))" >! "${ZSH_CACHE_DIR}/.zsh-update"
-  # Remove update lock if it exists
-  command rm -rf "$ZSH/log/update.lock"
-  # Restart the zsh session
-  if [[ $ret -eq 0 ]]; then
-    # Check whether to run a login shell
-    [[ "$ZSH_ARGZERO" = -* ]] && exec -l "${ZSH_ARGZERO#-}" || exec "$ZSH_ARGZERO"
-  fi
+  echo >&2 "${fg[yellow]}Note: \`$0\` is deprecated. Use \`omz update\` instead.$reset_color"
+  omz update
 }
 
 function take() {

From e48be7dfc8dfb1e7110bdecc8c9dfcb9380953dd Mon Sep 17 00:00:00 2001
From: Veesar <74916913+veesar@users.noreply.github.com>
Date: Tue, 8 Dec 2020 01:53:55 +0530
Subject: [PATCH 210/869] feat(wp-cli): add aliases for DB management (#9469)

---
 plugins/wp-cli/README.md         | 204 ++++++++++++++++---------------
 plugins/wp-cli/wp-cli.plugin.zsh |  51 ++------
 2 files changed, 110 insertions(+), 145 deletions(-)

diff --git a/plugins/wp-cli/README.md b/plugins/wp-cli/README.md
index 43c41eb53..c4993ab4c 100644
--- a/plugins/wp-cli/README.md
+++ b/plugins/wp-cli/README.md
@@ -1,107 +1,109 @@
 # WP-CLI
 
+The [WordPress CLI](https://wp-cli.org/) is a command-line tool for managing WordPress installations. You can update plugins, set up multisite installs and much more, without using a web browser.
+
+This plugin adds [tab completion](https://wp-cli.org/#tab-completions) for `wp-cli` as well as several aliases for commonly used commands.
+
+To use it, add `wp-cli` to the plugins array in your zshrc file:
+
+```zsh
+plugins=(... wp-cli)
+```
+
 **Maintainer:** [joshmedeski](https://github.com/joshmedeski)
 
-WordPress Command Line Interface (https://wp-cli.org/)
+## Aliases
 
-WP-CLI is a set of command-line tools for managing WordPress installations. You can update plugins, set up multisite installs and much more, without using a web browser.
-
-This plugin adds [tab completion](https://wp-cli.org/#tab-completions) for `wp-cli` as well as several aliases.
-
-## List of Aliases
-
-### Core
-- wpcc='wp core config'
-- wpcd='wp core download'
-- wpci='wp core install'
-- wpcii='wp core is-installed'
-- wpcmc='wp core multisite-convert'
-- wpcmi='wp core multisite-install'
-- wpcu='wp core update'
-- wpcudb='wp core update-db'
-- wpcvc='wp core verify-checksums'
-
-### Cron
-- wpcre='wp cron event'
-- wpcrs='wp cron schedule'
-- wpcrt='wp cron test'
-
-### Menu
-- wpmc='wp menu create'
-- wpmd='wp menu delete'
-- wpmi='wp menu item'
-- wpml='wp menu list'
-- wpmlo='wp menu location'
-
-### Plugin
-- wppa='activate'
-- wppda='deactivate'
-- wppd='delete'
-- wppg='get'
-- wppi='install'
-- wppis='is-installed'
-- wppl='list'
-- wppp='path'
-- wpps='search'
-- wppst='status'
-- wppt='toggle'
-- wppun='uninstall'
-- wppu='update'
-
-### Post
-- wppoc='wp post create'
-- wppod='wp post delete'
-- wppoe='wp post edit'
-- wppogen='wp post generate'
-- wppog='wp post get'
-- wppol='wp post list'
-- wppom='wp post meta'
-- wppou='wp post update'
-- wppourl='wp post url'
-
-### Sidebar
-- wpsbl='wp sidebar list'
-
-### Theme
-- wpta='wp theme activate'
-- wptd='wp theme delete'
-- wptdis='wp theme disable'
-- wpte='wp theme enable'
-- wptg='wp theme get'
-- wpti='wp theme install'
-- wptis='wp theme is-installed'
-- wptl='wp theme list'
-- wptm='wp theme mod'
-- wptp='wp theme path'
-- wpts='wp theme search'
-- wptst='wp theme status'
-- wptu='wp theme update'
-
-### User
-- wpuac='wp user add-cap'
-- wpuar='wp user add-role'
-- wpuc='wp user create'
-- wpud='wp user delete'
-- wpugen='wp user generate'
-- wpug='wp user get'
-- wpui='wp user import-csv'
-- wpul='wp user list'
-- wpulc='wp user list-caps'
-- wpum='wp user meta'
-- wpurc='wp user remove-cap'
-- wpurr='wp user remove-role'
-- wpusr='wp user set-role'
-- wpuu='wp user update'
-
-### Widget
-- wpwa='wp widget add'
-- wpwda='wp widget deactivate'
-- wpwd='wp widget delete'
-- wpwl='wp widget list'
-- wpwm='wp widget move'
-- wpwu='wp widget update'
-
-The entire list of wp-cli commands can be found here: https://wp-cli.org/commands/
-
-I only included the commands that are most used. Please feel free to contribute to this project if you want more commands.
+The entire list of `wp-cli` commands can be found here: https://developer.wordpress.org/cli/commands/
 
+| Alias     | Command                     |
+|-----------|-----------------------------|
+| **Core**                                |
+| `wpcc`    | `wp core config`            |
+| `wpcd`    | `wp core download`          |
+| `wpci`    | `wp core install`           |
+| `wpcii`   | `wp core is-installed`      |
+| `wpcmc`   | `wp core multisite-convert` |
+| `wpcmi`   | `wp core multisite-install` |
+| `wpcu`    | `wp core update`            |
+| `wpcudb`  | `wp core update-db`         |
+| `wpcvc`   | `wp core verify-checksums`  |
+| **Cron**                                |
+| `wpcre`   | `wp cron event`             |
+| `wpcrs`   | `wp cron schedule`          |
+| `wpcrt`   | `wp cron test`              |
+| **Database**                            |
+| `wpdbe`   | `wp db export`              |
+| `wpdbi`   | `wp db import`              |
+| `wpdbcr`  | `wp db create`              |
+| `wpdbs`   | `wp db search`              |
+| `wpdbch`  | `wp db check`               |
+| `wpdbr`   | `wp db repair`              |
+| **Menu**                                |
+| `wpmc`    | `wp menu create`            |
+| `wpmd`    | `wp menu delete`            |
+| `wpmi`    | `wp menu item`              |
+| `wpml`    | `wp menu list`              |
+| `wpmlo`   | `wp menu location`          |
+| **Plugin**                              |
+| `wppa`    | `wp plugin activate`        |
+| `wppda`   | `wp plugin deactivate`      |
+| `wppd`    | `wp plugin delete`          |
+| `wppg`    | `wp plugin get`             |
+| `wppi`    | `wp plugin install`         |
+| `wppis`   | `wp plugin is-installed`    |
+| `wppl`    | `wp plugin list`            |
+| `wppp`    | `wp plugin path`            |
+| `wpps`    | `wp plugin search`          |
+| `wppst`   | `wp plugin status`          |
+| `wppt`    | `wp plugin toggle`          |
+| `wppun`   | `wp plugin uninstall`       |
+| `wppu`    | `wp plugin update`          |
+| **Post**                                |
+| `wppoc`   | `wp post create`            |
+| `wppod`   | `wp post delete`            |
+| `wppoe`   | `wp post edit`              |
+| `wppogen` | `wp post generate`          |
+| `wppog`   | `wp post get`               |
+| `wppol`   | `wp post list`              |
+| `wppom`   | `wp post meta`              |
+| `wppou`   | `wp post update`            |
+| `wppourl` | `wp post url`               |
+| **Sidebar**                             |
+| `wpsbl`   | `wp sidebar list`           |
+| **Theme**                               |
+| `wpta`    | `wp theme activate`         |
+| `wptd`    | `wp theme delete`           |
+| `wptdis`  | `wp theme disable`          |
+| `wpte`    | `wp theme enable`           |
+| `wptg`    | `wp theme get`              |
+| `wpti`    | `wp theme install`          |
+| `wptis`   | `wp theme is-installed`     |
+| `wptl`    | `wp theme list`             |
+| `wptm`    | `wp theme mod`              |
+| `wptp`    | `wp theme path`             |
+| `wpts`    | `wp theme search`           |
+| `wptst`   | `wp theme status`           |
+| `wptu`    | `wp theme update`           |
+| **User**                                |
+| `wpuac`   | `wp user add-cap`           |
+| `wpuar`   | `wp user add-role`          |
+| `wpuc`    | `wp user create`            |
+| `wpud`    | `wp user delete`            |
+| `wpugen`  | `wp user generate`          |
+| `wpug`    | `wp user get`               |
+| `wpui`    | `wp user import-csv`        |
+| `wpul`    | `wp user list`              |
+| `wpulc`   | `wp user list-caps`         |
+| `wpum`    | `wp user meta`              |
+| `wpurc`   | `wp user remove-cap`        |
+| `wpurr`   | `wp user remove-role`       |
+| `wpusr`   | `wp user set-role`          |
+| `wpuu`    | `wp user update`            |
+| **Widget**                              |
+| `wpwa`    | `wp widget add`             |
+| `wpwda`   | `wp widget deactivate`      |
+| `wpwd`    | `wp widget delete`          |
+| `wpwl`    | `wp widget list`            |
+| `wpwm`    | `wp widget move`            |
+| `wpwu`    | `wp widget update`          |
diff --git a/plugins/wp-cli/wp-cli.plugin.zsh b/plugins/wp-cli/wp-cli.plugin.zsh
index 97bed406e..09bdf3260 100644
--- a/plugins/wp-cli/wp-cli.plugin.zsh
+++ b/plugins/wp-cli/wp-cli.plugin.zsh
@@ -2,14 +2,6 @@
 # A command line interface for WordPress
 # https://wp-cli.org/
 
-# Cache
-
-# Cap
-
-# CLI
-
-# Comment
-
 # Core
 alias wpcc='wp core config'
 alias wpcd='wp core download'
@@ -27,18 +19,12 @@ alias wpcrs='wp cron schedule'
 alias wpcrt='wp cron test'
 
 # Db
-
-# Eval
-
-# Eval-File
-
-# Export
-
-# Help
-
-# Import
-
-# Media
+alias wpdbe='wp db export'
+alias wpdbi='wp db import'
+alias wpdbcr='wp db create'
+alias wpdbs='wp db search'
+alias wpdbch='wp db check'
+alias wpdbr='wp db repair'
 
 # Menu
 alias wpmc='wp menu create'
@@ -47,10 +33,6 @@ alias wpmi='wp menu item'
 alias wpml='wp menu list'
 alias wpmlo='wp menu location'
 
-# Network
-
-# Option
-
 # Plugin
 alias wppa='wp plugin activate'
 alias wppda='wp plugin deactivate'
@@ -77,25 +59,9 @@ alias wppom='wp post meta'
 alias wppou='wp post update'
 alias wppourl='wp post url'
 
-# Rewrite
-
-# Role
-
-# Scaffold
-
-# Search-Replace
-
-# Shell
-
 # Sidebar
 alias wpsbl='wp sidebar list'
 
-# Site
-
-# Super-Admin
-
-# Term
-
 # Theme
 alias wpta='wp theme activate'
 alias wptd='wp theme delete'
@@ -111,8 +77,6 @@ alias wpts='wp theme search'
 alias wptst='wp theme status'
 alias wptu='wp theme update'
 
-# Transient
-
 # User
 alias wpuac='wp user add-cap'
 alias wpuar='wp user add-role'
@@ -138,9 +102,8 @@ alias wpwm='wp widget move'
 alias wpwu='wp widget update'
 
 
+# Completion for wp
 autoload -U +X bashcompinit && bashcompinit
-# bash completion for the `wp` command
-
 _wp_complete() {
 	local cur=${COMP_WORDS[COMP_CWORD]}
 

From 865d2d8a53f65eba22c8a0436be1ea985aaa2aba Mon Sep 17 00:00:00 2001
From: ratijas <me@ratijas.tk>
Date: Tue, 8 Dec 2020 00:00:25 +0300
Subject: [PATCH 211/869] refactor(archlinux): prevent leaking local variables
 (#9476)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Marc Cornellà <marc.cornella@live.com>
---
 plugins/archlinux/archlinux.plugin.zsh | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/plugins/archlinux/archlinux.plugin.zsh b/plugins/archlinux/archlinux.plugin.zsh
index 4d39bd86b..c72e06dc2 100644
--- a/plugins/archlinux/archlinux.plugin.zsh
+++ b/plugins/archlinux/archlinux.plugin.zsh
@@ -171,14 +171,13 @@ function paclist() {
 }
 
 function pacdisowned() {
-  emulate -L zsh
-
+  local tmp db fs
   tmp=${TMPDIR-/tmp}/pacman-disowned-$UID-$$
   db=$tmp/db
   fs=$tmp/fs
 
   mkdir "$tmp"
-  trap  'rm -rf "$tmp"' EXIT
+  trap 'rm -rf "$tmp"' EXIT
 
   pacman -Qlq | sort -u > "$db"
 
@@ -189,15 +188,14 @@ function pacdisowned() {
 }
 
 function pacmanallkeys() {
-  emulate -L zsh
   curl -s https://www.archlinux.org/people/{developers,trustedusers}/ | \
     awk -F\" '(/pgp.mit.edu/) { sub(/.*search=0x/,""); print $1}' | \
     xargs sudo pacman-key --recv-keys
 }
 
 function pacmansignkeys() {
-  emulate -L zsh
-  for key in $*; do
+  local key
+  for key in $@; do
     sudo pacman-key --recv-keys $key
     sudo pacman-key --lsign-key $key
     printf 'trust\n3\n' | sudo gpg --homedir /etc/pacman.d/gnupg \
@@ -207,13 +205,13 @@ function pacmansignkeys() {
 
 if (( $+commands[xdg-open] )); then
   function pacweb() {
-    pkg="$1"
-    infos="$(LANG=C pacman -Si "$pkg")"
+    local pkg="$1"
+    local infos="$(LANG=C pacman -Si "$pkg")"
     if [[ -z "$infos" ]]; then
       return
     fi
-    repo="$(grep -m 1 '^Repo' <<< "$infos" | grep -oP '[^ ]+$')"
-    arch="$(grep -m 1 '^Arch' <<< "$infos" | grep -oP '[^ ]+$')"
+    local repo="$(grep -m 1 '^Repo' <<< "$infos" | grep -oP '[^ ]+$')"
+    local arch="$(grep -m 1 '^Arch' <<< "$infos" | grep -oP '[^ ]+$')"
     xdg-open "https://www.archlinux.org/packages/$repo/$arch/$pkg/" &>/dev/null
   }
 fi

From 452586e79a06d568a3445b26e6d6f4d62c111f52 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Mon, 7 Dec 2020 21:28:08 +0100
Subject: [PATCH 212/869] chore: add Josh Medeski as `wp-cli` plugin maintainer

---
 .github/CODEOWNERS | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index e16ebb39b..8e175d549 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -3,3 +3,4 @@ plugins/aws/                        @maksyms
 plugins/git-lfs/                    @vietduc01100001
 plugins/gitfast/                    @felipec
 plugins/sdk/                        @rgoldberg
+plugins/wp-cli/                     @joshmedeski

From e2f2489a666caf238804783b4e8851a781ac6ffc Mon Sep 17 00:00:00 2001
From: Joseph Heyburn <34041368+jdheyburn@users.noreply.github.com>
Date: Tue, 8 Dec 2020 17:25:42 +0000
Subject: [PATCH 213/869] fix(git): silently fail in `git_main_branch` if not
 in a git repo (#9484)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Marc Cornellà <marc.cornella@live.com>
---
 plugins/git/git.plugin.zsh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index bf2619976..e32136f15 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -31,6 +31,7 @@ function work_in_progress() {
 
 # Check if main exists and use instead of master
 function git_main_branch() {
+  command git rev-parse --git-dir &>/dev/null || return
   local branch
   for branch in main trunk; do
     if command git show-ref -q --verify refs/heads/$branch; then

From e5af22cca6a07c9be52fe48810faaa08261e4d15 Mon Sep 17 00:00:00 2001
From: Mark Mercado <mamercad@gmail.com>
Date: Wed, 9 Dec 2020 11:59:12 -0500
Subject: [PATCH 214/869] feat(plugins): add grc plugin for Generic Colouriser
 (#9315)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Marc Cornellà <marc.cornella@live.com>
---
 plugins/grc/README.md      | 37 ++++++++++++++++++++++++++++++++
 plugins/grc/grc.plugin.zsh | 44 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 81 insertions(+)
 create mode 100644 plugins/grc/README.md
 create mode 100644 plugins/grc/grc.plugin.zsh

diff --git a/plugins/grc/README.md b/plugins/grc/README.md
new file mode 100644
index 000000000..dfda41466
--- /dev/null
+++ b/plugins/grc/README.md
@@ -0,0 +1,37 @@
+# Generic Colouriser plugin
+
+This plugin adds wrappers for commands supported by [Generic Colouriser](https://github.com/garabik/grc):
+
+To use it, add `grc` to the plugins array in your zshrc file:
+
+```zsh
+plugins=(... grc)
+```
+
+## Commands
+
+The following commands are wrapped by `grc` so that their output is automatically colored:
+
+- `cc`
+- `configure`
+- `cvs`
+- `df`
+- `diff`
+- `dig`
+- `gcc`
+- `gmake`
+- `ifconfig`
+- `iwconfig`
+- `last`
+- `ldap`
+- `make`
+- `mount`
+- `mtr`
+- `netstat`
+- `ping`
+- `ping6`
+- `ps`
+- `traceroute`
+- `traceroute6`
+- `wdiff`
+- `whois`
diff --git a/plugins/grc/grc.plugin.zsh b/plugins/grc/grc.plugin.zsh
new file mode 100644
index 000000000..6a52ec568
--- /dev/null
+++ b/plugins/grc/grc.plugin.zsh
@@ -0,0 +1,44 @@
+# Adapted from: https://github.com/garabik/grc/blob/master/grc.zsh
+
+if [[ "$TERM" = dumb ]] || (( ! $+commands[grc] )); then
+  return
+fi
+
+# Supported commands
+cmds=(
+  cc
+  configure
+  cvs
+  df
+  diff
+  dig
+  gcc
+  gmake
+  ifconfig
+  iwconfig
+  last
+  ldap
+  make
+  mount
+  mtr
+  netstat
+  ping
+  ping6
+  ps
+  traceroute
+  traceroute6
+  wdiff
+  whois
+)
+
+# Set alias for supported commands
+for cmd in $cmds; do
+  if (( $+commands[$cmd] )); then
+    eval "function $cmd {
+      grc --colour=auto \"${commands[$cmd]}\" \"\$@\"
+    }"
+  fi
+done
+
+# Clean up variables
+unset cmds cmd

From fbee1ff8bda5a4491a4d003023f27daf04e09f4a Mon Sep 17 00:00:00 2001
From: Rohit Goswami <r95g10@gmail.com>
Date: Thu, 10 Dec 2020 01:50:01 +0530
Subject: [PATCH 215/869] fd: Rework command to be more idiomatic
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Marc Cornellà <marc.cornella@live.com>
---
 plugins/common-aliases/common-aliases.plugin.zsh | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/plugins/common-aliases/common-aliases.plugin.zsh b/plugins/common-aliases/common-aliases.plugin.zsh
index 8f3045db4..231037a92 100644
--- a/plugins/common-aliases/common-aliases.plugin.zsh
+++ b/plugins/common-aliases/common-aliases.plugin.zsh
@@ -34,9 +34,7 @@ alias -g P="2>&1| pygmentize -l pytb"
 
 alias dud='du -d 1 -h'
 alias duf='du -sh *'
-if ! which fd >/dev/null 2>%1; then
-  alias fd='find . -type d -name'
-fi
+(( $+commands[fd] )) || alias fd='find . -type d -name'
 alias ff='find . -type f -name'
 
 alias h='history'

From 5feb2b67428546c7e50b510f9d644ce24e1d5c43 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Wed, 9 Dec 2020 23:11:31 +0100
Subject: [PATCH 216/869] Document fd alias change in README

---
 plugins/common-aliases/README.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/plugins/common-aliases/README.md b/plugins/common-aliases/README.md
index d198a29ac..b6f34cb54 100644
--- a/plugins/common-aliases/README.md
+++ b/plugins/common-aliases/README.md
@@ -40,11 +40,13 @@ plugins=(... common-aliases)
 
 | Alias | Command                                             | Description                             |
 |-------|-----------------------------------------------------|-----------------------------------------|
-| fd    | `find . -type d -name`                              | Find a directory with the given name    |
+| fd\*  | `find . -type d -name`                              | Find a directory with the given name    |
 | ff    | `find . -type f -name`                              | Find a file with the given name         |
 | grep  | `grep --color`                                      | Searches for a query string             |
 | sgrep | `grep -R -n -H -C 5 --exclude-dir={.git,.svn,CVS}`  | Useful for searching within files       |
 
+\* Only if the [`fd`](https://github.com/sharkdp/fd) command isn't installed.
+
 ### Other Aliases
 
 | Alias     | Command             | Description                                                 |

From 79d0182a2666a98f04bd0d731012ce97114c1ef1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Thu, 10 Dec 2020 20:38:19 +0100
Subject: [PATCH 217/869] refactor(hanami): change global aliases and clean up
 README

---
 plugins/hanami/README.md         | 61 +++++++++++++++++++-------------
 plugins/hanami/hanami.plugin.zsh |  6 ++--
 2 files changed, 40 insertions(+), 27 deletions(-)

diff --git a/plugins/hanami/README.md b/plugins/hanami/README.md
index 3ac8defbb..c9e09f4f2 100644
--- a/plugins/hanami/README.md
+++ b/plugins/hanami/README.md
@@ -1,32 +1,45 @@
-# Hanami Plugin #
-This plugin adds convenient ways to work with [Hanami](https://hanamirb.org/) via console.
+# Hanami Plugin
+
+This plugin adds convenient aliases to work with [Hanami](https://hanamirb.org/) via console.
 It's inspired by Rails plugin, so if you've used it, you'll feel like home.
 
-## Usage ##
+To use it, add `hanami` to the plugins array in your zshrc file:
+
+```zsh
+plugins=(... hanami)
+```
+
+## Usage
 
 For example, type `hc` into your console when you're within Hanami project directory to run
 the application console. Have a look at available shortcuts below. You can read more about
 these commands [on the official website](https://hanamirb.org/guides/command-line/applications/).
 
-## Aliases ##
+## Aliases
 
-| Alias | Command                   | Description                                             |
-|-------|---------------------------|---------------------------------------------------------|
-| HED   | HANAMI_ENV=development    | Set environment variable HANAMI_ENV to development      |
-| HEP   | HANAMI_ENV=production     | Set environment variable HANAMI_ENV to production       |
-| HET   | HANAMI_ENV=test           | Set environment variable HANAMI_ENV to test             |
-| hc    | hanami console            | Run application console                                 |
-| hd    | hanami destroy            | Remove specified hanami resource                        |
-| hg    | hanami generate           | Create specified hanami resource                        |
-| hgm   | hanami generate migration | Create migration file                                   |
-| hs    | hanami server             | Launch server with hanami application                   |
-| hsp   | hanami server -p          | Launch server with specified port                       |
-| hr    | hanami routes             | List application routes                                 |
-| hdc   | hanami db create          | Create application database                             |
-| hdd   | hanami db drop            | Delete application database                             |
-| hdp   | hanami db prepare         | Prepare database for the current environment            |
-| hda   | hanami db apply           | Recreates a fresh schema after migrations (destructive) |
-| hdv   | hanami db version         | Print current database version                          |
-| hdrs  | hdd && hdp                | Drop and recreate application database                  |
-| hdtp  | HET hdp                   | Actualize test environment database                     |
-| hrg   | hr &#124; grep            | Grep hanami routes with specified pattern               |
+| Alias | Command                     | Description                                             |
+|-------|-----------------------------|---------------------------------------------------------|
+| HED\* | `HANAMI_ENV=development`    | Set environment variable HANAMI_ENV to development      |
+| HEP\* | `HANAMI_ENV=production`     | Set environment variable HANAMI_ENV to production       |
+| HET\* | `HANAMI_ENV=test`           | Set environment variable HANAMI_ENV to test             |
+| hc    | `hanami console`            | Run application console                                 |
+| hd    | `hanami destroy`            | Remove specified hanami resource                        |
+| hg    | `hanami generate`           | Create specified hanami resource                        |
+| hgm   | `hanami generate migration` | Create migration file                                   |
+| hs    | `hanami server`             | Launch server with hanami application                   |
+| hsp   | `hanami server -p`          | Launch server with specified port                       |
+| hr    | `hanami routes`             | List application routes                                 |
+| hdc   | `hanami db create`          | Create application database                             |
+| hdd   | `hanami db drop`            | Delete application database                             |
+| hdp   | `hanami db prepare`         | Prepare database for the current environment            |
+| hda   | `hanami db apply`           | Recreates a fresh schema after migrations (destructive) |
+| hdv   | `hanami db version`         | Print current database version                          |
+| hdrs  | `hdd && hdp`                | Drop and recreate application database                  |
+| hdtp  | `HET hdp`                   | Actualize test environment database                     |
+| hrg   | `hr | grep`                 | Grep hanami routes with specified pattern               |
+
+\* You should use these at the beginning of a command, for example:
+
+```console
+$ HED hdd # equivalent to 'HANAMI_ENV=development hanami db drop'
+```
diff --git a/plugins/hanami/hanami.plugin.zsh b/plugins/hanami/hanami.plugin.zsh
index 349c42cae..42143b428 100644
--- a/plugins/hanami/hanami.plugin.zsh
+++ b/plugins/hanami/hanami.plugin.zsh
@@ -1,6 +1,6 @@
-alias -g HED='HANAMI_ENV=development'
-alias -g HEP='HANAMI_ENV=production'
-alias -g HET='HANAMI_ENV=test'
+alias HED='HANAMI_ENV=development '
+alias HEP='HANAMI_ENV=production '
+alias HET='HANAMI_ENV=test '
 
 alias hc='hanami console'
 alias hd='hanami destroy'

From 2f39c68ab0157b55413de74e579d1787f26e58b6 Mon Sep 17 00:00:00 2001
From: Bruno Borges <brborges@microsoft.com>
Date: Thu, 10 Dec 2020 11:44:08 -0800
Subject: [PATCH 218/869] feat(lib): show upstream branch in `git_prompt_info`
 (#9188)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Show the remote branch the local branch is tracking if `ZSH_THEME_GIT_SHOW_UPSTREAM`
is set, like so: `ZSH_THEME_GIT_SHOW_UPSTREAM=1`.

Co-authored-by: Marc Cornellà <marc.cornella@live.com>
---
 lib/git.zsh | 25 +++++++++++++++++++------
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/lib/git.zsh b/lib/git.zsh
index 53d39609e..da8a3e7a7 100644
--- a/lib/git.zsh
+++ b/lib/git.zsh
@@ -9,14 +9,27 @@ function __git_prompt_git() {
   GIT_OPTIONAL_LOCKS=0 command git "$@"
 }
 
-# Outputs current branch info in prompt format
 function git_prompt_info() {
-  local ref
-  if [[ "$(__git_prompt_git config --get oh-my-zsh.hide-status 2>/dev/null)" != "1" ]]; then
-    ref=$(__git_prompt_git symbolic-ref HEAD 2> /dev/null) || \
-    ref=$(__git_prompt_git rev-parse --short HEAD 2> /dev/null) || return 0
-    echo "$ZSH_THEME_GIT_PROMPT_PREFIX${ref#refs/heads/}$(parse_git_dirty)$ZSH_THEME_GIT_PROMPT_SUFFIX"
+  # If we are on a folder not tracked by git, get out.
+  # Otherwise, check for hide-info at global and local repository level
+  if ! __git_prompt_git rev-parse --git-dir &> /dev/null \
+     || [[ "$(__git_prompt_git config --get oh-my-zsh.hide-info 2>/dev/null)" == 1 ]]; then
+    return 0
   fi
+
+  local ref
+  ref=$(__git_prompt_git symbolic-ref --short HEAD 2> /dev/null) \
+  || ref=$(__git_prompt_git rev-parse --short HEAD 2> /dev/null) \
+  || return 0
+ 
+  # Use global ZSH_THEME_GIT_SHOW_UPSTREAM=1 for including upstream remote info
+  local upstream
+  if (( ${+ZSH_THEME_GIT_SHOW_UPSTREAM} )); then
+    upstream=$(__git_prompt_git rev-parse --abbrev-ref --symbolic-full-name "@{upstream}" 2>/dev/null) \
+    && upstream=" -> ${upstream}"
+  fi
+
+  echo "${ZSH_THEME_GIT_PROMPT_PREFIX}${ref}${upstream}$(parse_git_dirty)${ZSH_THEME_GIT_PROMPT_SUFFIX}"
 }
 
 # Checks if working tree is dirty

From 28265812f8fb923788d74409cef3e5635793b38e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Thu, 10 Dec 2020 20:45:22 +0100
Subject: [PATCH 219/869] chore!: notify breaking change in `git_prompt_info`

BREAKING CHANGE: the git config option to skip running `git_prompt_info` has changed from `oh-my-zsh.hide-status` to `oh-my-zsh.hide-info` (#9188).
---
 lib/git.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/git.zsh b/lib/git.zsh
index da8a3e7a7..157c85062 100644
--- a/lib/git.zsh
+++ b/lib/git.zsh
@@ -21,7 +21,7 @@ function git_prompt_info() {
   ref=$(__git_prompt_git symbolic-ref --short HEAD 2> /dev/null) \
   || ref=$(__git_prompt_git rev-parse --short HEAD 2> /dev/null) \
   || return 0
- 
+
   # Use global ZSH_THEME_GIT_SHOW_UPSTREAM=1 for including upstream remote info
   local upstream
   if (( ${+ZSH_THEME_GIT_SHOW_UPSTREAM} )); then

From 918195425576e57016c8415766a7d4e98bc2e260 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Fri, 11 Dec 2020 16:54:22 +0100
Subject: [PATCH 220/869] fix(composer): autoload `_cache_invalid` for antigen
 compatibility

Antigen doesn't call `compinit` until the user prompt is about to be shown,
which means `_cache_invalid` isn't automatically autoloaded. This patch
fixes that, though we should work towards a better caching mechanism.

Fixes #9490
---
 plugins/composer/composer.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/composer/composer.plugin.zsh b/plugins/composer/composer.plugin.zsh
index 75b03ffe7..218a13e5f 100644
--- a/plugins/composer/composer.plugin.zsh
+++ b/plugins/composer/composer.plugin.zsh
@@ -51,7 +51,7 @@ alias cget='curl -s https://getcomposer.org/installer | php'
 
 # Add Composer's global binaries to PATH, using Composer if available.
 if (( $+commands[composer] )); then
-    autoload -Uz _store_cache _retrieve_cache
+    autoload -Uz _store_cache _retrieve_cache _cache_invalid
 
     _retrieve_cache composer
 

From 9d6b3984f92cf7f4411b40dfb5a0897b260ae368 Mon Sep 17 00:00:00 2001
From: Aaron Toponce <aaron.toponce@gmail.com>
Date: Sat, 12 Dec 2020 04:50:45 -0700
Subject: [PATCH 221/869] feat(plugins): add genpass plugin with 3 distinct
 password generators (#9502)

---
 .github/CODEOWNERS                 |  1 +
 plugins/genpass/README.md          | 65 ++++++++++++++++++++
 plugins/genpass/genpass.plugin.zsh | 95 ++++++++++++++++++++++++++++++
 3 files changed, 161 insertions(+)
 create mode 100644 plugins/genpass/README.md
 create mode 100644 plugins/genpass/genpass.plugin.zsh

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 8e175d549..b091f5d89 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1,5 +1,6 @@
 # Plugin owners
 plugins/aws/                        @maksyms
+plugins/genpass/                    @atoponce
 plugins/git-lfs/                    @vietduc01100001
 plugins/gitfast/                    @felipec
 plugins/sdk/                        @rgoldberg
diff --git a/plugins/genpass/README.md b/plugins/genpass/README.md
new file mode 100644
index 000000000..e6e7a5138
--- /dev/null
+++ b/plugins/genpass/README.md
@@ -0,0 +1,65 @@
+# genpass
+
+This plugin provides three unique password generators for ZSH. Each generator
+has at least a 128-bit security margin and generates passwords from the
+cryptographically secure `/dev/urandom`. Each generator can also take an
+optional numeric argument to generate multiple passwords.
+
+Requirements:
+
+* `grep(1)`
+* GNU coreutils (or appropriate for your system)
+* Word list providing `/usr/share/dict/words`
+
+To use it, add `genpass` to the plugins array in your zshrc file:
+
+    plugins=(... genpass)
+
+## genpass-apple
+
+Generates a pronounceable pseudoword passphrase of the "cvccvc" consonant/vowel
+syntax, inspired by [Apple's iCloud Keychain password generator][1]. Each
+pseudoword has exactly 1 digit placed at the edge of a "word" and exactly 1
+capital letter to satisfy most password security requirements.
+
+    % genpass-apple
+    gelcyv-foqtam-fotqoh-viMleb-lexduv-6ixfuk
+
+    % genpass-apple 3
+    japvyz-qyjti4-kajrod-nubxaW-hukkan-dijcaf
+    vydpig-fucnul-3ukpog-voggom-zygNad-jepgad
+    zocmez-byznis-hegTaj-jecdyq-qiqmiq-5enwom
+
+[1]: https://developer.apple.com/password-rules/
+
+## genpass-monkey
+
+Generates visually unambiguous random meaningless strings using [Crockford's
+base32][2].
+
+    % genpass-monkey
+    xt7gn976e7jj3fstgpy27330x3
+
+    % genpass-monkey 3
+    n1qqwtzgejwgqve9yzf2gxvx4m
+    r2n3f5s6vbqs2yx7xjnmahqewy
+    296w9y9rts3p5r9yay0raek8e5
+
+[2]: https://www.crockford.com/base32.html
+
+## genpass-xkcd
+
+Generates passphrases from `/usr/share/dict/words` inspired by the [famous (and
+slightly misleading) XKCD comic][3]. Each passphrase is prepended with a digit
+showing the number of words in the passphrase to adhere to password security
+requirements that require digits. Each word is 6 characters or less.
+
+    % genpass-xkcd
+    9-eaten-Slav-rife-aired-hill-cordon-splits-welsh-napes
+
+    % genpass-xkcd 3
+    9-worker-Vlad-horde-shrubs-smite-thwart-paw-alters-prawns
+    9-tutors-stink-rhythm-junk-snappy-hooray-barbs-mewl-clomp
+    9-vital-escape-Angkor-Huff-wet-Mayra-abbés-putts-guzzle
+
+[3]: https://xkcd.com/936/
diff --git a/plugins/genpass/genpass.plugin.zsh b/plugins/genpass/genpass.plugin.zsh
new file mode 100644
index 000000000..15bfebda8
--- /dev/null
+++ b/plugins/genpass/genpass.plugin.zsh
@@ -0,0 +1,95 @@
+autoload -U regexp-replace
+zmodload zsh/mathfunc
+
+genpass-apple() {
+  # Generates a 128-bit password of 6 pseudowords of 6 characters each
+  # EG, xudmec-4ambyj-tavric-mumpub-mydVop-bypjyp
+  # Can take a numerical argument for generating extra passwords
+  local -i i j num
+
+  [[ $1 =~ '^[0-9]+$' ]] && num=$1 || num=1
+
+  local consonants="$(LC_ALL=C tr -cd b-df-hj-np-tv-xz < /dev/urandom \
+    | head -c $((24*$num)))"
+  local vowels="$(LC_ALL=C tr -cd aeiouy < /dev/urandom | head -c $((12*$num)))"
+  local digits="$(LC_ALL=C tr -cd 0-9 < /dev/urandom | head -c $num)"
+
+  # The digit is placed on a pseudoword edge using $base36. IE, Dvccvc or cvccvD
+  local position="$(LC_ALL=C tr -cd 056bchinotuz < /dev/urandom | head -c $num)"
+  local -A base36=(0 0 1 1 2 2 3 3 4 4 5 5 6 6 7 7 8 8 9 9 a 10 b 11 c 12 d 13 \
+    e 14 f 15 g 16 h 17 i 18 j 19 k 20 l 21 m 22 n 23 o 24 p 25 q 26 r 27 s 28 \
+    t 29 u 30 v 31 w 32 x 33 y 34 z 35)
+
+  for i in {1..$num}; do
+    local pseudo=""
+
+    for j in {1..12}; do
+      # Uniformly iterate through $consonants and $vowels for each $i and $j
+      # Creates cvccvccvccvccvccvccvccvccvccvccvccvc for each $num
+      pseudo="${pseudo}${consonants:$((24*$i+2*${j}-26)):1}"
+      pseudo="${pseudo}${vowels:$((12*$i+${j}-13)):1}"
+      pseudo="${pseudo}${consonants:$((24*$i+2*${j}-25)):1}"
+    done
+
+    local -i digit_pos=${base36[${position[$i]}]}
+    local -i char_pos=$digit_pos
+
+    # The digit and uppercase character must be in different locations
+    while [[ $digit_pos == $char_pos ]]; do
+      char_pos=$base36[$(LC_ALL=C tr -cd 0-9a-z < /dev/urandom | head -c 1)]
+    done
+
+    # Places the digit on a pseudoword edge
+    regexp-replace pseudo "^(.{$digit_pos}).(.*)$" \
+      '${match[1]}${digits[$i]}${match[2]}'
+
+    # Uppercase a random character (that is not a digit)
+    regexp-replace pseudo "^(.{$char_pos})(.)(.*)$" \
+      '${match[1]}${(U)match[2]}${match[3]}'
+
+    # Hyphenate each 6-character pseudoword
+    regexp-replace pseudo '^(.{6})(.{6})(.{6})(.{6})(.{6})(.{6})$' \
+      '${match[1]}-${match[2]}-${match[3]}-${match[4]}-${match[5]}-${match[6]}'
+
+    printf "${pseudo}\n"
+  done
+}
+
+genpass-monkey() {
+  # Generates a 128-bit base32 password as if monkeys banged the keyboard
+  # EG, nz5ej2kypkvcw0rn5cvhs6qxtm
+  # Can take a numerical argument for generating extra passwords
+  local -i i num
+
+  [[ $1 =~ '^[0-9]+$' ]] && num=$1 || num=1
+
+  local pass=$(LC_ALL=C tr -cd '0-9a-hjkmnp-tv-z' < /dev/urandom \
+    | head -c $((26*$num)))
+
+  for i in {1..$num}; do
+    printf "${pass:$((26*($i-1))):26}\n"
+  done
+}
+
+genpass-xkcd() {
+  # Generates a 128-bit XKCD-style passphrase
+  # EG, 9-mien-flood-Patti-buxom-dozes-ickier-pay-ailed-Foster
+  # Can take a numerical argument for generating extra passwords
+  local -i i num
+
+  [[ $1 =~ '^[0-9]+$' ]] && num=$1 || num=1
+
+  # Get all alphabetic words of at most 6 characters in length
+  local dict=$(grep -E '^[a-zA-Z]{,6}$' /usr/share/dict/words)
+
+  # Calculate the base-2 entropy of each word in $dict
+  # Entropy is e = L * log2(C), where L is the length of the password (here,
+  # in words) and C the size of the character set (here, words in $dict).
+  # Solve for e = 128 bits of entropy. Recall: log2(n) = log(n)/log(2).
+  local -i n=$((int(ceil(128*log(2)/log(${(w)#dict})))))
+
+  for i in {1..$num}; do
+    printf "$n-"
+    printf "$dict" | shuf -n "$n" | paste -sd '-'
+  done
+}

From e8e37eedbc8cf5e446be11971769df7cc10faeb0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Sat, 12 Dec 2020 13:41:29 +0100
Subject: [PATCH 222/869] =?UTF-8?q?feat(updater):=20save=20version=20prior?=
 =?UTF-8?q?=20to=20updating=20so=20`omz=20changelog`=20just=20works?=
 =?UTF-8?q?=E2=84=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixes #9505
---
 tools/changelog.sh | 11 +++++++++--
 tools/upgrade.sh   |  8 +++++++-
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/tools/changelog.sh b/tools/changelog.sh
index 4ce42e5a3..845b1d4b4 100755
--- a/tools/changelog.sh
+++ b/tools/changelog.sh
@@ -340,16 +340,23 @@ function display-release {
 
 function main {
   # $1 = until commit, $2 = since commit
-  # $3 = output format (--raw|--text|--md)
   local until="$1" since="$2"
+
+  # $3 = output format (--text|--raw|--md)
+  # --md:   uses markdown formatting
+  # --raw:  outputs without style
+  # --text: uses ANSI escape codes to style the output
   local output=${${3:-"--text"}#--*}
 
   if [[ -z "$until" ]]; then
     until=HEAD
   fi
 
-  # If $since is not specified, look up first version tag before $until
   if [[ -z "$since" ]]; then
+    # If $since is not specified:
+    # 1) try to find the version used before updating
+    # 2) try to find the first version tag before $until
+    since=$(command git config --get oh-my-zsh.lastVersion 2>/dev/null) || \
     since=$(command git describe --abbrev=0 --tags "$until^" 2>/dev/null) || \
     unset since
   elif [[ "$since" = --all ]]; then
diff --git a/tools/upgrade.sh b/tools/upgrade.sh
index cfd424527..4df7eb184 100755
--- a/tools/upgrade.sh
+++ b/tools/upgrade.sh
@@ -10,7 +10,7 @@ cd "$ZSH"
 # and that terminal supports them.
 
 local -a RAINBOW
-local RED GREEN YELLOW BLUE UNDER BOLD RESET
+local RED GREEN YELLOW BLUE BOLD DIM UNDER RESET
 
 if [ -t 1 ]; then
   RAINBOW=(
@@ -28,6 +28,7 @@ if [ -t 1 ]; then
   YELLOW=$(printf '\033[33m')
   BLUE=$(printf '\033[34m')
   BOLD=$(printf '\033[1m')
+  DIM=$(printf '\033[2m')
   UNDER=$(printf '\033[4m')
   RESET=$(printf '\033[m')
 fi
@@ -69,6 +70,9 @@ if git pull --rebase --stat origin master; then
   else
     message="Hooray! Oh My Zsh has been updated!"
 
+    # Save the commit prior to updating
+    git config oh-my-zsh.lastVersion "$last_commit"
+
     # Display changelog with less if available, otherwise just print it to the terminal
     if [[ "$1" = --interactive ]]; then
       if (( $+commands[less] )); then
@@ -77,6 +81,8 @@ if git pull --rebase --stat origin master; then
         "$ZSH/tools/changelog.sh" HEAD "$last_commit"
       fi
     fi
+
+    printf "${BLUE}%s \`${BOLD}%s${RESET}${BLUE}\`${RESET}\n" "You can see the changelog again with" "omz changelog"
   fi
 
   printf '%s         %s__      %s           %s        %s       %s     %s__   %s\n' $RAINBOW $RESET

From e2c73cf59a1a02257203db784f1e2fd27c830173 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Sat, 12 Dec 2020 14:22:26 +0100
Subject: [PATCH 223/869] fix(changelog): allow breaking change message to span
 multiple lines

This also allows the option to put extra paragraphs after the BREAKING CHANGE
message while properly displaying the breaking change message. Useful, for
example, to add signed-off or co-authored lines.
---
 tools/changelog.sh | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/tools/changelog.sh b/tools/changelog.sh
index 845b1d4b4..8753212e9 100755
--- a/tools/changelog.sh
+++ b/tools/changelog.sh
@@ -86,11 +86,15 @@ function parse-commit {
 
   # Return subject if the body or subject match the breaking change format
   function commit:is-breaking {
-    local subject="$1" body="$2"
+    local subject="$1" body="$2" message
 
     if [[ "$body" =~ "BREAKING CHANGE: (.*)" || \
       "$subject" =~ '^[^ :\)]+\)?!: (.*)$' ]]; then
-      echo "${match[1]}"
+      message="${match[1]}"
+      # skip next paragraphs (separated by two newlines or more)
+      message="${message%%$'\n\n'*}"
+      # ... and replace newlines with spaces
+      echo "${message//$'\n'/ }"
     else
       return 1
     fi

From f8e9339c87ab6b17ee34d34a72ddbe89333e9fa1 Mon Sep 17 00:00:00 2001
From: Aaron Toponce <aaron.toponce@gmail.com>
Date: Sat, 12 Dec 2020 17:20:41 -0700
Subject: [PATCH 224/869] fix(genpass): only use words with ASCII characters in
 `genpass-xkcd` (#9508)

---
 plugins/genpass/genpass.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/genpass/genpass.plugin.zsh b/plugins/genpass/genpass.plugin.zsh
index 15bfebda8..65bbd2e48 100644
--- a/plugins/genpass/genpass.plugin.zsh
+++ b/plugins/genpass/genpass.plugin.zsh
@@ -80,7 +80,7 @@ genpass-xkcd() {
   [[ $1 =~ '^[0-9]+$' ]] && num=$1 || num=1
 
   # Get all alphabetic words of at most 6 characters in length
-  local dict=$(grep -E '^[a-zA-Z]{,6}$' /usr/share/dict/words)
+  local dict=$(LC_ALL=C grep -E '^[a-zA-Z]{,6}$' /usr/share/dict/words)
 
   # Calculate the base-2 entropy of each word in $dict
   # Entropy is e = L * log2(C), where L is the length of the password (here,

From 2a0ae3315db98d137de547e2cb9adfbc38263e6c Mon Sep 17 00:00:00 2001
From: Matt Lewin <matt.lewin@gotruemotion.com>
Date: Sun, 13 Dec 2020 16:28:22 -0500
Subject: [PATCH 225/869] fix(genpass): fix grep regex in `genpass-xkcd` for
 FreeBSD version (#9514)

---
 plugins/genpass/genpass.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/genpass/genpass.plugin.zsh b/plugins/genpass/genpass.plugin.zsh
index 65bbd2e48..e7f86bf7a 100644
--- a/plugins/genpass/genpass.plugin.zsh
+++ b/plugins/genpass/genpass.plugin.zsh
@@ -80,7 +80,7 @@ genpass-xkcd() {
   [[ $1 =~ '^[0-9]+$' ]] && num=$1 || num=1
 
   # Get all alphabetic words of at most 6 characters in length
-  local dict=$(LC_ALL=C grep -E '^[a-zA-Z]{,6}$' /usr/share/dict/words)
+  local dict=$(LC_ALL=C grep -E '^[a-zA-Z]{1,6}$' /usr/share/dict/words)
 
   # Calculate the base-2 entropy of each word in $dict
   # Entropy is e = L * log2(C), where L is the length of the password (here,

From 619097cc2ad31c1b5086870293739d41dd4129c3 Mon Sep 17 00:00:00 2001
From: Patrick Harrison <mestizo@gmail.com>
Date: Mon, 14 Dec 2020 09:52:02 +0700
Subject: [PATCH 226/869] fix(genpass): check for presence of shuf command.

"shuf" is not a standard command on MacOS and requires installation of the brew coreutils package
---
 plugins/genpass/genpass.plugin.zsh | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/plugins/genpass/genpass.plugin.zsh b/plugins/genpass/genpass.plugin.zsh
index e7f86bf7a..f1ad80bba 100644
--- a/plugins/genpass/genpass.plugin.zsh
+++ b/plugins/genpass/genpass.plugin.zsh
@@ -75,6 +75,12 @@ genpass-xkcd() {
   # Generates a 128-bit XKCD-style passphrase
   # EG, 9-mien-flood-Patti-buxom-dozes-ickier-pay-ailed-Foster
   # Can take a numerical argument for generating extra passwords
+
+  if (( ! $+commands[shuf] )); then
+    echo >&2 "$0: \`shuf\` command not found. Install coreutils (\`brew install coreutils\` on macOS)."
+    return 1
+  fi
+
   local -i i num
 
   [[ $1 =~ '^[0-9]+$' ]] && num=$1 || num=1

From 076f7f1eb19914877e49eb186eb076fc3e493b36 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Mon, 14 Dec 2020 15:42:10 +0100
Subject: [PATCH 227/869] fix(genpass): warn if no wordlist is found

---
 plugins/genpass/genpass.plugin.zsh | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/plugins/genpass/genpass.plugin.zsh b/plugins/genpass/genpass.plugin.zsh
index f1ad80bba..1353ef456 100644
--- a/plugins/genpass/genpass.plugin.zsh
+++ b/plugins/genpass/genpass.plugin.zsh
@@ -73,7 +73,7 @@ genpass-monkey() {
 
 genpass-xkcd() {
   # Generates a 128-bit XKCD-style passphrase
-  # EG, 9-mien-flood-Patti-buxom-dozes-ickier-pay-ailed-Foster
+  # e.g, 9-mien-flood-Patti-buxom-dozes-ickier-pay-ailed-Foster
   # Can take a numerical argument for generating extra passwords
 
   if (( ! $+commands[shuf] )); then
@@ -81,6 +81,11 @@ genpass-xkcd() {
     return 1
   fi
 
+  if [[ ! -e /usr/share/dict/words ]]; then
+    echo >&2 "$0: no wordlist found in \`/usr/share/dict/words\`. Install one first."
+    return 1
+  fi
+
   local -i i num
 
   [[ $1 =~ '^[0-9]+$' ]] && num=$1 || num=1

From 2db42c6ce745ed37262bed6c97683a00a430f076 Mon Sep 17 00:00:00 2001
From: Patrick Harrison <mestizo@gmail.com>
Date: Mon, 14 Dec 2020 10:11:12 +0700
Subject: [PATCH 228/869] fix(genpass): add compatibility for macOS paste
 command

"paste" on macOS requires a '-' to signify that the standard input is used.
Without the '-' character, the command errors out.
---
 plugins/genpass/genpass.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/genpass/genpass.plugin.zsh b/plugins/genpass/genpass.plugin.zsh
index 1353ef456..e6a1cef34 100644
--- a/plugins/genpass/genpass.plugin.zsh
+++ b/plugins/genpass/genpass.plugin.zsh
@@ -101,6 +101,6 @@ genpass-xkcd() {
 
   for i in {1..$num}; do
     printf "$n-"
-    printf "$dict" | shuf -n "$n" | paste -sd '-'
+    printf "$dict" | shuf -n "$n" | paste -sd '-' -
   done
 }

From b28665aebb4c1b07a57890eb59551bc51d0acf37 Mon Sep 17 00:00:00 2001
From: Roman Perepelitsa <roman.perepelitsa@gmail.com>
Date: Wed, 16 Dec 2020 16:57:59 +0100
Subject: [PATCH 229/869] fix(genpass): improve performance and usability and
 fix bugs (#9520)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

*Bugs*

The following bugs have been fixed:

- All generators ignored errors from external commands. For example,
  if `/usr/share/dict/words` was unreadable, `genpass-xkcd` would
  print "0-" as a password and return success.
- All generators silently ignored the argument if it wasn't a number.
  For example, `genpass-apple -2` was generating one password and
  not printing any errors.
- All generators silently ignored extra arguments. For example,
  `genpass-apple -n 2` was generating one password and not printing
  any errors.
- `genpass-xkcd` was generating passwords with less than 128 bits of
  security margin in contradiction to documentation. The smaller the
  dictionary size, the weaker the passwords it was generating. For a
  dictionary with 27 words, `genpass-xkcd` was generating passwords
  with 93 bits of security margin (`log2(27!)`).
- The source of random data used by `genpass-xkcd` was not
  cryptographically secure in contradiction to documentation. See:
  https://www.gnu.org/software/coreutils/manual/html_node/Random-sources.html
- `genpass-apple` could generate a password with non-ascii characters
  depending on user locale. For example, passwords could contain 'İ'
  for users with Turkish locale.
- `genpass-apple` didn't work with `ksh_arrays` shell option.
- `genpass-xkcd` was printing spurious errors with `ksh_arrays` shell
  option.
- `genpass-xkcd` was producing too short (weak) or too strong (long)
  and/or printing errors when `IFS` was set to non-default value.
- All generators were printing fewer passwords than requested and
  returning success when passed a very large number as an argument.

*Usability*

Generators are now implemented as self-contained executable files.
They can be invoked from scripts with no additional setup.

Generators no longer depend on external commands. The only dependencies
are `/dev/urandom` and, for `genpass-xkcd`, `/usr/share/dict/words`.

All generators used to silently ignore all arguments after the first
and the first argument if it wasn't a number. For example, both
`genpass-apple -2` and `genpass-apple -n 2` were generating one password
and not printing any errors. Now these print an error and fail.

*Performance*

The time it takes to load the plugin has been greatly reduced. This
translates into faster zsh startup when the plugin is enabled.

Incidentally, two generators out of three have been sped up to a large
degree while one generator (`genpass-xkcd`) has gotten slower. This is
unlikely to matter one way or another unless generating a very large
number of passwords. In the latter case `genpass-xkcd` is now also
faster than it used to be.

The following table shows benchmark results from Linux x86-64 on i9-7900X.
The numbers in the second and third columns show how many times a given
command could be executed per second. Higher numbers are better.

command                     | before (Hz) | after (Hz) | speedup |
----------------------------|------------:|-----------:|--------:|
`source genpass.plugin.zsh` |        4810 |      68700 |  +1326% |
`genpass-apple`             |        30.3 |        893 |  +2846% |
`genpass-monkey`            |         203 |       5290 |  +2504% |
`genpass-xkcd`              |        34.4 |       14.5 |    -58% |
`genpass-xkcd 1000`         |       0.145 |      0.804 |   +454% |
---
 plugins/genpass/README.md          |  17 ++---
 plugins/genpass/genpass-apple      |  79 +++++++++++++++++++++
 plugins/genpass/genpass-monkey     |  32 +++++++++
 plugins/genpass/genpass-xkcd       |  68 ++++++++++++++++++
 plugins/genpass/genpass.plugin.zsh | 107 +----------------------------
 5 files changed, 189 insertions(+), 114 deletions(-)
 create mode 100755 plugins/genpass/genpass-apple
 create mode 100755 plugins/genpass/genpass-monkey
 create mode 100755 plugins/genpass/genpass-xkcd

diff --git a/plugins/genpass/README.md b/plugins/genpass/README.md
index e6e7a5138..a5ff4a876 100644
--- a/plugins/genpass/README.md
+++ b/plugins/genpass/README.md
@@ -5,21 +5,22 @@ has at least a 128-bit security margin and generates passwords from the
 cryptographically secure `/dev/urandom`. Each generator can also take an
 optional numeric argument to generate multiple passwords.
 
-Requirements:
-
-* `grep(1)`
-* GNU coreutils (or appropriate for your system)
-* Word list providing `/usr/share/dict/words`
-
-To use it, add `genpass` to the plugins array in your zshrc file:
+To use it from an interactive ZSH, add `genpass` to the plugins array in your
+zshrc file:
 
     plugins=(... genpass)
 
+You can also invoke password generators directly (they are implemented as
+standalone executable files), which can be handy when you need to generate
+passwords in a script:
+
+    ~/.oh-my-zsh/plugins/genpass/genpass-apple 3
+
 ## genpass-apple
 
 Generates a pronounceable pseudoword passphrase of the "cvccvc" consonant/vowel
 syntax, inspired by [Apple's iCloud Keychain password generator][1]. Each
-pseudoword has exactly 1 digit placed at the edge of a "word" and exactly 1
+password has exactly 1 digit placed at the edge of a "word" and exactly 1
 capital letter to satisfy most password security requirements.
 
     % genpass-apple
diff --git a/plugins/genpass/genpass-apple b/plugins/genpass/genpass-apple
new file mode 100755
index 000000000..963ab6447
--- /dev/null
+++ b/plugins/genpass/genpass-apple
@@ -0,0 +1,79 @@
+#!/usr/bin/env zsh
+#
+# Usage: genpass-apple [NUM]
+#
+# Generate a password made of 6 pseudowords of 6 characters each
+# with the security margin of at least 128 bits.
+#
+# Example password: xudmec-4ambyj-tavric-mumpub-mydVop-bypjyp
+#
+# If given a numerical argument, generate that many passwords.
+
+emulate -L zsh -o no_unset -o warn_create_global -o warn_nested_var
+
+if [[ ARGC -gt 1 || ${1-1} != ${~:-<1-$((16#7FFFFFFF))>} ]]; then
+  print -ru2 -- "usage: $0 [NUM]"
+  return 1
+fi
+
+zmodload zsh/system zsh/mathfunc || return
+
+{
+  local -r vowels=aeiouy
+  local -r consonants=bcdfghjklmnpqrstvwxz
+  local -r digits=0123456789
+
+  # Sets REPLY to a uniformly distributed random number in [1, $1].
+  # Requires: $1 <= 256.
+  function -$0-rand() {
+    local c
+    while true; do
+      sysread -s1 c || return
+      # Avoid bias towards smaller numbers.
+      (( #c < 256 / $1 * $1 )) && break
+    done
+    typeset -g REPLY=$((#c % $1 + 1))
+  }
+
+  local REPLY chars
+
+  repeat ${1-1}; do
+    # Generate 6 pseudowords of the form cvccvc where c and v
+    # denote random consonants and vowels respectively.
+    local words=()
+    repeat 6; do
+      words+=('')
+      repeat 2; do
+        for chars in $consonants $vowels $consonants; do
+          -$0-rand $#chars || return
+          words[-1]+=$chars[REPLY]
+        done
+      done
+    done
+
+    local pwd=${(j:-:)words}
+
+    # Replace either the first or the last character in one of
+    # the words with a random digit.
+    -$0-rand $#digits || return
+    local digit=$digits[REPLY]
+    -$0-rand $((2 * $#words)) || return
+    pwd[REPLY/2*7+2*(REPLY%2)-1]=$digit
+
+    # Convert one lower-case character to upper case.
+    while true; do
+      -$0-rand $#pwd || return
+      [[ $vowels$consonants == *$pwd[REPLY]* ]] && break
+    done
+    # NOTE: We aren't using ${(U)c} here because its results are
+    # locale-dependent. For example, when upper-casing 'i' in Turkish
+    # locale we would get 'İ', a.k.a. latin capital letter i with dot
+    # above. We could set LC_CTYPE=C locally but then we would run afoul
+    # of this zsh bug: https://www.zsh.org/mla/workers/2020/msg00588.html.
+    local c=$pwd[REPLY]
+    printf -v c '%o' $((#c - 32))
+    printf "%s\\$c%s\\n" "$pwd[1,REPLY-1]" "$pwd[REPLY+1,-1]" || return
+  done
+} always {
+  unfunction -m -- "-${(b)0}-*"
+} </dev/urandom
diff --git a/plugins/genpass/genpass-monkey b/plugins/genpass/genpass-monkey
new file mode 100755
index 000000000..94ff5e131
--- /dev/null
+++ b/plugins/genpass/genpass-monkey
@@ -0,0 +1,32 @@
+#!/usr/bin/env zsh
+#
+# Usage: genpass-monkey [NUM]
+#
+# Generate a password made of 26 alphanumeric characters
+# with the security margin of at least 128 bits.
+#
+# Example password: nz5ej2kypkvcw0rn5cvhs6qxtm
+#
+# If given a numerical argument, generate that many passwords.
+
+emulate -L zsh -o no_unset -o warn_create_global -o warn_nested_var
+
+if [[ ARGC -gt 1 || ${1-1} != ${~:-<1-$((16#7FFFFFFF))>} ]]; then
+  print -ru2 -- "usage: $0 [NUM]"
+  return 1
+fi
+
+zmodload zsh/system || return
+
+{
+  local -r chars=abcdefghjkmnpqrstvwxyz0123456789
+  local c
+  repeat ${1-1}; do
+    repeat 26; do
+      sysread -s1 c || return
+      # There is uniform because $#chars divides 256.
+      print -rn -- $chars[#c%$#chars+1]
+    done
+    print
+  done
+} </dev/urandom
diff --git a/plugins/genpass/genpass-xkcd b/plugins/genpass/genpass-xkcd
new file mode 100755
index 000000000..a486ccb40
--- /dev/null
+++ b/plugins/genpass/genpass-xkcd
@@ -0,0 +1,68 @@
+#!/usr/bin/env zsh
+#
+# Usage: genpass-xkcd [NUM]
+#
+# Generate a password made of words from /usr/share/dict/words
+# with the security margin of at least 128 bits.
+#
+# Example password: 9-mien-flood-Patti-buxom-dozes-ickier-pay-ailed-Foster
+#
+# If given a numerical argument, generate that many passwords.
+#
+# The name of this utility is a reference to https://xkcd.com/936/.
+
+emulate -L zsh -o no_unset -o warn_create_global -o warn_nested_var -o extended_glob
+
+if [[ ARGC -gt 1 || ${1-1} != ${~:-<1-$((16#7FFFFFFF))>} ]]; then
+  print -ru2 -- "usage: $0 [NUM]"
+  return 1
+fi
+
+zmodload zsh/system zsh/mathfunc || return
+
+local -r dict=/usr/share/dict/words
+
+if [[ ! -e $dict ]]; then
+  print -ru2 -- "$0: file not found: $dict"
+  return 1
+fi
+
+# Read all dictionary words and leave only those made of 1-6 characters.
+local -a words
+words=(${(M)${(f)"$(<$dict)"}:#[a-zA-Z](#c1,6)}) || return
+
+if (( $#words < 2 )); then
+  print -ru2 -- "$0: not enough suitable words in $dict"
+  return 1
+fi
+
+if (( $#words > 16#7FFFFFFF )); then
+  print -ru2 -- "$0: too many words in $dict"
+  return 1
+fi
+
+# Figure out how many words we need for 128 bits of security margin.
+# Each word adds log2($#words) bits.
+local -i n=$((ceil(128. / log2($#words))))
+
+{
+  local c
+  repeat ${1-1}; do
+    print -rn -- $n
+    repeat $n; do
+      while true; do
+        # Generate a random number in [0, 2**31).
+        local -i rnd=0
+        repeat 4; do
+          sysread -s1 c || return
+          (( rnd = (~(1 << 23) & rnd) << 8 | #c ))
+        done
+        # Avoid bias towards words in the beginning of the list.
+        (( rnd < 16#7FFFFFFF / $#words * $#words )) || continue
+        print -rn -- -$words[rnd%$#words+1]
+        break
+      done
+    done
+    print
+  done
+} </dev/urandom
diff --git a/plugins/genpass/genpass.plugin.zsh b/plugins/genpass/genpass.plugin.zsh
index e6a1cef34..a0ea841cd 100644
--- a/plugins/genpass/genpass.plugin.zsh
+++ b/plugins/genpass/genpass.plugin.zsh
@@ -1,106 +1 @@
-autoload -U regexp-replace
-zmodload zsh/mathfunc
-
-genpass-apple() {
-  # Generates a 128-bit password of 6 pseudowords of 6 characters each
-  # EG, xudmec-4ambyj-tavric-mumpub-mydVop-bypjyp
-  # Can take a numerical argument for generating extra passwords
-  local -i i j num
-
-  [[ $1 =~ '^[0-9]+$' ]] && num=$1 || num=1
-
-  local consonants="$(LC_ALL=C tr -cd b-df-hj-np-tv-xz < /dev/urandom \
-    | head -c $((24*$num)))"
-  local vowels="$(LC_ALL=C tr -cd aeiouy < /dev/urandom | head -c $((12*$num)))"
-  local digits="$(LC_ALL=C tr -cd 0-9 < /dev/urandom | head -c $num)"
-
-  # The digit is placed on a pseudoword edge using $base36. IE, Dvccvc or cvccvD
-  local position="$(LC_ALL=C tr -cd 056bchinotuz < /dev/urandom | head -c $num)"
-  local -A base36=(0 0 1 1 2 2 3 3 4 4 5 5 6 6 7 7 8 8 9 9 a 10 b 11 c 12 d 13 \
-    e 14 f 15 g 16 h 17 i 18 j 19 k 20 l 21 m 22 n 23 o 24 p 25 q 26 r 27 s 28 \
-    t 29 u 30 v 31 w 32 x 33 y 34 z 35)
-
-  for i in {1..$num}; do
-    local pseudo=""
-
-    for j in {1..12}; do
-      # Uniformly iterate through $consonants and $vowels for each $i and $j
-      # Creates cvccvccvccvccvccvccvccvccvccvccvccvc for each $num
-      pseudo="${pseudo}${consonants:$((24*$i+2*${j}-26)):1}"
-      pseudo="${pseudo}${vowels:$((12*$i+${j}-13)):1}"
-      pseudo="${pseudo}${consonants:$((24*$i+2*${j}-25)):1}"
-    done
-
-    local -i digit_pos=${base36[${position[$i]}]}
-    local -i char_pos=$digit_pos
-
-    # The digit and uppercase character must be in different locations
-    while [[ $digit_pos == $char_pos ]]; do
-      char_pos=$base36[$(LC_ALL=C tr -cd 0-9a-z < /dev/urandom | head -c 1)]
-    done
-
-    # Places the digit on a pseudoword edge
-    regexp-replace pseudo "^(.{$digit_pos}).(.*)$" \
-      '${match[1]}${digits[$i]}${match[2]}'
-
-    # Uppercase a random character (that is not a digit)
-    regexp-replace pseudo "^(.{$char_pos})(.)(.*)$" \
-      '${match[1]}${(U)match[2]}${match[3]}'
-
-    # Hyphenate each 6-character pseudoword
-    regexp-replace pseudo '^(.{6})(.{6})(.{6})(.{6})(.{6})(.{6})$' \
-      '${match[1]}-${match[2]}-${match[3]}-${match[4]}-${match[5]}-${match[6]}'
-
-    printf "${pseudo}\n"
-  done
-}
-
-genpass-monkey() {
-  # Generates a 128-bit base32 password as if monkeys banged the keyboard
-  # EG, nz5ej2kypkvcw0rn5cvhs6qxtm
-  # Can take a numerical argument for generating extra passwords
-  local -i i num
-
-  [[ $1 =~ '^[0-9]+$' ]] && num=$1 || num=1
-
-  local pass=$(LC_ALL=C tr -cd '0-9a-hjkmnp-tv-z' < /dev/urandom \
-    | head -c $((26*$num)))
-
-  for i in {1..$num}; do
-    printf "${pass:$((26*($i-1))):26}\n"
-  done
-}
-
-genpass-xkcd() {
-  # Generates a 128-bit XKCD-style passphrase
-  # e.g, 9-mien-flood-Patti-buxom-dozes-ickier-pay-ailed-Foster
-  # Can take a numerical argument for generating extra passwords
-
-  if (( ! $+commands[shuf] )); then
-    echo >&2 "$0: \`shuf\` command not found. Install coreutils (\`brew install coreutils\` on macOS)."
-    return 1
-  fi
-
-  if [[ ! -e /usr/share/dict/words ]]; then
-    echo >&2 "$0: no wordlist found in \`/usr/share/dict/words\`. Install one first."
-    return 1
-  fi
-
-  local -i i num
-
-  [[ $1 =~ '^[0-9]+$' ]] && num=$1 || num=1
-
-  # Get all alphabetic words of at most 6 characters in length
-  local dict=$(LC_ALL=C grep -E '^[a-zA-Z]{1,6}$' /usr/share/dict/words)
-
-  # Calculate the base-2 entropy of each word in $dict
-  # Entropy is e = L * log2(C), where L is the length of the password (here,
-  # in words) and C the size of the character set (here, words in $dict).
-  # Solve for e = 128 bits of entropy. Recall: log2(n) = log(n)/log(2).
-  local -i n=$((int(ceil(128*log(2)/log(${(w)#dict})))))
-
-  for i in {1..$num}; do
-    printf "$n-"
-    printf "$dict" | shuf -n "$n" | paste -sd '-' -
-  done
-}
+autoload -Uz genpass-apple genpass-monkey genpass-xkcd

From e9991c6aa09ed5b0a2ac3eeb095364bc3c06953e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Fri, 25 Dec 2020 19:39:42 +0100
Subject: [PATCH 230/869] chore: update git-lfs maintainer handle

---
 .github/CODEOWNERS | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index b091f5d89..bdd680b47 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1,7 +1,7 @@
 # Plugin owners
 plugins/aws/                        @maksyms
 plugins/genpass/                    @atoponce
-plugins/git-lfs/                    @vietduc01100001
+plugins/git-lfs/                    @hellovietduc
 plugins/gitfast/                    @felipec
 plugins/sdk/                        @rgoldberg
 plugins/wp-cli/                     @joshmedeski

From 90ffda7ed28dd8273b80bd262c6a28be65e4da71 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Sun, 27 Dec 2020 20:51:39 +0100
Subject: [PATCH 231/869] fix(genpass): use `log()` instead of `log2()` for zsh
 < 5.6 (#9548)

Fixes #9548
---
 plugins/genpass/genpass-xkcd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/genpass/genpass-xkcd b/plugins/genpass/genpass-xkcd
index a486ccb40..ed0397138 100755
--- a/plugins/genpass/genpass-xkcd
+++ b/plugins/genpass/genpass-xkcd
@@ -43,7 +43,7 @@ fi
 
 # Figure out how many words we need for 128 bits of security margin.
 # Each word adds log2($#words) bits.
-local -i n=$((ceil(128. / log2($#words))))
+local -i n=$((ceil(128. / (log($#words) / log(2)))))
 
 {
   local c

From 4b2431e8b1c08a2dc14fe31bf07a5e5f08eaa87e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Mon, 28 Dec 2020 19:35:43 +0100
Subject: [PATCH 232/869] fix(updater): don't pipe changelog to less when
 updating

Fixes #9509
---
 tools/upgrade.sh | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/tools/upgrade.sh b/tools/upgrade.sh
index 4df7eb184..358242d0f 100755
--- a/tools/upgrade.sh
+++ b/tools/upgrade.sh
@@ -75,14 +75,10 @@ if git pull --rebase --stat origin master; then
 
     # Display changelog with less if available, otherwise just print it to the terminal
     if [[ "$1" = --interactive ]]; then
-      if (( $+commands[less] )); then
-        "$ZSH/tools/changelog.sh" HEAD "$last_commit" --text | LESS= command less -R
-      else
-        "$ZSH/tools/changelog.sh" HEAD "$last_commit"
-      fi
+      "$ZSH/tools/changelog.sh" HEAD "$last_commit"
     fi
 
-    printf "${BLUE}%s \`${BOLD}%s${RESET}${BLUE}\`${RESET}\n" "You can see the changelog again with" "omz changelog"
+    printf "${BLUE}%s \`${BOLD}%s${RESET}${BLUE}\`${RESET}\n" "You can see the changelog with" "omz changelog"
   fi
 
   printf '%s         %s__      %s           %s        %s       %s     %s__   %s\n' $RAINBOW $RESET

From a251233bec17829eb46825157258219474b79c5c Mon Sep 17 00:00:00 2001
From: "Josh E. Roberts" <josh@cenintage.com>
Date: Wed, 30 Dec 2020 13:56:56 -0500
Subject: [PATCH 233/869] fix(brew)!: update `bcubc` alias to use `brew upgrade
 --cask` (#9501)

BREAKING CHANGE: changes deprecated `brew cask reinstall $(...)` alias to use
`brew upgrade --cask` instead. If you don't have this command, run `brew update` to
get the latest Homebrew CLI version.

Co-authored-by: jakepez <jake@findjake.com>
---
 plugins/brew/README.md       | 22 +++++++++++-----------
 plugins/brew/brew.plugin.zsh |  2 +-
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/plugins/brew/README.md b/plugins/brew/README.md
index b714b7ac0..bf952bf01 100644
--- a/plugins/brew/README.md
+++ b/plugins/brew/README.md
@@ -10,17 +10,17 @@ plugins=(... brew)
 
 ## Aliases
 
-| Alias    | Command                                                       | Description                                                         |
-|----------|-------------------------------------------------------------  |---------------------------------------------------------------------|
-| `brewp`  | `brew pin`                                                    | Pin a specified formula so that it's not upgraded.                  |
-| `brews`  | `brew list -1`                                                | List installed formulae or the installed files for a given formula. |
-| `brewsp` | `brew list --pinned`                                          | List pinned formulae, or show the version of a given formula.       |
-| `bubo`   | `brew update && brew outdated`                                | Update Homebrew data, then list outdated formulae and casks.        |
-| `bubc`   | `brew upgrade && brew cleanup`                                | Upgrade outdated formulae and casks, then run cleanup.              |
-| `bubu`   | `bubo && bubc`                                                | Do the last two operations above.                                   |
-| `buf`    | `brew upgrade --formula`                                      | Upgrade only formulas (not casks).                                  |
-| `bcubo`  | `brew update && brew outdated --cask`                         | Update Homebrew data, then list outdated casks.                     |
-| `bcubc`  | `brew cask reinstall $(brew outdated --cask) && brew cleanup` | Update outdated casks, then run cleanup.                            |
+| Alias    | Command                               | Description                                                         |
+|----------|---------------------------------------|---------------------------------------------------------------------|
+| `brewp`  | `brew pin`                            | Pin a specified formula so that it's not upgraded.                  |
+| `brews`  | `brew list -1`                        | List installed formulae or the installed files for a given formula. |
+| `brewsp` | `brew list --pinned`                  | List pinned formulae, or show the version of a given formula.       |
+| `bubo`   | `brew update && brew outdated`        | Update Homebrew data, then list outdated formulae and casks.        |
+| `bubc`   | `brew upgrade && brew cleanup`        | Upgrade outdated formulae and casks, then run cleanup.              |
+| `bubu`   | `bubo && bubc`                        | Do the last two operations above.                                   |
+| `buf`    | `brew upgrade --formula`              | Upgrade only formulas (not casks).                                  |
+| `bcubo`  | `brew update && brew outdated --cask` | Update Homebrew data, then list outdated casks.                     |
+| `bcubc`  | `brew upgrade --cask && brew cleanup` | Update outdated casks, then run cleanup.                            |
 
 ## Completion
 
diff --git a/plugins/brew/brew.plugin.zsh b/plugins/brew/brew.plugin.zsh
index 30eb135bb..532dd9be7 100644
--- a/plugins/brew/brew.plugin.zsh
+++ b/plugins/brew/brew.plugin.zsh
@@ -6,4 +6,4 @@ alias bubc='brew upgrade && brew cleanup'
 alias bubu='bubo && bubc'
 alias buf='brew upgrade --formula'
 alias bcubo='brew update && brew outdated --cask'
-alias bcubc='brew cask reinstall $(brew outdated --cask) && brew cleanup'
+alias bcubc='brew upgrade --cask && brew cleanup'

From a4a79eaa8cdf39f35dcd1753b973e830ff7b00b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Wed, 30 Dec 2020 20:02:24 +0100
Subject: [PATCH 234/869] fix(changelog): remove CR characters in breaking
 change messages

The GitHub UI might not remove CR characters from commit description forms
filled from a Windows browser.
---
 tools/changelog.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tools/changelog.sh b/tools/changelog.sh
index 8753212e9..634b61d01 100755
--- a/tools/changelog.sh
+++ b/tools/changelog.sh
@@ -91,6 +91,8 @@ function parse-commit {
     if [[ "$body" =~ "BREAKING CHANGE: (.*)" || \
       "$subject" =~ '^[^ :\)]+\)?!: (.*)$' ]]; then
       message="${match[1]}"
+      # remove CR characters (might be inserted in GitHub UI commit description form)
+      message="${message//$'\r'/}"
       # skip next paragraphs (separated by two newlines or more)
       message="${message%%$'\n\n'*}"
       # ... and replace newlines with spaces

From 0e7c81316cab30d28d362f69ddc72be83029ac34 Mon Sep 17 00:00:00 2001
From: hjpotter92 <hjpotter92@users.noreply.github.com>
Date: Thu, 31 Dec 2020 15:37:28 +0530
Subject: [PATCH 235/869] feat(grc): source `grc.zsh` instead of hard-coding
 its content (#9553)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Marc Cornellà <marc.cornella@live.com>
---
 plugins/grc/README.md      | 28 +++-------------------
 plugins/grc/grc.plugin.zsh | 49 +++++++++-----------------------------
 2 files changed, 14 insertions(+), 63 deletions(-)

diff --git a/plugins/grc/README.md b/plugins/grc/README.md
index dfda41466..515e87640 100644
--- a/plugins/grc/README.md
+++ b/plugins/grc/README.md
@@ -10,28 +10,6 @@ plugins=(... grc)
 
 ## Commands
 
-The following commands are wrapped by `grc` so that their output is automatically colored:
-
-- `cc`
-- `configure`
-- `cvs`
-- `df`
-- `diff`
-- `dig`
-- `gcc`
-- `gmake`
-- `ifconfig`
-- `iwconfig`
-- `last`
-- `ldap`
-- `make`
-- `mount`
-- `mtr`
-- `netstat`
-- `ping`
-- `ping6`
-- `ps`
-- `traceroute`
-- `traceroute6`
-- `wdiff`
-- `whois`
+The plugin sources the bundled alias generator from the installation, available at `/etc/grc.zsh`.
+The complete list of wrapped commands may vary depending on the installed version of `grc`, look
+at the file mentioned above (`/etc/grc.zsh`) to see which commands are wrapped.
diff --git a/plugins/grc/grc.plugin.zsh b/plugins/grc/grc.plugin.zsh
index 6a52ec568..b709b9e02 100644
--- a/plugins/grc/grc.plugin.zsh
+++ b/plugins/grc/grc.plugin.zsh
@@ -1,44 +1,17 @@
-# Adapted from: https://github.com/garabik/grc/blob/master/grc.zsh
+#!/usr/bin/env zsh
 
-if [[ "$TERM" = dumb ]] || (( ! $+commands[grc] )); then
-  return
-fi
-
-# Supported commands
-cmds=(
-  cc
-  configure
-  cvs
-  df
-  diff
-  dig
-  gcc
-  gmake
-  ifconfig
-  iwconfig
-  last
-  ldap
-  make
-  mount
-  mtr
-  netstat
-  ping
-  ping6
-  ps
-  traceroute
-  traceroute6
-  wdiff
-  whois
+# common grc.zsh paths
+files=(
+  /etc/grc.zsh            # default
+  /usr/local/etc/grc.zsh  # homebrew
 )
 
-# Set alias for supported commands
-for cmd in $cmds; do
-  if (( $+commands[$cmd] )); then
-    eval "function $cmd {
-      grc --colour=auto \"${commands[$cmd]}\" \"\$@\"
-    }"
+# verify the file is readable and source it
+for file in $files; do
+  if [[ -r "$file" ]]; then
+    source "$file"
+    break
   fi
 done
 
-# Clean up variables
-unset cmds cmd
+unset file files

From 0f6836701d82a2ee024153c7f781bb72c2e9a8ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Thu, 31 Dec 2020 23:20:24 +0100
Subject: [PATCH 236/869] fix(CLI): properly get zsh command in `omz update`
 (#9558)

Zsh versions older than 5.3 don't have ZSH_ARGZERO, so use an alternative
method to get the zsh command.

Fixes #9558
---
 lib/cli.zsh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/cli.zsh b/lib/cli.zsh
index 92d447a8e..6fcffdf87 100644
--- a/lib/cli.zsh
+++ b/lib/cli.zsh
@@ -391,7 +391,9 @@ function _omz::update {
 
   # Restart the zsh session
   if [[ $ret -eq 0 && "$1" != --unattended ]]; then
+    # Old zsh versions don't have ZSH_ARGZERO
+    local zsh="${ZSH_ARGZERO:-${functrace[-1]%:*}}"
     # Check whether to run a login shell
-    [[ "$ZSH_ARGZERO" = -* ]] && exec -l "${ZSH_ARGZERO#-}" || exec "$ZSH_ARGZERO"
+    [[ "$zsh" = -* || -o login ]] && exec -l "${zsh#-}" || exec "$zsh"
   fi
 }

From 3d6db3261082d8f8c2c7dc7d5b94dbcc4ff0b00e Mon Sep 17 00:00:00 2001
From: YantaoZhao <zhytsh15@126.com>
Date: Fri, 1 Jan 2021 11:11:01 -0600
Subject: [PATCH 237/869] feat(docker): update completion to upstream version
 (#9470)

---
 plugins/docker/_docker | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/plugins/docker/_docker b/plugins/docker/_docker
index 10c19e233..7fe204313 100644
--- a/plugins/docker/_docker
+++ b/plugins/docker/_docker
@@ -624,7 +624,8 @@ __docker_container_subcommand() {
         "($help)--entrypoint=[Overwrite the default entrypoint of the image]:entry point: "
         "($help)*--env-file=[Read environment variables from a file]:environment file:_files"
         "($help)*--expose=[Expose a port from the container without publishing it]: "
-        "($help)*--group=[Set one or more supplementary user groups for the container]:group:_groups"
+        "($help)*--gpus=[GPU devices to add to the container ('all' to pass all GPUs)]:device: "
+        "($help)*--group-add=[Set one or more supplementary user groups for the container]:group:_groups"
         "($help -h --hostname)"{-h=,--hostname=}"[Container host name]:hostname:_hosts"
         "($help -i --interactive)"{-i,--interactive}"[Keep stdin open even if not attached]"
         "($help)--init[Run an init inside the container that forwards signals and reaps processes]"
@@ -750,6 +751,7 @@ __docker_container_subcommand() {
                 $opts_attach_exec_run_start \
                 "($help -d --detach)"{-d,--detach}"[Detached mode: leave the container running in the background]" \
                 "($help)*"{-e=,--env=}"[Set environment variables]:environment variable: " \
+                "($help)*--env-file=[Read environment variables from a file]:environment file:_files" \
                 "($help -i --interactive)"{-i,--interactive}"[Keep stdin open even if not attached]" \
                 "($help)--privileged[Give extended Linux capabilities to the command]" \
                 "($help -t --tty)"{-t,--tty}"[Allocate a pseudo-tty]" \
@@ -791,7 +793,7 @@ __docker_container_subcommand() {
                 "($help -f --follow)"{-f,--follow}"[Follow log output]" \
                 "($help -s --since)"{-s=,--since=}"[Show logs since this timestamp]:timestamp: " \
                 "($help -t --timestamps)"{-t,--timestamps}"[Show timestamps]" \
-                "($help)--tail=[Output the last K lines]:lines:(1 10 20 50 all)" \
+                "($help -n --tail)"{-n=,--tail=}"[Number of lines to show from the end of the logs]:lines:(1 10 20 50 all)" \
                 "($help -)*:containers:__docker_complete_containers" && ret=0
             ;;
         (ls|list)
@@ -1018,6 +1020,7 @@ __docker_image_subcommand() {
                 "($help)*--shm-size=[Size of '/dev/shm' (format is '<number><unit>')]:shm size: " \
                 "($help)--squash[Squash newly built layers into a single new layer]" \
                 "($help -t --tag)*"{-t=,--tag=}"[Repository, name and tag for the image]: :__docker_complete_repositories_with_tags" \
+                "($help)--target=[Set the target build stage to build.]" \
                 "($help)*--ulimit=[ulimit options]:ulimit: " \
                 "($help)--userns=[Container user namespace]:user namespace:(host)" \
                 "($help -):path or URL:_directories" && ret=0
@@ -1958,6 +1961,8 @@ __docker_service_subcommand() {
 
     opts_help=("(: -)--help[Print usage]")
     opts_create_update=(
+        "($help)*--cap-add=[Add Linux capabilities]:capability: "
+        "($help)*--cap-drop=[Drop Linux capabilities]:capability: "
         "($help)*--constraint=[Placement constraints]:constraint: "
         "($help)--endpoint-mode=[Placement constraints]:mode:(dnsrr vip)"
         "($help)*"{-e=,--env=}"[Set environment variables]:env: "
@@ -1970,6 +1975,7 @@ __docker_service_subcommand() {
         "($help)*--label=[Service labels]:label: "
         "($help)--limit-cpu=[Limit CPUs]:value: "
         "($help)--limit-memory=[Limit Memory]:value: "
+        "($help)--limit-pids[Limit maximum number of processes (default 0 = unlimited)]"
         "($help)--log-driver=[Logging driver for service]:logging driver:__docker_complete_log_drivers"
         "($help)*--log-opt=[Logging driver options]:log driver options:__docker_complete_log_options"
         "($help)*--mount=[Attach a filesystem mount to the service]:mount: "
@@ -2012,6 +2018,7 @@ __docker_service_subcommand() {
                 "($help)*--dns-option=[Set DNS options]:DNS option: " \
                 "($help)*--dns-search=[Set custom DNS search domains]:DNS search: " \
                 "($help)*--env-file=[Read environment variables from a file]:environment file:_files" \
+                "($help)*--group=[Set one or more supplementary user groups for the container]:group: _groups " \
                 "($help)--mode=[Service Mode]:mode:(global replicated)" \
                 "($help)--name=[Service name]:name: " \
                 "($help)*--placement-pref=[Add a placement preference]:pref:__docker_service_complete_placement_pref" \
@@ -2035,7 +2042,7 @@ __docker_service_subcommand() {
                 "($help)--no-task-ids[Do not include task IDs]" \
                 "($help)--no-trunc[Do not truncate output]" \
                 "($help)--since=[Show logs since timestamp]:timestamp: " \
-                "($help)--tail=[Number of lines to show from the end of the logs]:lines:(1 10 20 50 all)" \
+                "($help -n --tail)"{-n=,--tail=}"[Number of lines to show from the end of the logs]:lines:(1 10 20 50 all)" \
                 "($help -t --timestamps)"{-t,--timestamps}"[Show timestamps]" \
                 "($help -)1:service:__docker_complete_services" && ret=0
             ;;
@@ -2639,6 +2646,8 @@ __docker_subcommand() {
                 "($help)*--cluster-store-opt=[Cluster store options]:Cluster options:->cluster-store-options" \
                 "($help)--config-file=[Path to daemon configuration file]:Config File:_files" \
                 "($help)--containerd=[Path to containerd socket]:socket:_files -g \"*.sock\"" \
+                "($help)--containerd-namespace=[Containerd namespace to use]:containerd namespace:" \
+                "($help)--containerd-plugins-namespace=[Containerd namespace to use for plugins]:containerd namespace:" \
                 "($help)--data-root=[Root directory of persisted Docker data]:path:_directories" \
                 "($help -D --debug)"{-D,--debug}"[Enable debug mode]" \
                 "($help)--default-gateway[Container default gateway IPv4 address]:IPv4 address: " \

From 0f6aa0182c8d13a2ff909b650d790f83373dc412 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Peter=20Babi=C4=8D?= <babicpet@gmail.com>
Date: Fri, 15 May 2020 11:01:18 +0200
Subject: [PATCH 238/869] feat(git): add grst alias for `git restore --staged`
 (#8932)

Closes #8932
---
 plugins/git/README.md      | 1 +
 plugins/git/git.plugin.zsh | 1 +
 2 files changed, 2 insertions(+)

diff --git a/plugins/git/README.md b/plugins/git/README.md
index b7f216813..029386267 100644
--- a/plugins/git/README.md
+++ b/plugins/git/README.md
@@ -136,6 +136,7 @@ plugins=(... git)
 | grs                  | git restore                                                                                                                      |
 | grset                | git remote set-url                                                                                                               |
 | grss                 | git restore --source                                                                                                             |
+| grst                 | git restore --staged                                                                                                             |
 | grt                  | cd "$(git rev-parse --show-toplevel \|\| echo .)"                                                                                |
 | gru                  | git reset --                                                                                                                     |
 | grup                 | git remote update                                                                                                                |
diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index e32136f15..2f97dbc92 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -236,6 +236,7 @@ alias grrm='git remote remove'
 alias grs='git restore'
 alias grset='git remote set-url'
 alias grss='git restore --source'
+alias grst='git restore --staged'
 alias grt='cd "$(git rev-parse --show-toplevel || echo .)"'
 alias gru='git reset --'
 alias grup='git remote update'

From 88ffc2f6666fe1196ae57cc75b559b08e08cb616 Mon Sep 17 00:00:00 2001
From: Seamile <lanhuermao@gmail.com>
Date: Sat, 2 Jan 2021 18:57:06 +0800
Subject: [PATCH 239/869] fix(lib): mark changes as MODIFIED on 'MM' in
 `git_prompt_status` (#9552)

In the output of `git status -sb`, 'MM' indicates there are both added and modified changes.
This change marks that case as MODIFIED instead of ADDED.
---
 lib/git.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/git.zsh b/lib/git.zsh
index 157c85062..34ffc7ab7 100644
--- a/lib/git.zsh
+++ b/lib/git.zsh
@@ -170,7 +170,7 @@ function git_prompt_status() {
     '\?\? '     'UNTRACKED'
     'A  '       'ADDED'
     'M  '       'ADDED'
-    'MM '       'ADDED'
+    'MM '       'MODIFIED'
     ' M '       'MODIFIED'
     'AM '       'MODIFIED'
     ' T '       'MODIFIED'

From 4298e89b4b0a4090e2ff5a1e2014d5a6d04fc25c Mon Sep 17 00:00:00 2001
From: Paul Robert Lloyd <paulrobertlloyd@users.noreply.github.com>
Date: Sat, 2 Jan 2021 13:04:34 +0000
Subject: [PATCH 240/869] docs(nvm): clarify how to enable settings (#9542)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

It wasn’t clear where I should set the `NVM_AUTOLOAD` variable. The clue was to be found in [the docs for another plugin](https://github.com/ohmyzsh/ohmyzsh/tree/master/plugins/fzf). It seems setting values need to come before Oh My Zsh is sourced.

Updated read me to reflect this, and the fact that one of the settings mentioned is specific to nvm, not this plugin.
---
 plugins/nvm/README.md | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/plugins/nvm/README.md b/plugins/nvm/README.md
index 749a43403..700613085 100644
--- a/plugins/nvm/README.md
+++ b/plugins/nvm/README.md
@@ -11,9 +11,11 @@ plugins=(... nvm)
 
 ## Settings
 
-- **`NVM_DIR`**: if you have installed nvm in a directory other than `$HOME/.nvm`, set and export `NVM_DIR`
-  to be the directory where you installed nvm.
-  
+If you installed nvm in a directory other than `$HOME/.nvm`, set and export `NVM_DIR` to be the directory
+where you installed nvm.
+
+These settings should go in your zshrc file, before Oh My Zsh is sourced:
+
 - **`NVM_HOMEBREW`**: if you installed nvm via Homebrew, in a directory other than `/usr/local/opt/nvm`, you
   can set `NVM_HOMEBREW` to be the directory where you installed it.
 

From 98762faa0762e1f0ede05149c1f6b3a9db93e074 Mon Sep 17 00:00:00 2001
From: Robert Estelle <robertestelle@gmail.com>
Date: Sat, 2 Jan 2021 13:41:57 -0800
Subject: [PATCH 241/869] fix(vi-mode): control cursor, restore and use visual
 mode and speed up mode changes (#8004)

---
 plugins/vi-mode/vi-mode.plugin.zsh | 149 +++++++++++++++++++++++++----
 1 file changed, 130 insertions(+), 19 deletions(-)

diff --git a/plugins/vi-mode/vi-mode.plugin.zsh b/plugins/vi-mode/vi-mode.plugin.zsh
index c91ba05ba..7ff826ea3 100644
--- a/plugins/vi-mode/vi-mode.plugin.zsh
+++ b/plugins/vi-mode/vi-mode.plugin.zsh
@@ -1,33 +1,61 @@
+# Control whether to force a redraw on each mode change.
+#
+# Resetting the prompt on every mode change can cause lag when switching modes.
+# This is especially true if the prompt does things like checking git status.
+#
+# Set to "true" to force the prompt to reset on each mode change.
+# Set to "false" to force the prompt *not* to reset on each mode change.
+#
+# (The default is not to reset, unless we're showing the mode in RPS1).
+typeset -g VI_MODE_RESET_PROMPT_ON_MODE_CHANGE
+typeset -g VI_KEYMAP=main
+
+function _vi-mode-set-cursor-shape-for-keymap() {
+  # https://vt100.net/docs/vt510-rm/DECSCUSR
+  local _shape=0
+  case "${1:-${VI_KEYMAP:-main}}" in
+    main)    _shape=6 ;; # vi insert: line
+    viins)   _shape=6 ;; # vi insert: line
+    isearch) _shape=6 ;; # inc search: line
+    command) _shape=6 ;; # read a command name
+    vicmd)   _shape=2 ;; # vi cmd: block
+    visual)  _shape=2 ;; # vi visual mode: block
+    viopp)   _shape=0 ;; # vi operation pending: blinking block
+    *)       _shape=0 ;;
+  esac
+  printf $'\e[%d q' "${_shape}"
+}
+
 # Updates editor information when the keymap changes.
 function zle-keymap-select() {
   # update keymap variable for the prompt
-  VI_KEYMAP=$KEYMAP
+  typeset -g VI_KEYMAP=$KEYMAP
 
-  zle reset-prompt
-  zle -R
+  if [ "${VI_MODE_RESET_PROMPT_ON_MODE_CHANGE:-}" = true ]; then
+    zle reset-prompt
+    zle -R
+  fi
+  _vi-mode-set-cursor-shape-for-keymap "${VI_KEYMAP}"
 }
-
 zle -N zle-keymap-select
 
-function vi-accept-line() {
-  VI_KEYMAP=main
-  zle accept-line
+# These "echoti" statements were originally set in lib/key-bindings.zsh
+# Not sure the best way to extend without overriding.
+function zle-line-init() {
+  typeset -g VI_KEYMAP=main
+  (( ! ${+terminfo[smkx]} )) || echoti smkx
+  _vi-mode-set-cursor-shape-for-keymap "${VI_KEYMAP}"
 }
+zle -N zle-line-init
 
-zle -N vi-accept-line
-
+function zle-line-finish() {
+  (( ! ${+terminfo[rmkx]} )) || echoti rmkx
+  _vi-mode-set-cursor-shape-for-keymap default
+}
+zle -N zle-line-finish
 
 bindkey -v
 
-# use custom accept-line widget to update $VI_KEYMAP
-bindkey -M vicmd '^J' vi-accept-line
-bindkey -M vicmd '^M' vi-accept-line
-
-# allow v to edit the command line (standard behaviour)
-autoload -Uz edit-command-line
-zle -N edit-command-line
-bindkey -M vicmd 'v' edit-command-line
-
 # allow ctrl-p, ctrl-n for navigate history (standard behaviour)
 bindkey '^P' up-history
 bindkey '^N' down-history
@@ -45,12 +73,95 @@ bindkey '^s' history-incremental-search-forward
 bindkey '^a' beginning-of-line
 bindkey '^e' end-of-line
 
+if [[ "${terminfo[kpp]}" != "" ]]; then
+  bindkey "${terminfo[kpp]}" up-line-or-history       # [PageUp] - Up a line of history
+fi
+if [[ "${terminfo[knp]}" != "" ]]; then
+  bindkey "${terminfo[knp]}" down-line-or-history     # [PageDown] - Down a line of history
+fi
+
+# start typing + [Up-Arrow] - fuzzy find history forward
+if [[ "${terminfo[kcuu1]}" != "" ]]; then
+  autoload -U up-line-or-beginning-search
+  zle -N up-line-or-beginning-search
+  bindkey "${terminfo[kcuu1]}" up-line-or-beginning-search
+fi
+# start typing + [Down-Arrow] - fuzzy find history backward
+if [[ "${terminfo[kcud1]}" != "" ]]; then
+  autoload -U down-line-or-beginning-search
+  zle -N down-line-or-beginning-search
+  bindkey "${terminfo[kcud1]}" down-line-or-beginning-search
+fi
+
+if [[ "${terminfo[khome]}" != "" ]]; then
+  bindkey "${terminfo[khome]}" beginning-of-line      # [Home] - Go to beginning of line
+fi
+if [[ "${terminfo[kend]}" != "" ]]; then
+  bindkey "${terminfo[kend]}"  end-of-line            # [End] - Go to end of line
+fi
+
+if [[ "${terminfo[kcbt]}" != "" ]]; then
+  bindkey "${terminfo[kcbt]}" reverse-menu-complete   # [Shift-Tab] - move through the completion menu backwards
+fi
+
+bindkey '^?' backward-delete-char                     # [Backspace] - delete backward
+if [[ "${terminfo[kdch1]}" != "" ]]; then
+  bindkey "${terminfo[kdch1]}" delete-char            # [Delete] - delete forward
+else
+  bindkey "^[[3~" delete-char
+  bindkey "^[3;5~" delete-char
+  bindkey "\e[3~" delete-char
+fi
+
+() {
+  local wrap_clipboard_widgets
+  function wrap_clipboard_widgets() {
+    # NB: Assume we are the first wrapper and that we only wrap native widgets
+    # See zsh-autosuggestions.zsh for a more generic and more robust wrapper
+    local verb="$1"
+    shift
+
+    local widget
+    local wrapped_name
+    for widget in "$@"; do
+      wrapped_name="_zsh-vi-${verb}-${widget}"
+      if [ "${verb}" = copy ]; then
+        eval "
+          function ${wrapped_name}() {
+            zle .${widget}
+            printf %s \"\${CUTBUFFER}\" | clipcopy
+          }
+        "
+      else
+        eval "
+          function ${wrapped_name}() {
+            CUTBUFFER=\"\$(clippaste)\"
+            zle .${widget}
+          }
+        "
+      fi
+      zle -N "${widget}" "${wrapped_name}"
+    done
+  }
+
+  wrap_clipboard_widgets copy vi-yank vi-yank-eol vi-backward-kill-word vi-change-whole-line vi-delete
+  wrap_clipboard_widgets paste vi-put-{before,after}
+  unfunction wrap_clipboard_widgets
+}
+
 # if mode indicator wasn't setup by theme, define default
 if [[ "$MODE_INDICATOR" == "" ]]; then
-  MODE_INDICATOR="%{$fg_bold[red]%}<%{$fg[red]%}<<%{$reset_color%}"
+  MODE_INDICATOR='%B%F{red}<%b<<%f'
 fi
 
 function vi_mode_prompt_info() {
+  # If we're using the prompt to display mode info, and we haven't explicitly
+  # disabled "reset prompt on mode change", then set it here.
+  #
+  # We do that here instead of the `if` statement below because the user may
+  # set RPS1/RPROMPT to something else in their custom config.
+  : "${VI_MODE_RESET_PROMPT_ON_MODE_CHANGE:=true}"
+
   echo "${${VI_KEYMAP/vicmd/$MODE_INDICATOR}/(main|viins)/}"
 }
 

From 0e833b622ba43d38bd62227244d831f3c0e4a325 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Sat, 2 Jan 2021 23:59:55 +0100
Subject: [PATCH 242/869] refactor(vi-mode): remove duplicate bindkey logic and
 fix syntax

---
 plugins/vi-mode/vi-mode.plugin.zsh | 109 +++++++++--------------------
 1 file changed, 33 insertions(+), 76 deletions(-)

diff --git a/plugins/vi-mode/vi-mode.plugin.zsh b/plugins/vi-mode/vi-mode.plugin.zsh
index 7ff826ea3..f83ea7696 100644
--- a/plugins/vi-mode/vi-mode.plugin.zsh
+++ b/plugins/vi-mode/vi-mode.plugin.zsh
@@ -31,7 +31,7 @@ function zle-keymap-select() {
   # update keymap variable for the prompt
   typeset -g VI_KEYMAP=$KEYMAP
 
-  if [ "${VI_MODE_RESET_PROMPT_ON_MODE_CHANGE:-}" = true ]; then
+  if [[ "${VI_MODE_RESET_PROMPT_ON_MODE_CHANGE:-}" = true ]]; then
     zle reset-prompt
     zle -R
   fi
@@ -73,84 +73,41 @@ bindkey '^s' history-incremental-search-forward
 bindkey '^a' beginning-of-line
 bindkey '^e' end-of-line
 
-if [[ "${terminfo[kpp]}" != "" ]]; then
-  bindkey "${terminfo[kpp]}" up-line-or-history       # [PageUp] - Up a line of history
-fi
-if [[ "${terminfo[knp]}" != "" ]]; then
-  bindkey "${terminfo[knp]}" down-line-or-history     # [PageDown] - Down a line of history
-fi
+function wrap_clipboard_widgets() {
+  # NB: Assume we are the first wrapper and that we only wrap native widgets
+  # See zsh-autosuggestions.zsh for a more generic and more robust wrapper
+  local verb="$1"
+  shift
 
-# start typing + [Up-Arrow] - fuzzy find history forward
-if [[ "${terminfo[kcuu1]}" != "" ]]; then
-  autoload -U up-line-or-beginning-search
-  zle -N up-line-or-beginning-search
-  bindkey "${terminfo[kcuu1]}" up-line-or-beginning-search
-fi
-# start typing + [Down-Arrow] - fuzzy find history backward
-if [[ "${terminfo[kcud1]}" != "" ]]; then
-  autoload -U down-line-or-beginning-search
-  zle -N down-line-or-beginning-search
-  bindkey "${terminfo[kcud1]}" down-line-or-beginning-search
-fi
-
-if [[ "${terminfo[khome]}" != "" ]]; then
-  bindkey "${terminfo[khome]}" beginning-of-line      # [Home] - Go to beginning of line
-fi
-if [[ "${terminfo[kend]}" != "" ]]; then
-  bindkey "${terminfo[kend]}"  end-of-line            # [End] - Go to end of line
-fi
-
-if [[ "${terminfo[kcbt]}" != "" ]]; then
-  bindkey "${terminfo[kcbt]}" reverse-menu-complete   # [Shift-Tab] - move through the completion menu backwards
-fi
-
-bindkey '^?' backward-delete-char                     # [Backspace] - delete backward
-if [[ "${terminfo[kdch1]}" != "" ]]; then
-  bindkey "${terminfo[kdch1]}" delete-char            # [Delete] - delete forward
-else
-  bindkey "^[[3~" delete-char
-  bindkey "^[3;5~" delete-char
-  bindkey "\e[3~" delete-char
-fi
-
-() {
-  local wrap_clipboard_widgets
-  function wrap_clipboard_widgets() {
-    # NB: Assume we are the first wrapper and that we only wrap native widgets
-    # See zsh-autosuggestions.zsh for a more generic and more robust wrapper
-    local verb="$1"
-    shift
-
-    local widget
-    local wrapped_name
-    for widget in "$@"; do
-      wrapped_name="_zsh-vi-${verb}-${widget}"
-      if [ "${verb}" = copy ]; then
-        eval "
-          function ${wrapped_name}() {
-            zle .${widget}
-            printf %s \"\${CUTBUFFER}\" | clipcopy
-          }
-        "
-      else
-        eval "
-          function ${wrapped_name}() {
-            CUTBUFFER=\"\$(clippaste)\"
-            zle .${widget}
-          }
-        "
-      fi
-      zle -N "${widget}" "${wrapped_name}"
-    done
-  }
-
-  wrap_clipboard_widgets copy vi-yank vi-yank-eol vi-backward-kill-word vi-change-whole-line vi-delete
-  wrap_clipboard_widgets paste vi-put-{before,after}
-  unfunction wrap_clipboard_widgets
+  local widget
+  local wrapped_name
+  for widget in "$@"; do
+    wrapped_name="_zsh-vi-${verb}-${widget}"
+    if [ "${verb}" = copy ]; then
+      eval "
+        function ${wrapped_name}() {
+          zle .${widget}
+          printf %s \"\${CUTBUFFER}\" | clipcopy
+        }
+      "
+    else
+      eval "
+        function ${wrapped_name}() {
+          CUTBUFFER=\"\$(clippaste)\"
+          zle .${widget}
+        }
+      "
+    fi
+    zle -N "${widget}" "${wrapped_name}"
+  done
 }
 
+wrap_clipboard_widgets copy vi-yank vi-yank-eol vi-backward-kill-word vi-change-whole-line vi-delete
+wrap_clipboard_widgets paste vi-put-{before,after}
+unfunction wrap_clipboard_widgets
+
 # if mode indicator wasn't setup by theme, define default
-if [[ "$MODE_INDICATOR" == "" ]]; then
+if [[ -z "$MODE_INDICATOR" ]]; then
   MODE_INDICATOR='%B%F{red}<%b<<%f'
 fi
 
@@ -166,6 +123,6 @@ function vi_mode_prompt_info() {
 }
 
 # define right prompt, if it wasn't defined by a theme
-if [[ "$RPS1" == "" && "$RPROMPT" == "" ]]; then
+if [[ -z "$RPS1" && -z "$RPROMPT" ]]; then
   RPS1='$(vi_mode_prompt_info)'
 fi

From 9e5f280f87f2c127896c20edcdd8cd023b5b1893 Mon Sep 17 00:00:00 2001
From: Fernando Crespo <fernando82@gmail.com>
Date: Sun, 3 Jan 2021 09:55:57 -0300
Subject: [PATCH 243/869] feat(CLI): add `plugin info` subcommand (#9452)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Fernando Crespo <fxcrespo@iMac-44054.local>
Co-authored-by: Marc Cornellà <marc.cornella@live.com>
---
 lib/cli.zsh | 28 +++++++++++++++++++++++++++-
 1 file changed, 27 insertions(+), 1 deletion(-)

diff --git a/lib/cli.zsh b/lib/cli.zsh
index 6fcffdf87..86a0ed3c4 100644
--- a/lib/cli.zsh
+++ b/lib/cli.zsh
@@ -37,7 +37,7 @@ function _omz {
       changelog) local -a refs
         refs=("${(@f)$(command git for-each-ref --format="%(refname:short):%(subject)" refs/heads refs/tags)}")
         _describe 'command' refs ;;
-      plugin) subcmds=('list:List plugins')
+      plugin) subcmds=('info:Get plugin information' 'list:List plugins')
         _describe 'command' subcmds ;;
       pr) subcmds=('test:Test a Pull Request' 'clean:Delete all Pull Request branches')
         _describe 'command' subcmds ;;
@@ -46,6 +46,8 @@ function _omz {
     esac
   elif (( CURRENT == 4 )); then
     case "$words[2]::$words[3]" in
+      plugin::info) compadd "$ZSH"/plugins/*/README.md(.N:h:t) \
+        "$ZSH_CUSTOM"/plugins/*/README.md(.N:h:t) ;;
       theme::use) compadd "$ZSH"/themes/*.zsh-theme(.N:t:r) \
         "$ZSH_CUSTOM"/**/*.zsh-theme(.N:r:gs:"$ZSH_CUSTOM"/themes/:::gs:"$ZSH_CUSTOM"/:::) ;;
     esac
@@ -143,6 +145,7 @@ Usage: omz plugin <command> [options]
 
 Available commands:
 
+  info <plugin>   Get information of a plugin
   list            List all available Oh My Zsh plugins
 
 EOF
@@ -155,6 +158,29 @@ EOF
   _omz::plugin::$command "$@"
 }
 
+function _omz::plugin::info {
+  if [[ -z "$1" ]]; then
+    echo >&2 "Usage: omz plugin info <plugin>"
+    return 1
+  fi
+
+  local readme
+  for readme in "$ZSH_CUSTOM/plugins/$1/README.md" "$ZSH/plugins/$1/README.md"; do
+    if [[ -f "$readme" ]]; then
+      (( ${+commands[less]} )) && less "$readme" || cat "$readme"
+      return 0
+    fi
+  done
+
+  if [[ -d "$ZSH_CUSTOM/plugins/$1" || -d "$ZSH/plugins/$1" ]]; then
+    _omz::log error "the '$1' plugin doesn't have a README file"
+  else
+    _omz::log error "'$1' plugin not found"
+  fi
+
+  return 1
+}
+
 function _omz::plugin::list {
   local -a custom_plugins builtin_plugins
   custom_plugins=("$ZSH_CUSTOM"/plugins/*(-/N:t))

From 66e0438d4788d0a0cdc107b3975418f1a572e354 Mon Sep 17 00:00:00 2001
From: Gabriel Corral <cascadingstyletrees@users.noreply.github.com>
Date: Sun, 3 Jan 2021 06:58:52 -0600
Subject: [PATCH 244/869] fix(archlinux): update URL and key server in
 `pacmanallkeys` (#9569)

- Added follow redirects curl flag to fix the 301 response
- Updated trusted users URL format
- Changed from `pgp.mit.edu` keyserver to `keyserver.ubuntu.com` keyserver
---
 plugins/archlinux/archlinux.plugin.zsh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/archlinux/archlinux.plugin.zsh b/plugins/archlinux/archlinux.plugin.zsh
index c72e06dc2..32f09cef9 100644
--- a/plugins/archlinux/archlinux.plugin.zsh
+++ b/plugins/archlinux/archlinux.plugin.zsh
@@ -188,8 +188,8 @@ function pacdisowned() {
 }
 
 function pacmanallkeys() {
-  curl -s https://www.archlinux.org/people/{developers,trustedusers}/ | \
-    awk -F\" '(/pgp.mit.edu/) { sub(/.*search=0x/,""); print $1}' | \
+  curl -sL https://www.archlinux.org/people/{developers,trusted-users}/ | \
+    awk -F\" '(/keyserver.ubuntu.com/) { sub(/.*search=0x/,""); print $1}' | \
     xargs sudo pacman-key --recv-keys
 }
 

From 94ce46d48b901ed9e581ccad22d9192c25507acd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Mon, 4 Jan 2021 16:38:36 +0100
Subject: [PATCH 245/869] docs(vi-mode): revamp README and document settings

---
 plugins/vi-mode/README.md | 77 ++++++++++++++++++++++++++-------------
 1 file changed, 51 insertions(+), 26 deletions(-)

diff --git a/plugins/vi-mode/README.md b/plugins/vi-mode/README.md
index 8519a5592..fdf3ede73 100644
--- a/plugins/vi-mode/README.md
+++ b/plugins/vi-mode/README.md
@@ -1,34 +1,59 @@
-vi-mode
-=======
+# vi-mode plugin
+
 This plugin increase `vi-like` zsh functionality.
 
+To use it, add `vi-mode` to the plugins array in your zshrc file:
+
+```zsh
+plugins=(... vi-mode)
+```
+
+## Settings
+
+- `VI_MODE_RESET_PROMPT_ON_MODE_CHANGE`: controls whether the prompt is redrawn when
+  switching to a different input mode. If this is unset, the mode indicator will not
+  be updated when changing to a different mode.
+  Set it to `true` to enable it. For example:
+
+  ```zsh
+  VI_MODE_RESET_PROMPT_ON_MODE_CHANGE=true
+  ```
+
+  The default value is unset, unless `vi_mode_prompt_info` is used, in which case it'll
+  automatically be set to `true`.
+
+- `MODE_INDICATOR`: controls the string displayed when the shell is in normal mode.
+  See [Mode indicator](#mode-indicator) for details.
+
+## Mode indicator
+
+*Normal mode* is indicated with a red `<<<` mark at the right prompt, when it
+hasn't been defined by theme.
+
+You can change this indicator by setting the `MODE_INDICATOR` variable. This setting
+supports Prompt Expansion sequences. For example:
+
+```zsh
+MODE_INDICATOR="%F{yellow}+%f"
+```
+
+You can also use the `vi_mode_prompt_info` function in your prompt, which will display
+this mode indicator.
+
+## Key bindings
+
 Use `ESC` or `CTRL-[` to enter `Normal mode`.
 
+NOTE: some of these key bindings are set by zsh by default when using a vi-mode keymap.
 
-History
--------
+### History
 
 - `ctrl-p` : Previous command in history
 - `ctrl-n` : Next command in history
 - `/`      : Search backward in history
 - `n`      : Repeat the last `/`
 
-
-Mode indicators
----------------
-
-*Normal mode* is indicated with red `<<<` mark at the right prompt, when it
-wasn't defined by theme.
-
-
-Vim edition
------------
-
-- `v`   : Edit current command line in Vim
-
-
-Movement
---------
+### Movement
 
 - `$`   : To the end of the line
 - `^`   : To the first non-blank character of the line
@@ -46,9 +71,7 @@ Movement
 - `;`   : Repeat latest f, t, F or T [count] times
 - `,`   : Repeat latest f, t, F or T in opposite direction
 
-
-Insertion
----------
+### Insertion
 
 - `i`   : Insert text before the cursor
 - `I`   : Insert text before the first character in the line
@@ -57,9 +80,7 @@ Insertion
 - `o`   : Insert new command line below the current one
 - `O`   : Insert new command line above the current one
 
-
-Delete and Insert
------------------
+### Delete and Insert
 
 - `ctrl-h`      : While in *Insert mode*: delete character before the cursor
 - `ctrl-w`      : While in *Insert mode*: delete word before the cursor
@@ -73,3 +94,7 @@ Delete and Insert
 - `R`           : Enter replace mode: Each character replaces existing one
 - `x`           : Delete [count] characters under and after the cursor
 - `X`           : Delete [count] characters before the cursor
+
+### Removed key bindings
+
+- `v`   : Edit current command line in Vim

From 79980b00fb146437231c2a110ea49032b842c92c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Mon, 4 Jan 2021 16:41:59 +0100
Subject: [PATCH 246/869] fix(vi-mode): hide cursor-change logic behind
 `VI_MODE_SET_CURSOR` setting

Fixes #9570
---
 plugins/vi-mode/README.md          |  7 +++++++
 plugins/vi-mode/vi-mode.plugin.zsh | 12 ++++++++++--
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/plugins/vi-mode/README.md b/plugins/vi-mode/README.md
index fdf3ede73..41faf2de0 100644
--- a/plugins/vi-mode/README.md
+++ b/plugins/vi-mode/README.md
@@ -22,6 +22,13 @@ plugins=(... vi-mode)
   The default value is unset, unless `vi_mode_prompt_info` is used, in which case it'll
   automatically be set to `true`.
 
+- `VI_MODE_SET_CURSOR`: controls whether the cursor style is changed when switching
+  to a different input mode. Set it to `true` to enable it (default: unset):
+
+  ```zsh
+  VI_MODE_SET_CURSOR=true
+  ```
+
 - `MODE_INDICATOR`: controls the string displayed when the shell is in normal mode.
   See [Mode indicator](#mode-indicator) for details.
 
diff --git a/plugins/vi-mode/vi-mode.plugin.zsh b/plugins/vi-mode/vi-mode.plugin.zsh
index f83ea7696..e5b252d83 100644
--- a/plugins/vi-mode/vi-mode.plugin.zsh
+++ b/plugins/vi-mode/vi-mode.plugin.zsh
@@ -4,13 +4,21 @@
 # This is especially true if the prompt does things like checking git status.
 #
 # Set to "true" to force the prompt to reset on each mode change.
-# Set to "false" to force the prompt *not* to reset on each mode change.
+# Unset or set to any other value to do the opposite.
 #
-# (The default is not to reset, unless we're showing the mode in RPS1).
+# The default is not to reset, unless we're showing the mode in RPS1.
 typeset -g VI_MODE_RESET_PROMPT_ON_MODE_CHANGE
+# Control whether to change the cursor style on mode change.
+#
+# Set to "true" to change the cursor on each mode change.
+# Unset or set to any other value to do the opposite.
+typeset -g VI_MODE_SET_CURSOR
+
 typeset -g VI_KEYMAP=main
 
 function _vi-mode-set-cursor-shape-for-keymap() {
+  [[ "$VI_MODE_SET_CURSOR" = true ]] || return
+
   # https://vt100.net/docs/vt510-rm/DECSCUSR
   local _shape=0
   case "${1:-${VI_KEYMAP:-main}}" in

From 2118d35e017eb8c599f3c25863c8263aca307541 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Mon, 4 Jan 2021 21:41:11 +0100
Subject: [PATCH 247/869] fix(vi-mode)!: add back edit-command-line key binding
 as 'vv' (#9573)

BREAKING CHANGE: the key binding to open an editor to edit the command line has
been moved from being `v` (press v once) to being `vv` (press v twice). Now, the
action for `v` is the default `visual-mode`, as is in Vim.

Fixes #9573
---
 plugins/vi-mode/README.md          | 14 ++++++++------
 plugins/vi-mode/vi-mode.plugin.zsh |  5 +++++
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/plugins/vi-mode/README.md b/plugins/vi-mode/README.md
index 41faf2de0..b59d5f279 100644
--- a/plugins/vi-mode/README.md
+++ b/plugins/vi-mode/README.md
@@ -60,6 +60,12 @@ NOTE: some of these key bindings are set by zsh by default when using a vi-mode
 - `/`      : Search backward in history
 - `n`      : Repeat the last `/`
 
+### Vim edition
+
+- `vv`     : Edit current command line in Vim
+
+NOTE: this used to be bound to `v`. That is now the default (`visual-mode`)
+
 ### Movement
 
 - `$`   : To the end of the line
@@ -99,9 +105,5 @@ NOTE: some of these key bindings are set by zsh by default when using a vi-mode
 - `C`           : Delete to the end of the line and start insert
 - `r{char}`     : Replace the character under the cursor with {char}
 - `R`           : Enter replace mode: Each character replaces existing one
-- `x`           : Delete [count] characters under and after the cursor
-- `X`           : Delete [count] characters before the cursor
-
-### Removed key bindings
-
-- `v`   : Edit current command line in Vim
+- `x`           : Delete `count` characters under and after the cursor
+- `X`           : Delete `count` characters before the cursor
diff --git a/plugins/vi-mode/vi-mode.plugin.zsh b/plugins/vi-mode/vi-mode.plugin.zsh
index e5b252d83..0b11a6a7f 100644
--- a/plugins/vi-mode/vi-mode.plugin.zsh
+++ b/plugins/vi-mode/vi-mode.plugin.zsh
@@ -64,6 +64,11 @@ zle -N zle-line-finish
 
 bindkey -v
 
+# allow vv to edit the command line (standard behaviour)
+autoload -Uz edit-command-line
+zle -N edit-command-line
+bindkey -M vicmd 'vv' edit-command-line
+
 # allow ctrl-p, ctrl-n for navigate history (standard behaviour)
 bindkey '^P' up-history
 bindkey '^N' down-history

From 492f712df281e96d6d1aa9ebb53b1304284b19a0 Mon Sep 17 00:00:00 2001
From: Konfekt <Konfekt@users.noreply.github.com>
Date: Tue, 5 Jan 2021 18:53:29 +0100
Subject: [PATCH 248/869] feat(plugins): add `universalarchive` plugin to
 conveniently compress files (#6846)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Marc Cornellà <marc.cornella@live.com>
---
 plugins/universalarchive/README.md            | 46 ++++++++++++
 plugins/universalarchive/_universalarchive    |  6 ++
 .../universalarchive.plugin.zsh               | 70 +++++++++++++++++++
 3 files changed, 122 insertions(+)
 create mode 100644 plugins/universalarchive/README.md
 create mode 100644 plugins/universalarchive/_universalarchive
 create mode 100644 plugins/universalarchive/universalarchive.plugin.zsh

diff --git a/plugins/universalarchive/README.md b/plugins/universalarchive/README.md
new file mode 100644
index 000000000..93a1bd9fc
--- /dev/null
+++ b/plugins/universalarchive/README.md
@@ -0,0 +1,46 @@
+# universalarchive plugin
+
+Lets you compress files by a command `ua <format> <files>`, supporting various
+compression formats (e.g. 7z, tar.gz, lzma, ...).
+
+To enable it, add `universalarchive` to the plugins array in your zshrc file:
+
+```zsh
+plugins=(... universalarchive)
+```
+
+## Usage
+
+Run `ua <format> <files>` to compress `<files>` into an archive file using `<format>`.
+For example:
+
+```sh
+ua xz *.html
+```
+
+this command will compress all `.html` files in directory `folder` into `folder.xz`.
+
+This plugin saves you from having to remember which command line arguments compress a file.
+
+## Supported compression formats
+
+| Extension        | Description                    |
+|:-----------------|:-------------------------------|
+| `7z`             | 7zip file                      |
+| `bz2`            | Bzip2 file                     |
+| `gz`             | Gzip file                      |
+| `lzma`           | LZMA archive                   |
+| `lzo`            | LZO archive                    |
+| `rar`            | WinRAR archive                 |
+| `tar`            | Tarball                        |
+| `tbz`/`tar.bz2`  | Tarball with bzip2 compression |
+| `tgz`/`tar.gz`   | Tarball with gzip compression  |
+| `tlz`/`tar.lzma` | Tarball with lzma compression  |
+| `txz`/`tar.xz`   | Tarball with lzma2 compression |
+| `tZ`/`tar.Z`     | Tarball with LZW compression   |
+| `xz`             | LZMA2 archive                  |
+| `Z`              | Z archive (LZW)                |
+| `zip`            | Zip archive                    |
+| `zst`            | Zstd archive                   |
+
+See [list of archive formats](https://en.wikipedia.org/wiki/List_of_archive_formats) for more information regarding the archive formats.
diff --git a/plugins/universalarchive/_universalarchive b/plugins/universalarchive/_universalarchive
new file mode 100644
index 000000000..17cfd782e
--- /dev/null
+++ b/plugins/universalarchive/_universalarchive
@@ -0,0 +1,6 @@
+#compdef ua
+
+_arguments \
+  "1:archive format:(7z bz2 gz lzma lzo rar tar tar.bz2 tar.gz tar.lzma tar.xz tar.Z tbz tgz tlz txz tZ xz Z zip zst)" \
+  "*:input files:_files" \
+&& return 0
diff --git a/plugins/universalarchive/universalarchive.plugin.zsh b/plugins/universalarchive/universalarchive.plugin.zsh
new file mode 100644
index 000000000..5a661a5b0
--- /dev/null
+++ b/plugins/universalarchive/universalarchive.plugin.zsh
@@ -0,0 +1,70 @@
+function ua() {
+  local usage=\
+"Archive files and directories using a given compression algorithm.
+
+Usage:   $0 <format> <files>
+Example: $0 tbz PKGBUILD
+
+Supported archive formats are:
+7z, bz2, gz, lzma, lzo, rar, tar, tbz (tar.bz2), tgz (tar.gz),
+tlz (tar.lzma), txz (tar.xz), tZ (tar.Z), xz, Z, zip, and zst."
+
+  if [[ $# -lt 2 ]]; then
+    echo >&2 "$usage"
+    return 1
+  fi
+
+  local ext="$1"
+  local input="$(realpath "$2")"
+
+  shift
+
+  if [[ ! -e "$input" ]]; then
+    echo >&2 "$input not found"
+    return 1
+  fi
+
+  # generate output file name
+  local output
+  if [[ $# -gt 1 ]]; then
+    output="$(basename "${input%/*}")"
+  elif [[ -f "$input" ]]; then
+    output="$(basename "${input%.[^.]*}")"
+  elif [[ -d "$input" ]]; then
+    output="$(basename "${input}")"
+  fi
+
+  # if output file exists, generate a random name
+  if [[ -f "${output}.${ext}" ]]; then
+    output=$(mktemp "${output}_XXX") && rm "$output" || return 1
+  fi
+
+  # add extension
+  output="${output}.${ext}"
+
+  # safety check
+  if [[ -f "$output" ]]; then
+    echo >&2 "output file '$output' already exists. Aborting"
+    return 1
+  fi
+
+  case "$ext" in
+    7z)           7z u                        "${output}"   "${@}" ;;
+    bz2)          bzip2 -vcf                  "${@}" > "${output}" ;;
+    gz)           gzip -vcf                   "${@}" > "${output}" ;;
+    lzma)         lzma -vc -T0                "${@}" > "${output}" ;;
+    lzo)          lzop -vc                    "${@}" > "${output}" ;;
+    rar)          rar a                       "${output}"   "${@}" ;;
+    tar)          tar -cvf                    "${output}"   "${@}" ;;
+    tbz|tar.bz2)  tar -cvjf                   "${output}"   "${@}" ;;
+    tgz|tar.gz)   tar -cvzf                   "${output}"   "${@}" ;;
+    tlz|tar.lzma) XZ_OPT=-T0 tar --lzma -cvf  "${output}"   "${@}" ;;
+    txz|tar.xz)   XZ_OPT=-T0 tar -cvJf        "${output}"   "${@}" ;;
+    tZ|tar.Z)     tar -cvZf                   "${output}"   "${@}" ;;
+    xz)           xz -vc -T0                  "${@}" > "${output}" ;;
+    Z)            compress -vcf               "${@}" > "${output}" ;;
+    zip)          zip -rull                   "${output}"   "${@}" ;;
+    zst)          zstd -c -T0                 "${@}" > "${output}" ;;
+    *) echo >&2 "$usage"; return 1 ;;
+  esac
+}

From 64cb153084d2817f1c14691ffca1f23ebc3e8c48 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Tue, 5 Jan 2021 18:58:23 +0100
Subject: [PATCH 249/869] chore: add Konfekt as universalarchive maintainer

---
 .github/CODEOWNERS | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index bdd680b47..e307e4be8 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -4,4 +4,5 @@ plugins/genpass/                    @atoponce
 plugins/git-lfs/                    @hellovietduc
 plugins/gitfast/                    @felipec
 plugins/sdk/                        @rgoldberg
+plugins/universalarchive/           @Konfekt
 plugins/wp-cli/                     @joshmedeski

From 6b57839292025d17d97410d1627228f3ec730a62 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Tue, 5 Jan 2021 19:09:57 +0100
Subject: [PATCH 250/869] fix(CLI): show symlinked themes in `omz theme list`

---
 lib/cli.zsh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/cli.zsh b/lib/cli.zsh
index 86a0ed3c4..3346d3973 100644
--- a/lib/cli.zsh
+++ b/lib/cli.zsh
@@ -359,8 +359,8 @@ EOF
 
 function _omz::theme::list {
   local -a custom_themes builtin_themes
-  custom_themes=("$ZSH_CUSTOM"/**/*.zsh-theme(.N:r:gs:"$ZSH_CUSTOM"/themes/:::gs:"$ZSH_CUSTOM"/:::))
-  builtin_themes=("$ZSH"/themes/*.zsh-theme(.N:t:r))
+  custom_themes=("$ZSH_CUSTOM"/**/*.zsh-theme(-.N:r:gs:"$ZSH_CUSTOM"/themes/:::gs:"$ZSH_CUSTOM"/:::))
+  builtin_themes=("$ZSH"/themes/*.zsh-theme(-.N:t:r))
 
   # If the command is being piped, print all found line by line
   if [[ ! -t 1 ]]; then

From 86f805280f6a8cf65d8d0a9380489aae4b72f767 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Tue, 5 Jan 2021 19:17:27 +0100
Subject: [PATCH 251/869] fix(changelog): display scope in breaking change
 messages

---
 tools/changelog.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/changelog.sh b/tools/changelog.sh
index 634b61d01..7275db53a 100755
--- a/tools/changelog.sh
+++ b/tools/changelog.sh
@@ -286,7 +286,7 @@ function display-release {
 
     local hash subject
     for hash message in ${(kv)breaking}; do
-      echo " - $(fmt:hash) $(fmt:subject "${message}")"
+      echo " - $(fmt:hash) $(fmt:scope) $(fmt:subject "${message}")"
     done | sort
     echo
   }

From c9bf8b4a84d4ae392cf1bdd6a4a7c7c4f7710b92 Mon Sep 17 00:00:00 2001
From: Kyle Gerard Felker <felker@anl.gov>
Date: Thu, 7 Jan 2021 13:55:18 -0600
Subject: [PATCH 252/869] fix(lib): update Emacs terminal detection in `title`
 function (#9577)

Environment variable EMACS was replaced by INSIDE_EMACS
---
 lib/termsupport.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/termsupport.zsh b/lib/termsupport.zsh
index 778f12bca..33451ef1f 100644
--- a/lib/termsupport.zsh
+++ b/lib/termsupport.zsh
@@ -10,7 +10,7 @@ function title {
   emulate -L zsh
   setopt prompt_subst
 
-  [[ "$EMACS" == *term* ]] && return
+  [[ "$INSIDE_EMACS" == *term* ]] && return
 
   # if $2 is unset use $1 as default
   # if it is set and empty, leave it as is

From 3635d7cf7e300b5ba746c384fc3e87a35561e62d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Sun, 10 Jan 2021 17:22:52 +0100
Subject: [PATCH 253/869] fix(universalarchive): make plugin zsh-only to fix
 `realpath` not found error

Fixes #9586
---
 .../universalarchive/universalarchive.plugin.zsh | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/plugins/universalarchive/universalarchive.plugin.zsh b/plugins/universalarchive/universalarchive.plugin.zsh
index 5a661a5b0..b287c22b2 100644
--- a/plugins/universalarchive/universalarchive.plugin.zsh
+++ b/plugins/universalarchive/universalarchive.plugin.zsh
@@ -10,28 +10,28 @@ Supported archive formats are:
 tlz (tar.lzma), txz (tar.xz), tZ (tar.Z), xz, Z, zip, and zst."
 
   if [[ $# -lt 2 ]]; then
-    echo >&2 "$usage"
+    print -u2 -- "$usage"
     return 1
   fi
 
   local ext="$1"
-  local input="$(realpath "$2")"
+  local input="${2:a}"
 
   shift
 
   if [[ ! -e "$input" ]]; then
-    echo >&2 "$input not found"
+    print -u2 -- "$input not found"
     return 1
   fi
 
   # generate output file name
   local output
   if [[ $# -gt 1 ]]; then
-    output="$(basename "${input%/*}")"
+    output="${input:h:t}"
   elif [[ -f "$input" ]]; then
-    output="$(basename "${input%.[^.]*}")"
+    output="${input:r:t}"
   elif [[ -d "$input" ]]; then
-    output="$(basename "${input}")"
+    output="${input:t}"
   fi
 
   # if output file exists, generate a random name
@@ -44,7 +44,7 @@ tlz (tar.lzma), txz (tar.xz), tZ (tar.Z), xz, Z, zip, and zst."
 
   # safety check
   if [[ -f "$output" ]]; then
-    echo >&2 "output file '$output' already exists. Aborting"
+    print -u2 -- "output file '$output' already exists. Aborting"
     return 1
   fi
 
@@ -65,6 +65,6 @@ tlz (tar.lzma), txz (tar.xz), tZ (tar.Z), xz, Z, zip, and zst."
     Z)            compress -vcf               "${@}" > "${output}" ;;
     zip)          zip -rull                   "${output}"   "${@}" ;;
     zst)          zstd -c -T0                 "${@}" > "${output}" ;;
-    *) echo >&2 "$usage"; return 1 ;;
+    *) print -u2 -- "$usage"; return 1 ;;
   esac
 }

From 3d51d6307791cf49c2ef28f2c05a542e521d85d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Sun, 10 Jan 2021 20:43:32 +0100
Subject: [PATCH 254/869] fix(changelog): fix spacing in breaking changes
 message

---
 tools/changelog.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/changelog.sh b/tools/changelog.sh
index 7275db53a..836afef14 100755
--- a/tools/changelog.sh
+++ b/tools/changelog.sh
@@ -286,7 +286,7 @@ function display-release {
 
     local hash subject
     for hash message in ${(kv)breaking}; do
-      echo " - $(fmt:hash) $(fmt:scope) $(fmt:subject "${message}")"
+      echo " - $(fmt:hash) $(fmt:scope)$(fmt:subject "${message}")"
     done | sort
     echo
   }

From 6b8b6253d229357ebb759ea2f96dec30633acc6f Mon Sep 17 00:00:00 2001
From: TIT <sblohin@yandex.ru>
Date: Mon, 11 Jan 2021 21:53:12 +0300
Subject: [PATCH 255/869] fix(jake-node): support all Jakefile filenames in
 `jake` completion (#9589)

---
 plugins/jake-node/jake-node.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/jake-node/jake-node.plugin.zsh b/plugins/jake-node/jake-node.plugin.zsh
index 3b692f899..c2dad28af 100644
--- a/plugins/jake-node/jake-node.plugin.zsh
+++ b/plugins/jake-node/jake-node.plugin.zsh
@@ -6,7 +6,7 @@
 # Inspiration : https://weblog.rubyonrails.org/2006/3/9/fast-rake-task-completion-for-zsh
 
 function _jake () {
-  if [ -f Jakefile ]||[ -f jakefile ]; then
+  if [ -f Jakefile ] || [ -f jakefile ] || [ -f Jakefile.js ] || [ -f jakefile.js ]; then
     compadd `jake -T | cut -d " " -f 2 | sed -E "s/.\[([0-9]{1,2}(;[0-9]{1,2})?)?[m|K]//g"`
   fi
 }

From fae34b383d6432f7118c2ad082224f6d27d51221 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B8ren=20Nielsen?= <contact@cph.dev>
Date: Mon, 11 Jan 2021 20:26:37 +0100
Subject: [PATCH 256/869] feat(macports): add 'reclaim' to completion list for
 Macports (#9521)

The sub-command `reclaim` is quite useful for freeing up disk space.
`reclaim` is a useful command that is missing from the list of completions in the plugin.

The description is for the `reclaim` sub-command is:
"port reclaim will find files that can be removed to reclaim disk space by uninstalling inactive ports on your system as well as unnecessary unrequested ports, and removing unneeded or unused installation files. The user is then provided interactive options for files to remove. No files are removed initially, until the user selects them from the provided list."

For all the details use this command on a system with Macports installed:

`port help reclaim`
---
 plugins/macports/_port | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/macports/_port b/plugins/macports/_port
index 6a9ebe0c6..897598a46 100644
--- a/plugins/macports/_port
+++ b/plugins/macports/_port
@@ -43,6 +43,7 @@ subcmds=(
 'provides'
 'rdependents'
 'rdeps'
+'reclaim'
 'rpmpackage'
 'search'
 'selfupdate'

From 869eb2091389eabd919c32b2ca98ed1b0af851e6 Mon Sep 17 00:00:00 2001
From: wilkis <git@marv.one>
Date: Tue, 12 Jan 2021 20:40:27 +0100
Subject: [PATCH 257/869] feat(last-working-dir): log separate `lwd`s for
 different SSH keys on the same user account (#9534)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Marc Cornellà <hello@mcornella.com>
---
 plugins/last-working-dir/README.md            | 28 +++++++++++++++----
 .../last-working-dir.plugin.zsh               | 14 ++++++----
 2 files changed, 31 insertions(+), 11 deletions(-)

diff --git a/plugins/last-working-dir/README.md b/plugins/last-working-dir/README.md
index ced9e0370..b5cc55828 100644
--- a/plugins/last-working-dir/README.md
+++ b/plugins/last-working-dir/README.md
@@ -1,15 +1,33 @@
 # last-working-dir plugin
 
 Keeps track of the last used working directory and automatically jumps into it
-for new shells, unless:
+for new shells, unless the starting directory is not `$HOME`.
 
-- The plugin is already loaded.
-- The current `$PWD` is not `$HOME`.
-
-Also adds `lwd` function to jump to the last working directory.
+Also adds a `lwd` function to jump to the last working directory.
 
 To use it, add `last-working-dir` to the plugins array in your zshrc file:
 
 ```zsh
 plugins=(... last-working-dir)
 ```
+
+## Features
+
+### Use separate last-working-dir files with different SSH keys
+
+If the same user account is used by multiple users connecting via different SSH keys, you can
+configure SSH to map them to different `SSH_USER`s and the plugin will use separate lwd files
+for each one.
+
+Make sure that your SSH server allows environment variables. You can enable this feature
+within the `/etc/sshd/sshd_config` file:
+
+```
+PermitUserEnvironment yes
+```
+
+Then, add `environment="SSH_USER=<SSH_USERNAME>"` before the SSH keys in your `authorized_keys` file:
+
+```
+environment="SSH_USER=a.test@example.com" ssh-ed25519 AAAAC3Nz...
+```
diff --git a/plugins/last-working-dir/last-working-dir.plugin.zsh b/plugins/last-working-dir/last-working-dir.plugin.zsh
index fd21705ae..905a02a70 100644
--- a/plugins/last-working-dir/last-working-dir.plugin.zsh
+++ b/plugins/last-working-dir/last-working-dir.plugin.zsh
@@ -5,16 +5,18 @@ typeset -g ZSH_LAST_WORKING_DIRECTORY
 autoload -U add-zsh-hook
 add-zsh-hook chpwd chpwd_last_working_dir
 chpwd_last_working_dir() {
-	if [ "$ZSH_SUBSHELL" = 0 ]; then
-		local cache_file="$ZSH_CACHE_DIR/last-working-dir"
-		pwd >| "$cache_file"
-	fi
+  # Don't run in subshells
+  [[ "$ZSH_SUBSHELL" -eq 0 ]] || return 0
+  # Add ".$SSH_USER" suffix to cache file if $SSH_USER is set and non-empty
+  local cache_file="$ZSH_CACHE_DIR/last-working-dir${SSH_USER:+.$SSH_USER}"
+  pwd >| "$cache_file"
 }
 
 # Changes directory to the last working directory
 lwd() {
-	local cache_file="$ZSH_CACHE_DIR/last-working-dir"
-	[[ -r "$cache_file" ]] && cd "$(cat "$cache_file")"
+  # Add ".$SSH_USER" suffix to cache file if $SSH_USER is set and non-empty
+  local cache_file="$ZSH_CACHE_DIR/last-working-dir${SSH_USER:+.$SSH_USER}"
+  [[ -r "$cache_file" ]] && cd "$(cat "$cache_file")"
 }
 
 # Jump to last directory automatically unless:

From a3bdff694a388c9bede63afec3c4a0a78bffa1ba Mon Sep 17 00:00:00 2001
From: Ruslan Sayfutdinov <ruslan@sayfutdinov.com>
Date: Thu, 14 Jan 2021 17:26:40 +0000
Subject: [PATCH 258/869] fix(colorize): bypass less aliases in `colorize_less`
 (#9593)

---
 plugins/colorize/colorize.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/colorize/colorize.plugin.zsh b/plugins/colorize/colorize.plugin.zsh
index cb5ac36f5..8ea98f80a 100644
--- a/plugins/colorize/colorize.plugin.zsh
+++ b/plugins/colorize/colorize.plugin.zsh
@@ -96,7 +96,7 @@ colorize_less() {
         # which assumes that his LESSOPEN has been executed.
         local LESSCLOSE=""
 
-        LESS="$LESS" LESSOPEN="$LESSOPEN" LESSCLOSE="$LESSCLOSE" less "$@"
+        LESS="$LESS" LESSOPEN="$LESSOPEN" LESSCLOSE="$LESSCLOSE" command less "$@"
     }
 
     if [ -t 0 ]; then

From 5db205908e9b5c43b74106c313712200c08fa79c Mon Sep 17 00:00:00 2001
From: Suhas Karanth <sudo-suhas@users.noreply.github.com>
Date: Fri, 15 Jan 2021 21:19:46 +0530
Subject: [PATCH 259/869] chore: caution against `COMPLETION_WAITING_DOTS` in
 template (#8352)

---
 templates/zshrc.zsh-template | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/templates/zshrc.zsh-template b/templates/zshrc.zsh-template
index 307618104..65d5ea65b 100644
--- a/templates/zshrc.zsh-template
+++ b/templates/zshrc.zsh-template
@@ -45,6 +45,8 @@ ZSH_THEME="robbyrussell"
 # ENABLE_CORRECTION="true"
 
 # Uncomment the following line to display red dots whilst waiting for completion.
+# Caution: this setting can cause issues with multiline prompts (zsh 5.7.1 and newer seem to work)
+# See https://github.com/ohmyzsh/ohmyzsh/issues/5765
 # COMPLETION_WAITING_DOTS="true"
 
 # Uncomment the following line if you want to disable marking untracked files

From 63477411eb073ec3ddaa925f6e88bfa94db1e596 Mon Sep 17 00:00:00 2001
From: Arnaud Thimel <thimel@codelutin.com>
Date: Thu, 25 Feb 2016 16:29:51 +0100
Subject: [PATCH 260/869] feat(git-prompt): display untracked files count

Closes #8435
Closes #4880
---
 plugins/git-prompt/git-prompt.plugin.zsh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/git-prompt/git-prompt.plugin.zsh b/plugins/git-prompt/git-prompt.plugin.zsh
index da674af98..43a327ab0 100644
--- a/plugins/git-prompt/git-prompt.plugin.zsh
+++ b/plugins/git-prompt/git-prompt.plugin.zsh
@@ -63,7 +63,7 @@ git_super_status() {
           STATUS="$STATUS$ZSH_THEME_GIT_PROMPT_CHANGED$GIT_CHANGED%{${reset_color}%}"
       fi
       if [ "$GIT_UNTRACKED" -ne "0" ]; then
-          STATUS="$STATUS$ZSH_THEME_GIT_PROMPT_UNTRACKED%{${reset_color}%}"
+          STATUS="$STATUS$ZSH_THEME_GIT_PROMPT_UNTRACKED$GIT_UNTRACKED%{${reset_color}%}"
       fi
       if [ "$GIT_CHANGED" -eq "0" ] && [ "$GIT_CONFLICTS" -eq "0" ] && [ "$GIT_STAGED" -eq "0" ] && [ "$GIT_UNTRACKED" -eq "0" ]; then
           STATUS="$STATUS$ZSH_THEME_GIT_PROMPT_CLEAN"
@@ -83,7 +83,7 @@ ZSH_THEME_GIT_PROMPT_CONFLICTS="%{$fg[red]%}%{✖%G%}"
 ZSH_THEME_GIT_PROMPT_CHANGED="%{$fg[blue]%}%{✚%G%}"
 ZSH_THEME_GIT_PROMPT_BEHIND="%{↓%G%}"
 ZSH_THEME_GIT_PROMPT_AHEAD="%{↑%G%}"
-ZSH_THEME_GIT_PROMPT_UNTRACKED="%{…%G%}"
+ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$fg[cyan]%}%{…%G%}"
 ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg_bold[green]%}%{✔%G%}"
 
 # Set the prompt.

From 47c04d921ebb3fe4916eb131ae11557650aa1ae3 Mon Sep 17 00:00:00 2001
From: Arnaud Thimel <thimel@codelutin.com>
Date: Thu, 25 Feb 2016 16:36:31 +0100
Subject: [PATCH 261/869] feat(git-prompt): display stash count in prompt

---
 plugins/git-prompt/git-prompt.plugin.zsh |  8 +++++++-
 plugins/git-prompt/gitstatus.py          | 20 ++++++++++++++++++++
 2 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/plugins/git-prompt/git-prompt.plugin.zsh b/plugins/git-prompt/git-prompt.plugin.zsh
index 43a327ab0..a4c952471 100644
--- a/plugins/git-prompt/git-prompt.plugin.zsh
+++ b/plugins/git-prompt/git-prompt.plugin.zsh
@@ -40,6 +40,8 @@ function update_current_git_vars() {
     GIT_CONFLICTS=$__CURRENT_GIT_STATUS[5]
     GIT_CHANGED=$__CURRENT_GIT_STATUS[6]
     GIT_UNTRACKED=$__CURRENT_GIT_STATUS[7]
+    GIT_STASHED=$__CURRENT_GIT_STATUS[8]
+    GIT_CLEAN=$__CURRENT_GIT_STATUS[9]
 }
 
 git_super_status() {
@@ -65,7 +67,10 @@ git_super_status() {
       if [ "$GIT_UNTRACKED" -ne "0" ]; then
           STATUS="$STATUS$ZSH_THEME_GIT_PROMPT_UNTRACKED$GIT_UNTRACKED%{${reset_color}%}"
       fi
-      if [ "$GIT_CHANGED" -eq "0" ] && [ "$GIT_CONFLICTS" -eq "0" ] && [ "$GIT_STAGED" -eq "0" ] && [ "$GIT_UNTRACKED" -eq "0" ]; then
+      if [ "$GIT_STASHED" -ne "0" ]; then
+          STATUS="$STATUS$ZSH_THEME_GIT_PROMPT_STASHED$GIT_STASHED%{${reset_color}%}"
+      fi
+      if [ "$GIT_CLEAN" -eq "1" ]; then
           STATUS="$STATUS$ZSH_THEME_GIT_PROMPT_CLEAN"
       fi
       STATUS="$STATUS%{${reset_color}%}$ZSH_THEME_GIT_PROMPT_SUFFIX"
@@ -84,6 +89,7 @@ ZSH_THEME_GIT_PROMPT_CHANGED="%{$fg[blue]%}%{✚%G%}"
 ZSH_THEME_GIT_PROMPT_BEHIND="%{↓%G%}"
 ZSH_THEME_GIT_PROMPT_AHEAD="%{↑%G%}"
 ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$fg[cyan]%}%{…%G%}"
+ZSH_THEME_GIT_PROMPT_STASHED="%{$fg_bold[blue]%}%{⚑%G%}"
 ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg_bold[green]%}%{✔%G%}"
 
 # Set the prompt.
diff --git a/plugins/git-prompt/gitstatus.py b/plugins/git-prompt/gitstatus.py
index bf3173614..786274a71 100644
--- a/plugins/git-prompt/gitstatus.py
+++ b/plugins/git-prompt/gitstatus.py
@@ -23,6 +23,18 @@ def get_tagname_or_hash():
         return hash_
     return None
 
+# Re-use method from https://github.com/magicmonty/bash-git-prompt to get stashs count
+def get_stash():
+    cmd = Popen(['git', 'rev-parse', '--git-dir'], stdout=PIPE, stderr=PIPE)
+    so, se = cmd.communicate()
+    stash_file = '%s%s' % (so.decode('utf-8').rstrip(), '/logs/refs/stash')
+
+    try:
+        with open(stash_file) as f:
+            return sum(1 for _ in f)
+    except IOError:
+        return 0
+
 
 # `git status --porcelain --branch` can collect all information
 # branch, remote_branch, untracked, staged, changed, conflicts, ahead, behind
@@ -68,6 +80,12 @@ for st in status:
         elif st[0] != ' ':
             staged.append(st)
 
+stashed = get_stash()
+if not changed and not staged and not conflicts and not untracked and not stashed:
+    clean = 1
+else:
+    clean = 0
+
 out = ' '.join([
     branch,
     str(ahead),
@@ -76,5 +94,7 @@ out = ' '.join([
     str(len(conflicts)),
     str(len(changed)),
     str(len(untracked)),
+    str(stashed),
+    str(clean)
 ])
 print(out, end='')

From 8b37f817c29715873b91c8a8e7f883eccc240895 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Sat, 16 Jan 2021 18:59:24 +0100
Subject: [PATCH 262/869] fix(lib): use -N syntax in `head` and `tail` to
 support Solaris (#6391)

Closes #6391

Co-authored-by: Sergey Mashkov <cy6erGn0m@gmail.com>
---
 lib/functions.zsh | 2 +-
 lib/git.zsh       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/functions.zsh b/lib/functions.zsh
index 7beb62ad9..c4340f16c 100644
--- a/lib/functions.zsh
+++ b/lib/functions.zsh
@@ -1,7 +1,7 @@
 function zsh_stats() {
   fc -l 1 \
     | awk '{ CMD[$2]++; count++; } END { for (a in CMD) print CMD[a] " " CMD[a]*100/count "% " a }' \
-    | grep -v "./" | sort -nr | head -n20 | column -c3 -s " " -t | nl
+    | grep -v "./" | sort -nr | head -20 | column -c3 -s " " -t | nl
 }
 
 function uninstall_oh_my_zsh() {
diff --git a/lib/git.zsh b/lib/git.zsh
index 34ffc7ab7..c9363274c 100644
--- a/lib/git.zsh
+++ b/lib/git.zsh
@@ -51,7 +51,7 @@ function parse_git_dirty() {
         FLAGS+="--ignore-submodules=${GIT_STATUS_IGNORE_SUBMODULES:-dirty}"
         ;;
     esac
-    STATUS=$(__git_prompt_git status ${FLAGS} 2> /dev/null | tail -n1)
+    STATUS=$(__git_prompt_git status ${FLAGS} 2> /dev/null | tail -1)
   fi
   if [[ -n $STATUS ]]; then
     echo "$ZSH_THEME_GIT_PROMPT_DIRTY"

From f484f88b4208b6624af1d3572d31edabc73041bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Sat, 16 Jan 2021 19:58:29 +0100
Subject: [PATCH 263/869] fix(debian): add quotes to `kclean` alias (#3066)

Co-authored-by: la-magra <via.magra@gmail.com>
---
 plugins/debian/debian.plugin.zsh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/debian/debian.plugin.zsh b/plugins/debian/debian.plugin.zsh
index 68c6df1ae..108396784 100644
--- a/plugins/debian/debian.plugin.zsh
+++ b/plugins/debian/debian.plugin.zsh
@@ -66,7 +66,7 @@ if [[ $use_sudo -eq 1 ]]; then
     alias di="sudo dpkg -i"
 
     # Remove ALL kernel images and headers EXCEPT the one in use
-    alias kclean='sudo aptitude remove -P ?and(~i~nlinux-(ima|hea) ?not(~n$(uname -r)))'
+    alias kclean='sudo aptitude remove -P "?and(~i~nlinux-(ima|hea) ?not(~n$(uname -r)))"'
 
 
 # commands using su #########
@@ -105,7 +105,7 @@ else
     alias di='su -lc "dpkg -i" root'
 
     # Remove ALL kernel images and headers EXCEPT the one in use
-    alias kclean='su -lc "aptitude remove -P ?and(~i~nlinux-(ima|hea) ?not(~n$(uname -r)))" root'
+    alias kclean='su -lc "aptitude remove -P \"?and(~i~nlinux-(ima|hea) ?not(~n$(uname -r)))\"" root'
 fi
 
 # Completion ################################################################

From 6b0557afe84f671705029bf2a21002dfe9d07be5 Mon Sep 17 00:00:00 2001
From: deathjest3r <Death.Jester@web.de>
Date: Sat, 16 Jan 2021 21:27:32 +0100
Subject: [PATCH 264/869] feat(plugins): add `term_tab` plugin to complete
 other zsh sessions' directories (#3018)

---
 plugins/term_tab/README              | 16 +++++++++++
 plugins/term_tab/term_tab.plugin.zsh | 41 ++++++++++++++++++++++++++++
 2 files changed, 57 insertions(+)
 create mode 100644 plugins/term_tab/README
 create mode 100644 plugins/term_tab/term_tab.plugin.zsh

diff --git a/plugins/term_tab/README b/plugins/term_tab/README
new file mode 100644
index 000000000..316062e73
--- /dev/null
+++ b/plugins/term_tab/README
@@ -0,0 +1,16 @@
+
+term_tab - 'cwd' for all open zsh sessions
+******************************************
+
+What it does:
+*************
+This plugin allows to complete the 'cwd' of other Zsh sessions. Sounds
+complicated but is rather simple. E.g. if you have three zsh sessions open, in
+each session you are in a different folder, you can hit Ctrl+v in one session
+to show you the current working directory of the other open zsh sessions.
+
+How it works:
+*************
+* It uses 'pidof zsh' to determine all zsh PIDs
+* It reads procfs to get the current working directory of this session
+* Everything is fed into zsh's completion magic
diff --git a/plugins/term_tab/term_tab.plugin.zsh b/plugins/term_tab/term_tab.plugin.zsh
new file mode 100644
index 000000000..1b612df68
--- /dev/null
+++ b/plugins/term_tab/term_tab.plugin.zsh
@@ -0,0 +1,41 @@
+# Copyright (C) 2014 Julian Vetter <death.jester@web.de>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+
+function _term_list(){
+  local -a expl
+  local -au dirs
+
+  PREFIX="$IPREFIX$PREFIX"
+  IPREFIX=
+  SUFFIX="$SUFFIX$ISUFFIX"
+  ISUFFIX=
+
+  [[ -o magicequalsubst ]] && compset -P '*='
+
+  case $OSTYPE in
+    solaris*) dirs=( ${(M)${${(f)"$(pgrep -U $UID -x zsh|xargs pwdx)"}:#$$:*}%%/*} ) ;;
+    linux*) dirs=( /proc/${^$(pidof zsh):#$$}/cwd(N:A) ) ;;
+  esac
+  dirs=( ${(D)dirs} )
+
+  compstate[pattern_match]='*'
+  _wanted directories expl 'current directory from other shell' \
+      compadd -Q -M "r:|/=* r:|=*" -f -a dirs
+}
+
+zle -C term_list menu-complete _generic
+bindkey "^v" term_list
+zstyle ':completion:term_list::::' completer _term_list

From 53aefc52e27afaeca83546f12f1dcbb78d733149 Mon Sep 17 00:00:00 2001
From: bullno1 <thebullno1@gmail.com>
Date: Sun, 17 Aug 2014 17:22:06 +0800
Subject: [PATCH 265/869] feat(plugins): add `zbell` plugin to notify when
 commands end (#3034)

Closes #3034
---
 plugins/zbell/README.md        | 30 ++++++++++++
 plugins/zbell/zbell.plugin.zsh | 83 ++++++++++++++++++++++++++++++++++
 2 files changed, 113 insertions(+)
 create mode 100644 plugins/zbell/README.md
 create mode 100644 plugins/zbell/zbell.plugin.zsh

diff --git a/plugins/zbell/README.md b/plugins/zbell/README.md
new file mode 100644
index 000000000..1c1c13546
--- /dev/null
+++ b/plugins/zbell/README.md
@@ -0,0 +1,30 @@
+# zbell plugin
+
+This plugin prints a bell character when a command finishes if it has been
+running for longer than a specified duration.
+
+To use it, add `zbell` to the plugins array in your zshrc file:
+
+```zsh
+plugins=(... zbell)
+```
+
+## Settings
+
+These settings need to be set in your zshrc file, before Oh My Zsh is sourced.
+
+- `zbell_duration`: duration in seconds after which to consider notifying
+  the end of a command. Default: 15 seconds.
+
+- `zbell_ignore`: if there are programs that you know run long that you
+  don't want to bell after, then add them to the `zbell_ignore` array.
+  By default, `$EDITOR` and `$PAGER` are ignored:
+
+  ```zsh
+  zbell_ignore=($EDITOR $PAGER)
+  ```
+
+## Author
+
+Adapted from an original version by [Jean-Philippe Ouellet](https://github.com/jpouellet).
+Made available under the ISC license.
diff --git a/plugins/zbell/zbell.plugin.zsh b/plugins/zbell/zbell.plugin.zsh
new file mode 100644
index 000000000..6d0416502
--- /dev/null
+++ b/plugins/zbell/zbell.plugin.zsh
@@ -0,0 +1,83 @@
+#!/usr/bin/env zsh
+
+# This script prints a bell character when a command finishes
+# if it has been running for longer than $zbell_duration seconds.
+# If there are programs that you know run long that you don't
+# want to bell after, then add them to $zbell_ignore.
+#
+# This script uses only zsh builtins so its fast, there's no needless
+# forking, and its only dependency is zsh and its standard modules
+#
+# Written by Jean-Philippe Ouellet <jpo@vt.edu>
+# Made available under the ISC license.
+
+# only do this if we're in an interactive shell
+[[ -o interactive ]] || return
+
+# get $EPOCHSECONDS. builtins are faster than date(1)
+zmodload zsh/datetime || return
+
+# make sure we can register hooks
+autoload -Uz add-zsh-hook || return
+
+# make sure we can do regexp replace
+autoload -Uz regexp-replace || return
+
+# initialize zbell_duration if not set
+(( ${+zbell_duration} )) || zbell_duration=15
+
+# initialize zbell_ignore if not set
+(( ${+zbell_ignore} )) || zbell_ignore=($EDITOR $PAGER)
+
+# initialize it because otherwise we compare a date and an empty string
+# the first time we see the prompt. it's fine to have lastcmd empty on the
+# initial run because it evaluates to an empty string, and splitting an
+# empty string just results in an empty array.
+zbell_timestamp=$EPOCHSECONDS
+
+# default notification function
+# $1: command
+# $2: duration in seconds
+zbell_notify() {
+	type notify-send > /dev/null && \
+		notify-send -i terminal "Command completed in ${2}s:" $1
+	print -n "\a"
+}
+
+# right before we begin to execute something, store the time it started at
+zbell_begin() {
+	zbell_timestamp=$EPOCHSECONDS
+	zbell_lastcmd=$1
+}
+
+# when it finishes, if it's been running longer than $zbell_duration,
+# and we dont have an ignored command in the line, then print a bell.
+zbell_end() {
+	local cmd_duration=$(( $EPOCHSECONDS - $zbell_timestamp ))
+	local ran_long=$(( $cmd_duration >= $zbell_duration ))
+
+	local zbell_lastcmd_tmp="$zbell_lastcmd"
+	regexp-replace zbell_lastcmd_tmp '^sudo ' ''
+
+	[[ $zbell_last_timestamp == $zbell_timestamp ]] && return
+
+	[[ $zbell_lastcmd_tmp == "" ]] && return
+
+	zbell_last_timestamp=$zbell_timestamp
+
+	local has_ignored_cmd=0
+	for cmd in ${(s:;:)zbell_lastcmd_tmp//|/;}; do
+		words=(${(z)cmd})
+		util=${words[1]}
+		if (( ${zbell_ignore[(i)$util]} <= ${#zbell_ignore} )); then
+			has_ignored_cmd=1
+			break
+		fi
+	done
+
+	(( ! $has_ignored_cmd && ran_long )) && zbell_notify $zbell_lastcmd $cmd_duration
+}
+
+# register the functions as hooks
+add-zsh-hook preexec zbell_begin
+add-zsh-hook precmd zbell_end

From 172b32c90dadf09bcc1e9b562a68c1c282bf514e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20MB?= <essembeh@users.noreply.github.com>
Date: Sat, 16 Jan 2021 21:52:11 +0100
Subject: [PATCH 266/869] feat(essembeh): update theme with new features
 (#9595)

- single line
- quite simple by default: user@host:$PWD
- green for local shell as non root
- red for ssh shell as non root
- magenta for root sessions
- prefix with remote address for ssh shells
- prefix to detect docker containers or chroot
- git plugin to display current branch and status
---
 themes/essembeh.zsh-theme | 60 ++++++++++++++++++++++++++-------------
 1 file changed, 40 insertions(+), 20 deletions(-)

diff --git a/themes/essembeh.zsh-theme b/themes/essembeh.zsh-theme
index 939bb7a4c..f34f36f8a 100644
--- a/themes/essembeh.zsh-theme
+++ b/themes/essembeh.zsh-theme
@@ -1,24 +1,14 @@
-# Theme with full path names and hostname
-# Handy if you work on different servers all the time;
-
-local return_code="%(?..%{$fg_bold[red]%}%? ↵%{$reset_color%})"
-
-function my_git_prompt_info() {
-	ref=$(git symbolic-ref HEAD 2> /dev/null) || return
-	GIT_STATUS=$(git_prompt_status)
-	[[ -n $GIT_STATUS ]] && GIT_STATUS=" $GIT_STATUS"
-	echo "$ZSH_THEME_GIT_PROMPT_PREFIX${ref#refs/heads/}$GIT_STATUS$ZSH_THEME_GIT_PROMPT_SUFFIX"
-}
-
-# Colored prompt
-ZSH_THEME_COLOR_USER="green" 
-ZSH_THEME_COLOR_HOST="green" 
-ZSH_THEME_COLOR_PWD="yellow" 
-test -n "$SSH_CONNECTION" && ZSH_THEME_COLOR_USER="red" && ZSH_THEME_COLOR_HOST="red"
-test `id -u` = 0 && ZSH_THEME_COLOR_USER="magenta" && ZSH_THEME_COLOR_HOST="magenta"
-PROMPT='%{$fg_bold[$ZSH_THEME_COLOR_USER]%}%n@%{$fg_bold[$ZSH_THEME_COLOR_HOST]%}%M%{$reset_color%}:%{$fg_bold[$ZSH_THEME_COLOR_PWD]%}%~%{$reset_color%} $(my_git_prompt_info)%(!.#.$) '
-RPS1="${return_code}"
+# My custom theme:
+#   - single line
+#   - quite simple by default: user@host:$PWD
+#   - green for local shell as non root
+#   - red for ssh shell as non root
+#   - magenta for root sessions
+#   - prefix with remote address for ssh shells
+#   - prefix to detect docker containers or chroot
+#   - git plugin to display current branch and status
 
+# git plugin 
 ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[cyan]%}("
 ZSH_THEME_GIT_PROMPT_SUFFIX=") %{$reset_color%}"
 ZSH_THEME_GIT_PROMPT_UNTRACKED="%%"
@@ -28,3 +18,33 @@ ZSH_THEME_GIT_PROMPT_RENAMED="~"
 ZSH_THEME_GIT_PROMPT_DELETED="!"
 ZSH_THEME_GIT_PROMPT_UNMERGED="?"
 
+function zsh_essembeh_gitstatus {
+	ref=$(git symbolic-ref HEAD 2> /dev/null) || return
+	GIT_STATUS=$(git_prompt_status)
+	if [[ -n $GIT_STATUS ]]; then
+		GIT_STATUS=" $GIT_STATUS"
+	fi
+	echo "$ZSH_THEME_GIT_PROMPT_PREFIX${ref#refs/heads/}$GIT_STATUS$ZSH_THEME_GIT_PROMPT_SUFFIX"
+}
+
+# by default, use green for user@host and no prefix
+local ZSH_ESSEMBEH_COLOR="green"
+local ZSH_ESSEMBEH_PREFIX=""
+if [[ -n "$SSH_CONNECTION" ]]; then
+	# display the source address if connected via ssh
+	ZSH_ESSEMBEH_PREFIX="%{$fg[yellow]%}[$(echo $SSH_CONNECTION | awk '{print $1}')]%{$reset_color%} "
+	# use red color to highlight a remote connection
+	ZSH_ESSEMBEH_COLOR="red"
+elif [[ -r /etc/debian_chroot ]]; then 
+	# prefix prompt in case of chroot
+	ZSH_ESSEMBEH_PREFIX="%{$fg[yellow]%}[chroot:$(cat /etc/debian_chroot)]%{$reset_color%} "
+elif [[ -r /.dockerenv ]]; then
+	# also prefix prompt inside a docker contrainer
+	ZSH_ESSEMBEH_PREFIX="%{$fg[yellow]%}[docker]%{$reset_color%} "
+fi
+if [[ $UID = 0 ]]; then
+	# always use magenta for root sessions, even in ssh
+	ZSH_ESSEMBEH_COLOR="magenta"
+fi
+PROMPT='${ZSH_ESSEMBEH_PREFIX}%{$fg[$ZSH_ESSEMBEH_COLOR]%}%n@%M%{$reset_color%}:%{%B$fg[yellow]%}%~%{$reset_color%b%} $(zsh_essembeh_gitstatus)%(!.#.$) '
+RPROMPT="%(?..%{$fg[red]%}%?%{$reset_color%})"

From efcbd9f3480a28ec69c607c46adcbfd8d230ac9f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Sat, 16 Jan 2021 22:55:17 +0100
Subject: [PATCH 267/869] fix(vi-mode): ignore `clip*` function errors in yank
 and put widgets

Fixes #9605
---
 plugins/vi-mode/vi-mode.plugin.zsh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/vi-mode/vi-mode.plugin.zsh b/plugins/vi-mode/vi-mode.plugin.zsh
index 0b11a6a7f..7f14961ad 100644
--- a/plugins/vi-mode/vi-mode.plugin.zsh
+++ b/plugins/vi-mode/vi-mode.plugin.zsh
@@ -100,13 +100,13 @@ function wrap_clipboard_widgets() {
       eval "
         function ${wrapped_name}() {
           zle .${widget}
-          printf %s \"\${CUTBUFFER}\" | clipcopy
+          printf %s \"\${CUTBUFFER}\" | clipcopy 2>/dev/null || true
         }
       "
     else
       eval "
         function ${wrapped_name}() {
-          CUTBUFFER=\"\$(clippaste)\"
+          CUTBUFFER=\"\$(clippaste 2>/dev/null || echo \$CUTBUFFER)\"
           zle .${widget}
         }
       "

From cd4918c2cdb6613cf77ea8f6f29e1930bd7f4bf5 Mon Sep 17 00:00:00 2001
From: Robby Russell <robby@planetargon.com>
Date: Tue, 19 Jan 2021 16:48:57 -0800
Subject: [PATCH 268/869] Bump year to 2021

---
 LICENSE.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/LICENSE.txt b/LICENSE.txt
index 45ba85a37..becd6a7bd 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2009-2020 Robby Russell and contributors (https://github.com/ohmyzsh/ohmyzsh/contributors)
+Copyright (c) 2009-2021 Robby Russell and contributors (https://github.com/ohmyzsh/ohmyzsh/contributors)
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

From d978f385e52a19f2fd41e8c7ceb2f7c0a4dfc56c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Thu, 21 Jan 2021 11:52:09 +0100
Subject: [PATCH 269/869] fix(updater): refresh date of last update only on
 successful update

---
 tools/check_for_upgrade.sh | 4 +++-
 tools/upgrade.sh           | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/tools/check_for_upgrade.sh b/tools/check_for_upgrade.sh
index d0ceba92d..88e521eea 100644
--- a/tools/check_for_upgrade.sh
+++ b/tools/check_for_upgrade.sh
@@ -25,7 +25,9 @@ function update_last_updated_file() {
 
 function update_ohmyzsh() {
   ZSH="$ZSH" zsh -f "$ZSH/tools/upgrade.sh" --interactive
-  update_last_updated_file
+  if [[ "$?" = (0|80) ]]; then
+    update_last_updated_file
+  fi
 }
 
 () {
diff --git a/tools/upgrade.sh b/tools/upgrade.sh
index 358242d0f..4b97540d6 100755
--- a/tools/upgrade.sh
+++ b/tools/upgrade.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env zsh
 
 if [ -z "$ZSH_VERSION" ]; then
-  exec zsh "$0"
+  exec zsh "$0" "$@"
 fi
 
 cd "$ZSH"

From f75f8bb930c6c7aed5e4e7bded94936f6d9f7724 Mon Sep 17 00:00:00 2001
From: Aidin Gharibnavaz <aidin@aidinhut.com>
Date: Thu, 28 Jan 2021 05:28:04 +1300
Subject: [PATCH 270/869] =?UTF-8?q?docs(git-prompt):=20explain=20stashed?=
 =?UTF-8?q?=20icon=20(=E2=9A=91)=20(#9619)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Stashed icon was added in #4880
---
 plugins/git-prompt/README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/plugins/git-prompt/README.md b/plugins/git-prompt/README.md
index 83948f536..c6610fa94 100644
--- a/plugins/git-prompt/README.md
+++ b/plugins/git-prompt/README.md
@@ -24,6 +24,7 @@ The prompt may look like the following:
 - `(master|✖2✚3)`: on branch `master`, 2 conflicts, 3 files changed
 - `(experimental↓2↑3|✔)`: on branch `experimental`; your branch has diverged by 3 commits, remote by 2 commits; the repository is otherwise clean
 - `(:70c2952|✔)`: not on any branch; parent commit has hash `70c2952`; the repository is otherwise clean
+- `(master|⚑2)`: on branch `master`, there are 2 stashed changes
 
 ## Prompt Structure
 
@@ -43,6 +44,7 @@ The symbols are as follows:
 | ●n     | there are `n` staged files     |
 | ✖n     | there are `n` unmerged files   |
 | ✚n     | there are `n` unstaged files   |
+| ⚑n     | there are `n` stashed changes  |
 | …      | there are some untracked files |
 
 ### Branch Tracking Symbols

From c52e646bb7b109e15f6dc4047b29ca8c8e029433 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Sun, 31 Jan 2021 19:55:13 +0100
Subject: [PATCH 271/869] refactor(gallois): clean up theme and fix typos

---
 themes/gallois.zsh-theme | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/themes/gallois.zsh-theme b/themes/gallois.zsh-theme
index e6c2d8142..bb97bfb17 100644
--- a/themes/gallois.zsh-theme
+++ b/themes/gallois.zsh-theme
@@ -1,16 +1,18 @@
 # Depends on the git plugin for work_in_progress()
+(( $+functions[work_in_progress] )) || work_in_progress() {}
 
 ZSH_THEME_GIT_PROMPT_PREFIX="%{$reset_color%}%{$fg[green]%}["
 ZSH_THEME_GIT_PROMPT_SUFFIX="]%{$reset_color%}"
 ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[red]%}*%{$reset_color%}"
 ZSH_THEME_GIT_PROMPT_CLEAN=""
 
-#Customized git status, oh-my-zsh currently does not allow render dirty status before branch
+# Customized git status, oh-my-zsh currently does not allow render dirty status before branch
 git_custom_status() {
-  local cb=$(git_current_branch)
-  if [ -n "$cb" ]; then
-    echo "$(parse_git_dirty)%{$fg_bold[yellow]%}$(work_in_progress)%{$reset_color%}$ZSH_THEME_GIT_PROMPT_PREFIX$(git_current_branch)$ZSH_THEME_GIT_PROMPT_SUFFIX"
-  fi
+  local branch=$(git_current_branch)
+  [[ -n "$branch" ]] || return 0
+  echo "$(parse_git_dirty)\
+%{${fg_bold[yellow]}%}$(work_in_progress)%{$reset_color%}\
+${ZSH_THEME_GIT_PROMPT_PREFIX}${branch}${ZSH_THEME_GIT_PROMPT_SUFFIX}"
 }
 
 # RVM component of prompt
@@ -18,6 +20,5 @@ ZSH_THEME_RUBY_PROMPT_PREFIX="%{$fg[red]%}["
 ZSH_THEME_RUBY_PROMPT_SUFFIX="]%{$reset_color%}"
 
 # Combine it all into a final right-side prompt
-RPS1='$(git_custom_status)$(ruby_prompt_info) $EPS1'
-
+RPS1="\$(git_custom_status)\$(ruby_prompt_info)${RPS1:+ $RPS1}"
 PROMPT='%{$fg[cyan]%}[%~% ]%(?.%{$fg[green]%}.%{$fg[red]%})%B$%b '

From f21e646ce6c09198f7f625c597f08af49551fdb0 Mon Sep 17 00:00:00 2001
From: iammordaty <iammordaty@users.noreply.github.com>
Date: Tue, 9 Feb 2021 15:00:10 +0100
Subject: [PATCH 272/869] refactor(git-flow): remove duplicate `gflfp` alias
 (#9640)

Fixes #9638
---
 plugins/git-flow/git-flow.plugin.zsh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/plugins/git-flow/git-flow.plugin.zsh b/plugins/git-flow/git-flow.plugin.zsh
index eab969d8a..916cd5693 100644
--- a/plugins/git-flow/git-flow.plugin.zsh
+++ b/plugins/git-flow/git-flow.plugin.zsh
@@ -36,7 +36,6 @@ alias gflff='git flow feature finish'
 alias gflfp='git flow feature publish'
 alias gflhf='git flow hotfix finish'
 alias gflrf='git flow release finish'
-alias gflfp='git flow feature publish'
 alias gflhp='git flow hotfix publish'
 alias gflrp='git flow release publish'
 alias gflfpll='git flow feature pull'

From 7a8d89688d080de28acf94fe995694f911e96c73 Mon Sep 17 00:00:00 2001
From: Kartikey Tanna <tannakartikey@gmail.com>
Date: Sun, 21 Feb 2021 11:54:21 +0530
Subject: [PATCH 273/869] Replce 'rake routes' task with 'rails rotues' (#9662)

* Replce 'rake routes' task with 'rails rotues'

Fixes https://github.com/ohmyzsh/ohmyzsh/issues/9661

* Modified 'rake routes|grep' to use rails
---
 plugins/rails/rails.plugin.zsh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/rails/rails.plugin.zsh b/plugins/rails/rails.plugin.zsh
index 1fd5f0f86..5b0be4f85 100644
--- a/plugins/rails/rails.plugin.zsh
+++ b/plugins/rails/rails.plugin.zsh
@@ -46,6 +46,8 @@ alias rdb='rails dbconsole'
 alias rgen='rails generate'
 alias rgm='rails generate migration'
 alias rp='rails plugin'
+alias rr='rails routes'
+alias rrg='rails routes | grep'
 alias ru='rails runner'
 alias rs='rails server'
 alias rsd='rails server --debugger'
@@ -65,8 +67,6 @@ alias rdmtc='rake db:migrate db:test:clone'
 alias rdsl='rake db:schema:load'
 alias rlc='rake log:clear'
 alias rn='rake notes'
-alias rr='rake routes'
-alias rrg='rake routes | grep'
 alias rt='rake test'
 alias rmd='rake middleware'
 alias rsts='rake stats'

From 27bf8318432c46c34743b6b67a5a3e145f1b3e83 Mon Sep 17 00:00:00 2001
From: Vikas Raj <vikasraj1911@gmail.com>
Date: Sun, 21 Feb 2021 11:57:27 +0530
Subject: [PATCH 274/869] [docker-compose] Added alias for docker-compose up
 --build (#8843)

* [docker-compose] Added alias for docker-compose up --build

Sometimes building images before starting the containers comes in handy.

Alias: `dcupb`
Command: `docker-compose up --build`

* Updated docker-compose/README.md

Added the alias definition in the readme

Co-authored-by: Robby Russell <robby@planetargon.com>
---
 plugins/docker-compose/README.md              | 37 ++++++++++---------
 .../docker-compose/docker-compose.plugin.zsh  |  1 +
 2 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/plugins/docker-compose/README.md b/plugins/docker-compose/README.md
index a81c2c78e..13f3c2cea 100644
--- a/plugins/docker-compose/README.md
+++ b/plugins/docker-compose/README.md
@@ -11,21 +11,22 @@ plugins=(... docker-compose)
 
 ## Aliases
 
-| Alias     | Command                  | Description                                                      |
-|-----------|--------------------------|------------------------------------------------------------------|
-| dco       | `docker-compose`         | Docker-compose main command                                      |
-| dcb       | `docker-compose build`   | Build containers                                                 |
-| dce       | `docker-compose exec`    | Execute command inside a container                               |
-| dcps      | `docker-compose ps`      | List containers                                                  |
-| dcrestart | `docker-compose restart` | Restart container                                                |
-| dcrm      | `docker-compose rm`      | Remove container                                                 |
-| dcr       | `docker-compose run`     | Run a command in container                                       |
-| dcstop    | `docker-compose stop`    | Stop a container                                                 |
-| dcup      | `docker-compose up`      | Build, (re)create, start, and attach to containers for a service |
-| dcupd     | `docker-compose up -d`   | Same as `dcup`, but starts as daemon                             |
-| dcdn      | `docker-compose down`    | Stop and remove containers                                       |
-| dcl       | `docker-compose logs`    | Show logs of container                                           |
-| dclf      | `docker-compose logs -f` | Show logs and follow output                                      |
-| dcpull    | `docker-compose pull`    | Pull image of a service                                          |
-| dcstart   | `docker-compose start`   | Start a container                                                |
-| dck       | `docker-compose kill`    | Kills containers                                                 |
+| Alias     | Command                        | Description                                                      |
+|-----------|--------------------------------|------------------------------------------------------------------|
+| dco       | `docker-compose`               | Docker-compose main command                                      |
+| dcb       | `docker-compose build`         | Build containers                                                 |
+| dce       | `docker-compose exec`          | Execute command inside a container                               |
+| dcps      | `docker-compose ps`            | List containers                                                  |
+| dcrestart | `docker-compose restart`       | Restart container                                                |
+| dcrm      | `docker-compose rm`            | Remove container                                                 |
+| dcr       | `docker-compose run`           | Run a command in container                                       |
+| dcstop    | `docker-compose stop`          | Stop a container                                                 |
+| dcup      | `docker-compose up`            | Build, (re)create, start, and attach to containers for a service |
+| dcupb     | `docker-compose up --build`    | Same as `dcup`, but build images before starting containers      |
+| dcupd     | `docker-compose up -d`         | Same as `dcup`, but starts as daemon                             |
+| dcdn      | `docker-compose down`          | Stop and remove containers                                       |
+| dcl       | `docker-compose logs`          | Show logs of container                                           |
+| dclf      | `docker-compose logs -f`       | Show logs and follow output                                      |
+| dcpull    | `docker-compose pull`          | Pull image of a service                                          |
+| dcstart   | `docker-compose start`         | Start a container                                                |
+| dck       | `docker-compose kill`          | Kills containers                                                 |
diff --git a/plugins/docker-compose/docker-compose.plugin.zsh b/plugins/docker-compose/docker-compose.plugin.zsh
index 5b25b63b9..85e03d343 100644
--- a/plugins/docker-compose/docker-compose.plugin.zsh
+++ b/plugins/docker-compose/docker-compose.plugin.zsh
@@ -18,6 +18,7 @@ alias dcrm='docker-compose rm'
 alias dcr='docker-compose run'
 alias dcstop='docker-compose stop'
 alias dcup='docker-compose up'
+alias dcupb='docker-compose up --build'
 alias dcupd='docker-compose up -d'
 alias dcdn='docker-compose down'
 alias dcl='docker-compose logs'

From 9a9f3831925432fdf4352c24a002506a06d329c1 Mon Sep 17 00:00:00 2001
From: Gustavo Bazan <gus.bazan@hey.com>
Date: Sun, 21 Feb 2021 06:29:54 +0000
Subject: [PATCH 275/869] feat: add mongocli plugin (#9248)

---
 plugins/mongocli/README.md           | 19 +++++++++++++++++++
 plugins/mongocli/mongocli.plugin.zsh |  4 ++++
 2 files changed, 23 insertions(+)
 create mode 100644 plugins/mongocli/README.md
 create mode 100644 plugins/mongocli/mongocli.plugin.zsh

diff --git a/plugins/mongocli/README.md b/plugins/mongocli/README.md
new file mode 100644
index 000000000..e245f2a4a
--- /dev/null
+++ b/plugins/mongocli/README.md
@@ -0,0 +1,19 @@
+# mongocli plugin
+
+The plugin adds several aliases for common [mongocli](https://docs.mongodb.com/mongocli/stable/) commands.
+
+To use it, add `mongocli` to the plugins array of your zshrc file:
+
+```zsh
+plugins=(... mongocli)
+```
+
+## Aliases
+
+| Alias    | Command                                                     | Description                                            |
+|----------|-------------------------------------------------------------|--------------------------------------------------------|
+| `ma`     | `mongocli atlas`                                            | Shortcut for mongocli Atlas commands.                  |
+| `mcm`    | `mongocli cloud-manager`                                    | Shortcut for mongocli Cloud Manager commands.          |
+| `mom`    | `mongocli ops-manager`                                      | Shortcut for mongocli Cloud Manager commands.          |
+| `miam`   | `mongocli iam`                                              | Shortcut for mongocli IAM commands.                    |
+
diff --git a/plugins/mongocli/mongocli.plugin.zsh b/plugins/mongocli/mongocli.plugin.zsh
new file mode 100644
index 000000000..0ca877e61
--- /dev/null
+++ b/plugins/mongocli/mongocli.plugin.zsh
@@ -0,0 +1,4 @@
+alias ma='mongocli atlas'
+alias mcm='mongocli cloud-manager'
+alias mom='mongocli ops-manager'
+alias miam='mongocli iam'

From 6fbad5bf72fad4ecf30ba4d4ffee62bac582f0ed Mon Sep 17 00:00:00 2001
From: Cai Cooper <2406847+cagiti@users.noreply.github.com>
Date: Mon, 1 Mar 2021 07:17:54 +0000
Subject: [PATCH 276/869] fix(update): don't error on upgrade no-op (#9685)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Don't error on upgrade no-op

No error code is required for a non failure scenario.

* Manually check whether changes were pulled in `omz update`

Co-authored-by: Marc Cornellà <hello@mcornella.com>
---
 lib/cli.zsh                | 7 ++++---
 tools/check_for_upgrade.sh | 3 +--
 tools/upgrade.sh           | 1 -
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/lib/cli.zsh b/lib/cli.zsh
index 3346d3973..38e2f72f8 100644
--- a/lib/cli.zsh
+++ b/lib/cli.zsh
@@ -401,13 +401,14 @@ function _omz::theme::use {
 }
 
 function _omz::update {
+  local last_commit=$(cd "$ZSH"; git rev-parse HEAD)
+
   # Run update script
   if [[ "$1" != --unattended ]]; then
     ZSH="$ZSH" zsh -f "$ZSH/tools/upgrade.sh" --interactive
   else
     ZSH="$ZSH" zsh -f "$ZSH/tools/upgrade.sh"
   fi
-  local ret=$?
 
   # Update last updated file
   zmodload zsh/datetime
@@ -415,8 +416,8 @@ function _omz::update {
   # Remove update lock if it exists
   command rm -rf "$ZSH/log/update.lock"
 
-  # Restart the zsh session
-  if [[ $ret -eq 0 && "$1" != --unattended ]]; then
+  # Restart the zsh session if there were changes
+  if [[ "$1" != --unattended && "$(cd "$ZSH"; git rev-parse HEAD)" != "$last_commit" ]]; then
     # Old zsh versions don't have ZSH_ARGZERO
     local zsh="${ZSH_ARGZERO:-${functrace[-1]%:*}}"
     # Check whether to run a login shell
diff --git a/tools/check_for_upgrade.sh b/tools/check_for_upgrade.sh
index 88e521eea..29a48b880 100644
--- a/tools/check_for_upgrade.sh
+++ b/tools/check_for_upgrade.sh
@@ -24,8 +24,7 @@ function update_last_updated_file() {
 }
 
 function update_ohmyzsh() {
-  ZSH="$ZSH" zsh -f "$ZSH/tools/upgrade.sh" --interactive
-  if [[ "$?" = (0|80) ]]; then
+  if ZSH="$ZSH" zsh -f "$ZSH/tools/upgrade.sh" --interactive; then
     update_last_updated_file
   fi
 }
diff --git a/tools/upgrade.sh b/tools/upgrade.sh
index 4b97540d6..417e06fe8 100755
--- a/tools/upgrade.sh
+++ b/tools/upgrade.sh
@@ -66,7 +66,6 @@ if git pull --rebase --stat origin master; then
   # Check if it was really updated or not
   if [[ "$(git rev-parse HEAD)" = "$last_commit" ]]; then
     message="Oh My Zsh is already at the latest version."
-    ret=80 # non-zero exit code to indicate no changes pulled
   else
     message="Hooray! Oh My Zsh has been updated!"
 

From 0ab87c26c17171ae6162ff379a0c704fa57dff2e Mon Sep 17 00:00:00 2001
From: Vlad Korolev <vlad@v-lad.org>
Date: Mon, 8 Mar 2021 01:46:42 -0800
Subject: [PATCH 277/869] fix(terraform): use faster method to get workspace
 (#9709)

Also add tf_prompt_info to the list of prompt functions so theme writers are aware of it
---
 lib/prompt_info_functions.zsh          | 1 +
 plugins/terraform/terraform.plugin.zsh | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/prompt_info_functions.zsh b/lib/prompt_info_functions.zsh
index 5069c4b21..48f033da6 100644
--- a/lib/prompt_info_functions.zsh
+++ b/lib/prompt_info_functions.zsh
@@ -18,6 +18,7 @@ function chruby_prompt_info \
   vi_mode_prompt_info \
   virtualenv_prompt_info \
   jenv_prompt_info \
+  tf_prompt_info \
 {
   return 1
 }
diff --git a/plugins/terraform/terraform.plugin.zsh b/plugins/terraform/terraform.plugin.zsh
index 2c42d394d..997241c9a 100644
--- a/plugins/terraform/terraform.plugin.zsh
+++ b/plugins/terraform/terraform.plugin.zsh
@@ -2,8 +2,8 @@ function tf_prompt_info() {
     # dont show 'default' workspace in home dir
     [[ "$PWD" == ~ ]] && return
     # check if in terraform dir
-    if [ -d .terraform ]; then
-      workspace=$(terraform workspace show 2> /dev/null) || return
+    if [[ -d .terraform && -r .terraform/environment  ]]; then
+      workspace=$(cat .terraform/environment) || return
       echo "[${workspace}]"
     fi
 }

From 3bb5e97762ee764170cffa6cfd1d179a1ba92ff3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Sat, 13 Mar 2021 13:51:26 +0100
Subject: [PATCH 278/869] feat(gentoo)!: use `vcs_info` to support other VCSs
 (#9440)

* prettify vcs infomation using `vcs_info`

* Show symbol when there are untracked files in git

Co-authored-by: freeyoung <ourbaozi@qq.com>
---
 themes/gentoo.zsh-theme | 30 +++++++++++++++++++++++++-----
 1 file changed, 25 insertions(+), 5 deletions(-)

diff --git a/themes/gentoo.zsh-theme b/themes/gentoo.zsh-theme
index 5f2427c7a..ae3274022 100644
--- a/themes/gentoo.zsh-theme
+++ b/themes/gentoo.zsh-theme
@@ -1,8 +1,28 @@
-function prompt_char {
-	if [ $UID -eq 0 ]; then echo "#"; else echo $; fi
+autoload -Uz colors && colors
+
+autoload -Uz vcs_info
+zstyle ':vcs_info:*' check-for-changes true
+zstyle ':vcs_info:*' unstagedstr '%F{red}*'   # display this when there are unstaged changes
+zstyle ':vcs_info:*' stagedstr '%F{yellow}+'  # display this when there are staged changes
+zstyle ':vcs_info:*' actionformats '%F{5}(%F{2}%b%F{3}|%F{1}%a%c%u%m%F{5})%f '
+zstyle ':vcs_info:*' formats '%F{5}(%F{2}%b%c%u%m%F{5})%f '
+zstyle ':vcs_info:(sv[nk]|bzr):*' branchformat '%b%F{1}:%F{3}%r'
+zstyle ':vcs_info:*' enable git cvs svn
+zstyle ':vcs_info:git*+set-message:*' hooks untracked-git
+
++vi-untracked-git() {
+  if command git status --porcelain 2>/dev/null | command grep -q '??'; then
+    hook_com[misc]='%F{red}?'
+  else
+    hook_com[misc]=''
+  fi
 }
 
-PROMPT='%(!.%{$fg_bold[red]%}.%{$fg_bold[green]%}%n@)%m %{$fg_bold[blue]%}%(!.%1~.%~) $(git_prompt_info)$(prompt_char)%{$reset_color%} '
+gentoo_precmd() {
+  vcs_info
+}
 
-ZSH_THEME_GIT_PROMPT_PREFIX="("
-ZSH_THEME_GIT_PROMPT_SUFFIX=") "
+autoload -U add-zsh-hook
+add-zsh-hook precmd gentoo_precmd
+
+PROMPT='%(!.%B%F{red}.%B%F{green}%n@)%m %F{blue}%(!.%1~.%~) ${vcs_info_msg_0_}%(!.#.$)%{$reset_color%} '

From e8716cb5703e4cff8dd6f0a4ba12ded7aee86f2d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Mon, 15 Mar 2021 19:49:34 +0100
Subject: [PATCH 279/869] fix(uninstall): fix renaming .zshrc when no original
 rc file found

Fixes #9629
Fixes #9700
---
 tools/uninstall.sh | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/tools/uninstall.sh b/tools/uninstall.sh
index b327a0163..6a0e7b4c7 100644
--- a/tools/uninstall.sh
+++ b/tools/uninstall.sh
@@ -9,20 +9,20 @@ if [ -d ~/.oh-my-zsh ]; then
   rm -rf ~/.oh-my-zsh
 fi
 
+if [ -e ~/.zshrc ]; then
+  ZSHRC_SAVE=~/.zshrc.omz-uninstalled-$(date +%Y-%m-%d_%H-%M-%S)
+  echo "Found ~/.zshrc -- Renaming to ${ZSHRC_SAVE}"
+  mv ~/.zshrc "${ZSHRC_SAVE}"
+fi
+
 echo "Looking for original zsh config..."
 ZSHRC_ORIG=~/.zshrc.pre-oh-my-zsh
 if [ -e "$ZSHRC_ORIG" ]; then
   echo "Found $ZSHRC_ORIG -- Restoring to ~/.zshrc"
-
-  if [ -e ~/.zshrc ]; then
-    ZSHRC_SAVE=~/.zshrc.omz-uninstalled-$(date +%Y-%m-%d_%H-%M-%S)
-    echo "Found ~/.zshrc -- Renaming to ${ZSHRC_SAVE}"
-    mv ~/.zshrc "${ZSHRC_SAVE}"
-  fi
-
   mv "$ZSHRC_ORIG" ~/.zshrc
-
   echo "Your original zsh config was restored."
+else
+  echo "No original zsh config found"
 fi
 
 if hash chsh >/dev/null 2>&1 && [ -f ~/.shell.pre-oh-my-zsh ]; then

From 040aadf7c460112386d23786d8d3f5d2dcfbfeb4 Mon Sep 17 00:00:00 2001
From: John Delgado <pexison@gmail.com>
Date: Mon, 15 Mar 2021 20:06:01 +0100
Subject: [PATCH 280/869] feat(git): add `grbo` alias for `git rebase --onto`
 (#8088)

---
 plugins/git/README.md      | 1 +
 plugins/git/git.plugin.zsh | 1 +
 2 files changed, 2 insertions(+)

diff --git a/plugins/git/README.md b/plugins/git/README.md
index 029386267..6ad19543e 100644
--- a/plugins/git/README.md
+++ b/plugins/git/README.md
@@ -124,6 +124,7 @@ plugins=(... git)
 | grbd                 | git rebase develop                                                                                                               |
 | grbi                 | git rebase -i                                                                                                                    |
 | grbm                 | git rebase $(git_main_branch)                                                                                                                  |
+| grbo                 | git rebase --onto                                                                                                             |
 | grbs                 | git rebase --skip                                                                                                                |
 | grev                 | git revert                                                                                                                       |
 | grh                  | git reset                                                                                                                        |
diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index 2f97dbc92..8167980fa 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -224,6 +224,7 @@ alias grbc='git rebase --continue'
 alias grbd='git rebase develop'
 alias grbi='git rebase -i'
 alias grbm='git rebase $(git_main_branch)'
+alias grbo='git rebase --onto'
 alias grbs='git rebase --skip'
 alias grev='git revert'
 alias grh='git reset'

From 9d556cd5458aba76dc4ab09bc53f53f2a1893ce9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20Rogo=C5=BCa?= <rogoza.piotr@gmail.com>
Date: Mon, 15 Mar 2021 22:27:00 +0100
Subject: [PATCH 281/869] fix(emotty): fix `bad assignment` error (#9714)

---
 plugins/emotty/emotty.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/emotty/emotty.plugin.zsh b/plugins/emotty/emotty.plugin.zsh
index e288b5cfb..4511275d6 100644
--- a/plugins/emotty/emotty.plugin.zsh
+++ b/plugins/emotty/emotty.plugin.zsh
@@ -29,7 +29,7 @@ function emotty() {
   # Parse tty number via prompt expansion. %l equals:
   # - N      if tty = /dev/ttyN
   # - pts/N  if tty = /dev/pts/N
-  local tty = ${${(%):-%l}##pts/}
+  local tty=${${(%):-%l}##pts/}
   # Normalize it to an emotty set index
   (( tty = (tty % ${#${=emotty}}) + 1 ))
 

From 90bdb8a1561b8eef759c8e46a31845265f8cb9b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dario=20Vladovi=C4=87?= <d.vladimyr@gmail.com>
Date: Mon, 15 Mar 2021 22:34:47 +0100
Subject: [PATCH 282/869] feat(fzf): add support for Termux package (#9718)

---
 plugins/fzf/fzf.plugin.zsh | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/plugins/fzf/fzf.plugin.zsh b/plugins/fzf/fzf.plugin.zsh
index 524089983..69ec1d411 100644
--- a/plugins/fzf/fzf.plugin.zsh
+++ b/plugins/fzf/fzf.plugin.zsh
@@ -64,11 +64,21 @@ function setup_using_debian_package() {
     # NOTE: There is no need to configure PATH for debian package, all binaries
     # are installed to /usr/bin by default
 
-    # Determine completion file path: first bullseye/sid, then buster/stretch
-    local completions="/usr/share/doc/fzf/examples/completion.zsh"
-    [[ -f "$completions" ]] || completions="/usr/share/zsh/vendor-completions/_fzf"
+    local completions key_bindings
 
-    local key_bindings="/usr/share/doc/fzf/examples/key-bindings.zsh"
+    case $PREFIX in
+        *com.termux*)
+            # Support Termux package
+            completions="${PREFIX}/share/fzf/completion.zsh"
+            key_bindings="${PREFIX}/share/fzf/key-bindings.zsh"
+            ;;
+        *)
+            # Determine completion file path: first bullseye/sid, then buster/stretch
+            completions="/usr/share/doc/fzf/examples/completion.zsh"
+            [[ -f "$completions" ]] || completions="/usr/share/zsh/vendor-completions/_fzf"
+            key_bindings="/usr/share/doc/fzf/examples/key-bindings.zsh"
+            ;;
+    esac
 
     # Auto-completion
     if [[ -o interactive && "$DISABLE_FZF_AUTO_COMPLETION" != "true" ]]; then

From 0e232d48537bd6f2c3ccbb4c96810fddffc7cfae Mon Sep 17 00:00:00 2001
From: Will Boyce <wrboyce@users.noreply.github.com>
Date: Mon, 15 Mar 2021 21:51:33 +0000
Subject: [PATCH 283/869] feat(ssh-agent): add `ssh-add-args` setting (#7908)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* ssh-agent: add `:omz:plugins:ssh-agent ssh_add_args` option

* Clean up and document extra setting

* Document valid ssh-add arguments

Co-authored-by: Marc Cornellà <hello@mcornella.com>
---
 plugins/ssh-agent/README.md            | 24 +++++++++++++++++++++++-
 plugins/ssh-agent/ssh-agent.plugin.zsh |  4 +++-
 2 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/plugins/ssh-agent/README.md b/plugins/ssh-agent/README.md
index 0b96d9bb5..8765a9c7e 100644
--- a/plugins/ssh-agent/README.md
+++ b/plugins/ssh-agent/README.md
@@ -9,7 +9,7 @@ To enable it, add `ssh-agent` to your plugins:
 plugins=(... ssh-agent)
 ```
 
-## Instructions
+## Settings
 
 **IMPORTANT: put these settings _before_ the line that sources oh-my-zsh**
 
@@ -19,12 +19,16 @@ To enable **agent forwarding support** add the following to your zshrc file:
 zstyle :omz:plugins:ssh-agent agent-forwarding on
 ```
 
+----
+
 To **load multiple identities** use the `identities` style, For example:
 
 ```zsh
 zstyle :omz:plugins:ssh-agent identities id_rsa id_rsa2 id_github
 ```
 
+----
+
 To **set the maximum lifetime of the identities**, use the `lifetime` style.
 The lifetime may be specified in seconds or as described in sshd_config(5)
 (see _TIME FORMATS_). If left unspecified, the default lifetime is forever.
@@ -33,6 +37,24 @@ The lifetime may be specified in seconds or as described in sshd_config(5)
 zstyle :omz:plugins:ssh-agent lifetime 4h
 ```
 
+----
+
+To **pass arguments to the `ssh-add` command** that adds the identities on startup,
+use the `ssh-add-args` setting. You can pass multiple arguments separated by spaces:
+
+```zsh
+zstyle :omz:plugins:ssh-agent ssh-add-args -K -c -a /run/user/1000/ssh-auth
+```
+
+These will then be passed the the `ssh-add` call as if written directly. The example
+above will turn into:
+
+```zsh
+ssh-add -K -c -a /run/user/1000/ssh-auth <identities>
+```
+
+For valid `ssh-add` arguments run `ssh-add --help` or `man ssh-add`.
+
 ## Credits
 
 Based on code from Joseph M. Reagle: https://www.cygwin.com/ml/cygwin/2001-06/msg00537.html
diff --git a/plugins/ssh-agent/ssh-agent.plugin.zsh b/plugins/ssh-agent/ssh-agent.plugin.zsh
index 6ab041c21..430647135 100644
--- a/plugins/ssh-agent/ssh-agent.plugin.zsh
+++ b/plugins/ssh-agent/ssh-agent.plugin.zsh
@@ -48,7 +48,9 @@ function _add_identities() {
 		fi
 	done
 
-	[[ -n "$not_loaded" ]] && ssh-add ${^not_loaded}
+	local args
+	zstyle -a :omz:plugins:ssh-agent ssh-add-args args
+	[[ -n "$not_loaded" ]] && ssh-add "${args[@]}" ${^not_loaded}
 }
 
 # Get the filename to store/lookup the environment from

From e5d206c8c8c28eba856b590860294ebe6baed35e Mon Sep 17 00:00:00 2001
From: wahjava <ashish.is@lostca.se>
Date: Tue, 16 Mar 2021 03:57:57 +0530
Subject: [PATCH 284/869] fix(fossil): PROMPT and RPROMPT are no longer
 exported (#9655)

Fixes #9654
---
 plugins/fossil/fossil.plugin.zsh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/fossil/fossil.plugin.zsh b/plugins/fossil/fossil.plugin.zsh
index 1ae166e62..25a8d121d 100644
--- a/plugins/fossil/fossil.plugin.zsh
+++ b/plugins/fossil/fossil.plugin.zsh
@@ -73,9 +73,9 @@ function _fossil_prompt () {
     local is_prompt=`echo $PROMPT | grep git`
 
     if [ "$is_prompt" = "" ]; then
-      export RPROMPT="$_rprompt"'$(fossil_prompt_info)'
+      RPROMPT="$_rprompt"'$(fossil_prompt_info)'
     else
-      export PROMPT="$_prompt"'$(fossil_prompt_info) '
+      PROMPT="$_prompt"'$(fossil_prompt_info) '
     fi
 
     _FOSSIL_PROMPT="1"

From 3f34ce4da401a18dc36c95f0c41280b544b02b6a Mon Sep 17 00:00:00 2001
From: CrispyConductor <crispy@cluenet.org>
Date: Mon, 15 Mar 2021 18:32:49 -0400
Subject: [PATCH 285/869] fix(vi-mode): fix keymap indicator on zle-line-finish
 (#9620)

* Update VI_KEYMAP on zle-line-finish.  Fixes next prompt draw.

* Also fix vi-mode prompt redraw in case previous prompt was canceled

* Do not redraw fix prompt if VI_MODE_RESET_PROMPT_ON_MODE_CHANGE is unset

* Use a local variable instead of global in function
---
 plugins/vi-mode/vi-mode.plugin.zsh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/plugins/vi-mode/vi-mode.plugin.zsh b/plugins/vi-mode/vi-mode.plugin.zsh
index 7f14961ad..dd4afdd8b 100644
--- a/plugins/vi-mode/vi-mode.plugin.zsh
+++ b/plugins/vi-mode/vi-mode.plugin.zsh
@@ -50,13 +50,17 @@ zle -N zle-keymap-select
 # These "echoti" statements were originally set in lib/key-bindings.zsh
 # Not sure the best way to extend without overriding.
 function zle-line-init() {
+  local prev_vi_keymap
+  prev_vi_keymap="${VI_KEYMAP:-}"
   typeset -g VI_KEYMAP=main
+  [[ "$prev_vi_keymap" != 'main' ]] && [[ "${VI_MODE_RESET_PROMPT_ON_MODE_CHANGE:-}" = true ]] && zle reset-prompt
   (( ! ${+terminfo[smkx]} )) || echoti smkx
   _vi-mode-set-cursor-shape-for-keymap "${VI_KEYMAP}"
 }
 zle -N zle-line-init
 
 function zle-line-finish() {
+  typeset -g VI_KEYMAP=main
   (( ! ${+terminfo[rmkx]} )) || echoti rmkx
   _vi-mode-set-cursor-shape-for-keymap default
 }

From 95a06f3927a286db257dc99791b02caba757fe33 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=A9a=20Gris?= <lea.gris@noiraude.net>
Date: Tue, 16 Mar 2021 00:06:06 +0100
Subject: [PATCH 286/869] refactor(installer): fix static analysis warnings
 (#9529)

* refactor(install.sh): fix static analysis warnings

Clear all warnings and errors raised by shellcheck.net static analysis.

- Replace non-POSIX shell use of `$OSTYPE` by POSIX compliant check on `uname -o`.
- Move variables out of`printf` format string.
- Refactor/simplify string formatters for error and underline.
- Fix expansion of arguments to a single string `$*` rather than individual elements `$@` within the error and underline formatters.

* fix(uname): non-posix -o option

* fix(install.sh): non portable which

Replaced non-portable `which zsh` by portable `command -v zsh`
---
 tools/install.sh | 27 +++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/tools/install.sh b/tools/install.sh
index 953c68baf..d4ecb7afe 100755
--- a/tools/install.sh
+++ b/tools/install.sh
@@ -57,15 +57,16 @@ command_exists() {
 }
 
 fmt_error() {
-  echo ${RED}"Error: $@"${RESET} >&2
+  printf '%sError: %s%s\n' "$BOLD$RED" "$*" "$RESET" >&2
 }
 
 fmt_underline() {
-  echo "$(printf '\033[4m')$@$(printf '\033[24m')"
+  printf '\033[4m%s\033[24m\n' "$*"
 }
 
 fmt_code() {
-  echo "\`$(printf '\033[38;5;247m')$@${RESET}\`"
+  # shellcheck disable=SC2016 # backtic in single-quote
+  printf '`\033[38;5;247m%s%s`\n' "$*" "$RESET"
 }
 
 setup_color() {
@@ -102,7 +103,8 @@ setup_ohmyzsh() {
     exit 1
   }
 
-  if [ "$OSTYPE" = cygwin ] && git --version | grep -q msysgit; then
+  ostype=$(uname)
+  if [ -z "${ostype%CYGWIN*}" ] && git --version | grep -q msysgit; then
     fmt_error "Windows/MSYS Git is not supported on Cygwin"
     fmt_error "Make sure the Cygwin git package is installed and is first on the \$PATH"
     exit 1
@@ -130,7 +132,7 @@ setup_zshrc() {
   OLD_ZSHRC=~/.zshrc.pre-oh-my-zsh
   if [ -f ~/.zshrc ] || [ -h ~/.zshrc ]; then
     # Skip this if the user doesn't want to replace an existing .zshrc
-    if [ $KEEP_ZSHRC = yes ]; then
+    if [ "$KEEP_ZSHRC" = yes ]; then
       echo "${YELLOW}Found ~/.zshrc.${RESET} ${GREEN}Keeping...${RESET}"
       return
     fi
@@ -162,7 +164,7 @@ export ZSH=\"$ZSH\"
 
 setup_shell() {
   # Skip setup if the user wants or stdin is closed (not running interactively).
-  if [ $CHSH = no ]; then
+  if [ "$CHSH" = no ]; then
     return
   fi
 
@@ -183,8 +185,9 @@ EOF
   echo "${BLUE}Time to change your default shell to zsh:${RESET}"
 
   # Prompt for user choice on changing the default login shell
-  printf "${YELLOW}Do you want to change your default shell to zsh? [Y/n]${RESET} "
-  read opt
+  printf '%sDo you want to change your default shell to zsh? [Y/n]%s ' \
+    "$YELLOW" "$RESET"
+  read -r opt
   case $opt in
     y*|Y*|"") echo "Changing the shell..." ;;
     n*|N*) echo "Shell change skipped."; return ;;
@@ -211,7 +214,7 @@ EOF
     # Get the path to the right zsh binary
     # 1. Use the most preceding one based on $PATH, then check that it's in the shells file
     # 2. If that fails, get a zsh path from the shells file, then check it actually exists
-    if ! zsh=$(which zsh) || ! grep -qx "$zsh" "$shells_file"; then
+    if ! zsh=$(command -v zsh) || ! grep -qx "$zsh" "$shells_file"; then
       if ! zsh=$(grep '^/.*/zsh$' "$shells_file" | tail -1) || [ ! -f "$zsh" ]; then
         fmt_error "no zsh binary found or not present in '$shells_file'"
         fmt_error "change your default shell manually."
@@ -222,7 +225,7 @@ EOF
 
   # We're going to change the default shell, so back up the current one
   if [ -n "$SHELL" ]; then
-    echo $SHELL > ~/.shell.pre-oh-my-zsh
+    echo "$SHELL" > ~/.shell.pre-oh-my-zsh
   else
     grep "^$USER:" /etc/passwd | awk -F: '{print $7}' > ~/.shell.pre-oh-my-zsh
   fi
@@ -288,7 +291,7 @@ EOF
   setup_zshrc
   setup_shell
 
-  printf "$GREEN"
+  printf %s "$GREEN"
   cat <<'EOF'
          __                                     __
   ____  / /_     ____ ___  __  __   ____  _____/ /_
@@ -307,7 +310,7 @@ Before you scream Oh My Zsh! please look over the ~/.zshrc file to select plugin
 • Get stickers, shirts, coffee mugs and other swag: $(fmt_underline https://shop.planetargon.com/collections/oh-my-zsh)
 
 EOF
-  printf "$RESET"
+  printf %s "$RESET"
 
   if [ $RUNZSH = no ]; then
     echo "${YELLOW}Run zsh to try it out.${RESET}"

From 02d07f3e3dba0d50b1d907a8062bbaca18f88478 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Thu, 25 Mar 2021 12:08:00 +0100
Subject: [PATCH 287/869] fix: use `$USERNAME` guaranteed to always be defined
 in zsh

Fixes #9701
---
 lib/completion.zsh                         |  4 ++--
 lib/diagnostics.zsh                        |  2 +-
 plugins/emacs/emacsclient.sh               |  4 ++--
 plugins/screen/screen.plugin.zsh           |  4 ++--
 plugins/ssh-agent/ssh-agent.plugin.zsh     |  4 ++--
 plugins/systemadmin/README.md              | 22 +++++++++++-----------
 plugins/systemadmin/systemadmin.plugin.zsh |  2 +-
 themes/adben.zsh-theme                     |  4 ++--
 themes/agnoster.zsh-theme                  |  2 +-
 themes/avit.zsh-theme                      |  2 +-
 themes/flazz.zsh-theme                     |  2 +-
 themes/obraun.zsh-theme                    |  2 +-
 themes/re5et.zsh-theme                     |  2 +-
 themes/sunrise.zsh-theme                   |  2 +-
 tools/install.sh                           |  2 +-
 15 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/lib/completion.zsh b/lib/completion.zsh
index 2b62785d5..ebaab0856 100644
--- a/lib/completion.zsh
+++ b/lib/completion.zsh
@@ -32,9 +32,9 @@ zstyle ':completion:*' list-colors ''
 zstyle ':completion:*:*:kill:*:processes' list-colors '=(#b) #([0-9]#) ([0-9a-z-]#)*=01;34=0=01'
 
 if [[ "$OSTYPE" = solaris* ]]; then
-  zstyle ':completion:*:*:*:*:processes' command "ps -u $USER -o pid,user,comm"
+  zstyle ':completion:*:*:*:*:processes' command "ps -u $USERNAME -o pid,user,comm"
 else
-  zstyle ':completion:*:*:*:*:processes' command "ps -u $USER -o pid,user,comm -w -w"
+  zstyle ':completion:*:*:*:*:processes' command "ps -u $USERNAME -o pid,user,comm -w -w"
 fi
 
 # disable named-directories autocompletion
diff --git a/lib/diagnostics.zsh b/lib/diagnostics.zsh
index 001de42b7..650520797 100644
--- a/lib/diagnostics.zsh
+++ b/lib/diagnostics.zsh
@@ -112,7 +112,7 @@ function _omz_diag_dump_one_big_text() {
   command uname -a
   builtin echo OSTYPE=$OSTYPE
   builtin echo ZSH_VERSION=$ZSH_VERSION
-  builtin echo User: $USER
+  builtin echo User: $USERNAME
   builtin echo umask: $(umask)
   builtin echo
   _omz_diag_dump_os_specific_version
diff --git a/plugins/emacs/emacsclient.sh b/plugins/emacs/emacsclient.sh
index 0aa8d6f40..04a2c2afd 100755
--- a/plugins/emacs/emacsclient.sh
+++ b/plugins/emacs/emacsclient.sh
@@ -20,8 +20,8 @@ _emacsfun()
 # tempfile. (first argument will be `--no-wait` passed in by the plugin.zsh)
 if [ "$#" -ge "2" -a "$2" = "-" ]
 then
-    tempfile="$(mktemp --tmpdir emacs-stdin-$USER.XXXXXXX 2>/dev/null \
-                || mktemp -t emacs-stdin-$USER)" # support BSD mktemp
+    tempfile="$(mktemp --tmpdir emacs-stdin-$USERNAME.XXXXXXX 2>/dev/null \
+                || mktemp -t emacs-stdin-$USERNAME)" # support BSD mktemp
     cat - > "$tempfile"
     _emacsfun --no-wait $tempfile
 else
diff --git a/plugins/screen/screen.plugin.zsh b/plugins/screen/screen.plugin.zsh
index 7009e7a91..c1db8ad92 100644
--- a/plugins/screen/screen.plugin.zsh
+++ b/plugins/screen/screen.plugin.zsh
@@ -2,7 +2,7 @@
 # of the tab window should be.
 if [[ "$TERM" == screen* ]]; then
   if [[ $_GET_PATH == '' ]]; then
-    _GET_PATH='echo $PWD | sed "s/^\/Users\//~/;s/^\/home\//~/;s/^~$USER/~/"'
+    _GET_PATH='echo $PWD | sed "s/^\/Users\//~/;s/^\/home\//~/;s/^~$USERNAME/~/"'
   fi
   if [[ $_GET_HOST == '' ]]; then
     _GET_HOST='echo $HOST | sed "s/\..*//"'
@@ -51,4 +51,4 @@ if [[ "$TERM" == screen* ]]; then
     eval "tab_hardstatus=$TAB_HARDSTATUS_PREFIX:$TAB_HARDSTATUS_PROMPT"
     screen_set $tab_title $tab_hardstatus
   }
-fi
\ No newline at end of file
+fi
diff --git a/plugins/ssh-agent/ssh-agent.plugin.zsh b/plugins/ssh-agent/ssh-agent.plugin.zsh
index 430647135..d45406f63 100644
--- a/plugins/ssh-agent/ssh-agent.plugin.zsh
+++ b/plugins/ssh-agent/ssh-agent.plugin.zsh
@@ -61,11 +61,11 @@ zstyle -b :omz:plugins:ssh-agent agent-forwarding _agent_forwarding
 
 if [[ $_agent_forwarding == "yes" && -n "$SSH_AUTH_SOCK" ]]; then
 	# Add a nifty symlink for screen/tmux if agent forwarding
-	[[ -L $SSH_AUTH_SOCK ]] || ln -sf "$SSH_AUTH_SOCK" /tmp/ssh-agent-$USER-screen
+	[[ -L $SSH_AUTH_SOCK ]] || ln -sf "$SSH_AUTH_SOCK" /tmp/ssh-agent-$USERNAME-screen
 elif [[ -f "$_ssh_env_cache" ]]; then
 	# Source SSH settings, if applicable
 	. $_ssh_env_cache > /dev/null
-	if [[ $USER == "root" ]]; then
+	if [[ $USERNAME == "root" ]]; then
 		FILTER="ax"
 	else
 		FILTER="x"
diff --git a/plugins/systemadmin/README.md b/plugins/systemadmin/README.md
index 243db03f2..052fc6edc 100644
--- a/plugins/systemadmin/README.md
+++ b/plugins/systemadmin/README.md
@@ -10,17 +10,17 @@ plugins=(... systemadmin)
 
 ## Aliases
 
-| Alias   | Command                                                                | Description                                                        |
-|---------|------------------------------------------------------------------------|--------------------------------------------------------------------|
-| ping    | `ping -c 5`                                                            | Sends only 5 ICMP Messages                                         |
-| clr     | `clear; echo Currently logged in on $TTY, as $USER in directory $PWD.` | Clears the screen and prints the current user, TTY, and directory  |
-| path    | `print -l $path`                                                       | Displays PATH with each entry on a separate line                   |
-| mkdir   | `mkdir -pv`                                                            | Automatically create parent directories and display verbose output |
-| psmem   | `ps -e -orss=,args= \| sort -b -k1 -nr`                                | Display the processes using the most memory                        |
-| psmem10 | `ps -e -orss=,args= \| sort -b -k1 -nr \| head -10`                    | Display the top 10 processes using the most memory                 |
-| pscpu   | `ps -e -o pcpu,cpu,nice,state,cputime,args \|sort -k1 -nr`             | Display the top processes using the most CPU                       |
-| pscpu10 | `ps -e -o pcpu,cpu,nice,state,cputime,args \|sort -k1 -nr \| head -10` | Display the top 10 processes using the most CPU                    |
-| hist10  | `print -l ${(o)history%% *} \| uniq -c \| sort -nr \| head -n 10`      | Display the top 10 most used commands in the history               |
+| Alias   | Command                                                                    | Description                                                        |
+|---------|----------------------------------------------------------------------------|--------------------------------------------------------------------|
+| ping    | `ping -c 5`                                                                | Sends only 5 ICMP Messages                                         |
+| clr     | `clear; echo Currently logged in on $TTY, as $USERNAME in directory $PWD.` | Clears the screen and prints the current user, TTY, and directory  |
+| path    | `print -l $path`                                                           | Displays PATH with each entry on a separate line                   |
+| mkdir   | `mkdir -pv`                                                                | Automatically create parent directories and display verbose output |
+| psmem   | `ps -e -orss=,args= \| sort -b -k1 -nr`                                    | Display the processes using the most memory                        |
+| psmem10 | `ps -e -orss=,args= \| sort -b -k1 -nr \| head -10`                        | Display the top 10 processes using the most memory                 |
+| pscpu   | `ps -e -o pcpu,cpu,nice,state,cputime,args \|sort -k1 -nr`                 | Display the top processes using the most CPU                       |
+| pscpu10 | `ps -e -o pcpu,cpu,nice,state,cputime,args \|sort -k1 -nr \| head -10`     | Display the top 10 processes using the most CPU                    |
+| hist10  | `print -l ${(o)history%% *} \| uniq -c \| sort -nr \| head -n 10`          | Display the top 10 most used commands in the history               |
 
 ## Functions
 
diff --git a/plugins/systemadmin/systemadmin.plugin.zsh b/plugins/systemadmin/systemadmin.plugin.zsh
index 03064c035..08136abda 100644
--- a/plugins/systemadmin/systemadmin.plugin.zsh
+++ b/plugins/systemadmin/systemadmin.plugin.zsh
@@ -21,7 +21,7 @@ function retlog() {
 }
 
 alias ping='ping -c 5'
-alias clr='clear; echo Currently logged in on $TTY, as $USER in directory $PWD.'
+alias clr='clear; echo Currently logged in on $TTY, as $USERNAME in directory $PWD.'
 alias path='print -l $path'
 alias mkdir='mkdir -pv'
 # get top process eating memory
diff --git a/themes/adben.zsh-theme b/themes/adben.zsh-theme
index b9ac77d00..7321df724 100644
--- a/themes/adben.zsh-theme
+++ b/themes/adben.zsh-theme
@@ -89,8 +89,8 @@ function precmd {
 
 # Context: user@directory or just directory
 prompt_context () {
-    if [[ "$USER" != "$DEFAULT_USER" || -n "$SSH_CLIENT" ]]; then
-        echo -n "${PR_RESET}${PR_RED}$USER@%m${PR_RESET}${PR_BRIGHT_YELLOW}%~%<<${PR_RESET}"
+    if [[ "$USERNAME" != "$DEFAULT_USER" || -n "$SSH_CLIENT" ]]; then
+        echo -n "${PR_RESET}${PR_RED}$USERNAME@%m${PR_RESET}${PR_BRIGHT_YELLOW}%~%<<${PR_RESET}"
     else
         echo -n "${PR_RESET}${PR_BRIGHT_YELLOW}%~%<<${PR_RESET}"
     fi
diff --git a/themes/agnoster.zsh-theme b/themes/agnoster.zsh-theme
index 99707f684..fe7ddbac6 100644
--- a/themes/agnoster.zsh-theme
+++ b/themes/agnoster.zsh-theme
@@ -88,7 +88,7 @@ prompt_end() {
 
 # Context: user@hostname (who am I and where am I)
 prompt_context() {
-  if [[ "$USER" != "$DEFAULT_USER" || -n "$SSH_CLIENT" ]]; then
+  if [[ "$USERNAME" != "$DEFAULT_USER" || -n "$SSH_CLIENT" ]]; then
     prompt_segment black default "%(!.%{%F{yellow}%}.)%n@%m"
   fi
 }
diff --git a/themes/avit.zsh-theme b/themes/avit.zsh-theme
index 921ed99d3..1e20d8f9f 100644
--- a/themes/avit.zsh-theme
+++ b/themes/avit.zsh-theme
@@ -17,7 +17,7 @@ function _user_host() {
   local me
   if [[ -n $SSH_CONNECTION ]]; then
     me="%n@%m"
-  elif [[ $LOGNAME != $USER ]]; then
+  elif [[ $LOGNAME != $USERNAME ]]; then
     me="%n"
   fi
   if [[ -n $me ]]; then
diff --git a/themes/flazz.zsh-theme b/themes/flazz.zsh-theme
index c0a7fb5d0..e21b52ef5 100644
--- a/themes/flazz.zsh-theme
+++ b/themes/flazz.zsh-theme
@@ -1,4 +1,4 @@
-if [ "$USER" = "root" ]
+if [ "$USERNAME" = "root" ]
 then CARETCOLOR="red"
 else CARETCOLOR="blue"
 fi
diff --git a/themes/obraun.zsh-theme b/themes/obraun.zsh-theme
index 7af44056f..cc2769e4b 100644
--- a/themes/obraun.zsh-theme
+++ b/themes/obraun.zsh-theme
@@ -1,4 +1,4 @@
-if [ "$USER" = "root" ]; then CARETCOLOR="red"; else CARETCOLOR="blue"; fi
+if [ "$USERNAME" = "root" ]; then CARETCOLOR="red"; else CARETCOLOR="blue"; fi
 
 local return_code="%(?..%{$fg[red]%}%? ↵%{$reset_color%})"
 
diff --git a/themes/re5et.zsh-theme b/themes/re5et.zsh-theme
index 95af1e2ee..bdf342f49 100644
--- a/themes/re5et.zsh-theme
+++ b/themes/re5et.zsh-theme
@@ -1,4 +1,4 @@
-if [ "$USER" = "root" ]; then CARETCOLOR="red"; else CARETCOLOR="magenta"; fi
+if [ "$USERNAME" = "root" ]; then CARETCOLOR="red"; else CARETCOLOR="magenta"; fi
 
 local return_code="%(?..%{$fg_bold[red]%}:( %?%{$reset_color%})"
 
diff --git a/themes/sunrise.zsh-theme b/themes/sunrise.zsh-theme
index 2111576c3..11f6af127 100644
--- a/themes/sunrise.zsh-theme
+++ b/themes/sunrise.zsh-theme
@@ -9,7 +9,7 @@ Y=$fg_no_bold[yellow]
 B=$fg_no_bold[blue]
 RESET=$reset_color
 
-if [ "$USER" = "root" ]; then
+if [ "$USERNAME" = "root" ]; then
     PROMPTCOLOR="%{$R%}" PROMPTPREFIX="-!-";
 else
     PROMPTCOLOR="" PROMPTPREFIX="---";
diff --git a/tools/install.sh b/tools/install.sh
index d4ecb7afe..cfc2808fe 100755
--- a/tools/install.sh
+++ b/tools/install.sh
@@ -227,7 +227,7 @@ EOF
   if [ -n "$SHELL" ]; then
     echo "$SHELL" > ~/.shell.pre-oh-my-zsh
   else
-    grep "^$USER:" /etc/passwd | awk -F: '{print $7}' > ~/.shell.pre-oh-my-zsh
+    grep "^$USERNAME:" /etc/passwd | awk -F: '{print $7}' > ~/.shell.pre-oh-my-zsh
   fi
 
   # Actually change the default shell to zsh

From d8b3e115e968225b5a0b999ea9292ac0263d5586 Mon Sep 17 00:00:00 2001
From: Luiz Pericolo <luiz.barbosa@hotelurbano.com.br>
Date: Wed, 25 May 2016 12:33:38 -0300
Subject: [PATCH 288/869] feat(plugins): add hitchhiker plugin (#5117)

---
 plugins/hitchhiker/.gitignore            |   1 +
 plugins/hitchhiker/README.md             |  44 ++++
 plugins/hitchhiker/fortunes/hitchhiker   | 275 +++++++++++++++++++++++
 plugins/hitchhiker/hitchhiker.plugin.zsh |  23 ++
 4 files changed, 343 insertions(+)
 create mode 100644 plugins/hitchhiker/.gitignore
 create mode 100644 plugins/hitchhiker/README.md
 create mode 100644 plugins/hitchhiker/fortunes/hitchhiker
 create mode 100644 plugins/hitchhiker/hitchhiker.plugin.zsh

diff --git a/plugins/hitchhiker/.gitignore b/plugins/hitchhiker/.gitignore
new file mode 100644
index 000000000..63c2b54c4
--- /dev/null
+++ b/plugins/hitchhiker/.gitignore
@@ -0,0 +1 @@
+fortunes/hitchhiker.dat
diff --git a/plugins/hitchhiker/README.md b/plugins/hitchhiker/README.md
new file mode 100644
index 000000000..d12a1e93f
--- /dev/null
+++ b/plugins/hitchhiker/README.md
@@ -0,0 +1,44 @@
+# hitchhiker
+
+This plugin adds quotes from The Hitchhiker's Guide to the Galaxy, from Douglas Adams.
+
+To use it, add `hitchhiker` to the plugins array in your zshrc file:
+
+```zsh
+plugins=(... hitchhiker)
+```
+
+## Aliases
+
+- `hitchhiker`: displays a quote from the book using `fortune`.
+- `hitchhiker_cow`: displays a quote from the book using `cowthink`.
+
+```console
+$ hitchhiker_cow
+ _______________________________________
+( "OK, so ten out of ten for style, but )
+( minus several million for good        )
+( thinking, yeah? "                     )
+ ---------------------------------------
+        o   ^__^
+         o  (oo)\_______
+            (__)\       )\/\
+                ||----w |
+                ||     ||
+```
+
+## Requirements
+
+- `fortune` and `strfile`.
+- `cowthink` if using the `hitchhiker_cow` command.
+
+## Credits
+
+Fortune file: Andreas Gohr <andi@splitbrain.org> ([splitbrain.org](https://www.splitbrain.org/projects/fortunes/hg2g))
+
+Spelling and formatting fixes: grok@resist.ca
+
+Original quotes from:
+
+- https://web.archive.org/web/20120106083254/http://tatooine.fortunecity.com/vonnegut/29/hitch/parhaat.html
+- https://web.archive.org/web/20011112065737/http://www-personal.umd.umich.edu/~nhughes/dna/faqs/quotedir.html
diff --git a/plugins/hitchhiker/fortunes/hitchhiker b/plugins/hitchhiker/fortunes/hitchhiker
new file mode 100644
index 000000000..825b86cd6
--- /dev/null
+++ b/plugins/hitchhiker/fortunes/hitchhiker
@@ -0,0 +1,275 @@
+"`...You hadn't exactly gone out of your way to call attention to them had you? I mean like actually telling anyone or anything.' `But the plans were on display...' `On display? I eventually had to go down to the cellar to find them.' `That's the display department.' `With a torch.' `Ah, well the lights had probably gone.' `So had the stairs.' `But look you found the notice didn't you?' `Yes,' said Arthur, `yes I did. It was on display in the bottom of a locked filing cabinet stuck in a disused lavatory with a sign on the door saying "Beware of The Leopard".'"
+
+- Arthur singing the praises of the local council planning department.
+%
+"`Time is an illusion. Lunchtime doubly so.' `Very deep,' said Arthur, `you should send that in to the "Reader's Digest". They've got a page for people like you.'"
+
+- Ford convincing Arthur to drink three pints in ten minutes at lunchtime.
+%
+"`This must be Thursday,' said Arthur to himself, sinking low over his beer, `I never could get the hang of Thursdays.'"
+
+- Arthur, on what was to be his last Thursday on Earth.
+%
+"Pages one and two [of Zaphod's presidential speech] had been salvaged by a Damogran Frond Crested Eagle and had already become incorporated into an extraordinary new form of nest which the eagle had invented. It was constructed largely of papier mache and it was virtually impossible for a newly hatched baby eagle to break out of it. The Damogran Frond Crested Eagle had heard of the notion of survival of the species but wanted no truck with it."
+
+- An example of Damogran wildlife.
+%
+"`How do you feel?' he asked him. `Like a military academy,' said Arthur, `bits of me keep passing out.'" .... `We're safe,' he said. `Oh good,' said Arthur. `We're in a small galley cabin,' said Ford, `in one of the spaceships of the Vogon Constructor Fleet.' `Ah,' said Arthur, `this is obviously some strange usage of the word "safe" that I wasn't previously aware of.'
+
+- Arthur after his first ever teleport ride.
+%
+"`The best way to get a drink out of a Vogon is to stick your finger down his throat...'"
+
+- The Book, on one of the Vogon's social inadequacies.
+%
+"`You'd better be prepared for the jump into hyperspace. It's unpleasantly like being drunk.' `What's so unpleasant about being drunk?' `You ask a glass of water.'"
+
+- Arthur getting ready for his first jump into hyperspace.
+%
+"`You know,' said Arthur, `it's at times like this, when I'm trapped in a Vogon airlock with a man from Betelgeuse, and about to die from asphyxiation in deep space that I really wish I'd listened to what my mother told me when I was young.' `Why, what did she tell you?' `I don't know, I didn't listen.'"
+
+- Arthur coping with certain death as best as he could.
+%
+"`Ford, you're turning into a penguin. Stop it.'"
+
+- Arthur experiences the improbability drive at work.
+%
+"`I think you ought to know that I'm feeling very depressed.'" "`Life, don't talk to me about life.'" "`Here I am, brain the size of a planet and they ask me to take you down to the bridge. Call that "job satisfaction"? 'Cos I don't.'" "`I've got this terrible pain in all the diodes down my left side.'"
+
+- Guess who.
+%
+"`If there's anything more important than my ego around, I want it caught and shot now.'"
+
+- Zaphod.
+%
+"`In those days spirits were brave, the stakes were high, men were REAL men, women were REAL women, and small furry creatures from Alpha Centauri were REAL small furry creatures from Aplha Centauri.'"
+
+- The Book getting all nostalgic.
+%
+"`Hey this is terrific!' Zaphod said. `Someone down there is trying to kill us!' `Terrific,' said Arthur. `But don't you see what this means?' `Yes. We are going to die.' `Yes, but apart from that.' `APART from that?' `It means we must be on to something!' `How soon can we get off it?'"
+
+- Zaphod and Arthur in a certain death situation over Magrathea.
+%
+"And wow! Hey! What's this thing coming towards me very fast? Very very fast. So big and flat and round, it needs a big wide sounding word like... ow... ound... round... ground! That's it! That's a good name - ground! I wonder if it will be friends with me?"
+
+- For the sperm whale, it wasn't.
+%
+"Oh no, not again."
+
+- A bowl of petunias on it's way to certain death.
+%
+"`Er, hey Earthman...' `Arthur,' said Arthur. `Yeah, could you just sort of keep this robot with you and guard this end of the passageway. OK?' `Guard?' said Arthur. `What from? You just said there's no one here.' `Yeah, well, just for safety, OK?' said Zaphod. `Whose? Yours or mine?'"
+
+- Arthur drawing the short straw on Magrathea.
+%
+"There are of course many problems connected with life, of which some of the most popular are `Why are people born?' `Why do they die?' `Why do they spend so much of the intervening time wearing digital watches?'"
+
+- The Book.
+%
+"`Right,' said Ford, `I'm going to have a look.' He glanced round at the others. `Is no one going to say, "No you can't possibly, let me go instead"?' They all shook their heads. `Oh well.'"
+
+- Ford attempting to be heroic whilst being seiged by Shooty and Bangbang.
+%
+"In the beginning the Universe was created. This has made a lot of people very angry and been widely regarded as a bad move." - The Book just recapping what happened in the last book. "`I am so amazingly cool you could keep a side of meat in me for a month. I am so hip I have difficulty seeing over my pelvis.'"
+
+- Zaphod being cool.
+%
+"`You ARE Zaphod Beeblebrox?' `Yeah,' said Zaphod, `but don't shout it out or they'll all want one.' `THE Zaphod Beeblebrox?' `No, just A Zaphod Bebblebrox, didn't you hear I come in six packs?' `But sir,' it squealed, `I just heard on the sub-ether radio report. It said you were dead...' `Yeah, that's right, I just haven't stopped moving yet.'"
+
+- Zaphod and the Guide's receptionist.
+%
+"The fronting for the eighty-yard-long marble-topped bar had been made by stitching together nearly twenty thousand Antarean Mosaic Lizard skins, despite the fact that the twenty thousand lizards concerned had needed them to keep their insides in."
+
+- The Book decribing Milliways' politically incorrect decor.
+%
+"`...and the Universe,' continued the waiter, determined not to be deflected on his home stretch, `will explode later for your pleasure.' Ford's head swivelled slowly towards him. He spoke with feeling. `Wow,' he said, `What sort of drinks do you serve in this place?' The waiter laughed a polite little waiter's laugh. `Ah,' he said, `I think sir has perhaps misunderstood me.' `Oh, I hope not,' breathed Ford."
+
+- Ford in paradise.
+%
+"Zaphod grinned two manic grins, sauntered over to the bar and bought most of it."
+
+- Zaphod in paradise.
+%
+"`Maybe somebody here tipped off the Galactic Police,' said Trillian. `Everybody saw you come in.' `You mean they want to arrest me over the phone?' said Zaphod, `Could be. I'm a pretty dangerous dude when I'm cornered.' `Yeah,' said a voice from under the table [Ford's now completely rat-arsed at this point], `you go to pieces so fast people get hit by the shrapnel.'"
+
+- Zaphod getting paranoid over a phone call.
+%
+"`Hand me the rap-rod, Plate Captain.' The little waiter's eyebrows wandered about his forehead in confusion. `I beg your pardon, sir?' he said. `The phone, waiter,' said Zaphod, grabbing it off him. `Shee, you guys are so unhip it's a wonder your bums don't fall off.'"
+
+- Zaphod discovers that waiters are the least hip people in the Universe.
+%
+"The main reception foyer was almost empty but Ford nevertheless weaved his way through it."
+
+- Ford making his way out of Milliways whilst under the influence of enough alcohol to make a rhino sing.
+%
+"`The first ten million years were the worst,' said Marvin, `and the second ten million, they were the worst too. The third ten million I didn't enjoy at all. After that I went into a bit of a decline.'"
+
+- Marvin reflecting back on his 576,000,003,579 year career as Milliways' car park attendent.
+%
+"`Incidentally,' he said, `what does teleport mean?' Another moment passed. Slowly, the others turned to face him. `Probably the wrong moment to ask,' said Arthur, `It's just I remember you use the word a short while ago and I only bring it up because...' `Where,' said Ford quietly, `does it say teleport?' `Well, just over here in fact,' said Arthur, pointing at a dark control box in the rear of the cabin, `Just under the word "emergency", above the word "system" and beside the sign saying "out of order".'"
+
+- Arthur finding an escape route from a certain death situation.
+%
+"I teleported home one night With Ron and Sid and Meg. Ron stole Meggie's heart away And I got Sidney's leg."
+
+- A poem about matter transference beams.
+%
+"Anyone who is capable of getting themselves made President should on no account be allowed to do the job."
+
+- Some wisdom from The Book.
+%
+"`We've got to find out what people want from fire, how they relate to it, what sort of image it has for them.' The crowd were tense. They were expecting something wonderful from Ford. `Stick it up your nose,' he said. `Which is precisely the sort of thing we need to know,' insisted the girl, `Do people want fire that can be fitted nasally?'"
+
+- Ford "debating" what to do with fire with a marketing girl.
+%
+"The story goes that I first had the idea for THHGTTG while lying drunk in a field in Innsbruck (or `Spain' as the BBC TV publicity department authoritatively has it, probably because it's easier to spell)." - Foreward by DNA.
+
+FORD 	Six pints of bitter. And quickly please, the world's about to 	end. BARMAN	Oh yes, sir? Nice weather for it.
+%
+BOOK	Meanwhile, the starship has landed on the surface of Magrathea 	and Trillian is about to make one of the most important 	statements of her life. Its importance is not immediately 	recognised by her companions. TRILL.	Hey, my white mice have escaped. ZAPHOD	Nuts to your white mice.
+%
+BOOK	...Man had always assumed that he was more intelligent than 	dolphins because he had achieved so much... the wheel, New York, 	wars, and so on, whilst all the dolphins had ever done was muck 	about in the water having a good time. But conversely the 	dolphins believed themselves to be more intelligent than man for 	precisely the same reasons.
+%
+ARTHUR	What is an Algolian Zylatburger anyway? FORD	They're a kind of meatburger made from the most unpleasant parts 	of a creature well known for its total lack of any pleasant 	parts. ARTHUR	So you mean that the Universe does actually end not with a bang 	but with a Wimpy?
+
+- Cut dialogue from Fit the Fifth.
+%
+BOOK	There is a theory which states that if ever anyone discovers 	exactly what the Universe is for and why it is here, it will 	instantly disappear and be replaced by something even more 	bizarrely inexplicable. 	There is another theory which states that this has already happened.
+
+- Introduction to Fit the Seventh.
+%
+FORD	Tell me Arthur... ARTHUR	Yes? FORD	This boulder we're stuck under, how big would you say it was? Roughly? ARTHUR	Oh, about the size of Coventry Cathedral. FORD	Do you think we could move it? (Arthur doesn't reply) Just asking.
+
+- Ford and Arthur in a tricky situation, Fit the Eighth.
+%
+BOOK	What to do if you find yourself stuck in a crack in the ground 	underneath a giant boulder you can't move, with no hope of 	rescue. Consider how lucky you are that life has been good to 	you so far. Alternatively, if life hasn't been good to you so 	far, which given your current circumstances seems more likely, 	consider how lucky you are that it won't be troubling you much 	longer.
+
+- Comforting advice for Ford and Arthur in this current situation, Fit the Eighth.
+%
+ZAPHOD	Hey, this rock... FORD	Marble... ZAPHOD	Marble... FORD	Ice-covered marble... ZAPHOD	Right... it's as slippery as... as... What's the slipperiest 	thing you can think of? FORD	At the moment? This marble. ZAPHOD	Right. This marble is as slippery as this marble.
+
+- Zaphod and Ford trying to get a grip on things in Brontitall, Fit the Tenth.
+%
+ARTHUR	It's not a question of whose habitat it is, it's a 	question of how hard you hit it.
+
+- Arthur pointing out one of the disadvantages of gravity, Fit the Tenth.
+%
+ARTHUR	It probably seems a terrible thing to say, but you 	know what I sometimes think would be useful in these situations? LINT.	What? ARTHUR	A gun of some sort. LINT.2	Will this help? ARTHUR	What is it? LINT.2	A gun of some sort. ARTHUR	Oh, that'll help. Can you make it fire? LINT.	Er... F/X	DEAFENING ROAR LINT.	Yes.
+
+- Arthur and the Lintillas gaining the upper hand, Fit the Twelfth.
+%
+"He stood up straight and looked the world squarely in the fields and hills. To add weight to his words he stuck the rabbit bone in his hair. He spread his arms out wide. `I will go mad!' he announced."
+
+- Arthur discovering a way of coping with life on Prehistoric Earth.
+%
+"`... then I decided that I was a lemon for a couple of weeks. I kept myself amused all that time jumping in and out of a gin and tonic.' Arthur cleared his throat, and then did it again. `Where,' he said, `did you...?' `Find a gin and tonic?' said Ford brightly. `I found a small lake that thought it was a gin and tonic, and jumped in and out of that. At least, I think it thought it was a gin and tonic.' `I may,' he addded with a grin which would have sent sane men scampering into the trees, `have been imagining it.'"
+
+- Ford updating Arthur about what he's been doing for the past four years.
+%
+"`Eddies,' said Ford, `in the space-time continuum.' `Ah,' nodded Arthur, `is he? Is he?'"
+
+- Arthur failing in his first lesson of galactic physics in four years.
+%
+"Ford grabbed him by the lapels of his dressing gown and spoke to him as slowly and distinctly and patiently as if he were somebody from a telephone company accounts department."
+
+- Ford trying to rectify that situation.
+%
+"...[Arthur] leapt to his feet like an author hearing the phone ring..."
+
+- Who says that the character of Arthur isn't autobiographical?
+%
+"Arthur's consciousness approached his body as from a great distance, and reluctantly. It had had some bad times in there. Slowly, nervously, it entered and settled down into its accustomed position. Arthur sat up. `Where am I?' he said. `Lord's Cricket Ground,' said Ford. `Fine,' said Arthur, and his consciousness stepped out again for a quick breather. His body flopped back on the grass."
+
+- Arthur coping with his return to Earth as best as he could.
+%
+"`A curse,' said Slartibartfast, `which will engulf the Galaxy in fire and destruction, and possibly bring the Universe to a premature doom. I mean it,' he added. `Sounds like a bad time,' said Ford, `with luck I'll be drunk enough not to notice.'"
+
+- Ford ensuring everyone knew where his priorities lay.
+%
+"`My doctor says that I have a malformed public-duty gland and a natural deficiency in moral fibre, and that I am therefore excused from saving Universes.'"
+
+- Ford's last-ditch attempt to get out of helping Slartibartfast.
+%
+"Trillian did a little research in the ship's copy of THHGTTG. It had some advice to offer on drunkenness. `Go to it,' it said, `and good luck.' It was cross-referenced to the entry concerning the size of the Universe and ways of coping with that."
+
+- One of the more preferable pieces of advice contained in the Guide.
+%
+"His eyes seemed to be popping out of his head. He wasn't certain if this was because they were trying to see more clearly, or if they simply wanted to leave at this point."QUOTEHERESTRINGMAGIC1234- Arthur trying to see who had diverted him from going to a party.
+%
+"Arthur yawed wildly as his skin tried to jump one way and his skeleton the other, whilst his brain tried to work out which of his ears it most wanted to crawl out of. `Bet you weren't expecting to see me again,' said the monster, which Arthur couldn't help thinking was a strange remark for it to make, seeing as he had never met the creature before. He could tell that he hadn't met the creature before from the simple fact that he was able to sleep at nights."QUOTEHERESTRINGMAGIC1234- Arthur discovering who had diverted him from going to a party.
+%
+"`That young girl is one of the least benightedly unintelligent organic life forms it has been my profound lack of pleasure not to be able to avoid meeting.'"QUOTEHERESTRINGMAGIC1234- Marvin's first ever compliment about anybody.
+%
+"Arthur hoped and prayed that there wasn't an afterlife. Then he realised there was a contradiction there and merely hoped that there wasn't an afterlife."QUOTEHERESTRINGMAGIC1234- Arthur realising that he's in a certain death situation with a supernova bomb that is shaped like a cricket ball.
+%
+"`Credit?' he said. `Aaaargggh...' These two words are usually coupled together in the Old Pink Dog Bar."QUOTEHERESTRINGMAGIC1234- Ford in a spot of bother.
+%
+"`...we might as well start with where your hand is now.' Arthur said, `So which way do I go?' `Down,' said Fenchurch, `on this occasion.' He moved his hand. `Down,' she said, `is in fact the other way.' `Oh yes.'"QUOTEHERESTRINGMAGIC1234- Arthur trying to discover which part of Fenchurch is wrong.
+%
+"There was a point to this story, but it has temporarily escaped the chronicler's mind."QUOTEHERESTRINGMAGIC1234- This line perhaps best sums up the whole book.
+%
+"The last time anybody made a list of the top hundred character attributes of New Yorkers, common sense snuck in at number 79. .... When it's fall in New York, the air smells as if someone's been frying goats in it, and if you are keen to breathe the best plan is to open a window and stick your head in a building."QUOTEHERESTRINGMAGIC1234- Nuff said??
+%
+"`What's been happening here?' he demanded. `Oh just the nicest things, sir, just the nicest things. can I sit on your lap please?'" "`Colin, I am going to abandon you to your fate.' `I'm so happy.'" "`It will be very, very nasty for you, and that's just too bad. Got it?' `I gurgle with pleasure.'"QUOTEHERESTRINGMAGIC1234- Ford and Colin the robot.
+%
+"What the hell, he thought, you're only young once, and threw himself out of the window. That would at least keep the element of surprise on his side."QUOTEHERESTRINGMAGIC1234- Ford outwitting a Vogon with a rocket launcher by going into another certain death situation.
+%
+"The major difference between a thing that might go wrong and a thing that cannot possibly go wrong is that when a thing that cannot possibly go wrong goes wrong it usually turns out to be impossible to get at or repair."QUOTEHERESTRINGMAGIC1234- One of the laws of computers and programming revealed.
+%
+"`You know they've reintroduced the death penalty for insurance company directors?' `Really?' said Arthur. `No I didn't. For what offence?' Trillian frowned. `What do you mean, offence?' `I see.'"QUOTEHERESTRINGMAGIC1234- Evidence that there will be some justice in the Universe eventually.
+%
+"`She hit me on the head with the rock again.' `I think I can confirm that that was my daughter.' `Sweet kid.' `You have to get to know her,' said Arthur. `She eases up does she?' `No,' said Arthur, `but you get a better sense of when to duck.'"QUOTEHERESTRINGMAGIC1234- Ford and Arthur on Random.
+%
+"Far out in the uncharted backwaters of the unfashionable end of the western spiral arm of the Galaxy lies a small unregarded yellow sun. "
+%
+"Ah, " said Arthur, "this is obviously some strange usage of the word safe that I wasn't previously aware of. "
+%
+"I don't know, " said the voice on the PA, "apathetic bloody planet, I've no sympathy at all. "
+%
+"Now it is such a bizarrely improbable coincidence that anything so mindboggingly useful could have evolved purely by chance that some thinkers have chosen to see it as the final and clinching proof of the non-existence of God. "The argument goes something like this: `I refuse to prove that I exist,' says God, `for proof denies faith, and without faith I am nothing.' "`But,' says Man, `The Babel fish is a dead giveaway, isn't it? It could not have evolved by chance. It proves you exist, and so therefore, by your own arguments, you don't. QED.'
+%
+"Prostetnic Vogon Jeltz smiled very slowly. This was done not so much for effect as because he was trying to remember the sequence of muscle movements. "
+%
+"OK, so ten out of ten for style, but minus several million for good thinking, yeah? "
+%
+"In those days spirits were brave, the stakes were high, men were real men, women were real women, and small furry creatures from Alpha Centauri were real small furry creatures from Alpha Centauri. "
+%
+"For a moment, nothing happened. Then, after a second or so, nothing continued to happen. "
+%
+(aikamuotojen k�ytt� aikamatkustuksessa) "You can arrive (mayan arivan on-when) for any sitting you like without prior (late fore-when) reservation because you can book retrospectively, as it were when you return to your own time. (you can have on-book haventa forewhen presooning returningwenta retrohome.) "
+%
+"The suit into which the man's body had been stuffed looked as if it's only purpose in life was to demonstrate how difficult it was to get this sort of body into a suit. "
+%
+"He dropped his voice still lower. In the stillness, a fly would not have dared clear its throat. "
+%
+"And finally, " said Max, quieting the audience down and putting on his solemn face, "finally I believe we have with us here tonight, a party of believers, very devout believers, from the Church of the Second Coming of the Great Prophet Zarquon. " ... "There they are, " said Max, "sitting there, patiently. He said he'd come again, and he's kept you waiting a long time, so let's hope he's hurrying fellas, because he's only got eight minutes left! "
+%
+"As he came into the light they could see his black and gold uniform on which the buttons were so highly polished that they shone with an intensity that would have made an approaching motorist flash his lights in annoyance. "
+%
+"You're very sure of your facts, " he said at last, "I couldn't trust the thinking of a man who takes the Universe - if there is one - for granted. "
+%
+"What are you talking about? " "Never mind, eat the fruit. " "You know, this place almost looks like the Garden of Eden. " "Eat the fruit. " "Sounds quite like it too. "
+%
+"Rome wasn't burned in a day. "
+%
+"Does it worry you that you don't talk any kind of sense? "
+%
+"One's never alone with a rubber duck. "
+%
+"Another world, another day, another dawn. "
+%
+"He expanded his chest to make it totally clear that here was the sort of man you only dared to cross if you had a team of Sherpas with you. "
+%
+"It was real. At least, if it wasn't real, it did support them, and as that is what sofas are supposed to do, this, by any test that mattered, was a real sofa. "
+%
+Arthur said, "So which way do I go? " "Down, " said Fenchurch, "on this occasion. " He moved his hand. "Down, " she said, "is in fact the other way. " "Oh yes. "
+%
+"You're one hundred percent positive that the ship which is crashed on the bottom of this ocean is the ship which you said you were one hundred percent positive could one hundred percent positively never crash? "
+%
+"Yes, it's the right planet, all right, " he said again. "Right planet, wrong universe. "
+%
+"Ford had his own code of ethics. It wasn't much of one, but it was his and he stuck by it, more or less. One rule he made was never to buy his own drinks. He wasn't sure if that counted as an ethic, but you have to go with what you've got. "
+%
+"Arthur felt at a bit of a loss. There was a whole Galaxy of stuff out there for him, and he wondered if it was churlish of him to complain to himself that it lacked just two things: the world he was born on and the woman he loved. "
+%
+"What was the self-sacrifice? " "I jettisoned half of a much loved and I think irreplaceable pair of shoes. " "Why was that self-sacrifice? " "Because they were mine! " said Ford crossly. "I think we have different value systems. " "Well mine's better. " "That's according to your... oh never mind. " 
diff --git a/plugins/hitchhiker/hitchhiker.plugin.zsh b/plugins/hitchhiker/hitchhiker.plugin.zsh
new file mode 100644
index 000000000..aeafaf01e
--- /dev/null
+++ b/plugins/hitchhiker/hitchhiker.plugin.zsh
@@ -0,0 +1,23 @@
+HITCHHIKER_DIR="${0:h}/fortunes"
+
+# Aliases
+alias hitchhiker="fortune -a $HITCHHIKER_DIR"
+alias hitchhiker_cow="hitchhiker | cowthink"
+
+() {
+  # Don't generate hitchhiker.dat if it exists and is up-to-date
+  if [[ -f "$HITCHHIKER_DIR/hitchhiker.dat" ]] && ! [[ "$HITCHHIKER_DIR/hitchhiker.dat" -ot "$HITCHHIKER_DIR/hitchhiker" ]]; then
+    return
+  fi
+
+  # If strfile is not found: some systems install strfile in /usr/sbin but it's not in $PATH
+  if ! command -v strfile &>/dev/null && ! [[ -f /usr/sbin/strfile ]]; then
+    echo "[oh-my-zsh] hitchhiker depends on strfile, which is not installed" >&2
+    echo "[oh-my-zsh] strfile is often provided as part of the 'fortune' package" >&2
+    return
+  fi
+
+  "${commands[strfile]:-/usr/sbin/strfile}" "$HITCHHIKER_DIR/hitchhiker" "$HITCHHIKER_DIR/hitchhiker.dat" >/dev/null
+}
+
+unset HITCHHIKER_DIR

From 6e56784179eae5a8b0b688916b4fedf7fd01fa3b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Sun, 28 Mar 2021 15:01:39 +0200
Subject: [PATCH 289/869] fix(virtualenv): allow empty prefix/suffix in prompt
 function (#9763)

Fixes #9763
---
 plugins/virtualenv/virtualenv.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/virtualenv/virtualenv.plugin.zsh b/plugins/virtualenv/virtualenv.plugin.zsh
index e250eb63e..3041475ed 100644
--- a/plugins/virtualenv/virtualenv.plugin.zsh
+++ b/plugins/virtualenv/virtualenv.plugin.zsh
@@ -1,6 +1,6 @@
 function virtualenv_prompt_info(){
   [[ -n ${VIRTUAL_ENV} ]] || return
-  echo "${ZSH_THEME_VIRTUALENV_PREFIX:=[}${VIRTUAL_ENV:t}${ZSH_THEME_VIRTUALENV_SUFFIX:=]}"
+  echo "${ZSH_THEME_VIRTUALENV_PREFIX=[}${VIRTUAL_ENV:t}${ZSH_THEME_VIRTUALENV_SUFFIX=]}"
 }
 
 # disables prompt mangling in virtual_env/bin/activate

From 69507c9518f7c7889d8f47ec8e67bfda02405817 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Sun, 28 Mar 2021 15:28:01 +0200
Subject: [PATCH 290/869] refactor(adben): refactor theme and degrade
 gracefully on missing dependencies (#9734)

---
 themes/adben.zsh-theme | 104 +++++++++++++++++++++++------------------
 1 file changed, 58 insertions(+), 46 deletions(-)

diff --git a/themes/adben.zsh-theme b/themes/adben.zsh-theme
index 7321df724..ebdec7c82 100644
--- a/themes/adben.zsh-theme
+++ b/themes/adben.zsh-theme
@@ -29,11 +29,13 @@
 # # This theme's look and feel is based on the Aaron Toponce's zsh theme, more info:
 # # https://pthree.org/2008/11/23/727/
 # # enjoy!
+
 ########## COLOR ###########
 for COLOR in CYAN WHITE YELLOW MAGENTA BLACK BLUE RED DEFAULT GREEN GREY; do
-    eval PR_$COLOR='%{$fg[${(L)COLOR}]%}'
-    eval PR_BRIGHT_$COLOR='%{$fg_bold[${(L)COLOR}]%}'
+  eval PR_$COLOR='%{$fg[${(L)COLOR}]%}'
+  eval PR_BRIGHT_$COLOR='%{$fg_bold[${(L)COLOR}]%}'
 done
+
 PR_RESET="%{$reset_color%}"
 RED_START="${PR_RESET}${PR_GREY}<${PR_RESET}${PR_RED}<${PR_BRIGHT_RED}<${PR_RESET} "
 RED_END="${PR_RESET}${PR_BRIGHT_RED}>${PR_RESET}${PR_RED}>${PR_GREY}>${PR_RESET} "
@@ -44,14 +46,14 @@ DIVISION="${PR_RESET}${PR_RED} < ${PR_RESET}"
 VCS_DIRTY_COLOR="${PR_RESET}${PR_YELLOW}"
 VCS_CLEAN_COLOR="${PR_RESET}${PR_GREEN}"
 VCS_SUFIX_COLOR="${PR_RESET}${PR_RED}› ${PR_RESET}"
-# ########## COLOR ###########
-# ########## SVN ###########
+
+########## SVN ###########
 ZSH_THEME_SVN_PROMPT_PREFIX="${PR_RESET}${PR_RED}‹svn:"
 ZSH_THEME_SVN_PROMPT_SUFFIX=""
 ZSH_THEME_SVN_PROMPT_DIRTY="${VCS_DIRTY_COLOR} ✘${VCS_SUFIX_COLOR}"
 ZSH_THEME_SVN_PROMPT_CLEAN="${VCS_CLEAN_COLOR} ✔${VCS_SUFIX_COLOR}"
-# ########## SVN ###########
-# ########## GIT ###########
+
+########## GIT ###########
 ZSH_THEME_GIT_PROMPT_PREFIX="${PR_RESET}${PR_RED}‹git:"
 ZSH_THEME_GIT_PROMPT_SUFFIX=""
 ZSH_THEME_GIT_PROMPT_DIRTY="${VCS_DIRTY_COLOR} ✘${VCS_SUFIX_COLOR}"
@@ -62,53 +64,63 @@ ZSH_THEME_GIT_PROMPT_DELETED="${PR_RESET}${PR_YELLOW} ✖${PR_RESET}"
 ZSH_THEME_GIT_PROMPT_RENAMED="${PR_RESET}${PR_YELLOW} ➜${PR_RESET}"
 ZSH_THEME_GIT_PROMPT_UNMERGED="${PR_RESET}${PR_YELLOW} ═${PR_RESET}"
 ZSH_THEME_GIT_PROMPT_UNTRACKED="${PR_RESET}${PR_YELLOW} ✭${PR_RESET}"
-# ########## GIT ###########
-function precmd {
-    #gets the fortune
-    ps1_fortune () {
-        #Choose from all databases, regardless of whether they are considered "offensive"
-        fortune -a
-    }
-    #obtains the tip
-    ps1_command_tip () {
-        wget -qO - http://www.commandlinefu.com/commands/random/plaintext | sed 1d | sed '/^$/d'
-    }
-    prompt_header () {
-        if [[ "true" == "$ENABLE_COMMAND_TIP" ]]; then
-            ps1_command_tip
-        else
-            ps1_fortune
-        fi
-    }
-    PROMPT_HEAD="${RED_START}${PR_YELLOW}$(prompt_header)${PR_RESET}"
-    # set a simple variable to show when in screen
-    if [[ -n "${WINDOW}" ]]; then
-        SCREEN=""
+
+# Get a fortune quote
+ps1_fortune() {
+  (( ${+commands[fortune]} )) && fortune
+}
+
+# Obtain a command tip
+ps1_command_tip() {
+  {
+    if (( ${+commands[wget]} )); then
+      command wget -qO- https://www.commandlinefu.com/commands/random/plaintext
+    elif (( ${+commands[curl]} )); then
+      command curl -fsL https://www.commandlinefu.com/commands/random/plaintext
     fi
+  } | sed 1d | sed '/^$/d'
+}
+
+function precmd_adben {
+  prompt_header() {
+    if [[ "$ENABLE_COMMAND_TIP" = true ]]; then
+      ps1_command_tip
+    else
+      ps1_fortune
+    fi
+  }
+
+  PROMPT_HEAD="${RED_START}${PR_YELLOW}$(prompt_header)${PR_RESET}"
+
+  # set a simple variable to show when in screen
+  if [[ -n "${WINDOW}" ]]; then
+    SCREEN=""
+  fi
 }
 
 # Context: user@directory or just directory
-prompt_context () {
-    if [[ "$USERNAME" != "$DEFAULT_USER" || -n "$SSH_CLIENT" ]]; then
-        echo -n "${PR_RESET}${PR_RED}$USERNAME@%m${PR_RESET}${PR_BRIGHT_YELLOW}%~%<<${PR_RESET}"
-    else
-        echo -n "${PR_RESET}${PR_BRIGHT_YELLOW}%~%<<${PR_RESET}"
-    fi
+prompt_context() {
+  if [[ "$USERNAME" != "$DEFAULT_USER" || -n "$SSH_CLIENT" ]]; then
+    echo -n "${PR_RESET}${PR_RED}$USERNAME@%m${PR_RESET}${PR_BRIGHT_YELLOW}%~%<<${PR_RESET}"
+  else
+    echo -n "${PR_RESET}${PR_BRIGHT_YELLOW}%~%<<${PR_RESET}"
+  fi
 }
 
-set_prompt () {
-    # required for the prompt
-    setopt prompt_subst
-    autoload zsh/terminfo
+########## SETUP ###########
 
-    # ######### PROMPT #########
-    PROMPT='${PROMPT_HEAD}
+# Required for the prompt
+setopt prompt_subst
+autoload zsh/terminfo
+
+# Prompt
+PROMPT='${PROMPT_HEAD}
 ${RED_START}$(prompt_context)
 ${GREEN_START_P1}'
-    RPROMPT='${PR_RESET}$(git_prompt_info)$(svn_prompt_info)${PR_YELLOW}%D{%R.%S %a %b %d %Y} ${GREEN_END}${PR_RESET}'
-    # Matching continuation prompt
-    PROMPT2='${GREEN_BASE_START}${PR_RESET} %_ ${GREEN_BASE_START}${PR_RESET} '
-    # ######### PROMPT #########
-}
+RPROMPT='${PR_RESET}$(git_prompt_info)$(svn_prompt_info)${PR_YELLOW}%D{%R.%S %a %b %d %Y} ${GREEN_END}${PR_RESET}'
+# Matching continuation prompt
+PROMPT2='${GREEN_BASE_START}${PR_RESET} %_ ${GREEN_BASE_START}${PR_RESET} '
 
-set_prompt
+# Prompt head
+autoload -Uz add-zsh-hook
+add-zsh-hook precmd precmd_adben

From 2b1d4122796fea12dcaa7545cfca59fb43e6393e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Wed, 31 Mar 2021 11:25:26 +0200
Subject: [PATCH 291/869] fix(git): add `push` or `save` to `gstu` alias
 (#9766)

Fixes #9766
---
 plugins/git/git.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index 8167980fa..e815d0787 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -263,7 +263,7 @@ alias gstd='git stash drop'
 alias gstl='git stash list'
 alias gstp='git stash pop'
 alias gsts='git stash show --text'
-alias gstu='git stash --include-untracked'
+alias gstu='gsta --include-untracked'
 alias gstall='git stash --all'
 alias gsu='git submodule update'
 alias gsw='git switch'

From 2d40b562e5da4c885babc1f7f09aa33a8a891eb2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Caron?= <stephane@scaron.info>
Date: Thu, 1 Apr 2021 00:35:28 +0200
Subject: [PATCH 292/869] fix(dirhistory): make sure to call built-in zle
 widgets (#9771)

Without this patch, if the called zle widgets have been redefined this plugin might come into
conflict. Related: #9770.
---
 plugins/dirhistory/dirhistory.plugin.zsh | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/plugins/dirhistory/dirhistory.plugin.zsh b/plugins/dirhistory/dirhistory.plugin.zsh
index 35c43d76a..ec1606940 100644
--- a/plugins/dirhistory/dirhistory.plugin.zsh
+++ b/plugins/dirhistory/dirhistory.plugin.zsh
@@ -108,16 +108,16 @@ function dirhistory_forward() {
 # Bind keys to history navigation
 function dirhistory_zle_dirhistory_back() {
   # Erase current line in buffer
-  zle kill-buffer
-  dirhistory_back 
-  zle accept-line
+  zle .kill-buffer
+  dirhistory_back
+  zle .accept-line
 }
 
 function dirhistory_zle_dirhistory_future() {
   # Erase current line in buffer
-  zle kill-buffer
+  zle .kill-buffer
   dirhistory_forward
-  zle accept-line
+  zle .accept-line
 }
 
 zle -N dirhistory_zle_dirhistory_back
@@ -160,15 +160,15 @@ function dirhistory_down() {
 
 # Bind keys to hierarchy navigation
 function dirhistory_zle_dirhistory_up() {
-  zle kill-buffer   # Erase current line in buffer
+  zle .kill-buffer   # Erase current line in buffer
   dirhistory_up
-  zle accept-line
+  zle .accept-line
 }
 
 function dirhistory_zle_dirhistory_down() {
-  zle kill-buffer   # Erase current line in buffer
+  zle .kill-buffer   # Erase current line in buffer
   dirhistory_down
-  zle accept-line
+  zle .accept-line
 }
 
 zle -N dirhistory_zle_dirhistory_up

From 279212f2ccab902911cd55f3380374f5be6e05db Mon Sep 17 00:00:00 2001
From: Max Staff <MaxMatti@users.noreply.github.com>
Date: Tue, 6 Apr 2021 12:23:59 +0200
Subject: [PATCH 293/869] feat(theme_chooser): display non-zero exit code
 (#8428)

Fixes #8427
---
 tools/theme_chooser.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tools/theme_chooser.sh b/tools/theme_chooser.sh
index 82ae5857c..3883f1d37 100755
--- a/tools/theme_chooser.sh
+++ b/tools/theme_chooser.sh
@@ -25,6 +25,7 @@ function theme_preview() {
     print "$fg[blue]${(l.((${COLUMNS}-${#THEME_NAME}-5))..─.)}$reset_color $THEME_NAME $fg[blue]───$reset_color"
     source "$THEMES_DIR/$THEME"
     cols=$(tput cols)
+    (exit 1)
     print -P "$PROMPT                                                                                      $RPROMPT"
 }
 

From 790f185e0fd8b70eab33847afe02af07f6af3a1e Mon Sep 17 00:00:00 2001
From: ratijas <me@ratijas.tk>
Date: Tue, 6 Apr 2021 13:28:22 +0300
Subject: [PATCH 294/869] refactor(archlinux): fix name & scripts; reorder
 aliases (#9546)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Marc Cornellà <hello@mcornella.com>
---
 plugins/archlinux/README.md            | 256 ++++++++++++------------
 plugins/archlinux/archlinux.plugin.zsh | 260 ++++++++++---------------
 2 files changed, 243 insertions(+), 273 deletions(-)

diff --git a/plugins/archlinux/README.md b/plugins/archlinux/README.md
index 5882c7603..a4f191a5f 100644
--- a/plugins/archlinux/README.md
+++ b/plugins/archlinux/README.md
@@ -1,4 +1,4 @@
-# Archlinux plugin
+# Arch Linux plugin
 
 This plugin adds some aliases and functions to work with Arch Linux.
 
@@ -10,145 +10,159 @@ plugins=(... archlinux)
 
 ## Features
 
-#### YAY
+### Pacman
 
-| Alias   | Command                            | Description                                                         |
-|---------|------------------------------------|---------------------------------------------------------------------|
-| yaconf  | yay -Pg                            | Print current configuration                                         |
-| yain    | yay -S                             | Install packages from the repositories                              |
-| yains   | yay -U                             | Install a package from a local file                                 |
-| yainsd  | yay -S --asdeps                    | Install packages as dependencies of another package                 |
-| yaloc   | yay -Qi                            | Display information about a package in the local database           |
-| yalocs  | yay -Qs                            | Search for packages in the local database                           |
-| yalst   | yay -Qe                            | List installed packages including from AUR (tagged as "local")      |
-| yamir   | yay -Syy                           | Force refresh of all package lists after updating mirrorlist        |
-| yaorph  | yay -Qtd                           | Remove orphans using yay                                            |
-| yare    | yay -R                             | Remove packages, keeping its settings and dependencies              |
-| yarem   | yay -Rns                           | Remove packages, including its settings and unneeded dependencies   |
-| yarep   | yay -Si                            | Display information about a package in the repositories             |
-| yareps  | yay -Ss                            | Search for packages in the repositories                             |
-| yaupg   | yay -Syu                           | Sync with repositories before upgrading packages                    |
-| yasu    | yay -Syu --no-confirm              | Same as `yaupg`, but without confirmation                           |
+| Alias        | Command                                | Description                                                      |
+|--------------|----------------------------------------|------------------------------------------------------------------|
+| pacin        | `sudo pacman -S`                       | Install packages from the repositories                           |
+| pacins       | `sudo pacman -U`                       | Install a package from a local file                              |
+| pacinsd      | `sudo pacman -S --asdeps`              | Install packages as dependencies of another package              |
+| pacloc       | `pacman -Qi`                           | Display information about a package in the local database        |
+| paclocs      | `pacman -Qs`                           | Search for packages in the local database                        |
+| paclsorphans | `sudo pacman -Qdt`                     | List all orphaned packages                                       |
+| pacmir       | `sudo pacman -Syy`                     | Force refresh of all package lists after updating mirrorlist     |
+| pacre        | `sudo pacman -R`                       | Remove packages, keeping its settings and dependencies           |
+| pacrem       | `sudo pacman -Rns`                     | Remove packages, including its settings and dependencies         |
+| pacrep       | `pacman -Si`                           | Display information about a package in the repositories          |
+| pacreps      | `pacman -Ss`                           | Search for packages in the repositories                          |
+| pacrmorphans | `sudo pacman -Rs $(pacman -Qtdq)`      | Delete all orphaned packages                                     |
+| pacupd       | `sudo pacman -Sy && <abs/aur refresh>`[¹](#f1) | Update and refresh local package, ABS and AUR databases  |
+| pacupg       | `sudo pacman -Syu`                     | Sync with repositories before upgrading packages                 |
+| pacfileupg   | `sudo pacman -Fy`                      | Download fresh package databases from the server                 |
+| pacfiles     | `pacman -F`                            | Search package file names for matching strings                   |
+| pacls        | `pacman -Ql`                           | List files in a package                                          |
+| pacown       | `pacman -Qo`                           | Show which package owns a file                                   |
+| upgrade[³](#f3) | `sudo pacman -Syu`                  | Sync with repositories before upgrading packages                 |
 
-#### TRIZEN
+| Function       | Description                                               |
+|----------------|-----------------------------------------------------------|
+| pacdisowned    | List all disowned files in your system                    |
+| paclist        | List all explicitly installed packages with a description |
+| pacmanallkeys  | Get all keys for developers and trusted users             |
+| pacmansignkeys | Locally trust all keys passed as parameters               |
+| pacweb         | Open the website of an ArchLinux package                  |
 
-| Alias   | Command                            | Description                                                         |
-|---------|------------------------------------|---------------------------------------------------------------------|
-| trconf  | trizen -C                          | Fix all configuration files with vimdiff                            |
-| trin    | trizen -S                          | Install packages from the repositories                              |
-| trins   | trizen -U                          | Install a package from a local file                                 |
-| trinsd  | trizen -S --asdeps                 | Install packages as dependencies of another package                 |
-| trloc   | trizen -Qi                         | Display information about a package in the local database           |
-| trlocs  | trizen -Qs                         | Search for packages in the local database                           |
-| trlst   | trizen -Qe                         | List installed packages including from AUR (tagged as "local")      |
-| trmir   | trizen -Syy                        | Force refresh of all package lists after updating mirrorlist        |
-| trorph  | trizen -Qtd                        | Remove orphans using yaourt                                         |
-| trre    | trizen -R                          | Remove packages, keeping its settings and dependencies              |
-| trrem   | trizen -Rns                        | Remove packages, including its settings and unneeded dependencies   |
-| trrep   | trizen -Si                         | Display information about a package in the repositories             |
-| trreps  | trizen -Ss                         | Search for packages in the repositories                             |
-| trupd   | trizen -Sy && sudo abs && sudo aur | Update and refresh local package, ABS and AUR databases             |
-| trupd   | trizen -Sy && sudo abs             | Update and refresh the local package and ABS databases              |
-| trupd   | trizen -Sy && sudo aur             | Update and refresh the local package and AUR databases              |
-| trupd   | trizen -Sy                         | Update and refresh the local package database                       |
-| trupg   | trizen -Syua                       | Sync with repositories before upgrading all packages (from AUR too) |
-| trsu    | trizen -Syua --no-confirm          | Same as `trupg`, but without confirmation                           |
-| upgrade | trizen -Syu                        | Sync with repositories before upgrading packages                    |
+Note: paclist used to print packages with a description which are (1) explicitly installed
+and (2) available for upgrade. Due to flawed scripting, it also printed all packages if no
+upgrades were available. Use `pacman -Que` instead.
 
-#### YAOURT
+### AUR helpers
 
-| Alias   | Command                            | Description                                                         |
-|---------|------------------------------------|---------------------------------------------------------------------|
-| yaconf  | yaourt -C                          | Fix all configuration files with vimdiff                            |
-| yain    | yaourt -S                          | Install packages from the repositories                              |
-| yains   | yaourt -U                          | Install a package from a local file                                 |
-| yainsd  | yaourt -S --asdeps                 | Install packages as dependencies of another package                 |
-| yaloc   | yaourt -Qi                         | Display information about a package in the local database           |
-| yalocs  | yaourt -Qs                         | Search for packages in the local database                           |
-| yalst   | yaourt -Qe                         | List installed packages including from AUR (tagged as "local")      |
-| yamir   | yaourt -Syy                        | Force refresh of all package lists after updating mirrorlist        |
-| yaorph  | yaourt -Qtd                        | Remove orphans using yaourt                                         |
-| yare    | yaourt -R                          | Remove packages, keeping its settings and dependencies              |
-| yarem   | yaourt -Rns                        | Remove packages, including its settings and unneeded dependencies   |
-| yarep   | yaourt -Si                         | Display information about a package in the repositories             |
-| yareps  | yaourt -Ss                         | Search for packages in the repositories                             |
-| yaupd   | yaourt -Sy && sudo abs && sudo aur | Update and refresh local package, ABS and AUR databases             |
-| yaupd   | yaourt -Sy && sudo abs             | Update and refresh the local package and ABS databases              |
-| yaupd   | yaourt -Sy && sudo aur             | Update and refresh the local package and AUR databases              |
-| yaupd   | yaourt -Sy                         | Update and refresh the local package database                       |
-| yaupg   | yaourt -Syua                       | Sync with repositories before upgrading all packages (from AUR too) |
-| yasu    | yaourt -Syua --no-confirm          | Same as `yaupg`, but without confirmation                           |
-| upgrade | yaourt -Syu                        | Sync with repositories before upgrading packages                    |
+#### Pacaur
 
-#### PACAUR
+| Alias   | Command                           | Description                                                         |
+|---------|-----------------------------------|---------------------------------------------------------------------|
+| pain    | `pacaur -S`                       | Install packages from the repositories                              |
+| pains   | `pacaur -U`                       | Install a package from a local file                                 |
+| painsd  | `pacaur -S --asdeps`              | Install packages as dependencies of another package                 |
+| paloc   | `pacaur -Qi`                      | Display information about a package in the local database           |
+| palocs  | `pacaur -Qs`                      | Search for packages in the local database                           |
+| palst   | `pacaur -Qe`                      | List installed packages including from AUR (tagged as "local")      |
+| pamir   | `pacaur -Syy`                     | Force refresh of all package lists after updating mirrorlist        |
+| paorph  | `pacaur -Qtd`                     | Remove orphans using pacaur                                         |
+| pare    | `pacaur -R`                       | Remove packages, keeping its settings and dependencies              |
+| parem   | `pacaur -Rns`                     | Remove packages, including its settings and unneeded dependencies   |
+| parep   | `pacaur -Si`                      | Display information about a package in the repositories             |
+| pareps  | `pacaur -Ss`                      | Search for packages in the repositories                             |
+| paupd   | `pacaur -Sy && <abs/aur refresh>`[¹](#f1) | Update and refresh local package, ABS and AUR databases     |
+| paupg   | `pacaur -Syua`                    | Sync with repositories before upgrading all packages (from AUR too) |
+| pasu    | `pacaur -Syua --no-confirm`       | Same as `paupg`, but without confirmation                           |
+| upgrade[³](#f3) | `pacaur -Syu`             | Sync with repositories before upgrading packages                    |
 
-| Alias   | Command                            | Description                                                         |
-|---------|------------------------------------|---------------------------------------------------------------------|
-| pain    | pacaur -S                          | Install packages from the repositories                              |
-| pains   | pacaur -U                          | Install a package from a local file                                 |
-| painsd  | pacaur -S --asdeps                 | Install packages as dependencies of another package                 |
-| paloc   | pacaur -Qi                         | Display information about a package in the local database           |
-| palocs  | pacaur -Qs                         | Search for packages in the local database                           |
-| palst   | pacaur -Qe                         | List installed packages including from AUR (tagged as "local")      |
-| pamir   | pacaur -Syy                        | Force refresh of all package lists after updating mirrorlist        |
-| paorph  | pacaur -Qtd                        | Remove orphans using pacaur                                         |
-| pare    | pacaur -R                          | Remove packages, keeping its settings and dependencies              |
-| parem   | pacaur -Rns                        | Remove packages, including its settings and unneeded dependencies   |
-| parep   | pacaur -Si                         | Display information about a package in the repositories             |
-| pareps  | pacaur -Ss                         | Search for packages in the repositories                             |
-| paupd   | pacaur -Sy && sudo abs && sudo aur | Update and refresh local package, ABS and AUR databases             |
-| paupd   | pacaur -Sy && sudo abs             | Update and refresh the local package and ABS databases              |
-| paupd   | pacaur -Sy && sudo aur             | Update and refresh the local package and AUR databases              |
-| paupd   | pacaur -Sy                         | Update and refresh the local package database                       |
-| paupg   | pacaur -Syua                       | Sync with repositories before upgrading all packages (from AUR too) |
-| pasu    | pacaur -Syua --no-confirm          | Same as `paupg`, but without confirmation                           |
-| upgrade | pacaur -Syu                        | Sync with repositories before upgrading packages                    |
+#### Trizen
 
-#### PACMAN
+| Alias   | Command                           | Description                                                         |
+|---------|-----------------------------------|---------------------------------------------------------------------|
+| trconf  | `trizen -C`                       | Fix all configuration files with vimdiff                            |
+| trin    | `trizen -S`                       | Install packages from the repositories                              |
+| trins   | `trizen -U`                       | Install a package from a local file                                 |
+| trinsd  | `trizen -S --asdeps`              | Install packages as dependencies of another package                 |
+| trloc   | `trizen -Qi`                      | Display information about a package in the local database           |
+| trlocs  | `trizen -Qs`                      | Search for packages in the local database                           |
+| trlst   | `trizen -Qe`                      | List installed packages including from AUR (tagged as "local")      |
+| trmir   | `trizen -Syy`                     | Force refresh of all package lists after updating mirrorlist        |
+| trorph  | `trizen -Qtd`                     | Remove orphans using yaourt                                         |
+| trre    | `trizen -R`                       | Remove packages, keeping its settings and dependencies              |
+| trrem   | `trizen -Rns`                     | Remove packages, including its settings and unneeded dependencies   |
+| trrep   | `trizen -Si`                      | Display information about a package in the repositories             |
+| trreps  | `trizen -Ss`                      | Search for packages in the repositories                             |
+| trupd   | `trizen -Sy && <abs/aur refresh>`[¹](#f1) | Update and refresh local package, ABS and AUR databases     |
+| trupg   | `trizen -Syua`                    | Sync with repositories before upgrading all packages (from AUR too) |
+| trsu    | `trizen -Syua --no-confirm`       | Same as `trupg`, but without confirmation                           |
+| upgrade[³](#f3) | `trizen -Syu`             | Sync with repositories before upgrading packages                    |
 
-| Alias        | Command                                 | Description                                                  |
-|--------------|-----------------------------------------|--------------------------------------------------------------|
-| pacin        | sudo pacman -S                          | Install packages from the repositories                       |
-| pacins       | sudo pacman -U                          | Install a package from a local file                          |
-| pacinsd      | sudo pacman -S --asdeps                 | Install packages as dependencies of another package          |
-| pacloc       | pacman -Qi                              | Display information about a package in the local database    |
-| paclocs      | pacman -Qs                              | Search for packages in the local database                    |
-| paclsorphans | sudo pacman -Qdt                        | List all orphaned packages                                   |
-| pacmir       | sudo pacman -Syy                        | Force refresh of all package lists after updating mirrorlist |
-| pacre        | sudo pacman -R                          | Remove packages, keeping its settings and dependencies       |
-| pacrem       | sudo pacman -Rns                        | Remove packages, including its settings and dependencies     |
-| pacrep       | pacman -Si                              | Display information about a package in the repositories      |
-| pacreps      | pacman -Ss                              | Search for packages in the repositories                      |
-| pacrmorphans | sudo pacman -Rs $(pacman -Qtdq)         | Delete all orphaned packages                                 |
-| pacupd       | sudo pacman -Sy && sudo abs && sudo aur | Update and refresh the local package, ABS and AUR databases  |
-| pacupd       | sudo pacman -Sy && sudo abs             | Update and refresh the local package and ABS databases       |
-| pacupd       | sudo pacman -Sy && sudo aur             | Update and refresh the local package and AUR databases       |
-| pacupd       | sudo pacman -Sy                         | Update and refresh the local package database                |
-| pacupg       | sudo pacman -Syu                        | Sync with repositories before upgrading packages             |
-| upgrade      | sudo pacman -Syu                        | Sync with repositories before upgrading packages             |
-| pacfileupg   | sudo pacman -Fy                         | Download fresh package databases from the server             |
-| pacfiles     | pacman -F                               | Search package file names for matching strings               |
-| pacls        | pacman -Ql                              | List files in a package                                      |
-| pacown       | pacman -Qo                              | Show which package owns a file                               |
+#### Yaourt[²](#f2)
 
-| Function       | Description                                          |
-|----------------|------------------------------------------------------|
-| pacdisowned    | List all disowned files in your system               |
-| paclist        | List all installed packages with a short description |
-| pacmanallkeys  | Get all keys for developers and trusted users        |
-| pacmansignkeys | Locally trust all keys passed as parameters          |
-| pacweb         | Open the website of an ArchLinux package             |
+| Alias   | Command                           | Description                                                         |
+|---------|-----------------------------------|---------------------------------------------------------------------|
+| yaconf  | `yaourt -C`                       | Fix all configuration files with vimdiff                            |
+| yain    | `yaourt -S`                       | Install packages from the repositories                              |
+| yains   | `yaourt -U`                       | Install a package from a local file                                 |
+| yainsd  | `yaourt -S --asdeps`              | Install packages as dependencies of another package                 |
+| yaloc   | `yaourt -Qi`                      | Display information about a package in the local database           |
+| yalocs  | `yaourt -Qs`                      | Search for packages in the local database                           |
+| yalst   | `yaourt -Qe`                      | List installed packages including from AUR (tagged as "local")      |
+| yamir   | `yaourt -Syy`                     | Force refresh of all package lists after updating mirrorlist        |
+| yaorph  | `yaourt -Qtd`                     | Remove orphans using yaourt                                         |
+| yare    | `yaourt -R`                       | Remove packages, keeping its settings and dependencies              |
+| yarem   | `yaourt -Rns`                     | Remove packages, including its settings and unneeded dependencies   |
+| yarep   | `yaourt -Si`                      | Display information about a package in the repositories             |
+| yareps  | `yaourt -Ss`                      | Search for packages in the repositories                             |
+| yaupd   | `yaourt -Sy && <abs/aur refresh>`[¹](#f1) | Update and refresh local package, ABS and AUR databases     |
+| yaupg   | `yaourt -Syua`                    | Sync with repositories before upgrading all packages (from AUR too) |
+| yasu    | `yaourt -Syua --no-confirm`       | Same as `yaupg`, but without confirmation                           |
+| upgrade[³](#f3) | `yaourt -Syu`             | Sync with repositories before upgrading packages                    |
+
+#### Yay[²](#f2)
+
+| Alias   | Command                        | Description                                                       |
+|---------|--------------------------------|-------------------------------------------------------------------|
+| yaconf  | `yay -Pg`                      | Print current configuration                                       |
+| yain    | `yay -S`                       | Install packages from the repositories                            |
+| yains   | `yay -U`                       | Install a package from a local file                               |
+| yainsd  | `yay -S --asdeps`              | Install packages as dependencies of another package               |
+| yaloc   | `yay -Qi`                      | Display information about a package in the local database         |
+| yalocs  | `yay -Qs`                      | Search for packages in the local database                         |
+| yalst   | `yay -Qe`                      | List installed packages including from AUR (tagged as "local")    |
+| yamir   | `yay -Syy`                     | Force refresh of all package lists after updating mirrorlist      |
+| yaorph  | `yay -Qtd`                     | Remove orphans using yay                                          |
+| yare    | `yay -R`                       | Remove packages, keeping its settings and dependencies            |
+| yarem   | `yay -Rns`                     | Remove packages, including its settings and unneeded dependencies |
+| yarep   | `yay -Si`                      | Display information about a package in the repositories           |
+| yareps  | `yay -Ss`                      | Search for packages in the repositories                           |
+| yaupd   | `yay -Sy && <abs/aur refresh>`[¹](#f1) | Update and refresh local package, ABS and AUR databases   |
+| yaupg   | `yay -Syu`                     | Sync with repositories before upgrading packages                  |
+| yasu    | `yay -Syu --no-confirm`        | Same as `yaupg`, but without confirmation                         |
+| upgrade[³](#f3) | `yay -Syu`             | Sync with repositories before upgrading packages                  |
 
 ---
 
+<span id="f1">¹</span>
+If the `abs` and/or `aur` commands are present, `sudo abs` and `sudo aur` are also
+called to update the ABS and AUR databases.
+
+<span id="f2">²</span>
+Yay and Yaourt aliases overlap. If both are installed, yay will take precedence.
+
+<span id="f3">³</span>
+The `upgrade` alias is set for all package managers. Its value will depend on
+whether the package manager is installed, checked in the following order:
+
+1. `yay`
+2. `yaourt`
+3. `trizen`
+4. `pacaur`
+5. `pacman`
+
 ## Contributors
 
 - Benjamin Boudreau - dreurmail@gmail.com
 - Celso Miranda - contacto@celsomiranda.net
+- ratijas (ivan tkachenko) - me@ratijas.tk
+- Juraj Fiala - doctorjellyface@riseup.net
 - KhasMek - Boushh@gmail.com
+- Majora320 (Moses Miller) - Majora320@gmail.com
 - Martin Putniorz - mputniorz@gmail.com
 - MatthR3D - matthr3d@gmail.com
 - ornicar - thibault.duplessis@gmail.com
-- Juraj Fiala - doctorjellyface@riseup.net
-- Majora320 (Moses Miller) - Majora320@gmail.com
 - Ybalrid (Arthur Brainville) - ybalrid@ybalrid.info
diff --git a/plugins/archlinux/archlinux.plugin.zsh b/plugins/archlinux/archlinux.plugin.zsh
index 32f09cef9..d53761077 100644
--- a/plugins/archlinux/archlinux.plugin.zsh
+++ b/plugins/archlinux/archlinux.plugin.zsh
@@ -1,138 +1,12 @@
-if (( $+commands[trizen] )); then
-  alias trconf='trizen -C'
-  alias trupg='trizen -Syua'
-  alias trsu='trizen -Syua --noconfirm'
-  alias trin='trizen -S'
-  alias trins='trizen -U'
-  alias trre='trizen -R'
-  alias trrem='trizen -Rns'
-  alias trrep='trizen -Si'
-  alias trreps='trizen -Ss'
-  alias trloc='trizen -Qi'
-  alias trlocs='trizen -Qs'
-  alias trlst='trizen -Qe'
-  alias trorph='trizen -Qtd'
-  alias trinsd='trizen -S --asdeps'
-  alias trmir='trizen -Syy'
+#######################################
+#               Pacman                #
+#######################################
 
+# abs and aur command check
+local abs_aur=''
+(( ! $+commands[abs] )) || abs_aur+=' && sudo abs'
+(( ! $+commands[aur] )) || abs_aur+=' && sudo aur'
 
-  if (( $+commands[abs] && $+commands[aur] )); then
-    alias trupd='trizen -Sy && sudo abs && sudo aur'
-  elif (( $+commands[abs] )); then
-    alias trupd='trizen -Sy && sudo abs'
-  elif (( $+commands[aur] )); then
-    alias trupd='trizen -Sy && sudo aur'
-  else
-    alias trupd='trizen -Sy'
-  fi
-fi
-
-if (( $+commands[yaourt] )); then
-  alias yaconf='yaourt -C'
-  alias yaupg='yaourt -Syua'
-  alias yasu='yaourt -Syua --noconfirm'
-  alias yain='yaourt -S'
-  alias yains='yaourt -U'
-  alias yare='yaourt -R'
-  alias yarem='yaourt -Rns'
-  alias yarep='yaourt -Si'
-  alias yareps='yaourt -Ss'
-  alias yaloc='yaourt -Qi'
-  alias yalocs='yaourt -Qs'
-  alias yalst='yaourt -Qe'
-  alias yaorph='yaourt -Qtd'
-  alias yainsd='yaourt -S --asdeps'
-  alias yamir='yaourt -Syy'
-
-
-  if (( $+commands[abs] && $+commands[aur] )); then
-    alias yaupd='yaourt -Sy && sudo abs && sudo aur'
-  elif (( $+commands[abs] )); then
-    alias yaupd='yaourt -Sy && sudo abs'
-  elif (( $+commands[aur] )); then
-    alias yaupd='yaourt -Sy && sudo aur'
-  else
-    alias yaupd='yaourt -Sy'
-  fi
-fi
-
-if (( $+commands[yay] )); then
-  alias yaconf='yay -Pg'
-  alias yaupg='yay -Syu'
-  alias yasu='yay -Syu --noconfirm'
-  alias yain='yay -S'
-  alias yains='yay -U'
-  alias yare='yay -R'
-  alias yarem='yay -Rns'
-  alias yarep='yay -Si'
-  alias yareps='yay -Ss'
-  alias yaloc='yay -Qi'
-  alias yalocs='yay -Qs'
-  alias yalst='yay -Qe'
-  alias yaorph='yay -Qtd'
-  alias yainsd='yay -S --asdeps'
-  alias yamir='yay -Syy'
-
-
-  if (( $+commands[abs] && $+commands[aur] )); then
-    alias yaupd='yay -Sy && sudo abs && sudo aur'
-  elif (( $+commands[abs] )); then
-    alias yaupd='yay -Sy && sudo abs'
-  elif (( $+commands[aur] )); then
-    alias yaupd='yay -Sy && sudo aur'
-  else
-    alias yaupd='yay -Sy'
-  fi
-fi
-
-if (( $+commands[pacaur] )); then
-  alias paupg='pacaur -Syu'
-  alias pasu='pacaur -Syu --noconfirm'
-  alias pain='pacaur -S'
-  alias pains='pacaur -U'
-  alias pare='pacaur -R'
-  alias parem='pacaur -Rns'
-  alias parep='pacaur -Si'
-  alias pareps='pacaur -Ss'
-  alias paloc='pacaur -Qi'
-  alias palocs='pacaur -Qs'
-  alias palst='pacaur -Qe'
-  alias paorph='pacaur -Qtd'
-  alias painsd='pacaur -S --asdeps'
-  alias pamir='pacaur -Syy'
-
-  if (( $+commands[abs] && $+commands[aur] )); then
-    alias paupd='pacaur -Sy && sudo abs && sudo aur'
-  elif (( $+commands[abs] )); then
-    alias paupd='pacaur -Sy && sudo abs'
-  elif (( $+commands[aur] )); then
-    alias paupd='pacaur -Sy && sudo aur'
-  else
-    alias paupd='pacaur -Sy'
-  fi
-fi
-
-if (( $+commands[trizen] )); then
-  function upgrade() {
-    trizen -Syu
-  }
-elif (( $+commands[pacaur] )); then
-  function upgrade() {
-    pacaur -Syu
-  }
-elif (( $+commands[yaourt] )); then
-  function upgrade() {
-    yaourt -Syu
-  }
-elif (( $+commands[yay] )); then
-  function upgrade() {
-    yay -Syu
-  }
-else
-  function upgrade() {
-    sudo pacman -Syu
-  }
-fi
 
 # Pacman - https://wiki.archlinux.org/index.php/Pacman_Tips
 alias pacupg='sudo pacman -Syu'
@@ -152,22 +26,14 @@ alias pacfileupg='sudo pacman -Fy'
 alias pacfiles='pacman -F'
 alias pacls='pacman -Ql'
 alias pacown='pacman -Qo'
-
-
-if (( $+commands[abs] && $+commands[aur] )); then
-  alias pacupd='sudo pacman -Sy && sudo abs && sudo aur'
-elif (( $+commands[abs] )); then
-  alias pacupd='sudo pacman -Sy && sudo abs'
-elif (( $+commands[aur] )); then
-  alias pacupd='sudo pacman -Sy && sudo aur'
-else
-  alias pacupd='sudo pacman -Sy'
-fi
+alias pacupd="sudo pacman -Sy$abs_aur"
+alias upgrade='sudo pacman -Syu'
 
 function paclist() {
-  # Source: https://bbs.archlinux.org/viewtopic.php?id=93683
-  LC_ALL=C pacman -Qei $(pacman -Qu | cut -d " " -f 1) | \
-    awk 'BEGIN {FS=":"} /^Name/{printf("\033[1;36m%s\033[1;37m", $2)} /^Description/{print $2}'
+  # Based on https://bbs.archlinux.org/viewtopic.php?id=93683
+  pacman -Qqe | \
+    xargs -I '{}' \
+      expac "${bold_color}% 20n ${fg_no_bold[white]}%d${reset_color}" '{}'
 }
 
 function pacdisowned() {
@@ -187,11 +53,7 @@ function pacdisowned() {
   comm -23 "$fs" "$db"
 }
 
-function pacmanallkeys() {
-  curl -sL https://www.archlinux.org/people/{developers,trusted-users}/ | \
-    awk -F\" '(/keyserver.ubuntu.com/) { sub(/.*search=0x/,""); print $1}' | \
-    xargs sudo pacman-key --recv-keys
-}
+alias pacmanallkeys='sudo pacman-key --refresh-keys'
 
 function pacmansignkeys() {
   local key
@@ -205,6 +67,15 @@ function pacmansignkeys() {
 
 if (( $+commands[xdg-open] )); then
   function pacweb() {
+    if [[ $# = 0 || "$1" =~ '--help|-h' ]]; then
+      local underline_color="\e[${color[underline]}m"
+      echo "$0 - open the website of an ArchLinux package"
+      echo
+      echo "Usage:"
+      echo "    $bold_color$0$reset_color ${underline_color}target${reset_color}"
+      return 1
+    fi
+
     local pkg="$1"
     local infos="$(LANG=C pacman -Si "$pkg")"
     if [[ -z "$infos" ]]; then
@@ -215,3 +86,88 @@ if (( $+commands[xdg-open] )); then
     xdg-open "https://www.archlinux.org/packages/$repo/$arch/$pkg/" &>/dev/null
   }
 fi
+
+#######################################
+#             AUR helpers             #
+#######################################
+
+if (( $+commands[pacaur] )); then
+  alias paupg='pacaur -Syu'
+  alias pasu='pacaur -Syu --noconfirm'
+  alias pain='pacaur -S'
+  alias pains='pacaur -U'
+  alias pare='pacaur -R'
+  alias parem='pacaur -Rns'
+  alias parep='pacaur -Si'
+  alias pareps='pacaur -Ss'
+  alias paloc='pacaur -Qi'
+  alias palocs='pacaur -Qs'
+  alias palst='pacaur -Qe'
+  alias paorph='pacaur -Qtd'
+  alias painsd='pacaur -S --asdeps'
+  alias pamir='pacaur -Syy'
+  alias paupd="pacaur -Sy$abs_aur"
+  alias upgrade='pacaur -Syu'
+fi
+
+if (( $+commands[trizen] )); then
+  alias trconf='trizen -C'
+  alias trupg='trizen -Syua'
+  alias trsu='trizen -Syua --noconfirm'
+  alias trin='trizen -S'
+  alias trins='trizen -U'
+  alias trre='trizen -R'
+  alias trrem='trizen -Rns'
+  alias trrep='trizen -Si'
+  alias trreps='trizen -Ss'
+  alias trloc='trizen -Qi'
+  alias trlocs='trizen -Qs'
+  alias trlst='trizen -Qe'
+  alias trorph='trizen -Qtd'
+  alias trinsd='trizen -S --asdeps'
+  alias trmir='trizen -Syy'
+  alias trupd="trizen -Sy$abs_aur"
+  alias upgrade='trizen -Syu'
+fi
+
+if (( $+commands[yaourt] )); then
+  alias yaconf='yaourt -C'
+  alias yaupg='yaourt -Syua'
+  alias yasu='yaourt -Syua --noconfirm'
+  alias yain='yaourt -S'
+  alias yains='yaourt -U'
+  alias yare='yaourt -R'
+  alias yarem='yaourt -Rns'
+  alias yarep='yaourt -Si'
+  alias yareps='yaourt -Ss'
+  alias yaloc='yaourt -Qi'
+  alias yalocs='yaourt -Qs'
+  alias yalst='yaourt -Qe'
+  alias yaorph='yaourt -Qtd'
+  alias yainsd='yaourt -S --asdeps'
+  alias yamir='yaourt -Syy'
+  alias yaupd="yaourt -Sy$abs_aur"
+  alias upgrade='yaourt -Syu'
+fi
+
+if (( $+commands[yay] )); then
+  alias yaconf='yay -Pg'
+  alias yaupg='yay -Syu'
+  alias yasu='yay -Syu --noconfirm'
+  alias yain='yay -S'
+  alias yains='yay -U'
+  alias yare='yay -R'
+  alias yarem='yay -Rns'
+  alias yarep='yay -Si'
+  alias yareps='yay -Ss'
+  alias yaloc='yay -Qi'
+  alias yalocs='yay -Qs'
+  alias yalst='yay -Qe'
+  alias yaorph='yay -Qtd'
+  alias yainsd='yay -S --asdeps'
+  alias yamir='yay -Syy'
+  alias yaupd="yay -Sy$abs_aur"
+  alias upgrade='yay -Syu'
+fi
+
+unset abs_aur

From 2e487b187eac96ac63c8bd0f5e3c28d5ed06d828 Mon Sep 17 00:00:00 2001
From: Septs <github@septs.pw>
Date: Tue, 6 Apr 2021 20:49:03 +0800
Subject: [PATCH 295/869] feat(shell-proxy): enable unexported `DEFAULT_PROXY`
 setting (#9774)

---
 plugins/shell-proxy/proxy.py               | 5 +++--
 plugins/shell-proxy/shell-proxy.plugin.zsh | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/plugins/shell-proxy/proxy.py b/plugins/shell-proxy/proxy.py
index d2e5361cb..97f4cf873 100755
--- a/plugins/shell-proxy/proxy.py
+++ b/plugins/shell-proxy/proxy.py
@@ -9,8 +9,9 @@ user_proxy = os.environ.get("CONFIG_PROXY", os.path.expandvars("$HOME/.config/pr
 
 
 def get_http_proxy():
-    if "DEFAULT_PROXY" in os.environ:
-        return os.environ["DEFAULT_PROXY"]
+    default_proxy = os.environ.get("DEFAULT_PROXY")
+    if default_proxy:
+        return default_proxy
     if os.path.isfile(user_proxy):
         return check_output(user_proxy).decode("utf-8").strip()
     raise Exception("Not found, Proxy configuration")
diff --git a/plugins/shell-proxy/shell-proxy.plugin.zsh b/plugins/shell-proxy/shell-proxy.plugin.zsh
index fd0e2fe79..315ade665 100644
--- a/plugins/shell-proxy/shell-proxy.plugin.zsh
+++ b/plugins/shell-proxy/shell-proxy.plugin.zsh
@@ -4,7 +4,7 @@
 __PROXY__="${0:A:h}/proxy.py"
 
 proxy() {
-	source <("$__PROXY__" "$1")
+	source <(env "DEFAULT_PROXY=$DEFAULT_PROXY" "$__PROXY__" "$1")
 }
 
 _proxy() {

From b94bdf8927935419a228a1ba21408a36125513f7 Mon Sep 17 00:00:00 2001
From: ratijas <me@ratijas.tk>
Date: Tue, 6 Apr 2021 15:51:40 +0300
Subject: [PATCH 296/869] feat(archlinux): add support for aura AUR helper
 (#9467)

---
 plugins/archlinux/README.md            | 35 +++++++++++++++++++++++++-
 plugins/archlinux/archlinux.plugin.zsh | 29 +++++++++++++++++++++
 2 files changed, 63 insertions(+), 1 deletion(-)

diff --git a/plugins/archlinux/README.md b/plugins/archlinux/README.md
index a4f191a5f..8dd191760 100644
--- a/plugins/archlinux/README.md
+++ b/plugins/archlinux/README.md
@@ -48,6 +48,38 @@ upgrades were available. Use `pacman -Que` instead.
 
 ### AUR helpers
 
+#### Aura
+
+| Alias   | Command                                         | Description                                                             |
+|---------|-------------------------------------------------|-------------------------------------------------------------------------|
+| auin    | `sudo aura -S`                                  | Install packages from the repositories                                  |
+| aurin   | `sudo aura -A`                                  | Install packages from the repositories                                  |
+| auins   | `sudo aura -U`                                  | Install a package from a local file                                     |
+| auinsd  | `sudo aura -S --asdeps`                         | Install packages as dependencies of another package (repositories only) |
+| aurinsd | `sudo aura -A --asdeps`                         | Install packages as dependencies of another package (AUR only)          |
+| auloc   | `aura -Qi`                                      | Display information about a package in the local database               |
+| aulocs  | `aura -Qs`                                      | Search for packages in the local database                               |
+| auls    | `aura -Qql`                                     | List all files owned by a given package                                 |
+| aulst   | `aura -Qe`                                      | List installed packages including from AUR (tagged as "local")          |
+| aumir   | `sudo aura -Syy`                                | Force refresh of all package lists after updating mirrorlist            |
+| aurph   | `sudo aura -Oj`                                 | Remove orphans using aura                                               |
+| auown   | `aura -Qqo`                                     | Search for packages that own the specified file(s)                      |
+| aure    | `sudo aura -R`                                  | Remove packages, keeping its settings and dependencies                  |
+| aurem   | `sudo aura -Rns`                                | Remove packages, including its settings and unneeded dependencies       |
+| aurep   | `aura -Si`                                      | Display information about a package in the repositories                 |
+| aurrep  | `aura -Ai`                                      | Display information about a package from AUR                            |
+| aureps  | `aura -As --both`                               | Search for packages in the repositories and AUR                         |
+| auras   | `aura -As --both`                               | Same as above                                                           |
+| auupd   | `sudo aura -Sy && <abs/aur refresh>`[¹](#f1)    | Update and refresh local package, ABS and AUR databases                 |
+| auupg   | `sudo sh -c "aura -Syu              && aura -Au"` | Sync with repositories before upgrading all packages (from AUR too)   |
+| ausu    | `sudo sh -c "aura -Syu --no-confirm && aura -Au --no-confirm"` | Same as `auupg`, but without confirmation                |
+| upgrade[³](#f3) | `sudo aura -Syu`                        | Sync with repositories before upgrading packages                        |
+
+| Function        | Description                                                         |
+|-----------------|---------------------------------------------------------------------|
+| auownloc _file_ | Display information about a package that owns the specified file(s) |
+| auownls  _file_ | List all files owned by a package that owns the specified file(s)   |
+
 #### Pacaur
 
 | Alias   | Command                           | Description                                                         |
@@ -152,7 +184,8 @@ whether the package manager is installed, checked in the following order:
 2. `yaourt`
 3. `trizen`
 4. `pacaur`
-5. `pacman`
+5. `aura`
+6. `pacman`
 
 ## Contributors
 
diff --git a/plugins/archlinux/archlinux.plugin.zsh b/plugins/archlinux/archlinux.plugin.zsh
index d53761077..4c553d271 100644
--- a/plugins/archlinux/archlinux.plugin.zsh
+++ b/plugins/archlinux/archlinux.plugin.zsh
@@ -91,6 +91,35 @@ fi
 #             AUR helpers             #
 #######################################
 
+if (( $+commands[aura] )); then
+  alias auin='sudo aura -S'
+  alias aurin='sudo aura -A'
+  alias auins='sudo aura -U'
+  alias auinsd='sudo aura -S --asdeps'
+  alias aurinsd='sudo aura -A --asdeps'
+  alias auloc='aura -Qi'
+  alias aulocs='aura -Qs'
+  alias aulst='aura -Qe'
+  alias aumir='sudo aura -Syy'
+  alias aurph='sudo aura -Oj'
+  alias aure='sudo aura -R'
+  alias aurem='sudo aura -Rns'
+  alias aurep='aura -Si'
+  alias aurrep='aura -Ai'
+  alias aureps='aura -As --both'
+  alias auras='aura -As --both'
+  alias auupd="sudo aura -Sy$abs_aur"
+  alias auupg='sudo sh -c "aura -Syu              && aura -Au"'
+  alias ausu='sudo  sh -c "aura -Syu --no-confirm && aura -Au --no-confirm"'
+  alias upgrade='sudo aura -Syu'
+
+  # extra bonus specially for aura
+  alias auown="aura -Qqo"
+  alias auls="aura -Qql"
+  function auownloc() { aura -Qi  $(aura -Qqo $@); }
+  function auownls () { aura -Qql $(aura -Qqo $@); }
+fi
+
 if (( $+commands[pacaur] )); then
   alias paupg='pacaur -Syu'
   alias pasu='pacaur -Syu --noconfirm'

From 1670f1cafcc919f35a2a52eaceeca315d293b679 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Tue, 6 Apr 2021 14:52:47 +0200
Subject: [PATCH 297/869] chore: add maintainer for archlinux plugin

---
 .github/CODEOWNERS | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index e307e4be8..1b1340554 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1,4 +1,5 @@
 # Plugin owners
+plugins/archlinux/                  @ratijas
 plugins/aws/                        @maksyms
 plugins/genpass/                    @atoponce
 plugins/git-lfs/                    @hellovietduc

From d5e9e8d37bd2556f154ec136f9c0dc206a52e35a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Tue, 6 Apr 2021 22:11:02 +0200
Subject: [PATCH 298/869] docs: document commit convention in CONTRIBUTING.md

---
 CONTRIBUTING.md | 120 ++++++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 110 insertions(+), 10 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index be67e93b0..b7db4f661 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -11,16 +11,23 @@ issues and pull requests. Please read them closely.
 Foremost, be so kind as to [search](#use-the-search-luke). This ensures any contribution
 you would make is not already covered.
 
-* [Issues](#reporting-issues)
-  * [You have a problem](#you-have-a-problem)
-  * [You have a suggestion](#you-have-a-suggestion)
-* [Pull Requests](#submitting-pull-requests)
-  * [Getting started](#getting-started)
-  * [You have a solution](#you-have-a-solution)
-  * [You have an addition](#you-have-an-addition)
-* [Information sources (_aka_ search)](#use-the-search-luke)
+<!-- TOC -->
 
-**BONUS:** [Volunteering](#you-have-spare-time-to-volunteer)
+- [CONTRIBUTING GUIDELINES](#contributing-guidelines)
+  - [Reporting Issues](#reporting-issues)
+    - [You have a problem](#you-have-a-problem)
+    - [You have a suggestion](#you-have-a-suggestion)
+  - [Submitting Pull Requests](#submitting-pull-requests)
+    - [Getting started](#getting-started)
+    - [You have a solution](#you-have-a-solution)
+    - [You have an addition](#you-have-an-addition)
+  - [Use the Search, Luke](#use-the-search-luke)
+  - [Commit Guidelines](#commit-guidelines)
+    - [Format](#format)
+    - [Style](#style)
+  - [Volunteer](#volunteer)
+
+<!-- /TOC -->
 
 ## Reporting Issues
 
@@ -117,7 +124,100 @@ and [create an issue](#reporting-issues) or [submit a PR](#submitting-pull-reque
 
 ----
 
-### You have spare time to volunteer
+## Commit Guidelines
+
+Oh My Zsh uses the [Conventional Commits](https://www.conventionalcommits.org/en/v1.0.0/)
+specification. The automatic changelog tool uses these to automatically generate
+a changelog based on the commit messages. Here's a guide to writing a commit message
+to allow this:
+
+### Format
+
+```
+type(scope)!: subject
+```
+
+- `type`: the type of the commit is one of the following:
+
+  - `feat`: new features.
+  - `fix`: bug fixes.
+  - `docs`: documentation changes.
+  - `refactor`: refactor of a particular code section without introducing
+    new features or bug fixes.
+  - `style`: code style improvements.
+  - `perf`: performance improvements.
+  - `test`: changes to the test suite.
+  - `ci`: changes to the CI system.
+  - `build`: changes to the build system (we don't yet have one so this shouldn't apply).
+  - `chore`: for other changes that don't match previous types. This doesn't appear
+    in the changelog.
+
+- `scope`: section of the codebase that the commit makes changes to. If it makes changes to
+  many sections, or if no section in particular is modified, leave blank without the parentheses.
+  Examples:
+
+  - Commit that changes the `git` plugin:
+  ```
+  feat(git): add alias for `git commit`
+  ```
+
+  - Commit that changes many plugins:
+  ```
+  style: fix inline declaration of arrays
+  ```
+
+  For changes to plugins or themes, the scope should be the plugin or theme name:
+
+  - ✅ `fix(agnoster): commit subject`
+  - ❌ `fix(theme/agnoster): commit subject`
+
+- `!`: this goes after the `scope` (or the `type` if scope is empty), to indicate that the commit
+  introduces breaking changes.
+
+  Optionally, you can specify a message that the changelog tool will display to the user to indicate
+  what's changed and what they can do to deal with it. You can use multiple lines to type this message;
+  the changelog parser will keep reading until the end of the commit message or until it finds an empty
+  line.
+
+  Example (made up):
+
+  ```
+  style(agnoster)!: change dirty git repo glyph
+
+  BREAKING CHANGE: the glyph to indicate when a git repository is dirty has
+  changed from a Powerline character to a standard UTF-8 emoji. You can
+  change it back by setting `ZSH_THEME_DIRTY_GLYPH`.
+
+  Fixes #420
+
+  Co-authored-by: Username <email>
+  ```
+
+- `subject`: a brief description of the changes. This will be displayed in the changelog. If you need
+  to specify other details you can use the commit body but it won't be visible.
+
+  Formatting tricks: the commit subject may contain:
+
+  - Links to related issues or PRs by writing `#issue`. This will be highlighted by the changelog tool:
+    ```
+    feat(archlinux): add support for aura AUR helper (#9467)
+    ```
+
+  - Formatted inline code by using backticks: the text inbetween backticks will also be highlighted by
+    the changelog tool:
+    ```
+    feat(shell-proxy): enable unexported `DEFAULT_PROXY` setting (#9774)
+    ```
+
+### Style
+
+Try to keep the first commit line short. This is harder to do using this commit style but try to be
+concise and if you need more space, you can use the commit body. Try to make sure that the commit
+subject is clear and precise enough that users will know what change by just looking at the changelog.
+
+----
+
+## Volunteer
 
 Very nice!! :)
 

From 7da330f1bd1690e821b438b6dd4cb54cc17f3b02 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Tue, 6 Apr 2021 22:14:05 +0200
Subject: [PATCH 299/869] chore: fix CONTRIBUTING.md TOC

---
 CONTRIBUTING.md | 24 +++++++++---------------
 1 file changed, 9 insertions(+), 15 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index b7db4f661..16393da58 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -11,22 +11,16 @@ issues and pull requests. Please read them closely.
 Foremost, be so kind as to [search](#use-the-search-luke). This ensures any contribution
 you would make is not already covered.
 
-<!-- TOC -->
-
-- [CONTRIBUTING GUIDELINES](#contributing-guidelines)
-  - [Reporting Issues](#reporting-issues)
-    - [You have a problem](#you-have-a-problem)
-    - [You have a suggestion](#you-have-a-suggestion)
-  - [Submitting Pull Requests](#submitting-pull-requests)
-    - [Getting started](#getting-started)
-    - [You have a solution](#you-have-a-solution)
-    - [You have an addition](#you-have-an-addition)
-  - [Use the Search, Luke](#use-the-search-luke)
-  - [Commit Guidelines](#commit-guidelines)
-    - [Format](#format)
-    - [Style](#style)
-  - [Volunteer](#volunteer)
+<!-- TOC updateonsave:true depthfrom:2 -->
 
+- [Reporting Issues](#reporting-issues)
+  - [You have a problem](#you-have-a-problem)
+  - [You have a suggestion](#you-have-a-suggestion)
+- [Submitting Pull Requests](#submitting-pull-requests)
+  - [Getting started](#getting-started)
+  - [You have a solution](#you-have-a-solution)
+  - [You have an addition](#you-have-an-addition)
+- [Use the Se
 <!-- /TOC -->
 
 ## Reporting Issues

From 74db9acdb9931996a54fd777c76393099d3dae1e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Tue, 6 Apr 2021 22:17:17 +0200
Subject: [PATCH 300/869] chore: I'm dumb

---
 CONTRIBUTING.md | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 16393da58..4903584ee 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -20,7 +20,12 @@ you would make is not already covered.
   - [Getting started](#getting-started)
   - [You have a solution](#you-have-a-solution)
   - [You have an addition](#you-have-an-addition)
-- [Use the Se
+- [Use the Search, Luke](#use-the-search-luke)
+- [Commit Guidelines](#commit-guidelines)
+  - [Format](#format)
+  - [Style](#style)
+- [Volunteer](#volunteer)
+
 <!-- /TOC -->
 
 ## Reporting Issues

From 615f9dd02b6b0c33c8c69e310fc049b4f89c7b26 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Tue, 6 Apr 2021 22:26:57 +0200
Subject: [PATCH 301/869] chore: direct support queries to Discussions

---
 .github/ISSUE_TEMPLATE/bug_report.md |  1 +
 .github/ISSUE_TEMPLATE/config.yml    |  3 +++
 .github/ISSUE_TEMPLATE/support.md    | 10 ----------
 3 files changed, 4 insertions(+), 10 deletions(-)
 delete mode 100644 .github/ISSUE_TEMPLATE/support.md

diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 611d8ebae..88a6b814d 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -1,6 +1,7 @@
 ---
 name: Bug report
 about: Create a report to help us improve Oh My Zsh
+labels: 'Bug'
 
 ---
 
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
index c6b4cef42..3ddd72a15 100644
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -1,5 +1,8 @@
 blank_issues_enabled: true
 contact_links:
+  - name: Support
+    url: https://github.com/ohmyzsh/ohmyzsh/discussions
+    about: Ask the community for support
   - name: Get help on Discord
     url: https://discord.gg/ohmyzsh
     about: Have a quick question? Join the Discord server and ask on the appropriate channel.
diff --git a/.github/ISSUE_TEMPLATE/support.md b/.github/ISSUE_TEMPLATE/support.md
deleted file mode 100644
index 8c4f08044..000000000
--- a/.github/ISSUE_TEMPLATE/support.md
+++ /dev/null
@@ -1,10 +0,0 @@
----
-name: Support
-about: Request support for any problem you're having with Oh My Zsh
-labels: 'Support'
-
----
-
-1. Look for similar issues already posted (including closed ones)
-2. Include as much relevant information as possible
-3. Try to make sure the issue is due to Oh My Zsh

From 3f50482674c2b3153590a4aba92fbfa1c01bc583 Mon Sep 17 00:00:00 2001
From: ilter <37029827+ilter@users.noreply.github.com>
Date: Wed, 7 Apr 2021 20:53:48 +0300
Subject: [PATCH 302/869] feat(react-native): add aliases for iPhone 12 (#9792)

---
 plugins/react-native/react-native.plugin.zsh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/plugins/react-native/react-native.plugin.zsh b/plugins/react-native/react-native.plugin.zsh
index b33dedfed..8323c27bd 100644
--- a/plugins/react-native/react-native.plugin.zsh
+++ b/plugins/react-native/react-native.plugin.zsh
@@ -27,6 +27,9 @@ alias rniosxr='react-native run-ios --simulator "iPhone Xʀ"'
 alias rnios11='react-native run-ios --simulator "iPhone 11"'
 alias rnios11p='react-native run-ios --simulator "iPhone 11 Pro"'
 alias rnios11pm='react-native run-ios --simulator "iPhone 11 Pro Max"'
+alias rnios12='react-native run-ios --simulator "iPhone 12"'
+alias rnios12p='react-native run-ios --simulator "iPhone 12 Pro"'
+alias rnios12pm='react-native run-ios --simulator "iPhone 12 Pro Max"'
 
 
 # iPad

From 9f8801bea6120817bc4f03f9d80dc1230ea7b2b0 Mon Sep 17 00:00:00 2001
From: "Jeff M. Hubbard" <jeffmhubbard@users.noreply.github.com>
Date: Fri, 9 Apr 2021 13:48:24 -0500
Subject: [PATCH 303/869] feat(archlinux)!: remove deprecated commands `aur`
 and `abs` (#9803)

BREAKING CHANGE: the various update aliases will no longer run `abs` and `aur`, which are either
deprecated or nonexistent. See https://archlinux.org/news/deprecation-of-abs/ for more.
---
 plugins/archlinux/README.md            | 35 ++++++++++++--------------
 plugins/archlinux/archlinux.plugin.zsh | 19 +++++---------
 2 files changed, 22 insertions(+), 32 deletions(-)

diff --git a/plugins/archlinux/README.md b/plugins/archlinux/README.md
index 8dd191760..d6b41ee40 100644
--- a/plugins/archlinux/README.md
+++ b/plugins/archlinux/README.md
@@ -26,13 +26,13 @@ plugins=(... archlinux)
 | pacrep       | `pacman -Si`                           | Display information about a package in the repositories          |
 | pacreps      | `pacman -Ss`                           | Search for packages in the repositories                          |
 | pacrmorphans | `sudo pacman -Rs $(pacman -Qtdq)`      | Delete all orphaned packages                                     |
-| pacupd       | `sudo pacman -Sy && <abs/aur refresh>`[¹](#f1) | Update and refresh local package, ABS and AUR databases  |
+| pacupd       | `sudo pacman -Sy`                      | Update and refresh local package, ABS and AUR databases          |
 | pacupg       | `sudo pacman -Syu`                     | Sync with repositories before upgrading packages                 |
 | pacfileupg   | `sudo pacman -Fy`                      | Download fresh package databases from the server                 |
 | pacfiles     | `pacman -F`                            | Search package file names for matching strings                   |
 | pacls        | `pacman -Ql`                           | List files in a package                                          |
 | pacown       | `pacman -Qo`                           | Show which package owns a file                                   |
-| upgrade[³](#f3) | `sudo pacman -Syu`                  | Sync with repositories before upgrading packages                 |
+| upgrade[²](#f2) | `sudo pacman -Syu`                  | Sync with repositories before upgrading packages                 |
 
 | Function       | Description                                               |
 |----------------|-----------------------------------------------------------|
@@ -70,10 +70,10 @@ upgrades were available. Use `pacman -Que` instead.
 | aurrep  | `aura -Ai`                                      | Display information about a package from AUR                            |
 | aureps  | `aura -As --both`                               | Search for packages in the repositories and AUR                         |
 | auras   | `aura -As --both`                               | Same as above                                                           |
-| auupd   | `sudo aura -Sy && <abs/aur refresh>`[¹](#f1)    | Update and refresh local package, ABS and AUR databases                 |
+| auupd   | `sudo aura -Sy`                                 | Update and refresh local package, ABS and AUR databases                 |
 | auupg   | `sudo sh -c "aura -Syu              && aura -Au"` | Sync with repositories before upgrading all packages (from AUR too)   |
 | ausu    | `sudo sh -c "aura -Syu --no-confirm && aura -Au --no-confirm"` | Same as `auupg`, but without confirmation                |
-| upgrade[³](#f3) | `sudo aura -Syu`                        | Sync with repositories before upgrading packages                        |
+| upgrade[²](#f2) | `sudo aura -Syu`                        | Sync with repositories before upgrading packages                        |
 
 | Function        | Description                                                         |
 |-----------------|---------------------------------------------------------------------|
@@ -96,10 +96,10 @@ upgrades were available. Use `pacman -Que` instead.
 | parem   | `pacaur -Rns`                     | Remove packages, including its settings and unneeded dependencies   |
 | parep   | `pacaur -Si`                      | Display information about a package in the repositories             |
 | pareps  | `pacaur -Ss`                      | Search for packages in the repositories                             |
-| paupd   | `pacaur -Sy && <abs/aur refresh>`[¹](#f1) | Update and refresh local package, ABS and AUR databases     |
+| paupd   | `pacaur -Sy`                      | Update and refresh local package, ABS and AUR databases             |
 | paupg   | `pacaur -Syua`                    | Sync with repositories before upgrading all packages (from AUR too) |
 | pasu    | `pacaur -Syua --no-confirm`       | Same as `paupg`, but without confirmation                           |
-| upgrade[³](#f3) | `pacaur -Syu`             | Sync with repositories before upgrading packages                    |
+| upgrade[²](#f2) | `pacaur -Syu`             | Sync with repositories before upgrading packages                    |
 
 #### Trizen
 
@@ -118,12 +118,12 @@ upgrades were available. Use `pacman -Que` instead.
 | trrem   | `trizen -Rns`                     | Remove packages, including its settings and unneeded dependencies   |
 | trrep   | `trizen -Si`                      | Display information about a package in the repositories             |
 | trreps  | `trizen -Ss`                      | Search for packages in the repositories                             |
-| trupd   | `trizen -Sy && <abs/aur refresh>`[¹](#f1) | Update and refresh local package, ABS and AUR databases     |
+| trupd   | `trizen -Sy`                      | Update and refresh local package, ABS and AUR databases             |
 | trupg   | `trizen -Syua`                    | Sync with repositories before upgrading all packages (from AUR too) |
 | trsu    | `trizen -Syua --no-confirm`       | Same as `trupg`, but without confirmation                           |
-| upgrade[³](#f3) | `trizen -Syu`             | Sync with repositories before upgrading packages                    |
+| upgrade[²](#f2) | `trizen -Syu`             | Sync with repositories before upgrading packages                    |
 
-#### Yaourt[²](#f2)
+#### Yaourt[¹](#f1)
 
 | Alias   | Command                           | Description                                                         |
 |---------|-----------------------------------|---------------------------------------------------------------------|
@@ -140,12 +140,12 @@ upgrades were available. Use `pacman -Que` instead.
 | yarem   | `yaourt -Rns`                     | Remove packages, including its settings and unneeded dependencies   |
 | yarep   | `yaourt -Si`                      | Display information about a package in the repositories             |
 | yareps  | `yaourt -Ss`                      | Search for packages in the repositories                             |
-| yaupd   | `yaourt -Sy && <abs/aur refresh>`[¹](#f1) | Update and refresh local package, ABS and AUR databases     |
+| yaupd   | `yaourt -Sy`                      | Update and refresh local package, ABS and AUR databases             |
 | yaupg   | `yaourt -Syua`                    | Sync with repositories before upgrading all packages (from AUR too) |
 | yasu    | `yaourt -Syua --no-confirm`       | Same as `yaupg`, but without confirmation                           |
-| upgrade[³](#f3) | `yaourt -Syu`             | Sync with repositories before upgrading packages                    |
+| upgrade[²](#f2) | `yaourt -Syu`             | Sync with repositories before upgrading packages                    |
 
-#### Yay[²](#f2)
+#### Yay[¹](#f1)
 
 | Alias   | Command                        | Description                                                       |
 |---------|--------------------------------|-------------------------------------------------------------------|
@@ -162,21 +162,17 @@ upgrades were available. Use `pacman -Que` instead.
 | yarem   | `yay -Rns`                     | Remove packages, including its settings and unneeded dependencies |
 | yarep   | `yay -Si`                      | Display information about a package in the repositories           |
 | yareps  | `yay -Ss`                      | Search for packages in the repositories                           |
-| yaupd   | `yay -Sy && <abs/aur refresh>`[¹](#f1) | Update and refresh local package, ABS and AUR databases   |
+| yaupd   | `yay -Sy`                      | Update and refresh local package, ABS and AUR databases           |
 | yaupg   | `yay -Syu`                     | Sync with repositories before upgrading packages                  |
 | yasu    | `yay -Syu --no-confirm`        | Same as `yaupg`, but without confirmation                         |
-| upgrade[³](#f3) | `yay -Syu`             | Sync with repositories before upgrading packages                  |
+| upgrade[²](#f2) | `yay -Syu`             | Sync with repositories before upgrading packages                  |
 
 ---
 
 <span id="f1">¹</span>
-If the `abs` and/or `aur` commands are present, `sudo abs` and `sudo aur` are also
-called to update the ABS and AUR databases.
-
-<span id="f2">²</span>
 Yay and Yaourt aliases overlap. If both are installed, yay will take precedence.
 
-<span id="f3">³</span>
+<span id="f2">²</span>
 The `upgrade` alias is set for all package managers. Its value will depend on
 whether the package manager is installed, checked in the following order:
 
@@ -199,3 +195,4 @@ whether the package manager is installed, checked in the following order:
 - MatthR3D - matthr3d@gmail.com
 - ornicar - thibault.duplessis@gmail.com
 - Ybalrid (Arthur Brainville) - ybalrid@ybalrid.info
+- Jeff M. Hubbard - jeffmhubbard@gmail.com
diff --git a/plugins/archlinux/archlinux.plugin.zsh b/plugins/archlinux/archlinux.plugin.zsh
index 4c553d271..c94fb8f6c 100644
--- a/plugins/archlinux/archlinux.plugin.zsh
+++ b/plugins/archlinux/archlinux.plugin.zsh
@@ -2,12 +2,6 @@
 #               Pacman                #
 #######################################
 
-# abs and aur command check
-local abs_aur=''
-(( ! $+commands[abs] )) || abs_aur+=' && sudo abs'
-(( ! $+commands[aur] )) || abs_aur+=' && sudo aur'
-
-
 # Pacman - https://wiki.archlinux.org/index.php/Pacman_Tips
 alias pacupg='sudo pacman -Syu'
 alias pacin='sudo pacman -S'
@@ -26,7 +20,7 @@ alias pacfileupg='sudo pacman -Fy'
 alias pacfiles='pacman -F'
 alias pacls='pacman -Ql'
 alias pacown='pacman -Qo'
-alias pacupd="sudo pacman -Sy$abs_aur"
+alias pacupd="sudo pacman -Sy"
 alias upgrade='sudo pacman -Syu'
 
 function paclist() {
@@ -108,7 +102,7 @@ if (( $+commands[aura] )); then
   alias aurrep='aura -Ai'
   alias aureps='aura -As --both'
   alias auras='aura -As --both'
-  alias auupd="sudo aura -Sy$abs_aur"
+  alias auupd="sudo aura -Sy"
   alias auupg='sudo sh -c "aura -Syu              && aura -Au"'
   alias ausu='sudo  sh -c "aura -Syu --no-confirm && aura -Au --no-confirm"'
   alias upgrade='sudo aura -Syu'
@@ -135,7 +129,7 @@ if (( $+commands[pacaur] )); then
   alias paorph='pacaur -Qtd'
   alias painsd='pacaur -S --asdeps'
   alias pamir='pacaur -Syy'
-  alias paupd="pacaur -Sy$abs_aur"
+  alias paupd="pacaur -Sy"
   alias upgrade='pacaur -Syu'
 fi
 
@@ -155,7 +149,7 @@ if (( $+commands[trizen] )); then
   alias trorph='trizen -Qtd'
   alias trinsd='trizen -S --asdeps'
   alias trmir='trizen -Syy'
-  alias trupd="trizen -Sy$abs_aur"
+  alias trupd="trizen -Sy"
   alias upgrade='trizen -Syu'
 fi
 
@@ -175,7 +169,7 @@ if (( $+commands[yaourt] )); then
   alias yaorph='yaourt -Qtd'
   alias yainsd='yaourt -S --asdeps'
   alias yamir='yaourt -Syy'
-  alias yaupd="yaourt -Sy$abs_aur"
+  alias yaupd="yaourt -Sy"
   alias upgrade='yaourt -Syu'
 fi
 
@@ -195,8 +189,7 @@ if (( $+commands[yay] )); then
   alias yaorph='yay -Qtd'
   alias yainsd='yay -S --asdeps'
   alias yamir='yay -Syy'
-  alias yaupd="yay -Sy$abs_aur"
+  alias yaupd="yay -Sy"
   alias upgrade='yay -Syu'
 fi
 
-unset abs_aur

From 8b55fb3b60e885934745b03d8fd550c6eaa82121 Mon Sep 17 00:00:00 2001
From: Daniel Wang <wangyang0123@gmail.com>
Date: Thu, 8 Apr 2021 13:59:57 +0800
Subject: [PATCH 304/869] feat(command-not-found): add support for Homebrew on
 Apple M1 (#9797)

---
 plugins/command-not-found/command-not-found.plugin.zsh | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/plugins/command-not-found/command-not-found.plugin.zsh b/plugins/command-not-found/command-not-found.plugin.zsh
index aea1e1b4c..10f3a6277 100644
--- a/plugins/command-not-found/command-not-found.plugin.zsh
+++ b/plugins/command-not-found/command-not-found.plugin.zsh
@@ -38,10 +38,13 @@ if [ -f /usr/libexec/pk-command-not-found ]; then
     }
 fi
 
-# OSX command-not-found support
+# macOS command-not-found support
 # https://github.com/Homebrew/homebrew-command-not-found
-if [[ -s '/usr/local/Homebrew/Library/Taps/homebrew/homebrew-command-not-found/handler.sh' ]]; then
-    source '/usr/local/Homebrew/Library/Taps/homebrew/homebrew-command-not-found/handler.sh'
+HB_CNF_HANDLER_SUFFIX="Library/Taps/homebrew/homebrew-command-not-found/handler.sh"
+if [[ -s "/opt/homebrew/$HB_CNF_HANDLER_SUFFIX" ]]; then
+      source "/opt/homebrew/$HB_CNF_HANDLER_SUFFIX"
+elif [[ -s "/usr/local/Homebrew/$HB_CNF_HANDLER_SUFFIX" ]]; then
+      source "/usr/local/Homebrew/$HB_CNF_HANDLER_SUFFIX"
 fi
 
 # NixOS command-not-found support

From b54a6dab9cc9db9196aae5d8bc53ac3956855ecf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Fri, 9 Apr 2021 21:21:57 +0200
Subject: [PATCH 305/869] refactor(command-not-found): clean up and reorganize
 logic

---
 .../command-not-found.plugin.zsh              | 96 +++++++++----------
 1 file changed, 48 insertions(+), 48 deletions(-)

diff --git a/plugins/command-not-found/command-not-found.plugin.zsh b/plugins/command-not-found/command-not-found.plugin.zsh
index 10f3a6277..8fdc8a647 100644
--- a/plugins/command-not-found/command-not-found.plugin.zsh
+++ b/plugins/command-not-found/command-not-found.plugin.zsh
@@ -1,55 +1,55 @@
-# Uses the command-not-found package zsh support
-# as seen in https://www.porcheron.info/command-not-found-for-zsh/
-# this is installed in Ubuntu
+## Platforms with a built-in command-not-found handler init file
 
-if [ -x /usr/lib/command-not-found -o -x /usr/share/command-not-found/command-not-found ]; then
-    function command_not_found_handler {
-        # check because c-n-f could've been removed in the meantime
-        if [ -x /usr/lib/command-not-found ]; then
-            /usr/lib/command-not-found -- "$1"
-            return $?
-        elif [ -x /usr/share/command-not-found/command-not-found ]; then
-            /usr/share/command-not-found/command-not-found -- "$1"
-            return $?
-        else
-            printf "zsh: command not found: %s\n" "$1" >&2
-            return 127
-        fi
-        return 0
-    }
+for file (
+  # Arch Linux. Must have pkgfile installed: https://wiki.archlinux.org/index.php/Pkgfile#Command_not_found
+  /usr/share/doc/pkgfile/command-not-found.zsh
+  # macOS (M1 and classic Homebrew): https://github.com/Homebrew/homebrew-command-not-found
+  /opt/homebrew/Library/Taps/homebrew/homebrew-command-not-found/handler.sh
+  /usr/local/Homebrew/Library/Taps/homebrew/homebrew-command-not-found/handler.sh
+); do
+  if [[ -r "$file" ]]; then
+    source "$file"
+    unset file
+    return 0
+  fi
+done
+unset file
+
+
+## Platforms with manual command_not_found_handler() setup
+
+# Debian and derivatives: https://launchpad.net/ubuntu/+source/command-not-found
+if [[ -x /usr/lib/command-not-found || -x /usr/share/command-not-found/command-not-found ]]; then
+  command_not_found_handler() {
+    if [[ -x /usr/lib/command-not-found ]]; then
+      /usr/lib/command-not-found -- "$1"
+      return $?
+    elif [[ -x /usr/share/command-not-found/command-not-found ]]; then
+      /usr/share/command-not-found/command-not-found -- "$1"
+      return $?
+    else
+      printf "zsh: command not found: %s\n" "$1" >&2
+      return 127
+    fi
+  }
 fi
 
-# Arch Linux command-not-found support, you must have package pkgfile installed
-# https://wiki.archlinux.org/index.php/Pkgfile#.22Command_not_found.22_hook
-[[ -e /usr/share/doc/pkgfile/command-not-found.zsh ]] && source /usr/share/doc/pkgfile/command-not-found.zsh
+# Fedora: https://fedoraproject.org/wiki/Features/PackageKitCommandNotFound
+if [[ -x /usr/libexec/pk-command-not-found ]]; then
+  command_not_found_handler() {
+    if [[ -S /var/run/dbus/system_bus_socket && -x /usr/libexec/packagekitd ]]; then
+      /usr/libexec/pk-command-not-found -- "$@"
+      return $?
+    fi
 
-# Fedora command-not-found support
-if [ -f /usr/libexec/pk-command-not-found ]; then
-    command_not_found_handler() {
-        runcnf=1
-        retval=127
-        [ ! -S /var/run/dbus/system_bus_socket ] && runcnf=0
-        [ ! -x /usr/libexec/packagekitd ] && runcnf=0
-        if [ $runcnf -eq 1 ]; then
-            /usr/libexec/pk-command-not-found $@
-            retval=$?
-        fi
-        return $retval
-    }
+    printf "zsh: command not found: %s\n" "$1" >&2
+    return 127
+  }
 fi
 
-# macOS command-not-found support
-# https://github.com/Homebrew/homebrew-command-not-found
-HB_CNF_HANDLER_SUFFIX="Library/Taps/homebrew/homebrew-command-not-found/handler.sh"
-if [[ -s "/opt/homebrew/$HB_CNF_HANDLER_SUFFIX" ]]; then
-      source "/opt/homebrew/$HB_CNF_HANDLER_SUFFIX"
-elif [[ -s "/usr/local/Homebrew/$HB_CNF_HANDLER_SUFFIX" ]]; then
-      source "/usr/local/Homebrew/$HB_CNF_HANDLER_SUFFIX"
-fi
-
-# NixOS command-not-found support
-if [ -x /run/current-system/sw/bin/command-not-found ]; then
-    command_not_found_handler() {
-        /run/current-system/sw/bin/command-not-found $@
-    }
+# NixOS: https://github.com/NixOS/nixpkgs/tree/master/nixos/modules/programs/command-not-found
+if [[ -x /run/current-system/sw/bin/command-not-found ]]; then
+  command_not_found_handler() {
+    /run/current-system/sw/bin/command-not-found -- "$@"
+  }
 fi

From 6ae78695efa8c222d716db267041f3ad19114d98 Mon Sep 17 00:00:00 2001
From: Mario A <marioanacl22@gmail.com>
Date: Sun, 14 Feb 2021 14:44:59 +0100
Subject: [PATCH 306/869] feat(command-not-found): add support for Termux
 (#9666)

---
 plugins/command-not-found/README.md                    | 1 +
 plugins/command-not-found/command-not-found.plugin.zsh | 7 +++++++
 2 files changed, 8 insertions(+)

diff --git a/plugins/command-not-found/README.md b/plugins/command-not-found/README.md
index 1cf4ba66e..f267f0c89 100644
--- a/plugins/command-not-found/README.md
+++ b/plugins/command-not-found/README.md
@@ -28,5 +28,6 @@ It works out of the box with the command-not-found packages for:
 - [macOS (Homebrew)](https://github.com/Homebrew/homebrew-command-not-found)
 - [Fedora](https://fedoraproject.org/wiki/Features/PackageKitCommandNotFound)
 - [NixOS](https://github.com/NixOS/nixpkgs/tree/master/nixos/modules/programs/command-not-found)
+- [Termux](https://github.com/termux/command-not-found)
 
 You can add support for other platforms by submitting a Pull Request.
diff --git a/plugins/command-not-found/command-not-found.plugin.zsh b/plugins/command-not-found/command-not-found.plugin.zsh
index 8fdc8a647..cbf9a0a8e 100644
--- a/plugins/command-not-found/command-not-found.plugin.zsh
+++ b/plugins/command-not-found/command-not-found.plugin.zsh
@@ -53,3 +53,10 @@ if [[ -x /run/current-system/sw/bin/command-not-found ]]; then
     /run/current-system/sw/bin/command-not-found -- "$@"
   }
 fi
+
+# Termux: https://github.com/termux/command-not-found
+if [[ -x /data/data/com.termux/files/usr/libexec/termux/command-not-found ]]; then
+  command_not_found_handler() {
+    /data/data/com.termux/files/usr/libexec/termux/command-not-found -- "$1"
+  }
+fi

From e9f805a3ca87ebe184b0c544b5e656f50deb52e4 Mon Sep 17 00:00:00 2001
From: Chuck <chuck@eclecticsaddlebag.com>
Date: Sun, 11 Apr 2021 10:20:11 -0400
Subject: [PATCH 307/869] docs(rails): reflect changes to aliases (#9809)

---
 plugins/rails/README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/rails/README.md b/plugins/rails/README.md
index 9fb1cecf1..efdb8f8ba 100644
--- a/plugins/rails/README.md
+++ b/plugins/rails/README.md
@@ -21,6 +21,8 @@ plugins=(... rails)
 | `rgen`| `rails generate`           | Generate boilerplate code                          |
 | `rgm` | `rails generate migration` | Generate a db migration                            |
 | `rp`  | `rails plugin`             | Run a Rails plugin command                         |
+| `rr`  | `rails routes`             | List all defined routes                            |
+| `rrg` | `rails routes \| grep`     | List and filter the defined routes                 |
 | `ru`  | `rails runner`             | Run Ruby code in the context of Rails              |
 | `rs`  | `rails server`             | Launch a web server                                |
 | `rsd` | `rails server --debugger`  | Launch a web server with debugger                  |
@@ -43,8 +45,6 @@ plugins=(... rails)
 | `rdsl`  | `rake db:schema:load`           | Load the database schema                               |
 | `rlc`   | `rake log:clear`                | Clear Rails logs                                       |
 | `rn`    | `rake notes`                    | Search for notes (`FIXME`, `TODO`) in code comments    |
-| `rr`    | `rake routes`                   | List all defined routes                                |
-| `rrg`   | `rake routes \| grep`           | List and filter the defined routes                     |
 | `rt`    | `rake test`                     | Run Rails tests                                        |
 | `rmd`   | `rake middleware`               | Interact with Rails middlewares                        |
 | `rsts`  | `rake stats`                    | Print code statistics                                  |

From 12669f29f0843b8b980dd137f150a74511f88842 Mon Sep 17 00:00:00 2001
From: Thomas De Backer <Thomasisdebacker5@gmail.com>
Date: Sun, 11 Apr 2021 19:40:27 +0200
Subject: [PATCH 308/869] fix(gentoo): fix tab color completion (#9810)

This commit fixes an issue in the gentoo theme introduced in 3bb5e977.
Due to incorrect line width calculations, colors are incorrectly applied
when using tab.

Fixes #9778

Signed-off-by: Thomas De Backer <mosterdt@debacker.me>
---
 themes/gentoo.zsh-theme | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/themes/gentoo.zsh-theme b/themes/gentoo.zsh-theme
index ae3274022..e18bce890 100644
--- a/themes/gentoo.zsh-theme
+++ b/themes/gentoo.zsh-theme
@@ -25,4 +25,4 @@ gentoo_precmd() {
 autoload -U add-zsh-hook
 add-zsh-hook precmd gentoo_precmd
 
-PROMPT='%(!.%B%F{red}.%B%F{green}%n@)%m %F{blue}%(!.%1~.%~) ${vcs_info_msg_0_}%(!.#.$)%{$reset_color%} '
+PROMPT='%(!.%B%F{red}.%B%F{green}%n@)%m %F{blue}%(!.%1~.%~) ${vcs_info_msg_0_}%(!.#.$)%k%b%f '

From b3d1826a431028acdbbae1eb5242f5641da17788 Mon Sep 17 00:00:00 2001
From: Kirk <1652877+chenkirk@users.noreply.github.com>
Date: Fri, 23 Apr 2021 06:22:18 -0700
Subject: [PATCH 309/869] feat(ys): add setting to hide dirty info in hg
 repositories (#8415)

On large mercurial projects, using `hg status` to show dirty prompt
causes significant delay.

This commit checks a local hg config value of `oh-my-zsh.hide-dirty` to
skip dirty check.

Users who wish to skip dirty check can add this to their `.hg/hgrc`
file.

```
[oh-my-zsh]
hide-dirty = 1
```

This config value uses the same naming as ones found for git, in file
lib/git.zsh.
---
 themes/ys.zsh-theme | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/themes/ys.zsh-theme b/themes/ys.zsh-theme
index 89d5355dc..95067060b 100644
--- a/themes/ys.zsh-theme
+++ b/themes/ys.zsh-theme
@@ -26,10 +26,12 @@ ys_hg_prompt_info() {
 	if [ -d '.hg' ]; then
 		echo -n "${YS_VCS_PROMPT_PREFIX1}hg${YS_VCS_PROMPT_PREFIX2}"
 		echo -n $(hg branch 2>/dev/null)
-		if [ -n "$(hg status 2>/dev/null)" ]; then
-			echo -n "$YS_VCS_PROMPT_DIRTY"
-		else
-			echo -n "$YS_VCS_PROMPT_CLEAN"
+		if [[ "$(hg config oh-my-zsh.hide-dirty 2>/dev/null)" != "1" ]]; then
+			if [ -n "$(hg status 2>/dev/null)" ]; then
+				echo -n "$YS_VCS_PROMPT_DIRTY"
+			else
+				echo -n "$YS_VCS_PROMPT_CLEAN"
+			fi
 		fi
 		echo -n "$YS_VCS_PROMPT_SUFFIX"
 	fi

From 0e5fed193edf0073fab5adaac61f7b912ea86060 Mon Sep 17 00:00:00 2001
From: MrAureliusR <41264289+MrAureliusR@users.noreply.github.com>
Date: Fri, 23 Apr 2021 09:51:31 -0400
Subject: [PATCH 310/869] feat(ys): add virtualenv prompt info (#8453)

---
 themes/ys.zsh-theme | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/themes/ys.zsh-theme b/themes/ys.zsh-theme
index 95067060b..303c898b4 100644
--- a/themes/ys.zsh-theme
+++ b/themes/ys.zsh-theme
@@ -37,6 +37,15 @@ ys_hg_prompt_info() {
 	fi
 }
 
+# Virtualenv
+local venv_info='$(virtenv_prompt)'
+YS_THEME_VIRTUALENV_PROMPT_PREFIX=" %{$fg[green]%}"
+YS_THEME_VIRTUALENV_PROMPT_SUFFIX=" %{$reset_color%}%"
+virtenv_prompt() {
+	[[ -n ${VIRTUAL_ENV} ]] || return
+	echo "${YS_THEME_VIRTUALENV_PROMPT_PREFIX}${VIRTUAL_ENV:t}${YS_THEME_VIRTUALENV_PROMPT_SUFFIX}"
+}
+
 local exit_code="%(?,,C:%{$fg[red]%}%?%{$reset_color%})"
 
 # Prompt format:
@@ -57,6 +66,7 @@ PROMPT="
 %{$terminfo[bold]$fg[yellow]%}%~%{$reset_color%}\
 ${hg_info}\
 ${git_info}\
+${venv_info}\
  \
 %{$fg[white]%}[%*] $exit_code
 %{$terminfo[bold]$fg[red]%}$ %{$reset_color%}"

From 1916a31153ddf3e48d31e3a7193ed97eaf34097d Mon Sep 17 00:00:00 2001
From: Wolfgang Ladermann <wuerzelchen@users.noreply.github.com>
Date: Fri, 23 Apr 2021 16:23:26 +0200
Subject: [PATCH 311/869] feat(systemadmin): add IPv6 info to `geteip` command
 (#9856)

---
 plugins/systemadmin/systemadmin.plugin.zsh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/plugins/systemadmin/systemadmin.plugin.zsh b/plugins/systemadmin/systemadmin.plugin.zsh
index 08136abda..a77f0069b 100644
--- a/plugins/systemadmin/systemadmin.plugin.zsh
+++ b/plugins/systemadmin/systemadmin.plugin.zsh
@@ -131,7 +131,8 @@ d0() {
 
 # gather external ip address
 geteip() {
-    curl -s -S https://icanhazip.com
+    curl -s -S -4 https://icanhazip.com
+    curl -s -S -6 https://icanhazip.com
 }
 
 # determine local IP address(es)

From 48a3c2f32d1a4643db367eed4d6c53768c3847b1 Mon Sep 17 00:00:00 2001
From: Ian G Canino <ian@thecommittedbug.io>
Date: Fri, 23 Apr 2021 14:28:42 -0400
Subject: [PATCH 312/869] feat(fzf): look in XDG compliant location (#9858)

---
 plugins/fzf/fzf.plugin.zsh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/fzf/fzf.plugin.zsh b/plugins/fzf/fzf.plugin.zsh
index 69ec1d411..a979fe222 100644
--- a/plugins/fzf/fzf.plugin.zsh
+++ b/plugins/fzf/fzf.plugin.zsh
@@ -7,6 +7,7 @@ function setup_using_base_dir() {
         fzfdirs=(
           "${HOME}/.fzf"
           "${HOME}/.nix-profile/share/fzf"
+          "${XDG_DATA_HOME:-$HOME/.local/share}/fzf"
           "/usr/local/opt/fzf"
           "/usr/share/fzf"
           "/usr/local/share/examples/fzf"

From 1cc15ca3c23ba1a2b5236432bc62eb652c98972d Mon Sep 17 00:00:00 2001
From: Mauro Porras <167700+mauroporras@users.noreply.github.com>
Date: Sun, 25 Apr 2021 12:02:39 -0500
Subject: [PATCH 313/869] feat(npm): add alias for `npm i -f` (#8454)

As documented in the README, `npm i -f` forces npm to install the specified packages from a remote
package registry, even if local copies exist on disk caches.
---
 plugins/npm/README.md      | 1 +
 plugins/npm/npm.plugin.zsh | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/plugins/npm/README.md b/plugins/npm/README.md
index 0b1a2280f..bc627e56f 100644
--- a/plugins/npm/README.md
+++ b/plugins/npm/README.md
@@ -15,6 +15,7 @@ plugins=(... npm)
 | `npmg`  | `npm i -g`                   | Install dependencies globally                                   |
 | `npmS`  | `npm i -S`                   | Install and save to dependencies in your package.json           |
 | `npmD`  | `npm i -D`                   | Install and save to dev-dependencies in your package.json       |
+| `npmF`  | `npm i -f`                   | Force install from remote registries ignoring local cache       |
 | `npmE`  | `PATH="$(npm bin)":"$PATH"`  | Run command from node_modules folder based on current directory |
 | `npmO`  | `npm outdated`               | Check which npm modules are outdated                            |
 | `npmV`  | `npm -v`                     | Check package versions                                          |
diff --git a/plugins/npm/npm.plugin.zsh b/plugins/npm/npm.plugin.zsh
index 87c68f3fb..93de9cba3 100644
--- a/plugins/npm/npm.plugin.zsh
+++ b/plugins/npm/npm.plugin.zsh
@@ -27,6 +27,9 @@ alias npmS="npm i -S "
 # npmd is used by https://github.com/dominictarr/npmd
 alias npmD="npm i -D "
 
+# Force npm to fetch remote resources even if a local copy exists on disk.
+alias npmF='npm i -f'
+
 # Execute command from node_modules folder based on current directory
 # i.e npmE gulp
 alias npmE='PATH="$(npm bin)":"$PATH"'

From 32532c149a90eb25710f94d207546501e83c161b Mon Sep 17 00:00:00 2001
From: Petr Rajtslegr <petr.rajtslegr@gmail.com>
Date: Sun, 25 Apr 2021 19:07:25 +0200
Subject: [PATCH 314/869] feat(npm): add alias for `npm update` (#9442)

---
 plugins/npm/README.md      | 1 +
 plugins/npm/npm.plugin.zsh | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/plugins/npm/README.md b/plugins/npm/README.md
index bc627e56f..d6bada38b 100644
--- a/plugins/npm/README.md
+++ b/plugins/npm/README.md
@@ -18,6 +18,7 @@ plugins=(... npm)
 | `npmF`  | `npm i -f`                   | Force install from remote registries ignoring local cache       |
 | `npmE`  | `PATH="$(npm bin)":"$PATH"`  | Run command from node_modules folder based on current directory |
 | `npmO`  | `npm outdated`               | Check which npm modules are outdated                            |
+| `npmU`  | `npm update`                 | Update all the packages listed to the latest version            |
 | `npmV`  | `npm -v`                     | Check package versions                                          |
 | `npmL`  | `npm list`                   | List installed packages                                         |
 | `npmL0` | `npm ls --depth=0`           | List top-level installed packages                               |
diff --git a/plugins/npm/npm.plugin.zsh b/plugins/npm/npm.plugin.zsh
index 93de9cba3..23f627ccd 100644
--- a/plugins/npm/npm.plugin.zsh
+++ b/plugins/npm/npm.plugin.zsh
@@ -37,6 +37,9 @@ alias npmE='PATH="$(npm bin)":"$PATH"'
 # Check which npm modules are outdated
 alias npmO="npm outdated"
 
+# Update all the packages listed to the latest version
+alias npmU="npm update"
+
 # Check package versions
 alias npmV="npm -v"
 

From 7ed8888c5bc58827a5b8cf9e8347829613bd3683 Mon Sep 17 00:00:00 2001
From: Sherwin Heydarbeygi <sherwinhb@gmail.com>
Date: Sun, 25 Apr 2021 10:08:51 -0700
Subject: [PATCH 315/869] feat(npm): add aliases for `npm search` and `npm
 info` (#9365)

---
 plugins/npm/README.md      | 2 ++
 plugins/npm/npm.plugin.zsh | 6 ++++++
 2 files changed, 8 insertions(+)

diff --git a/plugins/npm/README.md b/plugins/npm/README.md
index d6bada38b..47d153619 100644
--- a/plugins/npm/README.md
+++ b/plugins/npm/README.md
@@ -27,3 +27,5 @@ plugins=(... npm)
 | `npmR`  | `npm run`                    | Run npm scripts                                                 |
 | `npmP`  | `npm publish`                | Run npm publish                                                 |
 | `npmI`  | `npm init`                   | Run npm init                                                    |
+| `npmi`  | `npm info`                   | Run npm info                                                    |
+| `npmSe` | `npm search`                 | Run npm search                                                  |
diff --git a/plugins/npm/npm.plugin.zsh b/plugins/npm/npm.plugin.zsh
index 23f627ccd..f7d6d3939 100644
--- a/plugins/npm/npm.plugin.zsh
+++ b/plugins/npm/npm.plugin.zsh
@@ -63,3 +63,9 @@ alias npmP="npm publish"
 
 # Run npm init
 alias npmI="npm init"
+
+# Run npm info
+alias npmi="npm info"
+
+# Run npm search
+alias npmSe="npm search"

From 6cc12e031ea8744a0dedb3c25ba3d73fe062772d Mon Sep 17 00:00:00 2001
From: Carlo Sala <carlosalag@gmail.com>
Date: Sun, 25 Apr 2021 19:14:05 +0200
Subject: [PATCH 316/869] feat(plugins): add plugin for `deno` (#9847)

Co-authored-by: Kapil Pau <kapilpau@hotmail.com>
Co-authored-by: CallMeLaNN <CallMeLaNN@users.noreply.github.com>
---
 plugins/deno/.gitignore      |  1 +
 plugins/deno/README.md       | 18 ++++++++++++++++++
 plugins/deno/deno.plugin.zsh | 21 +++++++++++++++++++++
 3 files changed, 40 insertions(+)
 create mode 100644 plugins/deno/.gitignore
 create mode 100644 plugins/deno/README.md
 create mode 100644 plugins/deno/deno.plugin.zsh

diff --git a/plugins/deno/.gitignore b/plugins/deno/.gitignore
new file mode 100644
index 000000000..cba5b03e8
--- /dev/null
+++ b/plugins/deno/.gitignore
@@ -0,0 +1 @@
+_deno
diff --git a/plugins/deno/README.md b/plugins/deno/README.md
new file mode 100644
index 000000000..828e6af39
--- /dev/null
+++ b/plugins/deno/README.md
@@ -0,0 +1,18 @@
+# Deno Plugin
+
+This plugin sets up completion and aliases for [Deno](https://deno.land).
+
+## Aliases
+
+| Alias | Full command     |
+| ----- | ---------------- |
+| db    | deno bundle      |
+| dc    | deno compile     |
+| dca   | deno cache       |
+| dfmt  | deno fmt         |
+| dh    | deno help        |
+| dli   | deno lint        |
+| drn   | deno run         |
+| drw   | deno run --watch |
+| dts   | deno test        |
+| dup   | deno upgrade     |
diff --git a/plugins/deno/deno.plugin.zsh b/plugins/deno/deno.plugin.zsh
new file mode 100644
index 000000000..af5c98265
--- /dev/null
+++ b/plugins/deno/deno.plugin.zsh
@@ -0,0 +1,21 @@
+# ALIASES
+alias db='deno bundle'
+alias dc='deno compile'
+alias dca='deno cache'
+alias dfmt='deno fmt'
+alias dh='deno help'
+alias dli='deno lint'
+alias drn='deno run'
+alias drw='deno run --watch'
+alias dts='deno test'
+alias dup='deno upgrade'
+
+# COMPLETION FUNCTION
+if (( $+commands[deno] )); then
+  if [[ ! -f $ZSH_CACHE_DIR/deno_version ]] \
+    || [[ "$(deno --version)" != "$(< "$ZSH_CACHE_DIR/deno_version")" ]] \
+    || [[ ! -f $ZSH/plugins/deno/_deno ]]; then
+    deno completions zsh > $ZSH/plugins/deno/_deno
+    deno --version > $ZSH_CACHE_DIR/deno_version
+  fi
+fi

From 6a7285bc5bb69c255920950c45a911fdeca7f665 Mon Sep 17 00:00:00 2001
From: Piper <piperchester@users.noreply.github.com>
Date: Sun, 25 Apr 2021 10:21:31 -0700
Subject: [PATCH 317/869] chore: fix "Facebook" typo in README.md (#9378)

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 86037f199..3ebea91e0 100644
--- a/README.md
+++ b/README.md
@@ -295,7 +295,7 @@ Thank you so much!
 We're on social media:
 
 - [@ohmyzsh](https://twitter.com/ohmyzsh) on Twitter. You should follow it.
-- [FaceBook](https://www.facebook.com/Oh-My-Zsh-296616263819290/) poke us.
+- [Facebook](https://www.facebook.com/Oh-My-Zsh-296616263819290/) poke us.
 - [Instagram](https://www.instagram.com/_ohmyzsh/) tag us in your post showing Oh My Zsh!
 - [Discord](https://discord.gg/ohmyzsh) to chat with us!
 

From 0655241fa6b8d38ce2f2d43bb3289bdc2cad91c6 Mon Sep 17 00:00:00 2001
From: Eric Rodrigues Pires <eric@eric.dev.br>
Date: Sun, 25 Apr 2021 14:56:59 -0300
Subject: [PATCH 318/869] fix(kubectl): use `--current` flag in `kcn` alias
 (#7605)

---
 plugins/kubectl/README.md          | 2 +-
 plugins/kubectl/kubectl.plugin.zsh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/kubectl/README.md b/plugins/kubectl/README.md
index 7a6cdaa59..8937b2b80 100644
--- a/plugins/kubectl/README.md
+++ b/plugins/kubectl/README.md
@@ -49,7 +49,7 @@ plugins=(... kubectl)
 | kdeli   | `kubectl delete ingress`            | Delete ingress resources matching passed argument                                                |
 |         |                                     | **Namespace management**                                                                         |
 | kgns    | `kubectl get namespaces`            | List the current namespaces in a cluster                                                         |
-| kcn     | `kubectl config set-context ...`    | Change current namespace |
+| kcn     | `kubectl config set-context --current --namespace` | Change current namespace |
 | kens    | `kubectl edit namespace`            | Edit namespace resource from the default editor                                                  |
 | kdns    | `kubectl describe namespace`        | Describe namespace resource in detail                                                            |
 | kdelns  | `kubectl delete namespace`          | Delete the namespace. WARNING! This deletes everything in the namespace                          |
diff --git a/plugins/kubectl/kubectl.plugin.zsh b/plugins/kubectl/kubectl.plugin.zsh
index d509d8795..56135274f 100644
--- a/plugins/kubectl/kubectl.plugin.zsh
+++ b/plugins/kubectl/kubectl.plugin.zsh
@@ -71,7 +71,7 @@ alias kgns='kubectl get namespaces'
 alias kens='kubectl edit namespace'
 alias kdns='kubectl describe namespace'
 alias kdelns='kubectl delete namespace'
-alias kcn='kubectl config set-context $(kubectl config current-context) --namespace'
+alias kcn='kubectl config set-context --current --namespace'
 
 # ConfigMap management
 alias kgcm='kubectl get configmaps'

From 63a7422d8dd5eb93c849df0ab9e679e6f333818a Mon Sep 17 00:00:00 2001
From: Carlo Sala <carlosalag@protonmail.com>
Date: Mon, 26 Apr 2021 11:54:53 +0200
Subject: [PATCH 319/869] fix(deno): actually load deno completion (#9863)

---
 plugins/deno/deno.plugin.zsh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/plugins/deno/deno.plugin.zsh b/plugins/deno/deno.plugin.zsh
index af5c98265..a37b3bec4 100644
--- a/plugins/deno/deno.plugin.zsh
+++ b/plugins/deno/deno.plugin.zsh
@@ -18,4 +18,6 @@ if (( $+commands[deno] )); then
     deno completions zsh > $ZSH/plugins/deno/_deno
     deno --version > $ZSH_CACHE_DIR/deno_version
   fi
+  autoload -Uz _deno
+  _comps[deno]=_deno
 fi

From 70ab2928a5ecd2513d4f6a67beb10f79d64d5172 Mon Sep 17 00:00:00 2001
From: "kalle (jag)" <kalle.jillheden@gmail.com>
Date: Mon, 3 May 2021 16:35:28 +0200
Subject: [PATCH 320/869] feat(plugins): add `gh` plugin for GitHub CLI (#9557)

---
 plugins/gh/.gitignore    |  1 +
 plugins/gh/README.md     | 23 +++++++++++++++++++++++
 plugins/gh/gh.plugin.zsh | 13 +++++++++++++
 3 files changed, 37 insertions(+)
 create mode 100644 plugins/gh/.gitignore
 create mode 100644 plugins/gh/README.md
 create mode 100644 plugins/gh/gh.plugin.zsh

diff --git a/plugins/gh/.gitignore b/plugins/gh/.gitignore
new file mode 100644
index 000000000..fa1244ab5
--- /dev/null
+++ b/plugins/gh/.gitignore
@@ -0,0 +1 @@
+_gh
diff --git a/plugins/gh/README.md b/plugins/gh/README.md
new file mode 100644
index 000000000..54e046a1c
--- /dev/null
+++ b/plugins/gh/README.md
@@ -0,0 +1,23 @@
+# GitHub CLI plugin
+
+This plugin adds completion for the [GitHub CLI](https://cli.github.com/).
+
+To use it, add `gh` to the plugins array in your zshrc file:
+
+```zsh
+plugins=(... gh)
+```
+
+This plugin does not add any aliases.
+
+## Cache
+
+This plugin caches the completion script and is automatically updated when the
+plugin is loaded, which is usually when you start up a new terminal emulator.
+
+The cache is stored at:
+
+- `$ZSH/plugins/gh/_gh` completions script
+
+- `$ZSH_CACHE_DIR/gh_version` version of GitHub CLI, used to invalidate
+  the cache.
diff --git a/plugins/gh/gh.plugin.zsh b/plugins/gh/gh.plugin.zsh
new file mode 100644
index 000000000..8e055ec35
--- /dev/null
+++ b/plugins/gh/gh.plugin.zsh
@@ -0,0 +1,13 @@
+# Autocompletion for the GitHub CLI (gh).
+
+if (( $+commands[gh] )); then
+  if [[ ! -r "$ZSH_CACHE_DIR/gh_version" \
+    || "$(gh --version)" != "$(< "$ZSH_CACHE_DIR/gh_version")"
+    || ! -f "$ZSH/plugins/gh/_gh" ]]; then
+    gh completion --shell zsh > $ZSH/plugins/gh/_gh
+    gh --version > $ZSH_CACHE_DIR/gh_version
+  fi
+  autoload -Uz _gh
+  _comps[gh]=_gh
+fi
+

From f4de8c5b3a977d67ecbd302f24463dc00667eb40 Mon Sep 17 00:00:00 2001
From: sevendials <christj@gmail.com>
Date: Mon, 3 May 2021 07:49:41 -0700
Subject: [PATCH 321/869] fix(command-not-found): remove invalid argument for
 PackageKit (#9876)

`pk-command-not-found` doesn't accept `--` as an argument. This is what happens when `--` is the first argument:

```
$  gem
zsh: --: command not found...
```
---
 plugins/command-not-found/command-not-found.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/command-not-found/command-not-found.plugin.zsh b/plugins/command-not-found/command-not-found.plugin.zsh
index cbf9a0a8e..3ec13429c 100644
--- a/plugins/command-not-found/command-not-found.plugin.zsh
+++ b/plugins/command-not-found/command-not-found.plugin.zsh
@@ -38,7 +38,7 @@ fi
 if [[ -x /usr/libexec/pk-command-not-found ]]; then
   command_not_found_handler() {
     if [[ -S /var/run/dbus/system_bus_socket && -x /usr/libexec/packagekitd ]]; then
-      /usr/libexec/pk-command-not-found -- "$@"
+      /usr/libexec/pk-command-not-found "$@"
       return $?
     fi
 

From 4e8ffe88d4311edcd084de5efd4ee6688e9e70f7 Mon Sep 17 00:00:00 2001
From: Ben Goldberg <ben@benaaron.dev>
Date: Mon, 3 May 2021 10:59:45 -0400
Subject: [PATCH 322/869] fix(cargo): complete flags for default cargo aliases
 (#9692)

By default, cargo provides alias for some commonly used functions. This patch
makes it that those alias will complete the same as their full commands.

Default alias:
b -> build
c -> check
t -> test
r -> run

Since cargo allows users to define custom alias it would be nice if
oh-my-zsh automatically detected those and preformed completions as such
but that would be a much more complex patch.
---
 plugins/cargo/_cargo | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/plugins/cargo/_cargo b/plugins/cargo/_cargo
index ffc9fcdc8..ebff99310 100644
--- a/plugins/cargo/_cargo
+++ b/plugins/cargo/_cargo
@@ -77,7 +77,7 @@ _cargo() {
                         '*:args:_default'
                         ;;
 
-                build)
+                build|b)
                     _arguments -s -S $common $parallel $features $msgfmt $triple $target $manifest \
                         '--all-targets[equivalent to specifying --lib --bins --tests --benches --examples]' \
                         "${command_scope_spec[@]}" \
@@ -86,7 +86,7 @@ _cargo() {
                         '--build-plan[output the build plan in JSON]' \
                         ;;
 
-                check)
+                check|c)
                     _arguments -s -S $common $parallel $features $msgfmt $triple $target $manifest \
                         '--all-targets[equivalent to specifying --lib --bins --tests --benches --examples]' \
                         "${command_scope_spec[@]}" \
@@ -224,7 +224,7 @@ _cargo() {
                     _arguments -s -S $common $manifest
                         ;;
 
-                run)
+                run|r)
                     _arguments -s -S $common $parallel $features $msgfmt $triple $target $manifest \
                         '--example=[name of the bin target]:name' \
                         '--bin=[name of the bin target]:name' \
@@ -259,7 +259,7 @@ _cargo() {
                         '*: :_guard "^-*" "query"'
                         ;;
 
-                test)
+                test|t)
                     _arguments -s -S $common $parallel $features $msgfmt $triple $target $manifest \
                         '--test=[test name]: :_cargo_test_names' \
                         '--no-fail-fast[run all tests regardless of failure]' \

From d646884add277d134235a9b18ab755388d6e0d8d Mon Sep 17 00:00:00 2001
From: "Babak K. Shandiz" <babak.k.shandiz@gmail.com>
Date: Mon, 3 May 2021 20:05:13 +0430
Subject: [PATCH 323/869] feat(git): add aliases `gcas` and `gcasm` for commit
 with sign-off (#8881)

---
 plugins/git/README.md      | 2 ++
 plugins/git/git.plugin.zsh | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/plugins/git/README.md b/plugins/git/README.md
index 6ad19543e..4f051db8d 100644
--- a/plugins/git/README.md
+++ b/plugins/git/README.md
@@ -41,6 +41,8 @@ plugins=(... git)
 | gcan!                | git commit -v -a --no-edit --amend                                                                                               |
 | gcans!               | git commit -v -a -s --no-edit --amend                                                                                            |
 | gcam                 | git commit -a -m                                                                                                                 |
+| gcas                 | git commit -a -s                                                                                                                 |
+| gcasm                | git commit -a -s -m                                                                                                                  |
 | gcsm                 | git commit -s -m                                                                                                                 |
 | gcb                  | git checkout -b                                                                                                                  |
 | gcf                  | git config --list                                                                                                                |
diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index e815d0787..35ebfbfa3 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -80,6 +80,8 @@ alias gcan!='git commit -v -a --no-edit --amend'
 alias gcans!='git commit -v -a -s --no-edit --amend'
 alias gcam='git commit -a -m'
 alias gcsm='git commit -s -m'
+alias gcas='git commit -a -s'
+alias gcasm='git commit -a -s -m'
 alias gcb='git checkout -b'
 alias gcf='git config --list'
 alias gcl='git clone --recurse-submodules'

From 1bda62dffadf175091fe144cb423db348e3029df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Fri, 21 May 2021 21:57:34 +0200
Subject: [PATCH 324/869] feat(shrink-path): add ability to toggle off path
 shrinking (#9794)

---
 plugins/shrink-path/README.md              | 87 +++++++++++++++-------
 plugins/shrink-path/shrink-path.plugin.zsh | 12 +++
 2 files changed, 73 insertions(+), 26 deletions(-)

diff --git a/plugins/shrink-path/README.md b/plugins/shrink-path/README.md
index 33dc3f8ae..71a242b2c 100644
--- a/plugins/shrink-path/README.md
+++ b/plugins/shrink-path/README.md
@@ -1,43 +1,50 @@
-# A plugin to shrink directory paths for brevity and pretty-printing
+# shrink-path
 
+A plugin to shrink directory paths for brevity and pretty-printing.
+
+To use it, add `shrink-path` to the plugins array in your zshrc file:
+
+```zsh
+plugins=(... shrink-path)
+```
 
 ## Examples
 
 For this directory tree:
 ```
-    /home/
-      me/
-        f o o/     # The prefix f is ambiguous between "f o o" and "f i g".
-          bar/
-            quux/
-          biz/     # The prefix b is ambiguous between bar and biz.
-        f i g/
-          baz/
+/home/
+  me/
+    f o o/     # The prefix f is ambiguous between "f o o" and "f i g".
+      bar/
+        quux/
+      biz/     # The prefix b is ambiguous between bar and biz.
+    f i g/
+      baz/
 ```
 here are the results of calling `shrink_path <option> /home/me/foo/bar/quux`:
 ```
-    Option        Result
-    <none>        /h/m/f o/ba/q
-    -l|--last     /h/m/f o/ba/q
-    -s|--short    /h/m/f/b/q
-    -t|--tilde    ~/f o/ba/q
-    -f|--fish     ~/f/b/quux
-    -g|--glob     /h*/m*/f o*/ba*/q*
-    -3            /hom/me/f o/bar/quu
-    -e '$' -3     /hom$/me/f o$/bar/quu$
-    -q            /h/m/f\ o/ba/q
-    -g -q         /h*/m*/f\ o*/ba*/q*
+Option        Result
+<none>        /h/m/f o/ba/q
+-l|--last     /h/m/f o/ba/q
+-s|--short    /h/m/f/b/q
+-t|--tilde    ~/f o/ba/q
+-f|--fish     ~/f/b/quux
+-g|--glob     /h*/m*/f o*/ba*/q*
+-3            /hom/me/f o/bar/quu
+-e '$' -3     /hom$/me/f o$/bar/quu$
+-q            /h/m/f\ o/ba/q
+-g -q         /h*/m*/f\ o*/ba*/q*
+-x            /home/me/foo/bar/quux
 ```
 
-
 ## Usage
 
 For a fish-style working directory in your command prompt, add the following to
 your theme or zshrc:
 
-```
-    setopt prompt_subst
-    PS1='%n@%m $(shrink_path -f)>'
+```zsh
+setopt prompt_subst
+PS1='%n@%m $(shrink_path -f)>'
 ```
 
 The following options are available:
@@ -54,17 +61,45 @@ The following options are available:
                      ellipsis character(s) (defaulting to 1).
     -e SYMBOL        Postfix symbol(s) to indicate that a directory name had been truncated.
     -q, --quote      Quote special characters in the shrunk path
+    -x, --expand     Print the full path. This takes precedence over the other options
 ```
 
 The long options can also be set via zstyle, like
-```
-    zstyle :prompt:shrink_path fish yes
+```zsh
+zstyle :prompt:shrink_path fish yes
 ```
 
 Note: Directory names containing two or more consecutive spaces are not yet
 supported.
 
 
+## Trick: toggle shrinking with a keyboard shortcut
+
+You can use the `expand` option to disable the path shrinking. You can combine that
+with a key binding widget to toggle path shrinking on and off.
+
+```zsh
+# Toggle off path shrinking
+zstyle ':prompt:shrink_path' expand true
+# Toggle on path shrinking
+zstyle -d ':prompt:shrink_path' expand
+```
+
+Combined with a widget:
+
+```zsh
+# Widget definition
+shrink-path-toggle() {
+  zstyle -t ':prompt:shrink_path' expand \
+    && zstyle -d ':prompt:shrink_path' expand \
+    || zstyle ':prompt:shrink_path' expand true
+  zle reset-prompt
+}
+zle -N shrink-path-toggle
+# Key binding to ALT+SHIFT+S
+bindkey "^[S" shrink-path-toggle
+```
+
 ## License
 
 Copyright (C) 2008 by Daniel Friesel <derf@xxxxxxxxxxxxxxxxxx>
diff --git a/plugins/shrink-path/shrink-path.plugin.zsh b/plugins/shrink-path/shrink-path.plugin.zsh
index f0ed65138..373fd5b05 100644
--- a/plugins/shrink-path/shrink-path.plugin.zsh
+++ b/plugins/shrink-path/shrink-path.plugin.zsh
@@ -45,6 +45,7 @@ shrink_path () {
         typeset -i length=1
         typeset ellipsis=""
         typeset -i quote=0
+        typeset -i expand=0
 
         if zstyle -t ':prompt:shrink_path' fish; then
                 lastfull=1
@@ -60,6 +61,7 @@ shrink_path () {
         zstyle -t ':prompt:shrink_path' tilde && tilde=1
         zstyle -t ':prompt:shrink_path' glob && ellipsis='*'
         zstyle -t ':prompt:shrink_path' quote && quote=1
+        zstyle -t ':prompt:shrink_path' expand && expand=1
 
         while [[ $1 == -* ]]; do
                 case $1 in
@@ -85,6 +87,8 @@ shrink_path () {
                                 print '                 ellipsis character(s) (defaulting to 1).'
                                 print ' -e SYMBOL       Postfix symbol(s) to indicate that a directory name had been truncated.'
                                 print ' -q, --quote     Quote special characters in the shrunk path'
+                                print ' -x, --expand    Print the full path. This takes precedence over the other options'
+                                print ''
                                 print 'The long options can also be set via zstyle, like'
                                 print '  zstyle :prompt:shrink_path fish yes'
                                 return 0
@@ -109,6 +113,9 @@ shrink_path () {
                         -q|--quote)
                                 quote=1
                         ;;
+                        -x|--expand)
+                                expand=1
+                        ;;
                 esac
                 shift
         done
@@ -120,6 +127,11 @@ shrink_path () {
 
         [[ -d $dir ]] || return 0
 
+        if (( expand )) {
+                echo "$dir"
+                return 0
+        }
+
         if (( named )) {
                 for part in ${(k)nameddirs}; {
                         [[ $dir == ${nameddirs[$part]}(/*|) ]] && dir=${dir/#${nameddirs[$part]}/\~$part}

From 7ab15bee033a1ce6791b05f4636221cba7b9505e Mon Sep 17 00:00:00 2001
From: rhuitl <robert@huitl.de>
Date: Fri, 21 May 2021 22:00:58 +0200
Subject: [PATCH 325/869] feat(dirhistory): add ALT+UP/DOWN key bindings for
 iTerm2 (#8502)

---
 plugins/dirhistory/dirhistory.plugin.zsh | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/plugins/dirhistory/dirhistory.plugin.zsh b/plugins/dirhistory/dirhistory.plugin.zsh
index ec1606940..0ee8c6e6a 100644
--- a/plugins/dirhistory/dirhistory.plugin.zsh
+++ b/plugins/dirhistory/dirhistory.plugin.zsh
@@ -2,7 +2,7 @@
 #   Navigate directory history using ALT-LEFT and ALT-RIGHT. ALT-LEFT moves back to directories 
 #   that the user has changed to in the past, and ALT-RIGHT undoes ALT-LEFT.
 # 
-#   Navigate directory hierarchy using ALT-UP and ALT-DOWN. (mac keybindings not yet implemented)
+#   Navigate directory hierarchy using ALT-UP and ALT-DOWN.
 #   ALT-UP moves to higher hierarchy (cd ..)
 #   ALT-DOWN moves into the first directory found in alphabetical order
 #
@@ -125,7 +125,7 @@ zle -N dirhistory_zle_dirhistory_back
 bindkey "\e[3D" dirhistory_zle_dirhistory_back
 bindkey "\e[1;3D" dirhistory_zle_dirhistory_back
 # Mac teminal (alt+left/right)
-if [[ "$TERM_PROGRAM" == "Apple_Terminal" ]]; then
+if [[ "$TERM_PROGRAM" == "Apple_Terminal" || "$TERM_PROGRAM" == "iTerm.app" ]]; then
   bindkey "^[b" dirhistory_zle_dirhistory_back
 fi
 # Putty:
@@ -136,7 +136,7 @@ bindkey "\eO3D" dirhistory_zle_dirhistory_back
 zle -N dirhistory_zle_dirhistory_future
 bindkey "\e[3C" dirhistory_zle_dirhistory_future
 bindkey "\e[1;3C" dirhistory_zle_dirhistory_future
-if [[ "$TERM_PROGRAM" == "Apple_Terminal" ]]; then
+if [[ "$TERM_PROGRAM" == "Apple_Terminal" || "$TERM_PROGRAM" == "iTerm.app" ]]; then
   bindkey "^[f" dirhistory_zle_dirhistory_future
 fi
 bindkey "\e\e[C" dirhistory_zle_dirhistory_future
@@ -175,8 +175,9 @@ zle -N dirhistory_zle_dirhistory_up
 # xterm in normal mode
 bindkey "\e[3A" dirhistory_zle_dirhistory_up
 bindkey "\e[1;3A" dirhistory_zle_dirhistory_up
-# Mac teminal (alt+up)
-    #bindkey "^[?" dirhistory_zle_dirhistory_up #dont know it
+if [[ "$TERM_PROGRAM" == "Apple_Terminal" || "$TERM_PROGRAM" == "iTerm.app" ]]; then
+  bindkey "^[[A" dirhistory_zle_dirhistory_up
+fi
 # Putty:
 bindkey "\e\e[A" dirhistory_zle_dirhistory_up
 # GNU screen:
@@ -185,7 +186,8 @@ bindkey "\eO3A" dirhistory_zle_dirhistory_up
 zle -N dirhistory_zle_dirhistory_down
 bindkey "\e[3B" dirhistory_zle_dirhistory_down
 bindkey "\e[1;3B" dirhistory_zle_dirhistory_down
-# Mac teminal (alt+down)
-    #bindkey "^[?" dirhistory_zle_dirhistory_down #dont know it
+if [[ "$TERM_PROGRAM" == "Apple_Terminal" || "$TERM_PROGRAM" == "iTerm.app" ]]; then
+  bindkey "^[[B" dirhistory_zle_dirhistory_down
+fi
 bindkey "\e\e[B" dirhistory_zle_dirhistory_down
 bindkey "\eO3B" dirhistory_zle_dirhistory_down

From 308b2314f846fba1c0e6e4a64efc95feaa304a59 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Fri, 28 May 2021 10:47:02 +0200
Subject: [PATCH 326/869] fix(dirhistory): fix ALT+Left/Right key bindings for
 iTerm2 (#9940)

---
 plugins/dirhistory/dirhistory.plugin.zsh | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/plugins/dirhistory/dirhistory.plugin.zsh b/plugins/dirhistory/dirhistory.plugin.zsh
index 0ee8c6e6a..cbac84600 100644
--- a/plugins/dirhistory/dirhistory.plugin.zsh
+++ b/plugins/dirhistory/dirhistory.plugin.zsh
@@ -124,10 +124,14 @@ zle -N dirhistory_zle_dirhistory_back
 # xterm in normal mode
 bindkey "\e[3D" dirhistory_zle_dirhistory_back
 bindkey "\e[1;3D" dirhistory_zle_dirhistory_back
-# Mac teminal (alt+left/right)
-if [[ "$TERM_PROGRAM" == "Apple_Terminal" || "$TERM_PROGRAM" == "iTerm.app" ]]; then
+# Terminal.app
+if [[ "$TERM_PROGRAM" == "Apple_Terminal" ]]; then
   bindkey "^[b" dirhistory_zle_dirhistory_back
 fi
+# iTerm2
+if [[ "$TERM_PROGRAM" == "iTerm.app" ]]; then
+  bindkey "^[^[[D" dirhistory_zle_dirhistory_back
+fi
 # Putty:
 bindkey "\e\e[D" dirhistory_zle_dirhistory_back
 # GNU screen:
@@ -136,9 +140,14 @@ bindkey "\eO3D" dirhistory_zle_dirhistory_back
 zle -N dirhistory_zle_dirhistory_future
 bindkey "\e[3C" dirhistory_zle_dirhistory_future
 bindkey "\e[1;3C" dirhistory_zle_dirhistory_future
-if [[ "$TERM_PROGRAM" == "Apple_Terminal" || "$TERM_PROGRAM" == "iTerm.app" ]]; then
+# Terminal.app
+if [[ "$TERM_PROGRAM" == "Apple_Terminal" ]]; then
   bindkey "^[f" dirhistory_zle_dirhistory_future
 fi
+# iTerm2
+if [[ "$TERM_PROGRAM" == "iTerm.app" ]]; then
+  bindkey "^[^[[C" dirhistory_zle_dirhistory_future
+fi
 bindkey "\e\e[C" dirhistory_zle_dirhistory_future
 bindkey "\eO3C" dirhistory_zle_dirhistory_future
 

From 059ee71fc812f104bd8ac3dae2f5f01a8d3f032a Mon Sep 17 00:00:00 2001
From: Keita Urashima <ursm@ursm.jp>
Date: Fri, 28 May 2021 18:14:58 +0900
Subject: [PATCH 327/869] fix(gentoo): fix the color of the prompt symbol
 (#9885)

This commit fixes an issue where the prompt symbol is white when vcs_info is displayed in the gentoo theme.
---
 themes/gentoo.zsh-theme | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/themes/gentoo.zsh-theme b/themes/gentoo.zsh-theme
index e18bce890..7ac461036 100644
--- a/themes/gentoo.zsh-theme
+++ b/themes/gentoo.zsh-theme
@@ -25,4 +25,4 @@ gentoo_precmd() {
 autoload -U add-zsh-hook
 add-zsh-hook precmd gentoo_precmd
 
-PROMPT='%(!.%B%F{red}.%B%F{green}%n@)%m %F{blue}%(!.%1~.%~) ${vcs_info_msg_0_}%(!.#.$)%k%b%f '
+PROMPT='%(!.%B%F{red}.%B%F{green}%n@)%m %F{blue}%(!.%1~.%~) ${vcs_info_msg_0_}%F{blue}%(!.#.$)%k%b%f '

From c95b4a393a9eb4f4a4ca0535ed500bdf5e2fbe96 Mon Sep 17 00:00:00 2001
From: "Gustavo J. Acosta" <gtaw_acosta@protonmail.com>
Date: Fri, 28 May 2021 05:19:28 -0400
Subject: [PATCH 328/869] chore(chucknorris): fix typo (#9916)

---
 plugins/chucknorris/fortunes/chucknorris | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/chucknorris/fortunes/chucknorris b/plugins/chucknorris/fortunes/chucknorris
index 0eb6e2e99..0ddb6c03b 100644
--- a/plugins/chucknorris/fortunes/chucknorris
+++ b/plugins/chucknorris/fortunes/chucknorris
@@ -312,7 +312,7 @@ Chuck Norris. Enough said.
 %
 Chuck Norris: even Naruto can't believe it.
 %
-Chunk Norris can make sour milk turn fresh.
+Chuck Norris can make sour milk turn fresh.
 %
 Contrary to popular belief, Rome WAS built in a day, by Chuck Norris.
 %

From 706b2f3765d41bee2853b17724888d1a3f6f00d9 Mon Sep 17 00:00:00 2001
From: Corey Hinkle <bugg123@gmail.com>
Date: Fri, 28 May 2021 05:27:16 -0400
Subject: [PATCH 329/869] feat(extract): add support for .ear files (#9901)

Co-authored-by: Corey Hinkle <corey.hinkle@five9.com>
---
 plugins/extract/README.md          | 1 +
 plugins/extract/_extract           | 2 +-
 plugins/extract/extract.plugin.zsh | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/plugins/extract/README.md b/plugins/extract/README.md
index b2b731e39..f2e6ad1d1 100644
--- a/plugins/extract/README.md
+++ b/plugins/extract/README.md
@@ -22,6 +22,7 @@ plugins=(... extract)
 | `aar`             | Android library file                 |
 | `bz2`             | Bzip2 file                           |
 | `deb`             | Debian package                       |
+| `ear`             | Enterprise Application aRchive       |
 | `gz`              | Gzip file                            |
 | `ipa`             | iOS app package                      |
 | `ipsw`            | iOS firmware file                    |
diff --git a/plugins/extract/_extract b/plugins/extract/_extract
index f96f0d450..267c4d4e1 100644
--- a/plugins/extract/_extract
+++ b/plugins/extract/_extract
@@ -3,5 +3,5 @@
 
 _arguments \
   '(-r --remove)'{-r,--remove}'[Remove archive.]' \
-  "*::archive file:_files -g '(#i)*.(7z|Z|apk|aar|bz2|deb|gz|ipa|ipsw|jar|lrz|lz4|lzma|rar|rpm|sublime-package|tar|tar.bz2|tar.gz|tar.lrz|tar.lz|tar.lz4|tar.xz|tar.zma|tar.zst|tbz|tbz2|tgz|tlz|txz|tzst|war|whl|xpi|xz|zip|zst)(-.)'" \
+  "*::archive file:_files -g '(#i)*.(7z|Z|apk|aar|bz2|deb|ear|gz|ipa|ipsw|jar|lrz|lz4|lzma|rar|rpm|sublime-package|tar|tar.bz2|tar.gz|tar.lrz|tar.lz|tar.lz4|tar.xz|tar.zma|tar.zst|tbz|tbz2|tgz|tlz|txz|tzst|war|whl|xpi|xz|zip|zst)(-.)'" \
     && return 0
diff --git a/plugins/extract/extract.plugin.zsh b/plugins/extract/extract.plugin.zsh
index 46e69f08d..e390e2dcc 100644
--- a/plugins/extract/extract.plugin.zsh
+++ b/plugins/extract/extract.plugin.zsh
@@ -55,7 +55,7 @@ extract() {
 			(*.lz4) lz4 -d "$1" ;;
 			(*.lzma) unlzma "$1" ;;
 			(*.z) uncompress "$1" ;;
-			(*.zip|*.war|*.jar|*.sublime-package|*.ipa|*.ipsw|*.xpi|*.apk|*.aar|*.whl) unzip "$1" -d $extract_dir ;;
+			(*.zip|*.war|*.jar|*.ear|*.sublime-package|*.ipa|*.ipsw|*.xpi|*.apk|*.aar|*.whl) unzip "$1" -d $extract_dir ;;
 			(*.rar) unrar x -ad "$1" ;;
 			(*.rpm) mkdir "$extract_dir" && cd "$extract_dir" && rpm2cpio "../$1" | cpio --quiet -id && cd .. ;;
 			(*.7z) 7za x "$1" ;;

From 02ce2c4a2f563c4e092410fe3ddc8b29b6de7fdc Mon Sep 17 00:00:00 2001
From: Roc <rochappy.sun@gmail.com>
Date: Sat, 12 Jun 2021 09:50:29 +0800
Subject: [PATCH 330/869] add python alias (#7736)

---
 plugins/python/python.plugin.zsh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/plugins/python/python.plugin.zsh b/plugins/python/python.plugin.zsh
index c3c1474c1..276eb6f91 100644
--- a/plugins/python/python.plugin.zsh
+++ b/plugins/python/python.plugin.zsh
@@ -1,3 +1,6 @@
+# python command
+alias py='python'
+
 # Find python file
 alias pyfind='find . -name "*.py"'
 

From a206271460ce49e842b1b410c0424b8c9a0a3d14 Mon Sep 17 00:00:00 2001
From: Nuno Goncalves <nunojpg@gmail.com>
Date: Sat, 12 Jun 2021 04:03:25 +0200
Subject: [PATCH 331/869] ssh-agent: improvements (#6309)

* ssh-agent: lock this script with a mkdir style mutex

This script is a kind of singleton pattern and is not reentrant.
If several shells are oppened in a fast sequence, then several
independent ssh-agents would be created, which is not acceptable.
A mutex is required.

Signed-off-by: Nuno Goncalves <nunojpg@gmail.com>

* ssh-agent: only start agent if .ssh dir exists

To use the same profile system-wide, it might happen
that the .ssh directory does not exist
(typically $HOME/.ssh/). This would trigger a error.

Creating the directory would be a option, but it
usually will not make sense to do so because it means
the user doesn't have ssh keys or config.

Signed-off-by: Nuno Goncalves <nunojpg@gmail.com>

* ssh-agent: adds lazy option to disable key loading on start

Option is documented on updated README.md

Signed-off-by: Nuno Goncalves <nunojpg@gmail.com>

* ssh-agent: simplify agent-forwarding checking

Signed-off-by: Nuno Goncalves <nunojpg@gmail.com>

Co-authored-by: Robby Russell <robby@planetargon.com>
---
 plugins/ssh-agent/README.md            | 12 +++++++++--
 plugins/ssh-agent/ssh-agent.plugin.zsh | 29 +++++++++++++++++++-------
 2 files changed, 31 insertions(+), 10 deletions(-)

diff --git a/plugins/ssh-agent/README.md b/plugins/ssh-agent/README.md
index 8765a9c7e..aa96f9cc9 100644
--- a/plugins/ssh-agent/README.md
+++ b/plugins/ssh-agent/README.md
@@ -19,9 +19,17 @@ To enable **agent forwarding support** add the following to your zshrc file:
 zstyle :omz:plugins:ssh-agent agent-forwarding on
 ```
 
-----
+To **NOT load any identities on start** use the `lazy` style.
+This is particularly usefull when combined with the AddKeysToAgent
+(available from OpenSSH 7.2), since it allows to enter the password only
+on first use.
 
-To **load multiple identities** use the `identities` style, For example:
+```zsh
+zstyle :omz:plugins:ssh-agent lazy yes
+```
+
+To **load multiple identities** use the `identities` style. This have no
+effect if `lazy` is enabled.
 
 ```zsh
 zstyle :omz:plugins:ssh-agent identities id_rsa id_rsa2 id_github
diff --git a/plugins/ssh-agent/ssh-agent.plugin.zsh b/plugins/ssh-agent/ssh-agent.plugin.zsh
index d45406f63..494cf1393 100644
--- a/plugins/ssh-agent/ssh-agent.plugin.zsh
+++ b/plugins/ssh-agent/ssh-agent.plugin.zsh
@@ -1,4 +1,16 @@
-typeset _agent_forwarding _ssh_env_cache
+lockdir=/tmp/oh-my-zsh-ssh-agent.lock
+
+while true; do
+    if mkdir "$lockdir" 2>/dev/null
+    then    # directory did not exist, but was created successfully
+        trap 'rm -rf "$lockdir"' 0    # remove directory when script finishes
+        break    # continue with script
+    else
+        sleep 0.1  # sleep for 0.2 and try again
+    fi
+done
+
+typeset _ssh_env_cache
 
 function _start_agent() {
 	local lifetime
@@ -56,10 +68,7 @@ function _add_identities() {
 # Get the filename to store/lookup the environment from
 _ssh_env_cache="$HOME/.ssh/environment-$SHORT_HOST"
 
-# test if agent-forwarding is enabled
-zstyle -b :omz:plugins:ssh-agent agent-forwarding _agent_forwarding
-
-if [[ $_agent_forwarding == "yes" && -n "$SSH_AUTH_SOCK" ]]; then
+if zstyle -t :omz:plugins:ssh-agent agent-forwarding && [[ -n "$SSH_AUTH_SOCK" ]]; then
 	# Add a nifty symlink for screen/tmux if agent forwarding
 	[[ -L $SSH_AUTH_SOCK ]] || ln -sf "$SSH_AUTH_SOCK" /tmp/ssh-agent-$USERNAME-screen
 elif [[ -f "$_ssh_env_cache" ]]; then
@@ -73,12 +82,16 @@ elif [[ -f "$_ssh_env_cache" ]]; then
 	ps $FILTER | grep ssh-agent | grep -q $SSH_AGENT_PID || {
 		_start_agent
 	}
-else
+elif [[ -d $HOME/.ssh ]]; then
 	_start_agent
 fi
 
-_add_identities
+if ! zstyle -t :omz:plugins:ssh-agent lazy; then
+	_add_identities
+fi
 
 # tidy up after ourselves
-unset _agent_forwarding _ssh_env_cache
+unset _ssh_env_cache
 unfunction _start_agent _add_identities
+
+rm -rf "$lockdir"

From e47a8e2321be9e7af49872588619c031a757d6ea Mon Sep 17 00:00:00 2001
From: hqingyi <huangb.qingy@gmail.com>
Date: Sat, 12 Jun 2021 10:45:05 +0800
Subject: [PATCH 332/869] feat(plugins): add aliases cheatsheet plugin (#4662)

* add: explore alias quickly with aliases plugin.

* change: add compatibility with python2 & python3.

- add compatibility.
- add termcolor.py.
- remove aliass(search), just use acs.
- detect python.
---
 plugins/aliases/aliases.plugin.zsh |  10 ++
 plugins/aliases/cheatsheet.py      |  55 ++++++++++
 plugins/aliases/termcolor.py       | 168 +++++++++++++++++++++++++++++
 3 files changed, 233 insertions(+)
 create mode 100644 plugins/aliases/aliases.plugin.zsh
 create mode 100644 plugins/aliases/cheatsheet.py
 create mode 100644 plugins/aliases/termcolor.py

diff --git a/plugins/aliases/aliases.plugin.zsh b/plugins/aliases/aliases.plugin.zsh
new file mode 100644
index 000000000..28d8fba24
--- /dev/null
+++ b/plugins/aliases/aliases.plugin.zsh
@@ -0,0 +1,10 @@
+# with lots of 3rd-party amazing aliases installed, just need something to explore it quickly.
+#
+# - acs: alias cheatsheet
+#   group alias by command, pass addition argv to grep.
+ALIASES_PLUGIN_ROOT=$(cd `dirname $0` && pwd)
+function acs(){
+    which python >>/dev/null
+    [[ $? -eq 1 ]] && echo "[error]no python executable detected!" && return
+    alias | python $ALIASES_PLUGIN_ROOT/cheatsheet.py $@
+}
diff --git a/plugins/aliases/cheatsheet.py b/plugins/aliases/cheatsheet.py
new file mode 100644
index 000000000..d6d507b92
--- /dev/null
+++ b/plugins/aliases/cheatsheet.py
@@ -0,0 +1,55 @@
+#!/usr/bin/env python
+import sys
+import itertools
+import termcolor
+
+def parse(line):
+    left = line[0:line.find('=')].strip()
+    right = line[line.find('=')+1:].strip('\'"\n ')
+    try:
+        cmd = next(part for part in right.split() if len([char for char in '=<>' if char in part])==0)
+    except StopIteration:
+        cmd = right
+    return (left, right, cmd)
+
+def cheatsheet(lines):
+    exps = [ parse(line) for line in lines ]
+    cheatsheet = {'_default': []}
+    for key, group in itertools.groupby(exps, lambda exp:exp[2]):
+        group_list = [ item for item in group ]
+        if len(group_list)==1:
+            target_aliases = cheatsheet['_default']
+        else:
+            if key not in cheatsheet:
+                cheatsheet[key] = []
+            target_aliases = cheatsheet[key]
+        target_aliases.extend(group_list)
+    return cheatsheet
+
+def pretty_print_group(key, aliases, hightlight=None):
+    if len(aliases) == 0:
+        return
+    group_hl_formatter = lambda g, hl: termcolor.colored(hl, 'yellow').join([termcolor.colored(part, 'red') for part in ('[%s]' % g).split(hl)])
+    alias_hl_formatter = lambda alias, hl: termcolor.colored(hl, 'yellow').join([termcolor.colored(part, 'green') for part in ('\t%s = %s' % alias[0:2]).split(hl)])
+    group_formatter = lambda g: termcolor.colored('[%s]' % g, 'red')
+    alias_formatter = lambda alias: termcolor.colored('\t%s = %s' % alias[0:2], 'green')
+    if hightlight and len(hightlight)>0:
+        print (group_hl_formatter(key, hightlight))
+        print ('\n'.join([alias_hl_formatter(alias, hightlight) for alias in aliases]))
+    else:
+        print (group_formatter(key))
+        print ('\n'.join([alias_formatter(alias) for alias in aliases]))
+    print ('')
+
+def pretty_print(cheatsheet, wfilter):
+    sorted_key = sorted(cheatsheet.keys())
+    for key in sorted_key:
+        aliases = cheatsheet.get(key)
+        if not wfilter:
+            pretty_print_group(key, aliases, wfilter)
+        else:
+            pretty_print_group(key, [ alias for alias in aliases if alias[0].find(wfilter)>-1 or alias[1].find(wfilter)>-1], wfilter)
+
+if __name__ == '__main__':
+    lines = sys.stdin.readlines()
+    pretty_print(cheatsheet(lines), sys.argv[1] if len(sys.argv)>1 else None)
diff --git a/plugins/aliases/termcolor.py b/plugins/aliases/termcolor.py
new file mode 100644
index 000000000..f11b824b2
--- /dev/null
+++ b/plugins/aliases/termcolor.py
@@ -0,0 +1,168 @@
+# coding: utf-8
+# Copyright (c) 2008-2011 Volvox Development Team
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+#
+# Author: Konstantin Lepa <konstantin.lepa@gmail.com>
+
+"""ANSII Color formatting for output in terminal."""
+
+from __future__ import print_function
+import os
+
+
+__ALL__ = [ 'colored', 'cprint' ]
+
+VERSION = (1, 1, 0)
+
+ATTRIBUTES = dict(
+        list(zip([
+            'bold',
+            'dark',
+            '',
+            'underline',
+            'blink',
+            '',
+            'reverse',
+            'concealed'
+            ],
+            list(range(1, 9))
+            ))
+        )
+del ATTRIBUTES['']
+
+
+HIGHLIGHTS = dict(
+        list(zip([
+            'on_grey',
+            'on_red',
+            'on_green',
+            'on_yellow',
+            'on_blue',
+            'on_magenta',
+            'on_cyan',
+            'on_white'
+            ],
+            list(range(40, 48))
+            ))
+        )
+
+
+COLORS = dict(
+        list(zip([
+            'grey',
+            'red',
+            'green',
+            'yellow',
+            'blue',
+            'magenta',
+            'cyan',
+            'white',
+            ],
+            list(range(30, 38))
+            ))
+        )
+
+
+RESET = '\033[0m'
+
+
+def colored(text, color=None, on_color=None, attrs=None):
+    """Colorize text.
+
+    Available text colors:
+        red, green, yellow, blue, magenta, cyan, white.
+
+    Available text highlights:
+        on_red, on_green, on_yellow, on_blue, on_magenta, on_cyan, on_white.
+
+    Available attributes:
+        bold, dark, underline, blink, reverse, concealed.
+
+    Example:
+        colored('Hello, World!', 'red', 'on_grey', ['blue', 'blink'])
+        colored('Hello, World!', 'green')
+    """
+    if os.getenv('ANSI_COLORS_DISABLED') is None:
+        fmt_str = '\033[%dm%s'
+        if color is not None:
+            text = fmt_str % (COLORS[color], text)
+
+        if on_color is not None:
+            text = fmt_str % (HIGHLIGHTS[on_color], text)
+
+        if attrs is not None:
+            for attr in attrs:
+                text = fmt_str % (ATTRIBUTES[attr], text)
+
+        text += RESET
+    return text
+
+
+def cprint(text, color=None, on_color=None, attrs=None, **kwargs):
+    """Print colorize text.
+
+    It accepts arguments of print function.
+    """
+
+    print((colored(text, color, on_color, attrs)), **kwargs)
+
+
+if __name__ == '__main__':
+    print('Current terminal type: %s' % os.getenv('TERM'))
+    print('Test basic colors:')
+    cprint('Grey color', 'grey')
+    cprint('Red color', 'red')
+    cprint('Green color', 'green')
+    cprint('Yellow color', 'yellow')
+    cprint('Blue color', 'blue')
+    cprint('Magenta color', 'magenta')
+    cprint('Cyan color', 'cyan')
+    cprint('White color', 'white')
+    print(('-' * 78))
+
+    print('Test highlights:')
+    cprint('On grey color', on_color='on_grey')
+    cprint('On red color', on_color='on_red')
+    cprint('On green color', on_color='on_green')
+    cprint('On yellow color', on_color='on_yellow')
+    cprint('On blue color', on_color='on_blue')
+    cprint('On magenta color', on_color='on_magenta')
+    cprint('On cyan color', on_color='on_cyan')
+    cprint('On white color', color='grey', on_color='on_white')
+    print('-' * 78)
+
+    print('Test attributes:')
+    cprint('Bold grey color', 'grey', attrs=['bold'])
+    cprint('Dark red color', 'red', attrs=['dark'])
+    cprint('Underline green color', 'green', attrs=['underline'])
+    cprint('Blink yellow color', 'yellow', attrs=['blink'])
+    cprint('Reversed blue color', 'blue', attrs=['reverse'])
+    cprint('Concealed Magenta color', 'magenta', attrs=['concealed'])
+    cprint('Bold underline reverse cyan color', 'cyan',
+            attrs=['bold', 'underline', 'reverse'])
+    cprint('Dark blink concealed white color', 'white',
+            attrs=['dark', 'blink', 'concealed'])
+    print(('-' * 78))
+
+    print('Test mixing:')
+    cprint('Underline red on grey color', 'red', 'on_grey',
+            ['underline'])
+    cprint('Reversed green on red color', 'green', 'on_red', ['reverse'])
+

From 5cdba87025b9dca3c6f2378a58595c613464fc63 Mon Sep 17 00:00:00 2001
From: Robby Russell <robby@planetargon.com>
Date: Fri, 11 Jun 2021 19:43:24 -0700
Subject: [PATCH 333/869] Aliases: Adding a README file for the plugin. #4662

---
 plugins/aliases/README.md | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 plugins/aliases/README.md

diff --git a/plugins/aliases/README.md b/plugins/aliases/README.md
new file mode 100644
index 000000000..481c1bd4e
--- /dev/null
+++ b/plugins/aliases/README.md
@@ -0,0 +1,21 @@
+## Aliases Cheatsheet
+
+**Maintainer:** [@hqingyi](https://github.com/hqingyi)
+
+With lots of 3rd-party amazing aliases installed, this plugin helps list the shortcuts
+that are currently available based on the plugins you have enabled.
+
+Enable this plugin by adding it to your `plugins` definition in `~/.zshrc`.
+
+  ```
+  plugins=(aliases)
+  ```
+
+Requirements: Python needs to be installed.
+
+### Usage
+
+```
+  acs: group all alias
+  acs $keywordquickly filter alias & highlight
+```

From 270db708059909b575cd747789580f8a3dbf7baa Mon Sep 17 00:00:00 2001
From: Logicer <81077770+Logicer16@users.noreply.github.com>
Date: Sat, 12 Jun 2021 13:03:21 +1000
Subject: [PATCH 334/869] fix(update): correct description of how changelog is
 displayed (#9943)

---
 tools/upgrade.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/upgrade.sh b/tools/upgrade.sh
index 417e06fe8..38fac3ce0 100755
--- a/tools/upgrade.sh
+++ b/tools/upgrade.sh
@@ -72,7 +72,7 @@ if git pull --rebase --stat origin master; then
     # Save the commit prior to updating
     git config oh-my-zsh.lastVersion "$last_commit"
 
-    # Display changelog with less if available, otherwise just print it to the terminal
+    # Print changelog to the terminal
     if [[ "$1" = --interactive ]]; then
       "$ZSH/tools/changelog.sh" HEAD "$last_commit"
     fi

From 00ccb449907d322c6bfa53f17e96cbf48651fee3 Mon Sep 17 00:00:00 2001
From: Hugo Stijns <hugo@boosboos.net>
Date: Sat, 12 Jun 2021 05:04:58 +0200
Subject: [PATCH 335/869] fix(vagrant): Allow dot in Vagrant box name (#4803)

---
 plugins/vagrant/_vagrant | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/vagrant/_vagrant b/plugins/vagrant/_vagrant
index 3e16dbebf..e88835506 100644
--- a/plugins/vagrant/_vagrant
+++ b/plugins/vagrant/_vagrant
@@ -69,7 +69,7 @@ __box_list ()
 
 __vm_list ()
 {
-    _wanted application expl 'command' compadd $(command grep "${VAGRANT_CWD:-.}/Vagrantfile" -oe '^[^#]*\.vm\.define *[:"]\([a-zA-Z0-9_-]\+\)' 2>/dev/null | awk '{print substr($2, 2)}')
+    _wanted application expl 'command' compadd $(command grep "${VAGRANT_CWD:-.}/Vagrantfile" -oe '^[^#]*\.vm\.define *[:"]\([a-zA-Z0-9\._-]\+\)' 2>/dev/null | awk '{print substr($2, 2)}')
     _wanted application expl 'command' compadd $(command ls "${VAGRANT_CWD:-.}/.vagrant/machines/" 2>/dev/null)
 }
 

From 580c28dedd60e9262cd7240a9417e0302a6476da Mon Sep 17 00:00:00 2001
From: Eric Liu <lazybios@gmail.com>
Date: Sat, 12 Jun 2021 11:07:21 +0800
Subject: [PATCH 336/869] feat(rails): add 'rails server --bind' alias (#4977)

---
 plugins/rails/rails.plugin.zsh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/rails/rails.plugin.zsh b/plugins/rails/rails.plugin.zsh
index 5b0be4f85..aa7576916 100644
--- a/plugins/rails/rails.plugin.zsh
+++ b/plugins/rails/rails.plugin.zsh
@@ -52,6 +52,7 @@ alias ru='rails runner'
 alias rs='rails server'
 alias rsd='rails server --debugger'
 alias rsp='rails server --port'
+alias rsb='rails server --bind'
 
 # Rake aliases
 alias rdm='rake db:migrate'

From 42f56c5601f814ca34239324eefc9cb96cb4cdbc Mon Sep 17 00:00:00 2001
From: Dzianis Dashkevich <dskecse@gmail.com>
Date: Sat, 12 Jun 2021 06:10:00 +0300
Subject: [PATCH 337/869] feat(rails): Add `rdmd` and `rdmu` aliases to Rails
 plugin (#6126)

* `rdmd` is aliased to `rake db:migrate:down`
* `rdmu` is aliased to `rake db:migrate:up`
* These tasks allow you to run a specific migration up or down by
specifying the appropriate `VERSION` env variable, which contains
the numerical prefix of the migration's filename
---
 plugins/rails/rails.plugin.zsh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/plugins/rails/rails.plugin.zsh b/plugins/rails/rails.plugin.zsh
index aa7576916..34aebbc2c 100644
--- a/plugins/rails/rails.plugin.zsh
+++ b/plugins/rails/rails.plugin.zsh
@@ -56,7 +56,9 @@ alias rsb='rails server --bind'
 
 # Rake aliases
 alias rdm='rake db:migrate'
+alias rdmd='rake db:migrate:down'
 alias rdms='rake db:migrate:status'
+alias rdmu='rake db:migrate:up'
 alias rdr='rake db:rollback'
 alias rdc='rake db:create'
 alias rds='rake db:seed'

From 81db2af60131025f1bb1e25b27fc530066cdba3a Mon Sep 17 00:00:00 2001
From: Dzianis Dashkevich <dskecse@gmail.com>
Date: Sat, 12 Jun 2021 06:12:13 +0300
Subject: [PATCH 338/869] feat(rails): Add `rdmr` (`rake db:migrate:redo`)
 alias to Rails plugin (#6124)

Co-authored-by: Robby Russell <robby@planetargon.com>
---
 plugins/rails/rails.plugin.zsh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/rails/rails.plugin.zsh b/plugins/rails/rails.plugin.zsh
index 34aebbc2c..29b413434 100644
--- a/plugins/rails/rails.plugin.zsh
+++ b/plugins/rails/rails.plugin.zsh
@@ -56,6 +56,7 @@ alias rsb='rails server --bind'
 
 # Rake aliases
 alias rdm='rake db:migrate'
+alias rdmr='rake db:migrate:redo'
 alias rdmd='rake db:migrate:down'
 alias rdms='rake db:migrate:status'
 alias rdmu='rake db:migrate:up'

From 0869a57cb585ad6279abf108c742e3c6650ed9d5 Mon Sep 17 00:00:00 2001
From: Wenli Wan <swwl1992@gmail.com>
Date: Sat, 12 Jun 2021 11:49:04 +0800
Subject: [PATCH 339/869] fix(kubectl): remove duplicated alias for kubectl
 plugin `kgsa` (#9927)

---
 plugins/kubectl/README.md          | 1 -
 plugins/kubectl/kubectl.plugin.zsh | 1 -
 2 files changed, 2 deletions(-)

diff --git a/plugins/kubectl/README.md b/plugins/kubectl/README.md
index 8937b2b80..f6651c8cd 100644
--- a/plugins/kubectl/README.md
+++ b/plugins/kubectl/README.md
@@ -107,7 +107,6 @@ plugins=(... kubectl)
 | ksss    | `kubectl scale statefulset`         | Scale a statefulset                                                                              |
 | krsss   | `kubectl rollout status statefulset`| Check the rollout status of a deployment                                                         |
 |         |                                     | **Service Accounts management**                                                                  |
-| kgsa    | `kubectl get sa`                    | List all service accounts                                                                        |
 | kdsa    | `kubectl describe sa`               | Describe a service account in details                                                            |
 | kdelsa  | `kubectl delete sa`                 | Delete the service account                                                                       |
 |         |                                     | **DaemonSet management**                                                                         |
diff --git a/plugins/kubectl/kubectl.plugin.zsh b/plugins/kubectl/kubectl.plugin.zsh
index 56135274f..58a401120 100644
--- a/plugins/kubectl/kubectl.plugin.zsh
+++ b/plugins/kubectl/kubectl.plugin.zsh
@@ -151,7 +151,6 @@ alias kdpvc='kubectl describe pvc'
 alias kdelpvc='kubectl delete pvc'
 
 # Service account management.
-alias kgsa="kubectl get sa"
 alias kdsa="kubectl describe sa"
 alias kdelsa="kubectl delete sa"
 

From 94ea7b4516561c8a7587c7b74351bd6dd4f74583 Mon Sep 17 00:00:00 2001
From: Dom Sekotill <dom.sekotill@kodo.org.uk>
Date: Sat, 12 Jun 2021 04:52:22 +0100
Subject: [PATCH 340/869] fix(virtualenvwrapper): several changes for checking
 git directory, including fixes (#5663)

* Test only for the presence of a .git directory in virtualenvwrapper

Instead of using both $(git rev-parse --show-toplevel) and a check for
a .git directory, use just the latter. As well as being redundant
the former does not work quite so well when using multiple worktrees;
each worktree will be treated as a separate project.

* Unset ENV_NAME & deactivate if no virtualenv found

This addresses #4603 without breaking current behaviour (where current
behaviour is correct).

When changing directories, if there is no environment matching
ENV_NAME, ENV_NAME is emptied and deactivate called if there is a
current environment active (based on CD_VIRTUAL_ENV).

* Use path comparison not string comparison for paths

This will solve part of issue #4255 where WORKON_HOME is defined with a
trailing slash or not normalised in some way, as well as instances
where symlinks are used, and any other instances where constructed
paths don't exactly match even though they go to the same file.

Co-authored-by: Robby Russell <robby@planetargon.com>
---
 .../virtualenvwrapper.plugin.zsh              | 23 +++++++++----------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh b/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh
index 88217a7f5..c30216f51 100644
--- a/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh
+++ b/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh
@@ -35,27 +35,19 @@ if [[ ! $DISABLE_VENV_CD -eq 1 ]]; then
   function workon_cwd {
     if [[ -z "$WORKON_CWD" ]]; then
       local WORKON_CWD=1
-      # Check if this is a Git repo
-      local GIT_REPO_ROOT=""
-      local GIT_TOPLEVEL="$(git rev-parse --show-toplevel 2> /dev/null)"
-      if [[ $? == 0 ]]; then
-        GIT_REPO_ROOT="$GIT_TOPLEVEL"
-      fi
       # Get absolute path, resolving symlinks
       local PROJECT_ROOT="${PWD:A}"
       while [[ "$PROJECT_ROOT" != "/" && ! -e "$PROJECT_ROOT/.venv" \
-               && ! -d "$PROJECT_ROOT/.git"  && "$PROJECT_ROOT" != "$GIT_REPO_ROOT" ]]; do
+          && ! -d "$PROJECT_ROOT/.git" ]]; do
         PROJECT_ROOT="${PROJECT_ROOT:h}"
       done
-      if [[ "$PROJECT_ROOT" == "/" ]]; then
-        PROJECT_ROOT="."
-      fi
+
       # Check for virtualenv name override
       if [[ -f "$PROJECT_ROOT/.venv" ]]; then
         ENV_NAME="$(cat "$PROJECT_ROOT/.venv")"
       elif [[ -f "$PROJECT_ROOT/.venv/bin/activate" ]];then
         ENV_NAME="$PROJECT_ROOT/.venv"
-      elif [[ "$PROJECT_ROOT" != "." ]]; then
+      elif [[ "$PROJECT_ROOT" != "/" ]]; then
         ENV_NAME="${PROJECT_ROOT:t}"
       else
         ENV_NAME=""
@@ -68,14 +60,21 @@ if [[ ! $DISABLE_VENV_CD -eq 1 ]]; then
       fi
       if [[ "$ENV_NAME" != "" ]]; then
         # Activate the environment only if it is not already active
-        if [[ "$VIRTUAL_ENV" != "$WORKON_HOME/$ENV_NAME" ]]; then
+        if [[ ! "$VIRTUAL_ENV" -ef "$WORKON_HOME/$ENV_NAME" ]]; then
           if [[ -e "$WORKON_HOME/$ENV_NAME/bin/activate" ]]; then
             workon "$ENV_NAME" && export CD_VIRTUAL_ENV="$ENV_NAME"
           elif [[ -e "$ENV_NAME/bin/activate" ]]; then
             source $ENV_NAME/bin/activate && export CD_VIRTUAL_ENV="$ENV_NAME"
+          else
+            ENV_NAME=""
           fi
         fi
       fi
+      if [[ "$ENV_NAME" == "" && -n $CD_VIRTUAL_ENV && -n $VIRTUAL_ENV ]]; then
+        # We've just left the repo, deactivate the environment
+        # Note: this only happens if the virtualenv was activated automatically
+        deactivate && unset CD_VIRTUAL_ENV
+      fi
     fi
   }
 

From a2e6a85bf30332005262c312bdd110ae9548a259 Mon Sep 17 00:00:00 2001
From: Francesco Giannelli <bassobassista@gmail.com>
Date: Sat, 12 Jun 2021 05:57:04 +0200
Subject: [PATCH 341/869] fix(plugins): cache thefuck aliases (#5522)

---
 plugins/thefuck/thefuck.plugin.zsh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/plugins/thefuck/thefuck.plugin.zsh b/plugins/thefuck/thefuck.plugin.zsh
index b8586c70d..2ab4eb6e2 100644
--- a/plugins/thefuck/thefuck.plugin.zsh
+++ b/plugins/thefuck/thefuck.plugin.zsh
@@ -5,7 +5,8 @@ if [[ -z $commands[thefuck] ]]; then
 fi
 
 # Register alias
-eval "$(thefuck --alias)"
+[[ ! -a $ZSH_CACHE_DIR/thefuck ]] && thefuck --alias > $ZSH_CACHE_DIR/thefuck
+source $ZSH_CACHE_DIR/thefuck
 
 fuck-command-line() {
     local FUCK="$(THEFUCK_REQUIRE_CONFIRMATION=0 thefuck $(fc -ln -1 | tail -n 1) 2> /dev/null)"

From a3d90624df4ca9c4f438e8905f5c56399747db73 Mon Sep 17 00:00:00 2001
From: Gabo Esquivel <contact@gaboesquivel.com>
Date: Fri, 11 Jun 2021 22:06:06 -0600
Subject: [PATCH 342/869] feature(plugins): add bower commands aliases (#3387)

---
 plugins/bower/bower.plugin.zsh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/plugins/bower/bower.plugin.zsh b/plugins/bower/bower.plugin.zsh
index 6019b9d37..3a40b3af0 100644
--- a/plugins/bower/bower.plugin.zsh
+++ b/plugins/bower/bower.plugin.zsh
@@ -1,4 +1,6 @@
 alias bi="bower install"
+alias bisd="bower install --save-dev"
+alias bis="bower install --save"
 alias bl="bower list"
 alias bs="bower search"
 

From f68d65d32a4fce41f08ac229614b7e46baf5e916 Mon Sep 17 00:00:00 2001
From: Mitchel Humpherys <mitch.special@gmail.com>
Date: Fri, 11 Jun 2021 21:09:08 -0700
Subject: [PATCH 343/869] feat(take): add support to `take' for taking remote
 urls (#2029)

Download, extract, and cd into the resulting directory.

Co-authored-by: Mitchel Humpherys <mitchelh@codeaurora.org>
---
 lib/functions.zsh | 26 +++++++++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

diff --git a/lib/functions.zsh b/lib/functions.zsh
index c4340f16c..9cc735196 100644
--- a/lib/functions.zsh
+++ b/lib/functions.zsh
@@ -13,7 +13,7 @@ function upgrade_oh_my_zsh() {
   omz update
 }
 
-function take() {
+function takedir() {
   mkdir -p $@ && cd ${@:$#}
 }
 
@@ -37,6 +37,30 @@ function open_command() {
   ${=open_cmd} "$@" &>/dev/null
 }
 
+function takeurl() {
+  data=$(mktemp)
+  curl -L $1 > $data
+  tar xf $data
+  thedir=$(tar tf $data | head -1)
+  rm $data
+  cd $thedir
+}
+
+function takegit() {
+  git clone $1
+  cd $(basename ${1%%.git})
+}
+
+function take() {
+  if [[ $1 =~ ^(https?|ftp).*\.tar\.(gz|bz2|xz)$ ]]; then
+    takeurl $1
+  elif [[ $1 =~ ^([A-Za-z0-9]\+@|https?|git|ssh|ftps?|rsync).*\.git/?$ ]]; then
+    takegit $1
+  else
+    takedir $1
+  fi
+}
+
 #
 # Get the value of an alias.
 #

From 9bdbe08aa2c2ba4106f17082a9ee303b51167ba1 Mon Sep 17 00:00:00 2001
From: Daniel Wu <daniel.y.woo@gmail.com>
Date: Sat, 12 Jun 2021 21:06:09 +0800
Subject: [PATCH 344/869] feat(plugins): add gpr alias for /git pull -rebase/
 which is easier to remember (#9964)

---
 plugins/git/README.md      | 1 +
 plugins/git/git.plugin.zsh | 1 +
 2 files changed, 2 insertions(+)

diff --git a/plugins/git/README.md b/plugins/git/README.md
index 4f051db8d..93c9cc915 100644
--- a/plugins/git/README.md
+++ b/plugins/git/README.md
@@ -116,6 +116,7 @@ plugins=(... git)
 | gpf                  | git push --force-with-lease                                                                                                      |
 | gpf!                 | git push --force                                                                                                                 |
 | gpoat                | git push origin --all && git push origin --tags                                                                                  |
+| gpr                  | git pull --rebase                                                                                                                |
 | gpu                  | git push upstream                                                                                                                |
 | gpv                  | git push -v                                                                                                                      |
 | gr                   | git remote                                                                                                                       |
diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index 35ebfbfa3..a364b6162 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -215,6 +215,7 @@ alias gpd='git push --dry-run'
 alias gpf='git push --force-with-lease'
 alias gpf!='git push --force'
 alias gpoat='git push origin --all && git push origin --tags'
+alias gpr='git pull --rebase'
 alias gpu='git push upstream'
 alias gpv='git push -v'
 

From 6779e10759c7c45f18a3ade1efac4d87b5ded7f1 Mon Sep 17 00:00:00 2001
From: Frani <frani@users.noreply.github.com>
Date: Sat, 12 Jun 2021 10:08:27 -0300
Subject: [PATCH 345/869] feat(plugins): Add new isodate plugin for friendly
 date formatting commands (#9963)

* add isodate plugin
---
 plugins/isodate/README.md          | 22 ++++++++++++++++++++++
 plugins/isodate/isodate.plugin.zsh |  7 +++++++
 2 files changed, 29 insertions(+)
 create mode 100644 plugins/isodate/README.md
 create mode 100644 plugins/isodate/isodate.plugin.zsh

diff --git a/plugins/isodate/README.md b/plugins/isodate/README.md
new file mode 100644
index 000000000..1ec75b2d4
--- /dev/null
+++ b/plugins/isodate/README.md
@@ -0,0 +1,22 @@
+# Isodate plugin
+
+**Maintainer:** [@Frani](https://github.com/frani)
+
+This plugin adds completion for the [ISO 8601](https://en.wikipedia.org/wiki/ISO_8601),
+as well as some aliases for common Date commands.
+
+To use it, add `isodate` to the plugins array in your zshrc file:
+
+```zsh
+plugins=(... isodate)
+```
+
+## Aliases
+
+| Alias         | Command                              | Description                                                                |
+|---------------|--------------------------------------|----------------------------------------------------------------------------|
+| isodate       | `date +%Y-%m-%dT%H:%M:%S%z`          | Display the current date with UTC offset and ISO 8601-2 extended format    |
+| isodate_utc   | `date -u +%Y-%m-%dT%H:%M:%SZ`        | Display the current date in UTC and ISO 8601-2 extended format             |
+| isodate_basic | `date -u +%Y%m%dT%H%M%SZ`            | Display the current date in UTC and ISO 8601 basic format                  |
+| unixstamp     | `date +%s`                           | Display the current date as a Unix timestamp (seconds since the Unix epoch)|
+| date_locale   | `date +"%c"`                         | Display the current date using the default locale's format                 |
diff --git a/plugins/isodate/isodate.plugin.zsh b/plugins/isodate/isodate.plugin.zsh
new file mode 100644
index 000000000..1a827e785
--- /dev/null
+++ b/plugins/isodate/isodate.plugin.zsh
@@ -0,0 +1,7 @@
+# work with date ISO 8601 easy
+
+alias isodate="date +%Y-%m-%dT%H:%M:%S%z"
+alias isodate_utc="date -u +%Y-%m-%dT%H:%M:%SZ"
+alias isodate_basic="date -u +%Y%m%dT%H%M%SZ"
+alias unixstamp="date +%s"
+alias date_locale="date +"%c""

From 3cdc36fc1eb096804a448ded93da1667e1b3f230 Mon Sep 17 00:00:00 2001
From: Oshadha Gunawardena <oshadha.rocky@gmail.com>
Date: Sat, 12 Jun 2021 18:53:29 +0530
Subject: [PATCH 346/869] feat(plugins): Add a new showpkg alias to ubuntu
 plugin (#4653)

Add an alias for ```showpkg``` to get the reverse and recursive dependencies on a package
---
 plugins/ubuntu/ubuntu.plugin.zsh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/plugins/ubuntu/ubuntu.plugin.zsh b/plugins/ubuntu/ubuntu.plugin.zsh
index a53752fb2..989ffd1ff 100644
--- a/plugins/ubuntu/ubuntu.plugin.zsh
+++ b/plugins/ubuntu/ubuntu.plugin.zsh
@@ -15,6 +15,9 @@ alias agli='apt list --installed'
 # List available updates only
 alias aglu='apt list --upgradable'
 
+alias acsp='apt-cache showpkg'
+compdef _acsp acsp='apt-cache showpkg'
+
 # superuser operations ######################################################
 
 alias afu='sudo apt-file update'

From 81a6cc5050136399ea0c664bacb8f83a999fe866 Mon Sep 17 00:00:00 2001
From: Mirko Lelansky <mlelansky@mail.de>
Date: Sat, 12 Jun 2021 16:01:26 +0200
Subject: [PATCH 347/869] feat(plugins): Add helper function to get current
 mercurial bookmark (#4970)

Add a new function to get the current mercurial bookmark which can be
used in the theme prompts for example.
---
 plugins/mercurial/mercurial.plugin.zsh | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/plugins/mercurial/mercurial.plugin.zsh b/plugins/mercurial/mercurial.plugin.zsh
index f13430476..a50dcb523 100644
--- a/plugins/mercurial/mercurial.plugin.zsh
+++ b/plugins/mercurial/mercurial.plugin.zsh
@@ -63,3 +63,9 @@ function hgic() {
 function hgoc() {
     hg outgoing "$@" | grep "changeset" | wc -l
 }
+
+function hg_get_bookmark_name() {
+  if [ $(in_hg) ]; then
+    echo $(hg id -B)
+  fi
+}

From 8aca13ff78e61e83e0e4aa0acb62f42c75e26eb9 Mon Sep 17 00:00:00 2001
From: javier wilson <javier.wilson@gmail.com>
Date: Sat, 12 Jun 2021 08:02:10 -0600
Subject: [PATCH 348/869] feat(supervisord): autocomplete for restart command
 (#5144)


From 26e9cead1a7c9264962986fdc3038ad7266c92bd Mon Sep 17 00:00:00 2001
From: Felix Stupp <felix.stupp@outlook.com>
Date: Sat, 12 Jun 2021 14:10:06 +0000
Subject: [PATCH 349/869] feat(plugins): Plugin "debian": Switch order of "apt"
 and "aptitude" for detection (#7533)

* Switch order of "apt" and "aptitude" for detection

"apt" is installed by default at Debian (maybe Ubuntu too), while "aptitude" does not seem to be installed by default.
For that, it may be better for most of the users to prefer "aptitude" if installed.

* plugins/debian/README: Change of order mirroded into documentation
---
 plugins/debian/README.md         |  2 +-
 plugins/debian/debian.plugin.zsh | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/plugins/debian/README.md b/plugins/debian/README.md
index da5675c66..922d68cb3 100644
--- a/plugins/debian/README.md
+++ b/plugins/debian/README.md
@@ -10,7 +10,7 @@ plugins=(... debian)
 
 ## Settings
 
-- `$apt_pref`: use apt or aptitude if installed, fallback is apt-get.
+- `$apt_pref`: use aptitude or apt if installed, fallback is apt-get.
 - `$apt_upgr`: use upgrade or safe-upgrade (for aptitude).
 
 Set `$apt_pref` and `$apt_upgr` to whatever command you want (before sourcing Oh My Zsh) to override this behavior.
diff --git a/plugins/debian/debian.plugin.zsh b/plugins/debian/debian.plugin.zsh
index 108396784..bde97cd30 100644
--- a/plugins/debian/debian.plugin.zsh
+++ b/plugins/debian/debian.plugin.zsh
@@ -1,13 +1,13 @@
-# Use apt or aptitude if installed, fallback is apt-get
+# Use aptitude or apt if installed, fallback is apt-get
 # You can just set apt_pref='apt-get' to override it.
 
 if [[ -z $apt_pref || -z $apt_upgr ]]; then
-    if [[ -e $commands[apt] ]]; then
-        apt_pref='apt'
-        apt_upgr='upgrade'
-    elif [[ -e $commands[aptitude] ]]; then
+    if [[ -e $commands[aptitude] ]]; then
         apt_pref='aptitude'
         apt_upgr='safe-upgrade'
+    elif [[ -e $commands[apt] ]]; then
+        apt_pref='apt'
+        apt_upgr='upgrade'
     else
         apt_pref='apt-get'
         apt_upgr='upgrade'

From e701fa49e7fc5f8aaef4ba680e012a14bce00c4b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rolf=20Schr=C3=B6der?= <rolf.schr@gmail.com>
Date: Sat, 12 Jun 2021 16:12:07 +0200
Subject: [PATCH 350/869] feat(plugins): New plugins for samtools and bedtools
 (#3574)

* Add first impl of samtools autocompletion

* Just autocomplete with files all the time

* Add init impl of bedtools completion

* Add readme.md for bedtools plugin

* Add readme for samtools

Co-authored-by: Rolf Schroeder <rolf.schroeder@centogene.com>
---
 plugins/bedtools/README.md |  5 +++
 plugins/bedtools/_bedtools | 64 ++++++++++++++++++++++++++++++++++++++
 plugins/samtools/README.md |  5 +++
 plugins/samtools/_samtools | 40 ++++++++++++++++++++++++
 4 files changed, 114 insertions(+)
 create mode 100644 plugins/bedtools/README.md
 create mode 100644 plugins/bedtools/_bedtools
 create mode 100644 plugins/samtools/README.md
 create mode 100644 plugins/samtools/_samtools

diff --git a/plugins/bedtools/README.md b/plugins/bedtools/README.md
new file mode 100644
index 000000000..c4de4e3a9
--- /dev/null
+++ b/plugins/bedtools/README.md
@@ -0,0 +1,5 @@
+# Bedtools plugin
+
+This plugin adds support for the [bedtools suite](http://bedtools.readthedocs.org/en/latest/):
+
+* Adds autocomplete options for all bedtools sub commands.
diff --git a/plugins/bedtools/_bedtools b/plugins/bedtools/_bedtools
new file mode 100644
index 000000000..ef6c4179a
--- /dev/null
+++ b/plugins/bedtools/_bedtools
@@ -0,0 +1,64 @@
+#compdef bedtools
+#autoload
+
+local curcontext="$curcontext" state line ret=1
+local -a _files
+
+_arguments -C \
+  '1: :->cmds' \
+  '2:: :->args' && ret=0
+
+case $state in
+  cmds)
+    _values "bedtools command" \
+        "--contact[Feature requests, bugs, mailing lists, etc.]" \
+        "--help[Print this help menu.]" \
+        "--version[What version of bedtools are you using?.]" \
+        "annotate[Annotate coverage of features from multiple files.]" \
+        "bamtobed[Convert BAM alignments to BED (& other) formats.]" \
+        "bamtofastq[Convert BAM records to FASTQ records.]" \
+        "bed12tobed6[Breaks BED12 intervals into discrete BED6 intervals.]" \
+        "bedpetobam[Convert BEDPE intervals to BAM records.]" \
+        "bedtobam[Convert intervals to BAM records.]" \
+        "closest[Find the closest, potentially non-overlapping interval.]" \
+        "cluster[Cluster (but don't merge) overlapping/nearby intervals.]" \
+        "complement[Extract intervals _not_ represented by an interval file.]" \
+        "coverage[Compute the coverage over defined intervals.]" \
+        "expand[Replicate lines based on lists of values in columns.]" \
+        "fisher[Calculate Fisher statistic b/w two feature files.]" \
+        "flank[Create new intervals from the flanks of existing intervals.]" \
+        "genomecov[Compute the coverage over an entire genome.]" \
+        "getfasta[Use intervals to extract sequences from a FASTA file.]" \
+        "groupby[Group by common cols. & summarize oth. cols. (~ SQL "groupBy")]" \
+        "igv[Create an IGV snapshot batch script.]" \
+        "intersect[Find overlapping intervals in various ways.]" \
+        "jaccard[Calculate the Jaccard statistic b/w two sets of intervals.]" \
+        "links[Create a HTML page of links to UCSC locations.]" \
+        "makewindows[Make interval "windows" across a genome.]" \
+        "map[Apply a function to a column for each overlapping interval.]" \
+        "maskfasta[Use intervals to mask sequences from a FASTA file.]" \
+        "merge[Combine overlapping/nearby intervals into a single interval.]" \
+        "multicov[Counts coverage from multiple BAMs at specific intervals.]" \
+        "multiinter[Identifies common intervals among multiple interval files.]" \
+        "nuc[Profile the nucleotide content of intervals in a FASTA file.]" \
+        "overlap[Computes the amount of overlap from two intervals.]" \
+        "pairtobed[Find pairs that overlap intervals in various ways.]" \
+        "pairtopair[Find pairs that overlap other pairs in various ways.]" \
+        "random[Generate random intervals in a genome.]" \
+        "reldist[Calculate the distribution of relative distances b/w two files.]" \
+        "sample[Sample random records from file using reservoir sampling.]" \
+        "shuffle[Randomly redistrubute intervals in a genome.]" \
+        "slop[Adjust the size of intervals.]" \
+        "sort[Order the intervals in a file.]" \
+        "subtract[Remove intervals based on overlaps b/w two files.]" \
+        "tag[Tag BAM alignments based on overlaps with interval files.]" \
+        "unionbedg[Combines coverage intervals from multiple BEDGRAPH files.]" \
+        "window[Find overlapping intervals within a window around an interval.]" \
+    ret=0
+    ;;
+  *)
+    _files
+    ;;
+esac
+
+return ret
diff --git a/plugins/samtools/README.md b/plugins/samtools/README.md
new file mode 100644
index 000000000..f4baf41f7
--- /dev/null
+++ b/plugins/samtools/README.md
@@ -0,0 +1,5 @@
+# Samtools plugin
+
+This plugin adds support for [samtools](http://www.htslib.org/):
+
+* Adds autocomplete options for all samtools sub commands.
diff --git a/plugins/samtools/_samtools b/plugins/samtools/_samtools
new file mode 100644
index 000000000..ddb002ae2
--- /dev/null
+++ b/plugins/samtools/_samtools
@@ -0,0 +1,40 @@
+#compdef samtools
+#autoload
+
+local curcontext="$curcontext" state line ret=1
+local -a _files
+
+_arguments -C \
+  '1: :->cmds' \
+  '2:: :->args' && ret=0
+
+case $state in
+  cmds)
+    _values "samtools command" \
+        "view[SAM<->BAM conversion]" \
+        "sort[sort alignment file]" \
+        "mpileup[multi-way pileup]" \
+        "depth[compute the depth]" \
+        "faidx[index/extract FASTA]" \
+        "tview[text alignment viewer]" \
+        "index[index alignment]" \
+        "idxstats[BAM index stats (r595 or later)]" \
+        "fixmate[fix mate information]" \
+        "flagstat[simple stats]" \
+        "calmd[recalculate MD/NM tags and '=' bases]" \
+        "merge[merge sorted alignments]" \
+        "rmdup[remove PCR duplicates]" \
+        "reheader[replace BAM header]" \
+        "cat[concatenate BAMs]" \
+        "bedcov[read depth per BED region]" \
+        "targetcut[cut fosmid regions (for fosmid pool only)]" \
+        "phase[phase heterozygotes]" \
+        "bamshuf[shuffle and group alignments by name]"
+    ret=0
+    ;;
+  *)
+    _files
+    ;;
+esac
+
+return ret

From 5b3657a454efdd5d27753c049cc2e2f1c4d82bc7 Mon Sep 17 00:00:00 2001
From: Guillermo Alcantara <guillermo.alcantara@gmail.com>
Date: Sat, 12 Jun 2021 10:49:08 -0500
Subject: [PATCH 351/869] feat(plugins): Add Ag completion (#3534)

* Add Ag completion

A replacement for ack/grep https://github.com/ggreer/the_silver_searcher

* Create README.md

As requested in the PR: https://github.com/ohmyzsh/ohmyzsh/pull/3534
---
 plugins/ag/README.md | 13 +++++++++
 plugins/ag/_ag       | 66 ++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 79 insertions(+)
 create mode 100644 plugins/ag/README.md
 create mode 100644 plugins/ag/_ag

diff --git a/plugins/ag/README.md b/plugins/ag/README.md
new file mode 100644
index 000000000..6acc54067
--- /dev/null
+++ b/plugins/ag/README.md
@@ -0,0 +1,13 @@
+# The Silver Searcher
+
+This plugin provides completion support for [`ag`](https://github.com/ggreer/the_silver_searcher).
+
+To use it, add ag to the plugins array in your zshrc file.
+
+```zsh
+plugins=(... aws)
+```
+
+## INSTALLATION NOTES
+
+Besides oh-my-zsh, `ag` needs to be installed by following these steps: https://github.com/ggreer/the_silver_searcher#installing.
diff --git a/plugins/ag/_ag b/plugins/ag/_ag
new file mode 100644
index 000000000..25b0c27a7
--- /dev/null
+++ b/plugins/ag/_ag
@@ -0,0 +1,66 @@
+#compdef ag
+#autoload
+
+typeset -A opt_args
+
+# Took the liberty of not listing every option… specially aliases and -D
+_ag () {
+  local -a _1st_arguments
+  _1st_arguments=(
+    '--ackmate:Print results in AckMate-parseable format'
+    {'-A','--after'}':[LINES] Print lines after match (Default: 2)'
+    {'-B','--before'}':[LINES] Print lines before match (Default: 2)'
+    '--break:Print newlines between matches in different files'
+    '--nobreak:Do not print newlines between matches in different files'
+    {'-c','--count'}':Only print the number of matches in each file'
+    '--color:Print color codes in results (Default: On)'
+    '--nocolor:Do not print color codes in results'
+    '--color-line-number:Color codes for line numbers (Default: 1;33)'
+    '--color-match:Color codes for result match numbers (Default: 30;43)'
+    '--color-path:Color codes for path names (Default: 1;32)'
+    '--column:Print column numbers in results'
+    {'-H','--heading'}':Print file names (On unless searching a single file)'
+    '--noheading:Do not print file names (On unless searching a single file)'
+    '--line-numbers:Print line numbers even for streams'
+    {'-C','--context'}':[LINES] Print lines before and after matches (Default: 2)'
+    '-g:[PATTERN] Print filenames matching PATTERN'
+    {'-l','--files-with-matches'}':Only print filenames that contain matches'
+    {'-L','--files-without-matches'}':Only print filenames that do not contain matches'
+    '--no-numbers:Do not print line numbers'
+    {'-o','--only-matching'}':Prints only the matching part of the lines'
+    '--print-long-lines:Print matches on very long lines (Default: 2k characters)'
+    '--passthrough:When searching a stream, print all lines even if they do not match'
+    '--silent:Suppress all log messages, including errors'
+    '--stats:Print stats (files scanned, time taken, etc.)'
+    '--vimgrep:Print results like vim :vimgrep /pattern/g would'
+    {'-0','--null'}':Separate filenames with null (for "xargs -0")'
+
+    {'-a','--all-types'}':Search all files (does not include hidden files / .gitignore)'
+    '--depth:[NUM] Search up to NUM directories deep (Default: 25)'
+    {'-f','--follow'}':Follow symlinks'
+    {'-G','--file-search-regex'}':[PATTERN] Limit search to filenames matching PATTERN'
+    '--hidden:Search hidden files (obeys .*ignore files)'
+    {'-i','--ignore-case'}':Match case insensitively'
+    '--ignore:[PATTERN] Ignore files/directories matching PATTERN'
+    {'-m','--max-count'}':[NUM] Skip the rest of a file after NUM matches (Default: 10k)'
+    {'-p','--path-to-agignore'}':[PATH] Use .agignore file at PATH'
+    {'-Q','--literal'}':Do not parse PATTERN as a regular expression'
+    {'-s','--case-sensitive'}':Match case'
+    {'-S','--smart-case'}':Insensitive match unless PATTERN has uppercase (Default: On)'
+    '--search-binary:Search binary files for matches'
+    {'-t','--all-text'}':Search all text files (Hidden files not included)'
+    {'-u','--unrestricted'}':Search all files (ignore .agignore and _all_)'
+    {'-U','--skip-vcs-ignores'}':Ignore VCS files (stil obey .agignore)'
+    {'-v','--invert-match'}':Invert match'
+    {'-w','--word-regexp'}':Only match whole words'
+    {'-z','--search-zip'}':Search contents of compressed (e.g., gzip) files'
+
+    '--list-file-types:list of supported file types'
+  )
+
+  if [[ $words[-1] =~ "^-" ]]; then
+    _describe -t commands "ag options" _1st_arguments && ret=0
+  else
+    _files && ret=0
+  fi
+}

From baced0cdcf491b1ecf7176f5bba16a3a95dd0460 Mon Sep 17 00:00:00 2001
From: Robby Russell <robby@planetargon.com>
Date: Sun, 13 Jun 2021 08:10:29 -0700
Subject: [PATCH 352/869] style(kubectl): Being more explicit alias to the main
 CLI tool instead of to another alias (#6567)

---
 plugins/kubectl/kubectl.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/kubectl/kubectl.plugin.zsh b/plugins/kubectl/kubectl.plugin.zsh
index b79b7c941..3630facaa 100644
--- a/plugins/kubectl/kubectl.plugin.zsh
+++ b/plugins/kubectl/kubectl.plugin.zsh
@@ -43,7 +43,7 @@ alias kgpwide='kgp -o wide'
 alias kep='kubectl edit pods'
 alias kdp='kubectl describe pods'
 alias kdelp='kubectl delete pods'
-alias kgpall='k get pods --all-namespaces -o wide'
+alias kgpall='kubectl get pods --all-namespaces -o wide'
 
 # get pod by label: kgpl "app=myapp" -n myns
 alias kgpl='kgp -l'

From 5152d381bb828a4ed41fdbb430eb05970a8bb25c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stanis=C5=82aw=20Szyd=C5=82o?= <st4nson@gmail.com>
Date: Sun, 13 Jun 2021 17:23:13 +0200
Subject: [PATCH 353/869] feat(kubectx): adding a new plugin for 'kubectx'
 (#6114)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Marc Cornellà <marc.cornella@live.com>
Co-authored-by: Robby Russell <robby@planetargon.com>
---
 lib/prompt_info_functions.zsh      |   1 +
 plugins/kubectx/README.md          |  26 ++++++++++++++++++++++++++
 plugins/kubectx/kubectx.plugin.zsh |  14 ++++++++++++++
 plugins/kubectx/prod.png           | Bin 0 -> 3834 bytes
 plugins/kubectx/stage.png          | Bin 0 -> 3829 bytes
 5 files changed, 41 insertions(+)
 create mode 100644 plugins/kubectx/README.md
 create mode 100644 plugins/kubectx/kubectx.plugin.zsh
 create mode 100644 plugins/kubectx/prod.png
 create mode 100644 plugins/kubectx/stage.png

diff --git a/lib/prompt_info_functions.zsh b/lib/prompt_info_functions.zsh
index 48f033da6..e29fb27a5 100644
--- a/lib/prompt_info_functions.zsh
+++ b/lib/prompt_info_functions.zsh
@@ -19,6 +19,7 @@ function chruby_prompt_info \
   virtualenv_prompt_info \
   jenv_prompt_info \
   tf_prompt_info \
+  kubectx_prompt_info \
 {
   return 1
 }
diff --git a/plugins/kubectx/README.md b/plugins/kubectx/README.md
new file mode 100644
index 000000000..9a1df2617
--- /dev/null
+++ b/plugins/kubectx/README.md
@@ -0,0 +1,26 @@
+# kubectx - show active kubectl context
+
+This plugins adds ```kubectx_prompt_info()``` function. It shows name of the
+active kubectl context (```kubectl config current-context```).
+
+You can use it to customize prompt and know if You are on prod cluster ;)
+
+_Example_. Add to **.zshrc**:
+
+```
+RPS1='$(kubectx_prompt_info)'
+```
+
+### custom ctx names
+
+One can rename default context name for better readability.
+
+_Example_. Add to **.zshrc**:
+```
+kubectx_mapping[minikube] = "mini"
+kubectx_mapping[context_name_from_kubeconfig]="$emoji[wolf_face]"
+kubectx_mapping[production_cluster]="%{$fg[yellow]%}prod!%{$reset_color%}"
+```
+
+![staging](stage.png)
+![production](prod.png)
diff --git a/plugins/kubectx/kubectx.plugin.zsh b/plugins/kubectx/kubectx.plugin.zsh
new file mode 100644
index 000000000..56b7217f1
--- /dev/null
+++ b/plugins/kubectx/kubectx.plugin.zsh
@@ -0,0 +1,14 @@
+typeset -A kubectx_mapping
+
+function kubectx_prompt_info() {
+  if [ $commands[kubectl] ]; then
+    local current_ctx=`kubectl config current-context`
+
+    #if associative array declared
+    if [[ -n $kubectx_mapping ]]; then
+      echo "${kubectx_mapping[$current_ctx]}"
+    else
+      echo $current_ctx
+    fi
+  fi
+}
diff --git a/plugins/kubectx/prod.png b/plugins/kubectx/prod.png
new file mode 100644
index 0000000000000000000000000000000000000000..0c194a66d357e3089e26470e54bcd9cd1614aca0
GIT binary patch
literal 3834
zcmd6qXH-*Zx5uNRqLdd9DN2#z7)FpL5Rf7SVG<M~C>TINGD(2YA%Fs5z<`D3Xrx9F
z5fCXE3<MAe7J4vXgdl+sG)hT8qzZ)cCeFNT-Fv^>Pj{{R;hg6@d!6$<dp~=hy?+1O
zFlR@p{fG7g001e-Z}zSLz^)SEvy1p1;r)OD!bUjkh;((d160#hriBwRwCy=t0H7vI
zV&m#=;e21%Z}3O}KrTvj?HEI;#{vM-SrB{M3$a&b*_;a1LFJqCTW4B$my5(xT*bOm
z?Coyh33z<1(tC#|CIgo;Ja?IDF7JJ+86Z{Sc|)w+JqXWa?5|pSb6ulRR==%aYj2a~
zE>bm_e##iL@`y|PVyUQ3e*~ZF^(6O=U8SO{S{AE96DKJTv?2GjAx;JasBpNafB^n9
z=ykw;71=%0i!O-lwMyV}(Tf3wsjebB!%wnAWPjSO1U)J;q#6DnERgW_L~G1d?EDWK
zmyzs+HN|bOgw?sM50rv-j0cBTt@XPJONDelHZyc(C|w)EQgr}NZ?;|!#%_!{vAH+O
z)O;ScEPbQoH>$=?ZSZPrwvB^n#D>)cUN>L8N^RrqsQ|&1#ol&BcQb2&X7C8)n40B_
z^>-sKrNMbO^&hbw><BJXhQ>JH89v0;{_eoo(B`<!8-vFRam>MpvzOo2Af@I?TDLZR
zDiFt<gDV~;M@CR%t6d6}aZ+u|m4di{7HQr`b?kdIC$g&{K+xA&cu06w3|*m@jUHn@
zvo_(BxDD<iDN3WRI?oH=Td4>B!-Rm-3qg@759KwCF*F%psgisr8sFM(2nIarFFRhn
zIo)!i&GoG*Q>s)9lsW00<CCyiv52foitcC#`HpFkUO50=gQ#*5%}ej1uhHcu&4g)r
zYA%_|P*(#Dr!YoVRKHQwW52x{d|zl)UlkJKW;dOn-#V6Z9y~qN(D)_Q2r~i^+79HX
zO(o|QU5E_0#&+!TD<$a@sIk)vl!WsxuPR15`qAv6k88P~w7;JxhkPGdvUsLdi3%3g
z(9=fYUT@3vgW%Opr`a)I%De(S*|?dp!D&v*aEhZr6XdZj=7}B{riXcL9w69CDrWat
z5VAj+u9tEOo4@n2Eo#&CD^A5Nuk+|}>SM0PB^>ur`)nFNxBD5|@QL1ic6@yUe`;$m
zh4wG3?f%{nIUp_HpC)sG<{9S9`Ud)oB!KU&H5zr`ED5F-e}tBUX{#?@`n1kZ@w&>v
zUV)`cBX_K)(jr@;X6Hk08)uPWJq?JJT-FDdhocPoR*-HPU6s$`@dIRE?@icIEE$KF
zSL>AYzTEUQ8+ItwE}*bz5{R-RA8o7&%IR!I7rSKI!X@aoR^&Wzg5NWaHDXc{fvv40
zItu@lvxlJj3K1{3sl+&b=w$<~zvlDK<6e*|HAa&Re!H6%EMrOYl(EwSxpEYt`!dDs
z)-&#QabHl7@sIa7Ca!JpzBv|7(^U}}`8u1F@jVuH0J6F+iHo{h;K1s!Xge1cgkU3Y
z;<b|Hk}^)WyR1Ag!E4Ao*Hqb^jD}0>go}0RK0X7|?v;HrWoD<DMPp^pCmoVm5)YS^
zS4Iq+ovz<K<XlM1vYsxe38${-m+O$U9?^_)jk0H0>nrvCYw^B#tH4+(xk^nUGf@f7
za86~2-)gSsQ9vG?wb(1ywij|&VjpqMbuqSaOW-)p9I}$r+m98ya$r8RtA8#hd^zKs
z@DT2tBp4mukAke-(^6Z!=9)d{;1%tyzVmQWx=c>pkmdj~I4M$A8d0!Lh4u7B*a&*y
z{mgk;`|{(vfJ%Fdj456Mw!CrK@WM+Svq`XckeJrai_9x&u$;Qx^fRk>W_2I8Ut5KL
zL;ILZuq>>TRk29GZtju(_GnCNmFA`F*Tk9^q~?jKoZ-=rdo%S5D?pU$V$}U%Z^_;1
zu~vhx(YmAYA4;3Qm8CL3W}V1c%NVh~nJgRRc$S44n)@}&`MoqtfYVpvnHfi^64Ok>
z=ruMVn9WI3Ve4~mp~bAJ=omkVuO`ecc*U08`C5kzJIs)S=C$jB)t3{BYNh`icu-fx
z<>m&hoJ83on(8>`mf7;ojppidGz@LrRQt_Erb6!f<6s}vewoQ~ur?MM%wGkShNjl2
zgbE{=GCoyJMWG;M3)I<iJuq+t33wOCG?X`3PwwqE1k;J5t?L^%j=B5bR+o62$II$#
z6QX8kc)YY9LBm6VJ$xJ#n8CvC0(EvQw)H6?Os{P9U&t)CjCMl|$&x3;xY@|p{H-lv
z0}pH|Iw`OWh?khN@PnKn-w`uT_M&JjB8mtr5!vzsLrI}fP>`}uv<h$DdAk0f+4HYx
zC^*^;^mQWsZ10NUVaG7d2BcGjp#n5OAH8)tLA9$C|2BIb*;%9}jHA{q=ab6$&S++6
zORJ@|TV~mn=d@)~Q&jy)d4tc(Cp~~I;hQxl(yawupH2|7H3*dBiuJf`${=AV0Rucr
zkfn<Uz~j;)N^8AecxC0x3O%YNEvgJL8>P2elzDM%POCP=HP{QNXJf`f^A^~za>Qgm
z`l0>=<nI1p@#Vp@Nsx5~WJ+S7Ge^4Jye#!?&HS>eM^;Q=E8_FS17+##fpBof0?Mp{
z^n;WJ2fcCc)s+K~eLZhB%PrUR67C*+hAzF^8BS-0DRp!V#duqd>1=kaVvw!G<NW%u
zzG%z6c?%z}@6#WG8t7p}*%8L%2(-fa`<Q`yf^<g2+$d|xS;fK6bw~mxtS2t${^|XX
zip2|-6#L-HFgVUhs&F{tM@;&kTh~Tk+MAK-*tSV1*|c&|kfROh36dz8&wJl!?ZP@n
zHO~Qf)DLQq<ab2<MvS~4mYb1<$i76SW%xvcyQwp!Vc%e$nv$}2#KW*&stZv3aaL-Z
zc^Uq#r>S-3@GLFnJX7*EKdq#RAHUBn80g!p4DBnl{<ym@LY-VX18yP4+-U^s%;_h8
z?w4b}T71>(r=UU$b8MZjYDdD-=Ow#4ECxbzBUDSM`hNTQ8=}H7nqFX=+qhUfl}^y0
z!fyFqs!#gMqZs!gkKt)WE%%A44QZ`gm@sKO7ZmN*RlmqEUH+x^BL2zs#P}ju@8?0k
z36lM0sc}i&^?0||DStK&Q&ZbOw0gL3#u1n$m7X`5z8EQm6<CNn8y0vJ7!#6xJ?9Y7
zQEX*~0UCJpZrz?nBN%EDfd#V_ItklV(t^N&?_-nUs+PqqB%fMuN1w-EK|4d4dqnh-
z?{o<IuSeJ8nSJ-==($&a@7CjlIW?qhLyvk<50eQ4FrPi|tc9gcGEs3>R^K5%06UCD
zsz=^rGz@2cZ5r*0cq_g#v^@Gp$2(mg&wK2C$`PXBNasDTH}an{4KD1hlKIaX*wbJP
zh-hT}=J2y3Q(lktgmg)Ik~MejaVUkXd?C=E>zTXuyYBMYka6#sGF)a!)2(s)TenZk
z2hXn`|8ccG<(?9nsSs-eQzYl47Y5r)&FQmNxz3h~Mf#%|?;IRXZHA4-Zlmf-ln~6+
zBAgdV3zwCiF|@;myT}j9nbd6$hZhJ5O+EmKbSDg-S0j7pz<Oo^E)U)D?Nr<+yCIG_
zLL4lrvL8Rrrzz9U63L@OhosBWvtFstu(rUe?YZ~DBG9}QQ7lerd_57a018Mu>_jkQ
zSBYPoKVyMEB2&uich@v{u#B&$Jke%OOQ`x3*0U<!E4y%7yfUYSt_rnnmHk8cSi;If
z{U(LvpvyO(<sqg+#!XzQ9X*>t2T(ohYz3$v5$@&N9G*~@oqw*{EIEu=rvED2beg<u
zv09%zyAY$ENCftIaC5Ppzd-I?fC>}H4)U}spZE!=kwV&hdDI>#1<x>bl*yR<D5BK~
zU*Ll%Ctu~bwZ`sBhXTZKxMioF(_LYacKioYhv#AI-5L7%zjywm-H_n_L9^$7Hqv4Y
z`UB<MKi?Fm+UW#?64!lM)@^??@gd|tjEwTYGn%M^8&TVLb^k!UK!`v%fb??xv(@GP
zQ;`vgihHibbJr0SPA;nas;~0`59h>#a@zuWqaK#XS5J)hcZyTc9(Fuzva~j%b+f56
zEtTQMX+<p4*_|Gatub+|v11aC^JXrI_?lIr=`XjRgZoN7q2%!ROSrq!k)t3vZ<4oV
zqn<r(>-7Ou*0bB=@YHVZ%@wRkZTmH)U07lFMvzxD?xUdk>}&qZ9k10(f)ic<^1Cxd
zjQ_Odxn%xV+)h8MU5D!M%!tI>VUTlH1rUH<R$3m@$XCvJct{aC>=MT`MR@@?X@A}?
z#x*5kepSD>yZ>x-rAQ6TUX(q_mr)jw6TmdIkYHHX6MLy0rY7*!rzjvnE`&@m9I?}(
zMF|YtEU^1R6;2xu*N9X@t;d=E%A7XTj*}A4O_C7`zw!}+H)swnER#wx#FhS39MKx!
zfH$F>pPq&~C|J`r5rRN`$3stQ(``smlqwwX?(Zxzt{k*A7Cb4o@TTAy4>z7@QDbi#
z&aT$aRcrnC(_8V}cFK+LNd?>~-##iil3@Hyg=YQ=#9R4C)38!B{U4b(wo2Tv{6$Gl
zUJ%ING@&1StsvHCG460#%zgc7s-fgNf}Hn5ou6KL*<<>fhn0Wop8!Q80$uyR>?c`b
z+`ZHPms9SdcvpV?TRlNe_5Od5Rib+OUxi)DC}rKI%Oq)?J5ZZ1)T;o<8E5-yJKyAg
E10~p6Gynhq

literal 0
HcmV?d00001

diff --git a/plugins/kubectx/stage.png b/plugins/kubectx/stage.png
new file mode 100644
index 0000000000000000000000000000000000000000..ac15b392997ee141c324548c6924fe92a82f72f9
GIT binary patch
literal 3829
zcmb`KdpOhm`@p5?aV~no<Pdr4Ng+g3$T=iRW`~>_^El2(&MSwgoO+x|$u~-E7-LG>
z9LjucD7KX?hpeSAOy)G>JN108>-Wd+zu)hV&--)V*L7d->%Q;z`+ncA`;PksM>%O#
zX)!S|Ij3`Wm&C+&Vnp&;$z7s#<IZP@=(i*KlB11S{eaqckpc*^cC{80Ys{0`@Rtzj
zQjzB%(PCnX*S5bMV+hSSF){hOPIlIp<9xWI;}kWzI+?d=|9aZH3Xray`o%_D>rbse
z^7puCK6BXE#{};Um;383P4k}fIZUDM-P_HeuylsaEl`4%&+U_wx0ar4br!C4c?~{H
z3R<SlV#~h7`?kkjpGpcEC`-QHo%Apo@#Dcfdj9NTr+gi!p?nq4AKO9}99*O$67+KY
zJw<AMvss4cPlL(-4}%)yNYRSHHRY`Zd^0y;Z4t8-qbU>=G;<wz%=`1$fr9}iOpW=1
zxE$otO16#@l#t`k-wg7dxloZD%wO#tdpSp~S*d?k#`^3y5bL(VsSJjF{qnZt)zf<P
zCyNbo?C`SiYgv}TwaObjPbR_Tu%;zLxIE}q6JAEvpVKpX!7cZXIjN1^oZProgv}W2
zN%XRswG_@~dFlyhCbKZc0%V<KwMie1j+!rL8k!v<XMI>-vRzA@c<bWTww1Iv0_D<(
zu)&faS>@mG^CkhGnhhPgpX)d=YebIDa(1`b9v;MMj3;g`>b5gXqO%stS^^~r8Fb_u
z`$Pu8MZpqJknLpPp1*8vpFfx_ck86M$__r)>NQC^k+z`bVSBJMS7^>C^77eQkBd=H
zHqsYAR8<7kSdk#RLI+C1(>>8q#3i7A*;GvOM2r#EIltOlRTk5#Vc8;$`AuHK+v3K;
z%hon_o@K1-=%=1^dL?mVUAI~lMC!CZtXvLZ>E}pc+<X!u_kEPbl)F#_mR-u98w}bN
z6lcOOx|L#Crd5M&4YP3oe}aM%oJD{RwC?7of5ggd-+|`PG=KiL?=qnjv{e0Xc@{X(
z@H8QDZsx+)W}Rm(0AB^@Z#u*@0(@*zQY#?9<TZVT*zOQu!eivRkSEiCrB?+eK}O3?
zHe8SWwDJ+!Uy6pIF2eMO;a?v=<liPxOS5Q056HV?l<UtlNrU}N3m-ukcCZXF7$X%v
zbY1W{4O1BtdDIrU<Vwo3y0HaShxU}vg<o^Xui%NXb@c4-t^1PSDU%bvbE7deLuUrM
zblJHhh!D4}MH=)p3*R{V;B^okROu$u<<Rc9p6Un`mohkm07W`SvTC9#?w^-KCO2H9
zRv=sw;cEtYYgC8I*|b_VpNfEG%JO05f+TB}`zukU5QcEhe~#*~ki8?Zn?&g_fccyg
z=P;{J)kahD4xl|wUOX5g(-jPGo)&cJrsO|5M^ey;zrrA7@1{+xHawi4LvNJP8{ycC
z#!tqTuKeX-cDp9!icXZF6AY61!Yp^Hv@PlHcXl_mdli~j|4nGhxCiJ0r9U})KrhtV
zJ?m_lM5|;@`k5}E&>`*%3c@n7bl)j{;IqEC4m`WuP)L~g^u2)n{&2FfX|7kLu?Z*s
zO(<j+s3-pcY<yWsZ$;BVvN~hsK*~{@P~mR{Gr=YPCJ2kQFnTx&OJwuf93*Qje5T^$
zD5n;HPam41mvc}aq#DC1N}~3r9B^IO6Nfi-%C9!B_AeUoIF9KnIm#;)ctUomg^!?<
zC8Gc)UEU0zEL=&8M6Uf`*;BNYTb}4*)(B{zoRFJ$)7cw%zSB(dF|WO4Jlt@&TyL12
zS}4<>AOHi*#rIkt4Q;UhNMVYTwF}?=IQHT#Y84U@1Tzn1p0X6zj0rq0!9MWq?GFYT
zW<POk=V^E#EPmj<0iM(-H|t9TH6pzo`%UpA6=@9~`gxi>t7+l->+JaPJUI+1Y?;E0
z=SmijXx{3x0@$hN&F~!dOJbMyr4W$83+|+v;vXC^?It{8-4?*_Wr|+CukT*TmI^MH
zS#yY<4@<_S&w!2%>+Kx9SB&e!1_5_Ho0q}Fyr{0nhO27|0`PT)p{j#0!6<0_?PO`z
zvR32yR@rN|+SdZZQ-B>tvW!kSRK=+)m%JFFBqXmRbSON+GV87-UN{|%0GVLm8AVK^
zip6%>Cy@T%Z95+u)XH&<zf^f-wi#F@H3{Y&-C{M{6B6pU?AF0+NaAWiOL$#R`#d?F
zUi(0mI&#wIFuF%&hPSA~x4>^)l;#i`p#vuoBi~7Z@jTi%Nyq6DW(-$8+Mp_m!~PgI
zP$|E|;Sr^H`KkxF=5>Xq1V3hv+Fn&yPYE|Op&h;+{?;B5KN!-huSCAmj8w#@QO6W&
zC9jPP`GiShnoEptJtE47z-{1^)h3~PUTcdl^BE;FyOtf#K)!zc$;u=5sm~&1&COf<
zit6@Rlpn>S(fm7}=Y;&hyn35Z;Dz8s{^a`Ww(S^T-Maoc?;PSNOjw~YhBGvt(9T=S
zol2?sP&Y+?%1?614*Iron!jS;luw&3$3e$Rm_f5f6CEXc6~0_Ol<!w6!8o;1R2yV9
zC-H~uu4y(Ucd`_2%YMS+bG`Cn!$|kv*y|aeKGx6f+RL$z1o<K>??O)7fT?zhviJ^Y
zCP|Usc%^7zUu_WLZ!(I?c&B2T(|{yxXCa68p$}~i62<gjil-XTmpoI`QE@b-1zUFY
z&$u^&;9Ok7WPKV2=!x)(zu?C)w_>B3b4<P_kE@QYW{2;++!<;&!7&uR4J{tUm*?Eb
z9sE&<Q(dV;gqJP~N_3o5+2ta&dLV`rQn`A_H`RL-lu5b-7}i2j!)@TEmdh_SC^ugo
zpz4>B>TpnP9fe}a>oG9(P3LrdX2u&sa(WL`WCU3^@+&m4o!q!8wNPkq<GGwfUYu3G
z0%)+(vPrs{V~T)`WF$ZqRN!MPdY^L!KRl_yrF=*!>zy5YZ?yCtnUoc!o-XM6{Ej*;
zDuN^aE%L)HM@TnB1#UPL*bzO}aH?89O^eujy93;svIqPa%_^fqEr^Z2xDzeo(Bz9*
zFIK7gN^3?+OsIa-)7!Yq$UFn1yATqT`g?Kh_;o}JC=WTSe9V>Gs^n5g8DSXu;?kqW
zJ4)mG%`B(fTivYP?~ag|75@7GjD-F8XC6V9yDR*Q9x+rev%$$^xQX4UlE5xfV&!gA
z9seQSRal%c&}#54Y7;{0#OXTaU)PhvI4%$LCy;cja)3_7bBj5z(uu1EzD<E0h8QO~
zexMlFHd!42vt^g^6wX`AwOsUCHjD*x#0zBl!Mmsu`pWr!iQa<}rYxx!yt;qgNB9_}
zn<9RLw7K+ZFDc|tiz!_N6{t>A#F$UzBmR=hf%iDp?lhq}c#n`j`4<_!3u@O`>i-ee
zQ>4l?Q${!gT`Yd=H&bFgtAtA(*LGJJiX$ChP71vux`(=)vyDS#k~C_wAm@7qqwQR&
z0gH~6ae6ksaU8tq?-7q5pv@wZ(1K}|o$$b<?3(%e@hADLC?YR0V83vo;NB^k!BrC0
zHD4!KJ{TORR5Wr~13z1W>kA9@{&2U0tgNCSDTO-FO!u$1+jDG&0vtH6hX2G+RV8QV
z9Z;vBt-*C$^R$=Uy4sJTcHDVU%0VgF1!u`zC{%u0Ckf+8Sf(G`(=>hDOZ!|AKfNBS
z|HhCKURQ;pu1XFmY@Rj4mJAN4gRDsk*}%ie%jyQFmBk~xGi%G>QjrrDmx$y(?imtL
z)NXTrU|MKl(L@CmwpsEHJoaF=yhM)(Tu$1c)?VdVK?}*x8wX7rGDS`FP%yZtdcUg+
zn4Tny5ry?Zv_?oPfNVjJxeD%V6Vsn;BO;u(BRDl;JLv@G{W6%S)_@wngxGFC|AkTf
z58V3qDPNO+FaM-guG{}ktJU{AstSVIj7!E`SP^!=Y}%yMZY;f=6H(g`VgKL1Xg5M!
za0)xNCe(bw$_(f{QNTUA&Ax(>x=gp2L^o2Cbd_J({Oc)$2Kp~Dd1xlMw9+dxpESBT
z5sj=X-d$p%wO-?vJFJ`m+-=f~ntl9qYRzi?e)sg4UTf_9Sn|J4Z>F(^mMtO2`vU~d
z+u)6MSk1zntNkJ(i1IYD23YHaq6*twUhPa9h}<ZN6<zQ;8;)?0xXicY7)mw1H)uJN
zcaP;oUcD+C4Paa}#+1yxz$CJJ^M(ljb65MDI;#pw_+{ugb?Q*MJK`eSTu2uxCX9eI
ztk&VnCka{zC?(wE%3jb`!Ys{!bb874)VPk!ld>@1?U0!b+6RiQqk3t$zFFPLcxrC3
z$!*BTxB+a)OJBbX6PZT1_g)ZWj+H4w8J85iU-_>Cs1_beJ!o76uoVw}+1yG~1U<XM
zX|FN5w)ny)M2$sZe<0V=U9!lF4}Z=S(Bp_drOG(U8i6S>9^jno;>Yoo=}t7`YIv8f
zpa&JgA$nxD1<{c^i$yKDdM0zi`J7H1Bm91su75!!1liC%T^iUi!ux8Zi@or-#PE4S
z!}jD7?ClHY?2ikcdF6FNri6O4$qfi<6{h~Nr01#8z5Q<JILX-E3owsZ^X=bbDs>y8
zk`3_+sSVm{s`uGNML{lQ8>OehaTe>jQ?@ZY-<da2oTdorZORu-MSH9Z{2*v8MdL@d
zD`|?yDC-HkOvOW*9aT6e^_!H$0CV}|pp_;Be1ox7Nk7u`-@NGP?bK?%qTe3+&-HYm
z;*7G&TezwJ3|Se#%c(~w@oXPR*R+~%1+DLwpU`fL=K$KGC5?y#jukz~{F$}<o^9|K
zd80)B$4c#&bHS+XQW9nAt>ORG;FkG2p=NAYqx<jTpG8xtn3$9O1-p71ztsN#o%WFH

literal 0
HcmV?d00001


From adcb5c5e07850c0b8c05f61ca5cb7534dc434c2b Mon Sep 17 00:00:00 2001
From: Bartek Pacia <barpac02@gmail.com>
Date: Sun, 13 Jun 2021 19:16:34 +0200
Subject: [PATCH 354/869] style(mlh): update the official theme of Major League
 Hacking (#9971)

* allow for customization of RPROMPT (exit code and timestamp)

* improve code and comments
---
 themes/mlh.zsh-theme | 55 ++++++++++++++++++++++++++------------------
 1 file changed, 33 insertions(+), 22 deletions(-)

diff --git a/themes/mlh.zsh-theme b/themes/mlh.zsh-theme
index a21a546bc..33f238ed9 100644
--- a/themes/mlh.zsh-theme
+++ b/themes/mlh.zsh-theme
@@ -1,11 +1,12 @@
-# The Official Theme of 
-##     ## ##       ##     ## 
-###   ### ##       ##     ## 
-#### #### ##       ##     ## 
-## ### ## ##       ######### 
-##     ## ##       ##     ## 
-##     ## ##       ##     ## 
-##     ## ######## ##     ## 
+# The Official Theme of Major League Hacking
+
+##     ## ##       ##     ##
+###   ### ##       ##     ##
+#### #### ##       ##     ##
+## ### ## ##       #########
+##     ## ##       ##     ##
+##     ## ##       ##     ##
+##     ## ######## ##     ##
 
 # # # # # # # # # # # # # # # # # #
 # # # Feel free to customize! # # #
@@ -13,11 +14,17 @@
 
 # To easily discover colors and their codes, type `spectrum_ls` in the terminal
 
+# enable or disable particular elements
+PRINT_EXIT_CODE=true
+PRINT_TIME=true
+
+# symbols
 AT_SYMBOL=" @ "
 IN_SYMBOL=" in "
 ON_SYMBOL=" on "
-SYMBOL="$"
+SHELL_SYMBOL="$"
 
+# colors
 USER_COLOR="%F{001}"
 DEVICE_COLOR="%F{033}"
 DIR_COLOR="%F{220}"
@@ -25,35 +32,39 @@ BRANCH_COLOR="%F{001}"
 TIME_COLOR="%F{033}"
 
 username() {
-    echo "$USER_COLOR%n%f"
+  echo "$USER_COLOR%n%f"
 }
 
-# Returns device name 
+# Prints device name
 device() {
-    echo "$DEVICE_COLOR%m%f"
+  echo "$DEVICE_COLOR%m%f"
 }
 
-# The current directory
+# Prints the current directory
 directory() {
-    echo "$DIR_COLOR%1~%f"
+  echo "$DIR_COLOR%1~%f"
 }
 
-# Current time with milliseconds
+# Prints current time
 current_time() {
-    echo "$TIME_COLOR%*%f"
+  if [ "$PRINT_TIME" = true ]; then
+    echo " $TIME_COLOR%*%f"
+  fi
 }
 
-# Return status of the last command
-return_status() {
-    echo "%(?..%F{001}out %?)%f"
+# Prints exit code of the last executed command
+exit_code() {
+  if [ "$PRINT_EXIT_CODE" = true ]; then
+    echo "%(?..%F{001}exit %?)%f"
+  fi
 }
 
-# Set the git_prompt_info text
+# Set git_prompt_info text
 ZSH_THEME_GIT_PROMPT_PREFIX="${ON_SYMBOL}${BRANCH_COLOR}"
 ZSH_THEME_GIT_PROMPT_SUFFIX="%f"
 ZSH_THEME_GIT_PROMPT_DIRTY=""
 ZSH_THEME_GIT_PROMPT_CLEAN=""
 
 # %B and %b make the text bold
-PROMPT='%b$(username)$AT_SYMBOL$(device)$IN_SYMBOL$(directory)$(git_prompt_info)%b $SYMBOL '
-RPROMPT="$(return_status) $(current_time)"
+PROMPT='%b$(username)$AT_SYMBOL$(device)$IN_SYMBOL$(directory)$(git_prompt_info)%b $SHELL_SYMBOL '
+RPROMPT="$(exit_code)$(current_time)"

From 960483b76b536a525bb6b458f5705b2653064e46 Mon Sep 17 00:00:00 2001
From: Sagar Yadav <47110215+SagarYadav17@users.noreply.github.com>
Date: Sun, 13 Jun 2021 22:53:58 +0530
Subject: [PATCH 355/869] feat(pip): add alias for updating all requirements
 via pip (#9965)

* feat(plugins): add alias for pip commands

* feat(plugins): updated README.md and add alias
---
 plugins/pip/README.md      |  9 +++++++++
 plugins/pip/pip.plugin.zsh | 11 +++++++++++
 2 files changed, 20 insertions(+)

diff --git a/plugins/pip/README.md b/plugins/pip/README.md
index f07b5c058..88d88227e 100644
--- a/plugins/pip/README.md
+++ b/plugins/pip/README.md
@@ -17,3 +17,12 @@ or you can run `zsh-pip-cache-packages` directly.
 
 To reset the cache, run `zsh-pip-clear-cache` and it will be rebuilt next
 the next time you autocomplete `pip install`.
+
+## Aliases
+
+| Alias    | Description                                   |
+| :------- | :-------------------------------------------- |
+| pipreq   | Create requirements file                      |
+| pipir    | Install packages from `requirements.txt` file |
+| pipupall | Update all installed packages                 |
+| pipunall | Uninstall all installed packages              |
diff --git a/plugins/pip/pip.plugin.zsh b/plugins/pip/pip.plugin.zsh
index a46e7658c..629147bae 100644
--- a/plugins/pip/pip.plugin.zsh
+++ b/plugins/pip/pip.plugin.zsh
@@ -84,3 +84,14 @@ zsh-pip-test-clean-packages() {
 
 alias pip="noglob pip" # allows square brackets for pip command invocation
 
+# Create requirements file
+alias pipreq="pip freeze > requirements.txt"
+
+# Update all installed packages
+alias pipupall="pipreq && sed -i 's/==/>=/g' requirements.txt && pip install -r requirements.txt --upgrade && rm -rf requirements.txt"
+
+# Install packages from requirements file
+alias pipir="pip install -r requirements.txt"
+
+# Uninstalled all installed packages
+alias pipunall="pipreq && pip uninstall -r requirements.txt -y && rm -rf requirements.txt"

From 3ea66642e8d86b597e6c789358b82540859b178a Mon Sep 17 00:00:00 2001
From: Lasse Peters <lasse.peters@mailbox.org>
Date: Sun, 13 Jun 2021 19:25:27 +0200
Subject: [PATCH 356/869] feat(git): Add alias for 'git checkout
 --recurse-submodules' (#9958)

---
 plugins/git/README.md      | 1 +
 plugins/git/git.plugin.zsh | 1 +
 2 files changed, 2 insertions(+)

diff --git a/plugins/git/README.md b/plugins/git/README.md
index 93c9cc915..e00f4cf92 100644
--- a/plugins/git/README.md
+++ b/plugins/git/README.md
@@ -53,6 +53,7 @@ plugins=(... git)
 | gcd                  | git checkout develop                                                                                                             |
 | gcmsg                | git commit -m                                                                                                                    |
 | gco                  | git checkout                                                                                                                     |
+| gcor                 | git checkout --recurse-submodules                                                                                                |
 | gcount               | git shortlog -sn                                                                                                                 |
 | gcp                  | git cherry-pick                                                                                                                  |
 | gcpa                 | git cherry-pick --abort                                                                                                          |
diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index a364b6162..6664551eb 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -91,6 +91,7 @@ alias gcm='git checkout $(git_main_branch)'
 alias gcd='git checkout develop'
 alias gcmsg='git commit -m'
 alias gco='git checkout'
+alias gcor='git checkout --recurse-submodules'
 alias gcount='git shortlog -sn'
 alias gcp='git cherry-pick'
 alias gcpa='git cherry-pick --abort'

From 36cc94f3dcd8d6214b5a4bedf180bc723eb49a3f Mon Sep 17 00:00:00 2001
From: Ajeet D'Souza <98ajeet@gmail.com>
Date: Sun, 13 Jun 2021 23:00:58 +0530
Subject: [PATCH 357/869] feat(zoxide): add new plugin for zoxide (a smarter cd
 CLI tool) (#9950)

---
 .github/CODEOWNERS               |  1 +
 plugins/zoxide/README.md         | 14 ++++++++++++++
 plugins/zoxide/zoxide.plugin.zsh |  5 +++++
 3 files changed, 20 insertions(+)
 create mode 100644 plugins/zoxide/README.md
 create mode 100644 plugins/zoxide/zoxide.plugin.zsh

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 1b1340554..6c3eac6e7 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -7,3 +7,4 @@ plugins/gitfast/                    @felipec
 plugins/sdk/                        @rgoldberg
 plugins/universalarchive/           @Konfekt
 plugins/wp-cli/                     @joshmedeski
+plugins/zoxide/                     @ajeetdsouza
diff --git a/plugins/zoxide/README.md b/plugins/zoxide/README.md
new file mode 100644
index 000000000..f326effe6
--- /dev/null
+++ b/plugins/zoxide/README.md
@@ -0,0 +1,14 @@
+# zoxide plugin
+
+Initializes [zoxide](https://github.com/ajeetdsouza/zoxide), a smarter cd
+command for your terminal.
+
+![Tutorial](https://raw.githubusercontent.com/ajeetdsouza/zoxide/97dc08347d9dbf5b5a4516b79e0ac27366b962ce/contrib/tutorial.webp)
+
+To use it, add `zoxide` to the plugins array in your `.zshrc` file:
+
+```zsh
+plugins=(... zoxide)
+```
+
+**Note:** you have to [install zoxide](https://github.com/ajeetdsouza/zoxide#step-1-install-zoxide) first.
diff --git a/plugins/zoxide/zoxide.plugin.zsh b/plugins/zoxide/zoxide.plugin.zsh
new file mode 100644
index 000000000..e5658b8f0
--- /dev/null
+++ b/plugins/zoxide/zoxide.plugin.zsh
@@ -0,0 +1,5 @@
+if (( $+commands[zoxide] )); then
+  eval "$(zoxide init zsh)"
+else
+  echo '[oh-my-zsh] zoxide not found, please install it from https://github.com/ajeetdsouza/zoxide'
+fi

From 70a0577712bc8f78e14173c8032df3701ea2887f Mon Sep 17 00:00:00 2001
From: "Guo, Quan" <1118270+guoquan@users.noreply.github.com>
Date: Mon, 14 Jun 2021 01:32:47 +0800
Subject: [PATCH 358/869] feat(nvm): introduce customizable list of command
 that triggers lazy loading (#9946)

* Add customizable list of command that triggers lazy loading

* Add $NVM_LAZY_CMD

* Add instruction to `NVM_LAZY_CMD` in README.md
---
 plugins/nvm/README.md      | 6 +++++-
 plugins/nvm/nvm.plugin.zsh | 4 ++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/plugins/nvm/README.md b/plugins/nvm/README.md
index 700613085..0c2bbf9f0 100644
--- a/plugins/nvm/README.md
+++ b/plugins/nvm/README.md
@@ -21,7 +21,11 @@ These settings should go in your zshrc file, before Oh My Zsh is sourced:
 
 - **`NVM_LAZY`**: if you want the plugin to defer the load of nvm to speed-up the start of your zsh session,
   set `NVM_LAZY` to `1`. This will use the `--no-use` parameter when loading nvm, and will create a function
-  for `node`, `npm` and `yarn`, so when you call either of these three, nvm will load with `nvm use default`.
+  for `node`, `npm`, `yarn`, and the command(s) specified by `NVM_LAZY_CMD`, so when you call either of them,
+  nvm will load with `nvm use default`.
+
+- **`NVM_LAZY_CMD`**: if you want additional command(s) to trigger lazy loading of nvm, set `NVM_LAZY_CMD` to
+  the command or an array of the commands.
 
 - **`NVM_AUTOLOAD`**: if `NVM_AUTOLOAD` is set to `1`, the plugin will automatically load a node version when
   if finds a [`.nvmrc` file](https://github.com/nvm-sh/nvm#nvmrc) in the current working directory indicating
diff --git a/plugins/nvm/nvm.plugin.zsh b/plugins/nvm/nvm.plugin.zsh
index 1e9b26e7a..3ef8cc1d8 100644
--- a/plugins/nvm/nvm.plugin.zsh
+++ b/plugins/nvm/nvm.plugin.zsh
@@ -28,8 +28,8 @@ fi
 
 # Call nvm when first using node, npm or yarn
 if (( $+NVM_LAZY )); then
-  function node npm yarn {
-    unfunction node npm yarn
+  function node npm yarn $NVM_LAZY_CMD {
+    unfunction node npm yarn $NVM_LAZY_CMD
     nvm use default
     command "$0" "$@"
   }

From 027189b294d14a7d313cdbf611982843f921555d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Duszyk?= <mdevel@protonmail.com>
Date: Sun, 13 Jun 2021 19:40:07 +0200
Subject: [PATCH 359/869] perf(mercurial): speed up mercurial plugin (#4591)

* speed up mercurial plugin

* removed unnecesay limit to current dir from hg status
---
 plugins/mercurial/mercurial.plugin.zsh | 27 +++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/plugins/mercurial/mercurial.plugin.zsh b/plugins/mercurial/mercurial.plugin.zsh
index a50dcb523..f4efc2b4a 100644
--- a/plugins/mercurial/mercurial.plugin.zsh
+++ b/plugins/mercurial/mercurial.plugin.zsh
@@ -19,37 +19,38 @@ alias hglr='hg pull --rebase'
 alias hgo='hg outgoing'
 
 function in_hg() {
-  if [[ -d .hg ]] || $(hg summary > /dev/null 2>&1); then
+  if $(hg branch > /dev/null 2>&1); then
     echo 1
   fi
 }
 
 function hg_get_branch_name() {
-  if [ $(in_hg) ]; then
-    echo $(hg branch)
+  branch=`hg branch 2>/dev/null`
+  if [ $? -eq 0 ]; then
+    echo $branch
   fi
+  unset branch
 }
 
 function hg_prompt_info {
-  if [ $(in_hg) ]; then
-    _DISPLAY=$(hg_get_branch_name)
+  _DISPLAY=`hg branch 2>/dev/null`
+  if [ $? -eq 0 ]; then
     echo "$ZSH_PROMPT_BASE_COLOR$ZSH_THEME_HG_PROMPT_PREFIX\
 $ZSH_THEME_REPO_NAME_COLOR$_DISPLAY$ZSH_PROMPT_BASE_COLOR$ZSH_PROMPT_BASE_COLOR$(hg_dirty)$ZSH_THEME_HG_PROMPT_SUFFIX$ZSH_PROMPT_BASE_COLOR"
-    unset _DISPLAY
   fi
+  unset _DISPLAY
 }
 
 function hg_dirty_choose {
-  if [ $(in_hg) ]; then
-    hg status 2> /dev/null | command grep -Eq '^\s*[ACDIM!?L]'
+  hg status -mar 2> /dev/null | command grep -Eq '^\s*[ACDIM!?L]'
+  if [ $? -eq 0 ]; then
     if [ $pipestatus[-1] -eq 0 ]; then
       # Grep exits with 0 when "One or more lines were selected", return "dirty".
       echo $1
-    else
-      # Otherwise, no lines were found, or an error occurred. Return clean.
-      echo $2
+      return
     fi
   fi
+  echo $2
 }
 
 function hg_dirty {
@@ -57,11 +58,11 @@ function hg_dirty {
 }
 
 function hgic() {
-    hg incoming "$@" | grep "changeset" | wc -l
+  hg incoming "$@" | grep "changeset" | wc -l
 }
 
 function hgoc() {
-    hg outgoing "$@" | grep "changeset" | wc -l
+  hg outgoing "$@" | grep "changeset" | wc -l
 }
 
 function hg_get_bookmark_name() {

From 241c7dde2b6afc4025fc74774f51a71fb3b128d3 Mon Sep 17 00:00:00 2001
From: Shubham Chaudhary <shubhamchaudhary92@gmail.com>
Date: Sun, 13 Jun 2021 13:50:36 -0400
Subject: [PATCH 360/869] feat(supervisor): Add aliases for supervisor (#5819)

---
 plugins/supervisor/supervisor.plugin.zsh | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/plugins/supervisor/supervisor.plugin.zsh b/plugins/supervisor/supervisor.plugin.zsh
index cf1997c5b..f11f0ed3f 100644
--- a/plugins/supervisor/supervisor.plugin.zsh
+++ b/plugins/supervisor/supervisor.plugin.zsh
@@ -1 +1,14 @@
 # DECLARION: This plugin was created by hhatto. What I did is just making a portal from https://bitbucket.org/hhatto/zshcompfunc4supervisor.
+
+alias sup='sudo supervisorctl'
+alias supad='sudo supervisorctl add'
+alias supa='sudo supervisorctl avail'
+alias suprl='sudo supervisorctl reload'
+alias suprm='sudo supervisorctl remove'
+alias suprr='sudo supervisorctl reread'
+alias suprs='sudo supervisorctl restart'
+alias sups='sudo supervisorctl status'
+alias supsr='sudo supervisorctl start'
+alias supso='sudo supervisorctl stop'
+alias supt='sudo supervisorctl tail'
+alias supu='sudo supervisorctl update'

From bd5d0066b908af0db1c4e8b1fb18888d8965d3a0 Mon Sep 17 00:00:00 2001
From: Myoungdo Park <cuspymd@gmail.com>
Date: Mon, 14 Jun 2021 02:58:44 +0900
Subject: [PATCH 361/869] feat(pm2): Adding a pm2 plugin (#7684)

* Add pm2 plugin

* Add description of pm2 plugin
---
 plugins/pm2/README.md      |  19 +++++
 plugins/pm2/_pm2           | 168 +++++++++++++++++++++++++++++++++++++
 plugins/pm2/pm2.plugin.zsh |   6 ++
 3 files changed, 193 insertions(+)
 create mode 100644 plugins/pm2/README.md
 create mode 100644 plugins/pm2/_pm2
 create mode 100644 plugins/pm2/pm2.plugin.zsh

diff --git a/plugins/pm2/README.md b/plugins/pm2/README.md
new file mode 100644
index 000000000..5dfd540b6
--- /dev/null
+++ b/plugins/pm2/README.md
@@ -0,0 +1,19 @@
+# pm2 plugin
+
+The plugin adds several aliases and completions for common [pm2](http://pm2.keymetrics.io/) commands.
+
+To use it, add `pm2` to the plugins array of your zshrc file:
+```
+plugins=(... pm2)
+```
+
+## Aliases
+
+| Alias  | Command              |
+|--------|----------------------|
+| p2s  | `pm2 start` |
+| p2o  | `pm2 stop` |
+| p2d | `pm2 delete` |
+| p2r   | `pm2 restart` |
+| p2i   | `pm2 list` |
+| p2l   |  `pm2 logs` |
diff --git a/plugins/pm2/_pm2 b/plugins/pm2/_pm2
new file mode 100644
index 000000000..6f1e89df5
--- /dev/null
+++ b/plugins/pm2/_pm2
@@ -0,0 +1,168 @@
+#!/bin/zsh -f
+#compdef pm2
+#autoload
+
+local -a _1st_arguments
+
+_1st_arguments=(
+    "start:start and daemonize an app"
+    "trigger:trigger process action"
+    "deploy:deploy your json"
+    "startOrRestart:start or restart JSON file"
+    "startOrReload:start or gracefully reload JSON file"
+    "pid:return pid of [app_name] or all"
+    "stop:stop a process"
+    "restart:restart a process"
+    "scale:scale up/down a process in cluster mode depending on total_number param"
+    "profile\:mem:Sample PM2 heap memory"
+    "profile\:cpu:Profile PM2 cpu"
+    "reload:reload processes (note that its for app using HTTP/HTTPS)"
+    "id:get process id by name"
+    "inspect:inspect a process"
+    "delete:stop and delete a process from pm2 process list"
+    "sendSignal:send a system signal to the target process"
+    "ping:ping pm2 daemon - if not up it will launch it"
+    "updatePM2:update in-memory PM2 with local PM2"
+    "install:install or update a module and run it forever"
+    "module\:update:update a module and run it forever"
+    "module\:generate:Generate a sample module in current folder"
+    "uninstall:stop and uninstall a module"
+    "package:Check & Package TAR type module"
+    "publish:Publish the module you are currently on"
+    "set:sets the specified config <key> <value>"
+    "multiset:multiset eg \"key1 val1 key2 val2\""
+    "get:get value for <key>"
+    "config:get / set module config values"
+    "unset:clears the specified config <key>"
+    "report:give a full pm2 report for https\://github.com/Unitech/pm2/issues"
+    "link:link with the pm2 monitoring dashboard"
+    "unlink:unlink with the pm2 monitoring dashboard"
+    "monitor:monitor target process"
+    "unmonitor:unmonitor target process"
+    "open:open the pm2 monitoring dashboard"
+    "plus:enable pm2 plus"
+    "login:Login to pm2 plus"
+    "logout:Logout from pm2 plus"
+    "web:launch a health API on 0.0.0.0\:9615"
+    "dump:dump all processes for resurrecting them later"
+    "cleardump:Create empty dump file"
+    "send:send stdin to <pm_id>"
+    "attach:attach stdin/stdout to application identified by <pm_id>"
+    "resurrect:resurrect previously dumped processes"
+    "unstartup:disable the pm2 startup hook"
+    "startup:enable the pm2 startup hook"
+    "logrotate:copy default logrotate configuration"
+    "ecosystem:generate a process conf file. (mode = null or simple)"
+    "reset:reset counters for process"
+    "describe:describe all parameters of a process id"
+    "list:list all processes"
+    "jlist:list all processes in JSON format"
+    "prettylist:print json in a prettified JSON"
+    "monit:launch termcaps monitoring"
+    "imonit:launch legacy termcaps monitoring"
+    "dashboard:launch dashboard with monitoring and logs"
+    "flush:flush logs"
+    "reloadLogs:reload all logs"
+    "logs:stream logs file. Default stream all logs"
+    "kill:kill daemon"
+    "pull:updates repository for a given app"
+    "forward:updates repository to the next commit for a given app"
+    "backward:downgrades repository to the previous commit for a given app"
+    "deepUpdate:performs a deep update of PM2"
+    "serve:serve a directory over http via port"
+    "examples:display pm2 usage examples"
+)
+
+local -a id_names
+
+_id_names() {
+    local app_list
+    app_list=`pm2 list -m`
+
+    local -a names ids 
+    names=(`echo $app_list | grep '+---' | awk '{print $2}'`)
+    ids=(`echo $app_list | grep 'pm2 id' | awk '{print $4}'`)
+
+    if (( ${#ids} > 0 )); then
+        for i in {1..${#ids}}; do
+            id_names+=( "${ids[i]}:${names[i]}" )
+        done
+    fi
+}
+
+_arguments \
+    '(-v --version)'{-v,--version}'[output version]' \
+    '(-h --help)'{-h,--help}'[output usage information]' \
+    '*:: :->subcmds' && return 0
+
+if (( CURRENT == 1 )); then
+    _describe "command" _1st_arguments
+    return
+fi
+
+local -a id_comp id_all_comp id_all_files_comp start_options logs_options
+id_comp=('1: :->id_comp')
+id_all_comp=('1: :->id_all_comp')
+id_all_files_comp=('1: :->id_all_files_comp')
+start_options=(
+    '--watch[Watch folder for changes]'
+    '--fresh[Rebuild Dockerfile]'
+    '--daemon[Run container in Daemon mode (debug purposes)]'
+    '--container[Start application in container mode]'
+    '--dist[with --container; change local Dockerfile to containerize all files in current directory]'
+    '--image-name[with --dist; set the exported image name]'
+    '--node-version[with --container, set a specific major Node.js version]'
+    '--dockerdaemon[for debugging purpose]'
+    '(-h --help)'{-h,--help}'[output usage information]'
+    $id_all_files_comp
+)
+logs_options=(
+    '--json[json log output]'
+    '--format[formated log output]'
+    '--raw[raw output]'
+    '--err[only shows error output]'
+    '--out[only shows standard output]'
+    '--lines[output the last N lines, instead of the last 15 by default]'
+    '--timestamp[add timestamps (default format YYYY-MM-DD-HH:mm:ss)]'
+    '--nostream[print logs without lauching the log stream]'
+    '(-h --help)'{-h,--help}'[output usage information]'
+    $id_all_comp
+)
+
+case "$words[1]" in
+    start)
+        _arguments $start_options && return 0
+        ;;
+    logs)
+        _arguments $logs_options && return 0
+        ;;
+    stop|restart|delete|reload|reset)
+        _arguments $id_all_comp && return 0
+        ;;
+    env|inspect|monitor|unmonitor|discribe)
+        _arguments $id_comp && return 0
+        ;;
+    deploy|startOrRestart|startOrReload)
+        _files ;;
+esac
+
+case "$state" in
+    id_comp)
+        _id_names
+        _alternative \
+            'args:app args:(($id_names))'
+        ;;
+    id_all_comp)
+        _id_names
+        id_names+=(all)
+        _alternative \
+            'args:app args:(($id_names))'
+        ;;
+    id_all_files_comp)
+        _id_names
+        id_names+=(all)
+        _alternative \
+            'args:app args:(($id_names))' \
+            'files:filename:_files'
+        ;;
+esac
diff --git a/plugins/pm2/pm2.plugin.zsh b/plugins/pm2/pm2.plugin.zsh
new file mode 100644
index 000000000..f05d8db8b
--- /dev/null
+++ b/plugins/pm2/pm2.plugin.zsh
@@ -0,0 +1,6 @@
+alias p2s='pm2 start'
+alias p2o='pm2 stop'
+alias p2d='pm2 delete'
+alias p2r='pm2 restart'
+alias p2i='pm2 list'
+alias p2l='pm2 logs'

From 08751210e3204c4ba330bce1ff52b1906b92f850 Mon Sep 17 00:00:00 2001
From: Nick Revin <n@nrvn.cc>
Date: Sun, 13 Jun 2021 21:59:31 +0400
Subject: [PATCH 362/869] feat(git): Add aliases for 'git commit -S -s [-m]'
 (#7616)

I thought it would be useful to add these aliases.

There are already aliases for `git commit -S` and `git commit -s` but there is none for both simultaneously =)
---
 plugins/git/git.plugin.zsh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index 6664551eb..2a7c7290d 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -97,6 +97,8 @@ alias gcp='git cherry-pick'
 alias gcpa='git cherry-pick --abort'
 alias gcpc='git cherry-pick --continue'
 alias gcs='git commit -S'
+alias gcss='git commit -S -s'
+alias gcssm='git commit -S -s -m'
 
 alias gd='git diff'
 alias gdca='git diff --cached'

From 77087aaa8d9ff92ef84ae727411f0eca100ed5de Mon Sep 17 00:00:00 2001
From: Fabio Vitale <cometspk@gmail.com>
Date: Sun, 13 Jun 2021 20:05:09 +0200
Subject: [PATCH 363/869] refactor(git-glow): Add config interpolation for
 git-flow messages (#7481)

Changed commands:
gcd: uses gitflow.branch.develop to get user-set development branch
gch: uses gitflow.prefix.hotfix to get user-set hotfix prefix
gcr: uses gitflow.prefix.release to get user-set release prefix

Co-authored-by: Fabio 'c0m3tx' Vitale <c0m3tx@gmail.com>
---
 plugins/git-flow/git-flow.plugin.zsh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/plugins/git-flow/git-flow.plugin.zsh b/plugins/git-flow/git-flow.plugin.zsh
index 916cd5693..8f0714b16 100644
--- a/plugins/git-flow/git-flow.plugin.zsh
+++ b/plugins/git-flow/git-flow.plugin.zsh
@@ -23,9 +23,9 @@
 #Alias
 alias gfl='git flow'
 alias gfli='git flow init'
-alias gcd='git checkout develop'
-alias gch='git checkout hotfix'
-alias gcr='git checkout release'
+alias gcd='git checkout $(git config gitflow.branch.develop)'
+alias gch='git checkout $(git config gitflow.prefix.hotfix)'
+alias gcr='git checkout $(git config gitflow.prefix.release)'
 alias gflf='git flow feature'
 alias gflh='git flow hotfix'
 alias gflr='git flow release'

From 3e7998aec33ff7551d06d4510f9e8769aab5db93 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Mon, 14 Jun 2021 10:57:50 +0200
Subject: [PATCH 364/869] Revert "ssh-agent: improvements (#6309)"

This reverts commit a206271460ce49e842b1b410c0424b8c9a0a3d14.
---
 plugins/ssh-agent/README.md            | 12 ++---------
 plugins/ssh-agent/ssh-agent.plugin.zsh | 29 +++++++-------------------
 2 files changed, 10 insertions(+), 31 deletions(-)

diff --git a/plugins/ssh-agent/README.md b/plugins/ssh-agent/README.md
index aa96f9cc9..8765a9c7e 100644
--- a/plugins/ssh-agent/README.md
+++ b/plugins/ssh-agent/README.md
@@ -19,17 +19,9 @@ To enable **agent forwarding support** add the following to your zshrc file:
 zstyle :omz:plugins:ssh-agent agent-forwarding on
 ```
 
-To **NOT load any identities on start** use the `lazy` style.
-This is particularly usefull when combined with the AddKeysToAgent
-(available from OpenSSH 7.2), since it allows to enter the password only
-on first use.
+----
 
-```zsh
-zstyle :omz:plugins:ssh-agent lazy yes
-```
-
-To **load multiple identities** use the `identities` style. This have no
-effect if `lazy` is enabled.
+To **load multiple identities** use the `identities` style, For example:
 
 ```zsh
 zstyle :omz:plugins:ssh-agent identities id_rsa id_rsa2 id_github
diff --git a/plugins/ssh-agent/ssh-agent.plugin.zsh b/plugins/ssh-agent/ssh-agent.plugin.zsh
index 494cf1393..d45406f63 100644
--- a/plugins/ssh-agent/ssh-agent.plugin.zsh
+++ b/plugins/ssh-agent/ssh-agent.plugin.zsh
@@ -1,16 +1,4 @@
-lockdir=/tmp/oh-my-zsh-ssh-agent.lock
-
-while true; do
-    if mkdir "$lockdir" 2>/dev/null
-    then    # directory did not exist, but was created successfully
-        trap 'rm -rf "$lockdir"' 0    # remove directory when script finishes
-        break    # continue with script
-    else
-        sleep 0.1  # sleep for 0.2 and try again
-    fi
-done
-
-typeset _ssh_env_cache
+typeset _agent_forwarding _ssh_env_cache
 
 function _start_agent() {
 	local lifetime
@@ -68,7 +56,10 @@ function _add_identities() {
 # Get the filename to store/lookup the environment from
 _ssh_env_cache="$HOME/.ssh/environment-$SHORT_HOST"
 
-if zstyle -t :omz:plugins:ssh-agent agent-forwarding && [[ -n "$SSH_AUTH_SOCK" ]]; then
+# test if agent-forwarding is enabled
+zstyle -b :omz:plugins:ssh-agent agent-forwarding _agent_forwarding
+
+if [[ $_agent_forwarding == "yes" && -n "$SSH_AUTH_SOCK" ]]; then
 	# Add a nifty symlink for screen/tmux if agent forwarding
 	[[ -L $SSH_AUTH_SOCK ]] || ln -sf "$SSH_AUTH_SOCK" /tmp/ssh-agent-$USERNAME-screen
 elif [[ -f "$_ssh_env_cache" ]]; then
@@ -82,16 +73,12 @@ elif [[ -f "$_ssh_env_cache" ]]; then
 	ps $FILTER | grep ssh-agent | grep -q $SSH_AGENT_PID || {
 		_start_agent
 	}
-elif [[ -d $HOME/.ssh ]]; then
+else
 	_start_agent
 fi
 
-if ! zstyle -t :omz:plugins:ssh-agent lazy; then
-	_add_identities
-fi
+_add_identities
 
 # tidy up after ourselves
-unset _ssh_env_cache
+unset _agent_forwarding _ssh_env_cache
 unfunction _start_agent _add_identities
-
-rm -rf "$lockdir"

From e32d4b1e195f4c7777844beea97af42bd93434eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Thu, 17 Jun 2021 18:54:52 +0200
Subject: [PATCH 365/869] fix(lib): remove `kubectx` stub prompt function from
 lib

Fixes #9974
---
 lib/prompt_info_functions.zsh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lib/prompt_info_functions.zsh b/lib/prompt_info_functions.zsh
index e29fb27a5..48f033da6 100644
--- a/lib/prompt_info_functions.zsh
+++ b/lib/prompt_info_functions.zsh
@@ -19,7 +19,6 @@ function chruby_prompt_info \
   virtualenv_prompt_info \
   jenv_prompt_info \
   tf_prompt_info \
-  kubectx_prompt_info \
 {
   return 1
 }

From 0e7d7b87f33b5ec8c75a3a0a9b16fae082d06348 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Wed, 7 Jul 2021 10:40:05 +0200
Subject: [PATCH 366/869] feat(changelog): ignore merge commits

---
 tools/changelog.sh | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/tools/changelog.sh b/tools/changelog.sh
index 836afef14..56ea42cb1 100755
--- a/tools/changelog.sh
+++ b/tools/changelog.sh
@@ -114,6 +114,11 @@ function parse-commit {
     fi
   }
 
+  # Ignore commit if it is a merge commit
+  if [[ $(command git show -s --format=%p $1 | wc -w) -gt 1 ]]; then
+    return
+  fi
+
   # Parse commit with hash $1
   local hash="$1" subject body warning rhash
   subject="$(command git show -s --format=%s $hash)"

From c44b99e901d7ef58f60247995152de1b937e2e9c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Mon, 28 Jun 2021 15:54:24 +0200
Subject: [PATCH 367/869] fix(dotenv): draw confirmation prompt in next empty
 line

Without this fix the confirmation prompt appears wherever the cursor is,
which means that it might appear in the command line when using a widget
that changes the directory without redrawing the prompt (an example of
this are the dircycle and dirhistory plugins).
---
 plugins/dotenv/dotenv.plugin.zsh | 66 ++++++++++++++++++--------------
 1 file changed, 38 insertions(+), 28 deletions(-)

diff --git a/plugins/dotenv/dotenv.plugin.zsh b/plugins/dotenv/dotenv.plugin.zsh
index 24f285df5..40ec5c46f 100644
--- a/plugins/dotenv/dotenv.plugin.zsh
+++ b/plugins/dotenv/dotenv.plugin.zsh
@@ -11,41 +11,51 @@
 ## Functions
 
 source_env() {
-  if [[ -f $ZSH_DOTENV_FILE ]]; then
-    if [[ "$ZSH_DOTENV_PROMPT" != false ]]; then
-      local confirmation dirpath="${PWD:A}"
+  if [[ ! -f "$ZSH_DOTENV_FILE" ]]; then
+    return
+  fi
 
-      # make sure there is an (dis-)allowed file
-      touch "$ZSH_DOTENV_ALLOWED_LIST"
-      touch "$ZSH_DOTENV_DISALLOWED_LIST"
+  if [[ "$ZSH_DOTENV_PROMPT" != false ]]; then
+    local confirmation dirpath="${PWD:A}"
 
-      # early return if disallowed
-      if grep -q "$dirpath" "$ZSH_DOTENV_DISALLOWED_LIST" &>/dev/null; then
-        return;
-      fi
+    # make sure there is an (dis-)allowed file
+    touch "$ZSH_DOTENV_ALLOWED_LIST"
+    touch "$ZSH_DOTENV_DISALLOWED_LIST"
 
-      # check if current directory's .env file is allowed or ask for confirmation
-      if ! grep -q "$dirpath" "$ZSH_DOTENV_ALLOWED_LIST" &>/dev/null; then
-        # print same-line prompt and output newline character if necessary
-        echo -n "dotenv: found '$ZSH_DOTENV_FILE' file. Source it? ([Y]es/[n]o/[a]lways/n[e]ver) "
-        read -k 1 confirmation; [[ "$confirmation" != $'\n' ]] && echo
-
-        # check input
-        case "$confirmation" in
-          [nN]) return ;;
-          [aA]) echo "$dirpath" >> "$ZSH_DOTENV_ALLOWED_LIST" ;;
-          [eE]) echo "$dirpath" >> "$ZSH_DOTENV_DISALLOWED_LIST"; return ;;
-          *) ;; # interpret anything else as a yes
-        esac
-      fi
+    # early return if disallowed
+    if command grep -q "$dirpath" "$ZSH_DOTENV_DISALLOWED_LIST" &>/dev/null; then
+      return
     fi
 
-    # test .env syntax
-    zsh -fn $ZSH_DOTENV_FILE || echo "dotenv: error when sourcing '$ZSH_DOTENV_FILE' file" >&2
+    # check if current directory's .env file is allowed or ask for confirmation
+    if ! command grep -q "$dirpath" "$ZSH_DOTENV_ALLOWED_LIST" &>/dev/null; then
+      # get cursor column and print new line before prompt if not at line beginning
+      local column
+      echo -ne "\e[6n" > /dev/tty
+      read -t 1 -s -d R column < /dev/tty
+      column="${column##*\[*;}"
+      [[ $column -eq 1 ]] || echo
 
-    setopt localoptions allexport
-    source $ZSH_DOTENV_FILE
+      # print same-line prompt and output newline character if necessary
+      echo -n "dotenv: found '$ZSH_DOTENV_FILE' file. Source it? ([Y]es/[n]o/[a]lways/n[e]ver) "
+      read -k 1 confirmation
+      [[ "$confirmation" = $'\n' ]] || echo
+
+      # check input
+      case "$confirmation" in
+        [nN]) return ;;
+        [aA]) echo "$dirpath" >> "$ZSH_DOTENV_ALLOWED_LIST" ;;
+        [eE]) echo "$dirpath" >> "$ZSH_DOTENV_DISALLOWED_LIST"; return ;;
+        *) ;; # interpret anything else as a yes
+      esac
+    fi
   fi
+
+  # test .env syntax
+  zsh -fn $ZSH_DOTENV_FILE || echo "dotenv: error when sourcing '$ZSH_DOTENV_FILE' file" >&2
+
+  setopt localoptions allexport
+  source $ZSH_DOTENV_FILE
 }
 
 autoload -U add-zsh-hook

From 36f444ed7325720ec05f182781ec7d6c9a4d675c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Thu, 8 Jul 2021 16:11:16 +0200
Subject: [PATCH 368/869] fix(update): fix error exit code on update check
 (#10033)

This patch removes the 'exit 1' status code when the update check
finishes or is ended with CTRL+C.

Fixes #10033
---
 tools/check_for_upgrade.sh | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/tools/check_for_upgrade.sh b/tools/check_for_upgrade.sh
index 29a48b880..e87da3487 100644
--- a/tools/check_for_upgrade.sh
+++ b/tools/check_for_upgrade.sh
@@ -48,14 +48,17 @@ function update_ohmyzsh() {
     return
   fi
 
-  # Remove lock directory on exit. `return 1` is important for when trapping a SIGINT:
+  # Remove lock directory on exit. `return $ret` is important for when trapping a SIGINT:
   #  The return status from the function is handled specially. If it is zero, the signal is
   #  assumed to have been handled, and execution continues normally. Otherwise, the shell
   #  will behave as interrupted except that the return status of the trap is retained.
+  #  This means that for a CTRL+C, the trap needs to return the same exit status so that
+  #  the shell actually exits what it's running.
   trap "
-  unset -f current_epoch update_last_updated_file update_ohmyzsh
-  command rm -rf '$ZSH/log/update.lock'
-  return 1
+    ret=\$?
+    unset -f current_epoch update_last_updated_file update_ohmyzsh 2>/dev/null
+    command rm -rf '$ZSH/log/update.lock'
+    return \$ret
   " EXIT INT QUIT
 
   # Create or update .zsh-update file if missing or malformed

From 5b4e3ee7f1c48505a3ec56ce38e444b88feda7a4 Mon Sep 17 00:00:00 2001
From: Robert Lankford <rlankfo@gmail.com>
Date: Mon, 12 Jul 2021 10:16:26 -0500
Subject: [PATCH 369/869] feat(gnu-utils): include ggrep in gcmds (#10044)

Co-authored-by: Robert Lankford <robert.lankford@nuorder.com>
---
 plugins/gnu-utils/gnu-utils.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/gnu-utils/gnu-utils.plugin.zsh b/plugins/gnu-utils/gnu-utils.plugin.zsh
index 23e00c295..539e7fe4d 100644
--- a/plugins/gnu-utils/gnu-utils.plugin.zsh
+++ b/plugins/gnu-utils/gnu-utils.plugin.zsh
@@ -36,7 +36,7 @@ __gnu_utils() {
   gcmds+=('gfind' 'gxargs' 'glocate')
 
   # Not part of either coreutils or findutils, installed separately.
-  gcmds+=('gsed' 'gtar' 'gtime' 'gmake')
+  gcmds+=('gsed' 'gtar' 'gtime' 'gmake' 'ggrep')
 
   for gcmd in "${gcmds[@]}"; do
     # Do nothing if the command isn't found

From e4f6f1698d4bf2cebe3fd0e2f5bae9f163780a50 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Mon, 12 Jul 2021 17:34:34 +0200
Subject: [PATCH 370/869] fix(copybuffer): show error below the command line

---
 plugins/copybuffer/copybuffer.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/copybuffer/copybuffer.plugin.zsh b/plugins/copybuffer/copybuffer.plugin.zsh
index 483ed5a5f..87a658d93 100644
--- a/plugins/copybuffer/copybuffer.plugin.zsh
+++ b/plugins/copybuffer/copybuffer.plugin.zsh
@@ -5,7 +5,7 @@ copybuffer () {
   if which clipcopy &>/dev/null; then
     printf "%s" "$BUFFER" | clipcopy
   else
-    echo "clipcopy function not found. Please make sure you have Oh My Zsh installed correctly."
+    zle -M "clipcopy not found. Please make sure you have Oh My Zsh installed correctly."
   fi
 }
 

From 23f9348e2c2341df71b1891eb4607f60ddd5a204 Mon Sep 17 00:00:00 2001
From: Sergei Shvetsov <sshvetsov@users.noreply.github.com>
Date: Tue, 13 Jul 2021 15:05:33 +0700
Subject: [PATCH 371/869] fix(aws): allow for profile switch w/o MFA configured
 (#9924)

---
 plugins/aws/aws.plugin.zsh | 70 +++++++++++++++++++-------------------
 1 file changed, 35 insertions(+), 35 deletions(-)

diff --git a/plugins/aws/aws.plugin.zsh b/plugins/aws/aws.plugin.zsh
index e1566b113..2d095635b 100644
--- a/plugins/aws/aws.plugin.zsh
+++ b/plugins/aws/aws.plugin.zsh
@@ -62,47 +62,47 @@ function acp() {
       read -r sess_duration
     fi
     mfa_opt=(--serial-number "$mfa_serial" --token-code "$mfa_token" --duration-seconds "${sess_duration:-3600}")
+  fi
 
-    # Now see whether we need to just MFA for the current role, or assume a different one
-    local role_arn="$(aws configure get role_arn --profile $profile)"
-    local sess_name="$(aws configure get role_session_name --profile $profile)"
+  # Now see whether we need to just MFA for the current role, or assume a different one
+  local role_arn="$(aws configure get role_arn --profile $profile)"
+  local sess_name="$(aws configure get role_session_name --profile $profile)"
 
-    if [[ -n "$role_arn" ]]; then
-      # Means we need to assume a specified role
-      aws_command=(aws sts assume-role --role-arn "$role_arn" "${mfa_opt[@]}")
+  if [[ -n "$role_arn" ]]; then
+    # Means we need to assume a specified role
+    aws_command=(aws sts assume-role --role-arn "$role_arn" "${mfa_opt[@]}")
 
-      # Check whether external_id is configured to use while assuming the role
-      local external_id="$(aws configure get external_id --profile $profile)"
-      if [[ -n "$external_id" ]]; then
-        aws_command+=(--external-id "$external_id")
-      fi
-
-      # Get source profile to use to assume role
-      local source_profile="$(aws configure get source_profile --profile $profile)"
-      if [[ -z "$sess_name" ]]; then
-        sess_name="${source_profile:-profile}"
-      fi
-      aws_command+=(--profile="${source_profile:-profile}" --role-session-name "${sess_name}")
-
-      echo "Assuming role $role_arn using profile ${source_profile:-profile}"
-    else
-      # Means we only need to do MFA
-      aws_command=(aws sts get-session-token --profile="$profile" "${mfa_opt[@]}")
-      echo "Obtaining session token for profile $profile"
+    # Check whether external_id is configured to use while assuming the role
+    local external_id="$(aws configure get external_id --profile $profile)"
+    if [[ -n "$external_id" ]]; then
+      aws_command+=(--external-id "$external_id")
     fi
 
-    # Format output of aws command for easier processing
-    aws_command+=(--query '[Credentials.AccessKeyId,Credentials.SecretAccessKey,Credentials.SessionToken]' --output text)
-
-    # Run the aws command to obtain credentials
-    local -a credentials
-    credentials=(${(ps:\t:)"$(${aws_command[@]})"})
-
-    if [[ -n "$credentials" ]]; then
-      aws_access_key_id="${credentials[1]}"
-      aws_secret_access_key="${credentials[2]}"
-      aws_session_token="${credentials[3]}"
+    # Get source profile to use to assume role
+    local source_profile="$(aws configure get source_profile --profile $profile)"
+    if [[ -z "$sess_name" ]]; then
+      sess_name="${source_profile:-profile}"
     fi
+    aws_command+=(--profile="${source_profile:-profile}" --role-session-name "${sess_name}")
+
+    echo "Assuming role $role_arn using profile ${source_profile:-profile}"
+  else
+    # Means we only need to do MFA
+    aws_command=(aws sts get-session-token --profile="$profile" "${mfa_opt[@]}")
+    echo "Obtaining session token for profile $profile"
+  fi
+
+  # Format output of aws command for easier processing
+  aws_command+=(--query '[Credentials.AccessKeyId,Credentials.SecretAccessKey,Credentials.SessionToken]' --output text)
+
+  # Run the aws command to obtain credentials
+  local -a credentials
+  credentials=(${(ps:\t:)"$(${aws_command[@]})"})
+
+  if [[ -n "$credentials" ]]; then
+    aws_access_key_id="${credentials[1]}"
+    aws_secret_access_key="${credentials[2]}"
+    aws_session_token="${credentials[3]}"
   fi
 
   # Switch to AWS profile

From 4eadb9cf758b632b113bb793d5f1e38f4c304392 Mon Sep 17 00:00:00 2001
From: Mahdyar Hasanpour <thisismahdyar@gmail.com>
Date: Fri, 16 Jul 2021 14:11:00 +0430
Subject: [PATCH 372/869] chore: convert the repo issue templates to issue
 forms (#10050)

---
 .github/ISSUE_TEMPLATE/bug_report.md       | 46 ---------------
 .github/ISSUE_TEMPLATE/bug_report.yml      | 69 ++++++++++++++++++++++
 .github/ISSUE_TEMPLATE/feature_request.md  | 29 ---------
 .github/ISSUE_TEMPLATE/feature_request.yml | 32 ++++++++++
 4 files changed, 101 insertions(+), 75 deletions(-)
 delete mode 100644 .github/ISSUE_TEMPLATE/bug_report.md
 create mode 100644 .github/ISSUE_TEMPLATE/bug_report.yml
 delete mode 100644 .github/ISSUE_TEMPLATE/feature_request.md
 create mode 100644 .github/ISSUE_TEMPLATE/feature_request.yml

diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
deleted file mode 100644
index 88a6b814d..000000000
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ /dev/null
@@ -1,46 +0,0 @@
----
-name: Bug report
-about: Create a report to help us improve Oh My Zsh
-labels: 'Bug'
-
----
-
-<!--
-Fill this out before posting. You can delete irrelevant sections, but
-an issue where no sections have been filled will be deleted without comment.
--->
-
-**Describe the bug**
-A clear description of what the bug is.
-
-**To Reproduce**
-Steps to reproduce the behavior, for example:
-1. Enable this plugin '...'
-2. Run command '...' or try the autocomplete command '...'
-3. See error
-
-**Expected behavior**
-A brief description of what should happen.
-
-**Screenshots and/or Recordings**
-If applicable, add screenshots to help explain your problem.
-You can also record an asciinema session: https://asciinema.org/
-
-**Self Check**
-
-- Have you tried reaching out on the [Discord server](https://discord.gg/ohmyzsh)? 
-  This can help cut down on filling up issues. We always have a few people
-  online that are in a variety of timezones that are willing to help you!
-
-- Also searching existing [GitHub Issues](https://github.com/ohmyzsh/ohmyzsh/issues?q=) might help you get quicker support
-
-**Desktop (please complete the following information):**
-
- - OS / Distro: [e.g. Arch Linux, macOS]
- - If on Windows what version of WSL: [e.g. WSL1, WSL2]
- - Latest ohmyzsh update?: [e.g. Yes/No]
- - ZSH Version: [e.g. 5.6]
- - Terminal emulator: [e.g. iTerm2]
-
-**Additional context**
-Add any other context about the problem here. This can be themes, plugins, custom configs.
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
new file mode 100644
index 000000000..af2973fec
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -0,0 +1,69 @@
+name: Bug report
+description: Create a report to help us improve Oh My Zsh
+labels: 'Bug'
+body:
+  - type: markdown
+    attributes:
+      value: |
+        ## Self Check
+        - Try searching existing [GitHub Issues](https://github.com/ohmyzsh/ohmyzsh/issues?q=is%3Aissue) (open or closed) for similar issues.
+        - Try reaching out on the [Discord server](https://discord.gg/ohmyzsh) for help.
+  - type: textarea
+    validations:
+      required: true
+    attributes:
+      label: Describe the bug
+      description: A clear description of what the bug is.
+  - type: textarea
+    validations:
+      required: true
+    attributes:
+      label: Steps to reproduce
+      description: |
+        Steps to reproduce the problem.
+      placeholder: |
+        For example:
+        1. Enable plugin '...'
+        2. Run command '...' or try to complete command '...'
+        3. See error
+  - type: textarea
+    validations:
+      required: true
+    attributes:
+      label: Expected behavior
+      description: A brief description of what should happen.
+  - type: textarea
+    attributes:
+      label: Screenshots and recordings
+      description: |
+        If applicable, add screenshots to help explain your problem. You can also record an asciinema session: https://asciinema.org/
+  - type: input
+    validations:
+      required: true
+    attributes:
+      label: OS / Distro
+      placeholder: e.g. Windows 10, Ubuntu 20.04, Arch Linux, macOS 10.15...
+  - type: input
+    validations:
+      required: true
+    attributes:
+      label: Zsh version
+      description: Run `echo $ZSH_VERSION` to check.
+      placeholder: e.g. 5.6
+  - type: input
+    validations:
+      required: true
+    attributes:
+      label: Terminal emulator
+      placeholder: e.g. iTerm2, Gnome Terminal...
+  - type: dropdown
+    attributes:
+      label: If using WSL on Windows, which version of WSL
+      description: Run `wsl -l -v` to check.
+      options:
+        - WSL1
+        - WSL2
+  - type: textarea
+    attributes:
+      label: Additional context
+      description: Add any other context about the problem here. This can be themes, plugins, custom settings...
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
deleted file mode 100644
index 788f77368..000000000
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ /dev/null
@@ -1,29 +0,0 @@
----
-name: Feature request
-about: Suggest a feature for Oh My Zsh
-labels: 'Feature'
-
----
-
-<!--
-Fill this out before posting. You can delete irrelevant sections, but
-an issue where no sections have been filled will be deleted without comment.
--->
-
-**Is your feature request related to a particular plugin or theme? If so, specify it.**
-The name of the plugin, theme or alias that you would like us to improve. [...]
-
-**Is your feature request related to a problem? Please describe.**
-A description of what the problem is. Ex. I'm always frustrated when [...]
-
-**Describe the solution you'd like**
-A description of what you want to happen. [...]
-
-**Describe alternatives you've considered**
-A description of any alternative solutions or features you've considered. This can also include other plugins or themes.
-
-**Additional context**
-Add any other context, screenshots or discord conversations about the feature request here. Also if you have any PRs related to this issue that are already open that you would like us to look at.
-
-**Related Issues**
-Is there any open or closed issues that is related to this feature request? If so please link them below! [...]
diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml
new file mode 100644
index 000000000..dc4baf2b1
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.yml
@@ -0,0 +1,32 @@
+name: Feature request
+description: Suggest a feature for Oh My Zsh
+labels: 'Feature'
+body:
+  - type: input
+    attributes:
+      label: If the feature request is for a plugin or theme, specify it here.
+      description: The name of the plugin or theme that you would like us to improve.
+      placeholder: e.g. Git plugin, Agnoster theme
+  - type: textarea
+    attributes:
+      label: If the feature solves a problem you have, specify it here.
+      description: A description of what the problem is. 
+      placeholder: Ex. I'm always frustrated when...
+  - type: textarea
+    attributes:
+      label: Describe the proposed feature.
+      description: A description of what you want to happen. Be as specific as possible.
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Describe alternatives you've considered
+      description: A description of any alternative solutions or features you've considered. This can also include other plugins or themes.
+  - type: textarea
+    attributes:
+      label: Additional context
+      description: Add any other context, screenshots or Discord conversations about the feature request here. Also if you have any PRs related to this issue that are already open that you would like us to look at.
+  - type: textarea
+    attributes:
+      label: Related Issues
+      description: Is there any open or closed issues that is related to this feature request? If so please link them below!

From dac3314c76e799cddbbe5cf63870d31861626059 Mon Sep 17 00:00:00 2001
From: "MalaGaM @ ARTiSPRETiS" <malagam.artispretis@gmail.com>
Date: Fri, 16 Jul 2021 11:48:19 +0200
Subject: [PATCH 373/869] chore(github): add links to supported tools (#10057)

---
 plugins/github/README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/github/README.md b/plugins/github/README.md
index 70b863f64..af2b8a4e7 100644
--- a/plugins/github/README.md
+++ b/plugins/github/README.md
@@ -2,8 +2,8 @@
 
 This plugin supports working with GitHub from the command line. It provides a few things:
 
-* Sets up the `hub` wrapper and completions for the `git` command if you have `hub` installed.
-* Completion for the `github` Ruby gem.
+* Sets up the `hub` wrapper and completions for the `git` command if you have [`hub`](https://github.com/github/hub) installed.
+* Completion for the [`github` Ruby gem](https://github.com/defunkt/github-gem).
 * Convenience functions for working with repos and URLs.
 
 ### Functions

From d9ad99531f74df8b0d6622feeab5e253528b43d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=BDiga=20=C5=A0ebenik?=
 <sebenik@users.noreply.github.com>
Date: Fri, 23 Jul 2021 12:39:51 +0200
Subject: [PATCH 374/869] feat(plugins): add fnm plugin (#9864)

Co-authored-by: Ziga Sebenik <ziga.sebenik@oryxgaming.com>
---
 plugins/fnm/.gitignore     |  2 ++
 plugins/fnm/README.md      |  9 +++++++++
 plugins/fnm/fnm.plugin.zsh | 12 ++++++++++++
 3 files changed, 23 insertions(+)
 create mode 100644 plugins/fnm/.gitignore
 create mode 100644 plugins/fnm/README.md
 create mode 100644 plugins/fnm/fnm.plugin.zsh

diff --git a/plugins/fnm/.gitignore b/plugins/fnm/.gitignore
new file mode 100644
index 000000000..0b2bc9ab7
--- /dev/null
+++ b/plugins/fnm/.gitignore
@@ -0,0 +1,2 @@
+_fnm
+
diff --git a/plugins/fnm/README.md b/plugins/fnm/README.md
new file mode 100644
index 000000000..00fab5cd4
--- /dev/null
+++ b/plugins/fnm/README.md
@@ -0,0 +1,9 @@
+# fnm plugin
+
+This plugin adds autocompletion for [fnm](https://github.com/Schniz/fnm) - a Node.js version manager.
+
+To use it, add `fnm` to the plugins array in your zshrc file:
+
+```zsh
+plugins=(... fnm)
+```
diff --git a/plugins/fnm/fnm.plugin.zsh b/plugins/fnm/fnm.plugin.zsh
new file mode 100644
index 000000000..5ce558dcb
--- /dev/null
+++ b/plugins/fnm/fnm.plugin.zsh
@@ -0,0 +1,12 @@
+# COMPLETION FUNCTION
+if (( $+commands[fnm] )); then
+  if [[ ! -f $ZSH_CACHE_DIR/fnm_version ]] \
+    || [[ "$(fnm --version)" != "$(< "$ZSH_CACHE_DIR/fnm_version")" ]] \
+    || [[ ! -f $ZSH/plugins/fnm/_fnm ]]; then
+      fnm completions --shell=zsh > $ZSH/plugins/fnm/_fnm
+      fnm --version > $ZSH_CACHE_DIR/fnm_version
+  fi
+  autoload -Uz _fnm
+  _comps[fnm]=_fnm
+fi
+

From c8a258698de6a56145211657f05f8b554a8140b7 Mon Sep 17 00:00:00 2001
From: Neil Girdhar <mistersheik@gmail.com>
Date: Mon, 26 Jul 2021 05:45:02 -0400
Subject: [PATCH 375/869] fix(pyenv): fix pyenv PATH settings with a warning
 (#9935)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This change fixes the setting of $PATH for pyenv and its shims, while warning
the user about non-interactive shells.

Co-authored-by: Marc Cornellà <hello@mcornella.com>
---
 plugins/pyenv/pyenv.plugin.zsh | 81 ++++++++++++++++++++++------------
 1 file changed, 52 insertions(+), 29 deletions(-)

diff --git a/plugins/pyenv/pyenv.plugin.zsh b/plugins/pyenv/pyenv.plugin.zsh
index 82ba6ff8c..fedde6342 100644
--- a/plugins/pyenv/pyenv.plugin.zsh
+++ b/plugins/pyenv/pyenv.plugin.zsh
@@ -3,44 +3,67 @@
 
 # Load pyenv only if command not already available
 if command -v pyenv &> /dev/null && [[ "$(uname -r)" != *icrosoft* ]]; then
-    FOUND_PYENV=1
+  FOUND_PYENV=1
 else
-    FOUND_PYENV=0
+  FOUND_PYENV=0
 fi
 
+# Look for pyenv and try to load it (will only work on interactive shells)
 if [[ $FOUND_PYENV -ne 1 ]]; then
-    pyenvdirs=("$HOME/.pyenv" "/usr/local/pyenv" "/opt/pyenv" "/usr/local/opt/pyenv")
-    for dir in $pyenvdirs; do
-        if [[ -d $dir/bin ]]; then
-            export PATH="$PATH:$dir/bin"
-            FOUND_PYENV=1
-            break
-        fi
-    done
-fi
-
-if [[ $FOUND_PYENV -ne 1 ]]; then
-    if (( $+commands[brew] )) && dir=$(brew --prefix pyenv 2>/dev/null); then
-        if [[ -d $dir/bin ]]; then
-            export PATH="$PATH:$dir/bin"
-            FOUND_PYENV=1
-        fi
+  pyenvdirs=("$HOME/.pyenv" "/usr/local/pyenv" "/opt/pyenv" "/usr/local/opt/pyenv")
+  for dir in $pyenvdirs; do
+    if [[ -d "$dir/bin" ]]; then
+      FOUND_PYENV=1
+      break
     fi
+  done
+
+  if [[ $FOUND_PYENV -ne 1 ]]; then
+    if (( $+commands[brew] )) && dir=$(brew --prefix pyenv 2>/dev/null); then
+      if [[ -d "$dir/bin" ]]; then
+        FOUND_PYENV=1
+      fi
+    fi
+  fi
+
+  # If we found pyenv, load it but show a caveat about non-interactive shells
+  if [[ $FOUND_PYENV -eq 1 ]]; then
+    cat <<EOF
+Found pyenv, but it is badly configured. pyenv might not work for
+non-interactive shells (for example, when run from a script).
+${bold_color}
+To fix this message, add these lines to the '.profile' and '.zprofile' files
+in your home directory:
+
+export PYENV_ROOT="${dir/#$HOME/\$HOME}"
+export PATH="\$PYENV_ROOT/bin:\$PATH"
+eval "\$(pyenv init --path)"
+${reset_color}
+For more info go to https://github.com/pyenv/pyenv/#installation.
+EOF
+
+    # Configuring in .zshrc only makes pyenv available for interactive shells
+    export PYENV_ROOT=$dir
+    export PATH="$PYENV_ROOT/bin:$PATH"
+    eval "$(pyenv init --path)"
+  fi
 fi
 
 if [[ $FOUND_PYENV -eq 1 ]]; then
-    eval "$(pyenv init - --no-rehash zsh)"
-    if (( $+commands[pyenv-virtualenv-init] )); then
-        eval "$(pyenv virtualenv-init - zsh)"
-    fi
-    function pyenv_prompt_info() {
-        echo "$(pyenv version-name)"
-    }
+  eval "$(pyenv init - --no-rehash zsh)"
+
+  if (( ${+commands[pyenv-virtualenv-init]} )); then
+    eval "$(pyenv virtualenv-init - zsh)"
+  fi
+
+  function pyenv_prompt_info() {
+    echo "$(pyenv version-name)"
+  }
 else
-    # fallback to system python
-    function pyenv_prompt_info() {
-        echo "system: $(python -V 2>&1 | cut -f 2 -d ' ')"
-    }
+  # Fall back to system python
+  function pyenv_prompt_info() {
+    echo "system: $(python -V 2>&1 | cut -f 2 -d ' ')"
+  }
 fi
 
 unset FOUND_PYENV pyenvdirs dir

From 5377cc37c0f71fe22484303a4c6f387aa339f3f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Mon, 26 Jul 2021 11:46:15 +0200
Subject: [PATCH 376/869] fix(pyenv): fix for ignoring pyenv-win commands

The previous fix ignored any pyenv command found in $PATH while on
WSL, regardless of whether it was correctly set up or not.

This change only ignores the pyenv command if it's proved to come
from pyenv-win by looking at its full path.
---
 plugins/pyenv/pyenv.plugin.zsh | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/plugins/pyenv/pyenv.plugin.zsh b/plugins/pyenv/pyenv.plugin.zsh
index fedde6342..813f64b42 100644
--- a/plugins/pyenv/pyenv.plugin.zsh
+++ b/plugins/pyenv/pyenv.plugin.zsh
@@ -1,11 +1,13 @@
 # This plugin loads pyenv into the current shell and provides prompt info via
 # the 'pyenv_prompt_info' function. Also loads pyenv-virtualenv if available.
 
-# Load pyenv only if command not already available
-if command -v pyenv &> /dev/null && [[ "$(uname -r)" != *icrosoft* ]]; then
-  FOUND_PYENV=1
-else
+# Look for pyenv in $PATH and verify that it's not a part of pyenv-win in WSL
+if ! command -v pyenv &>/dev/null; then
   FOUND_PYENV=0
+elif [[ "${commands[pyenv]}" = */pyenv-win/* && "$(uname -r)" = *icrosoft* ]]; then
+  FOUND_PYENV=0
+else
+  FOUND_PYENV=1
 fi
 
 # Look for pyenv and try to load it (will only work on interactive shells)

From 9c34c359c4c1ebb1bd0211d40c3bca0c6aa2ca97 Mon Sep 17 00:00:00 2001
From: Aayush Kapoor <xeoneux@icloud.com>
Date: Fri, 6 Aug 2021 19:21:19 +0530
Subject: [PATCH 377/869] chore(ag): fix README (#10001)

---
 plugins/ag/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/ag/README.md b/plugins/ag/README.md
index 6acc54067..1983aaa41 100644
--- a/plugins/ag/README.md
+++ b/plugins/ag/README.md
@@ -5,7 +5,7 @@ This plugin provides completion support for [`ag`](https://github.com/ggreer/the
 To use it, add ag to the plugins array in your zshrc file.
 
 ```zsh
-plugins=(... aws)
+plugins=(... ag)
 ```
 
 ## INSTALLATION NOTES

From ab58594173c04f7fe2155a169d8906ef761ba0fc Mon Sep 17 00:00:00 2001
From: Max Eisner <4730112+max-ae@users.noreply.github.com>
Date: Tue, 10 Aug 2021 16:31:49 +0200
Subject: [PATCH 378/869] feat(git): add `develop` branch name detection
 (#9881)

---
 plugins/git/README.md      | 35 ++++++++++++++++++-----------------
 plugins/git/git.plugin.zsh | 19 ++++++++++++++++---
 2 files changed, 34 insertions(+), 20 deletions(-)

diff --git a/plugins/git/README.md b/plugins/git/README.md
index e00f4cf92..522257d2d 100644
--- a/plugins/git/README.md
+++ b/plugins/git/README.md
@@ -23,7 +23,7 @@ plugins=(... git)
 | gb                   | git branch                                                                                                                       |
 | gba                  | git branch -a                                                                                                                    |
 | gbd                  | git branch -d                                                                                                                    |
-| gbda                 | git branch --no-color --merged \| command grep -vE "^(\+\|\*\|\s*($(git_main_branch)\|development\|develop\|devel\|dev)\s*$)" \| command xargs -n 1 git branch -d |
+| gbda                 | git branch --no-color --merged \| command grep -vE "^(\+\|\*\|\s*($(git_main_branch)\|$(git_develop_branch))\s*$)" \| command xargs -n 1 git branch -d |
 | gbD                  | git branch -D                                                                                                                    |
 | gbl                  | git blame -b -w                                                                                                                  |
 | gbnm                 | git branch --no-merged                                                                                                           |
@@ -49,8 +49,8 @@ plugins=(... git)
 | gcl                  | git clone --recurse-submodules                                                                                                   |
 | gclean               | git clean -id                                                                                                                    |
 | gpristine            | git reset --hard && git clean -dffx                                                                                              |
-| gcm                  | git checkout $(git_main_branch)                                                                                                                |
-| gcd                  | git checkout develop                                                                                                             |
+| gcm                  | git checkout $(git_main_branch)                                                                                                  |
+| gcd                  | git checkout $(git_develop_branch)                                                                                               |
 | gcmsg                | git commit -m                                                                                                                    |
 | gco                  | git checkout                                                                                                                     |
 | gcor                 | git checkout --recurse-submodules                                                                                                |
@@ -88,7 +88,7 @@ plugins=(... git)
 | ghh                  | git help                                                                                                                         |
 | gignore              | git update-index --assume-unchanged                                                                                              |
 | gignored             | git ls-files -v \| grep "^[[:lower:]]"                                                                                           |
-| git-svn-dcommit-push | git svn dcommit && git push github $(git_main_branch):svntrunk                                                                                 |
+| git-svn-dcommit-push | git svn dcommit && git push github $(git_main_branch):svntrunk                                                                   |
 | gk                   | gitk --all --branches                                                                                                            |
 | gke                  | gitk --all $(git log -g --pretty=%h)                                                                                             |
 | gl                   | git pull                                                                                                                         |
@@ -107,10 +107,10 @@ plugins=(... git)
 | gloga                | git log --oneline --decorate --graph --all                                                                                       |
 | glp                  | git log --pretty=\<format\>                                                                                                      |
 | gm                   | git merge                                                                                                                        |
-| gmom                 | git merge origin/$(git_main_branch)                                                                                                            |
+| gmom                 | git merge origin/$(git_main_branch)                                                                                              |
 | gmt                  | git mergetool --no-prompt                                                                                                        |
 | gmtvim               | git mergetool --no-prompt --tool=vimdiff                                                                                         |
-| gmum                 | git merge upstream/$(git_main_branch)                                                                                                          |
+| gmum                 | git merge upstream/$(git_main_branch)                                                                                            |
 | gma                  | git merge --abort                                                                                                                |
 | gp                   | git push                                                                                                                         |
 | gpd                  | git push --dry-run                                                                                                               |
@@ -125,10 +125,10 @@ plugins=(... git)
 | grb                  | git rebase                                                                                                                       |
 | grba                 | git rebase --abort                                                                                                               |
 | grbc                 | git rebase --continue                                                                                                            |
-| grbd                 | git rebase develop                                                                                                               |
+| grbd                 | git rebase $(git_develop_branch)                                                                                                 |
 | grbi                 | git rebase -i                                                                                                                    |
-| grbm                 | git rebase $(git_main_branch)                                                                                                                  |
-| grbo                 | git rebase --onto                                                                                                             |
+| grbm                 | git rebase $(git_main_branch)                                                                                                    |
+| grbo                 | git rebase --onto                                                                                                                |
 | grbs                 | git rebase --skip                                                                                                                |
 | grev                 | git revert                                                                                                                       |
 | grh                  | git reset                                                                                                                        |
@@ -176,7 +176,7 @@ plugins=(... git)
 | gupv                 | git pull --rebase -v                                                                                                             |
 | gupa                 | git pull --rebase --autostash                                                                                                    |
 | gupav                | git pull --rebase --autostash -v                                                                                                 |
-| glum                 | git pull upstream $(git_main_branch)                                                                                                           |
+| glum                 | git pull upstream $(git_main_branch)                                                                                             |
 | gwch                 | git whatchanged -p --abbrev-commit --pretty=medium                                                                               |
 | gwip                 | git add -A; git rm $(git ls-files --deleted) 2> /dev/null; git commit --no-verify --no-gpg-sign -m "--wip-- [skip ci]"           |
 | gam                  | git am                                                                                                                           |
@@ -214,13 +214,14 @@ These are aliases that have been removed, renamed, or otherwise modified in a wa
 
 ### Current
 
-| Command                | Description                                                                  |
-|:-----------------------|:-----------------------------------------------------------------------------|
-| `grename <old> <new>`  | Rename `old` branch to `new`, including in origin remote                     |
-| current_branch         | Return the name of the current branch                                        |
-| git_current_user_name  | Returns the `user.name` config value                                         |
-| git_current_user_email | Returns the `user.email` config value                                        |
-| git_main_branch        | Returns the name of the main branch: `main` if it exists, `master` otherwise |
+| Command                | Description                                                                                              |
+|:-----------------------|:---------------------------------------------------------------------------------------------------------|
+| `grename <old> <new>`  | Rename `old` branch to `new`, including in origin remote                                                 |
+| current_branch         | Return the name of the current branch                                                                    |
+| git_current_user_name  | Returns the `user.name` config value                                                                     |
+| git_current_user_email | Returns the `user.email` config value                                                                    |
+| git_main_branch        | Returns the name of the main branch: `main` if it exists, `master` otherwise                             |
+| git_develop_branch     | Returns the name of the develop branch: `dev`, `devel`, `development` if they exist, `develop` otherwise |
 
 ### Work in Progress (WIP)
 
diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index 2a7c7290d..3cd558692 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -42,6 +42,19 @@ function git_main_branch() {
   echo master
 }
 
+# Check for develop and similarly named branches
+function git_develop_branch() {
+  command git rev-parse --git-dir &>/dev/null || return
+  local branch
+  for branch in dev devel development; do
+    if command git show-ref -q --verify refs/heads/$branch; then
+      echo $branch
+      return
+    fi
+  done
+  echo develop
+}
+
 #
 # Aliases
 # (sorted alphabetically)
@@ -60,7 +73,7 @@ alias gapt='git apply --3way'
 alias gb='git branch'
 alias gba='git branch -a'
 alias gbd='git branch -d'
-alias gbda='git branch --no-color --merged | command grep -vE "^(\+|\*|\s*($(git_main_branch)|development|develop|devel|dev)\s*$)" | command xargs -n 1 git branch -d'
+alias gbda='git branch --no-color --merged | command grep -vE "^(\+|\*|\s*($(git_main_branch)|$(git_develop_branch))\s*$)" | command xargs -n 1 git branch -d'
 alias gbD='git branch -D'
 alias gbl='git blame -b -w'
 alias gbnm='git branch --no-merged'
@@ -88,7 +101,7 @@ alias gcl='git clone --recurse-submodules'
 alias gclean='git clean -id'
 alias gpristine='git reset --hard && git clean -dffx'
 alias gcm='git checkout $(git_main_branch)'
-alias gcd='git checkout develop'
+alias gcd='git checkout $(git_develop_branch)'
 alias gcmsg='git commit -m'
 alias gco='git checkout'
 alias gcor='git checkout --recurse-submodules'
@@ -227,7 +240,7 @@ alias gra='git remote add'
 alias grb='git rebase'
 alias grba='git rebase --abort'
 alias grbc='git rebase --continue'
-alias grbd='git rebase develop'
+alias grbd='git rebase $(git_develop_branch)'
 alias grbi='git rebase -i'
 alias grbm='git rebase $(git_main_branch)'
 alias grbo='git rebase --onto'

From bca73e18584771fd6db770055dac25b5728764c3 Mon Sep 17 00:00:00 2001
From: Quentin Nerden <kenden@gmail.com>
Date: Tue, 10 Aug 2021 20:25:08 +0200
Subject: [PATCH 379/869] feat(plugins): add completion plugin for `invoke`
 (#7311)

Co-authored-by: Quentin Nerden <quentin.nerden@intel.com>
---
 plugins/invoke/README.md         | 10 ++++++++++
 plugins/invoke/invoke.plugin.zsh |  5 +++++
 2 files changed, 15 insertions(+)
 create mode 100644 plugins/invoke/README.md
 create mode 100644 plugins/invoke/invoke.plugin.zsh

diff --git a/plugins/invoke/README.md b/plugins/invoke/README.md
new file mode 100644
index 000000000..3f4b88078
--- /dev/null
+++ b/plugins/invoke/README.md
@@ -0,0 +1,10 @@
+# Invoke plugin
+
+This plugin adds completion for [invoke](https://github.com/pyinvoke/invoke).
+
+To use it, add `invoke` to the plugins array in your `~/.zshrc` file:
+
+```zsh
+plugins=(... invoke)
+```
+
diff --git a/plugins/invoke/invoke.plugin.zsh b/plugins/invoke/invoke.plugin.zsh
new file mode 100644
index 000000000..8c807de02
--- /dev/null
+++ b/plugins/invoke/invoke.plugin.zsh
@@ -0,0 +1,5 @@
+# Autocompletion for invoke.
+#
+if [ $commands[invoke] ]; then
+  source <(invoke --print-completion-script=zsh)
+fi

From b79fba7b0d38aa61afaeeaaa7fab6992dbfb6db3 Mon Sep 17 00:00:00 2001
From: Gregor Trefs <Gregor.Trefs@gmail.com>
Date: Tue, 10 Aug 2021 21:02:06 +0200
Subject: [PATCH 380/869] feat(plugins): `octozen` shows an Octocat zen quote
 on startup (#5959)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Marc Cornellà <hello@mcornella.com>
---
 plugins/octozen/README.md          | 12 ++++++++++++
 plugins/octozen/octozen.plugin.zsh | 11 +++++++++++
 2 files changed, 23 insertions(+)
 create mode 100644 plugins/octozen/README.md
 create mode 100644 plugins/octozen/octozen.plugin.zsh

diff --git a/plugins/octozen/README.md b/plugins/octozen/README.md
new file mode 100644
index 000000000..2051248ca
--- /dev/null
+++ b/plugins/octozen/README.md
@@ -0,0 +1,12 @@
+# Octozen plugin
+
+Displays a zen quote from GitHub's Octocat on start up.
+
+To use it, add `octozen` to the plugins array in your zshrc file:
+
+```zsh
+plugins=(... octozen)
+```
+
+It defines a `display_octozen` function that fetches a GitHub Octocat zen quote.
+NOTE: Internet connection is required (will time out if not fetched in 2 seconds).
diff --git a/plugins/octozen/octozen.plugin.zsh b/plugins/octozen/octozen.plugin.zsh
new file mode 100644
index 000000000..71ee550a5
--- /dev/null
+++ b/plugins/octozen/octozen.plugin.zsh
@@ -0,0 +1,11 @@
+# octozen plugin
+
+# Displays a zen quote from octocat
+function display_octozen() {
+  curl -m 2 -fsL "https://api.github.com/octocat"
+  add-zsh-hook -d precmd display_octozen
+}
+
+# Display the octocat on the first precmd, after the whole starting process has finished
+autoload -Uz add-zsh-hook
+add-zsh-hook precmd display_octozen

From c24928815179e1a8e1e3a0a4ab130e22ba2e0f1a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Tue, 10 Aug 2021 21:05:00 +0200
Subject: [PATCH 381/869] feat(lib): add `mkcd` as equivalent to `takedir`
 (#9749)

Fixes #9749
---
 lib/functions.zsh | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/lib/functions.zsh b/lib/functions.zsh
index 9cc735196..24b7254fb 100644
--- a/lib/functions.zsh
+++ b/lib/functions.zsh
@@ -13,10 +13,6 @@ function upgrade_oh_my_zsh() {
   omz update
 }
 
-function takedir() {
-  mkdir -p $@ && cd ${@:$#}
-}
-
 function open_command() {
   local open_cmd
 
@@ -37,6 +33,13 @@ function open_command() {
   ${=open_cmd} "$@" &>/dev/null
 }
 
+# take functions
+
+# mkcd is equivalent to takedir
+function mkcd takedir() {
+  mkdir -p $@ && cd ${@:$#}
+}
+
 function takeurl() {
   data=$(mktemp)
   curl -L $1 > $data

From 7eeb1e193d4a55ab706931fb80ef556a939be8fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Tue, 10 Aug 2021 21:09:21 +0200
Subject: [PATCH 382/869] refactor(lib): refactor take functions

---
 lib/functions.zsh | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/lib/functions.zsh b/lib/functions.zsh
index 24b7254fb..73b491a59 100644
--- a/lib/functions.zsh
+++ b/lib/functions.zsh
@@ -41,26 +41,27 @@ function mkcd takedir() {
 }
 
 function takeurl() {
-  data=$(mktemp)
-  curl -L $1 > $data
-  tar xf $data
-  thedir=$(tar tf $data | head -1)
-  rm $data
-  cd $thedir
+  local data thedir
+  data="$(mktemp)"
+  curl -L "$1" > "$data"
+  tar xf "$data"
+  thedir="$(tar tf "$data" | head -1)"
+  rm "$data"
+  cd "$thedir"
 }
 
 function takegit() {
-  git clone $1
-  cd $(basename ${1%%.git})
+  git clone "$1"
+  cd "$(basename ${1%%.git})"
 }
 
 function take() {
   if [[ $1 =~ ^(https?|ftp).*\.tar\.(gz|bz2|xz)$ ]]; then
-    takeurl $1
+    takeurl "$1"
   elif [[ $1 =~ ^([A-Za-z0-9]\+@|https?|git|ssh|ftps?|rsync).*\.git/?$ ]]; then
-    takegit $1
+    takegit "$1"
   else
-    takedir $1
+    takedir "$@"
   fi
 }
 

From 6e4c9df4a433849a2c636980dc317db0fba3a0f5 Mon Sep 17 00:00:00 2001
From: James Eapen <jamespeapen@gmail.com>
Date: Fri, 13 Aug 2021 06:33:30 -0400
Subject: [PATCH 383/869] feat(cli): add `plugin load` subcommand (#9872)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixes #9672

Co-authored-by: Marc Cornellà <hello@mcornella.com>
---
 lib/cli.zsh | 77 +++++++++++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 72 insertions(+), 5 deletions(-)

diff --git a/lib/cli.zsh b/lib/cli.zsh
index 38e2f72f8..7e3e37be8 100644
--- a/lib/cli.zsh
+++ b/lib/cli.zsh
@@ -37,7 +37,7 @@ function _omz {
       changelog) local -a refs
         refs=("${(@f)$(command git for-each-ref --format="%(refname:short):%(subject)" refs/heads refs/tags)}")
         _describe 'command' refs ;;
-      plugin) subcmds=('info:Get plugin information' 'list:List plugins')
+      plugin) subcmds=('info:Get plugin information' 'list:List plugins' 'load:Load plugin(s)')
         _describe 'command' subcmds ;;
       pr) subcmds=('test:Test a Pull Request' 'clean:Delete all Pull Request branches')
         _describe 'command' subcmds ;;
@@ -46,10 +46,26 @@ function _omz {
     esac
   elif (( CURRENT == 4 )); then
     case "$words[2]::$words[3]" in
-      plugin::info) compadd "$ZSH"/plugins/*/README.md(.N:h:t) \
-        "$ZSH_CUSTOM"/plugins/*/README.md(.N:h:t) ;;
-      theme::use) compadd "$ZSH"/themes/*.zsh-theme(.N:t:r) \
-        "$ZSH_CUSTOM"/**/*.zsh-theme(.N:r:gs:"$ZSH_CUSTOM"/themes/:::gs:"$ZSH_CUSTOM"/:::) ;;
+      plugin::(info|load))
+        local -aU plugins=("$ZSH"/plugins/*/{_*,*.plugin.zsh}(.N:h:t) "$ZSH_CUSTOM"/plugins/*/{_*,*.plugin.zsh}(.N:h:t))
+        _describe 'plugin' plugins ;;
+      theme::use)
+        local -aU themes=("$ZSH"/themes/*.zsh-theme(.N:t:r) "$ZSH_CUSTOM"/**/*.zsh-theme(.N:r:gs:"$ZSH_CUSTOM"/themes/:::gs:"$ZSH_CUSTOM"/:::))
+        _describe 'theme' themes ;;
+    esac
+  elif (( CURRENT > 4 )); then
+    case "$words[2]::$words[3]" in
+      plugin::load)
+        local -aU plugins=("$ZSH"/plugins/*/{_*,*.plugin.zsh}(.N:h:t) "$ZSH_CUSTOM"/plugins/*/{_*,*.plugin.zsh}(.N:h:t))
+
+        # Remove plugins already passed as arguments
+        # NOTE: $(( CURRENT - 1 )) is the last plugin argument completely passed, i.e. that which
+        # has a space after them. This is to avoid removing plugins partially passed, which makes
+        # the completion not add a space after the completed plugin.
+        local -a args=(${words[4,$(( CURRENT - 1))]})
+        plugins=(${plugins:|args})
+
+        _describe 'plugin' plugins ;;
     esac
   fi
 
@@ -147,6 +163,7 @@ Available commands:
 
   info <plugin>   Get information of a plugin
   list            List all available Oh My Zsh plugins
+  load <plugin>   Load plugin(s)
 
 EOF
     return 1
@@ -205,6 +222,56 @@ function _omz::plugin::list {
   fi
 }
 
+function _omz::plugin::load {
+  if [[ -z "$1" ]]; then
+    echo >&2 "Usage: omz plugin load <plugin> [...]"
+    return 1
+  fi
+
+  local plugins=("$@")
+  local plugin base has_completion=0
+
+  for plugin in $plugins; do
+    if [[ -d "$ZSH_CUSTOM/plugins/$plugin" ]]; then
+      base="$ZSH_CUSTOM/plugins/$plugin"
+    elif [[ -d "$ZSH/plugins/$plugin" ]]; then
+      base="$ZSH/plugins/$plugin"
+    else
+      _omz::log warn "plugin '$plugin' not found"
+      continue
+    fi
+
+    # Check if its a valid plugin
+    if [[ ! -f "$base/_$plugin" && ! -f "$base/$plugin.plugin.zsh" ]]; then
+      _omz::log warn "'$plugin' is not a valid plugin"
+      continue
+    # It it is a valid plugin, add its directory to $fpath unless it is already there
+    elif (( ! ${fpath[(Ie)$base]} )); then
+      fpath=("$base" $fpath)
+    fi
+
+    # Check if it has completion to reload compinit
+    if [[ -f "$base/_$plugin" ]]; then
+      has_completion=1
+    fi
+
+    # Load the plugin
+    if [[ -f "$base/$plugin.plugin.zsh" ]]; then
+      source "$base/$plugin.plugin.zsh"
+    fi
+  done
+
+  # If we have completion, we need to reload the completion
+  # We pass -D to avoid generating a new dump file, which would overwrite our
+  # current one for the next session (and we don't want that because we're not
+  # actually enabling the plugins for the next session).
+  # Note that we still have to pass -d "$_comp_dumpfile", so that compinit
+  # doesn't use the default zcompdump location (${ZDOTDIR:-$HOME}/.zcompdump).
+  if (( has_completion )); then
+    compinit -D -d "$_comp_dumpfile"
+  fi
+}
+
 function _omz::pr {
   (( $# > 0 && $+functions[_omz::pr::$1] )) || {
     cat <<EOF

From 502b07c9b2829733f43ca76b7cd077b310f0f77f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Fri, 13 Aug 2021 12:38:22 +0200
Subject: [PATCH 384/869] refactor(fedora)!: remove deprecated `fedora` plugin

BREAKING CHANGE: the `fedora` plugin has been removed. Use the `dnf` plugin instead.
---
 plugins/fedora/README.md         | 1 -
 plugins/fedora/fedora.plugin.zsh | 3 ---
 2 files changed, 4 deletions(-)
 delete mode 100644 plugins/fedora/README.md
 delete mode 100644 plugins/fedora/fedora.plugin.zsh

diff --git a/plugins/fedora/README.md b/plugins/fedora/README.md
deleted file mode 100644
index 85d8d7dea..000000000
--- a/plugins/fedora/README.md
+++ /dev/null
@@ -1 +0,0 @@
-The fedora plugin is deprecated. Use the [dnf plugin](https://github.com/ohmyzsh/ohmyzsh/tree/master/plugins/dnf) instead.
diff --git a/plugins/fedora/fedora.plugin.zsh b/plugins/fedora/fedora.plugin.zsh
deleted file mode 100644
index 226506c05..000000000
--- a/plugins/fedora/fedora.plugin.zsh
+++ /dev/null
@@ -1,3 +0,0 @@
-print -P "%F{yellow}The 'fedora' plugin is deprecated. Use the '%Udnf%u' plugin instead.%f"
-
-source "$ZSH/plugins/dnf/dnf.plugin.zsh"

From e1f0d826f1f0d362eb377ef4a8124062ec63c3e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Fri, 13 Aug 2021 12:40:20 +0200
Subject: [PATCH 385/869] refactor(go)!: remove deprecated `go` plugin

BREAKING CHANGE: the `go` plugin has been removed. Use the `golang` plugin instead.
---
 plugins/go/README.md     | 1 -
 plugins/go/go.plugin.zsh | 3 ---
 2 files changed, 4 deletions(-)
 delete mode 100644 plugins/go/README.md
 delete mode 100644 plugins/go/go.plugin.zsh

diff --git a/plugins/go/README.md b/plugins/go/README.md
deleted file mode 100644
index bf43b9feb..000000000
--- a/plugins/go/README.md
+++ /dev/null
@@ -1 +0,0 @@
-The go plugin is deprecated. Use the [golang plugin](https://github.com/ohmyzsh/ohmyzsh/tree/master/plugins/golang) instead.
diff --git a/plugins/go/go.plugin.zsh b/plugins/go/go.plugin.zsh
deleted file mode 100644
index da7c87cfd..000000000
--- a/plugins/go/go.plugin.zsh
+++ /dev/null
@@ -1,3 +0,0 @@
-print -P "%F{yellow}The 'go' plugin is deprecated. Use the '%Ugolang%u' plugin instead.%f"
-
-source "$ZSH/plugins/golang/golang.plugin.zsh"

From af6c7f3d6782cf0a34e4e68f661df526d35795be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Fri, 13 Aug 2021 12:42:56 +0200
Subject: [PATCH 386/869] refactor(cloudapp)!: remove deprecated `cloudapp`
 plugin

BREAKING CHANGE: the `cloudapp` plugin has been removed due to removed API.
---
 plugins/cloudapp/README.md           | 26 --------------------------
 plugins/cloudapp/cloudapp.plugin.zsh |  4 ----
 2 files changed, 30 deletions(-)
 delete mode 100644 plugins/cloudapp/README.md
 delete mode 100644 plugins/cloudapp/cloudapp.plugin.zsh

diff --git a/plugins/cloudapp/README.md b/plugins/cloudapp/README.md
deleted file mode 100644
index ef304edc2..000000000
--- a/plugins/cloudapp/README.md
+++ /dev/null
@@ -1,26 +0,0 @@
-# CloudApp plugin
-
-## The CloudApp API is deprecated, so the plugin will be removed shortly
-
-[CloudApp](https://www.getcloudapp.com) brings screen recording, screenshots, and GIF creation to the cloud, in an easy-to-use enterprise-level app. The CloudApp plugin allows you to upload a file to your CloadApp account from the command line.
-
-To use it, add `cloudapp` to the plugins array of your `~/.zshrc` file:
-
-```zsh
-plugins=(... cloudapp)
-```
-
-## Requirements
-
-1. [Aaron Russell's `cloudapp_api` gem](https://github.com/aaronrussell/cloudapp_api#installation)
-
-2. That you set your CloudApp credentials in `~/.cloudapp` as a simple text file like below:
-   ```
-   email
-   password
-   ```
-
-## Usage
-
-- `cloudapp <filename>`: uploads `<filename>` to your CloudApp account, and if you're using
-  macOS, copies the URL to your clipboard.
diff --git a/plugins/cloudapp/cloudapp.plugin.zsh b/plugins/cloudapp/cloudapp.plugin.zsh
deleted file mode 100644
index a4d92a080..000000000
--- a/plugins/cloudapp/cloudapp.plugin.zsh
+++ /dev/null
@@ -1,4 +0,0 @@
-print -Pn "%F{yellow}"
-print "[oh-my-zsh] The CloudApp API no longer works, so the cloudapp plugin will"
-print "[oh-my-zsh] be removed shortly. Please remove it from your plugins list."
-print -Pn "%f"

From 6dc937ff685fcbc43056dbd7fb05ba01c56dfd1a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Wed, 4 Aug 2021 15:49:11 +0200
Subject: [PATCH 387/869] feat(extract): add suport for .cab files via
 `cabextract`

---
 plugins/extract/README.md          | 1 +
 plugins/extract/_extract           | 2 +-
 plugins/extract/extract.plugin.zsh | 3 ++-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/plugins/extract/README.md b/plugins/extract/README.md
index f2e6ad1d1..1dd8e19c0 100644
--- a/plugins/extract/README.md
+++ b/plugins/extract/README.md
@@ -21,6 +21,7 @@ plugins=(... extract)
 | `apk`             | Android app file                     |
 | `aar`             | Android library file                 |
 | `bz2`             | Bzip2 file                           |
+| `cab`             | Microsoft cabinet archive            |
 | `deb`             | Debian package                       |
 | `ear`             | Enterprise Application aRchive       |
 | `gz`              | Gzip file                            |
diff --git a/plugins/extract/_extract b/plugins/extract/_extract
index 267c4d4e1..31a7facbe 100644
--- a/plugins/extract/_extract
+++ b/plugins/extract/_extract
@@ -3,5 +3,5 @@
 
 _arguments \
   '(-r --remove)'{-r,--remove}'[Remove archive.]' \
-  "*::archive file:_files -g '(#i)*.(7z|Z|apk|aar|bz2|deb|ear|gz|ipa|ipsw|jar|lrz|lz4|lzma|rar|rpm|sublime-package|tar|tar.bz2|tar.gz|tar.lrz|tar.lz|tar.lz4|tar.xz|tar.zma|tar.zst|tbz|tbz2|tgz|tlz|txz|tzst|war|whl|xpi|xz|zip|zst)(-.)'" \
+  "*::archive file:_files -g '(#i)*.(7z|Z|apk|aar|bz2|cab|deb|ear|gz|ipa|ipsw|jar|lrz|lz4|lzma|rar|rpm|sublime-package|tar|tar.bz2|tar.gz|tar.lrz|tar.lz|tar.lz4|tar.xz|tar.zma|tar.zst|tbz|tbz2|tgz|tlz|txz|tzst|war|whl|xpi|xz|zip|zst)(-.)'" \
     && return 0
diff --git a/plugins/extract/extract.plugin.zsh b/plugins/extract/extract.plugin.zsh
index e390e2dcc..601272cac 100644
--- a/plugins/extract/extract.plugin.zsh
+++ b/plugins/extract/extract.plugin.zsh
@@ -55,7 +55,7 @@ extract() {
 			(*.lz4) lz4 -d "$1" ;;
 			(*.lzma) unlzma "$1" ;;
 			(*.z) uncompress "$1" ;;
-			(*.zip|*.war|*.jar|*.ear|*.sublime-package|*.ipa|*.ipsw|*.xpi|*.apk|*.aar|*.whl) unzip "$1" -d $extract_dir ;;
+			(*.zip|*.war|*.jar|*.ear|*.sublime-package|*.ipa|*.ipsw|*.xpi|*.apk|*.aar|*.whl) unzip "$1" -d "$extract_dir" ;;
 			(*.rar) unrar x -ad "$1" ;;
 			(*.rpm) mkdir "$extract_dir" && cd "$extract_dir" && rpm2cpio "../$1" | cpio --quiet -id && cd .. ;;
 			(*.7z) 7za x "$1" ;;
@@ -69,6 +69,7 @@ extract() {
 				cd ..
 			;;
 			(*.zst) unzstd "$1" ;;
+			(*.cab) cabextract -d "$extract_dir" "$1" ;;
 			(*)
 				echo "extract: '$1' cannot be extracted" >&2
 				success=1

From 59a9b453d348baad4ff7b7cb2e1f205d615200e6 Mon Sep 17 00:00:00 2001
From: Alexander Kapshuna <kapsh@kap.sh>
Date: Mon, 24 Jun 2019 00:54:28 +0300
Subject: [PATCH 388/869] fix(extract): support unpacking deb file from
 different directory

---
 plugins/extract/extract.plugin.zsh | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/plugins/extract/extract.plugin.zsh b/plugins/extract/extract.plugin.zsh
index 601272cac..e63b9494f 100644
--- a/plugins/extract/extract.plugin.zsh
+++ b/plugins/extract/extract.plugin.zsh
@@ -60,13 +60,13 @@ extract() {
 			(*.rpm) mkdir "$extract_dir" && cd "$extract_dir" && rpm2cpio "../$1" | cpio --quiet -id && cd .. ;;
 			(*.7z) 7za x "$1" ;;
 			(*.deb)
-				mkdir -p "$extract_dir/control"
-				mkdir -p "$extract_dir/data"
-				cd "$extract_dir"; ar vx "../${1}" > /dev/null
-				cd control; tar xzvf ../control.tar.gz
-				cd ../data; extract ../data.tar.*
-				cd ..; rm *.tar.* debian-binary
-				cd ..
+				local pwd="$PWD" file="${1:A}"
+				mkdir -p "$extract_dir/control" "$extract_dir/data"
+				builtin cd -q "$extract_dir"; ar vx "$file" > /dev/null
+				builtin cd -q control; extract ../control.tar.*
+				builtin cd -q ../data; extract ../data.tar.*
+				builtin cd -q ..; command rm *.tar.* debian-binary
+				builtin cd -q "$pwd"
 			;;
 			(*.zst) unzstd "$1" ;;
 			(*.cab) cabextract -d "$extract_dir" "$1" ;;

From 0b506fea0c9aeb450db6fdaba572041fd900c05b Mon Sep 17 00:00:00 2001
From: Xeonacid <h.dwwwwww@gmail.com>
Date: Wed, 9 Jun 2021 19:29:04 +0800
Subject: [PATCH 389/869] feat(extract): add cpio support

---
 plugins/extract/README.md          | 1 +
 plugins/extract/_extract           | 2 +-
 plugins/extract/extract.plugin.zsh | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/plugins/extract/README.md b/plugins/extract/README.md
index 1dd8e19c0..44f0b05a1 100644
--- a/plugins/extract/README.md
+++ b/plugins/extract/README.md
@@ -22,6 +22,7 @@ plugins=(... extract)
 | `aar`             | Android library file                 |
 | `bz2`             | Bzip2 file                           |
 | `cab`             | Microsoft cabinet archive            |
+| `cpio`            | Cpio archive                         |
 | `deb`             | Debian package                       |
 | `ear`             | Enterprise Application aRchive       |
 | `gz`              | Gzip file                            |
diff --git a/plugins/extract/_extract b/plugins/extract/_extract
index 31a7facbe..27b099c9e 100644
--- a/plugins/extract/_extract
+++ b/plugins/extract/_extract
@@ -3,5 +3,5 @@
 
 _arguments \
   '(-r --remove)'{-r,--remove}'[Remove archive.]' \
-  "*::archive file:_files -g '(#i)*.(7z|Z|apk|aar|bz2|cab|deb|ear|gz|ipa|ipsw|jar|lrz|lz4|lzma|rar|rpm|sublime-package|tar|tar.bz2|tar.gz|tar.lrz|tar.lz|tar.lz4|tar.xz|tar.zma|tar.zst|tbz|tbz2|tgz|tlz|txz|tzst|war|whl|xpi|xz|zip|zst)(-.)'" \
+  "*::archive file:_files -g '(#i)*.(7z|Z|apk|aar|bz2|cab|cpio|deb|ear|gz|ipa|ipsw|jar|lrz|lz4|lzma|rar|rpm|sublime-package|tar|tar.bz2|tar.gz|tar.lrz|tar.lz|tar.lz4|tar.xz|tar.zma|tar.zst|tbz|tbz2|tgz|tlz|txz|tzst|war|whl|xpi|xz|zip|zst)(-.)'" \
     && return 0
diff --git a/plugins/extract/extract.plugin.zsh b/plugins/extract/extract.plugin.zsh
index e63b9494f..ac181fa78 100644
--- a/plugins/extract/extract.plugin.zsh
+++ b/plugins/extract/extract.plugin.zsh
@@ -70,6 +70,7 @@ extract() {
 			;;
 			(*.zst) unzstd "$1" ;;
 			(*.cab) cabextract -d "$extract_dir" "$1" ;;
+			(*.cpio) cpio -idmvF "$1" ;;
 			(*)
 				echo "extract: '$1' cannot be extracted" >&2
 				success=1

From a2f1ef69b570b43bbdd0fa29bddb860293b7278b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Sat, 14 Aug 2021 21:57:56 +0200
Subject: [PATCH 390/869] fix(extract): correctly extract rpm files on other
 directories

---
 plugins/extract/extract.plugin.zsh | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/plugins/extract/extract.plugin.zsh b/plugins/extract/extract.plugin.zsh
index ac181fa78..12a1ec948 100644
--- a/plugins/extract/extract.plugin.zsh
+++ b/plugins/extract/extract.plugin.zsh
@@ -20,6 +20,7 @@ extract() {
 		shift
 	fi
 
+	local pwd="$PWD"
 	while (( $# > 0 )); do
 		if [[ ! -f "$1" ]]; then
 			echo "extract: '$1' is not a valid file" >&2
@@ -29,6 +30,7 @@ extract() {
 
 		success=0
 		extract_dir="${1:t:r}"
+		local full_path="${1:A}"
 		case "${1:l}" in
 			(*.tar.gz|*.tgz) (( $+commands[pigz] )) && { pigz -dc "$1" | tar xv } || tar zxvf "$1" ;;
 			(*.tar.bz2|*.tbz|*.tbz2) tar xvjf "$1" ;;
@@ -57,17 +59,16 @@ extract() {
 			(*.z) uncompress "$1" ;;
 			(*.zip|*.war|*.jar|*.ear|*.sublime-package|*.ipa|*.ipsw|*.xpi|*.apk|*.aar|*.whl) unzip "$1" -d "$extract_dir" ;;
 			(*.rar) unrar x -ad "$1" ;;
-			(*.rpm) mkdir "$extract_dir" && cd "$extract_dir" && rpm2cpio "../$1" | cpio --quiet -id && cd .. ;;
+			(*.rpm)
+				command mkdir -p "$extract_dir" && builtin cd -q "$extract_dir" \
+				&& rpm2cpio "$full_path" | cpio --quiet -id ;;
 			(*.7z) 7za x "$1" ;;
 			(*.deb)
-				local pwd="$PWD" file="${1:A}"
-				mkdir -p "$extract_dir/control" "$extract_dir/data"
-				builtin cd -q "$extract_dir"; ar vx "$file" > /dev/null
+				command mkdir -p "$extract_dir/control" "$extract_dir/data"
+				builtin cd -q "$extract_dir"; ar vx "$full_path" > /dev/null
 				builtin cd -q control; extract ../control.tar.*
 				builtin cd -q ../data; extract ../data.tar.*
-				builtin cd -q ..; command rm *.tar.* debian-binary
-				builtin cd -q "$pwd"
-			;;
+				builtin cd -q ..; command rm *.tar.* debian-binary ;;
 			(*.zst) unzstd "$1" ;;
 			(*.cab) cabextract -d "$extract_dir" "$1" ;;
 			(*.cpio) cpio -idmvF "$1" ;;
@@ -77,8 +78,11 @@ extract() {
 			;;
 		esac
 
-		(( success = $success > 0 ? $success : $? ))
-		(( $success == 0 )) && (( $remove_archive == 0 )) && rm "$1"
+		(( success = success > 0 ? success : $? ))
+		(( success == 0 && remove_archive == 0 )) && rm "$full_path"
 		shift
+
+		# Go back to original working directory in case we ran cd previously
+		builtin cd -q "$pwd"
 	done
 }

From 10a00085d027a969c7ef27e52085ca1fa7f5668c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Sat, 14 Aug 2021 22:05:48 +0200
Subject: [PATCH 391/869] fix(extract): don't push entries to dirstack when
 extracting rpm and deb files

---
 plugins/extract/extract.plugin.zsh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/plugins/extract/extract.plugin.zsh b/plugins/extract/extract.plugin.zsh
index 12a1ec948..a257f6bc3 100644
--- a/plugins/extract/extract.plugin.zsh
+++ b/plugins/extract/extract.plugin.zsh
@@ -1,6 +1,8 @@
 alias x=extract
 
 extract() {
+	setopt localoptions noautopushd
+
 	local remove_archive
 	local success
 	local extract_dir

From 0b32e4b25fa7f3215964281a8af4e3ff2bf4cd68 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Sat, 14 Aug 2021 22:03:41 +0200
Subject: [PATCH 392/869] style(extract): adopt main code style guide and
 refactor variables

---
 plugins/extract/extract.plugin.zsh | 153 ++++++++++++++---------------
 1 file changed, 74 insertions(+), 79 deletions(-)

diff --git a/plugins/extract/extract.plugin.zsh b/plugins/extract/extract.plugin.zsh
index a257f6bc3..1112dd52f 100644
--- a/plugins/extract/extract.plugin.zsh
+++ b/plugins/extract/extract.plugin.zsh
@@ -1,90 +1,85 @@
 alias x=extract
 
 extract() {
-	setopt localoptions noautopushd
+  setopt localoptions noautopushd
 
-	local remove_archive
-	local success
-	local extract_dir
+  if (( $# == 0 )); then
+    cat >&2 <<'EOF'
+Usage: extract [-option] [file ...]
 
-	if (( $# == 0 )); then
-		cat <<-'EOF' >&2
-			Usage: extract [-option] [file ...]
+Options:
+    -r, --remove    Remove archive after unpacking.
+EOF
+  fi
 
-			Options:
-			    -r, --remove    Remove archive after unpacking.
-		EOF
-	fi
+  local remove_archive=1
+  if [[ "$1" == "-r" ]] || [[ "$1" == "--remove" ]]; then
+    remove_archive=0
+    shift
+  fi
 
-	remove_archive=1
-	if [[ "$1" == "-r" ]] || [[ "$1" == "--remove" ]]; then
-		remove_archive=0
-		shift
-	fi
+  local pwd="$PWD"
+  while (( $# > 0 )); do
+    if [[ ! -f "$1" ]]; then
+      echo "extract: '$1' is not a valid file" >&2
+      shift
+      continue
+    fi
 
-	local pwd="$PWD"
-	while (( $# > 0 )); do
-		if [[ ! -f "$1" ]]; then
-			echo "extract: '$1' is not a valid file" >&2
-			shift
-			continue
-		fi
+    local success=0
+    local extract_dir="${1:t:r}"
+    local file="$1" full_path="${1:A}"
+    case "${file:l}" in
+      (*.tar.gz|*.tgz) (( $+commands[pigz] )) && { pigz -dc "$file" | tar xv } || tar zxvf "$file" ;;
+      (*.tar.bz2|*.tbz|*.tbz2) tar xvjf "$file" ;;
+      (*.tar.xz|*.txz)
+        tar --xz --help &> /dev/null \
+        && tar --xz -xvf "$file" \
+        || xzcat "$file" | tar xvf - ;;
+      (*.tar.zma|*.tlz)
+        tar --lzma --help &> /dev/null \
+        && tar --lzma -xvf "$file" \
+        || lzcat "$file" | tar xvf - ;;
+      (*.tar.zst|*.tzst)
+        tar --zstd --help &> /dev/null \
+        && tar --zstd -xvf "$file" \
+        || zstdcat "$file" | tar xvf - ;;
+      (*.tar) tar xvf "$file" ;;
+      (*.tar.lz) (( $+commands[lzip] )) && tar xvf "$file" ;;
+      (*.tar.lz4) lz4 -c -d "$file" | tar xvf - ;;
+      (*.tar.lrz) (( $+commands[lrzuntar] )) && lrzuntar "$file" ;;
+      (*.gz) (( $+commands[pigz] )) && pigz -dk "$file" || gunzip -k "$file" ;;
+      (*.bz2) bunzip2 "$file" ;;
+      (*.xz) unxz "$file" ;;
+      (*.lrz) (( $+commands[lrunzip] )) && lrunzip "$file" ;;
+      (*.lz4) lz4 -d "$file" ;;
+      (*.lzma) unlzma "$file" ;;
+      (*.z) uncompress "$file" ;;
+      (*.zip|*.war|*.jar|*.ear|*.sublime-package|*.ipa|*.ipsw|*.xpi|*.apk|*.aar|*.whl) unzip "$file" -d "$extract_dir" ;;
+      (*.rar) unrar x -ad "$file" ;;
+      (*.rpm)
+        command mkdir -p "$extract_dir" && builtin cd -q "$extract_dir" \
+        && rpm2cpio "$full_path" | cpio --quiet -id ;;
+      (*.7z) 7za x "$file" ;;
+      (*.deb)
+        command mkdir -p "$extract_dir/control" "$extract_dir/data"
+        builtin cd -q "$extract_dir"; ar vx "$full_path" > /dev/null
+        builtin cd -q control; extract ../control.tar.*
+        builtin cd -q ../data; extract ../data.tar.*
+        builtin cd -q ..; command rm *.tar.* debian-binary ;;
+      (*.zst) unzstd "$file" ;;
+      (*.cab) cabextract -d "$extract_dir" "$file" ;;
+      (*.cpio) cpio -idmvF "$file" ;;
+      (*)
+        echo "extract: '$file' cannot be extracted" >&2
+        success=1 ;;
+    esac
 
-		success=0
-		extract_dir="${1:t:r}"
-		local full_path="${1:A}"
-		case "${1:l}" in
-			(*.tar.gz|*.tgz) (( $+commands[pigz] )) && { pigz -dc "$1" | tar xv } || tar zxvf "$1" ;;
-			(*.tar.bz2|*.tbz|*.tbz2) tar xvjf "$1" ;;
-			(*.tar.xz|*.txz)
-				tar --xz --help &> /dev/null \
-				&& tar --xz -xvf "$1" \
-				|| xzcat "$1" | tar xvf - ;;
-			(*.tar.zma|*.tlz)
-				tar --lzma --help &> /dev/null \
-				&& tar --lzma -xvf "$1" \
-				|| lzcat "$1" | tar xvf - ;;
-			(*.tar.zst|*.tzst)
-				tar --zstd --help &> /dev/null \
-				&& tar --zstd -xvf "$1" \
-				|| zstdcat "$1" | tar xvf - ;;
-			(*.tar) tar xvf "$1" ;;
-			(*.tar.lz) (( $+commands[lzip] )) && tar xvf "$1" ;;
-			(*.tar.lz4) lz4 -c -d "$1" | tar xvf - ;;
-			(*.tar.lrz) (( $+commands[lrzuntar] )) && lrzuntar "$1" ;;
-			(*.gz) (( $+commands[pigz] )) && pigz -dk "$1" || gunzip -k "$1" ;;
-			(*.bz2) bunzip2 "$1" ;;
-			(*.xz) unxz "$1" ;;
-			(*.lrz) (( $+commands[lrunzip] )) && lrunzip "$1" ;;
-			(*.lz4) lz4 -d "$1" ;;
-			(*.lzma) unlzma "$1" ;;
-			(*.z) uncompress "$1" ;;
-			(*.zip|*.war|*.jar|*.ear|*.sublime-package|*.ipa|*.ipsw|*.xpi|*.apk|*.aar|*.whl) unzip "$1" -d "$extract_dir" ;;
-			(*.rar) unrar x -ad "$1" ;;
-			(*.rpm)
-				command mkdir -p "$extract_dir" && builtin cd -q "$extract_dir" \
-				&& rpm2cpio "$full_path" | cpio --quiet -id ;;
-			(*.7z) 7za x "$1" ;;
-			(*.deb)
-				command mkdir -p "$extract_dir/control" "$extract_dir/data"
-				builtin cd -q "$extract_dir"; ar vx "$full_path" > /dev/null
-				builtin cd -q control; extract ../control.tar.*
-				builtin cd -q ../data; extract ../data.tar.*
-				builtin cd -q ..; command rm *.tar.* debian-binary ;;
-			(*.zst) unzstd "$1" ;;
-			(*.cab) cabextract -d "$extract_dir" "$1" ;;
-			(*.cpio) cpio -idmvF "$1" ;;
-			(*)
-				echo "extract: '$1' cannot be extracted" >&2
-				success=1
-			;;
-		esac
+    (( success = success > 0 ? success : $? ))
+    (( success == 0 && remove_archive == 0 )) && rm "$full_path"
+    shift
 
-		(( success = success > 0 ? success : $? ))
-		(( success == 0 && remove_archive == 0 )) && rm "$full_path"
-		shift
-
-		# Go back to original working directory in case we ran cd previously
-		builtin cd -q "$pwd"
-	done
+    # Go back to original working directory in case we ran cd previously
+    builtin cd -q "$pwd"
+  done
 }

From 7c5ab01a5f7b07481182108117db070b8cabb2e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Sat, 14 Aug 2021 22:41:48 +0200
Subject: [PATCH 393/869] fix(changelog): also display commits from merged
 branches

---
 tools/changelog.sh | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/tools/changelog.sh b/tools/changelog.sh
index 56ea42cb1..6913ae49a 100755
--- a/tools/changelog.sh
+++ b/tools/changelog.sh
@@ -391,9 +391,7 @@ function main {
 
   # Get commit list from $until commit until $since commit, or until root
   # commit if $since is unset, in short hash form.
-  # --first-parent is used when dealing with merges: it only prints the
-  # merge commit, not the commits of the merged branch.
-  command git rev-list --first-parent --abbrev-commit --abbrev=7 ${since:+$since..}$until | while read hash; do
+  command git rev-list --abbrev-commit --abbrev=7 ${since:+$since..}$until | while read hash; do
     # Truncate list on versions with a lot of commits
     if [[ -z "$since" ]] && (( ++read_commits > 35 )); then
       truncate=1

From 11e22ed0b5c1aebd6e990ea7a885bdf03ab6555a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Sat, 14 Aug 2021 22:54:07 +0200
Subject: [PATCH 394/869] docs(dirhistory): document keyboard shortcut conflict
 with Windows Terminal

Related: https://github.com/ohmyzsh/ohmyzsh/issues/8505#issuecomment-886241162
---
 plugins/dirhistory/README.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/plugins/dirhistory/README.md b/plugins/dirhistory/README.md
index 223650727..602fc8284 100644
--- a/plugins/dirhistory/README.md
+++ b/plugins/dirhistory/README.md
@@ -17,6 +17,9 @@ plugins=(... dirhistory)
 | <kbd>alt</kbd> + <kbd>up</kbd>    | Move into the parent directory                            |
 | <kbd>alt</kbd> + <kbd>down</kbd>  | Move into the first child directory by alphabetical order |
 
+NOTE: some terminals might override the ALT+Arrows key bindings (Windows Terminal, for example).
+If these don't work check your terminal settings and change them to a different keyboard shortcut.
+
 ## Usage
 
 This plugin allows you to navigate the history of previous current-working-directories using ALT-LEFT and ALT-RIGHT. ALT-LEFT moves back to directories that the user has changed to in the past, and ALT-RIGHT undoes ALT-LEFT. MAC users may alternately use OPT-LEFT and OPT-RIGHT.

From 33847956d9969866dd8b502ffc88af58d2b427fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Tue, 17 Aug 2021 09:37:01 +0200
Subject: [PATCH 395/869] fix(colemak): remove `lesskey` usage in less v582 and
 newer (#10102)

---
 plugins/colemak/.gitignore         |  1 +
 plugins/colemak/colemak.plugin.zsh | 13 ++++++++++++-
 2 files changed, 13 insertions(+), 1 deletion(-)
 create mode 100644 plugins/colemak/.gitignore

diff --git a/plugins/colemak/.gitignore b/plugins/colemak/.gitignore
new file mode 100644
index 000000000..8241f5ed6
--- /dev/null
+++ b/plugins/colemak/.gitignore
@@ -0,0 +1 @@
+.less
diff --git a/plugins/colemak/colemak.plugin.zsh b/plugins/colemak/colemak.plugin.zsh
index cb7cc5068..8d3393c44 100644
--- a/plugins/colemak/colemak.plugin.zsh
+++ b/plugins/colemak/colemak.plugin.zsh
@@ -19,4 +19,15 @@ bindkey -a 'N' vi-join
 bindkey -a 'j' vi-forward-word-end
 bindkey -a 'J' vi-forward-blank-word-end
 
-lesskey $ZSH/plugins/colemak/colemak-less
+# New less versions will read this file directly
+export LESSKEYIN="${0:h:A}/colemak-less"
+
+# Only run lesskey if less version is older than v582
+less_ver=$(less --version | awk '{print $2;exit}')
+autoload -Uz is-at-least
+if ! is-at-least 582 $less_ver; then
+  # Old less versions will read this transformed file
+  export LESSKEY="${0:h:A}/.less"
+  lesskey -o "$LESSKEY" "$LESSKEYIN" 2>/dev/null
+fi
+unset less_ver

From 4455c13e063cf81ba427f98e1dce2024ecd50762 Mon Sep 17 00:00:00 2001
From: pollyduan <pollyduan@163.com>
Date: Tue, 17 Aug 2021 18:10:54 +0800
Subject: [PATCH 396/869] feat(cli): add subcommands for plugin `enable` and
 `disable` (#9869)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Marc Cornellà <hello@mcornella.com>
---
 lib/cli.zsh | 218 +++++++++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 207 insertions(+), 11 deletions(-)

diff --git a/lib/cli.zsh b/lib/cli.zsh
index 7e3e37be8..1289df730 100644
--- a/lib/cli.zsh
+++ b/lib/cli.zsh
@@ -37,7 +37,13 @@ function _omz {
       changelog) local -a refs
         refs=("${(@f)$(command git for-each-ref --format="%(refname:short):%(subject)" refs/heads refs/tags)}")
         _describe 'command' refs ;;
-      plugin) subcmds=('info:Get plugin information' 'list:List plugins' 'load:Load plugin(s)')
+      plugin) subcmds=(
+        'disable:Disable plugin(s)'
+        'enable:Enable plugin(s)'
+        'info:Get plugin information'
+        'list:List plugins'
+        'load:Load plugin(s)'
+      )
         _describe 'command' subcmds ;;
       pr) subcmds=('test:Test a Pull Request' 'clean:Delete all Pull Request branches')
         _describe 'command' subcmds ;;
@@ -45,8 +51,21 @@ function _omz {
         _describe 'command' subcmds ;;
     esac
   elif (( CURRENT == 4 )); then
-    case "$words[2]::$words[3]" in
-      plugin::(info|load))
+    case "${words[2]}::${words[3]}" in
+      plugin::(disable|enable|load))
+        local -aU valid_plugins
+
+        if [[ "${words[3]}" = disable ]]; then
+          # if command is "disable", only offer already enabled plugins
+          valid_plugins=($plugins)
+        else
+          valid_plugins=("$ZSH"/plugins/*/{_*,*.plugin.zsh}(.N:h:t) "$ZSH_CUSTOM"/plugins/*/{_*,*.plugin.zsh}(.N:h:t))
+          # if command is "enable", remove already enabled plugins
+          [[ "${words[3]}" = enable ]] && valid_plugins=(${valid_plugins:|plugins})
+        fi
+
+        _describe 'plugin' valid_plugins ;;
+      plugin::info)
         local -aU plugins=("$ZSH"/plugins/*/{_*,*.plugin.zsh}(.N:h:t) "$ZSH_CUSTOM"/plugins/*/{_*,*.plugin.zsh}(.N:h:t))
         _describe 'plugin' plugins ;;
       theme::use)
@@ -54,18 +73,27 @@ function _omz {
         _describe 'theme' themes ;;
     esac
   elif (( CURRENT > 4 )); then
-    case "$words[2]::$words[3]" in
-      plugin::load)
-        local -aU plugins=("$ZSH"/plugins/*/{_*,*.plugin.zsh}(.N:h:t) "$ZSH_CUSTOM"/plugins/*/{_*,*.plugin.zsh}(.N:h:t))
+    case "${words[2]}::${words[3]}" in
+      plugin::(enable|disable|load))
+        local -aU valid_plugins
+
+        if [[ "${words[3]}" = disable ]]; then
+          # if command is "disable", only offer already enabled plugins
+          valid_plugins=($plugins)
+        else
+          valid_plugins=("$ZSH"/plugins/*/{_*,*.plugin.zsh}(.N:h:t) "$ZSH_CUSTOM"/plugins/*/{_*,*.plugin.zsh}(.N:h:t))
+          # if command is "enable", remove already enabled plugins
+          [[ "${words[3]}" = enable ]] && valid_plugins=(${valid_plugins:|plugins})
+        fi
 
         # Remove plugins already passed as arguments
         # NOTE: $(( CURRENT - 1 )) is the last plugin argument completely passed, i.e. that which
         # has a space after them. This is to avoid removing plugins partially passed, which makes
         # the completion not add a space after the completed plugin.
         local -a args=(${words[4,$(( CURRENT - 1))]})
-        plugins=(${plugins:|args})
+        valid_plugins=(${valid_plugins:|args})
 
-        _describe 'plugin' plugins ;;
+        _describe 'plugin' valid_plugins ;;
     esac
   fi
 
@@ -161,9 +189,11 @@ Usage: omz plugin <command> [options]
 
 Available commands:
 
-  info <plugin>   Get information of a plugin
-  list            List all available Oh My Zsh plugins
-  load <plugin>   Load plugin(s)
+  disable <plugin> Disable plugin(s)
+  enable <plugin>  Enable plugin(s)
+  info <plugin>    Get information of a plugin
+  list             List all available Oh My Zsh plugins
+  load <plugin>    Load plugin(s)
 
 EOF
     return 1
@@ -175,6 +205,172 @@ EOF
   _omz::plugin::$command "$@"
 }
 
+function _omz::plugin::disable {
+  if [[ -z "$1" ]]; then
+    echo >&2 "Usage: omz plugin disable <plugin> [...]"
+    return 1
+  fi
+
+  # Check that plugin is in $plugins
+  local -a dis_plugins=()
+  for plugin in "$@"; do
+    if [[ ${plugins[(Ie)$plugin]} -eq 0 ]]; then
+      _omz::log warn "plugin '$plugin' is not enabled."
+      continue
+    fi
+    dis_plugins+=("$plugin")
+  done
+
+  # Exit if there are no enabled plugins to disable
+  if [[ ${#dis_plugins} -eq 0 ]]; then
+    return 1
+  fi
+
+  # Disable plugins awk script
+  local awk_script="
+# if plugins=() is in oneline form, substitute disabled plugins and go to next line
+/^\s*plugins=\([^#]+\).*\$/ {
+  sub(/\s+(${(j:|:)dis_plugins})/, \"\") # with spaces before
+  sub(/(${(j:|:)dis_plugins})\s+/, \"\") # with spaces after
+  sub(/\((${(j:|:)dis_plugins})\)/, \"\") # without spaces (only plugin)
+  print \$0
+  next
+}
+
+# if plugins=() is in multiline form, enable multi flag and disable plugins if they're there
+/^\s*plugins=\(/ {
+  multi=1
+  sub(/\s+(${(j:|:)dis_plugins})/, \"\")
+  sub(/(${(j:|:)dis_plugins})\s+/, \"\")
+  sub(/\((${(j:|:)dis_plugins})\)/, \"\")
+  print \$0
+  next
+}
+
+# if multi flag is enabled and we find a valid closing parenthesis,
+# add new plugins and disable multi flag
+multi == 1 && /^[^#]*\)/ {
+  multi=0
+  sub(/\s+(${(j:|:)dis_plugins})/, \"\")
+  sub(/(${(j:|:)dis_plugins})\s+/, \"\")
+  sub(/\((${(j:|:)dis_plugins})\)/, \"\")
+  print \$0
+  next
+}
+
+multi == 1 {
+  sub(/\s+(${(j:|:)dis_plugins})/, \"\")
+  sub(/(${(j:|:)dis_plugins})\s+/, \"\")
+  sub(/\((${(j:|:)dis_plugins})\)/, \"\")
+  print \$0
+  next
+}
+
+{ print \$0 }
+"
+
+  awk "$awk_script" ~/.zshrc > ~/.zshrc.disabled \
+  && mv ~/.zshrc ~/.zshrc.swp \
+  && mv ~/.zshrc.disabled ~/.zshrc
+
+  # Exit if the new .zshrc file wasn't created correctly
+  [[ $? -eq 0 ]] || {
+    local ret=$?
+    _omz::log error "error disabling plugins."
+    return $ret
+  }
+
+  # Exit if the new .zshrc file has syntax errors
+  if ! zsh -n ~/.zshrc; then
+    _omz::log error "broken syntax in ~/.zshrc. Rolling back changes..."
+    mv ~/.zshrc ~/.zshrc.disabled
+    mv ~/.zshrc.swp ~/.zshrc
+    return 1
+  fi
+
+  # Restart the zsh session if there were no errors
+  _omz::log info ""
+
+  # Old zsh versions don't have ZSH_ARGZERO
+  local zsh="${ZSH_ARGZERO:-${functrace[-1]%:*}}"
+  # Check whether to run a login shell
+  [[ "$zsh" = -* || -o login ]] && exec -l "${zsh#-}" || exec "$zsh"
+}
+
+function _omz::plugin::enable {
+  if [[ -z "$1" ]]; then
+    echo >&2 "Usage: omz plugin enable <plugin> [...]"
+    return 1
+  fi
+
+  # Check that plugin is not in $plugins
+  local -a add_plugins=()
+  for plugin in "$@"; do
+    if [[ ${plugins[(Ie)$plugin]} -ne 0 ]]; then
+      _omz::log warn "plugin '$plugin' is already enabled."
+      continue
+    fi
+    add_plugins+=("$plugin")
+  done
+
+  # Exit if there are no plugins to enable
+  if [[ ${#add_plugins} -eq 0 ]]; then
+    return 1
+  fi
+
+  # Enable plugins awk script
+  local awk_script="
+# if plugins=() is in oneline form, substitute ) with new plugins and go to the next line
+/^\s*plugins=\([^#]+\).*\$/ {
+  sub(/\)/, \" $add_plugins&\")
+  print \$0
+  next
+}
+
+# if plugins=() is in multiline form, enable multi flag
+/^\s*plugins=\(/ {
+  multi=1
+}
+
+# if multi flag is enabled and we find a valid closing parenthesis,
+# add new plugins and disable multi flag
+multi == 1 && /^[^#]*\)/ {
+  multi=0
+  sub(/\)/, \" $add_plugins&\")
+  print \$0
+  next
+}
+
+{ print \$0 }
+"
+
+  awk "$awk_script" ~/.zshrc > ~/.zshrc.disabled \
+  && mv ~/.zshrc ~/.zshrc.swp \
+  && mv ~/.zshrc.disabled ~/.zshrc
+
+  # Exit if the new .zshrc file wasn't created correctly
+  [[ $? -eq 0 ]] || {
+    local ret=$?
+    _omz::log error "error disabling plugins."
+    return $ret
+  }
+
+  # Exit if the new .zshrc file has syntax errors
+  if ! zsh -n ~/.zshrc; then
+    _omz::log error "broken syntax in ~/.zshrc. Rolling back changes..."
+    mv ~/.zshrc ~/.zshrc.disabled
+    mv ~/.zshrc.swp ~/.zshrc
+    return 1
+  fi
+
+  # Restart the zsh session if there were no errors
+
+  # Old zsh versions don't have ZSH_ARGZERO
+  local zsh="${ZSH_ARGZERO:-${functrace[-1]%:*}}"
+  # Check whether to run a login shell
+  [[ "$zsh" = -* || -o login ]] && exec -l "${zsh#-}" || exec "$zsh"
+}
+
 function _omz::plugin::info {
   if [[ -z "$1" ]]; then
     echo >&2 "Usage: omz plugin info <plugin>"

From 708bbe12c5817e380c83d0c49bf684b0fc5d0024 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Tue, 17 Aug 2021 12:31:37 +0200
Subject: [PATCH 397/869] fix(cli): fix multiple errors in `plugin
 disable/enable`

---
 lib/cli.zsh | 43 ++++++++++++++++++++++---------------------
 1 file changed, 22 insertions(+), 21 deletions(-)

diff --git a/lib/cli.zsh b/lib/cli.zsh
index 1289df730..e490149e0 100644
--- a/lib/cli.zsh
+++ b/lib/cli.zsh
@@ -230,9 +230,9 @@ function _omz::plugin::disable {
   local awk_script="
 # if plugins=() is in oneline form, substitute disabled plugins and go to next line
 /^\s*plugins=\([^#]+\).*\$/ {
-  sub(/\s+(${(j:|:)dis_plugins})/, \"\") # with spaces before
-  sub(/(${(j:|:)dis_plugins})\s+/, \"\") # with spaces after
-  sub(/\((${(j:|:)dis_plugins})\)/, \"\") # without spaces (only plugin)
+  gsub(/\s+(${(j:|:)dis_plugins})/, \"\") # with spaces before
+  gsub(/(${(j:|:)dis_plugins})\s+/, \"\") # with spaces after
+  gsub(/\((${(j:|:)dis_plugins})\)/, \"\") # without spaces (only plugin)
   print \$0
   next
 }
@@ -240,9 +240,9 @@ function _omz::plugin::disable {
 # if plugins=() is in multiline form, enable multi flag and disable plugins if they're there
 /^\s*plugins=\(/ {
   multi=1
-  sub(/\s+(${(j:|:)dis_plugins})/, \"\")
-  sub(/(${(j:|:)dis_plugins})\s+/, \"\")
-  sub(/\((${(j:|:)dis_plugins})\)/, \"\")
+  gsub(/\s+(${(j:|:)dis_plugins})/, \"\")
+  gsub(/(${(j:|:)dis_plugins})\s+/, \"\")
+  gsub(/\((${(j:|:)dis_plugins})\)/, \"\")
   print \$0
   next
 }
@@ -251,17 +251,17 @@ function _omz::plugin::disable {
 # add new plugins and disable multi flag
 multi == 1 && /^[^#]*\)/ {
   multi=0
-  sub(/\s+(${(j:|:)dis_plugins})/, \"\")
-  sub(/(${(j:|:)dis_plugins})\s+/, \"\")
-  sub(/\((${(j:|:)dis_plugins})\)/, \"\")
+  gsub(/\s+(${(j:|:)dis_plugins})/, \"\")
+  gsub(/(${(j:|:)dis_plugins})\s+/, \"\")
+  gsub(/\((${(j:|:)dis_plugins})\)/, \"\")
   print \$0
   next
 }
 
 multi == 1 {
-  sub(/\s+(${(j:|:)dis_plugins})/, \"\")
-  sub(/(${(j:|:)dis_plugins})\s+/, \"\")
-  sub(/\((${(j:|:)dis_plugins})\)/, \"\")
+  gsub(/\s+(${(j:|:)dis_plugins})/, \"\")
+  gsub(/(${(j:|:)dis_plugins})\s+/, \"\")
+  gsub(/\((${(j:|:)dis_plugins})\)/, \"\")
   print \$0
   next
 }
@@ -283,13 +283,13 @@ multi == 1 {
   # Exit if the new .zshrc file has syntax errors
   if ! zsh -n ~/.zshrc; then
     _omz::log error "broken syntax in ~/.zshrc. Rolling back changes..."
-    mv ~/.zshrc ~/.zshrc.disabled
-    mv ~/.zshrc.swp ~/.zshrc
+    command mv -f ~/.zshrc ~/.zshrc.disabled
+    command mv -f ~/.zshrc.swp ~/.zshrc
     return 1
   fi
 
   # Restart the zsh session if there were no errors
-  _omz::log info ""
+  _omz::log info "plugins disabled: ${(j:, :)dis_plugins}."
 
   # Old zsh versions don't have ZSH_ARGZERO
   local zsh="${ZSH_ARGZERO:-${functrace[-1]%:*}}"
@@ -344,26 +344,27 @@ multi == 1 && /^[^#]*\)/ {
 { print \$0 }
 "
 
-  awk "$awk_script" ~/.zshrc > ~/.zshrc.disabled \
-  && mv ~/.zshrc ~/.zshrc.swp \
-  && mv ~/.zshrc.disabled ~/.zshrc
+  awk "$awk_script" ~/.zshrc > ~/.zshrc.enabled \
+  && command mv -f ~/.zshrc ~/.zshrc.swp \
+  && command mv -f ~/.zshrc.enabled ~/.zshrc
 
   # Exit if the new .zshrc file wasn't created correctly
   [[ $? -eq 0 ]] || {
     local ret=$?
-    _omz::log error "error disabling plugins."
+    _omz::log error "error enabling plugins."
     return $ret
   }
 
   # Exit if the new .zshrc file has syntax errors
   if ! zsh -n ~/.zshrc; then
     _omz::log error "broken syntax in ~/.zshrc. Rolling back changes..."
-    mv ~/.zshrc ~/.zshrc.disabled
-    mv ~/.zshrc.swp ~/.zshrc
+    command mv -f ~/.zshrc ~/.zshrc.enabled
+    command mv -f ~/.zshrc.swp ~/.zshrc
     return 1
   fi
 
   # Restart the zsh session if there were no errors
+  _omz::log info "plugins enabled: ${(j:, :)add_plugins}."
 
   # Old zsh versions don't have ZSH_ARGZERO
   local zsh="${ZSH_ARGZERO:-${functrace[-1]%:*}}"

From bf888680ea5b7161cf1d06011df33bfbeda8b255 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Tue, 17 Aug 2021 12:38:48 +0200
Subject: [PATCH 398/869] refactor(cli): extract substitution awk script in
 `plugin disable`

---
 lib/cli.zsh | 29 +++++++++++++----------------
 1 file changed, 13 insertions(+), 16 deletions(-)

diff --git a/lib/cli.zsh b/lib/cli.zsh
index e490149e0..a10b0e147 100644
--- a/lib/cli.zsh
+++ b/lib/cli.zsh
@@ -226,13 +226,17 @@ function _omz::plugin::disable {
     return 1
   fi
 
+  # Remove plugins substitution awk script
+  local awk_subst_plugins="\
+  gsub(/\s+(${(j:|:)dis_plugins})/, \"\") # with spaces before
+  gsub(/(${(j:|:)dis_plugins})\s+/, \"\") # with spaces after
+  gsub(/\((${(j:|:)dis_plugins})\)/, \"\") # without spaces (only plugin)
+"
   # Disable plugins awk script
   local awk_script="
 # if plugins=() is in oneline form, substitute disabled plugins and go to next line
 /^\s*plugins=\([^#]+\).*\$/ {
-  gsub(/\s+(${(j:|:)dis_plugins})/, \"\") # with spaces before
-  gsub(/(${(j:|:)dis_plugins})\s+/, \"\") # with spaces after
-  gsub(/\((${(j:|:)dis_plugins})\)/, \"\") # without spaces (only plugin)
+  $awk_subst_plugins
   print \$0
   next
 }
@@ -240,29 +244,22 @@ function _omz::plugin::disable {
 # if plugins=() is in multiline form, enable multi flag and disable plugins if they're there
 /^\s*plugins=\(/ {
   multi=1
-  gsub(/\s+(${(j:|:)dis_plugins})/, \"\")
-  gsub(/(${(j:|:)dis_plugins})\s+/, \"\")
-  gsub(/\((${(j:|:)dis_plugins})\)/, \"\")
+  $awk_subst_plugins
   print \$0
   next
 }
 
-# if multi flag is enabled and we find a valid closing parenthesis,
-# add new plugins and disable multi flag
+# if multi flag is enabled and we find a valid closing parenthesis, remove plugins and disable multi flag
 multi == 1 && /^[^#]*\)/ {
   multi=0
-  gsub(/\s+(${(j:|:)dis_plugins})/, \"\")
-  gsub(/(${(j:|:)dis_plugins})\s+/, \"\")
-  gsub(/\((${(j:|:)dis_plugins})\)/, \"\")
+  $awk_subst_plugins
   print \$0
   next
 }
 
-multi == 1 {
-  gsub(/\s+(${(j:|:)dis_plugins})/, \"\")
-  gsub(/(${(j:|:)dis_plugins})\s+/, \"\")
-  gsub(/\((${(j:|:)dis_plugins})\)/, \"\")
-  print \$0
+multi == 1 && length(\$0) > 0 {
+  $awk_subst_plugins
+  if (length(\$0) > 0) print \$0
   next
 }
 

From bc7ce982ddcabdb7a6d446207ef4a0b78920da8b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Tue, 17 Aug 2021 12:53:09 +0200
Subject: [PATCH 399/869] style(cli): fill rows in column output in theme and
 plugin `list` commands

---
 lib/cli.zsh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/cli.zsh b/lib/cli.zsh
index a10b0e147..6bdac6cf1 100644
--- a/lib/cli.zsh
+++ b/lib/cli.zsh
@@ -405,14 +405,14 @@ function _omz::plugin::list {
 
   if (( ${#custom_plugins} )); then
     print -P "%U%BCustom plugins%b%u:"
-    print -l ${(q-)custom_plugins} | column
+    print -l ${(q-)custom_plugins} | column -x
   fi
 
   if (( ${#builtin_plugins} )); then
     (( ${#custom_plugins} )) && echo # add a line of separation
 
     print -P "%U%BBuilt-in plugins%b%u:"
-    print -l ${(q-)builtin_plugins} | column
+    print -l ${(q-)builtin_plugins} | column -x
   fi
 }
 
@@ -631,14 +631,14 @@ function _omz::theme::list {
 
   if (( ${#custom_themes} )); then
     print -P "%U%BCustom themes%b%u:"
-    print -l ${(q-)custom_themes} | column
+    print -l ${(q-)custom_themes} | column -x
   fi
 
   if (( ${#builtin_themes} )); then
     (( ${#custom_themes} )) && echo # add a line of separation
 
     print -P "%U%BBuilt-in themes%b%u:"
-    print -l ${(q-)builtin_themes} | column
+    print -l ${(q-)builtin_themes} | column -x
   fi
 }
 

From ad1837859bedc5283b69cfcabee6d2ba5e4ee71e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Tue, 17 Aug 2021 16:35:42 +0200
Subject: [PATCH 400/869] fix(updater): fix reset ANSI escape code for
 resetting underline format

---
 tools/upgrade.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/upgrade.sh b/tools/upgrade.sh
index 38fac3ce0..e9f8bc0f9 100755
--- a/tools/upgrade.sh
+++ b/tools/upgrade.sh
@@ -30,7 +30,7 @@ if [ -t 1 ]; then
   BOLD=$(printf '\033[1m')
   DIM=$(printf '\033[2m')
   UNDER=$(printf '\033[4m')
-  RESET=$(printf '\033[m')
+  RESET=$(printf '\033[0m')
 fi
 
 # Update upstream remote to ohmyzsh org

From 7a4f4ad91e1f937b36a54703984b958abe9da4b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Tue, 17 Aug 2021 17:38:31 +0200
Subject: [PATCH 401/869] fix(lib): fix clipboard copy on Termux

---
 lib/clipboard.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/clipboard.zsh b/lib/clipboard.zsh
index 122145f15..4e3ba0a45 100644
--- a/lib/clipboard.zsh
+++ b/lib/clipboard.zsh
@@ -76,7 +76,7 @@ function detect-clipboard() {
     function clipcopy() { win32yank -i < "${1:-/dev/stdin}"; }
     function clippaste() { win32yank -o; }
   elif [[ $OSTYPE == linux-android* ]] && (( $+commands[termux-clipboard-set] )); then
-    function clipcopy() { termux-clipboard-set "${1:-/dev/stdin}"; }
+    function clipcopy() { termux-clipboard-set < "${1:-/dev/stdin}"; }
     function clippaste() { termux-clipboard-get; }
   elif [ -n "${TMUX:-}" ] && (( ${+commands[tmux]} )); then
     function clipcopy() { tmux load-buffer "${1:--}"; }

From 10f3e0d4d498c68109bafd711d0bae7f6fa44071 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Wed, 18 Aug 2021 11:43:29 +0200
Subject: [PATCH 402/869] docs(pyenv): document necessity to logout after PATH
 settings

---
 plugins/pyenv/pyenv.plugin.zsh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/plugins/pyenv/pyenv.plugin.zsh b/plugins/pyenv/pyenv.plugin.zsh
index 813f64b42..275c12c80 100644
--- a/plugins/pyenv/pyenv.plugin.zsh
+++ b/plugins/pyenv/pyenv.plugin.zsh
@@ -30,7 +30,7 @@ if [[ $FOUND_PYENV -ne 1 ]]; then
 
   # If we found pyenv, load it but show a caveat about non-interactive shells
   if [[ $FOUND_PYENV -eq 1 ]]; then
-    cat <<EOF
+    cat >&2 <<EOF
 Found pyenv, but it is badly configured. pyenv might not work for
 non-interactive shells (for example, when run from a script).
 ${bold_color}
@@ -40,7 +40,8 @@ in your home directory:
 export PYENV_ROOT="${dir/#$HOME/\$HOME}"
 export PATH="\$PYENV_ROOT/bin:\$PATH"
 eval "\$(pyenv init --path)"
-${reset_color}
+
+You'll need to restart your user session for the changes to take effect.${reset_color}
 For more info go to https://github.com/pyenv/pyenv/#installation.
 EOF
 

From b85e1dd5d6b0ee527b313ce8c902bbc4e34e36e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Wed, 18 Aug 2021 11:47:50 +0200
Subject: [PATCH 403/869] fix(pyenv): fix for checking if pyenv-virtualenv is
 installed

Fixes #8467
---
 plugins/pyenv/pyenv.plugin.zsh | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/plugins/pyenv/pyenv.plugin.zsh b/plugins/pyenv/pyenv.plugin.zsh
index 275c12c80..bcf80a6a2 100644
--- a/plugins/pyenv/pyenv.plugin.zsh
+++ b/plugins/pyenv/pyenv.plugin.zsh
@@ -46,16 +46,20 @@ For more info go to https://github.com/pyenv/pyenv/#installation.
 EOF
 
     # Configuring in .zshrc only makes pyenv available for interactive shells
-    export PYENV_ROOT=$dir
+    export PYENV_ROOT="$dir"
     export PATH="$PYENV_ROOT/bin:$PATH"
     eval "$(pyenv init --path)"
   fi
 fi
 
 if [[ $FOUND_PYENV -eq 1 ]]; then
+  if [[ -z "$PYENV_ROOT" ]]; then
+    export PYENV_ROOT="$(pyenv root)"
+  fi
+
   eval "$(pyenv init - --no-rehash zsh)"
 
-  if (( ${+commands[pyenv-virtualenv-init]} )); then
+  if [[ -d "$PYENV_ROOT/plugins/pyenv-virtualenv" ]]; then
     eval "$(pyenv virtualenv-init - zsh)"
   fi
 

From 8dedf26294d4236ffe84260d30d686a705b0d2ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Wed, 18 Aug 2021 12:50:22 +0200
Subject: [PATCH 404/869] style(cli): print usage messages to stderr

---
 lib/cli.zsh | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/cli.zsh b/lib/cli.zsh
index 6bdac6cf1..b49643339 100644
--- a/lib/cli.zsh
+++ b/lib/cli.zsh
@@ -150,7 +150,7 @@ function _omz::log {
 ## User-facing commands
 
 function _omz::help {
-  cat <<EOF
+  cat >&2 <<EOF
 Usage: omz <command> [options]
 
 Available commands:
@@ -171,7 +171,7 @@ function _omz::changelog {
   if ! command git -C "$ZSH" show-ref --verify refs/heads/$version &>/dev/null && \
     ! command git -C "$ZSH" show-ref --verify refs/tags/$version &>/dev/null && \
     ! command git -C "$ZSH" rev-parse --verify "${version}^{commit}" &>/dev/null; then
-    cat <<EOF
+    cat >&2 <<EOF
 Usage: omz changelog [version]
 
 NOTE: <version> must be a valid branch, tag or commit.
@@ -184,7 +184,7 @@ EOF
 
 function _omz::plugin {
   (( $# > 0 && $+functions[_omz::plugin::$1] )) || {
-    cat <<EOF
+    cat >&2 <<EOF
 Usage: omz plugin <command> [options]
 
 Available commands:
@@ -468,7 +468,7 @@ function _omz::plugin::load {
 
 function _omz::pr {
   (( $# > 0 && $+functions[_omz::pr::$1] )) || {
-    cat <<EOF
+    cat >&2 <<EOF
 Usage: omz pr <command> [options]
 
 Available commands:
@@ -600,7 +600,7 @@ function _omz::pr::test {
 
 function _omz::theme {
   (( $# > 0 && $+functions[_omz::theme::$1] )) || {
-    cat <<EOF
+    cat >&2 <<EOF
 Usage: omz theme <command> [options]
 
 Available commands:

From cbb534267aca09fd123635fc39a7d00c0e21a5f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Wed, 18 Aug 2021 16:57:56 +0200
Subject: [PATCH 405/869] feat(cli): add `theme set` subcommand to change theme
 in .zshrc

Fixes #9087
---
 lib/cli.zsh | 98 +++++++++++++++++++++++++++++++++++++++++++++--------
 1 file changed, 83 insertions(+), 15 deletions(-)

diff --git a/lib/cli.zsh b/lib/cli.zsh
index b49643339..2189e24ca 100644
--- a/lib/cli.zsh
+++ b/lib/cli.zsh
@@ -45,9 +45,9 @@ function _omz {
         'load:Load plugin(s)'
       )
         _describe 'command' subcmds ;;
-      pr) subcmds=('test:Test a Pull Request' 'clean:Delete all Pull Request branches')
+      pr) subcmds=('clean:Delete all Pull Request branches' 'test:Test a Pull Request')
         _describe 'command' subcmds ;;
-      theme) subcmds=('use:Load a theme' 'list:List themes')
+      theme) subcmds=('list:List themes' 'set:Set a theme in your .zshrc file' 'use:Load a theme')
         _describe 'command' subcmds ;;
     esac
   elif (( CURRENT == 4 )); then
@@ -68,7 +68,7 @@ function _omz {
       plugin::info)
         local -aU plugins=("$ZSH"/plugins/*/{_*,*.plugin.zsh}(.N:h:t) "$ZSH_CUSTOM"/plugins/*/{_*,*.plugin.zsh}(.N:h:t))
         _describe 'plugin' plugins ;;
-      theme::use)
+      theme::(set|use))
         local -aU themes=("$ZSH"/themes/*.zsh-theme(.N:t:r) "$ZSH_CUSTOM"/**/*.zsh-theme(.N:r:gs:"$ZSH_CUSTOM"/themes/:::gs:"$ZSH_CUSTOM"/:::))
         _describe 'theme' themes ;;
     esac
@@ -266,9 +266,9 @@ multi == 1 && length(\$0) > 0 {
 { print \$0 }
 "
 
-  awk "$awk_script" ~/.zshrc > ~/.zshrc.disabled \
-  && mv ~/.zshrc ~/.zshrc.swp \
-  && mv ~/.zshrc.disabled ~/.zshrc
+  awk "$awk_script" ~/.zshrc > ~/.zshrc.new \
+  && command mv -f ~/.zshrc ~/.zshrc.bck \
+  && command mv -f ~/.zshrc.new ~/.zshrc
 
   # Exit if the new .zshrc file wasn't created correctly
   [[ $? -eq 0 ]] || {
@@ -280,8 +280,8 @@ multi == 1 && length(\$0) > 0 {
   # Exit if the new .zshrc file has syntax errors
   if ! zsh -n ~/.zshrc; then
     _omz::log error "broken syntax in ~/.zshrc. Rolling back changes..."
-    command mv -f ~/.zshrc ~/.zshrc.disabled
-    command mv -f ~/.zshrc.swp ~/.zshrc
+    command mv -f ~/.zshrc ~/.zshrc.new
+    command mv -f ~/.zshrc.bck ~/.zshrc
     return 1
   fi
 
@@ -341,9 +341,9 @@ multi == 1 && /^[^#]*\)/ {
 { print \$0 }
 "
 
-  awk "$awk_script" ~/.zshrc > ~/.zshrc.enabled \
-  && command mv -f ~/.zshrc ~/.zshrc.swp \
-  && command mv -f ~/.zshrc.enabled ~/.zshrc
+  awk "$awk_script" ~/.zshrc > ~/.zshrc.new \
+  && command mv -f ~/.zshrc ~/.zshrc.bck \
+  && command mv -f ~/.zshrc.new ~/.zshrc
 
   # Exit if the new .zshrc file wasn't created correctly
   [[ $? -eq 0 ]] || {
@@ -355,8 +355,8 @@ multi == 1 && /^[^#]*\)/ {
   # Exit if the new .zshrc file has syntax errors
   if ! zsh -n ~/.zshrc; then
     _omz::log error "broken syntax in ~/.zshrc. Rolling back changes..."
-    command mv -f ~/.zshrc ~/.zshrc.enabled
-    command mv -f ~/.zshrc.swp ~/.zshrc
+    command mv -f ~/.zshrc ~/.zshrc.new
+    command mv -f ~/.zshrc.bck ~/.zshrc
     return 1
   fi
 
@@ -606,7 +606,8 @@ Usage: omz theme <command> [options]
 Available commands:
 
   list            List all available Oh My Zsh themes
-  use <theme>     Load an Oh My Zsh theme
+  set <theme>     Set a theme in your .zshrc file
+  use <theme>     Load a theme
 
 EOF
     return 1
@@ -642,6 +643,73 @@ function _omz::theme::list {
   fi
 }
 
+function _omz::theme::set {
+  if [[ -z "$1" ]]; then
+    echo >&2 "Usage: omz theme set <theme>"
+    return 1
+  fi
+
+  # Check that theme exists
+  if [[ ! -f "$ZSH_CUSTOM/$1.zsh-theme" ]] \
+    && [[ ! -f "$ZSH_CUSTOM/themes/$1.zsh-theme" ]] \
+    && [[ ! -f "$ZSH/themes/$1.zsh-theme" ]]; then
+    _omz::log error "%B$1%b theme not found"
+    return 1
+  fi
+
+  # Enable theme in .zshrc
+  local awk_script='
+!set && /^\s*ZSH_THEME=[^#]+.*$/ {
+  set=1
+  sub(/^\s*ZSH_THEME=[^#]+.*$/, "ZSH_THEME=\"'$1'\" # set by `omz`")
+  print $0
+  next
+}
+
+{ print $0 }
+
+END {
+  # If no ZSH_THEME= line was found, return an error
+  if (!set) exit 1
+}
+'
+
+  awk "$awk_script" ~/.zshrc > ~/.zshrc.new \
+  || {
+    # Prepend ZSH_THEME= line to .zshrc if it doesn't exist
+    cat <<EOF
+ZSH_THEME="$1" # set by \`omz\`
+
+EOF
+    cat ~/.zshrc
+  } > ~/.zshrc.new \
+  && command mv -f ~/.zshrc ~/.zshrc.bck \
+  && command mv -f ~/.zshrc.new ~/.zshrc
+
+  # Exit if the new .zshrc file wasn't created correctly
+  [[ $? -eq 0 ]] || {
+    local ret=$?
+    _omz::log error "error setting theme."
+    return $ret
+  }
+
+  # Exit if the new .zshrc file has syntax errors
+  if ! zsh -n ~/.zshrc; then
+    _omz::log error "broken syntax in ~/.zshrc. Rolling back changes..."
+    command mv -f ~/.zshrc ~/.zshrc.new
+    command mv -f ~/.zshrc.bck ~/.zshrc
+    return 1
+  fi
+
+  # Restart the zsh session if there were no errors
+  _omz::log info "'$1' theme set correctly."
+
+  # Old zsh versions don't have ZSH_ARGZERO
+  local zsh="${ZSH_ARGZERO:-${functrace[-1]%:*}}"
+  # Check whether to run a login shell
+  [[ "$zsh" = -* || -o login ]] && exec -l "${zsh#-}" || exec "$zsh"
+}
+
 function _omz::theme::use {
   if [[ -z "$1" ]]; then
     echo >&2 "Usage: omz theme use <theme>"
@@ -656,7 +724,7 @@ function _omz::theme::use {
   elif [[ -f "$ZSH/themes/$1.zsh-theme" ]]; then
     source "$ZSH/themes/$1.zsh-theme"
   else
-    _omz::log error "theme '$1' not found"
+    _omz::log error "%B$1%b theme not found"
     return 1
   fi
 }

From 6d5b8484ce7198161d5f617c3db9fd7d3833d48c Mon Sep 17 00:00:00 2001
From: Ilya Bizyaev <bizyaev@zoho.com>
Date: Fri, 20 Aug 2021 13:25:58 +0300
Subject: [PATCH 406/869] fix(suse): avoid refresh attempts for Zypper queries
 (#9798)

---
 plugins/suse/README.md       | 10 ++++++++--
 plugins/suse/suse.plugin.zsh | 20 ++++++++++----------
 2 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/plugins/suse/README.md b/plugins/suse/README.md
index b9b069574..06c6d9ef5 100644
--- a/plugins/suse/README.md
+++ b/plugins/suse/README.md
@@ -2,9 +2,9 @@
 
 **Maintainer**: [r-darwish](https://github.com/r-darwish)
 
- Alias for Zypper according to the official Zypper's alias
+Alias for Zypper according to the official Zypper's alias
 
- To use it add `suse` to the plugins array in you zshrc file.
+To use it add `suse` to the plugins array in you zshrc file.
 
 ```zsh
 plugins=(... suse)
@@ -60,6 +60,12 @@ plugins=(... suse)
 | zse           | `zypper se`                | search for packages                                  |
 | zwp           | `zypper wp`                | list all packages providing the specified capability |
 
+NOTE: `--no-refresh` is passed to zypper for speeding up the calls and avoid errors due to lack
+of root privileges. If you need to refresh the repositories, call `sudo zypper ref` (`zref` alias)
+before runing these aliases.
+
+Related: [#9798](https://github.com/ohmyzsh/ohmyzsh/pull/9798).
+
 ## Repositories commands
 
 | Alias | Commands            | Description                              |
diff --git a/plugins/suse/suse.plugin.zsh b/plugins/suse/suse.plugin.zsh
index dcfeccb03..56bc6f1c5 100644
--- a/plugins/suse/suse.plugin.zsh
+++ b/plugins/suse/suse.plugin.zsh
@@ -25,16 +25,16 @@ alias zup='sudo zypper up'
 alias zpatch='sudo zypper patch'
 
 #Request commands
-alias zif='zypper if'
-alias zpa='zypper pa'
-alias zpatch-info='zypper patch-info'
-alias zpattern-info='zypper pattern-info'
-alias zproduct-info='zypper product-info'
-alias zpch='zypper pch'
-alias zpd='zypper pd'
-alias zpt='zypper pt'
-alias zse='zypper se'
-alias zwp='zypper wp'
+alias zif='zypper --no-refresh if'
+alias zpa='zypper --no-refresh pa'
+alias zpatch-info='zypper --no-refresh patch-info'
+alias zpattern-info='zypper --no-refresh pattern-info'
+alias zproduct-info='zypper --no-refresh product-info'
+alias zpch='zypper --no-refresh pch'
+alias zpd='zypper --no-refresh pd'
+alias zpt='zypper --no-refresh pt'
+alias zse='zypper --no-refresh se'
+alias zwp='zypper --no-refresh wp'
 
 #Repositories commands
 alias zar='sudo zypper ar'

From e13ff75f38200b03b26f798991b3ecf30e547d82 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mattias=20=C3=96hrn?= <mattias.ohrn@gmail.com>
Date: Tue, 24 Aug 2021 19:19:29 +0200
Subject: [PATCH 407/869] fix(kubectx): show plain context if not mapped
 (#10134)

---
 plugins/kubectx/kubectx.plugin.zsh | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/plugins/kubectx/kubectx.plugin.zsh b/plugins/kubectx/kubectx.plugin.zsh
index 56b7217f1..abbdc254b 100644
--- a/plugins/kubectx/kubectx.plugin.zsh
+++ b/plugins/kubectx/kubectx.plugin.zsh
@@ -3,12 +3,7 @@ typeset -A kubectx_mapping
 function kubectx_prompt_info() {
   if [ $commands[kubectl] ]; then
     local current_ctx=`kubectl config current-context`
-
-    #if associative array declared
-    if [[ -n $kubectx_mapping ]]; then
-      echo "${kubectx_mapping[$current_ctx]}"
-    else
-      echo $current_ctx
-    fi
+    # use value in associative array if it exists, otherwise fall back to the context name
+    echo "${kubectx_mapping[$current_ctx]:-$current_ctx}"
   fi
 }

From c47ac2d86d1aec3dcc3106c58d3ef0a91aa8cc3c Mon Sep 17 00:00:00 2001
From: Bartek Pacia <barpac02@gmail.com>
Date: Wed, 25 Aug 2021 10:25:26 +0200
Subject: [PATCH 408/869] feat(mlh): let users configure the official MLH theme
 (#9997)

---
 themes/mlh.zsh-theme | 51 +++++++++++++++++++++++++++++++++-----------
 1 file changed, 39 insertions(+), 12 deletions(-)

diff --git a/themes/mlh.zsh-theme b/themes/mlh.zsh-theme
index 33f238ed9..baff3fb63 100644
--- a/themes/mlh.zsh-theme
+++ b/themes/mlh.zsh-theme
@@ -12,17 +12,40 @@
 # # # Feel free to customize! # # #
 # # # # # # # # # # # # # # # # # #
 
+# To customize symbols (e.g MLH_AT_SYMBOL), simply set them as environment variables
+# for example in your ~/.zshrc file, like this:
+# MLH_AT_SYMBOL=" at "
+# 
+# Settings *must* be set before sourcing oh-my-zsh.sh the .zshrc file.
+#
 # To easily discover colors and their codes, type `spectrum_ls` in the terminal
 
-# enable or disable particular elements
-PRINT_EXIT_CODE=true
-PRINT_TIME=true
+# right prompt default settings
+if [ -z "$MLH_PRINT_EXIT_CODE" ]; then
+  MLH_PRINT_EXIT_CODE=true
+fi
 
-# symbols
-AT_SYMBOL=" @ "
-IN_SYMBOL=" in "
-ON_SYMBOL=" on "
-SHELL_SYMBOL="$"
+if [ -z "$MLH_PRINT_TIME" ]; then
+  MLH_PRINT_TIME=false
+fi
+
+# left prompt symbols default settings
+
+if [ -z "$MLH_AT_SYMBOL" ]; then
+  MLH_AT_SYMBOL="@"
+fi
+
+if [ -z "$MLH_IN_SYMBOL" ]; then
+  MLH_IN_SYMBOL=" in "
+fi
+
+if [ -z "$MLH_ON_SYMBOL" ]; then
+  MLH_ON_SYMBOL=" on "
+fi
+
+if [ -z "$MLH_SHELL_SYMBOL" ]; then
+  MLH_SHELL_SYMBOL="$ "
+fi
 
 # colors
 USER_COLOR="%F{001}"
@@ -47,24 +70,28 @@ directory() {
 
 # Prints current time
 current_time() {
-  if [ "$PRINT_TIME" = true ]; then
+  if [ "$MLH_PRINT_TIME" = true ]; then
     echo " $TIME_COLOR%*%f"
   fi
 }
 
 # Prints exit code of the last executed command
 exit_code() {
-  if [ "$PRINT_EXIT_CODE" = true ]; then
+  if [ "$MLH_PRINT_EXIT_CODE" = true ]; then
     echo "%(?..%F{001}exit %?)%f"
   fi
 }
 
+prompt_end() {
+  printf "\n$MLH_SHELL_SYMBOL"
+}
+
 # Set git_prompt_info text
-ZSH_THEME_GIT_PROMPT_PREFIX="${ON_SYMBOL}${BRANCH_COLOR}"
+ZSH_THEME_GIT_PROMPT_PREFIX="${MLH_ON_SYMBOL}${BRANCH_COLOR}"
 ZSH_THEME_GIT_PROMPT_SUFFIX="%f"
 ZSH_THEME_GIT_PROMPT_DIRTY=""
 ZSH_THEME_GIT_PROMPT_CLEAN=""
 
 # %B and %b make the text bold
-PROMPT='%b$(username)$AT_SYMBOL$(device)$IN_SYMBOL$(directory)$(git_prompt_info)%b $SHELL_SYMBOL '
+PROMPT='%b$(username)$MLH_AT_SYMBOL$(device)$MLH_IN_SYMBOL$(directory)$(git_prompt_info)%b$(prompt_end)'
 RPROMPT="$(exit_code)$(current_time)"

From 5a9d9553cd6861d80cc958132ab5af40fe661ac4 Mon Sep 17 00:00:00 2001
From: Simone Gaiarin <simgunz@gmail.com>
Date: Thu, 26 Aug 2021 11:42:17 +0200
Subject: [PATCH 409/869] feat(ssh-agent): allow using external helper to ask
 for passwords (#7631)

---
 plugins/ssh-agent/README.md            |   9 ++
 plugins/ssh-agent/ssh-agent.plugin.zsh | 128 ++++++++++++++-----------
 2 files changed, 83 insertions(+), 54 deletions(-)

diff --git a/plugins/ssh-agent/README.md b/plugins/ssh-agent/README.md
index 8765a9c7e..f46e8bf6a 100644
--- a/plugins/ssh-agent/README.md
+++ b/plugins/ssh-agent/README.md
@@ -55,6 +55,15 @@ ssh-add -K -c -a /run/user/1000/ssh-auth <identities>
 
 For valid `ssh-add` arguments run `ssh-add --help` or `man ssh-add`.
 
+----
+
+To set an **external helper** to ask for the passwords and possibly store
+them in the system keychain use the `helper` style. For example:
+
+```zsh
+zstyle :omz:plugins:ssh-agent helper ksshaskpass
+```
+
 ## Credits
 
 Based on code from Joseph M. Reagle: https://www.cygwin.com/ml/cygwin/2001-06/msg00537.html
diff --git a/plugins/ssh-agent/ssh-agent.plugin.zsh b/plugins/ssh-agent/ssh-agent.plugin.zsh
index d45406f63..9bc2e8a21 100644
--- a/plugins/ssh-agent/ssh-agent.plugin.zsh
+++ b/plugins/ssh-agent/ssh-agent.plugin.zsh
@@ -1,56 +1,76 @@
 typeset _agent_forwarding _ssh_env_cache
 
 function _start_agent() {
-	local lifetime
-	zstyle -s :omz:plugins:ssh-agent lifetime lifetime
+  local lifetime
+  zstyle -s :omz:plugins:ssh-agent lifetime lifetime
 
-	# start ssh-agent and setup environment
-	echo Starting ssh-agent...
-	ssh-agent -s ${lifetime:+-t} ${lifetime} | sed 's/^echo/#echo/' >! $_ssh_env_cache
-	chmod 600 $_ssh_env_cache
-	. $_ssh_env_cache > /dev/null
+  # start ssh-agent and setup environment
+  echo Starting ssh-agent...
+  ssh-agent -s ${lifetime:+-t} ${lifetime} | sed 's/^echo/#echo/' >! $_ssh_env_cache
+  chmod 600 $_ssh_env_cache
+  . $_ssh_env_cache > /dev/null
 }
 
 function _add_identities() {
-	local id line sig lines
-	local -a identities loaded_sigs loaded_ids not_loaded
-	zstyle -a :omz:plugins:ssh-agent identities identities
+  local id line sig lines
+  local -a identities loaded_sigs loaded_ids not_loaded
+  zstyle -a :omz:plugins:ssh-agent identities identities
 
-	# check for .ssh folder presence
-	if [[ ! -d $HOME/.ssh ]]; then
-		return
-	fi
+  # check for .ssh folder presence
+  if [[ ! -d $HOME/.ssh ]]; then
+    return
+  fi
 
-	# add default keys if no identities were set up via zstyle
-	# this is to mimic the call to ssh-add with no identities
-	if [[ ${#identities} -eq 0 ]]; then
-		# key list found on `ssh-add` man page's DESCRIPTION section
-		for id in id_rsa id_dsa id_ecdsa id_ed25519 identity; do
-			# check if file exists
-			[[ -f "$HOME/.ssh/$id" ]] && identities+=$id
-		done
-	fi
+  # add default keys if no identities were set up via zstyle
+  # this is to mimic the call to ssh-add with no identities
+  if [[ ${#identities} -eq 0 ]]; then
+    # key list found on `ssh-add` man page's DESCRIPTION section
+    for id in id_rsa id_dsa id_ecdsa id_ed25519 identity; do
+      # check if file exists
+      [[ -f "$HOME/.ssh/$id" ]] && identities+=($id)
+    done
+  fi
 
-	# get list of loaded identities' signatures and filenames
-	if lines=$(ssh-add -l); then
-		for line in ${(f)lines}; do
-			loaded_sigs+=${${(z)line}[2]}
-			loaded_ids+=${${(z)line}[3]}
-		done
-	fi
+  # get list of loaded identities' signatures and filenames
+  if lines=$(ssh-add -l); then
+    for line in ${(f)lines}; do
+      loaded_sigs+=${${(z)line}[2]}
+      loaded_ids+=${${(z)line}[3]}
+    done
+  fi
 
-	# add identities if not already loaded
-	for id in $identities; do
-		# check for filename match, otherwise try for signature match
-		if [[ ${loaded_ids[(I)$HOME/.ssh/$id]} -le 0 ]]; then
-			sig="$(ssh-keygen -lf "$HOME/.ssh/$id" | awk '{print $2}')"
-			[[ ${loaded_sigs[(I)$sig]} -le 0 ]] && not_loaded+="$HOME/.ssh/$id"
-		fi
-	done
+  # add identities if not already loaded
+  for id in $identities; do
+    # check for filename match, otherwise try for signature match
+    if [[ ${loaded_ids[(I)$HOME/.ssh/$id]} -le 0 ]]; then
+      sig="$(ssh-keygen -lf "$HOME/.ssh/$id" | awk '{print $2}')"
+      [[ ${loaded_sigs[(I)$sig]} -le 0 ]] && not_loaded+=("$HOME/.ssh/$id")
+    fi
+  done
 
-	local args
-	zstyle -a :omz:plugins:ssh-agent ssh-add-args args
-	[[ -n "$not_loaded" ]] && ssh-add "${args[@]}" ${^not_loaded}
+  # abort if no identities need to be loaded
+  if [[ ${#not_loaded} -eq 0 ]]; then
+    return
+  fi
+
+  # pass extra arguments to ssh-add
+  local args
+  zstyle -a :omz:plugins:ssh-agent ssh-add-args args
+
+  # use user specified helper to ask for password (ksshaskpass, etc)
+  local helper
+  zstyle -s :omz:plugins:ssh-agent helper helper
+
+  if [[ -n "$helper" ]]; then
+    if [[ -z "${commands[$helper]}" ]]; then
+      echo "ssh-agent: the helper '$helper' has not been found."
+    else
+      SSH_ASKPASS="$helper" ssh-add "${args[@]}" ${^not_loaded} < /dev/null
+      return $?
+    fi
+  fi
+
+  ssh-add "${args[@]}" ${^not_loaded}
 }
 
 # Get the filename to store/lookup the environment from
@@ -60,21 +80,21 @@ _ssh_env_cache="$HOME/.ssh/environment-$SHORT_HOST"
 zstyle -b :omz:plugins:ssh-agent agent-forwarding _agent_forwarding
 
 if [[ $_agent_forwarding == "yes" && -n "$SSH_AUTH_SOCK" ]]; then
-	# Add a nifty symlink for screen/tmux if agent forwarding
-	[[ -L $SSH_AUTH_SOCK ]] || ln -sf "$SSH_AUTH_SOCK" /tmp/ssh-agent-$USERNAME-screen
+  # Add a nifty symlink for screen/tmux if agent forwarding
+  [[ -L $SSH_AUTH_SOCK ]] || ln -sf "$SSH_AUTH_SOCK" /tmp/ssh-agent-$USERNAME-screen
 elif [[ -f "$_ssh_env_cache" ]]; then
-	# Source SSH settings, if applicable
-	. $_ssh_env_cache > /dev/null
-	if [[ $USERNAME == "root" ]]; then
-		FILTER="ax"
-	else
-		FILTER="x"
-	fi
-	ps $FILTER | grep ssh-agent | grep -q $SSH_AGENT_PID || {
-		_start_agent
-	}
+  # Source SSH settings, if applicable
+  . $_ssh_env_cache > /dev/null
+  if [[ $USERNAME == "root" ]]; then
+    FILTER="ax"
+  else
+    FILTER="x"
+  fi
+  ps $FILTER | grep ssh-agent | grep -q $SSH_AGENT_PID || {
+    _start_agent
+  }
 else
-	_start_agent
+  _start_agent
 fi
 
 _add_identities

From 7692881d2a61a4ba47eeef5d7827c0d2cb896def Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Thu, 26 Aug 2021 12:14:53 +0200
Subject: [PATCH 410/869] feat(ssh-agent): only start ssh-agent once (#5359)

Close #5359
Close #7379

Co-authored-by: Will Andrews <will@firepipe.net>
Co-authored-by: zhangyc <zhangyc@fenbi.com>
---
 plugins/ssh-agent/ssh-agent.plugin.zsh | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/plugins/ssh-agent/ssh-agent.plugin.zsh b/plugins/ssh-agent/ssh-agent.plugin.zsh
index 9bc2e8a21..acad4e83e 100644
--- a/plugins/ssh-agent/ssh-agent.plugin.zsh
+++ b/plugins/ssh-agent/ssh-agent.plugin.zsh
@@ -1,5 +1,3 @@
-typeset _agent_forwarding _ssh_env_cache
-
 function _start_agent() {
   local lifetime
   zstyle -s :omz:plugins:ssh-agent lifetime lifetime
@@ -97,7 +95,23 @@ else
   _start_agent
 fi
 
-_add_identities
+() {
+  emulate -L zsh
+
+  command mkdir "$ZSH_CACHE_DIR/ssh-agent.lock" 2>/dev/null || return
+
+  trap "
+    ret=\$?
+
+    command rm -rf '$ZSH_CACHE_DIR/ssh-agent.lock'
+    unset _agent_forwarding _ssh_env_cache
+    unfunction _start_agent _add_identities 2>/dev/null
+
+    return \$ret
+  " EXIT INT QUIT
+
+  _add_identities
+}
 
 # tidy up after ourselves
 unset _agent_forwarding _ssh_env_cache

From 3f0672ff946a508329e382261e6eb8f837106e38 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Thu, 26 Aug 2021 12:40:16 +0200
Subject: [PATCH 411/869] refactor(ssh-agent): clean up and reorganize code

---
 plugins/ssh-agent/ssh-agent.plugin.zsh | 47 +++++++++++++-------------
 1 file changed, 23 insertions(+), 24 deletions(-)

diff --git a/plugins/ssh-agent/ssh-agent.plugin.zsh b/plugins/ssh-agent/ssh-agent.plugin.zsh
index acad4e83e..2049145fd 100644
--- a/plugins/ssh-agent/ssh-agent.plugin.zsh
+++ b/plugins/ssh-agent/ssh-agent.plugin.zsh
@@ -1,12 +1,25 @@
+# Get the filename to store/lookup the environment from
+ssh_env_cache="$HOME/.ssh/environment-$SHORT_HOST"
+
 function _start_agent() {
+  # Check if ssh-agent is already running
+  if [[ -f "$ssh_env_cache" ]]; then
+    . "$ssh_env_cache" > /dev/null
+
+    {
+      [[ "$USERNAME" = root ]] && command ps ax || command ps x
+    } | command grep ssh-agent | command grep -q $SSH_AGENT_PID && return 0
+  fi
+
+  # Set a maximum lifetime for identities added to ssh-agent
   local lifetime
   zstyle -s :omz:plugins:ssh-agent lifetime lifetime
 
   # start ssh-agent and setup environment
   echo Starting ssh-agent...
-  ssh-agent -s ${lifetime:+-t} ${lifetime} | sed 's/^echo/#echo/' >! $_ssh_env_cache
-  chmod 600 $_ssh_env_cache
-  . $_ssh_env_cache > /dev/null
+  ssh-agent -s ${lifetime:+-t} ${lifetime} | sed '/^echo/d' >! "$ssh_env_cache"
+  chmod 600 "$ssh_env_cache"
+  . "$ssh_env_cache" > /dev/null
 }
 
 function _add_identities() {
@@ -71,26 +84,12 @@ function _add_identities() {
   ssh-add "${args[@]}" ${^not_loaded}
 }
 
-# Get the filename to store/lookup the environment from
-_ssh_env_cache="$HOME/.ssh/environment-$SHORT_HOST"
-
 # test if agent-forwarding is enabled
-zstyle -b :omz:plugins:ssh-agent agent-forwarding _agent_forwarding
+zstyle -b :omz:plugins:ssh-agent agent-forwarding agent_forwarding
 
-if [[ $_agent_forwarding == "yes" && -n "$SSH_AUTH_SOCK" ]]; then
-  # Add a nifty symlink for screen/tmux if agent forwarding
-  [[ -L $SSH_AUTH_SOCK ]] || ln -sf "$SSH_AUTH_SOCK" /tmp/ssh-agent-$USERNAME-screen
-elif [[ -f "$_ssh_env_cache" ]]; then
-  # Source SSH settings, if applicable
-  . $_ssh_env_cache > /dev/null
-  if [[ $USERNAME == "root" ]]; then
-    FILTER="ax"
-  else
-    FILTER="x"
-  fi
-  ps $FILTER | grep ssh-agent | grep -q $SSH_AGENT_PID || {
-    _start_agent
-  }
+# Add a nifty symlink for screen/tmux if agent forwarding
+if [[ $agent_forwarding = "yes" && -n "$SSH_AUTH_SOCK" && ! -L "$SSH_AUTH_SOCK" ]]; then
+  ln -sf "$SSH_AUTH_SOCK" /tmp/ssh-agent-$USERNAME-screen
 else
   _start_agent
 fi
@@ -104,15 +103,15 @@ fi
     ret=\$?
 
     command rm -rf '$ZSH_CACHE_DIR/ssh-agent.lock'
-    unset _agent_forwarding _ssh_env_cache
+    unset agent_forwarding ssh_env_cache
     unfunction _start_agent _add_identities 2>/dev/null
 
     return \$ret
   " EXIT INT QUIT
 
   _add_identities
+
 }
 
-# tidy up after ourselves
-unset _agent_forwarding _ssh_env_cache
+unset agent_forwarding ssh_env_cache
 unfunction _start_agent _add_identities

From 0c590aba74f28e94f03eb918c07a90cf1a51f525 Mon Sep 17 00:00:00 2001
From: wl2776 <wl2776@users.noreply.github.com>
Date: Fri, 27 Aug 2021 19:07:19 +0300
Subject: [PATCH 412/869] fix(git): fix `gbda` alias when there are no merged
 branches (#10005)

---
 plugins/git/README.md      | 2 +-
 plugins/git/git.plugin.zsh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/git/README.md b/plugins/git/README.md
index 522257d2d..48cf87204 100644
--- a/plugins/git/README.md
+++ b/plugins/git/README.md
@@ -23,7 +23,7 @@ plugins=(... git)
 | gb                   | git branch                                                                                                                       |
 | gba                  | git branch -a                                                                                                                    |
 | gbd                  | git branch -d                                                                                                                    |
-| gbda                 | git branch --no-color --merged \| command grep -vE "^(\+\|\*\|\s*($(git_main_branch)\|$(git_develop_branch))\s*$)" \| command xargs -n 1 git branch -d |
+| gbda                 | git branch --no-color --merged \| grep -vE "^([+*]\|\s*($(git_main_branch)\|$(git_develop_branch))\s*$)" \| xargs git branch -d 2>/dev/null |
 | gbD                  | git branch -D                                                                                                                    |
 | gbl                  | git blame -b -w                                                                                                                  |
 | gbnm                 | git branch --no-merged                                                                                                           |
diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index 3cd558692..f0d9aaedc 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -73,7 +73,7 @@ alias gapt='git apply --3way'
 alias gb='git branch'
 alias gba='git branch -a'
 alias gbd='git branch -d'
-alias gbda='git branch --no-color --merged | command grep -vE "^(\+|\*|\s*($(git_main_branch)|$(git_develop_branch))\s*$)" | command xargs -n 1 git branch -d'
+alias gbda='git branch --no-color --merged | command grep -vE "^([+*]|\s*($(git_main_branch)|$(git_develop_branch))\s*$)" | command xargs git branch -d 2>/dev/null'
 alias gbD='git branch -D'
 alias gbl='git blame -b -w'
 alias gbnm='git branch --no-merged'

From 4a69ee575c9a8ec96fb6378fecae7777c7afba84 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Thu, 26 Aug 2021 15:52:09 +0200
Subject: [PATCH 413/869] feat(ssh-agent): allow specifying absolute path to
 `identities`

Fixes #9650
---
 plugins/ssh-agent/README.md            |  9 +++++++++
 plugins/ssh-agent/ssh-agent.plugin.zsh | 12 +++++++-----
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/plugins/ssh-agent/README.md b/plugins/ssh-agent/README.md
index f46e8bf6a..d1a504b1e 100644
--- a/plugins/ssh-agent/README.md
+++ b/plugins/ssh-agent/README.md
@@ -27,6 +27,15 @@ To **load multiple identities** use the `identities` style, For example:
 zstyle :omz:plugins:ssh-agent identities id_rsa id_rsa2 id_github
 ```
 
+**NOTE:** the identities may be an absolute path if they are somewhere other than
+`~/.ssh`. For example:
+
+```zsh
+zstyle :omz:plugins:ssh-agent identities ~/.config/ssh/id_rsa ~/.config/ssh/id_rsa2 ~/.config/ssh/id_github
+# which can be simplified to
+zstyle :omz:plugins:ssh-agent identities ~/.config/ssh/{id_rsa,id_rsa2,id_github}
+```
+
 ----
 
 To **set the maximum lifetime of the identities**, use the `lifetime` style.
diff --git a/plugins/ssh-agent/ssh-agent.plugin.zsh b/plugins/ssh-agent/ssh-agent.plugin.zsh
index 2049145fd..c2b9546a2 100644
--- a/plugins/ssh-agent/ssh-agent.plugin.zsh
+++ b/plugins/ssh-agent/ssh-agent.plugin.zsh
@@ -23,12 +23,12 @@ function _start_agent() {
 }
 
 function _add_identities() {
-  local id line sig lines
+  local id file line sig lines
   local -a identities loaded_sigs loaded_ids not_loaded
   zstyle -a :omz:plugins:ssh-agent identities identities
 
   # check for .ssh folder presence
-  if [[ ! -d $HOME/.ssh ]]; then
+  if [[ ! -d "$HOME/.ssh" ]]; then
     return
   fi
 
@@ -52,10 +52,12 @@ function _add_identities() {
 
   # add identities if not already loaded
   for id in $identities; do
+    # if id is an absolute path, make file equal to id
+    [[ "$id" = /* ]] && file="$id" || file="$HOME/.ssh/$id"
     # check for filename match, otherwise try for signature match
-    if [[ ${loaded_ids[(I)$HOME/.ssh/$id]} -le 0 ]]; then
-      sig="$(ssh-keygen -lf "$HOME/.ssh/$id" | awk '{print $2}')"
-      [[ ${loaded_sigs[(I)$sig]} -le 0 ]] && not_loaded+=("$HOME/.ssh/$id")
+    if [[ ${loaded_ids[(I)$file]} -le 0 ]]; then
+      sig="$(ssh-keygen -lf "$file" | awk '{print $2}')"
+      [[ ${loaded_sigs[(I)$sig]} -le 0 ]] && not_loaded+=("$file")
     fi
   done
 

From a1847dc860b85a0f0d97126ffe4b9b3a5276d1c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Thu, 19 Aug 2021 17:20:52 +0200
Subject: [PATCH 414/869] style(sudo): apply main style guide indentation

---
 plugins/sudo/sudo.plugin.zsh | 70 ++++++++++++++++++------------------
 1 file changed, 35 insertions(+), 35 deletions(-)

diff --git a/plugins/sudo/sudo.plugin.zsh b/plugins/sudo/sudo.plugin.zsh
index f2445a762..f0a01bc1f 100644
--- a/plugins/sudo/sudo.plugin.zsh
+++ b/plugins/sudo/sudo.plugin.zsh
@@ -15,48 +15,48 @@
 # ------------------------------------------------------------------------------
 
 __sudo-replace-buffer() {
-    local old=$1 new=$2 space=${2:+ }
-    if [[ ${#LBUFFER} -le ${#old} ]]; then
-        RBUFFER="${space}${BUFFER#$old }"
-        LBUFFER="${new}"
-    else
-        LBUFFER="${new}${space}${LBUFFER#$old }"
-    fi
+  local old=$1 new=$2 space=${2:+ }
+  if [[ ${#LBUFFER} -le ${#old} ]]; then
+    RBUFFER="${space}${BUFFER#$old }"
+    LBUFFER="${new}"
+  else
+    LBUFFER="${new}${space}${LBUFFER#$old }"
+  fi
 }
 
 sudo-command-line() {
-    [[ -z $BUFFER ]] && LBUFFER="$(fc -ln -1)"
+  [[ -z $BUFFER ]] && LBUFFER="$(fc -ln -1)"
 
-    # Save beginning space
-    local WHITESPACE=""
-    if [[ ${LBUFFER:0:1} = " " ]]; then
-        WHITESPACE=" "
-        LBUFFER="${LBUFFER:1}"
+  # Save beginning space
+  local WHITESPACE=""
+  if [[ ${LBUFFER:0:1} = " " ]]; then
+    WHITESPACE=" "
+    LBUFFER="${LBUFFER:1}"
+  fi
+
+  # Get the first part of the typed command and check if it's an alias to $EDITOR
+  # If so, locally change $EDITOR to the alias so that it matches below
+  if [[ -n "$EDITOR" ]]; then
+    local cmd="${${(Az)BUFFER}[1]}"
+    if [[ "${aliases[$cmd]} " = (\$EDITOR|$EDITOR)\ * ]]; then
+      local EDITOR="$cmd"
     fi
+  fi
 
-    # Get the first part of the typed command and check if it's an alias to $EDITOR
-    # If so, locally change $EDITOR to the alias so that it matches below
-    if [[ -n "$EDITOR" ]]; then
-        local cmd="${${(Az)BUFFER}[1]}"
-        if [[ "${aliases[$cmd]} " = (\$EDITOR|$EDITOR)\ * ]]; then
-            local EDITOR="$cmd"
-        fi
-    fi
+  if [[ -n $EDITOR && $BUFFER = $EDITOR\ * ]]; then
+    __sudo-replace-buffer "$EDITOR" "sudoedit"
+  elif [[ -n $EDITOR && $BUFFER = \$EDITOR\ * ]]; then
+    __sudo-replace-buffer "\$EDITOR" "sudoedit"
+  elif [[ $BUFFER = sudoedit\ * ]]; then
+    __sudo-replace-buffer "sudoedit" "$EDITOR"
+  elif [[ $BUFFER = sudo\ * ]]; then
+    __sudo-replace-buffer "sudo" ""
+  else
+    LBUFFER="sudo $LBUFFER"
+  fi
 
-    if [[ -n $EDITOR && $BUFFER = $EDITOR\ * ]]; then
-        __sudo-replace-buffer "$EDITOR" "sudoedit"
-    elif [[ -n $EDITOR && $BUFFER = \$EDITOR\ * ]]; then
-        __sudo-replace-buffer "\$EDITOR" "sudoedit"
-    elif [[ $BUFFER = sudoedit\ * ]]; then
-        __sudo-replace-buffer "sudoedit" "$EDITOR"
-    elif [[ $BUFFER = sudo\ * ]]; then
-        __sudo-replace-buffer "sudo" ""
-    else
-        LBUFFER="sudo $LBUFFER"
-    fi
-
-    # Preserve beginning space
-    LBUFFER="${WHITESPACE}${LBUFFER}"
+  # Preserve beginning space
+  LBUFFER="${WHITESPACE}${LBUFFER}"
 }
 
 zle -N sudo-command-line

From 190325049ef93731ab28295dbedf36d44ab33d7a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Thu, 19 Aug 2021 18:20:57 +0200
Subject: [PATCH 415/869] fix(sudo): allow different $EDITOR settings and fix
 zsh-syntax-highlighting redraw

---
 plugins/sudo/sudo.plugin.zsh | 64 ++++++++++++++++++++++++++----------
 1 file changed, 46 insertions(+), 18 deletions(-)

diff --git a/plugins/sudo/sudo.plugin.zsh b/plugins/sudo/sudo.plugin.zsh
index f0a01bc1f..e02f88a87 100644
--- a/plugins/sudo/sudo.plugin.zsh
+++ b/plugins/sudo/sudo.plugin.zsh
@@ -25,6 +25,7 @@ __sudo-replace-buffer() {
 }
 
 sudo-command-line() {
+  # If line is empty, get the last run command from history
   [[ -z $BUFFER ]] && LBUFFER="$(fc -ln -1)"
 
   # Save beginning space
@@ -34,29 +35,56 @@ sudo-command-line() {
     LBUFFER="${LBUFFER:1}"
   fi
 
-  # Get the first part of the typed command and check if it's an alias to $EDITOR
-  # If so, locally change $EDITOR to the alias so that it matches below
-  if [[ -n "$EDITOR" ]]; then
-    local cmd="${${(Az)BUFFER}[1]}"
-    if [[ "${aliases[$cmd]} " = (\$EDITOR|$EDITOR)\ * ]]; then
-      local EDITOR="$cmd"
-    fi
-  fi
-
-  if [[ -n $EDITOR && $BUFFER = $EDITOR\ * ]]; then
-    __sudo-replace-buffer "$EDITOR" "sudoedit"
-  elif [[ -n $EDITOR && $BUFFER = \$EDITOR\ * ]]; then
-    __sudo-replace-buffer "\$EDITOR" "sudoedit"
-  elif [[ $BUFFER = sudoedit\ * ]]; then
-    __sudo-replace-buffer "sudoedit" "$EDITOR"
-  elif [[ $BUFFER = sudo\ * ]]; then
-    __sudo-replace-buffer "sudo" ""
+  # If $EDITOR is not set, just toggle the sudo prefix on and off
+  if [[ -z "$EDITOR" ]]; then
+    case "$BUFFER" in
+      sudoedit\ *) __sudo-replace-buffer "sudoedit" "" ;;
+      sudo\ *) __sudo-replace-buffer "sudo" "" ;;
+      *) LBUFFER="sudo $LBUFFER" ;;
+    esac
   else
-    LBUFFER="sudo $LBUFFER"
+    # Check if the typed command is really an alias to $EDITOR
+
+    # Get the first part of the typed command
+    local cmd="${${(Az)BUFFER}[1]}"
+    # Get the first part of the alias of the same name as $cmd, or $cmd if no alias matches
+    local realcmd="${${(Az)aliases[$cmd]}[1]:-$cmd}"
+    # Get the first part of the $EDITOR command ($EDITOR may have arguments after it)
+    local editorcmd="${${(Az)EDITOR}[1]}"
+
+    # Note: ${var:c} makes a $PATH search and expands $var to the full path
+    # The if condition is met when:
+    # - $realcmd is '$EDITOR'
+    # - $realcmd is "cmd" and $EDITOR is "cmd"
+    # - $realcmd is "cmd" and $EDITOR is "cmd --with --arguments"
+    # - $realcmd is "/path/to/cmd" and $EDITOR is "cmd"
+    # - $realcmd is "/path/to/cmd" and $EDITOR is "/path/to/cmd"
+    # or
+    # - $realcmd is "cmd" and $EDITOR is "cmd"
+    # - $realcmd is "cmd" and $EDITOR is "/path/to/cmd"
+    # or
+    # - $realcmd is "cmd" and $EDITOR is /alternative/path/to/cmd that appears in $PATH
+    if [[ "$realcmd" = (\$EDITOR|$editorcmd|${editorcmd:c}) \
+      || "${realcmd:c}" = ($editorcmd|${editorcmd:c}) ]] \
+      || builtin which -a "$realcmd" | command grep -Fx -q "$editorcmd"; then
+      editorcmd="$cmd" # replace $editorcmd with the typed command so it matches below
+    fi
+
+    # Check for editor commands in the typed command and replace accordingly
+    case "$BUFFER" in
+      $editorcmd\ *) __sudo-replace-buffer "$editorcmd" "sudoedit" ;;
+      \$EDITOR\ *) __sudo-replace-buffer '$EDITOR' "sudoedit" ;;
+      sudoedit\ *) __sudo-replace-buffer "sudoedit" "$EDITOR" ;;
+      sudo\ *) __sudo-replace-buffer "sudo" "" ;;
+      *) LBUFFER="sudo $LBUFFER" ;;
+    esac
   fi
 
   # Preserve beginning space
   LBUFFER="${WHITESPACE}${LBUFFER}"
+
+  # Redisplay edit buffer (compatibility with zsh-syntax-highlighting)
+  zle redisplay
 }
 
 zle -N sudo-command-line

From 21b385e7bd522983642b52b51db5d4a210a77717 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Thu, 2 Sep 2021 12:29:04 +0200
Subject: [PATCH 416/869] fix(frontend-search): fix codepen.io search (#10157)

Fixes #10157
---
 plugins/frontend-search/frontend-search.plugin.zsh | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/plugins/frontend-search/frontend-search.plugin.zsh b/plugins/frontend-search/frontend-search.plugin.zsh
index 4517e21a8..437e477b9 100644
--- a/plugins/frontend-search/frontend-search.plugin.zsh
+++ b/plugins/frontend-search/frontend-search.plugin.zsh
@@ -29,14 +29,10 @@ alias unheap='frontend unheap'
 alias vuejs='frontend vuejs'
 
 function _frontend_fallback() {
-  local url
-  if [[ "$FRONTEND_SEARCH_FALLBACK" == duckduckgo ]]; then
-    url="https://duckduckgo.com/?sites=$1&q="
-  else
-    url="https://google.com/search?as_sitesearch=$1&as_q="
-  fi
-
-  echo "$url"
+  case "$FRONTEND_SEARCH_FALLBACK" in
+    duckduckgo) echo "https://duckduckgo.com/?sites=$1&q=" ;;
+    *) echo "https://google.com/search?as_sitesearch=$1&as_q=" ;;
+  esac
 }
 
 function frontend() {
@@ -51,7 +47,7 @@ function frontend() {
     bootsnipp      'https://bootsnipp.com/search?q='
     bundlephobia   'https://bundlephobia.com/result?p='
     caniuse        'https://caniuse.com/#search='
-    codepen        'https://codepen.io/search?q='
+    codepen        'https://codepen.io/search/pens?q='
     compassdoc     'http://compass-style.org/search?q='
     cssflow        'http://www.cssflow.com/search?q='
     dartlang       'https://api.dartlang.org/apidocs/channels/stable/dartdoc-viewer/dart:'

From 53b54f5faa271ee90ec31fcffb559541c82b9703 Mon Sep 17 00:00:00 2001
From: Vitaly Polonetsky <m_vitaly@topixoft.com>
Date: Fri, 3 Sep 2021 02:43:53 -0700
Subject: [PATCH 417/869] feat(git): guess main branch name also from remotes
 (#10158)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Marc Cornellà <hello@mcornella.com>
---
 plugins/git/git.plugin.zsh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index f0d9aaedc..2985ba024 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -32,10 +32,10 @@ function work_in_progress() {
 # Check if main exists and use instead of master
 function git_main_branch() {
   command git rev-parse --git-dir &>/dev/null || return
-  local branch
-  for branch in main trunk; do
-    if command git show-ref -q --verify refs/heads/$branch; then
-      echo $branch
+  local ref
+  for ref in refs/{heads,remotes/{origin,upstream}}/{main,trunk}; do
+    if command git show-ref -q --verify $ref; then
+      echo ${ref:t}
       return
     fi
   done

From c08fb77c2fc62ba8df6ad690df0e1d5c9f24c075 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Fri, 3 Sep 2021 12:44:01 +0200
Subject: [PATCH 418/869] fix(pyenv): properly load pyenv shims and warn of
 broken configuration
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Closes #10133

Co-authored-by: Chloé “Matcha” <chloe.desoutter@gmail.com>
---
 plugins/pyenv/pyenv.plugin.zsh | 48 +++++++++++++++++++++++-----------
 1 file changed, 33 insertions(+), 15 deletions(-)

diff --git a/plugins/pyenv/pyenv.plugin.zsh b/plugins/pyenv/pyenv.plugin.zsh
index bcf80a6a2..f55701900 100644
--- a/plugins/pyenv/pyenv.plugin.zsh
+++ b/plugins/pyenv/pyenv.plugin.zsh
@@ -1,3 +1,22 @@
+pyenv_config_warning() {
+  local reason="$1"
+  local pyenv_root="${PYENV_ROOT/#$HOME/\$HOME}"
+  cat >&2 <<EOF
+Found pyenv, but it is badly configured ($reason). pyenv might not
+work correctly for non-interactive shells (for example, when run from a script).
+${(%):-"%B%F{yellow}"}
+To fix this message, add these lines to the '.profile' and '.zprofile' files
+in your home directory:
+${(%):-"%f"}
+export PYENV_ROOT="$pyenv_root"
+export PATH="\$PYENV_ROOT/bin:\$PATH"
+eval "\$(pyenv init --path)"
+${(%):-"%F{yellow}"}
+You'll need to restart your user session for the changes to take effect.${(%):-%b%f}
+For more information go to https://github.com/pyenv/pyenv/#installation.
+EOF
+}
+
 # This plugin loads pyenv into the current shell and provides prompt info via
 # the 'pyenv_prompt_info' function. Also loads pyenv-virtualenv if available.
 
@@ -30,35 +49,33 @@ if [[ $FOUND_PYENV -ne 1 ]]; then
 
   # If we found pyenv, load it but show a caveat about non-interactive shells
   if [[ $FOUND_PYENV -eq 1 ]]; then
-    cat >&2 <<EOF
-Found pyenv, but it is badly configured. pyenv might not work for
-non-interactive shells (for example, when run from a script).
-${bold_color}
-To fix this message, add these lines to the '.profile' and '.zprofile' files
-in your home directory:
-
-export PYENV_ROOT="${dir/#$HOME/\$HOME}"
-export PATH="\$PYENV_ROOT/bin:\$PATH"
-eval "\$(pyenv init --path)"
-
-You'll need to restart your user session for the changes to take effect.${reset_color}
-For more info go to https://github.com/pyenv/pyenv/#installation.
-EOF
-
     # Configuring in .zshrc only makes pyenv available for interactive shells
     export PYENV_ROOT="$dir"
     export PATH="$PYENV_ROOT/bin:$PATH"
     eval "$(pyenv init --path)"
+
+    # Show warning due to bad pyenv configuration
+    pyenv_config_warning 'pyenv command not found in $PATH'
   fi
 fi
 
 if [[ $FOUND_PYENV -eq 1 ]]; then
+  # Setup $PYENV_ROOT if not already set
   if [[ -z "$PYENV_ROOT" ]]; then
     export PYENV_ROOT="$(pyenv root)"
+    pyenv_config_warning 'missing $PYENV_ROOT'
   fi
 
+  # Add pyenv shims to $PATH if not already added
+  if [[ -z "${path[(Re)$PYENV_ROOT/shims]}" ]]; then
+    eval "$(pyenv init --path)"
+    pyenv_config_warning 'missing pyenv shims in $PATH'
+  fi
+
+  # Load pyenv
   eval "$(pyenv init - --no-rehash zsh)"
 
+  # If pyenv-virtualenv exists, load it
   if [[ -d "$PYENV_ROOT/plugins/pyenv-virtualenv" ]]; then
     eval "$(pyenv virtualenv-init - zsh)"
   fi
@@ -74,3 +91,4 @@ else
 fi
 
 unset FOUND_PYENV pyenvdirs dir
+unfunction pyenv_config_warning

From 823be4ef5ff6753a9c5918218801709b98e5312f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Fri, 3 Sep 2021 12:53:33 +0200
Subject: [PATCH 419/869] feat(pyenv): silence bad config warning with
 `ZSH_PYENV_QUIET=true`

---
 plugins/pyenv/README.md        | 7 ++++++-
 plugins/pyenv/pyenv.plugin.zsh | 2 ++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/plugins/pyenv/README.md b/plugins/pyenv/README.md
index d063b55b9..810c67998 100644
--- a/plugins/pyenv/README.md
+++ b/plugins/pyenv/README.md
@@ -1,4 +1,4 @@
-# pyenv 
+# pyenv
 
 This plugin looks for [pyenv](https://github.com/pyenv/pyenv), a Simple Python version
 management system, and loads it if it's found. It also loads pyenv-virtualenv, a pyenv
@@ -10,6 +10,11 @@ To use it, add `pyenv` to the plugins array in your zshrc file:
 plugins=(... pyenv)
 ```
 
+## Settings
+
+- `ZSH_PYENV_QUIET`: if set to `true`, the plugin will not print any messages if it
+  finds that `pyenv` is not properly configured.
+
 ## Functions
 
 - `pyenv_prompt_info`: displays the Python version in use by pyenv; or the global Python
diff --git a/plugins/pyenv/pyenv.plugin.zsh b/plugins/pyenv/pyenv.plugin.zsh
index f55701900..679fc5e52 100644
--- a/plugins/pyenv/pyenv.plugin.zsh
+++ b/plugins/pyenv/pyenv.plugin.zsh
@@ -1,4 +1,6 @@
 pyenv_config_warning() {
+  [[ "$ZSH_PYENV_QUIET" != true ]] || return 0
+
   local reason="$1"
   local pyenv_root="${PYENV_ROOT/#$HOME/\$HOME}"
   cat >&2 <<EOF

From 1b03896a0e01ad263439449a0742d0f3339732e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Fri, 3 Sep 2021 12:56:00 +0200
Subject: [PATCH 420/869] feat(pyenv): don't load pyenv-virtualenv with
 `ZSH_PYENV_VIRTUALENV=false`

Closes #9443

Co-authored-by: Pandu POLUAN <pepoluan@gmail.com>
---
 plugins/pyenv/README.md        | 3 +++
 plugins/pyenv/pyenv.plugin.zsh | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/plugins/pyenv/README.md b/plugins/pyenv/README.md
index 810c67998..b9ee937b7 100644
--- a/plugins/pyenv/README.md
+++ b/plugins/pyenv/README.md
@@ -15,6 +15,9 @@ plugins=(... pyenv)
 - `ZSH_PYENV_QUIET`: if set to `true`, the plugin will not print any messages if it
   finds that `pyenv` is not properly configured.
 
+- `ZSH_PYENV_VIRTUALENV`: if set to `false`, the plugin will not load pyenv-virtualenv
+  when it finds it.
+
 ## Functions
 
 - `pyenv_prompt_info`: displays the Python version in use by pyenv; or the global Python
diff --git a/plugins/pyenv/pyenv.plugin.zsh b/plugins/pyenv/pyenv.plugin.zsh
index 679fc5e52..922df8ead 100644
--- a/plugins/pyenv/pyenv.plugin.zsh
+++ b/plugins/pyenv/pyenv.plugin.zsh
@@ -78,7 +78,7 @@ if [[ $FOUND_PYENV -eq 1 ]]; then
   eval "$(pyenv init - --no-rehash zsh)"
 
   # If pyenv-virtualenv exists, load it
-  if [[ -d "$PYENV_ROOT/plugins/pyenv-virtualenv" ]]; then
+  if [[ -d "$PYENV_ROOT/plugins/pyenv-virtualenv" && "$ZSH_PYENV_VIRTUALENV" != false ]]; then
     eval "$(pyenv virtualenv-init - zsh)"
   fi
 

From 19710a2d17d69dc0315465875c4becbf5e4ead38 Mon Sep 17 00:00:00 2001
From: Terry <tmoschou@gmail.com>
Date: Mon, 6 Sep 2021 18:02:19 +0930
Subject: [PATCH 421/869] fix(pyenv): do not warn if PYENV_ROOT is undefined
 (#10162)

Co-authored-by: Terry Moschou <terry.moschou@fivecast.com>
---
 plugins/pyenv/pyenv.plugin.zsh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/plugins/pyenv/pyenv.plugin.zsh b/plugins/pyenv/pyenv.plugin.zsh
index 922df8ead..d91b5daa7 100644
--- a/plugins/pyenv/pyenv.plugin.zsh
+++ b/plugins/pyenv/pyenv.plugin.zsh
@@ -62,14 +62,14 @@ if [[ $FOUND_PYENV -ne 1 ]]; then
 fi
 
 if [[ $FOUND_PYENV -eq 1 ]]; then
-  # Setup $PYENV_ROOT if not already set
   if [[ -z "$PYENV_ROOT" ]]; then
+    # This is only for backwards compatibility with users that previously relied
+    # on this plugin exporting it. pyenv itself does not require it to be exported
     export PYENV_ROOT="$(pyenv root)"
-    pyenv_config_warning 'missing $PYENV_ROOT'
   fi
 
   # Add pyenv shims to $PATH if not already added
-  if [[ -z "${path[(Re)$PYENV_ROOT/shims]}" ]]; then
+  if [[ -z "${path[(Re)$(pyenv root)/shims]}" ]]; then
     eval "$(pyenv init --path)"
     pyenv_config_warning 'missing pyenv shims in $PATH'
   fi
@@ -78,7 +78,7 @@ if [[ $FOUND_PYENV -eq 1 ]]; then
   eval "$(pyenv init - --no-rehash zsh)"
 
   # If pyenv-virtualenv exists, load it
-  if [[ -d "$PYENV_ROOT/plugins/pyenv-virtualenv" && "$ZSH_PYENV_VIRTUALENV" != false ]]; then
+  if [[ -d "$(pyenv root)/plugins/pyenv-virtualenv" && "$ZSH_PYENV_VIRTUALENV" != false ]]; then
     eval "$(pyenv virtualenv-init - zsh)"
   fi
 

From a5850d441b2168bbcc17ddcbe03c9b9cdb2720e0 Mon Sep 17 00:00:00 2001
From: Neil Girdhar <mistersheik@gmail.com>
Date: Mon, 6 Sep 2021 05:21:44 -0400
Subject: [PATCH 422/869] feat(git): change from commiter to author in `git
 log` aliases (#9670)

---
 plugins/git/README.md      | 6 +++---
 plugins/git/git.plugin.zsh | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/plugins/git/README.md b/plugins/git/README.md
index 48cf87204..13571c821 100644
--- a/plugins/git/README.md
+++ b/plugins/git/README.md
@@ -98,11 +98,11 @@ plugins=(... git)
 | glgga                | git log --graph --decorate --all                                                                                                 |
 | glgm                 | git log --graph --max-count=10                                                                                                   |
 | glo                  | git log --oneline --decorate                                                                                                     |
-| glol                 | git log --graph --pretty='%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset'                           |
-| glols                | git log --graph --pretty='%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --stat                    |
+| glol                 | git log --graph --pretty='%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%ar) %C(bold blue)<%an>%Creset'                           |
+| glols                | git log --graph --pretty='%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%ar) %C(bold blue)<%an>%Creset' --stat                    |
 | glod                 | git log --graph --pretty='%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%ad) %C(bold blue)<%an>%Creset'                           |
 | glods                | git log --graph --pretty='%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%ad) %C(bold blue)<%an>%Creset' --date=short              |
-| glola                | git log --graph --pretty='%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --all                     |
+| glola                | git log --graph --pretty='%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%ar) %C(bold blue)<%an>%Creset' --all                     |
 | glog                 | git log --oneline --decorate --graph                                                                                             |
 | gloga                | git log --oneline --decorate --graph --all                                                                                       |
 | glp                  | git log --pretty=\<format\>                                                                                                      |
diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index 2985ba024..03769ed0f 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -210,11 +210,11 @@ alias glgg='git log --graph'
 alias glgga='git log --graph --decorate --all'
 alias glgm='git log --graph --max-count=10'
 alias glo='git log --oneline --decorate'
-alias glol="git log --graph --pretty='%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset'"
-alias glols="git log --graph --pretty='%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --stat"
+alias glol="git log --graph --pretty='%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%ar) %C(bold blue)<%an>%Creset'"
+alias glols="git log --graph --pretty='%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%ar) %C(bold blue)<%an>%Creset' --stat"
 alias glod="git log --graph --pretty='%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%ad) %C(bold blue)<%an>%Creset'"
 alias glods="git log --graph --pretty='%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%ad) %C(bold blue)<%an>%Creset' --date=short"
-alias glola="git log --graph --pretty='%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --all"
+alias glola="git log --graph --pretty='%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%ar) %C(bold blue)<%an>%Creset' --all"
 alias glog='git log --oneline --decorate --graph'
 alias gloga='git log --oneline --decorate --graph --all'
 alias glp="_git_log_prettily"

From a15ac80bba400cffd6a2e2e32be9c39cd7d13411 Mon Sep 17 00:00:00 2001
From: Gijs Key <gmkey@users.noreply.github.com>
Date: Mon, 6 Sep 2021 11:28:32 +0200
Subject: [PATCH 423/869] feat(gcloud): add Mac M1 Homebrew path (#10143)

Homebrew on Mac M1 is moved to the /opt/Homebrew location. This change updates the search
locations with this path.
---
 plugins/gcloud/gcloud.plugin.zsh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/gcloud/gcloud.plugin.zsh b/plugins/gcloud/gcloud.plugin.zsh
index c7aebe697..7368eb3a6 100644
--- a/plugins/gcloud/gcloud.plugin.zsh
+++ b/plugins/gcloud/gcloud.plugin.zsh
@@ -7,6 +7,7 @@ if [[ -z "${CLOUDSDK_HOME}" ]]; then
   search_locations=(
     "$HOME/google-cloud-sdk"
     "/usr/local/Caskroom/google-cloud-sdk/latest/google-cloud-sdk"
+    "/opt/homebrew/Caskroom/google-cloud-sdk/latest/google-cloud-sdk"
     "/usr/share/google-cloud-sdk"
     "/snap/google-cloud-sdk/current"
     "/usr/lib64/google-cloud-sdk/"

From 4d5bfe4c69360353cf7ed9d99b672cb840e9bbcf Mon Sep 17 00:00:00 2001
From: Julian Horsch <julian.horsch@gmail.com>
Date: Mon, 6 Sep 2021 11:30:28 +0200
Subject: [PATCH 424/869] feat(autojump): add new Homebrew default path on M1
 Macs (#9637)

On M1-Macs homebrew uses /opt/homebrew as default location for ARM
packages. This results in the autojump plugin not being able to find
autojump after a clean default installation.
This commit adds the new default location to the autojump plugin.
---
 plugins/autojump/autojump.plugin.zsh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/autojump/autojump.plugin.zsh b/plugins/autojump/autojump.plugin.zsh
index f40b0e931..3117c6da4 100644
--- a/plugins/autojump/autojump.plugin.zsh
+++ b/plugins/autojump/autojump.plugin.zsh
@@ -10,6 +10,7 @@ autojump_paths=(
   /usr/local/share/autojump/autojump.zsh             # FreeBSD installation
   /opt/local/etc/profile.d/autojump.sh               # macOS with MacPorts
   /usr/local/etc/profile.d/autojump.sh               # macOS with Homebrew (default)
+  /opt/homebrew/etc/profile.d/autojump.sh            # macOS with Homebrew (default on M1 macs)
 )
 
 for file in $autojump_paths; do

From 97b4ab76b8c3743187495599a1ca87c520665299 Mon Sep 17 00:00:00 2001
From: "Michael J. Cohen" <mjc@kernel.org>
Date: Mon, 6 Sep 2021 05:31:56 -0400
Subject: [PATCH 425/869] fix(chruby): fix typo in test for Homebrew path
 (#9887)

---
 plugins/chruby/chruby.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/chruby/chruby.plugin.zsh b/plugins/chruby/chruby.plugin.zsh
index f7fedb5f2..32f0525aa 100644
--- a/plugins/chruby/chruby.plugin.zsh
+++ b/plugins/chruby/chruby.plugin.zsh
@@ -37,7 +37,7 @@ _homebrew-installed() {
 }
 
 _chruby-from-homebrew-installed() {
-  [ -r _brew_prefix ] &> /dev/null
+  [ -r $_brew_prefix ] &> /dev/null
 }
 
 _ruby-build_installed() {

From 7336ebcd8f095b0ead7e1e39bdc2fff57275acfd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Mon, 6 Sep 2021 13:30:16 +0200
Subject: [PATCH 426/869] feat(changelog): change style of `BREAKING CHANGES`
 header

---
 tools/changelog.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tools/changelog.sh b/tools/changelog.sh
index 6913ae49a..b4b8d0c9e 100755
--- a/tools/changelog.sh
+++ b/tools/changelog.sh
@@ -285,8 +285,9 @@ function display-release {
     (( $#breaking != 0 )) || return 0
 
     case "$output" in
+    text) fmt:header "\e[31mBREAKING CHANGES" 3 ;;
     raw) fmt:header "BREAKING CHANGES" 3 ;;
-    text|md) fmt:header "⚠ BREAKING CHANGES" 3 ;;
+    md) fmt:header "BREAKING CHANGES ⚠" 3 ;;
     esac
 
     local hash subject

From 5a4159cd29ab9dfa31e7747dd676f3cf0e19bf81 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Mon, 6 Sep 2021 13:25:35 +0200
Subject: [PATCH 427/869] fix(git)!: rename `git mergetool` aliases to `gmtl*`
 (#9154)

BREAKING CHANGE: the `gmt` alias conflicts with the Generic Mapping Tools command.
For that, the `gmt` alias has been renamed to `gmtl`, and `gmtvim` has been renamed to
`gmtlvim` for consistency.

Fixes #9154
---
 plugins/git/README.md      | 4 ++--
 plugins/git/git.plugin.zsh | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/plugins/git/README.md b/plugins/git/README.md
index 13571c821..64c507345 100644
--- a/plugins/git/README.md
+++ b/plugins/git/README.md
@@ -108,8 +108,8 @@ plugins=(... git)
 | glp                  | git log --pretty=\<format\>                                                                                                      |
 | gm                   | git merge                                                                                                                        |
 | gmom                 | git merge origin/$(git_main_branch)                                                                                              |
-| gmt                  | git mergetool --no-prompt                                                                                                        |
-| gmtvim               | git mergetool --no-prompt --tool=vimdiff                                                                                         |
+| gmtl                 | git mergetool --no-prompt                                                                                                        |
+| gmtlvim              | git mergetool --no-prompt --tool=vimdiff                                                                                         |
 | gmum                 | git merge upstream/$(git_main_branch)                                                                                            |
 | gma                  | git merge --abort                                                                                                                |
 | gp                   | git push                                                                                                                         |
diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index 03769ed0f..d030d2801 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -221,8 +221,8 @@ alias glp="_git_log_prettily"
 
 alias gm='git merge'
 alias gmom='git merge origin/$(git_main_branch)'
-alias gmt='git mergetool --no-prompt'
-alias gmtvim='git mergetool --no-prompt --tool=vimdiff'
+alias gmtl='git mergetool --no-prompt'
+alias gmtlvim='git mergetool --no-prompt --tool=vimdiff'
 alias gmum='git merge upstream/$(git_main_branch)'
 alias gma='git merge --abort'
 

From ab8b9913cb6cba35da3126887d4c0b67f033fffa Mon Sep 17 00:00:00 2001
From: Xuehai Pan <XuehaiPan@outlook.com>
Date: Mon, 6 Sep 2021 23:46:56 +0800
Subject: [PATCH 428/869] fix(git-auto-fetch): cancel fetch if we don't have
 permission over git folder (#10010)

---
 plugins/git-auto-fetch/git-auto-fetch.plugin.zsh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/plugins/git-auto-fetch/git-auto-fetch.plugin.zsh b/plugins/git-auto-fetch/git-auto-fetch.plugin.zsh
index 0da84f2f5..dbc949621 100644
--- a/plugins/git-auto-fetch/git-auto-fetch.plugin.zsh
+++ b/plugins/git-auto-fetch/git-auto-fetch.plugin.zsh
@@ -11,8 +11,9 @@ function git-fetch-all {
       return 0
     fi
 
-    # Do nothing if auto-fetch disabled
-    if [[ -z "$gitdir" || -f "$gitdir/NO_AUTO_FETCH" ]]; then
+    # Do nothing if auto-fetch is disabled or don't have permissions
+    if [[ ! -w "$gitdir" || -f "$gitdir/NO_AUTO_FETCH" ]] ||
+       [[ -f "$gitdir/FETCH_LOG" && ! -w "$gitdir/FETCH_LOG" ]]; then
       return 0
     fi
 

From af271c9e387f9b536205a7f459802369cb26a7e0 Mon Sep 17 00:00:00 2001
From: Moshe Avni <moshe@avni.us>
Date: Mon, 6 Sep 2021 18:56:39 +0300
Subject: [PATCH 429/869] feat(git-auto-fetch): add date to git-auto-fetch log
 file (#10021)

---
 plugins/git-auto-fetch/git-auto-fetch.plugin.zsh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/plugins/git-auto-fetch/git-auto-fetch.plugin.zsh b/plugins/git-auto-fetch/git-auto-fetch.plugin.zsh
index dbc949621..efe8cbe66 100644
--- a/plugins/git-auto-fetch/git-auto-fetch.plugin.zsh
+++ b/plugins/git-auto-fetch/git-auto-fetch.plugin.zsh
@@ -25,8 +25,9 @@ function git-fetch-all {
     fi
 
     # Fetch all remotes (avoid ssh passphrase prompt)
+    date -R &>! "$gitdir/FETCH_LOG"
     GIT_SSH_COMMAND="command ssh -o BatchMode=yes" \
-      command git fetch --all 2>/dev/null &>! "$gitdir/FETCH_LOG"
+      command git fetch --all 2>/dev/null &>> "$gitdir/FETCH_LOG"
   ) &|
 }
 

From f341c8c20646bd82d5d84fae32f68b760e0f1be0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Tue, 7 Sep 2021 17:08:46 +0200
Subject: [PATCH 430/869] feat(changelog): print BREAKING CHANGE messages in a
 prettier way

---
 tools/changelog.sh | 25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/tools/changelog.sh b/tools/changelog.sh
index b4b8d0c9e..966e91c25 100755
--- a/tools/changelog.sh
+++ b/tools/changelog.sh
@@ -181,6 +181,12 @@ function display-release {
     return
   fi
 
+  # Get length of longest scope for padding
+  local max_scope=0
+  for hash in ${(k)scopes}; do
+    max_scope=$(( max_scope < ${#scopes[$hash]} ? ${#scopes[$hash]} : max_scope ))
+  done
+
   ##* Formatting functions
 
   # Format the hash according to output format
@@ -220,18 +226,13 @@ function display-release {
     #* Uses $scopes (A) and $hash from outer scope
     local scope="${1:-${scopes[$hash]}}"
 
-    # Get length of longest scope for padding
-    local max_scope=0 padding=0
-    for hash in ${(k)scopes}; do
-      max_scope=$(( max_scope < ${#scopes[$hash]} ? ${#scopes[$hash]} : max_scope ))
-    done
-
     # If no scopes, exit the function
     if [[ $max_scope -eq 0 ]]; then
       return
     fi
 
     # Get how much padding is required for this scope
+    local padding=0
     padding=$(( max_scope < ${#scope} ? 0 : max_scope - ${#scope} ))
     padding="${(r:$padding:: :):-}"
 
@@ -290,11 +291,15 @@ function display-release {
     md) fmt:header "BREAKING CHANGES ⚠" 3 ;;
     esac
 
-    local hash subject
+    local hash message
+    local wrap_width=$(( (COLUMNS < 100 ? COLUMNS : 100) - 3 ))
     for hash message in ${(kv)breaking}; do
-      echo " - $(fmt:hash) $(fmt:scope)$(fmt:subject "${message}")"
-    done | sort
-    echo
+      # Format the BREAKING CHANGE message by word-wrapping it at maximum 100 characters
+      # (use $COLUMNS if smaller than 100), and adding a 3-space left padding.
+      message="$(fmt -w $wrap_width <<< "$message" | sed 's/^/   /')"
+      # Display hash and scope first, and then the full message with newline separators
+      echo " - $(fmt:hash) $(fmt:scope)\n\n$(fmt:subject "$message")\n"
+    done
   }
 
   function display:type {

From 37a60eebc107c08047d4b5716c1c1760104aa25d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Tue, 7 Sep 2021 17:13:46 +0200
Subject: [PATCH 431/869] chore(changelog): fix first-letter uppercase in
 breaking change messages

---
 tools/changelog.sh | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/tools/changelog.sh b/tools/changelog.sh
index 966e91c25..7329a9526 100755
--- a/tools/changelog.sh
+++ b/tools/changelog.sh
@@ -294,11 +294,12 @@ function display-release {
     local hash message
     local wrap_width=$(( (COLUMNS < 100 ? COLUMNS : 100) - 3 ))
     for hash message in ${(kv)breaking}; do
-      # Format the BREAKING CHANGE message by word-wrapping it at maximum 100 characters
-      # (use $COLUMNS if smaller than 100), and adding a 3-space left padding.
-      message="$(fmt -w $wrap_width <<< "$message" | sed 's/^/   /')"
-      # Display hash and scope first, and then the full message with newline separators
-      echo " - $(fmt:hash) $(fmt:scope)\n\n$(fmt:subject "$message")\n"
+      # Format the BREAKING CHANGE message by word-wrapping it at maximum 100
+      # characters (use $COLUMNS if smaller than 100)
+      message="$(fmt -w $wrap_width <<< "$message")"
+      # Display hash and scope in their own line, and then the full message with
+      # blank lines as separators and a 3-space left padding
+      echo " - $(fmt:hash) $(fmt:scope)\n\n$(fmt:subject "$message" | sed 's/^/   /')\n"
     done
   }
 

From 450acc0113b114352ce3b94870fe63fc461844bd Mon Sep 17 00:00:00 2001
From: Carlo Sala <carlosalag@protonmail.com>
Date: Tue, 7 Sep 2021 20:02:20 +0200
Subject: [PATCH 432/869] fix: automatically create completion for `cargo` and
 `rustup` plugins (#10087)

---
 plugins/cargo/.gitignore         |    1 +
 plugins/cargo/_cargo             |  407 -----------
 plugins/cargo/cargo.plugin.zsh   |   11 +
 plugins/rustup/.gitignore        |    1 +
 plugins/rustup/_rustup           | 1143 ------------------------------
 plugins/rustup/rustup.plugin.zsh |   12 +
 6 files changed, 25 insertions(+), 1550 deletions(-)
 create mode 100644 plugins/cargo/.gitignore
 delete mode 100644 plugins/cargo/_cargo
 create mode 100644 plugins/cargo/cargo.plugin.zsh
 create mode 100644 plugins/rustup/.gitignore
 delete mode 100644 plugins/rustup/_rustup
 create mode 100644 plugins/rustup/rustup.plugin.zsh

diff --git a/plugins/cargo/.gitignore b/plugins/cargo/.gitignore
new file mode 100644
index 000000000..42d7ecdd6
--- /dev/null
+++ b/plugins/cargo/.gitignore
@@ -0,0 +1 @@
+_cargo
diff --git a/plugins/cargo/_cargo b/plugins/cargo/_cargo
deleted file mode 100644
index ebff99310..000000000
--- a/plugins/cargo/_cargo
+++ /dev/null
@@ -1,407 +0,0 @@
-#compdef cargo
-
-autoload -U regexp-replace
-
-_cargo() {
-    local curcontext="$curcontext" ret=1
-    local -a command_scope_spec common parallel features msgfmt triple target registry
-    local -a state line state_descr # These are set by _arguments
-    typeset -A opt_args
-
-    common=(
-        '(-q --quiet)*'{-v,--verbose}'[use verbose output]'
-        '(-q --quiet -v --verbose)'{-q,--quiet}'[no output printed to stdout]'
-        '-Z+[pass unstable (nightly-only) flags to cargo]: :_cargo_unstable_flags'
-        '--frozen[require that Cargo.lock and cache are up to date]'
-        '--locked[require that Cargo.lock is up to date]'
-        '--color=[specify colorization option]:coloring:(auto always never)'
-        '(- 1 *)'{-h,--help}'[show help message]'
-    )
-
-    # leading items in parentheses are an exclusion list for the arguments following that arg
-    # See: http://zsh.sourceforge.net/Doc/Release/Completion-System.html#Completion-Functions
-    #   - => exclude all other options
-    #   1 => exclude positional arg 1
-    #   * => exclude all other args
-    #   +blah => exclude +blah
-    _arguments -s -S -C $common \
-        '(- 1 *)--list[list installed commands]' \
-        '(- 1 *)--explain=[provide a detailed explanation of an error message]:error code' \
-        '(- 1 *)'{-V,--version}'[show version information]' \
-        '(+beta +nightly)+stable[use the stable toolchain]' \
-        '(+stable +nightly)+beta[use the beta toolchain]' \
-        '(+stable +beta)+nightly[use the nightly toolchain]' \
-        '1: :_cargo_cmds' \
-        '*:: :->args'
-
-    # These flags are mutually exclusive specifiers for the scope of a command; as
-    # they are used in multiple places without change, they are expanded into the
-    # appropriate command's `_arguments` where appropriate.
-    command_scope_spec=(
-        '(--bin --example --test --lib)--bench=[specify benchmark name]: :_cargo_benchmark_names'
-        '(--bench --bin --test --lib)--example=[specify example name]:example name'
-        '(--bench --example --test --lib)--bin=[specify binary name]:binary name'
-        '(--bench --bin --example --test)--lib=[specify library name]:library name'
-        '(--bench --bin --example --lib)--test=[specify test name]:test name'
-    )
-
-    parallel=(
-        '(-j --jobs)'{-j+,--jobs=}'[specify number of parallel jobs]:jobs [# of CPUs]'
-    )
-
-    features=(
-        '(--all-features)--features=[specify features to activate]:feature'
-        '(--features)--all-features[activate all available features]'
-        "--no-default-features[don't build the default features]"
-    )
-
-    msgfmt='--message-format=[specify error format]:error format [human]:(human json short)'
-    triple='--target=[specify target triple]:target triple'
-    target='--target-dir=[specify directory for all generated artifacts]:directory:_directories'
-    manifest='--manifest-path=[specify path to manifest]:path:_directories'
-    registry='--registry=[specify registry to use]:registry'
-
-    case $state in
-        args)
-            curcontext="${curcontext%:*}-${words[1]}:"
-            case ${words[1]} in
-                bench)
-                    _arguments -s -A "^--" $common $parallel $features $msgfmt $triple $target $manifest \
-                        "${command_scope_spec[@]}" \
-                        '--all-targets[benchmark all targets]' \
-                        "--no-run[compile but don't run]" \
-                        '(-p --package)'{-p+,--package=}'[specify package to run benchmarks for]:package:_cargo_package_names' \
-                        '--exclude=[exclude packages from the benchmark]:spec' \
-                        '--no-fail-fast[run all benchmarks regardless of failure]' \
-                        '1: :_guard "^-*" "bench name"' \
-                        '*:args:_default'
-                        ;;
-
-                build|b)
-                    _arguments -s -S $common $parallel $features $msgfmt $triple $target $manifest \
-                        '--all-targets[equivalent to specifying --lib --bins --tests --benches --examples]' \
-                        "${command_scope_spec[@]}" \
-                        '(-p --package)'{-p+,--package=}'[specify package to build]:package:_cargo_package_names' \
-                        '--release[build in release mode]' \
-                        '--build-plan[output the build plan in JSON]' \
-                        ;;
-
-                check|c)
-                    _arguments -s -S $common $parallel $features $msgfmt $triple $target $manifest \
-                        '--all-targets[equivalent to specifying --lib --bins --tests --benches --examples]' \
-                        "${command_scope_spec[@]}" \
-                        '(-p --package)'{-p+,--package=}'[specify package to check]:package:_cargo_package_names' \
-                        '--release[check in release mode]' \
-                        ;;
-
-                clean)
-                    _arguments -s -S $common $triple $target $manifest \
-                        '(-p --package)'{-p+,--package=}'[specify package to clean]:package:_cargo_package_names' \
-                        '--release[clean release artifacts]' \
-                        '--doc[clean just the documentation directory]'
-                        ;;
-
-                doc)
-                    _arguments -s -S $common $parallel $features $msgfmt $triple $target $manifest \
-                        '--no-deps[do not build docs for dependencies]' \
-                        '--document-private-items[include non-public items in the documentation]' \
-                        '--open[open docs in browser after the build]' \
-                        '(-p --package)'{-p+,--package=}'[specify package to document]:package:_cargo_package_names' \
-                        '--release[build artifacts in release mode, with optimizations]' \
-                        ;;
-
-                fetch)
-                    _arguments -s -S $common $triple $manifest
-                        ;;
-
-                fix)
-                    _arguments -s -S $common $parallel $features $msgfmt $triple $target $manifest \
-                        "${command_scope_spec[@]}" \
-                        '--broken-code[fix code even if it already has compiler errors]' \
-                        '--edition[fix in preparation for the next edition]' \
-                        '--edition-idioms[fix warnings to migrate to the idioms of an edition]' \
-                        '--allow-no-vcs[fix code even if a VCS was not detected]' \
-                        '--allow-dirty[fix code even if the working directory is dirty]' \
-                        '--allow-staged[fix code even if the working directory has staged changes]'
-                ;;
-
-                generate-lockfile)
-                    _arguments -s -S $common $manifest
-                        ;;
-
-                git-checkout)
-                    _arguments -s -S $common \
-                        '--reference=:reference' \
-                        '--url=:url:_urls'
-                        ;;
-
-                help)
-                    _cargo_cmds
-                        ;;
-
-                init)
-                    _arguments -s -S $common $registry \
-                        '--lib[use library template]' \
-                        '--edition=[specify edition to set for the crate generated]:edition:(2015 2018)' \
-                        '--vcs=[initialize a new repo with a given VCS]:vcs:(git hg pijul fossil none)' \
-                        '--name=[set the resulting package name]:name' \
-                        '1:path:_directories'
-                        ;;
-
-                install)
-                    _arguments -s -S $common $parallel $features $triple $registry \
-                        '(-f --force)'{-f,--force}'[force overwriting of existing crates or binaries]' \
-                        '--bin=[only install the specified binary]:binary' \
-                        '--branch=[branch to use when installing from git]:branch' \
-                        '--debug[build in debug mode instead of release mode]' \
-                        '--example=[install the specified example instead of binaries]:example' \
-                        '--git=[specify URL from which to install the crate]:url:_urls' \
-                        '--path=[local filesystem path to crate to install]: :_directories' \
-                        '--rev=[specific commit to use when installing from git]:commit' \
-                        '--root=[directory to install packages into]: :_directories' \
-                        '--tag=[tag to use when installing from git]:tag' \
-                        '--vers=[version to install from crates.io]:version' \
-                        '--list[list all installed packages and their versions]' \
-                        '*: :_guard "^-*" "crate"'
-                        ;;
-
-                locate-project)
-                    _arguments -s -S $common $manifest
-                        ;;
-
-                login)
-                    _arguments -s -S $common $registry \
-                        '*: :_guard "^-*" "token"'
-                        ;;
-
-                metadata)
-                    _arguments -s -S $common $features $manifest \
-                        "--no-deps[output information only about the root package and don't fetch dependencies]" \
-                        '--format-version=[specify format version]:version [1]:(1)'
-                        ;;
-
-                new)
-                    _arguments -s -S $common $registry \
-                        '--lib[use library template]' \
-                        '--vcs:initialize a new repo with a given VCS:(git hg none)' \
-                        '--name=[set the resulting package name]'
-                        ;;
-
-                owner)
-                    _arguments -s -S $common $registry \
-                        '(-a --add)'{-a,--add}'[specify name of a user or team to invite as an owner]:name' \
-                        '--index=[specify registry index]:index' \
-                        '(-l --list)'{-l,--list}'[list owners of a crate]' \
-                        '(-r --remove)'{-r,--remove}'[specify name of a user or team to remove as an owner]:name' \
-                        '--token=[specify API token to use when authenticating]:token' \
-                        '*: :_guard "^-*" "crate"'
-                        ;;
-
-                package)
-                    _arguments -s -S $common $parallel $features $triple $target $manifest \
-                        '(-l --list)'{-l,--list}'[print files included in a package without making one]' \
-                        '--no-metadata[ignore warnings about a lack of human-usable metadata]' \
-                        '--allow-dirty[allow dirty working directories to be packaged]' \
-                        "--no-verify[don't build to verify contents]"
-                        ;;
-
-                pkgid)
-                    _arguments -s -S $common $manifest \
-                        '(-p --package)'{-p+,--package=}'[specify package to get ID specifier for]:package:_cargo_package_names' \
-                        '*: :_guard "^-*" "spec"'
-                        ;;
-
-                publish)
-                    _arguments -s -S $common $parallel $features $triple $target $manifest $registry \
-                        '--index=[specify registry index]:index' \
-                        '--allow-dirty[allow dirty working directories to be packaged]' \
-                        "--no-verify[don't verify the contents by building them]" \
-                        '--token=[specify token to use when uploading]:token' \
-                        '--dry-run[perform all checks without uploading]'
-                        ;;
-
-                read-manifest)
-                    _arguments -s -S $common $manifest
-                        ;;
-
-                run|r)
-                    _arguments -s -S $common $parallel $features $msgfmt $triple $target $manifest \
-                        '--example=[name of the bin target]:name' \
-                        '--bin=[name of the bin target]:name' \
-                        '(-p --package)'{-p+,--package=}'[specify package with the target to run]:package:_cargo_package_names' \
-                        '--release[build in release mode]' \
-                        '*: :_default'
-                        ;;
-
-                rustc)
-                    _arguments -s -S $common $parallel $features $msgfmt $triple $target $manifest \
-                        '(-p --package)'{-p+,--package=}'[specify package to build]:package:_cargo_package_names' \
-                        '--profile=[specify profile to build the selected target for]:profile' \
-                        '--release[build artifacts in release mode, with optimizations]' \
-                        "${command_scope_spec[@]}" \
-                        '*: : _dispatch rustc rustc -default-'
-                        ;;
-
-                rustdoc)
-                    _arguments -s -S $common $parallel $features $msgfmt $triple $target $manifest \
-                        '--document-private-items[include non-public items in the documentation]' \
-                        '--open[open the docs in a browser after the operation]' \
-                        '(-p --package)'{-p+,--package=}'[specify package to document]:package:_cargo_package_names' \
-                        '--release[build artifacts in release mode, with optimizations]' \
-                        "${command_scope_spec[@]}" \
-                        '*: : _dispatch rustdoc rustdoc -default-'
-                        ;;
-
-                search)
-                    _arguments -s -S $common $registry \
-                        '--index=[specify registry index]:index' \
-                        '--limit=[limit the number of results]:results [10]' \
-                        '*: :_guard "^-*" "query"'
-                        ;;
-
-                test|t)
-                    _arguments -s -S $common $parallel $features $msgfmt $triple $target $manifest \
-                        '--test=[test name]: :_cargo_test_names' \
-                        '--no-fail-fast[run all tests regardless of failure]' \
-                        '--no-run[compile but do not run]' \
-                        '(-p --package)'{-p+,--package=}'[package to run tests for]:package:_cargo_package_names' \
-                        '--all[test all packages in the workspace]' \
-                        '--release[build artifacts in release mode, with optimizations]' \
-                        '1: :_cargo_test_names' \
-                        '(--doc --bin --example --test --bench)--lib[only test library]' \
-                        '(--lib --bin --example --test --bench)--doc[only test documentation]' \
-                        '(--lib --doc --example --test --bench)--bin=[binary name]' \
-                        '(--lib --doc --bin --test --bench)--example=[example name]' \
-                        '(--lib --doc --bin --example --bench)--test=[test name]' \
-                        '(--lib --doc --bin --example --test)--bench=[benchmark name]' \
-                        '*: :_default'
-                        ;;
-
-                uninstall)
-                    _arguments -s -S $common \
-                        '(-p --package)'{-p+,--package=}'[specify package to uninstall]:package:_cargo_package_names' \
-                        '--bin=[only uninstall the specified binary]:name' \
-                        '--root=[directory to uninstall packages from]: :_files -/' \
-                        '*:crate:_cargo_installed_crates -F line'
-                        ;;
-
-                update)
-                    _arguments -s -S $common $manifest \
-                        '--aggressive=[force dependency update]' \
-                        "--dry-run[don't actually write the lockfile]" \
-                        '(-p --package)'{-p+,--package=}'[specify package to update]:package:_cargo_package_names' \
-                        '--precise=[update single dependency to precise release]:release'
-                        ;;
-
-                verify-project)
-                    _arguments -s -S $common $manifest
-                        ;;
-
-                version)
-                    _arguments -s -S $common
-                        ;;
-
-                yank)
-                    _arguments -s -S $common $registry \
-                        '--vers=[specify yank version]:version' \
-                        '--undo[undo a yank, putting a version back into the index]' \
-                        '--index=[specify registry index to yank from]:registry index' \
-                        '--token=[specify API token to use when authenticating]:token' \
-                        '*: :_guard "^-*" "crate"'
-                        ;;
-                *)
-                    # allow plugins to define their own functions
-                    if ! _call_function ret _cargo-${words[1]}; then
-                        # fallback on default completion for unknown commands
-                        _default && ret=0
-                    fi
-                    (( ! ret ))
-                ;;
-            esac
-            ;;
-    esac
-}
-
-_cargo_unstable_flags() {
-    local flags
-    flags=( help ${${${(M)${(f)"$(_call_program flags cargo -Z help)"}:#*--*}/ #-- #/:}##*-Z } )
-    _describe -t flags 'unstable flag' flags
-}
-
-_cargo_installed_crates() {
-    local expl
-    _description crates expl 'crate'
-    compadd "$@" "$expl[@]" - ${${${(f)"$(cargo install --list)"}:# *}%% *}
-}
-
-_cargo_cmds() {
-    local -a commands
-    # This uses Parameter Expansion Flags, which are a built-in Zsh feature.
-    # See more: http://zsh.sourceforge.net/Doc/Release/Expansion.html#Parameter-Expansion-Flags
-    # and       http://zsh.sourceforge.net/Doc/Release/Expansion.html#Parameter-Expansion
-    #
-    # # How this work?
-    #
-    # First it splits the result of `cargo --list` at newline, then it removes the first line.
-    # Then it removes indentation (4 whitespaces) before each items. (Note the x## pattern [1]).
-    # Then it replaces those spaces between item and description with a `:`
-    #
-    # [1]: https://github.com/zsh-users/zsh-completions/blob/master/zsh-completions-howto.org#patterns
-    commands=( ${${${(M)"${(f)$(_call_program commands cargo --list)}":#    *}/ ##/}/ ##/:} )
-    _describe -t commands 'command' commands
-}
-
-
-#FIXME: Disabled until fixed
-#gets package names from the manifest file
-_cargo_package_names() {
-    _message -e packages package
-}
-
-# Extracts the values of "name" from the array given in $1 and shows them as
-# command line options for completion
-_cargo_names_from_array() {
-    # strip json from the path
-    local manifest=${${${"$(cargo locate-project)"}%\"\}}##*\"}
-    if [[ -z $manifest ]]; then
-        return 0
-    fi
-
-    local last_line
-    local -a names;
-    local in_block=false
-    local block_name=$1
-    names=()
-    while read -r line; do
-        if [[ $last_line == "[[$block_name]]" ]]; then
-            in_block=true
-        else
-            if [[ $last_line =~ '\s*\[\[.*' ]]; then
-                in_block=false
-            fi
-        fi
-
-        if [[ $in_block == true ]]; then
-            if [[ $line =~ '\s*name\s*=' ]]; then
-                regexp-replace line '^\s*name\s*=\s*|"' ''
-                names+=( "$line" )
-            fi
-        fi
-
-        last_line=$line
-    done < "$manifest"
-    _describe "$block_name" names
-
-}
-
-#Gets the test names from the manifest file
-_cargo_test_names() {
-    _cargo_names_from_array "test"
-}
-
-#Gets the bench names from the manifest file
-_cargo_benchmark_names() {
-    _cargo_names_from_array "bench"
-}
-
-_cargo
diff --git a/plugins/cargo/cargo.plugin.zsh b/plugins/cargo/cargo.plugin.zsh
new file mode 100644
index 000000000..92eae5359
--- /dev/null
+++ b/plugins/cargo/cargo.plugin.zsh
@@ -0,0 +1,11 @@
+# COMPLETION FUNCTION
+if (( $+commands[rustup] && $+commands[cargo] )); then
+  if [[ ! -f $ZSH_CACHE_DIR/cargo_version ]] \
+    || [[ "$(cargo --version)" != "$(< "$ZSH_CACHE_DIR/cargo_version")" ]] \
+    || [[ ! -f $ZSH/plugins/cargo/_cargo ]]; then
+    rustup completions zsh cargo > $ZSH/plugins/cargo/_cargo
+    cargo --version > $ZSH_CACHE_DIR/cargo_version
+  fi
+  autoload -Uz _cargo
+  _comps[cargo]=_cargo
+fi
diff --git a/plugins/rustup/.gitignore b/plugins/rustup/.gitignore
new file mode 100644
index 000000000..ad38ae3bf
--- /dev/null
+++ b/plugins/rustup/.gitignore
@@ -0,0 +1 @@
+_rustup
diff --git a/plugins/rustup/_rustup b/plugins/rustup/_rustup
deleted file mode 100644
index dab33533a..000000000
--- a/plugins/rustup/_rustup
+++ /dev/null
@@ -1,1143 +0,0 @@
-#compdef rustup
-
-autoload -U is-at-least
-
-_rustup() {
-    typeset -A opt_args
-    typeset -a _arguments_options
-    local ret=1
-
-    if is-at-least 5.2; then
-        _arguments_options=(-s -S -C)
-    else
-        _arguments_options=(-s -C)
-    fi
-
-    local context curcontext="$curcontext" state line
-    _arguments "${_arguments_options[@]}" \
-'-v[Enable verbose output]' \
-'--verbose[Enable verbose output]' \
-'(-v --verbose)-q[Disable progress output]' \
-'(-v --verbose)--quiet[Disable progress output]' \
-'-h[Prints help information]' \
-'--help[Prints help information]' \
-'-V[Prints version information]' \
-'--version[Prints version information]' \
-'::+toolchain -- release channel (e.g. +stable) or custom toolchain to set override:_files' \
-":: :_rustup_commands" \
-"*::: :->rustup" \
-&& ret=0
-    case $state in
-    (rustup)
-        words=($line[2] "${words[@]}")
-        (( CURRENT += 1 ))
-        curcontext="${curcontext%:*:*}:rustup-command-$line[2]:"
-        case $line[2] in
-            (dump-testament)
-_arguments "${_arguments_options[@]}" \
-'-h[Prints help information]' \
-'--help[Prints help information]' \
-'-V[Prints version information]' \
-'--version[Prints version information]' \
-&& ret=0
-;;
-(show)
-_arguments "${_arguments_options[@]}" \
-'-h[Prints help information]' \
-'--help[Prints help information]' \
-'-V[Prints version information]' \
-'--version[Prints version information]' \
-":: :_rustup__show_commands" \
-"*::: :->show" \
-&& ret=0
-case $state in
-    (show)
-        words=($line[1] "${words[@]}")
-        (( CURRENT += 1 ))
-        curcontext="${curcontext%:*:*}:rustup-show-command-$line[1]:"
-        case $line[1] in
-            (active-toolchain)
-_arguments "${_arguments_options[@]}" \
-'-h[Prints help information]' \
-'--help[Prints help information]' \
-'-V[Prints version information]' \
-'--version[Prints version information]' \
-&& ret=0
-;;
-(home)
-_arguments "${_arguments_options[@]}" \
-'-h[Prints help information]' \
-'--help[Prints help information]' \
-'-V[Prints version information]' \
-'--version[Prints version information]' \
-&& ret=0
-;;
-(profile)
-_arguments "${_arguments_options[@]}" \
-'-h[Prints help information]' \
-'--help[Prints help information]' \
-'-V[Prints version information]' \
-'--version[Prints version information]' \
-&& ret=0
-;;
-(keys)
-_arguments "${_arguments_options[@]}" \
-'-h[Prints help information]' \
-'--help[Prints help information]' \
-'-V[Prints version information]' \
-'--version[Prints version information]' \
-&& ret=0
-;;
-(help)
-_arguments "${_arguments_options[@]}" \
-'-h[Prints help information]' \
-'--help[Prints help information]' \
-'-V[Prints version information]' \
-'--version[Prints version information]' \
-&& ret=0
-;;
-        esac
-    ;;
-esac
-;;
-(install)
-_arguments "${_arguments_options[@]}" \
-'--profile=[]: :(minimal default complete)' \
-'--no-self-update[Don'\''t perform self-update when running the `rustup install` command]' \
-'--force[Force an update, even if some components are missing]' \
-'-h[Prints help information]' \
-'--help[Prints help information]' \
-'-V[Prints version information]' \
-'--version[Prints version information]' \
-':toolchain -- Toolchain name, such as 'stable', 'nightly', or '1.8.0'. For more information see `rustup help toolchain`:_files' \
-&& ret=0
-;;
-(uninstall)
-_arguments "${_arguments_options[@]}" \
-'-h[Prints help information]' \
-'--help[Prints help information]' \
-'-V[Prints version information]' \
-'--version[Prints version information]' \
-':toolchain -- Toolchain name, such as 'stable', 'nightly', or '1.8.0'. For more information see `rustup help toolchain`:_files' \
-&& ret=0
-;;
-(update)
-_arguments "${_arguments_options[@]}" \
-'--no-self-update[Don'\''t perform self update when running the `rustup update` command]' \
-'--force[Force an update, even if some components are missing]' \
-'-h[Prints help information]' \
-'--help[Prints help information]' \
-'-V[Prints version information]' \
-'--version[Prints version information]' \
-'::toolchain -- Toolchain name, such as 'stable', 'nightly', or '1.8.0'. For more information see `rustup help toolchain`:_files' \
-&& ret=0
-;;
-(check)
-_arguments "${_arguments_options[@]}" \
-'-h[Prints help information]' \
-'--help[Prints help information]' \
-'-V[Prints version information]' \
-'--version[Prints version information]' \
-&& ret=0
-;;
-(default)
-_arguments "${_arguments_options[@]}" \
-'-h[Prints help information]' \
-'--help[Prints help information]' \
-'-V[Prints version information]' \
-'--version[Prints version information]' \
-'::toolchain -- Toolchain name, such as 'stable', 'nightly', or '1.8.0'. For more information see `rustup help toolchain`:_files' \
-&& ret=0
-;;
-(toolchain)
-_arguments "${_arguments_options[@]}" \
-'-h[Prints help information]' \
-'--help[Prints help information]' \
-'-V[Prints version information]' \
-'--version[Prints version information]' \
-":: :_rustup__toolchain_commands" \
-"*::: :->toolchain" \
-&& ret=0
-case $state in
-    (toolchain)
-        words=($line[1] "${words[@]}")
-        (( CURRENT += 1 ))
-        curcontext="${curcontext%:*:*}:rustup-toolchain-command-$line[1]:"
-        case $line[1] in
-            (list)
-_arguments "${_arguments_options[@]}" \
-'-v[Enable verbose output with toolchain information]' \
-'--verbose[Enable verbose output with toolchain information]' \
-'-h[Prints help information]' \
-'--help[Prints help information]' \
-'-V[Prints version information]' \
-'--version[Prints version information]' \
-&& ret=0
-;;
-(update)
-_arguments "${_arguments_options[@]}" \
-'--profile=[]: :(minimal default complete)' \
-'*-c+[Add specific components on installation]' \
-'*--component=[Add specific components on installation]' \
-'*-t+[Add specific targets on installation]' \
-'*--target=[Add specific targets on installation]' \
-'--no-self-update[Don'\''t perform self update when running the`rustup toolchain install` command]' \
-'--force[Force an update, even if some components are missing]' \
-'--allow-downgrade[Allow rustup to downgrade the toolchain to satisfy your component choice]' \
-'-h[Prints help information]' \
-'--help[Prints help information]' \
-'-V[Prints version information]' \
-'--version[Prints version information]' \
-':toolchain -- Toolchain name, such as 'stable', 'nightly', or '1.8.0'. For more information see `rustup help toolchain`:_files' \
-&& ret=0
-;;
-(add)
-_arguments "${_arguments_options[@]}" \
-'--profile=[]: :(minimal default complete)' \
-'*-c+[Add specific components on installation]' \
-'*--component=[Add specific components on installation]' \
-'*-t+[Add specific targets on installation]' \
-'*--target=[Add specific targets on installation]' \
-'--no-self-update[Don'\''t perform self update when running the`rustup toolchain install` command]' \
-'--force[Force an update, even if some components are missing]' \
-'--allow-downgrade[Allow rustup to downgrade the toolchain to satisfy your component choice]' \
-'-h[Prints help information]' \
-'--help[Prints help information]' \
-'-V[Prints version information]' \
-'--version[Prints version information]' \
-':toolchain -- Toolchain name, such as 'stable', 'nightly', or '1.8.0'. For more information see `rustup help toolchain`:_files' \
-&& ret=0
-;;
-(install)
-_arguments "${_arguments_options[@]}" \
-'--profile=[]: :(minimal default complete)' \
-'*-c+[Add specific components on installation]' \
-'*--component=[Add specific components on installation]' \
-'*-t+[Add specific targets on installation]' \
-'*--target=[Add specific targets on installation]' \
-'--no-self-update[Don'\''t perform self update when running the`rustup toolchain install` command]' \
-'--force[Force an update, even if some components are missing]' \
-'--allow-downgrade[Allow rustup to downgrade the toolchain to satisfy your component choice]' \
-'-h[Prints help information]' \
-'--help[Prints help information]' \
-'-V[Prints version information]' \
-'--version[Prints version information]' \
-':toolchain -- Toolchain name, such as 'stable', 'nightly', or '1.8.0'. For more information see `rustup help toolchain`:_files' \
-&& ret=0
-;;
-(remove)
-_arguments "${_arguments_options[@]}" \
-'-h[Prints help information]' \
-'--help[Prints help information]' \
-'-V[Prints version information]' \
-'--version[Prints version information]' \
-':toolchain -- Toolchain name, such as 'stable', 'nightly', or '1.8.0'. For more information see `rustup help toolchain`:_files' \
-&& ret=0
-;;
-(uninstall)
-_arguments "${_arguments_options[@]}" \
-'-h[Prints help information]' \
-'--help[Prints help information]' \
-'-V[Prints version information]' \
-'--version[Prints version information]' \
-':toolchain -- Toolchain name, such as 'stable', 'nightly', or '1.8.0'. For more information see `rustup help toolchain`:_files' \
-&& ret=0
-;;
-(link)
-_arguments "${_arguments_options[@]}" \
-'-h[Prints help information]' \
-'--help[Prints help information]' \
-'-V[Prints version information]' \
-'--version[Prints version information]' \
-':toolchain -- Toolchain name, such as 'stable', 'nightly', or '1.8.0'. For more information see `rustup help toolchain`:_files' \
-':path:_files' \
-&& ret=0
-;;
-(help)
-_arguments "${_arguments_options[@]}" \
-'-h[Prints help information]' \
-'--help[Prints help information]' \
-'-V[Prints version information]' \
-'--version[Prints version information]' \
-&& ret=0
-;;
-        esac
-    ;;
-esac
-;;
-(target)
-_arguments "${_arguments_options[@]}" \
-'-h[Prints help information]' \
-'--help[Prints help information]' \
-'-V[Prints version information]' \
-'--version[Prints version information]' \
-":: :_rustup__target_commands" \
-"*::: :->target" \
-&& ret=0
-case $state in
-    (target)
-        words=($line[1] "${words[@]}")
-        (( CURRENT += 1 ))
-        curcontext="${curcontext%:*:*}:rustup-target-command-$line[1]:"
-        case $line[1] in
-            (list)
-_arguments "${_arguments_options[@]}" \
-'--toolchain=[Toolchain name, such as '\''stable'\'', '\''nightly'\'', or '\''1.8.0'\''. For more information see `rustup help toolchain`]' \
-'--installed[List only installed targets]' \
-'-h[Prints help information]' \
-'--help[Prints help information]' \
-'-V[Prints version information]' \
-'--version[Prints version information]' \
-&& ret=0
-;;
-(install)
-_arguments "${_arguments_options[@]}" \
-'--toolchain=[Toolchain name, such as '\''stable'\'', '\''nightly'\'', or '\''1.8.0'\''. For more information see `rustup help toolchain`]' \
-'-h[Prints help information]' \
-'--help[Prints help information]' \
-'-V[Prints version information]' \
-'--version[Prints version information]' \
-':target -- List of targets to install; "all" installs all available targets:_files' \
-&& ret=0
-;;
-(add)
-_arguments "${_arguments_options[@]}" \
-'--toolchain=[Toolchain name, such as '\''stable'\'', '\''nightly'\'', or '\''1.8.0'\''. For more information see `rustup help toolchain`]' \
-'-h[Prints help information]' \
-'--help[Prints help information]' \
-'-V[Prints version information]' \
-'--version[Prints version information]' \
-':target -- List of targets to install; "all" installs all available targets:_files' \
-&& ret=0
-;;
-(uninstall)
-_arguments "${_arguments_options[@]}" \
-'--toolchain=[Toolchain name, such as '\''stable'\'', '\''nightly'\'', or '\''1.8.0'\''. For more information see `rustup help toolchain`]' \
-'-h[Prints help information]' \
-'--help[Prints help information]' \
-'-V[Prints version information]' \
-'--version[Prints version information]' \
-':target:_files' \
-&& ret=0
-;;
-(remove)
-_arguments "${_arguments_options[@]}" \
-'--toolchain=[Toolchain name, such as '\''stable'\'', '\''nightly'\'', or '\''1.8.0'\''. For more information see `rustup help toolchain`]' \
-'-h[Prints help information]' \
-'--help[Prints help information]' \
-'-V[Prints version information]' \
-'--version[Prints version information]' \
-':target:_files' \
-&& ret=0
-;;
-(help)
-_arguments "${_arguments_options[@]}" \
-'-h[Prints help information]' \
-'--help[Prints help information]' \
-'-V[Prints version information]' \
-'--version[Prints version information]' \
-&& ret=0
-;;
-        esac
-    ;;
-esac
-;;
-(component)
-_arguments "${_arguments_options[@]}" \
-'-h[Prints help information]' \
-'--help[Prints help information]' \
-'-V[Prints version information]' \
-'--version[Prints version information]' \
-":: :_rustup__component_commands" \
-"*::: :->component" \
-&& ret=0
-case $state in
-    (component)
-        words=($line[1] "${words[@]}")
-        (( CURRENT += 1 ))
-        curcontext="${curcontext%:*:*}:rustup-component-command-$line[1]:"
-        case $line[1] in
-            (list)
-_arguments "${_arguments_options[@]}" \
-'--toolchain=[Toolchain name, such as '\''stable'\'', '\''nightly'\'', or '\''1.8.0'\''. For more information see `rustup help toolchain`]' \
-'--installed[List only installed components]' \
-'-h[Prints help information]' \
-'--help[Prints help information]' \
-'-V[Prints version information]' \
-'--version[Prints version information]' \
-&& ret=0
-;;
-(add)
-_arguments "${_arguments_options[@]}" \
-'--toolchain=[Toolchain name, such as '\''stable'\'', '\''nightly'\'', or '\''1.8.0'\''. For more information see `rustup help toolchain`]' \
-'--target=[]' \
-'-h[Prints help information]' \
-'--help[Prints help information]' \
-'-V[Prints version information]' \
-'--version[Prints version information]' \
-':component:_files' \
-&& ret=0
-;;
-(remove)
-_arguments "${_arguments_options[@]}" \
-'--toolchain=[Toolchain name, such as '\''stable'\'', '\''nightly'\'', or '\''1.8.0'\''. For more information see `rustup help toolchain`]' \
-'--target=[]' \
-'-h[Prints help information]' \
-'--help[Prints help information]' \
-'-V[Prints version information]' \
-'--version[Prints version information]' \
-':component:_files' \
-&& ret=0
-;;
-(help)
-_arguments "${_arguments_options[@]}" \
-'-h[Prints help information]' \
-'--help[Prints help information]' \
-'-V[Prints version information]' \
-'--version[Prints version information]' \
-&& ret=0
-;;
-        esac
-    ;;
-esac
-;;
-(override)
-_arguments "${_arguments_options[@]}" \
-'-h[Prints help information]' \
-'--help[Prints help information]' \
-'-V[Prints version information]' \
-'--version[Prints version information]' \
-":: :_rustup__override_commands" \
-"*::: :->override" \
-&& ret=0
-case $state in
-    (override)
-        words=($line[1] "${words[@]}")
-        (( CURRENT += 1 ))
-        curcontext="${curcontext%:*:*}:rustup-override-command-$line[1]:"
-        case $line[1] in
-            (list)
-_arguments "${_arguments_options[@]}" \
-'-h[Prints help information]' \
-'--help[Prints help information]' \
-'-V[Prints version information]' \
-'--version[Prints version information]' \
-&& ret=0
-;;
-(add)
-_arguments "${_arguments_options[@]}" \
-'--path=[Path to the directory]' \
-'-h[Prints help information]' \
-'--help[Prints help information]' \
-'-V[Prints version information]' \
-'--version[Prints version information]' \
-':toolchain -- Toolchain name, such as 'stable', 'nightly', or '1.8.0'. For more information see `rustup help toolchain`:_files' \
-&& ret=0
-;;
-(set)
-_arguments "${_arguments_options[@]}" \
-'--path=[Path to the directory]' \
-'-h[Prints help information]' \
-'--help[Prints help information]' \
-'-V[Prints version information]' \
-'--version[Prints version information]' \
-':toolchain -- Toolchain name, such as 'stable', 'nightly', or '1.8.0'. For more information see `rustup help toolchain`:_files' \
-&& ret=0
-;;
-(remove)
-_arguments "${_arguments_options[@]}" \
-'--path=[Path to the directory]' \
-'--nonexistent[Remove override toolchain for all nonexistent directories]' \
-'-h[Prints help information]' \
-'--help[Prints help information]' \
-'-V[Prints version information]' \
-'--version[Prints version information]' \
-&& ret=0
-;;
-(unset)
-_arguments "${_arguments_options[@]}" \
-'--path=[Path to the directory]' \
-'--nonexistent[Remove override toolchain for all nonexistent directories]' \
-'-h[Prints help information]' \
-'--help[Prints help information]' \
-'-V[Prints version information]' \
-'--version[Prints version information]' \
-&& ret=0
-;;
-(help)
-_arguments "${_arguments_options[@]}" \
-'-h[Prints help information]' \
-'--help[Prints help information]' \
-'-V[Prints version information]' \
-'--version[Prints version information]' \
-&& ret=0
-;;
-        esac
-    ;;
-esac
-;;
-(run)
-_arguments "${_arguments_options[@]}" \
-'--install[Install the requested toolchain if needed]' \
-'-h[Prints help information]' \
-'--help[Prints help information]' \
-'-V[Prints version information]' \
-'--version[Prints version information]' \
-':toolchain -- Toolchain name, such as 'stable', 'nightly', or '1.8.0'. For more information see `rustup help toolchain`:_files' \
-':command:_files' \
-&& ret=0
-;;
-(which)
-_arguments "${_arguments_options[@]}" \
-'--toolchain=[Toolchain name, such as '\''stable'\'', '\''nightly'\'', or '\''1.8.0'\''. For more information see `rustup help toolchain`]' \
-'-h[Prints help information]' \
-'--help[Prints help information]' \
-'-V[Prints version information]' \
-'--version[Prints version information]' \
-':command:_files' \
-&& ret=0
-;;
-(docs)
-_arguments "${_arguments_options[@]}" \
-'--toolchain=[Toolchain name, such as '\''stable'\'', '\''nightly'\'', or '\''1.8.0'\''. For more information see `rustup help toolchain`]' \
-'--path[Only print the path to the documentation]' \
-'--alloc[The Rust core allocation and collections library]' \
-'--book[The Rust Programming Language book]' \
-'--cargo[The Cargo Book]' \
-'--core[The Rust Core Library]' \
-'--edition-guide[The Rust Edition Guide]' \
-'--nomicon[The Dark Arts of Advanced and Unsafe Rust Programming]' \
-'--proc_macro[A support library for macro authors when defining new macros]' \
-'--reference[The Rust Reference]' \
-'--rust-by-example[A collection of runnable examples that illustrate various Rust concepts and standard libraries]' \
-'--rustc[The compiler for the Rust programming language]' \
-'--rustdoc[Generate documentation for Rust projects]' \
-'--std[Standard library API documentation]' \
-'--test[Support code for rustc'\''s built in unit-test and micro-benchmarking framework]' \
-'--unstable-book[The Unstable Book]' \
-'--embedded-book[The Embedded Rust Book]' \
-'-h[Prints help information]' \
-'--help[Prints help information]' \
-'-V[Prints version information]' \
-'--version[Prints version information]' \
-'::topic -- Topic such as 'core', 'fn', 'usize', 'eprintln!', 'core::arch', 'alloc::format!', 'std::fs', 'std::fs::read_dir', 'std::io::Bytes', 'std::iter::Sum', 'std::io::error::Result' etc...:_files' \
-&& ret=0
-;;
-(doc)
-_arguments "${_arguments_options[@]}" \
-'--toolchain=[Toolchain name, such as '\''stable'\'', '\''nightly'\'', or '\''1.8.0'\''. For more information see `rustup help toolchain`]' \
-'--path[Only print the path to the documentation]' \
-'--alloc[The Rust core allocation and collections library]' \
-'--book[The Rust Programming Language book]' \
-'--cargo[The Cargo Book]' \
-'--core[The Rust Core Library]' \
-'--edition-guide[The Rust Edition Guide]' \
-'--nomicon[The Dark Arts of Advanced and Unsafe Rust Programming]' \
-'--proc_macro[A support library for macro authors when defining new macros]' \
-'--reference[The Rust Reference]' \
-'--rust-by-example[A collection of runnable examples that illustrate various Rust concepts and standard libraries]' \
-'--rustc[The compiler for the Rust programming language]' \
-'--rustdoc[Generate documentation for Rust projects]' \
-'--std[Standard library API documentation]' \
-'--test[Support code for rustc'\''s built in unit-test and micro-benchmarking framework]' \
-'--unstable-book[The Unstable Book]' \
-'--embedded-book[The Embedded Rust Book]' \
-'-h[Prints help information]' \
-'--help[Prints help information]' \
-'-V[Prints version information]' \
-'--version[Prints version information]' \
-'::topic -- Topic such as 'core', 'fn', 'usize', 'eprintln!', 'core::arch', 'alloc::format!', 'std::fs', 'std::fs::read_dir', 'std::io::Bytes', 'std::iter::Sum', 'std::io::error::Result' etc...:_files' \
-&& ret=0
-;;
-(man)
-_arguments "${_arguments_options[@]}" \
-'--toolchain=[Toolchain name, such as '\''stable'\'', '\''nightly'\'', or '\''1.8.0'\''. For more information see `rustup help toolchain`]' \
-'-h[Prints help information]' \
-'--help[Prints help information]' \
-'-V[Prints version information]' \
-'--version[Prints version information]' \
-':command:_files' \
-&& ret=0
-;;
-(self)
-_arguments "${_arguments_options[@]}" \
-'-h[Prints help information]' \
-'--help[Prints help information]' \
-'-V[Prints version information]' \
-'--version[Prints version information]' \
-":: :_rustup__self_commands" \
-"*::: :->self" \
-&& ret=0
-case $state in
-    (self)
-        words=($line[1] "${words[@]}")
-        (( CURRENT += 1 ))
-        curcontext="${curcontext%:*:*}:rustup-self-command-$line[1]:"
-        case $line[1] in
-            (update)
-_arguments "${_arguments_options[@]}" \
-'-h[Prints help information]' \
-'--help[Prints help information]' \
-'-V[Prints version information]' \
-'--version[Prints version information]' \
-&& ret=0
-;;
-(uninstall)
-_arguments "${_arguments_options[@]}" \
-'-y[]' \
-'-h[Prints help information]' \
-'--help[Prints help information]' \
-'-V[Prints version information]' \
-'--version[Prints version information]' \
-&& ret=0
-;;
-(upgrade-data)
-_arguments "${_arguments_options[@]}" \
-'-h[Prints help information]' \
-'--help[Prints help information]' \
-'-V[Prints version information]' \
-'--version[Prints version information]' \
-&& ret=0
-;;
-(help)
-_arguments "${_arguments_options[@]}" \
-'-h[Prints help information]' \
-'--help[Prints help information]' \
-'-V[Prints version information]' \
-'--version[Prints version information]' \
-&& ret=0
-;;
-        esac
-    ;;
-esac
-;;
-(set)
-_arguments "${_arguments_options[@]}" \
-'-h[Prints help information]' \
-'--help[Prints help information]' \
-'-V[Prints version information]' \
-'--version[Prints version information]' \
-":: :_rustup__set_commands" \
-"*::: :->set" \
-&& ret=0
-case $state in
-    (set)
-        words=($line[1] "${words[@]}")
-        (( CURRENT += 1 ))
-        curcontext="${curcontext%:*:*}:rustup-set-command-$line[1]:"
-        case $line[1] in
-            (default-host)
-_arguments "${_arguments_options[@]}" \
-'-h[Prints help information]' \
-'--help[Prints help information]' \
-'-V[Prints version information]' \
-'--version[Prints version information]' \
-':host_triple:_files' \
-&& ret=0
-;;
-(profile)
-_arguments "${_arguments_options[@]}" \
-'-h[Prints help information]' \
-'--help[Prints help information]' \
-'-V[Prints version information]' \
-'--version[Prints version information]' \
-':profile-name:(minimal default complete)' \
-&& ret=0
-;;
-(help)
-_arguments "${_arguments_options[@]}" \
-'-h[Prints help information]' \
-'--help[Prints help information]' \
-'-V[Prints version information]' \
-'--version[Prints version information]' \
-&& ret=0
-;;
-        esac
-    ;;
-esac
-;;
-(completions)
-_arguments "${_arguments_options[@]}" \
-'-h[Prints help information]' \
-'--help[Prints help information]' \
-'-V[Prints version information]' \
-'--version[Prints version information]' \
-'::shell:(zsh bash fish powershell elvish)' \
-'::command:(rustup cargo)' \
-&& ret=0
-;;
-(help)
-_arguments "${_arguments_options[@]}" \
-'-h[Prints help information]' \
-'--help[Prints help information]' \
-'-V[Prints version information]' \
-'--version[Prints version information]' \
-&& ret=0
-;;
-        esac
-    ;;
-esac
-}
-
-(( $+functions[_rustup_commands] )) ||
-_rustup_commands() {
-    local commands; commands=(
-        "dump-testament:Dump information about the build" \
-"show:Show the active and installed toolchains or profiles" \
-"install:Update Rust toolchains" \
-"uninstall:Uninstall Rust toolchains" \
-"update:Update Rust toolchains and rustup" \
-"check:Check for updates to Rust toolchains" \
-"default:Set the default toolchain" \
-"toolchain:Modify or query the installed toolchains" \
-"target:Modify a toolchain's supported targets" \
-"component:Modify a toolchain's installed components" \
-"override:Modify directory toolchain overrides" \
-"run:Run a command with an environment configured for a given toolchain" \
-"which:Display which binary will be run for a given command" \
-"doc:Open the documentation for the current toolchain" \
-"man:View the man page for a given command" \
-"self:Modify the rustup installation" \
-"set:Alter rustup settings" \
-"completions:Generate tab-completion scripts for your shell" \
-"help:Prints this message or the help of the given subcommand(s)" \
-    )
-    _describe -t commands 'rustup commands' commands "$@"
-}
-(( $+functions[_rustup__show__active-toolchain_commands] )) ||
-_rustup__show__active-toolchain_commands() {
-    local commands; commands=(
-        
-    )
-    _describe -t commands 'rustup show active-toolchain commands' commands "$@"
-}
-(( $+functions[_rustup__add_commands] )) ||
-_rustup__add_commands() {
-    local commands; commands=(
-        
-    )
-    _describe -t commands 'rustup add commands' commands "$@"
-}
-(( $+functions[_rustup__component__add_commands] )) ||
-_rustup__component__add_commands() {
-    local commands; commands=(
-        
-    )
-    _describe -t commands 'rustup component add commands' commands "$@"
-}
-(( $+functions[_rustup__override__add_commands] )) ||
-_rustup__override__add_commands() {
-    local commands; commands=(
-        
-    )
-    _describe -t commands 'rustup override add commands' commands "$@"
-}
-(( $+functions[_rustup__target__add_commands] )) ||
-_rustup__target__add_commands() {
-    local commands; commands=(
-        
-    )
-    _describe -t commands 'rustup target add commands' commands "$@"
-}
-(( $+functions[_rustup__toolchain__add_commands] )) ||
-_rustup__toolchain__add_commands() {
-    local commands; commands=(
-        
-    )
-    _describe -t commands 'rustup toolchain add commands' commands "$@"
-}
-(( $+functions[_rustup__check_commands] )) ||
-_rustup__check_commands() {
-    local commands; commands=(
-        
-    )
-    _describe -t commands 'rustup check commands' commands "$@"
-}
-(( $+functions[_rustup__completions_commands] )) ||
-_rustup__completions_commands() {
-    local commands; commands=(
-        
-    )
-    _describe -t commands 'rustup completions commands' commands "$@"
-}
-(( $+functions[_rustup__component_commands] )) ||
-_rustup__component_commands() {
-    local commands; commands=(
-        "list:List installed and available components" \
-"add:Add a component to a Rust toolchain" \
-"remove:Remove a component from a Rust toolchain" \
-"help:Prints this message or the help of the given subcommand(s)" \
-    )
-    _describe -t commands 'rustup component commands' commands "$@"
-}
-(( $+functions[_rustup__default_commands] )) ||
-_rustup__default_commands() {
-    local commands; commands=(
-        
-    )
-    _describe -t commands 'rustup default commands' commands "$@"
-}
-(( $+functions[_rustup__set__default-host_commands] )) ||
-_rustup__set__default-host_commands() {
-    local commands; commands=(
-        
-    )
-    _describe -t commands 'rustup set default-host commands' commands "$@"
-}
-(( $+functions[_rustup__doc_commands] )) ||
-_rustup__doc_commands() {
-    local commands; commands=(
-        
-    )
-    _describe -t commands 'rustup doc commands' commands "$@"
-}
-(( $+functions[_docs_commands] )) ||
-_docs_commands() {
-    local commands; commands=(
-        
-    )
-    _describe -t commands 'docs commands' commands "$@"
-}
-(( $+functions[_rustup__docs_commands] )) ||
-_rustup__docs_commands() {
-    local commands; commands=(
-        
-    )
-    _describe -t commands 'rustup docs commands' commands "$@"
-}
-(( $+functions[_rustup__dump-testament_commands] )) ||
-_rustup__dump-testament_commands() {
-    local commands; commands=(
-        
-    )
-    _describe -t commands 'rustup dump-testament commands' commands "$@"
-}
-(( $+functions[_rustup__component__help_commands] )) ||
-_rustup__component__help_commands() {
-    local commands; commands=(
-        
-    )
-    _describe -t commands 'rustup component help commands' commands "$@"
-}
-(( $+functions[_rustup__help_commands] )) ||
-_rustup__help_commands() {
-    local commands; commands=(
-        
-    )
-    _describe -t commands 'rustup help commands' commands "$@"
-}
-(( $+functions[_rustup__override__help_commands] )) ||
-_rustup__override__help_commands() {
-    local commands; commands=(
-        
-    )
-    _describe -t commands 'rustup override help commands' commands "$@"
-}
-(( $+functions[_rustup__self__help_commands] )) ||
-_rustup__self__help_commands() {
-    local commands; commands=(
-        
-    )
-    _describe -t commands 'rustup self help commands' commands "$@"
-}
-(( $+functions[_rustup__set__help_commands] )) ||
-_rustup__set__help_commands() {
-    local commands; commands=(
-        
-    )
-    _describe -t commands 'rustup set help commands' commands "$@"
-}
-(( $+functions[_rustup__show__help_commands] )) ||
-_rustup__show__help_commands() {
-    local commands; commands=(
-        
-    )
-    _describe -t commands 'rustup show help commands' commands "$@"
-}
-(( $+functions[_rustup__target__help_commands] )) ||
-_rustup__target__help_commands() {
-    local commands; commands=(
-        
-    )
-    _describe -t commands 'rustup target help commands' commands "$@"
-}
-(( $+functions[_rustup__toolchain__help_commands] )) ||
-_rustup__toolchain__help_commands() {
-    local commands; commands=(
-        
-    )
-    _describe -t commands 'rustup toolchain help commands' commands "$@"
-}
-(( $+functions[_rustup__show__home_commands] )) ||
-_rustup__show__home_commands() {
-    local commands; commands=(
-        
-    )
-    _describe -t commands 'rustup show home commands' commands "$@"
-}
-(( $+functions[_rustup__install_commands] )) ||
-_rustup__install_commands() {
-    local commands; commands=(
-        
-    )
-    _describe -t commands 'rustup install commands' commands "$@"
-}
-(( $+functions[_rustup__target__install_commands] )) ||
-_rustup__target__install_commands() {
-    local commands; commands=(
-        
-    )
-    _describe -t commands 'rustup target install commands' commands "$@"
-}
-(( $+functions[_rustup__toolchain__install_commands] )) ||
-_rustup__toolchain__install_commands() {
-    local commands; commands=(
-        
-    )
-    _describe -t commands 'rustup toolchain install commands' commands "$@"
-}
-(( $+functions[_rustup__show__keys_commands] )) ||
-_rustup__show__keys_commands() {
-    local commands; commands=(
-        
-    )
-    _describe -t commands 'rustup show keys commands' commands "$@"
-}
-(( $+functions[_rustup__toolchain__link_commands] )) ||
-_rustup__toolchain__link_commands() {
-    local commands; commands=(
-        
-    )
-    _describe -t commands 'rustup toolchain link commands' commands "$@"
-}
-(( $+functions[_rustup__component__list_commands] )) ||
-_rustup__component__list_commands() {
-    local commands; commands=(
-        
-    )
-    _describe -t commands 'rustup component list commands' commands "$@"
-}
-(( $+functions[_rustup__override__list_commands] )) ||
-_rustup__override__list_commands() {
-    local commands; commands=(
-        
-    )
-    _describe -t commands 'rustup override list commands' commands "$@"
-}
-(( $+functions[_rustup__target__list_commands] )) ||
-_rustup__target__list_commands() {
-    local commands; commands=(
-        
-    )
-    _describe -t commands 'rustup target list commands' commands "$@"
-}
-(( $+functions[_rustup__toolchain__list_commands] )) ||
-_rustup__toolchain__list_commands() {
-    local commands; commands=(
-        
-    )
-    _describe -t commands 'rustup toolchain list commands' commands "$@"
-}
-(( $+functions[_rustup__man_commands] )) ||
-_rustup__man_commands() {
-    local commands; commands=(
-        
-    )
-    _describe -t commands 'rustup man commands' commands "$@"
-}
-(( $+functions[_rustup__override_commands] )) ||
-_rustup__override_commands() {
-    local commands; commands=(
-        "list:List directory toolchain overrides" \
-"set:Set the override toolchain for a directory" \
-"unset:Remove the override toolchain for a directory" \
-"help:Prints this message or the help of the given subcommand(s)" \
-    )
-    _describe -t commands 'rustup override commands' commands "$@"
-}
-(( $+functions[_rustup__set__profile_commands] )) ||
-_rustup__set__profile_commands() {
-    local commands; commands=(
-        
-    )
-    _describe -t commands 'rustup set profile commands' commands "$@"
-}
-(( $+functions[_rustup__show__profile_commands] )) ||
-_rustup__show__profile_commands() {
-    local commands; commands=(
-        
-    )
-    _describe -t commands 'rustup show profile commands' commands "$@"
-}
-(( $+functions[_rustup__component__remove_commands] )) ||
-_rustup__component__remove_commands() {
-    local commands; commands=(
-        
-    )
-    _describe -t commands 'rustup component remove commands' commands "$@"
-}
-(( $+functions[_rustup__override__remove_commands] )) ||
-_rustup__override__remove_commands() {
-    local commands; commands=(
-        
-    )
-    _describe -t commands 'rustup override remove commands' commands "$@"
-}
-(( $+functions[_rustup__remove_commands] )) ||
-_rustup__remove_commands() {
-    local commands; commands=(
-        
-    )
-    _describe -t commands 'rustup remove commands' commands "$@"
-}
-(( $+functions[_rustup__target__remove_commands] )) ||
-_rustup__target__remove_commands() {
-    local commands; commands=(
-        
-    )
-    _describe -t commands 'rustup target remove commands' commands "$@"
-}
-(( $+functions[_rustup__toolchain__remove_commands] )) ||
-_rustup__toolchain__remove_commands() {
-    local commands; commands=(
-        
-    )
-    _describe -t commands 'rustup toolchain remove commands' commands "$@"
-}
-(( $+functions[_rustup__run_commands] )) ||
-_rustup__run_commands() {
-    local commands; commands=(
-        
-    )
-    _describe -t commands 'rustup run commands' commands "$@"
-}
-(( $+functions[_rustup__self_commands] )) ||
-_rustup__self_commands() {
-    local commands; commands=(
-        "update:Download and install updates to rustup" \
-"uninstall:Uninstall rustup." \
-"upgrade-data:Upgrade the internal data format." \
-"help:Prints this message or the help of the given subcommand(s)" \
-    )
-    _describe -t commands 'rustup self commands' commands "$@"
-}
-(( $+functions[_rustup__override__set_commands] )) ||
-_rustup__override__set_commands() {
-    local commands; commands=(
-        
-    )
-    _describe -t commands 'rustup override set commands' commands "$@"
-}
-(( $+functions[_rustup__set_commands] )) ||
-_rustup__set_commands() {
-    local commands; commands=(
-        "default-host:The triple used to identify toolchains when not specified" \
-"profile:The default components installed" \
-"help:Prints this message or the help of the given subcommand(s)" \
-    )
-    _describe -t commands 'rustup set commands' commands "$@"
-}
-(( $+functions[_rustup__show_commands] )) ||
-_rustup__show_commands() {
-    local commands; commands=(
-        "active-toolchain:Show the active toolchain" \
-"home:Display the computed value of RUSTUP_HOME" \
-"profile:Show the current profile" \
-"keys:Display the known PGP keys" \
-"help:Prints this message or the help of the given subcommand(s)" \
-    )
-    _describe -t commands 'rustup show commands' commands "$@"
-}
-(( $+functions[_rustup__target_commands] )) ||
-_rustup__target_commands() {
-    local commands; commands=(
-        "list:List installed and available targets" \
-"add:Add a target to a Rust toolchain" \
-"remove:Remove a target from a Rust toolchain" \
-"help:Prints this message or the help of the given subcommand(s)" \
-    )
-    _describe -t commands 'rustup target commands' commands "$@"
-}
-(( $+functions[_rustup__toolchain_commands] )) ||
-_rustup__toolchain_commands() {
-    local commands; commands=(
-        "list:List installed toolchains" \
-"install:Install or update a given toolchain" \
-"uninstall:Uninstall a toolchain" \
-"link:Create a custom toolchain by symlinking to a directory" \
-"help:Prints this message or the help of the given subcommand(s)" \
-    )
-    _describe -t commands 'rustup toolchain commands' commands "$@"
-}
-(( $+functions[_rustup__self__uninstall_commands] )) ||
-_rustup__self__uninstall_commands() {
-    local commands; commands=(
-        
-    )
-    _describe -t commands 'rustup self uninstall commands' commands "$@"
-}
-(( $+functions[_rustup__target__uninstall_commands] )) ||
-_rustup__target__uninstall_commands() {
-    local commands; commands=(
-        
-    )
-    _describe -t commands 'rustup target uninstall commands' commands "$@"
-}
-(( $+functions[_rustup__toolchain__uninstall_commands] )) ||
-_rustup__toolchain__uninstall_commands() {
-    local commands; commands=(
-        
-    )
-    _describe -t commands 'rustup toolchain uninstall commands' commands "$@"
-}
-(( $+functions[_rustup__uninstall_commands] )) ||
-_rustup__uninstall_commands() {
-    local commands; commands=(
-        
-    )
-    _describe -t commands 'rustup uninstall commands' commands "$@"
-}
-(( $+functions[_rustup__override__unset_commands] )) ||
-_rustup__override__unset_commands() {
-    local commands; commands=(
-        
-    )
-    _describe -t commands 'rustup override unset commands' commands "$@"
-}
-(( $+functions[_rustup__self__update_commands] )) ||
-_rustup__self__update_commands() {
-    local commands; commands=(
-        
-    )
-    _describe -t commands 'rustup self update commands' commands "$@"
-}
-(( $+functions[_rustup__toolchain__update_commands] )) ||
-_rustup__toolchain__update_commands() {
-    local commands; commands=(
-        
-    )
-    _describe -t commands 'rustup toolchain update commands' commands "$@"
-}
-(( $+functions[_rustup__update_commands] )) ||
-_rustup__update_commands() {
-    local commands; commands=(
-        
-    )
-    _describe -t commands 'rustup update commands' commands "$@"
-}
-(( $+functions[_rustup__self__upgrade-data_commands] )) ||
-_rustup__self__upgrade-data_commands() {
-    local commands; commands=(
-        
-    )
-    _describe -t commands 'rustup self upgrade-data commands' commands "$@"
-}
-(( $+functions[_rustup__which_commands] )) ||
-_rustup__which_commands() {
-    local commands; commands=(
-        
-    )
-    _describe -t commands 'rustup which commands' commands "$@"
-}
-
-_rustup "$@"
\ No newline at end of file
diff --git a/plugins/rustup/rustup.plugin.zsh b/plugins/rustup/rustup.plugin.zsh
new file mode 100644
index 000000000..c7a9b3060
--- /dev/null
+++ b/plugins/rustup/rustup.plugin.zsh
@@ -0,0 +1,12 @@
+# COMPLETION FUNCTION
+if (( $+commands[rustup] )); then
+  if [[ ! -f $ZSH_CACHE_DIR/rustup_version ]] \
+    || [[ "$(rustup --version 2> /dev/null)" \
+      != "$(< "$ZSH_CACHE_DIR/rustup_version")" ]] \
+    || [[ ! -f $ZSH/plugins/rustup/_rustup ]]; then
+    rustup completions zsh > $ZSH/plugins/rustup/_rustup
+    rustup --version 2> /dev/null > $ZSH_CACHE_DIR/rustup_version
+  fi
+  autoload -Uz _rustup
+  _comps[rustup]=_rustup
+fi

From 130f35fcb2e175e28178f834b16e00f121319bc4 Mon Sep 17 00:00:00 2001
From: Claas Augner <github@caugner.de>
Date: Thu, 9 Sep 2021 19:16:15 +0200
Subject: [PATCH 433/869] feat(git): add `gdu` alias to diff against upstream
 (#8721)

---
 plugins/git/README.md      | 1 +
 plugins/git/git.plugin.zsh | 1 +
 2 files changed, 2 insertions(+)

diff --git a/plugins/git/README.md b/plugins/git/README.md
index 64c507345..e53d93b0b 100644
--- a/plugins/git/README.md
+++ b/plugins/git/README.md
@@ -66,6 +66,7 @@ plugins=(... git)
 | gds                  | git diff --staged                                                                                                                |
 | gdt                  | git diff-tree --no-commit-id --name-only -r                                                                                      |
 | gdnolock             | git diff $@ ":(exclude)package-lock.json" ":(exclude)&ast;.lock"                                                                 |
+| gdu                  | git diff @{u}                                                                                                                    |
 | gdv                  | git diff -w $@ \| view -                                                                                                         |
 | gdw                  | git diff --word-diff                                                                                                             |
 | gf                   | git fetch                                                                                                                        |
diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index d030d2801..76e0faed3 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -119,6 +119,7 @@ alias gdcw='git diff --cached --word-diff'
 alias gdct='git describe --tags $(git rev-list --tags --max-count=1)'
 alias gds='git diff --staged'
 alias gdt='git diff-tree --no-commit-id --name-only -r'
+alias gdu='git diff @{u}'
 alias gdw='git diff --word-diff'
 
 function gdnolock() {

From aa6e932b06137a697296ea5be62c73905ff68848 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B3hann=20Fri=C3=B0riksson?=
 <johann.fridriksson@gmail.com>
Date: Thu, 9 Sep 2021 19:31:01 +0200
Subject: [PATCH 434/869] fix(vim-interaction): look up the newest GVim
 instance (#9095)

Instead of relying on a hardcoded instance-name existing for the default-value, let's
look up the latest instance. This also resolves my problem where MacVim
had a servername of "VIM" instead of "GVIM".

Co-authored-by: Johann Fridriksson <jofridri@silabs.com>
---
 plugins/vim-interaction/vim-interaction.plugin.zsh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/plugins/vim-interaction/vim-interaction.plugin.zsh b/plugins/vim-interaction/vim-interaction.plugin.zsh
index 010f998d3..53ec453e8 100644
--- a/plugins/vim-interaction/vim-interaction.plugin.zsh
+++ b/plugins/vim-interaction/vim-interaction.plugin.zsh
@@ -22,7 +22,8 @@ EOH
   local cmd=""
   local before="<esc>"
   local after=""
-  local name="GVIM"
+  # Look up the newest instance
+  local name="$(gvim --serverlist | tail -n 1)"
   while getopts ":b:a:n:" option
   do
     case $option in

From 358ac6a141010b19175d0eb5a6f28ff544aa75d3 Mon Sep 17 00:00:00 2001
From: Xuehai Pan <XuehaiPan@pku.edu.cn>
Date: Fri, 10 Sep 2021 04:18:09 +0800
Subject: [PATCH 435/869] fix(cp): add unique suffix to rsync backup directory
 for each user (#10170)

* fix(cp): add unique suffix to rsync backup directory for each user

* fix(cp): use `USERNAME` rather than `USER`
---
 plugins/cp/README.md     | 2 +-
 plugins/cp/cp.plugin.zsh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/cp/README.md b/plugins/cp/README.md
index e8a9b6ccc..23734243c 100644
--- a/plugins/cp/README.md
+++ b/plugins/cp/README.md
@@ -25,7 +25,7 @@ The enabled options for rsync are:
 
 * `-hhh`: outputs numbers in human-readable format, in units of 1024 (K, M, G, T).
 
-* `--backup-dir=/tmp/rsync`: move backup copies to "/tmp/rsync".
+* `--backup-dir="/tmp/rsync-$USERNAME"`: move backup copies to "/tmp/rsync-$USERNAME".
 
 * `-e /dev/null`: only work on local files (disable remote shells).
 
diff --git a/plugins/cp/cp.plugin.zsh b/plugins/cp/cp.plugin.zsh
index fe6ea87a8..a56259106 100644
--- a/plugins/cp/cp.plugin.zsh
+++ b/plugins/cp/cp.plugin.zsh
@@ -1,4 +1,4 @@
 cpv() {
-    rsync -pogbr -hhh --backup-dir=/tmp/rsync -e /dev/null --progress "$@"
+    rsync -pogbr -hhh --backup-dir="/tmp/rsync-${USERNAME}" -e /dev/null --progress "$@"
 }
 compdef _files cpv

From 81edb03c5261658d40885abf4bcd54cf9dbbc6a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Fri, 10 Sep 2021 17:06:24 +0200
Subject: [PATCH 436/869] fix(copybuffer): define CTRL+O binding for all
 keymaps (#6442)

Fixes #6442
---
 plugins/copybuffer/copybuffer.plugin.zsh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/plugins/copybuffer/copybuffer.plugin.zsh b/plugins/copybuffer/copybuffer.plugin.zsh
index 87a658d93..e67f920f0 100644
--- a/plugins/copybuffer/copybuffer.plugin.zsh
+++ b/plugins/copybuffer/copybuffer.plugin.zsh
@@ -11,4 +11,6 @@ copybuffer () {
 
 zle -N copybuffer
 
-bindkey "^O" copybuffer
+bindkey -M emacs "^O" copybuffer
+bindkey -M viins "^O" copybuffer
+bindkey -M vicmd "^O" copybuffer

From 735808f48d54aabce540f6c90294e21118104cf4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Fri, 10 Sep 2021 18:01:43 +0200
Subject: [PATCH 437/869] Revert "feat(ssh-agent): only start ssh-agent once
 (#5359)"

This reverts commit 7692881d2a61a4ba47eeef5d7827c0d2cb896def.
---
 plugins/ssh-agent/ssh-agent.plugin.zsh | 19 +------------------
 1 file changed, 1 insertion(+), 18 deletions(-)

diff --git a/plugins/ssh-agent/ssh-agent.plugin.zsh b/plugins/ssh-agent/ssh-agent.plugin.zsh
index c2b9546a2..2d7d8a2a0 100644
--- a/plugins/ssh-agent/ssh-agent.plugin.zsh
+++ b/plugins/ssh-agent/ssh-agent.plugin.zsh
@@ -96,24 +96,7 @@ else
   _start_agent
 fi
 
-() {
-  emulate -L zsh
-
-  command mkdir "$ZSH_CACHE_DIR/ssh-agent.lock" 2>/dev/null || return
-
-  trap "
-    ret=\$?
-
-    command rm -rf '$ZSH_CACHE_DIR/ssh-agent.lock'
-    unset agent_forwarding ssh_env_cache
-    unfunction _start_agent _add_identities 2>/dev/null
-
-    return \$ret
-  " EXIT INT QUIT
-
-  _add_identities
-
-}
+_add_identities
 
 unset agent_forwarding ssh_env_cache
 unfunction _start_agent _add_identities

From c21ff38b8fda0584208ffd697dac0502e2327466 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Wed, 15 Sep 2021 17:44:36 +0200
Subject: [PATCH 438/869] fix(docker): remove unwanted asterisk in completed
 docker commands

Also update upstream completion to version fe2008d04e80fafd.

NOTE: this fix means the version bundled within Oh My Zsh has diverged
from the upstream version.
---
 plugins/docker/_docker | 100 +++++++++++++++++++++++++++++++++++++++--
 1 file changed, 97 insertions(+), 3 deletions(-)

diff --git a/plugins/docker/_docker b/plugins/docker/_docker
index 7fe204313..8ee35abcf 100644
--- a/plugins/docker/_docker
+++ b/plugins/docker/_docker
@@ -1343,7 +1343,7 @@ __docker_node_complete_ls_filters() {
                 ;;
         esac
     else
-        opts=('id' 'label' 'membership' 'name' 'role')
+        opts=('id' 'label' 'membership' 'name' 'node.label' 'role')
         _describe -t filter-opts "filter options" opts -qS "=" && ret=0
     fi
 
@@ -2544,6 +2544,82 @@ __docker_volume_subcommand() {
 
 # EO volume
 
+# BO context
+
+__docker_complete_contexts() {
+    [[ $PREFIX = -* ]] && return 1
+    integer ret=1
+    declare -a contexts
+
+    contexts=(${(f)${:-"$(_call_program commands docker $docker_options context ls -q)"$'\n'}})
+
+    _describe -t context-list "context" contexts && ret=0
+    return ret
+}
+
+__docker_context_commands() {
+    local -a _docker_context_subcommands
+    _docker_context_subcommands=(
+        "create:Create new context"
+        "inspect:Display detailed information on one or more contexts"
+        "list:List available contexts"
+        "rm:Remove one or more contexts"
+        "show:Print the current context"
+        "update:Update a context"
+        "use:Set the default context"
+    )
+    _describe -t docker-context-commands "docker context command" _docker_context_subcommands
+}
+
+__docker_context_subcommand() {
+    local -a _command_args opts_help
+    local expl help="--help"
+    integer ret=1
+
+    opts_help=("(: -)--help[Print usage]")
+
+    case "$words[1]" in
+        (create)
+            _arguments $(__docker_arguments) \
+                $opts_help \
+                "($help)--default-stack-orchestrator=[Default orchestrator for stack operations to use with this context]:default-stack-orchestrator:(swarm kubernetes all)" \
+                "($help)--description=[Description of the context]:description:" \
+                "($help)--docker=[Set the docker endpoint]:docker:" \
+                "($help)--kubernetes=[Set the kubernetes endpoint]:kubernetes:" \
+                "($help)--from=[Create context from a named context]:from:__docker_complete_contexts" \
+                "($help -):name: " && ret=0
+            ;;
+        (use)
+            _arguments $(__docker_arguments) \
+                $opts_help \
+                "($help -)1:context:__docker_complete_contexts" && ret=0
+            ;;
+        (inspect)
+            _arguments $(__docker_arguments) \
+                $opts_help \
+                "($help -)1:context:__docker_complete_contexts" && ret=0
+            ;;
+        (rm)
+            _arguments $(__docker_arguments) \
+                $opts_help \
+                "($help -)1:context:__docker_complete_contexts" && ret=0
+            ;;
+        (update)
+            _arguments $(__docker_arguments) \
+                $opts_help \
+                "($help)--default-stack-orchestrator=[Default orchestrator for stack operations to use with this context]:default-stack-orchestrator:(swarm kubernetes all)" \
+                "($help)--description=[Description of the context]:description:" \
+                "($help)--docker=[Set the docker endpoint]:docker:" \
+                "($help)--kubernetes=[Set the kubernetes endpoint]:kubernetes:" \
+                "($help -):name:" && ret=0
+            ;;
+    esac
+
+    return ret
+}
+
+# EO context
+
 __docker_caching_policy() {
   oldp=( "$1"(Nmh+1) )     # 1 hour
   (( $#oldp ))
@@ -2576,7 +2652,7 @@ __docker_commands() {
     then
         local -a lines
         lines=(${(f)"$(_call_program commands docker 2>&1)"})
-        _docker_subcommands=(${${${(M)${lines[$((${lines[(i)*Commands:]} + 1)),-1]}:# *}## #}/ ##/:})
+        _docker_subcommands=(${${${(M)${lines[$((${lines[(i)*Commands:]} + 1)),-1]}:# *}## #}/\*# ##/:})
         _docker_subcommands=($_docker_subcommands 'daemon:Enable daemon mode' 'help:Show help for a command')
         (( $#_docker_subcommands > 2 )) && _store_cache docker_subcommands _docker_subcommands
     fi
@@ -2631,6 +2707,23 @@ __docker_subcommand() {
                     ;;
             esac
             ;;
+        (context)
+            local curcontext="$curcontext" state
+            _arguments $(__docker_arguments) \
+                $opts_help \
+                "($help -): :->command" \
+                "($help -)*:: :->option-or-argument" && ret=0
+
+            case $state in
+                (command)
+                    __docker_context_commands && ret=0
+                    ;;
+                (option-or-argument)
+                    curcontext=${curcontext%:*:*}:docker-${words[-1]}:
+                    __docker_context_subcommand && ret=0
+                    ;;
+            esac
+            ;;
         (daemon)
             _arguments $(__docker_arguments) \
                 $opts_help \
@@ -2698,7 +2791,8 @@ __docker_subcommand() {
                 "($help)--tlsverify[Use TLS and verify the remote]" \
                 "($help)--userns-remap=[User/Group setting for user namespaces]:user\:group:->users-groups" \
                 "($help)--userland-proxy[Use userland proxy for loopback traffic]" \
-                "($help)--userland-proxy-path=[Path to the userland proxy binary]:binary:_files" && ret=0
+                "($help)--userland-proxy-path=[Path to the userland proxy binary]:binary:_files" \
+                "($help)--validate[Validate daemon configuration and exit]" && ret=0
 
             case $state in
                 (cluster-store)

From 4e6e49652b69557c01ef1ce81c96da7eb9b34e6e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Wed, 15 Sep 2021 18:18:25 +0200
Subject: [PATCH 439/869] fix(plugins): fix `_comps` error in completion
 generation plugins (#10190)

Fixes #10190
---
 plugins/cargo/cargo.plugin.zsh   | 17 +++++++++++------
 plugins/deno/deno.plugin.zsh     | 16 +++++++++++-----
 plugins/fnm/fnm.plugin.zsh       | 17 +++++++++++------
 plugins/gh/gh.plugin.zsh         | 17 +++++++++++------
 plugins/rustup/rustup.plugin.zsh | 18 +++++++++++-------
 5 files changed, 55 insertions(+), 30 deletions(-)

diff --git a/plugins/cargo/cargo.plugin.zsh b/plugins/cargo/cargo.plugin.zsh
index 92eae5359..b636d492f 100644
--- a/plugins/cargo/cargo.plugin.zsh
+++ b/plugins/cargo/cargo.plugin.zsh
@@ -1,11 +1,16 @@
-# COMPLETION FUNCTION
 if (( $+commands[rustup] && $+commands[cargo] )); then
-  if [[ ! -f $ZSH_CACHE_DIR/cargo_version ]] \
-    || [[ "$(cargo --version)" != "$(< "$ZSH_CACHE_DIR/cargo_version")" ]] \
-    || [[ ! -f $ZSH/plugins/cargo/_cargo ]]; then
-    rustup completions zsh cargo > $ZSH/plugins/cargo/_cargo
-    cargo --version > $ZSH_CACHE_DIR/cargo_version
+  ver="$(cargo --version)"
+  ver_file="$ZSH_CACHE_DIR/cargo_version"
+  comp_file="$ZSH/plugins/cargo/_cargo"
+
+  if [[ ! -f "$comp_file" || ! -f "$ver_file" || "$ver" != "$(< "$ver_file")" ]]; then
+    rustup completions zsh cargo >| "$comp_file"
+    echo "$ver" >| "$ver_file"
   fi
+
+  declare -A _comps
   autoload -Uz _cargo
   _comps[cargo]=_cargo
+
+  unset ver ver_file comp_file
 fi
diff --git a/plugins/deno/deno.plugin.zsh b/plugins/deno/deno.plugin.zsh
index a37b3bec4..71749f4a0 100644
--- a/plugins/deno/deno.plugin.zsh
+++ b/plugins/deno/deno.plugin.zsh
@@ -12,12 +12,18 @@ alias dup='deno upgrade'
 
 # COMPLETION FUNCTION
 if (( $+commands[deno] )); then
-  if [[ ! -f $ZSH_CACHE_DIR/deno_version ]] \
-    || [[ "$(deno --version)" != "$(< "$ZSH_CACHE_DIR/deno_version")" ]] \
-    || [[ ! -f $ZSH/plugins/deno/_deno ]]; then
-    deno completions zsh > $ZSH/plugins/deno/_deno
-    deno --version > $ZSH_CACHE_DIR/deno_version
+  ver="$(deno --version)"
+  ver_file="$ZSH_CACHE_DIR/deno_version"
+  comp_file="$ZSH/plugins/deno/_deno"
+
+  if [[ ! -f "$comp_file" || ! -f "$ver_file" || "$ver" != "$(< "$ver_file")" ]]; then
+    deno completions zsh >| "$comp_file"
+    echo "$ver" >| "$ver_file"
   fi
+
+  declare -A _comps
   autoload -Uz _deno
   _comps[deno]=_deno
+
+  unset ver ver_file comp_file
 fi
diff --git a/plugins/fnm/fnm.plugin.zsh b/plugins/fnm/fnm.plugin.zsh
index 5ce558dcb..29b759abb 100644
--- a/plugins/fnm/fnm.plugin.zsh
+++ b/plugins/fnm/fnm.plugin.zsh
@@ -1,12 +1,17 @@
-# COMPLETION FUNCTION
 if (( $+commands[fnm] )); then
-  if [[ ! -f $ZSH_CACHE_DIR/fnm_version ]] \
-    || [[ "$(fnm --version)" != "$(< "$ZSH_CACHE_DIR/fnm_version")" ]] \
-    || [[ ! -f $ZSH/plugins/fnm/_fnm ]]; then
-      fnm completions --shell=zsh > $ZSH/plugins/fnm/_fnm
-      fnm --version > $ZSH_CACHE_DIR/fnm_version
+  ver="$(fnm --version)"
+  ver_file="$ZSH_CACHE_DIR/fnm_version"
+  comp_file="$ZSH/plugins/fnm/_fnm"
+
+  if [[ ! -f "$comp_file" || ! -f "$ver_file" || "$ver" != "$(< "$ver_file")" ]]; then
+    fnm completions --shell=zsh >| "$comp_file"
+    echo "$ver" >| "$ver_file"
   fi
+
+  declare -A _comps
   autoload -Uz _fnm
   _comps[fnm]=_fnm
+
+  unset ver ver_file comp_file
 fi
 
diff --git a/plugins/gh/gh.plugin.zsh b/plugins/gh/gh.plugin.zsh
index 8e055ec35..c3d87848d 100644
--- a/plugins/gh/gh.plugin.zsh
+++ b/plugins/gh/gh.plugin.zsh
@@ -1,13 +1,18 @@
 # Autocompletion for the GitHub CLI (gh).
-
 if (( $+commands[gh] )); then
-  if [[ ! -r "$ZSH_CACHE_DIR/gh_version" \
-    || "$(gh --version)" != "$(< "$ZSH_CACHE_DIR/gh_version")"
-    || ! -f "$ZSH/plugins/gh/_gh" ]]; then
-    gh completion --shell zsh > $ZSH/plugins/gh/_gh
-    gh --version > $ZSH_CACHE_DIR/gh_version
+  ver="$(gh --version)"
+  ver_file="$ZSH_CACHE_DIR/gh_version"
+  comp_file="$ZSH/plugins/gh/_gh"
+
+  if [[ ! -f "$comp_file" || ! -f "$ver_file" || "$ver" != "$(< "$ver_file")" ]]; then
+    gh completion --shell zsh >| "$comp_file"
+    echo "$ver" >| "$ver_file"
   fi
+
+  declare -A _comps
   autoload -Uz _gh
   _comps[gh]=_gh
+
+  unset ver ver_file comp_file
 fi
 
diff --git a/plugins/rustup/rustup.plugin.zsh b/plugins/rustup/rustup.plugin.zsh
index c7a9b3060..e709f41bd 100644
--- a/plugins/rustup/rustup.plugin.zsh
+++ b/plugins/rustup/rustup.plugin.zsh
@@ -1,12 +1,16 @@
-# COMPLETION FUNCTION
 if (( $+commands[rustup] )); then
-  if [[ ! -f $ZSH_CACHE_DIR/rustup_version ]] \
-    || [[ "$(rustup --version 2> /dev/null)" \
-      != "$(< "$ZSH_CACHE_DIR/rustup_version")" ]] \
-    || [[ ! -f $ZSH/plugins/rustup/_rustup ]]; then
-    rustup completions zsh > $ZSH/plugins/rustup/_rustup
-    rustup --version 2> /dev/null > $ZSH_CACHE_DIR/rustup_version
+  ver="$(rustup --version 2>/dev/null)"
+  ver_file="$ZSH_CACHE_DIR/rustup_version"
+  comp_file="$ZSH/plugins/rustup/_rustup"
+
+  if [[ ! -f "$comp_file" || ! -f "$ver_file" || "$ver" != "$(< "$ver_file")" ]]; then
+    rustup completions zsh >| "$comp_file"
+    echo "$ver" >| "$ver_file"
   fi
+
+  declare -A _comps
   autoload -Uz _rustup
   _comps[rustup]=_rustup
+
+  unset ver ver_file comp_file
 fi

From d2269180b074263f4a0d3df3f9de15a1abae8110 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Wed, 15 Sep 2021 18:41:44 +0200
Subject: [PATCH 440/869] fix(core): move plugin-generated completion files to
 `$ZSH_CACHE_DIR/completions`

Fixes #10183
---
 oh-my-zsh.sh                     | 4 ++++
 plugins/cargo/cargo.plugin.zsh   | 5 ++++-
 plugins/deno/deno.plugin.zsh     | 5 ++++-
 plugins/fnm/fnm.plugin.zsh       | 5 ++++-
 plugins/gh/gh.plugin.zsh         | 5 ++++-
 plugins/rustup/rustup.plugin.zsh | 5 ++++-
 6 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/oh-my-zsh.sh b/oh-my-zsh.sh
index 16e244be5..442972a9a 100644
--- a/oh-my-zsh.sh
+++ b/oh-my-zsh.sh
@@ -7,6 +7,10 @@ if [[ -z "$ZSH_CACHE_DIR" ]]; then
   ZSH_CACHE_DIR="$ZSH/cache"
 fi
 
+# Create completions cache dir and add to $fpath
+mkdir -p "$ZSH_CACHE_DIR/completions"
+(( ${fpath[(Ie)$ZSH_CACHE_DIR/completions]} )) || fpath=("$ZSH_CACHE_DIR/completions" $fpath)
+
 # Check for updates on initial load...
 if [ "$DISABLE_AUTO_UPDATE" != "true" ]; then
   source $ZSH/tools/check_for_upgrade.sh
diff --git a/plugins/cargo/cargo.plugin.zsh b/plugins/cargo/cargo.plugin.zsh
index b636d492f..95e63dd3c 100644
--- a/plugins/cargo/cargo.plugin.zsh
+++ b/plugins/cargo/cargo.plugin.zsh
@@ -1,7 +1,10 @@
 if (( $+commands[rustup] && $+commands[cargo] )); then
   ver="$(cargo --version)"
   ver_file="$ZSH_CACHE_DIR/cargo_version"
-  comp_file="$ZSH/plugins/cargo/_cargo"
+  comp_file="$ZSH_CACHE_DIR/completions/_cargo"
+
+  mkdir -p "${comp_file:h}"
+  (( ${fpath[(Ie)${comp_file:h}]} )) || fpath=("${comp_file:h}" $fpath)
 
   if [[ ! -f "$comp_file" || ! -f "$ver_file" || "$ver" != "$(< "$ver_file")" ]]; then
     rustup completions zsh cargo >| "$comp_file"
diff --git a/plugins/deno/deno.plugin.zsh b/plugins/deno/deno.plugin.zsh
index 71749f4a0..e22c4e4c8 100644
--- a/plugins/deno/deno.plugin.zsh
+++ b/plugins/deno/deno.plugin.zsh
@@ -14,7 +14,10 @@ alias dup='deno upgrade'
 if (( $+commands[deno] )); then
   ver="$(deno --version)"
   ver_file="$ZSH_CACHE_DIR/deno_version"
-  comp_file="$ZSH/plugins/deno/_deno"
+  comp_file="$ZSH_CACHE_DIR/completions/_deno"
+
+  mkdir -p "${comp_file:h}"
+  (( ${fpath[(Ie)${comp_file:h}]} )) || fpath=("${comp_file:h}" $fpath)
 
   if [[ ! -f "$comp_file" || ! -f "$ver_file" || "$ver" != "$(< "$ver_file")" ]]; then
     deno completions zsh >| "$comp_file"
diff --git a/plugins/fnm/fnm.plugin.zsh b/plugins/fnm/fnm.plugin.zsh
index 29b759abb..efb81a6fa 100644
--- a/plugins/fnm/fnm.plugin.zsh
+++ b/plugins/fnm/fnm.plugin.zsh
@@ -1,7 +1,10 @@
 if (( $+commands[fnm] )); then
   ver="$(fnm --version)"
   ver_file="$ZSH_CACHE_DIR/fnm_version"
-  comp_file="$ZSH/plugins/fnm/_fnm"
+  comp_file="$ZSH_CACHE_DIR/completions/_fnm"
+
+  mkdir -p "${comp_file:h}"
+  (( ${fpath[(Ie)${comp_file:h}]} )) || fpath=("${comp_file:h}" $fpath)
 
   if [[ ! -f "$comp_file" || ! -f "$ver_file" || "$ver" != "$(< "$ver_file")" ]]; then
     fnm completions --shell=zsh >| "$comp_file"
diff --git a/plugins/gh/gh.plugin.zsh b/plugins/gh/gh.plugin.zsh
index c3d87848d..a346ccf65 100644
--- a/plugins/gh/gh.plugin.zsh
+++ b/plugins/gh/gh.plugin.zsh
@@ -2,7 +2,10 @@
 if (( $+commands[gh] )); then
   ver="$(gh --version)"
   ver_file="$ZSH_CACHE_DIR/gh_version"
-  comp_file="$ZSH/plugins/gh/_gh"
+  comp_file="$ZSH_CACHE_DIR/completions/_gh"
+
+  mkdir -p "${comp_file:h}"
+  (( ${fpath[(Ie)${comp_file:h}]} )) || fpath=("${comp_file:h}" $fpath)
 
   if [[ ! -f "$comp_file" || ! -f "$ver_file" || "$ver" != "$(< "$ver_file")" ]]; then
     gh completion --shell zsh >| "$comp_file"
diff --git a/plugins/rustup/rustup.plugin.zsh b/plugins/rustup/rustup.plugin.zsh
index e709f41bd..8740f255a 100644
--- a/plugins/rustup/rustup.plugin.zsh
+++ b/plugins/rustup/rustup.plugin.zsh
@@ -1,7 +1,10 @@
 if (( $+commands[rustup] )); then
   ver="$(rustup --version 2>/dev/null)"
   ver_file="$ZSH_CACHE_DIR/rustup_version"
-  comp_file="$ZSH/plugins/rustup/_rustup"
+  comp_file="$ZSH_CACHE_DIR/completions/_rustup"
+
+  mkdir -p "${comp_file:h}"
+  (( ${fpath[(Ie)${comp_file:h}]} )) || fpath=("${comp_file:h}" $fpath)
 
   if [[ ! -f "$comp_file" || ! -f "$ver_file" || "$ver" != "$(< "$ver_file")" ]]; then
     rustup completions zsh >| "$comp_file"

From eb2eacaf0c46ace8e0eb3543199851a8249338fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Wed, 15 Sep 2021 18:47:51 +0200
Subject: [PATCH 441/869] refactor(plugins): remove old generated completion
 files

This removes .gitignore plugin files and adds a force-rm of the old completion file,
which ignores any errors if the file doesn't exist.
---
 plugins/cargo/.gitignore         | 1 -
 plugins/cargo/cargo.plugin.zsh   | 4 ++++
 plugins/deno/.gitignore          | 1 -
 plugins/deno/deno.plugin.zsh     | 3 +++
 plugins/fnm/.gitignore           | 2 --
 plugins/fnm/fnm.plugin.zsh       | 3 +++
 plugins/gh/.gitignore            | 1 -
 plugins/gh/gh.plugin.zsh         | 3 +++
 plugins/rustup/.gitignore        | 1 -
 plugins/rustup/rustup.plugin.zsh | 3 +++
 10 files changed, 16 insertions(+), 6 deletions(-)
 delete mode 100644 plugins/cargo/.gitignore
 delete mode 100644 plugins/deno/.gitignore
 delete mode 100644 plugins/fnm/.gitignore
 delete mode 100644 plugins/gh/.gitignore
 delete mode 100644 plugins/rustup/.gitignore

diff --git a/plugins/cargo/.gitignore b/plugins/cargo/.gitignore
deleted file mode 100644
index 42d7ecdd6..000000000
--- a/plugins/cargo/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-_cargo
diff --git a/plugins/cargo/cargo.plugin.zsh b/plugins/cargo/cargo.plugin.zsh
index 95e63dd3c..7082d2d55 100644
--- a/plugins/cargo/cargo.plugin.zsh
+++ b/plugins/cargo/cargo.plugin.zsh
@@ -1,4 +1,8 @@
 if (( $+commands[rustup] && $+commands[cargo] )); then
+  # remove old generated completion file
+  command rm -f "${0:A:h}/_cargo"
+
+  # generate new completion file
   ver="$(cargo --version)"
   ver_file="$ZSH_CACHE_DIR/cargo_version"
   comp_file="$ZSH_CACHE_DIR/completions/_cargo"
diff --git a/plugins/deno/.gitignore b/plugins/deno/.gitignore
deleted file mode 100644
index cba5b03e8..000000000
--- a/plugins/deno/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-_deno
diff --git a/plugins/deno/deno.plugin.zsh b/plugins/deno/deno.plugin.zsh
index e22c4e4c8..34adddc37 100644
--- a/plugins/deno/deno.plugin.zsh
+++ b/plugins/deno/deno.plugin.zsh
@@ -12,6 +12,9 @@ alias dup='deno upgrade'
 
 # COMPLETION FUNCTION
 if (( $+commands[deno] )); then
+  # remove old generated completion file
+  command rm -f "${0:A:h}/_deno"
+
   ver="$(deno --version)"
   ver_file="$ZSH_CACHE_DIR/deno_version"
   comp_file="$ZSH_CACHE_DIR/completions/_deno"
diff --git a/plugins/fnm/.gitignore b/plugins/fnm/.gitignore
deleted file mode 100644
index 0b2bc9ab7..000000000
--- a/plugins/fnm/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-_fnm
-
diff --git a/plugins/fnm/fnm.plugin.zsh b/plugins/fnm/fnm.plugin.zsh
index efb81a6fa..c161b27cd 100644
--- a/plugins/fnm/fnm.plugin.zsh
+++ b/plugins/fnm/fnm.plugin.zsh
@@ -1,4 +1,7 @@
 if (( $+commands[fnm] )); then
+  # remove old generated completion file
+  command rm -f "${0:A:h}/_fnm"
+
   ver="$(fnm --version)"
   ver_file="$ZSH_CACHE_DIR/fnm_version"
   comp_file="$ZSH_CACHE_DIR/completions/_fnm"
diff --git a/plugins/gh/.gitignore b/plugins/gh/.gitignore
deleted file mode 100644
index fa1244ab5..000000000
--- a/plugins/gh/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-_gh
diff --git a/plugins/gh/gh.plugin.zsh b/plugins/gh/gh.plugin.zsh
index a346ccf65..3e4cdee5e 100644
--- a/plugins/gh/gh.plugin.zsh
+++ b/plugins/gh/gh.plugin.zsh
@@ -1,5 +1,8 @@
 # Autocompletion for the GitHub CLI (gh).
 if (( $+commands[gh] )); then
+  # remove old generated completion file
+  command rm -f "${0:A:h}/_gh"
+
   ver="$(gh --version)"
   ver_file="$ZSH_CACHE_DIR/gh_version"
   comp_file="$ZSH_CACHE_DIR/completions/_gh"
diff --git a/plugins/rustup/.gitignore b/plugins/rustup/.gitignore
deleted file mode 100644
index ad38ae3bf..000000000
--- a/plugins/rustup/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-_rustup
diff --git a/plugins/rustup/rustup.plugin.zsh b/plugins/rustup/rustup.plugin.zsh
index 8740f255a..c6efc1b13 100644
--- a/plugins/rustup/rustup.plugin.zsh
+++ b/plugins/rustup/rustup.plugin.zsh
@@ -1,4 +1,7 @@
 if (( $+commands[rustup] )); then
+  # remove old generated completion file
+  command rm -f "${0:A:h}/_rustup"
+
   ver="$(rustup --version 2>/dev/null)"
   ver_file="$ZSH_CACHE_DIR/rustup_version"
   comp_file="$ZSH_CACHE_DIR/completions/_rustup"

From 8784e88552ad7f6f6a9c149a739474e0b168a840 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Wed, 15 Sep 2021 20:38:54 +0200
Subject: [PATCH 442/869] fix(core): use `$HOME/.cache` if default cache dir is
 non-writable (#10193)

Fixes #10193
---
 oh-my-zsh.sh | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/oh-my-zsh.sh b/oh-my-zsh.sh
index 442972a9a..cea466100 100644
--- a/oh-my-zsh.sh
+++ b/oh-my-zsh.sh
@@ -7,7 +7,12 @@ if [[ -z "$ZSH_CACHE_DIR" ]]; then
   ZSH_CACHE_DIR="$ZSH/cache"
 fi
 
-# Create completions cache dir and add to $fpath
+# Make sure $ZSH_CACHE_DIR is writable, otherwise use a directory in $HOME
+if [[ ! -w "$ZSH_CACHE_DIR" ]]; then
+  ZSH_CACHE_DIR="${XDG_CACHE_HOME:-$HOME/.cache}/ohmyzsh"
+fi
+
+# Create cache and completions dir and add to $fpath
 mkdir -p "$ZSH_CACHE_DIR/completions"
 (( ${fpath[(Ie)$ZSH_CACHE_DIR/completions]} )) || fpath=("$ZSH_CACHE_DIR/completions" $fpath)
 

From 93b557e291ba60286bcd49f5d3e4ac61730b3f7c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Wed, 15 Sep 2021 20:45:26 +0200
Subject: [PATCH 443/869] style(core): make alternative cache directory
 equivalent to Arch Linux package

The oh-my-zsh-git package sets the cache directory to `$HOME/.cache/oh-my-zsh`, so
Oh My Zsh will be compatible with it.
---
 oh-my-zsh.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/oh-my-zsh.sh b/oh-my-zsh.sh
index cea466100..83c8f8057 100644
--- a/oh-my-zsh.sh
+++ b/oh-my-zsh.sh
@@ -9,7 +9,7 @@ fi
 
 # Make sure $ZSH_CACHE_DIR is writable, otherwise use a directory in $HOME
 if [[ ! -w "$ZSH_CACHE_DIR" ]]; then
-  ZSH_CACHE_DIR="${XDG_CACHE_HOME:-$HOME/.cache}/ohmyzsh"
+  ZSH_CACHE_DIR="${XDG_CACHE_HOME:-$HOME/.cache}/oh-my-zsh"
 fi
 
 # Create cache and completions dir and add to $fpath

From 29ec52602ff947675ea9a1788d62c0c552bd01af Mon Sep 17 00:00:00 2001
From: Muhammad Zahalqa <m@tryfinally.com>
Date: Thu, 16 Sep 2021 17:44:35 +0300
Subject: [PATCH 444/869] feat(golang): add `gota` to test current directory
 recursively (#8974)

---
 plugins/golang/README.md         | 1 +
 plugins/golang/golang.plugin.zsh | 1 +
 2 files changed, 2 insertions(+)

diff --git a/plugins/golang/README.md b/plugins/golang/README.md
index 0a1b43c30..0c90aa10b 100644
--- a/plugins/golang/README.md
+++ b/plugins/golang/README.md
@@ -27,4 +27,5 @@ plugins=(... golang)
 | gops    | `cd $GOPATH/src`        | Takes you to $GOPATH/src                                      |
 | gor     | `go run`                | Compiles and runs your code                                   |
 | got     | `go test`               | Runs tests                                                    |
+| gota    | `go test ./...`         | Runs tests in all subdirectories                              |
 | gov     | `go vet`                | Vet examines Go source code and reports suspicious constructs |
diff --git a/plugins/golang/golang.plugin.zsh b/plugins/golang/golang.plugin.zsh
index 398bd966f..eedde2573 100644
--- a/plugins/golang/golang.plugin.zsh
+++ b/plugins/golang/golang.plugin.zsh
@@ -271,4 +271,5 @@ alias gopb='cd $GOPATH/bin'
 alias gops='cd $GOPATH/src'
 alias gor='go run'
 alias got='go test'
+alias gota='go test ./...'
 alias gov='go vet'

From 4bd5d03e51ae289a986ab63e94bf4e1c96a75786 Mon Sep 17 00:00:00 2001
From: Tristan Messner <tristanmessner@gmail.com>
Date: Sun, 21 Apr 2019 20:20:23 -0400
Subject: [PATCH 445/869] feat(golang): add `goga` alias to install
 dependencies in current directory, recursively (#7786)

Closes #7786
---
 plugins/golang/README.md         | 1 +
 plugins/golang/golang.plugin.zsh | 1 +
 2 files changed, 2 insertions(+)

diff --git a/plugins/golang/README.md b/plugins/golang/README.md
index 0c90aa10b..af2c4dff9 100644
--- a/plugins/golang/README.md
+++ b/plugins/golang/README.md
@@ -19,6 +19,7 @@ plugins=(... golang)
 | gof     | `go fmt`                | Gofmt formats (aligns and indents) Go programs.               |
 | gofa    | `go fmt ./...`          | Run go fmt for all packages in current directory, recursively |
 | gog     | `go get`                | Downloads packages and then installs them to $GOPATH          |
+| gog     | `go get ./...`          | Installs all dependencies in current directory, recursively   |
 | goi     | `go install`            | Compiles and installs packages to $GOPATH                     |
 | gol     | `go list`               | Lists Go packages                                             |
 | gom     | `go mod`                | Access to operations on modules                               |
diff --git a/plugins/golang/golang.plugin.zsh b/plugins/golang/golang.plugin.zsh
index eedde2573..fce663fd6 100644
--- a/plugins/golang/golang.plugin.zsh
+++ b/plugins/golang/golang.plugin.zsh
@@ -263,6 +263,7 @@ alias god='go doc'
 alias gof='go fmt'
 alias gofa='go fmt ./...'
 alias gog='go get'
+alias goga='go get ./...'
 alias goi='go install'
 alias gol='go list'
 alias gom='go mod'

From b79726b1c33149a429bbade49e9567a08ffa98af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Wed, 15 Sep 2021 19:06:51 +0200
Subject: [PATCH 446/869] fix(update): silence `typeset` calls in `upgrade.sh`
 script (#10048)

Co-authored-by: yyny <6576327+yyny@users.noreply.github.com>
---
 tools/upgrade.sh | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/tools/upgrade.sh b/tools/upgrade.sh
index e9f8bc0f9..7dec398fd 100755
--- a/tools/upgrade.sh
+++ b/tools/upgrade.sh
@@ -1,16 +1,23 @@
 #!/usr/bin/env zsh
 
+# Protect against running with shells other than zsh
 if [ -z "$ZSH_VERSION" ]; then
   exec zsh "$0" "$@"
 fi
 
+# Protect against unwanted sourcing
+case "$ZSH_EVAL_CONTEXT" in
+  *:file) echo "error: this file should not be sourced" && return ;;
+esac
+
 cd "$ZSH"
 
 # Use colors, but only if connected to a terminal
 # and that terminal supports them.
 
-local -a RAINBOW
-local RED GREEN YELLOW BLUE BOLD DIM UNDER RESET
+setopt typeset_silent
+typeset -a RAINBOW
+typeset RED GREEN YELLOW BLUE BOLD DIM UNDER RESET
 
 if [ -t 1 ]; then
   RAINBOW=(

From eba3be243f634a80ae8d8134bf88657afda71fbb Mon Sep 17 00:00:00 2001
From: Al-Amin Ahamed <34349365+mralaminahamed@users.noreply.github.com>
Date: Sat, 18 Sep 2021 03:31:56 +0600
Subject: [PATCH 447/869] feat(archlinux): add cleanup aliases to `yaourt` and
 `yay` (#10184)

---
 plugins/archlinux/README.md            | 4 ++++
 plugins/archlinux/archlinux.plugin.zsh | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/plugins/archlinux/README.md b/plugins/archlinux/README.md
index d6b41ee40..d4706e220 100644
--- a/plugins/archlinux/README.md
+++ b/plugins/archlinux/README.md
@@ -143,6 +143,8 @@ upgrades were available. Use `pacman -Que` instead.
 | yaupd   | `yaourt -Sy`                      | Update and refresh local package, ABS and AUR databases             |
 | yaupg   | `yaourt -Syua`                    | Sync with repositories before upgrading all packages (from AUR too) |
 | yasu    | `yaourt -Syua --no-confirm`       | Same as `yaupg`, but without confirmation                           |
+| yaclun  | `yaourt -Yc`                      | Remove unneeded installed packages                                  |
+| yaclf   | `yaourt -Scc`                     | Remove cache directories                                            |
 | upgrade[²](#f2) | `yaourt -Syu`             | Sync with repositories before upgrading packages                    |
 
 #### Yay[¹](#f1)
@@ -165,6 +167,8 @@ upgrades were available. Use `pacman -Que` instead.
 | yaupd   | `yay -Sy`                      | Update and refresh local package, ABS and AUR databases           |
 | yaupg   | `yay -Syu`                     | Sync with repositories before upgrading packages                  |
 | yasu    | `yay -Syu --no-confirm`        | Same as `yaupg`, but without confirmation                         |
+| yaclun  | `yay -Yc`                      | Remove unneeded installed packages                                |
+| yaclf   | `yay -Scc`                     | Remove cache directories                                          |
 | upgrade[²](#f2) | `yay -Syu`             | Sync with repositories before upgrading packages                  |
 
 ---
diff --git a/plugins/archlinux/archlinux.plugin.zsh b/plugins/archlinux/archlinux.plugin.zsh
index c94fb8f6c..d34a4cd96 100644
--- a/plugins/archlinux/archlinux.plugin.zsh
+++ b/plugins/archlinux/archlinux.plugin.zsh
@@ -170,6 +170,8 @@ if (( $+commands[yaourt] )); then
   alias yainsd='yaourt -S --asdeps'
   alias yamir='yaourt -Syy'
   alias yaupd="yaourt -Sy"
+  alias yaclun='yaourt -Yc'
+  alias yaclf='yaourt -Scc'
   alias upgrade='yaourt -Syu'
 fi
 
@@ -190,6 +192,8 @@ if (( $+commands[yay] )); then
   alias yainsd='yay -S --asdeps'
   alias yamir='yay -Syy'
   alias yaupd="yay -Sy"
+  alias yaclun='yay -Yc'
+  alias yaclf='yay -Scc'
   alias upgrade='yay -Syu'
 fi
 

From 4d7f0cfb47b04f218a05f0f2b3deebdb7e3fdb99 Mon Sep 17 00:00:00 2001
From: Ken Crawford <kmcrawford@gmail.com>
Date: Fri, 17 Sep 2021 17:33:12 -0400
Subject: [PATCH 448/869] docs(kubectx): fix README sample code syntax (#10199)

---
 plugins/kubectx/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/kubectx/README.md b/plugins/kubectx/README.md
index 9a1df2617..98f1cf032 100644
--- a/plugins/kubectx/README.md
+++ b/plugins/kubectx/README.md
@@ -17,7 +17,7 @@ One can rename default context name for better readability.
 
 _Example_. Add to **.zshrc**:
 ```
-kubectx_mapping[minikube] = "mini"
+kubectx_mapping[minikube]="mini"
 kubectx_mapping[context_name_from_kubeconfig]="$emoji[wolf_face]"
 kubectx_mapping[production_cluster]="%{$fg[yellow]%}prod!%{$reset_color%}"
 ```

From a4e68967a472132b4ffb05fbd1c86ac88d27fe42 Mon Sep 17 00:00:00 2001
From: Joshua Bedford <joshua@joshuabedford.com>
Date: Fri, 17 Sep 2021 16:36:27 -0500
Subject: [PATCH 449/869] feat(lando): add support for `php` command (#10146)

Co-authored-by: Joshua Bedford <joshua.bedford@hurstreview.com>
---
 plugins/lando/lando.plugin.zsh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/lando/lando.plugin.zsh b/plugins/lando/lando.plugin.zsh
index aa74c9924..af53e7e5a 100644
--- a/plugins/lando/lando.plugin.zsh
+++ b/plugins/lando/lando.plugin.zsh
@@ -8,6 +8,7 @@ function artisan \
          drush \
          gulp \
          npm \
+         php \
          wp \
          yarn {
   if checkForLandoFile; then

From f9d9d33ba42d3038a45c98d95343030f7ec39efa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Mon, 20 Sep 2021 19:57:04 +0200
Subject: [PATCH 450/869] refactor(jsontools): restructure and simplify logic

---
 plugins/jsontools/jsontools.plugin.zsh | 61 +++++++++++++++++---------
 1 file changed, 40 insertions(+), 21 deletions(-)

diff --git a/plugins/jsontools/jsontools.plugin.zsh b/plugins/jsontools/jsontools.plugin.zsh
index 912c83509..f92d336da 100644
--- a/plugins/jsontools/jsontools.plugin.zsh
+++ b/plugins/jsontools/jsontools.plugin.zsh
@@ -1,42 +1,61 @@
 # JSON Tools
 # Adds command line aliases useful for dealing with JSON
 
-if [[ $(whence $JSONTOOLS_METHOD) = "" ]]; then
-	JSONTOOLS_METHOD=""
+# Check that user-defined method is installed
+if [[ -n "$JSONTOOLS_METHOD" ]]; then
+  (( $+commands[$JSONTOOLS_METHOD] )) || unset JSONTOOLS_METHOD
 fi
 
-if [[ $(whence node) != "" && ( "x$JSONTOOLS_METHOD" = "x"  || "x$JSONTOOLS_METHOD" = "xnode" ) ]]; then
-	alias pp_json='xargs -0 node -e "console.log(JSON.stringify(JSON.parse(process.argv[1]), null, 4));"'
-	alias is_json='xargs -0 node -e "try {json = JSON.parse(process.argv[1]);} catch (e) { console.log(false); json = null; } if(json) { console.log(true); }"'
-	alias urlencode_json='xargs -0 node -e "console.log(encodeURIComponent(process.argv[1]))"'
-	alias urldecode_json='xargs -0 node -e "console.log(decodeURIComponent(process.argv[1]))"'
-elif [[ $(whence python) != "" && ( "x$JSONTOOLS_METHOD" = "x" || "x$JSONTOOLS_METHOD" = "xpython" ) ]]; then
-	alias pp_json='python -c "import sys; del sys.path[0]; import runpy; runpy._run_module_as_main(\"json.tool\")"'
-	alias is_json='python -c "
+# If method undefined, find the first one that is installed
+if [[ ! -v JSONTOOLS_METHOD ]]; then
+  for JSONTOOLS_METHOD in node python ruby; do
+    # If method found, break out of loop
+    (( $+commands[$JSONTOOLS_METHOD] )) && break
+    # Otherwise unset the variable
+    unset JSONTOOLS_METHOD
+  done
+
+  # If no methods were found, exit the plugin
+  [[ -v JSONTOOLS_METHOD ]] || return 1
+fi
+
+# Define json tools for each method
+case "$JSONTOOLS_METHOD" in
+  node)
+    alias pp_json='xargs -0 node -e "console.log(JSON.stringify(JSON.parse(process.argv[1]), null, 4));"'
+    alias is_json='xargs -0 node -e "try {json = JSON.parse(process.argv[1]);} catch (e) { console.log(false); json = null; } if(json) { console.log(true); }"'
+    alias urlencode_json='xargs -0 node -e "console.log(encodeURIComponent(process.argv[1]))"'
+    alias urldecode_json='xargs -0 node -e "console.log(decodeURIComponent(process.argv[1]))"'
+  ;;
+  python)
+    alias pp_json='python -c "import sys; del sys.path[0]; import runpy; runpy._run_module_as_main(\"json.tool\")"'
+    alias is_json='python -c "
 import sys; del sys.path[0];
 import json;
 try: 
-	json.loads(sys.stdin.read())
+    json.loads(sys.stdin.read())
 except ValueError, e: 
-	print False
+    print False
 else:
-	print True
+    print True
 sys.exit(0)"'
-	alias urlencode_json='python -c "
+    alias urlencode_json='python -c "
 import sys; del sys.path[0];
 import urllib, json;
 print urllib.quote_plus(sys.stdin.read())
 sys.exit(0)"'
-	alias urldecode_json='python -c "
+    alias urldecode_json='python -c "
 import sys; del sys.path[0];
 import urllib, json;
 print urllib.unquote_plus(sys.stdin.read())
 sys.exit(0)"'
-elif [[ $(whence ruby) != "" && ( "x$JSONTOOLS_METHOD" = "x" || "x$JSONTOOLS_METHOD" = "xruby" ) ]]; then
-	alias pp_json='ruby -e "require \"json\"; require \"yaml\"; puts JSON.parse(STDIN.read).to_yaml"'
-	alias is_json='ruby -e "require \"json\"; begin; JSON.parse(STDIN.read); puts true; rescue Exception => e; puts false; end"'
-	alias urlencode_json='ruby -e "require \"uri\"; puts URI.escape(STDIN.read)"'
-	alias urldecode_json='ruby -e "require \"uri\"; puts URI.unescape(STDIN.read)"'
-fi
+  ;;
+  ruby)
+    alias pp_json='ruby -e "require \"json\"; require \"yaml\"; puts JSON.parse(STDIN.read).to_yaml"'
+    alias is_json='ruby -e "require \"json\"; begin; JSON.parse(STDIN.read); puts true; rescue Exception => e; puts false; end"'
+    alias urlencode_json='ruby -e "require \"uri\"; puts URI.escape(STDIN.read)"'
+    alias urldecode_json='ruby -e "require \"uri\"; puts URI.unescape(STDIN.read)"'
+  ;;
+esac
 
 unset JSONTOOLS_METHOD

From b5909396370db43ba1c6c2513b1745991e5f60d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Mon, 20 Sep 2021 19:58:34 +0200
Subject: [PATCH 451/869] refactor(jsontools): move to functions, align
 `is_json` tool to return exit code

Also:

- Fix Python code in accordance with Python 3
- Use CGI module in Ruby to encode/decode strings
---
 plugins/jsontools/jsontools.plugin.zsh | 96 +++++++++++++++++++-------
 1 file changed, 70 insertions(+), 26 deletions(-)

diff --git a/plugins/jsontools/jsontools.plugin.zsh b/plugins/jsontools/jsontools.plugin.zsh
index f92d336da..b518288ad 100644
--- a/plugins/jsontools/jsontools.plugin.zsh
+++ b/plugins/jsontools/jsontools.plugin.zsh
@@ -22,39 +22,83 @@ fi
 # Define json tools for each method
 case "$JSONTOOLS_METHOD" in
   node)
-    alias pp_json='xargs -0 node -e "console.log(JSON.stringify(JSON.parse(process.argv[1]), null, 4));"'
-    alias is_json='xargs -0 node -e "try {json = JSON.parse(process.argv[1]);} catch (e) { console.log(false); json = null; } if(json) { console.log(true); }"'
-    alias urlencode_json='xargs -0 node -e "console.log(encodeURIComponent(process.argv[1]))"'
-    alias urldecode_json='xargs -0 node -e "console.log(decodeURIComponent(process.argv[1]))"'
+    # node doesn't make it easy to deal with stdin, so we pass it as an argument with xargs -0
+    function pp_json() {
+      xargs -0 node -e 'console.log(JSON.stringify(JSON.parse(process.argv[1]), null, 4));'
+    }
+    function is_json() {
+      xargs -0 node -e '
+        try {
+          json = JSON.parse(process.argv[1]);
+          console.log("true");
+          process.exit(0);
+        } catch (e) {
+          console.log("false");
+          process.exit(1);
+        }
+      '
+    }
+    function urlencode_json() {
+      xargs -0 node -e "console.log(encodeURIComponent(process.argv[1]))"
+    }
+    function urldecode_json() {
+      xargs -0 node -e "console.log(decodeURIComponent(process.argv[1]))"
+    }
   ;;
   python)
-    alias pp_json='python -c "import sys; del sys.path[0]; import runpy; runpy._run_module_as_main(\"json.tool\")"'
-    alias is_json='python -c "
+    function pp_json() {
+      python -c 'import sys; del sys.path[0]; import runpy; runpy._run_module_as_main("json.tool")'
+    }
+    function is_json() {
+      python -c '
 import sys; del sys.path[0];
-import json;
-try: 
-    json.loads(sys.stdin.read())
-except ValueError, e: 
-    print False
-else:
-    print True
-sys.exit(0)"'
-    alias urlencode_json='python -c "
+import json
+try:
+  json.loads(sys.stdin.read())
+  print("true"); sys.exit(0)
+except ValueError:
+  print("false"); sys.exit(1)
+      '
+    }
+    function urlencode_json() {
+      python -c '
 import sys; del sys.path[0];
-import urllib, json;
-print urllib.quote_plus(sys.stdin.read())
-sys.exit(0)"'
-    alias urldecode_json='python -c "
+from urllib.parse import quote_plus
+print(quote_plus(sys.stdin.read()))
+      '
+    }
+    function urldecode_json() {
+      python -c '
 import sys; del sys.path[0];
-import urllib, json;
-print urllib.unquote_plus(sys.stdin.read())
-sys.exit(0)"'
+from urllib.parse import unquote_plus
+print(unquote_plus(sys.stdin.read()))
+      '
+    }
   ;;
   ruby)
-    alias pp_json='ruby -e "require \"json\"; require \"yaml\"; puts JSON.parse(STDIN.read).to_yaml"'
-    alias is_json='ruby -e "require \"json\"; begin; JSON.parse(STDIN.read); puts true; rescue Exception => e; puts false; end"'
-    alias urlencode_json='ruby -e "require \"uri\"; puts URI.escape(STDIN.read)"'
-    alias urldecode_json='ruby -e "require \"uri\"; puts URI.unescape(STDIN.read)"'
+    function pp_json() {
+      ruby -e '
+        require "json"
+        require "yaml"
+        puts JSON.parse(STDIN.read).to_yaml
+      '
+    }
+    function is_json() {
+      ruby -e '
+        require "json"
+        begin
+          puts !!JSON.parse(STDIN.read); exit(0)
+        rescue JSON::ParserError
+          puts false; exit(1)
+        end
+      '
+    }
+    function urlencode_json() {
+      ruby -e 'require "cgi"; puts CGI.escape(STDIN.read)'
+    }
+    function urldecode_json() {
+      ruby -e 'require "cgi"; puts CGI.unescape(STDIN.read)'
+    }
   ;;
 esac
 

From 7ded6752fd34c513b0110b236c2ebd4fbbcd1a6f Mon Sep 17 00:00:00 2001
From: Eduardo Flores <eduardofv@gmail.com>
Date: Fri, 10 Sep 2021 17:52:00 -0500
Subject: [PATCH 452/869] feat(jsontools): add tools to pretty print json-lines
 (ndjson) (#10176)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Marc Cornellà <hello@mcornella.com>
---
 plugins/jsontools/README.md            | 47 +++++++++++++++++++++-----
 plugins/jsontools/jsontools.plugin.zsh | 10 +++++-
 2 files changed, 48 insertions(+), 9 deletions(-)

diff --git a/plugins/jsontools/README.md b/plugins/jsontools/README.md
index 1fa2b8eed..6a2740014 100644
--- a/plugins/jsontools/README.md
+++ b/plugins/jsontools/README.md
@@ -17,32 +17,63 @@ Usage is simple... just take your json data and pipe it into the appropriate jso
 - `urlencode_json`: returns a url encoded string for the given json.
 - `urldecode_json`: returns decoded json for the given url encoded string.
 
+### Supports NDJSON (Newline Delimited JSON)
+
+The plugin also supports [NDJSON](http://ndjson.org/) input, which means all functions
+have an alternative function that reads and processes the input line by line. These
+functions have the same name except using `ndjson` instead of `json`:
+
+> `pp_ndjson`, `is_ndjson`, `urlencode_ndjson`, `urldecode_ndjson`.
+
 ### Examples
 
 - **pp_json**:
 
-```sh
+```console
 # curl json data and pretty print the results
 curl https://coderwall.com/bobwilliams.json | pp_json
 ```
 
 - **is_json**:
 
-```sh
-# Validate if file's content conforms to a valid JSON schema
-less data.json | is_json
+```console
+# validate if file's content conforms to a valid JSON schema
+$ is_json < data.json
+true
+# shows true / false and returns the proper exit code
+$ echo $?
+0
 ```
 
 - **urlencode_json**:
 
-```sh
+```console
 # json data directly from the command line
-echo '{"b":2, "a":1}' | urlencode_json
+$ echo '{"b":2, "a":1}' | urlencode_json
+%7B%22b%22:2,%20%22a%22:1%7D
 ```
 
 - **urldecode_json**:
 
-```sh
+```console
 # url encoded string to decode
-echo '%7B%22b%22:2,%20%22a%22:1%7D%0A' | urldecode_json
+$ echo '%7B%22b%22:2,%20%22a%22:1%7D' | urldecode_json
+{"b":2, "a":1}
+```
+
+- **pp_ndjson**:
+
+```console
+# echo two separate json objects and pretty print both
+$ echo '{"a": "b"}\n{"c": [1,2,3]}' | pp_ndjson
+{
+    "a": "b"
+}
+{
+    "c": [
+        1,
+        2,
+        3
+    ]
+}
 ```
diff --git a/plugins/jsontools/jsontools.plugin.zsh b/plugins/jsontools/jsontools.plugin.zsh
index b518288ad..ed45cfa8e 100644
--- a/plugins/jsontools/jsontools.plugin.zsh
+++ b/plugins/jsontools/jsontools.plugin.zsh
@@ -101,5 +101,13 @@ print(unquote_plus(sys.stdin.read()))
     }
   ;;
 esac
-
 unset JSONTOOLS_METHOD
+
+## Add NDJSON support
+
+function {pp,is,urlencode,urldecode}_ndjson() {
+  local json jsonfunc="${0//ndjson/json}"
+  while read -r json; do
+    $jsonfunc <<< "$json"
+  done
+}

From 098bcda6910aa2f734fb0ad59ac089157a239c87 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Thu, 9 Sep 2021 12:57:59 +0200
Subject: [PATCH 453/869] feat(update): allow updating from branch set up on
 install

Closes #8788

Co-authored-by: Nikolas Garofil <nikolas@garofil.be>
---
 tools/install.sh | 42 ++++++++++++++++++++++--------------------
 tools/upgrade.sh | 17 +++++++++++++++--
 2 files changed, 37 insertions(+), 22 deletions(-)

diff --git a/tools/install.sh b/tools/install.sh
index cfc2808fe..510f83ce8 100755
--- a/tools/install.sh
+++ b/tools/install.sh
@@ -53,7 +53,7 @@ KEEP_ZSHRC=${KEEP_ZSHRC:-no}
 
 
 command_exists() {
-	command -v "$@" >/dev/null 2>&1
+  command -v "$@" >/dev/null 2>&1
 }
 
 fmt_error() {
@@ -65,27 +65,27 @@ fmt_underline() {
 }
 
 fmt_code() {
-  # shellcheck disable=SC2016 # backtic in single-quote
+  # shellcheck disable=SC2016 # backtick in single-quote
   printf '`\033[38;5;247m%s%s`\n' "$*" "$RESET"
 }
 
 setup_color() {
-	# Only use colors if connected to a terminal
-	if [ -t 1 ]; then
-		RED=$(printf '\033[31m')
-		GREEN=$(printf '\033[32m')
-		YELLOW=$(printf '\033[33m')
-		BLUE=$(printf '\033[34m')
-		BOLD=$(printf '\033[1m')
-		RESET=$(printf '\033[m')
-	else
-		RED=""
-		GREEN=""
-		YELLOW=""
-		BLUE=""
-		BOLD=""
-		RESET=""
-	fi
+  # Only use colors if connected to a terminal
+  if [ -t 1 ]; then
+    RED=$(printf '\033[31m')
+    GREEN=$(printf '\033[32m')
+    YELLOW=$(printf '\033[33m')
+    BLUE=$(printf '\033[34m')
+    BOLD=$(printf '\033[1m')
+    RESET=$(printf '\033[m')
+  else
+    RED=""
+    GREEN=""
+    YELLOW=""
+    BLUE=""
+    BOLD=""
+    RESET=""
+  fi
 }
 
 setup_ohmyzsh() {
@@ -114,6 +114,8 @@ setup_ohmyzsh() {
     -c fsck.zeroPaddedFilemode=ignore \
     -c fetch.fsck.zeroPaddedFilemode=ignore \
     -c receive.fsck.zeroPaddedFilemode=ignore \
+    -c oh-my-zsh.remote=origin \
+    -c oh-my-zsh.branch="$BRANCH" \
     --depth=1 --branch "$BRANCH" "$REMOTE" "$ZSH" || {
     fmt_error "git clone of oh-my-zsh repo failed"
     exit 1
@@ -157,9 +159,9 @@ setup_zshrc() {
   sed "/^export ZSH=/ c\\
 export ZSH=\"$ZSH\"
 " "$ZSH/templates/zshrc.zsh-template" > ~/.zshrc-omztemp
-	mv -f ~/.zshrc-omztemp ~/.zshrc
+  mv -f ~/.zshrc-omztemp ~/.zshrc
 
-	echo
+  echo
 }
 
 setup_shell() {
diff --git a/tools/upgrade.sh b/tools/upgrade.sh
index 7dec398fd..1424d1433 100755
--- a/tools/upgrade.sh
+++ b/tools/upgrade.sh
@@ -66,10 +66,20 @@ git config rebase.autoStash true
 
 local ret=0
 
+# repository settings
+remote=${"$(git config --local oh-my-zsh.remote)":-origin}
+branch=${"$(git config --local oh-my-zsh.branch)":-master}
+
+# repository state
+last_head=$(git symbolic-ref --quiet --short HEAD || git rev-parse HEAD)
+# checkout update branch
+git checkout -q "$branch" -- || exit 1
+# branch commit before update (used in changelog)
+last_commit=$(git rev-parse "$branch")
+
 # Update Oh My Zsh
 printf "${BLUE}%s${RESET}\n" "Updating Oh My Zsh"
-last_commit=$(git rev-parse HEAD)
-if git pull --rebase --stat origin master; then
+if git pull --rebase --stat $remote $branch; then
   # Check if it was really updated or not
   if [[ "$(git rev-parse HEAD)" = "$last_commit" ]]; then
     message="Oh My Zsh is already at the latest version."
@@ -103,6 +113,9 @@ else
   printf "${RED}%s${RESET}\n" 'There was an error updating. Try again later?'
 fi
 
+# go back to HEAD previous to update
+git checkout -q "$last_head" --
+
 # Unset git-config values set just for the upgrade
 case "$resetAutoStash" in
   "") git config --unset rebase.autoStash ;;

From 3e4b520190f1e4aaced9267bd5dcde59b3d0211f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Wed, 22 Sep 2021 10:36:28 +0200
Subject: [PATCH 454/869] refactor(django)!: deprecate plugin in favor of Zsh's
 django completion

BREAKING CHANGE: Zsh already provides completion for the `django-admin` and `manage.py`
commands, which is substantially better than the one provided by this plugin. We're
therefore deprecating this plugin and we will remove it in the near future.
---
 plugins/django/README.md         | 38 ++++++--------------------------
 plugins/django/django.plugin.zsh |  3 +++
 2 files changed, 10 insertions(+), 31 deletions(-)

diff --git a/plugins/django/README.md b/plugins/django/README.md
index 1740e55e5..cfab43980 100644
--- a/plugins/django/README.md
+++ b/plugins/django/README.md
@@ -1,36 +1,12 @@
 # Django plugin
 
-This plugin adds completion and hints for the [Django Project](https://www.djangoproject.com/) `manage.py` commands
-and options.
+This plugin adds completion for the [Django Project](https://www.djangoproject.com/) commands
+(`manage.py`, `django-admin`, ...).
 
-To use it, add `django` to the plugins array in your zshrc file:
+## Deprecation (2021-09-22)
 
-```zsh
-plugins=(... django)
-```
+The plugin used to provide completion for `./manage.py` and `django-admin`, but Zsh already provides
+a better, more extensive completion for those, so this plugin is no longer needed.
 
-## Usage
-
-```zsh
-$> python manage.py (press <TAB> here)
-```
-
-Would result in:
-
-```zsh
-cleanup                    -- remove old data from the database
-compilemessages            -- compile .po files to .mo for use with gettext
-createcachetable           -- creates table for SQL cache backend
-createsuperuser            -- create a superuser
-dbshell                    -- run command-line client for the current database
-diffsettings               -- display differences between the current settings and Django defaults
-dumpdata                   -- output contents of database as a fixture
-flush                      -- execute 'sqlflush' on the current database
-inspectdb                  -- output Django model module for tables in database
-loaddata                   -- install the named fixture(s) in the database
-makemessages               -- pull out all strings marked for translation
-reset                      -- executes 'sqlreset' for the given app(s)
-runfcgi                    -- run this project as a fastcgi
-runserver                  -- start a lightweight web server for development
-...
-```
+Right now a warning message is shown, but in the near future the plugin will stop working altogether.
+So you can remove it from your plugins and you'll automatically start using Zsh's django completion.
diff --git a/plugins/django/django.plugin.zsh b/plugins/django/django.plugin.zsh
index c2d00c171..a07a30889 100644
--- a/plugins/django/django.plugin.zsh
+++ b/plugins/django/django.plugin.zsh
@@ -402,3 +402,6 @@ compdef _managepy django
 compdef _managepy django-admin
 compdef _managepy django-admin.py
 compdef _managepy django-manage
+
+print -P "%F{yellow}The django plugin is deprecated in favor of Zsh's Django completion.
+%BPlease remove it from your plugins to stop using it.%b%f"

From 16de51404773a5e849c25a95e7612e212e7256a7 Mon Sep 17 00:00:00 2001
From: Simon Rogers <webdev@centralblue.co.uk>
Date: Thu, 5 Nov 2020 10:40:45 +0000
Subject: [PATCH 455/869] feat(lib): allow setting custom completion dots
 sequence (#9424)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Closes #9424
Closes #9703

Co-authored-by: mortezadadgar <mortezadadgar97@gmail.com>
Co-authored-by: Marc Cornellà <hello@mcornella.com>
---
 lib/completion.zsh           | 7 +++++--
 templates/zshrc.zsh-template | 5 +++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/lib/completion.zsh b/lib/completion.zsh
index ebaab0856..2c5695487 100644
--- a/lib/completion.zsh
+++ b/lib/completion.zsh
@@ -58,9 +58,12 @@ zstyle ':completion:*:*:*:users' ignored-patterns \
 # ... unless we really want to.
 zstyle '*' single-ignored show
 
-if [[ $COMPLETION_WAITING_DOTS = true ]]; then
+if [[ ${COMPLETION_WAITING_DOTS:-false} != false ]]; then
   expand-or-complete-with-dots() {
-    print -Pn "%F{red}…%f"
+    # use $COMPLETION_WAITING_DOTS either as toggle or as the sequence to show
+    [[ $COMPLETION_WAITING_DOTS = true ]] && COMPLETION_WAITING_DOTS="%F{red}…%f"
+    # turn off line wrapping and print prompt-expanded "dot" sequence
+    printf '\e[?7l%s\e[?7h' "${(%)COMPLETION_WAITING_DOTS}"
     zle expand-or-complete
     zle redisplay
   }
diff --git a/templates/zshrc.zsh-template b/templates/zshrc.zsh-template
index 65d5ea65b..4a998c2fc 100644
--- a/templates/zshrc.zsh-template
+++ b/templates/zshrc.zsh-template
@@ -45,8 +45,9 @@ ZSH_THEME="robbyrussell"
 # ENABLE_CORRECTION="true"
 
 # Uncomment the following line to display red dots whilst waiting for completion.
-# Caution: this setting can cause issues with multiline prompts (zsh 5.7.1 and newer seem to work)
-# See https://github.com/ohmyzsh/ohmyzsh/issues/5765
+# You can also set it to another string to have that shown instead of the default red dots.
+# e.g. COMPLETION_WAITING_DOTS="%F{yellow}waiting...%f"
+# Caution: this setting can cause issues with multiline prompts in zsh < 5.7.1 (see #5765)
 # COMPLETION_WAITING_DOTS="true"
 
 # Uncomment the following line if you want to disable marking untracked files

From 5b3d2b2f0c02ef059fcbcbdb619b22318b8cc13a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Wed, 22 Sep 2021 11:58:23 +0200
Subject: [PATCH 456/869] Revert "feat(archlinux): add cleanup aliases to
 `yaourt` and `yay` (#10184)"

This reverts commit eba3be243f634a80ae8d8134bf88657afda71fbb.
---
 plugins/archlinux/README.md            | 4 ----
 plugins/archlinux/archlinux.plugin.zsh | 4 ----
 2 files changed, 8 deletions(-)

diff --git a/plugins/archlinux/README.md b/plugins/archlinux/README.md
index d4706e220..d6b41ee40 100644
--- a/plugins/archlinux/README.md
+++ b/plugins/archlinux/README.md
@@ -143,8 +143,6 @@ upgrades were available. Use `pacman -Que` instead.
 | yaupd   | `yaourt -Sy`                      | Update and refresh local package, ABS and AUR databases             |
 | yaupg   | `yaourt -Syua`                    | Sync with repositories before upgrading all packages (from AUR too) |
 | yasu    | `yaourt -Syua --no-confirm`       | Same as `yaupg`, but without confirmation                           |
-| yaclun  | `yaourt -Yc`                      | Remove unneeded installed packages                                  |
-| yaclf   | `yaourt -Scc`                     | Remove cache directories                                            |
 | upgrade[²](#f2) | `yaourt -Syu`             | Sync with repositories before upgrading packages                    |
 
 #### Yay[¹](#f1)
@@ -167,8 +165,6 @@ upgrades were available. Use `pacman -Que` instead.
 | yaupd   | `yay -Sy`                      | Update and refresh local package, ABS and AUR databases           |
 | yaupg   | `yay -Syu`                     | Sync with repositories before upgrading packages                  |
 | yasu    | `yay -Syu --no-confirm`        | Same as `yaupg`, but without confirmation                         |
-| yaclun  | `yay -Yc`                      | Remove unneeded installed packages                                |
-| yaclf   | `yay -Scc`                     | Remove cache directories                                          |
 | upgrade[²](#f2) | `yay -Syu`             | Sync with repositories before upgrading packages                  |
 
 ---
diff --git a/plugins/archlinux/archlinux.plugin.zsh b/plugins/archlinux/archlinux.plugin.zsh
index d34a4cd96..c94fb8f6c 100644
--- a/plugins/archlinux/archlinux.plugin.zsh
+++ b/plugins/archlinux/archlinux.plugin.zsh
@@ -170,8 +170,6 @@ if (( $+commands[yaourt] )); then
   alias yainsd='yaourt -S --asdeps'
   alias yamir='yaourt -Syy'
   alias yaupd="yaourt -Sy"
-  alias yaclun='yaourt -Yc'
-  alias yaclf='yaourt -Scc'
   alias upgrade='yaourt -Syu'
 fi
 
@@ -192,8 +190,6 @@ if (( $+commands[yay] )); then
   alias yainsd='yay -S --asdeps'
   alias yamir='yay -Syy'
   alias yaupd="yay -Sy"
-  alias yaclun='yay -Yc'
-  alias yaclf='yay -Scc'
   alias upgrade='yay -Syu'
 fi
 

From d87f29f564286c4a233e454d8208b83b97b1366d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Thu, 23 Sep 2021 12:33:37 +0200
Subject: [PATCH 457/869] refactor(vim-interaction): clean up code and open
 gvim instance if none open (#10209)

Co-authored-by: Kevin Bader <keb@visotech.at>
---
 .../vim-interaction.plugin.zsh                | 48 +++++++++++--------
 1 file changed, 27 insertions(+), 21 deletions(-)

diff --git a/plugins/vim-interaction/vim-interaction.plugin.zsh b/plugins/vim-interaction/vim-interaction.plugin.zsh
index 53ec453e8..b73f9b4da 100644
--- a/plugins/vim-interaction/vim-interaction.plugin.zsh
+++ b/plugins/vim-interaction/vim-interaction.plugin.zsh
@@ -4,8 +4,7 @@
 # Derek Wyatt (derek@{myfirstnamemylastname}.org
 # 
 
-function callvim
-{
+function callvim {
   if [[ $# == 0 ]]; then
     cat <<EOH
 usage: callvim [-b cmd] [-a cmd] [-n name] [file ... fileN]
@@ -19,11 +18,20 @@ EOH
     return 0
   fi
 
-  local cmd=""
-  local before="<esc>"
-  local after=""
-  # Look up the newest instance
+  # Look up the newest instance or start one
   local name="$(gvim --serverlist | tail -n 1)"
+  [[ -n "$name" ]] || {
+    # run gvim or exit if it fails
+    gvim || return $?
+
+    # wait for gvim instance to fully load
+    while name=$(gvim --serverlist) && [[ -z "$name" ]]; do
+      sleep 0.1
+    done
+  }
+
+  local before="<esc>" files after cmd
+
   while getopts ":b:a:n:" option
   do
     case $option in
@@ -36,22 +44,20 @@ EOH
     esac
   done
   shift $((OPTIND-1))
-  if [[ ${after#:} != $after && ${after%<cr>} == $after ]]; then
-    after="$after<cr>"
-  fi
-  if [[ ${before#:} != $before && ${before%<cr>} == $before ]]; then
-    before="$before<cr>"
-  fi
-  local files
-  if [[ $# -gt 0 ]]; then
-    # absolute path of files resolving symlinks (:A) and quoting special chars (:q)
-    files=':args! '"${@:A:q}<cr>"
-  fi
+
+  # If before or after commands begin with : and don't end with <cr>, append it
+  [[ ${after}  = :* && ${after}  != *\<cr\> ]] && after+="<cr>"
+  [[ ${before} = :* && ${before} != *\<cr\> ]] && before+="<cr>"
+  # Open files passed (:A means abs path resolving symlinks, :q means quoting special chars)
+  [[ $# -gt 0 ]] && files=':args! '"${@:A:q}<cr>"
+  # Pass the built vim command to gvim
   cmd="$before$files$after"
-  gvim --servername "$name" --remote-send "$cmd"
-  if typeset -f postCallVim > /dev/null; then
-    postCallVim
-  fi
+
+  # Run the gvim command
+  gvim --servername "$name" --remote-send "$cmd" || return $?
+
+  # Run postCallVim if defined (maybe to bring focus to gvim, see README)
+  (( ! $+functions[postCallVim] )) || postCallVim
 }
 
 alias v=callvim

From 57e8c959a02ca8c2aeda3980480a50a1f82f6953 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Thu, 23 Sep 2021 18:28:34 +0200
Subject: [PATCH 458/869] style(installer): use rainbow logo and polish success
 message (#10211)

---
 tools/install.sh | 155 ++++++++++++++++++++++++++++++++++++++---------
 1 file changed, 125 insertions(+), 30 deletions(-)

diff --git a/tools/install.sh b/tools/install.sh
index 510f83ce8..7704107c8 100755
--- a/tools/install.sh
+++ b/tools/install.sh
@@ -56,22 +56,115 @@ command_exists() {
   command -v "$@" >/dev/null 2>&1
 }
 
+# The [ -t 1 ] check only works when the function is not called from
+# a subshell (like in `$(...)` or `(...)`, so this hack redefines the
+# function at the top level to always return false when stdout is not
+# a tty.
+if [ -t 1 ]; then
+  is_tty() {
+    true
+  }
+else
+  is_tty() {
+    false
+  }
+fi
+
+# This function uses the logic from supports-hyperlinks[1][2], which is
+# made by Kat Marchán (@zkat) and licensed under the Apache License 2.0.
+# [1] https://github.com/zkat/supports-hyperlinks
+# [2] https://crates.io/crates/supports-hyperlinks
+#
+# Copyright (c) 2021 Kat Marchán
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+supports_hyperlinks() {
+  # $FORCE_HYPERLINK must be set and be non-zero (this acts as a logic bypass)
+  if [ -n "$FORCE_HYPERLINK" ]; then
+    [ "$FORCE_HYPERLINK" != 0 ]
+    return $?
+  fi
+
+  # If stdout is not a tty, it doesn't support hyperlinks
+  is_tty || return 1
+
+  # DomTerm terminal emulator (domterm.org)
+  if [ -n "$DOMTERM" ]; then
+    return 0
+  fi
+
+  # VTE-based terminals above v0.50 (Gnome Terminal, Guake, ROXTerm, etc)
+  if [ -n "$VTE_VERSION" ]; then
+    [ $VTE_VERSION -ge 5000 ]
+    return $?
+  fi
+
+  # If $TERM_PROGRAM is set, these terminals support hyperlinks
+  case "$TERM_PROGRAM" in
+  Hyper|iTerm.app|terminology|WezTerm) return 0 ;;
+  esac
+
+  # kitty supports hyperlinks
+  if [ "$TERM" = xterm-kitty ]; then
+    return 0
+  fi
+
+  # Windows Terminal or Konsole also support hyperlinks
+  if [ -n "$WT_SESSION" ] || [ -n "$KONSOLE_VERSION" ]; then
+    return 0
+  fi
+
+  return 1
+}
+
+fmt_link() {
+  # $1: text, $2: url, $3: fallback mode
+  if supports_hyperlinks; then
+    printf '\033]8;;%s\a%s\033]8;;\a\n' "$2" "$1"
+    return
+  fi
+
+  case "$3" in
+  --text) printf '%s\n' "$1" ;;
+  --url|*) fmt_underline "$2" ;;
+  esac
+}
+
+fmt_underline() {
+  is_tty && printf '\033[4m%s\033[24m\n' "$*" || printf '%s\n' "$*"
+}
+
+# shellcheck disable=SC2016 # backtick in single-quote
+fmt_code() {
+  is_tty && printf '`\033[2m%s\033[22m`\n' "$*" || printf '`%s`\n' "$*"
+}
+
 fmt_error() {
   printf '%sError: %s%s\n' "$BOLD$RED" "$*" "$RESET" >&2
 }
 
-fmt_underline() {
-  printf '\033[4m%s\033[24m\n' "$*"
-}
-
-fmt_code() {
-  # shellcheck disable=SC2016 # backtick in single-quote
-  printf '`\033[38;5;247m%s%s`\n' "$*" "$RESET"
-}
-
 setup_color() {
   # Only use colors if connected to a terminal
-  if [ -t 1 ]; then
+  if is_tty; then
+    RAINBOW="
+      $(printf '\033[38;5;196m')
+      $(printf '\033[38;5;202m')
+      $(printf '\033[38;5;226m')
+      $(printf '\033[38;5;082m')
+      $(printf '\033[38;5;021m')
+      $(printf '\033[38;5;093m')
+      $(printf '\033[38;5;163m')
+    "
     RED=$(printf '\033[31m')
     GREEN=$(printf '\033[32m')
     YELLOW=$(printf '\033[33m')
@@ -79,6 +172,7 @@ setup_color() {
     BOLD=$(printf '\033[1m')
     RESET=$(printf '\033[m')
   else
+    RAINBOW=""
     RED=""
     GREEN=""
     YELLOW=""
@@ -243,6 +337,26 @@ EOF
   echo
 }
 
+# shellcheck disable=SC2183  # printf string has more %s than arguments ($RAINBOW expands to multiple arguments)
+print_success() {
+  printf '%s         %s__      %s           %s        %s       %s     %s__   %s\n' $RAINBOW $RESET
+  printf '%s  ____  %s/ /_    %s ____ ___  %s__  __  %s ____  %s_____%s/ /_  %s\n' $RAINBOW $RESET
+  printf '%s / __ \%s/ __ \  %s / __ `__ \%s/ / / / %s /_  / %s/ ___/%s __ \ %s\n' $RAINBOW $RESET
+  printf '%s/ /_/ /%s / / / %s / / / / / /%s /_/ / %s   / /_%s(__  )%s / / / %s\n' $RAINBOW $RESET
+  printf '%s\____/%s_/ /_/ %s /_/ /_/ /_/%s\__, / %s   /___/%s____/%s_/ /_/  %s\n' $RAINBOW $RESET
+  printf '%s    %s        %s           %s /____/ %s       %s     %s          %s....is now installed!%s\n' $RAINBOW $GREEN $RESET
+  printf '\n'
+  printf '\n'
+  printf "%s %s %s\n" "Before you scream ${BOLD}${YELLOW}Oh My Zsh!${RESET} look over the" \
+    "$(fmt_code "$(fmt_link ".zshrc" "file://$HOME/.zshrc" --text)")" \
+    "file to select plugins, themes, and options."
+  printf '\n'
+  printf '%s\n' "• Follow us on Twitter: $(fmt_link @ohmyzsh https://twitter.com/ohmyzsh)"
+  printf '%s\n' "• Join our Discord community: $(fmt_link "Discord server" https://discord.gg/ohmyzsh)"
+  printf '%s\n' "• Get stickers, t-shirts, coffee mugs and more: $(fmt_link "Planet Argon Shop" https://shop.planetargon.com/collections/oh-my-zsh)"
+  printf '%s\n' $RESET
+}
+
 main() {
   # Run as unattended if stdin is not a tty
   if [ ! -t 0 ]; then
@@ -293,26 +407,7 @@ EOF
   setup_zshrc
   setup_shell
 
-  printf %s "$GREEN"
-  cat <<'EOF'
-         __                                     __
-  ____  / /_     ____ ___  __  __   ____  _____/ /_
- / __ \/ __ \   / __ `__ \/ / / /  /_  / / ___/ __ \
-/ /_/ / / / /  / / / / / / /_/ /    / /_(__  ) / / /
-\____/_/ /_/  /_/ /_/ /_/\__, /    /___/____/_/ /_/
-                        /____/                       ....is now installed!
-
-
-EOF
-  cat <<EOF
-Before you scream Oh My Zsh! please look over the ~/.zshrc file to select plugins, themes, and options.
-
-• Follow us on Twitter: $(fmt_underline https://twitter.com/ohmyzsh)
-• Join our Discord server: $(fmt_underline https://discord.gg/ohmyzsh)
-• Get stickers, shirts, coffee mugs and other swag: $(fmt_underline https://shop.planetargon.com/collections/oh-my-zsh)
-
-EOF
-  printf %s "$RESET"
+  print_success
 
   if [ $RUNZSH = no ]; then
     echo "${YELLOW}Run zsh to try it out.${RESET}"

From 2ea1fa6cbfc6340463906dfed589d5c976a10abb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Fri, 24 Sep 2021 16:50:00 +0200
Subject: [PATCH 459/869] fix(init): fix `division by 0` error (#10213)

Fixes #10213
---
 oh-my-zsh.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/oh-my-zsh.sh b/oh-my-zsh.sh
index 83c8f8057..545d980f0 100644
--- a/oh-my-zsh.sh
+++ b/oh-my-zsh.sh
@@ -14,7 +14,7 @@ fi
 
 # Create cache and completions dir and add to $fpath
 mkdir -p "$ZSH_CACHE_DIR/completions"
-(( ${fpath[(Ie)$ZSH_CACHE_DIR/completions]} )) || fpath=("$ZSH_CACHE_DIR/completions" $fpath)
+(( ${fpath[(Ie)"$ZSH_CACHE_DIR/completions"]} )) || fpath=("$ZSH_CACHE_DIR/completions" $fpath)
 
 # Check for updates on initial load...
 if [ "$DISABLE_AUTO_UPDATE" != "true" ]; then

From 93ad3a88214b95f571e03c21f7d9bd76f9110938 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Mon, 27 Sep 2021 11:46:42 +0200
Subject: [PATCH 460/869] docs(vi-mode): document `$KEYTIMEOUT` issue (#9588)

Closes #9588
---
 plugins/vi-mode/README.md | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/plugins/vi-mode/README.md b/plugins/vi-mode/README.md
index b59d5f279..46bb6d070 100644
--- a/plugins/vi-mode/README.md
+++ b/plugins/vi-mode/README.md
@@ -64,7 +64,7 @@ NOTE: some of these key bindings are set by zsh by default when using a vi-mode
 
 - `vv`     : Edit current command line in Vim
 
-NOTE: this used to be bound to `v`. That is now the default (`visual-mode`)
+NOTE: this used to be bound to `v`. That is now the default (`visual-mode`).
 
 ### Movement
 
@@ -107,3 +107,21 @@ NOTE: this used to be bound to `v`. That is now the default (`visual-mode`)
 - `R`           : Enter replace mode: Each character replaces existing one
 - `x`           : Delete `count` characters under and after the cursor
 - `X`           : Delete `count` characters before the cursor
+
+## Known issues
+
+### Low `$KEYTIMEOUT`
+
+A low `$KEYTIMEOUT` value (< 15) means that key bindings that need multiple characters,
+like `vv`, will be very difficult to trigger. `$KEYTIMEOUT` controls the number of
+milliseconds that must pass before a key press is read and the appropriate key binding
+is triggered. For multi-character key bindings, the key presses need to happen before
+the timeout is reached, so on low timeouts the key press happens too slow, and therefore
+another key binding is triggered.
+
+We recommend either setting `$KEYTIMEOUT` to a higher value, or remapping the key bindings
+that you want to trigger to a keyboard sequence. For example:
+
+```zsh
+bindkey -M vicmd 'V' edit-command-line # this remaps `vv` to `V` (but overrides `visual-mode`)
+```

From 33c86fe80b5d838b3d3dd454c35aa94f4a38b3f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Tue, 28 Sep 2021 11:29:42 +0200
Subject: [PATCH 461/869] fix(init): detect and abort on non-zsh shell
 execution of Oh My Zsh

---
 oh-my-zsh.sh | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/oh-my-zsh.sh b/oh-my-zsh.sh
index 545d980f0..bf5902fc8 100644
--- a/oh-my-zsh.sh
+++ b/oh-my-zsh.sh
@@ -1,3 +1,11 @@
+# Protect against non-zsh execution of Oh My Zsh (use POSIX syntax here)
+[ -n "$ZSH_VERSION" ] || {
+  # ANSI (\033[<code>m): 0: reset, 1: bold, 4: underline, 22: no bold, 24: no underline, 31: red
+  printf "\033[1;31mERROR:\033[22m Oh My Zsh can't be loaded from: \033[1m${0#-}\033[22m. " >&2
+  printf "You need to run \033[1;4mzsh\033[22;24m instead.\033[0m\n" >&2
+  return 1
+}
+
 # If ZSH is not defined, use the current script's directory.
 [[ -z "$ZSH" ]] && export ZSH="${${(%):-%x}:a:h}"
 

From 4ae5bdebc36068a53fbc38a4e0d6d97e49f5b56c Mon Sep 17 00:00:00 2001
From: April King <april@pokeinthe.io>
Date: Tue, 28 Sep 2021 04:40:31 -0500
Subject: [PATCH 462/869] fix(osx): only run Preview.app in `man-preview` if
 man page exists (#10222)

---
 plugins/osx/osx.plugin.zsh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/plugins/osx/osx.plugin.zsh b/plugins/osx/osx.plugin.zsh
index 7842e9f73..5455d7c5f 100644
--- a/plugins/osx/osx.plugin.zsh
+++ b/plugins/osx/osx.plugin.zsh
@@ -219,7 +219,8 @@ function quick-look() {
 }
 
 function man-preview() {
-  man -t "$@" | open -f -a Preview
+  # Don't let Preview.app steal focus if the man page doesn't exist
+  man -w "$@" &>/dev/null && man -t "$@" | open -f -a Preview || man "$@"
 }
 compdef _man man-preview
 

From a42db120856091257c7545473a20fbc3e295c633 Mon Sep 17 00:00:00 2001
From: nowshed-imran <now.im.627@gmail.com>
Date: Sat, 6 Mar 2021 16:50:12 +0600
Subject: [PATCH 463/869] refactor(archlinux)!: remove `yaourt` support (#9713)

BREAKING CHANGE: `yaourt` is no longer maintained nor available as a package.
Use `pacman` or one of the other maintained AUR helpers.

Closes #9713
---
 plugins/archlinux/README.md            | 46 ++++++--------------------
 plugins/archlinux/archlinux.plugin.zsh | 23 +------------
 2 files changed, 11 insertions(+), 58 deletions(-)

diff --git a/plugins/archlinux/README.md b/plugins/archlinux/README.md
index d6b41ee40..c8ec1de1e 100644
--- a/plugins/archlinux/README.md
+++ b/plugins/archlinux/README.md
@@ -32,7 +32,7 @@ plugins=(... archlinux)
 | pacfiles     | `pacman -F`                            | Search package file names for matching strings                   |
 | pacls        | `pacman -Ql`                           | List files in a package                                          |
 | pacown       | `pacman -Qo`                           | Show which package owns a file                                   |
-| upgrade[²](#f2) | `sudo pacman -Syu`                  | Sync with repositories before upgrading packages                 |
+| upgrade[¹](#f1) | `sudo pacman -Syu`                  | Sync with repositories before upgrading packages                 |
 
 | Function       | Description                                               |
 |----------------|-----------------------------------------------------------|
@@ -73,7 +73,7 @@ upgrades were available. Use `pacman -Que` instead.
 | auupd   | `sudo aura -Sy`                                 | Update and refresh local package, ABS and AUR databases                 |
 | auupg   | `sudo sh -c "aura -Syu              && aura -Au"` | Sync with repositories before upgrading all packages (from AUR too)   |
 | ausu    | `sudo sh -c "aura -Syu --no-confirm && aura -Au --no-confirm"` | Same as `auupg`, but without confirmation                |
-| upgrade[²](#f2) | `sudo aura -Syu`                        | Sync with repositories before upgrading packages                        |
+| upgrade[¹](#f1) | `sudo aura -Syu`                        | Sync with repositories before upgrading packages                        |
 
 | Function        | Description                                                         |
 |-----------------|---------------------------------------------------------------------|
@@ -99,7 +99,7 @@ upgrades were available. Use `pacman -Que` instead.
 | paupd   | `pacaur -Sy`                      | Update and refresh local package, ABS and AUR databases             |
 | paupg   | `pacaur -Syua`                    | Sync with repositories before upgrading all packages (from AUR too) |
 | pasu    | `pacaur -Syua --no-confirm`       | Same as `paupg`, but without confirmation                           |
-| upgrade[²](#f2) | `pacaur -Syu`             | Sync with repositories before upgrading packages                    |
+| upgrade[¹](#f1) | `pacaur -Syu`             | Sync with repositories before upgrading packages                    |
 
 #### Trizen
 
@@ -121,31 +121,9 @@ upgrades were available. Use `pacman -Que` instead.
 | trupd   | `trizen -Sy`                      | Update and refresh local package, ABS and AUR databases             |
 | trupg   | `trizen -Syua`                    | Sync with repositories before upgrading all packages (from AUR too) |
 | trsu    | `trizen -Syua --no-confirm`       | Same as `trupg`, but without confirmation                           |
-| upgrade[²](#f2) | `trizen -Syu`             | Sync with repositories before upgrading packages                    |
+| upgrade[¹](#f1) | `trizen -Syu`             | Sync with repositories before upgrading packages                    |
 
-#### Yaourt[¹](#f1)
-
-| Alias   | Command                           | Description                                                         |
-|---------|-----------------------------------|---------------------------------------------------------------------|
-| yaconf  | `yaourt -C`                       | Fix all configuration files with vimdiff                            |
-| yain    | `yaourt -S`                       | Install packages from the repositories                              |
-| yains   | `yaourt -U`                       | Install a package from a local file                                 |
-| yainsd  | `yaourt -S --asdeps`              | Install packages as dependencies of another package                 |
-| yaloc   | `yaourt -Qi`                      | Display information about a package in the local database           |
-| yalocs  | `yaourt -Qs`                      | Search for packages in the local database                           |
-| yalst   | `yaourt -Qe`                      | List installed packages including from AUR (tagged as "local")      |
-| yamir   | `yaourt -Syy`                     | Force refresh of all package lists after updating mirrorlist        |
-| yaorph  | `yaourt -Qtd`                     | Remove orphans using yaourt                                         |
-| yare    | `yaourt -R`                       | Remove packages, keeping its settings and dependencies              |
-| yarem   | `yaourt -Rns`                     | Remove packages, including its settings and unneeded dependencies   |
-| yarep   | `yaourt -Si`                      | Display information about a package in the repositories             |
-| yareps  | `yaourt -Ss`                      | Search for packages in the repositories                             |
-| yaupd   | `yaourt -Sy`                      | Update and refresh local package, ABS and AUR databases             |
-| yaupg   | `yaourt -Syua`                    | Sync with repositories before upgrading all packages (from AUR too) |
-| yasu    | `yaourt -Syua --no-confirm`       | Same as `yaupg`, but without confirmation                           |
-| upgrade[²](#f2) | `yaourt -Syu`             | Sync with repositories before upgrading packages                    |
-
-#### Yay[¹](#f1)
+#### Yay
 
 | Alias   | Command                        | Description                                                       |
 |---------|--------------------------------|-------------------------------------------------------------------|
@@ -165,23 +143,19 @@ upgrades were available. Use `pacman -Que` instead.
 | yaupd   | `yay -Sy`                      | Update and refresh local package, ABS and AUR databases           |
 | yaupg   | `yay -Syu`                     | Sync with repositories before upgrading packages                  |
 | yasu    | `yay -Syu --no-confirm`        | Same as `yaupg`, but without confirmation                         |
-| upgrade[²](#f2) | `yay -Syu`             | Sync with repositories before upgrading packages                  |
+| upgrade[¹](#f1) | `yay -Syu`             | Sync with repositories before upgrading packages                  |
 
 ---
 
 <span id="f1">¹</span>
-Yay and Yaourt aliases overlap. If both are installed, yay will take precedence.
-
-<span id="f2">²</span>
 The `upgrade` alias is set for all package managers. Its value will depend on
 whether the package manager is installed, checked in the following order:
 
 1. `yay`
-2. `yaourt`
-3. `trizen`
-4. `pacaur`
-5. `aura`
-6. `pacman`
+2. `trizen`
+3. `pacaur`
+4. `aura`
+5. `pacman`
 
 ## Contributors
 
diff --git a/plugins/archlinux/archlinux.plugin.zsh b/plugins/archlinux/archlinux.plugin.zsh
index c94fb8f6c..0c5782d98 100644
--- a/plugins/archlinux/archlinux.plugin.zsh
+++ b/plugins/archlinux/archlinux.plugin.zsh
@@ -104,7 +104,7 @@ if (( $+commands[aura] )); then
   alias auras='aura -As --both'
   alias auupd="sudo aura -Sy"
   alias auupg='sudo sh -c "aura -Syu              && aura -Au"'
-  alias ausu='sudo  sh -c "aura -Syu --no-confirm && aura -Au --no-confirm"'
+  alias ausu='sudo sh -c "aura -Syu --no-confirm && aura -Au --no-confirm"'
   alias upgrade='sudo aura -Syu'
 
   # extra bonus specially for aura
@@ -153,26 +153,6 @@ if (( $+commands[trizen] )); then
   alias upgrade='trizen -Syu'
 fi
 
-if (( $+commands[yaourt] )); then
-  alias yaconf='yaourt -C'
-  alias yaupg='yaourt -Syua'
-  alias yasu='yaourt -Syua --noconfirm'
-  alias yain='yaourt -S'
-  alias yains='yaourt -U'
-  alias yare='yaourt -R'
-  alias yarem='yaourt -Rns'
-  alias yarep='yaourt -Si'
-  alias yareps='yaourt -Ss'
-  alias yaloc='yaourt -Qi'
-  alias yalocs='yaourt -Qs'
-  alias yalst='yaourt -Qe'
-  alias yaorph='yaourt -Qtd'
-  alias yainsd='yaourt -S --asdeps'
-  alias yamir='yaourt -Syy'
-  alias yaupd="yaourt -Sy"
-  alias upgrade='yaourt -Syu'
-fi
-
 if (( $+commands[yay] )); then
   alias yaconf='yay -Pg'
   alias yaupg='yay -Syu'
@@ -192,4 +172,3 @@ if (( $+commands[yay] )); then
   alias yaupd="yay -Sy"
   alias upgrade='yay -Syu'
 fi
-

From b37114b4d5804f8125d3951efde6a1b9d39610d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Mon, 27 Sep 2021 18:08:12 +0200
Subject: [PATCH 464/869] refactor(emacs): remove dependency on
 `require_tool.sh` and clean up code style

---
 plugins/emacs/emacs.plugin.zsh | 90 +++++++++++++++++-----------------
 1 file changed, 44 insertions(+), 46 deletions(-)

diff --git a/plugins/emacs/emacs.plugin.zsh b/plugins/emacs/emacs.plugin.zsh
index 0b602d12a..027c7550f 100644
--- a/plugins/emacs/emacs.plugin.zsh
+++ b/plugins/emacs/emacs.plugin.zsh
@@ -9,57 +9,55 @@
 # - You can share opened buffered across opened frames.
 # - Configuration changes made at runtime are applied to all frames.
 
+# Require emacs version to be minimum 24
+autoload -Uz is-at-least
+is-at-least 24 "${${(Az)"$(emacsclient --version 2>/dev/null)"}[2]}" || return 0
 
-if "$ZSH/tools/require_tool.sh" emacsclient 24 2>/dev/null ; then
-    export EMACS_PLUGIN_LAUNCHER="$ZSH/plugins/emacs/emacsclient.sh"
+# Path to custom emacsclient launcher
+export EMACS_PLUGIN_LAUNCHER="${0:A:h}/emacsclient.sh"
 
-    # set EDITOR if not already defined.
-    export EDITOR="${EDITOR:-${EMACS_PLUGIN_LAUNCHER}}"
+# set EDITOR if not already defined.
+export EDITOR="${EDITOR:-${EMACS_PLUGIN_LAUNCHER}}"
 
-    alias emacs="$EMACS_PLUGIN_LAUNCHER --no-wait"
-    alias e=emacs
-    # open terminal emacsclient
-    alias te="$EMACS_PLUGIN_LAUNCHER -nw"
+alias emacs="$EMACS_PLUGIN_LAUNCHER --no-wait"
+alias e=emacs
+# open terminal emacsclient
+alias te="$EMACS_PLUGIN_LAUNCHER -nw"
 
-    # same than M-x eval but from outside Emacs.
-    alias eeval="$EMACS_PLUGIN_LAUNCHER --eval"
-    # create a new X frame
-    alias eframe='emacsclient --alternate-editor "" --create-frame'
+# same than M-x eval but from outside Emacs.
+alias eeval="$EMACS_PLUGIN_LAUNCHER --eval"
+# create a new X frame
+alias eframe='emacsclient --alternate-editor "" --create-frame'
 
-    # Emacs ANSI Term tracking
-    if [[ -n "$INSIDE_EMACS" ]]; then
-        chpwd_emacs() { print -P "\033AnSiTc %d"; }
-        print -P "\033AnSiTc %d"    # Track current working directory
-        print -P "\033AnSiTu %n"    # Track username        
+# Emacs ANSI Term tracking
+if [[ -n "$INSIDE_EMACS" ]]; then
+  chpwd_emacs() { print -P "\033AnSiTc %d"; }
+  print -P "\033AnSiTc %d"    # Track current working directory
+  print -P "\033AnSiTu %n"    # Track username
 
-        # add chpwd hook
-        autoload -Uz add-zsh-hook
-        add-zsh-hook chpwd chpwd_emacs
-    fi    
-
-    # Write to standard output the path to the file
-    # opened in the current buffer.
-    function efile {
-        local cmd="(buffer-file-name (window-buffer))"
-        "$EMACS_PLUGIN_LAUNCHER" --eval "$cmd" | tr -d \"
-    }
-
-    # Write to standard output the directory of the file
-    # opened in the the current buffer
-    function ecd {
-        local cmd="(let ((buf-name (buffer-file-name (window-buffer))))
-                     (if buf-name (file-name-directory buf-name)))"
-
-        local dir="$($EMACS_PLUGIN_LAUNCHER --eval $cmd | tr -d \")"
-        if [ -n "$dir" ] ;then
-            echo "$dir"
-        else
-            echo "can not deduce current buffer filename." >/dev/stderr
-            return 1
-        fi
-    }
+  # add chpwd hook
+  autoload -Uz add-zsh-hook
+  add-zsh-hook chpwd chpwd_emacs
 fi
 
-## Local Variables:
-## mode: sh
-## End:
+# Write to standard output the path to the file
+# opened in the current buffer.
+function efile {
+  local cmd="(buffer-file-name (window-buffer))"
+  local file="$("$EMACS_PLUGIN_LAUNCHER" --eval "$cmd" | tr -d \")"
+
+  if [[ -z "$file" ]]; then
+    echo "Can't deduce current buffer filename." >&2
+    return 1
+  fi
+
+  echo "$file"
+}
+
+# Write to standard output the directory of the file
+# opened in the the current buffer
+function ecd {
+  local file
+  file="$(efile)" || return $?
+  echo "${file:h}"
+}

From 27dcca5967082474229d5efafb941e0d5229c760 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Tue, 28 Sep 2021 10:10:43 +0200
Subject: [PATCH 465/869] refactor(emacs): simplify emacsclient wrapper code

---
 plugins/emacs/emacsclient.sh | 36 +++++++++++++++++-------------------
 1 file changed, 17 insertions(+), 19 deletions(-)

diff --git a/plugins/emacs/emacsclient.sh b/plugins/emacs/emacsclient.sh
index 04a2c2afd..0702d7a33 100755
--- a/plugins/emacs/emacsclient.sh
+++ b/plugins/emacs/emacsclient.sh
@@ -1,29 +1,27 @@
 #!/bin/sh
 
-_emacsfun()
-{
-    # get list of emacs frames.
-    frameslist=`emacsclient --alternate-editor '' --eval '(frame-list)' 2>/dev/null | egrep -o '(frame)+'`
+emacsfun() {
+  local frames="$(emacsclient --alternate-editor "" -n -e "(length (frame-list))" 2>/dev/null)"
 
-    if [ "$(echo "$frameslist" | sed -n '$=')" -ge 2 ] ;then
-        # prevent creating another X frame if there is at least one present.
-        emacsclient --alternate-editor "" "$@"
-    else
-        # Create one if there is no X window yet.
-        emacsclient --alternate-editor "" --create-frame "$@"
-    fi
+  # Only create another X frame if there isn't one present
+  if [ -z "$frames" -o "$frames" -lt 2 ]; then
+    emacsclient --alternate-editor "" --create-frame "$@"
+    return $?
+  fi
+
+  emacsclient --alternate-editor "" "$@"
 }
 
 
 # adopted from https://github.com/davidshepherd7/emacs-read-stdin/blob/master/emacs-read-stdin.sh
 # If the second argument is - then write stdin to a tempfile and open the
 # tempfile. (first argument will be `--no-wait` passed in by the plugin.zsh)
-if [ "$#" -ge "2" -a "$2" = "-" ]
-then
-    tempfile="$(mktemp --tmpdir emacs-stdin-$USERNAME.XXXXXXX 2>/dev/null \
-                || mktemp -t emacs-stdin-$USERNAME)" # support BSD mktemp
-    cat - > "$tempfile"
-    _emacsfun --no-wait $tempfile
-else
-    _emacsfun "$@"
+if [ $# -ge 2 -a "$2" = "-" ]; then
+  tempfile="$(mktemp --tmpdir emacs-stdin-$USERNAME.XXXXXXX 2>/dev/null \
+    || mktemp -t emacs-stdin-$USERNAME)" # support BSD mktemp
+  cat - > "$tempfile"
+  emacsfun --no-wait "$tempfile"
+  return $?
 fi
+
+emacsfun "$@"

From 2acae3797b713db2520bb27e76f25d3de6cee48e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Tue, 28 Sep 2021 12:30:29 +0200
Subject: [PATCH 466/869] fix(emacs): assess if there are open frames of the
 expected type

This change looks at the frame type of the open frames ('framep) and
looks if they're of the type requested based on the arguments passed
to emacsclient (-nw/-t/--tty require tty frames, otherwise we need
graphical frames).

NOTE: this code considers anything different than t as graphical
terminals, including MS-DOS types (pc). I don't have such a setup
to test if this is correct.
---
 plugins/emacs/emacsclient.sh | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/plugins/emacs/emacsclient.sh b/plugins/emacs/emacsclient.sh
index 0702d7a33..53a3a428a 100755
--- a/plugins/emacs/emacsclient.sh
+++ b/plugins/emacs/emacsclient.sh
@@ -1,10 +1,20 @@
 #!/bin/sh
 
 emacsfun() {
-  local frames="$(emacsclient --alternate-editor "" -n -e "(length (frame-list))" 2>/dev/null)"
+  local cmd frames
+
+  # Build the Emacs Lisp command to check for suitable frames
+  # See https://www.gnu.org/software/emacs/manual/html_node/elisp/Frames.html#index-framep
+  case "$*" in
+  *-t*|*--tty*|*-nw*) cmd="(memq 't (mapcar 'framep (frame-list)))" ;; # if != nil, there are tty frames
+  *) cmd="(delete 't (mapcar 'framep (frame-list)))" ;; # if != nil, there are graphical terminals (x, w32, ns)
+  esac
+
+  # Check if there are suitable frames
+  frames="$(emacsclient -a '' -n -e "$cmd" 2>/dev/null)"
 
   # Only create another X frame if there isn't one present
-  if [ -z "$frames" -o "$frames" -lt 2 ]; then
+  if [ -z "$frames" -o "$frames" = nil ]; then
     emacsclient --alternate-editor "" --create-frame "$@"
     return $?
   fi

From de76f7cb491c7d566dd94f161b5dbc32e93af914 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Tue, 28 Sep 2021 12:34:44 +0200
Subject: [PATCH 467/869] fix(emacs): correctly pass arguments to emacsclient
 when $2 is stdin

---
 plugins/emacs/emacsclient.sh | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/plugins/emacs/emacsclient.sh b/plugins/emacs/emacsclient.sh
index 53a3a428a..25efe0d68 100755
--- a/plugins/emacs/emacsclient.sh
+++ b/plugins/emacs/emacsclient.sh
@@ -22,16 +22,17 @@ emacsfun() {
   emacsclient --alternate-editor "" "$@"
 }
 
-
-# adopted from https://github.com/davidshepherd7/emacs-read-stdin/blob/master/emacs-read-stdin.sh
+# Adapted from https://github.com/davidshepherd7/emacs-read-stdin/blob/master/emacs-read-stdin.sh
 # If the second argument is - then write stdin to a tempfile and open the
 # tempfile. (first argument will be `--no-wait` passed in by the plugin.zsh)
 if [ $# -ge 2 -a "$2" = "-" ]; then
+  # Create a tempfile to hold stdin
   tempfile="$(mktemp --tmpdir emacs-stdin-$USERNAME.XXXXXXX 2>/dev/null \
     || mktemp -t emacs-stdin-$USERNAME)" # support BSD mktemp
+  # Redirect stdin to the tempfile
   cat - > "$tempfile"
-  emacsfun --no-wait "$tempfile"
-  return $?
+  # Reset $2 to the tempfile so that "$@" works as expected
+  set -- "$1" "$tempfile" "${@:3}"
 fi
 
 emacsfun "$@"

From 54e3e8ef54765bb5d4548864ff2d6cff75a33976 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Wed, 29 Sep 2021 17:19:25 +0200
Subject: [PATCH 468/869] fix(lib): fix automatic title abort inside Emacs
 (#10124)

Closes #10124

Co-authored-by: Paul Schorfheide <pschorf2@gmail.com>
Co-authored-by: Alastair Rankine <alastair@girtby.net>
---
 lib/termsupport.zsh | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/lib/termsupport.zsh b/lib/termsupport.zsh
index 33451ef1f..ef0d78895 100644
--- a/lib/termsupport.zsh
+++ b/lib/termsupport.zsh
@@ -10,7 +10,8 @@ function title {
   emulate -L zsh
   setopt prompt_subst
 
-  [[ "$INSIDE_EMACS" == *term* ]] && return
+  # Don't set the title if inside emacs, unless using vterm
+  [[ -n "$INSIDE_EMACS" && "$INSIDE_EMACS" != vterm ]] && return
 
   # if $2 is unset use $1 as default
   # if it is set and empty, leave it as is
@@ -29,12 +30,9 @@ function title {
         print -Pn "\e]2;${2:q}\a" # set window name
         print -Pn "\e]1;${1:q}\a" # set tab name
       else
-        # Try to use terminfo to set the title
-        # If the feature is available set title
-        if [[ -n "$terminfo[fsl]" ]] && [[ -n "$terminfo[tsl]" ]]; then
-          echoti tsl
-          print -Pn "$1"
-          echoti fsl
+        # Try to use terminfo to set the title if the feature is available
+        if (( ${+terminfo[fsl]} && ${+terminfo[tsl]} )); then
+          print -Pn "${terminfo[tsl]}$1${terminfo[fsl]}"
         fi
       fi
       ;;
@@ -105,10 +103,12 @@ function omz_termsupport_preexec {
   title '$CMD' '%100>...>$LINE%<<'
 }
 
-autoload -U add-zsh-hook
-add-zsh-hook precmd omz_termsupport_precmd
-add-zsh-hook preexec omz_termsupport_preexec
+autoload -Uz add-zsh-hook
 
+if [[ -z "$INSIDE_EMACS" || "$INSIDE_EMACS" = vterm ]]; then
+  add-zsh-hook precmd omz_termsupport_precmd
+  add-zsh-hook preexec omz_termsupport_preexec
+fi
 
 # Keep Apple Terminal.app's current working directory updated
 # Based on this answer: https://superuser.com/a/315029

From c7a55086e16c8f1895498a859a1ef2806fa1f612 Mon Sep 17 00:00:00 2001
From: Celestino Gomes <tinorj@gmail.com>
Date: Wed, 29 Sep 2021 13:07:25 -0300
Subject: [PATCH 469/869] feat(lib): don't correct `su` command arguments
 (#10214)

---
 lib/correction.zsh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/correction.zsh b/lib/correction.zsh
index c635236b5..4259d3418 100644
--- a/lib/correction.zsh
+++ b/lib/correction.zsh
@@ -9,6 +9,7 @@ if [[ "$ENABLE_CORRECTION" == "true" ]]; then
   alias mv='nocorrect mv'
   alias mysql='nocorrect mysql'
   alias sudo='nocorrect sudo'
+  alias su='nocorrect su'
 
   setopt correct_all
 fi

From 54783f66b8188297448bc725c578fdc7647e9fa0 Mon Sep 17 00:00:00 2001
From: Leon <82407168+sed-i@users.noreply.github.com>
Date: Wed, 29 Sep 2021 12:09:02 -0400
Subject: [PATCH 470/869] feat(juju): add plugin for Juju (juju.is) (#10075)

Co-authored-by: Jon Seager <jon@sgrs.uk>
---
 plugins/juju/README.md       | 117 ++++++++++++++++++++++++++++++++
 plugins/juju/juju.plugin.zsh | 127 +++++++++++++++++++++++++++++++++++
 2 files changed, 244 insertions(+)
 create mode 100644 plugins/juju/README.md
 create mode 100644 plugins/juju/juju.plugin.zsh

diff --git a/plugins/juju/README.md b/plugins/juju/README.md
new file mode 100644
index 000000000..49f8b0d47
--- /dev/null
+++ b/plugins/juju/README.md
@@ -0,0 +1,117 @@
+# juju plugin
+
+This plugin provides useful aliases and functions for [juju](https://juju.is/) (for TAB completion,
+refer to the [official repo](https://github.com/juju/juju/blob/develop/etc/bash_completion.d/juju)).
+
+To use this plugin, add `juju` to the plugins array in your zshrc file.
+
+```zsh
+plugins=(... juju)
+```
+
+## Aliases
+
+Naming convention:
+
+- `!` suffix: `--force --no-wait -y`.
+- `ds` suffix: `--destroy-storage`.
+
+### General
+
+| Alias  | Command                                     | Description                                            |
+|--------|---------------------------------------------|--------------------------------------------------------|
+| `jdl`  | `juju debug-log --ms`                       | Display log, with millisecond resolution               |
+| `jdlr` | `juju debug-log --ms --replay`              | Replay entire log                                      |
+| `jh`   | `juju help`                                 | Show help on a command or other topic                  |
+| `jssl` | `juju juju show-status-log`                 | Output past statuses for the specified entity          |
+| `jstj` | `juju status --format=json`                 | Show status in json format (more detailed)             |
+| `jst`  | `juju status --relations --storage --color` | Show status, including relations and storage, in color |
+
+### Bootstrap
+
+| Alias | Command                   | Description                               |
+|-------|---------------------------|-------------------------------------------|
+| `jb`  | `juju bootstrap`          | Initializing a Juju cloud environment     |
+| `jbm` | `juju bootstrap microk8s` | Initializing a MicroK8s cloud environment |
+
+### Controller
+
+| Alias    | Command                                                                               | Description                                                       |
+|----------|---------------------------------------------------------------------------------------|-------------------------------------------------------------------|
+| `jdc`    | `juju destroy-controller --destroy-all-models`                                        | Destroy a controller                                              |
+| `jdc!`   | `juju destroy-controller --destroy-all-models --force --no-wait -y`                   | Destroy a controller                                              |
+| `jdcds`  | `juju destroy-controller --destroy-all-models --destroy-storage`                      | Destroy a controller and associated storage                       |
+| `jdcds!` | `juju destroy-controller --destroy-all-models --destroy-storage --force --no-wait -y` | Destroy a controller and associated storage                       |
+| `jkc`    | `juju kill-controller -y -t 0`                                                        | Forcibly terminate all associated resources for a Juju controller |
+| `jsw`    | `juju switch`                                                                         | Select or identify the current controller and model               |
+
+### Model
+
+| Alias    | Command                                                     | Description                                           |
+|----------|-------------------------------------------------------------|-------------------------------------------------------|
+| `jam`    | `juju add-model`                                            | Add a hosted model                                    |
+| `jdm`    | `juju destroy-model`                                        | Non-recoverable, complete removal of a model          |
+| `jdm!`   | `juju destroy-model --force --no-wait -y`                   | Non-recoverable, complete removal of a model          |
+| `jdmds`  | `juju destroy-model --destroy-storage`                      | Non-recoverable, complete removal of a model          |
+| `jdmds!` | `juju destroy-model --destroy-storage --force --no-wait -y` | Non-recoverable, complete removal of a model          |
+| `jmc`    | `juju model-config`                                         | Display or set configuration values on a model        |
+| `jm`     | `juju models`                                               | List models a user can access on a controller         |
+| `jshm`   | `juju show-model`                                           | Show information about the current or specified model |
+| `jsw`    | `juju switch`                                               | Select or identify the current controller and model   |
+
+### Application / unit
+
+| Alias    | Command                                                       | Description                                                               |
+|----------|---------------------------------------------------------------|---------------------------------------------------------------------------|
+| `jc`     | `juju config`                                                 | Get, set, or reset configuration for a deployed application               |
+| `jde`    | `juju deploy --channel=edge`                                  | Deploy a new application or bundle from the edge channel                  |
+| `jd`     | `juju deploy`                                                 | Deploy a new application or bundle                                        |
+| `jra`    | `juju run-action`                                             | Queue an action for execution                                             |
+| `jraw`   | `juju run-action --wait`                                      | Queue an action for execution and wait for results, with optional timeout |
+| `jrm`    | `juju remove-application`                                     | Remove application                                                        |
+| `jrm!`   | `juju remove-application --force --no-wait`                   | Remove application forcefully                                             |
+| `jrmds`  | `juju remove-application --destroy-storage`                   | Remove application and destroy attached storage                           |
+| `jrmds!` | `juju remove-application --destroy-storage --force --no-wait` | Remove application forcefully, destroying attached storage                |
+| `jrp`    | `juju refresh --path`                                         | Upgrade charm from local charm file                                       |
+| `jsa`    | `juju scale-application`                                      | Set the desired number of application units                               |
+| `jsh`    | `juju ssh`                                                    | Initiate an SSH session or execute a command on a Juju target             |
+| `jshc`   | `juju ssh --container`                                        | Initiate an SSH session or execute a command on a given container         |
+| `jsu`    | `juju show-unit`                                              | Displays information about a unit                                         |
+
+### Storage
+
+| Alias   | Command                       | Description                                     |
+|---------|-------------------------------|-------------------------------------------------|
+| `jrs`   | `juju remove-storage`         | Remove storage                                  |
+| `jrs!`  | `juju remove-storage --force` | Remove storage even if it is currently attached |
+
+### Relation
+
+| Alias     | Command                        | Description                                                       |
+|-----------|--------------------------------|-------------------------------------------------------------------|
+| `jrel`    | `juju relate`                  | Relate two applications                                           |
+| `jrmrel`  | `juju remove-relation`         | Remove an existing relation between two applications.             |
+| `jrmrel!` | `juju remove-relation --force` | Remove an existing relation between two applications, forcefully. |
+
+### Cross-model relation (CMR)
+
+| Alias    | Command            | Description                                                    |
+|----------|--------------------|----------------------------------------------------------------|
+| `jex`    | `juju expose`      | Make an application publicly available over the network        |
+| `jof`    | `juju offer`       | Offer application endpoints for use in other models            |
+| `jcon`   | `juju consume`     | Add a remote offer to the model                                |
+| `jrmsas` | `juju remove-saas` | Remove consumed applications (SAAS) from the model             |
+| `junex`  | `juju unexpose`    | Remove public availability over the network for an application |
+
+### Bundle
+
+| Alias | Command              | Description                                                 |
+|-------|----------------------|-------------------------------------------------------------|
+| `jeb` | `juju export-bundle` | Export the current model configuration as a reusable bundle |
+
+## Functions
+
+- `jaddr <app_name> [unit_num]`: display app or unit IP address.
+- `jreld <relation_name> <app_name> <unit_num>`: display app and unit relation data.
+- `wjst [interval_secs] [args_for_watch]`: watch juju status, with optional interval
+  (default: 5s); you may pass additional arguments to `watch`.
diff --git a/plugins/juju/juju.plugin.zsh b/plugins/juju/juju.plugin.zsh
new file mode 100644
index 000000000..07f15b392
--- /dev/null
+++ b/plugins/juju/juju.plugin.zsh
@@ -0,0 +1,127 @@
+# ---------------------------------------------------------- #
+# Aliases and functions for juju (https://juju.is)           #
+# ---------------------------------------------------------- #
+
+# Load TAB completions
+# You need juju's bash completion script installed. By default bash-completion's
+# location will be used (i.e. pkg-config --variable=completionsdir bash-completion).
+completion_file="$(pkg-config --variable=completionsdir bash-completion 2>/dev/null)/juju" || \
+  completion_file="/usr/share/bash-completion/completions/juju"
+[[ -f "$completion_file" ]] && source "$completion_file"
+unset completion_file
+
+# ---------------------------------------------------------- #
+# Aliases (in alphabetic order)                              #
+#                                                            #
+# Generally,                                                 #
+#   - `!` means --force --no-wait -y                         #
+#   - `ds` suffix means --destroy-storage                    #
+# ---------------------------------------------------------- #
+alias jam="juju add-model --config logging-config=\"<root>=WARNING; unit=DEBUG\"\
+ --config update-status-hook-interval=\"60m\""
+alias jb='juju bootstrap'
+alias jbm='juju bootstrap microk8s'
+alias jc='juju config'
+alias jdc='juju destroy-controller --destroy-all-models'
+alias 'jdc!'='juju destroy-controller --destroy-all-models --force --no-wait -y'
+alias jdcds='juju destroy-controller --destroy-all-models --destroy-storage'
+alias 'jdcds!'='juju destroy-controller --destroy-all-models --destroy-storage --force --no-wait -y'
+alias jdm='juju destroy-model'
+alias 'jdm!'='juju destroy-model --force --no-wait -y'
+alias jdmds='juju destroy-model --destroy-storage'
+alias 'jdmds!'='juju destroy-model --destroy-storage --force --no-wait -y'
+alias jde='juju deploy --channel=edge'
+alias jd='juju deploy'
+alias jdl='juju debug-log --ms'
+alias jdlr='juju debug-log --ms --replay'
+alias jcon='juju consume'
+alias jeb='juju export-bundle'
+alias jex='juju expose'
+alias jh='juju help'
+alias jkc='juju kill-controller -y -t 0'
+alias jm='juju models'
+alias jmc='juju model-config'
+alias jof='juju offer'
+alias jra='juju run-action'
+alias jraw='juju run-action --wait'
+alias jrel='juju relate'
+alias jrm='juju remove-application'
+alias 'jrm!'='juju remove-application --force --no-wait'
+alias jrmds='juju remove-application --destroy-storage'
+alias 'jrmds!'='juju remove-application --destroy-storage --force --no-wait'
+alias jrmrel='juju remove-relation'
+alias 'jrmrel!'='juju remove-relation --force'
+alias jrmsas='juju remove-saas'
+alias jrp='juju refresh --path'
+alias jrs='juju remove-storage'
+alias 'jrs!'='juju remove-storage --force'
+alias jsa='juju scale-application'
+alias jsh='juju ssh'
+alias jshc='juju ssh --container'
+alias jshm='juju show-model'
+alias jssl='juju show-status-log'
+alias jstj='juju status --format=json'
+alias jst='juju status --relations --storage --color'
+alias jsu='juju show-unit'
+alias jsw='juju switch'
+
+# ---------------------------------------------------------- #
+# Functions (in alphabetic order)                            #
+# ---------------------------------------------------------- #
+
+# Get app or unit address
+jaddr() {
+  # $1 = app name
+  # $2 = unit number (optional)
+  if (( ! ${+commands[jq]} )); then
+    echo "jq is required but could not be found." >&2
+    return 1
+  fi
+
+  if [[ $# -eq 1 ]]; then
+    # Get app address
+    juju status "$1" --format=json \
+      | jq -r ".applications.\"$1\".address"
+  elif [[ $# -eq 2 ]]; then
+    # Get unit address
+    juju status "$1/$2" --format=json \
+      | jq -r ".applications.\"$1\".units.\"$1/$2\".address"
+  else
+    echo "Invalid number of arguments."
+    echo "Usage:   jaddr <app-name> [<unit-number>]"
+    echo "Example: jaddr karma"
+    echo "Example: jaddr karma 0"
+    return 1
+  fi
+}
+
+# Display app and unit relation data
+jreld() {
+  # $1 = relation name
+  # $2 = app name
+  # $3 = unit number
+  if [[ $# -ne 3 ]]; then
+    echo "Invalid number of arguments."
+    echo "Usage:   jreld <relation-name> <app-name> <unit-number>"
+    echo "Example: jreld karma-dashboard alertmanager 0"
+    return 1
+  fi
+
+  local relid="$(juju run "relation-ids $1" --unit $2/$3)"
+  if [[ -z "$relid" ]]; then
+    return 1
+  fi
+
+  echo "App data:"
+  juju run "relation-get -r $relid --app - $2" --unit $2/$3
+  echo
+  echo "Unit data:"
+  juju run "relation-get -r $relid - $2" --unit $2/$3
+}
+
+# Watch juju status, with optional interval (default: 5 sec)
+wjst() {
+  local interval="${1:-5}"
+  shift $(( $# > 0 ))
+  watch -n "$interval" --color juju status --relations --storage --color "$@"
+}

From 5f99eb5afd3c19683f178ddb57bb9345391d3548 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Thu, 30 Sep 2021 10:18:53 +0200
Subject: [PATCH 471/869] fix(cli): get branch and tags from OMZ folder in `omz
 changelog` completion

---
 lib/cli.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/cli.zsh b/lib/cli.zsh
index 2189e24ca..f40a4226e 100644
--- a/lib/cli.zsh
+++ b/lib/cli.zsh
@@ -35,7 +35,7 @@ function _omz {
   elif (( CURRENT == 3 )); then
     case "$words[2]" in
       changelog) local -a refs
-        refs=("${(@f)$(command git for-each-ref --format="%(refname:short):%(subject)" refs/heads refs/tags)}")
+        refs=("${(@f)$(command git -C "$ZSH" for-each-ref --format="%(refname:short):%(subject)" refs/heads refs/tags)}")
         _describe 'command' refs ;;
       plugin) subcmds=(
         'disable:Disable plugin(s)'

From 72b8f0b73b56b4a5c01eada3cb93b94be39fd984 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Thu, 30 Sep 2021 15:23:11 +0200
Subject: [PATCH 472/869] fix(half-life): fix prompt color bleeding and code
 clean up (#10085)

Fixes #10085
Closes #10223

Co-authored-by: valdaarhun <icegambit91@gmail.com>
---
 themes/half-life.zsh-theme | 103 ++++++++++++++++++-------------------
 1 file changed, 50 insertions(+), 53 deletions(-)

diff --git a/themes/half-life.zsh-theme b/themes/half-life.zsh-theme
index c79027ed6..c4d785126 100644
--- a/themes/half-life.zsh-theme
+++ b/themes/half-life.zsh-theme
@@ -7,31 +7,22 @@
 # git untracked files modification from Brian Carper:
 # https://briancarper.net/blog/570/git-info-in-your-zsh-prompt
 
-function virtualenv_info {
-    [ $VIRTUAL_ENV ] && echo '('`basename $VIRTUAL_ENV`') '
-}
-PR_GIT_UPDATE=1
-
-setopt prompt_subst
-
-autoload -U add-zsh-hook
-autoload -Uz vcs_info
-
 #use extended color palette if available
-if [[ $TERM = *256color* || $TERM = *rxvt* ]]; then
-    turquoise="%F{81}"
-    orange="%F{166}"
-    purple="%F{135}"
-    hotpink="%F{161}"
-    limegreen="%F{118}"
+if [[ $TERM = (*256color|*rxvt*) ]]; then
+  turquoise="%{${(%):-"%F{81}"}%}"
+  orange="%{${(%):-"%F{166}"}%}"
+  purple="%{${(%):-"%F{135}"}%}"
+  hotpink="%{${(%):-"%F{161}"}%}"
+  limegreen="%{${(%):-"%F{118}"}%}"
 else
-    turquoise="$fg[cyan]"
-    orange="$fg[yellow]"
-    purple="$fg[magenta]"
-    hotpink="$fg[red]"
-    limegreen="$fg[green]"
+  turquoise="%{${(%):-"%F{cyan}"}%}"
+  orange="%{${(%):-"%F{yellow}"}%}"
+  purple="%{${(%):-"%F{magenta}"}%}"
+  hotpink="%{${(%):-"%F{red}"}%}"
+  limegreen="%{${(%):-"%F{green}"}%}"
 fi
 
+autoload -Uz vcs_info
 # enable VCS systems you use
 zstyle ':vcs_info:*' enable git svn
 
@@ -47,10 +38,10 @@ zstyle ':vcs_info:*:prompt:*' check-for-changes true
 # %R - repository path
 # %S - path in the repository
 PR_RST="%{${reset_color}%}"
-FMT_BRANCH=" on %{$turquoise%}%b%u%c${PR_RST}"
-FMT_ACTION=" performing a %{$limegreen%}%a${PR_RST}"
-FMT_UNSTAGED="%{$orange%} ●"
-FMT_STAGED="%{$limegreen%} ●"
+FMT_BRANCH=" on ${turquoise}%b%u%c${PR_RST}"
+FMT_ACTION=" performing a ${limegreen}%a${PR_RST}"
+FMT_UNSTAGED="${orange} ●"
+FMT_STAGED="${limegreen} ●"
 
 zstyle ':vcs_info:*:prompt:*' unstagedstr   "${FMT_UNSTAGED}"
 zstyle ':vcs_info:*:prompt:*' stagedstr     "${FMT_STAGED}"
@@ -59,38 +50,44 @@ zstyle ':vcs_info:*:prompt:*' formats       "${FMT_BRANCH}"
 zstyle ':vcs_info:*:prompt:*' nvcsformats   ""
 
 
-function steeef_preexec {
-    case "$2" in
-        *git*)
-            PR_GIT_UPDATE=1
-            ;;
-        *svn*)
-            PR_GIT_UPDATE=1
-            ;;
-    esac
-}
-add-zsh-hook preexec steeef_preexec
-
 function steeef_chpwd {
-    PR_GIT_UPDATE=1
+  PR_GIT_UPDATE=1
+}
+
+function steeef_preexec {
+  case "$2" in
+  *git*|*svn*) PR_GIT_UPDATE=1 ;;
+  esac
 }
-add-zsh-hook chpwd steeef_chpwd
 
 function steeef_precmd {
-    if [[ -n "$PR_GIT_UPDATE" ]] ; then
-        # check for untracked files or updated submodules, since vcs_info doesn't
-        if [[ ! -z $(git ls-files --other --exclude-standard 2> /dev/null) ]]; then
-            PR_GIT_UPDATE=1
-            FMT_BRANCH="${PM_RST} on %{$turquoise%}%b%u%c%{$hotpink%} ●${PR_RST}"
-        else
-            FMT_BRANCH="${PM_RST} on %{$turquoise%}%b%u%c${PR_RST}"
-        fi
-        zstyle ':vcs_info:*:prompt:*' formats       "${FMT_BRANCH}"
+  (( PR_GIT_UPDATE )) || return
 
-        vcs_info 'prompt'
-        PR_GIT_UPDATE=
-    fi
+  # check for untracked files or updated submodules, since vcs_info doesn't
+  if [[ -n "$(git ls-files --other --exclude-standard 2>/dev/null)" ]]; then
+    PR_GIT_UPDATE=1
+    FMT_BRANCH="${PM_RST} on ${turquoise}%b%u%c${hotpink} ●${PR_RST}"
+  else
+    FMT_BRANCH="${PM_RST} on ${turquoise}%b%u%c${PR_RST}"
+  fi
+  zstyle ':vcs_info:*:prompt:*' formats       "${FMT_BRANCH}"
+
+  vcs_info 'prompt'
+  PR_GIT_UPDATE=
 }
-add-zsh-hook precmd steeef_precmd
 
-PROMPT=$'%{$purple%}%n%{$reset_color%} in %{$limegreen%}%~%{$reset_color%}$(ruby_prompt_info " with%{$fg[red]%} " v g "%{$reset_color%}")$vcs_info_msg_0_%{$orange%} λ%{$reset_color%} '
+# vcs_info running hooks
+PR_GIT_UPDATE=1
+
+autoload -U add-zsh-hook
+add-zsh-hook chpwd steeef_chpwd
+add-zsh-hook precmd steeef_precmd
+add-zsh-hook preexec steeef_preexec
+
+# ruby prompt settings
+ZSH_THEME_RUBY_PROMPT_PREFIX="with%F{red} "
+ZSH_THEME_RUBY_PROMPT_SUFFIX="%{$reset_color%}"
+ZSH_THEME_RVM_PROMPT_OPTIONS="v g"
+
+setopt prompt_subst
+PROMPT="${purple}%n%{$reset_color%} in ${limegreen}%~%{$reset_color%}\$(ruby_prompt_info)\$vcs_info_msg_0_${orange} λ%{$reset_color%} "

From 3c209b00d69499db93fb6aac5c79a6179ff6b855 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Thu, 30 Sep 2021 15:41:25 +0200
Subject: [PATCH 473/869] feat(cli): show current theme in `omz theme list`

Fixes #9540
---
 lib/cli.zsh | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/lib/cli.zsh b/lib/cli.zsh
index f40a4226e..cadc82e27 100644
--- a/lib/cli.zsh
+++ b/lib/cli.zsh
@@ -630,17 +630,23 @@ function _omz::theme::list {
     return
   fi
 
+  # Print theme in use
+  if [[ -n "$ZSH_THEME" ]]; then
+    print -Pn "%U%BCurrent theme%b%u: "
+    [[ $ZSH_THEME = random ]] && echo "$RANDOM_THEME (via random)" || echo "$ZSH_THEME"
+    echo
+  fi
+
+  # Print custom themes if there are any
   if (( ${#custom_themes} )); then
     print -P "%U%BCustom themes%b%u:"
     print -l ${(q-)custom_themes} | column -x
+    echo
   fi
 
-  if (( ${#builtin_themes} )); then
-    (( ${#custom_themes} )) && echo # add a line of separation
-
-    print -P "%U%BBuilt-in themes%b%u:"
-    print -l ${(q-)builtin_themes} | column -x
-  fi
+  # Print built-in themes
+  print -P "%U%BBuilt-in themes%b%u:"
+  print -l ${(q-)builtin_themes} | column -x
 }
 
 function _omz::theme::set {
@@ -727,6 +733,10 @@ function _omz::theme::use {
     _omz::log error "%B$1%b theme not found"
     return 1
   fi
+
+  # Update theme settings
+  ZSH_THEME="$1"
+  [[ $1 = random ]] || unset RANDOM_THEME
 }
 
 function _omz::update {

From c6c364317d1762aafc575951c08c2cccce76fffa Mon Sep 17 00:00:00 2001
From: Kaede Hoshikawa <futursolo@users.noreply.github.com>
Date: Sun, 3 Oct 2021 16:18:33 +0900
Subject: [PATCH 474/869] fix(pyenv): fix pyenv-virtualenv detection under
 macOS.

---
 plugins/pyenv/pyenv.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/pyenv/pyenv.plugin.zsh b/plugins/pyenv/pyenv.plugin.zsh
index d91b5daa7..39897ed16 100644
--- a/plugins/pyenv/pyenv.plugin.zsh
+++ b/plugins/pyenv/pyenv.plugin.zsh
@@ -78,7 +78,7 @@ if [[ $FOUND_PYENV -eq 1 ]]; then
   eval "$(pyenv init - --no-rehash zsh)"
 
   # If pyenv-virtualenv exists, load it
-  if [[ -d "$(pyenv root)/plugins/pyenv-virtualenv" && "$ZSH_PYENV_VIRTUALENV" != false ]]; then
+  if [[ "$(pyenv commands)" =~ "virtualenv-init" && "$ZSH_PYENV_VIRTUALENV" != false ]]; then
     eval "$(pyenv virtualenv-init - zsh)"
   fi
 

From 7152a942802b01cb74d7c0b99f3106f8af17439d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Mon, 4 Oct 2021 10:34:13 +0200
Subject: [PATCH 475/869] feat(init): show error and process tree if OMZ is
 loaded from non-zsh shells (#10234)

---
 oh-my-zsh.sh | 38 +++++++++++++++++++++++++++++++++++---
 1 file changed, 35 insertions(+), 3 deletions(-)

diff --git a/oh-my-zsh.sh b/oh-my-zsh.sh
index bf5902fc8..c389fc963 100644
--- a/oh-my-zsh.sh
+++ b/oh-my-zsh.sh
@@ -1,8 +1,40 @@
 # Protect against non-zsh execution of Oh My Zsh (use POSIX syntax here)
 [ -n "$ZSH_VERSION" ] || {
-  # ANSI (\033[<code>m): 0: reset, 1: bold, 4: underline, 22: no bold, 24: no underline, 31: red
-  printf "\033[1;31mERROR:\033[22m Oh My Zsh can't be loaded from: \033[1m${0#-}\033[22m. " >&2
-  printf "You need to run \033[1;4mzsh\033[22;24m instead.\033[0m\n" >&2
+  # ANSI formatting function (\033[<code>m)
+  # 0: reset, 1: bold, 4: underline, 22: no bold, 24: no underline, 31: red, 33: yellow
+  f() {
+    [ $# -gt 0 ] || return
+    IFS=";" printf "\033[%sm" $*
+  }
+  # If stdout is not a terminal ignore all formatting
+  [ -t 1 ] || f() { :; }
+
+  ptree() {
+    # Get process tree of the current process
+    pid=$$; pids="$pid"
+    while [ ${pid-0} -ne 1 ] && ppid=$(ps -e -o pid,ppid | awk "\$1 == $pid { print \$2 }"); do
+      pids="$pids $pid"; pid=$ppid
+    done
+
+    # Show process tree
+    case "$(uname)" in
+    Linux) ps -o ppid,pid,command -f -p $pids 2>/dev/null ;;
+    Darwin|*) ps -o ppid,pid,command -p $pids 2>/dev/null ;;
+    esac
+
+    # If ps command failed, try Busybox ps
+    [ $? -eq 0 ] || ps -o ppid,pid,comm | awk "NR == 1 || index(\"$pids\", \$2) != 0"
+  }
+
+  {
+    shell=$(ps -o pid,comm | awk "\$1 == $$ { print \$2 }")
+    printf "$(f 1 31)Error:$(f 22) Oh My Zsh can't be loaded from: $(f 1)${shell}$(f 22). "
+    printf "You need to run $(f 1)zsh$(f 22) instead.$(f 0)\n"
+    printf "$(f 33)Here's the process tree:$(f 22)\n\n"
+    ptree
+    printf "$(f 0)\n"
+  } >&2
+
   return 1
 }
 

From adef0e6081789498156fa11455f3ab4f4d36525c Mon Sep 17 00:00:00 2001
From: Nikolas Garofil <nikolas@garofil.be>
Date: Mon, 4 Oct 2021 10:43:13 +0200
Subject: [PATCH 476/869] feat(git): run `gitk` in the background in `gk` and
 `gke` aliases (#9657)

---
 plugins/git/README.md      | 4 ++--
 plugins/git/git.plugin.zsh | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/plugins/git/README.md b/plugins/git/README.md
index e53d93b0b..05ef25099 100644
--- a/plugins/git/README.md
+++ b/plugins/git/README.md
@@ -90,8 +90,8 @@ plugins=(... git)
 | gignore              | git update-index --assume-unchanged                                                                                              |
 | gignored             | git ls-files -v \| grep "^[[:lower:]]"                                                                                           |
 | git-svn-dcommit-push | git svn dcommit && git push github $(git_main_branch):svntrunk                                                                   |
-| gk                   | gitk --all --branches                                                                                                            |
-| gke                  | gitk --all $(git log -g --pretty=%h)                                                                                             |
+| gk                   | gitk --all --branches &!                                                                                                          |
+| gke                  | gitk --all $(git log -g --pretty=%h) &!                                                                                           |
 | gl                   | git pull                                                                                                                         |
 | glg                  | git log --stat                                                                                                                   |
 | glgp                 | git log --stat -p                                                                                                                |
diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index 76e0faed3..11dff99d9 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -201,8 +201,8 @@ alias gignore='git update-index --assume-unchanged'
 alias gignored='git ls-files -v | grep "^[[:lower:]]"'
 alias git-svn-dcommit-push='git svn dcommit && git push github $(git_main_branch):svntrunk'
 
-alias gk='\gitk --all --branches'
-alias gke='\gitk --all $(git log -g --pretty=%h)'
+alias gk='\gitk --all --branches &!'
+alias gke='\gitk --all $(git log -g --pretty=%h) &!'
 
 alias gl='git pull'
 alias glg='git log --stat'

From 3c9743313cc916a6cede71e333eecef4b07ce3ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Thu, 30 Sep 2021 17:20:22 +0200
Subject: [PATCH 477/869] refactor(updater): change auto-update settings to use
 `zstyle`

---
 templates/zshrc.zsh-template | 10 ++++------
 tools/check_for_upgrade.sh   | 27 +++++++++++++++++++++------
 2 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/templates/zshrc.zsh-template b/templates/zshrc.zsh-template
index 4a998c2fc..7cb87078c 100644
--- a/templates/zshrc.zsh-template
+++ b/templates/zshrc.zsh-template
@@ -23,14 +23,12 @@ ZSH_THEME="robbyrussell"
 # Case-sensitive completion must be off. _ and - will be interchangeable.
 # HYPHEN_INSENSITIVE="true"
 
-# Uncomment the following line to disable bi-weekly auto-update checks.
-# DISABLE_AUTO_UPDATE="true"
-
-# Uncomment the following line to automatically update without prompting.
-# DISABLE_UPDATE_PROMPT="true"
+# Uncomment the following lines to change the auto-update behavior
+# zstyle ':omz:update' mode disabled  # disable automatic updates
+# zstyle ':omz:update' mode auto      # update automatically without asking
 
 # Uncomment the following line to change how often to auto-update (in days).
-# export UPDATE_ZSH_DAYS=13
+# zstyle ':omz:update' frequency 13
 
 # Uncomment the following line if pasting URLs and other text is messed up.
 # DISABLE_MAGIC_FUNCTIONS="true"
diff --git a/tools/check_for_upgrade.sh b/tools/check_for_upgrade.sh
index e87da3487..fa832ffac 100644
--- a/tools/check_for_upgrade.sh
+++ b/tools/check_for_upgrade.sh
@@ -3,17 +3,30 @@ if [[ -f ~/.zsh-update && ! -f "${ZSH_CACHE_DIR}/.zsh-update" ]]; then
   mv ~/.zsh-update "${ZSH_CACHE_DIR}/.zsh-update"
 fi
 
+# Get user's update preferences
+#
+# Supported update modes:
+# - prompt (default): the user is asked before updating when it's time to update
+# - auto: the update is performed automatically when it's time
+# - reminder: a reminder is shown to the user when it's time to update
+# - disabled: automatic update is turned off
+zstyle -s ':omz:update' mode update_mode || update_mode=prompt
+
+# Support old-style settings
+[[ "$DISABLE_UPDATE_PROMPT" != true ]] || update_mode=auto
+[[ "$DISABLE_AUTO_UPDATE" != true ]] || update_mode=disabled
+
 # Cancel update if:
 # - the automatic update is disabled.
 # - the current user doesn't have write permissions nor owns the $ZSH directory.
 # - git is unavailable on the system.
-if [[ "$DISABLE_AUTO_UPDATE" = true ]] \
+if [[ "$update_mode" = disabled ]] \
    || [[ ! -w "$ZSH" || ! -O "$ZSH" ]] \
    || ! command -v git &>/dev/null; then
+  unset update_mode
   return
 fi
 
-
 function current_epoch() {
   zmodload zsh/datetime
   echo $(( EPOCHSECONDS / 60 / 60 / 24 ))
@@ -56,7 +69,6 @@ function update_ohmyzsh() {
   #  the shell actually exits what it's running.
   trap "
     ret=\$?
-    unset -f current_epoch update_last_updated_file update_ohmyzsh 2>/dev/null
     command rm -rf '$ZSH/log/update.lock'
     return \$ret
   " EXIT INT QUIT
@@ -68,14 +80,14 @@ function update_ohmyzsh() {
   fi
 
   # Number of days before trying to update again
-  epoch_target=${UPDATE_ZSH_DAYS:-13}
+  zstyle -s ':omz:update' frequency epoch_target || epoch_target=${UPDATE_ZSH_DAYS:-13}
   # Test if enough time has passed until the next update
   if (( ( $(current_epoch) - $LAST_EPOCH ) < $epoch_target )); then
     return
   fi
 
-  # Ask for confirmation before updating unless disabled
-  if [[ "$DISABLE_UPDATE_PROMPT" = true ]]; then
+  # Ask for confirmation before updating unless in auto mode
+  if [[ "$update_mode" = auto ]]; then
     update_ohmyzsh
   else
     # input sink to swallow all characters typed before the prompt
@@ -92,3 +104,6 @@ function update_ohmyzsh() {
     esac
   fi
 }
+
+unset update_mode
+unset -f current_epoch update_last_updated_file update_ohmyzsh

From 0120749a54d147405beebe6f8416da0e4443ebc4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Thu, 30 Sep 2021 17:22:04 +0200
Subject: [PATCH 478/869] feat(updater): add mode to only remind you to update
 when it's time (#10187)

Fixes #10187

Co-authored-by: NoPreserveRoot <NoPreserveRoot@pm.me>
---
 templates/zshrc.zsh-template | 1 +
 tools/check_for_upgrade.sh   | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/templates/zshrc.zsh-template b/templates/zshrc.zsh-template
index 7cb87078c..58642bc41 100644
--- a/templates/zshrc.zsh-template
+++ b/templates/zshrc.zsh-template
@@ -26,6 +26,7 @@ ZSH_THEME="robbyrussell"
 # Uncomment the following lines to change the auto-update behavior
 # zstyle ':omz:update' mode disabled  # disable automatic updates
 # zstyle ':omz:update' mode auto      # update automatically without asking
+# zstyle ':omz:update' mode reminder  # just remind me to update when it's time
 
 # Uncomment the following line to change how often to auto-update (in days).
 # zstyle ':omz:update' frequency 13
diff --git a/tools/check_for_upgrade.sh b/tools/check_for_upgrade.sh
index fa832ffac..e6a4a3d69 100644
--- a/tools/check_for_upgrade.sh
+++ b/tools/check_for_upgrade.sh
@@ -89,6 +89,8 @@ function update_ohmyzsh() {
   # Ask for confirmation before updating unless in auto mode
   if [[ "$update_mode" = auto ]]; then
     update_ohmyzsh
+  elif [[ "$update_mode" = reminder ]]; then
+    echo "[oh-my-zsh] It's time to update! You can do that by running \`omz update\`"
   else
     # input sink to swallow all characters typed before the prompt
     # and add a newline if there wasn't one after characters typed

From 30d441713c47306fe63c1ce6833ff7a6120c9a47 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Thu, 30 Sep 2021 17:56:02 +0200
Subject: [PATCH 479/869] feat(updater): check if there are updates before
 prompting (#8387)

Fixes #8387
---
 tools/check_for_upgrade.sh | 44 +++++++++++++++++++++++++++++++++++++-
 1 file changed, 43 insertions(+), 1 deletion(-)

diff --git a/tools/check_for_upgrade.sh b/tools/check_for_upgrade.sh
index e6a4a3d69..157b0cce2 100644
--- a/tools/check_for_upgrade.sh
+++ b/tools/check_for_upgrade.sh
@@ -32,6 +32,41 @@ function current_epoch() {
   echo $(( EPOCHSECONDS / 60 / 60 / 24 ))
 }
 
+function is_update_available() {
+  local branch
+  branch=${"$(git -C "$ZSH" config --local oh-my-zsh.branch)":-master}
+
+  local remote remote_url remote_repo
+  remote=${"$(git -C "$ZSH" config --local oh-my-zsh.remote)":-origin}
+  remote_url=$(git -C "$ZSH" config remote.$remote.url)
+
+  local repo
+  case "$remote_url" in
+  https://github.com/*) repo=${${remote_url#https://github.com/}%.git} ;;
+  git@github.com:*) repo=${${remote_url#git@github.com:}%.git} ;;
+  *)
+    # If the remote is not using GitHub we can't check for updates
+    # Let's assume there are updates
+    return 0 ;;
+  esac
+
+  # If the remote repo is not the official one, let's assume there are updates available
+  [[ "$repo" = ohmyzsh/ohmyzsh ]] || return 0
+  local api_url="https://api.github.com/repos/${repo}/commits/${branch}"
+
+  # Get local and remote HEADs and compare them. If we can't get either assume there are updates
+  local local_head remote_head
+  local_head=$(git -C "$ZSH" rev-parse $branch 2>/dev/null) || return 0
+
+  remote_head=$(curl -fsSL -H 'Accept: application/vnd.github.v3.sha' $api_url 2>/dev/null) \
+  || remote_head=$(wget -O- --header='Accept: application/vnd.github.v3.sha' $api_url 2>/dev/null) \
+  || remote_head=$(HTTP_ACCEPT='Accept: application/vnd.github.v3.sha' fetch -o - $api_url 2>/dev/null) \
+  || return 0
+
+  # Compare local and remote HEADs
+  [[ "$local_head" != "$remote_head" ]]
+}
+
 function update_last_updated_file() {
   echo "LAST_EPOCH=$(current_epoch)" >! "${ZSH_CACHE_DIR}/.zsh-update"
 }
@@ -69,6 +104,8 @@ function update_ohmyzsh() {
   #  the shell actually exits what it's running.
   trap "
     ret=\$?
+    unset update_mode
+    unset -f current_epoch is_update_available update_last_updated_file update_ohmyzsh 2>/dev/null
     command rm -rf '$ZSH/log/update.lock'
     return \$ret
   " EXIT INT QUIT
@@ -86,6 +123,11 @@ function update_ohmyzsh() {
     return
   fi
 
+  # Check if there are updates available before proceeding
+  if ! is_update_available; then
+    return
+  fi
+
   # Ask for confirmation before updating unless in auto mode
   if [[ "$update_mode" = auto ]]; then
     update_ohmyzsh
@@ -108,4 +150,4 @@ function update_ohmyzsh() {
 }
 
 unset update_mode
-unset -f current_epoch update_last_updated_file update_ohmyzsh
+unset -f current_epoch is_update_available update_last_updated_file update_ohmyzsh

From c396efbee3217f1d5cc433cd788a67f747a579cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Mon, 4 Oct 2021 11:26:39 +0200
Subject: [PATCH 480/869] fix(docker-compose): support Compose V2 `docker
 compose` command (#10248)

---
 .../docker-compose/docker-compose.plugin.zsh  | 46 ++++++++-----------
 1 file changed, 20 insertions(+), 26 deletions(-)

diff --git a/plugins/docker-compose/docker-compose.plugin.zsh b/plugins/docker-compose/docker-compose.plugin.zsh
index 85e03d343..2eba20a09 100644
--- a/plugins/docker-compose/docker-compose.plugin.zsh
+++ b/plugins/docker-compose/docker-compose.plugin.zsh
@@ -1,28 +1,22 @@
-# Authors:
-# https://github.com/tristola
-#
-# Docker-compose related zsh aliases
+# support Compose v2 as docker CLI plugin
+command docker compose &>/dev/null && dccmd='docker compose' || dccmd='docker-compose'
 
-# Aliases ###################################################################
+alias dco="$dccmd"
+alias dcb="$dccmd build"
+alias dce="$dccmd exec"
+alias dcps="$dccmd ps"
+alias dcrestart="$dccmd restart"
+alias dcrm="$dccmd rm"
+alias dcr="$dccmd run"
+alias dcstop="$dccmd stop"
+alias dcup="$dccmd up"
+alias dcupb="$dccmd up --build"
+alias dcupd="$dccmd up -d"
+alias dcdn="$dccmd down"
+alias dcl="$dccmd logs"
+alias dclf="$dccmd logs -f"
+alias dcpull="$dccmd pull"
+alias dcstart="$dccmd start"
+alias dck="$dccmd kill"
 
-# Use dco as alias for docker-compose, since dc on *nix is 'dc - an arbitrary precision calculator'
-# https://www.gnu.org/software/bc/manual/dc-1.05/html_mono/dc.html
-
-alias dco='docker-compose'
-
-alias dcb='docker-compose build'
-alias dce='docker-compose exec'
-alias dcps='docker-compose ps'
-alias dcrestart='docker-compose restart'
-alias dcrm='docker-compose rm'
-alias dcr='docker-compose run'
-alias dcstop='docker-compose stop'
-alias dcup='docker-compose up'
-alias dcupb='docker-compose up --build'
-alias dcupd='docker-compose up -d'
-alias dcdn='docker-compose down'
-alias dcl='docker-compose logs'
-alias dclf='docker-compose logs -f'
-alias dcpull='docker-compose pull'
-alias dcstart='docker-compose start'
-alias dck='docker-compose kill'
+unset dccmd

From a3289c11f67ec84a6a56d3bde33c1ec191800470 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Mon, 4 Oct 2021 12:02:08 +0200
Subject: [PATCH 481/869] feat(docker-compose): update completion (4fa72a0,
 2021-01-19)

Source: https://github.com/docker/compose/blob/4fa72a0/contrib/completion/zsh/_docker-compose

Closes #9494

Co-authored-by: "Bakhir A.D" <Bakhir.A.D.st@gmail.com>
---
 plugins/docker-compose/_docker-compose | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/plugins/docker-compose/_docker-compose b/plugins/docker-compose/_docker-compose
index 808b068a3..c6b733500 100644
--- a/plugins/docker-compose/_docker-compose
+++ b/plugins/docker-compose/_docker-compose
@@ -121,12 +121,6 @@ __docker-compose_subcommand() {
                 '--parallel[Build images in parallel.]' \
                 '*:services:__docker-compose_services_from_build' && ret=0
             ;;
-        (bundle)
-            _arguments \
-                $opts_help \
-                '--push-images[Automatically push images for any services which have a `build` option specified.]' \
-                '(--output -o)'{--output,-o}'[Path to write the bundle file to. Defaults to "<project name>.dab".]:file:_files' && ret=0
-            ;;
         (config)
             _arguments \
                 $opts_help \
@@ -290,7 +284,7 @@ __docker-compose_subcommand() {
         (up)
             _arguments \
                 $opts_help \
-                '(--abort-on-container-exit)-d[Detached mode: Run containers in the background, print new container names. Incompatible with --abort-on-container-exit.]' \
+                '(--abort-on-container-exit)-d[Detached mode: Run containers in the background, print new container names. Incompatible with --abort-on-container-exit and --attach-dependencies.]' \
                 $opts_no_color \
                 $opts_no_deps \
                 $opts_force_recreate \
@@ -298,6 +292,7 @@ __docker-compose_subcommand() {
                 $opts_no_build \
                 "(--no-build)--build[Build images before starting containers.]" \
                 "(-d)--abort-on-container-exit[Stops all containers if any container was stopped. Incompatible with -d.]" \
+                "(-d)--attach-dependencies[Attach to dependent containers. Incompatible with -d.]" \
                 '(-t --timeout)'{-t,--timeout}"[Use this timeout in seconds for container shutdown when attached or when containers are already running. (default: 10)]:seconds: " \
                 '--scale[SERVICE=NUM Scale SERVICE to NUM instances. Overrides the `scale` setting in the Compose file if present.]:service scale SERVICE=NUM: ' \
                 '--exit-code-from=[Return the exit code of the selected service container. Implies --abort-on-container-exit]:service:__docker-compose_services' \
@@ -341,11 +336,13 @@ _docker-compose() {
         '(- :)'{-h,--help}'[Get help]' \
         '*'{-f,--file}"[${file_description}]:file:_files -g '*.yml'" \
         '(-p --project-name)'{-p,--project-name}'[Specify an alternate project name (default: directory name)]:project name:' \
+        '--env-file[Specify an alternate environment file (default: .env)]:env-file:_files' \
         "--compatibility[If set, Compose will attempt to convert keys in v3 files to their non-Swarm equivalent]" \
         '(- :)'{-v,--version}'[Print version and exit]' \
         '--verbose[Show more output]' \
         '--log-level=[Set log level]:level:(DEBUG INFO WARNING ERROR CRITICAL)' \
         '--no-ansi[Do not print ANSI control characters]' \
+        '--ansi=[Control when to print ANSI control characters]:when:(never always auto)' \
         '(-H --host)'{-H,--host}'[Daemon socket to connect to]:host:' \
         '--tls[Use TLS; implied by --tlsverify]' \
         '--tlscacert=[Trust certs signed only by this CA]:ca path:' \
@@ -359,6 +356,7 @@ _docker-compose() {
     local -a relevant_compose_flags relevant_compose_repeatable_flags relevant_docker_flags compose_options docker_options
 
     relevant_compose_flags=(
+        "--env-file"
         "--file" "-f"
         "--host" "-H"
         "--project-name" "-p"

From 5dbb30342e1b7c4a04c3464bb16ffeb33abde139 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Mon, 4 Oct 2021 12:45:59 +0200
Subject: [PATCH 482/869] feat(yarn): update completion from zsh-completions
 (73505e4)

Fixes #10195
---
 plugins/yarn/_yarn | 184 ++++++++++++++++++++++++++++++++++-----------
 1 file changed, 140 insertions(+), 44 deletions(-)

diff --git a/plugins/yarn/_yarn b/plugins/yarn/_yarn
index 70e783b86..70ed55929 100644
--- a/plugins/yarn/_yarn
+++ b/plugins/yarn/_yarn
@@ -32,15 +32,21 @@
 # -------
 #
 #  * Massimiliano Torromeo <massimiliano.torromeo@gmail.com>
+#  * Shohei YOSHIDA <syohex@gmail.com>
 #
 # ------------------------------------------------------------------------------
 
+declare -g _yarn_run_cwd
+
 _commands=(
   'access'
+  'audit:Checks for known security issues with the installed packages'
   'autoclean:Clean and remove unnecessary files from package dependencies'
   'cache:List or clean every cached package'
-  "check:Verify package dependencies agains yarn's lock file"
+  "check:Verify package dependencies against yarn's lock file"
   'config:Manages the yarn configuration files'
+  'create:Creates new projects from any create-* starter kits'
+  'exec'
   'generate-lock-entry:Generates a lock file entry'
   'global:Install packages globally on your operating system'
   'help:Show information about a command'
@@ -50,25 +56,30 @@ _commands=(
   'install:Install all the dependencies listed within package.json'
   'licenses:List licenses for installed packages'
   'link:Symlink a package folder during development'
-  'list:List installed packages'
   'login:Store registry username and email'
   'logout:Clear registry username and email'
+  'node:Runs Node with the same version that the one used by Yarn itself'
   'outdated:Check for outdated package dependencies'
   'owner:Manage package owners'
   'pack:Create a compressed gzip archive of package dependencies'
+  'policies:Defines project-wide policies for your project'
   'publish:Publish a package to the npm registry'
   'run:Run a defined package script'
   'tag:Add, remove, or list tags on a package'
   'team:Maintain team memberships'
   'unlink:Unlink a previously created symlink for a package'
+  'unplug:Temporarily copies a package outside of the global cache for debugging purposes'
   'version:Update the package version'
   'versions:Display version information of currently installed Yarn, Node.js, and its dependencies'
   'why:Show information about why a package is installed'
+  'workspace'
+  'workspaces:Show information about your workspaces'
 )
 
 _global_commands=(
   'add:Installs a package and any packages that it depends on'
   'bin:Displays the location of the yarn bin folder'
+  'list:List installed packages'
   'remove:Remove installed package from dependencies updating package.json'
   'upgrade:Upgrades packages to their latest version based on the specified range'
   'upgrade-interactive:Interactively upgrade packages'
@@ -76,7 +87,12 @@ _global_commands=(
 
 _yarn_commands_scripts() {
   local -a scripts
-  scripts=($(yarn run --json 2>/dev/null | sed -E '/Commands available|possibleCommands/!d;s/.*Commands available from binary scripts: ([^"]+)".*/\1/;s/.*"items":\[([^]]+).*/\1/;s/[" ]//g' | tr , '\n' | sed -e 's/:/\\:/g'))
+  if [[ -n $opt_args[--cwd] ]]; then
+    scripts=($(cd $opt_args[--cwd] && yarn run --json 2>/dev/null | sed -E '/Commands available|possibleCommands/!d;s/.*Commands available from binary scripts: ([^"]+)".*/\1/;s/.*"items":\[([^]]+).*/\1/;s/[" ]//g' | tr , '\n' | sed -e 's/:/\\:/g'))
+  else
+    scripts=($(yarn run --json 2>/dev/null | sed -E '/Commands available|possibleCommands/!d;s/.*Commands available from binary scripts: ([^"]+)".*/\1/;s/.*"items":\[([^]]+).*/\1/;s/[" ]//g' | tr , '\n' | sed -e 's/:/\\:/g'))
+  fi
+
   _describe 'command or script' _commands -- _global_commands -- scripts
 }
 
@@ -85,7 +101,11 @@ _yarn_scripts() {
   local -a scriptNames scriptCommands
   local i runJSON
 
-  runJSON=$(yarn run --json 2>/dev/null)
+  if [[ -n $_yarn_run_cwd ]]; then
+    runJSON=$(cd $_yarn_run_cwd && yarn run --json 2>/dev/null)
+  else
+    runJSON=$(yarn run --json 2>/dev/null)
+  fi
   # Some sed utilities (e.g. Mac OS / BSD) don't interpret `\n` in a replacement
   # pattern as a newline. See https://superuser.com/q/307165
   binaries=($(sed -E '/Commands available/!d;s/.*Commands available from binary scripts: ([^"]+)".*/\1/;s/.*"items":\[([^]]+).*/\1/;s/[" ]//g;s/:/\\:/g;s/,/\'$'\n/g' <<< "$runJSON"))
@@ -96,7 +116,7 @@ _yarn_scripts() {
     scripts+=("${scriptNames[$i]}:${scriptCommands[$i]}")
   done
 
-  commands=($scripts $binaries)
+  commands=('env' $scripts $binaries)
   _describe 'command' commands
 }
 
@@ -110,6 +130,17 @@ _yarn_commands() {
   _describe 'command' _commands -- _global_commands
 }
 
+_yarn_add_files() {
+  if compset -P "(file|link):"; then
+    _files
+  fi
+}
+
+_yarn_workspaces() {
+  local -a workspaces=(${(@f)$(yarn workspaces info |sed -n -e 's/^  "\([^"]*\)": {/\1/p')})
+  _describe 'workspace' workspaces
+}
+
 _yarn() {
   local context state state_descr line
   typeset -A opt_args
@@ -118,37 +149,51 @@ _yarn() {
     '(-h --help)'{-h,--help}'[output usage information]' \
     '(-V --version)'{-V,--version}'[output the version number]' \
     '--verbose[output verbose messages on internal operations]' \
-    '--offline[trigger an error if any required dependencies are not available in local cache]' \
-    '--prefer-offline[use network only if dependencies are not available in local cache]' \
-    '--strict-semver' \
-    '--json' \
-    "--ignore-scripts[don't run lifecycle scripts]" \
-    '--har[save HAR output of network traffic]' \
-    '--ignore-platform[ignore platform checks]' \
-    '--ignore-engines[ignore engines check]' \
-    '--ignore-optional[ignore optional dependencies]' \
-    '--force[install and build packages even if they were built before, overwrite lockfile]' \
-    '--skip-integrity-check[run install without checking if node_modules is installed]' \
-    '--check-files[install will verify file tree of packages for consistency]' \
-    "--no-bin-links[don't generate bin links when setting up packages]" \
-    '--flat[only allow one version of a package]' \
-    '(--prod --production)'{--prod,--production} \
-    "--no-lockfile[don't read or generate a lockfile]" \
-    "--pure-lockfile[don't generate a lockfile]" \
-    "--frozen-lockfile[don't generate a lockfile and fail if an update is needed]" \
-    '--link-duplicates[create hardlinks to the repeated modules in node_modules]' \
-    '--global-folder=[modules folder]:folder:_files -/' \
-    '--modules-folder=[rather than installing modules into the node_modules folder relative to the cwd, output them here]:folder:_files -/' \
     '--cache-folder=[specify a custom folder to store the yarn cache]:folder:_files -/' \
+    '--check-files[install will verify file tree of packages for consistency]' \
+    '--cwd=[working directory to use]:path:_files -/' \
+    "(--enable-pnp --pnp)--disable-pnp[disable the Plug'n'Play installation]" \
+    '(--no-emoji)--emoji=[enable emoji in output(default: false)]:enabled:(true false)' \
+    '(--emoji)--no-emoji[disable emoji in output]' \
+    '(--disable-pnp)'{--enable-pnp,--pnp}"[enable the Plug'n'Play installation]" \
+    '--flat[only allow one version of a package]' \
+    '--focus[Focus on a single workspace by installing remote copies of its sibiling workspaces]' \
+    '--force[install and build packages even if they were built before, overwrite lockfile]' \
+    "--frozen-lockfile[don't generate a lockfile and fail if an update is needed]" \
+    '--global-folder=[modules folder]:folder:_files -/' \
+    '--har[save HAR output of network traffic]' \
+    '--https-proxy=[HTTPS proxy]:host:_hosts' \
+    '--ignore-engines[ignore engines check]' \
+    "--ignore-scripts[don't run lifecycle scripts]" \
+    '--ignore-optional[ignore optional dependencies]' \
+    '--ignore-platform[ignore platform checks]' \
+    '--json[format Yarn log messages as lines of JSON]' \
+    '--link-duplicates[create hardlinks to the repeated modules in node_modules]' \
+    '--link-folder=[specify a custom folder to store global links]' \
+    '--modules-folder=[rather than installing modules into the node_modules folder relative to the cwd, output them here]:folder:_files -/' \
     '--mutex=[use a mutex to ensure only one yarn instance is executing]:type[\:specifier]' \
-    '--no-emoji[disable emoji in output]' \
-    '(-s --silent)'{-s,--silent}'[skip Yarn console logs, other types of logs (script output) will be printed]' \
-    '--proxy=:host:_hosts' \
-    '--https-proxy=:host:_hosts' \
-    '--no-progress[disable progress bar]' \
     '--network-concurrency=[maximum number of concurrent network requests]:number' \
     '--network-timeout=[TCP timeout for network requests]:milliseconds' \
+    "--no-bin-links[don't generate bin links when setting up packages]" \
+    '--no-default-rc[prevent Yarn from automatically detecting yarnrc and npmrc files]' \
+    "--no-lockfile[don't read or generate a lockfile]" \
     '--non-interactive[do not show interactive prompts]' \
+    '--no-node-version-check[do not warn when using a potentially unsupported Node version]' \
+    '--no-progress[disable progress bar]' \
+    '--offline[trigger an error if any required dependencies are not available in local cache]' \
+    '--otp=[one-time password for two factor authentication]:otpcode' \
+    '--prefer-offline[use network only if dependencies are not available in local cache]' \
+    '--preferred-cache-folder=[specify a custom folder to store the yarn cache if possible]:folder:_files -/' \
+    '(--prod --production)'{--prod,--production}'[install only production dependencies]' \
+    '--proxy=[HTTP proxy]:host:_hosts' \
+    "--pure-lockfile[don't generate a lockfile]" \
+    '--registry=[override configuration registry]:url:_urls' \
+    '(-s --silent)'{-s,--silent}'[skip Yarn console logs, other types of logs (script output) will be printed]' \
+    '--scripts-prepend-node-path=[prepend the node executable dir to the PATH in scripts]:bool:(true false)' \
+    '--skip-integrity-check[run install without checking if node_modules is installed]' \
+    "--strict-semver[don't compare semver loosely]" \
+    '--update-checksum[update package checksums from current repository]' \
+    '--use-yarnrc=[specifies a yarnrc that Yarn should use]:yarnrc:_files' \
     '1: :_yarn_commands_scripts' \
     '*:: :->command_args'
 
@@ -173,18 +218,29 @@ _yarn() {
             '(-O --optional)'{-O,--optional}'[install packages in optionalDependencies]' \
             '(-E --exact)'{-E,--exact}'[install packages as exact versions]' \
             '(-T --tilde)'{-T,--tilde}'[install the most recent release of the packages that have the same minor version]' \
-            '*:package-name:'
+            '(--ignore-workspace-root-check -W)'{--ignore-workspace-root-check,-W}'[allows a package to be installed at the workspaces root]' \
+            '--audit[checks for known security issues with the installed packages]' \
+            '*:package-name:_yarn_add_files'
+        ;;
+
+        audit)
+          _arguments \
+            '--verbose[output verbose message]' \
+            '--json[format Yarn log messages as lines of JSON]' \
+            '--level=[only print advisories with severity greater than or equal to]:level:(info low moderate high critical)' \
+            '--groups=[only audit dependencies from listed groups]:groups:->groups_args'
         ;;
 
         cache)
           _arguments \
-            '1: :(ls dir clean)'
+            '1: :(list dir clean)' \
+            '*:: :->cache_args'
         ;;
 
         check)
           _arguments \
-            '--integrity' \
-            '--verify-tree'
+            '--integrity[Verifies that versions and hashed values of the package contents in package.json]' \
+            '--verify-tree[Recursively verifies that the dependencies in package.json are present in node_modules]'
         ;;
 
         config)
@@ -223,12 +279,13 @@ _yarn() {
 
         list)
           _arguments \
-            '--depth[Limit the depth of the shown dependencies]:depth'
+            '--depth=[Limit the depth of the shown dependencies]:depth' \
+            '--pattern=[filter the list of dependencies by the pattern]'
         ;;
 
         owner)
           _arguments \
-            '1: :(ls add rm)' \
+            '1: :(list add rm)' \
             '*:: :->owner_args'
         ;;
 
@@ -247,12 +304,22 @@ _yarn() {
             '1: :_files'
         ;;
 
+        policies)
+          _arguments \
+            '1: :(set-version)'
+        ;;
+
         remove|upgrade)
           _arguments \
             '*:package:'
         ;;
 
         run)
+          if [[ -n $opt_args[--cwd] ]]; then
+            _yarn_run_cwd=$opt_args[--cwd]
+          else
+            _yarn_run_cwd=''
+          fi
           _arguments \
             '1: :_yarn_scripts' \
             '*:: :_default'
@@ -260,26 +327,33 @@ _yarn() {
 
         tag)
           _arguments \
-            '1: :(ls add rm)' \
+            '1: :(lists add rm)' \
             '*:: :->tag_args'
         ;;
 
         team)
           _arguments \
-            '1: :(create destroy add rm ls)' \
+            '1: :(create destroy add rm list)' \
             '*:: :->team_args'
         ;;
 
         upgrade-interactive)
           _arguments \
-            '--latest:use the version tagged latest in the registry:'
+            '--latest[use the version tagged latest in the registry]'
         ;;
 
         version)
           _arguments \
-            '--new-version:version:' \
-            '--message:message:' \
-            '--no-git-tag-version'
+            '--new-version[create a new version using an interactive session to prompt you]:version:' \
+            '--major[creates a new version by incrementing the major version]' \
+            '--minor[creates a new version by incrementing the minor version]' \
+            '--patch[creates a new version by incrementing the patch version]' \
+            '--premajor[creates a new prerelease version by incrementing the major version]' \
+            '--preminor[creates a new prerelease version by incrementing the minor version]' \
+            '--prepatch[creates a new prerelease version by incrementing the patch version]' \
+            '--prerelease[increments the prerelease version number keeping the main version]' \
+            '--no-git-tag-version[creates a new version without creating a git tag]' \
+            '--no-commit-hooks[bypasses running commit hooks when committing the new version]'
         ;;
 
         why)
@@ -287,7 +361,19 @@ _yarn() {
             '1:query:_files'
         ;;
 
-        *) 
+        workspace)
+          _arguments \
+            '1:workspace:_yarn_workspaces' \
+            '*:: :_yarn_global_commands'
+        ;;
+
+        workspaces)
+          _arguments \
+            '--json[format Yarn log messages as lines of JSON]' \
+            '1:commands:(info run)'
+        ;;
+
+        *)
           _default
         ;;
       esac
@@ -295,6 +381,12 @@ _yarn() {
   esac
 
   case $state in
+    cache_args)
+      if [[ $words[1] == "list" ]]; then
+        _arguments \
+          '--pattern=[print out every cached package that matches the pattern]:pattern:'
+      fi
+    ;;
     config_args)
       case $words[1] in
         get|delete)
@@ -310,6 +402,10 @@ _yarn() {
         ;;
       esac
     ;;
+    groups_args)
+      local dependency_groups=(devDependencies dependencies optionalDependencies peerDependencies bundledDependencies)
+      _values -s ',' 'groups' $dependency_groups
+    ;;
 
     owner_args)
       case $words[1] in

From d304635b8c70c6d9400d1246f1446eb76c64406c Mon Sep 17 00:00:00 2001
From: Emilien Escalle <neilime@users.noreply.github.com>
Date: Mon, 4 Oct 2021 13:07:55 +0200
Subject: [PATCH 483/869] feat(yarn): add `ylnf` alias to fix linting problems
 (#9219)

---
 plugins/yarn/README.md       | 1 +
 plugins/yarn/yarn.plugin.zsh | 1 +
 2 files changed, 2 insertions(+)

diff --git a/plugins/yarn/README.md b/plugins/yarn/README.md
index fd748b742..9a0d1708d 100644
--- a/plugins/yarn/README.md
+++ b/plugins/yarn/README.md
@@ -28,6 +28,7 @@ plugins=(... yarn)
 | yi    | `yarn init`                               | Interactively creates or updates a package.json file                          |
 | yin   | `yarn install`                            | Install dependencies defined in `package.json`                                |
 | yln   | `yarn lint`                               | Run the lint script defined in `package.json`                                 |
+| ylnf  | `yarn lint --fix`                         | Run the lint script defined in `package.json`to automatically fix problems    |
 | yls   | `yarn list`                               | List installed packages                                                       |
 | yout  | `yarn outdated`                           | Check for outdated package dependencies                                       |
 | yp    | `yarn pack`                               | Create a compressed gzip archive of package dependencies                      |
diff --git a/plugins/yarn/yarn.plugin.zsh b/plugins/yarn/yarn.plugin.zsh
index 4a5192c61..a240cb88e 100644
--- a/plugins/yarn/yarn.plugin.zsh
+++ b/plugins/yarn/yarn.plugin.zsh
@@ -13,6 +13,7 @@ alias yh="yarn help"
 alias yi="yarn init"
 alias yin="yarn install"
 alias yln="yarn lint"
+alias ylnf="yarn lint --fix"
 alias yls="yarn list"
 alias yout="yarn outdated"
 alias yp="yarn pack"

From 717ece07efea5e74e6d18bd647387607a6f5fc49 Mon Sep 17 00:00:00 2001
From: TheTechRobo <52163910+TheTechRobo@users.noreply.github.com>
Date: Mon, 4 Oct 2021 09:55:18 -0400
Subject: [PATCH 484/869] feat(mercurial): add `hg log` aliases (#9979)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Michał Kielan <kielanm@fb.com>
---
 plugins/mercurial/README.md            | 3 ++-
 plugins/mercurial/mercurial.plugin.zsh | 2 ++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/plugins/mercurial/README.md b/plugins/mercurial/README.md
index 80ea2de31..756964896 100644
--- a/plugins/mercurial/README.md
+++ b/plugins/mercurial/README.md
@@ -30,7 +30,8 @@ plugins=(... mercurial)
 | `hgl`  | `hg pull -u`                                                                                                |
 | `hglr` | `hg pull --rebase`                                                                                          |
 | `hgo`  | `hg outgoing`                                                                                               |
-
+| `hglg` | `hg log --stat -v`                                                                                          |
+| `hglgp`| `hg log --stat -p -v`                                                                                       |
 ## Prompt usage
 
 - Switch to a theme which uses `hg_prompt_info`
diff --git a/plugins/mercurial/mercurial.plugin.zsh b/plugins/mercurial/mercurial.plugin.zsh
index f4efc2b4a..e098664c0 100644
--- a/plugins/mercurial/mercurial.plugin.zsh
+++ b/plugins/mercurial/mercurial.plugin.zsh
@@ -17,6 +17,8 @@ alias hgi='hg incoming'
 alias hgl='hg pull -u'
 alias hglr='hg pull --rebase'
 alias hgo='hg outgoing'
+alias hglg='hg log --stat -v'
+alias hglgp='hg log --stat  -p -v'
 
 function in_hg() {
   if $(hg branch > /dev/null 2>&1); then

From 56ab66b19429e5609e4331a987368ce2c844c7be Mon Sep 17 00:00:00 2001
From: Dani Torramilans <dani.torramilans@gmail.com>
Date: Mon, 4 Oct 2021 15:57:03 +0200
Subject: [PATCH 485/869] docs(python): update README to include new `py` alias
 (#9995)

---
 plugins/python/README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/python/README.md b/plugins/python/README.md
index 0180218a2..b95ffe679 100644
--- a/plugins/python/README.md
+++ b/plugins/python/README.md
@@ -11,6 +11,7 @@ plugins=(... python)
 
 | Command          | Description                                                                     |
 |------------------|---------------------------------------------------------------------------------|
+| `py`             | Runs `python`                                                                   |
 | `ipython`        | Runs the appropriate `ipython` version according to the activated virtualenv    |
 | `pyfind`         | Finds .py files recursively in the current directory                            |
 | `pyclean [dirs]` | Deletes byte-code and cache files from a list of directories or the current one |

From be4a952972de03d501fbff79435ae41594f06bac Mon Sep 17 00:00:00 2001
From: Monson Shao <holymonson@gmail.com>
Date: Fri, 3 Jul 2020 12:16:58 +0800
Subject: [PATCH 486/869] feat(cli)!: add `omz reload` command and deprecate
 `zsh_reload` plugin (#9078)

BREAKING CHANGE: the `zsh_reload` plugin is deprecated. Instead of using its `src`
function, use `omz reload` or `exec zsh` to reload zsh after making changes to
your `.zshrc` file.

Closes #9078
---
 lib/cli.zsh                              | 12 ++++++++++++
 plugins/zsh_reload/README.md             | 22 +--------------------
 plugins/zsh_reload/zsh_reload.plugin.zsh | 25 +++++-------------------
 3 files changed, 18 insertions(+), 41 deletions(-)

diff --git a/lib/cli.zsh b/lib/cli.zsh
index cadc82e27..773891fce 100644
--- a/lib/cli.zsh
+++ b/lib/cli.zsh
@@ -26,6 +26,7 @@ function _omz {
     'help:Usage information'
     'plugin:Manage plugins'
     'pr:Manage Oh My Zsh Pull Requests'
+    'reload:Reload the current zsh session'
     'theme:Manage themes'
     'update:Update Oh My Zsh'
   )
@@ -159,6 +160,7 @@ Available commands:
   changelog           Print the changelog
   plugin <command>    Manage plugins
   pr     <command>    Manage Oh My Zsh Pull Requests
+  reload              Reload the current zsh session
   theme  <command>    Manage themes
   update              Update Oh My Zsh
 
@@ -598,6 +600,16 @@ function _omz::pr::test {
   )
 }
 
+function _omz::reload {
+  # Delete current completion cache
+  command rm -f $_comp_dumpfile $ZSH_COMPDUMP
+
+  # Old zsh versions don't have ZSH_ARGZERO
+  local zsh="${ZSH_ARGZERO:-${functrace[-1]%:*}}"
+  # Check whether to run a login shell
+  [[ "$zsh" = -* || -o login ]] && exec -l "${zsh#-}" || exec "$zsh"
+}
+
 function _omz::theme {
   (( $# > 0 && $+functions[_omz::theme::$1] )) || {
     cat >&2 <<EOF
diff --git a/plugins/zsh_reload/README.md b/plugins/zsh_reload/README.md
index d31a827fe..0b2e2a775 100644
--- a/plugins/zsh_reload/README.md
+++ b/plugins/zsh_reload/README.md
@@ -1,23 +1,3 @@
 # zsh_reload plugin
 
-The zsh_reload plugin defines a function to reload the zsh session with
-just a few keystrokes.
-
-To use it, add `zsh_reload` to the plugins array in your zshrc file:
-
-```zsh
-plugins=(... zsh_reload)
-```
-
-## Usage
-
-To reload the zsh session, just run `src`:
-
-```zsh
-$ vim ~/.zshrc  # enabled a plugin
-$ src
-re-compiling /home/user/.zshrc.zwc: succeeded
-re-compiling /home/user/.oh-my-zsh/cache/zcomp-host.zwc: succeeded
-
-# you now have a fresh zsh session. happy hacking!
-```
+**This plugin is deprecated.** Use `omz reload` or `exec zsh` instead.
diff --git a/plugins/zsh_reload/zsh_reload.plugin.zsh b/plugins/zsh_reload/zsh_reload.plugin.zsh
index 0d29a7ce3..6a058ec5e 100644
--- a/plugins/zsh_reload/zsh_reload.plugin.zsh
+++ b/plugins/zsh_reload/zsh_reload.plugin.zsh
@@ -1,22 +1,7 @@
+print ${(%):-"%F{yellow}The \`zsh_reload\` plugin is deprecated and will be removed."}
+print ${(%):-"Use \`%Bomz reload%b\` or \`%Bexec zsh%b\` instead.%f"}
+
 src() {
-	local cache="$ZSH_CACHE_DIR"
-	autoload -U compinit zrecompile
-	compinit -i -d "$cache/zcomp-$HOST"
-
-	for f in ${ZDOTDIR:-~}/.zshrc "$cache/zcomp-$HOST"; do
-		zrecompile -p $f && command rm -f $f.zwc.old
-	done
-
-	# Use $SHELL if it's available and a zsh shell
-	local shell="$ZSH_ARGZERO"
-	if [[ "${${SHELL:t}#-}" = zsh ]]; then
-		shell="$SHELL"
-	fi
-
-	# Remove leading dash if login shell and run accordingly
-	if [[ "${shell:0:1}" = "-" ]]; then
-		exec -l "${shell#-}"
-	else
-		exec "$shell"
-	fi
+  print ${(%):-"%F{yellow}$0 is deprecated. Use \`%Bomz reload%b\` or \`%Bexec zsh%b\` instead.%f\n"}
+  omz reload
 }

From 568584a9f5f42d51a08de8b71347f6463b9211e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Mon, 4 Oct 2021 17:14:34 +0200
Subject: [PATCH 487/869] fix(per-directory-history): fix use of global history
 on shell start (#9008)

Updated from upstream: https://github.com/jimhester/per-directory-history/blob/d2e291d/per-directory-history.zsh

Fixes #9007
Closese #9008

Co-authored-by: Sebastian Marsching <sebastian-git-2016@marsching.com>
---
 .../per-directory-history.zsh                 | 70 ++++++++++++-------
 1 file changed, 44 insertions(+), 26 deletions(-)

diff --git a/plugins/per-directory-history/per-directory-history.zsh b/plugins/per-directory-history/per-directory-history.zsh
index 41de2f91d..7cd673cdb 100644
--- a/plugins/per-directory-history/per-directory-history.zsh
+++ b/plugins/per-directory-history/per-directory-history.zsh
@@ -32,7 +32,7 @@
 #
 # Copyright (c) 2014 Jim Hester
 #
-# This software is provided 'as-is', without any express or implied warranty. 
+# This software is provided 'as-is', without any express or implied warranty.
 # In no event will the authors be held liable for any damages arising from the
 # use of this software.
 #
@@ -57,6 +57,7 @@
 #-------------------------------------------------------------------------------
 
 [[ -z $HISTORY_BASE ]] && HISTORY_BASE="$HOME/.directory_history"
+[[ -z $HISTORY_START_WITH_GLOBAL ]] && HISTORY_START_WITH_GLOBAL=false
 [[ -z $PER_DIRECTORY_HISTORY_TOGGLE ]] && PER_DIRECTORY_HISTORY_TOGGLE='^G'
 
 #-------------------------------------------------------------------------------
@@ -66,9 +67,11 @@
 function per-directory-history-toggle-history() {
   if [[ $_per_directory_history_is_global == true ]]; then
     _per-directory-history-set-directory-history
+    _per_directory_history_is_global=false
     print -n "\nusing local history"
   else
     _per-directory-history-set-global-history
+    _per_directory_history_is_global=true
     print -n "\nusing global history"
   fi
   zle .push-line
@@ -114,43 +117,58 @@ function _per-directory-history-addhistory() {
       true
   else
       print -Sr -- "${1%%$'\n'}"
+      # instantly write history if set options require it.
+      if [[ -o share_history ]] || \
+         [[ -o inc_append_history ]] || \
+         [[ -o inc_append_history_time ]]; then
+          fc -AI $HISTFILE
+          fc -AI $_per_directory_history_directory
+      fi
       fc -p $_per_directory_history_directory
   fi
 }
 
+function _per-directory-history-precmd() {
+  if [[ $_per_directory_history_initialized == false ]]; then
+    _per_directory_history_initialized=true
+
+    if [[ $HISTORY_START_WITH_GLOBAL == true ]]; then
+      _per-directory-history-set-global-history
+      _per_directory_history_is_global=true
+    else
+      _per-directory-history-set-directory-history
+      _per_directory_history_is_global=false
+    fi
+  fi
+}
 
 function _per-directory-history-set-directory-history() {
-  if [[ $_per_directory_history_is_global == true ]]; then
-    fc -AI $HISTFILE
-    local original_histsize=$HISTSIZE
-    HISTSIZE=0
-    HISTSIZE=$original_histsize
-    if [[ -e "$_per_directory_history_directory" ]]; then
-      fc -R "$_per_directory_history_directory"
-    fi
+  fc -AI $HISTFILE
+  local original_histsize=$HISTSIZE
+  HISTSIZE=0
+  HISTSIZE=$original_histsize
+  if [[ -e "$_per_directory_history_directory" ]]; then
+    fc -R "$_per_directory_history_directory"
   fi
-  _per_directory_history_is_global=false
-}
-function _per-directory-history-set-global-history() {
-  if [[ $_per_directory_history_is_global == false ]]; then
-    fc -AI $_per_directory_history_directory
-    local original_histsize=$HISTSIZE
-    HISTSIZE=0
-    HISTSIZE=$original_histsize
-    if [[ -e "$HISTFILE" ]]; then
-      fc -R "$HISTFILE"
-    fi
-  fi
-  _per_directory_history_is_global=true
 }
 
+function _per-directory-history-set-global-history() {
+  fc -AI $_per_directory_history_directory
+  local original_histsize=$HISTSIZE
+  HISTSIZE=0
+  HISTSIZE=$original_histsize
+  if [[ -e "$HISTFILE" ]]; then
+    fc -R "$HISTFILE"
+  fi
+}
+
+mkdir -p ${_per_directory_history_directory:h}
 
 #add functions to the exec list for chpwd and zshaddhistory
 autoload -U add-zsh-hook
 add-zsh-hook chpwd _per-directory-history-change-directory
 add-zsh-hook zshaddhistory _per-directory-history-addhistory
+add-zsh-hook precmd _per-directory-history-precmd
 
-#start in directory mode
-mkdir -p ${_per_directory_history_directory:h}
-_per_directory_history_is_global=true
-_per-directory-history-set-directory-history
+# set initialized flag to false
+_per_directory_history_initialized=false

From 714399a7c33963384ef7f21ce21f6d134416f9aa Mon Sep 17 00:00:00 2001
From: fanuch <fanuch@gmail.com>
Date: Sun, 6 Oct 2019 13:19:14 +1100
Subject: [PATCH 488/869] feat(git): add `gccd` alias to clone and cd into git
 repository (#8220)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixes #8216
Closes #8220

Co-authored-by: Nelson Estevão <nelsonmestevao@gmail.com>
---
 plugins/git/README.md      | 1 +
 plugins/git/git.plugin.zsh | 7 +++++++
 2 files changed, 8 insertions(+)

diff --git a/plugins/git/README.md b/plugins/git/README.md
index 05ef25099..b68dc552e 100644
--- a/plugins/git/README.md
+++ b/plugins/git/README.md
@@ -47,6 +47,7 @@ plugins=(... git)
 | gcb                  | git checkout -b                                                                                                                  |
 | gcf                  | git config --list                                                                                                                |
 | gcl                  | git clone --recurse-submodules                                                                                                   |
+| gccd                 | git clone --recurse-submodules "$@" && cd "$(basename $_ .git)"                                                                  |
 | gclean               | git clean -id                                                                                                                    |
 | gpristine            | git reset --hard && git clean -dffx                                                                                              |
 | gcm                  | git checkout $(git_main_branch)                                                                                                  |
diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index 11dff99d9..f2431fde5 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -97,6 +97,13 @@ alias gcas='git commit -a -s'
 alias gcasm='git commit -a -s -m'
 alias gcb='git checkout -b'
 alias gcf='git config --list'
+
+function gccd() {
+  command git clone --recurse-submodules "$@"
+  [[ -d "$_" ]] && cd "$_" || cd "${${_:h}%.git}"
+}
+compdef _git gccd=git-clone
+
 alias gcl='git clone --recurse-submodules'
 alias gclean='git clean -id'
 alias gpristine='git reset --hard && git clean -dffx'

From a54148a43e14f1ba8d4f602ce7d452111e70ad4d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Mon, 4 Oct 2021 17:51:22 +0200
Subject: [PATCH 489/869] fix(init): rename function `f` due to clash with `f`
 alias (#10260)

Fixes #10260
---
 oh-my-zsh.sh | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/oh-my-zsh.sh b/oh-my-zsh.sh
index c389fc963..b388b341d 100644
--- a/oh-my-zsh.sh
+++ b/oh-my-zsh.sh
@@ -2,14 +2,14 @@
 [ -n "$ZSH_VERSION" ] || {
   # ANSI formatting function (\033[<code>m)
   # 0: reset, 1: bold, 4: underline, 22: no bold, 24: no underline, 31: red, 33: yellow
-  f() {
+  omz_f() {
     [ $# -gt 0 ] || return
     IFS=";" printf "\033[%sm" $*
   }
   # If stdout is not a terminal ignore all formatting
-  [ -t 1 ] || f() { :; }
+  [ -t 1 ] || omz_f() { :; }
 
-  ptree() {
+  omz_ptree() {
     # Get process tree of the current process
     pid=$$; pids="$pid"
     while [ ${pid-0} -ne 1 ] && ppid=$(ps -e -o pid,ppid | awk "\$1 == $pid { print \$2 }"); do
@@ -28,11 +28,11 @@
 
   {
     shell=$(ps -o pid,comm | awk "\$1 == $$ { print \$2 }")
-    printf "$(f 1 31)Error:$(f 22) Oh My Zsh can't be loaded from: $(f 1)${shell}$(f 22). "
-    printf "You need to run $(f 1)zsh$(f 22) instead.$(f 0)\n"
-    printf "$(f 33)Here's the process tree:$(f 22)\n\n"
-    ptree
-    printf "$(f 0)\n"
+    printf "$(omz_f 1 31)Error:$(omz_f 22) Oh My Zsh can't be loaded from: $(omz_f 1)${shell}$(omz_f 22). "
+    printf "You need to run $(omz_f 1)zsh$(omz_f 22) instead.$(omz_f 0)\n"
+    printf "$(omz_f 33)Here's the process tree:$(omz_f 22)\n\n"
+    omz_ptree
+    printf "$(omz_f 0)\n"
   } >&2
 
   return 1

From b621eee21f269498d072ca60823ecde9777821bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Tue, 5 Oct 2021 11:58:39 +0200
Subject: [PATCH 490/869] fix(cli): fix zsh array syntax for szh 5.0.2

---
 lib/cli.zsh | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/lib/cli.zsh b/lib/cli.zsh
index 773891fce..4b14360c1 100644
--- a/lib/cli.zsh
+++ b/lib/cli.zsh
@@ -91,7 +91,8 @@ function _omz {
         # NOTE: $(( CURRENT - 1 )) is the last plugin argument completely passed, i.e. that which
         # has a space after them. This is to avoid removing plugins partially passed, which makes
         # the completion not add a space after the completed plugin.
-        local -a args=(${words[4,$(( CURRENT - 1))]})
+        local -a args
+        args=(${words[4,$(( CURRENT - 1))]})
         valid_plugins=(${valid_plugins:|args})
 
         _describe 'plugin' valid_plugins ;;
@@ -214,7 +215,7 @@ function _omz::plugin::disable {
   fi
 
   # Check that plugin is in $plugins
-  local -a dis_plugins=()
+  local -a dis_plugins
   for plugin in "$@"; do
     if [[ ${plugins[(Ie)$plugin]} -eq 0 ]]; then
       _omz::log warn "plugin '$plugin' is not enabled."
@@ -303,7 +304,7 @@ function _omz::plugin::enable {
   fi
 
   # Check that plugin is not in $plugins
-  local -a add_plugins=()
+  local -a add_plugins
   for plugin in "$@"; do
     if [[ ${plugins[(Ie)$plugin]} -ne 0 ]]; then
       _omz::log warn "plugin '$plugin' is already enabled."
@@ -424,10 +425,8 @@ function _omz::plugin::load {
     return 1
   fi
 
-  local plugins=("$@")
   local plugin base has_completion=0
-
-  for plugin in $plugins; do
+  for plugin in "$@"; do
     if [[ -d "$ZSH_CUSTOM/plugins/$plugin" ]]; then
       base="$ZSH_CUSTOM/plugins/$plugin"
     elif [[ -d "$ZSH/plugins/$plugin" ]]; then

From f793baf370bdfcbe3004f7746f3c945feefb56c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Tue, 5 Oct 2021 11:59:09 +0200
Subject: [PATCH 491/869] fix(jsontools): fix broken conditional in zsh 5.0.2
 (#10262)

Fixes #10262
---
 plugins/jsontools/jsontools.plugin.zsh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/jsontools/jsontools.plugin.zsh b/plugins/jsontools/jsontools.plugin.zsh
index ed45cfa8e..857ca0ec9 100644
--- a/plugins/jsontools/jsontools.plugin.zsh
+++ b/plugins/jsontools/jsontools.plugin.zsh
@@ -7,7 +7,7 @@ if [[ -n "$JSONTOOLS_METHOD" ]]; then
 fi
 
 # If method undefined, find the first one that is installed
-if [[ ! -v JSONTOOLS_METHOD ]]; then
+if [[ -z "$JSONTOOLS_METHOD" ]]; then
   for JSONTOOLS_METHOD in node python ruby; do
     # If method found, break out of loop
     (( $+commands[$JSONTOOLS_METHOD] )) && break
@@ -16,7 +16,7 @@ if [[ ! -v JSONTOOLS_METHOD ]]; then
   done
 
   # If no methods were found, exit the plugin
-  [[ -v JSONTOOLS_METHOD ]] || return 1
+  [[ -n "$JSONTOOLS_METHOD" ]] || return 1
 fi
 
 # Define json tools for each method

From 49bc55f966d91b2a407c883cf1d0f21d0cdd9f4a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Tue, 5 Oct 2021 13:23:05 +0200
Subject: [PATCH 492/869] fix(docker-compose): fix for slow `docker compose`
 call on remote Docker contexts (#10264)

Fixes #10264

Co-authored-by: Frederick Zhang <frederick888@tsundere.moe>
---
 plugins/docker-compose/docker-compose.plugin.zsh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/plugins/docker-compose/docker-compose.plugin.zsh b/plugins/docker-compose/docker-compose.plugin.zsh
index 2eba20a09..13985fc82 100644
--- a/plugins/docker-compose/docker-compose.plugin.zsh
+++ b/plugins/docker-compose/docker-compose.plugin.zsh
@@ -1,5 +1,7 @@
 # support Compose v2 as docker CLI plugin
-command docker compose &>/dev/null && dccmd='docker compose' || dccmd='docker-compose'
+DOCKER_CONTEXT=default command docker compose &>/dev/null \
+  && dccmd='docker compose' \
+  || dccmd='docker-compose'
 
 alias dco="$dccmd"
 alias dcb="$dccmd build"

From e5b9b80008a2fd71b441ef39fe620ed47dad82e5 Mon Sep 17 00:00:00 2001
From: Dapeng Gao <31944689+dpgao@users.noreply.github.com>
Date: Tue, 5 Oct 2021 19:54:53 +0800
Subject: [PATCH 493/869] fix(gpg-agent): correctly overwrite `$SSH_AUTH_SOCK`
 and other improvements (#7059)

---
 plugins/gpg-agent/README.md            |  2 +-
 plugins/gpg-agent/gpg-agent.plugin.zsh | 25 +++++++++++++------------
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/plugins/gpg-agent/README.md b/plugins/gpg-agent/README.md
index 9c1e6d2cc..8eeb94f92 100644
--- a/plugins/gpg-agent/README.md
+++ b/plugins/gpg-agent/README.md
@@ -2,7 +2,7 @@
 
 Enables [GPG's gpg-agent](https://www.gnupg.org/documentation/manuals/gnupg/) if it is not running.
 
-To use it, add gpg-agent to the plugins array of your zshrc file:
+To use it, add `gpg-agent` to the plugins array of your zshrc file:
 
 ```zsh
 plugins=(... gpg-agent)
diff --git a/plugins/gpg-agent/gpg-agent.plugin.zsh b/plugins/gpg-agent/gpg-agent.plugin.zsh
index 3e24c2527..0adc8de5d 100644
--- a/plugins/gpg-agent/gpg-agent.plugin.zsh
+++ b/plugins/gpg-agent/gpg-agent.plugin.zsh
@@ -1,16 +1,17 @@
-# Enable gpg-agent if it is not running-
-# --use-standard-socket will work from version 2 upwards
-
-AGENT_SOCK=$(gpgconf --list-dirs | grep agent-socket | cut -d : -f 2)
-
-if [[ ! -S $AGENT_SOCK ]]; then
-  gpg-agent --daemon --use-standard-socket &>/dev/null
-fi
 export GPG_TTY=$TTY
 
-# Set SSH to use gpg-agent if it's enabled
-GNUPGCONFIG="${GNUPGHOME:-"$HOME/.gnupg"}/gpg-agent.conf"
-if [[ -r $GNUPGCONFIG ]] && command grep -q enable-ssh-support "$GNUPGCONFIG"; then
-  export SSH_AUTH_SOCK="$AGENT_SOCK.ssh"
+# Fix for passphrase prompt on the correct tty
+# See https://www.gnupg.org/documentation/manuals/gnupg/Agent-Options.html#option-_002d_002denable_002dssh_002dsupport
+function _gpg-agent_update-tty_preexec {
+  gpg-connect-agent updatestartuptty /bye &>/dev/null
+}
+autoload -U add-zsh-hook
+add-zsh-hook preexec _gpg-agent_update-tty_preexec
+
+# If enable-ssh-support is set, fix ssh agent integration
+if [[ $(gpgconf --list-options gpg-agent | awk -F: '$1=="enable-ssh-support" {print $10}') = 1 ]]; then
   unset SSH_AGENT_PID
+  if [[ "${gnupg_SSH_AUTH_SOCK_by:-0}" -ne $$ ]]; then
+    export SSH_AUTH_SOCK="$(gpgconf --list-dirs agent-ssh-socket)"
+  fi
 fi

From 53c9661b003b91e8af356c3ecbb95a025ffcd412 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Tue, 5 Oct 2021 16:45:49 +0200
Subject: [PATCH 494/869] refactor(chucknorris): refresh plugin code

---
 plugins/chucknorris/README.md              |  4 +--
 plugins/chucknorris/chucknorris.plugin.zsh | 38 ++++++++++------------
 2 files changed, 18 insertions(+), 24 deletions(-)

diff --git a/plugins/chucknorris/README.md b/plugins/chucknorris/README.md
index 35f989180..b51875de9 100644
--- a/plugins/chucknorris/README.md
+++ b/plugins/chucknorris/README.md
@@ -1,8 +1,6 @@
 # chucknorris
 
-Chuck Norris fortunes plugin for oh-my-zsh. Perfectly suitable as MOTD.
-
-**Maintainers**: [apjanke](https://github.com/apjanke) [maff](https://github.com/maff)
+Chuck Norris fortunes plugin for Oh My Zsh. Perfectly suitable as MOTD.
 
 To use it add `chucknorris` to the plugins array in you zshrc file.
 
diff --git a/plugins/chucknorris/chucknorris.plugin.zsh b/plugins/chucknorris/chucknorris.plugin.zsh
index 1dbb04ef0..b90abe320 100644
--- a/plugins/chucknorris/chucknorris.plugin.zsh
+++ b/plugins/chucknorris/chucknorris.plugin.zsh
@@ -1,28 +1,24 @@
-# chucknorris: Chuck Norris fortunes
-
-# Automatically generate or update Chuck's compiled fortune data file
-# $0 must be used outside a local function. This variable name is unlikly to collide.
-CHUCKNORRIS_PLUGIN_DIR=${0:h}
-
 () {
-local DIR=$CHUCKNORRIS_PLUGIN_DIR/fortunes
-if [[ ! -f $DIR/chucknorris.dat ]] || [[ $DIR/chucknorris.dat -ot $DIR/chucknorris ]]; then
-  # For some reason, Cygwin puts strfile in /usr/sbin, which is not on the path by default
-  local strfile=strfile
-  if ! which strfile &>/dev/null && [[ -f /usr/sbin/strfile ]]; then
-    strfile=/usr/sbin/strfile
+  # %x: name of file containing code being executed
+  local fortunes_dir="${${(%):-%x}:h}/fortunes"
+
+  # Aliases
+  alias chuck="fortune -a $fortunes_dir"
+  alias chuck_cow="chuck | cowthink"
+
+  # Automatically generate or update Chuck's compiled fortune data file
+  if [[ "$fortunes_dir/chucknorris" -ot "$fortunes_dir/chucknorris.dat" ]]; then
+    return
   fi
-  if which $strfile &> /dev/null; then
-    $strfile $DIR/chucknorris $DIR/chucknorris.dat >/dev/null
-  else
+
+  # For some reason, Cygwin puts strfile in /usr/sbin, which is not on the path by default
+  local strfile="${commands[strfile]:-/usr/sbin/strfile}"
+  if [[ ! -x "$strfile" ]]; then
     echo "[oh-my-zsh] chucknorris depends on strfile, which is not installed" >&2
     echo "[oh-my-zsh] strfile is often provided as part of the 'fortune' package" >&2
+    return
   fi
-fi
 
-# Aliases
-alias chuck="fortune -a $DIR"
-alias chuck_cow="chuck | cowthink"
+  # Generate the compiled fortune data file
+  $strfile "$fortunes_dir/chucknorris" "$fortunes_dir/chucknorris.dat" >/dev/null
 }
-
-unset CHUCKNORRIS_PLUGIN_DIR

From 9e41cffbf8515ba64ab2cf21b49dc78949707553 Mon Sep 17 00:00:00 2001
From: Ryan McAllen <rhyno@rhynodesigns.com>
Date: Tue, 5 Oct 2021 10:47:28 -0400
Subject: [PATCH 495/869] chore(chucknorris): add a few more Chuck Norris
 quotes (#10210)

---
 plugins/chucknorris/fortunes/chucknorris | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/plugins/chucknorris/fortunes/chucknorris b/plugins/chucknorris/fortunes/chucknorris
index 0ddb6c03b..6ba5bb9b5 100644
--- a/plugins/chucknorris/fortunes/chucknorris
+++ b/plugins/chucknorris/fortunes/chucknorris
@@ -558,3 +558,11 @@ You know Chuck Norris' pet lizard, right? Last I heard, he was in the movie "God
 %
 http://chucknorrisfacts.com/ is built in Drupal because Chuck Norris knows a good CMS when he sees one.
 %
+Chuck Norris made the first Giraffe by uppercutting a horse.
+%
+Chuck Norris can hear sign language.
+%
+Chuck Norris make onions cry.
+%
+Chuck Norris doesn't shake hands, he makes them tremble.
+%

From 63b7e5767d551b1d839888a7216f2bed01e8eb1f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Tue, 5 Oct 2021 16:56:00 +0200
Subject: [PATCH 496/869] fix(changelog): don't parse commits of ignored types

---
 tools/changelog.sh | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/tools/changelog.sh b/tools/changelog.sh
index 7329a9526..71caa2b6c 100755
--- a/tools/changelog.sh
+++ b/tools/changelog.sh
@@ -120,7 +120,7 @@ function parse-commit {
   fi
 
   # Parse commit with hash $1
-  local hash="$1" subject body warning rhash
+  local hash="$1" subject body type warning rhash
   subject="$(command git show -s --format=%s $hash)"
   body="$(command git show -s --format=%b $hash)"
 
@@ -132,8 +132,12 @@ function parse-commit {
   #  commit body
   #  [BREAKING CHANGE: warning]
 
+  # if commit type is not going to be displayed, do nothing else
+  type="$(commit:type "$subject")"
+  (( ${MAIN_TYPES[(Ie)$type]} || ${OTHER_TYPES[(Ie)$type]} )) || return
+
   # commits holds the commit type
-  commits[$hash]="$(commit:type "$subject")"
+  commits[$hash]="$type"
   # scopes holds the commit scope
   scopes[$hash]="$(commit:scope "$subject")"
   # subjects holds the commit subject

From bf7c1b160d164f080a276e6ed6b21ef8008079ee Mon Sep 17 00:00:00 2001
From: Carlo Sala <carlosalag@protonmail.com>
Date: Wed, 6 Oct 2021 10:13:38 +0200
Subject: [PATCH 497/869] fix(git)!: rename `gdu` alias to `gdup` (#10263)

BREAKING CHANGE: the `gdu` alias has been renamed to `gdup` to avoid a
conflict with `go disk usage` (https://github.com/dundee/gdu).
---
 plugins/git/README.md      | 2 +-
 plugins/git/git.plugin.zsh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/git/README.md b/plugins/git/README.md
index b68dc552e..12e3676e8 100644
--- a/plugins/git/README.md
+++ b/plugins/git/README.md
@@ -67,7 +67,7 @@ plugins=(... git)
 | gds                  | git diff --staged                                                                                                                |
 | gdt                  | git diff-tree --no-commit-id --name-only -r                                                                                      |
 | gdnolock             | git diff $@ ":(exclude)package-lock.json" ":(exclude)&ast;.lock"                                                                 |
-| gdu                  | git diff @{u}                                                                                                                    |
+| gdup                 | git diff @{upstream}                                                                                                             |
 | gdv                  | git diff -w $@ \| view -                                                                                                         |
 | gdw                  | git diff --word-diff                                                                                                             |
 | gf                   | git fetch                                                                                                                        |
diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index f2431fde5..5c5db9972 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -126,7 +126,7 @@ alias gdcw='git diff --cached --word-diff'
 alias gdct='git describe --tags $(git rev-list --tags --max-count=1)'
 alias gds='git diff --staged'
 alias gdt='git diff-tree --no-commit-id --name-only -r'
-alias gdu='git diff @{u}'
+alias gdup='git diff @{upstream}'
 alias gdw='git diff --word-diff'
 
 function gdnolock() {

From 7418814677a1b64d584d84be03fbfe38c7760e61 Mon Sep 17 00:00:00 2001
From: Ryan Zegray <ryan.zegray@gmail.com>
Date: Wed, 6 Oct 2021 04:14:22 -0400
Subject: [PATCH 498/869] feat(z): update z to latest version (#10267)

---
 plugins/z/z.sh | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/plugins/z/z.sh b/plugins/z/z.sh
index 13008a60e..67f504e27 100644
--- a/plugins/z/z.sh
+++ b/plugins/z/z.sh
@@ -42,6 +42,8 @@ _z() {
     [ -z "$_Z_OWNER" -a -f "$datafile" -a ! -O "$datafile" ] && return
 
     _z_dirs () {
+        [ -f "$datafile" ] || return
+
         local line
         while read line; do
             # only count directories
@@ -54,14 +56,16 @@ _z() {
     if [ "$1" = "--add" ]; then
         shift
 
-        # $HOME isn't worth matching
-        [ "$*" = "$HOME" ] && return
+        # $HOME and / aren't worth matching
+        [ "$*" = "$HOME" -o "$*" = '/' ] && return
 
         # don't track excluded directory trees
-        local exclude
-        for exclude in "${_Z_EXCLUDE_DIRS[@]}"; do
-            case "$*" in "$exclude*") return;; esac
-        done
+        if [ ${#_Z_EXCLUDE_DIRS[@]} -gt 0 ]; then
+            local exclude
+            for exclude in "${_Z_EXCLUDE_DIRS[@]}"; do
+                case "$*" in "$exclude"*) return;; esac
+            done
+        fi
 
         # maintain the data file
         local tempfile="$datafile.$RANDOM"

From 69a45a9c98291dc485ee9c46c9bf79ec8533217b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Wed, 6 Oct 2021 10:04:30 +0200
Subject: [PATCH 499/869] chore: zshrc update settings rewording

---
 templates/zshrc.zsh-template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/zshrc.zsh-template b/templates/zshrc.zsh-template
index 58642bc41..7e1c7997c 100644
--- a/templates/zshrc.zsh-template
+++ b/templates/zshrc.zsh-template
@@ -23,7 +23,7 @@ ZSH_THEME="robbyrussell"
 # Case-sensitive completion must be off. _ and - will be interchangeable.
 # HYPHEN_INSENSITIVE="true"
 
-# Uncomment the following lines to change the auto-update behavior
+# Uncomment one of the following lines to change the auto-update behavior
 # zstyle ':omz:update' mode disabled  # disable automatic updates
 # zstyle ':omz:update' mode auto      # update automatically without asking
 # zstyle ':omz:update' mode reminder  # just remind me to update when it's time

From 29b5c182bec4cec7704fb8bac9ee0ab971dfb89a Mon Sep 17 00:00:00 2001
From: HoshinoArika <HoshinoArika@tuta.io>
Date: Wed, 6 Oct 2021 17:01:20 +0800
Subject: [PATCH 500/869] feat(sublime): add support for Sublime Text 4 on
 Windows (#10063)

---
 plugins/sublime/sublime.plugin.zsh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/plugins/sublime/sublime.plugin.zsh b/plugins/sublime/sublime.plugin.zsh
index 618dd8ee8..dadf37574 100644
--- a/plugins/sublime/sublime.plugin.zsh
+++ b/plugins/sublime/sublime.plugin.zsh
@@ -17,6 +17,7 @@ alias stn=create_project
   if [[ "$OSTYPE" == linux* ]]; then
     if [[ "$(uname -r)" = *icrosoft* ]]; then
       _sublime_paths=(
+        "$(wslpath -u 'C:\Program Files\Sublime Text\sublime_text.exe' 2>/dev/null)"
         "$(wslpath -u 'C:\Program Files\Sublime Text 3\subl.exe' 2>/dev/null)"
         "$(wslpath -u 'C:\Program Files\Sublime Text 2\subl.exe' 2>/dev/null)"
       )
@@ -52,6 +53,7 @@ alias stn=create_project
     )
   elif [[ "$OSTYPE" = msys ]]; then
     _sublime_paths=(
+      "/c/Program Files/Sublime Text/sublime_text.exe"
       "/c/Program Files/Sublime Text 2/subl.exe"
       "/c/Program Files/Sublime Text 3/subl.exe"
     )

From f0bbef1a070b7b00a36010c44af3c88807c73e6f Mon Sep 17 00:00:00 2001
From: Cxarli <10348289+Cxarli@users.noreply.github.com>
Date: Sat, 31 Oct 2020 16:01:18 +0100
Subject: [PATCH 501/869] feat(yarn): add global bin directory to `$PATH`
 (#9410)

Fixes #9177
Closes #9410
---
 plugins/yarn/yarn.plugin.zsh | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/plugins/yarn/yarn.plugin.zsh b/plugins/yarn/yarn.plugin.zsh
index a240cb88e..a4f595c61 100644
--- a/plugins/yarn/yarn.plugin.zsh
+++ b/plugins/yarn/yarn.plugin.zsh
@@ -1,3 +1,10 @@
+# Add yarn bin directory to $PATH if it exists and not in $PATH already
+bindir=$(yarn global bin 2>/dev/null) \
+  && [[ -d "$bindir" ]] \
+  && (( ! ${path[(Ie)$bindir]} )) \
+  && path+=("$bindir")
+unset bindir
+
 alias y="yarn"
 alias ya="yarn add"
 alias yad="yarn add --dev"

From 607d2f1eda6f7a8a8036a6608e99c512db75c602 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Thu, 7 Oct 2021 13:35:07 +0200
Subject: [PATCH 502/869] Revert "fix(changelog): don't parse commits of
 ignored types"

This reverts commit 63b7e5767d551b1d839888a7216f2bed01e8eb1f.
---
 tools/changelog.sh | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/tools/changelog.sh b/tools/changelog.sh
index 71caa2b6c..7329a9526 100755
--- a/tools/changelog.sh
+++ b/tools/changelog.sh
@@ -120,7 +120,7 @@ function parse-commit {
   fi
 
   # Parse commit with hash $1
-  local hash="$1" subject body type warning rhash
+  local hash="$1" subject body warning rhash
   subject="$(command git show -s --format=%s $hash)"
   body="$(command git show -s --format=%b $hash)"
 
@@ -132,12 +132,8 @@ function parse-commit {
   #  commit body
   #  [BREAKING CHANGE: warning]
 
-  # if commit type is not going to be displayed, do nothing else
-  type="$(commit:type "$subject")"
-  (( ${MAIN_TYPES[(Ie)$type]} || ${OTHER_TYPES[(Ie)$type]} )) || return
-
   # commits holds the commit type
-  commits[$hash]="$type"
+  commits[$hash]="$(commit:type "$subject")"
   # scopes holds the commit scope
   scopes[$hash]="$(commit:scope "$subject")"
   # subjects holds the commit subject

From dc83d0b7204cf66315471e980729490813b7d915 Mon Sep 17 00:00:00 2001
From: Ryan Voots <simcop2387@simcop2387.info>
Date: Thu, 7 Oct 2021 15:16:30 -0400
Subject: [PATCH 503/869] fix(battery): support `acpitool` and multiple
 batteries under Linux (#9609)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Marc Cornellà <hello@mcornella.com>
---
 plugins/battery/battery.plugin.zsh | 54 ++++++++++++++++++------------
 1 file changed, 32 insertions(+), 22 deletions(-)

diff --git a/plugins/battery/battery.plugin.zsh b/plugins/battery/battery.plugin.zsh
index a525fd7da..24bff8ae6 100644
--- a/plugins/battery/battery.plugin.zsh
+++ b/plugins/battery/battery.plugin.zsh
@@ -12,15 +12,12 @@
 ###########################################
 
 if [[ "$OSTYPE" = darwin* ]]; then
-
   function battery_is_charging() {
     ioreg -rc AppleSmartBattery | command grep -q '^.*"ExternalConnected"\ =\ Yes'
   }
-
   function battery_pct() {
     pmset -g batt | grep -Eo "\d+%" | cut -d% -f1
   }
-
   function battery_pct_remaining() {
     if battery_is_charging; then
       echo "External Power"
@@ -28,7 +25,6 @@ if [[ "$OSTYPE" = darwin* ]]; then
       battery_pct
     fi
   }
-
   function battery_time_remaining() {
     local smart_battery_status="$(ioreg -rc "AppleSmartBattery")"
     if [[ $(echo $smart_battery_status | command grep -c '^.*"ExternalConnected"\ =\ No') -eq 1 ]]; then
@@ -42,7 +38,6 @@ if [[ "$OSTYPE" = darwin* ]]; then
       echo "∞"
     fi
   }
-
   function battery_pct_prompt () {
     local battery_pct color
     if ioreg -rc AppleSmartBattery | command grep -q '^.*"ExternalConnected"\ =\ No'; then
@@ -61,17 +56,14 @@ if [[ "$OSTYPE" = darwin* ]]; then
   }
 
 elif [[ "$OSTYPE" = freebsd* ]]; then
-
   function battery_is_charging() {
     [[ $(sysctl -n hw.acpi.battery.state) -eq 2 ]]
   }
-
   function battery_pct() {
     if (( $+commands[sysctl] )); then
       sysctl -n hw.acpi.battery.life
     fi
   }
-
   function battery_pct_remaining() {
     if ! battery_is_charging; then
       battery_pct
@@ -79,7 +71,6 @@ elif [[ "$OSTYPE" = freebsd* ]]; then
       echo "External Power"
     fi
   }
-
   function battery_time_remaining() {
     local remaining_time
     remaining_time=$(sysctl -n hw.acpi.battery.time)
@@ -89,7 +80,6 @@ elif [[ "$OSTYPE" = freebsd* ]]; then
       printf %02d:%02d $hour $minute
     fi
   }
-
   function battery_pct_prompt() {
     local battery_pct color
     battery_pct=$(battery_pct_remaining)
@@ -106,19 +96,42 @@ elif [[ "$OSTYPE" = freebsd* ]]; then
       echo "%{$fg[$color]%}${battery_pct}%%%{$reset_color%}"
     fi
   }
-
 elif [[ "$OSTYPE" = linux*  ]]; then
-
   function battery_is_charging() {
-    ! acpi 2>/dev/null | command grep -v "rate information unavailable" | command grep -q '^Battery.*Discharging'
-  }
-
-  function battery_pct() {
-    if (( $+commands[acpi] )); then
-      acpi 2>/dev/null | command grep -v "rate information unavailable" | command grep -E '^Battery.*(Full|(Disc|C)harging)' | cut -f2 -d ',' | tr -cd '[:digit:]'
+    if (( $+commands[acpitool] )); then
+      ! acpitool 2>/dev/null | command grep -qE '^\s+Battery.*Discharging'
+    elif (( $+commands[acpi] )); then
+      ! acpi 2>/dev/null | command grep -v "rate information unavailable" | command grep -q '^Battery.*Discharging'
+    fi
+  }
+  function battery_pct() {
+    if (( $+commands[acpitool] )); then
+      # Sample output:
+      #   Battery #1     : Unknown, 99.55%
+      #   Battery #2     : Discharging, 49.58%, 01:12:05
+      #   All batteries  : 62.60%, 02:03:03
+      acpitool 2>/dev/null | command awk -F, '
+        /^\s+All batteries/ {
+          gsub(/[^0-9.]/, "", $1)
+          pct=$1
+          exit
+        }
+        !pct && /^\s+Battery/ {
+          gsub(/[^0-9.]/, "", $2)
+          pct=$2
+        }
+        END { print pct }
+        '
+    elif (( $+commands[acpi] )); then
+      # Sample output:
+      # Battery 0: Discharging, 0%, rate information unavailable
+      # Battery 1: Full, 100%
+      acpi 2>/dev/null | command awk -F, '
+        /rate information unavailable/ { next }
+        /^Battery.*: /{ gsub(/[^0-9]/, "", $2); print $2; exit }
+      '
     fi
   }
-
   function battery_pct_remaining() {
     if ! battery_is_charging; then
       battery_pct
@@ -126,13 +139,11 @@ elif [[ "$OSTYPE" = linux*  ]]; then
       echo "External Power"
     fi
   }
-
   function battery_time_remaining() {
     if ! battery_is_charging; then
       acpi 2>/dev/null | command grep -v "rate information unavailable" | cut -f3 -d ','
     fi
   }
-
   function battery_pct_prompt() {
     local battery_pct color
     battery_pct=$(battery_pct_remaining)
@@ -149,7 +160,6 @@ elif [[ "$OSTYPE" = linux*  ]]; then
       echo "%{$fg[$color]%}${battery_pct}%%%{$reset_color%}"
     fi
   }
-
 else
   # Empty functions so we don't cause errors in prompts
   function battery_is_charging { false }

From f26a1ecdf01185218004dd6d15ce02541e6a2b26 Mon Sep 17 00:00:00 2001
From: Avneet Singh <4151485+kalsi-avneet@users.noreply.github.com>
Date: Sun, 21 Mar 2021 00:06:33 +0530
Subject: [PATCH 504/869] feat(battery): add support for Android via Termux
 (#9752)

---
 plugins/battery/README.md          | 19 ++++++++-----
 plugins/battery/battery.plugin.zsh | 43 ++++++++++++++++++++++++++++++
 2 files changed, 56 insertions(+), 6 deletions(-)

diff --git a/plugins/battery/README.md b/plugins/battery/README.md
index c2554a36d..18e5bd882 100644
--- a/plugins/battery/README.md
+++ b/plugins/battery/README.md
@@ -8,15 +8,22 @@ To use, add `battery` to the list of plugins in your `.zshrc` file:
 
 Then, add the `battery_pct_prompt` function to your custom theme. For example:
 
-```
+```zsh
 RPROMPT='$(battery_pct_prompt) ...'
 ```
 
 ## Requirements
 
-On Linux, you must have the `acpi` tool installed on your operating system.
+- On Linux, you must have the `acpi` or `acpitool` commands installed on your operating system.
+  On Debian/Ubuntu, you can do that with `sudo apt install acpi` or `sudo apt install acpitool`.
 
-Here's an example of how to install with apt:
-```
-sudo apt-get install acpi
-```
+- On Android (via [Termux](https://play.google.com/store/apps/details?id=com.termux)), you must have:
+
+  1. The `Termux:API` addon app installed:
+     [Google Play](https://play.google.com/store/apps/details?id=com.termux.api) | [F-Droid](https://f-droid.org/packages/com.termux.api/)
+
+  2. The `termux-api` package installed within termux:
+
+     ```sh
+     pkg install termux-api
+     ```
diff --git a/plugins/battery/battery.plugin.zsh b/plugins/battery/battery.plugin.zsh
index 24bff8ae6..8e6afe65e 100644
--- a/plugins/battery/battery.plugin.zsh
+++ b/plugins/battery/battery.plugin.zsh
@@ -10,6 +10,9 @@
 # Author: J (927589452)                   #
 # Modified to add support for FreeBSD     #
 ###########################################
+# Author: Avneet Singh (kalsi-avneet)     #
+# Modified to add support for Android     #
+###########################################
 
 if [[ "$OSTYPE" = darwin* ]]; then
   function battery_is_charging() {
@@ -160,6 +163,46 @@ elif [[ "$OSTYPE" = linux*  ]]; then
       echo "%{$fg[$color]%}${battery_pct}%%%{$reset_color%}"
     fi
   }
+elif [[ "$OSTYPE" = linux-android ]] && (( ${+commands[termux-battery-status]} )); then
+  function battery_is_charging() {
+    termux-battery-status 2>/dev/null | command awk '/status/ { exit ($0 ~ /DISCHARGING/) }'
+  }
+  function battery_pct() {
+    # Sample output:
+    # {
+    #   "health": "GOOD",
+    #   "percentage": 93,
+    #   "plugged": "UNPLUGGED",
+    #   "status": "DISCHARGING",
+    #   "temperature": 29.0,
+    #   "current": 361816
+    # }
+    termux-battery-status 2>/dev/null | command awk '/percentage/ { gsub(/[,]/,""); print $2}'
+  }
+  function battery_pct_remaining() {
+    if ! battery_is_charging; then
+      battery_pct
+    else
+      echo "External Power"
+    fi
+  }
+  function battery_time_remaining() { } # Not available on android
+  function battery_pct_prompt() {
+    local battery_pct color
+    battery_pct=$(battery_pct_remaining)
+    if battery_is_charging; then
+      echo "∞"
+    else
+      if [[ $battery_pct -gt 50 ]]; then
+        color='green'
+      elif [[ $battery_pct -gt 20 ]]; then
+        color='yellow'
+      else
+        color='red'
+      fi
+      echo "%{$fg[$color]%}${battery_pct}%%%{$reset_color%}"
+    fi
+  }
 else
   # Empty functions so we don't cause errors in prompts
   function battery_is_charging { false }

From 9aeb967581061ca12c1679d3fdce8a5b516a9796 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Fri, 8 Oct 2021 12:34:04 +0200
Subject: [PATCH 505/869] fix(battery): fix system check so Termux uses the
 correct method

---
 plugins/battery/battery.plugin.zsh | 80 +++++++++++++++---------------
 1 file changed, 40 insertions(+), 40 deletions(-)

diff --git a/plugins/battery/battery.plugin.zsh b/plugins/battery/battery.plugin.zsh
index 8e6afe65e..0e96b00aa 100644
--- a/plugins/battery/battery.plugin.zsh
+++ b/plugins/battery/battery.plugin.zsh
@@ -99,6 +99,46 @@ elif [[ "$OSTYPE" = freebsd* ]]; then
       echo "%{$fg[$color]%}${battery_pct}%%%{$reset_color%}"
     fi
   }
+elif [[ "$OSTYPE" = linux-android ]] && (( ${+commands[termux-battery-status]} )); then
+  function battery_is_charging() {
+    termux-battery-status 2>/dev/null | command awk '/status/ { exit ($0 ~ /DISCHARGING/) }'
+  }
+  function battery_pct() {
+    # Sample output:
+    # {
+    #   "health": "GOOD",
+    #   "percentage": 93,
+    #   "plugged": "UNPLUGGED",
+    #   "status": "DISCHARGING",
+    #   "temperature": 29.0,
+    #   "current": 361816
+    # }
+    termux-battery-status 2>/dev/null | command awk '/percentage/ { gsub(/[,]/,""); print $2}'
+  }
+  function battery_pct_remaining() {
+    if ! battery_is_charging; then
+      battery_pct
+    else
+      echo "External Power"
+    fi
+  }
+  function battery_time_remaining() { } # Not available on android
+  function battery_pct_prompt() {
+    local battery_pct color
+    battery_pct=$(battery_pct_remaining)
+    if battery_is_charging; then
+      echo "∞"
+    else
+      if [[ $battery_pct -gt 50 ]]; then
+        color='green'
+      elif [[ $battery_pct -gt 20 ]]; then
+        color='yellow'
+      else
+        color='red'
+      fi
+      echo "%{$fg[$color]%}${battery_pct}%%%{$reset_color%}"
+    fi
+  }
 elif [[ "$OSTYPE" = linux*  ]]; then
   function battery_is_charging() {
     if (( $+commands[acpitool] )); then
@@ -163,46 +203,6 @@ elif [[ "$OSTYPE" = linux*  ]]; then
       echo "%{$fg[$color]%}${battery_pct}%%%{$reset_color%}"
     fi
   }
-elif [[ "$OSTYPE" = linux-android ]] && (( ${+commands[termux-battery-status]} )); then
-  function battery_is_charging() {
-    termux-battery-status 2>/dev/null | command awk '/status/ { exit ($0 ~ /DISCHARGING/) }'
-  }
-  function battery_pct() {
-    # Sample output:
-    # {
-    #   "health": "GOOD",
-    #   "percentage": 93,
-    #   "plugged": "UNPLUGGED",
-    #   "status": "DISCHARGING",
-    #   "temperature": 29.0,
-    #   "current": 361816
-    # }
-    termux-battery-status 2>/dev/null | command awk '/percentage/ { gsub(/[,]/,""); print $2}'
-  }
-  function battery_pct_remaining() {
-    if ! battery_is_charging; then
-      battery_pct
-    else
-      echo "External Power"
-    fi
-  }
-  function battery_time_remaining() { } # Not available on android
-  function battery_pct_prompt() {
-    local battery_pct color
-    battery_pct=$(battery_pct_remaining)
-    if battery_is_charging; then
-      echo "∞"
-    else
-      if [[ $battery_pct -gt 50 ]]; then
-        color='green'
-      elif [[ $battery_pct -gt 20 ]]; then
-        color='yellow'
-      else
-        color='red'
-      fi
-      echo "%{$fg[$color]%}${battery_pct}%%%{$reset_color%}"
-    fi
-  }
 else
   # Empty functions so we don't cause errors in prompts
   function battery_is_charging { false }

From 5fb204fa7469a89f31ffb8ee8a9b3c36bea926a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Fri, 8 Oct 2021 15:42:43 +0200
Subject: [PATCH 506/869] fix(battery): force battery percentage as integer

---
 plugins/battery/battery.plugin.zsh | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/plugins/battery/battery.plugin.zsh b/plugins/battery/battery.plugin.zsh
index 0e96b00aa..db5eeb93a 100644
--- a/plugins/battery/battery.plugin.zsh
+++ b/plugins/battery/battery.plugin.zsh
@@ -153,7 +153,7 @@ elif [[ "$OSTYPE" = linux*  ]]; then
       #   Battery #1     : Unknown, 99.55%
       #   Battery #2     : Discharging, 49.58%, 01:12:05
       #   All batteries  : 62.60%, 02:03:03
-      acpitool 2>/dev/null | command awk -F, '
+      local -i pct=$(acpitool 2>/dev/null | command awk -F, '
         /^\s+All batteries/ {
           gsub(/[^0-9.]/, "", $1)
           pct=$1
@@ -164,7 +164,8 @@ elif [[ "$OSTYPE" = linux*  ]]; then
           pct=$2
         }
         END { print pct }
-        '
+        ')
+      echo $pct
     elif (( $+commands[acpi] )); then
       # Sample output:
       # Battery 0: Discharging, 0%, rate information unavailable
@@ -227,7 +228,7 @@ function battery_level_gauge() {
   local charging_color=${BATTERY_CHARGING_COLOR:-$color_yellow}
   local charging_symbol=${BATTERY_CHARGING_SYMBOL:-'⚡'}
 
-  local battery_remaining_percentage=$(battery_pct)
+  local -i battery_remaining_percentage=$(battery_pct)
   local filled empty gauge_color
 
   if [[ $battery_remaining_percentage =~ [0-9]+ ]]; then

From 1c9a64ece6dce901aac114deaa71b298a32fbfb4 Mon Sep 17 00:00:00 2001
From: Michael Fryar <michaelefryar@gmail.com>
Date: Fri, 8 Oct 2021 08:24:00 -0700
Subject: [PATCH 507/869] feat(git): add `gswm` and `gswd` aliases (#9897)

Co-authored-by: Nathaniel Young <nathanielyoung95070@gmail.com>
---
 plugins/git/README.md      | 2 ++
 plugins/git/git.plugin.zsh | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/plugins/git/README.md b/plugins/git/README.md
index 12e3676e8..113080874 100644
--- a/plugins/git/README.md
+++ b/plugins/git/README.md
@@ -169,6 +169,8 @@ plugins=(... git)
 | gsu                  | git submodule update                                                                                                             |
 | gsw                  | git switch                                                                                                                       |
 | gswc                 | git switch -c                                                                                                                    |
+| gswm                 | git switch $(git_main_branch)                                                                                                    |
+| gswd                 | git switch $(git_develop_branch)                                                                                                 |
 | gts                  | git tag -s                                                                                                                       |
 | gtv                  | git tag \| sort -V                                                                                                               |
 | gtl                  | gtl(){ git tag --sort=-v:refname -n -l ${1}* }; noglob gtl                                                                       |
diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index 5c5db9972..dbcc7bddb 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -295,6 +295,8 @@ alias gstall='git stash --all'
 alias gsu='git submodule update'
 alias gsw='git switch'
 alias gswc='git switch -c'
+alias gswm='git switch $(git_main_branch)'
+alias gswd='git switch $(git_develop_branch)'
 
 alias gts='git tag -s'
 alias gtv='git tag | sort -V'

From 07cdd7a53931a17a2c24f834c5e1ea0f62609c42 Mon Sep 17 00:00:00 2001
From: Pooya Vahidi <56851682+pooyavahidi@users.noreply.github.com>
Date: Sat, 9 Oct 2021 21:02:49 +1100
Subject: [PATCH 508/869] fix(lib): fix status exit code check in
 `git_prompt_status` (#10275)

---
 lib/git.zsh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/git.zsh b/lib/git.zsh
index c9363274c..9a615e77b 100644
--- a/lib/git.zsh
+++ b/lib/git.zsh
@@ -206,7 +206,8 @@ function git_prompt_status() {
     STASHED UNMERGED AHEAD BEHIND DIVERGED
   )
 
-  local status_text="$(__git_prompt_git status --porcelain -b 2> /dev/null)"
+  local status_text
+  status_text="$(__git_prompt_git status --porcelain -b 2> /dev/null)"
 
   # Don't continue on a catastrophic failure
   if [[ $? -eq 128 ]]; then

From 6ac1ff69053525d94b8bc6c5243d2bb67fb61930 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luka=20Marku=C5=A1i=C4=87?= <markusicluka@gmail.com>
Date: Sat, 9 Oct 2021 13:42:17 +0200
Subject: [PATCH 509/869] fix(git): fix directory parse from URL in `gccd`
 (#10276)

---
 plugins/git/git.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index dbcc7bddb..5a3c98287 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -100,7 +100,7 @@ alias gcf='git config --list'
 
 function gccd() {
   command git clone --recurse-submodules "$@"
-  [[ -d "$_" ]] && cd "$_" || cd "${${_:h}%.git}"
+  [[ -d "$_" ]] && cd "$_" || cd "${${_:t}%.git}"
 }
 compdef _git gccd=git-clone
 

From f82aa819310752ad754c4ebfd1ae499285ee556e Mon Sep 17 00:00:00 2001
From: michael-yuji <michael-yuji@users.noreply.github.com>
Date: Mon, 11 Oct 2021 01:15:24 +0800
Subject: [PATCH 510/869] fix(lib): fix `diff --color` argument check for BSD
 systems (#10269)

---
 lib/theme-and-appearance.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/theme-and-appearance.zsh b/lib/theme-and-appearance.zsh
index 0b71de372..00947f72d 100644
--- a/lib/theme-and-appearance.zsh
+++ b/lib/theme-and-appearance.zsh
@@ -40,7 +40,7 @@ if [[ "$DISABLE_LS_COLORS" != "true" ]]; then
 fi
 
 # enable diff color if possible.
-if command diff --color . . &>/dev/null; then
+if command diff --color /dev/null /dev/null &>/dev/null; then
   alias diff='diff --color'
 fi
 

From 9bd0ac9b005189edceb0ac53f361fcc020f8e6b6 Mon Sep 17 00:00:00 2001
From: Arthur Maltson <arthur@maltson.com>
Date: Mon, 11 Oct 2021 05:40:17 -0400
Subject: [PATCH 511/869] feat(mvn): support using `mvnw` in multi-module
 projects (#9413)

---
 plugins/mvn/mvn.plugin.zsh | 531 +++++++++++++++++++------------------
 1 file changed, 269 insertions(+), 262 deletions(-)

diff --git a/plugins/mvn/mvn.plugin.zsh b/plugins/mvn/mvn.plugin.zsh
index 27d63a6f9..e32729aa6 100644
--- a/plugins/mvn/mvn.plugin.zsh
+++ b/plugins/mvn/mvn.plugin.zsh
@@ -1,39 +1,46 @@
-# Calls ./mvnw if found, otherwise execute the original mvn
+# Calls mvnw if found in the current project, otherwise execute the original mvn
 mvn-or-mvnw() {
-	if [ -x ./mvnw ]; then
-		echo "executing mvnw instead of mvn"
-		./mvnw "$@"
-	else
-		command mvn "$@"
-	fi
+  local dir="$PWD"
+  while [[ ! -x "$dir/mvnw" && "$dir" != / ]]; do
+    dir="${dir:h}"
+  done
+
+  if [[ -x "$dir/mvnw" ]]; then
+    echo "Running \`$dir/mvnw\`..." >&2
+    "$dir/mvnw" "$@"
+    return $?
+  fi
+
+  command mvn "$@"
 }
 
 # Wrapper function for Maven's mvn command. Based on https://gist.github.com/1027800
 mvn-color() {
-	local BOLD=$(echoti bold)
-	local TEXT_RED=$(echoti setaf 1)
-	local TEXT_GREEN=$(echoti setaf 2)
-	local TEXT_YELLOW=$(echoti setaf 3)
-	local TEXT_BLUE=$(echoti setaf 4)
-	local TEXT_WHITE=$(echoti setaf 7)
-	local RESET_FORMATTING=$(echoti sgr0)
-	(
-	# Filter mvn output using sed. Before filtering set the locale to C, so invalid characters won't break some sed implementations
-	unset LANG
-	LC_CTYPE=C mvn "$@" | sed \
-		-e "s/\(\[INFO\]\)\(.*\)/${TEXT_BLUE}${BOLD}\1${RESET_FORMATTING}\2/g" \
-		-e "s/\(\[DEBUG\]\)\(.*\)/${TEXT_WHITE}${BOLD}\1${RESET_FORMATTING}\2/g" \
-		-e "s/\(\[INFO\]\ BUILD SUCCESSFUL\)/${BOLD}${TEXT_GREEN}\1${RESET_FORMATTING}/g" \
-		-e "s/\(\[WARNING\]\)\(.*\)/${BOLD}${TEXT_YELLOW}\1${RESET_FORMATTING}\2/g" \
-		-e "s/\(\[ERROR\]\)\(.*\)/${BOLD}${TEXT_RED}\1${RESET_FORMATTING}\2/g" \
-		-e "s/Tests run: \([^,]*\), Failures: \([^,]*\), Errors: \([^,]*\), Skipped: \([^,]*\)/${BOLD}${TEXT_GREEN}Tests run: \1${RESET_FORMATTING}, Failures: ${BOLD}${TEXT_RED}\2${RESET_FORMATTING}, Errors: ${BOLD}${TEXT_RED}\3${RESET_FORMATTING}, Skipped: ${BOLD}${TEXT_YELLOW}\4${RESET_FORMATTING}/g"
+  local BOLD=$(echoti bold)
+  local TEXT_RED=$(echoti setaf 1)
+  local TEXT_GREEN=$(echoti setaf 2)
+  local TEXT_YELLOW=$(echoti setaf 3)
+  local TEXT_BLUE=$(echoti setaf 4)
+  local TEXT_WHITE=$(echoti setaf 7)
+  local RESET_FORMATTING=$(echoti sgr0)
 
-	# Make sure formatting is reset
-	echo -ne "${RESET_FORMATTING}"
-	)
+  (
+    # Filter mvn output using sed. Before filtering set the locale to C, so invalid characters won't break some sed implementations
+    unset LANG
+    LC_CTYPE=C mvn "$@" | sed \
+      -e "s/\(\[INFO\]\)\(.*\)/${TEXT_BLUE}${BOLD}\1${RESET_FORMATTING}\2/g" \
+      -e "s/\(\[DEBUG\]\)\(.*\)/${TEXT_WHITE}${BOLD}\1${RESET_FORMATTING}\2/g" \
+      -e "s/\(\[INFO\]\ BUILD SUCCESSFUL\)/${BOLD}${TEXT_GREEN}\1${RESET_FORMATTING}/g" \
+      -e "s/\(\[WARNING\]\)\(.*\)/${BOLD}${TEXT_YELLOW}\1${RESET_FORMATTING}\2/g" \
+      -e "s/\(\[ERROR\]\)\(.*\)/${BOLD}${TEXT_RED}\1${RESET_FORMATTING}\2/g" \
+      -e "s/Tests run: \([^,]*\), Failures: \([^,]*\), Errors: \([^,]*\), Skipped: \([^,]*\)/${BOLD}${TEXT_GREEN}Tests run: \1${RESET_FORMATTING}, Failures: ${BOLD}${TEXT_RED}\2${RESET_FORMATTING}, Errors: ${BOLD}${TEXT_RED}\3${RESET_FORMATTING}, Skipped: ${BOLD}${TEXT_YELLOW}\4${RESET_FORMATTING}/g"
+
+    # Make sure formatting is reset
+    echo -ne "${RESET_FORMATTING}"
+  )
 }
 
-# either use orignal mvn or the mvn wrapper
+# either use original mvn or the mvn wrapper
 alias mvn="mvn-or-mvnw"
 
 # Run mvn against the pom found in a project's root directory (assumes a git repo)
@@ -72,262 +79,262 @@ alias mvn-updates='mvn versions:display-dependency-updates'
 
 
 function listMavenCompletions {
-	local file new_file
-	local -a profiles POM_FILES modules
+  local file new_file
+  local -a profiles POM_FILES modules
 
-	# Root POM
-	POM_FILES=(~/.m2/settings.xml)
+  # Root POM
+  POM_FILES=(~/.m2/settings.xml)
 
-	# POM in the current directory
-	if [[ -f pom.xml ]]; then
-		local file=pom.xml
-		POM_FILES+=("${file:A}")
-	fi
+  # POM in the current directory
+  if [[ -f pom.xml ]]; then
+    local file=pom.xml
+    POM_FILES+=("${file:A}")
+  fi
 
-	# Look for POM files in parent directories
-	while [[ -n "$file" ]] && grep -q "<parent>" "$file"; do
-		# look for a new relativePath for parent pom.xml
-		new_file=$(grep -e "<relativePath>.*</relativePath>" "$file" | sed -e 's/.*<relativePath>\(.*\)<\/relativePath>.*/\1/')
+  # Look for POM files in parent directories
+  while [[ -n "$file" ]] && grep -q "<parent>" "$file"; do
+    # look for a new relativePath for parent pom.xml
+    new_file=$(grep -e "<relativePath>.*</relativePath>" "$file" | sed -e 's/.*<relativePath>\(.*\)<\/relativePath>.*/\1/')
 
-		# if <parent> is present but not defined, assume ../pom.xml
-		if [[ -z "$new_file" ]]; then
-			new_file="../pom.xml"
-		fi
+    # if <parent> is present but not defined, assume ../pom.xml
+    if [[ -z "$new_file" ]]; then
+      new_file="../pom.xml"
+    fi
 
-		# if file doesn't exist break
-		file="${file:h}/${new_file}"
-		if ! [[ -e "$file" ]]; then
-			break
-		fi
+    # if file doesn't exist break
+    file="${file:h}/${new_file}"
+    if ! [[ -e "$file" ]]; then
+      break
+    fi
 
-		POM_FILES+=("${file:A}")
-	done
+    POM_FILES+=("${file:A}")
+  done
 
-	# Get profiles from found files
-	for file in $POM_FILES; do
-		[[ -e $file ]] || continue
-		profiles+=($(sed 's/<!--.*-->//' "$file" | sed '/<!--/,/-->/d' | grep -e "<profile>" -A 1 | grep -e "<id>.*</id>" | sed 's?.*<id>\(.*\)<\/id>.*?-P\1?'))
-	done
+  # Get profiles from found files
+  for file in $POM_FILES; do
+    [[ -e $file ]] || continue
+    profiles+=($(sed 's/<!--.*-->//' "$file" | sed '/<!--/,/-->/d' | grep -e "<profile>" -A 1 | grep -e "<id>.*</id>" | sed 's?.*<id>\(.*\)<\/id>.*?-P\1?'))
+  done
 
-	# List modules
-	modules=($(find **/pom.xml -type f | grep -v '/target/classes/META-INF/' | grep '/pom.xml' |sed 's|\(.*\)/pom\.xml|\1|'))
+  # List modules
+  modules=($(find **/pom.xml -type f | grep -v '/target/classes/META-INF/' | grep '/pom.xml' |sed 's|\(.*\)/pom\.xml|\1|'))
 
-	reply=(
-		# common lifecycle
-		clean initialize process-resources compile process-test-resources test-compile test package verify install deploy site
+  reply=(
+    # common lifecycle
+    clean initialize process-resources compile process-test-resources test-compile test package verify install deploy site
 
-		# integration testing
-		pre-integration-test integration-test
+    # integration testing
+    pre-integration-test integration-test
 
-		# common plugins
-		deploy failsafe install site surefire checkstyle javadoc jxr pmd ant antrun archetype assembly dependency enforcer gpg help release repository source eclipse idea jetty cargo jboss tomcat tomcat6 tomcat7 exec versions war ear ejb android scm buildnumber nexus repository sonar license hibernate3 liquibase flyway gwt
+    # common plugins
+    deploy failsafe install site surefire checkstyle javadoc jxr pmd ant antrun archetype assembly dependency enforcer gpg help release repository source eclipse idea jetty cargo jboss tomcat tomcat6 tomcat7 exec versions war ear ejb android scm buildnumber nexus repository sonar license hibernate3 liquibase flyway gwt
 
-		# deploy
-		deploy:deploy-file
-		# failsafe
-		failsafe:integration-test failsafe:verify
-		# install
-		install:install-file install:help
-		# site
-		site:site site:deploy site:run site:stage site:stage-deploy site:attach-descriptor site:jar site:effective-site
-		# surefire
-		surefire:test
+    # deploy
+    deploy:deploy-file
+    # failsafe
+    failsafe:integration-test failsafe:verify
+    # install
+    install:install-file install:help
+    # site
+    site:site site:deploy site:run site:stage site:stage-deploy site:attach-descriptor site:jar site:effective-site
+    # surefire
+    surefire:test
 
-		# checkstyle
-		checkstyle:checkstyle checkstyle:check checkstyle:checkstyle-aggregate
-		# javadoc
-		javadoc:javadoc javadoc:test-javadoc javadoc:javadoc-no-fork javadoc:test-javadoc-no-fork javadoc:aggregate javadoc:test-aggregate javadoc:jar javadoc:test-jar javadoc:aggregate-jar javadoc:test-aggregate-jar javadoc:fix javadoc:test-fix javadoc:resource-bundle javadoc:test-resource-bundle
-		# jxr
-		jxr:jxr jxr:aggregate jxr:test-jxr jxr:test-aggregate
-		# pmd
-		pmd:pmd pmd:cpd pmd:check pmd:cpd-check
+    # checkstyle
+    checkstyle:checkstyle checkstyle:check checkstyle:checkstyle-aggregate
+    # javadoc
+    javadoc:javadoc javadoc:test-javadoc javadoc:javadoc-no-fork javadoc:test-javadoc-no-fork javadoc:aggregate javadoc:test-aggregate javadoc:jar javadoc:test-jar javadoc:aggregate-jar javadoc:test-aggregate-jar javadoc:fix javadoc:test-fix javadoc:resource-bundle javadoc:test-resource-bundle
+    # jxr
+    jxr:jxr jxr:aggregate jxr:test-jxr jxr:test-aggregate
+    # pmd
+    pmd:pmd pmd:cpd pmd:check pmd:cpd-check
 
-		# ant
-		ant:ant ant:clean
-		# antrun
-		antrun:run
-		# archetype
-		archetype:generate archetype:create-from-project archetype:crawl
-		# assembly
-		assembly:single assembly:assembly
-		# dependency
-		dependency:analyze dependency:analyze-dep-mgt dependency:analyze-only dependency:analyze-report dependency:analyze-duplicate dependency:build-classpath dependency:copy dependency:copy-dependencies dependency:display-ancestors dependency:get dependency:go-offline dependency:list dependency:list-repositories dependency:properties dependency:purge-local-repository dependency:resolve dependency:resolve-plugins dependency:sources dependency:tree dependency:unpack dependency:unpack-dependencies
-		# enforcer
-		enforcer:enforce enforcer:display-info
-		# gpg
-		gpg:sign gpg:sign-and-deploy-file
-		# help
-		help:active-profiles help:all-profiles help:describe help:effective-pom help:effective-settings help:evaluate help:expressions help:system
-		# release
-		release:clean release:prepare release:prepare-with-pom release:rollback release:perform release:stage release:branch release:update-versions
-		# jgitflow
-		jgitflow:feature-start jgitflow:feature-finish jgitflow:release-start jgitflow:release-finish jgitflow:hotfix-start jgitflow:hotfix-finish jgitflow:build-number
-		# repository
-		repository:bundle-create repository:bundle-pack
-		# source
-		source:aggregate source:jar source:jar-no-fork source:test-jar source:test-jar-no-fork
+    # ant
+    ant:ant ant:clean
+    # antrun
+    antrun:run
+    # archetype
+    archetype:generate archetype:create-from-project archetype:crawl
+    # assembly
+    assembly:single assembly:assembly
+    # dependency
+    dependency:analyze dependency:analyze-dep-mgt dependency:analyze-only dependency:analyze-report dependency:analyze-duplicate dependency:build-classpath dependency:copy dependency:copy-dependencies dependency:display-ancestors dependency:get dependency:go-offline dependency:list dependency:list-repositories dependency:properties dependency:purge-local-repository dependency:resolve dependency:resolve-plugins dependency:sources dependency:tree dependency:unpack dependency:unpack-dependencies
+    # enforcer
+    enforcer:enforce enforcer:display-info
+    # gpg
+    gpg:sign gpg:sign-and-deploy-file
+    # help
+    help:active-profiles help:all-profiles help:describe help:effective-pom help:effective-settings help:evaluate help:expressions help:system
+    # release
+    release:clean release:prepare release:prepare-with-pom release:rollback release:perform release:stage release:branch release:update-versions
+    # jgitflow
+    jgitflow:feature-start jgitflow:feature-finish jgitflow:release-start jgitflow:release-finish jgitflow:hotfix-start jgitflow:hotfix-finish jgitflow:build-number
+    # repository
+    repository:bundle-create repository:bundle-pack
+    # source
+    source:aggregate source:jar source:jar-no-fork source:test-jar source:test-jar-no-fork
 
-		# eclipse
-		eclipse:clean eclipse:eclipse
-		# idea
-		idea:clean idea:idea
+    # eclipse
+    eclipse:clean eclipse:eclipse
+    # idea
+    idea:clean idea:idea
 
-		# jetty
-		jetty:run jetty:run-exploded
-		# cargo
-		cargo:start cargo:run cargo:stop cargo:deploy cargo:undeploy cargo:help
-		# jboss
-		jboss:start jboss:stop jboss:deploy jboss:undeploy jboss:redeploy
-		# tomcat
-		tomcat:start tomcat:stop tomcat:deploy tomcat:undeploy tomcat:redeploy
-		# tomcat6
-		tomcat6:run tomcat6:run-war tomcat6:run-war-only tomcat6:stop tomcat6:deploy tomcat6:undeploy
-		# tomcat7
-		tomcat7:run tomcat7:run-war tomcat7:run-war-only tomcat7:deploy
-		# tomee
-		tomee:run tomee:run-war tomee:run-war-only tomee:stop tomee:deploy tomee:undeploy
-		# spring-boot
-		spring-boot:run spring-boot:repackage
-		# quarkus
-		quarkus:dev quarkus:list-extensions quarkus:add-extension quarkus:add-extensions quarkus:generate-config quarkus:help
-		# exec
-		exec:exec exec:java
-		# versions
-		versions:display-dependency-updates versions:display-plugin-updates versions:display-property-updates versions:update-parent versions:update-properties versions:update-child-modules versions:lock-snapshots versions:unlock-snapshots versions:resolve-ranges versions:set versions:use-releases versions:use-next-releases versions:use-latest-releases versions:use-next-snapshots versions:use-latest-snapshots versions:use-next-versions versions:use-latest-versions versions:commit versions:revert
-		# scm
-		scm:add scm:bootstrap scm:branch scm:changelog scm:check-local-modification scm:checkin scm:checkout scm:diff scm:edit scm:export scm:list scm:remove scm:status scm:tag scm:unedit scm:update scm:update-subprojects scm:validate
-		# buildnumber
-		buildnumber:create buildnumber:create-timestamp buildnumber:help buildnumber:hgchangeset
+    # jetty
+    jetty:run jetty:run-exploded
+    # cargo
+    cargo:start cargo:run cargo:stop cargo:deploy cargo:undeploy cargo:help
+    # jboss
+    jboss:start jboss:stop jboss:deploy jboss:undeploy jboss:redeploy
+    # tomcat
+    tomcat:start tomcat:stop tomcat:deploy tomcat:undeploy tomcat:redeploy
+    # tomcat6
+    tomcat6:run tomcat6:run-war tomcat6:run-war-only tomcat6:stop tomcat6:deploy tomcat6:undeploy
+    # tomcat7
+    tomcat7:run tomcat7:run-war tomcat7:run-war-only tomcat7:deploy
+    # tomee
+    tomee:run tomee:run-war tomee:run-war-only tomee:stop tomee:deploy tomee:undeploy
+    # spring-boot
+    spring-boot:run spring-boot:repackage
+    # quarkus
+    quarkus:dev quarkus:list-extensions quarkus:add-extension quarkus:add-extensions quarkus:generate-config quarkus:help
+    # exec
+    exec:exec exec:java
+    # versions
+    versions:display-dependency-updates versions:display-plugin-updates versions:display-property-updates versions:update-parent versions:update-properties versions:update-child-modules versions:lock-snapshots versions:unlock-snapshots versions:resolve-ranges versions:set versions:use-releases versions:use-next-releases versions:use-latest-releases versions:use-next-snapshots versions:use-latest-snapshots versions:use-next-versions versions:use-latest-versions versions:commit versions:revert
+    # scm
+    scm:add scm:bootstrap scm:branch scm:changelog scm:check-local-modification scm:checkin scm:checkout scm:diff scm:edit scm:export scm:list scm:remove scm:status scm:tag scm:unedit scm:update scm:update-subprojects scm:validate
+    # buildnumber
+    buildnumber:create buildnumber:create-timestamp buildnumber:help buildnumber:hgchangeset
 
-		# war
-		war:war war:exploded war:inplace war:manifest
-		# ear
-		ear:ear ear:generate-application-xml
-		# ejb
-		ejb:ejb
-		# android
-		android:apk android:apklib android:deploy android:deploy-dependencies android:dex android:emulator-start android:emulator-stop android:emulator-stop-all android:generate-sources android:help android:instrument android:manifest-update android:pull android:push android:redeploy android:run android:undeploy android:unpack android:version-update android:zipalign android:devices
-		# nexus
-		nexus:staging-list nexus:staging-close nexus:staging-drop nexus:staging-release nexus:staging-build-promotion nexus:staging-profiles-list nexus:settings-download
-		# repository
-		repository:bundle-create repository:bundle-pack repository:help
+    # war
+    war:war war:exploded war:inplace war:manifest
+    # ear
+    ear:ear ear:generate-application-xml
+    # ejb
+    ejb:ejb
+    # android
+    android:apk android:apklib android:deploy android:deploy-dependencies android:dex android:emulator-start android:emulator-stop android:emulator-stop-all android:generate-sources android:help android:instrument android:manifest-update android:pull android:push android:redeploy android:run android:undeploy android:unpack android:version-update android:zipalign android:devices
+    # nexus
+    nexus:staging-list nexus:staging-close nexus:staging-drop nexus:staging-release nexus:staging-build-promotion nexus:staging-profiles-list nexus:settings-download
+    # repository
+    repository:bundle-create repository:bundle-pack repository:help
 
-		# sonar
-		sonar:sonar
-		# license
-		license:format license:check
-		# hibernate3
-		hibernate3:hbm2ddl hibernate3:help
-		# liquibase
-		liquibase:changelogSync liquibase:changelogSyncSQL liquibase:clearCheckSums liquibase:dbDoc liquibase:diff liquibase:dropAll liquibase:help liquibase:migrate liquibase:listLocks liquibase:migrateSQL liquibase:releaseLocks liquibase:rollback liquibase:rollbackSQL liquibase:status liquibase:tag liquibase:update liquibase:updateSQL liquibase:updateTestingRollback
-		# flyway
-		flyway:clean flyway:history flyway:init flyway:migrate flyway:status flyway:validate
-		# gwt
-		gwt:browser gwt:clean gwt:compile gwt:compile-report gwt:css gwt:debug gwt:eclipse gwt:eclipseTest gwt:generateAsync gwt:help gwt:i18n gwt:mergewebxml gwt:resources gwt:run gwt:sdkInstall gwt:source-jar gwt:soyc gwt:test
-		# asciidoctor
-		asciidoctor:process-asciidoc asciidoctor:auto-refresh asciidoctor:http asciidoctor:zip
-		# compiler
-		compiler:compile compiler:testCompile
-		# resources
-		resources:resources resources:testResources resources:copy-resources
-		# verifier
-		verifier:verify
-		# jar
-		jar:jar jar:test-jar
-		# rar
-		rar:rar
-		# acr
-		acr:acr
-		# shade
-		shade:shade
-		# changelog
-		changelog:changelog changelog:dev-activity changelog:file-activity
-		# changes
-		changes:announcement-mail changes:announcement-generate changes:changes-check changes:changes-validate changes:changes-report changes:jira-report changes:trac-report changes:github-report
-		# doap
-		doap:generate
-		# docck
-		docck:check
-		# jdeps
-		jdeps:jdkinternals jdeps:test-jdkinternals
-		# linkcheck
-		linkcheck:linkcheck
-		# project-info-reports
-		project-info-reports:cim project-info-reports:dependencies project-info-reports:dependency-convergence project-info-reports:dependency-info project-info-reports:dependency-management project-info-reports:distribution-management project-info-reports:help project-info-reports:index project-info-reports:issue-tracking project-info-reports:license project-info-reports:mailing-list project-info-reports:modules project-info-reports:plugin-management project-info-reports:plugins project-info-reports:project-team project-info-reports:scm project-info-reports:summary
-		# surefire-report
-		surefire-report:failsafe-report-only surefire-report:report surefire-report:report-only
-		# invoker
-		invoker:install invoker:integration-test invoker:verify invoker:run
-		# jarsigner
-		jarsigner:sign jarsigner:verify
-		# patch
-		patch:apply
-		# pdf
-		pdf:pdf
-		# plugin
-		plugin:descriptor plugin:report plugin:updateRegistry plugin:addPluginArtifactMetadata plugin:helpmojo
-		# remote-resources
-		remote-resources:bundle remote-resources:process
-		# scm-publish
-		scm-publish:help scm-publish:publish-scm scm-publish:scmpublish
-		# stage
-		stage:copy
-		# toolchain
-		toolchain:toolchain
-		#liberty
-		liberty:clean-server liberty:compile-jsp liberty:configure-arquillian liberty:create-server liberty:debug liberty:debug-server liberty:deploy liberty:dev liberty:display-url liberty:dump-server liberty:install-apps liberty:install-feature liberty:install-server liberty:java-dump-server liberty:package-server liberty:run liberty:run-server liberty:server-status liberty:start liberty:start-server liberty:status liberty:stop liberty:stop-server liberty:test-start-server liberty:test-stop-server liberty:undeploy liberty:uninstall-feature
+    # sonar
+    sonar:sonar
+    # license
+    license:format license:check
+    # hibernate3
+    hibernate3:hbm2ddl hibernate3:help
+    # liquibase
+    liquibase:changelogSync liquibase:changelogSyncSQL liquibase:clearCheckSums liquibase:dbDoc liquibase:diff liquibase:dropAll liquibase:help liquibase:migrate liquibase:listLocks liquibase:migrateSQL liquibase:releaseLocks liquibase:rollback liquibase:rollbackSQL liquibase:status liquibase:tag liquibase:update liquibase:updateSQL liquibase:updateTestingRollback
+    # flyway
+    flyway:clean flyway:history flyway:init flyway:migrate flyway:status flyway:validate
+    # gwt
+    gwt:browser gwt:clean gwt:compile gwt:compile-report gwt:css gwt:debug gwt:eclipse gwt:eclipseTest gwt:generateAsync gwt:help gwt:i18n gwt:mergewebxml gwt:resources gwt:run gwt:sdkInstall gwt:source-jar gwt:soyc gwt:test
+    # asciidoctor
+    asciidoctor:process-asciidoc asciidoctor:auto-refresh asciidoctor:http asciidoctor:zip
+    # compiler
+    compiler:compile compiler:testCompile
+    # resources
+    resources:resources resources:testResources resources:copy-resources
+    # verifier
+    verifier:verify
+    # jar
+    jar:jar jar:test-jar
+    # rar
+    rar:rar
+    # acr
+    acr:acr
+    # shade
+    shade:shade
+    # changelog
+    changelog:changelog changelog:dev-activity changelog:file-activity
+    # changes
+    changes:announcement-mail changes:announcement-generate changes:changes-check changes:changes-validate changes:changes-report changes:jira-report changes:trac-report changes:github-report
+    # doap
+    doap:generate
+    # docck
+    docck:check
+    # jdeps
+    jdeps:jdkinternals jdeps:test-jdkinternals
+    # linkcheck
+    linkcheck:linkcheck
+    # project-info-reports
+    project-info-reports:cim project-info-reports:dependencies project-info-reports:dependency-convergence project-info-reports:dependency-info project-info-reports:dependency-management project-info-reports:distribution-management project-info-reports:help project-info-reports:index project-info-reports:issue-tracking project-info-reports:license project-info-reports:mailing-list project-info-reports:modules project-info-reports:plugin-management project-info-reports:plugins project-info-reports:project-team project-info-reports:scm project-info-reports:summary
+    # surefire-report
+    surefire-report:failsafe-report-only surefire-report:report surefire-report:report-only
+    # invoker
+    invoker:install invoker:integration-test invoker:verify invoker:run
+    # jarsigner
+    jarsigner:sign jarsigner:verify
+    # patch
+    patch:apply
+    # pdf
+    pdf:pdf
+    # plugin
+    plugin:descriptor plugin:report plugin:updateRegistry plugin:addPluginArtifactMetadata plugin:helpmojo
+    # remote-resources
+    remote-resources:bundle remote-resources:process
+    # scm-publish
+    scm-publish:help scm-publish:publish-scm scm-publish:scmpublish
+    # stage
+    stage:copy
+    # toolchain
+    toolchain:toolchain
+    #liberty
+    liberty:clean-server liberty:compile-jsp liberty:configure-arquillian liberty:create-server liberty:debug liberty:debug-server liberty:deploy liberty:dev liberty:display-url liberty:dump-server liberty:install-apps liberty:install-feature liberty:install-server liberty:java-dump-server liberty:package-server liberty:run liberty:run-server liberty:server-status liberty:start liberty:start-server liberty:status liberty:stop liberty:stop-server liberty:test-start-server liberty:test-stop-server liberty:undeploy liberty:uninstall-feature
 
-		# options
-		"-Dmaven.test.skip=true" -DskipTests -DskipITs -Dmaven.surefire.debug -DenableCiProfile "-Dpmd.skip=true" "-Dcheckstyle.skip=true" "-Dtycho.mode=maven" "-Dmaven.test.failure.ignore=true" "-DgroupId=" "-DartifactId=" "-Dversion=" "-Dpackaging=jar" "-Dfile="
+    # options
+    "-Dmaven.test.skip=true" -DskipTests -DskipITs -Dmaven.surefire.debug -DenableCiProfile "-Dpmd.skip=true" "-Dcheckstyle.skip=true" "-Dtycho.mode=maven" "-Dmaven.test.failure.ignore=true" "-DgroupId=" "-DartifactId=" "-Dversion=" "-Dpackaging=jar" "-Dfile="
 
-		# arguments
-		-am --also-make
-		-amd --also-make-dependents-am
-		-B --batch-mode
-		-b --builder
-		-C --strict-checksums
-		-c --lax-checksums
-		-cpu --check-plugin-updates
-		-D --define
-		-e --errors
-		-emp --encrypt-master-password
-		-ep --encrypt-password
-		-f --file
-		-fae --fail-at-end
-		-ff --fail-fast
-		-fn --fail-never
-		-gs --global-settings
-		-gt --global-toolchains
-		-h --help
-		-l --log-file
-		-llr --legacy-local-repository
-		-N --non-recursive
-		-npr --no-plugin-registry
-		-npu --no-plugin-updates
-		-nsu --no-snapshot-updates
-		-o --offline
-		-P --activate-profiles
-		-pl --projects
-		-q --quiet
-		-rf --resume-from
-		-s --settings
-		-t --toolchains
-		-T --threads
-		-U --update-snapshots
-		-up --update-plugins
-		-v --version
-		-V --show-version
-		-X --debug
+    # arguments
+    -am --also-make
+    -amd --also-make-dependents-am
+    -B --batch-mode
+    -b --builder
+    -C --strict-checksums
+    -c --lax-checksums
+    -cpu --check-plugin-updates
+    -D --define
+    -e --errors
+    -emp --encrypt-master-password
+    -ep --encrypt-password
+    -f --file
+    -fae --fail-at-end
+    -ff --fail-fast
+    -fn --fail-never
+    -gs --global-settings
+    -gt --global-toolchains
+    -h --help
+    -l --log-file
+    -llr --legacy-local-repository
+    -N --non-recursive
+    -npr --no-plugin-registry
+    -npu --no-plugin-updates
+    -nsu --no-snapshot-updates
+    -o --offline
+    -P --activate-profiles
+    -pl --projects
+    -q --quiet
+    -rf --resume-from
+    -s --settings
+    -t --toolchains
+    -T --threads
+    -U --update-snapshots
+    -up --update-plugins
+    -v --version
+    -V --show-version
+    -X --debug
 
-		cli:execute cli:execute-phase
-		archetype:generate generate-sources
-		cobertura:cobertura
-		-Dtest=$(if [ -d ./src/test/java ] ; then find ./src/test/java -type f -name '*.java' | grep -v svn | sed 's?.*/\([^/]*\)\..*?-Dtest=\1?' ; fi)
-		-Dit.test=$(if [ -d ./src/test/java ] ; then find ./src/test/java -type f -name '*.java' | grep -v svn | sed 's?.*/\([^/]*\)\..*?-Dit.test=\1?' ; fi)
+    cli:execute cli:execute-phase
+    archetype:generate generate-sources
+    cobertura:cobertura
+    -Dtest=$(if [ -d ./src/test/java ] ; then find ./src/test/java -type f -name '*.java' | grep -v svn | sed 's?.*/\([^/]*\)\..*?-Dtest=\1?' ; fi)
+    -Dit.test=$(if [ -d ./src/test/java ] ; then find ./src/test/java -type f -name '*.java' | grep -v svn | sed 's?.*/\([^/]*\)\..*?-Dit.test=\1?' ; fi)
 
-		$profiles
-		$modules
-	)
+    $profiles
+    $modules
+  )
 }
 
 compctl -K listMavenCompletions mvn mvnw

From a0ac789f2abf475346505cd372a3843b3b93d91e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Mon, 11 Oct 2021 12:15:47 +0200
Subject: [PATCH 512/869] feat(ssh-agent): allow lazy-loading SSH identities
 (#6309)

Fixes #7477
---
 plugins/ssh-agent/README.md            | 18 +++++++++++++++++-
 plugins/ssh-agent/ssh-agent.plugin.zsh |  5 ++++-
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/plugins/ssh-agent/README.md b/plugins/ssh-agent/README.md
index d1a504b1e..1d6914ec6 100644
--- a/plugins/ssh-agent/README.md
+++ b/plugins/ssh-agent/README.md
@@ -21,7 +21,23 @@ zstyle :omz:plugins:ssh-agent agent-forwarding on
 
 ----
 
-To **load multiple identities** use the `identities` style, For example:
+To **NOT load any identities on start** use the `lazy` setting. This is particularly
+useful when combined with the `AddKeysToAgent` setting (available since OpenSSH 7.2),
+since it allows to enter the password only on first use. _NOTE: you can know your
+OpenSSH version with `ssh -V`._
+
+```zsh
+zstyle :omz:plugins:ssh-agent lazy yes
+```
+
+You can enable `AddKeysToAgent` by passing `-o AddKeysToAgent=yes` to the `ssh` command,
+or by adding `AddKeysToAgent yes` to your `~/.ssh/config` file [1].
+See the [OpenSSH 7.2 Release Notes](http://www.openssh.com/txt/release-7.2).
+
+----
+
+To **load multiple identities** use the `identities` style (**this has no effect
+if the `lazy` setting is enabled**). For example:
 
 ```zsh
 zstyle :omz:plugins:ssh-agent identities id_rsa id_rsa2 id_github
diff --git a/plugins/ssh-agent/ssh-agent.plugin.zsh b/plugins/ssh-agent/ssh-agent.plugin.zsh
index 2d7d8a2a0..4bd2dedcc 100644
--- a/plugins/ssh-agent/ssh-agent.plugin.zsh
+++ b/plugins/ssh-agent/ssh-agent.plugin.zsh
@@ -96,7 +96,10 @@ else
   _start_agent
 fi
 
-_add_identities
+# Don't add identities if lazy-loading is enabled
+if ! zstyle -b :omz:plugins:ssh-agent lazy; then
+  _add_identities
+fi
 
 unset agent_forwarding ssh_env_cache
 unfunction _start_agent _add_identities

From beeda72826f7288d3edf6cec4114bbda9bbae347 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Mon, 11 Oct 2021 15:21:42 +0200
Subject: [PATCH 513/869] fix(ssh-agent): fix for bad `zstyle` command argument

Fixes #10282
---
 plugins/ssh-agent/ssh-agent.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/ssh-agent/ssh-agent.plugin.zsh b/plugins/ssh-agent/ssh-agent.plugin.zsh
index 4bd2dedcc..c006f1413 100644
--- a/plugins/ssh-agent/ssh-agent.plugin.zsh
+++ b/plugins/ssh-agent/ssh-agent.plugin.zsh
@@ -97,7 +97,7 @@ else
 fi
 
 # Don't add identities if lazy-loading is enabled
-if ! zstyle -b :omz:plugins:ssh-agent lazy; then
+if ! zstyle -t :omz:plugins:ssh-agent lazy; then
   _add_identities
 fi
 

From dbf555438e48fe447736200bd6f6d969a51a8086 Mon Sep 17 00:00:00 2001
From: Igor Gavelyuk <gavelyukworking@gmail.com>
Date: Wed, 13 Oct 2021 11:00:46 +0300
Subject: [PATCH 514/869] feat(obraun): display time with leading zeros
 (#10289)

---
 themes/obraun.zsh-theme | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/themes/obraun.zsh-theme b/themes/obraun.zsh-theme
index cc2769e4b..c64362b04 100644
--- a/themes/obraun.zsh-theme
+++ b/themes/obraun.zsh-theme
@@ -2,10 +2,9 @@ if [ "$USERNAME" = "root" ]; then CARETCOLOR="red"; else CARETCOLOR="blue"; fi
 
 local return_code="%(?..%{$fg[red]%}%? ↵%{$reset_color%})"
 
-PROMPT='%{$fg[green]%}[%*]%{$reset_color%} %{$fg_no_bold[cyan]%}%n %{${fg_bold[blue]}%}::%{$reset_color%} %{$fg[yellow]%}%m%{$reset_color%} %{$fg_no_bold[magenta]%} ➜ %{$reset_color%} %{${fg[green]}%}%3~ $(git_prompt_info)%{${fg_bold[$CARETCOLOR]}%}»%{${reset_color}%} '
+PROMPT='%{$fg[green]%}[%D{%H:%M:%S}]%{$reset_color%} %{$fg_no_bold[cyan]%}%n %{${fg_bold[blue]}%}::%{$reset_color%} %{$fg[yellow]%}%m%{$reset_color%} %{$fg_no_bold[magenta]%} ➜ %{$reset_color%} %{${fg[green]}%}%3~ $(git_prompt_info)%{${fg_bold[$CARETCOLOR]}%}»%{${reset_color}%} '
 
 RPS1="${return_code}"
 
 ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[red]%}‹"
 ZSH_THEME_GIT_PROMPT_SUFFIX="› %{$reset_color%}"
-

From 19f9b6f1ade7788b07480be685cf3fcb117cad84 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Wed, 13 Oct 2021 11:58:56 +0200
Subject: [PATCH 515/869] feat(updater): add support for terminal hyperlinks

---
 tools/upgrade.sh | 101 +++++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 93 insertions(+), 8 deletions(-)

diff --git a/tools/upgrade.sh b/tools/upgrade.sh
index 1424d1433..7642858fe 100755
--- a/tools/upgrade.sh
+++ b/tools/upgrade.sh
@@ -15,11 +15,98 @@ cd "$ZSH"
 # Use colors, but only if connected to a terminal
 # and that terminal supports them.
 
+# The [ -t 1 ] check only works when the function is not called from
+# a subshell (like in `$(...)` or `(...)`, so this hack redefines the
+# function at the top level to always return false when stdout is not
+# a tty.
+if [ -t 1 ]; then
+  is_tty() {
+    true
+  }
+else
+  is_tty() {
+    false
+  }
+fi
+
+# This function uses the logic from supports-hyperlinks[1][2], which is
+# made by Kat Marchán (@zkat) and licensed under the Apache License 2.0.
+# [1] https://github.com/zkat/supports-hyperlinks
+# [2] https://crates.io/crates/supports-hyperlinks
+#
+# Copyright (c) 2021 Kat Marchán
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+supports_hyperlinks() {
+  # $FORCE_HYPERLINK must be set and be non-zero (this acts as a logic bypass)
+  if [ -n "$FORCE_HYPERLINK" ]; then
+    [ "$FORCE_HYPERLINK" != 0 ]
+    return $?
+  fi
+
+  # If stdout is not a tty, it doesn't support hyperlinks
+  is_tty || return 1
+
+  # DomTerm terminal emulator (domterm.org)
+  if [ -n "$DOMTERM" ]; then
+    return 0
+  fi
+
+  # VTE-based terminals above v0.50 (Gnome Terminal, Guake, ROXTerm, etc)
+  if [ -n "$VTE_VERSION" ]; then
+    [ $VTE_VERSION -ge 5000 ]
+    return $?
+  fi
+
+  # If $TERM_PROGRAM is set, these terminals support hyperlinks
+  case "$TERM_PROGRAM" in
+  Hyper|iTerm.app|terminology|WezTerm) return 0 ;;
+  esac
+
+  # kitty supports hyperlinks
+  if [ "$TERM" = xterm-kitty ]; then
+    return 0
+  fi
+
+  # Windows Terminal or Konsole also support hyperlinks
+  if [ -n "$WT_SESSION" ] || [ -n "$KONSOLE_VERSION" ]; then
+    return 0
+  fi
+
+  return 1
+}
+
+fmt_link() {
+  # $1: text, $2: url, $3: fallback mode
+  if supports_hyperlinks; then
+    printf '\033]8;;%s\a%s\033]8;;\a\n' "$2" "$1"
+    return
+  fi
+
+  case "$3" in
+  --text) printf '%s\n' "$1" ;;
+  --url|*) fmt_underline "$2" ;;
+  esac
+}
+
+fmt_underline() {
+  is_tty && printf '\033[4m%s\033[24m\n' "$*" || printf '%s\n' "$*"
+}
+
 setopt typeset_silent
 typeset -a RAINBOW
-typeset RED GREEN YELLOW BLUE BOLD DIM UNDER RESET
 
-if [ -t 1 ]; then
+if is_tty; then
   RAINBOW=(
     "$(printf '\033[38;5;196m')"
     "$(printf '\033[38;5;202m')"
@@ -35,8 +122,6 @@ if [ -t 1 ]; then
   YELLOW=$(printf '\033[33m')
   BLUE=$(printf '\033[34m')
   BOLD=$(printf '\033[1m')
-  DIM=$(printf '\033[2m')
-  UNDER=$(printf '\033[4m')
   RESET=$(printf '\033[0m')
 fi
 
@@ -104,10 +189,10 @@ if git pull --rebase --stat $remote $branch; then
   printf '%s\____/%s_/ /_/ %s /_/ /_/ /_/%s\__, / %s   /___/%s____/%s_/ /_/  %s\n' $RAINBOW $RESET
   printf '%s    %s        %s           %s /____/ %s       %s     %s          %s\n' $RAINBOW $RESET
   printf '\n'
-  printf "${BLUE}%s${RESET}\n" "$message"
-  printf "${BLUE}${BOLD}%s ${UNDER}%s${RESET}\n" "To keep up with the latest news and updates, follow us on Twitter:" "https://twitter.com/ohmyzsh"
-  printf "${BLUE}${BOLD}%s ${UNDER}%s${RESET}\n" "Want to get involved in the community? Join our Discord:" "https://discord.gg/ohmyzsh"
-  printf "${BLUE}${BOLD}%s ${UNDER}%s${RESET}\n" "Get your Oh My Zsh swag at:" "https://shop.planetargon.com/collections/oh-my-zsh"
+  printf "${BLUE}%s${RESET}\n\n" "$message"
+  printf "${BLUE}${BOLD}%s %s${RESET}\n" "To keep up with the latest news and updates, follow us on Twitter:" "$(fmt_link @ohmyzsh https://twitter.com/ohmyzsh)"
+  printf "${BLUE}${BOLD}%s %s${RESET}\n" "Want to get involved in the community? Join our Discord:" "$(fmt_link "Discord server" https://discord.gg/ohmyzsh)"
+  printf "${BLUE}${BOLD}%s %s${RESET}\n" "Get your Oh My Zsh swag at:" "$(fmt_link "Planet Argon Shop" https://shop.planetargon.com/collections/oh-my-zsh)"
 else
   ret=$?
   printf "${RED}%s${RESET}\n" 'There was an error updating. Try again later?'

From 75fe22b40552305ef7636b7604ba99534d4f7808 Mon Sep 17 00:00:00 2001
From: Eric <192110+scribe@users.noreply.github.com>
Date: Mon, 18 Oct 2021 11:58:25 -0600
Subject: [PATCH 516/869] docs(README): document new `zstyle` update settings
 (#10304)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Marc Cornellà <hello@mcornella.com>
---
 README.md | 65 +++++++++++++++++++++++++++++++++++--------------------
 1 file changed, 41 insertions(+), 24 deletions(-)

diff --git a/README.md b/README.md
index 3ebea91e0..907248beb 100644
--- a/README.md
+++ b/README.md
@@ -42,7 +42,7 @@ It's a good idea to inspect the install script from projects you don't yet know.
 that by downloading the install script first, looking through it so everything looks normal,
 then running it:
 
-```shell
+```sh
 wget https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh
 sh install.sh
 ```
@@ -57,13 +57,13 @@ Oh My Zsh comes with a shitload of plugins for you to take advantage of. You can
 
 Once you spot a plugin (or several) that you'd like to use with Oh My Zsh, you'll need to enable them in the `.zshrc` file. You'll find the zshrc file in your `$HOME` directory. Open it with your favorite text editor and you'll see a spot to list all the plugins you want to load.
 
-```shell
+```sh
 vi ~/.zshrc
 ```
 
 For example, this might begin to look like this:
 
-```shell
+```sh
 plugins=(
   git
   bundler
@@ -91,13 +91,13 @@ _Robby's theme is the default one. It's not the fanciest one. It's not the simpl
 
 Once you find a theme that you'd like to use, you will need to edit the `~/.zshrc` file. You'll see an environment variable (all caps) in there that looks like:
 
-```shell
+```sh
 ZSH_THEME="robbyrussell"
 ```
 
 To use a different theme, simply change the value to match the name of your desired theme. For example:
 
-```shell
+```sh
 ZSH_THEME="agnoster" # (this is one of the fancy ones)
 # see https://github.com/ohmyzsh/ohmyzsh/wiki/Themes#agnoster
 ```
@@ -112,13 +112,13 @@ In case you did not find a suitable theme for your needs, please have a look at
 
 If you're feeling feisty, you can let the computer select one randomly for you each time you open a new terminal window.
 
-```shell
+```sh
 ZSH_THEME="random" # (...please let it be pie... please be some pie..)
 ```
 
 And if you want to pick random theme from a list of your favorite themes:
 
-```shell
+```sh
 ZSH_THEME_RANDOM_CANDIDATES=(
   "robbyrussell"
   "agnoster"
@@ -127,7 +127,7 @@ ZSH_THEME_RANDOM_CANDIDATES=(
 
 If you only know which themes you don't like, you can add them similarly to an ignored list:
 
-```shell
+```sh
 ZSH_THEME_RANDOM_IGNORED=(pygmalion tjkirch_mod)
 ```
 
@@ -152,7 +152,7 @@ If you'd like to change the install directory with the `ZSH` environment variabl
 `export ZSH=/your/path` before installing, or by setting it before the end of the install pipeline
 like this:
 
-```shell
+```sh
 ZSH="$HOME/.dotfiles/oh-my-zsh" sh install.sh
 ```
 
@@ -162,7 +162,7 @@ If you're running the Oh My Zsh install script as part of an automated install,
 flag `--unattended` to the `install.sh` script. This will have the effect of not trying to change
 the default shell, and also won't run `zsh` when the installation has finished.
 
-```shell
+```sh
 sh -c "$(curl -fsSL https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)" "" --unattended
 ```
 
@@ -185,7 +185,7 @@ The install script also accepts these variables to allow installation of a diffe
 
 For example:
 
-```shell
+```sh
 REPO=apjanke/oh-my-zsh BRANCH=edge sh install.sh
 ```
 
@@ -193,13 +193,13 @@ REPO=apjanke/oh-my-zsh BRANCH=edge sh install.sh
 
 ##### 1. Clone the repository
 
-```shell
+```sh
 git clone https://github.com/ohmyzsh/ohmyzsh.git ~/.oh-my-zsh
 ```
 
 ##### 2. *Optionally*, backup your existing `~/.zshrc` file
 
-```shell
+```sh
 cp ~/.zshrc ~/.zshrc.orig
 ```
 
@@ -207,13 +207,13 @@ cp ~/.zshrc ~/.zshrc.orig
 
 You can create a new zsh config file by copying the template that we have included for you.
 
-```shell
+```sh
 cp ~/.oh-my-zsh/templates/zshrc.zsh-template ~/.zshrc
 ```
 
 ##### 4. Change your default shell
 
-```shell
+```sh
 chsh -s $(which zsh)
 ```
 
@@ -242,23 +242,40 @@ If you would like to override the functionality of a plugin distributed with Oh
 
 ## Getting Updates
 
-By default, you will be prompted to check for upgrades every few weeks. If you would like `oh-my-zsh` to automatically upgrade itself without prompting you, set the following in your `~/.zshrc`:
+By default, you will be prompted to check for updates every 2 weeks. You can choose other update modes by adding a line to your `~/.zshrc` file, **before Oh My Zsh is loaded**:
 
-```shell
-DISABLE_UPDATE_PROMPT=true
-```
+1. Automatic update without confirmation prompt:
 
-To disable automatic upgrades, set the following in your `~/.zshrc`:
+   ```sh
+   zstyle ':omz:update' mode auto
+   ```
 
-```shell
-DISABLE_AUTO_UPDATE=true
+2. Just offer a reminder every few days, if there are updates available:
+
+   ```sh
+   zstyle ':omz:update' mode reminder
+   ```
+
+3. To disable automatic updates entirely:
+
+   ```sh
+   zstyle ':omz:update' mode disabled
+   ```
+
+NOTE: you can control how often Oh My Zsh checks for updates with the following setting:
+
+```sh
+# This will check for updates every 7 days
+zstyle ':omz:update' frequency 7
+# This will check for updates every time you open the terminal (not recommended)
+zstyle ':omz:update' frequency 0
 ```
 
 ### Manual Updates
 
-If you'd like to upgrade at any point in time (maybe someone just released a new plugin and you don't want to wait a week?) you just need to run:
+If you'd like to update at any point in time (maybe someone just released a new plugin and you don't want to wait a week?) you just need to run:
 
-```shell
+```sh
 omz update
 ```
 

From f83bb65d47e5c0a238f4950294eeaeaa12738ce4 Mon Sep 17 00:00:00 2001
From: Robby Russell <robby@planetargon.com>
Date: Tue, 19 Oct 2021 10:50:41 -0700
Subject: [PATCH 517/869] Swapping gh with ghlp as 'gh' is reserved for the
 Github CLI. #9005

---
 plugins/ruby/README.md       | 3 ++-
 plugins/ruby/ruby.plugin.zsh | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/plugins/ruby/README.md b/plugins/ruby/README.md
index a2de11991..d2beeb4b3 100644
--- a/plugins/ruby/README.md
+++ b/plugins/ruby/README.md
@@ -25,7 +25,8 @@ plugins=(... ruby)
 | gcb   | `gem cert --build`                     | Build private key and self-signed certificate        |
 | gclup | `gem cleanup -n`                       | Do not uninstall gem                                 |
 | ggi   | `gem generate_index`                   | Generate index file for gem server                   |
-| gh    | `gem help`                             | Provide additional help                              |
+| ghlp  | `gem help`                             | Provide additional help                              |
 | gl    | `gem lock`                             | Generate a lockdown list of gems                     |
 | go    | `gem open`                             | Open gem source in default editor                    |
 | goe   | `gem open -e`                          | Open gem sources in preferred editor                 |
+
diff --git a/plugins/ruby/ruby.plugin.zsh b/plugins/ruby/ruby.plugin.zsh
index 88e769d39..a7583497c 100644
--- a/plugins/ruby/ruby.plugin.zsh
+++ b/plugins/ruby/ruby.plugin.zsh
@@ -19,7 +19,7 @@ alias gcr="gem cert --remove"
 alias gcb="gem cert --build"
 alias gclup="gem cleanup -n"
 alias ggi="gem generate_index"
-alias gh="gem help"
+alias ghlp="gem help"
 alias gl="gem lock"
 alias go="gem open"
 alias goe="gem open -e"

From 4b1f6d638f0783e05a9d2601ee0e1fd902416491 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Tue, 19 Oct 2021 20:07:40 +0200
Subject: [PATCH 518/869] feat(ruby): add multiple `gem` aliases (#9005)

Mostly empty commit to fix the changelog for merge at 6f4c7f64
---
 plugins/ruby/README.md       | 1 -
 plugins/ruby/ruby.plugin.zsh | 3 +--
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/plugins/ruby/README.md b/plugins/ruby/README.md
index d2beeb4b3..76afc79f6 100644
--- a/plugins/ruby/README.md
+++ b/plugins/ruby/README.md
@@ -29,4 +29,3 @@ plugins=(... ruby)
 | gl    | `gem lock`                             | Generate a lockdown list of gems                     |
 | go    | `gem open`                             | Open gem source in default editor                    |
 | goe   | `gem open -e`                          | Open gem sources in preferred editor                 |
-
diff --git a/plugins/ruby/ruby.plugin.zsh b/plugins/ruby/ruby.plugin.zsh
index a7583497c..c235b6b69 100644
--- a/plugins/ruby/ruby.plugin.zsh
+++ b/plugins/ruby/ruby.plugin.zsh
@@ -1,5 +1,4 @@
-# TODO: Make this compatible with rvm.
-#       Run sudo gem on the system ruby, not the active ruby.
+# Run sudo gem on the system ruby, not the active ruby
 alias sgem='sudo gem'
 
 # Find ruby file

From 8c1495a18e5ba496837bf3978300519edadffaff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Wed, 20 Oct 2021 17:09:38 +0200
Subject: [PATCH 519/869] fix(ruby)!: rename aliases that start with `g` to
 `ge`

BREAKING CHANGE: all `gem` aliases that started with `g` now start
with `ge` to fix conflicting names with the `git` plugin. Also, the
`ghlp` alias is now renamed `geh`. Have a look at the plugin README
for more information.

Fixes #10320
---
 plugins/ruby/README.md       | 38 ++++++++++++++++++------------------
 plugins/ruby/ruby.plugin.zsh | 28 +++++++++++++-------------
 2 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/plugins/ruby/README.md b/plugins/ruby/README.md
index 76afc79f6..59594ade7 100644
--- a/plugins/ruby/README.md
+++ b/plugins/ruby/README.md
@@ -10,22 +10,22 @@ plugins=(... ruby)
 
 ## Aliases
 
-| Alias | Command                                | Description                                          |
-|-------|----------------------------------------|------------------------------------------------------|
-| rb    | `ruby`                                 | The Ruby command                                     |
-| sgem  | `sudo gem`                             | Run sudo gem on the system ruby, not the active ruby |
-| rfind | `find . -name "*.rb" \| xargs grep -n` | Find ruby file                                       |
-| gin   | `gem install`                          | Install a gem into the local repository              |
-| gun   | `gem uninstall`                        | Uninstall gems from the local repository             |
-| gli   | `gem list`                             | Display gems installed locally                       |
-| gi    | `gem info`                             | Show information for the given gem                   |
-| giall | `gem info --all`                       | Display all gem versions                             |
-| gca   | `gem cert --add`                       | Add a trusted certificate                            |
-| gcr   | `gem cert --remove`                    | Remove a trusted certificate                         |
-| gcb   | `gem cert --build`                     | Build private key and self-signed certificate        |
-| gclup | `gem cleanup -n`                       | Do not uninstall gem                                 |
-| ggi   | `gem generate_index`                   | Generate index file for gem server                   |
-| ghlp  | `gem help`                             | Provide additional help                              |
-| gl    | `gem lock`                             | Generate a lockdown list of gems                     |
-| go    | `gem open`                             | Open gem source in default editor                    |
-| goe   | `gem open -e`                          | Open gem sources in preferred editor                 |
+| Alias  | Command                                | Description                                          |
+|--------|----------------------------------------|------------------------------------------------------|
+| rb     | `ruby`                                 | The Ruby command                                     |
+| sgem   | `sudo gem`                             | Run sudo gem on the system ruby, not the active ruby |
+| rfind  | `find . -name "*.rb" \| xargs grep -n` | Find ruby file                                       |
+| gein   | `gem install`                          | Install a gem into the local repository              |
+| geun   | `gem uninstall`                        | Uninstall gems from the local repository             |
+| geli   | `gem list`                             | Display gems installed locally                       |
+| gei    | `gem info`                             | Show information for the given gem                   |
+| geiall | `gem info --all`                       | Display all gem versions                             |
+| geca   | `gem cert --add`                       | Add a trusted certificate                            |
+| gecr   | `gem cert --remove`                    | Remove a trusted certificate                         |
+| gecb   | `gem cert --build`                     | Build private key and self-signed certificate        |
+| geclup | `gem cleanup -n`                       | Do not uninstall gem                                 |
+| gegi   | `gem generate_index`                   | Generate index file for gem server                   |
+| geh    | `gem help`                             | Provide additional help                              |
+| gel    | `gem lock`                             | Generate a lockdown list of gems                     |
+| geo    | `gem open`                             | Open gem source in default editor                    |
+| geoe   | `gem open -e`                          | Open gem sources in preferred editor                 |
diff --git a/plugins/ruby/ruby.plugin.zsh b/plugins/ruby/ruby.plugin.zsh
index c235b6b69..890fcb179 100644
--- a/plugins/ruby/ruby.plugin.zsh
+++ b/plugins/ruby/ruby.plugin.zsh
@@ -8,17 +8,17 @@ alias rfind='find . -name "*.rb" | xargs grep -n'
 alias rb="ruby"
 
 # Gem Command Shorthands
-alias gin="gem install"
-alias gun="gem uninstall"
-alias gli="gem list"
-alias gi="gem info"
-alias giall="gem info --all"
-alias gca="gem cert --add"
-alias gcr="gem cert --remove"
-alias gcb="gem cert --build"
-alias gclup="gem cleanup -n"
-alias ggi="gem generate_index"
-alias ghlp="gem help"
-alias gl="gem lock"
-alias go="gem open"
-alias goe="gem open -e"
+alias gein="gem install"
+alias geun="gem uninstall"
+alias geli="gem list"
+alias gei="gem info"
+alias geiall="gem info --all"
+alias geca="gem cert --add"
+alias gecr="gem cert --remove"
+alias gecb="gem cert --build"
+alias geclup="gem cleanup -n"
+alias gegi="gem generate_index"
+alias geh="gem help"
+alias gel="gem lock"
+alias geo="gem open"
+alias geoe="gem open -e"

From 46f8765f4c871ef9b4e7f8bc448e45f4be15ff58 Mon Sep 17 00:00:00 2001
From: Rob Vadai <rvadai@segence.com>
Date: Wed, 20 Oct 2021 21:58:28 +0100
Subject: [PATCH 520/869] feat(osx): add `freespace` command to clean purgeable
 disk space (#8762)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Marc Cornellà <hello@mcornella.com>
---
 plugins/osx/README.md      | 43 +++++++++++++++++++-------------------
 plugins/osx/osx.plugin.zsh | 23 ++++++++++++++++++++
 2 files changed, 45 insertions(+), 21 deletions(-)

diff --git a/plugins/osx/README.md b/plugins/osx/README.md
index ecc9327d0..50458f60e 100644
--- a/plugins/osx/README.md
+++ b/plugins/osx/README.md
@@ -12,27 +12,28 @@ Original author: [Sorin Ionescu](https://github.com/sorin-ionescu)
 
 ## Commands
 
-| Command         | Description                                           |
-| :-------------- | :---------------------------------------------------- |
-| `tab`           | Open the current directory in a new tab               |
-| `split_tab`     | Split the current terminal tab horizontally           |
-| `vsplit_tab`    | Split the current terminal tab vertically             |
-| `ofd`           | Open the current directory in a Finder window         |
-| `pfd`           | Return the path of the frontmost Finder window        |
-| `pfs`           | Return the current Finder selection                   |
-| `cdf`           | `cd` to the current Finder directory                  |
-| `pushdf`        | `pushd` to the current Finder directory               |
-| `pxd`           | Return the current Xcode project directory            |
-| `cdx`           | `cd` to the current Xcode project directory           |
-| `quick-look`    | Quick-Look a specified file                           |
-| `man-preview`   | Open a specified man page in Preview app              |
-| `showfiles`     | Show hidden files in Finder                           |
-| `hidefiles`     | Hide the hidden files in Finder                       |
-| `itunes`        | _DEPRECATED_. Use `music` from macOS Catalina on      |
-| `music`         | Control Apple Music. Use `music -h` for usage details |
-| `spotify`       | Control Spotify and search by artist, album, track…   |
-| `rmdsstore`     | Remove .DS\_Store files recursively in a directory    |
-| `btrestart`     | Restart the Bluetooth daemon                          |
+| Command       | Description                                              |
+| :------------ | :------------------------------------------------------- |
+| `tab`         | Open the current directory in a new tab                  |
+| `split_tab`   | Split the current terminal tab horizontally              |
+| `vsplit_tab`  | Split the current terminal tab vertically                |
+| `ofd`         | Open the current directory in a Finder window            |
+| `pfd`         | Return the path of the frontmost Finder window           |
+| `pfs`         | Return the current Finder selection                      |
+| `cdf`         | `cd` to the current Finder directory                     |
+| `pushdf`      | `pushd` to the current Finder directory                  |
+| `pxd`         | Return the current Xcode project directory               |
+| `cdx`         | `cd` to the current Xcode project directory              |
+| `quick-look`  | Quick-Look a specified file                              |
+| `man-preview` | Open a specified man page in Preview app                 |
+| `showfiles`   | Show hidden files in Finder                              |
+| `hidefiles`   | Hide the hidden files in Finder                          |
+| `itunes`      | _DEPRECATED_. Use `music` from macOS Catalina on         |
+| `music`       | Control Apple Music. Use `music -h` for usage details    |
+| `spotify`     | Control Spotify and search by artist, album, track…      |
+| `rmdsstore`   | Remove .DS\_Store files recursively in a directory       |
+| `btrestart`   | Restart the Bluetooth daemon                             |
+| `freespace`   | Erases purgeable disk space with 0s on the selected disk |
 
 ## Acknowledgements
 
diff --git a/plugins/osx/osx.plugin.zsh b/plugins/osx/osx.plugin.zsh
index 5455d7c5f..16f16ddb6 100644
--- a/plugins/osx/osx.plugin.zsh
+++ b/plugins/osx/osx.plugin.zsh
@@ -233,6 +233,29 @@ function rmdsstore() {
   find "${@:-.}" -type f -name .DS_Store -delete
 }
 
+# Erases purgeable disk space with 0s on the selected disk
+function freespace(){
+  if [[ -z "$1" ]]; then
+    echo "Usage: $0 <disk>"
+    echo "Example: $0 /dev/disk1s1"
+    echo
+    echo "Possible disks:"
+    df -h | awk 'NR == 1 || /^\/dev\/disk/'
+    return 1
+  fi
+
+  echo "Cleaning purgeable files from disk: $1 ...."
+  diskutil secureErase freespace 0 $1
+}
+
+_freespace() {
+  local -a disks
+  disks=("${(@f)"$(df | awk '/^\/dev\/disk/{ printf $1 ":"; for (i=9; i<=NF; i++) printf $i FS; print "" }')"}")
+  _describe disks disks
+}
+
+compdef _freespace freespace
+
 # Music / iTunes control function
 source "${0:h:A}/music"
 

From f1dd97bb2a9df55fae9b1ca26c829b9f8b290667 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Sat, 23 Oct 2021 05:16:15 +0200
Subject: [PATCH 521/869] fix(ssh-agent): fix check for running `ssh-agent`
 process with hidepid /proc (#8492)

Fixes #8492
---
 plugins/ssh-agent/ssh-agent.plugin.zsh | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/plugins/ssh-agent/ssh-agent.plugin.zsh b/plugins/ssh-agent/ssh-agent.plugin.zsh
index c006f1413..47dfef5b0 100644
--- a/plugins/ssh-agent/ssh-agent.plugin.zsh
+++ b/plugins/ssh-agent/ssh-agent.plugin.zsh
@@ -6,9 +6,11 @@ function _start_agent() {
   if [[ -f "$ssh_env_cache" ]]; then
     . "$ssh_env_cache" > /dev/null
 
-    {
-      [[ "$USERNAME" = root ]] && command ps ax || command ps x
-    } | command grep ssh-agent | command grep -q $SSH_AGENT_PID && return 0
+    # Test if $SSH_AUTH_SOCK is visible
+    zmodload zsh/net/socket
+    if [[ -S "$SSH_AUTH_SOCK" ]] && zsocket "$SSH_AUTH_SOCK" 2>/dev/null; then
+      return 0
+    fi
   fi
 
   # Set a maximum lifetime for identities added to ssh-agent

From 1e5e834e0f6486a569efd6b12ce4e33624fef0c9 Mon Sep 17 00:00:00 2001
From: Sina Tak Tehrani <ssttehrani@gmail.com>
Date: Mon, 25 Oct 2021 20:28:22 +0200
Subject: [PATCH 522/869] fix(cli): exit `omz update` with correct error code
 (#10342)

---
 lib/cli.zsh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/cli.zsh b/lib/cli.zsh
index 4b14360c1..0b6bbc6cb 100644
--- a/lib/cli.zsh
+++ b/lib/cli.zsh
@@ -755,9 +755,9 @@ function _omz::update {
 
   # Run update script
   if [[ "$1" != --unattended ]]; then
-    ZSH="$ZSH" zsh -f "$ZSH/tools/upgrade.sh" --interactive
+    ZSH="$ZSH" zsh -f "$ZSH/tools/upgrade.sh" --interactive || return $?
   else
-    ZSH="$ZSH" zsh -f "$ZSH/tools/upgrade.sh"
+    ZSH="$ZSH" zsh -f "$ZSH/tools/upgrade.sh" || return $?
   fi
 
   # Update last updated file

From c2b9ae29371f142fe7f2da694f893f1365170bc2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Tue, 26 Oct 2021 13:23:07 +0200
Subject: [PATCH 523/869] fix(changelog): don't show more than 40 commits
 (#10345)

Fixes #10345
---
 tools/changelog.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/changelog.sh b/tools/changelog.sh
index 7329a9526..ebdffba0a 100755
--- a/tools/changelog.sh
+++ b/tools/changelog.sh
@@ -400,7 +400,7 @@ function main {
   # commit if $since is unset, in short hash form.
   command git rev-list --abbrev-commit --abbrev=7 ${since:+$since..}$until | while read hash; do
     # Truncate list on versions with a lot of commits
-    if [[ -z "$since" ]] && (( ++read_commits > 35 )); then
+    if (( ++read_commits > 40 )); then
       truncate=1
       break
     fi

From 4f67b02a9f43b0996ad85ee600b468399e1477e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Camelo=20Freitas?= <josecfreittas@outlook.com>
Date: Tue, 26 Oct 2021 07:07:46 -0700
Subject: [PATCH 524/869] feat(mix): update `mix` commands and descriptions
 (#10273)

---
 plugins/mix/README.md | 16 ++++++++--------
 plugins/mix/_mix      | 43 +++++++++++++++++++++++++++++++++++--------
 2 files changed, 43 insertions(+), 16 deletions(-)

diff --git a/plugins/mix/README.md b/plugins/mix/README.md
index 878f370f2..f0258fe88 100644
--- a/plugins/mix/README.md
+++ b/plugins/mix/README.md
@@ -9,11 +9,11 @@ plugins=(... mix)
 ```
 ## Supported Task Types
 
-| Task Type               | Documentation                                            |
-|-------------------------|----------------------------------------------------------|
-| Elixir                  | [Elixir Lang](https://elixir-lang.org/)                  |
-| Phoenix v1.2.1 and below| [Phoenix](https://hexdocs.pm/phoenix/1.2.1/Phoenix.html) |
-| Phoenix v1.3.0 and above| [Phoenix](https://hexdocs.pm/phoenix/Phoenix.html)       |
-| Ecto                    | [Ecto](https://hexdocs.pm/ecto/Ecto.html)                |
-| Hex                     | [Hex](https://hex.pm/)                                   |
-| Nerves                  | [Nerves](https://nerves-project.org/)                    |
+| Task Type                | Documentation                                            |
+|--------------------------|----------------------------------------------------------|
+| Elixir                   | [Elixir Lang](https://elixir-lang.org/)                  |
+| Phoenix v1.2.1 and below | [Phoenix](https://hexdocs.pm/phoenix/1.2.1/Phoenix.html) |
+| Phoenix v1.3.0 and above | [Phoenix](https://hexdocs.pm/phoenix/Phoenix.html)       |
+| Ecto                     | [Ecto](https://hexdocs.pm/ecto/Ecto.html)                |
+| Hex                      | [Hex](https://hex.pm/)                                   |
+| Nerves                   | [Nerves](https://nerves-project.org/)                    |
diff --git a/plugins/mix/_mix b/plugins/mix/_mix
index c0fe68c91..7940ff1c9 100644
--- a/plugins/mix/_mix
+++ b/plugins/mix/_mix
@@ -5,8 +5,10 @@
 
 local -a _1st_arguments
 _1st_arguments=(
+    'app.config:Configures all registered apps'
     'app.start:Start all registered apps'
-    'archive:List all archives'
+    'app.tree:Prints the application tree'
+    'archive:Lists installed archives'
     'archive.build:Archive this project into a .ez file'
     'archive.install:Install an archive locally'
     'archive.uninstall:Uninstall archives'
@@ -18,6 +20,7 @@ _1st_arguments=(
     "deps.clean:Remove the given dependencies' files"
     'deps.compile:Compile dependencies'
     'deps.get:Get all out of date dependencies'
+    'deps.tree:Prints the dependency tree'
     'deps.unlock:Unlock the given dependencies'
     'deps.update:Update the given dependencies'
     'do:Executes the tasks separated by comma'
@@ -30,27 +33,39 @@ _1st_arguments=(
     'ecto.migrate:Runs Ecto migration'
     'ecto.migrations:Displays the up / down migration status'
     'ecto.rollback:Reverts applied migrations'
+    'escript:Lists installed escripts'
     'escript.build:Builds an escript for the project'
+    'escript.install:Installs an escript locally'
+    'escript.uninstall:Uninstalls escripts'
     'firmware:Nerves - Build a firmware image for the selected target platform'
     'firmware.burn:Nerves - Writes the generated firmware image to an attached SDCard or file'
     'firmware.image:Nerves - Create a firmware image file that can be copied byte-for-byte'
     'format:Formats the given files and patterns'
     'help:Print help information for tasks'
     'hex:Print hex help information'
-    'hex.config:Read or update hex config'
-    'hex.docs:Publish docs for package'
+    'hex.audit:Shows retired Hex deps for the current project'
+    'hex.build:Builds a new package version locally'
+    'hex.config:Reads, updates or deletes local Hex config'
+    'hex.docs:Fetches or opens documentation of a package'
     'hex.info:Print hex information'
+    'hex.organization:Manages Hex.pm organizations'
     'hex.key:Hex API key tasks'
-    'hex.outdated:Shows outdated hex deps for the current project'
-    'hex.owner:Hex package ownership tasks'
+    'hex.outdated:Shows outdated Hex deps for the current project'
+    'hex.owner:Manages Hex package ownership'
+    'hex.package:Fetches or diffs packages'
     'hex.publish:Publish a new package version'
+    'hex.registry:Manages local Hex registries'
+    'hex.repo:Manages Hex repositories'
+    'hex.retire:Retires a package version'
     'hex.search:Search for package names'
-    'hex.user:Hex user tasks'
+    'hex.sponsor:Show Hex packages accepting sponsorships'
+    'hex.user:Manages your Hex user account'
     'loadconfig:Loads and persists the given configuration'
     'local:List local tasks'
     'local.hex:Install hex locally'
     'local.phoenix:Updates Phoenix locally'
     'local.phx:Updates the Phoenix project generator locally'
+    'local.public_keys:Manages public keys'
     'local.rebar:Install rebar locally'
     'nerves.artifact:Create an artifact for a specified Nerves package'
     'nerves.artifact.get:Nerves get artifacts'
@@ -69,21 +84,33 @@ _1st_arguments=(
     'phoenix.server:Starts applications and their servers'
     'phx.digest:Digests and compresses static files'
     'phx.digest.clean:Removes old versions of static assets.'
+    'phx.gen.auth:Generates authentication logic for a resource'
+    'phx.gen.cert:Generates a self-signed certificate for HTTPS testing'
     'phx.gen.channel:Generates a Phoenix channel'
     'phx.gen.context:Generates a context with functions around an Ecto schema'
     'phx.gen.embedded:Generates an embedded Ecto schema file'
     'phx.gen.html:Generates controller, views, and context for an HTML resource'
     'phx.gen.json:Generates controller, views, and context for a JSON resource'
+    'phx.gen.live:Generates LiveView, templates, and context for a resource'
+    'phx.gen.notifier:Generates a notifier that delivers emails by default'
     'phx.gen.presence:Generates a Presence tracker'
     'phx.gen.schema:Generates an Ecto schema and migration file'
     'phx.gen.secret:Generates a secret'
-    'phx.new:Creates a new Phoenix v1.3.0 application'
+    'phx.gen.socket:Generates a Phoenix socket handler'
+    'phx.new:Creates a new Phoenix application'
     'phx.new.ecto:Creates a new Ecto project within an umbrella project'
     'phx.new.web:Creates a new Phoenix web project within an umbrella project'
     'phx.routes:Prints all routes'
     'phx.server:Starts applications and their servers'
+    'profile.cprof:Profiles the given file or expression with cprof'
+    'profile.eprof:Profiles the given file or expression with eprof'
+    'profile.fprof:Profiles the given file or expression with fprof'
+    'release:Assembles a self-contained release'
+    'release.init:Generates sample files for releases'
     'run:Run the given file or expression'
     "test:Run a project's tests"
+    'test.coverage:Build report from exported test coverage'
+    'xref:Prints cross reference information'
     '--help:Describe available tasks'
     '--version:Prints the Elixir version information'
 )
@@ -93,7 +120,7 @@ __task_list ()
     local expl
     declare -a tasks
 
-    tasks=(app.start archive archive.build archive.install archive.uninstall clean cmd compile compile.protocols deps deps.clean deps.compile deps.get deps.unlock deps.update do escript.build format help hex hex.config hex.docs hex.info hex.key hex.outdated hex.owner hex.publish hex.search hex.user loadconfig local local.hex local.rebar new phoenix.digest phoenix.gen.channel phoenix.gen.html phoenix.gen.json phoenix.gen.model phoenix.gen.secret phoenix.new phoenix.routes phoenix.server phx.digest phx.digest.clean phx.gen.channel phx.gen.context phx.gen.embedded phx.gen.html phx.gen.json phx.gen.presence phx.gen.schema phx.gen.secret phx.new phx.new.ecto phx.new.web phx.routes phx.server run test)
+    tasks=(app.config app.start app.tree archive archive.build archive.install archive.uninstall clean cmd compile compile.protocols deps deps.clean deps.compile deps.get deps.tree deps.unlock deps.update do ecto.create ecto.drop ecto.dump ecto.gen.migration ecto.gen.repo ecto.load ecto.migrate ecto.migrations ecto.rollback escript escript.build escript.install escript.uninstall firmware firmware.burn firmware.image format help hex hex.audit hex.build hex.config hex.docs hex.info hex.organization hex.key hex.outdated hex.owner hex.package hex.publish hex.registry hex.repo hex.retire hex.search hex.sponsor hex.user loadconfig local local.hex local.phoenix local.phx local.public_keys local.rebar nerves.artifact nerves.artifact.get nerves.info nerves.new nerves.release.init new phoenix.digest phoenix.gen.channel phoenix.gen.html phoenix.gen.json phoenix.gen.model phoenix.gen.secret phoenix.new phoenix.routes phoenix.server phx.digest phx.digest.clean phx.gen.auth phx.gen.cert phx.gen.channel phx.gen.context phx.gen.embedded phx.gen.html phx.gen.json phx.gen.live phx.gen.notifier phx.gen.presence phx.gen.schema phx.gen.secret phx.gen.socket phx.new phx.new.ecto phx.new.web phx.routes phx.server profile.cprof profile.eprof profile.fprof release release.init run test test.coverage xref)
 
     _wanted tasks expl 'help' compadd $tasks
 }

From 9c8131e417a15fccb15615e3b03ce44a53678fe0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Tue, 26 Oct 2021 18:24:29 +0200
Subject: [PATCH 525/869] perf(changelog): use a single `git log` command to
 get all commit messages

---
 tools/changelog.sh | 50 +++++++++++++++++++++++++++++++---------------
 1 file changed, 34 insertions(+), 16 deletions(-)

diff --git a/tools/changelog.sh b/tools/changelog.sh
index ebdffba0a..13cfb9530 100755
--- a/tools/changelog.sh
+++ b/tools/changelog.sh
@@ -1,5 +1,8 @@
 #!/usr/bin/env zsh
 
+cd "$ZSH"
+setopt extendedglob
+
 ##############################
 # CHANGELOG SCRIPT CONSTANTS #
 ##############################
@@ -114,15 +117,8 @@ function parse-commit {
     fi
   }
 
-  # Ignore commit if it is a merge commit
-  if [[ $(command git show -s --format=%p $1 | wc -w) -gt 1 ]]; then
-    return
-  fi
-
   # Parse commit with hash $1
-  local hash="$1" subject body warning rhash
-  subject="$(command git show -s --format=%s $hash)"
-  body="$(command git show -s --format=%b $hash)"
+  local hash="$1" subject="$2" body="$3" warning rhash
 
   # Commits following Conventional Commits (https://www.conventionalcommits.org/)
   # have the following format, where parts between [] are optional:
@@ -384,7 +380,8 @@ function main {
   # Commit classification arrays
   local -A commits subjects scopes breaking reverts
   local truncate=0 read_commits=0
-  local hash version tag
+  local version tag
+  local hash refs subject body
 
   # Get the first version name:
   # 1) try tag-like version, or
@@ -396,17 +393,40 @@ function main {
     || version=$(command git symbolic-ref --quiet --short $until 2>/dev/null) \
     || version=$(command git rev-parse --short $until 2>/dev/null)
 
-  # Get commit list from $until commit until $since commit, or until root
-  # commit if $since is unset, in short hash form.
-  command git rev-list --abbrev-commit --abbrev=7 ${since:+$since..}$until | while read hash; do
+  # Get commit list from $until commit until $since commit, or until root commit if $since is unset
+  local range=${since:+$since..}$until
+
+  # Git log options
+  # -z:             commits are delimited by null bytes
+  # --format:       [7-char hash]<field sep>[ref names]<field sep>[subject]<field sep>[body]
+  # --abbrev=7:     force commit hashes to be 7 characters long
+  # --no-merges:    merge commits are omitted
+  local SEP="0mZmAgIcSeP"
+  local -a raw_commits
+  raw_commits=(${(0)"$(command git log -z \
+    --format="%h${SEP}%D${SEP}%s${SEP}%b" --abbrev=7 \
+    --no-merges $range)"})
+
+  local raw_commit
+  local -a raw_fields
+  for raw_commit in $raw_commits; do
     # Truncate list on versions with a lot of commits
     if (( ++read_commits > 40 )); then
       truncate=1
       break
     fi
 
+    # Read the commit fields (@ is needed to keep empty values)
+    raw_fields=("${(@ps:$SEP:)raw_commit}")
+    hash="${raw_fields[1]}"
+    refs="${raw_fields[2]}"
+    subject="${raw_fields[3]}"
+    body="${raw_fields[4]}"
+
     # If we find a new release (exact tag)
-    if tag=$(command git describe --exact-match --tags $hash 2>/dev/null); then
+    if [[ "$refs" = *tag:\ * ]]; then
+      # Parse tag name (needs: setopt extendedglob)
+      tag="${${refs##*tag: }%%,# *}"
       # Output previous release
       display-release
       # Reinitialize commit storage
@@ -420,7 +440,7 @@ function main {
       read_commits=1
     fi
 
-    parse-commit "$hash"
+    parse-commit "$hash" "$subject" "$body"
   done
 
   display-release
@@ -431,8 +451,6 @@ function main {
   fi
 }
 
-cd "$ZSH"
-
 # Use raw output if stdout is not a tty
 if [[ ! -t 1 && -z "$3" ]]; then
   main "$1" "$2" --raw

From 140bfa84320d6f0a9c3b429c1c6be41878e60352 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Tue, 26 Oct 2021 18:26:02 +0200
Subject: [PATCH 526/869] fix(changelog): go back to ignoring commits from
 merged branches

---
 tools/changelog.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/tools/changelog.sh b/tools/changelog.sh
index 13cfb9530..5c3159732 100755
--- a/tools/changelog.sh
+++ b/tools/changelog.sh
@@ -401,17 +401,18 @@ function main {
   # --format:       [7-char hash]<field sep>[ref names]<field sep>[subject]<field sep>[body]
   # --abbrev=7:     force commit hashes to be 7 characters long
   # --no-merges:    merge commits are omitted
+  # --first-parent: commits from merged branches are omitted
   local SEP="0mZmAgIcSeP"
   local -a raw_commits
   raw_commits=(${(0)"$(command git log -z \
     --format="%h${SEP}%D${SEP}%s${SEP}%b" --abbrev=7 \
-    --no-merges $range)"})
+    --no-merges --first-parent $range)"})
 
   local raw_commit
   local -a raw_fields
   for raw_commit in $raw_commits; do
     # Truncate list on versions with a lot of commits
-    if (( ++read_commits > 40 )); then
+    if [[ -z "$since" ]] && (( ++read_commits > 35 )); then
       truncate=1
       break
     fi

From 0267cb89eba6dc9f2744bfba73ada391a6582249 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Tue, 26 Oct 2021 18:59:39 +0200
Subject: [PATCH 527/869] perf(changelog): use regex-match instead of `sed` to
 parse commit subjects

---
 tools/changelog.sh | 30 ++++++++++++++++++++----------
 1 file changed, 20 insertions(+), 10 deletions(-)

diff --git a/tools/changelog.sh b/tools/changelog.sh
index 5c3159732..3641179e2 100755
--- a/tools/changelog.sh
+++ b/tools/changelog.sh
@@ -52,10 +52,15 @@ function parse-commit {
   #   make a breaking change
 
   function commit:type {
-    local type="$(sed -E 's/^([a-zA-Z_\-]+)(\(.+\))?!?: .+$/\1/' <<< "$1")"
+    local type
+
+    # Parse commit type from the subject
+    if [[ "$1" =~ '^([a-zA-Z_\-]+)(\(.+\))?!?: .+$' ]]; then
+      type="${match[1]}"
+    fi
 
     # If $type doesn't appear in $TYPES array mark it as 'other'
-    if [[ -n "${(k)TYPES[(i)$type]}" ]]; then
+    if [[ -n "$type" && -n "${(k)TYPES[(i)$type]}" ]]; then
       echo $type
     else
       echo other
@@ -66,17 +71,18 @@ function parse-commit {
     local scope
 
     # Try to find scope in "type(<scope>):" format
-    scope=$(sed -nE 's/^[a-zA-Z_\-]+\((.+)\)!?: .+$/\1/p' <<< "$1")
-    if [[ -n "$scope" ]]; then
-      echo "$scope"
+    if [[ "$1" =~ '^[a-zA-Z_\-]+\((.+)\)!?: .+$' ]]; then
+      echo "${match[1]}"
       return
     fi
 
     # If no scope found, try to find it in "<scope>:" format
-    # Make sure it's not a type before printing it
-    scope=$(sed -nE 's/^([a-zA-Z_\-]+): .+$/\1/p' <<< "$1")
-    if [[ -z "${(k)TYPES[(i)$scope]}" ]]; then
-      echo "$scope"
+    if [[ "$1" =~ '^([a-zA-Z_\-]+): .+$' ]]; then
+      scope="${match[1]}"
+      # Make sure it's not a type before printing it
+      if [[ -z "${(k)TYPES[(i)$scope]}" ]]; then
+        echo "$scope"
+      fi
     fi
   }
 
@@ -84,7 +90,11 @@ function parse-commit {
     # Only display the relevant part of the commit, i.e. if it has the format
     # type[(scope)!]: subject, where the part between [] is optional, only
     # displays subject. If it doesn't match the format, returns the whole string.
-    sed -E 's/^[a-zA-Z_\-]+(\(.+\))?!?: (.+)$/\2/' <<< "$1"
+    if [[ "$1" =~ '^[a-zA-Z_\-]+(\(.+\))?!?: (.+)$' ]]; then
+      echo "${match[2]}"
+    else
+      echo "$1"
+    fi
   }
 
   # Return subject if the body or subject match the breaking change format

From 4b3a5c54117fa8af12878d1b659c14214cb4bbec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Tue, 26 Oct 2021 20:54:39 +0200
Subject: [PATCH 528/869] fix(changelog): fix percent escapes in `printf` calls

---
 tools/changelog.sh | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/tools/changelog.sh b/tools/changelog.sh
index 3641179e2..e32d503b1 100755
--- a/tools/changelog.sh
+++ b/tools/changelog.sh
@@ -201,9 +201,9 @@ function display-release {
     #* Uses $hash from outer scope
     local hash="${1:-$hash}"
     case "$output" in
-    raw) printf "$hash" ;;
-    text) printf "\e[33m$hash\e[0m" ;; # red
-    md) printf "[\`$hash\`](https://github.com/ohmyzsh/ohmyzsh/commit/$hash)" ;;
+    raw) printf '%s' "$hash" ;;
+    text) printf '\e[33m%s\e[0m' "$hash" ;; # red
+    md) printf '[`%s`](https://github.com/ohmyzsh/ohmyzsh/commit/%s)' "$hash" ;;
     esac
   }
 
@@ -215,16 +215,16 @@ function display-release {
     case "$output" in
     raw)
       case "$level" in
-      1) printf "$header\n$(printf '%.0s=' {1..${#header}})\n\n" ;;
-      2) printf "$header\n$(printf '%.0s-' {1..${#header}})\n\n" ;;
-      *) printf "$header:\n\n" ;;
+      1) printf '%s\n%s\n\n' "$header" "$(printf '%.0s=' {1..${#header}})" ;;
+      2) printf '%s\n%s\n\n' "$header" "$(printf '%.0s-' {1..${#header}})" ;;
+      *) printf '%s:\n\n' "$header" ;;
       esac ;;
     text)
       case "$level" in
-      1|2) printf "\e[1;4m$header\e[0m\n\n" ;; # bold, underlined
-      *) printf "\e[1m$header:\e[0m\n\n" ;; # bold
+      1|2) printf '\e[1;4m%s\e[0m\n\n' "$header" ;; # bold, underlined
+      *) printf '\e[1m%s:\e[0m\n\n' "$header" ;; # bold
       esac ;;
-    md) printf "$(printf '%.0s#' {1..${level}}) $header\n\n" ;;
+    md) printf '%s %s\n\n' "$(printf '%.0s#' {1..${level}})" "$header" ;;
     esac
   }
 
@@ -250,8 +250,8 @@ function display-release {
 
     # Print [scope]
     case "$output" in
-    raw|md) printf "[$scope]${padding} " ;;
-    text) printf "[\e[38;5;9m$scope\e[0m]${padding} " ;; # red 9
+    raw|md) printf '[%s]%s ' "$scope" "$padding";;
+    text) printf '[\e[38;5;9m%s\e[0m]%s ' "$scope" "$padding";; # red 9
     esac
   }
 
@@ -264,7 +264,7 @@ function display-release {
     subject="${(U)subject:0:1}${subject:1}"
 
     case "$output" in
-    raw) printf "$subject" ;;
+    raw) printf '%s' "$subject" ;;
     # In text mode, highlight (#<issue>) and dim text between `backticks`
     text) sed -E $'s|#([0-9]+)|\e[32m#\\1\e[0m|g;s|`([^`]+)`|`\e[2m\\1\e[0m`|g' <<< "$subject" ;;
     # In markdown mode, link to (#<issue>) issues
@@ -277,8 +277,8 @@ function display-release {
     local type="${1:-${TYPES[$type]:-${(C)type}}}"
     [[ -z "$type" ]] && return 0
     case "$output" in
-    raw|md) printf "$type: " ;;
-    text) printf "\e[4m$type\e[24m: " ;; # underlined
+    raw|md) printf '%s: ' "$type" ;;
+    text) printf '\e[4m%s\e[24m: ' "$type" ;; # underlined
     esac
   }
 
@@ -292,7 +292,7 @@ function display-release {
     (( $#breaking != 0 )) || return 0
 
     case "$output" in
-    text) fmt:header "\e[31mBREAKING CHANGES" 3 ;;
+    text) printf '\e[31m'; fmt:header "BREAKING CHANGES" 3 ;;
     raw) fmt:header "BREAKING CHANGES" 3 ;;
     md) fmt:header "BREAKING CHANGES ⚠" 3 ;;
     esac

From 1dba1120410280699c6a97a5252bab24681b46b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Wed, 27 Oct 2021 10:12:23 +0200
Subject: [PATCH 529/869] fix(changelog): fix for `${(@ps:$sep:)var}` construct
 in zsh < 5.0.8

In recent zsh versions, `${(@ps:$sep:)var}` where $sep is a variable containing
a separator string and $var is a string with multiple values separated by $sep,
the `p` flag makes zsh correctly expand $sep before splitting $var. In versions
older than 5.0.8, this doesn't happen, so we use `eval` to get the same effect.
---
 tools/changelog.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/changelog.sh b/tools/changelog.sh
index e32d503b1..664f34608 100755
--- a/tools/changelog.sh
+++ b/tools/changelog.sh
@@ -428,7 +428,7 @@ function main {
     fi
 
     # Read the commit fields (@ is needed to keep empty values)
-    raw_fields=("${(@ps:$SEP:)raw_commit}")
+    eval "raw_fields=(\"\${(@ps:$SEP:)raw_commit}\")"
     hash="${raw_fields[1]}"
     refs="${raw_fields[2]}"
     subject="${raw_fields[3]}"

From 2e46b2a2dcb96cadd94283bdce95eca75bef1433 Mon Sep 17 00:00:00 2001
From: Christophe Bliard <christophe.bliard@trux.info>
Date: Wed, 27 Oct 2021 11:40:09 +0200
Subject: [PATCH 530/869] feat(fzf): support getting fzf from nix-darwin
 (#10355)

---
 plugins/fzf/fzf.plugin.zsh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/plugins/fzf/fzf.plugin.zsh b/plugins/fzf/fzf.plugin.zsh
index a979fe222..aabd62cb1 100644
--- a/plugins/fzf/fzf.plugin.zsh
+++ b/plugins/fzf/fzf.plugin.zsh
@@ -20,7 +20,9 @@ function setup_using_base_dir() {
         done
 
         if [[ -z "${fzf_base}" ]]; then
-            if (( ${+commands[brew]} )) && dir="$(brew --prefix fzf 2>/dev/null)"; then
+            if (( ${+commands[fzf-share]} )) && dir="$(fzf-share)" && [[ -d "${dir}" ]]; then
+                fzf_base="${dir}"
+            elif (( ${+commands[brew]} )) && dir="$(brew --prefix fzf 2>/dev/null)"; then
                 if [[ -d "${dir}" ]]; then
                     fzf_base="${dir}"
                 fi

From 1861b5f175dc8f6d6408772b707c9d6deb28a53f Mon Sep 17 00:00:00 2001
From: YR Chen <stevapple@icloud.com>
Date: Fri, 29 Oct 2021 23:40:23 +0800
Subject: [PATCH 531/869] feat(xcode): support `Package.swift` as project file
 in `xc` (#10358)

---
 plugins/xcode/README.md        |  2 +-
 plugins/xcode/xcode.plugin.zsh | 28 +++++++++-------------------
 2 files changed, 10 insertions(+), 20 deletions(-)

diff --git a/plugins/xcode/README.md b/plugins/xcode/README.md
index 37f882638..664a063a3 100644
--- a/plugins/xcode/README.md
+++ b/plugins/xcode/README.md
@@ -26,7 +26,7 @@ plugins=(... xcode)
 
 ###  `xc`
 
-Opens the current directory in Xcode as an Xcode project. This will open one of the `.xcworkspace` and `.xcodeproj` files that it can find in the current working directory. You can also specify a directory to look in for the Xcode files.
+Opens the current directory in Xcode as an Xcode project or a Swift package. This will open one of the `.xcworkspace`, `.xcodeproj` and `Package.swift` files that it can find in the current working directory. You can also specify a directory to look in for the Xcode files.
 Returns 1 if it didn't find any relevant files.
 
 ###  `xx`
diff --git a/plugins/xcode/xcode.plugin.zsh b/plugins/xcode/xcode.plugin.zsh
index 89703fe3c..41b9e37e4 100644
--- a/plugins/xcode/xcode.plugin.zsh
+++ b/plugins/xcode/xcode.plugin.zsh
@@ -6,28 +6,18 @@ alias xcsel='sudo xcode-select --switch'
 # original author: @subdigital
 # source: https://gist.github.com/subdigital/5420709
 function xc {
-  local xcode_proj
-  if [[ $# == 0 ]]; then
-    xcode_proj=(*.{xcworkspace,xcodeproj}(N))
-  else
-    xcode_proj=($1/*.{xcworkspace,xcodeproj}(N))
-  fi
+  local xcode_files
+  xcode_files=(${1:-.}/{*.{xcworkspace,xcodeproj},Package.swift}(N))
 
-
-  if [[ ${#xcode_proj} -eq 0 ]]; then
-    if [[ $# == 0 ]]; then
-      echo "No xcworkspace/xcodeproj file found in the current directory."
-    else
-      echo "No xcworkspace/xcodeproj file found in $1."
-    fi
+  if [[ ${#xcode_files} -eq 0 ]]; then
+    echo "No Xcode files found in ${1:-the current directory}." >&2
     return 1
-  else
-    local active_path
-    active_path=$(xcode-select -p)
-    active_path=${active_path%%/Contents/Developer*}
-    echo "Found ${xcode_proj[1]}. Opening with ${active_path}"
-    open -a "$active_path" "${xcode_proj[1]}"
   fi
+
+  local active_path
+  active_path=${"$(xcode-select -p)"%%/Contents/Developer*}
+  echo "Found ${xcode_files[1]}. Opening with ${active_path}"
+  open -a "$active_path" "${xcode_files[1]}"
 }
 
 # Opens a file or files in the Xcode IDE. Multiple files are opened in multi-file browser

From 04c96e235ff522704a6f1482e7fd06a05467cbb7 Mon Sep 17 00:00:00 2001
From: Afzal Sayed <14029371+afzalsayed96@users.noreply.github.com>
Date: Sat, 30 Oct 2021 16:50:30 +0530
Subject: [PATCH 532/869] chore: fix grammar mistake in `CONTRIBUTING.md`
 (#10362)

---
 CONTRIBUTING.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 4903584ee..605142845 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -202,7 +202,7 @@ type(scope)!: subject
     feat(archlinux): add support for aura AUR helper (#9467)
     ```
 
-  - Formatted inline code by using backticks: the text inbetween backticks will also be highlighted by
+  - Formatted inline code by using backticks: the text between backticks will also be highlighted by
     the changelog tool:
     ```
     feat(shell-proxy): enable unexported `DEFAULT_PROXY` setting (#9774)

From bf88ff3f904e7b6675ff142e44d8aae3132bad96 Mon Sep 17 00:00:00 2001
From: Richard Mitchell <rwmitchell@gmail.com>
Date: Tue, 2 Nov 2021 07:05:37 -0400
Subject: [PATCH 533/869] fix(lib): fix `1` alias to `cd` to directory 1 in
 stack (#10370)

---
 lib/directories.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/directories.zsh b/lib/directories.zsh
index cf87bd7e4..6696854b0 100644
--- a/lib/directories.zsh
+++ b/lib/directories.zsh
@@ -9,7 +9,7 @@ alias -g .....='../../../..'
 alias -g ......='../../../../..'
 
 alias -- -='cd -'
-alias 1='cd -'
+alias 1='cd -1'
 alias 2='cd -2'
 alias 3='cd -3'
 alias 4='cd -4'

From 49458b872d1bab1aa8338e319f27c9b3705c9fd7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Fri, 29 Oct 2021 18:21:13 +0200
Subject: [PATCH 534/869] docs(dirhistory): document OPT key alternative for
 macOS and fix style

Fixes #10350
---
 plugins/dirhistory/README.md | 42 ++++++++++++++++++++++++++----------
 1 file changed, 31 insertions(+), 11 deletions(-)

diff --git a/plugins/dirhistory/README.md b/plugins/dirhistory/README.md
index 602fc8284..ede9b5410 100644
--- a/plugins/dirhistory/README.md
+++ b/plugins/dirhistory/README.md
@@ -12,19 +12,27 @@ plugins=(... dirhistory)
 
 | Shortcut                          | Description                                               |
 |-----------------------------------|-----------------------------------------------------------|
-| <kbd>alt</kbd> + <kbd>left</kbd>  | Go to previous directory                                  |
-| <kbd>alt</kbd> + <kbd>right</kbd> | Undo <kbd>alt</kbd> + <kbd>left</kbd>                     |
-| <kbd>alt</kbd> + <kbd>up</kbd>    | Move into the parent directory                            |
-| <kbd>alt</kbd> + <kbd>down</kbd>  | Move into the first child directory by alphabetical order |
+| <kbd>Alt</kbd> + <kbd>Left</kbd>  | Go to previous directory                                  |
+| <kbd>Alt</kbd> + <kbd>Right</kbd> | Go to next directory                                      |
+| <kbd>Alt</kbd> + <kbd>Up</kbd>    | Move into the parent directory                            |
+| <kbd>Alt</kbd> + <kbd>Down</kbd>  | Move into the first child directory by alphabetical order |
 
-NOTE: some terminals might override the ALT+Arrows key bindings (Windows Terminal, for example).
-If these don't work check your terminal settings and change them to a different keyboard shortcut.
+**For macOS: use the Option key (<kbd>⌥</kbd>) instead of <kbd>Alt</kbd>**.
+
+> NOTE: some terminals might override the <kbd>Alt</kbd> + Arrows key bindings (e.g. Windows Terminal).
+> If these don't work check your terminal settings and change them to a different keyboard shortcut.
 
 ## Usage
 
-This plugin allows you to navigate the history of previous current-working-directories using ALT-LEFT and ALT-RIGHT. ALT-LEFT moves back to directories that the user has changed to in the past, and ALT-RIGHT undoes ALT-LEFT. MAC users may alternately use OPT-LEFT and OPT-RIGHT.
+This plugin allows you to navigate the history of previous working directories using <kbd>Alt</kbd> + <kbd>Left</kbd>
+and <kbd>Alt</kbd> + <kbd>Right</kbd>. <kbd>Alt</kbd> + <kbd>Left</kbd> moves to past directories, and
+<kbd>Alt</kbd> + <kbd>Right</kbd> goes back to recent directories.
 
-Also, navigate directory **hierarchy** using ALT-UP and ALT-DOWN. (mac keybindings not yet implemented). ALT-UP moves to higher hierarchy (shortcut for 'cd ..'). ALT-DOWN moves into the first directory found in alphabetical order (useful to navigate long empty directories e.g. java packages)
+**NOTE: the maximum directory history size is 30.**
+
+You can also navigate **directory hierarchies** using <kbd>Alt</kbd> + <kbd>Up</kbd> and <kbd>Alt</kbd> + <kbd>Down</kbd>.
+<kbd>Alt</kbd> + <kbd>Up</kbd> moves to the parent directory, while <kbd>Alt</kbd> + <kbd>Down</kbd> moves into the first
+child directory found in alphabetical order (useful to navigate long empty directories, e.g. Java packages).
 
 For example, if the shell was started, and the following commands were entered:
 
@@ -35,8 +43,20 @@ cd share
 cd doc
 ```
 
-Then entering ALT-LEFT at the prompt would change directory from /usr/share/doc to /usr/share, then if pressed again to /usr/, then ~. If ALT-RIGHT were pressed the directory would be changed to /usr/ again.
+the directory stack (`dirs -v`) would look like this:
 
-After that, ALT-DOWN will probably go to /usr/bin (depends on your /usr structure), ALT-UP will return to /usr, then ALT-UP will get you to /
+```console
+$ dirs -v
+0       /usr/share/doc
+1       /usr/share
+2       /usr
+3       ~
+```
 
-**Currently the max history size is 30**. The navigation should work for xterm, PuTTY xterm mode, GNU screen, and on MAC with alternate keys as mentioned above.
+then entering <kbd>Alt</kbd> + <kbd>Left</kbd> at the prompt would change directory from `/usr/share/doc` to `/usr/share`,
+then if pressed again to `/usr`, then `~`. If <kbd>Alt</kbd> + <kbd>Right</kbd> were pressed the directory would be changed
+to `/usr` again.
+
+After that, <kbd>Alt</kbd> + <kbd>Down</kbd> will probably go to `/usr/bin` if `bin` is the first directory in alphabetical
+order (depends on your `/usr` folder structure). <kbd>Alt</kbd> + <kbd>Up</kbd> will return to `/usr`, and once more will get
+you to the root folder (`/`).

From 7f494944e6e8047b49fdbd42977b4eb4670381fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Fri, 29 Oct 2021 18:22:35 +0200
Subject: [PATCH 535/869] fix(dirhistory): fix ALT+Up/Down key bindings for
 Terminal.app

---
 plugins/dirhistory/dirhistory.plugin.zsh | 76 ++++++++++--------------
 1 file changed, 32 insertions(+), 44 deletions(-)

diff --git a/plugins/dirhistory/dirhistory.plugin.zsh b/plugins/dirhistory/dirhistory.plugin.zsh
index cbac84600..d949064d8 100644
--- a/plugins/dirhistory/dirhistory.plugin.zsh
+++ b/plugins/dirhistory/dirhistory.plugin.zsh
@@ -121,35 +121,24 @@ function dirhistory_zle_dirhistory_future() {
 }
 
 zle -N dirhistory_zle_dirhistory_back
-# xterm in normal mode
-bindkey "\e[3D" dirhistory_zle_dirhistory_back
-bindkey "\e[1;3D" dirhistory_zle_dirhistory_back
-# Terminal.app
-if [[ "$TERM_PROGRAM" == "Apple_Terminal" ]]; then
-  bindkey "^[b" dirhistory_zle_dirhistory_back
-fi
-# iTerm2
-if [[ "$TERM_PROGRAM" == "iTerm.app" ]]; then
-  bindkey "^[^[[D" dirhistory_zle_dirhistory_back
-fi
-# Putty:
-bindkey "\e\e[D" dirhistory_zle_dirhistory_back
-# GNU screen:
-bindkey "\eO3D" dirhistory_zle_dirhistory_back
+bindkey "\e[3D" dirhistory_zle_dirhistory_back    # xterm in normal mode
+bindkey "\e[1;3D" dirhistory_zle_dirhistory_back  # xterm in normal mode
+bindkey "\e\e[D" dirhistory_zle_dirhistory_back   # Putty
+bindkey "\eO3D" dirhistory_zle_dirhistory_back    # GNU screen
+case "$TERM_PROGRAM" in
+iTerm.app) bindkey "^[^[[D" dirhistory_zle_dirhistory_back ;;   # iTerm2
+Apple_Terminal) bindkey "^[b" dirhistory_zle_dirhistory_back ;; # Terminal.app
+esac
 
 zle -N dirhistory_zle_dirhistory_future
-bindkey "\e[3C" dirhistory_zle_dirhistory_future
-bindkey "\e[1;3C" dirhistory_zle_dirhistory_future
-# Terminal.app
-if [[ "$TERM_PROGRAM" == "Apple_Terminal" ]]; then
-  bindkey "^[f" dirhistory_zle_dirhistory_future
-fi
-# iTerm2
-if [[ "$TERM_PROGRAM" == "iTerm.app" ]]; then
-  bindkey "^[^[[C" dirhistory_zle_dirhistory_future
-fi
-bindkey "\e\e[C" dirhistory_zle_dirhistory_future
-bindkey "\eO3C" dirhistory_zle_dirhistory_future
+bindkey "\e[3C" dirhistory_zle_dirhistory_future    # xterm in normal mode
+bindkey "\e[1;3C" dirhistory_zle_dirhistory_future  # xterm in normal mode
+bindkey "\e\e[C" dirhistory_zle_dirhistory_future   # Putty
+bindkey "\eO3C" dirhistory_zle_dirhistory_future    # GNU screen
+case "$TERM_PROGRAM" in
+iTerm.app) bindkey "^[^[[C" dirhistory_zle_dirhistory_future ;;   # iTerm2
+Apple_Terminal) bindkey "^[f" dirhistory_zle_dirhistory_future ;; # Terminal.app
+esac
 
 
 # 
@@ -181,22 +170,21 @@ function dirhistory_zle_dirhistory_down() {
 }
 
 zle -N dirhistory_zle_dirhistory_up
-# xterm in normal mode
-bindkey "\e[3A" dirhistory_zle_dirhistory_up
-bindkey "\e[1;3A" dirhistory_zle_dirhistory_up
-if [[ "$TERM_PROGRAM" == "Apple_Terminal" || "$TERM_PROGRAM" == "iTerm.app" ]]; then
-  bindkey "^[[A" dirhistory_zle_dirhistory_up
-fi
-# Putty:
-bindkey "\e\e[A" dirhistory_zle_dirhistory_up
-# GNU screen:
-bindkey "\eO3A" dirhistory_zle_dirhistory_up
+bindkey "\e[3A" dirhistory_zle_dirhistory_up    # xterm in normal mode
+bindkey "\e[1;3A" dirhistory_zle_dirhistory_up  # xterm in normal mode
+bindkey "\e\e[A" dirhistory_zle_dirhistory_up   # Putty
+bindkey "\eO3A" dirhistory_zle_dirhistory_up    # GNU screen
+case "$TERM_PROGRAM" in
+iTerm.app) bindkey "^[^[[A" dirhistory_zle_dirhistory_up ;;     # iTerm2
+Apple_Terminal) bindkey "^[OA" dirhistory_zle_dirhistory_up ;;  # Terminal.app
+esac
 
 zle -N dirhistory_zle_dirhistory_down
-bindkey "\e[3B" dirhistory_zle_dirhistory_down
-bindkey "\e[1;3B" dirhistory_zle_dirhistory_down
-if [[ "$TERM_PROGRAM" == "Apple_Terminal" || "$TERM_PROGRAM" == "iTerm.app" ]]; then
-  bindkey "^[[B" dirhistory_zle_dirhistory_down
-fi
-bindkey "\e\e[B" dirhistory_zle_dirhistory_down
-bindkey "\eO3B" dirhistory_zle_dirhistory_down
+bindkey "\e[3B" dirhistory_zle_dirhistory_down    # xterm in normal mode
+bindkey "\e[1;3B" dirhistory_zle_dirhistory_down  # xterm in normal mode
+bindkey "\e\e[B" dirhistory_zle_dirhistory_down   # Putty
+bindkey "\eO3B" dirhistory_zle_dirhistory_down    # GNU screen
+case "$TERM_PROGRAM" in
+iTerm.app) bindkey "^[^[[B" dirhistory_zle_dirhistory_down ;;     # iTerm2
+Apple_Terminal) bindkey "^[OB" dirhistory_zle_dirhistory_down ;;  # Terminal.app
+esac

From 79cf4b3ceb9bf981ce05adc1db3f01aa551efce8 Mon Sep 17 00:00:00 2001
From: Michael Peick <Michael.Peick@gmail.com>
Date: Sun, 10 Nov 2019 15:32:41 +0100
Subject: [PATCH 536/869] feat(dirhistory): support urxvt terminal key binding
 (#8370)

Closes #8370
---
 plugins/dirhistory/dirhistory.plugin.zsh | 30 +++++++++++++++++-------
 1 file changed, 21 insertions(+), 9 deletions(-)

diff --git a/plugins/dirhistory/dirhistory.plugin.zsh b/plugins/dirhistory/dirhistory.plugin.zsh
index d949064d8..26ef07494 100644
--- a/plugins/dirhistory/dirhistory.plugin.zsh
+++ b/plugins/dirhistory/dirhistory.plugin.zsh
@@ -1,7 +1,7 @@
-## 
-#   Navigate directory history using ALT-LEFT and ALT-RIGHT. ALT-LEFT moves back to directories 
+##
+#   Navigate directory history using ALT-LEFT and ALT-RIGHT. ALT-LEFT moves back to directories
 #   that the user has changed to in the past, and ALT-RIGHT undoes ALT-LEFT.
-# 
+#
 #   Navigate directory hierarchy using ALT-UP and ALT-DOWN.
 #   ALT-UP moves to higher hierarchy (cd ..)
 #   ALT-DOWN moves into the first directory found in alphabetical order
@@ -14,8 +14,8 @@ export dirhistory_future
 
 export DIRHISTORY_SIZE=30
 
-# Pop the last element of dirhistory_past. 
-# Pass the name of the variable to return the result in. 
+# Pop the last element of dirhistory_past.
+# Pass the name of the variable to return the result in.
 # Returns the element if the array was not empty,
 # otherwise returns empty string.
 function pop_past() {
@@ -32,7 +32,7 @@ function pop_future() {
   fi
 }
 
-# Push a new element onto the end of dirhistory_past. If the size of the array 
+# Push a new element onto the end of dirhistory_past. If the size of the array
 # is >= DIRHISTORY_SIZE, the array is shifted
 function push_past() {
   if [[ $#dirhistory_past -ge $DIRHISTORY_SIZE ]]; then
@@ -76,7 +76,7 @@ function dirhistory_back() {
   local d=""
   # Last element in dirhistory_past is the cwd.
 
-  pop_past cw 
+  pop_past cw
   if [[ "" == "$cw" ]]; then
     # Someone overwrote our variable. Recover it.
     dirhistory_past=($PWD)
@@ -129,6 +129,9 @@ case "$TERM_PROGRAM" in
 iTerm.app) bindkey "^[^[[D" dirhistory_zle_dirhistory_back ;;   # iTerm2
 Apple_Terminal) bindkey "^[b" dirhistory_zle_dirhistory_back ;; # Terminal.app
 esac
+if (( ${+terminfo[kcub1]} )); then
+  bindkey "^[${terminfo[kcub1]}" dirhistory_zle_dirhistory_back  # urxvt
+fi
 
 zle -N dirhistory_zle_dirhistory_future
 bindkey "\e[3C" dirhistory_zle_dirhistory_future    # xterm in normal mode
@@ -139,11 +142,14 @@ case "$TERM_PROGRAM" in
 iTerm.app) bindkey "^[^[[C" dirhistory_zle_dirhistory_future ;;   # iTerm2
 Apple_Terminal) bindkey "^[f" dirhistory_zle_dirhistory_future ;; # Terminal.app
 esac
+if (( ${+terminfo[kcuf1]} )); then
+  bindkey "^[${terminfo[kcuf1]}" dirhistory_zle_dirhistory_future # urxvt
+fi
 
 
-# 
+#
 # HIERARCHY Implemented in this section, in case someone wants to split it to another plugin if it clashes bindings
-# 
+#
 
 # Move up in hierarchy
 function dirhistory_up() {
@@ -178,6 +184,9 @@ case "$TERM_PROGRAM" in
 iTerm.app) bindkey "^[^[[A" dirhistory_zle_dirhistory_up ;;     # iTerm2
 Apple_Terminal) bindkey "^[OA" dirhistory_zle_dirhistory_up ;;  # Terminal.app
 esac
+if (( ${+terminfo[kcuu1]} )); then
+  bindkey "^[${terminfo[kcuu1]}" dirhistory_zle_dirhistory_up # urxvt
+fi
 
 zle -N dirhistory_zle_dirhistory_down
 bindkey "\e[3B" dirhistory_zle_dirhistory_down    # xterm in normal mode
@@ -188,3 +197,6 @@ case "$TERM_PROGRAM" in
 iTerm.app) bindkey "^[^[[B" dirhistory_zle_dirhistory_down ;;     # iTerm2
 Apple_Terminal) bindkey "^[OB" dirhistory_zle_dirhistory_down ;;  # Terminal.app
 esac
+if (( ${+terminfo[kcud1]} )); then
+  bindkey "^[${terminfo[kcud1]}" dirhistory_zle_dirhistory_down # urxvt
+fi

From 5e8905b4b22dfec9042590f3aa399935b8b83eed Mon Sep 17 00:00:00 2001
From: Aaron Hutchinson <xarnze@gmail.com>
Date: Tue, 2 Nov 2021 18:40:40 +0000
Subject: [PATCH 537/869] feat(ys): increase color contrast with light color
 schemes (#10295)

---
 themes/ys.zsh-theme | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/themes/ys.zsh-theme b/themes/ys.zsh-theme
index 303c898b4..251b48827 100644
--- a/themes/ys.zsh-theme
+++ b/themes/ys.zsh-theme
@@ -5,8 +5,10 @@
 #
 # Mar 2013 Yad Smood
 
+typeset +H my_gray="$FG[247]"
+
 # VCS
-YS_VCS_PROMPT_PREFIX1=" %{$fg[white]%}on%{$reset_color%} "
+YS_VCS_PROMPT_PREFIX1=" %{$my_gray%}on%{$reset_color%} "
 YS_VCS_PROMPT_PREFIX2=":%{$fg[cyan]%}"
 YS_VCS_PROMPT_SUFFIX="%{$reset_color%}"
 YS_VCS_PROMPT_DIRTY=" %{$fg[red]%}x"
@@ -60,13 +62,13 @@ local exit_code="%(?,,C:%{$fg[red]%}%?%{$reset_color%})"
 PROMPT="
 %{$terminfo[bold]$fg[blue]%}#%{$reset_color%} \
 %(#,%{$bg[yellow]%}%{$fg[black]%}%n%{$reset_color%},%{$fg[cyan]%}%n) \
-%{$fg[white]%}@ \
+%{$my_gray%}@ \
 %{$fg[green]%}%m \
-%{$fg[white]%}in \
+%{$my_gray%}in \
 %{$terminfo[bold]$fg[yellow]%}%~%{$reset_color%}\
 ${hg_info}\
 ${git_info}\
 ${venv_info}\
  \
-%{$fg[white]%}[%*] $exit_code
+%{$my_gray%}[%*] $exit_code
 %{$terminfo[bold]$fg[red]%}$ %{$reset_color%}"

From 9a02515c7c8eee90909fe72d59d2e3169cb5ed28 Mon Sep 17 00:00:00 2001
From: amnore <Mr.ChenWithCapsule@outlook.com>
Date: Wed, 3 Nov 2021 20:17:23 +0800
Subject: [PATCH 538/869] fix(command-not-found): pass arguments correctly in
 NixOS (#10381)

---
 plugins/command-not-found/command-not-found.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/command-not-found/command-not-found.plugin.zsh b/plugins/command-not-found/command-not-found.plugin.zsh
index 3ec13429c..cb96fe063 100644
--- a/plugins/command-not-found/command-not-found.plugin.zsh
+++ b/plugins/command-not-found/command-not-found.plugin.zsh
@@ -50,7 +50,7 @@ fi
 # NixOS: https://github.com/NixOS/nixpkgs/tree/master/nixos/modules/programs/command-not-found
 if [[ -x /run/current-system/sw/bin/command-not-found ]]; then
   command_not_found_handler() {
-    /run/current-system/sw/bin/command-not-found -- "$@"
+    /run/current-system/sw/bin/command-not-found "$@"
   }
 fi
 

From 0520c2e30934a6e01b27988dca5bbbe3511d6868 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Wed, 3 Nov 2021 18:21:04 +0100
Subject: [PATCH 539/869] docs: add Security Policy

---
 SECURITY.md | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 SECURITY.md

diff --git a/SECURITY.md b/SECURITY.md
new file mode 100644
index 000000000..cda53379f
--- /dev/null
+++ b/SECURITY.md
@@ -0,0 +1,22 @@
+# Security Policy
+
+## Supported Versions
+
+At the moment Oh My Zsh only considers the very latest commit to be supported.
+We combine that with our fast response to incidents, so risk is minimized.
+
+| Version        | Supported          |
+|:-------------- |:------------------ |
+| master         | :white_check_mark: |
+| other commits  | :x:                |
+
+In the near future we will introduce versioning, so expect this section to change.
+
+## Reporting a Vulnerability
+
+If you find a vulnerability, email all the maintainers directly at:
+
+- Robby: robby [at] planetargon.com
+- Marc: hello [at] mcornella.com
+
+**Do not open an issue or Pull Request directly**, because it might reveal the vulnerability.

From 7a2cb106258aa7a18bcd53e45df96c4871a03d5e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Fri, 5 Nov 2021 19:47:29 +0100
Subject: [PATCH 540/869] fix(updater): stop update if connection unavailable

---
 tools/check_for_upgrade.sh | 25 +++++++++++++++++++------
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/tools/check_for_upgrade.sh b/tools/check_for_upgrade.sh
index 157b0cce2..8264762b6 100644
--- a/tools/check_for_upgrade.sh
+++ b/tools/check_for_upgrade.sh
@@ -54,14 +54,27 @@ function is_update_available() {
   [[ "$repo" = ohmyzsh/ohmyzsh ]] || return 0
   local api_url="https://api.github.com/repos/${repo}/commits/${branch}"
 
-  # Get local and remote HEADs and compare them. If we can't get either assume there are updates
-  local local_head remote_head
+  # Get local HEAD. If this fails assume there are updates
+  local local_head
   local_head=$(git -C "$ZSH" rev-parse $branch 2>/dev/null) || return 0
 
-  remote_head=$(curl -fsSL -H 'Accept: application/vnd.github.v3.sha' $api_url 2>/dev/null) \
-  || remote_head=$(wget -O- --header='Accept: application/vnd.github.v3.sha' $api_url 2>/dev/null) \
-  || remote_head=$(HTTP_ACCEPT='Accept: application/vnd.github.v3.sha' fetch -o - $api_url 2>/dev/null) \
-  || return 0
+  # Get remote HEAD. If we can't get it assume there are updates unless there is no connection:
+  # - curl: 6 (could not resolve) or 7 (could not connect)
+  # - wget: 4 (network unreachable)
+  # - fetch: 1 (no route to host)
+  local remote_head ret
+  remote_head=$(
+    curl -fsSL -H 'Accept: application/vnd.github.v3.sha' $api_url 2>/dev/null || {
+      [[ $? -eq 6 || $? -eq 7 ]] && exit 1
+    } || wget -O- --header='Accept: application/vnd.github.v3.sha' $api_url 2>/dev/null || {
+      [[ $? -eq 4 ]] && exit 1
+    } || HTTP_ACCEPT='Accept: application/vnd.github.v3.sha' fetch -o - $api_url 2>/dev/null || {
+      [[ $? -eq 1 ]] && exit 1
+    } || exit 0
+  )
+
+  # If can't fetch remote HEAD, return exit code
+  ret=$?; [[ -n "$remote_head" ]] || return $ret
 
   # Compare local and remote HEADs
   [[ "$local_head" != "$remote_head" ]]

From b2f35a7b98455b2bb8c7c3b11db6aa587e1d28bf Mon Sep 17 00:00:00 2001
From: Jonathan Batchelor <jmb@users.noreply.github.com>
Date: Fri, 5 Nov 2021 23:40:38 +0000
Subject: [PATCH 541/869] refactor(osx): Rename osx plugin to macos (#10341)

Apple changed the name of their operating system from OS X to macOS a number of years ago. This was overdue!

As per issue  #10311

* refactor(osx): rename `osx` plugin to `macos`
* refactor(macos): Add symbolic link from old `osx` plugin name.
---
 README.md                                          |  2 +-
 plugins/{osx => macos}/README.md                   |  8 ++++----
 plugins/{osx => macos}/_security                   |  0
 .../{osx/osx.plugin.zsh => macos/macos.plugin.zsh} | 14 ++++++++++----
 plugins/{osx => macos}/music                       |  0
 plugins/macos/osx.plugin.zsh                       |  1 +
 plugins/{osx => macos}/spotify                     |  0
 plugins/osx                                        |  1 +
 8 files changed, 17 insertions(+), 9 deletions(-)
 rename plugins/{osx => macos}/README.md (94%)
 rename plugins/{osx => macos}/_security (100%)
 rename plugins/{osx/osx.plugin.zsh => macos/macos.plugin.zsh} (93%)
 rename plugins/{osx => macos}/music (100%)
 create mode 120000 plugins/macos/osx.plugin.zsh
 rename plugins/{osx => macos}/spotify (100%)
 create mode 120000 plugins/osx

diff --git a/README.md b/README.md
index 907248beb..5712c1701 100644
--- a/README.md
+++ b/README.md
@@ -68,7 +68,7 @@ plugins=(
   git
   bundler
   dotenv
-  osx
+  macos
   rake
   rbenv
   ruby
diff --git a/plugins/osx/README.md b/plugins/macos/README.md
similarity index 94%
rename from plugins/osx/README.md
rename to plugins/macos/README.md
index 50458f60e..1bc4244a4 100644
--- a/plugins/osx/README.md
+++ b/plugins/macos/README.md
@@ -1,11 +1,11 @@
-# OSX plugin
+# MacOS plugin
 
 This plugin provides a few utilities to make it more enjoyable on macOS (previously named OSX).
 
-To start using it, add the `osx` plugin to your plugins array in `~/.zshrc`:
+To start using it, add the `macos` plugin to your plugins array in `~/.zshrc`:
 
 ```zsh
-plugins=(... osx)
+plugins=(... macos)
 ```
 
 Original author: [Sorin Ionescu](https://github.com/sorin-ionescu)
@@ -31,7 +31,7 @@ Original author: [Sorin Ionescu](https://github.com/sorin-ionescu)
 | `itunes`      | _DEPRECATED_. Use `music` from macOS Catalina on         |
 | `music`       | Control Apple Music. Use `music -h` for usage details    |
 | `spotify`     | Control Spotify and search by artist, album, track…      |
-| `rmdsstore`   | Remove .DS\_Store files recursively in a directory       |
+| `rmdsstore`   | Remove .DS_Store files recursively in a directory        |
 | `btrestart`   | Restart the Bluetooth daemon                             |
 | `freespace`   | Erases purgeable disk space with 0s on the selected disk |
 
diff --git a/plugins/osx/_security b/plugins/macos/_security
similarity index 100%
rename from plugins/osx/_security
rename to plugins/macos/_security
diff --git a/plugins/osx/osx.plugin.zsh b/plugins/macos/macos.plugin.zsh
similarity index 93%
rename from plugins/osx/osx.plugin.zsh
rename to plugins/macos/macos.plugin.zsh
index 16f16ddb6..4bcbbaead 100644
--- a/plugins/osx/osx.plugin.zsh
+++ b/plugins/macos/macos.plugin.zsh
@@ -1,3 +1,9 @@
+# Check if 'osx' is still in the plugins list and prompt to change to 'macos'
+if [[ -n "${plugins[(r)osx]}" ]]; then
+  print ${(%):-"%F{yellow}The \`osx\` plugin is deprecated and has been renamed to \`macos\`."}
+  print ${(%):-"Please update your .zshrc to use the \`%Bmacos%b\` plugin instead.%f"}
+fi
+
 # Open the current directory in a Finder window
 alias ofd='open_command $PWD'
 
@@ -11,7 +17,7 @@ function btrestart() {
   sudo kextload -b com.apple.iokit.BroadcomBluetoothHostControllerUSBTransport
 }
 
-function _omz_osx_get_frontmost_app() {
+function _omz_macos_get_frontmost_app() {
   osascript 2>/dev/null <<EOF
     tell application "System Events"
       name of first item of (every process whose frontmost is true)
@@ -24,7 +30,7 @@ function tab() {
   local command="cd \\\"$PWD\\\"; clear"
   (( $# > 0 )) && command="${command}; $*"
 
-  local the_app=$(_omz_osx_get_frontmost_app)
+  local the_app=$(_omz_macos_get_frontmost_app)
 
   if [[ "$the_app" == 'Terminal' ]]; then
     # Discarding stdout to quash "tab N of window id XXX" output
@@ -77,7 +83,7 @@ function vsplit_tab() {
   local command="cd \\\"$PWD\\\"; clear"
   (( $# > 0 )) && command="${command}; $*"
 
-  local the_app=$(_omz_osx_get_frontmost_app)
+  local the_app=$(_omz_macos_get_frontmost_app)
 
   if [[ "$the_app" == 'iTerm' ]]; then
     osascript <<EOF
@@ -125,7 +131,7 @@ function split_tab() {
   local command="cd \\\"$PWD\\\"; clear"
   (( $# > 0 )) && command="${command}; $*"
 
-  local the_app=$(_omz_osx_get_frontmost_app)
+  local the_app=$(_omz_macos_get_frontmost_app)
 
   if [[ "$the_app" == 'iTerm' ]]; then
     osascript 2>/dev/null <<EOF
diff --git a/plugins/osx/music b/plugins/macos/music
similarity index 100%
rename from plugins/osx/music
rename to plugins/macos/music
diff --git a/plugins/macos/osx.plugin.zsh b/plugins/macos/osx.plugin.zsh
new file mode 120000
index 000000000..73d718d43
--- /dev/null
+++ b/plugins/macos/osx.plugin.zsh
@@ -0,0 +1 @@
+macos.plugin.zsh
\ No newline at end of file
diff --git a/plugins/osx/spotify b/plugins/macos/spotify
similarity index 100%
rename from plugins/osx/spotify
rename to plugins/macos/spotify
diff --git a/plugins/osx b/plugins/osx
new file mode 120000
index 000000000..a8d0f9c48
--- /dev/null
+++ b/plugins/osx
@@ -0,0 +1 @@
+macos
\ No newline at end of file

From 90903779b942a12d273e8d158ad97b252dc74360 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Mon, 8 Nov 2021 14:01:34 +0100
Subject: [PATCH 542/869] refactor(percol): fix style, bind keys for vi-mode
 and remove dependencies

---
 plugins/percol/README.md         | 23 ++++++++++--------
 plugins/percol/percol.plugin.zsh | 41 +++++++++++++++++---------------
 2 files changed, 35 insertions(+), 29 deletions(-)

diff --git a/plugins/percol/README.md b/plugins/percol/README.md
index ec5de4f86..78c881f55 100644
--- a/plugins/percol/README.md
+++ b/plugins/percol/README.md
@@ -1,20 +1,23 @@
-## percol
+# percol
 
-Provides some useful function to make [percol](https://github.com/mooz/percol) work with zsh history and [jump plugin](https://github.com/ohmyzsh/ohmyzsh/blob/master/plugins/jump/jump.plugin.zsh)
+Provides some useful function to make [percol](https://github.com/mooz/percol) work with zsh history and
+the [jump plugin](https://github.com/ohmyzsh/ohmyzsh/tree/master/plugins/jump), optionally.
 
-### Requirements
+To use it, add `percol` to the plugins array in your zshrc:
 
-```shell
-pip install percol
+```zsh
+plugins=(... percol)
 ```
 
-And [jump](https://github.com/ohmyzsh/ohmyzsh/blob/master/plugins/jump/jump.plugin.zsh) for `oh-my-zsh` is a optional requirement.
+## Requirements
 
-### Usage
+- `percol`: install with `pip install percol`.
 
-For default
+- (_Optional_) [`jump`](https://github.com/ohmyzsh/ohmyzsh/tree/master/plugins/jump) plugin: needs to be
+  enabled before the `percol` plugin.
 
-- `^-r` bind to `percol_select_history`.You can use it to grep your history with percol.
+## Usage
 
-- `^-b` bind to `percol_select_marks`.You can use it to grep your bookmarks with percol.
+- <kbd>CTRL-R</kbd> (bound to `percol_select_history`): you can use it to grep your history with percol.
 
+- <kbd>CTRL-B</kbd> (bound to `percol_select_marks`): you can use it to grep your jump bookmarks with percol.
diff --git a/plugins/percol/percol.plugin.zsh b/plugins/percol/percol.plugin.zsh
index c6adf4e1e..b78383eee 100644
--- a/plugins/percol/percol.plugin.zsh
+++ b/plugins/percol/percol.plugin.zsh
@@ -1,22 +1,25 @@
-if which percol &> /dev/null; then
-    function percol_select_history() {
-        local tac
-        which gtac &> /dev/null && tac="gtac" || { which tac &> /dev/null && tac="tac" || { tac="tail -r" } }
-        BUFFER=$(fc -l -n 1 | eval $tac | percol --query "$LBUFFER")
-        CURSOR=$#BUFFER
-        zle -R -c
-    }
+(( ${+commands[percol]} )) || return
 
-    zle -N percol_select_history
-    bindkey '^R' percol_select_history
+function percol_select_history() {
+  # print history in reverse order (from -1 (latest) to 1 (oldest))
+  BUFFER=$(fc -l -n -1 1 | percol --query "$LBUFFER")
+  CURSOR=$#BUFFER
+  zle -R -c
+}
+zle -N percol_select_history
+bindkey -M emacs '^R' percol_select_history
+bindkey -M viins '^R' percol_select_history
+bindkey -M vicmd '^R' percol_select_history
 
-    if which marks &> /dev/null; then
-        function percol_select_marks() {
-            BUFFER=$(marks | percol --query "$LBUFFER" | awk '{print $3}')
-            CURSOR=$#BUFFER # move cursor
-            zle -R -c       # refresh
-        }
-        zle -N percol_select_marks
-        bindkey '^B' percol_select_marks
-    fi
+if (( ${+functions[marks]} )); then
+  function percol_select_marks() {
+    # parse directory from marks output (markname -> path) and quote if necessary
+    BUFFER=${(q)"$(marks | percol --query "$LBUFFER")"##*-> }
+    CURSOR=$#BUFFER
+    zle -R -c
+  }
+  zle -N percol_select_marks
+  bindkey -M emacs '^B' percol_select_marks
+  bindkey -M viins '^B' percol_select_marks
+  bindkey -M vicmd '^B' percol_select_marks
 fi

From 55682e36920e2ab7633fc6eee11466d3faed0bf8 Mon Sep 17 00:00:00 2001
From: Shahin Sorkh <sorkh.shahin@protonmail.com>
Date: Mon, 8 Nov 2021 18:02:09 +0330
Subject: [PATCH 543/869] feat(tmux): set session name with
 `ZSH_TMUX_DEFAULT_SESSION_NAME` (#9063)

---
 plugins/tmux/README.md       | 1 +
 plugins/tmux/tmux.plugin.zsh | 6 +++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/plugins/tmux/README.md b/plugins/tmux/README.md
index 2ceaf1ad5..551814a39 100644
--- a/plugins/tmux/README.md
+++ b/plugins/tmux/README.md
@@ -39,3 +39,4 @@ The plugin also supports the following:
 | `ZSH_TMUX_FIXTERM_WITH_256COLOR`    | `$TERM` to use for 256-color terminals (default: `screen-256color`            |
 | `ZSH_TMUX_CONFIG`                   | Set the configuration path (default: `$HOME/.tmux.conf`)                      |
 | `ZSH_TMUX_UNICODE`                  | Set `tmux -u` option to support unicode                                       |
+| `ZSH_TMUX_DEFAULT_SESSION_NAME`     | Set tmux default session name when autostart is enabled                       |
diff --git a/plugins/tmux/tmux.plugin.zsh b/plugins/tmux/tmux.plugin.zsh
index e52443a71..0ea3aa02a 100644
--- a/plugins/tmux/tmux.plugin.zsh
+++ b/plugins/tmux/tmux.plugin.zsh
@@ -76,7 +76,11 @@ function _zsh_tmux_plugin_run() {
     elif [[ -e "$ZSH_TMUX_CONFIG" ]]; then
       tmux_cmd+=(-f "$ZSH_TMUX_CONFIG")
     fi
-    $tmux_cmd new-session
+    if [[ -n "$ZSH_TMUX_DEFAULT_SESSION_NAME" ]]; then
+        $tmux_cmd new-session -s $ZSH_TMUX_DEFAULT_SESSION_NAME
+    else
+        $tmux_cmd new-session
+    fi
   fi
 
   if [[ "$ZSH_TMUX_AUTOQUIT" == "true" ]]; then

From e86c6f5e7fc9f024a427e2870ab70644b5454725 Mon Sep 17 00:00:00 2001
From: Kevin Burke <kevin@burke.dev>
Date: Tue, 9 Nov 2021 00:04:10 -0800
Subject: [PATCH 544/869] style: use `-n` flag in `head` and `tail` commands
 (#10391)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Marc Cornellà <hello@mcornella.com>
---
 lib/diagnostics.zsh                        |  2 +-
 lib/directories.zsh                        |  2 +-
 lib/functions.zsh                          |  4 ++--
 lib/git.zsh                                |  2 +-
 plugins/scd/scd                            |  2 +-
 plugins/systemadmin/README.md              |  4 ++--
 plugins/systemadmin/systemadmin.plugin.zsh | 12 ++++++------
 tools/install.sh                           |  2 +-
 8 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/lib/diagnostics.zsh b/lib/diagnostics.zsh
index 650520797..eaeba7d23 100644
--- a/lib/diagnostics.zsh
+++ b/lib/diagnostics.zsh
@@ -335,7 +335,7 @@ function _omz_diag_dump_os_specific_version() {
       builtin echo "OS Version: $osname $osver build $(sw_vers -buildVersion)"
       ;;
     cygwin)
-      command systeminfo | command head -4 | command tail -2
+      command systeminfo | command head -n 4 | command tail -n 2
       ;;
   esac
 
diff --git a/lib/directories.zsh b/lib/directories.zsh
index 6696854b0..c62f56468 100644
--- a/lib/directories.zsh
+++ b/lib/directories.zsh
@@ -26,7 +26,7 @@ function d () {
   if [[ -n $1 ]]; then
     dirs "$@"
   else
-    dirs -v | head -10
+    dirs -v | head -n 10
   fi
 }
 compdef _dirs d
diff --git a/lib/functions.zsh b/lib/functions.zsh
index 73b491a59..fc53611b8 100644
--- a/lib/functions.zsh
+++ b/lib/functions.zsh
@@ -1,7 +1,7 @@
 function zsh_stats() {
   fc -l 1 \
     | awk '{ CMD[$2]++; count++; } END { for (a in CMD) print CMD[a] " " CMD[a]*100/count "% " a }' \
-    | grep -v "./" | sort -nr | head -20 | column -c3 -s " " -t | nl
+    | grep -v "./" | sort -nr | head -n 20 | column -c3 -s " " -t | nl
 }
 
 function uninstall_oh_my_zsh() {
@@ -45,7 +45,7 @@ function takeurl() {
   data="$(mktemp)"
   curl -L "$1" > "$data"
   tar xf "$data"
-  thedir="$(tar tf "$data" | head -1)"
+  thedir="$(tar tf "$data" | head -n 1)"
   rm "$data"
   cd "$thedir"
 }
diff --git a/lib/git.zsh b/lib/git.zsh
index 9a615e77b..8623473b0 100644
--- a/lib/git.zsh
+++ b/lib/git.zsh
@@ -51,7 +51,7 @@ function parse_git_dirty() {
         FLAGS+="--ignore-submodules=${GIT_STATUS_IGNORE_SUBMODULES:-dirty}"
         ;;
     esac
-    STATUS=$(__git_prompt_git status ${FLAGS} 2> /dev/null | tail -1)
+    STATUS=$(__git_prompt_git status ${FLAGS} 2> /dev/null | tail -n 1)
   fi
   if [[ -n $STATUS ]]; then
     echo "$ZSH_THEME_GIT_PROMPT_DIRTY"
diff --git a/plugins/scd/scd b/plugins/scd/scd
index a7db6c265..7e9654b44 100755
--- a/plugins/scd/scd
+++ b/plugins/scd/scd
@@ -270,7 +270,7 @@ fi
 
 # Determine the last recorded directory
 if [[ -s ${SCD_HISTFILE} ]]; then
-    last_directory=${"$(tail -1 ${SCD_HISTFILE})"#*;}
+    last_directory=${"$(tail -n 1 ${SCD_HISTFILE})"#*;}
 fi
 
 # The "record" function adds its arguments to the directory index.
diff --git a/plugins/systemadmin/README.md b/plugins/systemadmin/README.md
index 052fc6edc..146b58605 100644
--- a/plugins/systemadmin/README.md
+++ b/plugins/systemadmin/README.md
@@ -17,9 +17,9 @@ plugins=(... systemadmin)
 | path    | `print -l $path`                                                           | Displays PATH with each entry on a separate line                   |
 | mkdir   | `mkdir -pv`                                                                | Automatically create parent directories and display verbose output |
 | psmem   | `ps -e -orss=,args= \| sort -b -k1 -nr`                                    | Display the processes using the most memory                        |
-| psmem10 | `ps -e -orss=,args= \| sort -b -k1 -nr \| head -10`                        | Display the top 10 processes using the most memory                 |
+| psmem10 | `ps -e -orss=,args= \| sort -b -k1 -nr \| head -n 10`                      | Display the top 10 processes using the most memory                 |
 | pscpu   | `ps -e -o pcpu,cpu,nice,state,cputime,args \|sort -k1 -nr`                 | Display the top processes using the most CPU                       |
-| pscpu10 | `ps -e -o pcpu,cpu,nice,state,cputime,args \|sort -k1 -nr \| head -10`     | Display the top 10 processes using the most CPU                    |
+| pscpu10 | `ps -e -o pcpu,cpu,nice,state,cputime,args \|sort -k1 -nr \| head -n 10`   | Display the top 10 processes using the most CPU                    |
 | hist10  | `print -l ${(o)history%% *} \| uniq -c \| sort -nr \| head -n 10`          | Display the top 10 most used commands in the history               |
 
 ## Functions
diff --git a/plugins/systemadmin/systemadmin.plugin.zsh b/plugins/systemadmin/systemadmin.plugin.zsh
index a77f0069b..2f9d1ef35 100644
--- a/plugins/systemadmin/systemadmin.plugin.zsh
+++ b/plugins/systemadmin/systemadmin.plugin.zsh
@@ -26,10 +26,10 @@ alias path='print -l $path'
 alias mkdir='mkdir -pv'
 # get top process eating memory
 alias psmem='ps -e -orss=,args= | sort -b -k1 -nr'
-alias psmem10='ps -e -orss=,args= | sort -b -k1 -nr | head -10'
+alias psmem10='ps -e -orss=,args= | sort -b -k1 -nr | head -n 10'
 # get top process eating cpu if not work try excute : export LC_ALL='C'
 alias pscpu='ps -e -o pcpu,cpu,nice,state,cputime,args|sort -k1,1n -nr'
-alias pscpu10='ps -e -o pcpu,cpu,nice,state,cputime,args|sort -k1,1n -nr | head -10'
+alias pscpu10='ps -e -o pcpu,cpu,nice,state,cputime,args|sort -k1,1n -nr | head -n 10'
 # top10 of the history
 alias hist10='print -l ${(o)history%% *} | uniq -c | sort -nr | head -n 10'
 
@@ -74,7 +74,7 @@ req20() {
 
 # top20 of Using tcpdump port 80 access to view
 http20() {
-    sudo tcpdump -i eth0 -tnn dst port 80 -c 1000 | awk -F"." '{print $1"."$2"."$3"."$4}' | sort | uniq -c | sort -nr |head -20
+    sudo tcpdump -i eth0 -tnn dst port 80 -c 1000 | awk -F"." '{print $1"."$2"."$3"."$4}' | sort | uniq -c | sort -nr |head -n 20
 }
 
 # top20 of Find time_wait connection
@@ -99,14 +99,14 @@ accessip10() {
 
 # top20 of Most Visited file or page
 visitpage20() {
-    awk '{print $11}' "$(retlog)"|sort|uniq -c|sort -nr|head -20
+    awk '{print $11}' "$(retlog)"|sort|uniq -c|sort -nr|head -n 20
 }
 
 # top100 of Page lists the most time-consuming (more than 60 seconds) as well as the corresponding page number of occurrences
 consume100() {
-    awk '($NF > 60 && $7~/\.php/){print $7}' "$(retlog)" |sort -n|uniq -c|sort -nr|head -100
+    awk '($NF > 60 && $7~/\.php/){print $7}' "$(retlog)" |sort -n|uniq -c|sort -nr|head -n 100
     # if django website or other webiste make by no suffix language
-    # awk '{print $7}' "$(retlog)" |sort -n|uniq -c|sort -nr|head -100
+    # awk '{print $7}' "$(retlog)" |sort -n|uniq -c|sort -nr|head -n 100
 }
 
 # Website traffic statistics (G)
diff --git a/tools/install.sh b/tools/install.sh
index 7704107c8..ca996f8a7 100755
--- a/tools/install.sh
+++ b/tools/install.sh
@@ -311,7 +311,7 @@ EOF
     # 1. Use the most preceding one based on $PATH, then check that it's in the shells file
     # 2. If that fails, get a zsh path from the shells file, then check it actually exists
     if ! zsh=$(command -v zsh) || ! grep -qx "$zsh" "$shells_file"; then
-      if ! zsh=$(grep '^/.*/zsh$' "$shells_file" | tail -1) || [ ! -f "$zsh" ]; then
+      if ! zsh=$(grep '^/.*/zsh$' "$shells_file" | tail -n 1) || [ ! -f "$zsh" ]; then
         fmt_error "no zsh binary found or not present in '$shells_file'"
         fmt_error "change your default shell manually."
         return

From 4a74349635cf30d305766b459c7cc3246831676e Mon Sep 17 00:00:00 2001
From: Janusz Mordarski <janusz.m@gmail.com>
Date: Tue, 9 Nov 2021 09:50:25 +0100
Subject: [PATCH 545/869] feat(refined): allow selecting git branch by changing
 prefix to `:` (#10400)

---
 themes/refined.zsh-theme | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/themes/refined.zsh-theme b/themes/refined.zsh-theme
index 2a4188c9d..5d39bd757 100644
--- a/themes/refined.zsh-theme
+++ b/themes/refined.zsh-theme
@@ -33,8 +33,8 @@ autoload -Uz vcs_info
 zstyle ':vcs_info:*' enable hg bzr git
 zstyle ':vcs_info:*:*' unstagedstr '!'
 zstyle ':vcs_info:*:*' stagedstr '+'
-zstyle ':vcs_info:*:*' formats "$FX[bold]%r$FX[no-bold]/%S" "%s/%b" "%%u%c"
-zstyle ':vcs_info:*:*' actionformats "$FX[bold]%r$FX[no-bold]/%S" "%s/%b" "%u%c (%a)"
+zstyle ':vcs_info:*:*' formats "$FX[bold]%r$FX[no-bold]/%S" "%s:%b" "%%u%c"
+zstyle ':vcs_info:*:*' actionformats "$FX[bold]%r$FX[no-bold]/%S" "%s:%b" "%u%c (%a)"
 zstyle ':vcs_info:*:*' nvcsformats "%~" "" ""
 
 # Fastest possible way to check if repo is dirty

From 3dc66bd3676a564e3864fb5ccf5641c65fd42c6f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Tue, 9 Nov 2021 10:25:23 +0100
Subject: [PATCH 546/869] fix(emotty): fix glyphs output width in emotty theme

---
 themes/emotty.zsh-theme | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/themes/emotty.zsh-theme b/themes/emotty.zsh-theme
index 13adad78d..044b317e8 100644
--- a/themes/emotty.zsh-theme
+++ b/themes/emotty.zsh-theme
@@ -51,9 +51,9 @@ root_prompt="$emoji[skull]"
 warn_prompt="$emoji[collision_symbol]"
 
 vcs_unstaged_glyph="%{$emoji[circled_latin_capital_letter_m]$emoji2[emoji_style] %2G%}"
-vcs_staged_glyph="%{$emoji[high_voltage_sign] %2G%}"
-vcs_branch_glyph=$(print -P $'\Ue0a0') #  
-vcs_action_glyph=$(print -P $'\U276f') # ❯
+vcs_staged_glyph="%{$emoji[high_voltage_sign]%2G%}"
+vcs_branch_glyph=$'\Ue0a0' # 
+vcs_action_glyph=$'\U276f' # ❯
 
 red="$FG[001]"
 yellow="$FG[003]"

From 9a11b34101a218532f5133b78e55e48e3dbeb2e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Tue, 9 Nov 2021 12:03:59 +0100
Subject: [PATCH 547/869] fix(cli): fix check for completion files in `omz
 plugin load`

---
 lib/cli.zsh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/cli.zsh b/lib/cli.zsh
index 0b6bbc6cb..2975acb91 100644
--- a/lib/cli.zsh
+++ b/lib/cli.zsh
@@ -446,9 +446,9 @@ function _omz::plugin::load {
     fi
 
     # Check if it has completion to reload compinit
-    if [[ -f "$base/_$plugin" ]]; then
-      has_completion=1
-    fi
+    local -a comp_files
+    comp_files=($base/_*(N))
+    has_completion=$(( $#comp_files > 0 ))
 
     # Load the plugin
     if [[ -f "$base/$plugin.plugin.zsh" ]]; then

From 5c2440cb0c2ee70afb33bda3954a93abe37c34f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Tue, 9 Nov 2021 12:07:23 +0100
Subject: [PATCH 548/869] style(frontend-search): rename completion file to
 `_frontend`

---
 plugins/frontend-search/{_frontend-search.sh => _frontend} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename plugins/frontend-search/{_frontend-search.sh => _frontend} (100%)

diff --git a/plugins/frontend-search/_frontend-search.sh b/plugins/frontend-search/_frontend
similarity index 100%
rename from plugins/frontend-search/_frontend-search.sh
rename to plugins/frontend-search/_frontend

From db19589fcf03690a443f1a206361963b47809b93 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Tue, 9 Nov 2021 19:27:43 +0100
Subject: [PATCH 549/869] refactor(updater): simplify check for available
 updates

---
 tools/check_for_upgrade.sh | 29 +++++++++++++----------------
 1 file changed, 13 insertions(+), 16 deletions(-)

diff --git a/tools/check_for_upgrade.sh b/tools/check_for_upgrade.sh
index 8264762b6..70cd21f84 100644
--- a/tools/check_for_upgrade.sh
+++ b/tools/check_for_upgrade.sh
@@ -58,23 +58,20 @@ function is_update_available() {
   local local_head
   local_head=$(git -C "$ZSH" rev-parse $branch 2>/dev/null) || return 0
 
-  # Get remote HEAD. If we can't get it assume there are updates unless there is no connection:
-  # - curl: 6 (could not resolve) or 7 (could not connect)
-  # - wget: 4 (network unreachable)
-  # - fetch: 1 (no route to host)
-  local remote_head ret
+  # Get remote HEAD. If no suitable command is found assume there are updates
+  # On any other error, skip the update (connection may be down)
+  local remote_head
   remote_head=$(
-    curl -fsSL -H 'Accept: application/vnd.github.v3.sha' $api_url 2>/dev/null || {
-      [[ $? -eq 6 || $? -eq 7 ]] && exit 1
-    } || wget -O- --header='Accept: application/vnd.github.v3.sha' $api_url 2>/dev/null || {
-      [[ $? -eq 4 ]] && exit 1
-    } || HTTP_ACCEPT='Accept: application/vnd.github.v3.sha' fetch -o - $api_url 2>/dev/null || {
-      [[ $? -eq 1 ]] && exit 1
-    } || exit 0
-  )
-
-  # If can't fetch remote HEAD, return exit code
-  ret=$?; [[ -n "$remote_head" ]] || return $ret
+    if (( ${+commands[curl]} )); then
+      curl -fsSL -H 'Accept: application/vnd.github.v3.sha' $api_url 2>/dev/null
+    elif (( ${+commands[wget]} )); then
+      wget -O- --header='Accept: application/vnd.github.v3.sha' $api_url 2>/dev/null
+    elif (( ${+commands[fetch]} )); then
+      HTTP_ACCEPT='Accept: application/vnd.github.v3.sha' fetch -o - $api_url 2>/dev/null
+    else
+      exit 0
+    fi
+  ) || return 1
 
   # Compare local and remote HEADs
   [[ "$local_head" != "$remote_head" ]]

From e3f7b8aa570a09186a7e3d1877b36d7e43d39197 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Wed, 10 Nov 2021 11:21:59 +0100
Subject: [PATCH 550/869] fix(updater): avoid `git -C` for compatibility with
 git < v1.8.5 (#10404)

Fixes #10404
---
 tools/check_for_upgrade.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tools/check_for_upgrade.sh b/tools/check_for_upgrade.sh
index 70cd21f84..a6fdf4659 100644
--- a/tools/check_for_upgrade.sh
+++ b/tools/check_for_upgrade.sh
@@ -34,11 +34,11 @@ function current_epoch() {
 
 function is_update_available() {
   local branch
-  branch=${"$(git -C "$ZSH" config --local oh-my-zsh.branch)":-master}
+  branch=${"$(cd "$ZSH"; git config --local oh-my-zsh.branch)":-master}
 
   local remote remote_url remote_repo
-  remote=${"$(git -C "$ZSH" config --local oh-my-zsh.remote)":-origin}
-  remote_url=$(git -C "$ZSH" config remote.$remote.url)
+  remote=${"$(cd "$ZSH"; git config --local oh-my-zsh.remote)":-origin}
+  remote_url=$(cd "$ZSH"; git config remote.$remote.url)
 
   local repo
   case "$remote_url" in
@@ -56,7 +56,7 @@ function is_update_available() {
 
   # Get local HEAD. If this fails assume there are updates
   local local_head
-  local_head=$(git -C "$ZSH" rev-parse $branch 2>/dev/null) || return 0
+  local_head=$(cd "$ZSH"; git rev-parse $branch 2>/dev/null) || return 0
 
   # Get remote HEAD. If no suitable command is found assume there are updates
   # On any other error, skip the update (connection may be down)

From 1d166eaaa138d7413365205c61412ccb68286b3a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Wed, 10 Nov 2021 11:35:17 +0100
Subject: [PATCH 551/869] fix(cli): avoid `git -C` for compatibility with git <
 v1.8.5 (#10404)

---
 lib/cli.zsh | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/lib/cli.zsh b/lib/cli.zsh
index 2975acb91..d90cc6469 100644
--- a/lib/cli.zsh
+++ b/lib/cli.zsh
@@ -36,7 +36,7 @@ function _omz {
   elif (( CURRENT == 3 )); then
     case "$words[2]" in
       changelog) local -a refs
-        refs=("${(@f)$(command git -C "$ZSH" for-each-ref --format="%(refname:short):%(subject)" refs/heads refs/tags)}")
+        refs=("${(@f)$(cd "$ZSH"; command git for-each-ref --format="%(refname:short):%(subject)" refs/heads refs/tags)}")
         _describe 'command' refs ;;
       plugin) subcmds=(
         'disable:Disable plugin(s)'
@@ -171,9 +171,12 @@ EOF
 function _omz::changelog {
   local version=${1:-HEAD} format=${3:-"--text"}
 
-  if ! command git -C "$ZSH" show-ref --verify refs/heads/$version &>/dev/null && \
-    ! command git -C "$ZSH" show-ref --verify refs/tags/$version &>/dev/null && \
-    ! command git -C "$ZSH" rev-parse --verify "${version}^{commit}" &>/dev/null; then
+  if (
+    cd "$ZSH"
+    ! command git show-ref --verify refs/heads/$version && \
+    ! command git show-ref --verify refs/tags/$version && \
+    ! command git rev-parse --verify "${version}^{commit}"
+  ) &>/dev/null; then
     cat >&2 <<EOF
 Usage: omz changelog [version]
 

From 22de1d304c730c6e364a57a7b901978bd2fcd061 Mon Sep 17 00:00:00 2001
From: Kirill Molchanov <k03.mad@gmail.com>
Date: Wed, 10 Nov 2021 17:03:38 +0300
Subject: [PATCH 552/869] fix(command-not-found): pass arguments correctly in
 Termux (#10403)

---
 plugins/command-not-found/command-not-found.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/command-not-found/command-not-found.plugin.zsh b/plugins/command-not-found/command-not-found.plugin.zsh
index cb96fe063..e46350604 100644
--- a/plugins/command-not-found/command-not-found.plugin.zsh
+++ b/plugins/command-not-found/command-not-found.plugin.zsh
@@ -57,6 +57,6 @@ fi
 # Termux: https://github.com/termux/command-not-found
 if [[ -x /data/data/com.termux/files/usr/libexec/termux/command-not-found ]]; then
   command_not_found_handler() {
-    /data/data/com.termux/files/usr/libexec/termux/command-not-found -- "$1"
+    /data/data/com.termux/files/usr/libexec/termux/command-not-found "$1"
   }
 fi

From 1448d234d6d9c25f64a48b16379b34db28a36898 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Thu, 11 Nov 2021 17:20:07 +0100
Subject: [PATCH 553/869] fix(dirhistory): fix Up/Down key bindings for
 Terminal.app

Reference: https://github.com/ohmyzsh/ohmyzsh/commit/7f49494#commitcomment-60117011
---
 plugins/dirhistory/dirhistory.plugin.zsh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/dirhistory/dirhistory.plugin.zsh b/plugins/dirhistory/dirhistory.plugin.zsh
index 26ef07494..971eb6540 100644
--- a/plugins/dirhistory/dirhistory.plugin.zsh
+++ b/plugins/dirhistory/dirhistory.plugin.zsh
@@ -182,7 +182,7 @@ bindkey "\e\e[A" dirhistory_zle_dirhistory_up   # Putty
 bindkey "\eO3A" dirhistory_zle_dirhistory_up    # GNU screen
 case "$TERM_PROGRAM" in
 iTerm.app) bindkey "^[^[[A" dirhistory_zle_dirhistory_up ;;     # iTerm2
-Apple_Terminal) bindkey "^[OA" dirhistory_zle_dirhistory_up ;;  # Terminal.app
+Apple_Terminal) bindkey "^[[A" dirhistory_zle_dirhistory_up ;;  # Terminal.app
 esac
 if (( ${+terminfo[kcuu1]} )); then
   bindkey "^[${terminfo[kcuu1]}" dirhistory_zle_dirhistory_up # urxvt
@@ -195,7 +195,7 @@ bindkey "\e\e[B" dirhistory_zle_dirhistory_down   # Putty
 bindkey "\eO3B" dirhistory_zle_dirhistory_down    # GNU screen
 case "$TERM_PROGRAM" in
 iTerm.app) bindkey "^[^[[B" dirhistory_zle_dirhistory_down ;;     # iTerm2
-Apple_Terminal) bindkey "^[OB" dirhistory_zle_dirhistory_down ;;  # Terminal.app
+Apple_Terminal) bindkey "^[[B" dirhistory_zle_dirhistory_down ;;  # Terminal.app
 esac
 if (( ${+terminfo[kcud1]} )); then
   bindkey "^[${terminfo[kcud1]}" dirhistory_zle_dirhistory_down # urxvt

From 6cb41b70a6d04301fd50cd5862ecd705ba226c0e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Mon, 8 Nov 2021 17:46:14 +0100
Subject: [PATCH 554/869] fix(lib): fix `omz_urldecode` unsafe eval bug

The `omz_urldecode` function uses an eval to decode the input which can be
exploited to inject commands. This is used only in the svn plugin and it
requires a complex process to exploit, so it is highly unlikely to have been
used by an attacker.
---
 lib/functions.zsh | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/lib/functions.zsh b/lib/functions.zsh
index fc53611b8..61f4dd49e 100644
--- a/lib/functions.zsh
+++ b/lib/functions.zsh
@@ -237,12 +237,11 @@ function omz_urldecode {
   tmp=${tmp:gs/\\/\\\\/}
   # Handle %-escapes by turning them into `\xXX` printf escapes
   tmp=${tmp:gs/%/\\x/}
-  local decoded
-  eval "decoded=\$'$tmp'"
+  local decoded="$(printf -- "$tmp")"
 
   # Now we have a UTF-8 encoded string in the variable. We need to re-encode
   # it if caller is in a non-UTF-8 locale.
-  local safe_encodings
+  local -a safe_encodings
   safe_encodings=(UTF-8 utf8 US-ASCII)
   if [[ -z ${safe_encodings[(r)$caller_encoding]} ]]; then
     decoded=$(echo -E "$decoded" | iconv -f UTF-8 -t $caller_encoding)

From 06fc5fb12900d7ee5821a5f20b47be2c4b894ac0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Tue, 9 Nov 2021 15:05:53 +0100
Subject: [PATCH 555/869] fix(dirhistory): fix unsafe eval bug in back and
 forward widgets

The plugin unsafely processes directory paths in pop_past and pop_future.
This commit fixes that.
---
 plugins/dirhistory/dirhistory.plugin.zsh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/dirhistory/dirhistory.plugin.zsh b/plugins/dirhistory/dirhistory.plugin.zsh
index 971eb6540..e3f45ee99 100644
--- a/plugins/dirhistory/dirhistory.plugin.zsh
+++ b/plugins/dirhistory/dirhistory.plugin.zsh
@@ -19,14 +19,14 @@ export DIRHISTORY_SIZE=30
 # Returns the element if the array was not empty,
 # otherwise returns empty string.
 function pop_past() {
-  eval "$1='$dirhistory_past[$#dirhistory_past]'"
+  eval "$1=${(q)dirhistory_past[$#dirhistory_past]}"
   if [[ $#dirhistory_past -gt 0 ]]; then
     dirhistory_past[$#dirhistory_past]=()
   fi
 }
 
 function pop_future() {
-  eval "$1='$dirhistory_future[$#dirhistory_future]'"
+  eval "$1=${(q)dirhistory_future[$#dirhistory_future]}"
   if [[ $#dirhistory_future -gt 0 ]]; then
     dirhistory_future[$#dirhistory_future]=()
   fi

From a263cdac9c15de4003d3289a53cad1d19c8cfb3f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Tue, 9 Nov 2021 09:08:18 +0100
Subject: [PATCH 556/869] fix(lib): fix potential command injection in `title`
 and `spectrum` functions

The `title` function unsafely prints its input without sanitization, which if used
with custom user code that calls it, it could trigger command injection.

The `spectrum_ls` and `spectrum_bls` could similarly be exploited if a variable is
changed in the user's shell environment with a carefully crafted value. This is
highly unlikely to occur (and if possible, other methods would be used instead),
but with this change the exploit of these two functions is now impossible.
---
 lib/spectrum.zsh    |  6 ++++--
 lib/termsupport.zsh | 13 ++++++-------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/lib/spectrum.zsh b/lib/spectrum.zsh
index d5c22a8c5..97f5c360a 100644
--- a/lib/spectrum.zsh
+++ b/lib/spectrum.zsh
@@ -20,16 +20,18 @@ done
 
 # Show all 256 colors with color number
 function spectrum_ls() {
+  setopt localoptions nopromptsubst
   local ZSH_SPECTRUM_TEXT=${ZSH_SPECTRUM_TEXT:-Arma virumque cano Troiae qui primus ab oris}
   for code in {000..255}; do
-    print -P -- "$code: $FG[$code]$ZSH_SPECTRUM_TEXT%{$reset_color%}"
+    print -P -- "$code: ${FG[$code]}${ZSH_SPECTRUM_TEXT}%{$reset_color%}"
   done
 }
 
 # Show all 256 colors where the background is set to specific color
 function spectrum_bls() {
+  setopt localoptions nopromptsubst
   local ZSH_SPECTRUM_TEXT=${ZSH_SPECTRUM_TEXT:-Arma virumque cano Troiae qui primus ab oris}
   for code in {000..255}; do
-    print -P -- "$code: $BG[$code]$ZSH_SPECTRUM_TEXT%{$reset_color%}"
+    print -P -- "$code: ${BG[$code]}${ZSH_SPECTRUM_TEXT}%{$reset_color%}"
   done
 }
diff --git a/lib/termsupport.zsh b/lib/termsupport.zsh
index ef0d78895..49f64400b 100644
--- a/lib/termsupport.zsh
+++ b/lib/termsupport.zsh
@@ -7,8 +7,7 @@
 # (In screen, only short_tab_title is used)
 # Limited support for Apple Terminal (Terminal can't set window and tab separately)
 function title {
-  emulate -L zsh
-  setopt prompt_subst
+  setopt localoptions nopromptsubst
 
   # Don't set the title if inside emacs, unless using vterm
   [[ -n "$INSIDE_EMACS" && "$INSIDE_EMACS" != vterm ]] && return
@@ -48,13 +47,13 @@ fi
 
 # Runs before showing the prompt
 function omz_termsupport_precmd {
-  [[ "${DISABLE_AUTO_TITLE:-}" == true ]] && return
-  title $ZSH_THEME_TERM_TAB_TITLE_IDLE $ZSH_THEME_TERM_TITLE_IDLE
+  [[ "${DISABLE_AUTO_TITLE:-}" != true ]] || return
+  title "$ZSH_THEME_TERM_TAB_TITLE_IDLE" "$ZSH_THEME_TERM_TITLE_IDLE"
 }
 
 # Runs before executing the command
 function omz_termsupport_preexec {
-  [[ "${DISABLE_AUTO_TITLE:-}" == true ]] && return
+  [[ "${DISABLE_AUTO_TITLE:-}" != true ]] || return
 
   emulate -L zsh
   setopt extended_glob
@@ -97,10 +96,10 @@ function omz_termsupport_preexec {
   fi
 
   # cmd name only, or if this is sudo or ssh, the next cmd
-  local CMD=${1[(wr)^(*=*|sudo|ssh|mosh|rake|-*)]:gs/%/%%}
+  local CMD="${1[(wr)^(*=*|sudo|ssh|mosh|rake|-*)]:gs/%/%%}"
   local LINE="${2:gs/%/%%}"
 
-  title '$CMD' '%100>...>$LINE%<<'
+  title "$CMD" "%100>...>${LINE}%<<"
 }
 
 autoload -Uz add-zsh-hook

From 72928432f1ddaa244e02067dd7fc14948a4a5ce4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Tue, 9 Nov 2021 09:31:09 +0100
Subject: [PATCH 557/869] fix(plugins): fix potential command injection in
 `rand-quote` and `hitokoto`

The `rand-quote` plugin uses quotationspage.com and prints part of its content to the
shell without sanitization, which could trigger command injection. There is no evidence
that this has been exploited, but this commit removes all possibility for exploit.

Similarly, the `hitokoto` plugin uses the hitokoto.cn website to print quotes to the
shell, also without sanitization. Furthermore, there is also no evidence that this has
been exploited, but with this change it is now impossible.
---
 plugins/hitokoto/hitokoto.plugin.zsh     | 18 +++++++++++-------
 plugins/rand-quote/rand-quote.plugin.zsh | 23 ++++++++++++++++-------
 2 files changed, 27 insertions(+), 14 deletions(-)

diff --git a/plugins/hitokoto/hitokoto.plugin.zsh b/plugins/hitokoto/hitokoto.plugin.zsh
index 8646ebf3b..e346d18c5 100644
--- a/plugins/hitokoto/hitokoto.plugin.zsh
+++ b/plugins/hitokoto/hitokoto.plugin.zsh
@@ -1,14 +1,18 @@
 if ! (( $+commands[curl] )); then
-    echo "hitokoto plugin needs curl to work" >&2
-    return
+  echo "hitokoto plugin needs curl to work" >&2
+  return
 fi
 
 function hitokoto {
-    emulate -L zsh
-    Q=$(curl -s --connect-timeout 2 "https://v1.hitokoto.cn" | jq -j '.hitokoto+"\t"+.from')
+  setopt localoptions nopromptsubst
 
-    TXT=$(echo "$Q" | awk -F '\t' '{print $1}')
-    WHO=$(echo "$Q" | awk -F '\t' '{print $2}')
+  # Get hitokoto data
+  local -a data
+  data=("${(ps:\n:)"$(command curl -s --connect-timeout 2 "https://v1.hitokoto.cn" | command jq -j '.hitokoto+"\n"+.from')"}")
 
-    [[ -n "$WHO" && -n "$TXT" ]] && print -P "%F{3}${WHO}%f: “%F{5}${TXT}%f”"
+  # Exit if could not fetch hitokoto
+  [[ -n "$data" ]] || return 0
+
+  local quote="${data[1]}" author="${data[2]}"
+  print -P "%F{3}${author}%f: “%F{5}${quote}%f”"
 }
diff --git a/plugins/rand-quote/rand-quote.plugin.zsh b/plugins/rand-quote/rand-quote.plugin.zsh
index 371b997d3..23c21dc8f 100644
--- a/plugins/rand-quote/rand-quote.plugin.zsh
+++ b/plugins/rand-quote/rand-quote.plugin.zsh
@@ -1,14 +1,23 @@
 if ! (( $+commands[curl] )); then
-    echo "rand-quote plugin needs curl to work" >&2
-    return
+  echo "rand-quote plugin needs curl to work" >&2
+  return
 fi
 
 function quote {
-    emulate -L zsh
-    Q=$(curl -s --connect-timeout 2 "http://www.quotationspage.com/random.php" | iconv -c -f ISO-8859-1 -t UTF-8 | grep -m 1 "dt ")
+  setopt localoptions nopromptsubst
 
-    TXT=$(echo "$Q" | sed -e 's/<\/dt>.*//g' -e 's/.*html//g' -e 's/^[^a-zA-Z]*//' -e 's/<\/a..*$//g')
-    WHO=$(echo "$Q" | sed -e 's/.*\/quotes\///g' -e 's/<.*//g' -e 's/.*">//g')
+  # Get random quote data
+  local data
+  data="$(command curl -s --connect-timeout 2 "http://www.quotationspage.com/random.php" \
+    | iconv -c -f ISO-8859-1 -t UTF-8 \
+    | command grep -a -m 1 'dt class="quote"')"
 
-    [[ -n "$WHO" && -n "$TXT" ]] && print -P "%F{3}${WHO}%f: “%F{5}${TXT}%f”"
+  # Exit if could not fetch random quote
+  [[ -n "$data" ]] || return 0
+
+  local quote author
+  quote=$(sed -e 's|</dt>.*||g' -e 's|.*html||g' -e 's|^[^a-zA-Z]*||' -e 's|</a..*$||g' <<< "$data")
+  author=$(sed -e 's|.*/quotes/||g' -e 's|<.*||g' -e 's|.*">||g' <<< "$data")
+
+  print -P "%F{3}${author}%f: “%F{5}${quote}%f”"
 }

From b3ba9978cc42a5031c7b68e3cf917ec2e64643bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Tue, 9 Nov 2021 09:54:21 +0100
Subject: [PATCH 558/869] fix(themes): fix potential command injection in
 `pygmalion`, `pygmalion-virtualenv` and `refined`

The pygmalion and pygmalion-virtualenv themes unsafely handle git prompt information
which results in a double evaluation of this information, so a malicious git repository
could trigger a command injection if the user cloned and entered the repository.

A similar method could be used in the refined theme. All themes have been patched against this
vulnerability.
---
 themes/pygmalion-virtualenv.zsh-theme | 11 ++++++-----
 themes/pygmalion.zsh-theme            |  6 +++---
 themes/refined.zsh-theme              |  1 +
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/themes/pygmalion-virtualenv.zsh-theme b/themes/pygmalion-virtualenv.zsh-theme
index 47b0b4fb1..c2ab7f4e6 100644
--- a/themes/pygmalion-virtualenv.zsh-theme
+++ b/themes/pygmalion-virtualenv.zsh-theme
@@ -35,19 +35,20 @@ prompt_setup_pygmalion(){
 }
 
 prompt_pygmalion_precmd(){
-  setopt localoptions extendedglob
+  setopt localoptions nopromptsubst extendedglob
 
   local gitinfo=$(git_prompt_info)
   local gitinfo_nocolor=${gitinfo//\%\{[^\}]##\}}
-  local exp_nocolor="$(print -P \"$base_prompt_nocolor$gitinfo_nocolor$post_prompt_nocolor\")"
+  local exp_nocolor="$(print -P \"${base_prompt_nocolor}${gitinfo_nocolor}${post_prompt_nocolor}\")"
   local prompt_length=${#exp_nocolor}
 
+  # add new line on prompt longer than 40 characters
   local nl=""
-
   if [[ $prompt_length -gt 40 ]]; then
-    nl=$'\n%{\r%}';
+    nl=$'\n%{\r%}'
   fi
-  PROMPT="$base_prompt$gitinfo$nl$post_prompt"
+
+  PROMPT="${base_prompt}\$(git_prompt_info)${nl}${post_prompt}"
 }
 
 prompt_setup_pygmalion
diff --git a/themes/pygmalion.zsh-theme b/themes/pygmalion.zsh-theme
index b13adfd5f..be9ca3889 100644
--- a/themes/pygmalion.zsh-theme
+++ b/themes/pygmalion.zsh-theme
@@ -19,14 +19,14 @@ prompt_setup_pygmalion(){
 }
 
 prompt_pygmalion_precmd(){
-  setopt localoptions extendedglob
+  setopt localoptions nopromptsubst extendedglob
 
   local gitinfo=$(git_prompt_info)
   local gitinfo_nocolor=${gitinfo//\%\{[^\}]##\}}
-  local exp_nocolor="$(print -P \"$base_prompt_nocolor$gitinfo_nocolor$post_prompt_nocolor\")"
+  local exp_nocolor="$(print -P \"${base_prompt_nocolor}${gitinfo_nocolor}${post_prompt_nocolor}\")"
   local prompt_length=${#exp_nocolor}
 
-  PROMPT="${base_prompt}${gitinfo}${post_prompt}"
+  PROMPT="${base_prompt}\$(git_prompt_info)${post_prompt}"
 }
 
 prompt_setup_pygmalion
diff --git a/themes/refined.zsh-theme b/themes/refined.zsh-theme
index 5d39bd757..5e2de7a87 100644
--- a/themes/refined.zsh-theme
+++ b/themes/refined.zsh-theme
@@ -70,6 +70,7 @@ preexec() {
 # Output additional information about paths, repos and exec time
 #
 precmd() {
+    setopt localoptions nopromptsubst
     vcs_info # Get version control info before we start outputting stuff
     print -P "\n$(repo_information) %F{yellow}$(cmd_exec_time)%f"
     unset cmd_timestamp #Reset cmd exec time.

From 2c06852546f52330c389b53a1b81348e62f64423 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Tue, 16 Nov 2021 17:18:07 +0100
Subject: [PATCH 559/869] style(dirhistory): remove use of `eval` completely

---
 plugins/dirhistory/dirhistory.plugin.zsh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/dirhistory/dirhistory.plugin.zsh b/plugins/dirhistory/dirhistory.plugin.zsh
index e3f45ee99..9f39264cf 100644
--- a/plugins/dirhistory/dirhistory.plugin.zsh
+++ b/plugins/dirhistory/dirhistory.plugin.zsh
@@ -19,14 +19,14 @@ export DIRHISTORY_SIZE=30
 # Returns the element if the array was not empty,
 # otherwise returns empty string.
 function pop_past() {
-  eval "$1=${(q)dirhistory_past[$#dirhistory_past]}"
+  print -v $1 "${dirhistory_past[$#dirhistory_past]}"
   if [[ $#dirhistory_past -gt 0 ]]; then
     dirhistory_past[$#dirhistory_past]=()
   fi
 }
 
 function pop_future() {
-  eval "$1=${(q)dirhistory_future[$#dirhistory_future]}"
+  print -v $1 "${dirhistory_future[$#dirhistory_future]}"
   if [[ $#dirhistory_future -gt 0 ]]; then
     dirhistory_future[$#dirhistory_future]=()
   fi

From fb12e4135311b9c4189a7e4556be619922052f6b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Tue, 16 Nov 2021 18:38:59 +0100
Subject: [PATCH 560/869] fix(install): fix backslash in `printf` when showing
 logo (#10422)

Fixes #10422
---
 tools/install.sh | 10 +++++-----
 tools/upgrade.sh | 12 ++++++------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/tools/install.sh b/tools/install.sh
index ca996f8a7..47166059d 100755
--- a/tools/install.sh
+++ b/tools/install.sh
@@ -339,11 +339,11 @@ EOF
 
 # shellcheck disable=SC2183  # printf string has more %s than arguments ($RAINBOW expands to multiple arguments)
 print_success() {
-  printf '%s         %s__      %s           %s        %s       %s     %s__   %s\n' $RAINBOW $RESET
-  printf '%s  ____  %s/ /_    %s ____ ___  %s__  __  %s ____  %s_____%s/ /_  %s\n' $RAINBOW $RESET
-  printf '%s / __ \%s/ __ \  %s / __ `__ \%s/ / / / %s /_  / %s/ ___/%s __ \ %s\n' $RAINBOW $RESET
-  printf '%s/ /_/ /%s / / / %s / / / / / /%s /_/ / %s   / /_%s(__  )%s / / / %s\n' $RAINBOW $RESET
-  printf '%s\____/%s_/ /_/ %s /_/ /_/ /_/%s\__, / %s   /___/%s____/%s_/ /_/  %s\n' $RAINBOW $RESET
+  printf '%s         %s__      %s           %s        %s       %s     %s__   %s\n'      $RAINBOW $RESET
+  printf '%s  ____  %s/ /_    %s ____ ___  %s__  __  %s ____  %s_____%s/ /_  %s\n'      $RAINBOW $RESET
+  printf '%s / __ \\%s/ __ \\  %s / __ `__ \\%s/ / / / %s /_  / %s/ ___/%s __ \\ %s\n'  $RAINBOW $RESET
+  printf '%s/ /_/ /%s / / / %s / / / / / /%s /_/ / %s   / /_%s(__  )%s / / / %s\n'      $RAINBOW $RESET
+  printf '%s\\____/%s_/ /_/ %s /_/ /_/ /_/%s\\__, / %s   /___/%s____/%s_/ /_/  %s\n'    $RAINBOW $RESET
   printf '%s    %s        %s           %s /____/ %s       %s     %s          %s....is now installed!%s\n' $RAINBOW $GREEN $RESET
   printf '\n'
   printf '\n'
diff --git a/tools/upgrade.sh b/tools/upgrade.sh
index 7642858fe..994ffe9c9 100755
--- a/tools/upgrade.sh
+++ b/tools/upgrade.sh
@@ -182,12 +182,12 @@ if git pull --rebase --stat $remote $branch; then
     printf "${BLUE}%s \`${BOLD}%s${RESET}${BLUE}\`${RESET}\n" "You can see the changelog with" "omz changelog"
   fi
 
-  printf '%s         %s__      %s           %s        %s       %s     %s__   %s\n' $RAINBOW $RESET
-  printf '%s  ____  %s/ /_    %s ____ ___  %s__  __  %s ____  %s_____%s/ /_  %s\n' $RAINBOW $RESET
-  printf '%s / __ \%s/ __ \  %s / __ `__ \%s/ / / / %s /_  / %s/ ___/%s __ \ %s\n' $RAINBOW $RESET
-  printf '%s/ /_/ /%s / / / %s / / / / / /%s /_/ / %s   / /_%s(__  )%s / / / %s\n' $RAINBOW $RESET
-  printf '%s\____/%s_/ /_/ %s /_/ /_/ /_/%s\__, / %s   /___/%s____/%s_/ /_/  %s\n' $RAINBOW $RESET
-  printf '%s    %s        %s           %s /____/ %s       %s     %s          %s\n' $RAINBOW $RESET
+  printf '%s         %s__      %s           %s        %s       %s     %s__   %s\n'      $RAINBOW $RESET
+  printf '%s  ____  %s/ /_    %s ____ ___  %s__  __  %s ____  %s_____%s/ /_  %s\n'      $RAINBOW $RESET
+  printf '%s / __ \\%s/ __ \\  %s / __ `__ \\%s/ / / / %s /_  / %s/ ___/%s __ \\ %s\n'  $RAINBOW $RESET
+  printf '%s/ /_/ /%s / / / %s / / / / / /%s /_/ / %s   / /_%s(__  )%s / / / %s\n'      $RAINBOW $RESET
+  printf '%s\\____/%s_/ /_/ %s /_/ /_/ /_/%s\\__, / %s   /___/%s____/%s_/ /_/  %s\n'    $RAINBOW $RESET
+  printf '%s    %s        %s           %s /____/ %s       %s     %s          %s\n'      $RAINBOW $RESET
   printf '\n'
   printf "${BLUE}%s${RESET}\n\n" "$message"
   printf "${BLUE}${BOLD}%s %s${RESET}\n" "To keep up with the latest news and updates, follow us on Twitter:" "$(fmt_link @ohmyzsh https://twitter.com/ohmyzsh)"

From 60b89cd264a5d889573704f5116cefc8e690062c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Wed, 17 Nov 2021 09:55:39 +0100
Subject: [PATCH 561/869] feat(ssh-agent): add `quiet` option to silence plugin
 (#9659)

Closes #9659

Co-authored-by: Jeff Warner <jeff@develops.software>
---
 plugins/ssh-agent/README.md            | 56 +++++++++++++++-----------
 plugins/ssh-agent/ssh-agent.plugin.zsh | 12 +++---
 2 files changed, 38 insertions(+), 30 deletions(-)

diff --git a/plugins/ssh-agent/README.md b/plugins/ssh-agent/README.md
index 1d6914ec6..fa6a996d4 100644
--- a/plugins/ssh-agent/README.md
+++ b/plugins/ssh-agent/README.md
@@ -13,28 +13,24 @@ plugins=(... ssh-agent)
 
 **IMPORTANT: put these settings _before_ the line that sources oh-my-zsh**
 
+### `agent-forwarding`
+
 To enable **agent forwarding support** add the following to your zshrc file:
 
 ```zsh
-zstyle :omz:plugins:ssh-agent agent-forwarding on
+zstyle :omz:plugins:ssh-agent agent-forwarding yes
 ```
 
-----
+### `helper`
 
-To **NOT load any identities on start** use the `lazy` setting. This is particularly
-useful when combined with the `AddKeysToAgent` setting (available since OpenSSH 7.2),
-since it allows to enter the password only on first use. _NOTE: you can know your
-OpenSSH version with `ssh -V`._
+To set an **external helper** to ask for the passwords and possibly store
+them in the system keychain use the `helper` style. For example:
 
 ```zsh
-zstyle :omz:plugins:ssh-agent lazy yes
+zstyle :omz:plugins:ssh-agent helper ksshaskpass
 ```
 
-You can enable `AddKeysToAgent` by passing `-o AddKeysToAgent=yes` to the `ssh` command,
-or by adding `AddKeysToAgent yes` to your `~/.ssh/config` file [1].
-See the [OpenSSH 7.2 Release Notes](http://www.openssh.com/txt/release-7.2).
-
-----
+### `identities`
 
 To **load multiple identities** use the `identities` style (**this has no effect
 if the `lazy` setting is enabled**). For example:
@@ -52,7 +48,22 @@ zstyle :omz:plugins:ssh-agent identities ~/.config/ssh/id_rsa ~/.config/ssh/id_r
 zstyle :omz:plugins:ssh-agent identities ~/.config/ssh/{id_rsa,id_rsa2,id_github}
 ```
 
-----
+### `lazy`
+
+To **NOT load any identities on start** use the `lazy` setting. This is particularly
+useful when combined with the `AddKeysToAgent` setting (available since OpenSSH 7.2),
+since it allows to enter the password only on first use. _NOTE: you can know your
+OpenSSH version with `ssh -V`._
+
+```zsh
+zstyle :omz:plugins:ssh-agent lazy yes
+```
+
+You can enable `AddKeysToAgent` by passing `-o AddKeysToAgent=yes` to the `ssh` command,
+or by adding `AddKeysToAgent yes` to your `~/.ssh/config` file [1].
+See the [OpenSSH 7.2 Release Notes](http://www.openssh.com/txt/release-7.2).
+
+### `lifetime`
 
 To **set the maximum lifetime of the identities**, use the `lifetime` style.
 The lifetime may be specified in seconds or as described in sshd_config(5)
@@ -62,7 +73,15 @@ The lifetime may be specified in seconds or as described in sshd_config(5)
 zstyle :omz:plugins:ssh-agent lifetime 4h
 ```
 
-----
+### `quiet`
+
+To silence the plugin, use the following setting:
+
+```zsh
+zstyle :omz:plugins:ssh-agent quiet yes
+```
+
+### `ssh-add-args`
 
 To **pass arguments to the `ssh-add` command** that adds the identities on startup,
 use the `ssh-add-args` setting. You can pass multiple arguments separated by spaces:
@@ -80,15 +99,6 @@ ssh-add -K -c -a /run/user/1000/ssh-auth <identities>
 
 For valid `ssh-add` arguments run `ssh-add --help` or `man ssh-add`.
 
-----
-
-To set an **external helper** to ask for the passwords and possibly store
-them in the system keychain use the `helper` style. For example:
-
-```zsh
-zstyle :omz:plugins:ssh-agent helper ksshaskpass
-```
-
 ## Credits
 
 Based on code from Joseph M. Reagle: https://www.cygwin.com/ml/cygwin/2001-06/msg00537.html
diff --git a/plugins/ssh-agent/ssh-agent.plugin.zsh b/plugins/ssh-agent/ssh-agent.plugin.zsh
index 47dfef5b0..0d6a35b35 100644
--- a/plugins/ssh-agent/ssh-agent.plugin.zsh
+++ b/plugins/ssh-agent/ssh-agent.plugin.zsh
@@ -18,7 +18,7 @@ function _start_agent() {
   zstyle -s :omz:plugins:ssh-agent lifetime lifetime
 
   # start ssh-agent and setup environment
-  echo Starting ssh-agent...
+  zstyle -t :omz:plugins:ssh-agent quiet || echo >&2 "Starting ssh-agent ..."
   ssh-agent -s ${lifetime:+-t} ${lifetime} | sed '/^echo/d' >! "$ssh_env_cache"
   chmod 600 "$ssh_env_cache"
   . "$ssh_env_cache" > /dev/null
@@ -78,7 +78,7 @@ function _add_identities() {
 
   if [[ -n "$helper" ]]; then
     if [[ -z "${commands[$helper]}" ]]; then
-      echo "ssh-agent: the helper '$helper' has not been found."
+      echo >&2 "ssh-agent: the helper '$helper' has not been found."
     else
       SSH_ASKPASS="$helper" ssh-add "${args[@]}" ${^not_loaded} < /dev/null
       return $?
@@ -88,11 +88,9 @@ function _add_identities() {
   ssh-add "${args[@]}" ${^not_loaded}
 }
 
-# test if agent-forwarding is enabled
-zstyle -b :omz:plugins:ssh-agent agent-forwarding agent_forwarding
-
-# Add a nifty symlink for screen/tmux if agent forwarding
-if [[ $agent_forwarding = "yes" && -n "$SSH_AUTH_SOCK" && ! -L "$SSH_AUTH_SOCK" ]]; then
+# Add a nifty symlink for screen/tmux if agent forwarding is enabled
+if zstyle -t :omz:plugins:ssh-agent agent-forwarding \
+   && [[ -n "$SSH_AUTH_SOCK" && ! -L "$SSH_AUTH_SOCK" ]]; then
   ln -sf "$SSH_AUTH_SOCK" /tmp/ssh-agent-$USERNAME-screen
 else
   _start_agent

From 2b379ec42c8675d6076737e1373767c160f5ae70 Mon Sep 17 00:00:00 2001
From: Brian Tannous <brian@briantannous.com>
Date: Wed, 17 Nov 2021 01:33:48 -0800
Subject: [PATCH 562/869] feat(kn): add plugin for `kn` completion (#8927)

---
 plugins/kn/README.md     | 17 +++++++++++++++++
 plugins/kn/kn.plugin.zsh |  8 ++++++++
 2 files changed, 25 insertions(+)
 create mode 100644 plugins/kn/README.md
 create mode 100644 plugins/kn/kn.plugin.zsh

diff --git a/plugins/kn/README.md b/plugins/kn/README.md
new file mode 100644
index 000000000..d2eb9b31d
--- /dev/null
+++ b/plugins/kn/README.md
@@ -0,0 +1,17 @@
+# kn - Knative CLI
+
+This plugin provides autocompletion for [kn](https://knative.dev/docs/install/client/install-kn/) operations.
+
+To use it, add `kn` to the plugins array of your zshrc file:
+
+```zsh
+plugins=(... kn)
+```
+
+## See Also
+
++ [kn/client](https://github.com/knative/client)
+
+## Contributors
+
++ [btannous](https://github.com/btannous) - Plugin Author
diff --git a/plugins/kn/kn.plugin.zsh b/plugins/kn/kn.plugin.zsh
new file mode 100644
index 000000000..f60177dd9
--- /dev/null
+++ b/plugins/kn/kn.plugin.zsh
@@ -0,0 +1,8 @@
+# Autocompletion for kn, the command line interface for knative
+#
+# Author: https://github.com/btannous
+
+if [ $commands[kn] ]; then
+  source <(kn completion zsh)
+  compdef _kn kn 
+fi

From b60b3f184275c39800dd7284d6904fcf295b3956 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Wed, 17 Nov 2021 10:53:17 +0100
Subject: [PATCH 563/869] fix(osx): deprecate `osx` plugin without symlink
 (#10428)

Fixes #10428
---
 plugins/macos/macos.plugin.zsh | 6 ------
 plugins/macos/osx.plugin.zsh   | 1 -
 plugins/osx                    | 1 -
 plugins/osx/README.md          | 3 +++
 plugins/osx/osx.plugin.zsh     | 5 +++++
 5 files changed, 8 insertions(+), 8 deletions(-)
 delete mode 120000 plugins/macos/osx.plugin.zsh
 delete mode 120000 plugins/osx
 create mode 100644 plugins/osx/README.md
 create mode 100644 plugins/osx/osx.plugin.zsh

diff --git a/plugins/macos/macos.plugin.zsh b/plugins/macos/macos.plugin.zsh
index 4bcbbaead..6a91be336 100644
--- a/plugins/macos/macos.plugin.zsh
+++ b/plugins/macos/macos.plugin.zsh
@@ -1,9 +1,3 @@
-# Check if 'osx' is still in the plugins list and prompt to change to 'macos'
-if [[ -n "${plugins[(r)osx]}" ]]; then
-  print ${(%):-"%F{yellow}The \`osx\` plugin is deprecated and has been renamed to \`macos\`."}
-  print ${(%):-"Please update your .zshrc to use the \`%Bmacos%b\` plugin instead.%f"}
-fi
-
 # Open the current directory in a Finder window
 alias ofd='open_command $PWD'
 
diff --git a/plugins/macos/osx.plugin.zsh b/plugins/macos/osx.plugin.zsh
deleted file mode 120000
index 73d718d43..000000000
--- a/plugins/macos/osx.plugin.zsh
+++ /dev/null
@@ -1 +0,0 @@
-macos.plugin.zsh
\ No newline at end of file
diff --git a/plugins/osx b/plugins/osx
deleted file mode 120000
index a8d0f9c48..000000000
--- a/plugins/osx
+++ /dev/null
@@ -1 +0,0 @@
-macos
\ No newline at end of file
diff --git a/plugins/osx/README.md b/plugins/osx/README.md
new file mode 100644
index 000000000..98d859545
--- /dev/null
+++ b/plugins/osx/README.md
@@ -0,0 +1,3 @@
+# osx plugin
+
+**Deprecated: use the [`macos`](https://github.com/ohmyzsh/ohmyzsh/tree/master/plugins/macos) plugin instead.**
diff --git a/plugins/osx/osx.plugin.zsh b/plugins/osx/osx.plugin.zsh
new file mode 100644
index 000000000..9304e7f32
--- /dev/null
+++ b/plugins/osx/osx.plugin.zsh
@@ -0,0 +1,5 @@
+print ${(%):-'%F{yellow}The `osx` plugin is deprecated and has been renamed to `macos`.'}
+print ${(%):-'Please update your .zshrc to use the `%Bmacos%b` plugin instead.%f'}
+
+(( ${fpath[(Ie)$ZSH/plugins/macos]} )) || fpath=("$ZSH/plugins/macos" $fpath)
+source "$ZSH/plugins/macos/macos.plugin.zsh"

From 88e72e8a5482db677a1d07722293a3a4f8f71342 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Wed, 17 Nov 2021 10:35:32 +0100
Subject: [PATCH 564/869] fix(docker-compose)!: check for old command instead
 of calling `docker` (#10409)

BREAKING CHANGE: the plugin now checks for the `docker-compose` command instead
of trying whether `docker compose` is a valid command. This means that if the
old command is still installed it will be used instead. To use `docker compose`,
uninstall any old copies of `docker-compose`.

Fixes #10409
---
 plugins/docker-compose/docker-compose.plugin.zsh | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/plugins/docker-compose/docker-compose.plugin.zsh b/plugins/docker-compose/docker-compose.plugin.zsh
index 13985fc82..b8a4b067d 100644
--- a/plugins/docker-compose/docker-compose.plugin.zsh
+++ b/plugins/docker-compose/docker-compose.plugin.zsh
@@ -1,7 +1,5 @@
 # support Compose v2 as docker CLI plugin
-DOCKER_CONTEXT=default command docker compose &>/dev/null \
-  && dccmd='docker compose' \
-  || dccmd='docker-compose'
+(( ${+commands[docker-compose]} )) && dccmd='docker-compose' || dccmd='docker compose'
 
 alias dco="$dccmd"
 alias dcb="$dccmd build"

From ff09151d6b82fef7af4ced774a416a36e7835b8a Mon Sep 17 00:00:00 2001
From: Aurora <AuroraWright@users.noreply.github.com>
Date: Wed, 17 Nov 2021 11:44:04 +0100
Subject: [PATCH 565/869] fix(bgnotify): avoid permission prompts by checking
 frontmost app ID (#10318)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Marc Cornellà <hello@mcornella.com>
---
 plugins/bgnotify/bgnotify.plugin.zsh | 26 +++++++++++++++++++++-----
 1 file changed, 21 insertions(+), 5 deletions(-)

diff --git a/plugins/bgnotify/bgnotify.plugin.zsh b/plugins/bgnotify/bgnotify.plugin.zsh
index aecde20ea..479796dbe 100644
--- a/plugins/bgnotify/bgnotify.plugin.zsh
+++ b/plugins/bgnotify/bgnotify.plugin.zsh
@@ -20,6 +20,12 @@ if ! (type bgnotify_formatted | grep -q 'function'); then ## allow custom functi
   }
 fi
 
+currentAppId () {
+  if (( $+commands[osascript] )); then
+    osascript -e 'tell application (path to frontmost application as text) to id' 2>/dev/null
+  fi
+}
+
 currentWindowId () {
   if hash osascript 2>/dev/null; then #osx
     osascript -e 'tell application (path to frontmost application as text) to id of front window' 2&> /dev/null || echo "0"
@@ -32,11 +38,20 @@ currentWindowId () {
 
 bgnotify () { ## args: (title, subtitle)
   if hash terminal-notifier 2>/dev/null; then #osx
-    [[ "$TERM_PROGRAM" == 'iTerm.app' ]] && term_id='com.googlecode.iterm2';
-    [[ "$TERM_PROGRAM" == 'Apple_Terminal' ]] && term_id='com.apple.terminal';
+    local term_id="$bgnotify_appid"
+    if [[ -z "$term_id" ]]; then
+      case "$TERM_PROGRAM" in
+      iTerm.app) term_id='com.googlecode.iterm2' ;;
+      Apple_Terminal) term_id='com.apple.terminal' ;;
+      esac
+    fi
+
     ## now call terminal-notifier, (hopefully with $term_id!)
-    [ -z "$term_id" ] && terminal-notifier -message "$2" -title "$1" >/dev/null ||
-    terminal-notifier -message "$2" -title "$1" -activate "$term_id" -sender "$term_id" >/dev/null
+    if [[ -z "$term_id" ]]; then
+      terminal-notifier -message "$2" -title "$1" >/dev/null
+    else
+      terminal-notifier -message "$2" -title "$1" -activate "$term_id" -sender "$term_id" >/dev/null
+    fi
   elif hash growlnotify 2>/dev/null; then #osx growl
     growlnotify -m "$1" "$2"
   elif hash notify-send 2>/dev/null; then #ubuntu gnome!
@@ -54,6 +69,7 @@ bgnotify () { ## args: (title, subtitle)
 bgnotify_begin() {
   bgnotify_timestamp=$EPOCHSECONDS
   bgnotify_lastcmd="${1:-$2}"
+  bgnotify_appid="$(currentAppId)"
   bgnotify_windowid=$(currentWindowId)
 }
 
@@ -62,7 +78,7 @@ bgnotify_end() {
   elapsed=$(( EPOCHSECONDS - bgnotify_timestamp ))
   past_threshold=$(( elapsed >= bgnotify_threshold ))
   if (( bgnotify_timestamp > 0 )) && (( past_threshold )); then
-    if [ $(currentWindowId) != "$bgnotify_windowid" ]; then
+    if [[ $(currentAppId) != "$bgnotify_appid" || $(currentWindowId) != "$bgnotify_windowid" ]]; then
       print -n "\a"
       bgnotify_formatted "$didexit" "$bgnotify_lastcmd" "$elapsed"
     fi

From 98b48015486bc638ba8f989af9285b73c413f9e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Wed, 17 Nov 2021 12:35:23 +0100
Subject: [PATCH 566/869] fix(bundler): use BUNDLE_JOBS in `bi` to avoid config
 file change

When calling `bundle install` with `--jobs=<n>`, bundle persists this
argument in `.bundle/config`. If we run `BUNDLE_JOBS=<n> bundle install`
instead, this is not persisted.

Fixes #10425
---
 plugins/bundler/bundler.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/bundler/bundler.plugin.zsh b/plugins/bundler/bundler.plugin.zsh
index 6293dc28a..c93d4869e 100644
--- a/plugins/bundler/bundler.plugin.zsh
+++ b/plugins/bundler/bundler.plugin.zsh
@@ -40,7 +40,7 @@ bundle_install() {
   else
     local cores_num="$(nproc)"
   fi
-  bundle install --jobs="$cores_num" "$@"
+  BUNDLE_JOBS="$cores_num" bundle install "$@"
 }
 
 ## Gem wrapper

From 15fd9c84deae400ba52451d75548fb8f6ec26bcf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Tue, 9 Nov 2021 15:07:09 +0100
Subject: [PATCH 567/869] style(bundler): simplify `bundled_commands` array
 operations

---
 plugins/bundler/bundler.plugin.zsh | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/plugins/bundler/bundler.plugin.zsh b/plugins/bundler/bundler.plugin.zsh
index c93d4869e..c1cbb13dd 100644
--- a/plugins/bundler/bundler.plugin.zsh
+++ b/plugins/bundler/bundler.plugin.zsh
@@ -81,14 +81,12 @@ bundled_commands=(
 )
 
 # Remove $UNBUNDLED_COMMANDS from the bundled_commands list
-for cmd in $UNBUNDLED_COMMANDS; do
-  bundled_commands=(${bundled_commands#$cmd});
-done
+bundled_commands=(${bundled_commands:|UNBUNDLED_COMMANDS})
+unset UNBUNDLED_COMMANDS
 
 # Add $BUNDLED_COMMANDS to the bundled_commands list
-for cmd in $BUNDLED_COMMANDS; do
-  bundled_commands+=($cmd);
-done
+bundled_commands+=($BUNDLED_COMMANDS)
+unset BUNDLED_COMMANDS
 
 # Check if in the root or a subdirectory of a bundled project
 _within-bundled-project() {
@@ -126,5 +124,4 @@ for cmd in $bundled_commands; do
     compdef "_$cmd" "bundled_$cmd"="$cmd"
   fi
 done
-
 unset cmd bundled_commands

From 2b96b7c54bbc86743d5550196e31f14b1b3d4951 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Thu, 25 Nov 2021 11:46:37 +0100
Subject: [PATCH 568/869] fix(updater): stop update if `$ZSH` is not a git
 repository (#10448)

Fixes #10448
---
 tools/check_for_upgrade.sh | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/tools/check_for_upgrade.sh b/tools/check_for_upgrade.sh
index a6fdf4659..b6625a395 100644
--- a/tools/check_for_upgrade.sh
+++ b/tools/check_for_upgrade.sh
@@ -133,6 +133,12 @@ function update_ohmyzsh() {
     return
   fi
 
+  # Test if Oh My Zsh directory is a git repository
+  if ! (cd "$ZSH" && LANG= git rev-parse &>/dev/null); then
+    echo >&2 "[oh-my-zsh] Can't update: not a git repository."
+    return
+  fi
+
   # Check if there are updates available before proceeding
   if ! is_update_available; then
     return

From 0314604384529fb535825bf1d93c6fdb3c5ccbbe Mon Sep 17 00:00:00 2001
From: Paul Scott <paul.scotto@gmail.com>
Date: Thu, 25 Nov 2021 22:55:21 +0000
Subject: [PATCH 569/869] fix(lib): don't error if `INSIDE_EMACS` is not
 defined (#10443)

---
 lib/termsupport.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/termsupport.zsh b/lib/termsupport.zsh
index 49f64400b..4035d10a1 100644
--- a/lib/termsupport.zsh
+++ b/lib/termsupport.zsh
@@ -10,7 +10,7 @@ function title {
   setopt localoptions nopromptsubst
 
   # Don't set the title if inside emacs, unless using vterm
-  [[ -n "$INSIDE_EMACS" && "$INSIDE_EMACS" != vterm ]] && return
+  [[ -n "${INSIDE_EMACS:-}" && "$INSIDE_EMACS" != vterm ]] && return
 
   # if $2 is unset use $1 as default
   # if it is set and empty, leave it as is

From 452ddff763ebbaba40a060006e8290d497e2993a Mon Sep 17 00:00:00 2001
From: Kyle <43724855+Kyle-Ye@users.noreply.github.com>
Date: Fri, 26 Nov 2021 06:57:08 +0800
Subject: [PATCH 570/869] feat(xcode): support `.swiftpm` as project file in
 `xc` (#10434)

---
 plugins/xcode/README.md        | 2 +-
 plugins/xcode/xcode.plugin.zsh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/xcode/README.md b/plugins/xcode/README.md
index 664a063a3..27d6a228b 100644
--- a/plugins/xcode/README.md
+++ b/plugins/xcode/README.md
@@ -26,7 +26,7 @@ plugins=(... xcode)
 
 ###  `xc`
 
-Opens the current directory in Xcode as an Xcode project or a Swift package. This will open one of the `.xcworkspace`, `.xcodeproj` and `Package.swift` files that it can find in the current working directory. You can also specify a directory to look in for the Xcode files.
+Opens the current directory in Xcode as an Xcode project or a Swift package. This will open one of the `.xcworkspace`, `.xcodeproj`, `.swiftpm` and `Package.swift` files that it can find in the current working directory. You can also specify a directory to look in for the Xcode files.
 Returns 1 if it didn't find any relevant files.
 
 ###  `xx`
diff --git a/plugins/xcode/xcode.plugin.zsh b/plugins/xcode/xcode.plugin.zsh
index 41b9e37e4..3bd12cdec 100644
--- a/plugins/xcode/xcode.plugin.zsh
+++ b/plugins/xcode/xcode.plugin.zsh
@@ -7,7 +7,7 @@ alias xcsel='sudo xcode-select --switch'
 # source: https://gist.github.com/subdigital/5420709
 function xc {
   local xcode_files
-  xcode_files=(${1:-.}/{*.{xcworkspace,xcodeproj},Package.swift}(N))
+  xcode_files=(${1:-.}/{*.{xcworkspace,xcodeproj,swiftpm},Package.swift}(N))
 
   if [[ ${#xcode_files} -eq 0 ]]; then
     echo "No Xcode files found in ${1:-the current directory}." >&2

From 8e5f3db305bb1fc363d3fe98c2d1177f0027a5bc Mon Sep 17 00:00:00 2001
From: Adam Cwyk <8567636+acwyk@users.noreply.github.com>
Date: Sat, 27 Nov 2021 12:23:08 +1100
Subject: [PATCH 571/869] feat(dotnet): add alias for `dotnet build` command
 (#10435)

Co-authored-by: Adam Cwyk <git@adamcwyk.dev>
---
 plugins/dotnet/README.md         | 1 +
 plugins/dotnet/dotnet.plugin.zsh | 1 +
 2 files changed, 2 insertions(+)

diff --git a/plugins/dotnet/README.md b/plugins/dotnet/README.md
index 7554b4e3c..87dfd8f8d 100644
--- a/plugins/dotnet/README.md
+++ b/plugins/dotnet/README.md
@@ -21,3 +21,4 @@ plugins=(... dotnet)
 | da    | dotnet add       | Add a package or reference to a .NET project.                     |
 | dp    | dotnet pack      | Create a NuGet package.                                           |
 | dng   | dotnet nuget     | Provides additional NuGet commands.                               |
+| db    | dotnet build     | Build a .NET project                                              |
diff --git a/plugins/dotnet/dotnet.plugin.zsh b/plugins/dotnet/dotnet.plugin.zsh
index 6bd4b7af8..5bc1587c5 100644
--- a/plugins/dotnet/dotnet.plugin.zsh
+++ b/plugins/dotnet/dotnet.plugin.zsh
@@ -30,3 +30,4 @@ alias ds='dotnet sln'
 alias da='dotnet add'
 alias dp='dotnet pack'
 alias dng='dotnet nuget'
+alias db='dotnet build'

From 58478d0888aa842adc71aded80009cba5be190ec Mon Sep 17 00:00:00 2001
From: Markus Hofbauer <markus.hofbauer@tum.de>
Date: Sat, 27 Nov 2021 20:30:03 +0100
Subject: [PATCH 572/869] feat(git): Add alias for rebasing to
 origin/main-branch (#10445)

---
 plugins/git/README.md      | 1 +
 plugins/git/git.plugin.zsh | 1 +
 2 files changed, 2 insertions(+)

diff --git a/plugins/git/README.md b/plugins/git/README.md
index 113080874..b9af3488f 100644
--- a/plugins/git/README.md
+++ b/plugins/git/README.md
@@ -130,6 +130,7 @@ plugins=(... git)
 | grbd                 | git rebase $(git_develop_branch)                                                                                                 |
 | grbi                 | git rebase -i                                                                                                                    |
 | grbm                 | git rebase $(git_main_branch)                                                                                                    |
+| grbom                | git rebase origin/$(git_main_branch)                                                                                             |
 | grbo                 | git rebase --onto                                                                                                                |
 | grbs                 | git rebase --skip                                                                                                                |
 | grev                 | git revert                                                                                                                       |
diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index 5a3c98287..648fa0a33 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -251,6 +251,7 @@ alias grbc='git rebase --continue'
 alias grbd='git rebase $(git_develop_branch)'
 alias grbi='git rebase -i'
 alias grbm='git rebase $(git_main_branch)'
+alias grbom='git rebase origin/$(git_main_branch)'
 alias grbo='git rebase --onto'
 alias grbs='git rebase --skip'
 alias grev='git revert'

From bf303965e685489f2f1b764d5d22dc4766ca78c8 Mon Sep 17 00:00:00 2001
From: Nicholas Hawkes <nicholas.hawkes@prodigygame.com>
Date: Sat, 27 Nov 2021 15:34:47 -0500
Subject: [PATCH 573/869] feat(aws): Adds the login option for AWS SSO (#9921)

---
 plugins/aws/README.md      | 1 +
 plugins/aws/aws.plugin.zsh | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/plugins/aws/README.md b/plugins/aws/README.md
index 011bbd8b4..24c6429dd 100644
--- a/plugins/aws/README.md
+++ b/plugins/aws/README.md
@@ -14,6 +14,7 @@ plugins=(... aws)
 * `asp [<profile>]`: sets `$AWS_PROFILE` and `$AWS_DEFAULT_PROFILE` (legacy) to `<profile>`.
   It also sets `$AWS_EB_PROFILE` to `<profile>` for the Elastic Beanstalk CLI.
   Run `asp` without arguments to clear the profile.
+* `asp [<profile>] login`: If AWS SSO has been configured in your aws profile, it will run the `aws sso login` command following profile selection. 
 
 * `acp [<profile>]`: in addition to `asp` functionality, it actually changes the profile by
    assuming the role specified in the `<profile>` configuration. It supports MFA and sets
diff --git a/plugins/aws/aws.plugin.zsh b/plugins/aws/aws.plugin.zsh
index 2d095635b..3a3a111b4 100644
--- a/plugins/aws/aws.plugin.zsh
+++ b/plugins/aws/aws.plugin.zsh
@@ -21,6 +21,10 @@ function asp() {
   export AWS_DEFAULT_PROFILE=$1
   export AWS_PROFILE=$1
   export AWS_EB_PROFILE=$1
+
+  if [[ "$2" == "login" ]]; then
+    aws sso login
+  fi
 }
 
 # AWS profile switch

From f0f792fa6b207bc72453ae55011b6b44f678fb78 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Tue, 30 Nov 2021 10:13:23 +0100
Subject: [PATCH 574/869] feat(cli): add `omz version` command

---
 lib/cli.zsh | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/lib/cli.zsh b/lib/cli.zsh
index d90cc6469..aed84e08f 100644
--- a/lib/cli.zsh
+++ b/lib/cli.zsh
@@ -29,6 +29,7 @@ function _omz {
     'reload:Reload the current zsh session'
     'theme:Manage themes'
     'update:Update Oh My Zsh'
+    'version:Show the version'
   )
 
   if (( CURRENT == 2 )); then
@@ -164,6 +165,7 @@ Available commands:
   reload              Reload the current zsh session
   theme  <command>    Manage themes
   update              Update Oh My Zsh
+  version             Show the version
 
 EOF
 }
@@ -777,3 +779,24 @@ function _omz::update {
     [[ "$zsh" = -* || -o login ]] && exec -l "${zsh#-}" || exec "$zsh"
   fi
 }
+
+function _omz::version {
+  (
+    cd "$ZSH"
+
+    # Get the version name:
+    # 1) try tag-like version
+    # 2) try name-rev
+    # 3) try branch name
+    local version
+    version=$(command git describe --tags HEAD 2>/dev/null) \
+    || version=$(command git name-rev --no-undefined --name-only --exclude="remotes/*" HEAD 2>/dev/null) \
+    || version=$(command git symbolic-ref --quiet --short HEAD 2>/dev/null)
+
+    # Get short hash for the current HEAD
+    local commit=$(command git rev-parse --short HEAD 2>/dev/null)
+
+    # Show version and commit hash
+    printf "%s (%s)\n" "$version" "$commit"
+  )
+}

From 1c1d74c5ec49e5ab7e2d664e557c61745d1995e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Tue, 30 Nov 2021 10:19:21 +0100
Subject: [PATCH 575/869] chore: update new issue templates

---
 .github/ISSUE_TEMPLATE/bug_report.yml      | 15 ++---
 .github/ISSUE_TEMPLATE/bug_report_omz.yml  | 77 ++++++++++++++++++++++
 .github/ISSUE_TEMPLATE/feature_request.yml |  7 +-
 3 files changed, 90 insertions(+), 9 deletions(-)
 create mode 100644 .github/ISSUE_TEMPLATE/bug_report_omz.yml

diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
index af2973fec..98f66b1d2 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -1,12 +1,11 @@
-name: Bug report
-description: Create a report to help us improve Oh My Zsh
-labels: 'Bug'
+name: Report a bug
+description: Report a bug that isn't caused by Oh My Zsh. If unsure, use this form
 body:
   - type: markdown
     attributes:
       value: |
         ## Self Check
-        - Try searching existing [GitHub Issues](https://github.com/ohmyzsh/ohmyzsh/issues?q=is%3Aissue) (open or closed) for similar issues.
+        - Look for similar errors in existing [GitHub Issues](https://github.com/ohmyzsh/ohmyzsh/issues?q=is%3Aissue) (open or closed).
         - Try reaching out on the [Discord server](https://discord.gg/ohmyzsh) for help.
   - type: textarea
     validations:
@@ -41,21 +40,21 @@ body:
     validations:
       required: true
     attributes:
-      label: OS / Distro
-      placeholder: e.g. Windows 10, Ubuntu 20.04, Arch Linux, macOS 10.15...
+      label: OS / Linux distribution
+      placeholder: Windows 10, Ubuntu 20.04, Arch Linux, macOS 10.15...
   - type: input
     validations:
       required: true
     attributes:
       label: Zsh version
       description: Run `echo $ZSH_VERSION` to check.
-      placeholder: e.g. 5.6
+      placeholder: "5.6"
   - type: input
     validations:
       required: true
     attributes:
       label: Terminal emulator
-      placeholder: e.g. iTerm2, Gnome Terminal...
+      placeholder: iTerm2, GNOME Terminal, Terminal.app...
   - type: dropdown
     attributes:
       label: If using WSL on Windows, which version of WSL
diff --git a/.github/ISSUE_TEMPLATE/bug_report_omz.yml b/.github/ISSUE_TEMPLATE/bug_report_omz.yml
new file mode 100644
index 000000000..96f5ad934
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report_omz.yml
@@ -0,0 +1,77 @@
+name: Report a bug in Oh My Zsh
+description: Create a report to help us improve Oh My Zsh
+labels: ['Bug']
+body:
+  - type: markdown
+    attributes:
+      value: |
+        ## Self Check
+        - **Make sure this bug only happens with Oh My Zsh enabled**.
+        - Look for similar errors in existing [GitHub Issues](https://github.com/ohmyzsh/ohmyzsh/issues?q=is%3Aissue) (open or closed).
+        - Try reaching out on the [Discord server](https://discord.gg/ohmyzsh) for help.
+  - type: textarea
+    validations:
+      required: true
+    attributes:
+      label: Describe the bug
+      description: A clear description of what the bug is.
+  - type: textarea
+    validations:
+      required: true
+    attributes:
+      label: Steps to reproduce
+      description: |
+        Steps to reproduce the problem.
+      placeholder: |
+        For example:
+        1. Enable plugin '...'
+        2. Run command '...' or try to complete command '...'
+        3. See error
+  - type: textarea
+    validations:
+      required: true
+    attributes:
+      label: Expected behavior
+      description: A brief description of what should happen.
+  - type: textarea
+    attributes:
+      label: Screenshots and recordings
+      description: |
+        If applicable, add screenshots to help explain your problem. You can also record an asciinema session: https://asciinema.org/
+  - type: input
+    validations:
+      required: true
+    attributes:
+      label: OS / Linux distribution
+      placeholder: Windows 10, Ubuntu 20.04, Arch Linux, macOS 10.15...
+  - type: input
+    validations:
+      required: true
+    attributes:
+      label: Zsh version
+      description: Run `echo $ZSH_VERSION` to check.
+      placeholder: "5.6"
+  - type: input
+    validations:
+      required: true
+    attributes:
+      label: Oh My Zsh version
+      description: Run `omz version` to check.
+      placeholder: master (bf303965)
+  - type: input
+    validations:
+      required: true
+    attributes:
+      label: Terminal emulator
+      placeholder: iTerm2, GNOME Terminal, Terminal.app...
+  - type: dropdown
+    attributes:
+      label: If using WSL on Windows, which version of WSL
+      description: Run `wsl -l -v` to check.
+      options:
+        - WSL1
+        - WSL2
+  - type: textarea
+    attributes:
+      label: Additional context
+      description: Add any other context about the problem here. This can be themes, plugins, custom settings...
diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml
index dc4baf2b1..ac966dfd9 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.yml
+++ b/.github/ISSUE_TEMPLATE/feature_request.yml
@@ -1,7 +1,12 @@
 name: Feature request
 description: Suggest a feature for Oh My Zsh
-labels: 'Feature'
+labels: ["Feature"]
 body:
+  - type: markdown
+    attributes:
+      value: |
+        ## Self Check
+        - Look for similar features in existing [GitHub Issues](https://github.com/ohmyzsh/ohmyzsh/issues?q=is%3Aissue) (open or closed).
   - type: input
     attributes:
       label: If the feature request is for a plugin or theme, specify it here.

From 0e41181d547e2f89ffc503a7afc8b0f3991dd1a8 Mon Sep 17 00:00:00 2001
From: Josh Soref <2119212+jsoref@users.noreply.github.com>
Date: Wed, 1 Dec 2021 06:20:31 -0500
Subject: [PATCH 576/869] chore: fix spelling errors across the project
 (#10459)

Co-authored-by: Josh Soref <jsoref@users.noreply.github.com>
---
 plugins/aliases/cheatsheet.py                        |  8 ++++----
 plugins/aliases/termcolor.py                         |  2 +-
 plugins/bower/bower.plugin.zsh                       |  8 ++++----
 plugins/catimg/catimg.plugin.zsh                     |  2 +-
 plugins/catimg/catimg.sh                             |  2 +-
 plugins/chucknorris/fortunes/chucknorris             | 10 +++++-----
 plugins/colorize/colorize.plugin.zsh                 |  2 +-
 plugins/cpanm/_cpanm                                 |  2 +-
 plugins/docker-machine/_docker-machine               |  6 +++---
 plugins/dotnet/dotnet.plugin.zsh                     |  2 +-
 plugins/emoji/emoji.plugin.zsh                       |  2 +-
 plugins/fastfile/fastfile.plugin.zsh                 | 12 ++++++------
 plugins/fd/README.md                                 |  2 +-
 plugins/flutter/README.md                            |  2 +-
 plugins/fzf/README.md                                |  2 +-
 plugins/gitfast/git-completion.bash                  |  2 +-
 plugins/grails/grails.plugin.zsh                     |  2 +-
 plugins/grunt/grunt.plugin.zsh                       |  4 ++--
 .../history-substring-search.zsh                     |  4 ++--
 plugins/ipfs/_ipfs                                   |  2 +-
 plugins/iterm2/iterm2.plugin.zsh                     |  2 +-
 plugins/jenv/README.md                               |  2 +-
 plugins/macos/spotify                                |  2 +-
 plugins/mercurial/README.md                          |  2 +-
 plugins/npm/README.md                                |  2 +-
 plugins/pep8/_pep8                                   |  2 +-
 plugins/please/README.md                             |  2 +-
 plugins/pm2/_pm2                                     |  4 ++--
 plugins/powify/_powify                               |  2 +-
 plugins/rake/rake.plugin.zsh                         |  2 +-
 plugins/rebar/_rebar                                 |  2 +-
 plugins/redis-cli/_redis-cli                         | 10 +++++-----
 plugins/salt/_salt                                   |  2 +-
 plugins/scala/_scala                                 |  2 +-
 plugins/sfdx/_sfdx                                   |  2 +-
 plugins/sprunge/README.md                            |  2 +-
 plugins/supervisor/_supervisorctl                    | 10 +++++-----
 plugins/supervisor/supervisor.plugin.zsh             |  2 +-
 plugins/suse/README.md                               |  2 +-
 plugins/symfony2/README.md                           |  2 +-
 plugins/systemadmin/systemadmin.plugin.zsh           |  4 ++--
 plugins/terminitor/_terminitor                       |  2 +-
 plugins/ubuntu/README.md                             |  2 +-
 plugins/vault/_vault                                 |  4 ++--
 plugins/yarn/_yarn                                   |  2 +-
 plugins/yum/yum.plugin.zsh                           |  2 +-
 themes/dallas.zsh-theme                              |  2 +-
 themes/essembeh.zsh-theme                            |  2 +-
 themes/nicoulaj.zsh-theme                            |  2 +-
 49 files changed, 79 insertions(+), 79 deletions(-)

diff --git a/plugins/aliases/cheatsheet.py b/plugins/aliases/cheatsheet.py
index d6d507b92..694afd31c 100644
--- a/plugins/aliases/cheatsheet.py
+++ b/plugins/aliases/cheatsheet.py
@@ -26,16 +26,16 @@ def cheatsheet(lines):
         target_aliases.extend(group_list)
     return cheatsheet
 
-def pretty_print_group(key, aliases, hightlight=None):
+def pretty_print_group(key, aliases, highlight=None):
     if len(aliases) == 0:
         return
     group_hl_formatter = lambda g, hl: termcolor.colored(hl, 'yellow').join([termcolor.colored(part, 'red') for part in ('[%s]' % g).split(hl)])
     alias_hl_formatter = lambda alias, hl: termcolor.colored(hl, 'yellow').join([termcolor.colored(part, 'green') for part in ('\t%s = %s' % alias[0:2]).split(hl)])
     group_formatter = lambda g: termcolor.colored('[%s]' % g, 'red')
     alias_formatter = lambda alias: termcolor.colored('\t%s = %s' % alias[0:2], 'green')
-    if hightlight and len(hightlight)>0:
-        print (group_hl_formatter(key, hightlight))
-        print ('\n'.join([alias_hl_formatter(alias, hightlight) for alias in aliases]))
+    if highlight and len(highlight)>0:
+        print (group_hl_formatter(key, highlight))
+        print ('\n'.join([alias_hl_formatter(alias, highlight) for alias in aliases]))
     else:
         print (group_formatter(key))
         print ('\n'.join([alias_formatter(alias) for alias in aliases]))
diff --git a/plugins/aliases/termcolor.py b/plugins/aliases/termcolor.py
index f11b824b2..bb725e905 100644
--- a/plugins/aliases/termcolor.py
+++ b/plugins/aliases/termcolor.py
@@ -21,7 +21,7 @@
 #
 # Author: Konstantin Lepa <konstantin.lepa@gmail.com>
 
-"""ANSII Color formatting for output in terminal."""
+"""ANSI Color formatting for output in terminal."""
 
 from __future__ import print_function
 import os
diff --git a/plugins/bower/bower.plugin.zsh b/plugins/bower/bower.plugin.zsh
index 3a40b3af0..c4f71c2ae 100644
--- a/plugins/bower/bower.plugin.zsh
+++ b/plugins/bower/bower.plugin.zsh
@@ -9,7 +9,7 @@ _bower_installed_packages () {
 }
 _bower ()
 {
-    local -a _1st_arguments _no_color _dopts _save_dev _force_lastest _production
+    local -a _1st_arguments _no_color _dopts _save_dev _force_latest _production
     local expl
     typeset -A opt_args
 
@@ -22,7 +22,7 @@ _bower ()
 
     _save_dev=('(--save-dev)--save-dev[Save installed packages into the project"s bower.json devDependencies]')
 
-    _force_lastest=('(--force-latest)--force-latest[Force latest version on conflict]')
+    _force_latest=('(--force-latest)--force-latest[Force latest version on conflict]')
 
     _production=('(--production)--production[Do not install project devDependencies]')
 
@@ -54,7 +54,7 @@ _bower ()
         _arguments \
         $_dopts \
         $_save_dev \
-        $_force_lastest \
+        $_force_latest \
         $_no_color \
         $_production
         ;;
@@ -62,7 +62,7 @@ _bower ()
         _arguments \
         $_dopts \
         $_no_color \
-        $_force_lastest
+        $_force_latest
         _bower_installed_packages
         compadd "$@" $(echo $bower_package_list)
         ;;
diff --git a/plugins/catimg/catimg.plugin.zsh b/plugins/catimg/catimg.plugin.zsh
index ca46444cc..f4ff6f856 100644
--- a/plugins/catimg/catimg.plugin.zsh
+++ b/plugins/catimg/catimg.plugin.zsh
@@ -2,7 +2,7 @@
 # catimg script by Eduardo San Martin Morote aka Posva                         #
 # https://posva.net                                                            #
 #                                                                              #
-# Ouput the content of an image to the stdout using the 256 colors of the      #
+# Output the content of an image to the stdout using the 256 colors of the     #
 # terminal.                                                                    #
 # GitHub: https://github.com/posva/catimg                                      #
 ################################################################################
diff --git a/plugins/catimg/catimg.sh b/plugins/catimg/catimg.sh
index 713a03291..f58392428 100644
--- a/plugins/catimg/catimg.sh
+++ b/plugins/catimg/catimg.sh
@@ -2,7 +2,7 @@
 # catimg script by Eduardo San Martin Morote aka Posva                         #
 # https://posva.net                                                            #
 #                                                                              #
-# Ouput the content of an image to the stdout using the 256 colors of the      #
+# Output the content of an image to the stdout using the 256 colors of the     #
 # terminal.                                                                    #
 # GitHub: https://github.com/posva/catimg                                      #
 ################################################################################
diff --git a/plugins/chucknorris/fortunes/chucknorris b/plugins/chucknorris/fortunes/chucknorris
index 6ba5bb9b5..9e36ce89a 100644
--- a/plugins/chucknorris/fortunes/chucknorris
+++ b/plugins/chucknorris/fortunes/chucknorris
@@ -228,7 +228,7 @@ Chuck Norris once punched the ground to stop an earthquake. The resulting afters
 %
 Chuck Norris once round-house kicked a salesman. Over the phone.
 %
-Chuck Norris once rounhouse kicked a football. The astronomical society now considers it a planet.
+Chuck Norris once roundhouse kicked a football. The astronomical society now considers it a planet.
 %
 Chuck Norris once thought he was wrong. He was, however, mistaken.
 %
@@ -342,7 +342,7 @@ Every time there's an earthquake, you know Chuck Norris is hungry. The earthquak
 %
 Evolution's driving mechanism is nature's desperate attempt to escape Chuck Norris.
 %
-Fear of spiders is arachnaphobia. Fear of tight spaces is claustrophobia. Fear of Chuck Norris is called Logic.
+Fear of spiders is arachnophobia. Fear of tight spaces is claustrophobia. Fear of Chuck Norris is called Logic.
 %
 Fool me once, shame on you. Fool Chuck Norris once and he will roundhouse you in the face.
 %
@@ -426,7 +426,7 @@ Some people ask for a Kleenex when they sneeze, Chuck Norris asks for a body bag
 %
 Someone once videotaped Chuck Norris getting pissed off. It was called Walker: Texas Chain Saw Massacre.
 %
-Staring at Chuck Norris for extended periods of time without proper eye protection will cause blindess, and possibly foot sized brusies on the face.
+Staring at Chuck Norris for extended periods of time without proper eye protection will cause blindness, and possibly foot sized bruises on the face.
 %
 Taking Karate Lessons = $100, Buying MMA DVD's = $150, Subscribing to a UFC event = $50, Getting a Roundhouse Kick from Chuck Norris = PRICELESS.
 %
@@ -452,7 +452,7 @@ The best part of waking up is not Folgers in your cup. it's knowing that Chuck N
 %
 The chief export of Chuck Norris is pain.
 %
-The dictionary references Chuck Norris several times, he is metioned under Fear, Law, Order and Chucktatorship.
+The dictionary references Chuck Norris several times, he is mentioned under Fear, Law, Order and Chucktatorship.
 %
 The leading causes of death in the United States are: 1. Heart Disease 2. Chuck Norris 3. Cancer.
 %
@@ -468,7 +468,7 @@ The only way sharks will come near CN underwater is when CN is inside of a cage.
 %
 The only word that rhymes with orange is Chuck Norris.
 %
-The producers of the movie "The Last Airbender" are now in talks with Chuck Norris in Order to star him in their next sequal "The Last Skull Bender".
+The producers of the movie "The Last Airbender" are now in talks with Chuck Norris in Order to star him in their next sequel "The Last Skull Bender".
 %
 The quickest way to a man's heart is with Chuck Norris' fist.
 %
diff --git a/plugins/colorize/colorize.plugin.zsh b/plugins/colorize/colorize.plugin.zsh
index 8ea98f80a..a9da6cf83 100644
--- a/plugins/colorize/colorize.plugin.zsh
+++ b/plugins/colorize/colorize.plugin.zsh
@@ -82,7 +82,7 @@ colorize_less() {
         # This variable tells less to pipe every file through the specified command
         # (see the man page of less INPUT PREPROCESSOR).
         # 'zsh -ic "colorize_cat %s 2> /dev/null"' would not work for huge files like
-        # the ~/.zsh_history. For such files the tty of the preprocessor will be supended.
+        # the ~/.zsh_history. For such files the tty of the preprocessor will be suspended.
         # Therefore we must source this file to make colorize_cat available in the
         # preprocessor without the interactive mode.
         # `2>/dev/null` will suppress the error for large files 'broken pipe' of the python
diff --git a/plugins/cpanm/_cpanm b/plugins/cpanm/_cpanm
index ff9ae1c15..f328dd997 100644
--- a/plugins/cpanm/_cpanm
+++ b/plugins/cpanm/_cpanm
@@ -36,7 +36,7 @@ arguments=(
   '--reinstall[Reinstall the distribution even if you already have the latest version installed]'
   '--interactive[Turn on interactive configure]'
 
-  '--scandeps[Scan the depencencies of given modules and output the tree in a text format]'
+  '--scandeps[Scan the dependencies of given modules and output the tree in a text format]'
   '--format[Specify what format to display the scanned dependency tree]:scandeps format:(tree json yaml dists)'
 
   '--save-dists[Specify the optional directory path to copy downloaded tarballs]'
diff --git a/plugins/docker-machine/_docker-machine b/plugins/docker-machine/_docker-machine
index 7c19ba8e7..fbd36d7c6 100644
--- a/plugins/docker-machine/_docker-machine
+++ b/plugins/docker-machine/_docker-machine
@@ -90,7 +90,7 @@ __docker-machine_filters() {
 }
 
 __get_swarm_discovery() {
-    declare -a masters serivces
+    declare -a masters services
     local service
     services=()
     masters=($(docker-machine ls -f {{.Swarm}} |grep '(master)' |awk '{print $1}'))
@@ -169,7 +169,7 @@ __get_create_argument() {
 __docker-machine_subcommand() {
     local -a opts_help
     opts_help=("(- :)--help[Print usage]")
-    local -a opts_only_host opts_driver opts_storage_driver opts_stragery
+    local -a opts_only_host opts_driver opts_storage_driver opts_state
     opts_only_host=(
         "$opts_help"
         "*:host:__docker-machine_hosts_all"
@@ -330,7 +330,7 @@ _docker-machine() {
     _arguments -C \
         "(- :)"{-h,--help}"[Show help]" \
         "(-D --debug)"{-D,--debug}"[Enable debug mode]" \
-        '(-s --stroage-path)'{-s,--storage-path}'[Configures storage path]:file:_files' \
+        '(-s --storage-path)'{-s,--storage-path}'[Configures storage path]:file:_files' \
         '--tls-ca-cert[CA to verify remotes against]:file:_files' \
         '--tls-ca-key[Private key to generate certificates]:file:_files' \
         '--tls-client-cert[Client cert to use for TLS]:file:_files' \
diff --git a/plugins/dotnet/dotnet.plugin.zsh b/plugins/dotnet/dotnet.plugin.zsh
index 5bc1587c5..8ea31cdbd 100644
--- a/plugins/dotnet/dotnet.plugin.zsh
+++ b/plugins/dotnet/dotnet.plugin.zsh
@@ -12,7 +12,7 @@ _dotnet_zsh_complete()
     return
   fi
 
-  # This is not a variable assigment, don't remove spaces!
+  # This is not a variable assignment, don't remove spaces!
   _values = "${(ps:\n:)completions}"
 }
 
diff --git a/plugins/emoji/emoji.plugin.zsh b/plugins/emoji/emoji.plugin.zsh
index 7876f1c89..f70e09320 100644
--- a/plugins/emoji/emoji.plugin.zsh
+++ b/plugins/emoji/emoji.plugin.zsh
@@ -20,7 +20,7 @@ unset _omz_emoji_plugin_dir
 
 # These additional emoji are not in the definition file, but are useful in conjunction with it
 
-# This is a combinin character that can be placed after any other character to surround
+# This is a combining character that can be placed after any other character to surround
 # it in a "keycap" symbol.
 # The digits 0-9 are already in the emoji table as keycap_digit_<N>, keycap_ten, etc. 
 # It's unclear whether this should be in the $emoji array, because those characters are all ones
diff --git a/plugins/fastfile/fastfile.plugin.zsh b/plugins/fastfile/fastfile.plugin.zsh
index ccbbce3b2..6288bb275 100644
--- a/plugins/fastfile/fastfile.plugin.zsh
+++ b/plugins/fastfile/fastfile.plugin.zsh
@@ -18,7 +18,7 @@ default fastfile_var_prefix "§"
 #    1. name - The name of the shortcut (default: name of the file)
 #    2. file - The file or directory to make the shortcut for
 # STDOUT:
-#    => fastfle_print
+#    => fastfile_print
 #
 function fastfile() {
     test "$2" || 2="."
@@ -75,14 +75,14 @@ function fastfile_print() {
 # List all shortcuts
 #
 # STDOUT:
-#    (=> fastfle_print) for each shortcut
+#    (=> fastfile_print) for each shortcut
 #
 function fastfile_ls() {
     for f in "${fastfile_dir}"/*(NF); do
-        file=`basename "$f"` # To enable simpler handeling of spaces in file names
+        file=`basename "$f"` # To enable simpler handling of spaces in file names
         varkey=`echo "$file" | tr " " "_"`
 
-        # Special format for colums
+        # Special format for columns
         echo "${fastfile_var_prefix}${varkey}|->|$(fastfile_get "$file")"
     done | column -t -s "|"
 }
@@ -93,7 +93,7 @@ function fastfile_ls() {
 # Arguments:
 #    1. name - The name of the shortcut (default: name of the file)
 # STDOUT:
-#    => fastfle_print
+#    => fastfile_print
 #
 function fastfile_rm() {
     fastfile_print "$1"
@@ -105,7 +105,7 @@ function fastfile_rm() {
 #
 function fastfile_sync() {
     for f in "${fastfile_dir}"/*(NF); do
-        file=`basename "$f"` # To enable simpler handeling of spaces in file names
+        file=`basename "$f"` # To enable simpler handling of spaces in file names
         varkey=`echo "$file" | tr " " "_"`
 
         alias -g "${fastfile_var_prefix}${varkey}"="'$(fastfile_get "$file")'"
diff --git a/plugins/fd/README.md b/plugins/fd/README.md
index aabd624b8..4d9cf190f 100644
--- a/plugins/fd/README.md
+++ b/plugins/fd/README.md
@@ -10,4 +10,4 @@ plugins=(... fd)
 
 Completion is taken from the fd release [`7.3.0`](https://github.com/sharkdp/fd/releases/tag/v7.3.0).
 
-Updated on Febrary 13th, 2019.
+Updated on February 13th, 2019.
diff --git a/plugins/flutter/README.md b/plugins/flutter/README.md
index be419144f..9c8169afc 100644
--- a/plugins/flutter/README.md
+++ b/plugins/flutter/README.md
@@ -18,4 +18,4 @@ plugins=(... flutter)
 | `flb`      | `flutter build`        | Build flutter application                                                  |
 | `flattach` | `flutter attach`       | Attaches flutter to a running flutter application with enabled observatory |
 | `flget`    | `flutter packages get` | Installs dependencies                                                      |
-| `flc`      | `flutter clean`        | Cleans flutter porject                                                     |
+| `flc`      | `flutter clean`        | Cleans flutter project                                                     |
diff --git a/plugins/fzf/README.md b/plugins/fzf/README.md
index 791a3eb6f..15d4d31f3 100644
--- a/plugins/fzf/README.md
+++ b/plugins/fzf/README.md
@@ -26,7 +26,7 @@ export FZF_BASE=/path/to/fzf/install/dir
 Set default command to use when input is tty:
 
 ```zsh
-export FZF_DEFAULT_COMMAND='<your fzf default commmand>'
+export FZF_DEFAULT_COMMAND='<your fzf default command>'
 ```
 
 If not set, the plugin will try to set it to these, in the order in which they're found:
diff --git a/plugins/gitfast/git-completion.bash b/plugins/gitfast/git-completion.bash
index 4497a294f..f7b09b2c1 100644
--- a/plugins/gitfast/git-completion.bash
+++ b/plugins/gitfast/git-completion.bash
@@ -3383,7 +3383,7 @@ _git_worktree ()
 		# Here we are not completing an --option, it's either the
 		# path or a ref.
 		case "$prev" in
-		-b|-B)	# Complete refs for branch to be created/reseted.
+		-b|-B)	# Complete refs for branch to be created/reset.
 			__git_complete_refs
 			;;
 		-*)	# The previous word is an -o|--option without an
diff --git a/plugins/grails/grails.plugin.zsh b/plugins/grails/grails.plugin.zsh
index 11777738c..ddc257428 100644
--- a/plugins/grails/grails.plugin.zsh
+++ b/plugins/grails/grails.plugin.zsh
@@ -1,5 +1,5 @@
 _enumerateGrailsScripts() {
-    # Default directoryies
+    # Default directories
     directories=($GRAILS_HOME/scripts ~/.grails/scripts ./scripts)
 
     # Check all of the plugins directories, if they exist
diff --git a/plugins/grunt/grunt.plugin.zsh b/plugins/grunt/grunt.plugin.zsh
index 3f9695177..a89469a59 100644
--- a/plugins/grunt/grunt.plugin.zsh
+++ b/plugins/grunt/grunt.plugin.zsh
@@ -82,7 +82,7 @@ function __grunt() {
         update_msg=' (cache updated)'
     fi
 
-    # Make optioins completion.
+    # Make options completion.
     if [[ ${#__grunt_opts} -gt 0 ]]; then
         opts+=("${__grunt_opts[@]}")
     fi
@@ -161,7 +161,7 @@ function __grunt_update_cache() {
     fi
 
     if [[ $is_updating -ne 0 ]]; then
-        # Update caceh.
+        # Update cache.
         __grunt_version=$version
         __grunt_gruntfile=$gruntfile
         is_updating=1
diff --git a/plugins/history-substring-search/history-substring-search.zsh b/plugins/history-substring-search/history-substring-search.zsh
index a791cc4da..c326778d4 100644
--- a/plugins/history-substring-search/history-substring-search.zsh
+++ b/plugins/history-substring-search/history-substring-search.zsh
@@ -243,8 +243,8 @@ _history-substring-search-begin() {
     fi
 
     #
-    # Escape and join query parts with wildcard character '*' as seperator
-    # `(j:CHAR:)` join array to string with CHAR as seperator
+    # Escape and join query parts with wildcard character '*' as separator
+    # `(j:CHAR:)` join array to string with CHAR as separator
     #
     local search_pattern="*${(j:*:)_history_substring_search_query_parts[@]//(#m)[\][()|\\*?#<>~^]/\\$MATCH}*"
 
diff --git a/plugins/ipfs/_ipfs b/plugins/ipfs/_ipfs
index 9ee8bd79c..90c0a61c8 100644
--- a/plugins/ipfs/_ipfs
+++ b/plugins/ipfs/_ipfs
@@ -596,7 +596,7 @@ case $MAIN_SUBCOMMAND in
       '(-v --headers)'{-v,--headers}'[Print table headers (Hash, Size, Name).]' \
       '--resolve-type[Resolve linked objects to find out their types. Default: true.]' \
       '--size[Resolve linked objects to find out their file size. Default: true.]' \
-      '(-s --stream)'{-s,--stream}'[Enable exprimental streaming of directory entries as they are traversed.]' \
+      '(-s --stream)'{-s,--stream}'[Enable experimental streaming of directory entries as they are traversed.]' \
   ;;
   (mount)
     _arguments \
diff --git a/plugins/iterm2/iterm2.plugin.zsh b/plugins/iterm2/iterm2.plugin.zsh
index e4ac72ee3..9d8e40bf6 100644
--- a/plugins/iterm2/iterm2.plugin.zsh
+++ b/plugins/iterm2/iterm2.plugin.zsh
@@ -8,7 +8,7 @@
 if [[ "$OSTYPE" == darwin* ]] && [[ -n "$ITERM_SESSION_ID" ]] ; then
 
   ###
-  # Executes an arbitrary iTerm2 command via an escape code sequce.
+  # Executes an arbitrary iTerm2 command via an escape code sequence.
   # See https://iterm2.com/documentation-escape-codes.html for all supported commands.
   # Example: $ _iterm2_command "1337;StealFocus"
   function _iterm2_command() {
diff --git a/plugins/jenv/README.md b/plugins/jenv/README.md
index c043c626e..148794197 100644
--- a/plugins/jenv/README.md
+++ b/plugins/jenv/README.md
@@ -1,6 +1,6 @@
 # jenv plugin
 
-[jenv](https://www.jenv.be/) is a Java version manager similiar to [rbenv](https://github.com/rbenv/rbenv)
+[jenv](https://www.jenv.be/) is a Java version manager similar to [rbenv](https://github.com/rbenv/rbenv)
 and [pyenv](https://github.com/yyuu/pyenv).
 
 This plugin initializes jenv and provides the `jenv_prompt_info` function to add Java
diff --git a/plugins/macos/spotify b/plugins/macos/spotify
index 663215a74..491a60686 100644
--- a/plugins/macos/spotify
+++ b/plugins/macos/spotify
@@ -191,7 +191,7 @@ while [ $# -gt 0 ]; do
                             -d "grant_type=client_credentials" \
                     )
                     if ! [[ "${SPOTIFY_TOKEN_RESPONSE_DATA}" =~ "access_token" ]]; then
-                        cecho "Autorization failed, please check ${USER_CONFG_FILE}"
+                        cecho "Authorization failed, please check ${USER_CONFG_FILE}"
                         cecho "${SPOTIFY_TOKEN_RESPONSE_DATA}"
                         showAPIHelp
                         return 1
diff --git a/plugins/mercurial/README.md b/plugins/mercurial/README.md
index 756964896..4beee0a95 100644
--- a/plugins/mercurial/README.md
+++ b/plugins/mercurial/README.md
@@ -61,7 +61,7 @@ ZSH_THEME_HG_PROMPT_CLEAN="%{$fg[magenta]%})"
 This is the same as git plugin does. **Note**: additional changes to `.zshrc`, or using a theme designed
 to use `hg_prompt_info`, are required in order for this to work.
 
-## Mantainers
+## Maintainers
 
 - [ptrv](https://github.com/ptrv): original creator
 - [oshybystyi](https://github.com/oshybystyi)
diff --git a/plugins/npm/README.md b/plugins/npm/README.md
index 47d153619..e970c3c7a 100644
--- a/plugins/npm/README.md
+++ b/plugins/npm/README.md
@@ -10,7 +10,7 @@ plugins=(... npm)
 
 ## Aliases
 
-| Alias   | Command                      | Descripton                                                      |
+| Alias   | Command                      | Description                                                     |
 |:------  |:-----------------------------|:----------------------------------------------------------------|
 | `npmg`  | `npm i -g`                   | Install dependencies globally                                   |
 | `npmS`  | `npm i -S`                   | Install and save to dependencies in your package.json           |
diff --git a/plugins/pep8/_pep8 b/plugins/pep8/_pep8
index ce19951dc..27b7fc544 100644
--- a/plugins/pep8/_pep8
+++ b/plugins/pep8/_pep8
@@ -29,6 +29,6 @@ _arguments -s -S \
   "--max-line-length[set maximum allowed line length (default: 79)]::n:_files" \
   "--format[set the error format \[default|pylint|<custom>\]]::format:_files" \
   "--diff[report only lines changed according to the unified diff received on STDIN]" \
-  "--benchmark[measure processing speed   are read from the \[pep8\] section of the tox.ini fg file located in any parent folder of the path(s) llowed options are: exclude, filename, select, ngth, count, format, quiet, show-pep8, show-source, .]" \
+  "--benchmark[measure processing speed   are read from the \[pep8\] section of the tox.ini fg file located in any parent folder of the path(s) allowed options are: exclude, filename, select, ngth, count, format, quiet, show-pep8, show-source, .]" \
   "--config[user config file location (default: /home/gsemet/.config/pep8)]::path:_files" \
   "*::args:_files"
diff --git a/plugins/please/README.md b/plugins/please/README.md
index 89bfbf105..0a33f897b 100644
--- a/plugins/please/README.md
+++ b/plugins/please/README.md
@@ -1,7 +1,7 @@
 # please plugin
 
 [Please](https://please.build) is a cross-language build system with an emphasis on
-high performance, extensibility and reproduceability. It supports a number of popular
+high performance, extensibility and reproducibility. It supports a number of popular
 languages and can automate nearly any aspect of your build process.
 
 This plugin adds autocomplete and major aliases for `plz`, the command line tool for
diff --git a/plugins/pm2/_pm2 b/plugins/pm2/_pm2
index 6f1e89df5..86412aef1 100644
--- a/plugins/pm2/_pm2
+++ b/plugins/pm2/_pm2
@@ -124,7 +124,7 @@ logs_options=(
     '--out[only shows standard output]'
     '--lines[output the last N lines, instead of the last 15 by default]'
     '--timestamp[add timestamps (default format YYYY-MM-DD-HH:mm:ss)]'
-    '--nostream[print logs without lauching the log stream]'
+    '--nostream[print logs without launching the log stream]'
     '(-h --help)'{-h,--help}'[output usage information]'
     $id_all_comp
 )
@@ -139,7 +139,7 @@ case "$words[1]" in
     stop|restart|delete|reload|reset)
         _arguments $id_all_comp && return 0
         ;;
-    env|inspect|monitor|unmonitor|discribe)
+    env|inspect|monitor|unmonitor|describe)
         _arguments $id_comp && return 0
         ;;
     deploy|startOrRestart|startOrReload)
diff --git a/plugins/powify/_powify b/plugins/powify/_powify
index 9507f400e..57042aa63 100644
--- a/plugins/powify/_powify
+++ b/plugins/powify/_powify
@@ -15,7 +15,7 @@ _1st_arguments=(
   'restart:restarts the pow app linked to the current directory'
   'always_restart:reload the pow app after each request'
   'always_restart_off:do not reload the pow app after each request'
-  'rename:rename the current pow app to [NAME] or renmae [OLD] to [NEW]'
+  'rename:rename the current pow app to [NAME] or rename [OLD] to [NEW]'
   'environment:run the this pow app in a different environment (aliased `env`)'
   'browse:opens and navigates the default browser to this app'
   'logs:tail the application logs'
diff --git a/plugins/rake/rake.plugin.zsh b/plugins/rake/rake.plugin.zsh
index 121150017..3ceb20fea 100644
--- a/plugins/rake/rake.plugin.zsh
+++ b/plugins/rake/rake.plugin.zsh
@@ -2,7 +2,7 @@
 # over the years. We will miss you dearly.
 alias jimweirich="rake"  
 
-alias rake="noglob rake" # allows square brackts for rake task invocation
+alias rake="noglob rake" # allows square brackets for rake task invocation
 alias brake='noglob bundle exec rake' # execute the bundled rake gem
 alias srake='noglob sudo rake' # noglob must come before sudo
 alias sbrake='noglob sudo bundle exec rake' # altogether now ... 
diff --git a/plugins/rebar/_rebar b/plugins/rebar/_rebar
index 7ac5a510c..ea0d8a674 100644
--- a/plugins/rebar/_rebar
+++ b/plugins/rebar/_rebar
@@ -32,7 +32,7 @@ _rebar () {
         'create[Create skel based on template and vars]' \
         'create-app[Create simple app skel]' \
         'create-node[Create simple node skel]' \
-        'list-template[List avaiavle templates]' \
+        'list-template[List available templates]' \
         'doc[Generate Erlang program documentation]' \
         'check-deps[Display to be fetched dependencies]' \
         'get-deps[Fetch dependencies]' \
diff --git a/plugins/redis-cli/_redis-cli b/plugins/redis-cli/_redis-cli
index 1569f2916..f93624565 100644
--- a/plugins/redis-cli/_redis-cli
+++ b/plugins/redis-cli/_redis-cli
@@ -8,7 +8,7 @@ _1st_arguments=(
   'append:append a value to a key'
   'auth:authenticate to the server'
   'bgrewriteeaof:asynchronously rewrite the append-only file'
-  'bgsave:asynchornously save the dataset to disk'
+  'bgsave:asynchronously save the dataset to disk'
   'blpop:remove and get the first element in a list, or block until one is available'
   'brpop:remove and get the last element in a list, or block until one is available'
   'brpoplpush:pop a value from a list, push it to another list and return it; or block until one is available'
@@ -17,9 +17,9 @@ _1st_arguments=(
   # 'config resetstat: reset the stats returned by INFO'
   'dbsize:return the number of keys in the selected database'
   # 'debug object:get debugging information about a key'
-  # 'debug setgfault:make the server crash'
+  # 'debug segfault:make the server crash'
   'decr:decrement the integer value of a key by one'
-  'decrby:decrement the integet value of a key by the given number'
+  'decrby:decrement the integer value of a key by the given number'
   'del:delete a key'
   'discard:discard all commands issued after MULTI'
   'echo:echo the given string'
@@ -63,7 +63,7 @@ _1st_arguments=(
   'mget:get the values of all the given keys'
   'monitor:listen for all requests received by the server in real time'
   'move:move a key to another database'
-  'mset:set multiple keys to muliple values'
+  'mset:set multiple keys to multiple values'
   'msetnx:set multiple keys tom ultiple values, only if none of the keys exist'
   'multi:mark the start of a transaction block'
   'object:inspect the internals of Redis objects'
@@ -122,7 +122,7 @@ _1st_arguments=(
   'zrem:remove a member from a sorted set'
   'zremrangebyrank:remove all members in a sorted set within the given indexes'
   'zremrangebyscore:remove all members in a sorted set within the given scores'
-  'zrevrange:return a range of membrs in a sorted set, by index, with scores ordered from high to low'
+  'zrevrange:return a range of members in a sorted set, by index, with scores ordered from high to low'
   'zrevrangebyscore:return a range of members in a sorted set, by score, with scores ordered from high to low'
   'zrevrank:determine the index of a member in a sorted set, with scores ordered from high to low'
   'zscore:get the score associated with the given member in a sorted set'
diff --git a/plugins/salt/_salt b/plugins/salt/_salt
index 78d8611d2..a1c55f350 100644
--- a/plugins/salt/_salt
+++ b/plugins/salt/_salt
@@ -145,7 +145,7 @@ _master_options=(
     '(-v --verbose)'{-v,--verbose}'[Turn on command verbosity, display jid and active job queries]'
     '--hide-timeout[Hide minions that timeout]'
     '(-b --batch --batch-size)'{-b,--batch,--batch-size}'[Execute the salt job in batch mode, pass number or percentage to batch.]:Batch Size:'
-    '(-a --auth --eauth --extrenal-auth)'{-a,--auth,--eauth,--external-auth}'[Specify an external authentication system to use.]:eauth:'
+    '(-a --auth --eauth --external-auth)'{-a,--auth,--eauth,--external-auth}'[Specify an external authentication system to use.]:eauth:'
     '(-T --make-token)'{-T,--make-token}'[Generate and save an authentication token for re-use.]'
     '--return[Set an alternative return method.]:Returners:_path_files -W "$salt_dir/returners" -g "[^_]*.py(\:r)"'
     '(-d --doc --documentation)'{-d,--doc,--documentation}'[Return the documentation for the specified module]'
diff --git a/plugins/scala/_scala b/plugins/scala/_scala
index f7511a647..ba7ac3874 100644
--- a/plugins/scala/_scala
+++ b/plugins/scala/_scala
@@ -190,7 +190,7 @@ Y_opts=(
   "-Yshow-symkinds[Print abbreviated symbol kinds next to symbol names]"
   "-Yshow-trees[Print detailed ASTs (requires -Xprint\:phase)]"
   "-Yshow-trees-compact[Print detailed ASTs in compact form (requires -Xprint\:)]"
-  "-Yshow-trees-stringified[Print stringifications along with detailed ASTs (requires -Xprint\:)]"
+  "-Yshow-trees-stringified[Print stringification along with detailed ASTs (requires -Xprint\:)]"
   "-Ystatistics[Print compiler statistics]"
   "-Ystruct-dispatch\:-[Structural method dispatch policy (default\: poly-cache)]:policy name:(no-cache mono-cache poly-cache invoke-dynamic)"
 
diff --git a/plugins/sfdx/_sfdx b/plugins/sfdx/_sfdx
index 42ee55970..3a441f257 100644
--- a/plugins/sfdx/_sfdx
+++ b/plugins/sfdx/_sfdx
@@ -900,7 +900,7 @@ case "$words[1]" in
  force:data:tree:export)
  _command_args=(
  '(-q|--query)'{-q,--query}'[soql query, or filepath of file containing a soql query, to retrieve records]' \
- '(-p|--plan)'{-p,--plan}'[generate mulitple sobject tree files and a plan definition file for aggregated import]' \
+ '(-p|--plan)'{-p,--plan}'[generate multiple sobject tree files and a plan definition file for aggregated import]' \
  '(-x|--prefix)'{-x,--prefix}'[prefix of generated files]' \
  '(-d|--outputdir)'{-d,--outputdir}'[directory to store files]:file:_files' \
  '(-u|--targetusername)'{-u,--targetusername}'[username or alias for the target org; overrides default target org]' \
diff --git a/plugins/sprunge/README.md b/plugins/sprunge/README.md
index 28ed1834a..fb70d42eb 100644
--- a/plugins/sprunge/README.md
+++ b/plugins/sprunge/README.md
@@ -28,5 +28,5 @@ http://sprunge.us/XxjnKz
 - Sprunge accepts piped data, stdin redirection, text strings as input or filenames.
   Only one of these can be used at a time.
 - Argument precedence goes as follows: stdin > piped input > text strings.
-- If a filename is mispelled or doesn't have the necessary path description, it will NOT
+- If a filename is misspelled or doesn't have the necessary path description, it will NOT
   generate an error, but instead treat it as a text string.
diff --git a/plugins/supervisor/_supervisorctl b/plugins/supervisor/_supervisorctl
index 9f576c0c0..87cffab86 100644
--- a/plugins/supervisor/_supervisorctl
+++ b/plugins/supervisor/_supervisorctl
@@ -109,27 +109,27 @@ _supervisorctl_maintail() {
 _supervisorctl_start() {
     # TODO: add 'all'
     _arguments -s \
-        '*::supvervisor process:_get_supervisor_procs'
+        '*::supervisor process:_get_supervisor_procs'
 }
 
 (( $+functions[_supervisorctl_restart] )) ||
 _supervisorctl_restart() {
     # TODO: add 'all'
     _arguments -s \
-        '*::supvervisor process:_get_supervisor_procs'
+        '*::supervisor process:_get_supervisor_procs'
 }
 
 (( $+functions[_supervisorctl_status] )) ||
 _supervisorctl_status() {
     _arguments \
-        '*::supvervisor process:_get_supervisor_procs'
+        '*::supervisor process:_get_supervisor_procs'
 }
 
 (( $+functions[_supervisorctl_stop] )) ||
 _supervisorctl_stop() {
     # TODO: add 'all'
     _arguments -s \
-        '*::supvervisor process:_get_supervisor_procs'
+        '*::supervisor process:_get_supervisor_procs'
 }
 
 (( $+functions[_supervisorctl_tail] )) ||
@@ -137,7 +137,7 @@ _supervisorctl_tail() {
     # TODO: add 'stderr'
     _arguments -s \
         '-f[Continuous tail of named process stdout Ctrl-C to exit.]' \
-        '*::supvervisor process:_get_supervisor_procs'
+        '*::supervisor process:_get_supervisor_procs'
 }
 
 _supervisorctl "$@"
diff --git a/plugins/supervisor/supervisor.plugin.zsh b/plugins/supervisor/supervisor.plugin.zsh
index f11f0ed3f..ad5430275 100644
--- a/plugins/supervisor/supervisor.plugin.zsh
+++ b/plugins/supervisor/supervisor.plugin.zsh
@@ -1,4 +1,4 @@
-# DECLARION: This plugin was created by hhatto. What I did is just making a portal from https://bitbucket.org/hhatto/zshcompfunc4supervisor.
+# DECLARATION: This plugin was created by hhatto. What I did is just making a portal from https://bitbucket.org/hhatto/zshcompfunc4supervisor.
 
 alias sup='sudo supervisorctl'
 alias supad='sudo supervisorctl add'
diff --git a/plugins/suse/README.md b/plugins/suse/README.md
index 06c6d9ef5..f37ec1695 100644
--- a/plugins/suse/README.md
+++ b/plugins/suse/README.md
@@ -62,7 +62,7 @@ plugins=(... suse)
 
 NOTE: `--no-refresh` is passed to zypper for speeding up the calls and avoid errors due to lack
 of root privileges. If you need to refresh the repositories, call `sudo zypper ref` (`zref` alias)
-before runing these aliases.
+before running these aliases.
 
 Related: [#9798](https://github.com/ohmyzsh/ohmyzsh/pull/9798).
 
diff --git a/plugins/symfony2/README.md b/plugins/symfony2/README.md
index 2946d0937..76233472f 100644
--- a/plugins/symfony2/README.md
+++ b/plugins/symfony2/README.md
@@ -17,7 +17,7 @@ plugins=(... symfony2)
 | `sfsr`        | sf server:run                | Run the dev server            |
 | `sfcw`        | sf cache:warmup              | Use the Bundles warmer        |
 | `sfroute`     | sf debug:router              | Show the different routes     |
-| `sfcontainer` | sf debug:contaner            | List the different services   |
+| `sfcontainer` | sf debug:container           | List the different services   |
 | `sfgb`        | sf generate:bundle           | Generate a bundle             |
 | `sfgc`        | sf generate:controller       | Generate a controller         |
 | `sfgcom`      | sf generate:command          | Generate a command            |
diff --git a/plugins/systemadmin/systemadmin.plugin.zsh b/plugins/systemadmin/systemadmin.plugin.zsh
index 2f9d1ef35..9a2129060 100644
--- a/plugins/systemadmin/systemadmin.plugin.zsh
+++ b/plugins/systemadmin/systemadmin.plugin.zsh
@@ -27,7 +27,7 @@ alias mkdir='mkdir -pv'
 # get top process eating memory
 alias psmem='ps -e -orss=,args= | sort -b -k1 -nr'
 alias psmem10='ps -e -orss=,args= | sort -b -k1 -nr | head -n 10'
-# get top process eating cpu if not work try excute : export LC_ALL='C'
+# get top process eating cpu if not work try execute : export LC_ALL='C'
 alias pscpu='ps -e -o pcpu,cpu,nice,state,cputime,args|sort -k1,1n -nr'
 alias pscpu10='ps -e -o pcpu,cpu,nice,state,cputime,args|sort -k1,1n -nr | head -n 10'
 # top10 of the history
@@ -105,7 +105,7 @@ visitpage20() {
 # top100 of Page lists the most time-consuming (more than 60 seconds) as well as the corresponding page number of occurrences
 consume100() {
     awk '($NF > 60 && $7~/\.php/){print $7}' "$(retlog)" |sort -n|uniq -c|sort -nr|head -n 100
-    # if django website or other webiste make by no suffix language
+    # if django website or other website make by no suffix language
     # awk '{print $7}' "$(retlog)" |sort -n|uniq -c|sort -nr|head -n 100
 }
 
diff --git a/plugins/terminitor/_terminitor b/plugins/terminitor/_terminitor
index 1ce87c3ad..3615350e2 100644
--- a/plugins/terminitor/_terminitor
+++ b/plugins/terminitor/_terminitor
@@ -11,7 +11,7 @@ local -a _1st_arguments
 _1st_arguments=(
     'create:create a Termfile in directory'
     'delete:delete terminitor script'
-    'edit:open termitor script'
+    'edit:open terminitor script'
     'fetch:clone the designated repo and run setup'
     'help:Describe available tasks or one specific task'
     'init:create initial root terminitor folder'
diff --git a/plugins/ubuntu/README.md b/plugins/ubuntu/README.md
index f72182f5c..9efef0732 100644
--- a/plugins/ubuntu/README.md
+++ b/plugins/ubuntu/README.md
@@ -19,7 +19,7 @@ Commands that use `$APT` will use `apt` if installed or defer to `apt-get` other
 | acp     | `apt-cache policy`                                                       | Display the package source priorities                                                             |
 | afs     | `apt-file search --regexp`                                               | Perform a regular expression apt-file search                                                      |
 | afu     | `sudo apt-file update`                                                   | Generates or updates the apt-file package database                                                |
-| aga     | `sudo $APT autoclean`                                                    | Clears out the local reposityory of retrieved package files that can no longer be downloaded      |
+| aga     | `sudo $APT autoclean`                                                    | Clears out the local repository of retrieved package files that can no longer be downloaded       |
 | agb     | `sudo $APT build-dep <source_pkg>`                                       | Installs/Removes packages to satisfy the dependencies of a specified build pkg                    |
 | agc     | `sudo $APT clean`                                                        | Clears out the local repository of retrieved package files leaving everything from the lock files |
 | agd     | `sudo $APT dselect-upgrade`                                              | Follows dselect choices for package installation                                                  |
diff --git a/plugins/vault/_vault b/plugins/vault/_vault
index c5338dffa..f6bd3517e 100644
--- a/plugins/vault/_vault
+++ b/plugins/vault/_vault
@@ -53,7 +53,7 @@ mount_tune_args=(
 typeset -a mount_args
 mount_args=(
     $mount_tune_args
-    '(-path)-path=-[Mount point for the logical backend. This defauls to the type of the mount.]:path:'
+    '(-path)-path=-[Mount point for the logical backend. This defaults to the type of the mount.]:path:'
     '(-description)-description=-[Human-friendly description of the purpose for the mount. This shows up in the mounts command.]:description:'
 )
 
@@ -189,7 +189,7 @@ _vault_mounts() {
 }
 
 _vault_mount() {
-    # to find out how many types of backens are there
+    # to find out how many types of backends are there
     _arguments : \
         ${general_args[@]} \
         ${mount_args[@]} \
diff --git a/plugins/yarn/_yarn b/plugins/yarn/_yarn
index 70ed55929..9173eca20 100644
--- a/plugins/yarn/_yarn
+++ b/plugins/yarn/_yarn
@@ -157,7 +157,7 @@ _yarn() {
     '(--emoji)--no-emoji[disable emoji in output]' \
     '(--disable-pnp)'{--enable-pnp,--pnp}"[enable the Plug'n'Play installation]" \
     '--flat[only allow one version of a package]' \
-    '--focus[Focus on a single workspace by installing remote copies of its sibiling workspaces]' \
+    '--focus[Focus on a single workspace by installing remote copies of its sibling workspaces]' \
     '--force[install and build packages even if they were built before, overwrite lockfile]' \
     "--frozen-lockfile[don't generate a lockfile and fail if an update is needed]" \
     '--global-folder=[modules folder]:folder:_files -/' \
diff --git a/plugins/yum/yum.plugin.zsh b/plugins/yum/yum.plugin.zsh
index 69abfc4ce..d36571133 100644
--- a/plugins/yum/yum.plugin.zsh
+++ b/plugins/yum/yum.plugin.zsh
@@ -7,7 +7,7 @@ alias ygl="yum grouplist"                   # list package groups
 alias yli="yum list installed"              # print all installed packages
 alias ymc="yum makecache"                   # rebuilds the yum package list
 
-alias yu="sudo yum update"                  # upgrate packages
+alias yu="sudo yum update"                  # upgrade packages
 alias yi="sudo yum install"                 # install package
 alias ygi="sudo yum groupinstall"           # install package group
 alias yr="sudo yum remove"                  # remove package
diff --git a/themes/dallas.zsh-theme b/themes/dallas.zsh-theme
index d6c417fc3..4f8be20d3 100644
--- a/themes/dallas.zsh-theme
+++ b/themes/dallas.zsh-theme
@@ -9,7 +9,7 @@ DALLAS_CURRENT_MACH_="%{$fg[green]%}%m%{$fg[white]%}:%{$reset_color%}"
 DALLAS_CURRENT_LOCA_="%{$fg[cyan]%}%~\$(git_prompt_info)%{$reset_color%}\$(parse_git_dirty)"
 # Grab the current username: dallas
 DALLAS_CURRENT_USER_="%{$fg[red]%}%n%{$reset_color%}"
-# Use a % for normal users and a # for privelaged (root) users.
+# Use a % for normal users and a # for privileged (root) users.
 DALLAS_PROMPT_CHAR_="%{$fg[white]%}%(!.#.%%)%{$reset_color%}"
 # For the git prompt, use a white @ and blue text for the branch name
 ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[white]%}@%{$fg[blue]%}"
diff --git a/themes/essembeh.zsh-theme b/themes/essembeh.zsh-theme
index f34f36f8a..43d4093b1 100644
--- a/themes/essembeh.zsh-theme
+++ b/themes/essembeh.zsh-theme
@@ -39,7 +39,7 @@ elif [[ -r /etc/debian_chroot ]]; then
 	# prefix prompt in case of chroot
 	ZSH_ESSEMBEH_PREFIX="%{$fg[yellow]%}[chroot:$(cat /etc/debian_chroot)]%{$reset_color%} "
 elif [[ -r /.dockerenv ]]; then
-	# also prefix prompt inside a docker contrainer
+	# also prefix prompt inside a docker container
 	ZSH_ESSEMBEH_PREFIX="%{$fg[yellow]%}[docker]%{$reset_color%} "
 fi
 if [[ $UID = 0 ]]; then
diff --git a/themes/nicoulaj.zsh-theme b/themes/nicoulaj.zsh-theme
index 333aa5e70..685cd1ade 100644
--- a/themes/nicoulaj.zsh-theme
+++ b/themes/nicoulaj.zsh-theme
@@ -6,7 +6,7 @@
 #   * Only shows the path on the left prompt by default.
 #   * Crops the path to a defined length and only shows the path relative to
 #     the current VCS repository root.
-#   * Wears a different color wether the last command succeeded/failed.
+#   * Wears a different color whether the last command succeeded/failed.
 #   * Shows user@hostname if connected through SSH.
 #   * Shows if logged in as root or not.
 # ------------------------------------------------------------------------------

From aef393bdce523ed5e5754721965fab2da8080119 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Wed, 1 Dec 2021 12:18:32 +0100
Subject: [PATCH 577/869] ci: add `check-spelling` GitHub Action

---
 .github/actions/spelling/README.md    | 15 +++++++++++++
 .github/actions/spelling/advice.md    | 27 +++++++++++++++++++++++
 .github/actions/spelling/allow.txt    |  0
 .github/actions/spelling/excludes.txt | 17 +++++++++++++++
 .github/actions/spelling/expect.txt   |  2 ++
 .github/actions/spelling/patterns.txt |  4 ++++
 .github/actions/spelling/reject.txt   |  6 ++++++
 .github/workflows/spelling.yml        | 31 +++++++++++++++++++++++++++
 8 files changed, 102 insertions(+)
 create mode 100644 .github/actions/spelling/README.md
 create mode 100644 .github/actions/spelling/advice.md
 create mode 100644 .github/actions/spelling/allow.txt
 create mode 100644 .github/actions/spelling/excludes.txt
 create mode 100644 .github/actions/spelling/expect.txt
 create mode 100644 .github/actions/spelling/patterns.txt
 create mode 100644 .github/actions/spelling/reject.txt
 create mode 100644 .github/workflows/spelling.yml

diff --git a/.github/actions/spelling/README.md b/.github/actions/spelling/README.md
new file mode 100644
index 000000000..1bd7d4412
--- /dev/null
+++ b/.github/actions/spelling/README.md
@@ -0,0 +1,15 @@
+# check-spelling/check-spelling configuration
+
+| File                             | Purpose                                                                          | Format                                                    | Info                                                                                                 |
+| -------------------------------- | -------------------------------------------------------------------------------- | --------------------------------------------------------- | ---------------------------------------------------------------------------------------------------- |
+| [dictionary.txt](dictionary.txt) | Replacement dictionary (creating this file will override the default dictionary) | one word per line                                         | [dictionary](https://github.com/check-spelling/check-spelling/wiki/Configuration#dictionary)         |
+| [allow.txt](allow.txt)           | Add words to the dictionary                                                      | one word per line (only letters and `'`s allowed)         | [allow](https://github.com/check-spelling/check-spelling/wiki/Configuration#allow)                   |
+| [reject.txt](reject.txt)         | Remove words from the dictionary (after allow)                                   | grep pattern matching whole dictionary words              | [reject](https://github.com/check-spelling/check-spelling/wiki/Configuration-Examples%3A-reject)     |
+| [excludes.txt](excludes.txt)     | Files to ignore entirely                                                         | perl regular expression                                   | [excludes](https://github.com/check-spelling/check-spelling/wiki/Configuration-Examples%3A-excludes) |
+| [only.txt](only.txt)             | Only check matching files (applied after excludes)                               | perl regular expression                                   | [only](https://github.com/check-spelling/check-spelling/wiki/Configuration-Examples%3A-only)         |
+| [patterns.txt](patterns.txt)     | Patterns to ignore from checked lines                                            | perl regular expression (order matters, first match wins) | [patterns](https://github.com/check-spelling/check-spelling/wiki/Configuration-Examples%3A-patterns) |
+| [expect.txt](expect.txt)         | Expected words that aren't in the dictionary                                     | one word per line (sorted, alphabetically)                | [expect](https://github.com/check-spelling/check-spelling/wiki/Configuration#expect)                 |
+| [advice.md](advice.md)           | Supplement for GitHub comment when unrecognized words are found                  | GitHub Markdown                                           | [advice](https://github.com/check-spelling/check-spelling/wiki/Configuration-Examples%3A-advice)     |
+
+Note: you can replace any of these files with a directory by the same name (minus the suffix)
+and then include multiple files inside that directory (with that suffix) to merge multiple files together.
diff --git a/.github/actions/spelling/advice.md b/.github/actions/spelling/advice.md
new file mode 100644
index 000000000..2a32b6520
--- /dev/null
+++ b/.github/actions/spelling/advice.md
@@ -0,0 +1,27 @@
+<!-- See https://github.com/check-spelling/check-spelling/wiki/Configuration-Examples%3A-advice --> <!-- markdownlint-disable MD033 MD041 -->
+<details><summary>If you see a bunch of garbage</summary>
+
+If it relates to a ...
+<details><summary>well-formed pattern</summary>
+
+See if there's a [pattern](https://github.com/check-spelling/check-spelling/wiki/Configuration-Examples:-patterns) that would match it.
+
+If not, try writing one and adding it to the `patterns.txt` file.
+
+Patterns are Perl 5 Regular Expressions - you can [test](
+https://www.regexplanet.com/advanced/perl/) yours before committing to verify it will match your lines.
+
+Note that patterns can't match multiline strings.
+</details>
+<details><summary>binary-ish string</summary>
+
+Please add a file path to the `excludes.txt` file instead of just accepting the garbage.
+
+File paths are Perl 5 Regular Expressions - you can [test](
+https://www.regexplanet.com/advanced/perl/) yours before committing to verify it will match your files.
+
+`^` refers to the file's path from the root of the repository, so `^README\.md$` would exclude [README.md](
+../tree/HEAD/README.md) (on whichever branch you're using).
+</details>
+
+</details>
diff --git a/.github/actions/spelling/allow.txt b/.github/actions/spelling/allow.txt
new file mode 100644
index 000000000..e69de29bb
diff --git a/.github/actions/spelling/excludes.txt b/.github/actions/spelling/excludes.txt
new file mode 100644
index 000000000..ce9f3b99a
--- /dev/null
+++ b/.github/actions/spelling/excludes.txt
@@ -0,0 +1,17 @@
+# See https://github.com/check-spelling/check-spelling/wiki/Configuration-Examples:-excludes
+(?:^|/)(?i)COPYRIGHT
+(?:^|/)(?i)LICEN[CS]E
+(?:^|/)package(?:-lock|)\.json$
+(?:^|/)vendor/
+ignore$
+\.avi$
+\.ico$
+\.jpe?g$
+\.lock$
+\.map$
+\.min\.
+\.mod$
+\.mp[34]$
+\.png$
+\.wav$
+^\.github/
diff --git a/.github/actions/spelling/expect.txt b/.github/actions/spelling/expect.txt
new file mode 100644
index 000000000..d69fa3882
--- /dev/null
+++ b/.github/actions/spelling/expect.txt
@@ -0,0 +1,2 @@
+ohmyzsh
+oh-my-zsh
diff --git a/.github/actions/spelling/patterns.txt b/.github/actions/spelling/patterns.txt
new file mode 100644
index 000000000..d39d09e97
--- /dev/null
+++ b/.github/actions/spelling/patterns.txt
@@ -0,0 +1,4 @@
+# See https://github.com/check-spelling/check-spelling/wiki/Configuration-Examples:-patterns
+
+# ignore long runs of a single character:
+\b([A-Za-z])\g{-1}{3,}\b
diff --git a/.github/actions/spelling/reject.txt b/.github/actions/spelling/reject.txt
new file mode 100644
index 000000000..67e0ad79b
--- /dev/null
+++ b/.github/actions/spelling/reject.txt
@@ -0,0 +1,6 @@
+^attache$
+occurence
+Sorce
+^[Ss]pae
+^untill
+^wether
diff --git a/.github/workflows/spelling.yml b/.github/workflows/spelling.yml
new file mode 100644
index 000000000..06a8b74c9
--- /dev/null
+++ b/.github/workflows/spelling.yml
@@ -0,0 +1,31 @@
+name: Spell checking
+on:
+  pull_request_target:
+  push:
+  issue_comment:
+    types: [created]
+
+jobs:
+  spelling:
+    name: Spell checking
+    runs-on: ubuntu-latest
+    steps:
+    - name: checkout-merge
+      if: "contains(github.event_name, 'pull_request')"
+      uses: actions/checkout@v2
+      with:
+        ref: refs/pull/${{github.event.pull_request.number}}/merge
+    - name: checkout
+      if: ${{ github.event_name == 'push' ||
+        (
+          contains(github.event.comment.body, '@check-spelling-bot apply')
+        ) }}
+      uses: actions/checkout@v2
+    - uses: check-spelling/check-spelling@main
+      id: spelling
+      if: ${{ github.event_name != 'issue_comment' ||
+        (
+          contains(github.event.comment.body, '@check-spelling-bot apply')
+        ) }}
+      with:
+        experimental_apply_changes_via_bot: 1

From e253661a9b3d8bba3acc90bc06c211f14ab8d587 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Wed, 1 Dec 2021 12:25:58 +0100
Subject: [PATCH 578/869] Revert "ci: add `check-spelling` GitHub Action"

This reverts commit aef393bdce523ed5e5754721965fab2da8080119.
---
 .github/actions/spelling/README.md    | 15 -------------
 .github/actions/spelling/advice.md    | 27 -----------------------
 .github/actions/spelling/allow.txt    |  0
 .github/actions/spelling/excludes.txt | 17 ---------------
 .github/actions/spelling/expect.txt   |  2 --
 .github/actions/spelling/patterns.txt |  4 ----
 .github/actions/spelling/reject.txt   |  6 ------
 .github/workflows/spelling.yml        | 31 ---------------------------
 8 files changed, 102 deletions(-)
 delete mode 100644 .github/actions/spelling/README.md
 delete mode 100644 .github/actions/spelling/advice.md
 delete mode 100644 .github/actions/spelling/allow.txt
 delete mode 100644 .github/actions/spelling/excludes.txt
 delete mode 100644 .github/actions/spelling/expect.txt
 delete mode 100644 .github/actions/spelling/patterns.txt
 delete mode 100644 .github/actions/spelling/reject.txt
 delete mode 100644 .github/workflows/spelling.yml

diff --git a/.github/actions/spelling/README.md b/.github/actions/spelling/README.md
deleted file mode 100644
index 1bd7d4412..000000000
--- a/.github/actions/spelling/README.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# check-spelling/check-spelling configuration
-
-| File                             | Purpose                                                                          | Format                                                    | Info                                                                                                 |
-| -------------------------------- | -------------------------------------------------------------------------------- | --------------------------------------------------------- | ---------------------------------------------------------------------------------------------------- |
-| [dictionary.txt](dictionary.txt) | Replacement dictionary (creating this file will override the default dictionary) | one word per line                                         | [dictionary](https://github.com/check-spelling/check-spelling/wiki/Configuration#dictionary)         |
-| [allow.txt](allow.txt)           | Add words to the dictionary                                                      | one word per line (only letters and `'`s allowed)         | [allow](https://github.com/check-spelling/check-spelling/wiki/Configuration#allow)                   |
-| [reject.txt](reject.txt)         | Remove words from the dictionary (after allow)                                   | grep pattern matching whole dictionary words              | [reject](https://github.com/check-spelling/check-spelling/wiki/Configuration-Examples%3A-reject)     |
-| [excludes.txt](excludes.txt)     | Files to ignore entirely                                                         | perl regular expression                                   | [excludes](https://github.com/check-spelling/check-spelling/wiki/Configuration-Examples%3A-excludes) |
-| [only.txt](only.txt)             | Only check matching files (applied after excludes)                               | perl regular expression                                   | [only](https://github.com/check-spelling/check-spelling/wiki/Configuration-Examples%3A-only)         |
-| [patterns.txt](patterns.txt)     | Patterns to ignore from checked lines                                            | perl regular expression (order matters, first match wins) | [patterns](https://github.com/check-spelling/check-spelling/wiki/Configuration-Examples%3A-patterns) |
-| [expect.txt](expect.txt)         | Expected words that aren't in the dictionary                                     | one word per line (sorted, alphabetically)                | [expect](https://github.com/check-spelling/check-spelling/wiki/Configuration#expect)                 |
-| [advice.md](advice.md)           | Supplement for GitHub comment when unrecognized words are found                  | GitHub Markdown                                           | [advice](https://github.com/check-spelling/check-spelling/wiki/Configuration-Examples%3A-advice)     |
-
-Note: you can replace any of these files with a directory by the same name (minus the suffix)
-and then include multiple files inside that directory (with that suffix) to merge multiple files together.
diff --git a/.github/actions/spelling/advice.md b/.github/actions/spelling/advice.md
deleted file mode 100644
index 2a32b6520..000000000
--- a/.github/actions/spelling/advice.md
+++ /dev/null
@@ -1,27 +0,0 @@
-<!-- See https://github.com/check-spelling/check-spelling/wiki/Configuration-Examples%3A-advice --> <!-- markdownlint-disable MD033 MD041 -->
-<details><summary>If you see a bunch of garbage</summary>
-
-If it relates to a ...
-<details><summary>well-formed pattern</summary>
-
-See if there's a [pattern](https://github.com/check-spelling/check-spelling/wiki/Configuration-Examples:-patterns) that would match it.
-
-If not, try writing one and adding it to the `patterns.txt` file.
-
-Patterns are Perl 5 Regular Expressions - you can [test](
-https://www.regexplanet.com/advanced/perl/) yours before committing to verify it will match your lines.
-
-Note that patterns can't match multiline strings.
-</details>
-<details><summary>binary-ish string</summary>
-
-Please add a file path to the `excludes.txt` file instead of just accepting the garbage.
-
-File paths are Perl 5 Regular Expressions - you can [test](
-https://www.regexplanet.com/advanced/perl/) yours before committing to verify it will match your files.
-
-`^` refers to the file's path from the root of the repository, so `^README\.md$` would exclude [README.md](
-../tree/HEAD/README.md) (on whichever branch you're using).
-</details>
-
-</details>
diff --git a/.github/actions/spelling/allow.txt b/.github/actions/spelling/allow.txt
deleted file mode 100644
index e69de29bb..000000000
diff --git a/.github/actions/spelling/excludes.txt b/.github/actions/spelling/excludes.txt
deleted file mode 100644
index ce9f3b99a..000000000
--- a/.github/actions/spelling/excludes.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-# See https://github.com/check-spelling/check-spelling/wiki/Configuration-Examples:-excludes
-(?:^|/)(?i)COPYRIGHT
-(?:^|/)(?i)LICEN[CS]E
-(?:^|/)package(?:-lock|)\.json$
-(?:^|/)vendor/
-ignore$
-\.avi$
-\.ico$
-\.jpe?g$
-\.lock$
-\.map$
-\.min\.
-\.mod$
-\.mp[34]$
-\.png$
-\.wav$
-^\.github/
diff --git a/.github/actions/spelling/expect.txt b/.github/actions/spelling/expect.txt
deleted file mode 100644
index d69fa3882..000000000
--- a/.github/actions/spelling/expect.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-ohmyzsh
-oh-my-zsh
diff --git a/.github/actions/spelling/patterns.txt b/.github/actions/spelling/patterns.txt
deleted file mode 100644
index d39d09e97..000000000
--- a/.github/actions/spelling/patterns.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-# See https://github.com/check-spelling/check-spelling/wiki/Configuration-Examples:-patterns
-
-# ignore long runs of a single character:
-\b([A-Za-z])\g{-1}{3,}\b
diff --git a/.github/actions/spelling/reject.txt b/.github/actions/spelling/reject.txt
deleted file mode 100644
index 67e0ad79b..000000000
--- a/.github/actions/spelling/reject.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-^attache$
-occurence
-Sorce
-^[Ss]pae
-^untill
-^wether
diff --git a/.github/workflows/spelling.yml b/.github/workflows/spelling.yml
deleted file mode 100644
index 06a8b74c9..000000000
--- a/.github/workflows/spelling.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-name: Spell checking
-on:
-  pull_request_target:
-  push:
-  issue_comment:
-    types: [created]
-
-jobs:
-  spelling:
-    name: Spell checking
-    runs-on: ubuntu-latest
-    steps:
-    - name: checkout-merge
-      if: "contains(github.event_name, 'pull_request')"
-      uses: actions/checkout@v2
-      with:
-        ref: refs/pull/${{github.event.pull_request.number}}/merge
-    - name: checkout
-      if: ${{ github.event_name == 'push' ||
-        (
-          contains(github.event.comment.body, '@check-spelling-bot apply')
-        ) }}
-      uses: actions/checkout@v2
-    - uses: check-spelling/check-spelling@main
-      id: spelling
-      if: ${{ github.event_name != 'issue_comment' ||
-        (
-          contains(github.event.comment.body, '@check-spelling-bot apply')
-        ) }}
-      with:
-        experimental_apply_changes_via_bot: 1

From c66fc00401a8d6a6bd6da39ec890dfdc0e6bd878 Mon Sep 17 00:00:00 2001
From: Nick Aldwin <Nick@Aldwin.us>
Date: Wed, 1 Dec 2021 06:44:15 -0500
Subject: [PATCH 579/869] feat(updater): show command to update when update
 skipped (#10465)

---
 tools/check_for_upgrade.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tools/check_for_upgrade.sh b/tools/check_for_upgrade.sh
index b6625a395..293f48edf 100644
--- a/tools/check_for_upgrade.sh
+++ b/tools/check_for_upgrade.sh
@@ -160,7 +160,8 @@ function update_ohmyzsh() {
     [[ "$option" != $'\n' ]] && echo
     case "$option" in
       [yY$'\n']) update_ohmyzsh ;;
-      [nN]) update_last_updated_file ;;
+      [nN]) update_last_updated_file ;&
+      *) echo "[oh-my-zsh] You can update manually by running \`omz update\`" ;;
     esac
   fi
 }

From 46e63340eef243f25890e2178931919125c58aae Mon Sep 17 00:00:00 2001
From: whoami <atommixz@gmail.com>
Date: Wed, 1 Dec 2021 19:49:42 +0300
Subject: [PATCH 580/869] feat(branch): show mercurial bookmarks if used
 (#9948)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Marc Cornellà <hello@mcornella.com>
---
 plugins/branch/README.md         | 48 +++++++++++++++++++++-----------
 plugins/branch/branch.plugin.zsh | 44 ++++++++++++++++-------------
 2 files changed, 56 insertions(+), 36 deletions(-)

diff --git a/plugins/branch/README.md b/plugins/branch/README.md
index 56ab8da4b..a15dd22df 100644
--- a/plugins/branch/README.md
+++ b/plugins/branch/README.md
@@ -1,31 +1,47 @@
-# Branch
+# Branch plugin
 
-Displays the current Git or Mercurial branch fast.
+This plugin displays the current Git or Mercurial branch, fast. If in a Mercurial repository,
+also display the current bookmark, if present.
+
+To use it, add `branch` to the plugins array in your zshrc file:
+
+```zsh
+plugins=(... branch)
+```
 
 ## Speed test
 
-### Mercurial
+- `hg branch`:
 
-```shell
-$ time hg branch
-0.11s user 0.14s system 70% cpu 0.355 total
-```
+  ```console
+  $ time hg branch
+  0.11s user 0.14s system 70% cpu 0.355 total
+  ```
 
-### Branch plugin
+- branch plugin:
 
-```shell
-$ time zsh /tmp/branch_prompt_info_test.zsh
-0.00s user 0.01s system 78% cpu 0.014 total
-```
+  ```console
+  $ time zsh /tmp/branch_prompt_info_test.zsh
+  0.00s user 0.01s system 78% cpu 0.014 total
+  ```
 
 ## Usage
 
-Edit your theme file (eg.: `~/.oh-my-zsh/theme/robbyrussell.zsh-theme`)
-adding `$(branch_prompt_info)` in your prompt like this:
+Copy your theme to `$ZSH_CUSTOM/themes/` and modify it to add `$(branch_prompt_info)` in your prompt.
+This example is for the `robbyrussell` theme:
 
 ```diff
-- PROMPT='${ret_status}%{$fg_bold[green]%}%p %{$fg[cyan]%}%c %{$fg_bold[blue]%}$(git_prompt_info)%{$fg_bold[blue]%} % %{$reset_color%}'
-+ PROMPT='${ret_status}%{$fg_bold[green]%}%p %{$fg[cyan]%}%c %{$fg_bold[blue]%}$(git_prompt_info)$(branch_prompt_info)%{$fg_bold[blue]%} % %{$reset_color%}'
+diff --git a/themes/robbyrussell.zsh-theme b/themes/robbyrussell.zsh-theme
+index 2fd5f2cd..9d89a464 100644
+--- a/themes/robbyrussell.zsh-theme
++++ b/themes/robbyrussell.zsh-theme
+@@ -1,5 +1,5 @@
+ PROMPT="%(?:%{$fg_bold[green]%}➜ :%{$fg_bold[red]%}➜ )"
+-PROMPT+=' %{$fg[cyan]%}%c%{$reset_color%} $(git_prompt_info)'
++PROMPT+=' %{$fg[cyan]%}%c%{$reset_color%} $(branch_prompt_info)'
+ 
+ ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg_bold[blue]%}git:(%{$fg[red]%}"
+ ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%} "
 ```
 
 ## Maintainer
diff --git a/plugins/branch/branch.plugin.zsh b/plugins/branch/branch.plugin.zsh
index 2e5659bdf..dd5871fdc 100644
--- a/plugins/branch/branch.plugin.zsh
+++ b/plugins/branch/branch.plugin.zsh
@@ -3,29 +3,33 @@
 # Oct 2, 2015
 
 function branch_prompt_info() {
-  # Defines path as current directory
-  local current_dir=$PWD
-  # While current path is not root path
-  while [[ $current_dir != '/' ]]
-  do
-    # Git repository
-    if [[ -d "${current_dir}/.git" ]]
-    then
-      echo '±' ${"$(<"$current_dir/.git/HEAD")"##*/}
-      return;
+  # Start checking in current working directory
+  local branch="" dir="$PWD"
+  while [[ "$dir" != '/' ]]; do
+    # Found .git directory
+    if [[ -d "${dir}/.git" ]]; then
+      branch="${"$(<"${dir}/.git/HEAD")"##*/}"
+      echo '±' "${branch:gs/%/%%}"
+      return
     fi
-    # Mercurial repository
-    if [[ -d "${current_dir}/.hg" ]]
-    then
-      if [[ -f "$current_dir/.hg/branch" ]]
-      then
-        echo '☿' $(<"$current_dir/.hg/branch")
+
+    # Found .hg directory
+    if [[ -d "${dir}/.hg" ]]; then
+      if [[ -f "${dir}/.hg/branch" ]]; then
+        branch="$(<"${dir}/.hg/branch")"
       else
-        echo '☿ default'
+        branch="default"
       fi
-      return;
+
+      if [[ -f "${dir}/.hg/bookmarks.current" ]]; then
+        branch="${branch}/$(<"${dir}/.hg/bookmarks.current")"
+      fi
+
+      echo '☿' "${branch:gs/%/%%}"
+      return
     fi
-    # Defines path as parent directory and keeps looking for :)
-    current_dir="${current_dir:h}"
+
+    # Check parent directory
+    dir="${dir:h}"
   done
 }

From 841f3cb0bb7663fa1062ffc59acb7b4581dc1d0f Mon Sep 17 00:00:00 2001
From: Josh Soref <2119212+jsoref@users.noreply.github.com>
Date: Thu, 2 Dec 2021 06:17:00 -0500
Subject: [PATCH 581/869] ci: add `check-spelling` action (#10470)

Co-authored-by: Josh Soref <jsoref@users.noreply.github.com>
---
 .github/actions/spelling/README.md    |   15 +
 .github/actions/spelling/advice.md    |   25 +
 .github/actions/spelling/allow.txt    |    0
 .github/actions/spelling/excludes.txt |   41 +
 .github/actions/spelling/expect.txt   | 4489 +++++++++++++++++++++++++
 .github/actions/spelling/patterns.txt |   73 +
 .github/actions/spelling/reject.txt   |    7 +
 .github/workflows/spelling.yml        |   95 +
 8 files changed, 4745 insertions(+)
 create mode 100644 .github/actions/spelling/README.md
 create mode 100644 .github/actions/spelling/advice.md
 create mode 100644 .github/actions/spelling/allow.txt
 create mode 100644 .github/actions/spelling/excludes.txt
 create mode 100644 .github/actions/spelling/expect.txt
 create mode 100644 .github/actions/spelling/patterns.txt
 create mode 100644 .github/actions/spelling/reject.txt
 create mode 100644 .github/workflows/spelling.yml

diff --git a/.github/actions/spelling/README.md b/.github/actions/spelling/README.md
new file mode 100644
index 000000000..dcd237ba2
--- /dev/null
+++ b/.github/actions/spelling/README.md
@@ -0,0 +1,15 @@
+# check-spelling/check-spelling configuration
+
+File | Purpose | Format | Info
+-|-|-|-
+[dictionary.txt](dictionary.txt) | Replacement dictionary (creating this file will override the default dictionary) | one word per line | [dictionary](https://github.com/check-spelling/check-spelling/wiki/Configuration#dictionary)
+[allow.txt](allow.txt) | Add words to the dictionary | one word per line (only letters and `'`s allowed) | [allow](https://github.com/check-spelling/check-spelling/wiki/Configuration#allow)
+[reject.txt](reject.txt) | Remove words from the dictionary (after allow) | grep pattern matching whole dictionary words | [reject](https://github.com/check-spelling/check-spelling/wiki/Configuration-Examples%3A-reject)
+[excludes.txt](excludes.txt) | Files to ignore entirely | perl regular expression | [excludes](https://github.com/check-spelling/check-spelling/wiki/Configuration-Examples%3A-excludes)
+[only.txt](only.txt) | Only check matching files (applied after excludes) | perl regular expression | [only](https://github.com/check-spelling/check-spelling/wiki/Configuration-Examples%3A-only)
+[patterns.txt](patterns.txt) | Patterns to ignore from checked lines | perl regular expression (order matters, first match wins) | [patterns](https://github.com/check-spelling/check-spelling/wiki/Configuration-Examples%3A-patterns)
+[expect.txt](expect.txt) | Expected words that aren't in the dictionary | one word per line (sorted, alphabetically) | [expect](https://github.com/check-spelling/check-spelling/wiki/Configuration#expect)
+[advice.md](advice.md) | Supplement for GitHub comment when unrecognized words are found | GitHub Markdown | [advice](https://github.com/check-spelling/check-spelling/wiki/Configuration-Examples%3A-advice)
+
+Note: you can replace any of these files with a directory by the same name (minus the suffix)
+and then include multiple files inside that directory (with that suffix) to merge multiple files together.
diff --git a/.github/actions/spelling/advice.md b/.github/actions/spelling/advice.md
new file mode 100644
index 000000000..c83423a8e
--- /dev/null
+++ b/.github/actions/spelling/advice.md
@@ -0,0 +1,25 @@
+<!-- See https://github.com/check-spelling/check-spelling/wiki/Configuration-Examples%3A-advice --> <!-- markdownlint-disable MD033 MD041 -->
+<details><summary>If the flagged items do not appear to be text</summary>
+
+If items relate to a ...
+* well-formed pattern.
+
+  If you can write a [pattern](https://github.com/check-spelling/check-spelling/wiki/Configuration-Examples:-patterns) that would match it,
+  try adding it to the `patterns.txt` file.
+
+  Patterns are Perl 5 Regular Expressions - you can [test](
+https://www.regexplanet.com/advanced/perl/) yours before committing to verify it will match your lines.
+
+  Note that patterns can't match multiline strings.
+
+* binary file.
+
+  Please add a file path to the `excludes.txt` file matching the containing file.
+
+  File paths are Perl 5 Regular Expressions - you can [test](
+https://www.regexplanet.com/advanced/perl/) yours before committing to verify it will match your files.
+
+  `^` refers to the file's path from the root of the repository, so `^README\.md$` would exclude [README.md](
+../tree/HEAD/README.md) (on whichever branch you're using).
+
+</details>
diff --git a/.github/actions/spelling/allow.txt b/.github/actions/spelling/allow.txt
new file mode 100644
index 000000000..e69de29bb
diff --git a/.github/actions/spelling/excludes.txt b/.github/actions/spelling/excludes.txt
new file mode 100644
index 000000000..f1cfeefbb
--- /dev/null
+++ b/.github/actions/spelling/excludes.txt
@@ -0,0 +1,41 @@
+# See https://github.com/check-spelling/check-spelling/wiki/Configuration-Examples:-excludes
+(?:^|/)(?i)COPYRIGHT
+(?:^|/)(?i)LICEN[CS]E
+(?:^|/)package(?:-lock|)\.json$
+(?:^|/)vendor/
+ignore$
+\.avi$
+\.ico$
+\.jpe?g$
+\.lock$
+\.map$
+\.min\..
+\.mod$
+\.mp[34]$
+\.png$
+\.wav$
+^\.github/
+^\Qplugins/archlinux/archlinux.plugin.zsh\E$
+^\Qplugins/cp/cp.plugin.zsh\E$
+^\Qplugins/extract/_extract\E$
+^\Qplugins/genpass/genpass.plugin.zsh\E$
+^\Qplugins/gitignore/gitignore.plugin.zsh\E$
+^\Qplugins/gnu-utils/gnu-utils.plugin.zsh\E$
+^\Qplugins/hitchhiker/fortunes/hitchhiker\E$
+^\Qplugins/jhbuild/jhbuild.plugin.zsh\E$
+^\Qplugins/jhbuild/README.md\E$
+^\Qplugins/jruby/jruby.plugin.zsh\E$
+^\Qplugins/kubectl/kubectl.plugin.zsh\E$
+^\Qplugins/lol/lol.plugin.zsh\E$
+^\Qplugins/mosh/mosh.plugin.zsh\E$
+^\Qplugins/npx/npx.plugin.zsh\E$
+^\Qplugins/powder/_powder\E$
+^\Qplugins/suse/suse.plugin.zsh\E$
+^\Qplugins/thor/_thor\E$
+^\Qplugins/universalarchive/_universalarchive\E$
+^\Qplugins/vagrant/vagrant.plugin.zsh\E$
+^\Qplugins/wp-cli/README.md\E$
+^\Qplugins/wp-cli/wp-cli.plugin.zsh\E$
+^\Qthemes/clean.zsh-theme\E$
+^\Qthemes/philips.zsh-theme\E$
+^\Qthemes/tonotdo.zsh-theme\E$
diff --git a/.github/actions/spelling/expect.txt b/.github/actions/spelling/expect.txt
new file mode 100644
index 000000000..fc764f57a
--- /dev/null
+++ b/.github/actions/spelling/expect.txt
@@ -0,0 +1,4489 @@
+AAAAC
+aac
+aar
+abcdefghjkmnpqrstvwxyz
+ABRT
+absorbgitdirs
+abspath
+abtvfr
+acceptorthreads
+accessip
+ACDIM
+acking
+ackmate
+ackup
+ACLs
+acon
+aconf
+acp
+acpi
+acpitool
+acr
+acroread
+acs
+acsc
+acsp
+actionformats
+Adamantium
+adb
+adbd
+adben
+addgroups
+addhistory
+addon
+addprincipals
+addrport
+addrs
+addusergroups
+addwin
+adelcampo
+adg
+ADK
+adminalias
+adminport
+Admins
+adoc
+adu
+aeiouy
+afh
+afind
+afmagic
+afs
+afu
+agb
+agc
+agd
+agentpath
+agi
+agignore
+agli
+aglu
+agnoster
+agp
+agrimaldi
+ags
+agu
+agud
+agug
+aguu
+AHg
+ainv
+aip
+Airbender
+ajp
+ajs
+Akinori
+akoenig
+alacritty
+albers
+alberto
+alertmanager
+alex
+alexandre
+aliasfiletype
+aliaspassword
+allexport
+alloc
+allocstatus
+allownoncomponentcallers
+allpkgs
+alnum
+ALRM
+altchar
+Altoid
+alwayz
+amanda
+amazonaws
+amazonec
+ambyj
+amd
+amqp
+AMRD
+anche
+andi
+andrewrdwyer
+angularjs
+anley
+anlp
+annots
+anonymize
+anotherfolder
+ansible
+antrun
+anycommand
+apexcodefile
+apextests
+api
+apidocs
+apiversion
+apjanke
+apk
+apklib
+aplaybook
+appid
+applica
+applist
+appname
+apps
+appup
+aps
+apull
+arachnophobia
+araxis
+ARCHFLAGS
+archimport
+archlinux
+arci
+arcizan
+ard
+ardc
+ardnu
+ardnupc
+ardp
+ardpc
+ARGC
+args
+argset
+argslist
+argu
+argv
+ARGZERO
+arh
+arinit
+arl
+arli
+arpa
+arquillian
+artifactory
+asadmin
+asc
+asciicast
+asciidoc
+asciidoctor
+asciinema
+asdeps
+asdf
+askpass
+asm
+asmo
+asrc
+assem
+associatewiththread
+ASTs
+asyncreplication
+atlassian
+attr
+ATTRIBUTENAME
+aufs
+auin
+auinsd
+auloc
+auls
+aulst
+aumir
+auown
+auownloc
+auownls
+aur
+aure
+aurem
+aurep
+aurinsd
+aurph
+aurrep
+authmethods
+authorizationdb
+authpriv
+authrealmname
+authz
+autoapplyenabled
+autoclean
+autocomplete
+autocompleted
+autocompletion
+AUTOCONNECT
+autocrlf
+autodetermine
+autodie
+autoenv
+autohadboverride
+autoipd
+autojump
+autoload
+autolock
+autolocking
+autopep
+AUTOQUIT
+autoreload
+autoreloading
+autoremove
+autorun
+autoscale
+autoscaling
+autoselect
+autoshortened
+autosquash
+autostart
+autostash
+autoupdate
+auupd
+auupg
+availabilityenabled
+avh
+avi
+AVIT
+avivrosenberg
+avneet
+avz
+avzu
+aws
+awscli
+awslogs
+babakks
+backend
+backendconfig
+backtick
+backupconfig
+backupdir
+backupfile
+backuptheme
+bactrian
+baidu
+bamshuf
+bamtobed
+bamtofastq
+Barsi
+Basecamp
+basedir
+basedn
+basefile
+baseurl
+basevmdk
+bashcompinit
+bashdefault
+bashrc
+batchid
+baz
+bazel
+bazelbuild
+bbd
+bbdiff
+bbedit
+BBM
+bbpb
+bcc
+bcdfghjklmnpqrstvwxz
+bck
+bcn
+bcubc
+bcubo
+beaglidx
+becc
+bedcov
+BEDGRAPH
+BEDPE
+bedpetobam
+bedtobam
+bedtools
+Belarus
+bem
+benchmarker
+benchmem
+benchtime
+bento
+benwilcock
+berks
+Bertinelli
+bgnotify
+bgrewriteeaof
+bgsave
+binarynights
+bindaddress
+binded
+bindir
+bindkey
+binpack
+binstub
+bintray
+bip
+bira
+bisd
+bitboxer
+bitbucket
+bitswap
+blkio
+blockprofile
+blockprofilerate
+blod
+blog
+blogger
+blogspot
+blpop
+bluebox
+Bluetooth
+bobwilliams
+bodycc
+Bonetti
+bookmarked
+booknames
+bootclasspath
+bootscript
+bootsnipp
+borland
+borrowck
+Boudreau
+Boushh
+Bouvet
+BPtmux
+bpython
+bqr
+brainstormr
+Brainville
+branchformat
+branchname
+branchrefs
+brewp
+brewsp
+briancarper
+bringz
+Broadcom
+Brodersen
+brpop
+brpoplpush
+btannous
+btih
+btn
+btrestart
+btrfs
+btw
+bubc
+bubu
+buf
+buffersizebytes
+buflines
+bugfix
+bugfixes
+bugreport
+bugsnag
+Buildfile
+buildinstance
+buildnumber
+buildpackage
+buildpacks
+buildscript
+builtins
+bundlephobia
+bunzip
+Burkina
+Busybox
+bwaht
+Bxegedabagacad
+bypjyp
+bytebuffertype
+bytecode
+bytewise
+byznis
+bzip
+bzr
+cabextract
+CACERT
+cacertfile
+cacheinfo
+cachename
+caiifr
+Cakefile
+cakephp
+callvim
+calmd
+calways
+caname
+caniuse
+cano
+capath
+Capfile
+capify
+capistrano
+capistranorb
+capit
+CARETCOLOR
+caserta
+Caskroom
+catimg
+catserver
+catspeak
+cbr
+ccat
+cccmd
+ccflags
+ccl
+ccomp
+ccp
+cdargs
+cdcmd
+cdo
+CDPATH
+cdu
+cdx
+cdylib
+cecho
+cehlrtx
+celerybeat
+celeryev
+celerymon
+celeryproject
+Celso
+celsomiranda
+certfile
+certname
+certs
+cfa
+cfap
+cfbpk
+cfbs
+cfc
+cfdel
+cfdm
+cfdor
+cfds
+cfe
+cfev
+cfg
+cfgfile
+cfhu
+cfl
+cflg
+cflr
+cfp
+cfpc
+cfpm
+cfr
+cfsc
+cfsh
+cfsp
+cfsrt
+cfsrtall
+cfstg
+cfstp
+cfstpall
+cft
+cfup
+cfus
+cget
+cgi
+cgit
+cgr
+cgrm
+cgroup
+cgroupns
+cgu
+changelog
+changepassword
+changeset
+charmap
+charset
+chaselinks
+chcid
+chdir
+cheatsheet
+checkin
+checkinit
+checkonly
+checkports
+checkstyle
+cheeseshops
+Chesal
+chiark
+childlogdir
+chlrtx
+chmod
+chown
+chpwd
+chroot
+chruby
+chrubydirs
+chsh
+chucknorris
+chucknorrisfacts
+Chucktatorship
+Chucktober
+chunker
+cidfile
+cidr
+CIDs
+cidv
+ciici
+cim
+cirw
+citool
+civis
+cjk
+clamav
+classfile
+classloaders
+classloading
+classmap
+classname
+classpath
+CLDR
+cleardump
+cless
+CLICOLOR
+clientauthenabled
+clientid
+clipcmd
+clipcopy
+clippaste
+Clipperton
+clj
+Clojure
+closelim
+cloudfoundry
+cloudproviders
+CLOUDSDK
+clrz
+clustertype
+cmdargs
+cmdline
+cmds
+Cmp
+CMR
+cms
+cmt
+cnorm
+cobertura
+cocoapods
+codebase
+codeclimate
+codecompare
+codecoverage
+codegen
+codepen
+coderwall
+CODESET
+codium
+coffeescript
+colemak
+Colindres
+collectstatic
+colorbool
+colorcoded
+colorcoding
+colorify
+colorized
+colorls
+colorpair
+colorset
+colorspec
+colourised
+Colouriser
+colsearch
+COMMANDLINE
+commandlinefu
+committerdate
+Comoros
+compadd
+comparguments
+compassdoc
+compaudit
+compbiome
+compcall
+compctl
+compdef
+compdescribe
+compdump
+compfiles
+compfix
+compgen
+compgroups
+compilemessages
+compinit
+compl
+completemarks
+completionsdir
+complist
+componentname
+compopt
+compquote
+COMPREPLY
+COMPRESSSPARSESTATE
+compset
+compstate
+comptags
+comptry
+compvalues
+CONDA
+CONFG
+config
+configfile
+confighelp
+configmap
+configstoretype
+connectiondefinition
+connectionpoolid
+conssec
+Consts
+contacto
+containerd
+contenttype
+contextinitialization
+contextroot
+contoroll
+contreras
+controlargs
+conventionalcommits
+COOKBOOKNAME
+cookbookversion
+coproc
+copybuffer
+copydir
+copyfile
+copypaste
+copypasteable
+cordova
+coreutil
+cors
+cowsay
+cowthink
+cpan
+cpanm
+cpanminus
+cpantesters
+cpio
+cpp
+cprint
+cprof
+cpuprofile
+cpuset
+cpv
+createcachetable
+createdlastdays
+createsuperuser
+createtables
+creationretryattempts
+creationretryinterval
+cription
+crlf
+crm
+crockford
+cron
+cronjob
+crt
+cseuckr
+cseucpkdfmtjapanese
+csh
+csibm
+csiso
+csisolatin
+cskoi
+csksc
+css
+cssflow
+cssh
+csshiftjis
+csu
+csv
+csvfile
+ctag
+ctl
+ctlseqs
+ctx
+ctype
+culater
+Cunha
+curcontext
+curdir
+curhistsize
+curkeyword
+curpath
+currentartist
+currentdir
+currenttrack
+cursored
+curtheme
+Customisation
+CUTBUFFER
+cvccvc
+cvf
+cvhs
+cvjf
+cvs
+cvsexportcommit
+cvsimport
+cvsserver
+cvvis
+cvzf
+cwd
+cword
+cxx
+cya
+cycledleft
+cycledright
+cygpath
+cygstart
+cygwin
+cygwyn
+czf
+daemonize
+daemonized
+daemonizing
+daemonset
+dalias
+dango
+danielcsgomes
+darcs
+dartdoc
+dartlang
+dashdoc
+DATABAGNAME
+datafieldenc
+datasift
+datasourceclassname
+datastore
+datestamp
+datetime
+daylerees
+dbbolton
+dbconsole
+dbfile
+dbhome
+dbhost
+dbport
+dbshell
+dbsize
+dburl
+dbus
+dbuser
+dbvendor
+dbvendorname
+dccmd
+dcdn
+dce
+dck
+dcl
+dclf
+dco
+dcom
+dcommit
+dcps
+dcpull
+dcr
+dcrestart
+dcrm
+dcstart
+dcstop
+dcup
+dcupb
+dcupd
+ddg
+ddl
+deadwyler
+debian
+debman
+debuginfo
+debuglevel
+decr
+decrby
+DECSCUSR
+defaultleasettl
+defaultpackagedir
+Defaultsfdx
+defaultvs
+defaultwebmodule
+definitionfile
+definitionjson
+deinit
+deinstall
+delwin
+denable
+deno
+dependencyfile
+deploydir
+deployers
+deploymentplan
+deps
+depthfrom
+dequote
+dequoted
+deref
+derek
+descr
+dest
+DESTDIR
+destroot
+desttype
+devcenter
+devdocs
+devfolder
+devicehost
+devicemapper
+deviceport
+devlog
+devops
+devpath
+dfa
+dffx
+dflt
+dfmt
+dfs
+dhcp
+dhcpd
+dhcpip
+dht
+dhtrc
+dhtt
+diagdump
+didexit
+diffcore
+diffmerge
+diffs
+diffsettings
+difftool
+digitalocean
+diiirrrty
+dijcaf
+dircolors
+dircycle
+direnv
+dirhistory
+dirname
+dirpath
+dirpersist
+dirs
+dirstack
+DIRSTACKSIZE
+dirstat
+dirver
+disablemasking
+disksize
+diskutil
+displayconfiguration
+displayname
+distcache
+distcheck
+distclean
+distro
+dists
+django
+djangojs
+djangoproject
+djangopypi
+djview
+djvu
+dli
+dlist
+dls
+dman
+dmatching
+dmesg
+dmg
+dna
+dnf
+dnfc
+dnfgi
+dnfgl
+dnfgr
+dnfi
+dnfl
+dnfli
+dnfmc
+dnfp
+dnfr
+dnfu
+dng
+dnote
+dns
+dnsmasq
+dnsrr
+doap
+docck
+dockerd
+dockerdaemon
+dockerenv
+Dockerfile
+dockerport
+dockersearch
+docopt
+docset
+docstring
+doctl
+doctorjellyface
+dogenpunk
+doitclient
+domaindir
+domainname
+domainproperties
+domterm
+Donenfeld
+dongweiming
+donotwant
+dopts
+dotall
+dotenv
+dotest
+dotfile
+dotnet
+doubledash
+doublequotes
+dowant
+dpkg
+drca
+drcb
+drcg
+drcj
+drcm
+drcml
+drcr
+drct
+drcv
+drdmp
+dren
+dreurmail
+drf
+drfi
+drfr
+drfra
+drfu
+Driessen
+drif
+dris
+driverclassname
+drn
+drnew
+droid
+dropandcreatetables
+dropindexes
+droplr
+dropreplace
+droptables
+drpm
+drpu
+drst
+drup
+drush
+drushrc
+drv
+drvd
+drvg
+drw
+dsa
+dselect
+dsl
+dssh
+dst
+dsupport
+Dtest
+dtrace
+dts
+duckduckgo
+duf
+dumpconfig
+dumpdata
+dumpfiles
+duplessis
+durationdays
+durrheimer
+dutchcoders
+dvd
+dvi
+dwim
+dwr
+dylib
+eal
+eastermonday
+eauth
+ebuild
+ecd
+ecdsa
+echotc
+echoti
+ecma
+ecmerge
+ecosia
+ecto
+editorcmd
+edu
+eecms
+eed
+eeval
+efforted
+efile
+eframe
+egrep
+ein
+Eisentraut
+ejb
+ekzsh
+Eley
+ELGNRCIS
+elidable
+elif
+elim
+elisp
+elllen
+elot
+emacs
+emacsclient
+emacsfun
+emacswiki
+emails
+emberjs
+Emelianenko
+emoji
+emotty
+enablesnoop
+enacs
+endswith
+ent
+entrypoint
+enum
+envsubst
+envvar
+enwom
+eocw
+EOH
+eol
+eoq
+eow
+eoww
+eoy
+EPOCHREALTIME
+epochseconds
+eprof
+eread
+erl
+errlog
+Errored
+esac
+escripts
+essembeh
+etcd
+ethanschoonover
+ets
+etwlogs
+euc
+EUID
+EULAs
+eunit
+evals
+evalstatus
+evan
+eventlet
+eventname
+Evernote
+Evt
+exe
+executables
+execv
+exfxcxdxbxbxbxbxbxbxbx
+exfxcxdxbxegedabagacad
+existentials
+exitcode
+exoscale
+expandvars
+expaning
+expireat
+expl
+explaintypes
+explicitouter
+expn
+expr
+exps
+exs
+extcmd
+extdirs
+extendedglob
+externalid
+extmethods
+fabfile
+facebook
+factoryclass
+faidx
+failconnection
+failfast
+failurefatal
+fakeroot
+faqs
+fargs
+Faroe
+fasd
+FASTA
+fastcgi
+fastfile
+fastprint
+FASTQ
+favlist
+fbterm
+fcap
+Fcart
+fcgi
+Fcrt
+fcss
+fdfind
+fdlimit
+feditor
+fedoraproject
+felipe
+felixr
+ffls
+ffp
+ffrm
+ffsync
+fghijk
+fgrep
+Fiala
+fieldlist
+Filemode
+filepath
+filesize
+filestore
+filesystem
+filetype
+filevaultmaster
+FILLBAR
+filtername
+findpeer
+findprovs
+finetune
+firefox
+firewalld
+firewalls
+firstline
+fishshell
+fitzpatrick
+fixmate
+fixme
+fixperms
+FIXTERM
+fizsh
+fjs
+flagstat
+flatlist
+flattach
+flc
+fldoc
+flget
+flickr
+flowgraph
+flowtype
+flr
+fluentd
+flup
+flushall
+flushdb
+flv
+fnd
+fnm
+fns
+Fnv
+Folgers
+fontello
+foodcritic
+foqtam
+forall
+forceoverwrite
+forceupgrade
+foreach
+forrest
+fortunecity
+forw
+fosmid
+fotqoh
+fpath
+fprof
+fqn
+framep
+frecency
+frecent
+freebsd
+freenode
+freqs
+fri
+Friesel
+fromaddress
+frontend
+frontmost
+fsc
+fscache
+fsck
+fsl
+fsmonitor
+FSsh
+fstgpy
+ftp
+fts
+fucnul
+func
+funcsourcetrace
+functrace
+funtoo
+Futuna
+futuret
+fwl
+fwp
+fwr
+fwrp
+fzf
+fzfdirs
+gaa
+gallifrey
+gamc
+Gamera
+gamscp
+gapt
+gasconfig
+Gatorade
+gatsbyjs
+gav
+gba
+gbd
+gbda
+gbk
+gbl
+gbnm
+gbr
+gbs
+gbsb
+gbsg
+gbsr
+gca
+gcam
+gcan
+gcasm
+gcb
+gcc
+gccd
+gccgo
+gccgoflags
+gcf
+gcflags
+gch
+gcl
+gclean
+gcloud
+gcm
+gcmsg
+gcn
+gco
+gcor
+gcount
+gcp
+gcpa
+gcpc
+gcplogs
+gcr
+gcs
+gcsm
+gcssm
+gdc
+gdca
+gdct
+gdcw
+gdd
+gdm
+gdnolock
+gdt
+gdup
+gdv
+gdw
+geca
+gecb
+gecho
+geclup
+gecr
+geeknote
+gegi
+geh
+gei
+geiall
+gelcyv
+gelf
+geli
+gemb
+gemfile
+gemoji
+gemp
+gemset
+gemspec
+gemy
+generatekey
+generatermistubs
+genomecov
+genpass
+genpaths
+genzshcomp
+geoe
+geoff
+geoffgarside
+getattr
+getbit
+getcomposer
+getdir
+geteip
+getenv
+getfasta
+getgb
+getip
+getline
+getln
+getopt
+getrange
+getset
+gettext
+geun
+gevent
+Geza
+gezalore
+gfa
+gfg
+gfl
+gflf
+gflff
+gflfp
+gflfpll
+gflh
+gflhf
+gflhp
+gfli
+gflr
+gflrf
+gflrp
+gfo
+gga
+ggf
+ggfl
+ggl
+ggp
+ggpnp
+ggpull
+ggpur
+ggpush
+ggsup
+ggu
+ghci
+ghf
+ghff
+ghfh
+ghfr
+ghfu
+ghh
+ghostrevery
+gignore
+gignored
+gimmeh
+giobi
+gistcomment
+gitbranch
+gitbranchsize
+gitcomp
+gitcompadd
+gitcompappend
+gitcompletion
+gitdir
+gitex
+gitfast
+gitflow
+github
+gitignore
+gitinfo
+gitk
+gitmodules
+gitpod
+GITSS
+gitstatus
+gitstring
+gitweb
+givero
+gke
+gkrellmd
+glfsi
+glfsls
+glfsmi
+glfst
+glg
+glgg
+glgga
+glgm
+glgp
+glidenote
+glo
+globalias
+globals
+globbing
+globsubst
+glods
+glog
+gloga
+glol
+glola
+glp
+gls
+gma
+gmail
+gmom
+gmtl
+gmtlvim
+gmum
+Gneat
+Gniazdowski
+gnore
+gnupg
+goc
+godoc
+Godzilla
+gof
+gofa
+gofmt
+goga
+Gohr
+golang
+gom
+GOMAXPROCS
+Gomes
+Gonz
+goodreads
+google
+googlecode
+gop
+gopath
+gopb
+GOROOT
+goroutine
+gota
+gpf
+gpg
+gpgconf
+gplfs
+GPLv
+gpoat
+gpr
+gpristine
+gpsup
+gpu
+gpv
+gradle
+gradlew
+graphviz
+grb
+grba
+grbc
+grbd
+grbi
+grbm
+grbo
+grbom
+grc
+greenend
+greer
+grename
+grep
+grepping
+grev
+grh
+grhh
+GRIMALDI
+grk
+Grlm
+grm
+grmc
+grml
+grmv
+groh
+grok
+Grosenbach
+groupby
+groupinstall
+grouplist
+groupremove
+groupsmap
+growlnotify
+grrm
+grset
+grss
+grst
+grt
+gru
+gruntfile
+grup
+grv
+gsb
+gsd
+gsemet
+gsh
+gsi
+gsps
+gsr
+gss
+gst
+gsta
+gstaa
+gstall
+gstc
+gstd
+gstl
+gstp
+gstu
+gsu
+gsub
+gsw
+gswc
+gswd
+gswm
+gtb
+gtfo
+gtl
+gts
+gtv
+gua
+Guake
+Guerci
+gui
+guidovansteen
+guitool
+gulpfile
+gulpjs
+gunignore
+gunwip
+gunzip
+gupa
+gupav
+gupv
+gvim
+gvimdiff
+gwc
+gwch
+gwip
+gwt
+Gxfxcxdxbxegedabagacad
+gxvx
+gyazo
+Gyver
+gzip
+Hackage
+Hacktoberfest
+hackzor
+hacluster
+hadouken
+hai
+haldaemon
+Halis
+Hamelink
+hammertest
+hanami
+hanamirb
+har
+hardcoded
+hardlinks
+hardstatus
+harishnarayanan
+hashh
+Hashicorp
+haskell
+haskellstack
+Hasklig
+hawaga
+hax
+HBAR
+hbm
+Hcode
+hda
+hdc
+hdd
+hdel
+hdp
+hdrs
+hdtp
+hdv
+hea
+healthcheck
+healthcheckerinterval
+healthcheckertimeout
+healthcheckerurl
+heduled
+heg
+Helens
+helpmojo
+heroku
+hexdocs
+hexdump
+hexists
+hga
+hgb
+hgba
+hgbk
+hgc
+hgca
+hgchangeset
+hgco
+hgd
+hged
+hget
+hgetall
+hgi
+hgic
+hgl
+hglg
+hglgp
+hglr
+hgm
+hgo
+hgoc
+hgp
+hgrc
+hgrep
+hgs
+hgsl
+hgun
+hhatto
+hhh
+hidefiles
+highlighter
+hincrby
+HISTCMD
+HISTFILE
+HISTNO
+historywords
+histsize
+histsubstrsrch
+hitokoto
+hkeys
+hkscs
+hlen
+hmget
+hmset
+Hocevar
+hocho
+hoeg
+Homeboy
+homepage
+hostip
+hostname
+hostpath
+hotfix
+hotfixes
+hotlist
+hotpink
+howto
+howtorun
+hpodder
+href
+hrg
+hscolour
+hscroll
+hset
+hsetnx
+hsi
+hsp
+hsqldb
+htm
+html
+htmlsingle
+htop
+htslib
+HTT
+http
+httpd
+httpie
+httplisteners
+httpparams
+httpsrouting
+httpstatus
+hubflow
+hukkan
+humza
+huyy
+hvals
+hyperlink
+hypermedia
+hyperv
+hypervisor
+iam
+ian
+ianchesal
+ibest
+icanhas
+icanhazip
+icba
+icbi
+icc
+icode
+icpaa
+icpai
+icpra
+icpri
+icra
+icri
+icrosoft
+icrsa
+icrsi
+idlekeytimeoutseconds
+idletimeout
+idmv
+idx
+idxstats
+ietf
+ifargs
+ifconfig
+iflist
+iglob
+ignoredescriptoritem
+ignoreerrors
+ignorenonexistent
+ignorewarnings
+igv
+ihasbucket
+iiop
+iiopport
+ilikenwf
+ilkka
+ima
+imageshack
+imap
+imatch
+imatches
+img
+imgur
+iminurbase
+imnp
+imonit
+impl
+implicits
+importpath
+inbox
+incrby
+indexopts
+inet
+infocmp
+ini
+initsql
+inkytonik
+inl
+inliner
+inlining
+inplace
+inprogress
+Inproper
+inputenc
+inr
+insecureskipverify
+insns
+inspectdb
+inspr
+instagram
+Installable
+installationkey
+installationkeybypass
+installdeps
+installdir
+installsuffix
+instancealias
+instanceport
+instanceurl
+instaweb
+instrs
+integ
+Intellij
+interactivecomments
+interdiff
+interfacename
+interoperability
+interp
+Intf
+inur
+invicem
+iojs
+iokit
+ionescu
+ionicframework
+iops
+ioreg
+ipa
+ipaddr
+ipam
+ipamdriver
+ipapp
+ipc
+ipcidr
+ipe
+ipfs
+ipld
+ipns
+IPREFIX
+ipsw
+iptables
+ipv
+ipython
+irb
+irc
+IRTY
+isconnectvalidatereq
+isdefaultprovider
+isdeleted
+isearch
+isfile
+isisolationguaranteed
+isodate
+isodatesec
+isolationlevel
+isredeploy
+istio
+ISUFFIX
+isundeploy
+iterm
+itertools
+itunes
+ivan
+Ivoire
+ixfuk
+izakaya
+ize
+jacc
+jaccard
+jaddr
+jaischeema
+jakefile
+jakejs
+Janke
+japvyz
+jarfile
+JARIN
+jarsigner
+javabootclasspath
+javac
+javadoc
+javaextdirs
+javamail
+javap
+javascript
+javax
+jbm
+jboss
+jcon
+jdbc
+jdc
+jdcds
+jde
+jdeps
+JDK
+jdkinternals
+jdl
+jdlr
+jdm
+jdmds
+jdwp
+jeb
+jecdyq
+ject
+Jedis
+jeffmhubbard
+jenv
+jenvdir
+jepgad
+jerryling
+jestjs
+jex
+jexec
+jfrog
+jgitflow
+jgpagent
+jid
+jimhester
+jimweirich
+jira
+jis
+jisse
+jkc
+jkenabled
+JLine
+jlist
+jmc
+jmsdbpassword
+jmsdest
+jmx
+jndi
+jndilookupname
+jnrowe
+jobid
+jobspec
+jobstates
+jobtexts
+jof
+johnhamelink
+joly
+jonas
+jonmosco
+jorge
+journald
+jpeg
+jpg
+jpo
+jprofile
+jql
+jquery
+jra
+jraw
+jrel
+jreld
+jrm
+jrmds
+jrmrel
+jrmsas
+jrp
+jrs
+jrspec
+jruby
+jsa
+jsh
+jshc
+jshm
+json
+jsonfunc
+jsonpath
+jsontool
+jsp
+jspa
+jssl
+jst
+jstj
+jsu
+jsw
+jukie
+junegunn
+junex
+junit
+junkbust
+JUNKFOOD
+Juraj
+jvenant
+jvm
+jvmargs
+jvmoptions
+jwt
+jwtkeyfile
+jxr
+kajrod
+kalsi
+kapeli
+kapow
+kate
+Kaving
+kbd
+kca
+kcbt
+kccc
+kcdc
+kcgc
+kclean
+kcn
+kcp
+kcsc
+kcub
+kcuc
+kcud
+kcuf
+kcuu
+kdch
+kdcj
+kdcm
+kdd
+kde
+kdel
+kdelcj
+kdelcm
+kdeld
+kdelf
+kdeli
+kdelno
+kdelns
+kdelp
+kdelpvc
+kdelsa
+kdelsec
+kdelss
+kdi
+kdialog
+kdiff
+kdm
+kdno
+kdns
+kdp
+kdpvc
+kds
+kdsa
+kdsec
+Keanu
+kecj
+kecm
+keds
+keepfailedstubs
+keepreposdir
+keepstate
+kei
+kepvc
+kerndeb
+kes
+keti
+kevinkirkup
+kexec
+kextload
+kextunload
+keybindings
+keycap
+keychain
+keyfile
+keygen
+keymap
+keymetrics
+keypair
+keyring
+keyshares
+keysize
+keyspace
+keythreshold
+KEYTIMEOUT
+keytooloptions
+keywordisfresh
+keywordmsg
+keywordquickly
+kga
+kgaa
+kgcj
+kgcm
+kgd
+kgdsw
+kgdw
+kgdwide
+kgi
+kgno
+kgns
+kgp
+kgpl
+kgpn
+kgpvc
+kgpvcw
+kgpw
+kgpwide
+kgrs
+kgs
+kgsec
+kgssw
+kgsswide
+kgsw
+kgswide
+Khas
+khome
+killall
+killit
+Kindergarteners
+Kitts
+kiwiirc
+kiwish
+kjx
+klf
+Klingberg
+knative
+kni
+knifecmd
+knifesubcmd
+knp
+knu
+koenig
+Kombat
+kompare
+konsole
+kotlin
+kotlintest
+kpf
+kphoen
+kpkg
+kpp
+kres
+krh
+Krivitsky
+krsd
+krsss
+kru
+ksc
+ksd
+ksh
+ksharrays
+kshautoload
+kshglob
+kshoptionprint
+ksshaskpass
+ksss
+kthxbai
+kts
+kube
+kubeconfig
+kubectl
+kubectx
+kubens
+kubeoff
+kubeon
+kubernetes
+kungfoo
+Kurapati
+kwargs
+kypkvcw
+Kyrgyzstan
+Lacheze
+lambdalift
+lando
+langinfo
+laravel
+lart
+lastcategory
+lastcmd
+lastfull
+lastrun
+lastsave
+launchctl
+lazyconnectionassociation
+lazyconnectionenlistment
+lazyvals
+lbenableallapplications
+lbenableallinstances
+lbenabled
+lblue
+lbname
+lbpolicy
+lbpolicymodule
+lbtargets
+lbuf
+LBUFFER
+lbweight
+lcmd
+ldap
+ldflags
+ldot
+leakreclaim
+leaktimeout
+leavebrowseropen
+lein
+leiningen
+lemy
+len
+Lengyel
+leonhartx
+LESSCLOSE
+lesskey
+LESSKEYIN
+LESSOPEN
+letcat
+leter
+lexduv
+lexer
+lfs
+lho
+lhs
+libc
+libedit
+libexec
+libnotify
+libp
+libreadline
+libsecret
+lifecycle
+lighthouseapp
+limegreen
+lindex
+linearizer
+linewords
+linkcheck
+linkname
+linsert
+linux
+linuxcommando
+linuxcontainers
+linuxmain
+liquibase
+listeneraddress
+listenerport
+livecheck
+liveserver
+llc
+LLCORNER
+llen
+llr
+llvm
+lmnop
+lname
+loadconfig
+loaddata
+loadorder
+localhost
+localonly
+localoptions
+localtime
+localtraps
+lockdown
+lockfile
+lodash
+logcat
+logdriver
+logentries
+logfile
+logid
+loginurl
+loglevel
+logname
+logreportederrors
+logrotate
+logtype
+lol
+lowerip
+lpop
+lpr
+lpush
+lpushx
+lrange
+lrbu
+LRCORNER
+lrem
+lrh
+lrp
+lrt
+lrunzip
+lrz
+lrzip
+lrzuntar
+lsa
+lsb
+lscolors
+lset
+lsof
+lstheme
+lstrip
+lto
+ltrim
+lubs
+lucentbeing
+lvi
+lways
+lwc
+lwd
+lxc
+lxd
+lzcat
+lzip
+lzma
+lzo
+lzop
+LZW
+Maarten
+macos
+macports
+macromates
+Maeda
+Magento
+magerun
+magicequalsubst
+magick
+mailhost
+mailinfo
+mailmap
+mailnull
+mailrc
+mailsplit
+mailuser
+mainporcelain
+maintail
+maintainership
+makecache
+MAKEFLAGS
+makemessages
+makemigrations
+makewindows
+managedreleased
+managepy
+manni
+manpage
+manpath
+mapcar
+mapfile
+mappedpassword
+mappedusername
+markname
+markpath
+maskfasta
+maskray
+masq
+massimiliano
+matchconnections
+mathfunc
+Mattern
+Matth
+matthewratzloff
+matthr
+maxbytes
+maxchildren
+maxconnectionscount
+maxconnectionusagecount
+maxdepth
+maxleasettl
+maxpoolsize
+maxqueuesize
+maxrank
+maxrate
+maxrequests
+maxspare
+maxtasksperchild
+maxthreadpoolsize
+maxwait
+Mayen
+Mayra
+mbean
+mbegin
+mbologna
+mbox
+mboxrd
+mbp
+mca
+mcl
+mcm
+mco
+mcornella
+mct
+mdapi
+mdb
+mde
+mdi
+mdn
+mds
+meanlife
+mediawiki
+megazord
+meh
+Mek
+mekanics
+memprofile
+memprofilerate
+memq
+menuselect
+MENUSIZE
+mergetool
+mergewebxml
+merkledag
+Mery
+messagebus
+messagestoretype
+metacpan
+metadata
+metricscollector
+mfa
+mfaerevaag
+mfs
+mget
+miam
+michelebologna
+microk
+microsoft
+middleware
+midsommar
+midsommarafton
+mikeh
+millis
+mindepth
+minfds
+minidisc
+minikube
+minlogprob
+minprocs
+minspare
+minthreadpoolsize
+mirko
+mirrorlist
+mixin
+mkcd
+mkdir
+mktag
+mktemp
+mktree
+mkv
+mkvirtualenv
+mla
+mldonkey
+Mleb
+MLH
+mli
+mlo
+mlog
+mlp
+mls
+mlterm
+MMA
+mmap
+mmin
+mng
+mnt
+moar
+modded
+modifiedlastdays
+modulename
+Moldova
+mongocli
+mongodb
+monit
+monitorable
+monokai
+Morote
+Mosco
+mosh
+mostfrequent
+MOTD
+mountpoint
+mov
+moyai
+mozilla
+mpa
+mpeg
+mpileup
+mpkg
+mplayer
+mplex
+mpr
+mputniorz
+mqhost
+mqpassword
+mqport
+mquser
+mre
+mrp
+mset
+msetnx
+msgnum
+msgs
+msh
+msil
+msp
+mst
+msvs
+msw
+msys
+msysgit
+mtime
+mtu
+Mudkipz
+multiaddresses
+multibase
+multicastaddress
+multicastport
+multicov
+multihashes
+multiinter
+multiline
+multios
+multiset
+mumpub
+munication
+MURI
+muscato
+mutex
+muxer
+mvim
+mvn
+mvnag
+mvnboot
+mvnc
+mvncd
+mvnce
+mvnci
+mvncie
+mvncini
+mvncist
+mvncisto
+mvncom
+mvncp
+mvnct
+mvncv
+mvncvst
+mvnd
+mvndocs
+mvndt
+mvne
+mvnfmt
+mvnjetty
+mvnp
+mvnqdev
+mvnsrc
+mvnt
+mvntc
+mvnw
+Mvt
+Myanmar
+myapp
+myargs
+myd
+mydeb
+myers
+myfile
+myfirstnamemylastname
+mygit
+myissues
+mymark
+myns
+myprop
+mypy
+myrole
+myserver
+mysql
+mysqladmin
+mysqlrestart
+mysqlstart
+mysqlstatus
+mysqlstop
+mytime
+myuser
+myvalue
+myvirtualenv
+myzsh
+nables
+nagios
+naliases
+nameddirs
+namespace
+namesys
+nanoant
+nanoc
+Narayanan
+Naruto
+nativelibrarypath
+ncd
+ncipe
+NCOLOR
+ncpu
+ncs
+ncv
+ndjson
+NDUw
+NEm
+nenv
+neovim
+netbsd
+netdump
+netloc
+netmask
+netstat
+networkdriver
+networklisteners
+neuralsandwich
+newcons
+newpl
+newvol
+nextgenthemes
+nfsnobody
+nfunctions
+nginx
+ngnix
+ngth
+nhelp
+nhistory
+nhughes
+nicoulaj
+Nicoulaud
+nixos
+nkeywords
+nkill
+nle
+nlinux
+nlist
+nmap
+nmatches
+Nmh
+Nms
+Nmw
+noacl
+noancestors
+noargs
+noautonamedirs
+noautopushd
+noblock
+nobootcp
+nobreak
+nocache
+nochunk
+nocleanup
+nocolor
+nocopy
+nocorrect
+nodaemon
+nodedir
+nodefaultpolicy
+nodegroup
+nodehost
+nodeid
+nodejs
+nodense
+nodestatus
+noexec
+noexpand
+noglob
+noheading
+nohelpers
+nohup
+noinput
+nojline
+noksh
+nomadproject
+nomnom
+nomz
+nonamespace
+nondistributable
+nongnu
+NONINFRINGEMENT
+nonomatch
+NONSELECTABLE
+nontransactionalconnections
+nopassword
+noposixbuiltins
+noprofile
+noprompt
+nopromptsubst
+noptions
+nopushdminus
+norc
+noreload
+NORMARG
+NORRIS
+noshortloops
+noshwordsplit
+nospace
+nosplash
+nostatic
+nostatus
+nostream
+notactive
+notailcalls
+notest
+nothreading
+notifu
+notnull
+nounit
+noverbose
+nowai
+nowarn
+noword
+noyes
+NPAGE
+npanelize
+npm
+npmd
+npmg
+npmi
+npmjs
+npmrc
+npmst
+npmt
+npr
+nproc
+npu
+npx
+nroff
+nscd
+nsu
+nthemes
+ntlp
+ntp
+ntu
+nubxa
+nuc
+nuget
+numstat
+nvcsformats
+nvie
+nvimdiff
+nvm
+nvmrc
+Oakv
+oanward
+oathtool
+OAuth
+objectname
+objectsize
+objecttype
+obsrun
+obtw
+octocat
+octozen
+oden
+ofd
+ogg
+ogm
+ohmyz
+ohmyzsh
+oid
+oldp
+oldpatmat
+OLDPWD
+OMITSPARSESTATE
+OMMIT
+omz
+omztemp
+onbehalfof
+oneline
+onlyrepos
+onoz
+ooanward
+oom
+openbsd
+opendiff
+openr
+openshift
+opensource
+openssh
+openstack
+opensuse
+openvpn
+openw
+OPTARG
+optimisations
+OPTIND
+orderby
+orgdir
+orgs
+oris
+ority
+orm
+ornicar
+orss
+osascript
+osname
+osscan
+ostype
+osver
+osx
+oth
+otp
+otpcode
+Ouellet
+oug
+outfh
+outfile
+outfilebase
+outfilename
+outlog
+outputdir
+outputtedto
+Outputters
+pacac
+pacaur
+pacdisowned
+pacfiles
+pacfileupg
+pacin
+pacinsd
+packagecreaterequestid
+packageid
+packagekitd
+packagename
+packageobjects
+packagephobia
+packagetype
+packageversionid
+paclist
+pacloc
+pacls
+paclsorphans
+pacman
+pacmanallkeys
+pacmansignkeys
+pacmir
+pacoc
+pacown
+pacre
+pacrem
+pacrep
+pacrmorphans
+pacupd
+pacupg
+pacweb
+pagage
+pagename
+painsd
+pairtobed
+pairtopair
+paloc
+palst
+pamc
+pame
+pamf
+pamfa
+pamir
+pamj
+paml
+pamm
+pamn
+pamp
+pampp
+pamr
+pamt
+panelize
+paorph
+paperclips
+paqf
+paqft
+paql
+paqr
+paqt
+paqw
+paralint
+params
+parem
+parep
+PARGON
+parhaat
+paroc
+parseable
+parseopt
+parwok
+passivepopup
+passphrase
+passthrough
+passthru
+passwd
+passwordstore
+pastebin
+pasu
+patchformat
+pathspec
+patmat
+patshead
+paupd
+paupg
+pausedservices
+pavic
+paypal
+paypalobjects
+pbcopy
+pbi
+pbl
+pbo
+pbpaste
+pbs
+pbu
+pcap
+pch
+pchk
+pcl
+pcmode
+pcpu
+PCR
+pcre
+pdf
+PDoc
+peb
+peepcode
+peerid
+pem
+percol
+perflog
+perl
+perlbrew
+perldoc
+permset
+permsetname
+petere
+peterhoeg
+Pfenniger
+pfs
+pgp
+pgpkeys
+pgr
+pgrep
+pgs
+phab
+phing
+phome
+php
+phx
+pid
+pidev
+pidfile
+pidof
+pigz
+pipenv
+pipestatus
+pipfile
+pipir
+piplist
+pipreq
+pipunall
+pipupall
+Pitcairn
+pjdb
+pjo
+PKGBUILD
+pkgfile
+plaetinck
+planetargon
+playlists
+playpause
+ple
+pleted
+plist
+Plug'n
+plugin
+pluginsdir
+plz
+pmat
+pmd
+pmin
+pmset
+png
+pnp
+podfile
+podspec
+policyconfigfactoryclass
+policyproviderclass
+polipo
+polkitd
+poo
+poolname
+poolresize
+Poorter
+popd
+Popen
+porcheron
+portbase
+portdir
+Portfile
+portlist
+portname
+posix
+possen
+posteo
+posterasure
+postgres
+postinstallurl
+posva
+powd
+powed
+Powerline
+poweroff
+powershell
+powify
+powit
+PPAGE
+ppap
+ppid
+ppy
+precache
+precaire
+precmd
+precompilejsp
+precompilewait
+predef
+preexec
+prefetching
+prefiltered
+prefork
+preload
+premajor
+preminor
+prepatch
+prepends
+prepopulate
+prettylist
+previewer
+prevword
+pri
+princ
+principalsmap
+printenv
+printf
+printflags
+printprompt
+privhist
+privoxy
+procfs
+procs
+prodlog
+progfile
+projectname
+PROMPTCOLOR
+PROMPTPREFIX
+promptsize
+promptsubst
+promptvars
+propget
+proplist
+protobuf
+providertype
+prun
+pscpu
+pseudoword
+psgrep
+psh
+psmem
+psprint
+pstadler
+pstree
+psu
+psubscribe
+psy
+psykorebase
+pthree
+ptot
+ptree
+pubgrub
+publishwait
+pubsub
+puni
+punsubscribe
+puo
+pushd
+pushdefault
+pushdf
+pushdignoredups
+pushdminus
+pushdsilent
+pushln
+pushremote
+pushurl
+Putniorz
+pvc
+pvenv
+pvm
+pwd
+PWDCASECORRECT
+PWDLEN
+pwdsize
+pwdx
+pwgen
+pwh
+pwned
+pxd
+pxy
+pybundles
+pyc
+pycache
+pyclean
+pyenv
+pyenvdirs
+pyfind
+pygmentize
+pygments
+pygrep
+pylint
+pypa
+pypi
+pytb
+pytest
+pythonhosted
+pythonpath
+pythonrc
+PYTHONSTARTUP
+PYTHONUSERBASE
+pyuserpaths
+Qdt
+qiqmiq
+qkey
+qlmanage
+qpwd
+Qql
+Qqo
+qqq
+qqwtzgejwgqve
+Qtdq
+quarkus
+quicklisp
+quickstart
+quiltimport
+qunit
+qunitjs
+quotationspage
+quotedir
+quu
+quux
+qwant
+qwerty
+qxtm
+qyjti
+rabin
+rackspace
+rackup
+radvd
+raek
+Rakefile
+raname
+randomkey
+rangepos
+rar
+ratijas
+rawurldecode
+rawurlencode
+rbenv
+rbenvdirs
+rbfu
+RBUFFER
+rcfile
+Rchive
+rcs
+rdargument
+rdb
+rdc
+rdd
+rdependents
+rdeps
+rdm
+rdmd
+rdmr
+rdmtc
+rdmu
+rdoc
+rdp
+rdr
+rds
+rdsl
+rdtc
+rdtp
+reactjs
+readline
+readlink
+readme
+readonly
+readthedocs
+readtimeoutmillis
+Reagle
+realcmd
+reauthor
+rebased
+rebases
+rebasing
+receivepack
+reddit
+redirectport
+redis
+rediscli
+redistrubute
+redzone
+reencode
+reexec
+refactor
+refchecks
+reflogs
+refmap
+refname
+refspec
+regex
+regexes
+regexn
+regexp
+reheader
+reintializes
+Reitsma
+rej
+reldates
+reldist
+releasenotesurl
+releaseversion
+relid
+reloadinterval
+reloadpost
+reltool
+remco
+remoteonly
+remotetestdir
+removegroups
+removeprincipals
+removeusergroups
+renamenx
+rephorm
+replacetokens
+repow
+reprovider
+requestauthrecipient
+requestauthsource
+requestid
+rerere
+resetstat
+resolv
+resolvemsg
+responseauthrecipient
+responseauthsource
+responsetimeout
+restartpost
+restype
+resultformat
+retcode
+retlog
+retrievefile
+retrievetargetdir
+returncode
+RETVAL
+revdeps
+revlist
+rfa
+rfakeroot
+rfap
+rfbu
+rfc
+RFh
+rfind
+rgm
+rhash
+rinass
+rinf
+ripgrep
+riseup
+RIXIUS
+rlc
+Rli
+rlib
+Rlvi
+rmacs
+rmcup
+rmd
+rmdir
+rmdsstore
+rmdup
+rmi
+rmkx
+rnand
+rnatv
+rnaw
+rnios
+rniosse
+rniosx
+rniosxr
+rniosxsm
+rnipad
+rnipada
+rnipadm
+rnipadp
+rnipadr
+rnland
+rnlink
+rnlios
+rns
+robby
+robbyrussell
+ROLENAME
+rollbackonerror
+rootdir
+rosrc
+roswell
+ROSWELLPATH
+roundhoused
+routecookie
+rpath
+rpc
+rpcuser
+rpmpackage
+rpms
+rpo
+rpop
+rpoplpush
+rprompt
+rpush
+rpushx
+rra
+rrg
+rsa
+rsb
+rsd
+rset
+rsh
+rsp
+rspec
+rsrra
+rst
+rsto
+rstrip
+rsync
+rtfm
+rtkit
+rtorrent
+rts
+rubocop
+rubygems
+rubyonrails
+rubyprompt
+rubypromptsize
+rubyversion
+Rudkin
+rulz
+runfcgi
+runningservers
+runningservices
+runpy
+runserver
+runtests
+runtfile
+runtimes
+RUNZSH
+Ruslan
+ruslanspivak
+rustc
+rustup
+Rvi
+rvm
+rvmprompt
+rvmpromptsize
+rxvt
+saas
+sadd
+salesforce
+samtools
+sandboxed
+SAVEHIST
+savelogin
+savemasterpassword
+sba
+sbc
+sbcc
+sbcln
+sbco
+sbcp
+sbcq
+sbd
+sbdc
+sbdi
+sbgi
+sbin
+sbp
+sbpl
+sbr
+sbrake
+sbrm
+sbt
+sbu
+sbx
+scalac
+scaladoc
+scalatest
+scaleway
+scandeps
+scard
+scd
+scdalias
+scdaliases
+scdhistory
+scdignore
+scgi
+sched
+scheduledrundatetime
+Schlatow
+scm
+scmpublish
+scorpius
+scottkidder
+scp
+screencast
+screenshot
+SCTP
+scu
+scutil
+scw
+scwsearch
+sdiff
+sdiffstore
+sdist
+sdk
+sdkman
+Sdl
+sdurrheimer
+Seagal
+searchterm
+seccomp
+securityenabled
+securitymap
+securitytype
+segfault
+selectables
+selectionkeyhandler
+selectiveanf
+selectivecps
+selectorpolltimeoutmillis
+selfupdate
+selinux
+semver
+sendemail
+sendperiod
+serialfile
+serialno
+serverlist
+servername
+serverurl
+serviceproperties
+serviceuser
+servlet
+setab
+setaf
+setalias
+setapp
+setbit
+setdefaultdevhubusername
+setdefaulttimeout
+setdefaultusername
+setenv
+setex
+setnx
+setopt
+setprompt
+setrange
+sfcl
+sfcontainer
+sfcw
+sfdc
+sfdev
+sfdx
+sfdxcli
+sfdxurl
+sfdxurlfile
+sfffe
+sfgb
+sfgc
+sfgcom
+sfge
+sfn
+sfprod
+sfroute
+SFSB
+sfsr
+sfsu
+sftp
+sfx
+sgem
+sgr
+sgrep
+sgtatham
+shasum
+sheerun
+shellcheck
+shellinit
+shellperson
+shitload
+SHLVL
+shm
+Shohei
+shopt
+shortlist
+shortlog
+shortname
+shortstat
+SHOWCOLORHINTS
+showcurrentpatch
+showdeprecated
+SHOWDIRTYSTATE
+showfiles
+showformat
+showmigrations
+showpkg
+SHOWSTASHSTATE
+showsubclasses
+SHOWUNTRACKEDFILES
+showupstream
+shpotify
+shuf
+shunit
+Shyamshankar
+sid
+sidekiq
+sideload
+SIGINT
+SIGKILL
+sigs
+SIMBL
+Sindre
+sindresorhus
+singlechar
+singlepackage
+Sint
+sinterstore
+sirech
+sismember
+sitecookbooks
+sitesearch
+sjis
+skintone
+skiptraceflag
+skitch
+slaveof
+slicehost
+sln
+slogin
+slp
+smacs
+smartlist
+smartsync
+smcup
+smembers
+smerge
+smkx
+Smood
+smove
+smt
+smtp
+Smurf
+snapshotname
+snowboarder
+sobject
+sobjectid
+sobjecttreefiles
+sobjecttype
+sobjecttypecategory
+socio
+socw
+softlayer
+solaris
+som
+soq
+soql
+Sorhus
+sorin
+sortconip
+sortcons
+sortnr
+sortr
+sourceapiversion
+sourced
+sourcedir
+sourcefile
+sourceforge
+sourceorg
+sourcepath
+sourcetype
+sourcing
+soww
+soyc
+spacewander
+spam
+spd
+spearce
+speartail
+spf
+spi
+Spivak
+splitbrain
+splitlines
+splunk
+spock
+spop
+spork
+spotify
+springframework
+sprintf
+sprunge
+spu
+spx
+sql
+sqlall
+sqlc
+sqlclear
+sqlcustom
+sqldropindexes
+sqlflush
+sqlindexes
+sqlinitialdata
+sqlq
+sqlsan
+sqlsequencereset
+sqltracelisteners
+squashmigrations
+srake
+srandmember
+src
+srem
+ssh
+sshd
+sshkey
+sshkeyfile
+sshkeypassphrase
+sshpassword
+sshport
+sshpublickeyfile
+sshuser
+ssl
+sslproxyhost
+sslproxyport
+ssm
+sso
+sst
+sstat
+stackoverflow
+stacktrace
+stagedstr
+standalone
+standaloneonly
+startapp
+startpage
+startpost
+startproject
+startswith
+startus
+statd
+statedb
+statefile
+statefulset
+statelist
+statementcachesize
+statementleakreclaim
+statementleaktimeout
+statementtimeout
+STATESEPARATOR
+staticlib
+statuspost
+stderr
+stdin
+stdio
+stdlayout
+stdlib
+stdout
+steadypoolsize
+stedolan
+steeef
+sterr
+stevelosh
+stgit
+stil
+STITLE
+stn
+stoppedservers
+stoppedservices
+stoppost
+stopwait
+storeprotocol
+storeprotocolclass
+stp
+strfile
+strftime
+stringification
+stringified
+stringify
+stripspace
+strlen
+strverscmp
+Strzelecki
+sts
+stt
+stty
+stu
+stylesheets
+subcmds
+subdigital
+subdir
+subdomain
+subfolder
+Subhaditya
+subl
+sublimemerge
+sublimetext
+subm
+subnut
+subpage
+subpath
+subscriberfile
+subscriberorg
+subservices
+subshells
+subspec
+substr
+subsubcmds
+Subsubcommands
+Subsubsubcommands
+sudo
+sudoedit
+SUFIX
+suitenames
+sunaku
+sunion
+sunionstore
+supad
+superaccessors
+supervisorctl
+supervisord
+suppresscc
+suprl
+suprm
+suprr
+suprs
+supso
+supsr
+supu
+Suraj
+surryhill
+suse
+svcat
+svg
+svm
+svn
+svnsync
+svntrunk
+swiftc
+swiftpm
+sxa
+sxc
+sxd
+sxf
+sxfn
+sxm
+sxn
+sxp
+sxu
+sxw
+sxy
+sykora
+symfony
+symkinds
+symlink
+Symlinking
+symref
+syms
+syncdb
+SYNOPSYS
+syns
+syohex
+sys
+sysadmins
+sysctl
+syslog
+sysread
+sysroot
+systemadmin
+systemctl
+systemd
+systeminfo
+systemproperties
+Syu
+Syua
+Syy
+Tabone
+tagname
+tailcalls
+Tajikistan
+takedir
+takegit
+takeurl
+tanabata
+tarball
+tarfile
+targetcut
+targetdevhubusername
+targetprotocol
+targetted
+targetusername
+Tasche
+Tascii
+taskwarrior
+Tassilo
+tatooine
+tavric
+tbz
+tcl
+tcp
+tcpdump
+tcpip
+tcpnodelay
+tcsh
+tdiff
+tdiffstr
+tempdir
+tempfile
+tempfilename
+TEMPLATENAME
+terday
+termcap
+termcolor
+Termfile
+terminalapp
+terminfo
+terminitor
+termsupport
+termux
+TERMWIDTH
+terraform
+terremark
+testflag
+testfunc
+testlevel
+testlog
+testname
+testng
+testrb
+testrunid
+testrunner
+testserver
+textastic
+textasticapp
+textconv
+textfile
+textmate
+tformat
+tfstate
+tftp
+tfvars
+tgz
+thedir
+thefuck
+themeisfresh
+thememsg
+there're
+thibault
+thisfcn
+Thoumie
+threadpool
+threadpoolid
+thu
+tif
+timeoutmsec
+timeremaining
+timetolive
+timewait
+timothybasanov
+tion
+titlebar
+tjkirch
+tkachenko
+tkdiff
+tkss
+tksv
+tldr
+Tlp
+tls
+tlscacert
+tlscert
+tlsciphers
+tlsenabled
+tlskey
+tlsrollbackenabled
+tlsverify
+tlz
+tmp
+tmpdir
+tmpfile
+tmpfs
+tmux
+tmuxinator
+tne
+tnn
+tobed
+todo
+Tokenise
+tokenized
+tolower
+tomee
+tonotdo
+toolchain
+toolcp
+toplevel
+Toponce
+torrez
+torromeo
+tortoisemerge
+totp
+totpkey
+Touron
+tput
+traceroute
+trackball
+transactionlogdir
+transactionsupport
+transferencoding
+transprotocol
+transprotocolclass
+trapd
+trconf
+triggerevents
+triggername
+trins
+trinsd
+trizen
+trloc
+trlst
+trmir
+Troiae
+Trojanowski
+trorph
+trre
+trrem
+trrep
+trsu
+trunc
+trupd
+trupg
+tsdh
+tsl
+ttl
+ttr
+ttyctl
+ttys
+tview
+twohead
+txl
+txn
+txo
+txs
+txz
+tycho
+typechecking
+typescriptlang
+typesetsilent
+typespec
+typoes
+tzst
+uapprox
+uberjar
+Ubfksu
+ubuntu
+udp
+uescape
+UFE
+ufw
+uid
+ukpog
+ULCORNER
+ulimit
+Ullrich
+ultiple
+umask
+umd
+umich
+unace
+unalias
+uname
+unarchive
+Uncomment
+uncommit
+uncompress
+uncurry
+undelete
+undeploy
+unedit
+unescape
+unexport
+unexpose
+unfunction
+unhash
+unheap
+unhost
+unicode
+unidiff
+unindex
+uninst
+uninstall
+uninstalling
+unionbedg
+uniq
+uniqid
+uniquetablenames
+unittest
+universalarchive
+unixfs
+unixstamp
+unlimit
+unlzma
+unmark
+unmatch
+unmonitor
+unmute
+unpause
+unrar
+unreachability
+unsetopt
+unshallow
+unshare
+unstagedstr
+unstartup
+unsubscribe
+untag
+unversioned
+unwatch
+unwip
+unxz
+unzstd
+updatedb
+updateonsave
+updatestartuptty
+upgr
+upgradable
+upgradetype
+uploadpack
+upperip
+upsert
+urandom
+URCORNER
+uri
+url
+urldecode
+urlencode
+urllib
+urlmatch
+urlonly
+urlparse
+urlstring
+urltools
+urxvt
+usb
+usbmux
+usejavacp
+uselimit
+usemasterpassword
+usergroups
+userguide
+userland
+username
+userns
+userpass
+userpassword
+usetoolingapi
+usetty
+usr
+utc
+utf
+utils
+utm
+uucp
+UUID
+Vagrantfile
+vagrantup
+valentinbud
+validateatmostonceperiod
+validateddeployrequestid
+validateschema
+validationclassname
+validationmethod
+validationtable
+Valodim
+vals
+varargs
+vared
+varkey
+varname
+vaultproject
+vba
+vbl
+vbm
+vbo
+vbox
+vbqs
+vbr
+vbu
+vcf
+vcmp
+vcs
+vcsa
+vdf
+vectorize
+Venant
+vendored
+venv
+Verhoef
+Verma
+VERSINFO
+versioncomp
+versiondescription
+versioned
+versioning
+versionname
+versionnumber
+versiontagprefix
+verstr
+vfs
+vgi
+vgrepping
+vgs
+vguerci
+vhost
+vhsp
+vicmd
+viewtopic
+viins
+vimdiff
+vimgrep
+vimrc
+violenz
+viopp
+virtenv
+virtualbox
+virtualenv
+virtualenvwrapper
+virtualizing
+virtualservers
+virumque
+visitpage
+visualforce
+visualstudio
+VMDK
+VMs
+vmwarefusion
+vmwarevcloudair
+vmwarevsphere
+vnc
+vncviewer
+vnd
+voggom
+Voldemort
+volumedriver
+vonnegut
+Vop
+vopts
+vpaivatorres
+vpc
+vpli
+vpll
+vplu
+vplun
+vpr
+vrdp
+vre
+vrp
+vsc
+vsca
+vscd
+vscde
+vscg
+vscie
+vscl
+vscn
+vscode
+vscodium
+vscr
+vscu
+vscue
+vscv
+vscw
+vsh
+vsix
+vsp
+vsplit
+vssh
+vsshc
+vssp
+vst
+VTE
+vterm
+Vue
+vuejs
+vulns
+vulscan
+vundle
+vup
+vvsp
+vvv
+vwxyz
+vydpig
+waittime
+wakeonlan
+walle
+wantlist
+warpdir
+warprc
+wav
+wclip
+wcomp
+Webchat
+weblog
+webm
+webrick
+webscr
+webserver
+website
+webtraffic
+Wegner
+Weiming
+Weirich
+Wez
+wfilter
+wget
+whatchanged
+whatisthor
+whatthecommit
+whatwg
+whitespacelist
+whl
+whoami
+wiki
+wikipedia
+wil
+willmendesneto
+wincmd
+windowid
+windowsdomain
+windowspassword
+windowsuser
+wip
+wjst
+wks
+wlne
+wolframalpha
+womens
+wordbits
+WORDBREAKS
+WORDCHARS
+wordlist
+wordpress
+workaround
+workdir
+workflow
+workon
+workpass
+workqueues
+workspaces
+worktree
+would've
+wrapjdbcobjects
+writetimeoutmillis
+WSL
+wslpath
+wtf
+wtfpl
+www
+wwwrun
+Wzf
+xargs
+xcb
+xcconfig
+xcdd
+xchm
+xclick
+xclip
+xcode
+xcodebuild
+xcodeproj
+xcp
+xcsel
+xcselv
+xcworkspace
+XDCHDSBDSDG
+xdg
+xdvi
+xfn
+xfree
+xfs
+xit
+XIVIEWER
+xjnmahqewy
+xkcd
+Xkten
+XLBUFFER
+xlbuflines
+xml
+xnode
+xontab
+xor
+Xout
+xperl
+xphp
+xpi
+xpm
+xpowered
+xprop
+xpython
+XRBUFFER
+xrbuflines
+xruby
+xsel
+xshell
+xstrat
+xterm
+XTRACE
+xudmec
+xunit
+xvf
+xvjf
+xxd
+xxdiff
+Xxjn
+xzcat
+yaconf
+yain
+yainsd
+yaloc
+yalst
+yamir
+yaml
+yandex
+yandsearch
+Yanovich
+yaorph
+yarem
+yarep
+yarnpkg
+yarnrc
+yasu
+yaupd
+yaupg
+ybalrid
+ycc
+yesorno
+yga
+ygi
+ygl
+ygr
+ygrm
+ygu
+yii
+yiic
+yiiframework
+yireo
+yleo
+ylep
+yli
+yln
+ylnf
+yls
+ymc
+yml
+yolo
+Yonchu
+YOSHIDA
+yout
+youtube
+yrl
+yrm
+yrun
+yst
+ytc
+yuc
+yui
+yuil
+yuyuchu
+yws
+yyy
+yzf
+zadd
+zake
+zal
+zall
+zas
+zbell
+ZCA
+zcard
+zcl
+zcompcache
+zcompdump
+zcompile
+Zconvey
+zcount
+zcu
+zcurses
+zdbc
+zdbcm
+zdbm
+zdbmigrate
+zdbr
+zdbreset
+ZDgw
+zdharma
+zdirs
+zdotdir
+zdup
+zenerate
+zenmap
+zerver
+zfs
+zgen
+zgrep
+zhimingwang
+zhse
+zic
+zif
+zin
+zincrby
+zinit
+zinr
+zinterstore
+zipalign
+zipfile
+zkat
+zle
+zleparameter
+zlicenses
+zll
+zlogin
+zlogout
+zlp
+zlr
+zls
+zlu
+zma
+zmodload
+zmr
+zms
+znr
+znt
+zocmez
+zonsole
+zoxide
+zpa
+zparseopts
+zpatch
+zpattern
+zpch
+zpchk
+zpd
+zplg
+zplug
+zplugin
+zproduct
+zprofile
+zps
+zpt
+zrake
+zrange
+zrangebyscore
+zrank
+zref
+zregexparse
+zrem
+zremrangebyrank
+zremrangebyscore
+zrevrange
+zrevrangebyscore
+zrevrank
+zrl
+zrm
+zrn
+zrr
+zrs
+zscore
+zse
+zsh'ed
+zsh
+zshaddhistory
+zshcmd
+zshcommands
+zshcompfunc
+zshconfig
+zshell
+zshenv
+zshexpn
+zshids
+zshrc
+zshtheme
+zshwiki
+zshzle
+zsi
+zsocket
+Zsolt
+zsource
+zspec
+zsr
+zsrc
+zst
+Zstandard
+zstat
+zstd
+zstdcat
+zstyle
+zsw
+ztart
+ztos
+zucumber
+zunctional
+zunionstore
+zunits
+zunner
+zup
+zutil
+zvcmp
+zve
+zweep
+zwip
+ZWJ
+zwp
+zxvf
+zyg
+zypper
+zzz
diff --git a/.github/actions/spelling/patterns.txt b/.github/actions/spelling/patterns.txt
new file mode 100644
index 000000000..93dfa201c
--- /dev/null
+++ b/.github/actions/spelling/patterns.txt
@@ -0,0 +1,73 @@
+# See https://github.com/check-spelling/check-spelling/wiki/Configuration-Examples:-patterns
+
+# YouTube
+https?://(?:(?:www\.|)youtube\.com|youtu.be)/(?:channel/|embed/|playlist\?list=|watch\?v=|v/|)[-a-zA-Z0-9?&=_]*
+<\s*youtube\s+id=['"][-a-zA-Z0-9?_]*['"]
+\bimg\.youtube\.com/vi/[-a-zA-Z0-9?&=_]*
+# Google Analytics
+\bgoogle-analytics\.com/collect.[-0-9a-zA-Z?%=&_.~]*
+# Google APIs
+\bgoogleapis\.com/[a-z]+/v\d+/[a-z]+/[@./?=\w]+
+\b[-a-zA-Z0-9.]*\bstorage\d*\.googleapis\.com(?:/\S*|)
+# Google Calendar
+\bcalendar\.google\.com/calendar(?:/u/\d+|)/embed\?src=[@./?=\w&%]+
+\w+\@group\.calendar\.google\.com\b
+# Google DataStudio
+\bdatastudio\.google\.com/(?:(?:c/|)u/\d+/|)(?:embed/|)(?:open|reporting|datasources|s)/[-0-9a-zA-Z]+(?:/page/[-0-9a-zA-Z]+|)
+# The leading `/` here is as opposed to the `\b` above
+# ... a short way to match `https://` or `http://` since most urls have one of those prefixes
+# Google Docs
+/docs\.google\.com/[a-z]+/d/(?:e/|)[0-9a-zA-Z_-]+/?
+# Google Drive
+\bdrive\.google\.com/file/d/[0-9a-zA-Z_?=]*
+# Google Groups
+\bgroups\.google\.com/(?:forum/#!|d/)(?:msg|topic)/[^/]+/[a-zA-Z0-9]+(?:/[a-zA-Z0-9]+|)
+# Google themes
+themes\.googleusercontent\.com/static/fonts/[^/]+/v\d+/[^.]+.
+# Google CDN
+\bclients2\.google(?:usercontent|)\.com[-0-9a-zA-Z/.]*
+# Goo.gl
+/goo\.gl/[a-zA-Z0-9]+
+# Google Chrome Store
+\bchrome\.google\.com/webstore/detail/\w*(?:/\w*|)
+# Google Books
+\bbooks\.google\.(?:\w{2,4})/books\?[-\w\d=&#.]*
+# Google Fonts
+\bfonts\.(?:googleapis|gstatic)\.com/[-/?=:;+&0-9a-zA-Z]*
+
+# GitHub SHAs
+\bapi.github\.com/repos/[^/]+/[^/]+/[^/]+/[0-9a-f]+\b
+(?:\[[0-9a-f]+\]\(https:/|)/(?:www\.|)github\.com/[^/]+/[^/]+(?:/[^/]+/[0-9a-f]+(?:[-0-9a-zA-Z/#.]*|)\b|)
+\bgithub\.com/[^/]+/[^/]+[@#][0-9a-f]+\b
+# githubusercontent
+/[-a-z0-9]+\.githubusercontent\.com/[-a-zA-Z0-9?&=_\/.]*
+# gist github
+/gist\.github\.com/[^/]+/[0-9a-f]+
+# git.io
+\bgit\.io/[0-9a-zA-Z]+
+# GitHub JSON
+"node_id": "[-a-zA-Z=;:/0-9+]*"
+# Contributor
+\[[^\]]+]\(https://github\.com/[^/]+\)
+# GHSA
+GHSA(?:-[0-9a-z]{4}){3}
+
+LS_COLORS=(["']).*?\g{-1}
+
+(\\?)%[a-zA-Z]+\g{-1}(?!%)
+
+# URL escaped characters
+\%[0-9A-F]{2}
+# hex digits including css/html color classes:
+(?:[\\0][xX]|\\u|[uU]\+|#x?|\%23)[0-9a-fA-FgGrR_]{2,}(?:[uU]?[lL]{0,2}|u\d+)\b
+
+# https://www.gnu.org/software/groff/manual/groff.html
+# man troff content
+\\f[BCIPR]
+
+# Compiler flags
+[\t "'`=]-[LPWXY]
+[\t "'`=]-D(?!ebian)
+
+# ignore long runs of a single character:
+\b([A-Za-z])\g{-1}{3,}\b
diff --git a/.github/actions/spelling/reject.txt b/.github/actions/spelling/reject.txt
new file mode 100644
index 000000000..a5ba6f639
--- /dev/null
+++ b/.github/actions/spelling/reject.txt
@@ -0,0 +1,7 @@
+^attache$
+benefitting
+occurence
+Sorce
+^[Ss]pae
+^untill
+^wether
diff --git a/.github/workflows/spelling.yml b/.github/workflows/spelling.yml
new file mode 100644
index 000000000..18a302e3c
--- /dev/null
+++ b/.github/workflows/spelling.yml
@@ -0,0 +1,95 @@
+name: Spell checking
+on:
+  push:
+    branches: ["**"]
+    tags-ignore: ["**"]
+  pull_request_target:
+  issue_comment:
+    types: [created]
+
+jobs:
+  spelling:
+    name: Spell checking
+    permissions:
+      contents: read
+      pull-requests: read
+    outputs:
+      internal_state_directory: ${{ steps.spelling.outputs.internal_state_directory }}
+    runs-on: ubuntu-latest
+    if: "contains(github.event_name, 'pull_request') || github.event_name == 'push'"
+    concurrency:
+      group: spelling-${{ github.event.pull_request.number || github.ref }}
+      # note: If you use only_check_changed_files, you do not want cancel-in-progress
+      cancel-in-progress: true
+    steps:
+    - name: checkout-merge
+      if: "contains(github.event_name, 'pull_request')"
+      uses: actions/checkout@v2
+      with:
+        ref: refs/pull/${{github.event.pull_request.number}}/merge
+    - name: checkout
+      if: github.event_name == 'push'
+      uses: actions/checkout@v2
+    - name: check-spelling
+      id: spelling
+      uses: check-spelling/check-spelling@prerelease
+      with:
+        experimental_apply_changes_via_bot: 1
+        suppress_push_for_open_pull_request: 1
+        post_comment: 0
+    - name: store-comment
+      if: failure()
+      uses: actions/upload-artifact@v2
+      with:
+        retention-days: 1
+        name: "check-spelling-comment-${{ github.run_id }}"
+        path: |
+          ${{ steps.spelling.outputs.internal_state_directory }}
+
+  comment:
+    name: Comment
+    runs-on: ubuntu-latest
+    needs: spelling
+    permissions:
+      contents: write
+      pull-requests: write
+    if: always() && needs.spelling.result == 'failure' && needs.spelling.outputs.internal_state_directory
+    steps:
+    - name: checkout
+      uses: actions/checkout@v2
+    - name: set up
+      run: |
+        mkdir /tmp/data
+    - name: retrieve-comment
+      uses: actions/download-artifact@v2
+      with:
+        name: "check-spelling-comment-${{ github.run_id }}"
+        path: /tmp/data
+    - name: comment
+      uses: check-spelling/check-spelling@prerelease
+      with:
+        experimental_apply_changes_via_bot: 1
+        custom_task: comment
+        internal_state_directory: /tmp/data
+
+  update:
+    name: Update PR
+    permissions:
+      contents: write
+      pull-requests: write
+    runs-on: ubuntu-latest
+    if: ${{
+        github.event_name == 'issue_comment' &&
+        github.event.issue.pull_request &&
+        contains(github.event.comment.body, '@check-spelling-bot apply')
+      }}
+    concurrency:
+      group: spelling-update-${{ github.event.issue.number }}
+      cancel-in-progress: false
+    steps:
+    - name: checkout
+      uses: actions/checkout@v2
+    - name: check-spelling
+      uses: check-spelling/check-spelling@prerelease
+      with:
+        experimental_apply_changes_via_bot: 1

From 29b344a7102a2fe427d5ea6bcde4044898be1112 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Tue, 7 Dec 2021 18:04:33 +0100
Subject: [PATCH 582/869] chore: update security docs and link to huntr.dev

---
 README.md   |  1 +
 SECURITY.md | 12 +++++++-----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 5712c1701..310283e92 100644
--- a/README.md
+++ b/README.md
@@ -16,6 +16,7 @@ To learn more, visit [ohmyz.sh](https://ohmyz.sh), follow [@ohmyzsh](https://twi
 [![Follow @ohmyzsh](https://img.shields.io/twitter/follow/ohmyzsh?label=Follow+@ohmyzsh&style=flat)](https://twitter.com/intent/follow?screen_name=ohmyzsh)
 [![Discord server](https://img.shields.io/discord/642496866407284746)](https://discord.gg/ohmyzsh)
 [![Gitpod ready](https://img.shields.io/badge/Gitpod-ready-blue?logo=gitpod)](https://gitpod.io/#https://github.com/ohmyzsh/ohmyzsh)
+[![huntr.dev](https://cdn.huntr.dev/huntr_security_badge_mono.svg)](https://huntr.dev/bounties/disclose/?utm_campaign=ohmyzsh%2Fohmyzsh&utm_medium=social&utm_source=github&target=https%3A%2F%2Fgithub.com%2Fohmyzsh%2Fohmyzsh)
 
 ## Getting Started
 
diff --git a/SECURITY.md b/SECURITY.md
index cda53379f..7e5c8eed0 100644
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -3,7 +3,8 @@
 ## Supported Versions
 
 At the moment Oh My Zsh only considers the very latest commit to be supported.
-We combine that with our fast response to incidents, so risk is minimized.
+We combine that with our fast response to incidents and the automated updates
+to minimize the time between vulnerability publication and patch release.
 
 | Version        | Supported          |
 |:-------------- |:------------------ |
@@ -14,9 +15,10 @@ In the near future we will introduce versioning, so expect this section to chang
 
 ## Reporting a Vulnerability
 
-If you find a vulnerability, email all the maintainers directly at:
+**Do not submit an issue or pull request**: this might reveal the vulnerability.
 
-- Robby: robby [at] planetargon.com
-- Marc: hello [at] mcornella.com
+Instead, you should email the maintainers directly at: [**security@ohmyz.sh**](mailto:security@ohmyz.sh).
 
-**Do not open an issue or Pull Request directly**, because it might reveal the vulnerability.
+We will deal with the vulnerability privately and submit a patch as soon as possible.
+
+You can also submit your vulnerability report to [huntr.dev](https://huntr.dev/bounties/disclose/?utm_campaign=ohmyzsh%2Fohmyzsh&utm_medium=social&utm_source=github&target=https%3A%2F%2Fgithub.com%2Fohmyzsh%2Fohmyzsh) and see if you can get a bounty reward.

From 44d8edea05d940ceb593a025e27466e7c8727f03 Mon Sep 17 00:00:00 2001
From: Josh Soref <2119212+jsoref@users.noreply.github.com>
Date: Tue, 7 Dec 2021 12:09:34 -0500
Subject: [PATCH 583/869] ci(spelling): automatically accept aliased commands
 (#10475)

Co-authored-by: Josh Soref <jsoref@users.noreply.github.com>
---
 .github/actions/spelling/expect.txt | 3 +++
 .github/workflows/spelling.yml      | 8 ++++++++
 2 files changed, 11 insertions(+)

diff --git a/.github/actions/spelling/expect.txt b/.github/actions/spelling/expect.txt
index fc764f57a..76e9fdf31 100644
--- a/.github/actions/spelling/expect.txt
+++ b/.github/actions/spelling/expect.txt
@@ -22,6 +22,7 @@ acr
 acroread
 acs
 acsc
+acss
 acsp
 actionformats
 Adamantium
@@ -1459,6 +1460,7 @@ gpr
 gpristine
 gpsup
 gpu
+gpus
 gpv
 gradle
 gradlew
@@ -2396,6 +2398,7 @@ mirrorlist
 mixin
 mkcd
 mkdir
+mkdirs
 mktag
 mktemp
 mktree
diff --git a/.github/workflows/spelling.yml b/.github/workflows/spelling.yml
index 18a302e3c..946d411d1 100644
--- a/.github/workflows/spelling.yml
+++ b/.github/workflows/spelling.yml
@@ -30,6 +30,14 @@ jobs:
     - name: checkout
       if: github.event_name == 'push'
       uses: actions/checkout@v2
+    - name: find aliases
+      run: |
+        for a in $(git ls-files|grep '\.zsh$'); do
+          echo "-- $a"
+          if [ -s "$a" ]; then
+            perl -ne 'next unless s/^alias ([A-Za-z]{3,})=.*/$1/;print' "$a" | tee -a .github/actions/spelling/allow.txt
+          fi
+        done;
     - name: check-spelling
       id: spelling
       uses: check-spelling/check-spelling@prerelease

From 90e53bcc6aba67e9e27c4e6961cb4a0eec34d436 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Tue, 7 Dec 2021 19:37:28 +0100
Subject: [PATCH 584/869] ci(spelling): turn off check-spelling action
 temporarily

---
 .github/workflows/spelling.yml | 103 ---------------------------------
 1 file changed, 103 deletions(-)
 delete mode 100644 .github/workflows/spelling.yml

diff --git a/.github/workflows/spelling.yml b/.github/workflows/spelling.yml
deleted file mode 100644
index 946d411d1..000000000
--- a/.github/workflows/spelling.yml
+++ /dev/null
@@ -1,103 +0,0 @@
-name: Spell checking
-on:
-  push:
-    branches: ["**"]
-    tags-ignore: ["**"]
-  pull_request_target:
-  issue_comment:
-    types: [created]
-
-jobs:
-  spelling:
-    name: Spell checking
-    permissions:
-      contents: read
-      pull-requests: read
-    outputs:
-      internal_state_directory: ${{ steps.spelling.outputs.internal_state_directory }}
-    runs-on: ubuntu-latest
-    if: "contains(github.event_name, 'pull_request') || github.event_name == 'push'"
-    concurrency:
-      group: spelling-${{ github.event.pull_request.number || github.ref }}
-      # note: If you use only_check_changed_files, you do not want cancel-in-progress
-      cancel-in-progress: true
-    steps:
-    - name: checkout-merge
-      if: "contains(github.event_name, 'pull_request')"
-      uses: actions/checkout@v2
-      with:
-        ref: refs/pull/${{github.event.pull_request.number}}/merge
-    - name: checkout
-      if: github.event_name == 'push'
-      uses: actions/checkout@v2
-    - name: find aliases
-      run: |
-        for a in $(git ls-files|grep '\.zsh$'); do
-          echo "-- $a"
-          if [ -s "$a" ]; then
-            perl -ne 'next unless s/^alias ([A-Za-z]{3,})=.*/$1/;print' "$a" | tee -a .github/actions/spelling/allow.txt
-          fi
-        done;
-    - name: check-spelling
-      id: spelling
-      uses: check-spelling/check-spelling@prerelease
-      with:
-        experimental_apply_changes_via_bot: 1
-        suppress_push_for_open_pull_request: 1
-        post_comment: 0
-    - name: store-comment
-      if: failure()
-      uses: actions/upload-artifact@v2
-      with:
-        retention-days: 1
-        name: "check-spelling-comment-${{ github.run_id }}"
-        path: |
-          ${{ steps.spelling.outputs.internal_state_directory }}
-
-  comment:
-    name: Comment
-    runs-on: ubuntu-latest
-    needs: spelling
-    permissions:
-      contents: write
-      pull-requests: write
-    if: always() && needs.spelling.result == 'failure' && needs.spelling.outputs.internal_state_directory
-    steps:
-    - name: checkout
-      uses: actions/checkout@v2
-    - name: set up
-      run: |
-        mkdir /tmp/data
-    - name: retrieve-comment
-      uses: actions/download-artifact@v2
-      with:
-        name: "check-spelling-comment-${{ github.run_id }}"
-        path: /tmp/data
-    - name: comment
-      uses: check-spelling/check-spelling@prerelease
-      with:
-        experimental_apply_changes_via_bot: 1
-        custom_task: comment
-        internal_state_directory: /tmp/data
-
-  update:
-    name: Update PR
-    permissions:
-      contents: write
-      pull-requests: write
-    runs-on: ubuntu-latest
-    if: ${{
-        github.event_name == 'issue_comment' &&
-        github.event.issue.pull_request &&
-        contains(github.event.comment.body, '@check-spelling-bot apply')
-      }}
-    concurrency:
-      group: spelling-update-${{ github.event.issue.number }}
-      cancel-in-progress: false
-    steps:
-    - name: checkout
-      uses: actions/checkout@v2
-    - name: check-spelling
-      uses: check-spelling/check-spelling@prerelease
-      with:
-        experimental_apply_changes_via_bot: 1

From 5b987e59d0fce1a74bcfd51750c6f52d7c29c647 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Tue, 7 Dec 2021 20:15:38 +0100
Subject: [PATCH 585/869] chore: add ohmyzsh GitHub Sponsors to FUNDING.yml

---
 .github/FUNDING.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
index c44bb2475..484a8cf53 100644
--- a/.github/FUNDING.yml
+++ b/.github/FUNDING.yml
@@ -1,2 +1,2 @@
-github: [robbyrussell, mcornella, larson-carter]
+github: [ohmyzsh, robbyrussell, mcornella, larson-carter]
 open_collective: ohmyzsh

From dcf12ba8f3b31eead602c530a9fbfd5579c64630 Mon Sep 17 00:00:00 2001
From: Nicolas Cavigneaux <nico@bounga.org>
Date: Fri, 16 Jan 2015 15:59:52 +0100
Subject: [PATCH 586/869] fix(mercurial): show author name in `hgsl` alias log
 alias (#3500)

Closes #3500
---
 plugins/mercurial/README.md            | 43 +++++++++++++-------------
 plugins/mercurial/mercurial.plugin.zsh |  2 +-
 2 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/plugins/mercurial/README.md b/plugins/mercurial/README.md
index 4beee0a95..a362de4ce 100644
--- a/plugins/mercurial/README.md
+++ b/plugins/mercurial/README.md
@@ -11,27 +11,28 @@ plugins=(... mercurial)
 
 ## Aliases
 
-| Alias  | Command                                                                                                     |
-|--------|-------------------------------------------------------------------------------------------------------------|
-| `hga`  | `hg add`                                                                                                    |
-| `hgc`  | `hg commit`                                                                                                 |
-| `hgca` | `hg commit --amend`                                                                                         |
-| `hgb`  | `hg branch`                                                                                                 |
-| `hgba` | `hg branches`                                                                                               |
-| `hgbk` | `hg bookmarks`                                                                                              |
-| `hgco` | `hg checkout`                                                                                               |
-| `hgd`  | `hg diff`                                                                                                   |
-| `hged` | `hg diffmerge`                                                                                              |
-| `hgp`  | `hg push`                                                                                                   |
-| `hgs`  | `hg status`                                                                                                 |
-| `hgsl` | `hg log --limit 20 --template "{node|short} | {date|isodatesec} | {author|user}: {desc|strip|firstline}\n"` |
-| `hgun` | `hg resolve --list`                                                                                         |
-| `hgi`  | `hg incoming`                                                                                               |
-| `hgl`  | `hg pull -u`                                                                                                |
-| `hglr` | `hg pull --rebase`                                                                                          |
-| `hgo`  | `hg outgoing`                                                                                               |
-| `hglg` | `hg log --stat -v`                                                                                          |
-| `hglgp`| `hg log --stat -p -v`                                                                                       |
+| Alias   | Command                                     |
+| ------- | ------------------------------------------- |
+| `hga`   | `hg add`                                    |
+| `hgc`   | `hg commit`                                 |
+| `hgca`  | `hg commit --amend`                         |
+| `hgb`   | `hg branch`                                 |
+| `hgba`  | `hg branches`                               |
+| `hgbk`  | `hg bookmarks`                              |
+| `hgco`  | `hg checkout`                               |
+| `hgd`   | `hg diff`                                   |
+| `hged`  | `hg diffmerge`                              |
+| `hgp`   | `hg push`                                   |
+| `hgs`   | `hg status`                                 |
+| `hgsl`  | `hg log --limit 20 --template "<template>"` |
+| `hgun`  | `hg resolve --list`                         |
+| `hgi`   | `hg incoming`                               |
+| `hgl`   | `hg pull -u`                                |
+| `hglr`  | `hg pull --rebase`                          |
+| `hgo`   | `hg outgoing`                               |
+| `hglg`  | `hg log --stat -v`                          |
+| `hglgp` | `hg log --stat -p -v`                       |
+
 ## Prompt usage
 
 - Switch to a theme which uses `hg_prompt_info`
diff --git a/plugins/mercurial/mercurial.plugin.zsh b/plugins/mercurial/mercurial.plugin.zsh
index e098664c0..68a3d9a5c 100644
--- a/plugins/mercurial/mercurial.plugin.zsh
+++ b/plugins/mercurial/mercurial.plugin.zsh
@@ -10,7 +10,7 @@ alias hgd='hg diff'
 alias hged='hg diffmerge'
 alias hgp='hg push'
 alias hgs='hg status'
-alias hgsl='hg log --limit 20 --template "{node|short} | {date|isodatesec} | {author|user}: {desc|strip|firstline}\n"'
+alias hgsl='hg log --limit 20 --template "{node|short} | {date|isodatesec} | {author|person}: {desc|strip|firstline}\n" '
 alias hgun='hg resolve --list'
 # pull and update
 alias hgi='hg incoming'

From e52584c90195d0cc0979efec88b94271a31fe494 Mon Sep 17 00:00:00 2001
From: anatolyrr <anatoly.rr@gmail.com>
Date: Sun, 16 Jun 2019 16:50:11 +0300
Subject: [PATCH 587/869] perf(mercurial): improve performance of
 `hg_prompt_info` (#7929)

Replaced two different calls of hg with one `hg --id --branch` for retrieving
information whether we're in a repo (will be empty if not), whether the repo is
dirty (revision id will contain "+" if there are uncommitted changed), and the
branch name.

Closes #6197
Closes #7929
---
 plugins/mercurial/mercurial.plugin.zsh | 27 +++++++++++++++++++++-----
 1 file changed, 22 insertions(+), 5 deletions(-)

diff --git a/plugins/mercurial/mercurial.plugin.zsh b/plugins/mercurial/mercurial.plugin.zsh
index 68a3d9a5c..f110507fd 100644
--- a/plugins/mercurial/mercurial.plugin.zsh
+++ b/plugins/mercurial/mercurial.plugin.zsh
@@ -35,12 +35,29 @@ function hg_get_branch_name() {
 }
 
 function hg_prompt_info {
-  _DISPLAY=`hg branch 2>/dev/null`
-  if [ $? -eq 0 ]; then
-    echo "$ZSH_PROMPT_BASE_COLOR$ZSH_THEME_HG_PROMPT_PREFIX\
-$ZSH_THEME_REPO_NAME_COLOR$_DISPLAY$ZSH_PROMPT_BASE_COLOR$ZSH_PROMPT_BASE_COLOR$(hg_dirty)$ZSH_THEME_HG_PROMPT_SUFFIX$ZSH_PROMPT_BASE_COLOR"
+  local info rev branch dirty
+
+  if ! info=$(hg id --id --branch 2>/dev/null); then
+    return
   fi
-  unset _DISPLAY
+
+  rev="${info[(w)1]}"
+  branch="${${info[(w)2]}:gs/%/%%}"
+
+  if [[ "$rev" = *+ ]]; then
+    dirty="$ZSH_THEME_HG_PROMPT_DIRTY"
+  else
+    dirty="$ZSH_THEME_HG_PROMPT_CLEAN"
+  fi
+
+  echo "${ZSH_PROMPT_BASE_COLOR}\
+${ZSH_THEME_HG_PROMPT_PREFIX}\
+${ZSH_THEME_REPO_NAME_COLOR}\
+${branch}\
+${ZSH_PROMPT_BASE_COLOR}\
+${dirty}\
+${ZSH_THEME_HG_PROMPT_SUFFIX}\
+${ZSH_PROMPT_BASE_COLOR}"
 }
 
 function hg_dirty_choose {

From 24974a135c0bdd4c2d824e4836177ae292f8f56a Mon Sep 17 00:00:00 2001
From: Romain Failliot <romain.failliot@foolstep.com>
Date: Sun, 18 Feb 2018 19:19:03 -0500
Subject: [PATCH 588/869] feat(mercurial)!: use `PREFIX` and `SUFFIX` settings
 in `hg_prompt_info` (#6631)

BREAKING CHANGE: the `hg_prompt_info` function now uses `ZSH_THEME_HG_PROMPT_PREFIX`
and `ZSH_THEME_HG_PROMPT_SUFFIX` variables when displaying branch information, similar
to the `git_prompt_info` function.

Closes #6631
---
 plugins/mercurial/mercurial.plugin.zsh | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/plugins/mercurial/mercurial.plugin.zsh b/plugins/mercurial/mercurial.plugin.zsh
index f110507fd..111464af6 100644
--- a/plugins/mercurial/mercurial.plugin.zsh
+++ b/plugins/mercurial/mercurial.plugin.zsh
@@ -50,14 +50,7 @@ function hg_prompt_info {
     dirty="$ZSH_THEME_HG_PROMPT_CLEAN"
   fi
 
-  echo "${ZSH_PROMPT_BASE_COLOR}\
-${ZSH_THEME_HG_PROMPT_PREFIX}\
-${ZSH_THEME_REPO_NAME_COLOR}\
-${branch}\
-${ZSH_PROMPT_BASE_COLOR}\
-${dirty}\
-${ZSH_THEME_HG_PROMPT_SUFFIX}\
-${ZSH_PROMPT_BASE_COLOR}"
+  echo "${ZSH_THEME_HG_PROMPT_PREFIX}${branch}${dirty}${ZSH_THEME_HG_PROMPT_SUFFIX}"
 }
 
 function hg_dirty_choose {

From 137b45672dd182e798f7bd0c580aa9b634657990 Mon Sep 17 00:00:00 2001
From: Romain Failliot <romain.failliot@foolstep.com>
Date: Sun, 18 Feb 2018 19:27:50 -0500
Subject: [PATCH 589/869] feat(bira): improve theme and add support for
 mercurial (#6631)

Added the red dot (instead of the default `*`) if the branch is dirty.

The bira theme only supported git, now it supports mercurial as well. It
needed ito call `hg_prompt_info` and the `ZSH_THEME_HG_PROMPT_`
variables.

Closes #6631
---
 themes/bira.zsh-theme | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/themes/bira.zsh-theme b/themes/bira.zsh-theme
index cdae68d6c..4a05bf3bb 100644
--- a/themes/bira.zsh-theme
+++ b/themes/bira.zsh-theme
@@ -1,32 +1,32 @@
-# ZSH Theme - Preview: https://gyazo.com/8becc8a7ed5ab54a0262a470555c3eed.png
 local return_code="%(?..%{$fg[red]%}%? ↵%{$reset_color%})"
+local user_host="%B%(!.%F{red}.%F{green})%n@%m %{$reset_color%}"
+local user_symbol='%(!.#.$)'
+local current_dir="%B%{$fg[blue]%}%~ %{$reset_color%}"
 
-if [[ $UID -eq 0 ]]; then
-    local user_host='%{$terminfo[bold]$fg[red]%}%n@%m %{$reset_color%}'
-    local user_symbol='#'
-else
-    local user_host='%{$terminfo[bold]$fg[green]%}%n@%m %{$reset_color%}'
-    local user_symbol='$'
-fi
-
-local current_dir='%{$terminfo[bold]$fg[blue]%}%~ %{$reset_color%}'
-local git_branch='$(git_prompt_info)'
+local vcs_branch='$(git_prompt_info)$(hg_prompt_info)'
 local rvm_ruby='$(ruby_prompt_info)'
 local venv_prompt='$(virtualenv_prompt_info)'
 
 ZSH_THEME_RVM_PROMPT_OPTIONS="i v g"
 
-PROMPT="╭─${user_host}${current_dir}${rvm_ruby}${git_branch}${venv_prompt}
+PROMPT="╭─${user_host}${current_dir}${rvm_ruby}${vcs_branch}${venv_prompt}
 ╰─%B${user_symbol}%b "
 RPROMPT="%B${return_code}%b"
 
 ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[yellow]%}‹"
 ZSH_THEME_GIT_PROMPT_SUFFIX="› %{$reset_color%}"
+ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[red]%}●%{$fg[yellow]%}"
+ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg[yellow]%}"
+
+ZSH_THEME_HG_PROMPT_PREFIX="$ZSH_THEME_GIT_PROMPT_PREFIX"
+ZSH_THEME_HG_PROMPT_SUFFIX="$ZSH_THEME_GIT_PROMPT_SUFFIX"
+ZSH_THEME_HG_PROMPT_DIRTY="$ZSH_THEME_GIT_PROMPT_DIRTY"
+ZSH_THEME_HG_PROMPT_CLEAN="$ZSH_THEME_GIT_PROMPT_CLEAN"
 
 ZSH_THEME_RUBY_PROMPT_PREFIX="%{$fg[red]%}‹"
 ZSH_THEME_RUBY_PROMPT_SUFFIX="› %{$reset_color%}"
 
 ZSH_THEME_VIRTUAL_ENV_PROMPT_PREFIX="%{$fg[green]%}‹"
 ZSH_THEME_VIRTUAL_ENV_PROMPT_SUFFIX="› %{$reset_color%}"
-ZSH_THEME_VIRTUALENV_PREFIX=$ZSH_THEME_VIRTUAL_ENV_PROMPT_PREFIX
-ZSH_THEME_VIRTUALENV_SUFFIX=$ZSH_THEME_VIRTUAL_ENV_PROMPT_SUFFIX
+ZSH_THEME_VIRTUALENV_PREFIX="$ZSH_THEME_VIRTUAL_ENV_PROMPT_PREFIX"
+ZSH_THEME_VIRTUALENV_SUFFIX="$ZSH_THEME_VIRTUAL_ENV_PROMPT_SUFFIX"

From d058801a18270800c906d92dd41e275f4da24397 Mon Sep 17 00:00:00 2001
From: Pandu POLUAN <pepoluan@gmail.com>
Date: Mon, 11 May 2020 14:55:20 +0700
Subject: [PATCH 590/869] feat(mercurial): add `hgci` alias for interactive
 commit (#8912)

Closes #8912
---
 plugins/mercurial/README.md            | 1 +
 plugins/mercurial/mercurial.plugin.zsh | 1 +
 2 files changed, 2 insertions(+)

diff --git a/plugins/mercurial/README.md b/plugins/mercurial/README.md
index a362de4ce..19d4a17b1 100644
--- a/plugins/mercurial/README.md
+++ b/plugins/mercurial/README.md
@@ -16,6 +16,7 @@ plugins=(... mercurial)
 | `hga`   | `hg add`                                    |
 | `hgc`   | `hg commit`                                 |
 | `hgca`  | `hg commit --amend`                         |
+| `hgci`  | `hg commit --interactive`                   |
 | `hgb`   | `hg branch`                                 |
 | `hgba`  | `hg branches`                               |
 | `hgbk`  | `hg bookmarks`                              |
diff --git a/plugins/mercurial/mercurial.plugin.zsh b/plugins/mercurial/mercurial.plugin.zsh
index 111464af6..8b50da9d8 100644
--- a/plugins/mercurial/mercurial.plugin.zsh
+++ b/plugins/mercurial/mercurial.plugin.zsh
@@ -2,6 +2,7 @@
 alias hga='hg add'
 alias hgc='hg commit'
 alias hgca='hg commit --amend'
+alias hgci='hg commit --interactive'
 alias hgb='hg branch'
 alias hgba='hg branches'
 alias hgbk='hg bookmarks'

From 4119f53004de987215e4ae2ce49d0f818ad58c63 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Thu, 2 Dec 2021 11:12:18 +0100
Subject: [PATCH 591/869] perf(mercurial): optimize utility functions

---
 plugins/mercurial/mercurial.plugin.zsh | 127 ++++++++++++++-----------
 themes/minimal.zsh-theme               |  32 ++++---
 2 files changed, 91 insertions(+), 68 deletions(-)

diff --git a/plugins/mercurial/mercurial.plugin.zsh b/plugins/mercurial/mercurial.plugin.zsh
index 8b50da9d8..6e72f0b1e 100644
--- a/plugins/mercurial/mercurial.plugin.zsh
+++ b/plugins/mercurial/mercurial.plugin.zsh
@@ -21,55 +21,6 @@ alias hgo='hg outgoing'
 alias hglg='hg log --stat -v'
 alias hglgp='hg log --stat  -p -v'
 
-function in_hg() {
-  if $(hg branch > /dev/null 2>&1); then
-    echo 1
-  fi
-}
-
-function hg_get_branch_name() {
-  branch=`hg branch 2>/dev/null`
-  if [ $? -eq 0 ]; then
-    echo $branch
-  fi
-  unset branch
-}
-
-function hg_prompt_info {
-  local info rev branch dirty
-
-  if ! info=$(hg id --id --branch 2>/dev/null); then
-    return
-  fi
-
-  rev="${info[(w)1]}"
-  branch="${${info[(w)2]}:gs/%/%%}"
-
-  if [[ "$rev" = *+ ]]; then
-    dirty="$ZSH_THEME_HG_PROMPT_DIRTY"
-  else
-    dirty="$ZSH_THEME_HG_PROMPT_CLEAN"
-  fi
-
-  echo "${ZSH_THEME_HG_PROMPT_PREFIX}${branch}${dirty}${ZSH_THEME_HG_PROMPT_SUFFIX}"
-}
-
-function hg_dirty_choose {
-  hg status -mar 2> /dev/null | command grep -Eq '^\s*[ACDIM!?L]'
-  if [ $? -eq 0 ]; then
-    if [ $pipestatus[-1] -eq 0 ]; then
-      # Grep exits with 0 when "One or more lines were selected", return "dirty".
-      echo $1
-      return
-    fi
-  fi
-  echo $2
-}
-
-function hg_dirty {
-  hg_dirty_choose $ZSH_THEME_HG_PROMPT_DIRTY $ZSH_THEME_HG_PROMPT_CLEAN
-}
-
 function hgic() {
   hg incoming "$@" | grep "changeset" | wc -l
 }
@@ -78,8 +29,78 @@ function hgoc() {
   hg outgoing "$@" | grep "changeset" | wc -l
 }
 
-function hg_get_bookmark_name() {
-  if [ $(in_hg) ]; then
-    echo $(hg id -B)
-  fi
+# functions
+function hg_root() {
+  local dir="$PWD"
+  while [[ "$dir" != "/" ]]; do
+    if [[ -d "$dir/.hg" ]]; then
+      echo "$dir"
+      return 0
+    fi
+    dir="${dir:h}"
+  done
+  return 1
+}
+
+function in_hg() {
+  hg_root >/dev/null
+}
+
+function hg_get_branch_name() {
+  local dir
+  if ! dir=$(hg_root); then
+    return
+  fi
+
+  if [[ ! -f "$dir/.hg/branch" ]]; then
+    echo default
+    return
+  fi
+
+  echo "$(<"$dir/.hg/branch")"
+}
+
+function hg_get_bookmark_name() {
+  local dir
+  if ! dir=$(hg_root); then
+    return
+  fi
+
+  if [[ ! -f "$dir/.hg/bookmarks.current" ]]; then
+    return
+  fi
+
+  echo "$(<"$dir/.hg/bookmarks.current")"
+}
+
+function hg_prompt_info {
+  local dir branch dirty
+  if ! dir=$(hg_root); then
+    return
+  fi
+
+  if [[ ! -f "$dir/.hg/branch" ]]; then
+    branch=default
+  else
+    branch="$(<"$dir/.hg/branch")"
+  fi
+
+  dirty="$(hg_dirty)"
+
+  echo "${ZSH_THEME_HG_PROMPT_PREFIX}${branch:gs/%/%%}${dirty}${ZSH_THEME_HG_PROMPT_SUFFIX}"
+}
+
+function hg_dirty {
+  local hg_status
+  if ! hg_status="$(hg status -mar 2>/dev/null)"; then
+    return
+  fi
+
+  # grep exits with 0 when dirty
+  if command grep -Eq '^\s*[ACDIM!?L]' <<< "$hg_status"; then
+    echo $ZSH_THEME_HG_PROMPT_DIRTY
+    return
+  fi
+
+  echo $ZSH_THEME_HG_PROMPT_CLEAN
 }
diff --git a/themes/minimal.zsh-theme b/themes/minimal.zsh-theme
index e05df9c9b..588ab6982 100644
--- a/themes/minimal.zsh-theme
+++ b/themes/minimal.zsh-theme
@@ -2,23 +2,25 @@ ZSH_THEME_GIT_PROMPT_PREFIX="%{$reset_color%}%{$fg[white]%}["
 ZSH_THEME_GIT_PROMPT_SUFFIX=""
 ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[red]%}●%{$fg[white]%}]%{$reset_color%} "
 ZSH_THEME_GIT_PROMPT_CLEAN="]%{$reset_color%} "
-ZSH_THEME_SVN_PROMPT_PREFIX=$ZSH_THEME_GIT_PROMPT_PREFIX
-ZSH_THEME_SVN_PROMPT_SUFFIX=$ZSH_THEME_GIT_PROMPT_SUFFIX
-ZSH_THEME_SVN_PROMPT_DIRTY=$ZSH_THEME_GIT_PROMPT_DIRTY
-ZSH_THEME_SVN_PROMPT_CLEAN=$ZSH_THEME_GIT_PROMPT_CLEAN
-ZSH_THEME_HG_PROMPT_PREFIX=$ZSH_THEME_GIT_PROMPT_PREFIX
-ZSH_THEME_HG_PROMPT_SUFFIX=$ZSH_THEME_GIT_PROMPT_SUFFIX
-ZSH_THEME_HG_PROMPT_DIRTY=$ZSH_THEME_GIT_PROMPT_DIRTY
-ZSH_THEME_HG_PROMPT_CLEAN=$ZSH_THEME_GIT_PROMPT_CLEAN
+
+ZSH_THEME_SVN_PROMPT_PREFIX="$ZSH_THEME_GIT_PROMPT_PREFIX"
+ZSH_THEME_SVN_PROMPT_SUFFIX="$ZSH_THEME_GIT_PROMPT_SUFFIX"
+ZSH_THEME_SVN_PROMPT_DIRTY="$ZSH_THEME_GIT_PROMPT_DIRTY"
+ZSH_THEME_SVN_PROMPT_CLEAN="$ZSH_THEME_GIT_PROMPT_CLEAN"
+
+ZSH_THEME_HG_PROMPT_PREFIX="$ZSH_THEME_GIT_PROMPT_PREFIX"
+ZSH_THEME_HG_PROMPT_SUFFIX="$ZSH_THEME_GIT_PROMPT_SUFFIX"
+ZSH_THEME_HG_PROMPT_DIRTY="$ZSH_THEME_GIT_PROMPT_DIRTY"
+ZSH_THEME_HG_PROMPT_CLEAN="$ZSH_THEME_GIT_PROMPT_CLEAN"
 
 vcs_status() {
-    if [[ $(whence in_svn) != "" ]] && in_svn; then
-        svn_prompt_info
-    elif [[ $(whence in_hg) != "" ]] && in_hg; then
-        hg_prompt_info
-    else
-        git_prompt_info
-    fi
+  if (( ${+functions[in_svn]} )) && in_svn; then
+    svn_prompt_info
+  elif (( ${+functions[in_hg]} )) && in_hg; then
+    hg_prompt_info
+  else
+    git_prompt_info
+  fi
 }
 
 PROMPT='%2~ $(vcs_status)»%b '

From 1c07001896de18cd0a742d7892b948ba7bab10c7 Mon Sep 17 00:00:00 2001
From: David Sutherland <djsutho@gmail.com>
Date: Thu, 17 Oct 2013 16:48:58 +1000
Subject: [PATCH 592/869] fix(mercurial): correctly check for untracked files
 in `hg_dirty` (#2177)

Closes #2177
Closes #6197

Co-authored-by: Henrik Ravn <hravnx@gmail.com>
---
 plugins/mercurial/mercurial.plugin.zsh | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/plugins/mercurial/mercurial.plugin.zsh b/plugins/mercurial/mercurial.plugin.zsh
index 6e72f0b1e..9b85d02f6 100644
--- a/plugins/mercurial/mercurial.plugin.zsh
+++ b/plugins/mercurial/mercurial.plugin.zsh
@@ -91,13 +91,25 @@ function hg_prompt_info {
 }
 
 function hg_dirty {
-  local hg_status
-  if ! hg_status="$(hg status -mar 2>/dev/null)"; then
+  # Do nothing if clean / dirty settings aren't defined
+  if [[ -z "$ZSH_THEME_HG_PROMPT_DIRTY" && -z "$ZSH_THEME_HG_PROMPT_CLEAN" ]]; then
     return
   fi
 
+  # Check if there are modifications
+  local hg_status
+  if [[ "$DISABLE_UNTRACKED_FILES_DIRTY" = true ]]; then
+    if ! hg_status="$(hg status -q 2>/dev/null)"; then
+      return
+    fi
+  else
+    if ! hg_status="$(hg status 2>/dev/null)"; then
+      return
+    fi
+  fi
+
   # grep exits with 0 when dirty
-  if command grep -Eq '^\s*[ACDIM!?L]' <<< "$hg_status"; then
+  if command grep -Eq '^\s*[ACDIMR!?L].*$' <<< "$hg_status"; then
     echo $ZSH_THEME_HG_PROMPT_DIRTY
     return
   fi

From c172624398918577bcb212d07b0036f4058cb5c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Tue, 30 Nov 2021 18:07:42 +0100
Subject: [PATCH 593/869] style(af-magic): fix code style and remove
 unnecessary variables

---
 themes/af-magic.zsh-theme | 61 +++++++++++++++++++--------------------
 1 file changed, 30 insertions(+), 31 deletions(-)

diff --git a/themes/af-magic.zsh-theme b/themes/af-magic.zsh-theme
index 1d2af3458..d939d546f 100644
--- a/themes/af-magic.zsh-theme
+++ b/themes/af-magic.zsh-theme
@@ -1,47 +1,46 @@
 # af-magic.zsh-theme
-# Repo: https://github.com/andyfleming/oh-my-zsh
-# Direct Link: https://github.com/andyfleming/oh-my-zsh/blob/master/themes/af-magic.zsh-theme
+#
+# Author: Andy Fleming
+# URL: http://andyfleming.com/
 
-
-# settings
-typeset +H return_code="%(?..%{$fg[red]%}%? ↵%{$reset_color%})"
-typeset +H my_gray="$FG[237]"
-typeset +H my_orange="$FG[214]"
-
-# separator dashes size
+# dashed separator size
 function afmagic_dashes {
-	local PYTHON_ENV="$VIRTUAL_ENV"
-	[[ -z "$PYTHON_ENV" ]] && PYTHON_ENV="$CONDA_DEFAULT_ENV"
+  # check either virtualenv or condaenv variables
+  local python_env="${VIRTUAL_ENV:-$CONDA_DEFAULT_ENV}"
 
-	if [[ -n "$PYTHON_ENV" && "$PS1" = \(* ]]; then
-		echo $(( COLUMNS - ${#PYTHON_ENV} - 3 ))
-	else
-		echo $COLUMNS
-	fi
+  # if there is a python virtual environment and it is displayed in
+  # the prompt, account for it when returning the number of dashes
+  if [[ -n "$python_env" && "$PS1" = \(* ]]; then
+    echo $(( COLUMNS - ${#python_env} - 3 ))
+  else
+    echo $COLUMNS
+  fi
 }
 
-# primary prompt
-PS1='$FG[237]${(l.$(afmagic_dashes)..-.)}%{$reset_color%}
-$FG[032]%~$(git_prompt_info)$(hg_prompt_info) $FG[105]%(!.#.»)%{$reset_color%} '
-PS2='%{$fg[red]%}\ %{$reset_color%}'
-RPS1='${return_code}'
+# primary prompt: dashed separator, directory and vcs info
+PS1="${FG[237]}\${(l.\$(afmagic_dashes)..-.)}%{$reset_color%}
+${FG[032]}%~\$(git_prompt_info)\$(hg_prompt_info) ${FG[105]}%(!.#.»)%{$reset_color%} "
+PS2="%{$fg[red]%}\ %{$reset_color%}"
 
-# right prompt
-(( $+functions[virtualenv_prompt_info] )) && RPS1+='$(virtualenv_prompt_info)'
-RPS1+=' $my_gray%n@%m%{$reset_color%}%'
+# right prompt: return code, virtualenv and context (user@host)
+RPS1="%(?..%{$fg[red]%}%? ↵%{$reset_color%})"
+if (( $+functions[virtualenv_prompt_info] )); then
+  RPS1+='$(virtualenv_prompt_info)'
+fi
+RPS1+=" ${FG[237]}%n@%m%{$reset_color%}"
 
 # git settings
-ZSH_THEME_GIT_PROMPT_PREFIX="$FG[075]($FG[078]"
+ZSH_THEME_GIT_PROMPT_PREFIX="${FG[075]}(${FG[078]}"
 ZSH_THEME_GIT_PROMPT_CLEAN=""
-ZSH_THEME_GIT_PROMPT_DIRTY="$my_orange*%{$reset_color%}"
-ZSH_THEME_GIT_PROMPT_SUFFIX="$FG[075])%{$reset_color%}"
+ZSH_THEME_GIT_PROMPT_DIRTY="${FG[214]}*%{$reset_color%}"
+ZSH_THEME_GIT_PROMPT_SUFFIX="${FG[075]})%{$reset_color%}"
 
 # hg settings
-ZSH_THEME_HG_PROMPT_PREFIX="$FG[075]($FG[078]"
+ZSH_THEME_HG_PROMPT_PREFIX="${FG[075]}(${FG[078]}"
 ZSH_THEME_HG_PROMPT_CLEAN=""
-ZSH_THEME_HG_PROMPT_DIRTY="$my_orange*%{$reset_color%}"
-ZSH_THEME_HG_PROMPT_SUFFIX="$FG[075])%{$reset_color%}"
+ZSH_THEME_HG_PROMPT_DIRTY="${FG[214]}*%{$reset_color%}"
+ZSH_THEME_HG_PROMPT_SUFFIX="${FG[075]})%{$reset_color%}"
 
 # virtualenv settings
-ZSH_THEME_VIRTUALENV_PREFIX=" $FG[075]["
+ZSH_THEME_VIRTUALENV_PREFIX=" ${FG[075]}["
 ZSH_THEME_VIRTUALENV_SUFFIX="]%{$reset_color%}"

From ee46d198ad94c3e4942f2557b6ecade5f9224b3e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Mon, 13 Dec 2021 11:10:47 +0100
Subject: [PATCH 594/869] style(afowler): simplify code and remove unnecessary
 variables

---
 themes/afowler.zsh-theme | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/themes/afowler.zsh-theme b/themes/afowler.zsh-theme
index 3a4753fc1..783bdc269 100644
--- a/themes/afowler.zsh-theme
+++ b/themes/afowler.zsh-theme
@@ -1,10 +1,5 @@
-if [ $UID -eq 0 ]; then CARETCOLOR="red"; else CARETCOLOR="blue"; fi
-
-local return_code="%(?..%{$fg[red]%}%? ↵%{$reset_color%})"
-
-PROMPT='%m %{${fg_bold[blue]}%}:: %{$reset_color%}%{${fg[green]}%}%3~ $(git_prompt_info)%{${fg_bold[$CARETCOLOR]}%}»%{${reset_color}%} '
-
-RPS1="${return_code}"
+PROMPT='%m %B%F{blue}:: %b%F{green}%3~ $(git_prompt_info)%B%(!.%F{red}.%F{blue})»%f%b '
+RPS1='%(?..%F{red}%? ↵%f)'
 
 ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[yellow]%}‹"
 ZSH_THEME_GIT_PROMPT_SUFFIX="› %{$reset_color%}"

From a1a63f4c7d3e765ffc4af93793d6d45287e80291 Mon Sep 17 00:00:00 2001
From: Frank Van Damme <frank.van.damme@vub.ac.be>
Date: Tue, 10 Jan 2017 09:23:49 +0100
Subject: [PATCH 595/869] feat(afowler): add mercurial support

Closes #5992
---
 themes/afowler.zsh-theme | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/themes/afowler.zsh-theme b/themes/afowler.zsh-theme
index 783bdc269..f6d3ef82a 100644
--- a/themes/afowler.zsh-theme
+++ b/themes/afowler.zsh-theme
@@ -1,5 +1,10 @@
-PROMPT='%m %B%F{blue}:: %b%F{green}%3~ $(git_prompt_info)%B%(!.%F{red}.%F{blue})»%f%b '
+PROMPT='%m %B%F{blue}:: %b%F{green}%3~ $(hg_prompt_info)$(git_prompt_info)%B%(!.%F{red}.%F{blue})»%f%b '
 RPS1='%(?..%F{red}%? ↵%f)'
 
 ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[yellow]%}‹"
 ZSH_THEME_GIT_PROMPT_SUFFIX="› %{$reset_color%}"
+
+ZSH_THEME_HG_PROMPT_PREFIX="%{$fg[magenta]%}hg:‹%{$fg[yellow]%}"
+ZSH_THEME_HG_PROMPT_SUFFIX="%{$fg[magenta]%}› %{$reset_color%}"
+ZSH_THEME_HG_PROMPT_DIRTY=" %{$fg[red]%}✗"
+ZSH_THEME_HG_PROMPT_CLEAN=""

From e96b8bd52366b526d7ebb22d947b54d286d6da61 Mon Sep 17 00:00:00 2001
From: fengkx <liangkx8237@gmail.com>
Date: Mon, 13 Dec 2021 18:26:05 +0800
Subject: [PATCH 596/869] refactor(shell-proxy)!: rename env vars to
 `SHELLPROXY_*` and add usage message (#10456)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

BREAKING CHANGE: the `DEFAULT_PROXY` setting has been renamed to `SHELLPROXY_URL`,
and `CONFIG_PROXY` has been renamed to `SHELLPROXY_CONFIG`. See the plugin README
for more information.

Co-authored-by: Marc Cornellà <hello@mcornella.com>
---
 .github/actions/spelling/expect.txt        |  1 +
 plugins/shell-proxy/README.md              | 58 +++++++++++++---------
 plugins/shell-proxy/proxy.py               | 21 +++++---
 plugins/shell-proxy/shell-proxy.plugin.zsh | 37 +++++++++++---
 4 files changed, 77 insertions(+), 40 deletions(-)

diff --git a/.github/actions/spelling/expect.txt b/.github/actions/spelling/expect.txt
index 76e9fdf31..533ae49c0 100644
--- a/.github/actions/spelling/expect.txt
+++ b/.github/actions/spelling/expect.txt
@@ -3456,6 +3456,7 @@ sheerun
 shellcheck
 shellinit
 shellperson
+SHELLPROXY
 shitload
 SHLVL
 shm
diff --git a/plugins/shell-proxy/README.md b/plugins/shell-proxy/README.md
index 6f2cd13e0..b19888c56 100644
--- a/plugins/shell-proxy/README.md
+++ b/plugins/shell-proxy/README.md
@@ -1,42 +1,56 @@
-# Shell Proxy oh-my-zsh plugin
+# shell-proxy plugin
 
-This a pure user-space program, shell-proxy setter, written Python3 and Bash.
+This a pure user-space program, shell-proxy setter, written in Python3 and Zsh.
 
-100% only no side-effects, only effect **environment variables** and **aliases**
+To use it, add `shell-proxy` to the plugins array in your zshrc file:
 
-## Key feature
+```zsh
+plugins=(... shell-proxy)
+```
 
-- Support Ubuntu, Archlinux, etc (Linux)
-- Support macOS
-- Support git via based-`$GIT_SSH`
-- Support ssh, sftp, scp, slogin and ssh-copy-id via based-`alias`
-- Built-in Auto-complete
+## Key features
+
+- Supports macOS and Linux (Ubuntu, Archlinux, etc.)
+- Supports git via setting `$GIT_SSH`
+- Supports ssh, sftp, scp, slogin and ssh-copy-id via setting aliases
+- Built-in autocomplete
 
 ## Usage
 
-Method 1:
+### Method 1
 
-`$DEFAULT_PROXY` is the proxy URL you will set
+Set `SHELLPROXY_URL` environment variable to the URL of the proxy server:
 
-Method 2:
+```sh
+SHELLPROXY_URL="http://127.0.0.1:8123"
+proxy enable
+```
 
-Write a program to `$HOME/.config/proxy` in the file.
+### Method 2
 
-Example program:
+Write a program file in `$HOME/.config/proxy` so that the proxy URL is defined dynamically.
+Note that the program file must be executable.
 
-```bash
+Example:
+
+```sh
 #!/bin/bash
-# The file path: $HOME/.config/proxy
-if [[ "$OSTYPE" == "darwin"* ]]; then
+
+if [[ "$(uname)" = Darwin ]]; then
   echo "http://127.0.0.1:6152" # Surge Mac
 else
   echo "http://127.0.0.1:8123" # polipo
 fi
 ```
 
-Method 3:
+### Method 3
 
-The working path of **Method 2** can be changed via `$CONFIG_PROXY`
+Use [method 2](#method-2) but define the location of the program file by setting the
+`SHELLPROXY_CONFIG` environment variable:
+
+```sh
+SHELLPROXY_CONFIG="$HOME/.dotfiles/proxy-config"
+```
 
 ## Reference
 
@@ -45,8 +59,4 @@ The working path of **Method 2** can be changed via `$CONFIG_PROXY`
 
 ## Maintainer
 
-- <https://github.com/septs>
-
-## The oh-my-zsh plugin (shell-proxy)
-
-Public Domain
+- [@septs](https://github.com/septs)
diff --git a/plugins/shell-proxy/proxy.py b/plugins/shell-proxy/proxy.py
index 97f4cf873..14f2944cc 100755
--- a/plugins/shell-proxy/proxy.py
+++ b/plugins/shell-proxy/proxy.py
@@ -5,16 +5,22 @@ from subprocess import check_output, list2cmdline
 
 cwd = os.path.dirname(__file__)
 ssh_agent = os.path.join(cwd, "ssh-agent.py")
-user_proxy = os.environ.get("CONFIG_PROXY", os.path.expandvars("$HOME/.config/proxy"))
+proxy_env = "SHELLPROXY_URL"
+proxy_config = os.environ.get("SHELLPROXY_CONFIG") or os.path.expandvars("$HOME/.config/proxy")
 
+usage="""shell-proxy: no proxy configuration found.
+
+Set `{env}` or create a config file at `{config}`
+See the plugin README for more information.""".format(env=proxy_env, config=proxy_config)
 
 def get_http_proxy():
-    default_proxy = os.environ.get("DEFAULT_PROXY")
+    default_proxy = os.environ.get(proxy_env)
     if default_proxy:
         return default_proxy
-    if os.path.isfile(user_proxy):
-        return check_output(user_proxy).decode("utf-8").strip()
-    raise Exception("Not found, Proxy configuration")
+    if os.path.isfile(proxy_config):
+        return check_output(proxy_config).decode("utf-8").strip()
+    print(usage, file=sys.stderr)
+    sys.exit(1)
 
 
 def make_proxies(url: str):
@@ -53,8 +59,7 @@ class CommandSet:
             cmdline("echo", _)
 
     def usage(self):
-        cmdline("echo", "usage: proxy {enable,disable,status}")
-        self.status()
+        print("usage: proxy {enable,disable,status}", file=sys.stderr)
 
 
 def cmdline(*items):
@@ -65,7 +70,7 @@ def main():
     command = CommandSet()
     if len(sys.argv) == 1:
         command.usage()
-        sys.exit(-1)
+        sys.exit(1)
     getattr(command, sys.argv[1], command.usage)()
 
 
diff --git a/plugins/shell-proxy/shell-proxy.plugin.zsh b/plugins/shell-proxy/shell-proxy.plugin.zsh
index 315ade665..9d45b5269 100644
--- a/plugins/shell-proxy/shell-proxy.plugin.zsh
+++ b/plugins/shell-proxy/shell-proxy.plugin.zsh
@@ -1,16 +1,37 @@
 #!/usr/bin/bash
-# shellcheck disable=SC1090
-
-__PROXY__="${0:A:h}/proxy.py"
+# shellcheck disable=SC1090,SC2154
 
 proxy() {
-	source <(env "DEFAULT_PROXY=$DEFAULT_PROXY" "$__PROXY__" "$1")
+  # deprecate $DEFAULT_PROXY, use SHELLPROXY_URL instead
+  if [[ -n "$DEFAULT_PROXY" && -z "$SHELLPROXY_URL" ]]; then
+    echo >&2 "proxy: DEFAULT_PROXY is deprecated, use SHELLPROXY_URL instead"
+    SHELLPROXY_URL="$DEFAULT_PROXY"
+    unset DEFAULT_PROXY
+  fi
+
+  # deprecate CONFIG_PROXY, use SHELLPROXY_CONFIG instead
+  if [[ -n "$CONFIG_PROXY" && -z "$SHELLPROXY_CONFIG" ]]; then
+    echo >&2 "proxy: CONFIG_PROXY is deprecated, use SHELLPROXY_CONFIG instead"
+    SHELLPROXY_CONFIG="$CONFIG_PROXY"
+    unset CONFIG_PROXY
+  fi
+
+  # the proxy.py script is in the same directory as this function
+  local proxy="${functions_source[$0]:A:h}/proxy.py"
+
+  # capture the output of the proxy script and bail out if it fails
+  local output
+  output="$(SHELLPROXY_URL="$SHELLPROXY_URL" SHELLPROXY_CONFIG="$SHELLPROXY_CONFIG" "$proxy" "$1")" ||
+    return $?
+
+  # evaluate the output generated by the proxy script
+  source <(echo "$output")
 }
 
 _proxy() {
-	local -r commands=('enable' 'disable' 'status')
-	compset -P '*,'
-	compadd -S '' "${commands[@]}"
+  local -r commands=('enable' 'disable' 'status')
+  compset -P '*,'
+  compadd -S '' "${commands[@]}"
 }
 
-compdef '_proxy' 'proxy'
+compdef _proxy proxy

From 428f815169ea8ff4918cff41d8ab68fe9d9c0c7a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Tue, 30 Nov 2021 17:43:36 +0100
Subject: [PATCH 597/869] fix(lib): %-quote git prompt functions

---
 lib/git.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/git.zsh b/lib/git.zsh
index 8623473b0..62aac8f39 100644
--- a/lib/git.zsh
+++ b/lib/git.zsh
@@ -29,7 +29,7 @@ function git_prompt_info() {
     && upstream=" -> ${upstream}"
   fi
 
-  echo "${ZSH_THEME_GIT_PROMPT_PREFIX}${ref}${upstream}$(parse_git_dirty)${ZSH_THEME_GIT_PROMPT_SUFFIX}"
+  echo "${ZSH_THEME_GIT_PROMPT_PREFIX}${ref:gs/%/%%}${upstream:gs/%/%%}$(parse_git_dirty)${ZSH_THEME_GIT_PROMPT_SUFFIX}"
 }
 
 # Checks if working tree is dirty

From a94e263426bdf6e05cdfa9fae5e80cec5ee8d9ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Tue, 30 Nov 2021 17:37:29 +0100
Subject: [PATCH 598/869] refactor(adben): simplify used variables and %-quote
 prompt functions

Closes #10474

Co-authored-by: Tom Payne <twpayne@gmail.com>
---
 .github/actions/spelling/expect.txt |   1 -
 themes/adben.zsh-theme              | 106 +++++++++++++---------------
 2 files changed, 49 insertions(+), 58 deletions(-)

diff --git a/.github/actions/spelling/expect.txt b/.github/actions/spelling/expect.txt
index 533ae49c0..65215c6c3 100644
--- a/.github/actions/spelling/expect.txt
+++ b/.github/actions/spelling/expect.txt
@@ -3688,7 +3688,6 @@ Subsubcommands
 Subsubsubcommands
 sudo
 sudoedit
-SUFIX
 suitenames
 sunaku
 sunion
diff --git a/themes/adben.zsh-theme b/themes/adben.zsh-theme
index ebdec7c82..ddb34236b 100644
--- a/themes/adben.zsh-theme
+++ b/themes/adben.zsh-theme
@@ -32,42 +32,44 @@
 
 ########## COLOR ###########
 for COLOR in CYAN WHITE YELLOW MAGENTA BLACK BLUE RED DEFAULT GREEN GREY; do
-  eval PR_$COLOR='%{$fg[${(L)COLOR}]%}'
-  eval PR_BRIGHT_$COLOR='%{$fg_bold[${(L)COLOR}]%}'
+  print -v "PR_$COLOR" "%b%{$fg[${(L)COLOR}]%}"
+  print -v "PR_BRIGHT_$COLOR" "%B%{$fg[${(L)COLOR}]%}"
 done
-
 PR_RESET="%{$reset_color%}"
-RED_START="${PR_RESET}${PR_GREY}<${PR_RESET}${PR_RED}<${PR_BRIGHT_RED}<${PR_RESET} "
-RED_END="${PR_RESET}${PR_BRIGHT_RED}>${PR_RESET}${PR_RED}>${PR_GREY}>${PR_RESET} "
-GREEN_END="${PR_RESET}${PR_BRIGHT_GREEN}>${PR_RESET}${PR_GREEN}>${PR_GREY}>${PR_RESET} "
-GREEN_BASE_START="${PR_RESET}${PR_GREY}>${PR_RESET}${PR_GREEN}>${PR_BRIGHT_GREEN}>${PR_RESET}"
-GREEN_START_P1="${PR_RESET}${GREEN_BASE_START}${PR_RESET} "
-DIVISION="${PR_RESET}${PR_RED} < ${PR_RESET}"
-VCS_DIRTY_COLOR="${PR_RESET}${PR_YELLOW}"
-VCS_CLEAN_COLOR="${PR_RESET}${PR_GREEN}"
-VCS_SUFIX_COLOR="${PR_RESET}${PR_RED}› ${PR_RESET}"
+
+RED_START="${PR_GREY}<${PR_RED}<${PR_BRIGHT_RED}<${PR_RESET} "
+RED_END="${PR_BRIGHT_RED}>${PR_RED}>${PR_GREY}>${PR_RESET} "
+GREEN_START="${PR_GREY}>${PR_GREEN}>${PR_BRIGHT_GREEN}>${PR_RESET}"
+GREEN_END="${PR_BRIGHT_GREEN}>${PR_GREEN}>${PR_GREY}>${PR_RESET} "
+
+########## VCS ###########
+VCS_DIRTY_COLOR="${PR_YELLOW}"
+VCS_CLEAN_COLOR="${PR_GREEN}"
+VCS_SUFFIX_COLOR="${PR_RED}› ${PR_RESET}"
 
 ########## SVN ###########
-ZSH_THEME_SVN_PROMPT_PREFIX="${PR_RESET}${PR_RED}‹svn:"
-ZSH_THEME_SVN_PROMPT_SUFFIX=""
-ZSH_THEME_SVN_PROMPT_DIRTY="${VCS_DIRTY_COLOR} ✘${VCS_SUFIX_COLOR}"
-ZSH_THEME_SVN_PROMPT_CLEAN="${VCS_CLEAN_COLOR} ✔${VCS_SUFIX_COLOR}"
+ZSH_THEME_SVN_PROMPT_PREFIX="${PR_RED}‹svn:"
+ZSH_THEME_SVN_PROMPT_SUFFIX="${VCS_SUFFIX_COLOR}"
+ZSH_THEME_SVN_PROMPT_DIRTY="${VCS_DIRTY_COLOR} ✘"
+ZSH_THEME_SVN_PROMPT_CLEAN="${VCS_CLEAN_COLOR} ✔"
 
 ########## GIT ###########
-ZSH_THEME_GIT_PROMPT_PREFIX="${PR_RESET}${PR_RED}‹git:"
-ZSH_THEME_GIT_PROMPT_SUFFIX=""
-ZSH_THEME_GIT_PROMPT_DIRTY="${VCS_DIRTY_COLOR} ✘${VCS_SUFIX_COLOR}"
-ZSH_THEME_GIT_PROMPT_CLEAN="${VCS_CLEAN_COLOR} ✔${VCS_SUFIX_COLOR}"
-ZSH_THEME_GIT_PROMPT_ADDED="${PR_RESET}${PR_YELLOW} ✚${PR_RESET}"
-ZSH_THEME_GIT_PROMPT_MODIFIED="${PR_RESET}${PR_YELLOW} ✹${PR_RESET}"
-ZSH_THEME_GIT_PROMPT_DELETED="${PR_RESET}${PR_YELLOW} ✖${PR_RESET}"
-ZSH_THEME_GIT_PROMPT_RENAMED="${PR_RESET}${PR_YELLOW} ➜${PR_RESET}"
-ZSH_THEME_GIT_PROMPT_UNMERGED="${PR_RESET}${PR_YELLOW} ═${PR_RESET}"
-ZSH_THEME_GIT_PROMPT_UNTRACKED="${PR_RESET}${PR_YELLOW} ✭${PR_RESET}"
+ZSH_THEME_GIT_PROMPT_PREFIX="${PR_RED}‹git:"
+ZSH_THEME_GIT_PROMPT_SUFFIX="${VCS_SUFFIX_COLOR}"
+ZSH_THEME_GIT_PROMPT_DIRTY="${VCS_DIRTY_COLOR} ✘"
+ZSH_THEME_GIT_PROMPT_CLEAN="${VCS_CLEAN_COLOR} ✔"
+ZSH_THEME_GIT_PROMPT_ADDED="${PR_YELLOW} ✚"
+ZSH_THEME_GIT_PROMPT_MODIFIED="${PR_YELLOW} ✹"
+ZSH_THEME_GIT_PROMPT_DELETED="${PR_YELLOW} ✖"
+ZSH_THEME_GIT_PROMPT_RENAMED="${PR_YELLOW} ➜"
+ZSH_THEME_GIT_PROMPT_UNMERGED="${PR_YELLOW} ═"
+ZSH_THEME_GIT_PROMPT_UNTRACKED="${PR_YELLOW} ✭"
 
 # Get a fortune quote
 ps1_fortune() {
-  (( ${+commands[fortune]} )) && fortune
+  if (( ${+commands[fortune]} )); then
+    fortune
+  fi
 }
 
 # Obtain a command tip
@@ -77,33 +79,27 @@ ps1_command_tip() {
       command wget -qO- https://www.commandlinefu.com/commands/random/plaintext
     elif (( ${+commands[curl]} )); then
       command curl -fsL https://www.commandlinefu.com/commands/random/plaintext
-    fi
-  } | sed 1d | sed '/^$/d'
+    fi 
+  } | sed '1d;/^$/d'
 }
 
-function precmd_adben {
-  prompt_header() {
-    if [[ "$ENABLE_COMMAND_TIP" = true ]]; then
-      ps1_command_tip
-    else
-      ps1_fortune
-    fi
-  }
+# Show prompt header (fortune / command tip)
+prompt_header() {
+  local header=$(
+    case "${ENABLE_COMMAND_TIP:-}" in
+    true) ps1_command_tip ;;
+    *) ps1_fortune ;;
+    esac
+  )
 
-  PROMPT_HEAD="${RED_START}${PR_YELLOW}$(prompt_header)${PR_RESET}"
-
-  # set a simple variable to show when in screen
-  if [[ -n "${WINDOW}" ]]; then
-    SCREEN=""
-  fi
+  # Make sure to quote % so that they're not expanded by the prompt
+  echo -n "${header:gs/%/%%}"
 }
 
 # Context: user@directory or just directory
 prompt_context() {
   if [[ "$USERNAME" != "$DEFAULT_USER" || -n "$SSH_CLIENT" ]]; then
-    echo -n "${PR_RESET}${PR_RED}$USERNAME@%m${PR_RESET}${PR_BRIGHT_YELLOW}%~%<<${PR_RESET}"
-  else
-    echo -n "${PR_RESET}${PR_BRIGHT_YELLOW}%~%<<${PR_RESET}"
+    echo -n "${PR_RESET}${PR_RED}%n@%m"
   fi
 }
 
@@ -111,16 +107,12 @@ prompt_context() {
 
 # Required for the prompt
 setopt prompt_subst
-autoload zsh/terminfo
 
-# Prompt
-PROMPT='${PROMPT_HEAD}
-${RED_START}$(prompt_context)
-${GREEN_START_P1}'
-RPROMPT='${PR_RESET}$(git_prompt_info)$(svn_prompt_info)${PR_YELLOW}%D{%R.%S %a %b %d %Y} ${GREEN_END}${PR_RESET}'
+# Prompt: header, context (user@host), directory
+PROMPT="${RED_START}${PR_YELLOW}\$(prompt_header)${PR_RESET}
+${RED_START}\$(prompt_context)${PR_BRIGHT_YELLOW}%~${PR_RESET}
+${GREEN_START} "
+# Right prompt: vcs status + time
+RPROMPT="\$(git_prompt_info)\$(svn_prompt_info)${PR_YELLOW}%D{%R.%S %a %b %d %Y} ${GREEN_END}"
 # Matching continuation prompt
-PROMPT2='${GREEN_BASE_START}${PR_RESET} %_ ${GREEN_BASE_START}${PR_RESET} '
-
-# Prompt head
-autoload -Uz add-zsh-hook
-add-zsh-hook precmd precmd_adben
+PROMPT2="${GREEN_START} %_ ${GREEN_START} "

From 1b01496c21e9ca7ef79d6a1dcb4728abd7a2803a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Mon, 13 Dec 2021 14:42:57 +0100
Subject: [PATCH 599/869] fix(bira): fix color bleed in user_host prompt
 section (#10505)

Fixes #10505
---
 themes/bira.zsh-theme | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/themes/bira.zsh-theme b/themes/bira.zsh-theme
index 4a05bf3bb..42a70a018 100644
--- a/themes/bira.zsh-theme
+++ b/themes/bira.zsh-theme
@@ -1,5 +1,5 @@
 local return_code="%(?..%{$fg[red]%}%? ↵%{$reset_color%})"
-local user_host="%B%(!.%F{red}.%F{green})%n@%m %{$reset_color%}"
+local user_host="%B%(!.%{$fg[red]%}.%{$fg[green]%})%n@%m%{$reset_color%} "
 local user_symbol='%(!.#.$)'
 local current_dir="%B%{$fg[blue]%}%~ %{$reset_color%}"
 

From 065e8ebdd02ba2554d4509424f1cde0e84361357 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Mon, 13 Dec 2021 15:13:43 +0100
Subject: [PATCH 600/869] style(jonathan): fix code style in jonathan theme

---
 themes/jonathan.zsh-theme | 255 +++++++++++++++++---------------------
 themes/simonoff.zsh-theme | 134 ++++++++++----------
 2 files changed, 178 insertions(+), 211 deletions(-)

diff --git a/themes/jonathan.zsh-theme b/themes/jonathan.zsh-theme
index 2f0e77431..2c5f30060 100644
--- a/themes/jonathan.zsh-theme
+++ b/themes/jonathan.zsh-theme
@@ -1,153 +1,124 @@
-functions rbenv_prompt_info >& /dev/null || rbenv_prompt_info(){}
-
 function theme_precmd {
-    local TERMWIDTH
-    (( TERMWIDTH = ${COLUMNS} - 1 ))
+  local -i TERMWIDTH=$COLUMNS
 
+  PR_FILLBAR=""
+  PR_PWDLEN=""
 
-    ###
-    # Truncate the path if it's too long.
-
-    PR_FILLBAR=""
-    PR_PWDLEN=""
-
-    local promptsize=${#${(%):---(%n@%m:%l)---()--}}
-    local rubyprompt=`rvm_prompt_info || rbenv_prompt_info`
-    local rubypromptsize=${#${rubyprompt}}
-    local pwdsize=${#${(%):-%~}}
-
-    if [[ "$promptsize + $rubypromptsize + $pwdsize" -gt $TERMWIDTH ]]; then
-      ((PR_PWDLEN=$TERMWIDTH - $promptsize))
-    else
-      PR_FILLBAR="\${(l.(($TERMWIDTH - ($promptsize + $rubypromptsize + $pwdsize)))..${PR_HBAR}.)}"
-    fi
+  local promptsize=${#${(%):---(%n@%m:%l)---()--}}
+  local rubypromptsize=${#${(%)$(ruby_prompt_info)}}
+  local pwdsize=${#${(%):-%~}}
 
+  # Truncate the path if it's too long.
+  if (( promptsize + rubypromptsize + pwdsize > TERMWIDTH )); then
+    (( PR_PWDLEN = TERMWIDTH - promptsize ))
+  else
+    PR_FILLBAR="\${(l.(($TERMWIDTH - ($promptsize + $rubypromptsize + $pwdsize)))..${PR_HBAR}.)}"
+  fi
 }
 
-
-setopt extended_glob
-theme_preexec () {
-    if [[ "$TERM" == "screen" ]]; then
-	local CMD=${1[(wr)^(*=*|sudo|-*)]}
-	echo -n "\ek$CMD\e\\"
-    fi
+function theme_preexec {
+  setopt local_options extended_glob
+  if [[ "$TERM" = "screen" ]]; then
+    local CMD=${1[(wr)^(*=*|sudo|-*)]}
+    echo -n "\ek$CMD\e\\"
+  fi
 }
 
-
-setprompt () {
-    ###
-    # Need this so the prompt will work.
-
-    setopt prompt_subst
-
-
-    ###
-    # See if we can use colors.
-
-    autoload zsh/terminfo
-    for color in RED GREEN YELLOW BLUE MAGENTA CYAN WHITE GREY; do
-	eval PR_$color='%{$terminfo[bold]$fg[${(L)color}]%}'
-	eval PR_LIGHT_$color='%{$fg[${(L)color}]%}'
-	(( count = $count + 1 ))
-    done
-    PR_NO_COLOUR="%{$terminfo[sgr0]%}"
-
-    ###
-    # Modify Git prompt
-    ZSH_THEME_GIT_PROMPT_PREFIX=" on %{$fg[green]%}"
-    ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}"
-    ZSH_THEME_GIT_PROMPT_DIRTY=""
-    ZSH_THEME_GIT_PROMPT_CLEAN=""
-
-    ZSH_THEME_GIT_PROMPT_ADDED="%{$fg[green]%} ✚"
-    ZSH_THEME_GIT_PROMPT_MODIFIED="%{$fg[blue]%} ✹"
-    ZSH_THEME_GIT_PROMPT_DELETED="%{$fg[red]%} ✖"
-    ZSH_THEME_GIT_PROMPT_RENAMED="%{$fg[magenta]%} ➜"
-    ZSH_THEME_GIT_PROMPT_UNMERGED="%{$fg[yellow]%} ═"
-    ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$fg[cyan]%} ✭"
-
-    ###
-    # See if we can use extended characters to look nicer.
-    # UTF-8 Fixed
-
-    if [[ $(locale charmap) == "UTF-8" ]]; then
-	PR_SET_CHARSET=""
-	PR_SHIFT_IN=""
-	PR_SHIFT_OUT=""
-	PR_HBAR="─"
-        PR_ULCORNER="┌"
-        PR_LLCORNER="└"
-        PR_LRCORNER="┘"
-        PR_URCORNER="┐"
-    else
-        typeset -A altchar
-        set -A altchar ${(s..)terminfo[acsc]}
-        # Some stuff to help us draw nice lines
-        PR_SET_CHARSET="%{$terminfo[enacs]%}"
-        PR_SHIFT_IN="%{$terminfo[smacs]%}"
-        PR_SHIFT_OUT="%{$terminfo[rmacs]%}"
-        PR_HBAR='$PR_SHIFT_IN${altchar[q]:--}$PR_SHIFT_OUT'
-        PR_ULCORNER='$PR_SHIFT_IN${altchar[l]:--}$PR_SHIFT_OUT'
-        PR_LLCORNER='$PR_SHIFT_IN${altchar[m]:--}$PR_SHIFT_OUT'
-        PR_LRCORNER='$PR_SHIFT_IN${altchar[j]:--}$PR_SHIFT_OUT'
-        PR_URCORNER='$PR_SHIFT_IN${altchar[k]:--}$PR_SHIFT_OUT'
-     fi
-
-
-    ###
-    # Decide if we need to set titlebar text.
-
-    case $TERM in
-	xterm*)
-	    PR_TITLEBAR=$'%{\e]0;%(!.-=*[ROOT]*=- | .)%n@%m:%~ | ${COLUMNS}x${LINES} | %y\a%}'
-	    ;;
-	screen)
-	    PR_TITLEBAR=$'%{\e_screen \005 (\005t) | %(!.-=[ROOT]=- | .)%n@%m:%~ | ${COLUMNS}x${LINES} | %y\e\\%}'
-	    ;;
-	*)
-	    PR_TITLEBAR=''
-	    ;;
-    esac
-
-
-    ###
-    # Decide whether to set a screen title
-    if [[ "$TERM" == "screen" ]]; then
-	PR_STITLE=$'%{\ekzsh\e\\%}'
-    else
-	PR_STITLE=''
-    fi
-
-
-    ###
-    # Finally, the prompt.
-
-    PROMPT='$PR_SET_CHARSET$PR_STITLE${(e)PR_TITLEBAR}\
-$PR_CYAN$PR_ULCORNER$PR_HBAR$PR_GREY(\
-$PR_GREEN%$PR_PWDLEN<...<%~%<<\
-$PR_GREY)`rvm_prompt_info || rbenv_prompt_info`$PR_CYAN$PR_HBAR$PR_HBAR${(e)PR_FILLBAR}$PR_HBAR$PR_GREY(\
-$PR_CYAN%(!.%SROOT%s.%n)$PR_GREY@$PR_GREEN%m:%l\
-$PR_GREY)$PR_CYAN$PR_HBAR$PR_URCORNER\
-
-$PR_CYAN$PR_LLCORNER$PR_BLUE$PR_HBAR(\
-$PR_YELLOW%D{%H:%M:%S}\
-$PR_LIGHT_BLUE%{$reset_color%}`git_prompt_info``git_prompt_status`$PR_BLUE)$PR_CYAN$PR_HBAR\
-$PR_HBAR\
->$PR_NO_COLOUR '
-
-    # display exitcode on the right when >0
-    return_code="%(?..%{$fg[red]%}%? ↵ %{$reset_color%})"
-    RPROMPT=' $return_code$PR_CYAN$PR_HBAR$PR_BLUE$PR_HBAR\
-($PR_YELLOW%D{%a,%b%d}$PR_BLUE)$PR_HBAR$PR_CYAN$PR_LRCORNER$PR_NO_COLOUR'
-
-    PS2='$PR_CYAN$PR_HBAR\
-$PR_BLUE$PR_HBAR(\
-$PR_LIGHT_GREEN%_$PR_BLUE)$PR_HBAR\
-$PR_CYAN$PR_HBAR$PR_NO_COLOUR '
-}
-
-setprompt
-
 autoload -U add-zsh-hook
 add-zsh-hook precmd  theme_precmd
 add-zsh-hook preexec theme_preexec
+
+
+# Set the prompt
+
+# Need this so the prompt will work.
+setopt prompt_subst
+
+# See if we can use colors.
+autoload zsh/terminfo
+for color in RED GREEN YELLOW BLUE MAGENTA CYAN WHITE GREY; do
+  print -v "PR_$color" "%{$terminfo[bold]$fg[${(L)color}]%}"
+  print -v "PR_LIGHT_$color" "%{$fg[${(L)color}]%}"
+done
+PR_NO_COLOUR="%{$terminfo[sgr0]%}"
+
+# Modify Git prompt
+ZSH_THEME_GIT_PROMPT_PREFIX=" on %{$fg[green]%}"
+ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}"
+ZSH_THEME_GIT_PROMPT_DIRTY=""
+ZSH_THEME_GIT_PROMPT_CLEAN=""
+
+ZSH_THEME_GIT_PROMPT_ADDED="%{$fg[green]%} ✚"
+ZSH_THEME_GIT_PROMPT_MODIFIED="%{$fg[blue]%} ✹"
+ZSH_THEME_GIT_PROMPT_DELETED="%{$fg[red]%} ✖"
+ZSH_THEME_GIT_PROMPT_RENAMED="%{$fg[magenta]%} ➜"
+ZSH_THEME_GIT_PROMPT_UNMERGED="%{$fg[yellow]%} ═"
+ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$fg[cyan]%} ✭"
+
+# Use extended characters to look nicer if supported.
+if [[ "${langinfo[CODESET]}" = "UTF-8" ]]; then
+  PR_SET_CHARSET=""
+  PR_SHIFT_IN=""
+  PR_SHIFT_OUT=""
+  PR_HBAR="─"
+  PR_ULCORNER="┌"
+  PR_LLCORNER="└"
+  PR_LRCORNER="┘"
+  PR_URCORNER="┐"
+else
+  typeset -A altchar
+  set -A altchar ${(s..)terminfo[acsc]}
+  # Some stuff to help us draw nice lines
+  PR_SET_CHARSET="%{$terminfo[enacs]%}"
+  PR_SHIFT_IN="%{$terminfo[smacs]%}"
+  PR_SHIFT_OUT="%{$terminfo[rmacs]%}"
+  PR_HBAR='$PR_SHIFT_IN${altchar[q]:--}$PR_SHIFT_OUT'
+  PR_ULCORNER='$PR_SHIFT_IN${altchar[l]:--}$PR_SHIFT_OUT'
+  PR_LLCORNER='$PR_SHIFT_IN${altchar[m]:--}$PR_SHIFT_OUT'
+  PR_LRCORNER='$PR_SHIFT_IN${altchar[j]:--}$PR_SHIFT_OUT'
+  PR_URCORNER='$PR_SHIFT_IN${altchar[k]:--}$PR_SHIFT_OUT'
+  fi
+
+# Decide if we need to set titlebar text.
+case $TERM in
+  xterm*)
+    PR_TITLEBAR=$'%{\e]0;%(!.-=*[ROOT]*=- | .)%n@%m:%~ | ${COLUMNS}x${LINES} | %y\a%}'
+    ;;
+  screen)
+    PR_TITLEBAR=$'%{\e_screen \005 (\005t) | %(!.-=[ROOT]=- | .)%n@%m:%~ | ${COLUMNS}x${LINES} | %y\e\\%}'
+    ;;
+  *)
+    PR_TITLEBAR=""
+    ;;
+esac
+
+# Decide whether to set a screen title
+if [[ "$TERM" = "screen" ]]; then
+  PR_STITLE=$'%{\ekzsh\e\\%}'
+else
+  PR_STITLE=""
+fi
+
+# Finally, the prompt.
+PROMPT='${PR_SET_CHARSET}${PR_STITLE}${(e)PR_TITLEBAR}\
+${PR_CYAN}${PR_ULCORNER}${PR_HBAR}${PR_GREY}(\
+${PR_GREEN}%${PR_PWDLEN}<...<%~%<<\
+${PR_GREY})$(ruby_prompt_info)${PR_CYAN}${PR_HBAR}${PR_HBAR}${(e)PR_FILLBAR}${PR_HBAR}${PR_GREY}(\
+${PR_CYAN}%(!.%SROOT%s.%n)${PR_GREY}@${PR_GREEN}%m:%l\
+${PR_GREY})${PR_CYAN}${PR_HBAR}${PR_URCORNER}\
+
+${PR_CYAN}${PR_LLCORNER}${PR_BLUE}${PR_HBAR}(\
+${PR_YELLOW}%D{%H:%M:%S}\
+${PR_LIGHT_BLUE}%{$reset_color%}$(git_prompt_info)$(git_prompt_status)${PR_BLUE})${PR_CYAN}${PR_HBAR}\
+${PR_HBAR}\
+>${PR_NO_COLOUR} '
+
+# display exitcode on the right when > 0
+return_code="%(?..%{$fg[red]%}%? ↵ %{$reset_color%})"
+RPROMPT=' $return_code${PR_CYAN}${PR_HBAR}${PR_BLUE}${PR_HBAR}\
+(${PR_YELLOW}%D{%a,%b%d}${PR_BLUE})${PR_HBAR}${PR_CYAN}${PR_LRCORNER}${PR_NO_COLOUR}'
+
+PS2='${PR_CYAN}${PR_HBAR}\
+${PR_BLUE}${PR_HBAR}(\
+${PR_LIGHT_GREEN}%_${PR_BLUE})${PR_HBAR}\
+${PR_CYAN}${PR_HBAR}${PR_NO_COLOUR} '
diff --git a/themes/simonoff.zsh-theme b/themes/simonoff.zsh-theme
index ef91c5ee3..fea2eff42 100644
--- a/themes/simonoff.zsh-theme
+++ b/themes/simonoff.zsh-theme
@@ -10,46 +10,46 @@
 # 40=black 41=red 42=green 43=yellow 44=blue 45=magenta 46=cyan 47=white
 function precmd {
 
-    local TERMWIDTH
-    (( TERMWIDTH = ${COLUMNS} - 1 ))
+  local TERMWIDTH
+  (( TERMWIDTH = ${COLUMNS} - 1 ))
 
 
-    ###
-    # Truncate the path if it's too long.
+  ###
+  # Truncate the path if it's too long.
 
-    PR_FILLBAR=""
-    PR_PWDLEN=""
+  PR_FILLBAR=""
+  PR_PWDLEN=""
 
-    local promptsize=${#${(%):---(%n@%M:%l)---()}}
-    local pwdsize=${#${(%):-%~}}
-    local gitbranch="$(git_prompt_info)"
-    local rvmprompt="$(ruby_prompt_info)"
-    local gitbranchsize=${#${gitbranch:-''}}
-    local rvmpromptsize=${#${rvmprompt:-''}}
+  local promptsize=${#${(%):---(%n@%M:%l)---()}}
+  local pwdsize=${#${(%):-%~}}
+  local gitbranch="$(git_prompt_info)"
+  local rvmprompt="$(ruby_prompt_info)"
+  local gitbranchsize=${#${gitbranch:-''}}
+  local rvmpromptsize=${#${rvmprompt:-''}}
 
-    if [[ "$promptsize + $pwdsize + $rvmpromptsize + $gitbranchsize" -gt $TERMWIDTH ]]; then
-        ((PR_PWDLEN=$TERMWIDTH - $promptsize))
-    else
-        PR_FILLBAR="\${(l.(($TERMWIDTH - ($promptsize + $pwdsize + $rvmpromptsize + $gitbranchsize)))..${PR_SPACE}.)}"
-    fi
+  if [[ "$promptsize + $pwdsize + $rvmpromptsize + $gitbranchsize" -gt $TERMWIDTH ]]; then
+    ((PR_PWDLEN=$TERMWIDTH - $promptsize))
+  else
+    PR_FILLBAR="\${(l.(($TERMWIDTH - ($promptsize + $pwdsize + $rvmpromptsize + $gitbranchsize)))..${PR_SPACE}.)}"
+  fi
 }
 
 
 setopt extended_glob
 
 preexec () {
-    if [[ "$TERM" == "screen" ]]; then
-        local CMD=${1[(wr)^(*=*|sudo|-*)]}
-        echo -n "\ek$CMD\e\\"
-    fi
+  if [[ "$TERM" == "screen" ]]; then
+    local CMD=${1[(wr)^(*=*|sudo|-*)]}
+    echo -n "\ek$CMD\e\\"
+  fi
 
-    if [[ "$TERM" == "xterm" ]]; then
-        print -Pn "\e]0;$1\a"
-    fi
+  if [[ "$TERM" == "xterm" ]]; then
+    print -Pn "\e]0;$1\a"
+  fi
 
-    if [[ "$TERM" == "rxvt" ]]; then
-        print -Pn "\e]0;$1\a"
-    fi
+  if [[ "$TERM" == "rxvt" ]]; then
+    print -Pn "\e]0;$1\a"
+  fi
 
 }
 
@@ -57,71 +57,67 @@ setprompt () {
 ###
 # Need this so the prompt will work.
 
-    setopt prompt_subst
+  setopt prompt_subst
 
 
 ###
 # See if we can use colors.
 
-    autoload zsh/terminfo
-    for color in RED GREEN YELLOW BLUE MAGENTA CYAN WHITE; do
-    eval PR_$color='%{$terminfo[bold]$fg[${(L)color}]%}'
-    eval PR_LIGHT_$color='%{$fg[${(L)color}]%}'
-    (( count = $count + 1 ))
-    done
-    PR_NO_COLOUR="%{$terminfo[sgr0]%}"
+  autoload zsh/terminfo
+  for color in RED GREEN YELLOW BLUE MAGENTA CYAN WHITE; do
+  eval PR_$color='%{$terminfo[bold]$fg[${(L)color}]%}'
+  eval PR_LIGHT_$color='%{$fg[${(L)color}]%}'
+  (( count = $count + 1 ))
+  done
+  PR_NO_COLOUR="%{$terminfo[sgr0]%}"
 
 
 ###
 # See if we can use extended characters to look nicer.
+  PR_HBAR=${altchar[q]:--}
+  PR_ULCORNER=${altchar[l]:--}
+  PR_LLCORNER=${altchar[m]:--}
+  PR_LRCORNER=${altchar[j]:--}
+  PR_URCORNER=${altchar[k]:--}
 
-    typeset -A altchar
-#    set -A altchar "${(s..)terminfo[acsc]}"
-    PR_SET_CHARSET="%{$terminfo[enacs]%}"
-    PR_HBAR=${altchar[q]:--}
-    PR_ULCORNER=${altchar[l]:--}
-    PR_LLCORNER=${altchar[m]:--}
-    PR_LRCORNER=${altchar[j]:--}
-    PR_URCORNER=${altchar[k]:--}
-
-    ###
-    # Modify Git prompt
-    ZSH_THEME_GIT_PROMPT_PREFIX=" ["
-    ZSH_THEME_GIT_PROMPT_SUFFIX="]"
-    ###
-    # Modify RVM prompt
-    ZSH_THEME_RUBY_PROMPT_PREFIX=" ["
-    ZSH_THEME_RUBY_PROMPT_SUFFIX="]"
+  ###
+  # Modify Git prompt
+  ZSH_THEME_GIT_PROMPT_PREFIX=" ["
+  ZSH_THEME_GIT_PROMPT_SUFFIX="]"
+  ###
+  # Modify RVM prompt
+  ZSH_THEME_RUBY_PROMPT_PREFIX=" ["
+  ZSH_THEME_RUBY_PROMPT_SUFFIX="]"
 
 
 ###
 # Decide if we need to set titlebar text.
 
-    case $TERM in
-    xterm*|*rxvt*)
-        PR_TITLEBAR=$'%{\e]0;%(!.-=*[ROOT]*=- | .)%n@%M:%~ $(git_prompt_info) $(rvm_prompt_info) | ${COLUMNS}x${LINES} | %y\a%}'
-        ;;
-    screen)
-        PR_TITLEBAR=$'%{\e_screen \005 (\005t) | %(!.-=[ROOT]=- | .)%n@%m:%~ | ${COLUMNS}x${LINES} | %y\e\\%}'
-        ;;
-    *)
-        PR_TITLEBAR=''
-        ;;
-    esac
+  case $TERM in
+  xterm*|*rxvt*)
+    PR_TITLEBAR=$'%{\e]0;%(!.-=*[ROOT]*=- | .)%n@%M:%~ $(git_prompt_info) $(rvm_prompt_info) | ${COLUMNS}x${LINES} | %y\a%}'
+    ;;
+  screen)
+    PR_TITLEBAR=$'%{\e_screen \005 (\005t) | %(!.-=[ROOT]=- | .)%n@%m:%~ | ${COLUMNS}x${LINES} | %y\e\\%}'
+    ;;
+  *)
+    PR_TITLEBAR=''
+    ;;
+  esac
 
 
 ###
 # Decide whether to set a screen title
-    if [[ "$TERM" == "screen" ]]; then
-        PR_STITLE=$'%{\ekzsh\e\\%}'
-    else
-        PR_STITLE=''
-    fi
+  if [[ "$TERM" == "screen" ]]; then
+    PR_STITLE=$'%{\ekzsh\e\\%}'
+  else
+    PR_STITLE=''
+  fi
 
 ###
 # Finally, the prompt.
 #
-    PROMPT='$PR_SET_CHARSET$PR_STITLE${(e)PR_TITLEBAR}\
+  PROMPT='$PR_SET_CHARSET$PR_STITLE${(e)PR_TITLEBAR}\
 $PR_RED$PR_HBAR<\
 $PR_BLUE%(!.$PR_RED%SROOT%s.%n)$PR_GREEN@$PR_BLUE%M:$PR_GREEN%$PR_PWDLEN<...<%~$PR_CYAN$(git_prompt_info)$(rvm_prompt_info)\
 $PR_RED>$PR_HBAR$PR_SPACE${(e)PR_FILLBAR}\

From 134c1ada285f5c65fa9d0f2f0cc784201428462a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Mon, 13 Dec 2021 16:42:54 +0100
Subject: [PATCH 601/869] fix(jonathan): fix theme for non-UTF8 locales

---
 themes/jonathan.zsh-theme | 38 ++++++++++++++++++--------------------
 1 file changed, 18 insertions(+), 20 deletions(-)

diff --git a/themes/jonathan.zsh-theme b/themes/jonathan.zsh-theme
index 2c5f30060..ca58b94a3 100644
--- a/themes/jonathan.zsh-theme
+++ b/themes/jonathan.zsh-theme
@@ -1,6 +1,4 @@
 function theme_precmd {
-  local -i TERMWIDTH=$COLUMNS
-
   PR_FILLBAR=""
   PR_PWDLEN=""
 
@@ -9,10 +7,12 @@ function theme_precmd {
   local pwdsize=${#${(%):-%~}}
 
   # Truncate the path if it's too long.
-  if (( promptsize + rubypromptsize + pwdsize > TERMWIDTH )); then
-    (( PR_PWDLEN = TERMWIDTH - promptsize ))
+  if (( promptsize + rubypromptsize + pwdsize > COLUMNS )); then
+    (( PR_PWDLEN = COLUMNS - promptsize ))
+  elif [[ "${langinfo[CODESET]}" = UTF-8 ]]; then
+    PR_FILLBAR="\${(l:$(( COLUMNS - (promptsize + rubypromptsize + pwdsize) ))::${PR_HBAR}:)}"
   else
-    PR_FILLBAR="\${(l.(($TERMWIDTH - ($promptsize + $rubypromptsize + $pwdsize)))..${PR_HBAR}.)}"
+    PR_FILLBAR="${PR_SHIFT_IN}\${(l:$(( COLUMNS - (promptsize + rubypromptsize + pwdsize) ))::${altchar[q]:--}:)}${PR_SHIFT_OUT}"
   fi
 }
 
@@ -48,18 +48,16 @@ ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}"
 ZSH_THEME_GIT_PROMPT_DIRTY=""
 ZSH_THEME_GIT_PROMPT_CLEAN=""
 
-ZSH_THEME_GIT_PROMPT_ADDED="%{$fg[green]%} ✚"
-ZSH_THEME_GIT_PROMPT_MODIFIED="%{$fg[blue]%} ✹"
-ZSH_THEME_GIT_PROMPT_DELETED="%{$fg[red]%} ✖"
-ZSH_THEME_GIT_PROMPT_RENAMED="%{$fg[magenta]%} ➜"
-ZSH_THEME_GIT_PROMPT_UNMERGED="%{$fg[yellow]%} ═"
-ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$fg[cyan]%} ✭"
+ZSH_THEME_GIT_PROMPT_ADDED="%{$fg[green]%} %{%G✚%}"
+ZSH_THEME_GIT_PROMPT_MODIFIED="%{$fg[blue]%} %{%G✹%}"
+ZSH_THEME_GIT_PROMPT_DELETED="%{$fg[red]%} %{%G✖%}"
+ZSH_THEME_GIT_PROMPT_RENAMED="%{$fg[magenta]%} %{%G➜%}"
+ZSH_THEME_GIT_PROMPT_UNMERGED="%{$fg[yellow]%} %{%G═%}"
+ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$fg[cyan]%} %{%G✭%}"
 
 # Use extended characters to look nicer if supported.
-if [[ "${langinfo[CODESET]}" = "UTF-8" ]]; then
+if [[ "${langinfo[CODESET]}" = UTF-8 ]]; then
   PR_SET_CHARSET=""
-  PR_SHIFT_IN=""
-  PR_SHIFT_OUT=""
   PR_HBAR="─"
   PR_ULCORNER="┌"
   PR_LLCORNER="└"
@@ -72,12 +70,12 @@ else
   PR_SET_CHARSET="%{$terminfo[enacs]%}"
   PR_SHIFT_IN="%{$terminfo[smacs]%}"
   PR_SHIFT_OUT="%{$terminfo[rmacs]%}"
-  PR_HBAR='$PR_SHIFT_IN${altchar[q]:--}$PR_SHIFT_OUT'
-  PR_ULCORNER='$PR_SHIFT_IN${altchar[l]:--}$PR_SHIFT_OUT'
-  PR_LLCORNER='$PR_SHIFT_IN${altchar[m]:--}$PR_SHIFT_OUT'
-  PR_LRCORNER='$PR_SHIFT_IN${altchar[j]:--}$PR_SHIFT_OUT'
-  PR_URCORNER='$PR_SHIFT_IN${altchar[k]:--}$PR_SHIFT_OUT'
-  fi
+  PR_HBAR="${PR_SHIFT_IN}${altchar[q]:--}${PR_SHIFT_OUT}"
+  PR_ULCORNER="${PR_SHIFT_IN}${altchar[l]:--}${PR_SHIFT_OUT}"
+  PR_LLCORNER="${PR_SHIFT_IN}${altchar[m]:--}${PR_SHIFT_OUT}"
+  PR_LRCORNER="${PR_SHIFT_IN}${altchar[j]:--}${PR_SHIFT_OUT}"
+  PR_URCORNER="${PR_SHIFT_IN}${altchar[k]:--}${PR_SHIFT_OUT}"
+fi
 
 # Decide if we need to set titlebar text.
 case $TERM in

From aa99472c8ac5bdd111ea306e800bb152fb8580ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Mon, 13 Dec 2021 17:02:21 +0100
Subject: [PATCH 602/869] style(simonoff): fix code style and optimize use of
 variables

---
 themes/simonoff.zsh-theme | 127 ++++++++++++++------------------------
 1 file changed, 46 insertions(+), 81 deletions(-)

diff --git a/themes/simonoff.zsh-theme b/themes/simonoff.zsh-theme
index fea2eff42..c906192a0 100644
--- a/themes/simonoff.zsh-theme
+++ b/themes/simonoff.zsh-theme
@@ -1,43 +1,22 @@
-# Prompt
-#
-# Below are the color init strings for the basic file types. A color init
-# string consists of one or more of the following numeric codes:
-# Attribute codes:
-# 00=none 01=bold 04=underscore 05=blink 07=reverse 08=concealed
-# Text color codes:
-# 30=black 31=red 32=green 33=yellow 34=blue 35=magenta 36=cyan 37=white
-# Background color codes:
-# 40=black 41=red 42=green 43=yellow 44=blue 45=magenta 46=cyan 47=white
-function precmd {
-
-  local TERMWIDTH
-  (( TERMWIDTH = ${COLUMNS} - 1 ))
-
-
-  ###
-  # Truncate the path if it's too long.
-
+function theme_precmd {
   PR_FILLBAR=""
   PR_PWDLEN=""
 
-  local promptsize=${#${(%):---(%n@%M:%l)---()}}
+  local promptsize=${#${(%):--(%n@%M:)--(%l)-}}
   local pwdsize=${#${(%):-%~}}
-  local gitbranch="$(git_prompt_info)"
-  local rvmprompt="$(ruby_prompt_info)"
-  local gitbranchsize=${#${gitbranch:-''}}
-  local rvmpromptsize=${#${rvmprompt:-''}}
+  local gitbranchsize="${#${(%)$(git_prompt_info)}:-}"
+  local rvmpromptsize="${#${(%)$(ruby_prompt_info):-}}"
 
-  if [[ "$promptsize + $pwdsize + $rvmpromptsize + $gitbranchsize" -gt $TERMWIDTH ]]; then
-    ((PR_PWDLEN=$TERMWIDTH - $promptsize))
+  # Truncate the path if it's too long.
+  if (( promptsize + pwdsize + rvmpromptsize + gitbranchsize > COLUMNS )); then
+    (( PR_PWDLEN = COLUMNS - promptsize ))
   else
-    PR_FILLBAR="\${(l.(($TERMWIDTH - ($promptsize + $pwdsize + $rvmpromptsize + $gitbranchsize)))..${PR_SPACE}.)}"
+    PR_FILLBAR="\${(l.$(( COLUMNS - (promptsize + pwdsize + rvmpromptsize + gitbranchsize) ))..${PR_SPACE}.)}"
   fi
 }
 
-
-setopt extended_glob
-
-preexec () {
+function theme_preexec {
+  setopt local_options extended_glob
   if [[ "$TERM" == "screen" ]]; then
     local CMD=${1[(wr)^(*=*|sudo|-*)]}
     echo -n "\ek$CMD\e\\"
@@ -53,47 +32,41 @@ preexec () {
 
 }
 
-setprompt () {
-###
+autoload -U add-zsh-hook
+add-zsh-hook precmd  theme_precmd
+add-zsh-hook preexec theme_preexec
+
+
+# Set the prompt
+
 # Need this so the prompt will work.
+setopt prompt_subst
 
-  setopt prompt_subst
-
-
-###
 # See if we can use colors.
+autoload zsh/terminfo
+for color in RED GREEN YELLOW BLUE MAGENTA CYAN WHITE GREY; do
+  print -v "PR_$color" "%{$terminfo[bold]$fg[${(L)color}]%}"
+  print -v "PR_LIGHT_$color" "%{$fg[${(L)color}]%}"
+done
+PR_NO_COLOUR="%{$terminfo[sgr0]%}"
 
-  autoload zsh/terminfo
-  for color in RED GREEN YELLOW BLUE MAGENTA CYAN WHITE; do
-  eval PR_$color='%{$terminfo[bold]$fg[${(L)color}]%}'
-  eval PR_LIGHT_$color='%{$fg[${(L)color}]%}'
-  (( count = $count + 1 ))
-  done
-  PR_NO_COLOUR="%{$terminfo[sgr0]%}"
+# Use extended characters to look nicer
+PR_HBAR="-"
+PR_ULCORNER="-"
+PR_LLCORNER="-"
+PR_LRCORNER="-"
+PR_URCORNER="-"
 
+# Modify Git prompt
+ZSH_THEME_GIT_PROMPT_PREFIX=" ["
+ZSH_THEME_GIT_PROMPT_SUFFIX="]"
 
-###
-# See if we can use extended characters to look nicer.
-  PR_HBAR=${altchar[q]:--}
-  PR_ULCORNER=${altchar[l]:--}
-  PR_LLCORNER=${altchar[m]:--}
-  PR_LRCORNER=${altchar[j]:--}
-  PR_URCORNER=${altchar[k]:--}
+# Modify RVM prompt
+ZSH_THEME_RUBY_PROMPT_PREFIX=" ["
+ZSH_THEME_RUBY_PROMPT_SUFFIX="]"
 
-  ###
-  # Modify Git prompt
-  ZSH_THEME_GIT_PROMPT_PREFIX=" ["
-  ZSH_THEME_GIT_PROMPT_SUFFIX="]"
-  ###
-  # Modify RVM prompt
-  ZSH_THEME_RUBY_PROMPT_PREFIX=" ["
-  ZSH_THEME_RUBY_PROMPT_SUFFIX="]"
-
-
-###
 # Decide if we need to set titlebar text.
-
-  case $TERM in
+case $TERM in
   xterm*|*rxvt*)
     PR_TITLEBAR=$'%{\e]0;%(!.-=*[ROOT]*=- | .)%n@%M:%~ $(git_prompt_info) $(rvm_prompt_info) | ${COLUMNS}x${LINES} | %y\a%}'
     ;;
@@ -101,26 +74,22 @@ setprompt () {
     PR_TITLEBAR=$'%{\e_screen \005 (\005t) | %(!.-=[ROOT]=- | .)%n@%m:%~ | ${COLUMNS}x${LINES} | %y\e\\%}'
     ;;
   *)
-    PR_TITLEBAR=''
+    PR_TITLEBAR=""
     ;;
-  esac
+esac
 
-
-###
 # Decide whether to set a screen title
-  if [[ "$TERM" == "screen" ]]; then
-    PR_STITLE=$'%{\ekzsh\e\\%}'
-  else
-    PR_STITLE=''
-  fi
+if [[ "$TERM" == "screen" ]]; then
+  PR_STITLE=$'%{\ekzsh\e\\%}'
+else
+  PR_STITLE=""
+fi
 
-###
 # Finally, the prompt.
-#
-  PROMPT='$PR_SET_CHARSET$PR_STITLE${(e)PR_TITLEBAR}\
+PROMPT='$PR_SET_CHARSET$PR_STITLE${(e)PR_TITLEBAR}\
 $PR_RED$PR_HBAR<\
 $PR_BLUE%(!.$PR_RED%SROOT%s.%n)$PR_GREEN@$PR_BLUE%M:$PR_GREEN%$PR_PWDLEN<...<%~$PR_CYAN$(git_prompt_info)$(rvm_prompt_info)\
-$PR_RED>$PR_HBAR$PR_SPACE${(e)PR_FILLBAR}\
+$PR_RED>$PR_HBAR${(e)PR_FILLBAR}\
 $PR_RED$PR_HBAR<\
 $PR_GREEN%l$PR_RED>$PR_HBAR\
 
@@ -128,7 +97,3 @@ $PR_RED$PR_HBAR<\
 %(?..$PR_LIGHT_RED%?$PR_BLUE:)\
 $PR_LIGHT_BLUE%(!.$PR_RED.$PR_WHITE)%#$PR_RED>$PR_HBAR\
 $PR_NO_COLOUR '
-
-}
-
-setprompt

From e3bb6e685dc0325f472a4cfadb9847add12ec699 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Mon, 13 Dec 2021 17:12:31 +0100
Subject: [PATCH 603/869] refactor(themes): use `ruby_prompt_info` everywhere

---
 themes/aussiegeek.zsh-theme | 2 +-
 themes/josh.zsh-theme       | 4 ++--
 themes/murilasso.zsh-theme  | 2 +-
 themes/simonoff.zsh-theme   | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/themes/aussiegeek.zsh-theme b/themes/aussiegeek.zsh-theme
index c2c7f65b9..2ded5c157 100644
--- a/themes/aussiegeek.zsh-theme
+++ b/themes/aussiegeek.zsh-theme
@@ -1,5 +1,5 @@
 
-PROMPT='$fg_bold[blue][ $fg[red]%t $fg_bold[blue]] $fg_bold[blue] [ $fg[red]%n@%m:%~$(git_prompt_info)$fg[yellow]$(rvm_prompt_info)$fg_bold[blue] ]$reset_color
+PROMPT='$fg_bold[blue][ $fg[red]%t $fg_bold[blue]] $fg_bold[blue] [ $fg[red]%n@%m:%~$(git_prompt_info)$fg[yellow]$(ruby_prompt_info)$fg_bold[blue] ]$reset_color
  $ '
 # git theming
 ZSH_THEME_GIT_PROMPT_PREFIX="$fg_bold[green]("
diff --git a/themes/josh.zsh-theme b/themes/josh.zsh-theme
index c8f0f4dd7..ea051c58e 100644
--- a/themes/josh.zsh-theme
+++ b/themes/josh.zsh-theme
@@ -10,7 +10,7 @@ function josh_prompt {
   prompt=" "
 
   branch=$(git_current_branch)
-  ruby_version=$(rvm_prompt_info || rbenv_prompt_info)
+  ruby_version=$(ruby_prompt_info)
   path_size=${#PWD}
   branch_size=${#branch}
   ruby_size=${#ruby_version}
@@ -31,7 +31,7 @@ function josh_prompt {
     prompt=" $prompt"
   done
   
-  prompt="%{%F{green}%}$PWD$prompt%{%F{red}%}$(rvm_prompt_info || rbenv_prompt_info)%{$reset_color%} $(git_current_branch)"
+  prompt="%{%F{green}%}$PWD$prompt%{%F{red}%}$(ruby_prompt_info)%{$reset_color%} $(git_current_branch)"
   
   echo $prompt
 }
diff --git a/themes/murilasso.zsh-theme b/themes/murilasso.zsh-theme
index bc2b9b224..d46874c54 100644
--- a/themes/murilasso.zsh-theme
+++ b/themes/murilasso.zsh-theme
@@ -1,7 +1,7 @@
 local return_code="%(?..%{$fg[red]%}%? ↵%{$reset_color%})"
 local user_host='%{$terminfo[bold]$fg[green]%}%n@%m%{$reset_color%}'
 local current_dir='%{$terminfo[bold]$fg[blue]%}%~%{$reset_color%}'
-local rvm_ruby='%{$fg[red]%}$(rvm_prompt_info || rbenv_prompt_info)%{$reset_color%}'
+local rvm_ruby='%{$fg[red]%}$(ruby_prompt_info)%{$reset_color%}'
 local git_branch='%{$fg[blue]%}$(git_prompt_info)%{$reset_color%}'
 
 PROMPT="${user_host}:${current_dir} ${rvm_ruby}
diff --git a/themes/simonoff.zsh-theme b/themes/simonoff.zsh-theme
index c906192a0..201d5d7e4 100644
--- a/themes/simonoff.zsh-theme
+++ b/themes/simonoff.zsh-theme
@@ -68,7 +68,7 @@ ZSH_THEME_RUBY_PROMPT_SUFFIX="]"
 # Decide if we need to set titlebar text.
 case $TERM in
   xterm*|*rxvt*)
-    PR_TITLEBAR=$'%{\e]0;%(!.-=*[ROOT]*=- | .)%n@%M:%~ $(git_prompt_info) $(rvm_prompt_info) | ${COLUMNS}x${LINES} | %y\a%}'
+    PR_TITLEBAR=$'%{\e]0;%(!.-=*[ROOT]*=- | .)%n@%M:%~ $(git_prompt_info) $(ruby_prompt_info) | ${COLUMNS}x${LINES} | %y\a%}'
     ;;
   screen)
     PR_TITLEBAR=$'%{\e_screen \005 (\005t) | %(!.-=[ROOT]=- | .)%n@%m:%~ | ${COLUMNS}x${LINES} | %y\e\\%}'
@@ -88,7 +88,7 @@ fi
 # Finally, the prompt.
 PROMPT='$PR_SET_CHARSET$PR_STITLE${(e)PR_TITLEBAR}\
 $PR_RED$PR_HBAR<\
-$PR_BLUE%(!.$PR_RED%SROOT%s.%n)$PR_GREEN@$PR_BLUE%M:$PR_GREEN%$PR_PWDLEN<...<%~$PR_CYAN$(git_prompt_info)$(rvm_prompt_info)\
+$PR_BLUE%(!.$PR_RED%SROOT%s.%n)$PR_GREEN@$PR_BLUE%M:$PR_GREEN%$PR_PWDLEN<...<%~$PR_CYAN$(git_prompt_info)$(ruby_prompt_info)\
 $PR_RED>$PR_HBAR${(e)PR_FILLBAR}\
 $PR_RED$PR_HBAR<\
 $PR_GREEN%l$PR_RED>$PR_HBAR\

From 7b12fa9799edf07547cf5a55cf6518a4cb4c4852 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Mon, 13 Dec 2021 12:14:45 +0100
Subject: [PATCH 604/869] style(rbfu): clean up code

---
 plugins/rbfu/README.md       |  1 +
 plugins/rbfu/rbfu.plugin.zsh | 68 ++++++++++++++++++++----------------
 2 files changed, 38 insertions(+), 31 deletions(-)

diff --git a/plugins/rbfu/README.md b/plugins/rbfu/README.md
index f1f9fa2f7..fbcab64de 100644
--- a/plugins/rbfu/README.md
+++ b/plugins/rbfu/README.md
@@ -4,6 +4,7 @@ This plugin starts [rbfu](https://github.com/hmans/rbfu), a minimal Ruby version
 manager, and adds some useful functions.
 
 To use it, add `rbfu` to the plugins array in your zshrc file:
+
 ```zsh
 plugins=(... rbfu)
 ```
diff --git a/plugins/rbfu/rbfu.plugin.zsh b/plugins/rbfu/rbfu.plugin.zsh
index 008485205..c973fbf9f 100644
--- a/plugins/rbfu/rbfu.plugin.zsh
+++ b/plugins/rbfu/rbfu.plugin.zsh
@@ -5,38 +5,44 @@
 # rvm_prompt_info function to return the $RBFU_RUBY_VERSION
 # version.
 
-command -v rbfu &>/dev/null
+command -v rbfu &>/dev/null || return
 
-if [[ $? -eq 0 ]]; then
-  eval "$(rbfu --init --auto)"
+eval "$(rbfu --init --auto)"
 
-  # Internal: Print ruby version details, if it's currently
-  # active etc.
-  function _rbfu_rubies_print() {
-    local rb rb_out
-    rb=$(basename $1)
-    rb_out="$rb"
-    [[ -h $1 ]] && rb_out="$rb_out${fg[green]}@${reset_color}"
-    [[ "x$rb" == "x$2" ]] && rb_out="${fg[red]}$rb_out ${fg[red]}*${reset_color}"
-    echo $rb_out
-  }
+# Internal: Print ruby version details, if it's currently active, etc.
+function _rbfu_rubies_print() {
+  # 1: path to ruby file
+  # 2: active ruby
+  local rb rb_out
+  rb="${$1:t}"
+  rb_out="$rb"
 
-  # Public: Provide a list with all available rubies, this basically depends
-  # on `ls -1` and .rfbu/rubies. Highlights the currently active ruby version
-  # and aliases.
-  function rbfu-rubies() {
-    local rbfu_dir active_rb
-    rbfu_dir=$RBFU_RUBIES
-    active_rb=$RBFU_RUBY_VERSION
-    [[ -z "$rbfu_dir" ]] && rbfu_dir="${HOME}/.rbfu/rubies"
-    [[ -z "$active_rb" ]] && active_rb="system"
-    _rbfu_rubies_print "${rbfu_dir}/system" $active_rb
-    for rb in $(ls -1 $rbfu_dir); do
-      _rbfu_rubies_print "${rbfu_dir}/${rb}" $active_rb
-    done
-  }
+  # If the ruby is a symlink, add @ to the name.
+  if [[ -h "$1" ]]; then
+    rb_out="${rb_out}${fg[green]}@${reset_color}"
+  fi
 
-  # Public: Create rvm_prompt_info command for themes compatibility, unless
-  # it has already been defined.
-  [ ! -x rvm_prompt_info ] && function rvm_prompt_info() { echo "${RBFU_RUBY_VERSION:=system}" }
-fi
+  # If the ruby is active, add * to the name and show it in red.
+  if [[ "$rb" = "$2" ]]; then
+    rb_out="${fg[red]}${rb_out} ${fg[red]}*${reset_color}"
+  fi
+
+  echo $rb_out
+}
+
+# Public: Provide a list with all available rubies, this basically depends
+# on ~/.rfbu/rubies. Highlights the currently active ruby version and aliases.
+function rbfu-rubies() {
+  local rbfu_dir active_rb
+  rbfu_dir="${RBFU_RUBIES:-${HOME}/.rbfu/rubies}"
+  active_rb="${RBFU_RUBY_VERSION:-system}"
+
+  _rbfu_rubies_print "${rbfu_dir}/system" "$active_rb"
+  for rb in ${rbfu_dir}/*(N); do
+    _rbfu_rubies_print "$rb" "$active_rb"
+  done
+}
+
+# Public: Create rvm_prompt_info command for themes compatibility, unless
+# it has already been defined.
+[ ! -x rvm_prompt_info ] && function rvm_prompt_info() { echo "${RBFU_RUBY_VERSION:=system}" }

From 5c14474eb2a252ad61e55cf084c5bbe6c1c934b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Mon, 13 Dec 2021 17:37:44 +0100
Subject: [PATCH 605/869] style(chruby): fix plugin code style and loading
 process

---
 plugins/chruby/README.md         |   3 +-
 plugins/chruby/chruby.plugin.zsh | 189 +++++++++++++------------------
 2 files changed, 83 insertions(+), 109 deletions(-)

diff --git a/plugins/chruby/README.md b/plugins/chruby/README.md
index d373006a5..19eb15a8d 100644
--- a/plugins/chruby/README.md
+++ b/plugins/chruby/README.md
@@ -5,6 +5,7 @@ current Ruby version, and completion and a prompt function to display the Ruby v
 Supports brew and manual installation of chruby.
 
 To use it, add `chruby` to the plugins array in your zshrc file:
+
 ```zsh
 plugins=(... chruby)
 ```
@@ -14,7 +15,7 @@ plugins=(... chruby)
 If you'd prefer to specify an explicit path to load chruby from
 you can set variables like so:
 
-```
+```zsh
 zstyle :omz:plugins:chruby path /local/path/to/chruby.sh
 zstyle :omz:plugins:chruby auto /local/path/to/auto.sh
 ```
diff --git a/plugins/chruby/chruby.plugin.zsh b/plugins/chruby/chruby.plugin.zsh
index 32f0525aa..61ded3b73 100644
--- a/plugins/chruby/chruby.plugin.zsh
+++ b/plugins/chruby/chruby.plugin.zsh
@@ -1,121 +1,94 @@
-#
-# INSTRUCTIONS
-#
-#  With either a manual or brew installed chruby things should just work.
-#
-#  If you'd prefer to specify an explicit path to load chruby from
-#  you can set variables like so:
-#
-#    zstyle :omz:plugins:chruby path /local/path/to/chruby.sh
-#    zstyle :omz:plugins:chruby auto /local/path/to/auto.sh
-# 
-# TODO
-#  - autodetermine correct source path on non OS X systems
-#  - completion if ruby-install exists
+## load chruby from different locations
+
+_source-from-omz-settings() {
+  local _chruby_path _chruby_auto
+  
+  zstyle -s :omz:plugins:chruby path _chruby_path || return 1
+  zstyle -s :omz:plugins:chruby auto _chruby_auto || return 1
+
+  if [[ -r ${_chruby_path} ]]; then
+    source ${_chruby_path}
+  fi
+
+  if [[ -r ${_chruby_auto} ]]; then
+    source ${_chruby_auto}
+  fi
+}
+
+_source-from-homebrew() {
+  (( $+commands[brew] )) || return 1
+
+  local _brew_prefix
+  # check default brew prefix
+  if [[ -h /usr/local/opt/chruby ]];then
+    _brew_prefix="/usr/local/opt/chruby"
+  else
+    # ok , it is not default prefix 
+    # this call to brew is expensive ( about 400 ms ), so at least let's make it only once
+    _brew_prefix=$(brew --prefix chruby)
+  fi
+
+  [[ -r "$_brew_prefix" ]] || return 1
+
+  source $_brew_prefix/share/chruby/chruby.sh
+  source $_brew_prefix/share/chruby/auto.sh
+}
+
+_load-chruby-dirs() {
+  local dir
+  for dir in "$HOME/.rubies" "$PREFIX/opt/rubies"; do
+    if [[ -d "$dir" ]]; then
+      RUBIES+=("$dir")
+    fi
+  done
+}
+
+# Load chruby
+if _source-from-omz-settings; then
+  _load-chruby-dirs
+elif [[ -r "/usr/local/share/chruby/chruby.sh" ]] ; then
+  source /usr/local/share/chruby/chruby.sh
+  source /usr/local/share/chruby/auto.sh
+  _load-chruby-dirs
+elif _source-from-homebrew; then
+  _load-chruby-dirs
+fi
+
+unfunction _source-from-homebrew _source-from-omz-settings _load-chruby-dirs
+
+
+## chruby utility functions and aliases
 
 # rvm and rbenv plugins also provide this alias
 alias rubies='chruby'
 
-
-_homebrew-installed() {
-    whence brew &> /dev/null
-    _xit=$?
-    if [ $_xit -eq 0 ];then
-    	# ok , we have brew installed
-	# speculatively we check default brew prefix
-        if [ -h  /usr/local/opt/chruby ];then
-		_brew_prefix="/usr/local/opt/chruby"
-	else
-		# ok , it is not default prefix 
-		# this call to brew is expensive ( about 400 ms ), so at least let's make it only once
-		_brew_prefix=$(brew --prefix chruby)
-	fi
-	return 0
-   else
-        return $_xit
-   fi
-}
-
-_chruby-from-homebrew-installed() {
-  [ -r $_brew_prefix ] &> /dev/null
-}
-
-_ruby-build_installed() {
-    whence ruby-build &> /dev/null
-}
-
-_ruby-install-installed() {
-    whence ruby-install &> /dev/null
-}
-
-# Simple definition completer for ruby-build
-if _ruby-build_installed; then
-    _ruby-build() { compadd $(ruby-build --definitions) }
-    compdef _ruby-build ruby-build
-fi
-
-_source_from_omz_settings() {
-    local _chruby_path
-    local _chruby_auto
-    
-    zstyle -s :omz:plugins:chruby path _chruby_path
-    zstyle -s :omz:plugins:chruby auto _chruby_auto
-
-    if [[ -r ${_chruby_path} ]]; then
-        source ${_chruby_path}
-    fi
-
-    if [[ -r ${_chruby_auto} ]]; then
-        source ${_chruby_auto}
-    fi
-}
-
-_chruby_dirs() {
-    chrubydirs=($HOME/.rubies/ $PREFIX/opt/rubies)
-    for dir in chrubydirs; do
-        if [[ -d $dir ]]; then
-            RUBIES+=$dir
-        fi
-    done
-}
-
-if _homebrew-installed && _chruby-from-homebrew-installed ; then
-    source $_brew_prefix/share/chruby/chruby.sh
-    source $_brew_prefix/share/chruby/auto.sh
-    _chruby_dirs
-elif [[ -r "/usr/local/share/chruby/chruby.sh" ]] ; then
-    source /usr/local/share/chruby/chruby.sh
-    source /usr/local/share/chruby/auto.sh
-    _chruby_dirs
-else
-    _source_from_omz_settings
-    _chruby_dirs
-fi
-
-function ensure_chruby() {
-    $(whence chruby)
-}
-
 function current_ruby() {
-    local _ruby
-    _ruby="$(chruby |grep \* |tr -d '* ')"
-    if [[ $(chruby |grep -c \*) -eq 1 ]]; then
-        echo ${_ruby}
-    else
-        echo "system"
-    fi
+  local ruby
+  ruby="$(chruby | grep \* | tr -d '* ')"
+  if [[ $(chruby | grep -c \*) -eq 1 ]]; then
+    echo ${ruby}
+  else
+    echo "system"
+  fi
 }
 
 function chruby_prompt_info() {
-    echo "$(current_ruby)"
+  echo "$(current_ruby)"
 }
 
-# complete on installed rubies
+# Complete chruby command with installed rubies
 _chruby() {
-    compadd $(chruby | tr -d '* ')
-    local default_path='/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin'
-    if PATH=${default_path} type ruby &> /dev/null; then
-        compadd system
-    fi
+  compadd $(chruby | tr -d '* ')
+  if PATH="/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin" command ruby &>/dev/null; then
+    compadd system
+  fi
 }
+
 compdef _chruby chruby
+
+
+# Simple definition completer for ruby-build
+if command ruby-build &> /dev/null; then
+  _ruby-build() { compadd $(ruby-build --definitions) }
+  compdef _ruby-build ruby-build
+fi

From 59cb231692a171887e064fc4002da387718aaea9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Mon, 13 Dec 2021 17:42:17 +0100
Subject: [PATCH 606/869] style(rbenv): adapt to code style

---
 plugins/rbenv/rbenv.plugin.zsh | 92 +++++++++++++++++-----------------
 1 file changed, 46 insertions(+), 46 deletions(-)

diff --git a/plugins/rbenv/rbenv.plugin.zsh b/plugins/rbenv/rbenv.plugin.zsh
index 0f2d366e2..d36d4922c 100644
--- a/plugins/rbenv/rbenv.plugin.zsh
+++ b/plugins/rbenv/rbenv.plugin.zsh
@@ -4,65 +4,65 @@
 FOUND_RBENV=$+commands[rbenv]
 
 if [[ $FOUND_RBENV -ne 1 ]]; then
-    rbenvdirs=("$HOME/.rbenv" "/usr/local/rbenv" "/opt/rbenv" "/usr/local/opt/rbenv")
-    for dir in $rbenvdirs; do
-        if [[ -d $dir/bin ]]; then
-            export PATH="$dir/bin:$PATH"
-            FOUND_RBENV=1
-            break
-        fi
-    done
+  rbenvdirs=("$HOME/.rbenv" "/usr/local/rbenv" "/opt/rbenv" "/usr/local/opt/rbenv")
+  for dir in $rbenvdirs; do
+    if [[ -d $dir/bin ]]; then
+      export PATH="$dir/bin:$PATH"
+      FOUND_RBENV=1
+      break
+    fi
+  done
 fi
 
 if [[ $FOUND_RBENV -ne 1 ]]; then
-    if (( $+commands[brew] )) && dir=$(brew --prefix rbenv 2>/dev/null); then
-        if [[ -d $dir/bin ]]; then
-            export PATH="$dir/bin:$PATH"
-            FOUND_RBENV=1
-        fi
+  if (( $+commands[brew] )) && dir=$(brew --prefix rbenv 2>/dev/null); then
+    if [[ -d $dir/bin ]]; then
+      export PATH="$dir/bin:$PATH"
+      FOUND_RBENV=1
     fi
+  fi
 fi
 
 if [[ $FOUND_RBENV -eq 1 ]]; then
-    eval "$(rbenv init --no-rehash - zsh)"
+  eval "$(rbenv init --no-rehash - zsh)"
 
-    alias rubies="rbenv versions"
-    alias gemsets="rbenv gemset list"
+  alias rubies="rbenv versions"
+  alias gemsets="rbenv gemset list"
 
-    function current_ruby() {
-        echo "$(rbenv version-name)"
-    }
+  function current_ruby() {
+    echo "$(rbenv version-name)"
+  }
 
-    function current_gemset() {
-        echo "$(rbenv gemset active 2>/dev/null)" | tr ' ' '+'
-    }
+  function current_gemset() {
+    echo "$(rbenv gemset active 2>/dev/null)" | tr ' ' '+'
+  }
 
-    function gems() {
-        local rbenv_path=$(rbenv prefix)
-        gem list $@ | sed -E \
-          -e "s/\([0-9a-z, \.]+( .+)?\)/$fg[blue]&$reset_color/g" \
-          -e "s|$(echo $rbenv_path)|$fg[magenta]\$rbenv_path$reset_color|g" \
-          -e "s/$current_ruby@global/$fg[yellow]&$reset_color/g" \
-          -e "s/$current_ruby$current_gemset$/$fg[green]&$reset_color/g"
-    }
+  function gems() {
+    local rbenv_path=$(rbenv prefix)
+    gem list $@ | sed -E \
+      -e "s/\([0-9a-z, \.]+( .+)?\)/$fg[blue]&$reset_color/g" \
+      -e "s|$(echo $rbenv_path)|$fg[magenta]\$rbenv_path$reset_color|g" \
+      -e "s/$current_ruby@global/$fg[yellow]&$reset_color/g" \
+      -e "s/$current_ruby$current_gemset$/$fg[green]&$reset_color/g"
+  }
 
-    function rbenv_prompt_info() {
-        local ruby=$(current_ruby) gemset=$(current_gemset)
-        echo -n "${ZSH_THEME_RUBY_PROMPT_PREFIX}"
-        [[ -n "$gemset" ]] && echo -n "${ruby}@${gemset}" || echo -n "${ruby}"
-        echo "${ZSH_THEME_RUBY_PROMPT_SUFFIX}"
-    }
+  function rbenv_prompt_info() {
+    local ruby=$(current_ruby) gemset=$(current_gemset)
+    echo -n "${ZSH_THEME_RUBY_PROMPT_PREFIX}"
+    [[ -n "$gemset" ]] && echo -n "${ruby}@${gemset}" || echo -n "${ruby}"
+    echo "${ZSH_THEME_RUBY_PROMPT_SUFFIX}"
+  }
 else
-    alias rubies="ruby -v"
-    function gemsets() { echo "not supported" }
-    function current_ruby() { echo "not supported" }
-    function current_gemset() { echo "not supported" }
-    function gems() { echo "not supported" }
-    function rbenv_prompt_info() {
-        echo -n "${ZSH_THEME_RUBY_PROMPT_PREFIX}"
-        echo -n "system: $(ruby -v | cut -f-2 -d ' ')"
-        echo "${ZSH_THEME_RUBY_PROMPT_SUFFIX}"
-    }
+  alias rubies="ruby -v"
+  function gemsets() { echo "not supported" }
+  function current_ruby() { echo "not supported" }
+  function current_gemset() { echo "not supported" }
+  function gems() { echo "not supported" }
+  function rbenv_prompt_info() {
+    echo -n "${ZSH_THEME_RUBY_PROMPT_PREFIX}"
+    echo -n "system: $(ruby -v | cut -f-2 -d ' ')"
+    echo "${ZSH_THEME_RUBY_PROMPT_SUFFIX}"
+  }
 fi
 
 unset FOUND_RBENV rbenvdirs dir

From 9a3d853481645ae0f961e9cc8421fc5d84e2c3c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Mon, 13 Dec 2021 17:43:32 +0100
Subject: [PATCH 607/869] fix: quote % characters in ruby prompt info functions

---
 lib/prompt_info_functions.zsh    | 2 +-
 plugins/chruby/chruby.plugin.zsh | 2 +-
 plugins/rbenv/rbenv.plugin.zsh   | 4 ++--
 plugins/rbfu/rbfu.plugin.zsh     | 3 ++-
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/lib/prompt_info_functions.zsh b/lib/prompt_info_functions.zsh
index 48f033da6..e5535848b 100644
--- a/lib/prompt_info_functions.zsh
+++ b/lib/prompt_info_functions.zsh
@@ -30,7 +30,7 @@ function rvm_prompt_info() {
   local rvm_prompt
   rvm_prompt=$($HOME/.rvm/bin/rvm-prompt ${=ZSH_THEME_RVM_PROMPT_OPTIONS} 2>/dev/null)
   [[ -z "${rvm_prompt}" ]] && return 1
-  echo "${ZSH_THEME_RUBY_PROMPT_PREFIX}${rvm_prompt}${ZSH_THEME_RUBY_PROMPT_SUFFIX}"
+  echo "${ZSH_THEME_RUBY_PROMPT_PREFIX}${rvm_prompt:gs/%/%%}${ZSH_THEME_RUBY_PROMPT_SUFFIX}"
 }
 
 ZSH_THEME_RVM_PROMPT_OPTIONS="i v g"
diff --git a/plugins/chruby/chruby.plugin.zsh b/plugins/chruby/chruby.plugin.zsh
index 61ded3b73..d7a28d4e2 100644
--- a/plugins/chruby/chruby.plugin.zsh
+++ b/plugins/chruby/chruby.plugin.zsh
@@ -73,7 +73,7 @@ function current_ruby() {
 }
 
 function chruby_prompt_info() {
-  echo "$(current_ruby)"
+  echo "${$(current_ruby):gs/%/%%}"
 }
 
 # Complete chruby command with installed rubies
diff --git a/plugins/rbenv/rbenv.plugin.zsh b/plugins/rbenv/rbenv.plugin.zsh
index d36d4922c..d758aebae 100644
--- a/plugins/rbenv/rbenv.plugin.zsh
+++ b/plugins/rbenv/rbenv.plugin.zsh
@@ -47,7 +47,7 @@ if [[ $FOUND_RBENV -eq 1 ]]; then
   }
 
   function rbenv_prompt_info() {
-    local ruby=$(current_ruby) gemset=$(current_gemset)
+    local ruby=${$(current_ruby):gs/%/%%} gemset=${$(current_gemset):gs/%/%%}
     echo -n "${ZSH_THEME_RUBY_PROMPT_PREFIX}"
     [[ -n "$gemset" ]] && echo -n "${ruby}@${gemset}" || echo -n "${ruby}"
     echo "${ZSH_THEME_RUBY_PROMPT_SUFFIX}"
@@ -60,7 +60,7 @@ else
   function gems() { echo "not supported" }
   function rbenv_prompt_info() {
     echo -n "${ZSH_THEME_RUBY_PROMPT_PREFIX}"
-    echo -n "system: $(ruby -v | cut -f-2 -d ' ')"
+    echo -n "system: $(ruby -v | cut -f-2 -d ' ' | sed 's/%/%%/g')"
     echo "${ZSH_THEME_RUBY_PROMPT_SUFFIX}"
   }
 fi
diff --git a/plugins/rbfu/rbfu.plugin.zsh b/plugins/rbfu/rbfu.plugin.zsh
index c973fbf9f..27dc3eec6 100644
--- a/plugins/rbfu/rbfu.plugin.zsh
+++ b/plugins/rbfu/rbfu.plugin.zsh
@@ -45,4 +45,5 @@ function rbfu-rubies() {
 
 # Public: Create rvm_prompt_info command for themes compatibility, unless
 # it has already been defined.
-[ ! -x rvm_prompt_info ] && function rvm_prompt_info() { echo "${RBFU_RUBY_VERSION:=system}" }
+(( ${+functions[rvm_prompt_info]} )) || \
+function rvm_prompt_info() { echo "${${RBFU_RUBY_VERSION:=system}:gs/%/%%}" }

From f42aa49cfdfc56b784744d3e421f297ab03efbdc Mon Sep 17 00:00:00 2001
From: deimosian <deimosian@gmail.com>
Date: Mon, 13 Dec 2021 16:52:32 -0500
Subject: [PATCH 608/869] fix(ys): use default color instead of gray for
 improved readability (#10506)

---
 themes/ys.zsh-theme | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/themes/ys.zsh-theme b/themes/ys.zsh-theme
index 251b48827..45bbae2d1 100644
--- a/themes/ys.zsh-theme
+++ b/themes/ys.zsh-theme
@@ -5,10 +5,8 @@
 #
 # Mar 2013 Yad Smood
 
-typeset +H my_gray="$FG[247]"
-
 # VCS
-YS_VCS_PROMPT_PREFIX1=" %{$my_gray%}on%{$reset_color%} "
+YS_VCS_PROMPT_PREFIX1=" %{$reset_color%}on%{$fg[blue]%} "
 YS_VCS_PROMPT_PREFIX2=":%{$fg[cyan]%}"
 YS_VCS_PROMPT_SUFFIX="%{$reset_color%}"
 YS_VCS_PROMPT_DIRTY=" %{$fg[red]%}x"
@@ -62,13 +60,13 @@ local exit_code="%(?,,C:%{$fg[red]%}%?%{$reset_color%})"
 PROMPT="
 %{$terminfo[bold]$fg[blue]%}#%{$reset_color%} \
 %(#,%{$bg[yellow]%}%{$fg[black]%}%n%{$reset_color%},%{$fg[cyan]%}%n) \
-%{$my_gray%}@ \
+%{$reset_color%}@ \
 %{$fg[green]%}%m \
-%{$my_gray%}in \
+%{$reset_color%}in \
 %{$terminfo[bold]$fg[yellow]%}%~%{$reset_color%}\
 ${hg_info}\
 ${git_info}\
 ${venv_info}\
  \
-%{$my_gray%}[%*] $exit_code
+[%*] $exit_code
 %{$terminfo[bold]$fg[red]%}$ %{$reset_color%}"

From 5403db85998ff0c087bc97d972e1e76551127b7e Mon Sep 17 00:00:00 2001
From: K Harishankar <48408097+harishnkr@users.noreply.github.com>
Date: Tue, 14 Dec 2021 03:24:19 +0530
Subject: [PATCH 609/869] feat(archlinux): add aliases for cleaning package
 cache (#10091)

Co-authored-by: K Harishankar <48408097+Haritronic909@users.noreply.github.com>
---
 plugins/archlinux/README.md            | 11 +++++++++++
 plugins/archlinux/archlinux.plugin.zsh | 10 ++++++++++
 2 files changed, 21 insertions(+)

diff --git a/plugins/archlinux/README.md b/plugins/archlinux/README.md
index c8ec1de1e..fd772c61a 100644
--- a/plugins/archlinux/README.md
+++ b/plugins/archlinux/README.md
@@ -17,8 +17,10 @@ plugins=(... archlinux)
 | pacin        | `sudo pacman -S`                       | Install packages from the repositories                           |
 | pacins       | `sudo pacman -U`                       | Install a package from a local file                              |
 | pacinsd      | `sudo pacman -S --asdeps`              | Install packages as dependencies of another package              |
+| paclean      | `sudo pacman -Sc`                      | Clean out old and unused caches and packages                     |
 | pacloc       | `pacman -Qi`                           | Display information about a package in the local database        |
 | paclocs      | `pacman -Qs`                           | Search for packages in the local database                        |
+| paclr        | `sudo pacman -Scc`                     | Remove all files from the cache                                  |
 | paclsorphans | `sudo pacman -Qdt`                     | List all orphaned packages                                       |
 | pacmir       | `sudo pacman -Syy`                     | Force refresh of all package lists after updating mirrorlist     |
 | pacre        | `sudo pacman -R`                       | Remove packages, keeping its settings and dependencies           |
@@ -52,6 +54,8 @@ upgrades were available. Use `pacman -Que` instead.
 
 | Alias   | Command                                         | Description                                                             |
 |---------|-------------------------------------------------|-------------------------------------------------------------------------|
+| auclean | `sudo aura -Sc`                                 | Clean out old and unused caches and packages                            |
+| auclr   | `sudo aura -Scc`                                | Remove all files from the cache                                         |
 | auin    | `sudo aura -S`                                  | Install packages from the repositories                                  |
 | aurin   | `sudo aura -A`                                  | Install packages from the repositories                                  |
 | auins   | `sudo aura -U`                                  | Install a package from a local file                                     |
@@ -84,6 +88,8 @@ upgrades were available. Use `pacman -Que` instead.
 
 | Alias   | Command                           | Description                                                         |
 |---------|-----------------------------------|---------------------------------------------------------------------|
+| pacclean| `pacaur -Sc`                      | Clean out old and unused caches and packages                        |
+| pacclr  | `pacaur -Scc`                     | Remove all files from the cache                                     |
 | pain    | `pacaur -S`                       | Install packages from the repositories                              |
 | pains   | `pacaur -U`                       | Install a package from a local file                                 |
 | painsd  | `pacaur -S --asdeps`              | Install packages as dependencies of another package                 |
@@ -106,6 +112,8 @@ upgrades were available. Use `pacman -Que` instead.
 | Alias   | Command                           | Description                                                         |
 |---------|-----------------------------------|---------------------------------------------------------------------|
 | trconf  | `trizen -C`                       | Fix all configuration files with vimdiff                            |
+| trclean | `trizen -Sc`                      | Clean out old and unused caches and packages                        |
+| trclr   | `trizen -Scc`                     | Remove all files from the cache                                     |
 | trin    | `trizen -S`                       | Install packages from the repositories                              |
 | trins   | `trizen -U`                       | Install a package from a local file                                 |
 | trinsd  | `trizen -S --asdeps`              | Install packages as dependencies of another package                 |
@@ -128,6 +136,8 @@ upgrades were available. Use `pacman -Que` instead.
 | Alias   | Command                        | Description                                                       |
 |---------|--------------------------------|-------------------------------------------------------------------|
 | yaconf  | `yay -Pg`                      | Print current configuration                                       |
+| yaclean | `yay -Sc`                      | Clean out old and unused caches and packages                      |
+| yaclr   | `yay -Scc`                     | Remove all files from the cache                                   |
 | yain    | `yay -S`                       | Install packages from the repositories                            |
 | yains   | `yay -U`                       | Install a package from a local file                               |
 | yainsd  | `yay -S --asdeps`              | Install packages as dependencies of another package               |
@@ -170,3 +180,4 @@ whether the package manager is installed, checked in the following order:
 - ornicar - thibault.duplessis@gmail.com
 - Ybalrid (Arthur Brainville) - ybalrid@ybalrid.info
 - Jeff M. Hubbard - jeffmhubbard@gmail.com
+- K. Harishankar(harishnkr) - hari2menon1234@gmail.com
diff --git a/plugins/archlinux/archlinux.plugin.zsh b/plugins/archlinux/archlinux.plugin.zsh
index 0c5782d98..4f1364779 100644
--- a/plugins/archlinux/archlinux.plugin.zsh
+++ b/plugins/archlinux/archlinux.plugin.zsh
@@ -5,7 +5,9 @@
 # Pacman - https://wiki.archlinux.org/index.php/Pacman_Tips
 alias pacupg='sudo pacman -Syu'
 alias pacin='sudo pacman -S'
+alias paclean='sudo pacman -Sc'
 alias pacins='sudo pacman -U'
+alias paclr='sudo pacman -Scc'
 alias pacre='sudo pacman -R'
 alias pacrem='sudo pacman -Rns'
 alias pacrep='pacman -Si'
@@ -88,6 +90,8 @@ fi
 if (( $+commands[aura] )); then
   alias auin='sudo aura -S'
   alias aurin='sudo aura -A'
+  alias auclean='sudo aura -Sc'
+  alias auclr='sudo aura -Scc'
   alias auins='sudo aura -U'
   alias auinsd='sudo aura -S --asdeps'
   alias aurinsd='sudo aura -A --asdeps'
@@ -115,6 +119,8 @@ if (( $+commands[aura] )); then
 fi
 
 if (( $+commands[pacaur] )); then
+  alias pacclean='pacaur -Sc'
+  alias pacclr='pacaur -Scc'
   alias paupg='pacaur -Syu'
   alias pasu='pacaur -Syu --noconfirm'
   alias pain='pacaur -S'
@@ -138,6 +144,8 @@ if (( $+commands[trizen] )); then
   alias trupg='trizen -Syua'
   alias trsu='trizen -Syua --noconfirm'
   alias trin='trizen -S'
+  alias trclean='trizen -Sc'
+  alias trclr='trizen -Scc'
   alias trins='trizen -U'
   alias trre='trizen -R'
   alias trrem='trizen -Rns'
@@ -155,6 +163,8 @@ fi
 
 if (( $+commands[yay] )); then
   alias yaconf='yay -Pg'
+  alias yaclean='yay -Sc'
+  alias yaclr='yay -Scc'
   alias yaupg='yay -Syu'
   alias yasu='yay -Syu --noconfirm'
   alias yain='yay -S'

From fb86ec7749644bba4792f95bd06076049d9c74a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Tue, 14 Dec 2021 13:09:02 +0100
Subject: [PATCH 610/869] style: use `typeset` for dynamic variable names

---
 plugins/dirhistory/dirhistory.plugin.zsh | 4 ++--
 themes/adben.zsh-theme                   | 4 ++--
 themes/jonathan.zsh-theme                | 4 ++--
 themes/simonoff.zsh-theme                | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/plugins/dirhistory/dirhistory.plugin.zsh b/plugins/dirhistory/dirhistory.plugin.zsh
index 9f39264cf..2f5a79735 100644
--- a/plugins/dirhistory/dirhistory.plugin.zsh
+++ b/plugins/dirhistory/dirhistory.plugin.zsh
@@ -19,14 +19,14 @@ export DIRHISTORY_SIZE=30
 # Returns the element if the array was not empty,
 # otherwise returns empty string.
 function pop_past() {
-  print -v $1 "${dirhistory_past[$#dirhistory_past]}"
+  typeset $1="${dirhistory_past[$#dirhistory_past]}"
   if [[ $#dirhistory_past -gt 0 ]]; then
     dirhistory_past[$#dirhistory_past]=()
   fi
 }
 
 function pop_future() {
-  print -v $1 "${dirhistory_future[$#dirhistory_future]}"
+  typeset $1="${dirhistory_future[$#dirhistory_future]}"
   if [[ $#dirhistory_future -gt 0 ]]; then
     dirhistory_future[$#dirhistory_future]=()
   fi
diff --git a/themes/adben.zsh-theme b/themes/adben.zsh-theme
index ddb34236b..a11f7b0a9 100644
--- a/themes/adben.zsh-theme
+++ b/themes/adben.zsh-theme
@@ -32,8 +32,8 @@
 
 ########## COLOR ###########
 for COLOR in CYAN WHITE YELLOW MAGENTA BLACK BLUE RED DEFAULT GREEN GREY; do
-  print -v "PR_$COLOR" "%b%{$fg[${(L)COLOR}]%}"
-  print -v "PR_BRIGHT_$COLOR" "%B%{$fg[${(L)COLOR}]%}"
+  typeset PR_$COLOR="%b%{$fg[${(L)COLOR}]%}"
+  typeset PR_BRIGHT_$COLOR="%B%{$fg[${(L)COLOR}]%}"
 done
 PR_RESET="%{$reset_color%}"
 
diff --git a/themes/jonathan.zsh-theme b/themes/jonathan.zsh-theme
index ca58b94a3..fc3cb2caa 100644
--- a/themes/jonathan.zsh-theme
+++ b/themes/jonathan.zsh-theme
@@ -37,8 +37,8 @@ setopt prompt_subst
 # See if we can use colors.
 autoload zsh/terminfo
 for color in RED GREEN YELLOW BLUE MAGENTA CYAN WHITE GREY; do
-  print -v "PR_$color" "%{$terminfo[bold]$fg[${(L)color}]%}"
-  print -v "PR_LIGHT_$color" "%{$fg[${(L)color}]%}"
+  typeset PR_$color="%{$terminfo[bold]$fg[${(L)color}]%}"
+  typeset PR_LIGHT_$color="%{$fg[${(L)color}]%}"
 done
 PR_NO_COLOUR="%{$terminfo[sgr0]%}"
 
diff --git a/themes/simonoff.zsh-theme b/themes/simonoff.zsh-theme
index 201d5d7e4..c7e35e160 100644
--- a/themes/simonoff.zsh-theme
+++ b/themes/simonoff.zsh-theme
@@ -45,8 +45,8 @@ setopt prompt_subst
 # See if we can use colors.
 autoload zsh/terminfo
 for color in RED GREEN YELLOW BLUE MAGENTA CYAN WHITE GREY; do
-  print -v "PR_$color" "%{$terminfo[bold]$fg[${(L)color}]%}"
-  print -v "PR_LIGHT_$color" "%{$fg[${(L)color}]%}"
+  typeset PR_$color="%{$terminfo[bold]$fg[${(L)color}]%}"
+  typeset PR_LIGHT_$color="%{$fg[${(L)color}]%}"
 done
 PR_NO_COLOUR="%{$terminfo[sgr0]%}"
 

From 7d03ea18eda8d89316fdb035fb3840f48a065338 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Thu, 16 Dec 2021 10:15:55 +0100
Subject: [PATCH 611/869] fix: declare variables as global when using `typeset`

Fixes fb86ec77
---
 plugins/dirhistory/dirhistory.plugin.zsh | 4 ++--
 themes/adben.zsh-theme                   | 4 ++--
 themes/jonathan.zsh-theme                | 4 ++--
 themes/simonoff.zsh-theme                | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/plugins/dirhistory/dirhistory.plugin.zsh b/plugins/dirhistory/dirhistory.plugin.zsh
index 2f5a79735..8268147f6 100644
--- a/plugins/dirhistory/dirhistory.plugin.zsh
+++ b/plugins/dirhistory/dirhistory.plugin.zsh
@@ -19,14 +19,14 @@ export DIRHISTORY_SIZE=30
 # Returns the element if the array was not empty,
 # otherwise returns empty string.
 function pop_past() {
-  typeset $1="${dirhistory_past[$#dirhistory_past]}"
+  typeset -g $1="${dirhistory_past[$#dirhistory_past]}"
   if [[ $#dirhistory_past -gt 0 ]]; then
     dirhistory_past[$#dirhistory_past]=()
   fi
 }
 
 function pop_future() {
-  typeset $1="${dirhistory_future[$#dirhistory_future]}"
+  typeset -g $1="${dirhistory_future[$#dirhistory_future]}"
   if [[ $#dirhistory_future -gt 0 ]]; then
     dirhistory_future[$#dirhistory_future]=()
   fi
diff --git a/themes/adben.zsh-theme b/themes/adben.zsh-theme
index a11f7b0a9..c2fdbed23 100644
--- a/themes/adben.zsh-theme
+++ b/themes/adben.zsh-theme
@@ -32,8 +32,8 @@
 
 ########## COLOR ###########
 for COLOR in CYAN WHITE YELLOW MAGENTA BLACK BLUE RED DEFAULT GREEN GREY; do
-  typeset PR_$COLOR="%b%{$fg[${(L)COLOR}]%}"
-  typeset PR_BRIGHT_$COLOR="%B%{$fg[${(L)COLOR}]%}"
+  typeset -g PR_$COLOR="%b%{$fg[${(L)COLOR}]%}"
+  typeset -g PR_BRIGHT_$COLOR="%B%{$fg[${(L)COLOR}]%}"
 done
 PR_RESET="%{$reset_color%}"
 
diff --git a/themes/jonathan.zsh-theme b/themes/jonathan.zsh-theme
index fc3cb2caa..48927f1db 100644
--- a/themes/jonathan.zsh-theme
+++ b/themes/jonathan.zsh-theme
@@ -37,8 +37,8 @@ setopt prompt_subst
 # See if we can use colors.
 autoload zsh/terminfo
 for color in RED GREEN YELLOW BLUE MAGENTA CYAN WHITE GREY; do
-  typeset PR_$color="%{$terminfo[bold]$fg[${(L)color}]%}"
-  typeset PR_LIGHT_$color="%{$fg[${(L)color}]%}"
+  typeset -g PR_$color="%{$terminfo[bold]$fg[${(L)color}]%}"
+  typeset -g PR_LIGHT_$color="%{$fg[${(L)color}]%}"
 done
 PR_NO_COLOUR="%{$terminfo[sgr0]%}"
 
diff --git a/themes/simonoff.zsh-theme b/themes/simonoff.zsh-theme
index c7e35e160..287781d9e 100644
--- a/themes/simonoff.zsh-theme
+++ b/themes/simonoff.zsh-theme
@@ -45,8 +45,8 @@ setopt prompt_subst
 # See if we can use colors.
 autoload zsh/terminfo
 for color in RED GREEN YELLOW BLUE MAGENTA CYAN WHITE GREY; do
-  typeset PR_$color="%{$terminfo[bold]$fg[${(L)color}]%}"
-  typeset PR_LIGHT_$color="%{$fg[${(L)color}]%}"
+  typeset -g PR_$color="%{$terminfo[bold]$fg[${(L)color}]%}"
+  typeset -g PR_LIGHT_$color="%{$fg[${(L)color}]%}"
 done
 PR_NO_COLOUR="%{$terminfo[sgr0]%}"
 

From 4b4cc9a4a57468218b25b10c21c1e6060f42544b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Thu, 16 Dec 2021 10:50:34 +0100
Subject: [PATCH 612/869] fix(cli): fix plugin and theme suggestions in
 completion for older zsh versions

---
 lib/cli.zsh | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/lib/cli.zsh b/lib/cli.zsh
index aed84e08f..4917bc354 100644
--- a/lib/cli.zsh
+++ b/lib/cli.zsh
@@ -68,10 +68,12 @@ function _omz {
 
         _describe 'plugin' valid_plugins ;;
       plugin::info)
-        local -aU plugins=("$ZSH"/plugins/*/{_*,*.plugin.zsh}(.N:h:t) "$ZSH_CUSTOM"/plugins/*/{_*,*.plugin.zsh}(.N:h:t))
+        local -aU plugins
+        plugins=("$ZSH"/plugins/*/{_*,*.plugin.zsh}(.N:h:t) "$ZSH_CUSTOM"/plugins/*/{_*,*.plugin.zsh}(.N:h:t))
         _describe 'plugin' plugins ;;
       theme::(set|use))
-        local -aU themes=("$ZSH"/themes/*.zsh-theme(.N:t:r) "$ZSH_CUSTOM"/**/*.zsh-theme(.N:r:gs:"$ZSH_CUSTOM"/themes/:::gs:"$ZSH_CUSTOM"/:::))
+        local -aU themes
+        themes=("$ZSH"/themes/*.zsh-theme(.N:t:r) "$ZSH_CUSTOM"/**/*.zsh-theme(.N:r:gs:"$ZSH_CUSTOM"/themes/:::gs:"$ZSH_CUSTOM"/:::))
         _describe 'theme' themes ;;
     esac
   elif (( CURRENT > 4 )); then

From 41c15a21599f16a802046f741ac26f80c30c7c31 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Thu, 16 Dec 2021 10:51:25 +0100
Subject: [PATCH 613/869] fix(jonathan): fix top bar alignment with RPROMPT

---
 themes/jonathan.zsh-theme | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/themes/jonathan.zsh-theme b/themes/jonathan.zsh-theme
index 48927f1db..11d799a84 100644
--- a/themes/jonathan.zsh-theme
+++ b/themes/jonathan.zsh-theme
@@ -1,4 +1,6 @@
 function theme_precmd {
+  local TERMWIDTH=$(( COLUMNS - ${ZLE_RPROMPT_INDENT:-1} ))
+
   PR_FILLBAR=""
   PR_PWDLEN=""
 
@@ -7,12 +9,12 @@ function theme_precmd {
   local pwdsize=${#${(%):-%~}}
 
   # Truncate the path if it's too long.
-  if (( promptsize + rubypromptsize + pwdsize > COLUMNS )); then
-    (( PR_PWDLEN = COLUMNS - promptsize ))
+  if (( promptsize + rubypromptsize + pwdsize > TERMWIDTH )); then
+    (( PR_PWDLEN = TERMWIDTH - promptsize ))
   elif [[ "${langinfo[CODESET]}" = UTF-8 ]]; then
-    PR_FILLBAR="\${(l:$(( COLUMNS - (promptsize + rubypromptsize + pwdsize) ))::${PR_HBAR}:)}"
+    PR_FILLBAR="\${(l:$(( TERMWIDTH - (promptsize + rubypromptsize + pwdsize) ))::${PR_HBAR}:)}"
   else
-    PR_FILLBAR="${PR_SHIFT_IN}\${(l:$(( COLUMNS - (promptsize + rubypromptsize + pwdsize) ))::${altchar[q]:--}:)}${PR_SHIFT_OUT}"
+    PR_FILLBAR="${PR_SHIFT_IN}\${(l:$(( TERMWIDTH - (promptsize + rubypromptsize + pwdsize) ))::${altchar[q]:--}:)}${PR_SHIFT_OUT}"
   fi
 }
 

From 010c36d4ab0b6f9037a278c39ed6d41586f25843 Mon Sep 17 00:00:00 2001
From: Logan Linn <logan@loganlinn.com>
Date: Fri, 17 Dec 2021 04:18:28 -0800
Subject: [PATCH 614/869] refactor(fzf): adopt code style and simplify function
 naming (#10514)

---
 plugins/fzf/fzf.plugin.zsh | 274 ++++++++++++++++++-------------------
 1 file changed, 137 insertions(+), 137 deletions(-)

diff --git a/plugins/fzf/fzf.plugin.zsh b/plugins/fzf/fzf.plugin.zsh
index aabd62cb1..50712cbee 100644
--- a/plugins/fzf/fzf.plugin.zsh
+++ b/plugins/fzf/fzf.plugin.zsh
@@ -1,176 +1,176 @@
-function setup_using_base_dir() {
-    local fzf_base fzf_shell fzfdirs dir
+function fzf_setup_using_base_dir() {
+  local fzf_base fzf_shell fzfdirs dir
 
-    test -d "${FZF_BASE}" && fzf_base="${FZF_BASE}"
+  test -d "${FZF_BASE}" && fzf_base="${FZF_BASE}"
+
+  if [[ -z "${fzf_base}" ]]; then
+    fzfdirs=(
+      "${HOME}/.fzf"
+      "${HOME}/.nix-profile/share/fzf"
+      "${XDG_DATA_HOME:-$HOME/.local/share}/fzf"
+      "/usr/local/opt/fzf"
+      "/usr/share/fzf"
+      "/usr/local/share/examples/fzf"
+    )
+    for dir in ${fzfdirs}; do
+      if [[ -d "${dir}" ]]; then
+        fzf_base="${dir}"
+        break
+      fi
+    done
 
     if [[ -z "${fzf_base}" ]]; then
-        fzfdirs=(
-          "${HOME}/.fzf"
-          "${HOME}/.nix-profile/share/fzf"
-          "${XDG_DATA_HOME:-$HOME/.local/share}/fzf"
-          "/usr/local/opt/fzf"
-          "/usr/share/fzf"
-          "/usr/local/share/examples/fzf"
-        )
-        for dir in ${fzfdirs}; do
-            if [[ -d "${dir}" ]]; then
-                fzf_base="${dir}"
-                break
-            fi
-        done
-
-        if [[ -z "${fzf_base}" ]]; then
-            if (( ${+commands[fzf-share]} )) && dir="$(fzf-share)" && [[ -d "${dir}" ]]; then
-                fzf_base="${dir}"
-            elif (( ${+commands[brew]} )) && dir="$(brew --prefix fzf 2>/dev/null)"; then
-                if [[ -d "${dir}" ]]; then
-                    fzf_base="${dir}"
-                fi
-            fi
+      if (( ${+commands[fzf-share]} )) && dir="$(fzf-share)" && [[ -d "${dir}" ]]; then
+        fzf_base="${dir}"
+      elif (( ${+commands[brew]} )) && dir="$(brew --prefix fzf 2>/dev/null)"; then
+        if [[ -d "${dir}" ]]; then
+          fzf_base="${dir}"
         fi
+      fi
     fi
+  fi
 
-    if [[ ! -d "${fzf_base}" ]]; then
-        return 1
-    fi
+  if [[ ! -d "${fzf_base}" ]]; then
+    return 1
+  fi
 
-    # Fix fzf shell directory for Arch Linux, NixOS or Void Linux packages
-    if [[ ! -d "${fzf_base}/shell" ]]; then
-        fzf_shell="${fzf_base}"
-    else
-        fzf_shell="${fzf_base}/shell"
-    fi
+  # Fix fzf shell directory for Arch Linux, NixOS or Void Linux packages
+  if [[ ! -d "${fzf_base}/shell" ]]; then
+    fzf_shell="${fzf_base}"
+  else
+    fzf_shell="${fzf_base}/shell"
+  fi
 
-    # Setup fzf binary path
-    if (( ! ${+commands[fzf]} )) && [[ "$PATH" != *$fzf_base/bin* ]]; then
-        export PATH="$PATH:$fzf_base/bin"
-    fi
+  # Setup fzf binary path
+  if (( ! ${+commands[fzf]} )) && [[ "$PATH" != *$fzf_base/bin* ]]; then
+    export PATH="$PATH:$fzf_base/bin"
+  fi
 
-    # Auto-completion
-    if [[ -o interactive && "$DISABLE_FZF_AUTO_COMPLETION" != "true" ]]; then
-        source "${fzf_shell}/completion.zsh" 2> /dev/null
-    fi
+  # Auto-completion
+  if [[ -o interactive && "$DISABLE_FZF_AUTO_COMPLETION" != "true" ]]; then
+    source "${fzf_shell}/completion.zsh" 2> /dev/null
+  fi
 
-    # Key bindings
-    if [[ "$DISABLE_FZF_KEY_BINDINGS" != "true" ]]; then
-        source "${fzf_shell}/key-bindings.zsh"
-    fi
+  # Key bindings
+  if [[ "$DISABLE_FZF_KEY_BINDINGS" != "true" ]]; then
+    source "${fzf_shell}/key-bindings.zsh"
+  fi
 }
 
 
-function setup_using_debian_package() {
-    if (( ! $+commands[dpkg] )) || ! dpkg -s fzf &>/dev/null; then
-        # Either not a debian based distro, or no fzf installed
-        return 1
-    fi
+function fzf_setup_using_debian() {
+  if (( ! $+commands[dpkg] )) || ! dpkg -s fzf &>/dev/null; then
+    # Either not a debian based distro, or no fzf installed
+    return 1
+  fi
 
-    # NOTE: There is no need to configure PATH for debian package, all binaries
-    # are installed to /usr/bin by default
+  # NOTE: There is no need to configure PATH for debian package, all binaries
+  # are installed to /usr/bin by default
 
-    local completions key_bindings
+  local completions key_bindings
 
-    case $PREFIX in
-        *com.termux*)
-            # Support Termux package
-            completions="${PREFIX}/share/fzf/completion.zsh"
-            key_bindings="${PREFIX}/share/fzf/key-bindings.zsh"
-            ;;
-        *)
-            # Determine completion file path: first bullseye/sid, then buster/stretch
-            completions="/usr/share/doc/fzf/examples/completion.zsh"
-            [[ -f "$completions" ]] || completions="/usr/share/zsh/vendor-completions/_fzf"
-            key_bindings="/usr/share/doc/fzf/examples/key-bindings.zsh"
-            ;;
-    esac
+  case $PREFIX in
+    *com.termux*)
+      # Support Termux package
+      completions="${PREFIX}/share/fzf/completion.zsh"
+      key_bindings="${PREFIX}/share/fzf/key-bindings.zsh"
+      ;;
+    *)
+      # Determine completion file path: first bullseye/sid, then buster/stretch
+      completions="/usr/share/doc/fzf/examples/completion.zsh"
+      [[ -f "$completions" ]] || completions="/usr/share/zsh/vendor-completions/_fzf"
+      key_bindings="/usr/share/doc/fzf/examples/key-bindings.zsh"
+      ;;
+  esac
 
-    # Auto-completion
-    if [[ -o interactive && "$DISABLE_FZF_AUTO_COMPLETION" != "true" ]]; then
-        source $completions 2> /dev/null
-    fi
+  # Auto-completion
+  if [[ -o interactive && "$DISABLE_FZF_AUTO_COMPLETION" != "true" ]]; then
+    source $completions 2> /dev/null
+  fi
 
-    # Key bindings
-    if [[ ! "$DISABLE_FZF_KEY_BINDINGS" == "true" ]]; then
-        source $key_bindings
-    fi
+  # Key bindings
+  if [[ ! "$DISABLE_FZF_KEY_BINDINGS" == "true" ]]; then
+    source $key_bindings
+  fi
 
-    return 0
+  return 0
 }
 
-function setup_using_opensuse_package() {
-    # OpenSUSE installs fzf in /usr/bin/fzf
-    # If the command is not found, the package isn't installed
-    (( $+commands[fzf] )) || return 1
+function fzf_setup_using_opensuse() {
+  # OpenSUSE installs fzf in /usr/bin/fzf
+  # If the command is not found, the package isn't installed
+  (( $+commands[fzf] )) || return 1
 
-    # The fzf-zsh-completion package installs the auto-completion in
-    local completions="/usr/share/zsh/site-functions/_fzf"
-    # The fzf-zsh-completion package installs the key-bindings file in
-    local key_bindings="/etc/zsh_completion.d/fzf-key-bindings"
+  # The fzf-zsh-completion package installs the auto-completion in
+  local completions="/usr/share/zsh/site-functions/_fzf"
+  # The fzf-zsh-completion package installs the key-bindings file in
+  local key_bindings="/etc/zsh_completion.d/fzf-key-bindings"
 
-    # If these are not found: (1) maybe we're not on OpenSUSE, or
-    # (2) maybe the fzf-zsh-completion package isn't installed.
-    if [[ ! -f "$completions" || ! -f "$key_bindings" ]]; then
-        return 1
-    fi
+  # If these are not found: (1) maybe we're not on OpenSUSE, or
+  # (2) maybe the fzf-zsh-completion package isn't installed.
+  if [[ ! -f "$completions" || ! -f "$key_bindings" ]]; then
+    return 1
+  fi
 
-    # Auto-completion
-    if [[ -o interactive && "$DISABLE_FZF_AUTO_COMPLETION" != "true" ]]; then
-        source "$completions" 2>/dev/null
-    fi
+  # Auto-completion
+  if [[ -o interactive && "$DISABLE_FZF_AUTO_COMPLETION" != "true" ]]; then
+    source "$completions" 2>/dev/null
+  fi
 
-    # Key bindings
-    if [[ "$DISABLE_FZF_KEY_BINDINGS" != "true" ]]; then
-        source "$key_bindings" 2>/dev/null
-    fi
+  # Key bindings
+  if [[ "$DISABLE_FZF_KEY_BINDINGS" != "true" ]]; then
+    source "$key_bindings" 2>/dev/null
+  fi
 
-    return 0
+  return 0
 }
 
-function setup_using_openbsd_package() {
-    # openBSD installs fzf in /usr/local/bin/fzf
-    if [[ "$OSTYPE" != openbsd* ]] || (( ! $+commands[fzf] )); then
-        return 1
-    fi
+function fzf_setup_using_openbsd() {
+  # openBSD installs fzf in /usr/local/bin/fzf
+  if [[ "$OSTYPE" != openbsd* ]] || (( ! $+commands[fzf] )); then
+    return 1
+  fi
 
-    # The fzf package installs the auto-completion in
-    local completions="/usr/local/share/zsh/site-functions/_fzf_completion"
-    # The fzf package installs the key-bindings file in
-    local key_bindings="/usr/local/share/zsh/site-functions/_fzf_key_bindings"
+  # The fzf package installs the auto-completion in
+  local completions="/usr/local/share/zsh/site-functions/_fzf_completion"
+  # The fzf package installs the key-bindings file in
+  local key_bindings="/usr/local/share/zsh/site-functions/_fzf_key_bindings"
 
-    # Auto-completion
-    if [[ -o interactive && "$DISABLE_FZF_AUTO_COMPLETION" != "true" ]]; then
-        source "$completions" 2>/dev/null
-    fi
+  # Auto-completion
+  if [[ -o interactive && "$DISABLE_FZF_AUTO_COMPLETION" != "true" ]]; then
+    source "$completions" 2>/dev/null
+  fi
 
-    # Key bindings
-    if [[ "$DISABLE_FZF_KEY_BINDINGS" != "true" ]]; then
-        source "$key_bindings" 2>/dev/null
-    fi
+  # Key bindings
+  if [[ "$DISABLE_FZF_KEY_BINDINGS" != "true" ]]; then
+    source "$key_bindings" 2>/dev/null
+  fi
 
-    return 0
-}
-
-function indicate_error() {
-    cat >&2 <<EOF
-[oh-my-zsh] fzf plugin: Cannot find fzf installation directory.
-Please add \`export FZF_BASE=/path/to/fzf/install/dir\` to your .zshrc
-EOF
+  return 0
 }
 
 # Indicate to user that fzf installation not found if nothing worked
-setup_using_openbsd_package \
-    || setup_using_debian_package \
-    || setup_using_opensuse_package \
-    || setup_using_base_dir \
-    || indicate_error
+function fzf_setup_error() {
+  cat >&2 <<'EOF'
+[oh-my-zsh] fzf plugin: Cannot find fzf installation directory.
+Please add `export FZF_BASE=/path/to/fzf/install/dir` to your .zshrc
+EOF
+}
 
-unset -f setup_using_opensuse_package setup_using_debian_package setup_using_base_dir indicate_error
+fzf_setup_using_openbsd \
+  || fzf_setup_using_debian \
+  || fzf_setup_using_opensuse \
+  || fzf_setup_using_base_dir \
+  || fzf_setup_error
+
+unset -f -m 'fzf_setup_*'
 
 if [[ -z "$FZF_DEFAULT_COMMAND" ]]; then
-    if (( $+commands[rg] )); then
-        export FZF_DEFAULT_COMMAND='rg --files --hidden --glob "!.git/*"'
-    elif (( $+commands[fd] )); then
-        export FZF_DEFAULT_COMMAND='fd --type f --hidden --exclude .git'
-    elif (( $+commands[ag] )); then
-        export FZF_DEFAULT_COMMAND='ag -l --hidden -g "" --ignore .git'
-    fi
+  if (( $+commands[rg] )); then
+    export FZF_DEFAULT_COMMAND='rg --files --hidden --glob "!.git/*"'
+  elif (( $+commands[fd] )); then
+    export FZF_DEFAULT_COMMAND='fd --type f --hidden --exclude .git'
+  elif (( $+commands[ag] )); then
+    export FZF_DEFAULT_COMMAND='ag -l --hidden -g "" --ignore .git'
+  fi
 fi

From 52a46ec362389429049cc36b0806627db02f099e Mon Sep 17 00:00:00 2001
From: Sean Flanigan <sean@flanigan.org>
Date: Sat, 21 Nov 2020 20:52:11 +1000
Subject: [PATCH 615/869] feat(fzf): support fzf in Cygwin (#9463)

Closes #9463
---
 plugins/fzf/fzf.plugin.zsh | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/plugins/fzf/fzf.plugin.zsh b/plugins/fzf/fzf.plugin.zsh
index 50712cbee..102605958 100644
--- a/plugins/fzf/fzf.plugin.zsh
+++ b/plugins/fzf/fzf.plugin.zsh
@@ -149,6 +149,30 @@ function fzf_setup_using_openbsd() {
   return 0
 }
 
+function fzf_setup_using_cygwin() {
+  # Cygwin installs fzf in /usr/local/bin/fzf
+  if [[ "$OSTYPE" != cygwin* ]] || (( ! $+commands[fzf] )); then
+    return 1
+  fi
+
+  # The fzf-zsh-completion package installs the auto-completion in
+  local completions="/etc/profile.d/fzf-completion.zsh"
+  # The fzf-zsh package installs the key-bindings file in
+  local key_bindings="/etc/profile.d/fzf.zsh"
+
+  # Auto-completion
+  if [[ -o interactive && "$DISABLE_FZF_AUTO_COMPLETION" != "true" ]]; then
+    source "$completions" 2>/dev/null
+  fi
+
+  # Key bindings
+  if [[ "$DISABLE_FZF_KEY_BINDINGS" != "true" ]]; then
+    source "$key_bindings" 2>/dev/null
+  fi
+
+  return 0
+}
+
 # Indicate to user that fzf installation not found if nothing worked
 function fzf_setup_error() {
   cat >&2 <<'EOF'
@@ -160,6 +184,7 @@ EOF
 fzf_setup_using_openbsd \
   || fzf_setup_using_debian \
   || fzf_setup_using_opensuse \
+  || fzf_setup_using_cygwin \
   || fzf_setup_using_base_dir \
   || fzf_setup_error
 

From b7fb0a55c03429bd90cbae74fb538bb0dff4b0ea Mon Sep 17 00:00:00 2001
From: smac89 <8305511+smac89@users.noreply.github.com>
Date: Fri, 17 Dec 2021 06:45:06 -0600
Subject: [PATCH 616/869] fix(heroku): fix XDG cache directory name and code
 style (#10436)

---
 plugins/heroku/heroku.plugin.zsh | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/plugins/heroku/heroku.plugin.zsh b/plugins/heroku/heroku.plugin.zsh
index 9a99b4211..d22c1bb2f 100644
--- a/plugins/heroku/heroku.plugin.zsh
+++ b/plugins/heroku/heroku.plugin.zsh
@@ -1,9 +1,9 @@
-HEROKU_AC_CACHE_DIR="$HOME/.cache"
-if [ "$(uname -s)" = "Darwin" ]; then
-  HEROKU_AC_CACHE_DIR="$HOME/Library/Caches"
+if [[ "$OSTYPE" = darwin* ]]; then
+  cache_dir="${HOME}/Library/Caches"
+else
+  cache_dir="${XDG_CACHE_HOME:-"${HOME}/.cache"}"
 fi
-if [ ! -z "$XDG_CACHE_HOME" ]; then
-  HEROKU_AC_CACHE_DIR="$XDG_CACHE_DIR"
-fi
-HEROKU_AC_ZSH_SETUP_PATH=$HEROKU_AC_CACHE_DIR/heroku/autocomplete/zsh_setup
-[ -f $HEROKU_AC_ZSH_SETUP_PATH ] && source $HEROKU_AC_ZSH_SETUP_PATH
+
+setup_path="${cache_dir}/heroku/autocomplete/zsh_setup"
+[[ -f "$setup_path" ]] && source $setup_path
+unset cache_dir setup_path

From 44c6a71243092e32ba4760743338f0bf130f6409 Mon Sep 17 00:00:00 2001
From: Carlo Sala <carlosalag@protonmail.com>
Date: Sat, 18 Dec 2021 00:40:57 +0100
Subject: [PATCH 617/869] feat(deno): adding drA alias for --allow-all (#10501)

---
 plugins/deno/README.md       | 1 +
 plugins/deno/deno.plugin.zsh | 1 +
 2 files changed, 2 insertions(+)

diff --git a/plugins/deno/README.md b/plugins/deno/README.md
index 828e6af39..691318397 100644
--- a/plugins/deno/README.md
+++ b/plugins/deno/README.md
@@ -13,6 +13,7 @@ This plugin sets up completion and aliases for [Deno](https://deno.land).
 | dh    | deno help        |
 | dli   | deno lint        |
 | drn   | deno run         |
+| drA   | deno run -A      |
 | drw   | deno run --watch |
 | dts   | deno test        |
 | dup   | deno upgrade     |
diff --git a/plugins/deno/deno.plugin.zsh b/plugins/deno/deno.plugin.zsh
index 34adddc37..eb7191971 100644
--- a/plugins/deno/deno.plugin.zsh
+++ b/plugins/deno/deno.plugin.zsh
@@ -6,6 +6,7 @@ alias dfmt='deno fmt'
 alias dh='deno help'
 alias dli='deno lint'
 alias drn='deno run'
+alias drA='deno run -A'
 alias drw='deno run --watch'
 alias dts='deno test'
 alias dup='deno upgrade'

From 08d086a09c0181b733a9f5565fc242ca148fd80a Mon Sep 17 00:00:00 2001
From: Patrick Fitzgerald <auskast03@gmail.com>
Date: Fri, 17 Dec 2021 15:47:56 -0800
Subject: [PATCH 618/869] feat(volta): add volta plugin (#10441)

For Volta JavaScript toolchain
https://github.com/volta-cli/volta
---
 plugins/volta/README.md |  11 ++
 plugins/volta/_volta    | 298 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 309 insertions(+)
 create mode 100644 plugins/volta/README.md
 create mode 100644 plugins/volta/_volta

diff --git a/plugins/volta/README.md b/plugins/volta/README.md
new file mode 100644
index 000000000..d5972d56c
--- /dev/null
+++ b/plugins/volta/README.md
@@ -0,0 +1,11 @@
+# Volta
+
+This plugin provides completion for [Volta](https://volta.sh/).
+
+To use it add volta to the plugins array in your zshrc file.
+
+```bash
+plugins=(... volta)
+```
+
+This plugin installs no aliases.
diff --git a/plugins/volta/_volta b/plugins/volta/_volta
new file mode 100644
index 000000000..295b80362
--- /dev/null
+++ b/plugins/volta/_volta
@@ -0,0 +1,298 @@
+#compdef volta
+
+autoload -U is-at-least
+
+_volta() {
+    typeset -A opt_args
+    typeset -a _arguments_options
+    local ret=1
+
+    if is-at-least 5.2; then
+        _arguments_options=(-s -S -C)
+    else
+        _arguments_options=(-s -C)
+    fi
+
+    local context curcontext="$curcontext" state line
+    _arguments "${_arguments_options[@]}" \
+'--verbose[Enables verbose diagnostics]' \
+'(--verbose)--quiet[Prevents unnecessary output]' \
+'-v[Prints the current version of Volta]' \
+'--version[Prints the current version of Volta]' \
+'-h[Prints help information]' \
+'--help[Prints help information]' \
+":: :_volta_commands" \
+"*::: :->Volta" \
+&& ret=0
+    case $state in
+    (Volta)
+        words=($line[1] "${words[@]}")
+        (( CURRENT += 1 ))
+        curcontext="${curcontext%:*:*}:volta-command-$line[1]:"
+        case $line[1] in
+            (fetch)
+_arguments "${_arguments_options[@]}" \
+'-h[Prints help information]' \
+'--help[Prints help information]' \
+'-V[Prints version information]' \
+'--version[Prints version information]' \
+'--verbose[Enables verbose diagnostics]' \
+'(--verbose)--quiet[Prevents unnecessary output]' \
+':tool[@version] -- Tools to fetch, like `node`, `yarn@latest` or `your-package@^14.4.3`.:_files' \
+&& ret=0
+;;
+(install)
+_arguments "${_arguments_options[@]}" \
+'-h[Prints help information]' \
+'--help[Prints help information]' \
+'-V[Prints version information]' \
+'--version[Prints version information]' \
+'--verbose[Enables verbose diagnostics]' \
+'(--verbose)--quiet[Prevents unnecessary output]' \
+':tool[@version] -- Tools to install, like `node`, `yarn@latest` or `your-package@^14.4.3`.:_files' \
+&& ret=0
+;;
+(uninstall)
+_arguments "${_arguments_options[@]}" \
+'-h[Prints help information]' \
+'--help[Prints help information]' \
+'-V[Prints version information]' \
+'--version[Prints version information]' \
+'--verbose[Enables verbose diagnostics]' \
+'(--verbose)--quiet[Prevents unnecessary output]' \
+':tool -- The tool to uninstall, e.g. `node`, `npm`, `yarn`, or <package>:_files' \
+&& ret=0
+;;
+(pin)
+_arguments "${_arguments_options[@]}" \
+'-h[Prints help information]' \
+'--help[Prints help information]' \
+'-V[Prints version information]' \
+'--version[Prints version information]' \
+'--verbose[Enables verbose diagnostics]' \
+'(--verbose)--quiet[Prevents unnecessary output]' \
+':tool[@version] -- Tools to pin, like `node@lts` or `yarn@^1.14`.:_files' \
+&& ret=0
+;;
+(ls)
+_arguments "${_arguments_options[@]}" \
+'--format=[Specify the output format]: :(human plain)' \
+'(-d --default)-c[Show the currently-active tool(s)]' \
+'(-d --default)--current[Show the currently-active tool(s)]' \
+'(-c --current)-d[Show your default tool(s).]' \
+'(-c --current)--default[Show your default tool(s).]' \
+'-h[Prints help information]' \
+'--help[Prints help information]' \
+'-V[Prints version information]' \
+'--version[Prints version information]' \
+'--verbose[Enables verbose diagnostics]' \
+'(--verbose)--quiet[Prevents unnecessary output]' \
+'::tool -- The tool to lookup - `all`, `node`, `yarn`, or the name of a package or binary.:_files' \
+&& ret=0
+;;
+(list)
+_arguments "${_arguments_options[@]}" \
+'--format=[Specify the output format]: :(human plain)' \
+'(-d --default)-c[Show the currently-active tool(s)]' \
+'(-d --default)--current[Show the currently-active tool(s)]' \
+'(-c --current)-d[Show your default tool(s).]' \
+'(-c --current)--default[Show your default tool(s).]' \
+'-h[Prints help information]' \
+'--help[Prints help information]' \
+'-V[Prints version information]' \
+'--version[Prints version information]' \
+'--verbose[Enables verbose diagnostics]' \
+'(--verbose)--quiet[Prevents unnecessary output]' \
+'::tool -- The tool to lookup - `all`, `node`, `yarn`, or the name of a package or binary.:_files' \
+&& ret=0
+;;
+(completions)
+_arguments "${_arguments_options[@]}" \
+'-o+[File to write generated completions to]' \
+'--output=[File to write generated completions to]' \
+'-f[Write over an existing file, if any.]' \
+'--force[Write over an existing file, if any.]' \
+'-h[Prints help information]' \
+'--help[Prints help information]' \
+'-V[Prints version information]' \
+'--version[Prints version information]' \
+'--verbose[Enables verbose diagnostics]' \
+'(--verbose)--quiet[Prevents unnecessary output]' \
+':shell -- Shell to generate completions for:(zsh bash fish powershell elvish)' \
+&& ret=0
+;;
+(which)
+_arguments "${_arguments_options[@]}" \
+'-h[Prints help information]' \
+'--help[Prints help information]' \
+'-V[Prints version information]' \
+'--version[Prints version information]' \
+'--verbose[Enables verbose diagnostics]' \
+'(--verbose)--quiet[Prevents unnecessary output]' \
+':binary -- The binary to find, e.g. `node` or `npm`:_files' \
+&& ret=0
+;;
+(use)
+_arguments "${_arguments_options[@]}" \
+'-h[Prints help information]' \
+'--help[Prints help information]' \
+'-V[Prints version information]' \
+'--version[Prints version information]' \
+'--verbose[Enables verbose diagnostics]' \
+'(--verbose)--quiet[Prevents unnecessary output]' \
+'::anything:_files' \
+&& ret=0
+;;
+(setup)
+_arguments "${_arguments_options[@]}" \
+'-h[Prints help information]' \
+'--help[Prints help information]' \
+'-V[Prints version information]' \
+'--version[Prints version information]' \
+'--verbose[Enables verbose diagnostics]' \
+'(--verbose)--quiet[Prevents unnecessary output]' \
+&& ret=0
+;;
+(run)
+_arguments "${_arguments_options[@]}" \
+'--node=[Set the custom Node version]' \
+'(--bundled-npm)--npm=[Set the custom npm version]' \
+'(--no-yarn)--yarn=[Set the custom Yarn version]' \
+'*--env=[Set an environment variable (can be used multiple times)]' \
+'(--npm)--bundled-npm[Forces npm to be the version bundled with Node]' \
+'(--yarn)--no-yarn[Disables Yarn]' \
+'-h[Prints help information]' \
+'--help[Prints help information]' \
+'-V[Prints version information]' \
+'--version[Prints version information]' \
+'--verbose[Enables verbose diagnostics]' \
+'(--verbose)--quiet[Prevents unnecessary output]' \
+':command -- The command to run:_files' \
+'::args -- Arguments to pass to the command:_files' \
+&& ret=0
+;;
+(help)
+_arguments "${_arguments_options[@]}" \
+'-h[Prints help information]' \
+'--help[Prints help information]' \
+'-V[Prints version information]' \
+'--version[Prints version information]' \
+'--verbose[Enables verbose diagnostics]' \
+'(--verbose)--quiet[Prevents unnecessary output]' \
+&& ret=0
+;;
+        esac
+    ;;
+esac
+}
+
+(( $+functions[_volta_commands] )) ||
+_volta_commands() {
+    local commands; commands=(
+        "fetch:Fetches a tool to the local machine" \
+"install:Installs a tool in your toolchain" \
+"uninstall:Uninstalls a tool from your toolchain" \
+"pin:Pins your project's runtime or package manager" \
+"list:Displays the current toolchain" \
+"completions:Generates Volta completions" \
+"which:Locates the actual binary that will be called by Volta" \
+"use:" \
+"setup:Enables Volta for the current user / shell" \
+"run:Run a command with custom Node, npm, and/or Yarn versions" \
+"help:Prints this message or the help of the given subcommand(s)" \
+    )
+    _describe -t commands 'volta commands' commands "$@"
+}
+(( $+functions[_volta__completions_commands] )) ||
+_volta__completions_commands() {
+    local commands; commands=(
+        
+    )
+    _describe -t commands 'volta completions commands' commands "$@"
+}
+(( $+functions[_volta__fetch_commands] )) ||
+_volta__fetch_commands() {
+    local commands; commands=(
+        
+    )
+    _describe -t commands 'volta fetch commands' commands "$@"
+}
+(( $+functions[_volta__help_commands] )) ||
+_volta__help_commands() {
+    local commands; commands=(
+        
+    )
+    _describe -t commands 'volta help commands' commands "$@"
+}
+(( $+functions[_volta__install_commands] )) ||
+_volta__install_commands() {
+    local commands; commands=(
+        
+    )
+    _describe -t commands 'volta install commands' commands "$@"
+}
+(( $+functions[_volta__list_commands] )) ||
+_volta__list_commands() {
+    local commands; commands=(
+        
+    )
+    _describe -t commands 'volta list commands' commands "$@"
+}
+(( $+functions[_ls_commands] )) ||
+_ls_commands() {
+    local commands; commands=(
+        
+    )
+    _describe -t commands 'ls commands' commands "$@"
+}
+(( $+functions[_volta__ls_commands] )) ||
+_volta__ls_commands() {
+    local commands; commands=(
+        
+    )
+    _describe -t commands 'volta ls commands' commands "$@"
+}
+(( $+functions[_volta__pin_commands] )) ||
+_volta__pin_commands() {
+    local commands; commands=(
+        
+    )
+    _describe -t commands 'volta pin commands' commands "$@"
+}
+(( $+functions[_volta__run_commands] )) ||
+_volta__run_commands() {
+    local commands; commands=(
+        
+    )
+    _describe -t commands 'volta run commands' commands "$@"
+}
+(( $+functions[_volta__setup_commands] )) ||
+_volta__setup_commands() {
+    local commands; commands=(
+        
+    )
+    _describe -t commands 'volta setup commands' commands "$@"
+}
+(( $+functions[_volta__uninstall_commands] )) ||
+_volta__uninstall_commands() {
+    local commands; commands=(
+        
+    )
+    _describe -t commands 'volta uninstall commands' commands "$@"
+}
+(( $+functions[_volta__use_commands] )) ||
+_volta__use_commands() {
+    local commands; commands=(
+        
+    )
+    _describe -t commands 'volta use commands' commands "$@"
+}
+(( $+functions[_volta__which_commands] )) ||
+_volta__which_commands() {
+    local commands; commands=(
+        
+    )
+    _describe -t commands 'volta which commands' commands "$@"
+}
+
+_volta "$@"
\ No newline at end of file

From a150d8a7c0040de5a1b0246728dc3c2af3b4c423 Mon Sep 17 00:00:00 2001
From: jxlwqq <jxlwqq@gmail.com>
Date: Sat, 18 Dec 2021 07:54:19 +0800
Subject: [PATCH 619/869] feat(istioctl): add plugin for istioctl (#10410)

* Add plugin for istioctl completion. close #10405

* fix typo

* Update README.md
---
 plugins/istioctl/README.md           | 9 +++++++++
 plugins/istioctl/istioctl.plugin.zsh | 4 ++++
 2 files changed, 13 insertions(+)
 create mode 100644 plugins/istioctl/README.md
 create mode 100644 plugins/istioctl/istioctl.plugin.zsh

diff --git a/plugins/istioctl/README.md b/plugins/istioctl/README.md
new file mode 100644
index 000000000..afd4d293c
--- /dev/null
+++ b/plugins/istioctl/README.md
@@ -0,0 +1,9 @@
+# Istioctl - Istio Command-line Tool
+
+The [istioctl](https://istio.io/latest/docs/ops/diagnostic-tools/istioctl/) tool is a configuration command line utility that allows service operators to debug and diagnose their Istio service mesh deployments.
+
+To use it, add `istioctl` to the plugins array of your zshrc file:
+
+```sh
+plugins=(... istioctl)
+```
diff --git a/plugins/istioctl/istioctl.plugin.zsh b/plugins/istioctl/istioctl.plugin.zsh
new file mode 100644
index 000000000..13ead1b2b
--- /dev/null
+++ b/plugins/istioctl/istioctl.plugin.zsh
@@ -0,0 +1,4 @@
+if [ $commands[istioctl] ]; then
+  source <(istioctl completion zsh)
+  compdef _istioctl istioctl
+fi

From f8c76d55a7c26ba7061d95ed4ba7fb200f3e6cde Mon Sep 17 00:00:00 2001
From: theVerusDev <richard.p23@protonmail.com>
Date: Fri, 17 Dec 2021 19:02:06 -0500
Subject: [PATCH 620/869] feat(cnf): Added support for SUSE-derived operation
 systems (ZYpp) to CNF plugin (#10508)

* Added support for SUSE and derivatives for command-not-found plugin

* Updated command-not-found documentation to list support for SUSE and derivatives
---
 plugins/command-not-found/README.md                    | 1 +
 plugins/command-not-found/command-not-found.plugin.zsh | 7 +++++++
 2 files changed, 8 insertions(+)

diff --git a/plugins/command-not-found/README.md b/plugins/command-not-found/README.md
index f267f0c89..5a373c537 100644
--- a/plugins/command-not-found/README.md
+++ b/plugins/command-not-found/README.md
@@ -29,5 +29,6 @@ It works out of the box with the command-not-found packages for:
 - [Fedora](https://fedoraproject.org/wiki/Features/PackageKitCommandNotFound)
 - [NixOS](https://github.com/NixOS/nixpkgs/tree/master/nixos/modules/programs/command-not-found)
 - [Termux](https://github.com/termux/command-not-found)
+- [SUSE](https://www.unix.com/man-page/suse/1/command-not-found/)
 
 You can add support for other platforms by submitting a Pull Request.
diff --git a/plugins/command-not-found/command-not-found.plugin.zsh b/plugins/command-not-found/command-not-found.plugin.zsh
index e46350604..cb8a8989c 100644
--- a/plugins/command-not-found/command-not-found.plugin.zsh
+++ b/plugins/command-not-found/command-not-found.plugin.zsh
@@ -60,3 +60,10 @@ if [[ -x /data/data/com.termux/files/usr/libexec/termux/command-not-found ]]; th
     /data/data/com.termux/files/usr/libexec/termux/command-not-found "$1"
   }
 fi
+
+# SUSE and derivates: https://www.unix.com/man-page/suse/1/command-not-found/
+if [[ -x /usr/bin/command-not-found ]]; then
+  command_not_found_handler() {
+    /usr/bin/command-not-found "$1"
+  }
+fi

From 481b912fd794827de435f50f44fbd047fa9d6a0e Mon Sep 17 00:00:00 2001
From: Robi Nino <robin@jfrog.com>
Date: Sat, 18 Dec 2021 02:03:20 +0200
Subject: [PATCH 621/869] feat(jfrog): Support jf executable auto completion
 (#10503)

---
 plugins/jfrog/jfrog.plugin.zsh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/plugins/jfrog/jfrog.plugin.zsh b/plugins/jfrog/jfrog.plugin.zsh
index 064ffa2db..1441bc107 100644
--- a/plugins/jfrog/jfrog.plugin.zsh
+++ b/plugins/jfrog/jfrog.plugin.zsh
@@ -7,4 +7,5 @@ _jfrog() {
 	fi
 }
 
-compdef _jfrog jfrog
\ No newline at end of file
+compdef _jfrog jfrog
+compdef _jfrog jf

From 1e263e245d2760bd3bc35d81c761ad00f0d0a83f Mon Sep 17 00:00:00 2001
From: jxlwqq <jxlwqq@gmail.com>
Date: Sat, 18 Dec 2021 08:04:31 +0800
Subject: [PATCH 622/869] feat(operator-sdk): add plugin for operator-sdk
 (#10423)

---
 plugins/operator-sdk/README.md               | 11 +++++++++++
 plugins/operator-sdk/operator-sdk.plugin.zsh |  4 ++++
 2 files changed, 15 insertions(+)
 create mode 100644 plugins/operator-sdk/README.md
 create mode 100644 plugins/operator-sdk/operator-sdk.plugin.zsh

diff --git a/plugins/operator-sdk/README.md b/plugins/operator-sdk/README.md
new file mode 100644
index 000000000..3336e36ef
--- /dev/null
+++ b/plugins/operator-sdk/README.md
@@ -0,0 +1,11 @@
+# Operator SDK
+
+[Operator SDK](https://sdk.operatorframework.io/) is a component of the Operator Framework, an open source toolkit to manage Kubernetes native applications, called Operators, in an effective, automated, and scalable way.
+
+To use it, add `operator-sdk` to the plugins array of your zshrc file:
+
+```sh
+plugins=(... operator-sdk)
+```
+
+
diff --git a/plugins/operator-sdk/operator-sdk.plugin.zsh b/plugins/operator-sdk/operator-sdk.plugin.zsh
new file mode 100644
index 000000000..baeb01a80
--- /dev/null
+++ b/plugins/operator-sdk/operator-sdk.plugin.zsh
@@ -0,0 +1,4 @@
+if [ $commands[operator-sdk] ]; then
+  source <(operator-sdk completion zsh)
+  compdef _operator-sdk operator-sdk
+fi

From 8d02dabbb616a149d23ab5668b6db5428d5182ac Mon Sep 17 00:00:00 2001
From: Eric <192110+scribe@users.noreply.github.com>
Date: Fri, 17 Dec 2021 17:12:31 -0700
Subject: [PATCH 623/869] docs(README): Document .pre-oh-my-zsh (#10315)

---
 README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.md b/README.md
index 310283e92..94a200850 100644
--- a/README.md
+++ b/README.md
@@ -37,6 +37,8 @@ Oh My Zsh is installed by running one of the following commands in your terminal
 | **wget**  | `sh -c "$(wget -O- https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)"`   |
 | **fetch** | `sh -c "$(fetch -o - https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)"` |
 
+_Note that previous configuration in `.zshrc` will be placed in `.pre-oh-my-zsh`. After installation you can move configuration you want to preserve into `.zshrc`._
+
 #### Manual inspection
 
 It's a good idea to inspect the install script from projects you don't yet know. You can do

From 3a3a44c7b583d5518f28c8679298256bdbd0780b Mon Sep 17 00:00:00 2001
From: Celestino Gomes <tinorj@gmail.com>
Date: Fri, 17 Dec 2021 21:14:14 -0300
Subject: [PATCH 624/869] feat(rvm): add alias `rvms` (#10219)

* feat(rvm): add alias `rvms`

* docs(rvm): new alias `rvms`
---
 plugins/rvm/README.md      | 1 +
 plugins/rvm/rvm.plugin.zsh | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/plugins/rvm/README.md b/plugins/rvm/README.md
index 1ed8d46a2..b0977f53a 100644
--- a/plugins/rvm/README.md
+++ b/plugins/rvm/README.md
@@ -18,3 +18,4 @@ plugins=(... rvm)
 | `rb21`         | `rvm use ruby-2.1.2` |
 | `rvm-update`   | `rvm get head`       |
 | `gems`         | `gem list`           |
+| `rvms`         | `rvm gemset`         |
diff --git a/plugins/rvm/rvm.plugin.zsh b/plugins/rvm/rvm.plugin.zsh
index 53e809aaf..c5918f289 100644
--- a/plugins/rvm/rvm.plugin.zsh
+++ b/plugins/rvm/rvm.plugin.zsh
@@ -1,7 +1,8 @@
 fpath=($rvm_path/scripts/zsh/Completion $fpath)
 
 alias rubies='rvm list rubies'
-alias gemsets='rvm gemset list'
+alias rvms='rvm gemset'
+alias gemsets='rvms list'
 
 local ruby18='ruby-1.8.7'
 local ruby19='ruby-1.9.3'

From 904f8685f75ff5dd3f544f8c6f2cabb8e5952e9a Mon Sep 17 00:00:00 2001
From: Ming Aldrich-Gan <mingaldrichgan@gmail.com>
Date: Fri, 17 Dec 2021 18:15:39 -0600
Subject: [PATCH 625/869] feat(brew): improve `brews` list layout (#10135)

This is an improvement (in my opinion) to the `brews` command that prints each leaf formula (in white), followed by its dependencies (in blue), on each line. Compared to the existing flat list of formulae, the new layout is both more compact and more informative, by differentiating leaves from dependencies at a glance.

Screenshot:
<img width="530" src="https://user-images.githubusercontent.com/1753319/130641713-b78535c9-e3f5-4dbb-80f8-22bc00e1129d.png">
---
 plugins/brew/brew.plugin.zsh | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/plugins/brew/brew.plugin.zsh b/plugins/brew/brew.plugin.zsh
index 532dd9be7..070a083d0 100644
--- a/plugins/brew/brew.plugin.zsh
+++ b/plugins/brew/brew.plugin.zsh
@@ -1,5 +1,4 @@
 alias brewp='brew pin'
-alias brews='brew list -1'
 alias brewsp='brew list --pinned'
 alias bubo='brew update && brew outdated'
 alias bubc='brew upgrade && brew cleanup'
@@ -7,3 +6,16 @@ alias bubu='bubo && bubc'
 alias buf='brew upgrade --formula'
 alias bcubo='brew update && brew outdated --cask'
 alias bcubc='brew upgrade --cask && brew cleanup'
+
+function brews() {
+  local formulae="$(brew leaves | xargs brew deps --installed --for-each)"
+  local casks="$(brew list --cask)"
+
+  local blue="$(tput setaf 4)"
+  local bold="$(tput bold)"
+  local off="$(tput sgr0)"
+
+  echo "${blue}==>${off} ${bold}Formulae${off}"
+  echo "${formulae}" | sed "s/^\(.*\):\(.*\)$/\1${blue}\2${off}/"
+  echo "\n${blue}==>${off} ${bold}Casks${off}\n${casks}"
+}

From a1ec96d125ad421bc291563378b96711689cb1b8 Mon Sep 17 00:00:00 2001
From: rutriff <mail@alextri.ru>
Date: Wed, 28 Oct 2020 20:31:26 +0300
Subject: [PATCH 626/869] fix(af-magic): add space before git and hg
 information (#9396)

Closes #9396
---
 themes/af-magic.zsh-theme | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/themes/af-magic.zsh-theme b/themes/af-magic.zsh-theme
index d939d546f..2ef9b02d7 100644
--- a/themes/af-magic.zsh-theme
+++ b/themes/af-magic.zsh-theme
@@ -30,13 +30,13 @@ fi
 RPS1+=" ${FG[237]}%n@%m%{$reset_color%}"
 
 # git settings
-ZSH_THEME_GIT_PROMPT_PREFIX="${FG[075]}(${FG[078]}"
+ZSH_THEME_GIT_PROMPT_PREFIX=" ${FG[075]}(${FG[078]}"
 ZSH_THEME_GIT_PROMPT_CLEAN=""
 ZSH_THEME_GIT_PROMPT_DIRTY="${FG[214]}*%{$reset_color%}"
 ZSH_THEME_GIT_PROMPT_SUFFIX="${FG[075]})%{$reset_color%}"
 
 # hg settings
-ZSH_THEME_HG_PROMPT_PREFIX="${FG[075]}(${FG[078]}"
+ZSH_THEME_HG_PROMPT_PREFIX=" ${FG[075]}(${FG[078]}"
 ZSH_THEME_HG_PROMPT_CLEAN=""
 ZSH_THEME_HG_PROMPT_DIRTY="${FG[214]}*%{$reset_color%}"
 ZSH_THEME_HG_PROMPT_SUFFIX="${FG[075]})%{$reset_color%}"

From 8ae373130c8da1458323a196505355c710869e38 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Tue, 21 Dec 2021 17:01:56 +0100
Subject: [PATCH 627/869] fix(cli): respect `ZDOTDIR` in plugin/theme change
 commands (#10520)

Fixes #10520
---
 lib/cli.zsh | 49 ++++++++++++++++++++++++++-----------------------
 1 file changed, 26 insertions(+), 23 deletions(-)

diff --git a/lib/cli.zsh b/lib/cli.zsh
index 4917bc354..8cf8368e6 100644
--- a/lib/cli.zsh
+++ b/lib/cli.zsh
@@ -276,9 +276,10 @@ multi == 1 && length(\$0) > 0 {
 { print \$0 }
 "
 
-  awk "$awk_script" ~/.zshrc > ~/.zshrc.new \
-  && command mv -f ~/.zshrc ~/.zshrc.bck \
-  && command mv -f ~/.zshrc.new ~/.zshrc
+  local zdot="${ZDOTDIR:-$HOME}"
+  awk "$awk_script" "$zdot/.zshrc" > "$zdot/.zshrc.new" \
+  && command mv -f "$zdot/.zshrc" "$zdot/.zshrc.bck" \
+  && command mv -f "$zdot/.zshrc.new" "$zdot/.zshrc"
 
   # Exit if the new .zshrc file wasn't created correctly
   [[ $? -eq 0 ]] || {
@@ -288,10 +289,10 @@ multi == 1 && length(\$0) > 0 {
   }
 
   # Exit if the new .zshrc file has syntax errors
-  if ! zsh -n ~/.zshrc; then
-    _omz::log error "broken syntax in ~/.zshrc. Rolling back changes..."
-    command mv -f ~/.zshrc ~/.zshrc.new
-    command mv -f ~/.zshrc.bck ~/.zshrc
+  if ! zsh -n "$zdot/.zshrc"; then
+    _omz::log error "broken syntax in '"${zdot/#$HOME/\~}/.zshrc"'. Rolling back changes..."
+    command mv -f "$zdot/.zshrc" "$zdot/.zshrc.new"
+    command mv -f "$zdot/.zshrc.bck" "$zdot/.zshrc"
     return 1
   fi
 
@@ -351,9 +352,10 @@ multi == 1 && /^[^#]*\)/ {
 { print \$0 }
 "
 
-  awk "$awk_script" ~/.zshrc > ~/.zshrc.new \
-  && command mv -f ~/.zshrc ~/.zshrc.bck \
-  && command mv -f ~/.zshrc.new ~/.zshrc
+  local zdot="${ZDOTDIR:-$HOME}"
+  awk "$awk_script" "$zdot/.zshrc" > "$zdot/.zshrc.new" \
+  && command mv -f "$zdot/.zshrc" "$zdot/.zshrc.bck" \
+  && command mv -f "$zdot/.zshrc.new" "$zdot/.zshrc"
 
   # Exit if the new .zshrc file wasn't created correctly
   [[ $? -eq 0 ]] || {
@@ -363,10 +365,10 @@ multi == 1 && /^[^#]*\)/ {
   }
 
   # Exit if the new .zshrc file has syntax errors
-  if ! zsh -n ~/.zshrc; then
-    _omz::log error "broken syntax in ~/.zshrc. Rolling back changes..."
-    command mv -f ~/.zshrc ~/.zshrc.new
-    command mv -f ~/.zshrc.bck ~/.zshrc
+  if ! zsh -n "$zdot/.zshrc"; then
+    _omz::log error "broken syntax in '"${zdot/#$HOME/\~}/.zshrc"'. Rolling back changes..."
+    command mv -f "$zdot/.zshrc" "$zdot/.zshrc.new"
+    command mv -f "$zdot/.zshrc.bck" "$zdot/.zshrc"
     return 1
   fi
 
@@ -698,17 +700,18 @@ END {
 }
 '
 
-  awk "$awk_script" ~/.zshrc > ~/.zshrc.new \
+  local zdot="${ZDOTDIR:-$HOME}"
+  awk "$awk_script" "$zdot/.zshrc" > "$zdot/.zshrc.new" \
   || {
     # Prepend ZSH_THEME= line to .zshrc if it doesn't exist
     cat <<EOF
 ZSH_THEME="$1" # set by \`omz\`
 
 EOF
-    cat ~/.zshrc
-  } > ~/.zshrc.new \
-  && command mv -f ~/.zshrc ~/.zshrc.bck \
-  && command mv -f ~/.zshrc.new ~/.zshrc
+    cat "$zdot/.zshrc"
+  } > "$zdot/.zshrc.new" \
+  && command mv -f "$zdot/.zshrc" "$zdot/.zshrc.bck" \
+  && command mv -f "$zdot/.zshrc.new" "$zdot/.zshrc"
 
   # Exit if the new .zshrc file wasn't created correctly
   [[ $? -eq 0 ]] || {
@@ -718,10 +721,10 @@ EOF
   }
 
   # Exit if the new .zshrc file has syntax errors
-  if ! zsh -n ~/.zshrc; then
-    _omz::log error "broken syntax in ~/.zshrc. Rolling back changes..."
-    command mv -f ~/.zshrc ~/.zshrc.new
-    command mv -f ~/.zshrc.bck ~/.zshrc
+  if ! zsh -n "$zdot/.zshrc"; then
+    _omz::log error "broken syntax in '"${zdot/#$HOME/\~}/.zshrc"'. Rolling back changes..."
+    command mv -f "$zdot/.zshrc" "$zdot/.zshrc.new"
+    command mv -f "$zdot/.zshrc.bck" "$zdot/.zshrc"
     return 1
   fi
 

From bd0b4b64c6ceaddbd01c6ec35a56f1d72bae4072 Mon Sep 17 00:00:00 2001
From: Sergei Shishov <sshishov@users.noreply.github.com>
Date: Sun, 5 Dec 2021 11:48:00 +0400
Subject: [PATCH 628/869] fix(asdf): fix path to Homebrew installation of
 `asdf` (#10481)

Fixes #10484
Closes #10481
---
 plugins/asdf/asdf.plugin.zsh | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/plugins/asdf/asdf.plugin.zsh b/plugins/asdf/asdf.plugin.zsh
index c386d57ed..da53eef8e 100644
--- a/plugins/asdf/asdf.plugin.zsh
+++ b/plugins/asdf/asdf.plugin.zsh
@@ -4,16 +4,18 @@ ASDF_COMPLETIONS="$ASDF_DIR/completions"
 
 # If not found, check for Homebrew package
 if [[ ! -f "$ASDF_DIR/asdf.sh" || ! -f "$ASDF_COMPLETIONS/asdf.bash" ]] && (( $+commands[brew] )); then
-   ASDF_DIR="$(brew --prefix asdf)"
-   ASDF_COMPLETIONS="$ASDF_DIR/etc/bash_completion.d"
+  brew_prefix="$(brew --prefix asdf)"
+  ASDF_DIR="${brew_prefix}/libexec"
+  ASDF_COMPLETIONS="${brew_prefix}/etc/bash_completion.d"
+  unset brew_prefix
 fi
 
 # Load command
 if [[ -f "$ASDF_DIR/asdf.sh" ]]; then
-    . "$ASDF_DIR/asdf.sh"
+  . "$ASDF_DIR/asdf.sh"
 
-    # Load completions
-    if [[ -f "$ASDF_COMPLETIONS/asdf.bash" ]]; then
-        . "$ASDF_COMPLETIONS/asdf.bash"
-    fi
+  # Load completions
+  if [[ -f "$ASDF_COMPLETIONS/asdf.bash" ]]; then
+    . "$ASDF_COMPLETIONS/asdf.bash"
+  fi
 fi

From 6babcbd8841335a3c25ec960ff57ab9a139c9073 Mon Sep 17 00:00:00 2001
From: alexandregv <contact@alexandregv.fr>
Date: Thu, 6 May 2021 19:02:37 +0200
Subject: [PATCH 629/869] feat(asdf): add support for archlinux/AUR package
 (#9893)

Closes #9893
---
 plugins/asdf/asdf.plugin.zsh | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/plugins/asdf/asdf.plugin.zsh b/plugins/asdf/asdf.plugin.zsh
index da53eef8e..3016282c6 100644
--- a/plugins/asdf/asdf.plugin.zsh
+++ b/plugins/asdf/asdf.plugin.zsh
@@ -2,6 +2,12 @@
 ASDF_DIR="${ASDF_DIR:-$HOME/.asdf}"
 ASDF_COMPLETIONS="$ASDF_DIR/completions"
 
+# If not found, check for archlinux/AUR package (/opt/asdf-vm/)
+if [[ ! -f "$ASDF_DIR/asdf.sh" || ! -f "$ASDF_COMPLETIONS/asdf.bash" ]] && [[ -f "/opt/asdf-vm/asdf.sh" ]]; then
+  ASDF_DIR="/opt/asdf-vm"
+  ASDF_COMPLETIONS="$ASDF_DIR"
+fi
+
 # If not found, check for Homebrew package
 if [[ ! -f "$ASDF_DIR/asdf.sh" || ! -f "$ASDF_COMPLETIONS/asdf.bash" ]] && (( $+commands[brew] )); then
   brew_prefix="$(brew --prefix asdf)"

From 98a916b2cf67a47f97268dec9d68a15cb2c092ba Mon Sep 17 00:00:00 2001
From: Carlo Sala <carlosalag@protonmail.com>
Date: Thu, 23 Dec 2021 19:45:28 +0100
Subject: [PATCH 630/869] feat(yarn): upgrade completion to latest version
 (#10516)

---
 plugins/yarn/_yarn | 73 ++++++++++++++++++++++++++++++++++------------
 1 file changed, 55 insertions(+), 18 deletions(-)

diff --git a/plugins/yarn/_yarn b/plugins/yarn/_yarn
index 9173eca20..9db02602e 100644
--- a/plugins/yarn/_yarn
+++ b/plugins/yarn/_yarn
@@ -85,36 +85,67 @@ _global_commands=(
   'upgrade-interactive:Interactively upgrade packages'
 )
 
+_yarn_find_package_json() {
+  local dir=$(cd "$1" && pwd)
+
+  while true
+  do
+    if [[ -e "${dir}/package.json" ]]; then
+      echo "${dir}/package.json"
+      return
+    fi
+
+    if [[ $dir == '/' ]]; then
+      break
+    fi
+
+    dir=$(dirname $dir)
+  done
+}
+
 _yarn_commands_scripts() {
-  local -a scripts
+  local -a scripts binaries
+  local packageJson
+
   if [[ -n $opt_args[--cwd] ]]; then
-    scripts=($(cd $opt_args[--cwd] && yarn run --json 2>/dev/null | sed -E '/Commands available|possibleCommands/!d;s/.*Commands available from binary scripts: ([^"]+)".*/\1/;s/.*"items":\[([^]]+).*/\1/;s/[" ]//g' | tr , '\n' | sed -e 's/:/\\:/g'))
+    packageJson=$(_yarn_find_package_json $opt_args[--cwd])
+    binaries=($(cd $opt_args[--cwd] && echo node_modules/.bin/*(x:t)))
   else
-    scripts=($(yarn run --json 2>/dev/null | sed -E '/Commands available|possibleCommands/!d;s/.*Commands available from binary scripts: ([^"]+)".*/\1/;s/.*"items":\[([^]]+).*/\1/;s/[" ]//g' | tr , '\n' | sed -e 's/:/\\:/g'))
+    packageJson=$(_yarn_find_package_json $pwd)
+    binaries=($(echo node_modules/.bin/*(x:t)))
   fi
 
-  _describe 'command or script' _commands -- _global_commands -- scripts
+  if [[ -n $packageJson ]]; then
+    scripts=($(cat "$packageJson" | perl -0777 -MJSON::PP -n -E '%r=decode_json($_); say for sort keys %{$r->{scripts}}'))
+  fi
+
+  _describe 'command or script' _commands -- _global_commands -- scripts -- binaries
 }
 
 _yarn_scripts() {
-  local -a commands binaries scripts
-  local -a scriptNames scriptCommands
-  local i runJSON
+  local -a binaries scripts
+  local -a commands
+  local packageJson
 
   if [[ -n $_yarn_run_cwd ]]; then
-    runJSON=$(cd $_yarn_run_cwd && yarn run --json 2>/dev/null)
+    packageJson=$(_yarn_find_package_json $_yarn_run_cwd)
+    if [[ -d "${_yarn_run_cwd}/node_modules" ]]; then
+      binaries=($(cd $_yarn_run_cwd && echo node_modules/.bin/*(x:t)))
+    else
+      binaries=($(cd $_yarn_run_cwd && yarn bin | perl -wln -e 'm{^[^:]+: (\S+)$} and print $1'))
+    fi
   else
-    runJSON=$(yarn run --json 2>/dev/null)
+    packageJson=$(_yarn_find_package_json $pwd)
+    if [[ -d node_modules ]]; then
+      binaries=($(echo node_modules/.bin/*(x:t)))
+    else
+      binaries=($(yarn bin | perl -wln -e 'm{^[^:]+: (\S+)$} and print $1'))
+    fi
   fi
-  # Some sed utilities (e.g. Mac OS / BSD) don't interpret `\n` in a replacement
-  # pattern as a newline. See https://superuser.com/q/307165
-  binaries=($(sed -E '/Commands available/!d;s/.*Commands available from binary scripts: ([^"]+)".*/\1/;s/.*"items":\[([^]]+).*/\1/;s/[" ]//g;s/:/\\:/g;s/,/\'$'\n/g' <<< "$runJSON"))
-  scriptNames=($(sed -E '/possibleCommands/!d;s/.*"items":\[([^]]+).*/\1/;s/[" ]//g;s/:/\\:/g;s/,/\'$'\n/g' <<< "$runJSON"))
-  scriptCommands=("${(@f)$(sed -E '/possibleCommands/!d;s/.*"hints":\{(.+")\}.*/\1/;s/"[^"]+"://g;s/:/\\:/g;s/","/\'$'\n/g;s/(^"|"$)//g' <<< "$runJSON")}")
 
-  for (( i=1; i <= $#scriptNames; i++ )); do
-    scripts+=("${scriptNames[$i]}:${scriptCommands[$i]}")
-  done
+  if [[ -n $packageJson ]]; then
+    scripts=("${(@f)$(cat ${packageJson} | perl -0777 -MJSON::PP -n -E '%r=%{decode_json($_)->{scripts}}; printf "$_:$r{$_}\n" for sort keys %r')}")
+  fi
 
   commands=('env' $scripts $binaries)
   _describe 'command' commands
@@ -137,7 +168,13 @@ _yarn_add_files() {
 }
 
 _yarn_workspaces() {
-  local -a workspaces=(${(@f)$(yarn workspaces info |sed -n -e 's/^  "\([^"]*\)": {/\1/p')})
+  local version=$(yarn --version |sed -n 's|\([0-9]*\).*|\1|p')
+  local -a workspaces
+  if [[ $version == "1" ]]; then
+    workspaces=(${(@f)$(yarn workspaces info |sed -n -e 's/^  "\([^"]*\)": {/\1/p')})
+  else
+    workspaces=(${(@f)$(yarn workspaces list --json | sed -n 's|.*"name":"\([^"]*\)"}|\1|p')})
+  fi
   _describe 'workspace' workspaces
 }
 

From 7546ded93b31ffc3824b3cd63a72bba0a25f5e9b Mon Sep 17 00:00:00 2001
From: Benoit Foujols <benoit@foujols.com>
Date: Thu, 23 Dec 2021 19:47:50 +0100
Subject: [PATCH 631/869] fix(symfony2): silence debug lines in command
 completion (#10528)

---
 plugins/symfony2/symfony2.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/symfony2/symfony2.plugin.zsh b/plugins/symfony2/symfony2.plugin.zsh
index 1498e8d02..e23809df4 100644
--- a/plugins/symfony2/symfony2.plugin.zsh
+++ b/plugins/symfony2/symfony2.plugin.zsh
@@ -5,7 +5,7 @@ _symfony_console () {
 }
 
 _symfony2_get_command_list () {
-   `_symfony_console` --no-ansi | sed "1,/Available commands/d" | awk '/^  ?[^ ]+ / { print $1 }'
+   `_symfony_console` --no-ansi --no-debug | sed "1,/Available commands/d" | awk '/^  ?[^ ]+ / { print $1 }'
 }
 
 _symfony2 () {

From 4f90849425b4f40778e2fdb5281a1bae4117a7c2 Mon Sep 17 00:00:00 2001
From: Mark Mercado <mamercad@gmail.com>
Date: Thu, 23 Dec 2021 13:50:13 -0500
Subject: [PATCH 632/869] feat(lpass): add plugin for LastPass CLI completion
 (#9323)

---
 plugins/lpass/README.md |  13 ++++
 plugins/lpass/_lpass    | 169 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 182 insertions(+)
 create mode 100644 plugins/lpass/README.md
 create mode 100644 plugins/lpass/_lpass

diff --git a/plugins/lpass/README.md b/plugins/lpass/README.md
new file mode 100644
index 000000000..d3923ea67
--- /dev/null
+++ b/plugins/lpass/README.md
@@ -0,0 +1,13 @@
+# lpass (LastPass CLI)
+
+This plugin adds completion for LastPass CLI [`lpass`](https://github.com/lastpass/lastpass-cli).
+
+To use it, add `lpass` to the plugins array in your zshrc file:
+
+```zsh
+plugins=(... lpass)
+```
+
+Completion is taken from the `lpass` release [`1.3.3`](https://github.com/lastpass/lastpass-cli/releases/tag/v1.3.3).
+
+Updated on October 9th, 2020.
diff --git a/plugins/lpass/_lpass b/plugins/lpass/_lpass
new file mode 100644
index 000000000..e6193a22d
--- /dev/null
+++ b/plugins/lpass/_lpass
@@ -0,0 +1,169 @@
+#compdef lpass
+
+_lpass() {
+    local cmd has_color has_sync has_interactive
+  	if (( CURRENT > 2)); then
+        cmd=${words[2]}
+        # Set the context for the subcommand.
+        curcontext="${curcontext%:*:*}:lpass-$cmd"
+        # Narrow the range of words we are looking at to exclude `lpass'
+        (( CURRENT-- ))
+        shift words
+        # Run the completion for the subcommand
+        case "${cmd}" in
+            login)
+                _arguments : \
+                  '--trust[Cause subsequent logins to not require multifactor authentication.]' \
+                  '--plaintext-key[Save plaintext decryption key to the hard disk]' \
+                  '--force[Do not ask on saving plaintext key]'
+                has_color=1
+            ;;
+
+            logout)
+                _arguments : '--force[Force confirmation]'
+                has_color=1
+            ;;
+            show)
+                _arguments : \
+                  '(-c --clip)'{-c,--clip}'[Copy output to clipboard]' \
+                  '(-x --expand-multi)'{-x,---expand-multi}'[Show the requested information from all of the matching sites]' \
+                  '(--all --username --password --url --notes --field= --id --name --attach=)'{--all,--username,--password,--url,--notes,--field=,--id,--name,--attach=}'[Output the specific field]' \
+                  '(--basic-regexp,--fixed-string)'{-G,--basic-regexp}'[Find a site by substring or regular expression]' \
+                  '--format=[Format output with printf-style placeholders]'
+                _lpass_complete_uniqenames
+                has_color=1
+                has_sync=1
+            ;;
+
+            ls)
+                _arguments : \
+                  '(-l --long)'{-l,--long}'[Also list the last modification time and username]' \
+                  '-u[List username]' \
+                  '-m[List modification time]' \
+                  '--format=[Format output with printf-style placeholders]'
+      				  _lpass_complete_groups
+                has_color=1
+                has_sync=1
+      			;;
+            mv)
+                _lpass_complete_uniqenames
+                _lpass_complete_groups
+                has_color=1
+            ;;
+            duplicate|rm)
+                _lpass_complete_uniqenames
+                has_color=1
+                has_sync=1
+            ;;
+            add)
+                _arguments : '(--username --password --url --notes --field=)'{--username,--password,--url,--notes,--field=}'[Add field]'
+                _lpass_complete_uniqenames
+                has_color=1
+                has_sync=1
+                has_interactive=1
+            ;;
+            edit)
+                _arguments : '(--name --username --password --url --notes --field=)'{--name,--username,--password,--url,--notes,--field=}'[Update field]'
+                _lpass_complete_uniqenames
+                has_color=1
+                has_sync=1
+                has_interactive=1
+            ;;
+            generate)
+                _arguments : \
+                  '(-c --clip)'{-c,--clip}'[Copy output to clipboard]' \
+                  '--username=[USERNAME]' \
+                  '--url=[URL]' \
+                  '--no-symbols[Do not use symbols]'
+                has_sync=1
+            ;;
+            status)
+               _arguments : '(-q --quiet)'{-q,--quiet}'[Supress output to stdout]'
+                has_color=1
+            ;;
+            sync)
+                _arguments : '(-b --background)'{-b,--background}'[Run sync in background]'
+                has_color=1
+            ;;
+            export)
+                _arguments : '--fields=[Field list]'
+                has_color=1
+                has_sync=1
+            ;;
+            import)
+              if ((CURRENT < 3)); then
+                _files
+              fi
+            ;;
+        esac
+
+        if [ -n "$has_sync" ] || [ -n "$has_color" ] || [ -n "$has_interactive" ]; then
+            local -a generic_options
+            if [ "$has_sync" -eq 1 ]; then
+                generic_options+=('--sync=[Synchronize local cache with server: auto | now | no]')
+            fi
+            if [ "$has_color" -eq 1 ]; then
+                generic_options+=('--color=[Color: auto | never | always]')
+            fi
+            if [ "$has_interactive" -eq 1 ]; then
+                generic_options+=("--non-interactive[Use stardard input instead of $EDITOR]")
+            fi
+            _arguments $generic_options
+        fi
+    else
+        local -a subcommands
+        subcommands=(
+          "login:Authenticate with the LastPass server and initialize a local cache"
+          "logout:Remove the local cache and stored encryption keys"
+          "passwd:Change your LastPass password"
+          "show:Display a password or selected field"
+          "ls:List names in groups in a tree structure"
+          "mv:Move the specified entry to a new group"
+          "add:Add a new entry"
+          "edit:Edit the selected field"
+          "generate:Create a randomly generated password"
+          "duplicate:Create a duplicate entry of the one specified"
+          "rm:Remove the specified entry"
+          "status:Show current login status"
+          "sync:Synchronize local cache with server"
+          "export:Dump all account information including passwords as unencrypted csv to stdout"
+          "import:Upload accounts from an unencrypted CSV file to the server"
+          "share:Manipulate shared folders (only enterprise or premium user)"
+        )
+        _describe -t commands 'lpass' subcommands
+        _arguments : \
+          '(-h --help)'{-h,--help}'[show help]' \
+          '(-v --version)'{-v,--version}'[show version]'
+
+    fi
+}
+
+_lpass_complete_uniqenames(){
+  local -a entries
+  while read i;  do
+    if [ -n "$i" ]; then
+      entries+=("$i")
+    fi
+  done < <(lpass ls --sync auto --format "%an" --color=never)
+  compadd -a entries
+}
+
+
+_lpass_complete_groups() {
+  local -a entries
+  while read i;  do
+    if [ -n "$i" ]; then
+      entries+=("$i")
+    fi
+  done < <(lpass ls --sync auto --format "%aN" --color=never | grep -E "\/$")
+  compadd -a entries
+}
+
+_lpass
+# Local Variables:
+# mode: Shell-Script
+# sh-indentation: 2
+# indent-tabs-mode: nil
+# sh-basic-offset: 2
+# End:
+# vim: ft=zsh sw=2 ts=2 et

From 068feca15d09dce6747d0fb6cab2027b938e82bd Mon Sep 17 00:00:00 2001
From: Philipp Schmitt <pschmitt@users.noreply.github.com>
Date: Fri, 24 Dec 2021 18:09:01 +0100
Subject: [PATCH 633/869] feat(zsh-navigation-tools)!: update to
 zdharma-continuum fork (#10402)

BREAKING CHANGE: the `zsh-navigation-tools` plugin now bundles the version from the
zdharma-continuum project, which republished the projects that psprint deleted (we
don't yet know yet why). In theory this change doesn't break anything, but be aware
of the change and that the upstream repository now lives somewhere else.

Source: https://github.com/zdharma-continuum/zsh-navigation-tools/commit/67b24e1
---
 .../.config/znt/README.txt                    |   1 -
 plugins/zsh-navigation-tools/README.md        |  37 ++-
 .../doc/generate_single_file                  |  35 +++
 .../doc/img/n-history2.png                    | Bin 0 -> 108316 bytes
 plugins/zsh-navigation-tools/doc/install.sh   |  70 ++++++
 plugins/zsh-navigation-tools/doc/n-preview    | 224 ++++++++++++++++++
 .../{ => doc}/znt-tmux.zsh                    |   2 +-
 .../zsh-navigation-tools.plugin.zsh           |   2 +-
 8 files changed, 346 insertions(+), 25 deletions(-)
 delete mode 100644 plugins/zsh-navigation-tools/.config/znt/README.txt
 create mode 100755 plugins/zsh-navigation-tools/doc/generate_single_file
 create mode 100644 plugins/zsh-navigation-tools/doc/img/n-history2.png
 create mode 100755 plugins/zsh-navigation-tools/doc/install.sh
 create mode 100644 plugins/zsh-navigation-tools/doc/n-preview
 rename plugins/zsh-navigation-tools/{ => doc}/znt-tmux.zsh (97%)

diff --git a/plugins/zsh-navigation-tools/.config/znt/README.txt b/plugins/zsh-navigation-tools/.config/znt/README.txt
deleted file mode 100644
index c3d6c821a..000000000
--- a/plugins/zsh-navigation-tools/.config/znt/README.txt
+++ /dev/null
@@ -1 +0,0 @@
-These are skeletons, configuration is read from ~/.config/znt/*
diff --git a/plugins/zsh-navigation-tools/README.md b/plugins/zsh-navigation-tools/README.md
index 7d2ce99f4..9fd2d5414 100644
--- a/plugins/zsh-navigation-tools/README.md
+++ b/plugins/zsh-navigation-tools/README.md
@@ -1,15 +1,14 @@
 [![License (GPL version 3)](https://img.shields.io/badge/license-GNU%20GPL%20version%203-blue.svg?style=flat-square)](./LICENSE)
 [![MIT License](https://img.shields.io/badge/license-MIT-blue.svg?style=flat-square)](./LICENSE)
 ![ZSH 5.0.0](https://img.shields.io/badge/zsh-v5.0.0-orange.svg?style=flat-square)
+[![Gitter][gitter-image]][gitter-link]
 
 ![znt logo](http://imageshack.com/a/img905/2629/WK9qjN.png)
 
-[![paypal](https://www.paypalobjects.com/en_US/i/btn/btn_donateCC_LG.gif)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=D6XDCHDSBDSDG)
-
 # Zsh Navigation Tools
 
-Also check out [![ZCA](http://imageshack.com/a/img911/8084/qSpO8a.png) Zsh Command Architect](https://github.com/psprint/zsh-cmd-architect)
-and [Zconvey](https://github.com/psprint/zconvey)
+Also check out [![ZCA](http://imageshack.com/a/img911/8084/qSpO8a.png) Zsh Command Architect](https://github.com/zdharma-continuum/zsh-cmd-architect)
+and [Zconvey](https://github.com/zdharma-continuum/zconvey)
 
 
 
@@ -107,10 +106,10 @@ history management and various integrations with `Zsh`.
 
 * 30-04-2016
   - New feature: color themes. Use `Ctrl-T` and `Ctrl-G` to browse predefined
-    themes. They are listed in [~/.config/znt/n-list.conf](https://github.com/psprint/zsh-navigation-tools/blob/master/.config/znt/n-list.conf).
+    themes. They are listed in [~/.config/znt/n-list.conf](https://github.com/zdharma-continuum/zsh-navigation-tools/blob/master/.config/znt/n-list.conf).
     Use the file to permanently set a color scheme. Also, I sent a patch to Zsh developers
     and starting from Zsh > 5.2 (not yet released) supported will be 256 colors.
-    The file [~/.config/znt/n-list.conf](https://github.com/psprint/zsh-navigation-tools/blob/master/.config/znt/n-list.conf)
+    The file [~/.config/znt/n-list.conf](https://github.com/zdharma-continuum/zsh-navigation-tools/blob/master/.config/znt/n-list.conf)
     already has set of 256-color themes prepared :)
 
     ![themes](http://imageshack.com/a/img924/4310/EbRh30.gif)
@@ -130,7 +129,7 @@ history management and various integrations with `Zsh`.
 ## Installation
 
 ```
-sh -c "$(curl -fsSL https://raw.githubusercontent.com/psprint/zsh-navigation-tools/master/doc/install.sh)"
+sh -c "$(curl -fsSL https://raw.githubusercontent.com/zdharma-continuum/zsh-navigation-tools/master/doc/install.sh)"
 ```
 
 To update run the command again.
@@ -140,16 +139,16 @@ will be updated with only `8` lines of code, which will be added at the bottom.
 
 After installing and reloading shell give `ZNT` a quick try with `Ctrl-R` – this keyboard shortcut will open `n-history`.
 
-## Installation With [Zplugin](https://github.com/psprint/zplugin)
-Add `zplugin load psprint/zsh-navigation-tools` to `.zshrc`. The config files will be in `~/.config/znt`.
+## Installation With [Zinit](https://github.com/zdharma-continuum/zinit)
+Add `zinit load zdharma-continuum/zsh-navigation-tools` to `.zshrc`. The config files will be in `~/.config/znt`.
 
-## Installation With Zgen
+## Installation With Zgenom/Zgen
 
-Add `zgen load psprint/zsh-navigation-tools` to `.zshrc` and issue a `zgen reset` (this assumes that there is a proper `zgen save` construct in `.zshrc`).
+Add `zgen load zdharma-continuum/zsh-navigation-tools` to `.zshrc` and issue a `zgen reset` (this assumes that there is a proper `zgen save` construct in `.zshrc`).
 The config files will be available in `~/.config/znt`.
 
 ## Installation With Antigen
-Add `antigen bundle psprint/zsh-navigation-tools` to `.zshrc`. There also
+Add `antigen bundle zdharma-continuum/zsh-navigation-tools` to `.zshrc`. There also
 should be `antigen apply`. The config files will be in `~/.config/znt`.
 
 ## Single File Manual Installation
@@ -194,7 +193,7 @@ alias naliases=n-aliases ncd=n-cd nenv=n-env nfunctions=n-functions nhistory=n-h
 alias nkill=n-kill noptions=n-options npanelize=n-panelize nhelp=n-help
 ```
 
-Don't forget to copy [configuration files](https://github.com/psprint/zsh-navigation-tools/tree/master/.config/znt). They should go to `~/.config/znt`. Moreover, `n-cd` works together with option `AUTO_PUSHD` and you should have:
+Don't forget to copy [configuration files](https://github.com/zdharma-continuum/zsh-navigation-tools/tree/master/.config/znt). They should go to `~/.config/znt`. Moreover, `n-cd` works together with option `AUTO_PUSHD` and you should have:
 
 ```zsh
 setopt AUTO_PUSHD
@@ -397,15 +396,7 @@ The same with doing any non-typical Zsh Navigation Tools installation.
 
 ## More
 
-- be aware of [this](https://github.com/psprint/zsh-navigation-tools/blob/f49f910d239ae5bc6e1a5bb34930307b4f4e3ffe/zsh-navigation-tools.plugin.zsh#L35-L49)
-
-## IRC Channel
-
-Channel `#zplugin@freenode` is a support place for all author's projects. Connect to:
-[chat.freenode.net:6697](ircs://chat.freenode.net:6697/%23zplugin) (SSL) or [chat.freenode.net:6667](irc://chat.freenode.net:6667/%23zplugin)
- and join #zplugin.
-
-Following is a quick access via Webchat [![IRC](https://kiwiirc.com/buttons/chat.freenode.net/zplugin.png)](https://kiwiirc.com/client/chat.freenode.net:+6697/#zplugin)
+- be aware of [this](https://github.com/zdharma-continuum/zsh-navigation-tools/blob/f49f910d239ae5bc6e1a5bb34930307b4f4e3ffe/zsh-navigation-tools.plugin.zsh#L35-L49)
 
 # Fixing tmux, screen and linux vt
 
@@ -429,3 +420,5 @@ It will not display underline properly, but will instead highlight by a color,
 which is quite nice. The same will not work for FreeBSD's vt, `ZNT` will detect
 if that vt is used and will revert to highlighting elements via `reverse` mode.
 
+[gitter-image]: https://badges.gitter.im/zdharma-continuum/community.svg
+[gitter-link]: https://gitter.im/zdharma-continuum/community
diff --git a/plugins/zsh-navigation-tools/doc/generate_single_file b/plugins/zsh-navigation-tools/doc/generate_single_file
new file mode 100755
index 000000000..d3d393834
--- /dev/null
+++ b/plugins/zsh-navigation-tools/doc/generate_single_file
@@ -0,0 +1,35 @@
+#!/bin/zsh
+
+local PLUGIN_FILE="doc/zshnavigationtools.plugin.zsh"
+
+[ -d doc ] || cd ..
+
+rm -vf "$PLUGIN_FILE"
+echo "# The preamble comments apply when using ZNT as autoload functions" >>"$PLUGIN_FILE"
+echo "# https://github.com/psprint/zsh-navigation-tools" >>"$PLUGIN_FILE"
+echo "# License is GPLv3 and MIT" >>"$PLUGIN_FILE"
+echo -n "# " >>"$PLUGIN_FILE"
+git show-ref master | head -1 >>"$PLUGIN_FILE"
+echo >>"$PLUGIN_FILE"
+
+for i in n-*(on); do
+    echo "$i() {" >>"$PLUGIN_FILE"
+    cat "$i" >>"$PLUGIN_FILE"
+    echo "}" >>"$PLUGIN_FILE"
+    echo "alias n${i#n-}=$i" >>"$PLUGIN_FILE"
+    echo >>"$PLUGIN_FILE"
+done
+
+# Append znt-* files
+for i in znt-*(on); do
+    echo "$i() {" >>"$PLUGIN_FILE"
+    cat "$i" >>"$PLUGIN_FILE"
+    echo "}" >>"$PLUGIN_FILE"
+    echo >>"$PLUGIN_FILE"
+done
+
+# Append ^R bind
+echo "zle -N znt-history-widget" >>"$PLUGIN_FILE"
+echo "bindkey '^R' znt-history-widget" >>"$PLUGIN_FILE"
+echo "setopt AUTO_PUSHD HIST_IGNORE_DUPS PUSHD_IGNORE_DUPS" >>"$PLUGIN_FILE"
+
diff --git a/plugins/zsh-navigation-tools/doc/img/n-history2.png b/plugins/zsh-navigation-tools/doc/img/n-history2.png
new file mode 100644
index 0000000000000000000000000000000000000000..fa23de00d5c6b4550c96fe783d34575d8fdecbfe
GIT binary patch
literal 108316
zcmb@uWmud^_VA5+Ah-s1cY<qhcPB{W?oNQ<7CgASyEpFc?iSqLUNW=0v;UpB-cL_|
z>aM%wu2ZMvoZqPqk(U+w0EYty0s`_uLR>@<1O#FO1O&_w2JAhBn(n~@1Ozn1OjuZ6
zLRgqk-rmO8%n|?sLWy1$%_{{i_%U!jY?2Zdi_{b@8uAP6=}!0;>Doc)pTS>(;mlo{
zQbT@3ZQBz)f*)JfezZcnVF+f&NHE9>AcW~$Cxiea-b`&1R)oZbcHUofG2u6cvP}vt
zPh0^RLZ2R>?_b=TW4~hE3_v0YHjq}ZaHoyc$oqjm=k4FopiAaGFZ+1pb&zRi$5Ls}
zj?C7JALI?N(Jd+Z#whNWTu}trLa8b|43zMcq-B#%yCSjc$V5Wn;Kamx-AS!k>{Wur
zI$DI-fJ1q5KpeNF|J>T4K}YQtDuEm}MiBfhOF1TBHyEu(?d@~Cl+(~OyDnXZ>Y_Ty
zSpicdTFh4%VNnPagZz522e6Q0pv^HxD0!FyfGwdg;ikC=n^;P1Mk6|4hcl`FBHa$D
zw%VED`($FdY8wP`tiZay+He|(%bmb^QHe|%cz0OGNliIcr~|>M(DKWCb3F?|^){p)
z-mkaH(mB=*PAD$1gc~n_Mw*3thWoAjBPgkh*+!OBYwY`=q?;+LJF3e_a~axL(d!%8
z7y#&9t!&>14FrV8mFxYh6~IxS(ACP)+JVcJm-vqyT<_n1Co>Qe{*lGef|pobMxIdE
z#vVY(M$bymNX!RENJz+IZ)D7+C?fi=;_ttBiA^0HZMhg2TwGk}U0CRC>`fS$I5{~P
z7?~NEnd#nh&^fqSJL<dASv!#YS;@ca5dk<D+MC%rn%P(r{;pTwz{bgumzel>L;v~w
z`JMn*v%gxhcKBDf-aE+f`w0URJtM<^>V7ZE^E;JG-pmzXsV-t>1+aE_Z-bACne{Wz
z9|ivQ=&vUKtEk3bMcJ8{{=4LVJ^5Ej9){mN_^%%QDXu?K-{r*z$HVX++4I4jj<$t@
zfCzv{hzKgXf*!Xa*`m(3{qm8vtd#h+An}1o-gY&Yd}i2-Je=wSDf0^2P_I<ides+j
zM{3jk7r#qy7x7stphG<Hp89SL6mZGxSFb>>p0xIJhiFRVd1`=MQdd;E!c@bWSob5Q
zLOEf!psW!JcCJXfgL7R;e5;2u*&^YFN1tIDuTT5F!|U<GDW?Yp5u*SI3<xM82*fv#
zk04<GkADy*3Iw=5Y&bx-?8^%2dG&IKm*DAfA}#}Eb!5EgprXAy)r5TM1i(!N<dBy@
zt|5QHPhe&;bfkic3Sq(OlYWo>DB9&G*0pTia_RG?KRdp*k1MAtxOz8NahgI&pxlA@
zPjCG-99H|~J~8Si1Z17!5Osi++S{eY(P<5v%e?eYPr22Th0U;qfO~YRU{g@NXov?$
z9073m&<Uta1_8ZqKoBp`Jp@LSE^!zVqVVsGC>V?=<a{zCk3P*lmvoC0(JJz8{hKvs
zZxR#Q0R0ZQe|&*!ScL6(#UxcpT~<i&f6B4Zj0ysI)2s#x1M&}#zk^T~P9Xlncx2MT
zeDl-9m<1660sZ@ky%&P|e^^LdFExp)3@0nJNNHGz`XkssXo<Bu*n_*NGh|&c7){}J
z-}*H~=C^;)AbEU<%WHWF!H9GzLdTn~rpq5FxgcPF%jlbuCIG~zrYhv{=*;r`+hb5d
z`85auLAtX?(1X8svjG8AUfw3DIM5I5Z=xAWc^Bxe4nN_iziIeJ0ukdLT(Q;S(0Ot@
z+x#kzh}EgU=U;3r9C9I|d8E!hv}utGA97-_NWmcfZ=)S$;$KVAXZj+sooe!>m)RQ>
zLQYw?SKR8|LUkoOhr31>F1qJ5Mo*U0S*b$|8I#M{!?F_<&r=4=ilOrO4hR~PLLmU4
z|09KsWE3n5$eWsmoD99z=YwH_bZiY;=Sja8t8lx+6Oy)}g#eFbm&>ii9EP*gPgJBw
zm1pa1!;MCJ;taO`Ti5St&E+fE>@o=S=jI7=F3hzjPwL{!K=3Z!(n}v(iOh3Qmb!jO
z%oRy(=lKF%^nbhedokFR&dfzup6<$<98H<hy3kWIomE^<c3Mbxt&Lzfmp*&^a3O<h
zkcMl3tEOqcE?8Hl9?=%bI=}T}<OQj}nVpoK*SNg^L|!$K0Y@(14Hf>Wtdy4C@YWW&
zlK~mN#cC^1%byM{%-)+`)_|<lxr8FFquz+ew0rUZNa{9+8`-;ErOt{G20`0&mbuhQ
zbnLWKaAo^>57vbiL#n5HelI}Ud5ze5TNH@Fo=2d!ufs~wEz}~?ID=usIHc5rN32^w
zhKflfO@aSGT|JiLyB<9m`LTmIaKWImQHTlbV@mM26NluGSLfds5z07$3pnZ)+upS&
zTymd>gEf91SHfh|N73#rs_jQPpXYIcjQs%d*WIw;0=^c!b}P@59;&<5Xp)74&aCrY
zhHX7H!fU6U%Za36y+8(^3klheLjj$rvd4$o+KF7tKEDLsCa3FamYhFHH%hk-4J?uL
zyD-?81>^C0Zk$hwoRmhUJ^9n4N?2dUJuW>a)O);*OF@t27cXZl)Ok)3+~I##<t%dR
zR;>wS2qAbI)*DNG{3YF*UthoZ`eeVJ%KJi4(6#v%T5ulfNR7hhv^U}t(Css+LmcBC
zonJo7*<J(?I&5oCUGz9Sme4NWgYFszN-5?fVnQ=6ki3l7a?IoLUQg9{AbnT-aFUX-
ziHGgwE$Q`=`#5KUcxqJ<bw|ME>CVVzaZz8%ozuyTA@|0TCKJ2$0<G)5J29Euo0e7<
zE1x|eB*6N&Me18>hd)EB)6T&16MkHa!im?>Mc0A3?iI;qss-1y7I&@`Rk77<;PqTY
zq>Ut^M%V^mTt|D<y<{Q0oKUwq46?e!EqoR??B2C4^Z<T4Z#sA0e4xj;w1?;uk$Zfn
z@4T#VYqdH2SBtI?VJ7ERzMmU-I6!87%bmuhMq!{a%_E%d?Mko8q|%L=x>s*lIWuY$
z)T$8n_gUlC0otc!EFHs-Qo##N4o1}@2s}Wl)f@0FDFy~1`s#0ZF2*D^pvNDt;HZ|t
zjW${Fk5Q!zyJ^Y>e}pjvc1rP(uumdk>lo>9ArFw}Yigf^{Ljn=fq{XzyqU;e7cBc!
zQF*WFHV-p4yG<?H2*87=fOWNF%f~Rv<(|H=Wf3xYb9;3jj5^ZQoFCQ0_HK1l1sopx
z=B;k&S8Ly~Ky%-fTNzkcj_WH2Oe6{`;ML-2DHXJSj?)JdCA5^ydy-sKQ7aNcZ6#+V
z?vd!Mqr)`FC{T<=2~lP@1polE_k+(j0W^a%^C}?~QyS}b=<(>=5PHYIUKxWAjgwE4
zrdW%hyx8>ntQN}bxd@UqiR+tyI5`zsCyr$VQT}>u?rhjnS%G`I2snh7+Xjg3w^vRE
z3Vfegz8@AeY(Rsyg=ZCEe8_O!rkX^$0X|N`r&)dG|N9xk*8sNgP*W2Y5$LvA6PeF_
zf~!`a4z!)GU9>1zVRxjO%0VwP^2rAxW@X7e55Xc^vDh87u3XJLj9={bP{oRf4aVT1
zq#1>xud0PJ7PouMjjrdUZ=}C+Pyu09k97FkUl285?{jmriE<T*jbC-xKAQ^n?~N{w
zC{e`~r^cvM#;R3&`$YuJeMVIiV!lh8_JqA8>0<la{vhE0t&6!(6k*b1y@g_YD{mmg
zX<2ix{6%zhu|3^*RqV@n)l-D0ubyM-Ot9Jm8bW)qI!m75DVrOZLRyTP5p~MSQ(yhO
zJ3GB)`*yuyLDQ}O6OC?<PdmS(hF)}I6vHOja##?}PJVH5w)vrRgDRZKn0_)FD#buo
zufwcL5|X;_-%e$ZFlZH-I2fKD7(zi&aPH9-x3~ns%jORD_^-*@x(ZXt<UdCGWl$2=
z5bk~md)1A6+ozlhJMx)28VNL#R%Lm+%vrvgBrLXk<ZjTI($g4z#P|-i&RJOG1enfQ
z4s=sF9>NZgZ>85}lhCeV#Uf=w1B(irPP<W;XtlR{ZRv+L@N{=t_awaIp}x^3&gf+t
z2m+Lz2b#=f;u9Tpe@JZ&rcRk}yvOvZ;x=65l%sWG$6EON))MfM(mjl!`5Ik;H?hG=
zlJ8ulI6E69FDQ_~!_ViC%R3S?bMAIxopt?oHhj4X#~t^HSGYTVhaj@8U2Y=h{v$<D
zdG^xsJcG8*{Abpe(;_<5pbXCor$c8|lrodvbOJJGjs{Cvk^Q&VGNkgk)%N3{up=61
zitBma-X^;7ySp><vxOJn+fzmBO9rZ{4SW4ecITb<3));dx>Lm<sm$zbJDy(Oo_n*~
z^DH(?m88xn-<dU5>vNEf&QtCkBQlp8d7!3onGd~k!|BX5G`_W2FrNmKR*i^=AF<39
zd@CGR7GI@h=Nd}}+vxqAT*_fc`T#$gyezX;wr?IUbWF><^D!R|<MU}pNB=Yi?eff`
zuE*^}>tboC^rF#s3fNYBuJe_%$U6SXr6zv%Sg#wo#Ix1vrcdqT#bZn<F#jM?bBIti
z`Q<ax3dVHc^}&8&wK-lfjvAZCP~6x<7+>4H4LAMQ4DN){^hrs?V<O|Z8SI(~wM2eV
zdq}5oZXeCM3y%|23c5G)Id>qJ9g)2@OxcCccq;pjS6fS45#VGG1BKn`;@qL-JGci_
zb7HyZsaHZ|eckf+v#Rvd^{0iYg72hN#MGxZGQ_1z`lxSsHrRW0?Af{sp2+6fx9Vav
zlik5db&ZA?IKXG(7@9(l1-<gn=jOI7GdD3*KK)-JZ~9(jC^58KZxnAY;{`~(6Elya
zdu{8alMK3CZ~a3>CtJkDq9M1X9=UzHwT|`9mewbPlS-I!JWs<q+0LP$yR1mreH6?L
zr_C-SZ(qPobe5}KPwIO=ujf>>2C7<Gr?6)TS~KxUAS3*Jl5_aNF_H4E-KpKFc|Q+}
zNuPzu)~<Ujq0pR$z3#4?w4=uPVPljX+5oTG_}}ygtK>+<WZ;))KEviUPVd9bT42pB
zthsVLUQWMywUKNwiz+>>qE04ld#r?VN3r!%6M<N;$_fc<pVdvzES#+@2Tvs3Q*pSl
z%2(<~<QJh{fc6*M-eACl>C3?5PA2xlN2*tbe|$F$K>vID^i7F+KOHC6h^WfjUAQlm
zKH6xsJ3MsgjoVdeZm-y!S+=4w;Nrt#W~Oc7tro<u?adIu?c*0EN=`QFJ`CmWc*@Y8
zuB}<b$g!i|z46AkQLgNruBy3`@<Htby?=(GVP}K>pZ4C5+w~BkD)J1T&qI0zHcz6f
z<!Ah@G+K=%FBES%+zD+^xPKGm?;~g0??RIsw;a0bx*XF}tS3Nodw1FAu+DXS_{atG
z5+wu}D2Tr=2n}4I5`t-59|+!*n4HW71q}Ax4Z4!rAiwx`{DUO`^1he88x&tu?pt$1
z?Y3`-ByCo68NP02c|X~2+F7q*@xLlu09s^8X{d8!8$uI58T_wRU`z9HU|N_AlFgmo
z_q3ul(}A~ktM|na(&AVVpC)9OO@~mUoDJOme`V5vIxsKX4~qHUBl91z?FxXP&Da-0
z{`lXq`<>(CyLkrl_kIif|JrmNKWPf<0W{qfuXEbag%uQ_ecwJPr9vP`Nk>PA4aeYz
zRf$fSwMX=3m9B|%?XgXCM+H`N9?IlTACR&i7>&qX&RIG3)ir@{X3lGiW=g;gD^af=
zqk|>5g&e=CbA77P^Jg#X$QLh|jA^oThnvO>h2pIzwi95b0}CI-j@-V8`zg|6GiY_v
zpov6xbxEzdcT?O+d^yWmOo?$7=uDfZ6OW=sQ9Ide@oU6-#((iefrsQ;(*e2yc~KiY
zhU8M&2}>ub0`P(FzDr9ivbF6@a5fu#e-dk@71k$~ys=S%>h&*^$zcUSv}V?rX|Hj$
z6%#6!_hV<n_0Jr_RTyx6EA6;nsy(E{)>=e8SYiAzAG5axyc6?iL23|bQN;u*y~9b7
zKZf<hG_@JUgvfXBYCfiS9wLf$WqqX#y^@81D~9m0ix31R_{mnW0y>*{@~9zYni2=_
z#dBi=*eVrm!zEYVC7|sdS`>BNTWF%ZAwcW~Q5o48H4Qtqe`9yAPXa7^Fsf<QDho>R
zaJwo-($lTLp{3XJ${89^OlXJqLe!RQp(ZQWwa#&xpGa9Z4XS}YKV~`o5uq)~sSO_^
z`9R$gQ9fcQ?_ca*SR7<8c+)($q~<6xUr|X}mRTL9s=vy1IpA_bP7dGC_1RM|%ymc@
z5Ch8&r5dZ|z7+l>EZ7`9=}U0=H6rw?nHQLuX<^QHi5%APIKV@UecgO48<kn;ewFSN
zCRlM$L8K>$9$o2boe>Gyh95P51m6o$$7A_vmQ4b8E+lN0pwJGxg#+uu6I~9q)!>a{
zx?;RysXfCa7Q$oR#uU2C3;+n^?L{Xh$txIX&Mr@GL<Zyh9L_<t$#!R_ogqPfUp6N^
z+}2uMJg8ow_95XXgOf70#*n?sWHNZ-RJmkGN#b(hI@`4|kK`uvQ2OU5Wr-WjAIgK8
zoo<c*e19C}Sz#4kG)YcL*%3c<b-@p`KUGEC!$+g`KZ2(8ZHEyn(zj5Cquab(e=bv1
z`&g0;NnJQ5PMoY0%hGhtlHs^eRuW!{I!;m@1)`1#l(t3GvFm63(djGI$vGftXpKY!
zXHNVzk-4E!xUn%LQ^}rcH73PS{~#Wvp)!^5`h(Pls3mC*{Z%1_x_|>?j4vXR=k85z
z;Ww~24|$3;ni!asMwip0#m~bz)_-*FOh(m?;}P#(v;xs<NZ0LJT_JQb-VMQ=Q4fjk
z;L~r@Siu|G#@*syma+P#G|y7s^v?sGb|RpeaH)f^<@Qi3y7F@9?81?_10CYv%A0Me
zg|NZ2;jM>A=!{+p2U=8r<g+7w$kTUjj4-k-{RbMY(%!-7)yh^0kv7B{9^Tkhl2cci
zz-L#DXj-Po(6!z%tsbkDVAvn+{qt^^qtW{%<{S$`Rj#zh@%+I|>bw^sJ!V_`;@Wr5
ziw>%m2l)5bQnMm6JnjwB6-mu`YS(LbDN%tRla~r@Fb~l2%JRJvu#%qp-rN<uHNw;4
zIEEfLfq^KxEwkMfYNXqOuVsp#BxFU|U{o$ZDU?;RB|E7_OOpwg<dL3Y@1PW%u5k2m
zp~k4vyOVCdD)?EO6^qz#Dpu!M>9=iSSx;4&(qh0;(l4v)08M#n<hU_zwH%g0AuC$p
zB6zW*T+<eLA#+<NzXh<l2`80}>+79fLCzh*1GctCsRc8n5*THuN8|bn6DKX?rKmMS
zY}0T?A_*5eWTaUq_OGFscu(lI+?QB>I~1~BQL1d$*ggDv(L({35%=0IIYzSJEQND6
zvXx*Ak|ZIaiAh!VRjw0OOzMv!3xl?qa#)A8aDpX*WlR0&rD3@a`^DzpA2WPHV{<3t
zH0S`MRi8|<FfcvL_N0#5XX5g*i?mD)Bi%jn=lwd3>eW-DSk;JG0d>8WRhnfOZllwO
zm{OA1D!)!NQb_YKV8qRlR16Dso^W>QF1#HLXESlWbhh;*2+O6;LEA~YGfayoAC@ge
zVPRrM1gsc`(XeR9^nslo(_Cmee7$kb^J-9x3PZ|04@7azCQhbguW}toK@XR$9`Gh5
z%$*0Tdz*TU-opw*;>sEU%EQSpyZI$OsPr&o=uL`G^-E|Q45^D*DZ2B7#bHyFDfrK5
zPLN=eNdxyJVX0lK;0GT~3|`>GEG*WC`dxc1{qM5ak5-aAznP82(}0(#26E^JlubX3
zre0SX5A!xtugnIpEuSaHgF366PZFqKQx!JueU5~W{g66n%lHw-R&XqF)oo}&+)zTq
z(>k$xk)k%WlAFcC<iu!|4f&S4w4P7zr}UQ#Y;O9XS=yAOeevR_>~c2I>!~^*0Er8O
z0oECrjjdIB{1o6H^b3ZmDbkAKOjY#iHoy87B%!SmeTL@(8+T0dE|mCaJ07!iwz8B>
zpt4WrQF*!5(t%#1`ZXl){PR;+S1RwJ!}VtNX8dZZ7%XR%J^etHOxGin;n&6EO}S?{
z^HZFP$-zx$;?_{}ey!n{)KZA&gs+1EOZK_XQf{WXDDxZFkYKMM?NQvDBQ_yWaz9NO
z2Gs|SPOlyZlNs~(QTCjmxZmK^R?eK4@RH`}OX&=K9|{1Twxx+JRm`%sQeL1$@av!k
zK)#^Sy#doE1+&dya&+F^sw2QPPOemdm>Qf(-_{;3N&aRncUuy!EEiukS8gDoChIZ_
z&5Q!q@!ho>vyB9_P7-fKc(1TICHBoNr;hc-r^Cj3MCv;4FR-BxbOA;Z%<zpd&sZPf
zn{~YSyu)vI_+Tls3ruH#vN3+H3N~YxR653*Lz;%%boA-iSHgMJH0E!41*MZlg@%ZA
zywet)ov<W){FH!KNB}r<S<sXiy1U05p#&gra><Oe&OC#Qn8@pnB>vf^6-Sv$yss%P
zfh4b#r&!)X?}(l%Pp2_pF6urBc3n`2j{|4{V{T6SW73CpuOrTx41ub45wi?Q^AT**
zR-92VQcs=mEGi6+I^GEO1*V2hzclBLB!VenF6#I>_2-NtvERO0*R<6lX@Y1BpX^kB
zb61KcyC@a2#SCHHZ4HX)g7S^L3Q`@!)12Wa%ew2+U<Vl!cZ(oLs^03dr5|g}lhGxa
za6rFAor4=?s^;Wg(LH-Rk1-x%)C9KSSs7qSm<i)`G?kk;%9O;~5Q1c)xf|?hS22U`
zas0b0wVcUletmB&nhKKzJjzDW<wf8!kJNf&b}x9II*@6TSAOt^RO`rdLTP5Tt~Yvr
zflD6BzQyJZfp;z`^gi|GSZqu?TKahi($e>JSL3pn^-SC?ieK!P32t2>*i6paX=D|K
zG?axrwXFST_V{)_L#b7yvp9LX;(2({!8<utS^enAj%(mBB#ZND38&JZk@^lJzIb+(
zM*3*TmW#la@j8@NF=F-ldl}S4_oFJdbRGQ2V*BZ}XJYrXN)nl?6c?IqPt_KVXa~`e
z`mS4Kd8Nw4{)s$cAxnArUmY*FiX+v4Y)dTN{DIMFH~s1l`^?C%NlCtH0VIo&fE|v_
zumao3BQ<IT<OCG)1oE0rBFZ<rF*0_kKJ#%8jKl^f{&r7Ew&0u}-)A*jWMhPgfvvg%
z@k!~-UX}&@UuHZHUeri-J+nFIXPAQ4(%H;GqjX)Zz7gDTdM*Q8V`DjdveetJ6#~}M
z4@iqjSv8-;H+Si;mlB1j6EL3+n+POA2Ix2pJ`C-uRb#H(=gx?-qHGD5dD%D2IwZzb
zPgrH$k-P!}O|%zrW5`6(PkL%9-bF8c!&ylfDAY35s0HX%3r@KqW%nNyBMmib&k`Wh
zP~^{^2V>JCrY<8;=vO!AABuF^BF&i37V}gViY9%r{z7mh9v#Z22n-l5Rq#))%aq&k
z<VCZory84yR9pC@?KU6WQ{1l-Zae%LMi=!|fHEILWVQ|G>_o&=h(u^HO+BgOl-J{9
zck<Gijd^Nd;90sahh^4s0jiv_=c%<kpU|jylH1+04`w;3lAanFP|}3APeoZZJcU-b
zg&!fiIVs;GpH-$<P*3Kk9qw)6&K0_F;WOf~>&4FaQgWhWvcetyO4{-AIey`*ns*LL
zE2T*v-skF;I*c^W-9a+B0}p6)>=i*Na3PZ@d_JAt+6MO87o@1|p6ipTKz%1c`W`;H
zJaRIWBFi5`Lqo+EU^LpWdWc`D)Y#SvQ@D0Nb>yr<Xs0!4;npaKbvl1h!#SiAQ@ch1
zhn3;tK+ZqfG}Z=x<MC<P8FOMNJHjYm*mGZLG;}ISE5F&Unw~9Di>*R4H`N`>1f61F
zoY|cB2Fe~26Qp7b-Arp$+J_zeIP%^<F2B_nUEZ1m_}sQ%J%%w{SHkCMlZM48U&l!u
z0u+H?G)#BnQIsj8^>2Ji#JVY7?+}Yju7Qsi@9x3aTya+TGG5%j9G#8vSAj>~dtdk0
z>SRhIPV7c)ihCb`(W|mcPlsZk*GCxhG}>8<B(Ibx2C+m1_ht^-O`3a*2c6D7mOXw~
zEfhpi&@s-9%IyTgB1QY3z4$9@*t^96=ERe@>MeRkjmlFQ+TISOG<2Iw)428~mRXu=
z<jq0%eQBDb3HD>}p}x5Y0czqG;|^U|MbQB<%BsO@O8_AnjiS1Yh)iYOEv@61U-_k-
z*;=v*H8ByIPk3#KRCxu{GC2enMY*y(8Er&2JWq#Fx6bV2dgdZ+Z9?QiH43TV!{9p-
zA}v~je#LbXL@?gaCnsrPG(mEfDM01cDg}x6rLoWf-5mG~lCv5WCkAECPfR$Ve%JS=
zO@VU%E0&10WN)mMvmH)i=rbpdVOlA*Ls{<-5B1%Pw!*cxzFioLzm4vFY0iP{Q(t^p
z0mBNL)$I~h!v~$vYqZ1#)4nc~wO6U9(&r*F?;Di$kLx`4**P`6_^`FNK!<r@+&OkN
zq)*(XN_)I7HU=jOt1Ex_P$NfX6yf^zX>^J-Zrh&6_<3qt%}V@NYj~{}r$Q+t+7(kt
zi^v3A`cotj`6j<9p7AyS1|xOd)d%N~ot;_bxGsj+^DPLRjjYnwPqcw2db|wR<?`vO
z;!Ma(HP(Fb=!n!R@`^%n<FW}~FXmuLXBjGjlLnOckj)e|$AT;82YibvgiU{;wi`H)
zJhzxviv4!sYP>1K<xv+H5v-7k{n|r0PhTvt@O-=8K4ascJMHjUcBfBw9qak!<>@=4
zNMDo)fX_D0nI(+OA&=Lz_v3!^B;5xMc^co$s>g7rZK}}pAg7|BPfLX6b$WI1<g^<i
zoq6{N+b~nCj||U}ww6D}Q)p+leU2d;4)@I^CZOgx0Fz=QZj?MZA~AdFkEnzB^m4-=
zj2dZqS<GxvP|8<t(ND%g=%jl1q9!)9SiQUazVT+)?@KFE*Zs&)5S-@{MK||QC6h1-
zDCAXcfjF$I_|)+0Y4U@X|B|#QH$>a*pomyoVmv8)8^OhNe4JweIp>!E5^>R$v9K7S
z6YD$%rktxfone~EhkfsXA4OSTf00U^h#l4mj3>@yit;Od!v5Gs0NX2z7@{<c0L`Np
zYl(wVXQ$Y&UJ%W^+CrHm1w5MuC|;?kL#e<g?*q?PV@)oI7kZkl=p5#~bM}t)<Z4cH
z-1N&I$hJd{tuj;`j^hiK_f^h~*NABIOmCfd<&3ONSL+@2m+B8pqJTX^bNM~;U!Ldw
z$-~|B&CxxbmoZp=I7cgDFU@szuczdV%RWX~z@AfZv~ykm#PNQDVee>O)($Mtt>z=w
z3vor-meie+Tw6rJqSN$+Y6|W^sUACYR@m9AsydET_96BOl*DtRQTGx^+wOpnu9U@2
z7{uHz?nP*!-zFdM`@Rt-68s0=tM)(L=~<0%cJ^s2t5SQ?6~#XrP7d16(puGZ)~g-b
z^_F&%acjSoFdYHZp(H<G5M~)n;FK~MM{K@gUk;aw>9c!}3yh+*A`@AVUm?lF+-D6Y
zIounovM_m+V)6yjmXs&xwlDICErpVC;xJRt>kzU8Sr}jcFtSX+oX_dZ;gzF8Y8zrc
z64!9DoJYn)RUA_jD46rP$t(5C_`T-TNQUNYm9iC^Hkbfn996I9%5%OJ*Hs`l#Jwwn
zraz8IUr&nelTd<rTPd3F^>xlraZxqxPAq!T6<foWn)0np-;*~YPm@8AXKrpRZ4&`e
zoo42KiH&Xn4>O@TKaSM7rs1mkUReTr8x)(lAf1BM-4?oXx1WvShrM$JK>~+S?`?25
zhxp&jK)r&}%mP(>Z<{;>-XzfD{K}#&Fk@Rq24(+8;D`k0GfR}<`g6IpcNobW_Z;81
zJhX_;`uKt8T*jn|<Tl%|>=6Uomv)!AZHc}3u&Z@mzK`36vtC!Atxg*4*bAGSoZ*Mu
zsV#{)GlTm#=2(je;TR>oKWE!Wk<=;+nz&})9C4R(xG0pvJ<uz9vku_H6(yw&(~KBQ
zq;9cuCb5567UOYUv<J||d8Q<JHq?T5U)MbK-umOhX_P3xo0`5s4`~Cvt8~BYg4||z
zhOnt<EV0k=dgYW4e*=$ZX7UT^iUAY#$j6`nl1ye$gi;}r0nxFgbNWwXhPxF_UaQNA
zBa5z<SOk$gOkv;elwzn;g0p2z7`n^GERE2V<Q;P7GBtBOT>?-(JTGTJD*&bqy{4#i
z_A*{%KywtlF%~Tv_DNzc*9Q-S>q>1pWlqxkt$Y3jLBvg>m=e;is?jqWyep^%Cx0|a
z;$78b+FJ$O#jV^ws4bC}wM5*&d|F=5xwRDgVtf)8eYj9gLVp@fU0V2}rZ)8OgZa-x
zmWm?nj7C;ajLVwooi#6sKb!<LO~kv(7!|*7NhQj<ZFf1A)EdhlH2gI#q$;VRN5~6U
z-w*8s4P0I>gMMOPd0z_c$8r`~UKV{;7D6%i!Ord^cNLPrrCx(&NpNKc^HJu}Tz%$g
zS;O~Zk8W+7E(%Gdj>Kj(GxvV06f?8@lY;dol^QiE6%%V87nN~mnQUkgK;ef*4%9(i
zW_$+X+jF84TMlCx|AyS@YMf^)OH~t1Qxi*lRX3a5=Pu0t@;Y84+Xe<$%bp+#E4T{Q
zYdVh!<;2)xH*C%)j>WpA8cQlMKVI@tB!@04ou8{att6hcMg0-&8{fvc;I8aG@YySh
zGH=wUgp;QX_Y+`*tkaFBh7PKGEu?%GCq<F4M5z*=08n{NnkGl#Eia?1*LTb~R-9xJ
z^aMnWT51;YAB<pY90n~aB1)hj8g}fW0SkyhQDwnNY^qy$*TOFz9DwA0wOf7XuvO0X
zLbPsVeAH<R<hu%my&D~M@o(r#ue5cpr=YC?<lzlO+h>{i7YggnEz<$xDcf>}5)gT!
zfE}cqE))KiQsa_t61+L$`VVCZhSg2Hr+lfjoThLYO-uXEEuS7W5p$3etD08clbI9v
zKJ^vcHnEsoUqX!RkTQ5CE5sc+aA{i;_+;wQI+R8>Ma{sy7H2Mpv@d;ixiC5XzUsHs
zpMgffzZbL{MF9&lj(2b9J9SaHZq}f2K?TI)Bp2rrg0(nCEBZxsbO3;|CuL*5L`|=y
zN!9efp8#7~RT-9IKpyr{!xp>SW{JqFkB&_ab=5ps>>#Ki%C)TH<ji{Q@g~LF`VuL0
z?65KIf7M4LQl=-EX(3lln)IN=HRJA1#rq}amQ7r9(9G5@{sde(>1O6#XJr#ZlPg4j
z8=6xIUrd&M3fqk1)Cn*Ta4txXDBR~oaK4)Ze9RldF#{8s&OTYyQ>G_Pkn*jHWnN2I
zC3gIZBjS6m+q0R{u51=nbV1&4d2>KfhHWxBYl!^YoDm|4#!>f+6YO!|eT(SY9j5YL
zhdTL<cdk=IcJG&P?yJ=R#&^%>l|%*q#wZ@O7@3A7|5PEQCQ$Pwn2(uIlOKn3E;`DF
zl=+H=S|Xwe&Z`u)S<J4i94(2>{D&&MIj?(eOEG@&Arte5&fXOuPDvt>Gvuo{!mF{g
z?WiGacD&U`ev=^rLz-V^NpBAXDV_Udu5LH+YL47Z=vG{qKCYnQy52(Lat^4e968BM
z#uRTVh-=suD4<c8a_7BDOru^qG@po`Wuid%GJWBp0xCH(Toq^-R@0K+9i34p=)<^x
zME8rTz9`Jh%q?z?3LUXaxmq-qz2%@w6JrGIUT*VYGE-DOv{+xFSEH7X5}I`Mx6It0
zt(w##(ok)o1>|9u2hY1=-$8tMJ{`~r&0^i3tryA=I_A?#d-W*h$6owcr+XX1m+jj^
zlzc^Q59*dIzCQO`vR8+u_!39!#(}`bRJV2MUKdAMwc~9W$RtI;OqM=a*dH0yF@p6B
zpniQ~?SW1)imM43j(HBT;)KJ+7BJkRT@m0Lqv}C<72}LTz?7kOA98n3a`i|cP^QEP
zd6X&=Y*tR%$GimFw`b>mdCmbrA;#!HLJ;2`;8xZUWc_rKRM#AE1_6^4)Qb4fRh7r^
zbP-XwzDsJtVhjx``2yFajTBSpn)IRes#)rQO0!N5xS2nvM5{Z6oO{NyJI}0QjQ2C9
z`e)p`?uAK>tL3~MMoY$7?=U!xWYwCCY7S5qZWX4auvm>u;;B%QfP2G*aij0XxoXmF
zv_RDb?O_OBNS582?dFXeq16o9wSrnOig^dX>sryY?wUqW&!lJ14p;vC64i0|B2H;G
z5&M8f>>~x&ELQ4FIqqxb!gbPuo+opO)EMBQKK6F(2q=AwR;81_oc$%HNdm5TCg%K#
z23SN8EM&9uCM!)W{FWURn{22v`CIAi@~@+RD8j?FX)H>pAgSEQ%kHPMmqrE-!h35N
zs@K9<m;&d_G$=l?*B4DLuqyExP9syHerGd?eIU)}!LVRXlF5G_jeMRaS#${%M*y#I
z-SJTqNLM9tzU974Zg*htkR!6Q?_yqza^GvT(8CHR&-(;iLbii3*X}dz>Qk@%+DzIQ
z=z9)2j!~oWA;EsQDR8R@&|4|W!cMO6H1eVUGCo(eaHX<I4WZoA0L@*&TA)p>*&`{Q
zhgV`?d~`kuvJJ|KJR2{Z>BqZiB~FsgM%_Pg68eN()bT7R5gZjpx>xd(u+6&yX>iI&
zm3EKKR+-eS){Pk1=hiAPdq-YcBLT(Aaz2zsihR6y)+bC3n*ns956|3V47K`N$}2}Q
zgakYyUe#irnz-zi%1)}4VAYmQT##u_cV=n6Q3`_>Y+E+pQEx*fO$3C2<Eu?ruXGb{
z$*6BX4knq``~2qqM5dwKrOuJ?5=?H-<o(#km1+-LR*u!gY*#BPq<LatQc@gL>`qzW
zCWpJ&yVNxGn3jaF*r;WZ+VYKLS$kf?;qHQ3tew96UBaz}=Dn+Fls(~-mJ}AI2Zc-7
zyH3cc%#dIljG%38BO^Y?YLB88i}9|t=rdI`Uz=j_T4IEU8sI?Na)!#fw)<%IN45QP
z_`poiW{{=wIdtp%dmvFKmX$=?X3=R6utem4qY&lqg-)f!Hb3@Wt<LF(G?Y|AJlayR
zgECs1k}V8$gRT>{Zcq>|-`o5Es?#<iT0b2~2hcW!UUW@yOnAY|dX`AABl9=qfCJUZ
z8H!N+siioUQV-St6~g$Tfv*we&T%DX^q8Eowmh8~s;nGuV)rNuJzIWZ`@cx{Qo9oi
zoy_!U3Hd%kUpv<GN!8c2PTeIc?Wd0j76<0-72eFz4=Wez&ie$S&L?Dkc)lH@q5?IE
zo4iV~9(P5bk~E<{BanybL%}(g;2&v1F<%nL@ebO9LfWtVf?ySk$8Gz@(e}&%_z>9%
zV_B_kLdti#7Ry_6mv4h3-+>2~%nLx!)QJR{-xpFr(z$YfizWd-Wt$hH9YFsd0{)w#
zTC@F*IKAaARB>ghGg!IT`T!G$`49QZQGI!Ml@;Z4_EBJT+H6m`LLe9a7XgDneCwbS
zCDcQTN1M?K2S@v-dWOQ^Lq`FsM1+WcgWVgdWFT;dWtvy=)_<eH0!hdqkaZ)}5Iuj7
z%3LXi=+hRgqtn9Hy=vHN)<U;+i%Vhp+8q}}OD5H+PI6GY-naGrPoNtv9YaJ0)PUou
zc734#jbsZTV}tMM;6yHSR)Xi9eOS|E-OF%#YyKd-o}(piP{ok`vnf5JWFazK*jKSY
z<wh#MtHK?v#@rmd?$fBeY2+4B7BrSw7Tpm2&A&R_0nw)^Xm$Kkfx}{`*2)1l-d2uf
zEX^dP;8z|RPygswRxK+G!^q`P4}Hc(aO6_I9=w1tG7Vfz8T_;UJy$MdyX9*X!xP`|
zK9V;Hi0eLrmS)q^{wQv8*-q@rC|XkiHW%5%{a($NP4&mmR2LVH%sUPTsiH&Ejrg})
z%PezYk;kh%7E|XTcaQ7bcEIMWlcaf14)G#*QXLh4`K_4_5Vqv1?Vz%n<mColH<^^f
z2vzt*lKt^?#I%S!d4NnjoSb_KZDdWlr%DeMfyoM@QpWXkN){=dS8I%)FXVsp150qD
z6LXEre&@ssDe|0hG;0o+P15Wg@Wl)=UZ<A2%}Hq|`V1o)@@S)S4edfbG}t5O3zJ*k
zY?WgxBjoI_4k_6KN59_$_N$*78yjXO1Rs=?9wi=JC^;Tk6{_I=O@WE+SB1}DemCzy
z_Q(T=$Ik|kx>#_JE3zhf0vi}Ang(sJy#vviaks}Cj8VD$F&a#)zo{w}#ZAg?7k<Z0
z*&-y?A8_^y{(Rv%hbi5HEvDp<`;YJh)fCzg7Bamg7=U>lG>Z8I8fkvG8eCQ<?7uqK
zK_~vM$z^zkP=5yd?%4e&*jLVh@9H6ulzzVevYGSwC$>xWz-Hp(>u2xP^07t81T!J?
z`z<N{cQ}|BWn$lZ=Uo3b5Z+uz@QQR@`s6If&e2+O67o3IaCbV!rNgfkW5f%awU$#5
zxNOADDbvD*`;qJMm;^p!2yNmNp5OIxy;jQOWr%o3Thb$4UL_>3$;9I`Q4#OaPu}^K
z&+}|P*8NkQ=7wVnu+IK-LQe5ZmsC^cv1E4nJKWArj%|vnxE1AzJU<xzHQjufDdeXx
z^!|)NKBqSQ4{H502>I&&1R?L0WiF|f_UVcxTiA*3y#^WT;G(49*R1D+#gF2K_8W?M
zb4B%db$tr!MY*Vab|ReH+8MA`Un9-d4bn(2A3P0-X{e}__!nv={~W|4ZRh-Fh;e#f
z{`K}zYuMf|$^NhKy<1h4iSYsK|AMVf4CNlL$DB0vj!2%8j+b51X9)*v?;%Nsr%$6|
z!Z0#cw6144oxq|p44vzfrPxV7I8<T$<o`mgsKgdEgRVb(N|f=Hd-<?8BhtHSlT9Jx
z7qOkEl}qcg8On`FPSu$`UK6~!*#3g8-W;^sTiI1VmM!f7$zseHw#z-=e*rxy`;Iq>
zg@z@2x;V9puxT*EpjR<kDMu@WW48jqy@YPe>rE7(0`&X`Evr5gnDs>^<(Jm~q*E=K
zCC;UWqF1G60zOuB`pr|>Nr>xjAy=@NFo2gKDVo7NX#A$Q(^7`|?J8>=e{#orG64f(
zZ?|#4JMP8DGniDTMH$c%B&#F%Bjh?R1ow7uJ3Ct}@JI>%{W!j~G+PpXH)$S=Hpb-+
z$LnC;q8JtmN$%pC>g?AYgP3kbM0O4N8{tOlhq7{J99j32q{gt8&SDN-L$-DiTsPT6
zC=gWSLUjBUi%*F%pr@&VK<Z+ISx$KP>k&P2ZVnh9brHG<btY^z*TnMhbvl(s4NA2P
z!KUlbqTnj!vJl3iekG@*OGih&=0k-B_E$AXf*0Q}8GfPr(Rlp<hOV#42+-iZAecLz
zi%R-fxJlmR#C#3Io5!eoRr)T*w<Ak0JuJsA>Q-Jr#w6<v7H4h55>6A*Xp)k#u;w`|
z)foc4Bdyy^!;6@&n3K!h!`H{U?5+bV<mB^JCq_r+Gt^qRJ&NZH0pxJYTPYMghTR(I
zRWkEio&6|z;AFdWp<P@MvoqVr@bFyXGyA_t&RPOjIipZ|U`Twh69ACx;l6-f6QZQY
zd(v&bL^@O<jOECNE^^K!`?0Mw_iT8ZexclHqKuaDZOoY&b%6=}U%*^z7(#7`cIbX|
zw9HJY6%!gX&cQ@(49Av7PtTU?^Zt9&T9c$_k}^d4oZgEh_&2{rumr-{fmVBM1R=L=
z?}q8UfotY5qCM#o|6oaQB7cez{>tEh)>FO;{+>kY&8-`255gR+EyPHUGH5p^y*Wz+
zSv|rHOlN0`)F!Xwb^H;EzzoI4sy(5Jh@k;nFLS{X0tGFPdS-N&67xC<IFqt;;=R(J
z4A~7dOs4~SvG5JC(h;$p)YGFOj1rq=-%%dH3@?5-$A-H<rP90PyA*6s0Zrk3NJ1VS
z@z_&Hu4c#&qd%-2ZqE+He1re@vY{3I?YB{vC0b;|JJ+ci=3u*{J)N|+M5H5GWm&?W
z+hFauLtW@su>nwX=T!+UH?E3y6I!89ffOgwsL@{Cp^&Z`Nn-LcqDGGS?ika+>_3$k
z=a>CO{iZjpt-3v8k`3yB703A$Z!yl*c;iCmpqxM)7-|L=38iZl=~`xhrSy@Y4BI{=
zF=;&pU3qS};{4&dTv_q~)$LqFj)D?TM%}kFY?&E#yi^4z*biqbo&(n{k8!gn9E-br
zOhKcceW|VWP|!Gz$j3Ndk#aDYv+5aLbuAJJdaS%lT}UJ#gga#E%N@W~Ma#LF)^OM9
zOnk2?xRdCY%5RXT{toioUIom?71<~?Y~9JziGwVHHY2bs(Q;8@hu)l`znnEngQK}?
z-0J8_5{M|{h^l=Q#>{~K;fY<sfpG!bT#=dC_f8)hww(Nt`#-}oUf~yr+x1ctB3b0>
zstyf&1GFO6WzI$wmhoz3k@x}HSeJ8AOx)!L$;*FM7`F`djn^ctHZDSl?*m$Q-1Meo
zL}^%5wYt6TtJJ8xIycDLI1EsiKQK2B<d9#?x~%XGsxY?T*u29{O=y|@5TwL^$NO1Z
z{XXkWYI$1pzdIsYEg)78?a)b9m=XQvzjMz#o1M<O+E56g;-Ggm-W}Vq(5^k3)+}4q
z->?)T7dLrv!48CvpF+hG&xOZnT*hkAYfIz<U%4)3)fU^Y)d~$(jF^5rb!WC%=bN3n
zSixg1V2mW&;R?madjbt$;@5pYF{Ddp1(Kz8fe~A*2i{pe>OMqBo@b|GI}kcowq;%J
z(8$rd4e7|E`0?zoyK&Yisfz8uSB)zb83|d(z$&xpehr}69L}PY&Bw8skx9GU;t)AY
z{#L@`vYZ-e8RvI>s;;TVc6N}6nDI$S#>(OjU+yujneAvMWZy;H);-<phSYo7=~dBA
zUw(A{d^@j(TFC^7K7Q?Zw>g8;6(<Wy^_7;;>G3Ry-Y$rBzAZ<qHr7CXsYa2Cj3ZSv
zZa<+%;9?BSlG!_lC_YZ6Jiw~FKh3<*x^B7`x4^*(B?C%pxm7#0r{qqMi41@vJ>NYF
zllHRzu-t1K{C@9%!z<(*k?m9g=0p1h|9l7oy3aN2T6MZhcnyq_q+soj#)=ouG?-uh
zEW(BM?(ljoWDy8h&o_mT)x%!LkH~@fi{t?y#JY<WnsU*Q3f1NfG<oW+T5lIuFssY#
z1X*?KW&QN=@EqzNr-OsmrS``&72l`0Y4MkCiZxeBOOC=jmCNk!rj4gAV+N}4R8gVz
zu1nuI3E!EB<^!Yw<2@wUzcu6<wIjBEYh)t@lkdp1c^YU3I68oLkx6ND9<mZnB(7F+
z3YDtAR=*!v_A$%&vi2no*ITr+&22|S%p{B##q`8$zdVS&)T$hx%UQi(#N%;&g+z{N
z-Mhl&<@uKTlI`oFG&#TDvHSY)*>g9`a7sPb0`Ky60$rKud7ECu78<mT4fnkWxMbVi
zN&*>oPZ5yTqd0!CxgI^MlOuh0Fod+;WYv?J22Z3oGxs}X#wQipVv6}Tz?VCW9!+fq
zb?#+$eyim+29|bdh3&lRt_@p-&AfFQ12h%AY#j>vO>FzQRIWEp;Lp!wO44|Q=noSa
zH|<dMOtGO!KA7IHSZt1#YpHai)B%d|O6TAt%uxl`f+)giP{Ke$)@xXFWqWaRCWBiN
zJdvp9^<3qo>?rx|_kl7{3~e`5g-=>3e0k@Z=)0fL#b(omWOQ0|ip2JzWD!rzZBk8Y
zR}`Y?(?4@J0XpFlIAvs!j{2igRngXkaZR?!lSaH;6Sx&`Ms#(yp9%<kDw@pfpkJ5g
z94>ks$n!h;za4%7C-}EX)PN5f0FY1nc-!U?!^4@b-cSZOU9y=;eK|6l^HMfhVS?{-
zCH7c0nZ@(iJ-Bs4Z%uN6k)lfW(iulh!qsdzS!t@bdVIg`R#jbx!=#MdUY8yLzkJqs
zvS3#Jvhf;<d9i+mq(e`bmTrQCKs<B#OEt&MWSP`)Yt{#SJ{V41gshPBp1U*+k>IiS
zxvNg8wdqCzT-9nE*x+>yp&0FOowmxW)3=^3Q23ffuYcu)qB3sEA&%Wkrq!pY!KSho
zcUHDHTme5X-MJ5KGP(n6gp$%4qmqV_NN=n0R@D%Zro7UhSh?qLQ904c{8my-U7T-C
zF+7grB~RG|7cqbd`+S_Opc(SXLplks&)f*BMRP(lXLhMhiIV-hrd(D*!DRWbXz16M
zZ6ak3m*J(iz%k&}@o@iSZu=t8+M6sCzu&4lPV=(^;@xI)2&&Oy|NE_w@Bd7+ZkvN>
zssHP~$fw^I0zSY4dEv9V#UQ;#*q$Pg&{TeIR)nCb#nslql3v-x_ViB%dYC)Gq{4QM
zzm<@O96|qqeBeehZM@a)zGZ%3v>@nE4DI{6ENSGe_)}SJRJZYqf-zI$>pJ(*1;pM^
z@532BLGVS@A@D&!P%9DI*;N)X=Mi!LbeGcU(#<=+g5Lvg%Ct%|Tw_%#^a$>jRjuGL
z!`iTS{D-)1%ojR(#IK95FvcUFycOWI$1oi97~{O+6U85MzSLawjcq`SIBYGC?6h3e
z^LPIAc5YwrW~PsKz#mP28G7CBQ*BMfbZuAbo<Dgo{iwqJl9s}M9gH-hIoGfO*mpsU
z@r2BI<wV-5m`Z1{3wyx+P^5er;Th<3_ZS4&?KQ!zGT5H}<u8;>%?iaMc7dAvm~qWj
zqrs9dG|q^-haOC0Qf+3s^n1*@H76)zoh|lJvG(3E*CU?U`+i4l;?A!)nz&Xj3iosS
zvU5_Y5w*TyF8!H5eeKkRAzNaYTXUkf9j`x2vIw%3-2+*Ly~6IoqtnhH9I(%`*yt;#
zz0aeni)O8NcT48Lj*r_H6fPGBIT(#f|5u2(44CVYQuN-Gn#hgzT0PZ6hgwl+sAL>I
z4)7TEwdm-cldo5ES=eXVb6JhWy5Ibl)$tv|2elZV&$q99f<D{Asd&wy<~DlmwoW?R
z6W1*T_0o9Wm%a0K^?}B@y#IKA#RF+e?W=hr#L8`(7Xf=2<7=%0QxavcTq}c4Q)orP
znJk4zpi+E%JSCeW)3Mv@z7DU(7vfk!ef|)J^W>@Tj~&&J9^;;KtlL`rR>c$#mqSfs
zah41O2cE{9<xw>@C$n$$1wTIX8JoSK-XHPpX+#fR=E-`R+nG493GGkvq|9@tBWXK%
z%r>Qy=_vZnZe99DShPoBLXEdS_@QZ=n86|RG1vvyDSutDwC(OAVC9fmLXRqaep_>W
z<7s~C+%3_(Fh08q(%b9x@!80+qO(dHV{En=KX@c~zOx$MwepwCw|`(c^Eh*OeTol^
z6jS4v&)JNv0Pqn>wa$93ChR{wxzxEFd#}H}sI9$@!<KO1YMEcKpXi0@8InaG<SChr
zlNwYRqva|Nx_>nr_uV<I`_vKzh0xB;cz#g}In3@<KcCLaYQsKkb|Xk6!-m64bNftL
z)zSoTAm)0zv+=U6JADQ4YisLqPM%Fn{`<cGK4-PlKcQ^EREYq-RW+qs<NG-ENk31N
zBzvu`GP*t>wKU(tju(seprnVx+VxxhUPZ7J@Q(?P#IEPYep<@$FL|;#-)K#n%kPHk
z-QFbiN40PG*tJ-aD%->+r_Q>=W$#JZs7da|H#I#qWl?BSWD&iU+=rkz96!IQugP;>
z>-lUE2qq}PgO9(Qsz0HYr9Bz4EULXZKCIEDEMNSfzS-Ba)>>0+=fU^hVY_SD4=nKX
z>CGvdrF44yey=V?PW;!h;|m76laZc_z50$)d?d(v$~y=`I@iNt%iU-N`GT7TpHr!P
z!s+ayUoZLD{pE99Ncf)AU?v93Oi?lQSy}o)!`EQ=B$XLq$BsU3F~7r<_|R}M){Tp;
z9QR&S%y*Vjf=={I77D^COOA!swdc9@MQ)9xo6!L?;G(L{KtJbLk%4dS{vtlW^4h@b
z*)E#1pk>HDJ9W#V^6?%_%&G~(iqAe90F;2}=>>^t*3{lIIqVKb6~wHHO4yVm*d1RM
z*%>DI6QabuvS~v35U~^tD2&lDl=jLXhM-ILoNY3mkL(lQPm65}%I$3nlft|bhpT%z
z>iGrMHTRw!#WWIC_(un0U#BXRuB7L&&d~W;PKhztgC)?a$eLfmKLZ9B-&XMyH9gJE
z<7%*3$nx(5pQ(_g)0_=h3={ZNs7X(%Od^}AuS{HqBlppV=&cGyytlt&!o3Z@(;5C=
zj&uT!gb=OE0ozdvK{0+so0EGj{?uT~C+;n9Wpk^TE{&W5(>*COwadK%BaY2+@x1LM
zIJOI6uiI&{yc>Bby<2}-h4x{IC4EvBdE5c$A2lB@?m9oqo%RREe~0Aw_qHuSC?)V4
zPYm?MFQ1xqADX%@;x(n{Pg0j=J!lpTequYZRLZF`Gj?XLz!t>##%92B>7N+PmNY^h
zTYJEW+P%?%inXYQ8dBr?|55gqVRa=<zjq)3f(3VXcXx;25ZpHI7J_?lcXxMp-B@s!
z;O_43hsn&`llwXIyw`g^axM1my}EmKRsE{!zcLE%MfXeI9XXz`c<usjaFYW4)G+SF
zc%XyL=#yg|?hYh!VjG(o8+*NA8egQ1E(5_kLcHLd>UG-PRG+#z5jvoF^_kVE*{fT{
zC*AWl)(ed+F0j(KDh%b#$JEdFUh*VF#M4;xCi4;K#bLI2KZ{e%hUkWU$P@qRV(Tt;
zZ+0XG-li7!lQo#CTEd(TzY26QcQiel;9Z`UY4^`F+AKPq*t_y*KC8fc1}AtDQsX&z
zp5MS|CgLwj9~;wBKohP4&84E=&J<JhL%=M|7VWE+6QoUAoMwF9`YiV3#CMc2!oZtO
z^bv<@|M>7?8ufTX2L8e-{KzEL5XpRJwQ=`L&>!1jqVGig<x3d$D02J}5kdcQWxo!=
zzx5S`xI<ib^;JCCKh#_QJbrlj(NcX@ev|POaiV(D+-mWjuJxPUeSQ6mmMh$#0q)W2
zV$7xZ-~}RPZj<N-(hb=HMdcuCrX6F6+Yva}SvFJ<bPUmow#<T1T*=S>U_yyZRWKA-
zE6>gA<G;CoL0I=M?w>hmLu?3|u-NwX#=*bNu5ML@FR9<{<j%U~Hnw5d(EB7G?Z>m*
z?GzItUJ16P;4N@}ed!9!H%hm*7~N&iB+A$BALCWKbNxaj2EJte4($IT=WlIdUgiRC
zxN^h;;!QdtE7+#1;B&bjaU{gQ{Oi)f@8S{OXRuQmSO~GW|6#iC{u2$9gLt|9!Tc)(
zRwDm(P!J{1%*^6!5V-&B@_(dH8sp!zC4lj@1a$v$QSOcO7gJ)M{WI2oZq&<MTxa;L
z!=pNGoyF6<yd~bxyY&K+9^4|)O=WqOnw3O&HZ7v<dnik^%%dgsC(CQmNrnmm?bZtz
z!%CN!eLK!SLH!pBj1(^TPc9=pvsquV8|qV*@gxg~ZUoig^uPIUHr5A<3qQpRZp3p~
zh+vA;H>Z>Y#5?zRIsF|7S@DAEmu0d#3>T)b7%tQ|g-IOcW9*LBj3``vflA*r`XxWX
z(09B8q)$BZ`k0Q{hi!%#sy_cW!e>ucXtDG|VB%`6GI+peeeOe&AGM->4_j1)%XgB<
z4u+QKZXoc!xXHFzecl@8b|~u7ST<m^_e)`QzJ!Q@ejl8MF-wEBYjx#;f;eodGpG^^
z`L+1#cL1g;7f-e0WvTdEXm{v&+I@fEUvCV!i~|N2yQV5;%3GAQ%)1n>pn|UdGokVX
z^fOQg#@1qd?N0Yo34Gj4Uo?M{z+l!=4RC)w(ds2(Vi8)o1Cd(!+Uj|VR0bOZUrb%f
zE-H4lHX8r%Gw4MqV3mtQb9ubVwtcqP@yiG&XiG!gY<9>g4(Hdqz4?QO_&O~rXe1qK
z!M;l*oI%INsB(zr`S~ehPuI}~ZBE`?0B~usEe352*WKCiG)%ERMRF$N`8KSM-2M*D
zayU9qGI3uPm))jou|xw1<fWFtA`7v!XH$U#^0GiQ{he%T^n*k$JVTZ;`x>x2{wYq?
zIGW<<a$v21@`ZVqDZ^8I<C}+iX3CF<Bpb3|Y>%STh|SsKgH$b@B+^`ey0)vBB8?Bg
z-mT!%V~f`)4Ew_*m6X^0zA}@$tr!;Do3kd&5mKwMHc&A1m^JZeO66JCh;&RVDj$|*
zc?yGHa9t*SvC1y|tqLM;i2y+w6seeUg8tS5j?8zdCLH0x&#3zlJ+s!P`cBzV;b#0$
zH6rrw9(XT}V199`!hAo;oD{aahK=^}@#4HTmcvS(a}zAtulbJ8{&)GXRim&~VN^6u
z3i-oxf1&p(EZf%~Rpqcj(h>8gQGRj_3$0mB+zxNz9iNxTma0^#5#WZjiS=n@!jJs7
zr3nx06Ssqsj?&4Uci~bD`cKcna^~XKurKI)=I5P58pE)hF;gZZDlTc0bEt6s&<pA7
z0w|*{=v;RrAru770vk{6Yj#WLCV9>%CI+CHfExL;feRGjO{Z*l>(jkOVJ<g8)i=^3
zaeH%Z8R9i(D?E>kwwGPL{jk!5Sldt7+Cq>O%LkAopAEZxo;32Byih7gb1;2B7>4h`
z#Hj&46`(|bQ<n~4byc7tBHiqls`d7W=o2)|ZwxX=7*Ma(4_p@1QXRX&qSCESR(>9E
z>OQRPSIA#bvu5|la-+r!5dn?Yw8Xyk`*4FOjhv#&y%iUv<<=%lUNVFhX6zzKebg|x
zU?R>;4rWxUNsVi#0TbUwZi@Cnm3^Gd4h%6uoiJF@O;LqBUYvQub~((6C73XD&yYTe
z26dOHkuQ^?gvKaj+N{oiL@=3=$p{V&ft^%u{fPB(@)6Yh+OPj(Z;I3SZglZy+f-&%
za%Ph<nU=beTe&Fmr@!~-+mXhf@{cCR&reB^owS+)KPRrKu*=Hasqi*YYG79a7D{dX
zEF1m@O6S<u8;N(dQ)(=MHm_f2p?ZH*yq3dPxu+mk<v(DfiQbM8WL)0KkKX~tp?y<}
z*ej|SBiy~~z>(@M0FZ@jVS0FHev33#xvE=tec$y|O1opvQEFrgNFXu>L9;JoC@th`
zn`t-_=-VLaq|I&!NN`sXg93+3((T>itY40pZYX3?!O}ejp?2*&%^W1rv0yI|9;a|r
zs7ZMgRHZEF*?|+QLPY-b0OjVcM4~%GP?(QvtgV_@Bjz5?t66I|mv%`mK*H-_be1Fy
ziq#uw>k`9*&zl$+0JM?~WJXLa#kGutHDFG#>)$=OyaQulL5088Fl(9YpVjFr;LMw{
zX<sz8HCQ0t?e~<>=|d!bPlTD>xexu}3FO5h-Ir;0aT4ugfRH!jx7O^4!(lSY!iNi`
zb&E6KdkBcC$l2xH>&@Qp(p@BbhI!+119Y3z%n`)e5mlLs)4Q9Gm169;!2rTy#kXD{
ziO65%n~ei6DDm#|8q@^`dsZHljqhux#q)%rk>7%Bz%%Yrxv$%sV$4AP&o-U)fXc**
zG2I#tMp^!B+${6)K5-h%TIGU?1@TTrSMu`@ze!SgVT1nBk}4)+H!rg4QtDH-v#ZuU
z-IUJ+tP^UE1zk|K{A|6v*RLc8rrkM|-qJ`ZlB;21kdM}|Tl`fJd4^hr&AEpto?|FC
zLTXPiI&u_0-5VlLG7S4(NxOB9>X)KQBw){AcQmR9?%$eiz|OtO2@;%=?rGEn41rIS
z;j*g|c|?&(KlCm6&=F@mH@aFmWh<i+x(>n`E6JXEa|GD3bn&6g0%iL}uLgXPS{NNt
z)%FkP8~{5`m9iFS!UPGQCv)FQ_(;FQLDWmyn?NFz5uYHVAV{=i?;a8+>ucs~Kv^=r
zp6Q~1u?VS{oW=Gbfu}_DV-1j&Fs(*S2WY(s&B#!fWNcDayXYfie0+~0EyU1Ln$t<Z
z+`_(#NEKDJz%*vYESXCi*C{y}HrFj|11auDX7|<?cl9ypZf0<O-FrQZHwoi~L5lHl
zgH3-sV@SAPA!hOcv>f4!cjg@o7(vM5>8Se;O~cfml0sF}6B@3l(7y{hWQM#o`m0}Y
z71nK{I6$bZum}eJ2EO5gi@@aVD|%hI5R%6OS4W57HdksO_&V9@R#$(r!@{oe<X}QH
zzTxklU-(;Z`ZxStF5wn8${Ai#Sc=Z3*6QGiE^N;veJf>}tmxC0Ouxx`BtNiA<u7-S
zGk3l*kWt4%x8Hs0zwumK>W;M{Irlnft>}%mJ)HPn%%Nc>JEnrWX^WyEow)qW3tYDK
zf__Q_J>>z>b=HCRxawGg0o2*U<v-dpGdb1O)n=_7P%2$-nl(pCVQdHaGS26ZmHv>8
zoYz*3!=#*({xKLH$GeBZkbHlt$>`J-qY*SK5|{nM#Kl~>Qg-QBvH{pwMGaI(;sXh9
zU|X7AxnW^noeviR=yGj_m@&6F-kK`#K09+R&B_<N0u}re($jT!V{jd5F`o`an~s)5
z`;V>{-_e)Lr{gc-nzxh9R{O;!nDfXc^>4i-XzDnS-EX}l^ri`)>%!566lgGc&wCXR
z&sJ3UT(WAUb@}CDp~cL%7L5_vG+TXy2qLqG{qgA1l#)1Ib&9TL*k+%HJ4b=$DXLhD
zwuwiIbj@^Mmrqldr+G`9HMpCP#$Fr&p67nJ4!Y?&gPXZln3QGVlM9y@0g}IYp2$+~
zWLbj$fAw@wyLromufw@)ul#@XbVyk1?+~XoHO{tpcs%0VBLR4|^VT@59swS^c<E{@
zwbPv^^SBKbrXp|sG7`xXJHFHhpw^7s|IqEg^1QLNdWKq0h_@R3kB>9JHl}$Fb54Nd
zm*n(a;-)`Ax9XpuTT3STfiBwHj3y*<Kv1JtQ5hYZhqCo5MLc}6+_zNm!f<C*$>%-u
z8@{IYC3^j($di5LM1m#SKC<U#IeQ^t_tJ#NIL}lnF_=K0eSz`NT|p^S#jJ=l?6PK*
z5bRbMS?3V+GtVqF2s(Dy{R5-KaoFc_N+v>C0Aj+ZaY(>;(PhTwP>@0{Exuayh-`)h
zPmRj#-OGO8s=1Z=lGkhfwI=s@YS4toI~FKrMfH}}R2_)_L=oTl<v$?D3)tt^{Cjf*
z=VrJXeJ|4dB5%pg9F=UtSjpN*tB|V1#L=NkdjHaRv*qq+o#oV<*BBI6h7gn$d{=gD
zp*iQ#XW1uXdkk@_(i-^c;kow>WdDlWRR=yRUaSFgglmyB3#sCzr16t7KOyCB%@JtX
zY1!*^h<D`KEryaE86LD62ucG-y$<E2$&^(5+~%_;D)ZloEZ-nBeSJuP-%jGawvv)O
zi+xM2Di>qC2U@G4-K$Y6r_<U13fERxey$r)?gbgk1`B{h0TecGOSGAUR!h$5W48R8
ztuY>5-^Kq!d*~u~x448cBfE5v@zNFCET6eQCY9T(Fk^sfG6ti`*vrB3HkxCqgmTBy
z)#cQcjBW!?;CSgYfwib4pXG*Gu?GD20Luh{93a3#eRo6c`w0)_iedJMjW<#@BF`<L
zopgpuVqxJ!^nIiFhMw1Yx;jOCzTdCbgIQb{a9zrgiYJ(d9Y=d(R$0d1IkX&7u@T);
zHhB%Y=Id$NwbOy?_QsQA1YGx>>YFmrJ8P{OYw-U9(f3{UXgNJ*449%ud%rPg{ZN=3
z^xLA@2wg3YX_*4_mDcDY(I7f8eRUdAHLLbtq&a5j7ikVfcWOto{zOI<d~h7B9{$!+
zFjeL`M}vJy^ns<4sKhLBbu;t_WwI_Ht@#`2*wkOu^oNeixU{pf)@@Byz9k@I@=wGC
zFJ!<k$NJ!;=hRhSOvtxcyQH^$xULZ8^ESX`0K#!2=9*3oY}V*Qqs|+941}+G*s+EV
zuDqDSanhb-CGIoTZD4Hqj-TQm+(1tccis@P@;?Z9ES7XIB#&F>AU|vJAb9<~&3|Gl
z5d6%TcPrnObDREm!6n(M|6Oot^?wyyDl5yvFqKUY%8FMz%z&OQ<6?RC3edpJmQ@~J
z@wto3SResuaJOC!kfsXdJJyuSH{Vbn$fHs@pT1b$HyHa0)s7PMMF{Oj`mX27w8Dk~
z!#Nm$Bt;HSwO;2mX)M{u?XW=lnphjaG4{FiTHp2l^DdK94k_p3%*v6dbeXC*-|sAW
z(U6mkx300K2{Y@`Bz@$NgpPj$^5|G;*CpOg985VR<c8b6zqK^S&^9*ZhHH$>f25c6
zX*x+IJ%JEPEn@U_fEc4HUX)Cn0A+nYz->@Q8u&k9@n%IwTd${}a*kG*ltTPz$7K5Z
zfn{?p2RvAG4@aG~O;hN2%L9uF9#@kU3)I8d(1Dw)oDmg$m3EdgaHY{ZL+uRbr#t8u
zv<Bk^VtrelW$u@Q&?NQ&vm0l}A8XruM+X~xcRw0`yq3hp(zvi_wC~+;O)PpwtUCYf
zcg!9BmXMC(>JdA)yj0DBkoNlcR^X}b_*#ueTV8>kI<9?-tO5n=Oj_&^7tc?JpjGU(
z>)}}X95gffT$OZG;@RwW8b5N}s2{4Aq7XH2>D<=tsp8sqa{IjMxqbYaTIo_#m4|A*
z{(7y@m=W$K;UzM;jONi~=`8tt;dB=@yL6h4m45Mz5>c<5^K&2R&MVkJu~%FgGgg@_
zFRiX$-E{`R;%^%9w(rQJ_+R$LlLwL(RW|90eCJT^h#2lt7&=)ZNcth<*#a||wj-)Y
zXeYH_`i#z+h*rYxj<gB*$r`eyZMyOagC?*#19G59JDqU^HG7Y?+QXyH1HrigZi*F7
z%4Dzmv34Il>xjO?ajts{5Lk?o0TipJz8dY&LT&21_H>EP=K<VG&o`;+8Ws(ajNG3D
za-6jjqMj%U?l4Pv+dAYmXa!PaA4K)QKi<EAU_;{QdUZ`+ZK9XTLUg8qYsev%Xkihx
zyBNv$Pr6N8t|))u;3pRK7q^MVqe6`ri<QK1>4+|hw)0G~%X5M+CQorlMGt$&5=`1p
zBjPVy3>fhP<i<>lpu97kLB2KZ)v_Rl?Vdy~l6Wb)c@+nNfUXMUcb?3OEZWC|`oojE
z2I9@XD()*u@`W)42?t+cF?Tr>B!m;7jE(n)JZMP|961KW*AVJXSOvM;Xed15MJ0`9
z4p7^HQvCj{;Zn;9b7(MIm&L>)6T%!3N0+67kg<O_{jtgc%o>j$?bhCX_~$HudZT2u
zf-oUG9`>HweeG`DS8aR3kH7+&s*Sci?HBhOE&+-}-HGCt9j?{KOT2jON8xWjYb&M0
zV&sCk+-a=?vW<kXzq4SzWf96})6f!Fk}wfCZOt+?>Qe*x4kGtfQF*SmELdBl%)fqp
zUQ}OkZFV0p!ItRu*abveKgB+J<DQH8>%zbkyc(!DyZKBo^Hf);002#F(=rhu?z_^$
z#!rtI6be(V6Wmn~HkD-us;(nXlA=?CNl0|=Kl!RV29G5i<<)Xb4}{$;4vPp6#T`YR
zK_mwfbi<Cr9CPUSj#p<(N)ooWc~}!-5lw$0@UFV*5<Ohpv6O?B{=||#cHH!^bCVs-
zROH0#)zNgKvr?A7#w})*iJls*fD4-pfu(o{^0zDYR(7q#!>nyPO@7W}Y167c_p4%D
z3g^?Wit)oP$-u+Xt!ir6c0g1(cqwT-fh77{x%h5>wxQxJrG#2Mv@a$Y=+i@D<0LQC
zz5wEHPslsaw?9n&kdyis?Aru5=DWvRt~#=Jo(BgwZSP%JT9&ok;KmMc&$Txca9LXx
zwr+u&mV<c(-RaZEDK)Pu15pVDaR2-J*OZCmO1*=@8`{qwZkm(g^G$D+Vwe~=v|(Ou
zR4ZFic&r|~<`*$$CZ|2LpA85vn>O2zNBN$vl+8ip0O{W!?@tQes<q?s=-(Usvwi-Y
zna17^#9;OZ%x;B-J&N~^_;n&dX@^0O#y4gGGzsvjEdf|DF(yNK-|@xdKipi~p`pML
z{!b|_Ip(*G80!|SNdKpb*Bb*CX8WzU<F_H{m49czU19aOoXUy#T7NInZ+DHZ|5h_p
zn41}H(-z77FEsfb2<4kjaFJ67(!T*@l(%aYD5m`o|8lYLjSuH-fXM#KppDA^Rncv(
zgx@a~^iIFSU;d&AWEtI@IPGRpmAZKvOT4eue}de18Be+(25?wN%!&yrfXNNg!WS<i
zb|gm=e5`Bn;H{^;_VL4iZr;mW=zquz7jaL8+V0NpP`FTljoC1vk0__~ByKuf0??&y
z_=(eH`mlxRsJbgzX_L8EB1X>b2si5Y$$Al|@n?zI#R!}ur005Fo*MNxkW<+o`@O*x
zZFlV$@Lb;!4YG*46~U=1!3qW`ynnB!ccy{+;VUqgcR#>Pz7+PlEfXCZ`!_X8xt9-=
zeX8AKE8!jhHj4X;0Ao?3Zd&!q_WRMx*Xx1;(FfC}%1@6kmNdI?uNy_UWtnWP?E_dZ
z2{&pnci&)8lreLNnmsjmFnK3lm2(f;0?^nTkCsk>h-wRE#%+A|gv#^&qqxs|NCZ>G
z#X%Wq+!~4R^bt7IGYUU!!`${E?TymKh+}6%WziKI(OOyZ7tN_TdLU094ixjQfqWPY
z|L&qq&LuB^|J!=)5&c1y*FKG9;ZSC$isx63k@;j4-%X{CxxJ7C4c(i1S$*O&>P;j6
zc9+-27p~n<V(Z{#m>h}Ob~h=TZ?(U@nWT9ROgrXdB;tXhTy(K!;q){Z>q2pb8nzqu
zK>|b84Flfp6|J+*k8bm5#19(QIT3{*aNcyix?b{iquXvp3M3)Q9YPyY(guS4v&0}Y
zpd^;(EHs*!%dHeZlvjH{Wt!_UwSeOwvBf(nW0zU$K<fqg!zK8|#>wc%PsNr!W=Hn9
zO{f6|C!Xvxbp%!W439kOT^BE`*5tSmIQRS9h_`=<BwwifR1JwCYSDF$33S0Ra&9JV
zA(N<g*NcI<=V`<DxTNQy<Wl(`n3ZTuW!kFJPw!lHj%u~pywYVOC~&I#5b%$pRP5fC
zU(yQAl)3ORa^KRMp46Gy=1)<rMYsE&B-zH7u5UkK{uQn!pCcrPo(<9h@Oz8|l}L(_
zOYaddYWfydB01f4UOvq~P`okA&taFOxK~YEa|jYy;-s?lH8mU?vn?4I2?Xg1KBW+7
zjC-SP?BZjyI_DS1@RD(%Vy!Zg_4J`}Aw51;A)S+GB&nYx-{hT4Fp1H5wk-rDSY0&V
z5USoEBGhA7d8%{PaXH;rO@V6(fqvUqLy#pV9bL(-SunembOAM;8&ExrB7ew75dpvy
z5Iu9T@=m8N^B$u^_ej1}xF5%!m;6MIzEU5bMHBS~{apkwmd^`9+v%`Bs^Qi1W(B-I
z=x`9NeU52|s5h~SNr&Fc8HvjWa-=Ou?guApJvgg>nqTjZt#LQzXOYSx8lu_7t_fxC
zqPR;&s#7bBCe7GHi_+G&&aU+BEj5SMjSLZ{@S|&_Ix2t(fO;@6K$R~k5Irie8?#jW
zY83dKWmWX(Ac;8wbLSu()_l6l(e65W?0N!pKN)`?Pq95~(Y>=59@aKGs&lH}O}~iY
zT(}6-gQU>UYHwg`D`Km|8lL5S-DTePHl*TirkGxZi?=j0w@zJ+b-F@GV0n*1EhPZ|
zMGgHK^-GWwH!ZPmp(FzsI~?xK&eVil$1YrOy(lGd*qyUAj99)NZvz>+^!fzv-5liI
zlFap*x=`_SK>R2*`ay(sNV#Xn?b?DcU;U!OVY>-I3r#3Ze(6H*O>c+WP@|H$kKCuz
zu=mGGo<7C--!J)<?tQg!jGU}5L8JYoDB}jUFPrQbcWBf^{F8=>oH9(3{hvEyO*##-
z+wd!urTmx`AbUk@xW_`~zOtszI=&d7Rfff!lY4uG*hZ0#iTdzH^pVZ`CRM7&veC{<
z;&VsIu?q|fgb+JtReNVLKHjtc1VCj?hgbm4?iHzb^a$Gf$iz$6VxW=MDdC5!gXHkh
zNf>b)f)y1cSw$ne<t`_S1na*-ZEEzB5@qQS$9H2RUxLUBIz{E^QKEkG&x1=s0txsm
zv(Kelxi6&CuTLPy9Bb=mBkm_fya(sI6_IIcBl#dc?d}4+QXS`+6a~kY*I3Op;EX0M
zdl#ra0fxk(GXVqQ|4!&TK?l6fNBR%>$RI*oKk2&ym)1U2cGiE+k@0=fcnp4IrHYWC
z9m`Maac^-`f3FmZlGD1-qeMdV-0Ra<&QUSri&S$aQ`aOe<!7N-tKdDyFHR}^fJEOf
zLmolO60M}IdZhGxJZMozfePQQ*JOqcB!0O&(R(G5pw9b>#gH<E(2&|2Mc#2?#qSa8
zamXrn|50r!SY4y2*13`au3nH4H>@|NJHGZ{OIdT<zsGVqE=C#Ia*kgb(e_Qj2y^@S
zJ3>I%I;2`3YUekx%83ee5k36faDE+LdG!igKRtqZ%L<ds9Yleqfxu_dmXG;1zL980
z6W$Af8|N@WZ!0p3)dAhl;VEt>92BR8wCI+-oQecmU1@7o!R#nN*CgdJh`aB+uQ>l6
zlAjTajsP;xa7tcJ$<|;)fP^wNWmq`3M~x87I0=W_lu)vT#=A+{b&K5qPG?F}v^vyp
zP%QXF;m{AY8%5}Fh^3^6aXWD4;b*iLA5?VU3RK)t4g7BlfDSrK0J`m9GP0UE+Ad=3
z_;m^gC33jgR8%Ap8DDgy6(y@w9`VPST4e*0gHt^Laclu34lm3hRCxO1!Xj#R71wDx
z7$k2EdclU(#5^o#OZ3hK;=pB(x!*Y-^RA~hb<YZOj%lxS!@yXUHnH3gVxQLK!tSVO
zdxrDv2>gWbL7W2mQ#h{M`S5HD*UU|4L)IB2$?5Xygs&*zh0JG*1<ZEzPGih|RLmIQ
z@$Fcln5LrFFRTrV(_sTiS5Ai3qy0g}(;SQ5(ax3OG3ETc>Hf*7=q^7$e@8>OG!uch
zE!nG3ty13c$>IYx>%5Vmt#Vadjbiyq8qwZ?sYrro+X`Q9I4XF!wo|jQY2S;c(es#o
zpXbv?lz>MVB}gRwO|R!N?PG+?X@bhcmw6HTG$JJe&W4{Z_u<O$;}%1xo;rOrk@qpO
zyc7m~6WQUg*qBNNu1`zaw$B$a^k3zg^WsZ|f;a<{6J$_kU%x^KqP?^oe*cn5Us-PW
zoqN8m*~)b4&QC=$ywTU|v~|YOPJ`=o9ir+;H`Vhh?3nRwa@&K|(JDS{IwaQAjX^{J
zthq`0ves2rxF%=Ia_S{UlCkuc0}OhvHyA_pM>r<O<<5098M6t4_R8es;h_I`!q7qg
zdf>ha;lJ}KSSY8m20UHw+$;iHT)4)xTJ_hfEibLwTsU}OTPF(LSK?KP!U2A4tDL|l
z>pV7`Q*2(3J|V6K`{8Dni$sxRxQNywhYkfw_2w3`>YS3@nTssuq6R`s=Z<l>aL+?7
ztcBbAyB`qW%7JNngNv*68-0bX*gnQ{nRg3FYa=(uySL>$>=u!QgzU_X47puKg|FM~
z3$>oxXbp3bMSd<$u4pJ!g_3p>Fl=C8+24*R$*WO2`d)N3keVN!U#n$US>oJ$hU$mI
zUzSx~8*`pJN6s2N&nEYGaZ(3$=rolIqnLs~cCd>=Z8%CU%r)s|?IGOcLQpMNYQ)6D
zdiy4vrnsFiz!dGcpF>nB)ZL9Wt2yIdfHnZ6Vs^LDv1x70NZ(z|iv&K!S?8M{s~wxE
z&UvEk`Qg2{!Y~W*{GHtpwiL~nMVWhTsyYJgfFjl$RcP!9bv#>RIXV>a7-e#S?vwva
z_#Y?S(&vwR)IRD4)_cZx{ZVSR>NgddRmU|obWaD^c$~Tn)<2?c)~_bg^J-+<o}|W#
zF}BpNIprv{g`VkjlF{r>`0PwHZa1LG+Qv$hy|xrto<`wL)u(I^N65w?c`AU+n<96Q
z1BdNp*{Pkz+CcB|L9yHUw1DQ_?5T<;eLou|5z~d-(Qdd-P8`=~>*nH0nL3d`+1bjN
z{QSjO5`7@E0`3kJ9>_aBZdP&*T3RA<=1PbAjU9}V8$R2sW2OY7x^nKTFQv6D_0%>f
z5n#-RC%7rm1O-dtY@*jtr`q6)JCh9Zs(G&?BTUI?*m7mIyL8%$GstD}n&~p9O`^q<
z?L$9cgs@7_4>X0jjm9)`!<#KhS(%_`DN8-=2^;xdL2?s$jPohkjh(fYg>RJ%m7UE;
zqtp(uls}71CR?D#j}ZRXbZTaN{Au;p4(I7XA=oDqc%!N_k9B&mps4TJ(V;n2Gh?(d
zXq`+&7d3a1Y>gwtxM7)2MK>@<EX!davLR7h;>o{&J7D>U_%^|;W4uzAG1&y;trjBy
zt>o>k8Bc3#KY{ByNi9AumSmD9b>3T&xn_%JOdfPzCVzFd$Bf1Ay<@GJ^)jU>dX7z6
zH_?8%22jM{Tt;CL+*2cPm<#O9&KxU9vb~B{A(}uf+X-~`dilY054M|*4u6r#CdW<D
z>4gd@(mPSqE~^V-7+7r87Pr{}hOZFZVyJ{1TG#EunAR-{^JB+%5AMZ+Mc4VBu)P+C
zKL`f)5sDUj6IcvtN{I|}<t1q)HC{fCNEVneyMgXFtGBZr(V+}-5X<Ukow=&WDLiHr
zv2SQ`DHGal-<ca_6NRQX`6hGLgX^@@HL=fTz18ALPVX-z?X}5#3K1~Ep3ulpheQz<
zwgxlnq>lc}EdQGH4*L-P5e>JA?N$9LTcO*Nt^^N0UVTv{N&wEICHr~%gRDFMc;cz^
zUIeGr%ky#u2-B6(ON3=eIm*lS7MD==v*?%9rU%I6*CZVC`r2A8Ew^3oINRQIxAQ(D
z4Iz@;vDC5bI7vtD42yXWhw}tnKoj}pR;XbBf?8B!J1g!5F6>LTd(Jc6BX0MmhBL~}
zMV;)L=?~kUuC+OKH<X~>3V?*4_MPZ!=KQ!?@ys6CE0-!n$~>la`@`P7cEjp(#!EF2
zWmYoOHiz4AJsq!g`Zf)A92f27zHn!1pxVwQV$Enjk8I5jZ+G&_5<-!c&57pZFwt*3
zz$A_gu``3+Ti_;X2M&Dph6)C2`<O@P)I$4blBE0n_Unsh`Ex;;YeO9yh~?{QB`(Od
zf0PJiQ=A#?FzS6D@0!EWfpI#dm=(%=4~*xIPh^Sb*Q=CAwo;4bNJ;l?v8)Vtde+k+
zEWG1XzuvL5d|QJaUKisl;4@Xr;}eD5>AG!M#MAT(tXWac3|F(&*>sofTT_K2q1EGh
zNzN&qCeXuCd+Z6iqC&lwiU~@zUrv(MD=K-`x41Jb;Fa)Ivu}{+UTRkM<$hUK{Y2xn
z0Ir@@D~V(BA{PD|ke>0vZfs|FCFt!wGF~#0G;ZcpMgyb|SKTE@lFT-Q4^!5-AD-Z3
zZ@4GsZ@)M|z7D=V9P_x|Uh(@-K9r0q*;r>kqU`6z1cxrDh{Qp@)#?_^N{US8qEJd2
z5&V~HXGQ#B5J;AEv2!#JN>)UCANKV#Oe#jq+=J>{ZGE!>?`UjeRS&_S_Ps9C$2t)Q
zuTyOXfsD$k7K`;j2_K$l@Y{loI5a|D2D;s=m`l3cKq+o)5EWoGnw&9wMnF_(-`ZEq
zMnp)4vYkLQvpoN(rQk<}wR#mJ)*lri-!(S-TubJ82gQP*r>dt6V<{;BZk8wHx{XJQ
zC|f~##`W7OytH(3>(yZwg0WoWfe@XMh)_Y5Dg^mASQ|ZTCp{f&NbKGDRZ*ALzR@ak
z$%DI9Dmp+(&bl6dxLw6QW8cbecHs$ke#&VZLfq#&rB?48{3^MW&n5c0K$-Ktu|w4X
z){tdhq>9Mt3_e7p#lYhSJflCbu~H?0=coZNmE>r56+bcdXreLdRtOb^I|gh``P&#U
zZp7RpJa6v|+Kk43btuZEMS{MwX~_+X6)cL96P|M4ke;msxKJa@tbf#_D6>{)#CbD0
za+hN#7=PRNKTM8h!pGRfEG7e5{Efw17U1hh1^Y^rk4d|u{Vv-|%6){VwgYz-am{kO
zY3}AtgXasKx$MgqNM_*r;^I!W&H56=pi7h~DhY^n!<dMQ-@2R{U}fFJhi+l?li$w}
zR#t5f1J9jnvV`+IL-iC{^!fISV`G;Y8D9m$7wFqH7h7W?G!)E|=5>oyxr=3WY2}pV
zDs~>`(w*6F4(fm-xF*X_4|h-favX#4Lm2=_juiJ19$WaqZqh`e@5K$4quUWO`)odH
zz}Drecl{4{r5+AYfkq?>)r2*zcE#)~D^m_+4|h3HS?i2AACP8F_L^)zae5w9io%-y
z?6-Nhoy>Yw1rq&@a#`Dbc~)B89zTpIW`?aKB$zn6!CP&fI{m*6I6Kjf@lP}jn$n4l
zC0r0Ce(t~%I_h<G{A0Jr;AufVY62_A%|27-sJa$C(i4X>Y{2;XkqjMRpVFwbbWBPz
z9$o&wcKlzaYVAQJbLo?xHLiIxZQJWb1?uUm#n6<t$KC!Hkc`mO`_=dJlb2V`SUeXO
zL9mZ4Tp7F%$-z5RL}CySl**p@XxpKf|K*_nHO3hQf2Q(#6fKUk-Uzr_YMVN`R!7tu
zvgpU<xYIN#DQh8F_DZ99kZ{NA+oeSpto(Z)g;gweZlLK4azDO))bBU`cl-ta0r|as
zr{LEF4*gE=;;#c9^oc0$H_CCA5=hWl0s=O=TzRpTga5U={&FZg3NXFCan;&=GGn@v
zOty(}W9=)zB<|(@Phj_7W?Kpr)X<?&FVl#(pXh3!=g^YJ4iR2o={M)}&uH-1hxm!$
z$s2@F-q#_-RWbhC*nj+b9TX6wOm&gqJpJEY-2Z%wmp@?#%uoNWAt>X2y$(|Hk^cQO
z<riw4fB(VE$X@<fh3VJ8qB7473sZ8m(yvG#*s(NI#j_7dl5Gn@dJ+R5T$ZEk7_h38
z<VMe1m#r#bDn6^)e<wqhB_SM5t}G?9p7t$flu`mxBF-Hbd;%F=m)#EDh?DKp3>)v2
z#VO37^#@j2R3+Z9Dt~j*6el<~HK3VNK*PKMRGvA!*g-OE#=k9DA(j_J_|v6^^|Rfc
zS2Oe^>UjKIO-rM-<3=Z|W#e7#c$;3Fahz2w;G1;f$cde+ri1ic*rSfE)21o<iJ|)(
zZOP6Ck6?agD3VZmGJMVBI!QW`+qB|RWo;{+HZ>IbM_%yAtxe4MqZMJ)jUFnrYmVYv
zA6k{051owbvp-GCf?X~q%}uaJu3Qd-@}@Lp2kdv#lqUgnYzjV1q5WBX@3xV%qYB?4
zNsQZzV3~scgr2fb@ibd-{I+({d)Xt{n#=}(H951nKrG6SKWNP0)XL16NW4XOKGwwf
zM$Pgz`DaCfZ_gl0Xdzts{YqF06Bldqm9pIZBb(Q8^2;Ead7<|$B>j$ffELRZaHX1^
za8N>+K_$)0?AGvXj-F0faNR_(c9HPJ3?kSd-1z~$u>RZoI_7%(d@%Y{#Oy5kbc_J1
z9h#mLR$!8*&B|xOnBXQeHGwiRy0A0RNvV>CbatlXLyDHs)+wol!%d^&uQ!n6^T=J*
z>Fhq<@TCsLg}kGDI86n`?qm?lX0Sh#$0Ln6N}R+M2c8u7y)iJuoblvWMwK>tqnX|U
ztqjHwgU93f;Fq4;I(OGT;P$C>p+duS6>bLbve3M*DG@dR0#Qjj{can_)$qx_HoT_>
zje5T2hEj=iqwol=hnHE@BOKCuY_Fw>w)FO|*<SL8+l@qG&AS@1yciU38re-BVKdmd
zX0)nNn#LQBFDLH$YZhmCP`boB0Pd!;w@855&T)JX*7o5o3HC;-rYP=|IDjlbeLgHV
zN!gmm#)x@V!9mNpAggxv$C%<ecTE#y806R|D8loA2HSu`U7u|hex2fl+3%?opVHG!
zq~d53vnC2}qdFIzgAIL@#{Mua?H^+`%9Yt|O4SkwxST>BA7WBwL>jCDP$r&omWfZJ
z`@_?kmbq%&xoTQmhLq)auo~71m)#@V&hE-BUPqr!`dS^;ijbTM2Q+C@M%K4G1aVKQ
z?=>Z!lb}v7pq<#Ln=X<9$BJlY*I|da0MG;I)KnWJy-&gxfNhm!x}ya!?Dh7(2C)<E
z^77fUl^t;-+j&J{9v^et0NeZ8RrzWle#;0JghYvk08PcT=uJ12(vhsa|GNx3ZeCpt
zH->f$0@6s-L9y18uhGngv;u9EGzF@=Nw=M>i@tD7>qu+Lk(o8l=YTR_?X(_*&!Eo?
zPhJRU@Qm{Y{rga#LFM{;g>Xr#-gtSGA}Tb1G)1~^JB}cFF_mbu_2Upzlpef+o8j8v
zPIMHaF0ylZno*SHC<f}}#>=T2Yu?HWY+3YBw^l1rH1cd#NRbH(R;#lkvpDK$73vP+
z#CO6KBW5C~cK*7cmj%truCPPjQG$f<yOJechV{wvz=W5uASppoPRznjsq#Fk7?R;5
z>vl~~P72n%`}S|5>J5u|$Ng7X9a%eH-hxs2Y{edBNZ!=pe0}BZ8Js|)Z`rKKHARUU
z2x^(bnE-?ANBagk9X<ZIB3z6gQhG2NtEdu2m-E8=DN>^}2H(bQqr=$jZ44ILSXJIp
zk{xJBiM<Dzb2qmPsi45@b$NSRk1az37x}fFp9S^aOr~+EVX^@VoSjyOiOI^NswNX8
zf-!WnT#Lo{idZ5fk!eGAmZ<eE)K}F%4bM2Cj!6KfsL5qQ`W*{a6-TpvPDKsV+#@=}
zu!AV>fkTC=AR^7x?M*M+b-sg7=gjV_CI!)w*Z%@?MGL+0bF1m2$#W6UoismxoQQ__
zH0q<xbZ^Iue0J{xc`+*Pmuo|L8n)iAIJ|rFA&26Ea99+Sw?TmieInBAIxCMU<ap9@
z;u`J_S2Ja=&&bRS7`HrBPme2aJk45<wit!c(90|0_6$zB>s34`#ZKw->1lw(iGZ+B
zCh+Zj4}URRcFbX6cY#V^NKvE_WoIJ&SFi40&^95BZ=PG8oEX3=QTM3Z8WZNMTL_28
z9HhdC3FWV!os=9Vxv7HGB*^N?j2qE2V0GB4O+&YXjj=1zj}lt&Mf_aiW49`VcTTmJ
zMBMIzDfm}sx_joz#9%)VSevi$A3s0R1MhxNf9pi2{P3P^Nii4~gDnhwldw204BQ<z
zLbe*6Nw;c1$|V27JiDDWDo2xg>-LU#8LeN~AEQ&x?S1ZYt{zg7up%?RgIQk_ZfRk(
z&`v1ve3U05s&The?r0-`5st((k1CZGwVQ(-##(?&-*6ni{%f#QjA2Za96jQX8uf7n
zaN(haMnKI<>F7<KykWK&xSK@h&zW6K-O}SE^8Kww_>+8Sf`Pa9nqf~Yq8;=UqA^Bg
z^1(;D<m!!1vK5k=j9&$!7dCF_5hB9)pDR*p?pNyNOxA{eV$wout%L<2DpsL;mthO`
zLG6@KAewuFZ)<`3%H`q^FcssszbqzwLJl$fW#>O)EM)m3h!%o5euu3Wxi9Z;M~N3=
z`@dPTOGW|Ze3%vY-E-WfnKU~C!>M9QO72v`v+alT@3ckm`+eGmq_JW-&D~#3ryD%U
zN^b`}TNpJg2O-j)g10Ga48@<$mwR5sVpS#9S@l>8hz79`;9{W%_|@W@VHJ4=m4~vG
zRVbt2G$^)8RIutP%diS3-Rc`j$)Cr>ZGYqz5;OR6ck}q+Ram)Xag-%!`-k3rKBI_l
zp(C8$u0)}P6;{m1ZH{)rk5}O0&hC#>4N2s$3AaolN^4b@>FDi6&SUWiqPQp}6<0y~
z3CYY%6fOmaEP+RCYsIJ?iMso()gU!q@`EAl4+X3^#v&4JmyIO^9l{LqGR-Ezs>qum
zW2jMNkNpR%jv03u7DxPpHgG8|@173-&s=%D*oL$*$jk?wO`l4oh#_JzjPQeupvUXJ
zZ83TYgy&1()B&omq)7`JKc=5j`F?FU`5?rE!klqa4S^UbmQ>=M`rVQhhs1%U4uG^=
zQQ}^tC>|+)^%-1gceeIAjld$?m=G6DK$L|^2~F(hO`S-kY2r;k&!=jLGh(%sXfH}e
zae*JI5tQuFrMI>00u~}ecKGq$Ce3o^el%IaI|;!kIzmyZMOILlW{srBK%G#;5Zzx3
z|DC@HNBxqm@X~sMBP)MD94gXynK_403JN~QXeC%~hCE33j{2?_GAqgQqqsIl+!y~(
zc>ZeKVq@;dme3P(X^vywg=5sc=Swsrc?K8DM-s`~<Rhp5U~IqtXN;YP`oCiAvOD*D
zH3l8(<I_~vi~IEVXB=d=DK?+A8;#<{gWD6INAB*H+;EMf%m0gGpQ#mMgk^+v+*Z~n
zji+ucqHwsEwUaW3XLzjR-*clR@ZB9zdD_%g<d~=7z=q)M69#JrAqPPY7S{AfSpo9M
z=VqU$gy2}i(pK7?(jJg>^_}CZX9R1GOAg~%!?d03(=J%5>Ce(;AHuE7cX^)h<Kayr
ztMJ_QTS@_cVQ6217T;Jw$DT0yuTNc5Jd#{DyNrjPxLhxrXb~_M=7V44O;~pl%G=$<
zs0v-`4MX@UH&F{ueuv|6^W;QA&K9Y)R7&V8a)y)Wu!<0)_Bw{N9N+D+CbmJzIgT6{
z3^d8QR1fy9!DZY7Sy!i){p4oRG_scRS-7;w>*1SMZ+W>Z6e36i4?P>-XF+?e+VexA
zg3r{!M3T7x`!b=K4oA!^v?-MsvygeBV-#PK8(wr@s_4jMEe<)ZaD02|uos8T`PM6<
zh%&ny-8nQK-IyI7!U~X`F+8?`MDEL+6-N@`x$sb!$UI$1ePgYKt!ScfZ7$zVk<!Xa
zTsf%QP+gdWywCP>L7Kmlin0nfGIvkq0o!i9^9gVM3_ynAzoUs-&c?CPy|~yu9<OKt
z({^cBs=m(GJF{s6Q)k-x%&3}1HP<e0@Lb}(A#g_QQTQOO+w5IzS0$`DS2*0B!UG(v
z4ioLKw-`d0@o=4yO2sx0)BD5A(=~>)3vvOQQeTGu6}Kx>Lrg8@L+VV8n#)oPZd&uT
zJ01%tJPJ~eZu4E?FVP%5TSbdW*Px9BB;2{TOcg=+-#YN*)n{Cp@wEa&f>E~QF$**K
z6~og21F@A$bElt6zu-DY@4y*MxwI<c2pjWumDfjNi!=Uws^ASjdcorXW<k2&J!O0o
z!bBv$C>2-PexHueul*vIc6b!f?$yU}DG{ppE=NE%O~sY3(PHRmZ`J)ef@=Y93C8mg
zf-cQtrBf{hJ?l(zTD$x(e4f82d&Ko7HV^|(Y*YI3D!)p?^h_%!PfJ5%9!Z*%!i1lq
zZbK7IS(&&X^hYr+RY9Wg8zG~51DqFjvWt{0hcn7{`&WL8%H=Elw!4)D`3Q!BgMl#R
zbzoT~?V<a93Wsskv5KPm?h-(?uw%&ri40}Qtax?pxtF@vc&vH2(C4unER+;^%68H4
z?j`W!#rhAJS($0M)Vd}?3=)LRxScJ>`rP`I+C-<R?%6fA^FZvR*K(zytx1#iVhT;5
z0k~?G{{VP3;jyUVzD-BhpW$rTuM7aS*`Bd6Z3p38YWy>mipAs65p+9eUx1A2@M5Kb
zCcAsB@%~W^9p6-q8F-U2@RQ=;tlTSf;*Ln#BOK1c4DhZi==8E!&6Yz6w*B%)%goi1
z%jJNr;Fvkxh!et#$Hjwn3Aypvyh;Ur?Zt$<!*13|)7}-;tBKKjb-JabI|9`L{fbxV
z1j9q*cxLM{?dGd>Ke&mb`I;1CHlkMag%AD*N6s@;>07ZmeJef_>lfFR{VL5CJSDoJ
z_BUw=6op030u+ebinj{R(2M5U3-1phDtMdDGxOJ_x0)Q1gO+(+R|xGP8%Da{cXhEC
zhL(kwUfA+3bN#Ia!27Rx1*tlal|p7D57P&#R!<CrtG8Uj@n5-wHJW!<=4N@za-`DZ
z9o*CYwmhmV>fb`u2Xj{@JUw42&D5$K7d=JM!ucM36iiO=aOPH~eHja+H1P5~69O=5
zSXE7Do1_k=2jp=T^&h_!QC8$68=IHmJ)LZ3&p&5Mx{fm|DiMh(5{`MkdmcUFU{VVD
zrf#c*qOe>B#v?c~i2Xix`MSqXr>4zQf_2z@iqV!3+GJ*#hm|DldRG32L5_#1N~12@
zFEo?M`@xJ&&a#BB9XU&%OxTsW@+i!aMaVp<w2E)7#oT3PK}z#p+IHLY%c9ohw$x6$
z0rfJsibu(>yoAyDpLvO&eZS`=HqPpt=aYfW%tHfZuPZB1bTj4&%^nVK9Xj9Y+)gAb
z?dKm@T<G15VCt-H_!>a!v4A?f`LuKkC*N9*@*L9;aX!O13}fOs=cgn@xXES5Vx_g_
z$kJ$6>YP{iOkR`Gb;6$<yb14tWw2@SDg~z<rA!dLJ`k9ht)ePD5!;-ca&mT>IbXV7
zkk^^s=a9g)KCPa3&y}1zN|X$Oe^b&k424N9PowiwZD;B~3~ax=`oauuS^HecO&kry
z5@pPwM8h1=b*cqY`XY7X4oY%fjzfje{OySagX%EURG|xCDDaJe@IMI<-{jr?!C(cf
zaf>cGCC{mLe-Oao56W<zbiY}7NSeAk(_i~wWV{e(m$T9=cT2HeilV!8#ZfjD%<E)7
z)pJMt$B*}XExtQebFGM44-pD^grO&*Kge`es;|v|ynKNgC2$^PDrt!A*(>k8$@@Yw
zYnUnat@fqD`H%}V$nv;`7WjM=v&t8?<A95x*w3HD@-0_33>nINEkRD9Z{|C9XMfYD
zvM-JpKbQ1!K`=>Od@o1USF|4#=bN5A5}St7F*<=&aVt`#z=c=eg~bzJ%e{^5w;Yc0
zeH!}wxHH}~-7zEEQNk|(Cxr~UjaQHyKV;7<$bH+z!Qg(+^X$jtKChMXzC;+UEz-4Z
zmq4S?*wPJ+SCVwv9Qv)gWFnhlx(WC3h33i{vO=3|%^)If1tHm&6K)j##!<1K^alYu
z#rxEp+|K|FWG;2`ZXrOx@;an2iAruY8UJV)4sZkc-mUGO3U7+c2Tjy?2fNR55Hz8B
z4Z!E~>k^#fTPIu>VlrITnwD9YiD)<>edBs$GV$yblB4m@T)1e!biE3$tgph&*$mT3
zcpX0S02bH4JJ6!3peV&myGS-%|JYVxc(KN&2e?NsAAtB{{>Ivy%Ll21{4}Q>yb%d5
z7kmet8=|t=)YzGt<1feO+J*EL?9{=A#!78Mgz_iG%Xs(cL(qyIEIZ?9h%i}F<L5|&
zrZB>)#yw!aa5|)RA!_n@2XqS~D6^ixndvdwN6g?`osF`nyFSFjcX<7C(#k#R!N?`|
z1OT((CPf$>2Ol(TFQ>8z&S%EVd0%a$XM6Cf5Q<F3t$<7ER*(&Q5|l|T^eH*b8+xxv
zfbzHdoUP0r{<mYM@V)UFo+6jB-2ef#*%C08$?{1mfiuR%nQy{<LK2la83Dq?rozVZ
z0G;e60U|pF!P`R{9~q@iz-~^cWLEh0&`jHe7)puo8r&t<NcuE=<ssUUaG$vv|D4*Y
z42>m9)#Wi5a8e0<nK^bC5esa&o+F22;`fn3*`NQqX`J17{G(fzi`%Jtvdlz{11H&7
zNUIWQH}ET}K*zD&W0%twXacu#mcCMkh1`l5tQ(z)oG#p-#}D?e5}NGR5BKx)HDJR-
z#O(;5g1ngY5jF6J^h+!X+)^oQ^r;q1Ctojq7<G8^`zBU&j~^qkI+%}8HIY7RyZR<V
z<tmIpBMdNarh0q>yo2<2l;OtqN@zX87{llug^c;C{u#R!?_-c}qOxswh=-+7)?e9{
z9k#!+EhY4Fo!*2qbz9t()q=@hlo%^Xlk4`x?PS50J{OYaMsqM1W*;l>*RI9g*3G=l
zo$+%#&*{;hKB1=cijKAyt@49$O|Huh24HLy1%H<$jfO$~7F2213NK2M@=<9Re{Tq-
zHvF4JSZIOUTquWFud~PxSz7sPDioOn<D|L+Q&J9R$Ism6Vx?>t=M?qW=LAIza_0kL
zYE+AMoi{ywCB;q@M!sKr<P#s5r|wy%wb{kwv9*Ki&=|e@%Fl>%3?I0>Cau0C1W8R!
z6hathmf)6>M+>o|-WPYh76--@{ggkn@2J9|UnMlF^|8BF!e;E|h$Hf>IzxWT->_Ht
zi8Gb{u>s7r3lk+!K%})JJ|iDz*c^sbWNB7*15L<`gIZ>r*%>XhRp9X~XaGs79TD!=
zSZ(mvb5mkI#bR@ABRxJ|s{2}y#=HqGu#&(eT$(TF(rB7lzQa}wIMC2rG*nQP6w3Df
z;M?xLL9DS3+y$ZHiX1N_OKNU(a{PLKrXe!BLQY{Ykm%*w-L<D4SD%76aX12RTvZ%B
zHi1d6cejRpND_>T&ncpuR-TW$uhlnObaDJsSZzQ{T1>Q2ce(nO31%YVwd0$ny<&Q7
z%Ap}HY|D>nd|b$1tk?bKPokcaW-~N<6S(i@+`9T-;;i4C6$ipp#B=RNh}je_tY#Cx
zr$Oe_FeE9SaAhMO_`efBDr{*09UkZF!ITGj_)sw09Rocf%7O1H`{v6dWUfYzTJ>Bm
z3ByfKD}kKq(zQ{VMN?8cz&37kio!Uf(SH&=YPEi|7v1wm<|j$-(+io)GARZEjodwG
z4(Y5NslNyF@oMDonwVJZ`H&?26cfrS`IMR!`erT?x5!KPSD7mT;SIO7%R#&^CI%*r
zM`@tFde_N}2*=PUQ-xjV82eGY9>wDa8lHOWU!vq}pmFbJYqKI`i{j8ojkR5~YX~Vm
zvAf%`Ic8pkf%~Fo>1K;<;WQtNa^R(LmR@4kWg0ebC4qys04;54J#*J*nG>Qjb*trl
zYN>>)uzuxo<lck&JD9{#6*}5)YL)(#XZjv~e}hs2);eO}g2g8@6f*4aBfEI9)7Hs5
zwuTGnG+LdAAj_Q+FU*up3I&3$uH;y}BCIq#n1uepivQV=k%J+dK})jfe8JI-y_(~>
z@{mH=Mj&xjZKSPapOQS3_Se8?MPh#>qkfQ@{l6!pjD`x{l2OS){5qeog(h>)XV?+)
zsu@Y4y|CmxlcZ$gucV}T*Z_|*kYYIjx8)R;uF1*y26c>omK=2$5XzN!1(#zxZT3N^
z$2TsZt#Cm<u8%yQ4BpC+<~L-KVXM|0z3Xdva6PdE!cIMP7M;Sza>=AgU8!ls1oH3s
zc^RLKwpYx<vIb4p6d#DL^-gJ%#@Ivm)Y7i?ny+I0AJWb;td3<(+X?RO?!h5A1b26b
z;O_1g+=IJYaF^ij?ry=|-M&TkJ~rp<nfb2a&-%fl=w4l`tE=w!e(HO!DGhHp+n=ax
z;c+XvVGRq`(opn2W2FxQIt=e%Nn$UH#jiaNlXaB=Q?QcbUpUo2{iV;)v1~8zs7I8@
zery;%eehqsj~?@#wuXM=z>Kf?%f@v4KQPKhMCoq+CtT=5NM8h?QI7JPM)9BjQLgoO
zmh~~v2N7t5mzh5>;2kpjdlMabL=!f^vo&q3bvH6;G_gadC8aPQ$H354&|F%%?M@x4
zFs{yd+rPxn8WGn+NwZ}%ET6=0qC%Fyo%{bP66{e!PPo}FOOaIyEGkwJ0%|sdm<jV?
zO`t%7Ms%hzv$Pk15*mP2sfvo&Y|~fQT2rl8m2@}PmCMYO2|1l7#(wNj^0$NYrUYm3
zukhg5P5H@ETqurg!&SdQGGU>n;8H3dP-|ShBr)x>t=l!31Y%mT-Nod;)<2~$1)bRe
z;xL%qKQ&lLL5G)W&m8gTpl3q=lP1~0>@5CMN3^%sQCTJ&m#nu~3epmiyA%4|i8SXz
z0b~Lm+LB7?W$9GJltejX&0@OM_u+ELW?Os<IBQPWivH4yr7F}jL<Sd&K)^9=7Xf`<
zLlrg3Z&_4yn9>>~8y$GM?9K7{wxRz)jJsTS@KnlxP^-mGF0(tY_R^$Da}gQjyT7)A
zu`A}|_|5h#ogADc&Zr$M@|(mD*I!4BG`1<?%@nH&2|Cpp6WHLE;}2$7CQB>XiX8Eh
zB#aZR+gr0vIkACNtQmA@WKk`BH|()sA^D+zKwm0UA4e!7xZp^H2tm*!f&dlUS~9U(
z`BaY4Ycswz?EaR-ub_NS9BD8qH0Ds>n<I)8A3{WOC#T92c#iI_xfAfrTN54?rbvVE
zBq~~mS^#Ut6!4>Ai;5#$t`+$qiDDcK3Hq=nvfU8FLPun2XRANiYxHv^tU=@3y^$Bn
z4=Oz5SU+(^-9b)>6?D_ORbvy)A<7w9>3S%~BP@GX?)zw$01Ajx5KdT1BoNZjIh<VJ
zyQ$a{qC$)2mdqhu-`N^S$X6U;6a{`Jls?8EHoYzRE(&fV+o4y&NXd#LO2gqQT&|}6
ztT9IFtv5Z%lbSM%%sc7zQ(DNZu~DX%8nRdkO4*|v^e#Hm=0r5S>6C|%#dg8^>Poqf
zIMbn@*gO3PzygdiKhTZytDfGa^YKAQj}6<n)n%Dvk?HFcl$6^n0=9j9?^bzg$B#|0
zp(aVfQk+;32~G+L`;hyd)LaQ#m;OD!KcG)pDJ>rU;YBrrh2vYW!m$RWDaEGl2<haj
z3xH2*)vOqvsa61%xVWO*49@CCm|k|P1YLbJOT6DzZzAV{Vx=LQsGzDL4VxuC@WslR
z;A4SNJXkSL`gol36V68q`vQJ6NT;7%aEnOx8%w>85@C(l2_w6}v>^BywX?Snn&hC!
z@&OQwFJUE#$Fp%arr}3&<rt&LL}t^9OP~B3z)%<-<XH*387#j~e$YImvP+3o!MBGU
z;UcW&%N~dSVtjcarpAyj`}sz$hj-L{N3IhE$v{n^V1+l`B?^n?#8F<-8q3WhT}fk5
z`jZcy1l_uumI#7IUUH!d#l&g9gw<fyO;vHsjc^l1gTT=v*ld;2*TCZqK!uZxl{)%r
z6E4gc0N8<4l1Afxv2S)ZdU7&yzDX#{a$~XjR@lI?D<FQ_7F6@{<*FI~YRwSRM1~}J
z*l_)ESc&ZnIopCIbv%Ct|Kyyu-N(5*hAK1UKJCyBcdfEzt1c?MvzjQQe*l`>F=grW
zLFo><+36$D{n^Dy^i!e+W&hupUAOUXW~W^X7x1mzaG3QJ7vp7LUjnok8TRZer+ep`
zF1yKo=2~;;gfGiUAP#%|FK3gDB0@eW+{Xr###D{y;-L>C*22M%c>$M*6<^YNsG0*b
z`Kzd;#9LrTg$t8OQWjVIQ+hP~Ewt-sEU~^YwwzKd0^zScMI??B)&c@DFg1Ax3}Oj?
zP!T}#5@N%<#x()@@%OxH0+&Temej~$#siXu_eV`cU$-mS(*MZy$N+T@|AFgqbT#LS
zF$e_L(I*Cjp<J-!V#?iv7E4{v@A{%zX?{v5bm-9*a$ZL;Rp|+{(-*Cwi5uCi37MkC
z*+XMskJ7#2U3>?2Q^MKRmi&RDDYxvE?rT5MnJxJY1`t6(<q+jjmvQfH7*ZoCs#zm<
zIl3Ul$doqo4D?+Kl&Je=1#9G~^HCAvDY0L}ft-D8@^ildj3El-^%-f@vT@Tir_?FQ
zXey9j>7%6lw5e3V&U#xVQK8`RV)Eo^fs8prU<D)h3|7Rc-3N9L?NgKf6D>5fKZZ}7
znrBcj6UFrQUr=FT6}6$U?mEa&G=ei0jpBm&YXa87DNo2!^aP_Zw8$MA{p2e?u4jR-
zirbY!r%a-s+AxI3<4aic<>RzsLtzza;pRy+1FAd^ql@6M%tP^jVo`)=iT4Ff-@m|X
zz^U8J+ZpS3qF=ChuCAB-#A7yFZ&x*xJ-wa?_{UT^Ql$dp36b-vT!|VzSg7eLu>gv*
z<kWh0M4Xs@5#uZaD0ptF-S8}VI?`B0=TYVZF1BZSdgoeyux>r$rEG(HFH(%r-z^cC
zdVnPo=W!24t+6>NRrKmrX`!IuzV%$tll%Q=DQ4jW3xF=3H$(?065)M^hUB|(CE4p-
zmF32T1@(B%VvG5ME%qLjKl}+7pTR)zzkJMGE<yu?EmFo;=crkrT}Au)=5y9r7vg16
zP%x*l*lGd2h3KeksqcQ#5Rcj5lp&wiQfdWS7w$F&th9stTCFoJ66xIkxm3xDevT%w
z|0t7JXaT?HDBZ>o;Dx+a1E#Q&r2D&M-!_0k(5p5rIO)E4SG(rOindtzo8NWIe!})k
zro`huL#i-fLV@WQWMsxp>}w;l3)t}c=E8~gsk!XRtF9%<-XIN~P=!82oV1sU5J4Xo
zB60|fQYpjy2d2$->$XBM!1(}U>Pd7aA~?|?wyy=Dad8jYh>u7WpCsNYK-AY1tgD{P
z8sEAQL(?atW=Vz|RrCUMax%NPuz+X0%)F;x;?0<yDfc09PEwt2@QNwyDi~WCAxO5d
zED-+Ucuf|YC<zDrESQj>#Gh?bWw{9=GfhQPZrE#ETq1qufEC!M{CJ`4L43T#YBV<;
z<Q^+wODw-RsA)}s>t>Jq;3Grs38rwwQgl^5oXy-Wk2jL1u0t(U<a^R{f=U*hz=sgy
zP#qau&zcj7*Yyry%@{!biCnfCEX}A?9<>mS24T4<NRAL5bLXsz<bpLuR-Mh%ehOO`
z;o*Cq&;?7X4H?GRLiU1+3p)fDmO)LqDrv#cfP48wI|jSMRN7{y4QpA`#jJ(nage35
z<z$p)#fC|VI(1YJ1*dceg>SlcEk{{v4bljLl4=Rcw1RW9<-WtEh<$0jF?BP@@l%wN
z>zFvx-!XA3O)E~(F2<XDAJWf8B`@XKDqVGd3aO!9#a3Kwd%>d%a(|Ap011^$X%oQy
z6iXkIAO5(nUf?_QUNj?XIJW}!2kM0DZm+BOX<c(!NOEJbq_)y9{DWDxSM~Ey$(?I)
z%<6uh-})~5Y8hFJf~8f=sqn2aLJtBNDp3dy$vfsGF&iwVqrNSEbuz49iaSl#uF^ED
zrw-w1YhHK@Mv|ad5gyrf5KNx6@9@guXOK<Ew*rp;9yMECI2$jn*<J|qD~w%PeTag%
z>{(7zKN=mhcRh`XN{nTnEQD~I@D%#l2hljEY6o?n3)v%d=QK>zk=-IdoQ`t#QxWZD
zh+BCrDApWf#Ey8Wf@D@QS>;Hyv=$Aqj{er9tol}B64AI>jDsUzI<ElZuYqfyp-+^1
zWLKc3wzMK1pa93lH3me+QgJ9R!Q&vrUc@KFgJ122zg(7@MCP?fY$`vwi|(s8@Iupg
z(Jq|e>by^pL?sg2#Z)<prH#IL4Wr;KkPs(rb-xyuh|VX%AsFbH4+F;2a)#HEd{edK
z+1sdUpQlh1B4MI@LbecsVUu-!4cxH@Ae^S8cX(3<{{ZZL7WYNzQaCQnC3T=izUcJ4
z&?#k;5lEeCqNrNvyjFIJ_y{8|AcAo*TY^iG;`#8F9V*6d6uDrvfN6SrXczg%pdCLi
zS-8D>zN<Rrn8TuM$3$y(1ERr4b)0P}QXfvc?J1f<hNv}dJ~u2ZJ6q=3tav<C+O{U`
z3sPwQ;wFa?$FC{bWa58z#7o(WwM6R8T5?rXTp%&JqbyTs`H}=8$H_tw@c0%tE<!J8
z-Xn}w?*lh~6AqJN3Z!<_C^O!iezO>LFZwy+rtJxRxm<&oaE#u>6z;G{f^c9ZDluAB
z333uYJ-rmklvaWGLo&eAxxC8cJ{FBaA%7uYZW%#U_Z7fh7jah{M1*u}tWx9<$v}hU
z7_EiK&EtCLJ<yI%1R<=MqwlgP#RP)ji6fn_SLWC15h7My@2G<xM)Yt-SBcKRl#qy-
znq!QVEDmme)pgzDr(CtuCHPvUOfqd1EN|~k&><BXhHRC)p4c1bu8+4o83mgV-3(E{
zc!|Kbx$GXT;+j9DnQYM4L*8|J<wPgG4HCFYb*3@C&e^A5O(rL1YL*=P)X7dgct0JK
zR2ZYxdLDGfhc#ug{o=0o(3#;}?mf2d>)+eG+RD$9l9C#22v+4I_V8c^maEapJ-uIq
zKru;$94%U1Q65sC{kn<8{BVDO4mX7DGr3Vy@!UJv7Fq7-#KcK$lsgd5!Ka3c#*PF{
zH(bKm)pnYR=T>QYeEr&cG=qUXToYG^mSU;>wV~GZxvS(TZWjft?Mi)p((<Gw2)_pj
z2$tbC*V-a+_GtA=MegWVyw0<zD20Q{3IuRJ9p`FIt-d#H&Ffy(7LV7(06}{JHEMv7
zJ^<zqJJ<Ra8*9|x1AnplcF6s(9n0^8Lvy&$ku8@T!N4$thfR25sAPgaYRWyrbGx%0
zV#yWM<~MO4pr7ix07Rmt`PPjK@%8?x9M}#5=^dw%%M4(M87%F|UWTG#)Ml}ZkUkEb
z3jZ^cB`h}`l|~Px@u$6Rg&&WtRV7=$uUIxbae23;rWPBvxaTx8hA9<z=J*(M>VeXW
zc~$-fTQ_n3fUQ#!fDKK=S1_;HVW+I@Q>1pFA~K)M%e4aqG1$o0<Zb(ov4({qVOqbq
zVQ*$2K$sAp6#%u=>YVv#Q8ejZzd{**76D$1F(_1!`&b5AcHMyrst%9AbNk%!_9pS1
z4V%K{?)3VmOr*!l$Z$GZ7~^N5C{@M#aG#7GfA_lIsUmX<;CPOXbl{_6qZVtvGsp6P
z1^!wzCaMIolbJczSz`H`a<~-pP|R7_FxDC3NJ{o=)ft`S9zPU6^Zn$l^`-i3zaYza
za1mXlr*U*bhhHKhqGrXCDeVIJSb$k<k-Tw7L4Xdz^<P_8W#JiSR1QRT-^Q1{_tn&2
zi%2}&An6kSJO2uDF89Jw#y~`6yle-JzG$8;7KQQJZ)^Q=Eb!Ko`}O==nz{9-rpwy~
z)ZtF122-Ggq>Clwu!;NS@w2b)HVaIR9N*|UE7P}q^h<>^P8Z*#?m7z1AWEf+oBn{n
zBualm;9_2?hQ_M(XajNAZLt)dsL{C#c}IkFM4qE~;<6dNw1WS_fKxdB&kPujQ%}9t
zbvy&<^VXJ0i)qFhlQKobVY%*9d9i?}d5Dqj)BLN3l>txf5Fi^}jydC(x&}hi<8V?F
z?<g0jn5f8^{k|*ntO*{qZQh`q8-nn-rfbs=%lK7CbE+nX$1Y1M73=Lrdnpr13^}rR
zD3!WL*hMiPR99N1{Kk?XBY*@$sbndU^$~i>v{4>k6<rDI6$X#;$K~PNd*|GS;>f?a
zrn?qQiL4pOiMGJ_Kme++9Go#rlCY$`*+OQLgz}x7MpXvhLYYP~u9d|_HG`Bvs!U2}
zB6X4!T#i{t<J;@>eZPyaW}EOD`;(yYUbQ<r!_x<bPa<(|DfK$8fs~mPG$!guLQ8=1
z{&JB%js-TU&xQ#Z9jf2o=eG5o42@Z^yNMCBn~R&s*l>>4PX$LC`y1axRJy=R=(tIX
zag@ktS_L8~QM=6nr6e=aF|c*v!r#Xj$Y~lWt$qXO>$U#^pbLNf*iL}{@%@%M-ScwC
z*iCtqV7_?%oA?9Pq4&q>mO}ftY=Pw_bZxc^Pp!IFf*-}3&R#C_DH$5p+^*95t|$4J
zbY1H*T5p!9J22c&hp7I_+)d-BoHJbL>0Ued=ErZ2hYn<35OW6$N8Zy)Wsb$P77iQj
znS6yiH7=(5Zd$qhmEeUtN4n7!4vTKe-2<=3Ux?*p6|Q{cNrs9}e_W!~&$rcrD=TPu
z+7U}8711KQD(9D8CM=xP>~;2N9sqnYJUsMrCDjl4BnfByz~+f`RvA@hZ;T@A-1er*
zM?(U1y^7cy5ksFh6ARkAo)WXcTO1@6-4DF&uflgh!BLL-3YS99#bTVynZVnhezF;#
zXGwT&TR%FxCheK}-RQOsgNP02t?VW3&6Y&_t8EPsJngr)d!yEsE;OI;<U;pnzI0MB
z-F=6%I5Xo<Rw$rR{mwZr#8`*AubBS!fyweVEt!(Zj?})6wpdY!<=32Ovy@3aiORz;
zx>5~2)Qw_Vydv|;#ByOEkdm6o3u?80U~wg-b;MHPkluAH^2BxS2>*>cBVc4^?kyEY
zS}&Ds?$Vz}NB32Fe5H_^fcg!k^HD~#e3pF06Aqm97akL?MYX}PizplkL}z~w>44|P
z+_N-XftrL0XN(%I#~J7!{S!HL-lrR$+JO&CCbDV`SwjZ6XR`WwrF|IUxG22S4B`)U
z*oF18ncATfRmeG9XsWk;%_-S+ntKcQ=c~+I=9XmT&jpQ_c~vLn4|Zf%+6)O+8B}*1
zEQ1Pg$@oo3Cx`e^EH}2xZ6Jz6iK8{})6aQq9+q15MisQ9c6LYY4GmrNTTA)nndw-g
zF`6`)Pe>MD>%AiIU@|cU%2Hp(Eqw-K(2MaEmcLphw$2PwGJ_-e;nwttWE|{*->f~6
zr1NQM5NO)9g=&89@`r~B`EkbVwyn)0D0Q-&6Pigf_VQKalPZn1mkiz}3ypW}_P4~h
z<*x|t%&%~2#AM-^14<zWpBemHoZ3+IUd9M2h+oI1B_=UyCvUqAEe(jq^=9iPaG=_q
zK`S2_<NI;f>hwwZRU+HT^bONLTZ%7~P>a%%`)7Xx^tLk&b}*~Ne+AfMgfowop~MRh
zgGYt_3F;4~;(4oSMr>=Q8c(GX);v$!cQUz+=^`NQlIJG(AS3m4UY4qm-@aquRJXGt
zlh_gldPWAc1k#v{MN77ioi%?N^Oe1I7~{FB*xdY<`IX<E)j}(T_NAX9y>^LU_>xn&
zjpT!v+}E24NlQ=;CHiGgNM=V1*Z~Ezw4;gQn3x#>r4V*M?jLbkOJ9nercD8zZ}ifI
zR{{go*mCMHW8YHotJ+Rc(MvojQ&ta_deo9IDG}`2Q$7guI_9LsN~#=bzn}tj6uY@A
z&ujSCmbB%wpyb8lWW?usQtO=MQ%!0Sjy5lCG4M|JLy&Nch>56@v<+>uBaJCyPu$v4
z3O7%S5D_=(fxPLlc=^<Ixtn0x_d%2`8OQ7DE2pBTu;U0!_0zA5${HpuOs|Vid$QBw
zXYlPD=wDy(#}jX9rVOWkeR1eAjG=TSQ#V>0hzH>F-AxXB!VGt3biA|Svje*0gW=O9
z997b$^MI8rF8D=$F7vJC4%ewu#R{6AuOCIi3KaL;j-MJP+DTiy(tTpNln(`%ARY12
z2#?PoR#XB7Y~;b%M8u+7>dBpIWP<^_H#c`92aAtE8MX(fVSjP!rMP_X_*m}2k`D2c
zn)+lvDho~>qu0v)Y3oSk%hK5e=e4Lbr-hMo#Z3-rrcU3O1%-5sVB)8RVJoq=&#u+e
z=*QO#L|-S94oBcc_2cG+(xCUIFMQ^)A-3#?Hft;msq>B6n%q<2Ln(QB<L<3TX1y1_
zyG&5&V1NgC=ExN0Y@mNCCNYNek?%R{)zS*V)}Bq=Pl5+-^u-uMh6wQOWJ6<NvnNG?
z5nGe*tnk4EtXW0xr=X%k#!xrNk)VA?_`y$hNll~;JvwpP6AzSy2<<Cl-p)HA+XAkV
zR@;ZnN_dFMS!I|0_6u_6Zvg$Hdl9XDr2%gZWINg8QBOH&Wo&X3{+Qo6STKBw;=s^R
zx!hDa@OPGA>6&e35d^6uf{P34VaB*ElC{^+hj4`JC!p-Yg}|PJNXQr>L@>|D{1z}8
z2*KGksNlO;JdJAyP=&3ZT=upVqL%rRdd7RMVq^!GBkY{nHslx|UIG|8&8_HBpdR8f
z+VN6M%XD%KtA{a<&z9c7dD$U<%#^kmx6Ul>;wR~5z>>jW{Qkt)ISp^L(<EJ0AaR|A
ziBkD<2rWBFU9`ma%bcMMK<CE9a(tgUE$p{y_wg?h8zS(_%da^sWMU+oxA0jD$KqfN
z>hQcRw6>NP#K{%8l2k`r8Rh&;ghA$cKHor8SPTghXG0{~aBA|@os>%aC6>D6n__m2
zXJVpwYc#iB8SgqfWi|K6#O2!wQyV=g8eUHEzFbe0V;rllc5)yKuOgKc^5-o7o7AOQ
zaH)q)uz;CO$C+buE8nEz;NTDPsOvNhPUGyTsZz|O0g@YBaqNDU%U0fb22_q6>6ke3
zZU|DL#fTbX=%hq3FJc@dVB<cLdhUdN<wfZSHich(%C*yZZ#zMwK4;$`K5K_$FMqN)
zo=Z_NL`~pYBJNS_;DWz){gd%u0zn3HQ{Y8*5J=w+?vnIxk!{vSv9WzY_(P~ntTv<O
zwxc?g`L?W;ybjY&3uG06U(v-2Y9FIIA7kG*<QBrcUDu|XugEfZJ{I?|cq3S4DeE;T
z!11|8POE28pr<yfdT*Mq!O^}s#)IAe+UJ)p{m)F)-?0BPPRf8Q%`*TQ$#bJ2$tZzn
z+L18~43KtBUGOK-unlMVl6p4!&dEs^MPJ0hr+(fWV538!f|b~j&(|)pY2q9%Rgz&G
z9BdZ&rS?THeK1(2Y9~0eBlM&8+z`vxO3#anVlyuW{-3}0c|B7Oo>LC#(j>?td3u(h
zF+25bIqLbQXd4iA=97%71O`AQzI^Mc5~`npw2|J)QXjD+M7|X-IuISY-oIm?yF6?l
zh_e`p)-2nkbG6(f`HU>Xr~(Idi3Gn)x+c`VVy8zQLp0tZBMY79Qjw8X>}TY1fDM@D
zPzF1KO7tfg=zZkbt-6LP^rIBdBz|nMjB`>jVTq=ynMNmPOC1W#?umv7-44E3_z?A@
z@j$3Z|KKGa5-W~1a(i;=Cn(KzN8p(!AgAWe03oNmff`ikaKxQ4beosiL5d<*;3gP0
zNs|*JIKGeHrl8@npqn%ZNqjFVG5}PTud(carm$G(F2Ps$D~AcuNkN&+LB)teRL&n=
zvg;FehtRAXbW?{J(CGDmpxwUREJiZQfwSN?aBJ25P7JpzRYX_Det9DdEMszBtAOd2
z>a>;+p~PLE<RQ6w0cFJsTsmPtUr)oCx!YT+wrvYB_@vj_;h1#`>lOZ6+p!D3m{GI$
zv}pf{_1m*HVEd?iBonvphK5n0t*%D+bFVN;x;3ky9cx`S#e_s>wj~4(ZzuA+wJvC?
zuf$J`6+DgMbgt)B5B||FRO?;^#wUVoq`%s2;LBN^SsbdwrSrA{H3rmfI5Z_4M$XjI
z@USHhG!nYcqQmA}xFt&y{d+-yOf_tM0a9TY|0p;30DMz-x(nE#yP0+ww^d?S)5}^A
zx2#}Uw0y>t>`F^JqYh<8oY5GtGQkd>&f}<>OTE-(?)uB(micbvql{vT@<g10U=4SB
z!cAhs7c|~p{LC_S`~vAEz*^}s@jt9oT?wx20z{Z6oEPPZZ6RSAh@!(yQ4KLA8OK3;
zE+z%_k14?gh8y-?u-8>T!h7oQii^9-Lwk&tq_P)7HRZ^&e@PA+V+mOjPp`y7mfom1
z=E$j80&3kNOwL~9DPlcEqH#PpfRz;XYk}HJPSdU?i@M{xNyvZx_GW82Ov*qH;-%F}
z)sE(~MUcxVD8pAKN2cM|ZeLbw?h@LX<%O`<Q}z+R+U-|eJ147Y>Brc@7;nw50DH+X
zxB*)%2soH^=P*7QQ>$?E_CDQUS@cdovV`P|r?(}TiUVNTFpY{-`A|@E(*^BZo7NqA
zf{n}8>ANZmw6@!{8iD^~M@YFzM{f3HgPrqR-(tEJr-t%~s7RTVL@}luvOjOcaxGb*
zld|M01pP}HHox+_4MZ;nQTb{X<71`DTndT}R>s#kCioHmzDR4GMbvc*Y`JAnai-HY
zqtXSWNu&D^mNqufsZiG+EPblmW1Z|7wCL8_c>8rHpJe(p@~Zbdv1Ew~`$FyQ+Ht9>
z2ckOsgUs!e7=DN9STB+^K1kB5bY{Iy+&krW08#Z8>NkGuuSQFoVY%$-NEH!(AUBsk
z%3z5P8N($ZCPk+5Tql-u(H}Mdm<2~@+K8nIq~*5(cVk^%cXsW~m#wiO)v!j>1(Qnt
zHZ3LXduwyc^rQG`k88Y*TZ&5ZPVNGP8#aw+W9>XPKZjb0Sy8~|c^D<VE8bWPaOgp}
zX#l5v=w@v?=NmicTM7A8zj<`1UmeJ+@9fIzbum`*cDEkMX{eL2Qpo@bR{Z*-K*O8!
za!w;RyA1YY8tTyR@T7k)2Ke^dK%8PP9IZ^^*ecK%nyL}`PcHF$aRC$9H-;~YpJf^G
zw-Fz=e}P97#mE0uyMQpaop*uPEVk;?U$rMm3#d{^*KAR<{Pz-t-^#8Jpa=riN4N7o
z|C+w>y$HhY!l>>qiXc7$!LrJ79l0xLy!9;V$?`yFpu8)&nwCnlu?_WDQg*g~R60bB
z;EJKwAZiGKMedzAxf{9&brl11X1h=#+RphKa=Dg}DaPv-A1X!Ltgc9ZF>SYs()XW2
z(BUW)4zj;jU_YRK1XM9h-OeCK#*gAs@LGcY3=Ob=X=lfBa@Akd`+Q<aFS5I>;UbZO
z-X;ILVC0*r&j*~S$2koiTsIwGF;j`-#jh(3UoLb~wK}0ssFYom4}=d$=lvItr5pMU
z=lxfI!m|XiW(2CZ&8eI$$KOF<K0EcPaN}Mo`l)icV$Y-frJ76P|KF*(b-U>qQ(9E4
z)awrXS+-3)=|5|Qp;dqAbo2Go2olSEB*WgULsP<ZK>iLmG4XtbK|uy!>p+i|C6z+v
z`aH!omo`=M61`vS44*<?6PU)w|2#XfcS#-~=zj0`OF{QsOX44bu7&;I1l=c|zYDrn
zvpPP$LR_vCy>s}6RIIWRz;MlM*AxZ*CgkBisy9PjB`yl$QwLG^B1jmDl1dU#X8__c
zgf+=%EkHbG%x%o5HXr(8ncqrgrCMMb$eZinol<2Qf&-`&$N^Le2)tJc6#qcP4vq&m
zVj3<Jkzmr0$urJki6R#0BDWUn=A`!hqx_Z-P=-~gE4UTBqihWV%-rUt3#(+4fw6#R
z`<+>%BoL}V25k&BRlM7);Y-v9g&J|-*~~Fx@e<F-4{Iv%P-=Q(S|VB!s52=8ze&GV
z_e><%Pg$rrR%pcPC-g+x#S)66X^i<?&Ce<3@gz!Zrc@`CSc^0Q8(_R0@XfN97Zk4c
z=IiLNopwmYm4XeM8dLIC3Bi9H8prQL0|^l9PjSSo_G|bF7zs_kIvhFCvt506ilvqy
z`r@?fbT)E(GIDxIqrrD$vErNSbjSDDwbfkxC#V-HDn{7}A+c|?U<pbDhIaiqylYQ!
z^9jFYm~LaWa(l>_h})Qgksr=lb?ri3v`<G3k?!*@XeNi0<=u1fQ^40|AL8e```dw+
zVVZdTE0UT<3(6d=-I~VkMvtYliPGuCmWyK889OKo1DR6U?pH<s!@-gq;Hy+bJs{I;
zkDepAPhtwYNTFYg#LJwApE_Wq5P)Ytb(9hC8DH@y1CsC3`w>O?pZd-P!Tx)xcG3G!
zsg|!*FqALqBK{jys)Vq(zudcRAXLw8tSTDIHQf8x^u5~U`(My^2e?Lu9&1lCengN9
zBj3E%(wR_^@EYN}2l_%0A`-augEHRly-La1n{a}R>{T!C#WiJ2F{WBux4k#=`lctt
zjR6+4h<1ybd@b0qO!|~~B)Hj(31ddFy08%$qO_T?8Y@UZnWYN%%rl^F?YiQqQg>1s
z6M{=cY+HeaTg8x6f_nqIHcgsdEk&%E*G*}(fNCuH_H7f@k5ptPsycHMZcG-Qn&eV?
zRWYD3mm;JGCIkp7bW>AoIr@fUbgefLYcXiDdSbut{T+$~zfD>Uxxv38-G={4x|w=?
z{z9W&lmD&JmQ(&+qfG=I^8=sxn?}pfB>h{X{U_AT`TFq>)Qxv*B3k!2F_qlwbWp$l
z2<`!2E_JQX$XvHJbZV%9@x8Fd40}23WFTBaKa;4<3pgH-gJ?*WrUZ60SW@oyU-0(A
zT4i-fvbe1A)S4eOiB?Zw%|*-c^Wbg>KjB3+Y^xIwj6=<5IvB={ErJViVS!E?NhXCF
z+rd+YXexs%k*y2WwB!1*r`b!rv1nT@f6Y!8%6OCtf8KCM0yawQLdAD2`$ODa%y@ff
zkt)Un!svt`?~?gmfNp}zw-*$kTu9dV9Fe8nLJvE{*`YrI7S+O&D;EsNm=qqEC$&=t
z<Y>_@-92JX!>CT;NmBeJ<7!hC{aPwltFkiaiR3ARCN#d`g-K3S1}GTlk*9|H`$l7A
z^nWaa3BL6e(^7x(6;x2ims>^;DOMz?PL%Qo>Lfqt?CzmR&h*G7SPT0ZGn$i<F^yqO
z+0OKp{(yC)Fz0}~6;vuOJ+kIA0-By#A5?wq#3L+2rYK0+HC=WJO}?&SU?6Dykn_rb
znn@Wva%wFi=pK~5@}CsE)#URJ4?pp(;K+E)c14=*w1ak1!;D3`-^mwARuCA!m028+
zKRB{e&;O*%evSHvGHc*M_@o2zD_cRHFeaP^X((6jtKQGr!{v75Irp9RugPUBh9yXV
z0LCE;H6(8j=c+eE(ggXR5lN#5!5Y$AK3uW^2LA|PqzP01TBJCy{Z-2}UQ!b|?sYHE
zk+AxPTnvT~9&dE}#l>+NdQ@$XgQfF_>S<fBVq&*4`9)#g1IcWBkCDpXA+o=KWY(g|
zZ&}tXT$f=Dx%Yq6Wo<3003cbd`+P<?U(#$aF@wz+<Z>4|A5}$#9Bqo$Ue2cATw;Fx
zL;b0JaU-zY9kb3Mk|rXX?Ua_BgBovdOyu^R#Ie{u;LeestJ}X0jS|0znFXazlNuR1
z2gF6!>UmHli<s{jJ^D#HZrk67+9hq7YJ7&>Hw(A;ff;?I5+$aSLDUhy=y}Sqvvj>u
zIKKRJS|f_~q=4<{mkwzqTxkby{vGy2G2GM<^!d`xfRb1Yt+E3XCG;e0ku0mIkhP~~
zcva65QPOIy2%56NC;Umpd)=v>;7HW;^}f0`S}W?P-(w6D-g{_E(H!O8dX7E66d>xc
zcl6(*9!HZd0hTP}jwyc-eD`s7?q1t%eSpdFShF#oFTjy4`l*pJjQq}OcZUQK>@L)G
zpW#Oz*3l)ZSVv7#Y^N<R?f20kXR3Q_=UZ+YYbMW(*E|^onWEixP{7)A!L>QBZcZcX
zJf)dzFe)rg&P@1;>E2@bE>nEjji1Z*IQDWG>3AA%Da_ZiC~p)q@APh2x3=uB9&Gbr
zW&l4PVZo?OUHvMI2+YvTxfeCja+M>1SVuJRBJ*}C&D>pFo|i7ZfEPd--a}ZfC+^py
zV-pwE5#eYmN8f4=YC94%tppWUf6rAOu4|p?g@c!{`Hv(+hScNoG3qAuo{p<i1sBj2
z<=9arNdE(s?Ep~OYo-4qm36@Tq`u@>Tu1~6=8RM2!1@P-g`(-|XiE5a5t4yExtxdx
zjf&AwAvt{C*uML?gN6(SH`E|7j`KEG4~xrb!NSf4RZ`~N29b@-!$D-6`z#N*QGo)g
zz}~ykw^IdmKvyCw<L&ICF2*aBe1bI@VwoC8-vIsaCEFonvU>;wcGZp=G^Li?OASMu
z+Sokvd!KasMO;_^In^2N!BIJe(Y`GRs7&`<gFmK3&+n-R*~gFjMCQ%qEv^^ysms=P
zr-vt;&KHpZ!}X)h4~IL~I+g)a2DIm{Pw-q4dkLtns65dBYr$3Oe<8R+Pya)3?bMy#
zP61)w;rgwx&SWvk@_j4B`2vf(3;#|p1^<;^KJ4qKiAIuOn!T#vi#WY~&sdxA=k|D&
zX(WV&L~)(VE4lnQ4zW$=T{!0WX96UtFs09A){n80R(#ERL#OMrw#R<l6L_n@_7}fI
zX`Zu<QmJs+`}{*d*kr#&mfqwpm%DgR`1jn40#~<b)qJMIW?`}BrpQqDSte;A91un6
z#zKuwf;kY_zlo`{L6VpJcy3Qq`V=Q&MIWnhWZw8Q=}9=hc<6O!pIWXv;NswNp6`n@
zdF}T8*v3Trs+Gq}*&bXDoyU`XgUzf!iex<DyK7CwF~-DJXnUh0v=^*iCPt!kCv`cM
zdr$`N8bMlb30Ww|_oYgGN5i72jvJQ>ZTOGt2>&tNP&O<c{^fWCR23w3y4rgu)G{;O
zb5mvSegZPg6+0pPe+vf#|9|0N8BBAj(uU+SLg{qX{98eZ*%8WY>^znua-!Mwf;)YJ
zW*Z*bgLq<@G4q0k@j7O-Z%PV!9Fd%~BTsxoW$SG|7d`shVJx<;si<S}Kn<l~d_#{_
zCKr4{miW9S<Hbg?jg<Lj;;)iMXxP%PZ9iT6ieJWYJfBAL)yk;gTTv7&eOM`n{IyeF
z-;*pQ&i=_h#px&^P%fv4z6DBgbp9?yXzeRF1rl+6c1bTX17<$Vktn7W<G0opSVeY1
zg%sQFAvZw?4IaUL({=E<*5oAfi_3bV#$>*U?3YyiC|J3Nx*X^kuUzHg@WS{m(<xfA
z&pnHI24)Vcs&Wz)>{B=qOQ9^Lp2a;GZyz3q7VV9S&Bjbem6Rmo8+M;r@@`7<Vo3i;
zv4R!Iasr;Mf4q`F<Z$Az?FSlOb5UWeO`yPg0&Z(AFfJSIiC<?@$*`+kW!4@uc$Mgz
z8nxf)#Y^3$2pW0S3URuD7fpTqX{ilFxih@G7-Z@tkJH9Nr%|JlXvE%lv%ajcN$Pka
zKR+%VVI)?bFzyLiPpi=`3?Dcio;^4Ey2sK{-2t7@KO+w7l(=k27hxZN&Z}3cKX*UC
zxcZzmSqMKHt5RfgXf6Ex`6#Hc$Wue{BDSZo{b(PgWM}kjkVSm@QbYpJ<)M8Qv`S^`
zEKWHdcDuM|1q0JZ^NTiAm6vhUJfipBLB0vhlF8F%H48(uan+%^30%N>Gmz?wTJX<I
z!kzPfb4dx0$#lCWI=<BnJE!9a6uL&1ma_Hv7$JKVJ*K`o!e!3|DdBX^*=mW9*3MAM
zC^HF(amulR1ih21#65tf2~dPK4!sXd!UJVGB)=Zb2fpOTum>GeMgG3?Vwq315q%!L
z#LgDfIIz0!%}f)JqH5)NKGbx$@#dtn6sPSyTK|2C$zB54mB5-RWXdtb<DCG(d_w_k
ztEThmL9#J%t1}TwYOb?9hk8OH-Fl?@+h36OKZz%b9Vw71V{qC30qkOP0Kkrt>t%MQ
zP|$A;H(k3p;Q+P&4~zUgi}Rtss36=X{X4>VtBtgzwwH{zu8g+R{B8&3WB}cE#+mB?
z+Mycudcb&$*v*pf5xz~WiMV5Vf15Y-i$>ScJS5wqK3eNfev04PsE<B4|36_b^?zV5
zT2R9ZxBq~>Odu*eRR0QldHei{y;vnS2>X8Eeh<s|P&J<}%l0St+Q`djiRVoU5(N+5
zQgItJ1ie^GE_tiOzsOSQpvQv*6Uvko>ZEJxj7dxXAdc9M?(Rxz<)Or_LVp5g2l_ef
z69N>dpDne8&8|2(Mhs_$uQ56VB~PMKH{cPUBx5x+3`8tpnH(uBY%NT38&g3O`#0)B
z{AbjK3?IuLuT7fqlO<%B_;Z!f%NwHIm;@~<aMJ2VuS&<bAzT8C4a?@dpm+L02;9%f
zkf3LqzyMZW&ZInk<-k2azsX#F<Ui@*!@4Ji|Cw&3t?Gc7=khVX0f-ANIct-I+cxa)
z-0L-_8Qo0F?MYr=Y6)Et(#;~)%f~)!?FTg4xP1ava37r#I`s|qhW?NbW$0-bw>6+j
zgZ4x*jWlC$&>#!ZY+P4)yUwUol8wmGe8tDKC|g%ZL_kCO0eSD-zbjkkgPZj}VaL{Q
zK(>9yU3VizqI^9Pv|0}CspXw#(Zc6$zA=xF=9J5wFjf&iM<?=)>$f=c%{0O%8`lg&
zw<q#{0g>AM{~00)Gly;7LVQL&4@P-z7bXGh)$urZ07-(eCUju~0;X53!Uag>EQs=-
z=Kr;k#V1PAQ;P;qnKjv6_LB$H%H43p@NVI6SpZ&)&rJ|NnY~(|fKgkB5sx@%o=T}J
zB8{@d1D(M#?~0l@<@BgTbq07`Ba(GXh%1UIhZ_uFDDlAj)+h9)7X}_!Z?FsLiEQp;
zFDD~iiitL2D2Rb`HHoNk>HH^sVyP*O5UzKi)J53yg*)Z!FaUYNwp!%MSTh6p;_Xvn
zEDo*-Y9$#)F|p1;JvB}}9I=R*dc%nDu_>L%+<+Be!&KUZwtE*PW*$t!Qts0z#c~<O
zbZv!~07l3`c3%0Nfbfl~dJh931%uj8_w%S-aE`rH07FwJZwT4!S~;s9D4xs&0F$CL
zG~EF(DO7<yiBJ7^PdGS%t}*OrEn>Bvd@+?=B-gFtD}2T}^6m8kK8EFNmE}Vfy6dG5
zR5v05^aLSMgXxkOO2z@Ro*{o?`I6utb_ii9NLb2bCWT=|KleO+3$+j54vWOL=0wPl
z!p0%HgKWc8$k5L9dCrF<()tj;dQ08cO+2E~SAO`tUQ3^jNdIoTTsJnBV2@1BJnkH-
z0#wir{xBz6Mevlhs}sxHThgI{1*TSxkJdpF97qbtr#5W3k(Vc)2Kgn&l~UNQjzV?D
zI)!1yhZ%2OTw`=A-Rnw9WR7~$+%pQeCI@Rq&ig0lmM(zhF-bQf1Q>7#AK~J>WOw>a
z_U7&#y9A*UQ>GXy$CSaAJ;xn23BEEWU<~P>L-9fyE;KSY!6a?9|D<%%DQngMY|gZB
za2t+OI}URd9m)s?CbqT6)b(uZ{^`r9<wUHK^)^LX#prW2f+S$&@8AlCJq?Opj*gvr
z?Q-Z!hJwFD!ltBqF+**)*oRskNodlWV0?@FhqAIB{b+LJRD_z!=;BR?s<Jxhe<gLm
z^%J!lm1(2nQ8WHAEmj19dDo~sFHaBqnpL0NR<%{THY1v^0L!`1E~!UO4NmwKUbhsG
zq*Pxk3l9T7GqQYTYn~39rwYZ)6&j`>j8$5~0LlAi)Ei@}Z>FCw%?2dt{RwC4sE{|6
zH93@nZ49}uS%)ECAs2fTxNhA9M+uquMA|N|-Y&&9x5`ZQ0ohNudm#1Pm&fv1n$4$_
z7jO|b9tD0c#L{orwpk;;`YJv(Fxs^nNzD?RDT3O!VZ7QYxf>F5A7!>lqwbWhJtA%l
zN>g_Zsl?r=^og5%02~1JheJpCy!*-O8AoHi{MG^3ADMI3OfkifQBE>2?#8m*b|!3!
zu%$Xc6D9<X$lBLGBGyAhqT&YtPl}q>e}u|{{SK9V;kjJ{A1I<6#cnfUWg;giTPE@b
zTfj>fE}(m2mLH`LjSW=7K%*U4KY`0-s53P(lh8ZyVskY=E`q&U!gg*TNytP^n!S(c
zNntoNPqWoy&r1zC^~g5rhD%ft5OaY%0)wH_l`Jt8{qm4u|F%Qcc(;<82P}1!c6gZP
z{>nXm#<{n0m1cix&;57-Tz|Jiu(iJ17&({h%#2tPmP|+6X2aBnz1O%zp*l7>?Wi)$
z#DCS_ueDFboaR<{(EWH6;4`|J7W-0Yt=(y4-D=ilcNFyDcKuQJOT9!r$BKEI>+*#6
z%j?6Z^8G9+eAYt=rHCoGAICp%Ib}=KPCpZ)G3R_Xx~G>Ixaq4<)1=2G@_`7K0CBjP
zkg|rs;pW6xV4`glE<pGw_yLg@<X>O<aDejNOg8amgcl^!ZMu6ti+o1%hadn7{s3s?
zpI_*?5y>Y70NeTA*e2-GW<I%i*hOd({`>m?|C$*@{6<!Y57*qEi0j|ld2e+d9jGu%
zOZy~Zh3MZKpf^I~1$7)@fkg`Zmjn2HI2|_uA1DjwRosai{zJ>*Y9NQ@Sxw4iQWlRA
z?pH}d8%+e^bw2tf`gI8{v$G~qVUA>155Zx624k`enQ&@D43#*>b?U?2!$`_F8&HDC
zRZ*>!)aHX4pR<c$R7$i^A?L%LN5r0({cw=P1wK4wVd2j0N*P?{43iN@{)%>+sj6lZ
zU@xQwr_GcQ8A#2w8p9RayApH$EYeh$?2>q}+Y9mgBQJ*s+3=m|4qE53IU~1kCb%7l
zd>+HCdO|Zn<(zIZsWPuJic`MKp%0rqbzm<Q(%ri2)Uy|fJr|d8r}S*LqvaM_8|yKQ
z{is43JR8&CW!dRk{lF>XvqAJhj77aCW)@dMpk<#y_j?&X|Gu4J1f*(Ti;!bVNlrq`
zHP)dBW9yo_-T~9Ryj`7Ze?hIvFzhb21jJ0m*>_Uf(Mg~sihUb;o2yOPq@Z45m$CpQ
zsMURaLt8MUK|xM5na)%~?6PZAvq&0>_%A7=dy*=A-ib<zpUH&ZJJQCIFs};yY(!zi
zI_4?!k%GoNTdk99<IWMUvlRFFC}r^mCuhri44(+9YegM(eN^>Q+PGptmO2;3<?Hxm
zHZMI6@=bk|0yAcoj+}&+cvYQ<nmFoAmwz{<wC5!xHx5KhzJ(2<GvQjL9dV=HYPKqX
znJL!zsY_^KZQi_Rh|<^!15V6I$+f?<R;3r#2umMgrsVAVXBMgGt<6oLIOrk$!qxFB
zuNwwE+$y`y&;r+!Nfg%n5K0AEinHn|-wVw5Z^XBY2%mDiVr)4c&V_t)UcLz0bTuK=
zQYxS(kr_kj`QjYks@MR>uI#C-`Gf0T-q})Fz8kWdqAsh<QIRnvQlNsQnz^WXMbKHY
zY8M~qHGy0DFk@f~f{#zBjZrp_iE*?CC6HIc81p%rgrl?KF_h~`@lL1_`$8anAAz*k
z0%9Vx;#r+9o^oham6Zcdn@eeHb+dnW?{Hnfw^()+0*bNTkV>Hoa_xC6<Gv|=Q%Zw(
zbHwTxrFsO`ay4PGie|Nyrq$DO5U$vK6bz{@7kg?CZw*jNov?Zl^#mub6hN**o-vp=
zjaiMGH0(>4K1wo^>0tv$CnMbrMVkucdK@qUqi+wsgIv+*0#c7Uh^C)#S2(S>w}(cz
z*I*4EIk4WX!9R?iLfQW-^ataCplIu;u`L+mV&1%Rt&Fj)2$iy|1Vtr;vEBpa*bfFt
z8doI;1TO^-e{^+nY`ZUhw%HVnpM@$E^XD$@@MHz_eSHr%JBKAE)K+ATSay~6svdq#
zv>{eUbw1uJa^O{d@re1bJvHegA!b3MqDdZ2=9?(~BUaA!Mti_=B-%?W@S7Vb1sES0
zEhuezND$OJgmD8v7&Z4O87Sj~t3?NX&u46P(pbQ-ra?}7DzJyVDgFqt2h$%g>OKX{
zSXC*5Xic1g`5tY`_g2TI6O=jw=_f#jd6}Y}A`8NI9UfDg7^i+KYD0VYq>0cZLQNq3
zo5GMPVP<b$2Pj}xy<8m#_7pM2=xV*(lKw$qI366x&}>w3yzH<PO!@?8=wSSBMH$i~
z!NW`(0vHw@Cbpvy?hVqrDy+1#zGDX}PCmBjLSu=3K{cL2VE$QLske`#X5kdnEdh69
zv}FYd%yHnrJxs)brPAsB0E;|wX!gCSOa>}njQYT!?dP+c7{l?EP#CM}fo0wuEn_D%
z8Q=T&QOAQYt0d@9c>iLYhWIISvCNzk7x%Re9x`;Xe&Qv4OvpZfnz7Y<UU<Gt>i9!I
z+456ejvjB#4r{r@^|g;t>Ow8cP+6Fz$AqplUqA!O_*DqgNQqsDDihX@zQ<1;!*7n!
zkd7>vaQB>A-jYdQKLJf~#@okw&RY=uvTb_a1WA7LiNMY5H&u~w4;5v8nplY@b352Q
zFLvj;D+|6sU}mlw8aXhOh#D!JHp5+(x*mwD5#=%bxrC}X2dWfbXk&y~N?Oqb7kTUr
zgvwWudF<>f5y0g&(W-0QU_!x{UbFyD7R82$J=bMheeo%b3MN2M0`6M9m3~r6WQBgz
z=ewUEIz0GuXK-ObL2k^NA%RMGFLtCbvD{{@<6KDsx_;#K6+?J8z7)x?oUjYuYB-P}
zL(q82@!4q@A3Lkfs|pVyBoHP+W~SZPv86`c6jF|fOrR{L=mPmiIa~WU9(Mooc(^An
z+C-5l3<bWbL74Xx(+O`HB9Ua#j-yLaPwf>`x=)h?2DN#sSy+9r{kZmrpu~LQI|y!6
z6Z)9IOw^tJmGp6uK|rsv{-s;I71tq;zI=Zon9S^YI%22%Gy?YnRlt5<(8MmX^y0gy
zZE^@NMCDz&lR41}_y7h|+onTrg&`+&^mL8J6y?M*_Q;zQT!cl%HpP$4>VG51Hv#pg
zS3E0^r7Uccq*HR;6Ok4$_gGmemMT{nNuW!b2=&m~=ED@a%Q(bZIMc>^IPaA>7`I9H
zd$^y62WoOFwDQMec`eKGvy^Say|D5<nYbCsjTx@9((u}IlBx2g><g8%DjQdbKX$`I
zcSSc?>7`6dN~$TDmC|)1T-G^{EmF`Vluy#=i4$pk&num8FvdOx<drTfq*4#bky=gi
z$1gFkKAuN<jQhQBe-)O+@<~9NJpy)&cjp)PgWO}88s83omzCPWv2=dZ>(Hfmv%#;7
ztZN?P6KKewlwZC?+e9_VrHRK@P1)?`EB$EagNZ40NX5elG>Vmliq~Sr#L_e6lA91r
z$Hs@l@en~tS^HUarjbmS#h(LvT~v}}<EX18B%_U)#Zo-^(zAk%0#Osd?E>Iq)P7WI
zMWM{wt;pq68R>a721Vyb*d<ewX}jsA6Aq+CpgL*deiO}dNe%O54A6FayFonR&Q<?{
z@Z^P<lme0n8ktd>i24;twmzSD@dZf)>HVr7n5Yik0l6AFf))BIOML3isplP+u-0~?
zRunYV?)!y^F3!**gT^^`kf3sC;kA!je8UW0TDkq}6-ku&9l$*KPX5%5q#SLNvF2;4
z#r{<q;+NckRS5(d&uzt9vg9w988lBz_0ukfsVXN|PAk|*RL$8>@p|r4@4iGSso;WC
zlYy>bX_p97HEzLUT{M|9M)3P%RYzSoZxP;-EDa+gnc0f$w2ir%trV*yIdm*gPoWqq
zqog`rh?R>1akj@4P~fJ-G|26VpQD(@{AwAr5kq&wsHraq>nK^#LP$h@2&R!8`{+&x
z!S+i2%0MPojrI<76|1C4l1(?$1N%8&xM_xYv%cHW%;1Ph?CuH#A}oKa9aQ>y=PF&s
zy{_?csMVM0hVRD~H}%Z)z!lFW(wD`)YVOzPjJS+R$Q7JzzaZ^@qnC_3&BvPP=%U5r
zV0p0ViHQj|xgIF2&EaemLFUg9BLjmI1SUqYS?u-!GqX>2iG{8rkvt6=y6tZVD(wyJ
z&6b1WRQBgtNfAUUhajYmN!y~-EhH6}5PMDQtM=O6=ND^>R3DLg4*)(~9##s?x;A@-
z?)Hc|)zfzIecO+<<F)q2czfFyLH;bhK<&3lv_|)r(`$rjhGtw83`mNAHU{{0=lzjb
zz;<G8j73V`!8mSPy?alMhNMO0Oh;D|XYHCA&<-~aS6~&^M}mc?mpj9a*AR>)mdwL2
zLl$vS*%xd}Q{{3(pnQN?d(YIQj(gj5AHDIb=^$+YTAQ_@edfL3`0&JU^s@hsUIvQV
zjor7=ww|1Z*MQyOUkt7eS>WJOkMaCh=h`!R=|!}>wZ?=W@&R`!bbmdHtw8o-hez&w
z(1R(f2`Cim@Eo(wA)6JS0!@POD|VNU9by2)Ut7t*D^P=@@C~d?MhmS8X;@v|n7+H;
z`@z4fzf*<BqpevX!wBORQ~^bg=#M8`36Kp?we;ru+eV&p>(*YtLr8y-eZyE<yX#|w
z0D8>JEGkP%W5@0ZkMn4%y8JeR>+U+Yhli(g^B2q$HkbXmrv^(ab1aU>NU@YV*cRBO
z+_q-MT1T<@(aRDs=}$9MJo~SB_Yc{boOMl(KZ2GUsJ2{c{TlDrWKc)>SQ8H**t)KF
z^=p!%?=n0cdQbfdY9Jv?hMKL1ktmgAtEYI`L38AfDT(6-VY~^qWrvV6@@|0DEO99m
z!6%Dk+DSsTMF|CF-^{iK4n1E6XJJPcjoXLu$cerYjSC%6dJs?nEkYa5HcDr_z~KFm
zq@$MylSFhoZ0UV{eZVFQdb@a9H#2Xw=6b%l&E$D4jbLt|=if|R@?IoukOrePD)Zis
z2Kr1)JR;idP-a-lk5yNpHC0}oI|A4zha$|+=aLlNk!rsOE331fiE(7&6JpsThF?om
z&|2HIs`wL<885X+4893+-?<DvXSJKm-Y)(ZC-~d5rG>HZG?xoV*8rhdbc(1UI)O9j
zE*HSvzqml0MEVD4#JaLWnyHQKmRV=$7-F5epQzb7>wv`ff(GvG*~A4<`)ur;P;}+6
zbv;KjVh$0Eu;2Fs7hYa{>=_abaIgPI*gFT-*==jQZOq2DZQD*`+qP}9v2ELGY#UAE
z2952z((dovv(MS*-anI-%=K!{caHHJ&oexCV5|bZnx9$gHa<?1<~*J&YHfv$b~;N9
zfh9b59DL<{8r!TML;`7fpvhHm0r$uzVxB%e{Lx_Q`0F>5n9h!pCxk;erH?5{3*AZk
z<4{4#Lp7Uj_66a~>v7dI6?w_~(K0Qg^z%@b%5(Nq*~F#l``|?5xEAQ$3LQTej?alN
zb(tEMvBjumO#7@9%fnPCeTr5q6ze0@)LawtO;y4<oVWmNbPF0`TGW^?OP5{e-M*L}
z&0Ev(^7o~0V;CRcC0IwmHisLhITy-ijhL}*Oq+7)0{SxP0mz#Qb;>5Qw$=6g?OrC+
z*24VfwS%zpC!HE{U?20>l=nj*Gml?C5jwhVdg|;2cTYP;Xu~jEl?!=>nJ16x$@ik;
z#W8c^UI?Krg`xFq)%!8_P#k8~RoRwuy+sV_(WWjjjpA~9$+Ee4Cnhv5mszK-Pf-uN
zR&+bl3lgI9t}Kh`<c6ay%H|4Gph_e<Qiah>1LMnPSqw#Jx{k#Snaioxa&OBJJ)aEG
zsmNs03d=bZE35nNES-t+%EfQ~1j}~XgmPU07V1y8?l9L=2=aK>lkfZI5yeZ4>HWTh
z-BKEBYs3nVu!{R6V&gbWd(uNaeOm4I<(;dBan$<|6+LMEQXWr*Lf*d*JpCkB)wQ@F
zCu1Y$mxmt5aTg2KWo+K=lTqCyv^jhBT86>q1*;EgegKQ5Om_7C=tb(69``tBs?gWm
z;+S`|C<3eKKdMDNXp?NETl%@g%vjr!aI&0n%h0r^OxgaF-TUkPlzM)qouhI^!XS&U
z!P#%=>JGX-X0F!GuosB#9&Vk$h5X4!UsYYK8fpR-8tI!<2{gfhH>bPx?0rt=FrZJH
z^{OhMXXh2QiZ<+||5hm4=ZYREhy&9g2lnA5mykBM!><@r*HI`XK@DSGGZaCW;7=}9
zYOSw_^!>~-aa>g4vw5q2x)$$W-x&JoX@1JvgNO}tMAOPkS6vwumym~xjT3FrpEj>L
zxHsc%R)t7>seVa`8PdCes9b1znG~?iGg=~Dk0|(Me0VAq&0?k-mn!-gEtgxh#r3dL
zBf|iDdZz2;OUZQ8lb!U11Z}6uTghkg2EYaSQz^5$Yrg*BE`cB1rS6B#qSgm@akCgI
zFYFw{V*$LZ_3PvHx496}$)Kh_Zu&S}Hv2SlqxIEjWPYXLw1M(_(OobQ<e|{tj7=`S
z+><>eNg4W}3pcsiS+J);dqeEa9`2Eht?s!db^1jxF_YH4CXhB&{`#mkV|Wwld%36e
zq)5@4D#ChCTQ+R3GL?J$Z-N9BtvqB;zZI^r-X`GBtrWmf1;jy}$@B~w-y*>_SSu#?
zp`}PcjVnAV6VN?KDC$?OzG$&#MLlAZHoHVX(D|lfkeYaU=2s-IX`DO#c-Ir{v@#ji
zxE7JR`*a(<st`pSZj$_6Fsj6jmsW$9Sj82n_uF0{!eSQQcL^Hzaew+Ran+<`H8%mH
zP`w_e#dqUA1CctP`^`qq(X0jc-D}Liq!?X*$b&m=4EB}jcPr}K1kIM?sKWHMyZOJL
z$0F(na;XBn`59dzQ+M#o9d%WTU?2T59_Y}Nh{GRszzQampY@3I=SGUCD8N|LrZ)yL
z6MoT~UmJ%uBVP&xwammw(k79iw?<4dH87Z5dl%~Cp-U46(Q^qv(aq*gL06mW1w1i<
zZ<b`DPT!+sn74wts5f|f10)FbOgwCgOUxWKHA|K0zk%J2c*}ImBO!kUp-|!fDA6;9
znW=?lwZC3PKEL<y@~>Tai*NfEbAeq$Ye$S)0o(m_f?Os0OM3GcH4A*Su7xf=i;Z72
z1x`7+w{D|*#rpUmAVI9Yqu!bZ;}Nvxkc#16g-Hb*6Vx6#;fJCq)E^NeYR^$5TRDjW
z0rtX+-lZS(DYD~@AAc+E=QBVY{!ML`5s#tc?7p=tFa9wkjg_(pB?sXn>DMZQFtaG+
zOmyQ{?`r+&mT{`eU&>%>Ds`nev|gBMomAJ9GPMrnmifr{$e2lwj)1tdCLn)(vgU|d
zrRK&0wZDo$KpCG&q4pg!UWsYx48=wkK44oL88$?ZkW_QA;d#^=%D$C`7zzyYK}}lP
z@+uz)ljnE-J|z7*)pf>>O33%h%YGE{Qav1rnd*f4$+5X(GpO=Hw~`U>9Lir%(Cq;r
zAukCu3QW{2d&<hjYg7{ggX4N5Fq&4Fk#_H2PoXFe<5+FAy4T{Ul^?Jfjr#`3k)S1)
zp%Iw3NF(b}K&(I1IW}eTc8M@Un2v=xXc0-IEDmLJHBJez+S$fSlqKpTqa4719)t#2
zm*2!@_dzT(MHEdPuI1Mz7_?`+M{fZN9R)8r?;m+`ZLE_{KCsVp8xrIjz{JYgQkS%j
z>tZGz5m9&K@0>sbxz&g9arkhO<(;{rwxAx=a^`+uma4REBu&2*1X@}Xh0qK4i(2Sd
zk~h0+HNZBoG_Fy<4vHoQB9dYSjn(+*(sS5|gISH2=HGZTMB30XeRH9lA|$RqPNFLq
zgQ%yhW84xiRUS}m3lsSY2}=dcyfB#f$N@*^OurcGVXn|~ivb)?avu~o-YSw3@z6Q&
zrSk=mZC2EHz~FDbcA4yN0LLoh>J-44uGS=nW2xT#g}KpgSlT%^FUL|_&pNAOA_{iC
z0?AIrZZ0WRWScePhY1zWCfRSNB&}w11Rd?|9WMF>5#_yK-S#D~SgsDPN{JF#sY!IV
z05Ef<S;<<3)a^WNSsp-@4FS>*1|&zUJU7NudQrJ}V7DTbzsP(%n#4JobmN$Qr6n!U
z1i&gTc12l5trr&AYVZ;}5t@0W#60Ouk1RiYIqG)GpM?;jRd+r|#c=(;JLaNK66M6C
zHYJ&~onP8DcRvCwyo)xvlxXGR57h7rpBt6~%NP;ql5{7#^&B=z!^;r~M++p(OLkxe
z*+(&rRlF0D0U9HLB*P*_xzk?K+0rt?$)yxY=5K0;-|2T}u<WANN=eHZnEph&yC9#n
zd6d`$GcLI}M=6%hnx<?gj7NKaU@VD9xjRfaM>afQ*SOqOAX5Hz>MbruI+zf4)~|A5
zTdf%>xnZTLfl5;|_lEyQnr^IFd|L)9h2soT`yRttxGd+7>dKAKTvtgYF4J2G)gro_
z0e;*n&sQ!gwszW=v^HivbURdTvmg5f)0qek`cEqL6GAD<-@_>x!pL^sgPz;zvCi8U
z@hs<buTh~t3I9f?8mY~>$MAl1vY3y3QibzbhCO^R<1wQCZmc$l6W{N(<x8#(kw^p{
zjg*ipr2>1Tmg|%Gt|(6#CaAfqNSHI&K2d19kn%8;=;vrog-{Wqzq$8?2tXjnDL@NP
z=;PtqFUIHd{jM9^=w+RId6x6Kn$*CV;d*coEoR7Vms^z!bezMZ{mddw)a>nH1=_nP
zM6rg|Tg|r%zLq1?u^#XClxpR7mFibDn^*YnZ<>5o!!DyLp`Md$wpdR!Kl$DVP;eTL
zc169*%H`L#6JHwx!7W(Ec}xcKMVW_S@WdhhG6#MPz(agk%m(%a4;RLYa@_y(f5`O%
zVpx70c=AOd==)sOK9l1hEYhVs8EVA;MK}Oyu}=u(V!6U_%E$`~!|EYzUT3>k*ysWO
zn=X9Jp(tJe5Gl>ijqy=dBm8?j{}YAi;eJ+<n=}lj__MhFPoi=h1|Ss9AZU^Qx~>2I
zIejeP(}TLc#Q%6o&ceB8Q0113YXikSjcm(t;M8mIpO=7QSfpL7iS@EZy?A$a{4`9-
z(_}-bjh!0)f8fPo*BpdeW}X&r&b0sduQ`M{&FXkZvAIXDIqld@w<PxVzD1Q;-yd<v
zjou?1&HQ*M<!Tvhai2#?X)~hOhfpI`#hFDxN2!EQ)Jlg2GWDsyg);-Lx*w*$2URKb
z(zJOto43h%KIpNA@w@a%{$TZBy1WD858b~Mqy2K1s_zfQ(2((@%rXa1j3h4BPiN?z
z)4<hZ@D<&gPuo4Ypvhdt(xFhT;K@@4q(2!owNn5v!!)+*@nD>;hx^-f5D%+!Atax6
zb>&IVIzvrW#r@@&9`bP&30>C3)2wt&OR^g0WK*J+_hudW>7wJc`_=C>#Y?6mgkpUM
z!`s1y>;`*ArmNBKdZ(b;IV3Z~uvtDJsZ6U0frc<Q>19BtHy3YW2VZe`-!{K{4o|aA
z9(x_%UXYiSa*8i~J=~C2pGIx6evnO0oaoxI6s>1%K2)1Ew5(`r-?-rrayB-g{dl=5
zKx{m})WG5S+<)&X(E15;pMG0bWr?l9Rl0HI{FucR59ieo!N~y!XXws&SW0-_lst&4
zpb~YRHioQJ0ggJSpO*#)8nCUF{BT{IvS?Y_QVp-k{T<?i?_5Moi$ZgDEJA0nY$1BF
z!xLk%Z4sUcb`ofdIt;c8)hQ9~l$wA8;1+Y=i3C&Crp8W`S#{Cx<Et2D^O_heWm+_+
z_{{Ry(){YEWgI|TVW4W54CjhqR-40HB7w)U3uAdUu*3k%lCl2&l^p1?-5LNZd6P`R
zM{$VY_7F!U!CVCIU>guCK<Mq2WrqR}^lNKP<M?_izSIYWL*-#bbE}e*!f0CBEjJMk
zm`w$dA1NjJ_Q8}S7kk%>svpLA2H%f1Al!J{9?E36X&!D&b>jgRn8{{d19grz`tj$T
zd+)CUG_o$!HQ!1ki28r&K4q-q@sRH|JTg9abab1VK1o+rE-Tpv8>ysni_OUzrv{42
zd~ro}5@EeiJb^JW+B%w~%7OSsoLkfVBL2(JX84Ss&z;o;aCOdg+T>)jqa|xd=&F8u
ze6-d}W+zIwr06K`G*nxw*eUr|R(4r#lY<H&pz91VGZf9R99wQU>r^cf4Ld>q?!-rT
zu+kFz!<3VbXFEyE;b#HW;sBT6=rj7k;kB>nm9mIwNp+o5<zbyONt8nCRHlDCaKT3g
zz7k)qye&O%yxGe5I1Z;4I{oJ=l5PuQr#bXP0~S|sr=yT&i?NH9l&dWu3#eHic&yRj
zFMN6!a?=*tQsUWc?8?2@-7lRLMTI<VG<O8E`enknH)YBM@fa?XJv4=^L?1NeYcRKq
za~rEGy~vk2zwtq$+A8s8^oCBctYS{S7B`L_?+(AAn3w;P*vxe0l1FkuC8{(BYDoHv
ztT^mZaprJh-j*NYzZ5?}&^5}j?zw>N3M!fy^r;q=Cwk~i0mGtS!;^AzySYPhMrQmj
z8R|UtV%5c7W7`Q()T@k@E!zFu(N6}+Pm2TFnm7Qs`oW0igl=U{025+WfCs|R#~wY5
z8(IM-Kw1k*ixUYB1)^ZY@s>H#s^Jbl2ia4IHA@cfJw#=+F#pRGYDDDo%%gB?JZ~RI
zzrFr-wo{`t^>4+2bwHxFk50}SkZ}L9vQ6qNct1rfq{GyK5CH){O)ljrzp4ROnILOw
z@HupFTQ<&zA3|36HMqKF91sssB^_Do&Dn?imeFNTiW?epBHU3*hu?83BV5$L?sn5K
zAjP<Q+#)X+rP(;1#lKad!b<-1Eh8pQK+uU_loHr57?J;1%4~{Dn{c#l-Y(f#jH_L*
z8z%<Bb9!&9fIA!%mz8<!B5IVxt17KxV0=D)!E96%jEF6jpdDp#pQNrsc?nd|n29TU
zr%?g}mMhoqFD3Iw<Tr?Vz5Lm?>mzo;`Ayw<1E~HL&!31GZW^^VbQ1-04lutl<Fb*9
z&(-A*BQBBef}u$4-pBE(6zX(w0EY{O0%n}yzjiROb~dY+`7t)yyGMr?HQwTK6V1VA
z=T5ZgR7Pn>+8wOzHr58<r8Pe`Yfw;t(`kC_wew5Bnb!x3o8)b@t#$*yI6_fQ2)bp<
z7LK}Qhlv!(^A3eVCnKt%xf7TsZ2L{`-bUK~66Q}YaX5nrmlo!hN#V=<#OHN|aOIxq
za=TX%rqlp8iDNFefVYXQ<6QHr8>J36zlBUCjibv7G9JTOqsp)&95>AY^{50!wIg7x
zJ+~YYW$Ih6e5tB7_%8(I`P}6kc+;M;+F`hMS3seG20(2?c^3#tEHe<&WS436GP(mL
zL@*nVk+TTRwC^+kdrr=7PTuauz6B>L%))|`bVCc=W<b43pE(=>RZ`WU)6|I$2n15}
zvER%H5zw@w&=LV^8)~W#wM{laZQ}?nHg***4nG55Qpb?vq$8913DT_BiuseG+?<jm
zAEiyq6<O#^)0}?K@cxxJrXeLcYuaakn<VU0jmRE35~Q0pZrS;DpP(p5xCcQ2^{K}q
z`F8%rUJ!3w48Vo6mfi$Zgh`7z24+vaOh8khXa@#qR4?ErS&I`F>Olyhehio>RCWQv
zOo^eANPO-<fuLs@?b{w@4uk7Zs|PcGW|?6J!lZDwqJExc!)HeNeV_;uW(%FeUSxAs
zjl2z_$}9<@aH7<SUjxoUbCn$CNztq}GtY5clt)DultFJ;NT__$u(hHEX;@!YB?}|C
zAsy5p@+4$#l_V_VgzJ@PRn*K`zL{!Z&Bg_hQ0ZqbU??9VYHl8{5vVvgaO6-@$9*$m
zPPgQrGuy}|lo*b{)r5{0Jtx9c0oq%01Up^&F8A@)<AgXo&TB{TaC&M9_|h!!_}1S6
z*(|jD(b{gg-TE<Woo5iL9GyzEt%+Awx&Fjm%jh7%9<9R8z+kFcg)MlSon}=YfQp2*
z2<D`^$D$}=J)FY<Z6$4|Sy#@J-kVEU)f1In{x>V4Z;}kjbimYvfw3L(zACuUyk1Cy
zhU_rbZ{SK=T&AijjPMMYdyi@yvmt=8(2@(%8juuTf<~{iF`L4?uLJeEVzAYp6GVsq
zLyI2tnhq0`#4@F&n2xcL+Yq<mk&sUfGY-UwYJ%!+fH_(7$kmPh`aLo~2XG1?Ou|r6
z!<GK_s+ZC4!l$U-4@1h8o}jy@uWyv6O&HvhlC5L{kv1|6#!(f+M<iz@m+S?&J$Ai6
zg}LO&SK)+t_drO04OsM7zF|yntcYB?(d5o2jobEST&SF<sro9<!ALSKSJE5+^(x?-
z+4y8I6EL<0iwtC)E)z0XEmAawNccjm&BzqBD3)k@8@iLu9_GJT(7Qm6b@xfWPmv%+
zXiK{bRcJp2U+AGgvV(Q_?voKR>cR@Vdcg$fNX5t(C*l_oDd$9cp&C4jS5=?SkW6kg
zfxn6xF``Y3ca)4E{Af8A6-7!x;_4x7VQ}pXKubuo38zig#Ni}7PWqpN=X@9U<X>d+
z9+L(I7)Y}IS)d{skMu=it3V}!b=|cnJn&}g^6_Kk0UKQU<c|${#T%IOkT5Lpci5KX
z%QdI|pn7@={-|^(rvAd)_`?vk-WGBgCiBnz;<^RM3Sf7qhH6tw&aNi`X%iRLj_LTv
zq`fm#T=Kh?m81L2Xk!YGQ`%$EFJ%nR%H8lT{Xrp+Y|;riz<2|x2W`z<#Vs;f6J9Ll
zQ_=9V_zP4eGmkhMuRGy*F3nYkA+|!>1;|rB)|bA+bY9hPj#faKoX+-7J5A`xbY49`
zT|Q5gM=+!v{X?0=3A}}bgm#4ysLX=sLKWZ_2bdX&$b>F<Dvc4DOD>Yc3B;VcH%KhH
z<94S{QF&!a%ARt3Zatqn){`q68Nml*oiG3$@Ae}gC6DPx<4gb@@7R}L&$6E}Lt^iz
zbjsd@)pWCqDi>$09^b~?VTnw2G|RlAC+>M}P43?&t1=@`$UeLmU!G!{M}C~RmV~Az
zub$@Se|RsZxIc6YnP&e^UtY?PsCp9Go57;v{W(oTB_Wcho&x}r`)eAx6(t#LZr++?
zg3c*)x>Nq3>+04O>Lzj~1wm2r?f|>vGD=aISDtmE`H}lm)GktX#&}c7Q{>G57dw$~
z{cNdkll9717*zWQ15Lm<UM#}poS!YAyCv0+b1&w~S6Kbt#eH&l89Autk!6?|NpoFt
z982+2@^K%EYD}>w2Z6!n8n5hWaD?oqel&p&Vy0d{&?98pPP*J)oj;}qJdHhgac|G#
z?`<Nu61*=)VQH!c7h2k(W3~>=iu-b%)XEO{>bFXewojmaT!i3saO@&Q3zQx=`>RS=
zNBHJ5Pl&K<h?;`AQw5XfhZg!%a4)sL{5XT-v=#%1!`M%G#03-z<-n=Jy|Pv?<A`65
zyJDki6?P+hJ{B<(ct0E6|C?ToX?C>>iV>ly?Y{h~cGnXq8G(%>dpqqPUUqHiNSKWY
z47KU<T|a0p&MP=iEp-3+eLa`wxPwbbGsWqL7AFGI@!~Y`Aol-(uX^cQ^nutX9{)SO
z3K_MOt^EtH0{?+mg+xp*!QX@^WZmMI;EbA_3*~TxOL$3&o6$KGM&xdL*4XPkbbTG1
zfgSHw&+A35kwXZll@p*aMkDy|`qZ5f$fkY3Vik+g&?$h6A$XiO4Se5UU=#Y^A6{*n
znl@W--#nhD@qCwt(ltN&-ktXRj@KjuMrl~$yAt<LjYBXg)Nfy6R3Z2}$%`~6Qvr-=
zK>R3B$Q_OmQ=S57+ezIvY<`FY8}BF1sXU=Il1`;#QC_O68Yy~O-)sAr@y^CH13mZt
zeyXcD<8$~D@3bh%#pkxOlb{Was)@rE7~t?S(Rf#6$$p1i2gIC9ou3pL{P=A{?othc
zV;ty4k_rY$GFgzT92Gb6T9HIdQUh9funC1neh*_#d0lj<O4iBd^i5MZdlMM#@z*5m
z#Eg`$Y9l#CA!}h97_s>-7>)#wXjGrr=h3S{(|vEFup|U`^w^J$6Wr%$Yq<nr+=tU}
zrdmkWqP7<A*#o`|uY(?0dw(L*>m?ctEa|iJbhgJsD$fp7S@?~e76327IdqSi;jSof
zoz9-jYM91$4_7=z94RY*$U@lYt~@!wip}2X*z|Jmi@dn6XyL8N&3r4-?HHjy#d6g+
z_2evJ9M*kBbKma>5Oj)PGwk_v>hw_cUbi=9R>Entz~gq21*cEjWQSsPg_2ohNg>@N
z)6Itu%EG*<6K2Fn`M!A5ce$2==bu%wjH}zwQMwKLQTYVg<$ZOdevDZBl~8eJgTz?0
zJf?C6?@+VO&Sf`fu*>tl$92a`QR+E6g{U0(!lMY|Lh7XFMGQ@E)9VeVZe8jf3yX|-
zv)fY1<k^EbR@CjTuPs2d5ZNrGfO0=A#_=kWx)PtpFUu5GtmOD+7@sGhL|Vak0=c51
z9398j*=&Ip>n(?ey4?7lBR^OmXsTvJFlmnW;T#W^VKNf;$BQq6=@*{YYr~0!o|PtJ
z3E%`y)?yOYzdS9v1Xs8$zF-gC8%{er_^I5Ih^b0e<*D(h29g!0_t&<w?_HM9=!B0%
z^065$h48h!>ju4lp^1Npzq4q38J<c=r9Kc~9+$!aEmD;x7wP5<)1PA_+%o)p(S55n
zv!F@fdLi5CC@iY_N|^MMURfu#X@fy%%IJk^q6n*G?4%QQR3WA|z>}e~utb(~Vc4b{
zyfiUuuqk2YrIp>=I<x1u{MYpTy#rrcbAO7}qH8H1Pb+$wJ&U(B9y_PiPOJ?aZib1*
z%6s01bPSG5t$jy}KSay~R&ugi%~x}N<ol+K4C`c#Fa>T`r(}R-KhwiYPnI#J23sf!
zmqg{YY4evEjZGhc>`NBv4Yk_u<FEZLVK@=pzH<6<V%3RmCTgiRx}4e&4CnKsmXY1>
zd)y}IYi8r!h&+S**@NX3c^vRB7leAZs-RNzdZ3P$T>V<yH^os&?n4oZed@-%hsb>o
zz}_7y)Ehodsrr~DBUwoUhci~+>6+e2-yszDlg~@p0}6ICMN`O&U8uQ_v_K34h=|<5
z&O(A4uKl9NX6<odaQ&S-lY2N0X^ix(>q$5$m20Wovdzub_YzpRm+DOG+P9%ej-Sef
z3Pe|H9}O}zGp2g(Z+7W$Op9H(r>Qy>A3+hA2u?jJ-_AxP4uiCDm}FiwFZ6!ePBSU0
z*4Ua(z5lA)f#KW*lPH{zjku0IPLSJeTsIjHUh{Et&GSBrCo;u&)otg_upq)AhSktD
z5)m_qerSApQkf3u@3LGn%iJj!sg9xyDOmD27XT(6jCZb$FJBC=B8tBq97F#q?GKpk
zw<5VWyGs3QD>2}MRLTx;uBLcLqdaq2o86l&YRucvZKkbfEg<bG!Yv6MMu?U)Z_4*;
z>5-C6HH6K+jyzZa6)IQ6t3o2h1QBz|yeq&1n+WJ>FkoB7F!V9;@K+jr14aV0n0D)x
ztSNNV=))l66!EYUOA;_$@yM%Itl+d6GDBWpkTki9Zd16YVUQZScxIKQtgBqx&wS~H
zsyA2Te%38{&BotKc^ft(U(@8Lk!;N?a^s=VXd+f{`Rj>0Y=<3B!RZOn)$|b*>5zN{
z#XTCcV)Un3S%<eGFtO<Q4NmKUvc`r0`}mswwUqlDGy`*sco*JJVdR8VMF*6rn}jvm
zc@L_-fmRoP>s~Cpwl|CFvoC+WIg|?{zIY>QML(dZQj{4(GUAVF2{}9jq(BfrT`vZe
zgqYIQkalVPL<itltGYV<LJWA+YSUBYSCw}_u8GUDNa}2=-UCKsy+{#0r)KF5rl3)O
zN5*=c`{1qsigu5Lq^S3eY%AE496-@@WC?TI5K2YZA+e0jmn%de(W2dsBzU8VfZa{3
ztNH1-?)?XVDD@PV@gP9B=hRI7m{N}k?sh+o{R^p)<HR2kVJZ{)eM?%g1Na${5Y_gz
zG?#cVe^*0rwknyU)^vzJ`*{W3+_-NK{5^Lx3B!EZ1XYlu#xK@v6`HjMq`+FfB{Q4R
zMqI+_2?3@`&QAUvg%+J@);C&|sX}iKj{5L9)1`!rJRL$|v({;}ESoa?2VtNzqvVAp
z{y*DbDba_Ur<#ZX#u|}AO03vYus1n&#7jt5#2NGI&k|3q`hJBY!L%xZjW*Oxc(ZZT
zzf@m&^9_|lxWPWEu2zKq)JxCo_HQ<QcB*A>0izA~=Q1?Nz#T)ZvdZwvD$^TMSpeAP
z6{SqlPXv6+?MBqLF=gv1Zcyu*t5An&2?0^|moE7JW+|>Psn(&|iYEXO;;zn&9#EES
zB{X+NR*bo8rzwscMSW41n%aCAf#y-=QTHEM9K9w&<B8GeDWha`Vp)SodS=o}nW>h3
zK2~D8)hx3JT}_%t5;KZh5J#yS28{bj*jGb@v!1d87F`V{%j=>2aja2=;Aw&qc%6wf
zHMw@3uw0;fkHji`vp;?Dq(1uMtwu43J-O$pnM2W~P`*kA&+n_7R5_#vXJ#_tZ#EGv
zVZgZ~Ys=K8tFiWe&EP18o)>ZGDo@Wr#-nbp|F%&56`*qJe}iVTgS!7Dk@QQUbG#hT
z7*FK2=!Vgv+k%J&?5^ULgYlc`RDVSV{|(hRgHt9XQ>AtrP|Dt9QGktoUa0V~qKE;G
zj{{HLp#nlqikj9k&XPFTpmHqOAp)3T2k+$0_l!%l2c+BU#(MsOoaMqsD(qx8t398%
zsD&ykAn5YQIP%>Pg%}q;2WXWulqdZMLa1`BxOnw`L+*5j7=CG+O)o~oy*&4Q5<P|7
z?mZ>hB;nGL;GrZDuq&<pFc20+&7ZmNl0lX)htV%{8f4zcRi7mQ#Q~or!V#>?651A`
zt1u-3@8inulFIsZ0k1Li0*J)pJR~Ddf}IjqHm{pqaI5oifySR)oDG&|lCQsdrumQ+
z<JFUEu*^F40g_LX!CBcvej&K!c0Ed_zMQAlJ*NVFQStBURf=f@Z+f}Jbfyh7da3hd
za3Bj}Zu-`4xoo#fyVq?2pm>p?c!$=$wzkU=v-FY!-n%jiwg*OAnHX2&^R=kSHB&pK
zgBBTC+;(!4w(ggl1WkL36jzksfqEOf#*&l{{3I9`20jf9muAa*Bxse*O^zj64|e<j
z|2j2UfPY<ep{{0jBt>bm$&$rMyET;K(@J;#l!BHUi)`g!`|l|Vz3}o<lnBYW0`&~t
z`PY<&HJi|g9&UAGU-Eo=X>K!nC4cUd%iQP&N|tf;4%Ceyug9bB{(&Th)P-~Tl2b4)
z3n?^u-P|g%q%)=W5hEd@U5p)3kmjm$G3{bCc+nmrlKwNDmT1y#7iBijb0lIErcOLy
zS62DafLxk}FQBDCib;TpvjdWk;%><2ctIBAO8jg@O*&#RJSrqR1H_Lz!SbP=QJ7rJ
z9r{1eU;=lH1X(3)e{uQzP@R!xaMRikqg%F|x%Ecu1S@>`MFRXv>~YVdMHK(GYEqyT
z-^dv;ca>iM`aB@ut}s7dAa<KW!$1Z=jBLm9m(4qsW^JpBb>q{#t)psm%aOgRL74C$
zT<u%bNriGB@Ok4vYvIE#5`2gJ^`&TfqMQoIQCk^+8_Tx=;}!tM6$O3`^TYiZmmqNa
zV_athK<vGZSaZBFsNLgbsCum>b~4eC9)`0yfd+8T#-!o{Q_()U9UVN^VD&}&UtI4*
zktNw<5dngGxy4oHt{`A=vqA;|Q4RxeE{kq?+!eF@t8xYYKEnKPpRw6)zV+JueSobz
z47V<}d%qVmNaDr^1Kz!WL-`*<qN#tVT|ieMAb7_%eIexfUw`%SKZYp&h&)R2a*BAS
z7zbBvvBQ)<#L@o8Xn$2f4}!T$A9(L_kkldYKYgiP6@eeranq84_}@b3fB(K+WB||`
zHt#3Y{P*Ag`AN$XA~(RJstJAWPodnupU!u7k^fHYVijMi5t`MY*<D}|#yJxny#@w9
zOZ?Ru4Z+(pD`@$f5u(<|l2H3=6-F$XIL9=w3$=Oi<^ZQm7ZC{;E63ngNQz(A$9z&k
zKz)kLjEOAFn=3qtxW{%SPMR*^Ch;0GTD+o4%!KBERcqInt6qd^s^tRkVN^_$(v}tP
zQ7h8JZy{0%-U0~)oKo6JS5^uJlX@&Fb86mY(i?{JzWv$_=Vx^R^m8A(q67HSmVkD>
z*USU=dDA;uja-rGe=wfLXk;I?O2_<uEoyM|Pw>b|oUbNVk4}Tvf>VPf4#QyIamGy(
zJ}<BETM0l@t4pVSfgR$hbwXu&OkOoCIt6HuwBLWkxLa#?#m2&-lgw0$lpnG$6T;q7
zsmGR2CzwuWM&wAu(!(ZTjU&z)j>lVq-q?*}q8}t5DK5rE!!uuvo`Wsws}B5RPt)J3
zK`ogVE!_J(D!?hF`gM&(GY=JcVt=t$a?ERShMsuyAo>gUJWqxBaTXQpcsQW`3MWQX
z;Mj;#(#MiwHE|$$fvp&i=Cq0i&_(H9j0iW&bz{ZbHP&1&j{PHYK>mQ4zFus%tB=!s
zuaDp*;}pBeblz<VO`AT7?uq&kzwCQnCK8rV9AOo8o*}LBgiZ9`4RIRuJfIxsBr_Ki
zJRD^`$44&xTQ=R#2kho6Z#{KbH*!l011#oEB$>V>foWx#61DC8gw0|1Js6qJ;c#<4
zoUguJ1C)E1TJuf@E!7xxt${zcJ~sUF_1<3A<z!Xb6gaB$FisB9rG@qTl_|Q?gkUry
zI)A98#bdr~0m@m`G>oY?sKvuv+SzMz^d`oc8pkw!mU?l^;%%Ve=&c{+AZ)nIZ(y!I
ztg*3$G|u|l8yc*BYBMD=)@md%X3@1p8t)BIO8A{!Aa@h$c<@JWi;XYKO3u>v6DJ!G
zK|TPh6U~&LIhyV!c7F_$@3Z8~&T@oK@cLEM<*CcjOTYij<OD_*4U^+*K5XPd(qb~$
zH`-O>hr4pi!^Jb56pm87oa+D{lZj26v!siGIcCWaPvvtz7ThweyEL6*+7&^tjH@il
zt_o-JD#=<{Ru;F!b5wWJ_wx}h8kE-~xei-X6HA-Lyoa(%FKAI&D3DaI@_H*l8^+P+
z{ot{qDfz0@TVL8ic-N(K5cH|lysM^HX}g<8XA()%@cIYOX8Pwx0g!4>5DNu4>v5H0
zT)^%c(wFDbnW{gd*^jTIPLbc)#_XhdBF6gY%=+lm62~rAabL@lm49Ko83TT3^EJz9
zy7_lZ=!R>l!l9>jo*QWb?@Qny@wuVD6DL48wNYM^{NF&F$W!Vhj&vN|(D(hFI6Zc-
zpNjhc64xWxz_78i|8jQ<gvoUUXA4QAYerczh$3q`7yj)jfi{vUb(FMg#}(h}XZ$1d
zGWQzW1I6qpl_NM_7SH3ISQ15_zwax&4p$4^3`d7yyOp40MC=97*y^`+j3`sc+%&aW
zRfoi@;y9*&9VZ_|Y-KC*iQjpZ(v-(rR(b4RhGJTTS`sI<A81XJJwv86hPi>4Hz@}E
z_m>>vPi;=jTMA|X=`(Gjc;Hr%;*k?0rLR)a9+>(<MGC_~m}AJU@E6dO@L+EXeYr*X
zv&E8#P0<^*2YPgkJaN)Cd}eoQ{5vM1n47YIX=C%(Wn78k`ODmN??|e|(c(bSpCmxc
z3-O?bH|wR?tMTwpr3&$G3wR}8)AO}WXj=x3Ql22a-j7{T<LhL2v%*2KQA7DeJjhzL
z2#@K!v`p-Sf@Widjp7Mv3cjJqY$}S$J4+57hnM741W!g$4p|RG(JNZ_rVc1F=AS(?
zw=u>`4C(E$&4N2?=0U{NgKL*zr4S+N|Gb>IH)WWZef4djk_!Q&@muOHdK@c?p`0#S
zrI_9)!5RS*F(`Wt+Y~ygYs7uZZ#MnM3&6qvnPn?X|BKaX-8*^zgxdpNSCQONPluG^
z&fl7$0{`z_)9+6g+pcgMmhII48M`6I{+PO{*2dCqVXXsRShhJ|ju-=-O#azQJ39}Y
zZf!8XM&3f(d?^sh0g7^f!97hjmm9c;SZBsOHvCX4Brm6qmbPZ}FYb1o3E*y?_W#D+
z7BT*Cx5U=}i@SNx3%f{tJ0vx4iaCw(J5F(^7ir^gMK)X3nx&Q$bJx?BQ)X4U8_P4A
zjoRVPx4^u4LdvI2h4Osi*ZH7tUuGs~K<crF!(Zx9V-zv$9K`kqL1(@J<)X$xC893S
z$%Soi=y`@0#)7;G7zl%DO_(C>=Fc(n;K708t0*bX%bSB){iD5_1<9j5p@~D&=!!xR
z`yv28|Cgz83Q?+UJa~AWD2mt;c~JMaK3ee(S15gn$t4R#w=a}M5xN19e7_wMCjwO#
zE#>Byus@&a571#0vL@<cEV4T;&EInd7Hu;NH%pCDjyLxdCzHQN6dwctTf4e%Kk=d>
z=CWbNILlWCI0)o9Q7<0*`^?DoEfG8=Nf9sFx#!qNsdTgCA5k>;h+IBLGU4Bp6Hk^$
zM38u3wULnKhLYr+4}%P9uoTYhMbIXQ67{t4md-*^ZZdZ<mmxhR&IIh52?HTpF`zdz
z9M2XYV`gO=taLvqh^73Rdy34C-b*9J0z;HK6@%#toii*W!HUjjj!~LX>oby;C^ID$
ztUT+`OhW7Wv%OG?_#-{dQw{W`I@H4&XyYrqv^kzS*Q(*BY|}bv-gmXRN2V$@s6^kV
z-PBTMoa3R*_cq$lXmI<((IogesVQrH@}UM$2!rjpi@7lu$bUcenbaKHdRioi$Vaz{
zKr1`Wx6OvS?s?)W8Bhdkf;4ep#G5AfLGz;BCmEIf5nD~=--VKpB#l1H*9ufQV3@;A
z3L-DG=03EA@uuAZ+#|8l3-7wjE|YS?ANQL{B%1<4T7e4)Av+nBVW>*SDXDTR6=!l1
z`ksQA^I}_*R2&AvuQD#nZ|DI41R@+VA_emBHXuN9^V$QuZVG<D#4tFE5J1T2>-0-)
z7+}i}t%YMjL7SA85og9F*U++vg6Uz)_t>>Ft$i5VXe#sA^#%#h?#Caae4Qm(&4~IP
zC<-FtTVR+;Lfj7PL?piQB#t&Pi^)ntYofv-aKUqLlDU!q1XYCIdn19&KhP|YhDQS!
ztf6{#f^dg)DpD#X1VE30K^Jf-8H(pcgR=?YGWw+3Ck9%IwPuaud9Pw6@fIwY+ZU3W
z@R?{ui3J+QgnwxGiR<5V=gxOu<P+F>eJx{3G^J!{j6bT+6VJ*XP<TQRI?V&CtK~1^
zo7OKaAkQLVkz>_`d2-eNA&C?E!5a8ML^1pocp3!@xIisTq!-w6HtZ}3{P!%|^##?{
z<QEDvFi5LXgxNa7Q)`V#0byHx&1c}}I|gdgllBhhUTKquW{$7lE=YUDsk!Rx;*}`e
z0ir9(%r(a|1)DwD=+&C5;O|(Z%+js;=`Yw1_(ROoO+OgAoR5tTDkL0jg2KS^bU1>i
z&bQ9cWM66<tVLR~j@H5Ha9wRRftfDGdX9-}C{vrn;P~bl0y!?ncB!)IozIT{3x(x%
zhlGR-g%kFC+Dj3l2(t(XYzLsQKp4X`kgtSZSqdZaNpKMuKCfb$dm*nsjtGj4UAWBR
zz%fEZllGsfez8Plx?3CL$q})4pO>+9+}qmhYiYeB366|h{&J!Eeb4uLe1GTKLZfbO
z{6%neKz>g$i~mOI9rif**bMv9J9LVBm8GVNEkWZpbR>^W$E!O>Q$?ve96auKe9#SR
z{%|s~@}2muxJ0Ey5_(1CwSQNrPrbV{7WnvG2e^LhcFlI>R@`!q>KOBlS&G$$C>ZET
zEF~Dm2^NpTj)+J$xNDEg&FnCzMsl?=hRzueQOR5OX&l}|_mBJ(OG|%!h98~1C+nOD
z<egrR4qvR`r!6!m83P3oDSPNirG2*acIxijiA=#+r*+D1$jKv?gp8>h*TV)7+n)B{
zHway~;P@~M4wBLymg1-)q%osj3g*C#50rYq6vzs(eTfu8ygKZ!?t4@}%crT9cvC2t
zQco*Ek&`fq*6ZWfE%*>a`I*2a9W9>q5GSiJIwP~}h*ziU6TWlx(pv|c-u$s(umeT#
z+iv1?y*zdF)%xiX>G`}Cqxj1vi^KQ&1}l`7__>10irLYBa^3eVUDXK>7#S`{CxG_(
zZhQBnWBtdd*>JB=%Vv+Yqvrg~tgG}~r|p*Y4DRiZth_3zcAF4Y$2g>88mL(h_KRyF
zK6eY}6B)P`Th*aUGjPYtt{h5@WR;MyzOB^NjMzy7(M`|0S(J2Es>X=*7GuaH-H`&n
zOvM%IeccKpB>gt2qVPh>QY8df4$tjM&XduGoZekz2fk4LU2%UU2-)zQ+hpZp+TNfX
zof<ViS}~Y;KHvVm3qGHBP3x-rs?eUzx9j1Yrn-Y<1emgd76ca5Vryox?XcuY@)+Nz
zt++)`PPX@zI?r0)<sla^r&=<j;6d^RpUyOZ!QiBvD2inDlUTHugi5#(+r``HFem51
zPf)I6;qjm|`uG?A{uu0zJ(UNL%(SMrII+FTZ%#oN=Bczaj~G|$3roDQO0#p#A%;Md
zut{q|&`n3r4nkvQgk+S^--slAZ;j^c_G%RI3Z;Iu;>78t)!QqWuSX3v#4KQpH|Xzk
zk|cPA)C<I^1^N`O3xRr+)!oD&6_gT)A!@yZ=D<kly!;VxZ%Gp6*1=lD2Lbo+*n_!b
z7Bk;B)2+RjCQQHFQ_$KC7;Uzb7zU2MYG0G$c^lg<??47<zM#rcbO7^ABcz);-<+*B
zv^n0T5z*O8xs1j&y-Y#a=q@>5M~lf`YTI^mZ;L!UFKXtf%IUq&*JvB1-bHg&-SK28
zrtQ|eNu4S>w0U^`M$66m(sRp~oVqNt-?_X{Q`^Gj&S}+#ve76ZY&@kMU())I`bxKJ
zS-R_H4){N+syM==r!`tuu;-ae#`BT+IOQk?<+%f8xm~?d)0%c_tTTVD(@Z?pzJDTV
z8ZAv<8_`o@kP!5aXQ8x&k$a1`odOZLE->uFEtS&+0I9w}!O!orplaUi?=kGcl7EpE
zty&Yq;CY;>tCiaw#5{e)eN*dGSdGGH>J@tI%k5#HNukY4v^damL&}CG+~=8OPGEOd
zkuaB0gC$DiekH!SvpmL8&blEItf>40_MLV$b~FDkf9xPC0{CyC%8ief^&wxgi1K+4
zGTx<5v35h>g&*4g3npzkHEb~SbAtqI&ax|KXQ>lYaal<*^=rY<9UURTl`{YYRwIHv
zd(_ogK?lQw6zaP##<4N+xNcI=)abhZ$g8v`bvwXgXfs>`I|9i<(vojCO;!4nXB`0>
zlOT`EFD3mNGh~VB-gR%y#c}>!SsUmbm?C+03)~-KsI-u!9w=n#-*z!or}*%pn~5!M
zn5Z_?6UA-5E1RFWDrWEDD47pOk`Sk1phHvXvS@?oO^%gG=q>{WO>`Ko`tc6en+&$^
z3TiEWu#2Fc#_z4gVk()FF=J5zL{Y5!LG7oZuByV{<lurSDW|}7Ulu8f^M1TWp354C
zye&7(kwlP6EYr3XvofM9Blm>_Bb{OFx2*`p(#Tjom6_|y_EM&Kk2|PkN#vlD9~N?=
z{Um;eP-^xPTU6W%<0XT`3wh~Vnwr7e1lZGbS)G4ZKXj1AiBbES00Y^yKH>z4+%`uQ
z`1f60x)!w%-Ge}3x5K^C)aA$_LVV~g@Uc>grI<!1Q+&x!oLIoe3V98a%bOP>0dh8&
zOswRJNdILv*#)iFdvX)r=cW*a#rtQaloJEdGpnA{euyZ|uHbUrJA1S+>I(uR<zs$v
zr@zDF8RkWm%-n8&r(3gmv6%Xr8?rg#J<fQdaK<L~lMnycRxkodC?ySp&04!T&%Jl%
z_qvU34&%#1q%ArQRZ=OBJ?CWO^!k%kr~CNm>b+Nqx61J)<n=wnC|$iCrnd<5*5>(p
zu5<J)_>cQI_of%)y<n-7ZSz~EN3Hh@2rv23D3~l+kep|E*`CVp;)AMB39mpd#H3Ba
zsx&`*pJJ;V-(JA0XbN=%IM~#aPkx1V<Y>U2+8-=GQ~h8BVv?fc18aF+`9)H4s&KTS
z*HPaAyTm`u7^$5H|F{C96UN5kv(b}ZA{xSyiikR8T*$Ih@dZ(pUiwh%^ROc@u&hg!
z@4@Rxi>~|qyY$*cSd%vxcFJ4YahO^Eamgm!kNwwssfH!njhUrBm>jn*J6O2>!x5C3
zsdg{VbyA&dCbSXroowid_J>E??B5*xn?FpBX?AobXJb88TUsioh;iL`F4kj1OME>i
zhhj)g_7*M!ML2G7$(78F^IGC4?_PW1JlDB8x*!j#y-PH3U)DDlkA0MM8q<j=RTNab
zGbIANJ#`;@*!VaqAiK$NE1jxDOZFnx#Rm&|OZ(QeJlUGHWpv-J(-P7`IQZ_KPm##7
zBRgBA(3KDC$~7qOpi<c?eMnK>?rQitxgBrY7q8P(ug|+~f-HE;=JCK)?|PCwO|G9z
zV}xmX+^jDO(xg;R56{x=52^;QIX2CZlORwEi){CQFR2v++Ets{^SwLoci02#IIW4Z
zrEJ_&CAc(6&xyUQJ>}A_9*Bn6vl4#BeAbD*J3X>`*G$>Zwb%=WDCpM9_iieRp`A_y
zQxGvvnNT9b3K+nQ!ZP^5$)iLlO}3;o>QPXt9;3D_TB~7y+2#GL1RMcH|1asMF+6!w
zwvk#zmnHB<A>yy4?<5R%rqWjPLh23#$E=T>ioH=Zkn(SmbQ$`opn0cy&#KZh02Nna
z$^|S{D9DnWLhF{_O5DU1L2PPDlP8iSeX4jYn2?=)u$A}1S**}8`vxjva0Ts$h)dIH
zFfy$jKm#I^$-Z0FOjt!|VgNM^!PQjl<&u)AIj2P1B`*rp?O57}K*BsGR-g;0s<mk=
zhM~P17bG^F)>||Ifne3j_hQpB98vUHBAnHhJ&LOL(i(^wld9G_r?GnOB{_oadD=j>
zTz(5pVuv3a9SE4a6(mNr`AKexZ`}s8t~^G=LQG~ak}`R?OtnV3_-jOvRt`l9`Mu;p
zZ@XTS=0REiNojUH43|o23j!V~CSOW4fSVzss(GhkIu1ca@X~`_Y9joAL76l~SsKgD
zS*o}Zp-cR!w9nlQqol9KAS@MEswM?fiq?Nb__bR+FSb9rx4yAIrqo~AI<lW^BaL`A
z6CnSpNX(e3F&k7}6spqC8%MEe&6}eUwrGjdtevc;RR7%|`ExnN#eg^s!pvO9eS;qT
z(egMDY~vWP4Zw~AVP>a89|ApD5B}lJkh-RLXjqxIAitNkDF{ZQXdFmecjIF;BUJXf
zoNJV(e=46i7MGa>3z0x{Nka#|^EXp{EA*Eb7VpQ%$cZ6Upq3lbj4%6#pq}}i=Th2f
zod8*$Z1i=O2UNnCf|6;MluZq<TDfF=<)|kWQRmKWFSl7F>P6j7!l=GbfpgZj;Jc6J
zI{n$2&>@7Q5|^W_4WS_~I%Lpfo^?@G`Ry`3y=m?DRs<-2>KBuO+&-bke*G46h!_yR
zY%PrK0`(esQikkcFk+b;a>xBB3rhNs)7teDGPNi6elZpLeilzqC64*T_$H%*&QH<s
zr}831+eu%5W<Q(PR6jfBub3NGv-Lb#Gp~J0$9_Cn0cQ~lx#T8X1va8#Pk}+DON((C
zPfikx`&HkV1OiymZ%@QTNdPGzN-<phRjPhZs$PisKN@H`=)WpA7i(816TOyN&#G%I
z$5j(?#{PCQil4xmVVaqH_R^gC%Mh%}S-GI_!Koj3MwdJ%o)#QCL5WDdAjppyhkBh6
zr)Z}xbq%4mbvL{=+E`nFvEwU>4On%T8TB@&s9sde%dVI3)ny;61*26@pX9MK^-<96
znyCDe0o>qV2=sQx6(<^r5gtNo{oi6(&YQ`LN>6c)SxV35;AFJZvg5rjjowPKc)xJl
z4~#<s9#@U(u4b!^u=Rl5$gO*FdC)%R=8a|pSK4k$Y0%L<%YP;Y=U>Nh75j`3ek(d6
z5GFmq;_)?{1Os1gm)rvG8>!T_kCrn1C(HtX_DC=B1MyU_#yi<B)BRjo{711BP54)_
zHFURp^HObm?OK;vP;ye8Y#wwF8{0J#iuy@ZePGDK-v8Ir-PEX$(bU6?nz4b_d{b=3
zds%<iK}HMg>+*SyFA&#3tIcn!v5gh%$Klto0ls!Cmyx6Nt2HFm#-^I{F$-*w`_tzV
zt{CqpVZ3g#8e0azGX(#-pzr@kw=kuc326QUQo#q>Mf-?_?cgkSK|<2(0^LwXANKJ$
z{v~z(cf}Ms6-44;UPM6p6S@t2mzPXuzf&cAq|<*OO91hf=D)1xTCj->|Kk@ggM3)e
zAx#De|0nCYw-4*Nmlg(xKOQOn1NE@@e^}26GZDo7hmoUv|IK>tArz6L^3&%f$Yp;q
zEo>wEkoZTZLrERzvp*(tSyg_U6-f&_F#B7ZH`uLSv^WHA(e7d;X}DYmX%)c!s!enY
z{&@eUW%Ez}U$o}n|C`n{mN?)PC3oHmI{k~$3_8M5XAMes8#gN<p?#)hl4nUdGvmyW
zZ4>(%+*JK;Gu+u+y*XS{d!a;DmqRw4&4I#~fUA#5%C=O&A=;+JIeD`pPYNjfD*5>Y
zXgWAC6BG2`?*SkL1>mHoVOPbRtoN7s9ACTkObVOFxfCw-lT)@NF^mv9-23rqZgXvh
zW%~W5obRZTMqqb*OAMBj{me=uGBoZ~mF4++X>$ug$9@VTRsh+SE^y#6a?``3Yd_gk
z4#(BC>6ax1$s+fPgq2=io44POy1EayDKW6h8xKkG?2<=E%=3m~;Xw?lFjcolfCH=x
z0Qv9!gmStd$5pvH8#rDkcdCJ}=CG_XzeMqG5+ZXf1~5Rg-hNBPr^KR@bl&Z*a<tHo
zy6UWT+$SNyD3-Tl)T&D91m;^tPsIW8?|;GO;P5h5ru#3Zu{<Uy@@Sd3Qal8e(M`B>
zoRBKR#M8`+tlgw=RONg7)Tay#LiOLpfc$X&>Bvg!^+{!7E_<$hy0TtB#x9C!wx$7&
zZj>2VYwa`*hMMi3njX&@;Mj*s9Lwpj@XoE)U_o`RzGOcdXgYQY?s3YIpLG71y1~8c
zF^oQ|;b+O1GC|%x%1&+XkD9CX8Y>dSYHR<26E#nN;Y2c!?tiy+Lz`KN^L3LldlXdM
zSJS$5BF%y*gKN^r?3HFcYJ$|2xbl`dpwqfG`?*yjOja|o7@wkml*chB=Jt8tYUC7V
zr~za~TKb_pF<vnyeMmaF=@g)xk`^kv15K}}Har#JrD)dwXi%y|=B!SZGc^G8C9*$<
z5E&sKQN9O)7@O=1$s9iSkrHQC6lX+_0BGBoVB&9ut+_O}5oLU#9-S?|zy57sO5(z$
zf}jzV3kFajO8bTZk|4tEfboGo-lkLm_djx;Cm~J*d&*fbalxPSw!xH#%sC=CL~~Fg
zuVK&usY5`0t9DDnC3Ba4KeiLveE||B@@T18l(2#esll<@TMWRS3>QoKL%;UVwEpfU
zxU~tOaSs<A;Abq8NG(>d@?tI3mrhO(%e=(oChLOtuAFG$!#1WK%hl1<ni(sfk1bp7
zEk*VNOvY`sQVx$kPqNmTTPJFwtv}@UX9hrFlK!z$D|h^tmD)<4SMErASj4xlA;7$`
z%XmmP!NT7ORHoaAh#3(s*|p#71XG(zgm`1;tEDF*4=cCw+K6Byp87NTE6#2=S_qef
zZte!kZPUqn5s5K{Kh!m&p{W$6bzp;S1^k{UKXZX#0VNxH{?}pU<})X<VQXJ0e_sN-
zKMLoXaqtt>AP+cTlU)sKuutXJQhEiZ(>#K)WK53|WMWlP#YGSb_|g-W2QuV*rBo)S
zCX-9~qiMnaEHH{6|Hn>k79@PyBXWIXJC+pDes<7JU^_$wa-0*UNyk;G^#5V(Eu-pM
zwzXX#BzSNLp5X3I(BSSa!QI{6-5r9vyAvEH?(XjHa%a|Bd!OX&ecJtgjyA^}<yF0&
zdV4QK(f4p<ASQ^Q0@2N?go>c!I11iB{4kxceS!+QJt6@+P*A3H5AxD|i%8;-0O$iJ
z(sg)&O&*5MP2@Uf_856al<a-rK#u1N;be?h{>sx+l0d=QDgF`h87%O^3WQMT*ZG1q
zjyJB@qtuM7;rOE;XB*J}kp1uN-9J(TV6f7^10GnNTfWCJ^DV`oU6ojQNI!}fB1$w}
zsec|l$<TSP5Qdtw+?!e=D%jjFU>6&vmSI|gZ0k_hOeW4br7h!q6AR@EbWg$Zg)$R&
zmPeO8MR#=9u2H&a;H(?WF6>**_9u@ww7A~DdB}i>pT7i)NBAd{Sr6K~*fQ(PXVRD1
zY(2$jrR9fc7L?w#uv$F*zr0dlH27HnF5XhJa1ydtnzcWEK!@;8a1WXxQIPgDMalKW
z+e2g8$f|l*I`PLdbwBA%d`~|`lE_5#56nJP1B$eCh*6iiKHNYXq+KQ_X_ZgEH~mON
zrJUYFPA~1x-p~H6lb=~}9$*iS4~oHFLi3@jIzaHy`}#mnS@zrr7{5k4W>;pfu$1RU
zCy-DHv0+jO$9l34gGM_E*R+QQjsgl+^oYVL3*t9VYVRYYU+eWDK|3&7n4WoK9qe>I
z7IB=v2&fJaT;FUOZ%9~C$7vH&jSC~sH_&w2Fatv@JG7{)?J?2~Z>NG2R2}zB#^y%3
z1DQ3ZKmBl%SW`6j3)$0*l7Gju(y$*^{$LT%g#&EF);zTRK(&6l&Tcgg>u0WvuUVR+
zWbO?|<5Mp(!Eh<+%H}S?-l@6i_by<dFvUd*bO-8}g#lse5{D+rDOQ<nbgyR{()ZJh
zKMkvZeER#({aKN5!mc?xCS*37+jJ#OX9=rw*X!e;>yxs7acNuqOf$ORGuOirIar2J
zxlAftwwpV%$Y+1DwT2d{TQR@jt{fqvv<eT$F?YD`epkbaxMI3;bY;B1Xm^N*Bc?d!
zh=tM#aHAnoiW{Ea^#JtE_~8wV0!B8^bUn{jpQ+X-GG4{GW~`gU@K&prD2oR4t8l&z
z!3W5s2xI1Cp|B0%k_!<ZVzRw1pL(U01LKuRbt;XEDGrt8qMOEONtA96k(SYr{QRX6
z`^`4;0g<^Xwn1Oxy6e9wYiMk!IAOIvolU-Ck?OGC=d120t`=lMo-ca=x-R6c(LxLA
zJT$=LX|1iCN(yp(#BIKLHBVhi35aOdjoEd7XL*)`=wfJe6jPom#<Y&VRolD(|NJ~I
zm7%)QJk<@n70~+Y;!kzAvx1P1`KcxCh)?yDS(h+%6rcA{n8h9{BKo4GGENVo?WI33
z8*`}k_ym1SYqL_+IQ$Fn#vLHhMSTbQ4cye%l&;QYs;_jWx!<-Nd-E~%-S}8|6h&!X
zqkbm~Cv(XcHj`-{!h77aOu~NcKl3apyJ^2UpIh>Ly{}=uh04yU+Rn(#k|O0fATa(A
zJ`~Ip@7om}<>{w7BrFq}+Y{LwZ!i_kw5x<iLC*Q<_c<K|Upm06kJ(5C^TZ3tR(Wp?
z{})>2=QxOm(f@x#tHn5kYzn9y3_eSV_A72%6LM~IsWehfh_4<uvwNs<Q*YO%=otAx
zRb7d@)SmqAeaTyPp&@D<eMAiT(_|;|LN01L0=x4gB~#86arFE$k$}(#xZAYW*dj@z
zE_jFlEf2j949|;OrVb@oo$77G<fKwMpR0B-$YG$a%amDLth+W>+n&}qtlNw7+{XZj
z8&RgeMEbOp$|I9QQ-akIM&m)zn|5qI_y54x7#X*if~*S%1!?12%~Cdxx++<PK+QjU
z69c4t#Shg44|m+|R$Kn*ezz;n2acOK%_7%(sUBAmF||~F@(%6dQg`Lk&w}m}?7S4l
zY2;@czp!Ul`*`npOh!AejF2|V+B^B7(al8>BM<dy4XiyHSNT}rT^<i>YO2Jbv3rTn
zxAWgs2WFn@T*=v+zcz9>=_DDeoVgn?G1zQ2X$<l5*DxyMNCwu?vaqC{EQ+E-dN@TJ
z8@-fx>0Lt>?qRDfVeD>ZvA_gjXb#X*V)M7#HTyZMUB8g*(RIIb<!Csjn6(<2QIl04
z)U`({L7}Hi%b=bqiZh~uPgB_SmHZOGJ>Fp2+jSxo_|xtZC2I=yLu99_1YiyO8m+pz
z9?4XDQ8-1=_m};~6F(%h6NHG6;gD)myn5T+vU9;po}<0d=W}9kidXO0No;fd;`^a$
z_kN~NlvuOiX2<AR;O|gP|BTTnM6ViSg=QEn#2H)ry@+K_t#I+A@y_kQ0B-oc*POli
ze!gH}$fh@erEsm0CaCFgtR_np1C61V-TfyB{uc>hYn^?1hOPWE05c=arxf?4lM}fB
zJkJZb9Nj#mIugl(<XdO8%y1S<HnyjXv)VCHPA=_NF2Q;9lq!5otFt@L@#elq-_xf7
zY=u|)%dR}YdF^AeTe+uGZdR5z1_pa3B-dR|#;cDDfr9jc)GZ9F8fy_zv&q5hl&4wx
z)gHHz`Ij5$p{BtYb#CtE7Zhx2{n2Najzg=WqUG-f2Rr@i4tP(k+qD`wxwfgr%IU)M
zMlsQfLSfn5>rNKm*9XgQ##-?nZYj=QGexj)tLn$R-c4}3^7Ynn!Ic6U8q7C$*le|B
za)Vu|X^%GdI-INbKqdqicsAb-KAR^rx6Y$NOP~a|AE527bOh39O3ak(%BkDS90|>c
zP@3AFtjs&Gxj&2<N*ZA9KF^;uNToSZUv5$(BRy@c&YVz{Fa$$r!av_`Z5*s=)>P#L
zW3bt)%MU!x9Y1N_CfDBzRTmL;Jl>p9v#hlpw%pY*s;4oIKl_zt9DN1`^hq~xDaGuz
z;ZD!FgWx_kKRdo9PHMSLH*r3<bX6*OYL{01Z$$J(Mupq|4989f?jH4E`lqN4U%?GP
zr3c~9aR%irdn6LjIp4zEDM4;+0jG}i&atnDnKO<EJ=-F-f&q1SJ_cc@;<_3mKm}p(
zW4&iD_{ww2sHg)-Sr%av;WsN4u5HAtYKICd#{iV*kPqL!7b~^b_neYA8ux7EN0X{6
zbocA%EM`+^!eY#ccT%fnfYh|n*N|E0Lk?qdw<=a)6epLkM!_H>*AB|2*4W^O5NU=o
zP|~K^9DEiYq(IjitoYu`LjH-Lh@~{>Ts7!maiVIIV&OPmn7nFqi0$2_M7`gE(?B<Q
zt=fKqA523qq}5OEooWopCNjYYB+qzo*gVajA(n#rXv&q)sc7(1<UI-mRcV1V`GH^c
zb&JiV^6qUS{nZtUM>95kFXJouOlHf~mqlZCfZ>zOrWQd&Ffr{?4yty<QT#tyZ$lzX
z_598CZm2Y+32TLk(c-8R@kQ2g@ta&Hb)lf*W(~tCk(9?RUhq%PL4R8wy^j!qCX1a9
zEExau^=Uw)$FtXoJ6q7LtB|3?h(^)d^W8(Bjwn6g(*B)!L+f4OS}E&eFp|;!hAO(a
zzTmwa9$<+%fDIaowZxvBp$88(ZhOb9{ynVi<F>b#iEen6Q}w&Hq6XZ|G1PivDqN2r
z4KHnN8We)vq=-PkCeoH1>uviUpW>nlEg|tEiBb&Qq-tsX!r(iInP)}iE~fajy2WOT
z)UGtH`ijEfqtS0=H;TknIb9!3tEgLSq0QigKE~Z5XSpTRI8Zf)KU_|Ezk?8ajFx$+
z%hr}}m;4$}K)c@N@G}l36PMx?_J>dV!h%z+>17Oz;?iQ19JL$k4<BFLk|-I94wteD
zc`w}G`(QcuKjLPP6b^QVO11g6*@y5ZGltxBZH?NvGjFOMD#=S$;`GY1L@9xE<_Mxx
zi_)1>VpqzCxYhifB)xaRe87<DqKF8$!aK1j`pE}X`h#?TSSI}6r+;aDH&XkHmzyFr
zAI=uqJZGP`8#=D^vb+HANM0Q?4=JYjhLz9ZxZZ}MXWG(nq)t8M1g?6$UtaRi^&{S!
zM1KHg`4cC2zIZ^SIM$5T`w~EYf3aLP-fv9|%KxJrQoiH|J-Xw|Ww^$OElwH3nF&6c
zHoca*+lEnT7lDtxep#!P$6WP8%ilLIz|bAUKKzPYMD#%oV5|Kr;E?(eBzVTr5(mkX
z%ujq-#BbO0*}3<BN|vqk5$3P^Iybs~y(N_LnM>dQk%@nbzW!!-=H`{kde-{(Nzd%_
z2Q%4sA55Ooa*3w_;W&M9;67%H^Y#~)Yq)BR0i%Ptw#dV+7=^23r)dMd1?n8i7%_;a
zOo!k-cK9*D!pL+e3;eWfbZ5Z{J4ntxtlK%zh;T=rNuqhPT`~=oT2u!o4<oH<w;Q&8
z7-n*J?A^I#tPFeHIo~?BpMY=L8`<GatG8;(j>Zk#Vy-!ek9&Lu0rvty00H9xfdm2l
z`yt5+%$i*urLesO)Xzd|>y9?vislE{e|hn~9yw?(E1Tz~-q-u~-9P^Z0sHr-I@^dq
zz;0GA0~fvjR}#RNKJ$TqldD7j`{n<6gO&`^izgjr1w;}A^gmMV^n;OKStK6I$8$gh
zJ#-cI%8nB~%y2<aW6Qe<=>CWku3N`!nN&xnJ5|Fm#o@MLHJ;x_(N}E?Dk?$i9o%F?
zJa0@35B^(`qo}=u(F%7)LPJCi$IjGMGX`=Vit_+=03>3fAzb7Fd3$4fOa<{}U)OB;
zqjXJA)?v(`e8Bz>@sF1GUH-4HFrXDVrZI)nmpacwI(=r#2#-R*0QT2xF#gO3>5a)%
zLcrUG=FXQ7Am3BN!9w-{U6}}?o`;;*Q=s9%!2VtO&W30&9UrWhUXittY@c;3JPiyr
z#5S9UjUl$o*PAid{`|a<EV#$+bcM`}`wmxES^c)NsTt<6iX%~&Mu#xHMN9(Q`m*Bh
zPUpi-9r28%#hg~N4-cg&1j(vRM-ML-XuSa%+OKN@jC)7l5%vZI_Dhy~ONzy$gK(;Q
z&_!IhD2$;Am+!!1wAk+4r+$F`J72$A1ybS~^6;Gc=)&1j)pZ`cvI6`Y>ut@(7;<i2
zNVCnAsceFE?vT@4fn4bB=d<9ovo%k<s93Y)+Csph_sqe=Hvut4mU53=WHr)4kBQ~@
z;NajPF>unZ;w78YNz#~Bl7kgZshR20^^ecGFFxBGZ;Nlv=UV(x0bS84Jk=B=_96qI
zzc(1|0aTdSk7A|iC-!=O$Mp_}yJnZCd@5G#d1*kMOO?54sHYmt(ri~fv$0MG?+jCU
zzeoWEjJ4$91(TVp*!LyD7oS?A12c<`OwN~Odf8iN7(g{>hY-!fVbts=40@~t4lu6N
zFM^RpH;Q=4^dXTymbB|y&XqzpKy-ymEEdGCtK-E@DTH*@?iZ-)<Hhu9V1h-{Q*UZ;
zQ|%7RWle7&S_PR{@DdNo$<!tr+g#Uevj-X2!_rL=nmw$ZB+F4|<kbS+<=tQr)i%b7
zzkT6)`UKG}^Kt%KwS<Gm>rrD_DbF}5)&E>i{VPvMWUKmn+4G<GKJtkQYD!4WZlwl^
zde3pQiz~TvjooL}sk!?I&{<%0GrgCCnnKN-p-bzL2k#d{unwyERR-rurso??q2{oz
zUCjk0YU$z<v|p%01%VL~AW33+w-~Qh#Ht6?A}~b}Vwx63Lfs_c%Icd47{A_<!ac~#
zBIl1eJ-8Bex==Rn+qpO^7Ex`%M@l$ka@*il;|3}&`qL9uDII9AK?(Ds{62wnx(loq
z&8>2~KkBW?8FNTf7!lgondW3QFD}<cBO6fF7ns(Gq1!U=Vx^{}9i@C-s&q4F@L=hq
zR;(Wmu+O-4C^h2*{&LMe7huSE03}~aixF^9d4IsXZ_So2+1ESIlpXfNZd?27dYzj1
zhn(a&GF&l!s&N+xk!x01)%1naFQT9oW4iQ4ExGUmbmjT3vhpK3S+B<iPm2YxC5kPJ
z!4`L=FCLh^@rv2?%0+#%9F^Bs#=0Hoc{h^BuEc9UCP#T#_vtUV_D^zCJ|n(Aa33Sv
zVmDvUE1EI7JtyxrWJ#)W)s7_Ewdb+HLXntqdm<&0Akpj;=|y1Mn+i@B8#ZpV&^<Bm
zl{5@8;>(O@$#WEp`_v9%hE@_9>ucPc+aLcvxe)T3Uk0IIxn}P47E@-Ic1O3)GzPvB
zjxIvjMWYWk!>m4C^2xHjakv`-r70U5Zw$U`olwVa@6eLZ4)X!|g=UnL0OMMAWxqC)
z8qQb6M3Ipef-!P`{oGoY#yO1AB?G!8YzsbWY}yMKjSRxMUB+_kRf&7_f6wtCU_9S1
zk%f!D#S#;m#yV5Xem^3RDuu*gsq=Sa3@y+hTWL->k5K$p%CjT)K<IwFUaTz5^@Ct+
z*u%ZlZ!2_ML$+yf5O#Ld6q^B&#bQDv2Zo!prDqC-$tI`WsZ!~3?r<p=Wd^y;E|`Cp
z+JUQuYWX!RiCkBGaL}Maf?`{y#mC8s1)tJim=dEJvG94la&cfi;pzObUX^m<onUZI
z_DdrOw`@2>AyFVVeRd%s*v!ZvDvrt&>Gz(K-0McM(;;QXv*1}llseLodtp&i0+T*e
z9H?n!Y&7i!P0b&V8U~;o1uuR?K0B&@Q5l8K1>mp}t4QGZbeA_N10dB}eDNKJetE(1
zA2in=Fk-EK%Bs3=zxcN9G)iK)lH1mWGWv<ye=2m+7|fSl4uu$W8Hh`8Mc&w1yB?^C
zsSA@QMnC19#W>*=_qthhX3F&0p1=JD`^O-7k@&0`D9ZH;DAo3#LK^<4IE<r9=qWmy
z)F=#|8Fz=kXI4!qvUPRQD*ctC7W)e^S7crTx=d~J=|#xpgVFVdzyoWyxJ9(GiK<U>
z?o|IHwq-O&hXci@M^}q=N!Ap0BB5vo{RAtEhXMZ(v=a2;a?+%T(`~Ah5M&hfHogeL
zj(07Zc+bw}JBRhu(<`BSu7?~HsD*F)o`i!L+ShX|(TmR}LJCIv_wYw8dxxo34{FBq
zjeV=I{?K6F(u@^+Sp(^P4d}klE<J&<mlymi<3w1REK13NEq+g2w5s?|QH!NT6oPY4
zo~x@QOkH-Fn2SnEstX5qWiO#y(@PZ{v)?MB^g5}-+Mg=a{Pf+pU(LYdp~b)f4Z=Ev
zywdfW&DEc@^vot)a*U4{)$ealmUx-{M9Hy889!@gW&voVPr5Ls+9;6X>e4!68w<CU
zI7WqyT5m$B`10^HF?f4nN-9yl@|6-wDZG}p%Ohg4E3Q#_={0M)6r7Cj0<YA&JB}A`
zh`1uQNm-`PUYwK1XS_aRdakvV^*Si0IouV?7owMic?JRf&A#~R1%95R=g@!dI@fMg
zo|I#0Ufk|xe)?QJQd1DId@kt|Z<cGiDwx_wg#>7IeAKa3i(fq|<+3q3ouW#mxDp!8
z6rS2!eZ8x65%>6NvZN|^C*2B$hF&0{iBNFeW__qc!z6!9JKo0el5#R*bUz%L%^XFQ
zOfMs|y6IXcPv=rq6V}Hkz-0P?IwrCD6JMK}iQZDE#5oMi7LT-<f!otmA*l@7;>FPj
zG~?ydn;Z=(A)S)c!sEfM=hFf_IfWwAR>x?@5xSO)9MS{|Hewqh^aWy(8X@8qpUee|
zbDR8#`ZF&Tx$)^ff^Cj8q(4fHKRW3>GmJC04S#H2)^<W(6H=glxkEdT)i5B)$Z#V<
zEJk#d3EaYsyzFYSfaT&KY=N%;P}PMItCBzP%14k%BpCfcq(}_m1K4log3~!9;inH0
zHPP;Pupc)-YcT}U6~tIP4IjtXsHYNajT6!<&EjTU3(M^uA99|K5_YWmtGDLGHug=q
zh25x&PM3kv;!nD=Y&!~w2-x__DLr7y$|w$TQ(Ru@<?co|(&jGK@FG2vz0)%iBjE_-
z>$C%lO{L61o9}lm`ygvzOQBRMp5x)jLc~HR#sS><_ud123Xz|;AI9QzzxxEcUY1m~
z2YhjJ$u@k7=D$&ER-#c!O06lieam9-ox2Jxxy5!6&fg^_k5N=d*r6$w3sHH|Aw?2a
zq`4Y|E1fORT&HOq=xAzUYr1j}WreU%M;4^tg3HlM=+_Gi7q+hJHyGUx!y?M$YT;Kk
zP{eh9Kxpj^eUUHCCDQF$tpK|p5oE(vleEeeqUYre`px_UL2#0W)T5D(2jGzj?Dw!~
zMkWufzR+gnW4>_k+EYZU0tn)z$PhlP#KAyM6%27w?V&+-vkeW9b1dHvSGMK1anRSr
zEIxzZ%Cg2a<MiyUv<3}Osa0`ijq%-Hd+woZ@eZoZnQ}GKcG~2Hv_FAoG^f4NRRY*q
zLqbx+Auy$l&VR@+<QnqlO_<2b*!QC9xJ0sAe@|koO0+CktgYgsvw77UE?u}j_Oxx1
z&p!=7`r6b`MfY=_S#vF^%H(18#{NvbE%)Y`RP&=#fYlehGh#=95f|mO*s|A$Eu@_4
z8<&nwoqDHmqUwFbJ>Qs!qcHUi_DEZqSsV4$#wipfSM^g^Nvhe%!07Bvk{Gm!lrn{T
zS@xTc6U&#SdK8$I8Qo_=A#VpkbSdGoFePz$0`#f~e82TN5HNUb(68|{fUQ0pd`>Kr
zhWD9`$U}oNKh6jC6BXw&muS>?DA5ixUi*iN9MML4=<Uc~-sumPt!IvAo^0J<CF)vj
zGn1z^+4nwXUq<`GkCmj*H9y@n$VpIyJ8?Mq3n=8NX<4J2H`Sg8Gbs?YudwO21z}~9
zsh`yD!zXhW8_9Fd)rS<qZU6?b8Z5SI0^V(WA2WjVlnLe|nB$!F?JzovhP4+k8Q3Q|
zN5%aHpl~SH@Yo+hM-6@5XbRDhr6C!eV$5~jvRe{^Yvc}C<&G=z>H$#Vc;KF$PAMFw
z*U4o!LEM@=ay%XtbF_`VKcj~?KPdzV%{^(($LEVB>u&|DfKMi)#&0VwdQ2rma;IY_
zH?5ht2Dwd$L@XyWRH!nZaK7s}HY+5zICu59PT27+$*IXSTb53b<V&O>#x~gjY<d!j
z%7ul(r{UZ;))d!|?DIz6Xi|IZW^!QVDn*#Jy}RM;_kmz$!DHQ%f8ChxB)LkgSeaE+
zVzqO_U@1$fAj7~=0bEG-WfU|n>N3PKXcCa*d=aTL`gnVHR$|I!HG8o=5&IU~(Ed$9
zA&4a7Ex~i@%a~~UYDV8`=7*2+iuT}cOrCCU-Ae+I6)zXXI=xn!o)enHR57|I|7&ga
z75eOPlN(2MT&x!9C~G|x?iBl})iBI-st;rVp-y0aG)}EAp(n`mB6Z}myoG76>Dwj7
zVp88?BQJ>xo;)+nLa7f2SlCEsVqSCDGA>#)c;=Kzx7ZD|X_Z6rU<R5+!8=PyU--n(
zF|3;2P_sM{<f1$ZPNxOUtSYYN)qq4Mk9xA$qJr9V%G<;6B@Mw+Sp!t9yxCDERtq7t
z_QFMKA7~eeNg1vQyL?a!RIP#x#)xCGt}TTa0iFJ~5E==^_mXz}4(2j3BW!sGTz%vg
zq{Vx)4hhFS-DN#TQjTDieSBz1JMb0VLs9<O{`T(rN4?l_n6W~e&g1?2@?DIIdB=}^
zMU()$i07HnvizgSf}es$0|lF+#$^KYbV;ABmtgr^gM{cyWmWq)N<-9YkfwMu74S5~
z)FN_WVTAvfb{c7*dXC1ivrt(#dizl`pD%?DYxv@p&wLhnwshOyUMi~PsOeH|c7V4n
zu^GNz7R>B%BNNDd*blh`L(!qul6dsjv_Y;FRqzr_B1mYgu2t2D7>^foM;o-lm&F8o
zNpIh30qpP7mQ8kEJ1V9xXf-@qP>S+<p2^5oyv6LO+7#@_k`ndu&$-6~Ff#Myi_l%3
zB7~PH2Kh>+cNp4F&p41EfCR7|T2^!>MCigsic3h#Z7s3_$LV1&{}O|Rt0U@@ez6PP
zp7VTJ1q~53^_ChrfL;Ju>xBM2y>PbtVRNA24+?Y_T??X7K4`@vlPn_zjfd|2qcLR7
zgoRjf1)AJHxP>?|n25bmtBu6QwT~({E|r<-q=zM)g5MQdaRRmB;swGc8Wmf590bcL
z`Yl_XNeaF%Z(OmMl;B`jyPj`CY&FLEA6ucnn8y0g&j=OYYF<9vERqPl)mL6|2s~w|
z*U*UWI=roWI@U~F4WeQ?o$NOSj4mF!2d+lne_i%0EO-LNP)<{C{fYIPiSoC-!XpS?
zjaq2rwAW&JMyXm_l=P;|rJ~XMHgkS9+CtnguIo@vx+F4@a@*V=Vu+Yop?R<2c(#4Z
zmb2<N{KuU6>%sde$%|BaZ=~O}V0Sn*QATaPgp;zvz*4aH)YzbJvOCOnWYzVMTmB>X
zZ_EVb*Mk!eB(Ur3a}_o@wdJOfb+zNd3)^O4{6`9)pJ|PudJd#zems_cKxlS9@xX#l
zuTA?&_a6lVL5Ly&R+WG^xfZPKe?dkdkm8h}2!+T1^wK|C?VoB%0q6OV4+UKf3i=;k
z?(9JV@n)}b`^o;hk^T>I$`$$E^}g7`Jl1duz9nSxdQa2fA9AFyN<m_WR?x41lwDoq
z`BlHB=*%K6Yg#apdl(P2;#(}7)6ns4Q)zR{#;8WE^;~Q7-rTl^A6Pyy0ceOUdCepD
zsGb?@J@~KM0s#Y7%vWjf440FasRF56PWwbGh10`%wAHGSy5g_V8~+2HxPDr@kSL0I
zd}F3RD0j-Yc^|B7i=mL5iY2u$Y}$fFRLQO{V*4&^#lWzYaA1+apn@6MfXlR0NK_$F
zv0xBPw=}tQ49PV<yvfyF!eEOb?tvJJbjGCs{Vg(-X*^j`EE#**J<yV`f}rJ2Cs`5d
z;kTNm4d7}0n7)rVO(Xeeq4{=s#lqE0--pUyq3+R`AUl%E#(bdJH{7fg&p>kGI~O?G
zX1y-FiyKy8wp+Inj>P@8H_L~@e&K0aG;>o@<lhph(Q3p&AC;v)m61t`z&_EUq#D7z
z505urpxUO4`5+O1?7~D1ak{|7MqQD04vs9n^!4@i+n7=!%4feb-{FtHm{z?WkZA=o
zBwmS`z^B=-wy>}#JAZ8Ycb>g1p}d`T9^n{MRab)`l+povp6~4Q<OK9;$+x_N?99Gp
zIDrX%)x@?k_^L<Fltcgi{JdxmljU3VB%4*O91Hc*qzgR^$ptwB0iQ)9@q46mjsTFn
z-b`@iaMiLwe+XU%EZ&pq7%~{icb4)JlzyDM<#hJIW4ynb69g34(TG!kRfaPMS?nUv
z7Mc1JYjxsOQ^|6z_C3sKXMk!sVyL;A+Vhg?d_7uyoe1(1TyeQIrzE?EN|3E=WQF#U
z8rTx^A$snV(@@X7azmb&?xi)dPB-tYaj=I^VO{eJZYsa-q$10atxC3zKal&}tI55d
zw;U6T7##CJq864>TU?UOazzZhQ)kckQVbY!axMTX?az*d6_!>FxM`up%<DTQ$cDz_
zjhrft5T;n%)qe3vxTz|gD+-=cgDkq471r(MZRj>}M0|S(dzPxM!q>ewJ#Lc9F^M0^
z8H;8;l5doPyM-h=f$tZGiM2;!T)bw=V8S0DYM&^m`z%9*dzIX#IR&&E>oC2+Gsy(-
z1Sm1?N&!NJZ|j<Zv}H9-bbV7}RNaWvS7-_P?>r*87Vm<7VK%&&zcAZwuzCUm-_|*~
z7l#t7+x_<!3$^QP34JzzsZHx0-zBd2%F{s=(j(PwqGo-Jv3c(s$rsNti>fkpd}4ss
z*kw_V@Fj<QhJpzI(in)QGCQ8SOZ&6pUo8a!a_8%-K=VdN9v70{QorQQ9>P0?Kc95j
z&Baj}FRyZ*Kg{Wh0s232%zd_dS-(wJXD%+PhlLP5Vi7$>rGEbk`fI%Y)xchzZ3GAv
z>T)i86`!{<z01M_4oz&Q1W&!IdvEQ^9LTuqY}%`e2Aj$UYv8zz>M=U7bm1w~47%B+
zTsai$GbAJ=UDAO8-coA8$xp%{TPv3==+tmpZIA=OuEjrN>k&>y0r0{noPwCO|7J#{
zq*{8Al4oIstj{6|BRclhvXi>O6SQ<AQ5oYdueQ{Y-63t8a82Te!f1;;@-k7ef~5c*
z`Xx3vvv9ZjJjTUz$-r1OI@0fPT#Gs?xg=ZOppo4_W|B|Rp0sBTfK=?>%|^fJf@N}@
zR`CRla%S*dZ9mdX$RrveEJYo2c`J*@SJ`#}(TspKZMs8P1I;sr0O5vDNdvZD4U^yc
zi4N$SxI)+mIo4}L>KGK0V7r}!8GLaQrw;Vg!#JC7k@5&$kj@vWh<)ic<An)O_m0~p
zlhSb`Q@Pc{Qae0UT1cgLC?oe$u*cfG^jr}J@3>-2WojXi144>bvc*`I=D75g>lSAu
z^@<Ho?jBk%=W5)@+oSbPrJWVYC<*drzPT_BG@GN<jBM<dA9w{PMqd&l^9Avfmu*X+
zP`GzzJFdS4-q%isW<1k$C2v5IKXmAf>xW3!#hUnR=MQgwQ*8RcgZbO&o%|dnA4n`A
zY%tx5%FR)Zj`E4#!UX2b2u-S2w%ML)1E(xN*?XwqQbf5w0{36B03PRmDpY-s0g=cU
z@6ry`jI+jMajw0*5`#Gyj7^ji?}oP|^!$wU&Dw@yJtP9(gz{r(r5O#)hiB><+OSSe
z!y4ud#$X}B6nfVn(vWfxabpqwd8`Q^(RVZ|FJU51^|`f=jeFv`1YNUuEDB@dj74hT
zrgj@b+KEo&k8zcy^Y~e^I36f)%>?lIIx5LtF{#v8cX8sEfcgP``6R9E+NL>hnV5MT
zCY5ON&h-H4<u8w)*MxMK+l?Kv&U&1%*JbwonZ;uF%Y#by@SQ90DHsNAaXXY+u|(6;
zTd1?q<6HHsApApVcT={7!u+#TUgu~=(Lar~MP)<iyK1!yJRd`SHRk)9@L>k+=ZO*C
zo$2h=EOniXofqN5Wm)Q$8!k+vI2L}TPyq<{jzpraMQ=p(fh$*}d+y;&$+knpF9XPc
z6i~g}<SUKG@k?qt&rZSj!f@Evw@~=EOtDZczupcU<U@b0-_~()Y;Px=l#5ABAJcz$
z8fr}M+A|rO4l8vh$quI<0#;(oA*0>JI(2AN(cTV=r%Pd3b-t#51U4c*@*Dk1LBQ=y
zyrRRSyXo5|>&@*^#mzVcp$c92gyWliXr=sEe`ffP$pc$7Q5(XK<erLJ#gK3~C1+?M
z^eZ%NQw~P9@5^#rZ=uTrsDYOQ!(7QEpK9<))23u{)N>RXH}TnAJGy|4LJe(#<qBB7
z=!8m71u6+jUv!Z_@2C01NzZkzq8`yWj$GZ`K~W*gHm>zhWmAM+EUVQUwN2F8V~#pL
z-JX2L;v<TOL&5x9zWz4k+ru*+DD~+l2a>Ps4Pv55(VC)0P{7!;DEO$r)!X@}tDz<r
z!V6ZTgA)OivU1nfY&R}UcPB&#<dN-1miK!XuKuQ7R}508DtVvU=9?-tdy<E$mzkWy
z+c2O}!NIbOC{UpVPHR;ru5!ODxX9gpHe|LwE7<>O+TfGbvG?KBFDFA{P-a^k(Y@Yn
zn@=Eg2F5@MMO?`75_oA525J{4sV66il*HA?@JAGMQ40*26H{_T%*Q)Sk7i1;0lPVL
z`ztirsJOGA-WnC~udVeq_G;*dr$hvK=}ww%Zxe4pw$y;B3QPRDhna}t@$n11S;w&%
z7Hy7(>e~0c|FV{Vv#-@0<T^yfam2=5x%-4VozU8%y!*rA@`HY=p%hNj#>wEQa(*7)
zPec(!yf>(Xdov<u^~CK>Urzm_f~B_;L+-*-<(aTIcGq$(Hvx%YBqXtX#3JMJ@uVO+
zMH$@PPmLEvj2r*3EhldYn|0VPXF?xe34J}2?<BR%EJ`L_(`SSvN8FqBZS`LV9*~o*
zK8AevGtu3LiWc#ta=%|-{TW>=AV0Ev!0IVtD<o8_OzOuMvJlL#%P2({R~;F3s&x+C
zxxZ}bNi@_-Cx|4tt{~;9p@eyWNCz?3LB<xjL=k^c<_-saeL%sT|Jc(k@;PrOcTVpt
zA*IKiU~%kJQ#c1A_ST~q?dG<F<mf7=zKqEpzPBSjdfE4K&bE4b+L842S^ZYnAeo$+
z&uF`*r@?_drpTr8EL^U`r6@}$(ED`dV9u<fk49fp{90CU_Npg1<PvSIByZbZ1S4Dv
zvB+Sg^WhR{&tLhs!RBTQjs)wQuj0H0;rk78XN>f)RJHkmV=C~~A-O(HtmfFMhRkM9
zMEsseyOdVuHJd%}6KZNu4%JFYBIWRi%52lyc=FGqhh7EOj~s+@(7is%;EfZR2Q^~3
z`UX4Efye7*`#JXOeN4}vlMW{4Jff`r1b@0r$*L_a56BHc58EF+W;;Cag<Q6Gceh8E
z$ij#UtiH8Jl4|r9>oB^N8(IoJ##Ot(&%{e|d)j%f(683$_tU9t2#+{_)!ZOk3*>;F
z*sod%Z|QTPvQ#;zy;?In^S^eXwLZJjG+4;yGd&7v4$RN!7@lskW!<xXzU$x8GFUyW
zB9dLpDpC%w!wA0cK;<d?fj#z7_-|_WrFd^gw;NKyd_L=NQBKW^y8R)wDlsyO<z<b+
zQ~z7Y=A;heb@h33uJsH7r1LAo2nXX!@n@3XmK=J*s5Tx2YR_C0OJ3&)&j`l&wkPc_
zl7fj2<VXu5m!aXmQJ+{G%z2@*OQ6nRz`kn3bw{n@))&~l1%gJ}0%$`{%3(<U!%S{!
z4BBp6N{o_(65oTP)g~8_qX!v38$;ph+&vz3>d>1l?cBoqV4~(F&awqn|MBx8$80IL
zCO)w((a?gN<=Qzlr5;Em=|cyE(H3Wkc(r;RSDn$|p}tQ;w|}F+UK*y@T!B@Zb5rk4
zCM3*83_BfUSzC2heLQ3M!VpAu&qfka=2=KbxNS7Z^kVtTNpGwJ%=)=nN872ei$tH)
z%uYT3Zy8tjt+E_rrxXG?FHfco*L@v1!p16Av|DS|%P___-(yxu7?Nw+0J|t#Ut0f#
zDNm>#Pm%ADy)N*Iel7mhH}J}18+X{fZ+1POMg)uenT99vF{oIX8ULV|-<!{zvICG-
zI>gTqNk-|0(}G&JWm1_HNd-qU!*G@&F})FfYl(I`FsFRYg#K_2ei!Cx3m7hIlDOC$
zo{i`UnzC~42Cc>+70PMOm&kazGs=`;{eAgIh@lv@pWNx(Oa0uAHf$e+EONS%)s#wU
z$njL}&s&Qza$2-J)f^r(_lvVP@@ne)!`|#ma-F*$hjbX(?`Ivdr6v}<BRNV;mcnqa
zmCtrI4PTpTy!TNgTQ}CU9GK-%S?)QxT>zIqXC@Y;m@NuNg|YzXP1(6lUEieHp^zVh
zLwCP>zO^^+zB9y;!sUG6c0S^eSJ=iHToZ+O0H^6&%(BaWiJ!8dQ4J$9<8mLDrGMVZ
zysf*lR^9C@TWaL#_O_}tWc2Hx<<E*f!ae$_RVxIZqP|eYbb-khjwTSYsjvExJMs?h
zko;zJkxdYT#CU?oeXMHTdt?M+lr7$qmHB+|dB?P&ZU*%uj#i%pG4@eBBe4RWv8SSv
zkKm|r4&E0rvDou<R5XQn3-?})+MUTRpyz7*y~AGI4ZcNgiB;WHHn-kuVYbYT`V#p;
z-Ip<EY)u)ov67iw;<Xcf_SA5<xX{RC+wnp40Tw_J<<-L0n?wObzco$njIW3bHvr9=
z3f9fPfAuOP-82!e`BI=a+taB$JE=C#br3buizBfkgQ$q?SC7#xNl+H#3~%Fx!!9g6
zguFL-y?+gC2*uTU+EVBZ*=T*uZWC7}>|adm+h1i}xkbvrj`*9qiaWf0Jf69Byq;5V
zbV-L<)yG|2lu3*%ziX=$Q>F3y_s$czI$1*XRAj_Wrj|F~I6*+NtOT(H|8(tZWHyJ5
zDuYq;I}vZ%VR;yVC3x$zWcF1Ws;b+p^Bj~!a-zV@uVN18Wwubz>;PacSiP^{!RULc
z7v9@9p`=Cv;AjTMf1%idK6)e{RLtYUf4HGjw1$y%f5vZi(>Ra>$*)7xZjjYkFlXQ=
zc_F)*htb}ftTJla(G&S{5ky_EpikVQ*myzBDA}5Zuw`S-p~}ya8ASmo<098UOEN`F
zwFs@u5iLu<8bt3H5f4GzFqf8CE@z8Id+#15iMoTRqM>q(PKLC=H90SQ7tAp$3=rue
zPfav?`iTSDXRuyDQ4AQU*+O=cEP<m5rYt>A^Rd0voX~6A1P>hVtxo87mN0Oqi7HP#
z;C)z4G>^_rMFRf^pl-Zj{Y6kAJnMrye(qElKFF&lFXMzn!Is1&Tzo9qRP4?z@#QMP
zrIE&A+ZKj)*7G#xPyt`Y>NsqW7BoOz%e|u^E2$4{5E(ZO8GS`K?xOj9I79t{cawfS
znpB0oHq$i@!Hfz`HaH&DwMt`&g88shs5`|Wy|O3xYJ}D1unE|4qGc0yMF-#l7kp(Y
z<<#~u!9_u`#naou^78eU)4}sa)NZ*PnM`@Sd7u<!jcv;DAF3JnyKod`7XkS10^(uy
zL`@mt*+VZy9)<I2T-rV=424u-%4`tu!cUplqn|!DI({*>!EI0y!I9EoGk&c_?sKMD
zzQGmmw|;bubZ|eDap7fmW*8xG49x!?UrZjN7@ewxb44sj8OJH2;}aq-k3N!z6V>5a
zr8I~w+45lk68ztmk@p3{-)Hyb=DcNikv6r!uy_qg<XtMz3Sx;2Cr<mip$Tb{%ZP}D
zlV7HSOO9976fp<RQ^$&WO;Sj$MQ8Fzbi1^*syE_X&#qqfL9N>HT;bgQILB)|`vr#0
zI(XY|2PZnHj-Mqb+DYb)L;0FkxbN3i%&y(=`54a8h(ng`+JB}7Ep`~EzN^6DoEukB
zYdag~KpO3S33O@RQd)Y**KqxD_-+(l-jPrD-vs~#S{tWIU<=UljICEI4UTA3v+~29
zl$oWUHs4I{9rrYlX;LU5TJC6|-S9g~Cten@pq>r>;F_aKG|%O(!?Kl7(0uZO;9j<Z
zjh`8Q>kYu9l9a(xS5LX!T{^3cbxc8z{=K9B2gm)jy>|k;U}tQGH?jE0$0moL`W=M&
zH$&*JH~z{rviN7oz!0z*M<%cF6VqqheB|SINf2QF<&%FAOlYG&iu$jIWihbN(q}~O
zg;>8UG5!G!{J`G?{*xd7g0!w8AmE2>x$yS?g?oAl|Bf$vFgvI~+kD{y+gx^f>XpvU
z{kwTn9ehfX=LNlPM8to|<xG&CAj<!Mq(Cl7tokE?g@&9wowLK%*cspK3fPej5{Se_
z<2Z>Wiw-9b8H<w|MeJiZaQwNB@RGh~T2YZ&8Gp|%NnTg<dVnJM@h@@QzWC7}+Bg__
zll<q;+`qRB&+f0}Jgg@juO1UKJ1!>TtJ)_h67kCO<gW}OBt$X3VO<BpAIp_#rqS;;
z;CGi=3Q%N4V<7#82XhB1De37AmrTS0AjZ;IZP_|<Z#z}?2tBakjJN(wt&@<5b^^@a
zDe>mMm8Fc+%;#1MD!}U4usf4PSPa#EXLl}_a!WWKanif9Asz&HUUivq|ML1G1c5j-
z62_NUms9-x{y8g~s02%idoq{`MZUx6bZ8iI`;XxQ0)~O~DUnB^qVUe%4CbuU^W@b2
z=2k+@inTH;;Y$1eO_k<0x3KKN?fTfHpL_fdF1wbKQq|QPNE1ATyf+I-Dln;AJ%qV5
z{)^acSh9A5_C+bKR3`(Ehf?9r^V=Mzx=Be>Ia7kvP|mj;_&?%tDR(U8hwlEUb6~ju
z-g!XXLgr9!@E13H9;9Gvjj&tF{tGhppqSg&a3vBwa+bKYiH3*g1X92~wlU`rAJXRO
zD|Z00WlV<KA!B~@8!LuR@$XOx!4W}D02JxV%9a%xsGg6}mWGIQh$rzg<-V1epF+Y#
za*BTAivN_=TpE_x!TyU#hJM5tsu4BE_)<1_dL>l;b#`l9w2=TKMrWz-LmWHHk)f^&
z0$H7+XQ$~lFT)Cxz8GeMBfOjB>aL#M|3Esje?dCI3OH)e-yz+vA&t!coA4~PK#38F
zt+{SOTEpC8aR4d+ZE31*G4Hu{>7g&5c(0jwjG0nvDQqpgDm0#|MmxQr4TnN)ET5R9
zZM1F!L&60Nl|no~`zxi#EWC@lWI?PookRHjy7)m5Bb3t#TI^4wU4_(sqzTE|RbC{{
zkG_hA^{!T*JW~xBFlvF~D1<GO6q2|;(XjXK%rz5wUycZ(yU)b?%lnS6otB?Bbe3Cx
z=$>Tr%veQKJJj$NFz_>GjSZP{wlT<}T2%jnem3Jk=(jzX^1~2p<1;d<c96qna}J%&
z4SwD#pl<vZnnN57<E0hE8o=`Te3#;7uOe>1F^4=m5ExdS5ZeUkM^~u1_aCT9Ju%Is
zFI7D;AvqKJYT7YIa+ux~3RT)lrEG!BOM2VxMxOnE=Fj=DWC8PlH&FzqiW2a*j7+%V
zgG$4QPCeVQpE~RJP5s=jB5atV6wanUMb}36agw~GDB2;{L#A9v%Bf>5r3d2??2_@#
z8-SqAPah4hdWZ>R@?W#wU$bcY4S3AqcrMgnRC0rkc_r87b3~N2oSKtRjT3poWSJ?{
znGsVDv^-b5)MWq1@{spC@7S|HKR?bxShqv25XGma?dzPhdNCmv?V+VJHdmTi1s9N+
zYztcWYfAzNRTvAoIX{VueKt2aa<r&-EqHOQX5OfzpVu6k!m=t>)pke(_`g7$^b2)O
zROXb2SuQL0Vp@-3E(tmR;TMVN@O1_vwTj?<qYk>_4(CyyCDC^ksX!vf!)JVhxI$=|
zjHl7>dl=K9xJH~e&cjcmfmDV@^|!VSHj{i3fqX{W7}XAjFBJJINg-Q)==e*;*X*M&
za;iv(x0h$k+rI>v^i7pt{zo`Q^EVBHLH|X=_)L^&7d5{iiJh5&lXI8xnCn$uaSaQE
zYMp`;a#E)R{=R4dYj)t*xx<Ll0ZP_xmobz91jR1&;HKqk95x*``g-goE?-c%n238y
zrWo+D4WXdmF|$8Okqp-;t?idV0SU45FRRy8T>Wa>qZL&w-?DsoKBGt|kfJnA86b8K
zh43-DT&%QZGYG9d-`CYIg3kzuMZ#@7B$M2g%7$qkt1Ht`0|5VB{uS4YEx7hFN5%IV
z$&JOEH??PVB4EQMCQb-DG%Kcrrd#?i`4=!6?*GWY_#ibryiL$YlTJ0Ff0XLmohZ^?
z-z|5hTTPdcv4y0O`7t;ubJ=8N_a45lp@7cM;cyPk-&B6TrfEU;W1_*MN}%w%n}VRw
zNgFl6M@U$ui`=^S((ooPWPH5p(E^lk>SdC{JdjywoW0qw!oNgiH*-4yai%>VDJ#pf
zVxs_nL?G_yF2iC;^<Lxw7kmEZaed5`LaD(%>r~Uv-^efz>;~@z9z%#h`0<fgHdX7S
z5E>5WP22rW-5r_QmBRNj3iZ#GT~8c@TiMVNw!`rxbT@?UaW?-DFt<BOv-H*VZ~)Fy
z%AxPnfUMQ#04U_XsLrG7hh)=T<#4ZRDib}kSHxpux;sc1iGLv2lgd4?JxjnW1x3Q!
z2@OSn?(?us$zl}{)^{`2@&$8$9EvPzPcm^Cnw4sJTN?9_R;en+c(cD%@3;?1i3!SI
zhn)Lr{Dq5e)R3!z-$E?Zc4PZSmdW<wl({gsDThFn9EI;ouh~XCXnQ5!Y9#iAo-t{Y
zzMsp}n%GeCywh}jUH)m7Q!^6CPda?^Bta8g2Ue>sxuV2GuC`z)!(p^?A~r=<-D;O2
z9XIPRw}eju{}n<Bb{lG<FxA)6B?qGJP_-+G4IahNW5RgMlw!;aYVJDx`2AcB*u{l2
zd3?0T8DZ|+X<7ZGU&FFTi}O-D7~J<Q6O92)i~vbx=AlDQc_sFj=ZP14fK8+Bg7tBp
z)pZ>nAy=Zj<FAN!4jbc5Yf~}SR9}>KJCw?Gpcvf)t`Ao5D3s(DdXPoo9oJ>%bz86;
zp>&-l=o3z7#L#wkDUX&t_lMVSo;Qm*194)E%O}Dx0(?k4WzuCSx6!{v^HjSeOIduc
zb9e!dWWBVsu#h}$O^>PS>kKzlo+sprQISkj3!|#7FE4a8I(z_#uW$s~YW912etpeL
zVvhh};o@+22%hdK{fh7F+u-D!8WLZtCqDnA0Fvcn^R+&0T{u$D$A?dT4A38dSiD&I
zZKkfE9z?_Kiba<O?~CPQhtlg%07`FOuhG8#hP}vEu@J)Lb3v}>6bl5~Z<|vPa4((|
z@M`qJp`FM$e7jBT3S@EpGmoV6L8t4po>;YDd4Aj?H&JiePx<Q7N%>Q(SOqvXFn&L&
z@?t!n_XJA<PMA(sqJ#6NcS$M}yRxQFK69Pz5-C_Lgq%RRqg5BY0AOJ?g+hiTh!t`n
z^A>8v&#B-jO!gMs^NeaeJx>x=og@PHUg#C64E_F%rdo{$!eEC<F1&PEkF>QNC}rQC
zt%GG2T-vn0)2X%gA*oykmGFoN<x!(YQ(T*=zf>n|UG}AqlJ(JmT4+=}tapI`h)~_{
zpuP&YJqPwaUeL<QKl4xGtJc&(XKl!xAxIF9iPpb@9<e<u=H6#Ue9BoMt*fL~QYFlJ
z-yiV7K?Ooc#=7Q$=N&X0Ze079PpND&VWK%Rg`3S02b`Nd&Vk9ut`8ji=8MW%pV&O<
z9n83+*@E8vY2$Bwj=Dk7vfKI?odH+3<Ri5VwX;ns?WA`tR&q3Uf?jU(it>NS%<SL)
zUotcO0!KkC_Ww&}R!07(%*=>doAC<BbM8wwcv$BdFuSy(vd0JPBX8De7G3+;Xc^Ck
z@J8o2wN@OGG{id|_Gs`{R%H@tidYUEeGv37T2&=luU9nlYZeAb((jYlAky8u-4GuD
zqXEU6A3FAgELFG~+1Z~4``~6CNbMdr5xKNtJcHZh`~MSN@eYaBuX;ab=>B|{nhKw0
zOa5kMwjTQcn6oe~p}=Nu4@><xG)E~NdG~GB#%*{0s#D2no4I1X$>AZ3LQ9_VF>sGO
zBzSCDENVV2`u|5SHvF2PWOP~Dr$|*5=7Q<!iODLhGJ|+N^L+6FZ;8&?e%oIXg4*r;
zBH)@_D;!Zr6F$*q-F!myl?@xN&689PG&oU({rT%EdU44#hiSpK`ADaxgr|_FhJC?Y
z)4IlPR@t^o`|4d6wQ<{@dRCxS`M27P$$qA+pTn*3K(JK=c9o&8&REyWENBtm%y5XR
zLR6=x<9@^dfxO`t;(35I7uPjkW{oI?|HVyK{^lkCSq(u8p-5q$G2^<8JQx3X<CbB)
zK=_6!Z<d0efq>q<@P)!}^|HW=gp<Dj+HC^IwCQ8)1KO;yJP669LS1tp^B%Ocd*z81
z(&SRMbxSt`vRy2gbO%4;FN?Om+L3^mQtElDyq>d{!m41ZD9<U?Yc3<So|ObrDqyqu
za0wP5<yVp4%*#%$=*y`{@{=J6QE43f1l&TS$48boZ0zJ@ns1VPwJkY#+%m32#JntO
z1XDFdyd5A4xA~<f6F&J5JsGEJgkJ8-B{xtA2XxoaiB;)UDyl>F?Bde!ag{Phx2*ax
zM~Fj}=m_z@v^+e`zdX?*q!CD3?;AH`wO)nY6@y})G^DYN+=lNu-V_{$hz#V))#tR>
z_J*}yYagEtb@YZnG-Ncr_=a~%E^O805_&@T^2m7zh7rZoRaDEUh4zQ?xI*=$A<5vp
zUnSQrR`l)ck`#@<KXR0e9#^QjD<vfSEP<#X71Gk$=fE#x4Nu4&<|9*}!0iQ0-($O9
zlu4*4GQV?ZDst-!AB(+DE7nxa%LrU~e3b2zkknV{GX)ZxnAaPvYW3K`cnzdH**VUy
z?=+gmv1~7_`eZ9b6}||R91h_LYI&}%ITD_R^a|9Fh#cm{p&)B;v&EB4+U1G1ji=V$
zRVo2hZIb(y(~!S&#9vdj;xFsiX(y%Y@t5$d*W`Z*&&Fr}5}pN4@_cx9lPpWg9~l3X
zcQ_eK*Ih{yZapfpfNur;r{MuKx~=ej`R6To_`00L=6I^jKcr{7OO-F6_gc4jo_Dkm
zX(bEF5q~pUuglrPWH&9j!*LPXys~=B$~djsQi=VkeGd8`pFB6mk1FF4=;l~+cQu^Q
zk?4KyzZ?vqeXR)abX;X>^2e>Q6<ClAnXR4URQwux?{?F5*4$5-`ec6SVMOse1Nh6D
z{eFpn@cyv%!D(S3&H0MnCcJI2`_lB*K>j$xz<`o-n04;Bt>E?B&VNuAZwNo2^&5Wb
zn-V$)v`~;1wzolzsTkk=M}C3&92##{9CB#+wHXk;hKd!-t*lsdMyC(pe{4?vdZ-3=
z%R*9VeKB7A|H$bt2m?h70%q?6>g)Vp0FiJc2;}rNEAM}UM@ip-V29)r?SI2X-q(=g
zjXX1D=9gxV+DbAmr^{37E`c=I9~WzfTzC9OH?JGbG~}6YA`8rzZw3>Z_6YUce0!cU
zK?KO+RaQvuJg2hW|5iIrl~CffJXDsN^78Di9($9Q{MdUX3Di?mVo7nNPyGEml0v_z
z&G+mh5go0W=dHuZq2|$*VnPhP?0z}LKC^m}yCl7Oi*HSqAzrd&jxH}7w5C58%3|o*
zS~p<OAD?KzTO*EvTXI#R?LXMpeIFz#abx~3)fgHo_}cyc(0s^#JOEy4^x?X~bCrYn
z1oxM0%>I{bOaPT-jn#_K7QRo8`D$^J(t1od{{T;~g#>*1AAiPXA^Mxnfi&|H@=v&5
zZBH$U;7WdJzdX1~h(oc6r(C}LL6bUJzJ1Sr|CfWJhDgf)*WOu2McK7&Us0q%1q4YI
zK^l>+0i?UTM5G)-a%cnuq)R}$TNvpErMtUEx;tjb`3AiWp69ur_gmk)*7w&fYq<uv
zu4^`XpSzCzJI=ADBy6Bb!g5c1d_H-vdm~pbJWz%9-aJiQ2YdPrk81I^nye^}a%VGV
z@J#dZQPrrJSw<j=YSuCi{_sW<@-WqCO4%Agw~koZfsql4^%c2IS`}$Nb}mm>VS62c
z?Rmf_rq|at<I29hc_G9wI@Vm4&v0SRV21D>PNe&t-%=T^AbXNfK;Oib(>nTjlflEB
z_z+{jLpX+ze7(%pRJ!iPM-l|))$d1Hs#*>)h>#{u&$k#^E)uS%%Rs0#7b73|5ps=0
z`29Gvp9Vi)!IF4x0XvQROxwzD57lkMW2$~z`jBciFVz__Kw6qP*~qrB26?AbLM$_6
z<bPnirthtqZC$gM_=~>6V~ZsWpWhVBXldE~`rgwG+@0-bukEiZkfVuL%E~Uxq}5(h
zW({p9+bPyEql<p;xZo^^5PBrsblQKZJNu(%9}hW82I2(&q_CWS$~#P;%<4=tiTR@~
zkKTGRElohnSmmvhb(C^kJO4`7;i%c9fs>&A>bR!H>wosrod>ra)=HsrNq}*v@`QQH
z6?um*wtOtHV3<*-Yy6|7*=y?p;GS9IUTHUMny^}Z{2B3x<HTfP(IMhD1MAwviT&x6
z@}|bZ-@K>o1IE|BMG~(Et}yc9qN3dQV_n!2GhiiqgriYCo;-N}kz|YUB4x_VeFdx8
zx1&adRh%@dg|^KVi5u@moc$IN2E1n7T_0^KyT?4{Um%nEUxlqdGX}JqEwg@R+e1qj
zFadFs%Hl}i5N15O9zccYyG|sx@_Wpdr*MkdBLpX#mm}!%K-O$?d+McHpOv2|HW`GO
zl)dT}6gRMU;<dPV!)%er4J1Hb6AmMh!+Asr!Ep0!&Sv>|48;r-tRPW5@YD_nx0zE!
z;8SO@OXJ-~rE>RG^X*F`%Gnc3A<I(jP)`@yEw`9;$wU?OPI1%2P+hDdi@0Vpn+hvJ
zJrgQj(T<1@jVUGJ&?ldCQ;80-T}V$#3N3X_YH`(~+c~lqbg`?X@8sGm%7kk7Yq+%0
zj$RYLvLc4vLVG-%B7qyuWjy1b)G&&Hj``nAgij^jQuS8NeimZt;0%i6O+N{W$Lx<V
zR?qtAb4c1w{=P|GlemZIjffZ`fxEAWdRa6<wp+A@L&*{z1`t;^!a+EdrWl3ip~m%(
z1L5yKbEG089DGG5_ak;b$eJEn$!&;>z02p{3Y-3mn$lO8y(=e@bT<lL>#=ffBhH~9
zXyJ|?ecZF;q4CNQVTC~7$7FGojm^xydL)ZvayYT?gO8-}08ppr8-nAyp_X^}mqL6`
zDBbhxWF&VdlA{^JwCw^CdMz-@`5Uu3pq^&0{Sh@A`N=T-S>=v5W!?Bgg2Is&r_Gw!
z=qEG~FUhS)|ItkR0=iPVkKb}TWs~=CQHDfs@oYEJSpav}<6t1}=e0W+e@6M!<I8iG
zPg$^gvQqNO%pgn;1mk2d_vns`;*3!HKt!uABiWSUop5JeH=Eljp0Q5)$<pG4r<W4U
zbL#q{!R^L*un%MGT8diV^juLbEMV$8;PmEV*Vq9o8o@UOv*8h>ooTq{AS`jRwI=?n
zZmS8MsF8i#er9Nw%8T(MLj>D2{hae|WD?I&#EaLO7TSg|+aGjO{9klaKZ0%weW|bV
zS}~k^7x5`r&Z;z`O!kbQ2-=c&Lu)Q=gr3(|?_efRnHE2eq{8^F_bgMeDwfQc%weZl
zxrSn;G<4h&OvWvia1tDOR&{A?JcZl<Z3)90K=M6!{l=YQj8gqC4+pl_Rq00=m~>e2
zi`7uof?b#%Be0_?$y-td(3~T-NK~wI9w_q@%S&6IX2l6AmxLe!FhjAg1rR=`%$tN&
zqLkDXD|&2*!6|a$?o+zB;^uUN?UlWKg5jU*h`XuETk`|y1&scj(LE#(k`2j!m293d
z;G;{b!4G!Hi~Zzs9^SY4&%n_p{xBnYu(*s(REuz6X_7D3Ergj)rs7~##)aE}y<U^1
zAN`UyG7T<i=yJ|tVlP)&t?gN($XWtS7gauUUpVuV=0p*B`rMoO;9c9}dfIudQzE>T
zK{Yq&!{%4*iI<cR9&qB-sMjTcG}aux6datLm2w-M#wePi$<!7Rz(55{xN{MJ|A!s%
ztomkqBn1ScT~SF-4VGp)P7!06TY(BZ?!BuQnj@aM_O*^f_IxeF$Dj086(~!uxRwYj
z$x*=tM6qtsAuQq;usy7}SCt;vqLUlTc7vc@N(1v5VwrjESNu*r`OXckUUEaPSgl1B
zjE4uhAu)i1^3IY)?O4OsIGHdWxt9%0XcTzD#{p{}UMibC3NEt+>lQubFxFVU5Hh|6
zUM5i6<k|=gwDw14L3=ZAGH4tv-r3bbVNK~kN2`d$Q7|jECLL0D<n_)*!frW{FAhk6
zop8#>aR0DlNYm(eS9r0J)Z64>Y^z0Q?puz@%SYmO=f{s8{AJ*43nTks-xJjn_y$F7
zcYfG;4_{MDZHSNc@XRoCE1{7KJYUaG23Kri4Hj5ir^U}pk94j_|7MD^$ZXL0a_K<a
zf4udUlP-WgP=45lG`E1S6nSMXuKvFBaUeq^?NW!{cxY-x2_aT3eGQ|j_95!?MEHjT
zOInK1D;A2UIcR_Q{Vx2bl#jN2(UJtk;Ib3$bp88IKg5}hbc8s=NZTBa)n96{>Ta6f
z;w9KqEcV7q7Qe?y{iBxO5WhR`vv(3^^W(XJDxJd(2S1&7&nsCTYg9Bz!wc2<$wdAA
zlhhvtkj?Iu7y<F0H)hTF0eF_t8DxyySj81Bbo?aLen3FOe?mYo;Z5FZFkaBnHh6k~
z82ssp|3ZaR-zl;isX~qD07gaU>Pjbiut1S6p;*8bc*hRU73xP%RS>e7tUMZdHVha^
zd~Ec^3A-LjeUU}cV)8iSp6ZNbz^jsPV|`y3*S}HITCkIu2&8=V8sNBT!1Baj!L)=(
zMSGOFRxF-#`>D-KCU=}{8Dcs-gbvygy!qrAiq#*B-fKuuwClXf%>QrZzoc)KBwiHd
z3bS4LbR&qpFujX|?r>oLG`OCDCrr^+rGIBYW741nUZpZnqwi|SOhoDe<mt~^+4$0$
zpi*isisSSNYQ4(>pBfivdh%puXPb$KIM<)}ERnp{@c7%>%El974&~)}%eze0A`-jr
z#EABWQ@O?<_27czFB+{8VsaO9Gbh+8Di0IKV3TbTtj20PFU=@F^pw<FPi%?=6u#@u
z!qJrUsXrU6I|9h!&s5kE6PR$`#y$%4!9zzz57LIJ;~-cT-{?AP!`6`|-~y|rum&$!
zHNvHCveTA*l67XNi)&>8V?k;Xje;wYj3j%T>mKjt%HuCwS$jCGw*WEqE}La#RShZg
zofWIeF1X=`&+QrJ%x={+P?S41_mp<x=p3iM?C0lIQ;=@60vo|3=Px3+ktHstzKho(
zd3Z^Z^lASWCO#<xTg!M0XEZr%F`;ep4rPHk!zcu81j_qP8__tDvwT(?g!JpFO|RN9
zIz&5~0L63=w8($ZWE`HNUUD}@Dmr%SyShXcRd+1!dO-uN%qIvR5T}-*PR3Yc#Do*>
zGPxDsf7fB2@35%{5F#E_C+2t=-iGoUx>=MsG7szNA69SMOFx^nQ@>yItl)D2INVHy
z_Hno#xdA>qg~$m^#P+yqAmN%ckfFgMqp4`pD7ont^>^q-ky#Z}7~1oYvi*+E$C6Iz
zBlw$n9g}!WfHtFrW#|e!83MGo)6VEbvSD~RXnKcXOTO`#;(~&cJ?wGumLR5b4zpGD
zp)d*d31Ncd3d*r=sCn3!3fhgKfk?6%Gw_?7(-kLT-Jz3ls*9oz+sFu3CSl6X8+1d`
ztu(775TuUJ(MDP03CIIf0ZK^P-{H+sAYhrQ3F3Oy(omTnmc+v(x#(|j)YsJn;NdP(
zK`;%svEXNn`m3D>_mZrp;0(dlb<y5!XL3&m&<VGnGiGD40+vo8a9W<lyTvqW1?%8=
zn<XZ9P1g$+=4Xa)3#gd{9xm+-!!*+Uq+a?R%9?K-SFN&fD6eHUvsk!HL5%&FB>UHX
zxb*r!!p|-q5v6~~#SfWlR&fa~6ls<oN2ZRf+M2z;(&4Qul^V;!p38dkgvYfN6y4vS
zVwmBvy8Vf}xZdJWN7I4I0NjLxD{39jC!RO7{|3d~m1Y<D!3jV6)8Kpk5a$w-6uJwk
zD4@Y+FpKC`mE>1im2SNJTsn6`*K<dANEnP5t#kg9M7R?TWiw_VTWkkqe8HvHFye^p
zDA%QB6pd82k^R*lmJb9w!uwN@Swt>%<JBD+Nk5-?nTxv2pv<7tQ!+1@&Y)?{ZH2;d
zi+TgdZ8a=?uT%2I_|fq4P_C&z=1s+1M!x&F*r(xG(lYmYzvBEcN&c8I1<(=P37$Je
z)Uef6afa>9Z*gWz*W}iWq;ObVi`oYexWn1R^iQp(!Lb4^FLy?j3+<E0Ci*w&;|&Mu
zD?0i9ogNTmMx#Vsi5Xt#Qgq}G&zprLfDGB<n9}UkvF*3@@L&t#qTXBcU0pr+hCDQy
zgSt@lUHXROHE)Prh=wv0VDX^h%GC9JzJLEixj9B%?26c8iY2=1T<W_xx*?MQwOCwP
zU#-*1+#==)%<%QIP_uzlU<D&x|JN#5xMCj++Z0}qzGBVzCD3?O3;fC6Kn@&MbWHAi
zyoPioj4!|OI1NL{LiosQ=VOFB_y4U%uH7UfK}a#=@pbQ_uKiniwt$yx&idAk<*TPC
zmr4~5Ho|v^BdhmZ>Q||L-4A8+KqJVmDwRo;;oqRG0@DPII@UH4V5698E;?WdIz9*u
zy;N(I8}Q!Wyjo=FoqtI^g^Kv(+5y8VL$rvyh9Q241mh*#L9|pB1BnZN={5u0sKL`(
zNRp*9tB1agpFDbo?sP2d_%La&Y}eo3;jR+MFzUeByQ*4HA>lH}*K@8`JDzv;ewSuc
z2mcPXdED_7c=s5oK$-~YbzCdNedTy99O)fijFaK3p0eR6Oq@h6t0ikUiA|5<p3{W{
znM^G2vn#CtLBD)AUyw#fuk+wUBUQ2^LXRoD)MFkns0>BM=|vO;QmBZEqaa1Z{R?Z;
zHOdGSQ~A2{ZwaGf?zCauyi)H}SRPhr%7^|=daY$U*k_}EIqrOK5WlV*VJI^<-?aql
zBRqE_R5BYJ*;OrvoU68m4|^o|>U_*C(aa{Z^+NCACv<N@i?fonL^}YM`Wo!tpevMm
zpaCKZAtNbku`k9fO}yZ|Lsh*{IgBb&)oKiPQX=f9J|FDnoo={kYc1@|dL34qSD6TE
z0ztUIsaeptOkpvbP_}@%9ip3!hE<8q6pgGMIh);8DjDuR(T*|+SX@_mZKh3ZRV!FO
zYBVHFnpuLm4$@$i3>qi+c8=~8Z&b=Dqda3hB=32<){Js+qC<yxvf+o>&FB%s9v555
z#8PnI&R81jf|B2zORwKC0P{0h03-J+>R#GX!*?ZA)xG4E0QC?dy4m1Y;{N8u#PVxX
zpOS)B1=EK#&#!~SP`ZEl-?$u?!~69&w7vQcy(U4{8QGZ=&q%2AA%wN;6*plhS3A!X
z=(lk-vTXjqU-Xe!IXh8qUbhS}7tO#+=PK3e4@veskg=f!?a_sCpG9EYZZ)%gVUZ#G
zr~Q(01H<+4p@sC(N_O5f3AyB#-tA8VeVb_?{YvRHN5Pdrk^1CkN+&NwN~g&F-zlAD
zS?>eCgEbHD&gVL$GV}0}aky6yaxkr^BOGOH@mwPo>?^iD@2L(n9P<%}X&(sfyDqgF
zu9d<jYU9Gxinobq@4Tdy-#wi0TMuq&8xHv3#AKTO-QsqK=sQRAJ{ZUPW#V^?rnQsk
zI24haB0kzGOJtbd&3yNF@~Cz#%-)IZ{mKK`*~9CqGxzAr{T|?*iUaWbT>=`&e22~K
zcGPvK?3#+`^YEg=2G$<d61|#c4;Wv1Gyk+sUAiXl!;|}?XCIX^B5O)tWNgbHU`v0=
z!q>a`=GgS7<RXb$B^_2aDZwV#@GJmF!+_TZ_v+ZWBXj2m{kh*&gP#|Cc*pSV|A^Aa
zAW#}Hm%mV&c!TdK&7IZnD9r;azpOnrNu@|`o;ygoTFL}KbIwNy=h}Y+W~k^fyZ7qd
ztOAwgl;0~oN;XZkKnf$2EYrp9?{_mOc`7ILM$7aYa$*uQ+5?(=Kx*6q!@j{chZU_q
z3}dOosm(pc<=&G?vq~aF&oj8`^F1vDO{`v$6-$1QjNw~o7PjSkB`Ni&LH7dd9WULn
zlL{39dlPpW-+Q#rx;)^eMTrh*a=0_YT&bzIl=vpP=p>!+%hiM+fkhPf@OOPhy99<W
zEif>j>UcGfuX#v_BN8(i)ldiYW&SU@89&H(ZYGeg^-rUfc2x8#fUN{vP=XL+v`z_H
zbISGH^L=$6()iYrx<d8JQIEeTLy}Eubo4IxN!)aU<*BW+y8RQMV6|VuG4n0OBI`k!
z`GcSRCd(~R#&6T+m?ihUZDX)KM$XmYG^hfJcos$Vmuh|OgV@{vH7N9EE>K%%z6WUi
z8ygddUROJ%D3JEumbUtrEsY*I<hIQ_l{w|b-Zd%wloW%*X(aK?(+toAws}Faoo%nK
z)KE+lA}i3JY)tsx4>pGSzpybOO#maJ(?gkb_WB70d?N0P#*?ke6DqTBs+po!xlF_w
zi{$1Gh4bHLTsnGXykQa508G88D!^lUPh=Aq%Cb~DNDw!fd!TE47^Y;CWHGKC!*6{d
zYy`*)wA=*BC(G#_GY=Ce3H^Oyq}lk;dvg>{<wGx~AA!Wv*FT!IuV=honwvJ4|L)*Y
z{_f!N{M<TCzUQ{^o=Qrnoq=L#5}x>}H)Nu0WQY$B4iG?kz$q$>JSg7Xh>e2KbPo4^
zCP)hTo*-#h3ZLL1>z>9-yuVjfhQ<b3UXiJOD2M4XP=cj8Oz2@M#YQiP9b+av?p~Qw
z1ztS6E&dcUHdE^|r_#d@{At<6uUD70rO8hw4JWJ_yNht6g8nc;6_ISI+mkrckhpH5
z`1Mi_CpaIO73gr<Zb3_4HA%Nco)O4V^Gzwd7Y*68n4%1v6|wo7JV=$IEJlRrsb?Z~
zl7*pqm?B8+YleVIkKu_!T;BJ;(jc`E-QXxdqlnq{QFzvA@T^4???1^Y&)B8xji+E6
z2ji3j1I2sqF|lXn7R_l@2f~^4x7Dt{L+{ufv-YIm3r9moSKwnJCl<|q-H5F+nmB=E
zyW0&3taW);vkKQerXyCwi@ukZ674-o8I(sR*tVY(ejx)PS@_qrRlL9vl1k-SnBqIx
z_<8*IIUCbBxB#1wi-eM0)km)3Vzfz$4={^q2=FpPyp$*_ksCh8D7Ir@Sdf^F=?>12
z#xzKpyCESeQF0o4Zr?)p(_&QqSYn^?L+2^*grmJ44bdh<uR4Q6cW~CR9-+M8zc{G^
z73dB)x#3w7JrjEKv`6_?mbTQTQ!7~H(y7Hvs|AK)&>IDeUJ5Z*k+iGXLyM2BkuR(O
z?V7=z#31f0LY&#@D&76B-q)j~Xc6`&heuEt&QB9py2wxI=3%UKVx-ymjS(Bzw8$<$
zDYIy?!fXA*PbK1_7{ORr8%5Z`sdGm29=Gs_c&S~5p0eAd5=M&VDKy)W4mvma?PIe%
zIoca7{F&EjW6bT5&25x_Sz%FnAT;PyV$k~ov+U`6E_1TfPsBVLDAM#ab=)oL-$VjU
zQ?^#!KgBy4_e;|YWexDlM@^w$te%YnbPM17tut!Q1aJ25+(9ItuDXL#mpsEfIV`4I
zQhsJrTK=6)NrG$PyUKy9^<Cv4K2FCaXIV~;U<ze=<UT$wuQK%wdbYyQiJ~TE%s*a{
z!cFeYsK?u|EVai}7`?{HvtwnfVjkD;MYdk6eb&VfVi(tXthN1L%}ywbz<Xm&rw@T#
z0GkcRZ*;uYacUdd)n|Q?OtkmT8*T8Ln~b+qM9g~H?t{Z3`a{zZCyl44&|x-m&UJ^q
zm3DZ$79=H?wh7nBy_1ghe_>GiD>2l}(D%epd$NWvz?t=F^#xUf>)Jbv`+Xz9RW7!*
z+uk|@P7g7!HtUuc(r(_93^O6MX{Q>{`#6iHxTbG>2HJ7#x7vKN85-;}ryBAfi=G8Q
z%x<MvYtiYRM)&r$u#U6@-EKcgE^=(od@yzA1wtF5A2wV#Lic+Ni&rJq%~ez1FGI*5
z*j7BG4mLzC71}N{9~lI~l_e3_im<ep+dF)v$X7P9rr{xl{>1)km2AG0Jn!Go?Vb!K
zT>DfQifnY;xc>RstLp~(I(p+yR$7<Yj>d+OwNMet$QryH1n*awu}l0y9($Ym!@a8h
zfQ$k5(!x#>gNQ_rn2&c%Jc?J4oRTLu8|Jt^-CX=YmSIt?BrnQQCM4$@?B&&9(o?84
zL^iM49=3HYUzx?^zV|(pjpU||Z4>$uacYmQ4I5l*%L<7tn?{+$%tbr+itE<COX4>4
zv}UW8tLD@-aoIkxh5JxSU#j-vmYH&AEh^Ppl55u}v?YWEl?5o(qR%B3>1NHHc_1g5
zTp$4P%)+q&`4;DF<+()_*!XpglOV<E$md-yJ($}v(>Rrc+xdnXPso#TyL)+UQH^@)
zGUu$oqE#E2UKbkIkY%&*_CyMD8@CTNrh8$5deIV_QHzXqO7%Nw3l0~xrgk`x&^7Xm
zI@IN0vkh*o#Mcu@*O6|b-hLqP_L_$vZD@>;uWc~Plsrqy8+gb4VXTC_BEEXyKuk=A
z42rw`e3@QmN2Y3z)7D5oznj%M3W!uLKT!Ll&Av>U=e{#GNe3^G-MaT_9=-ZgTF%nt
z_HE-0o~){q%m=V;FuO~Ar>)Y{!#v|et$~u&L5>~?xk1EvLE>^$&2}sNG#KZoQwG?P
z$p|afYM2~iJ+~EF`e@A=Pfs~(?#J&k_@1A&zGSw&z;~!pOu63Xp7N6h{nE4C<!PR{
z)mg6GMKb$UZMNmw^2ZSGQTM}hgM_@3%}O)DL(*mnPe{!{IYDjn=BAjsNKlGdk0*}>
zEw*NC(&WyomSx(h!vV^O^C%gH$%s04>ml(fi=?V#r>QVqNbMVCjv$j&t1mjlh0<@Y
z{Z&;jLeUOlg;*khO%)Kf)x$S#8}+U*jBQuYc&Yy8M`ZWCEaxTP2qTc|!((fCK&BfT
zSLE2iK9h1Ujg)LvBm-<HI=naxJ~K3#K9bCf>GcRv_dgrq%cRf)7GK>pw(Qm;_kHMm
zRL%TEuiJ|b<H2Y7y|rgdN$b{;rcRwN)K6xsEbDfXqNH<S8z))SfyYfY>*UAU(3qmH
zPhS{ZHs`NLE<S#fbDfQI*Y5;=>Ia0JM{|TQkS5lQcCBa0xwwupp@8}(_x<>*cX17E
zF03y|Gq!8Ext4^OT+eN$E!v#9YR`ise?1NH0+BxrUmn-M7v*cHaH^b;^I;za*nX<G
zT&}t{r`fp<-j>+rd{mc1F~s$=2$y#=Vt90s#9ojNrOcj(`)FIuE-Nu&V4z6+E-2zE
z%S-`LY#HRCOd(^><ijy7bHG7&`VhyT&p};yh=@|9>ue$Ho03;<zPWerw){TT(4S?!
ziF)As_U#0@|HPkFa?PU#`Q}g!8rvV$gt+Vc;e+HO-&FP=-Qlk{ePDV0I-BKltnXdq
zXF&wqQBkwcQ?jvs_MPv)Xwwo9=#G=W@mGKPad96x64GmT>epUZiuF%XJsNuM-Tf<w
z_DhYgROExFp-3@YtbAVFw&H~HU}~bao>G~sZLNrOpNkb=J`Otp&2z-SSJC_4l~#NE
z<r?~{r9Nc=(k}qEf4TJ$qV2^I|NVKxZA6q1`4$2G{F%T5MFD}J$BI{j#0t^!R@CcP
zoAaMX{?R@D*L8``L-$W)e2=<+g6-#sdpUYOLjET*ehyIoM8-dn@y`TxWliumUE-fH
z<DW6(Kd;&Te?-O*P2G*LtW31q?=@Z^lC)_!#XmEYjLK)f^J_oiP<&I7CEIf3+5zHp
z_|HKt90@76_xhhdLB&MBe%(&K2J4pKl}jCUyfjPAgu15&3f^ZOxdKN94s}LrG&(6&
zR5<h;4fjX#t8K^xhxaC8$0>C>wTL)eP5NUIjI*}x-i{AX0el{G@!C<xpekce1W2Z(
zuFy9!au4q&!>MYw=0xZWVXI<Dnt$5-Cs*x;?5KQar>%Di)rqjKy@@Hv(I>B!`4%Zc
z8**oP*<WS)wn-nVCb0RI%kd4opTqN&khixb$+-cxrph||sI<xS{%XinwEvw=4d{ss
z9e+t?iYrim9@3?*3>jBF9f<?EIPMDRf6mjat28=#-y^fxo8S8>zK}a|EtAQ4t}Y~y
zTqSg>WNy%z-F2~!Ehma`f?>XS)hp<<amwMsrQ*Ux9=0_Qu74lDwtgdVIHJ@%NUz4G
zf8;=SkpF28tHSNBI-t|^8e^UpM{HbNPkB5!m;Ka=er+wq;^1;*G$v1po53jQpv-dN
z&}8<WNfEhyHy~G+6}>S@g4@{vv}Q1jGruB*8_l{@XPb;50sh*$e3{frF6aDks!+~*
zsx}O)?m}5AGS=7cb2^K(V4iDu5iTb}Nv>6#?dE76Ju(p+QVy~?_{P6IVYhhPFfiFE
zn#5PM-%R1%*h|7Wp}~3n^#q?q4EbxAE04RYHSCnGv%?5dzcuBT0VL+8b8?;0QB%^1
zp3p3^klJ)s0$Xcw7Fo(E5t=JCTh<K3YsxZ`z?P%2b@{eJ;IM>%=Sy1?zFQXjeU$6$
zkU^<vmCoq=k2(W2`{W~*HQCJ<4*mPtCuxf=6K(9ds6k=J2XVc1j)7cB7Ms6g^4sR4
zP;8}WCt+_PFoq}K*3gD4rSVg*<chg89M$2>Wf7%Q){%TovZb~?J1sJDD_9l|ZwY%T
zC8{LZ1uRfOaI)tKU|*nBB2lF?sUU_=f2-&iNPO~fqX5HnqKY-4@#VT4c{LMI)l$3K
zMSpbGs6+$r7F3r^Os@Wph2!CuI^DA6V(yp9$E*phb>pIJp+t_DTy4OvPIj|I=lR)4
zmR#b!`<||7zcwN@k;qOm!j?yZ-s5kE0u7V&ra$LKhXqPw*S=X1(dy)P(MnA&-HpLm
zWt|%NytG|DUG{PUhC@#Ssi>R$uqna=Z48(xb{dY&BCBBw?8%=UZ)~kQ7dUK*r#KI1
zBVL|zveOFXorWz{>V1Ounm3|ruBlDcvfHsP?vJ{h6!`C^HF}msEk!57XZD5@^lM%z
zY(_8PU%Z^3ca~CfHQQU+xjB}cZ|dF{;a-~y;CgG8rg^Z^;+T=e0Z?^6eUeAl;%ze^
zIG88{f<)In0*w@j!CS?sf@KpWrtM!rdf{(WOvhpU`9X0;uWDa&@Wxk`-y7j~fi^2m
zsDxO!d|oIe@6jSEOEOpPCz^$;R9KIs$tlZ`B$3$c*U4;}`vk0tIk@iGi4hZ7yJ2u2
zbve~I23Mx}HtY~B&<!?rndZE{@CpEMSEg5-$3sUVsxKfBoulb;H`;R0M1Jp_Zv}mM
zQ4?Uv88TL6*;&>S<=M1gC)Ht7PMhQ)1=~Jogzw4efW}X}2(&!EO>cwOs;u8ei3R4<
zf+hK?g3oM~1`8X(BtRM>wp>`tdL!3zJh_;=%>rx}QeNUM_>{N(c&E^yp5Luzb$DoN
zv2%?~Pn)^U1QKjqSGsykVcv|-LNLmh<feaWm)06g#OyY3)=D5p=6duk*t~a}Yb=~P
z;fw&E6zbW*o*S0d8c3*9Rk3v8&&*J5zrkyr%b>u1n&Z0+D$y=An?ARB5{$YJ!G$=v
z$?aF5;dZtVY)q7`PR4;UeMaUR`qjKr?-+11K1_t0OdlBod0MznNYh%h*-Bia&C>k)
z#Cse=Vr%Cv{0w@13;+&Ar4G+ImmGD(?#_hgmStvUmK881eR{Cwuz!EwyT8<j0O0Fa
zwXRMPEfvLE;b7E0%;0QqHhIvskJ1}l@X^(Bjn98d>-W&_@s;YSJWDo#Q57S%SXuIB
zQ$Ug)O#bx}Q-H|qPE>5HG1YJnR&P&2otr{1{581-E3eu9Li^yf7NbcLu-is?I<D41
zroY4)n3<tQdN%jLJAoi>OV?G;uEMar>cp7}FJ5X?m}wa7`k<y+sWljDnh~mV9HY@J
z*vUf2KV-#taKffSTsHJUHbJ8<^ZckeYqD37k+6TDVsl1>4e{ZzlmSsP<8HH54dY^w
zF8i9;0Qc<%l}#Q-N2gQ1W{#;L=DAfB+=g|R(V5zk^CP8oa+jB#UAs@*)Nx%oa!;b&
zo#7=`9MNjXSYnn;4A|%`(h2xx`Q$uB)Fv0*9!D+3LA2GPtz!+$VD*aJa|3pG&Sn7a
zb{;*>+CWlON;{6kZA>ZIC(CE=xo4zEZH|kw$m4i&^Vv!msnNxhPsXAcHan5wC(|mk
z-h+3N###>Z>d$<W3kp)^1ysxHPq*Wg$;`Tr+wkuGnvw~Hk#6A2!{4mgYE8Bk8}k%A
zG3Wo*(9q!75WlU*!fK+uznKt0AV;sUw^M`SHl2|`U7II*G$!#3e~B-5!?k?#%wn@g
zZBnj<l-+D>90FR%FF3`+FN0`RtmjTe@z`(JqgxHbnDuiV&tq|TE3750Pj;s&ZI<;c
zG5lNQ=+W%6WcAH?_978u6TRuDP5T%#rZjZliIX#*U|XWC3aE+H(^*o=*>}q$$*)Xs
zTA4T2w1W*t!Es(4>u>{8!WPMJV@d+)kKFuY&YL`*-y)ahb%<9CmD|I0S;O<a4Q6)T
zxd%*Pd*$vXXm=Y6Xl1u-XA7Or2O`CmgSZOw00|mA<%cKn>$^veUEtaYhZpdjotFM(
zFQA3fc7=j@{rO?%EJI;qYrk3qJc)7-cT!%B;Dd5^ZpCaBNQbyYcfaS=2HDJ^gEJo$
z@z1sAO;k*PhX;DLU0&7HZKxuS^ZX4+g-z!<WhDI2V0mD<#K?5R_7ve)8_n>^Vc?>~
zf4r|%AD9chUP5X)HfESx0ByLKP*il1*&7&|>xf|)l=0!uno#8|+V4@(e+dL$Y|b1k
z0T>dt*~gtPq>DUSl4{1(x$<9WO#5h+U7W>2A<T|03Y`}O*0E*4Dc7B$2LJUL7T1fN
z{;%yVnRh75Wpk^J#RdDEUO>J5z5uWawRVrAjvm_UBo(Hn)PdDZm#k`ZTKioqt>*XE
zFw8cgZvZv+rYGgm4SU&g8=u(ZT#Fv{Tea9$9R|+JSbi4%wHA8u1_M)BAc%J@*v3N1
zFsrc|<!~ok?{qpQ1j3@fx9~=mx+a`;uCRJGI%`R`V)lq;wmVEQV{x(k9jJ309`GJW
zp>*iTaKH(QQwz`lS@0fcYK3x^+H{DKwJCy*N|%OSy^bmZnCF6zXFN@zPyD5fA-Fx>
zWo(<yOW+77N5^8}sUA+Lat+icCIXBds|y?9*DZfJ>ue-foBM#%>cM&D;(+WYHb)Z6
zg87XKUmHDuAZ5tNw4TCLnfoNJ-m#JS={v{vM!8|t;Pz56yFbSMxG!<`5$T@0?sfF8
z1S#Rw00#r{i1@`C7$TMocw!sw_icp?wimmx7{L%9RYA}#__ZPjcrPP1@vz+yk$NJB
zAO1C2oIigvi#Ca8;`~iGklP|+uo1r`MS2hZ7%zCGrWNSu*s2p83ny$j>M!Tx1<xBg
z7cZ*hcv-rWCO)0momzJ<4#{nu?uhP^zWKF>NzT-L$`Lv+T$%K=8XE1}$dQw3JM>kr
z=5y&$M#R_mevy=4+cN`MQi}s~34+MPCK@|d_X)a_5<P~5G)7gp$SeT{7JTkyzz{Ba
z2roBp&dHF}FdOMA>se$5O~!2X-0wyAHwL=fkvg{)z7Qdf)+|LF;AyRE{z(@zy}>$c
z=LKAbeyK{Q9EUr3S%ULIz;d&Km>BMW!dD~VA@F9b<sQ7c;s?|Y%cp>P>&3p5Ww*Vc
z;m!KE0a)LOd7PSbo;qv{x4iZ<6y%K`iQBkOj$?6pa^jXGv=JxW9v(?vufI|`2lDwQ
zqLSoP0SjT^Kh=~u{pf`uc5qS&(&3@!O^06`_d?igP4;KHf$Z$*+*}T4%JShKoggiF
zS!6VfwfX6=rs%9G9fA$ri-rB(8J^0$8L&mR!_l#hFSz#b=>8zBDBGsGEmSCnV(a{5
z+AK}dE<tkz_R03u!e|erR)WL!k#U~ZBsw~J19=6P)tUFUdG_kFrJ>;a7+BRfC0z`p
zcS<&<$!3IdU%BtQ$Ea)f?N#g9iB7F39Hxf#%bge+7swUR=#?>^Z6JTG5#IM5v9*t3
z+%%+Fb2!!ST95A0gh*}IezI_*2rNmPsh^!SJmhy-tdba9mZp<(lW}sdcQ$Q({rkwk
zOC*^b>9ys)hX%IQ`b0*f@5OY{xM9RHW8#!9!G&)7joJi?iO*FQqe+aPDsC%)D|e4N
z{ANuvHbeR|BC@<Y^TFnusM)hvF0Z#p-L}HydPwwCxd0jiBNYbosj)}S-S!*d>+T^w
z@Sg2iS%Go;-f+x<>T|Ei3=sl**$*mIo+DA+f?@)-TTv2`vob-9yrOE-vf(AVaLv)T
zn$W&c+Vu-#k=+Wv$oYn#plaQUrx5k>HI_!z3-IxvB%N`TDpi~b&p0d}?3&M#Kn1Rs
z(aoILr<lxch<bJ{+!s_fPc)P~=L5f8$6e$OS$*NaDWs*&X}tm49lXa6o2c_Sz$rPJ
zGIh8(teekgk?N`6lWV^=1DmgHeIiQ+I$Mn9=`0SR)fmoeIqqV9lGm$8Xk*RgQX*ID
z>%-Th4EkUTw;bACVqV%xSgbOFLfqzK#Bv*<u3P7umgnu~JbGkqTFqnHP&KjNgW6{_
z%vBQk;i_&nTy!WnULhf|Y<+5E(q^~_i_Jz#j*X-AUF8E8JiK`GshS;+iJ3K)(P-uF
z)BVD)<KH%Rbq=u-!f1<E?&|fr!*ZG<n|UsldVH<1vlau$beOBtH#fY!?nh8#6LEB_
zf0)mRjOOeCY^t)ko<x3)xuNC!B{voTl!l$sSdtW2!d+tkY?I4#dy86RNv<zjqqp6t
zUCUGU7E42V8OQgVvbOWO9d(O(N%cyE?ga&`Rn<}_0rDy;nPksFHPO6F7ARr53T!~t
zj}jr|1(qvF^{%H!wj$*jJ53uF>z{rt2_D?87cj!^2HrY6SdHk;lD*~K=wrvKB>$#v
zlEJo^^rb<gH)Os`)z)v)tq9sS*CD)^#m--vY}fP|;%eY%_eu|3>qbS5>Q0_Xk$elB
z#5+DPm1SBcMe=&9n#~NW*KhN<|1;b2gBhC}u3E%BnN(C=>a6Rqqgt$>Aj-jIS6E`s
z?Bktwf^ra=ge$P9cUXh9sJyg#TlL)T@{gbw8<Hnq*Ge*c{D-j6rt|>(wyOHb!;woa
zdWoyAZj0=~t(AZ307RZ}kjQKxip+o#viwwVQoa1Ou9N6zFsZKWVRh0>ndQI+S_Z~8
zSmPsLOR1WjPb1FD#wnz{V_?y~#xfGx%=v4RHDizDh&&`%P*}KB7w;Bh6H4Clf<$*d
zHUk8v$wA-tc0ONODE-P%&%fg}(MGfO)!}hv(5f}h%#^b7ZvkY*(nDE5CJ+n!f+T#0
z4*#6t?8qEks6T(=Q@%ZG$5Yg~=}>)L{rBLTT#x+BW(7Y7+s6kgMPx0q9Au=F$M9?4
z_x**(^*e2CDLHQ^Y*(aVgT$@aSmIeklvhvk?q8lU+95ttJ|X%hYK=GYS!kCQteeI5
z=YHOhJ~URaHV})1`{x$_`(7Ut38BH<u0iv;`ZU1@$tQSM3h^cR_HB8T=E)bge@~i-
z<q+aJ%>UQx+Ay=#u>BS8-@H;HZF{7c>xW&2PrkkV)iRgst{3vCc)G0qsRO;{<Kfyi
zBKivY&#Esbk4N_5_6mOaF(jX={QHt;w?$ixzkt5}_^MAnqdbW2(|hiYW&@K_S4PM{
ztCpRiJ<YjTTCXJ=&B?C(EdmeNJ<3{`W-3j9&Y+yPL?6^-m}GT4xHr}iGto18&hxdx
z(O!Gv=zJXslfE69RTw6W@vkoquljcvcTc2Nm{RKBMejuKNbisMOzXhi)Typk?A15?
hH3a?ri_m*8cx~+M&cg!~=4*(55+bs~1<zl2{vVr177_pe

literal 0
HcmV?d00001

diff --git a/plugins/zsh-navigation-tools/doc/install.sh b/plugins/zsh-navigation-tools/doc/install.sh
new file mode 100755
index 000000000..2b71aa3b4
--- /dev/null
+++ b/plugins/zsh-navigation-tools/doc/install.sh
@@ -0,0 +1,70 @@
+#!/bin/sh
+
+if ! type git 2>/dev/null 1>&2; then
+    echo "Please install GIT first"
+    echo "Exiting"
+    exit 1
+fi
+
+#
+# Clone or pull
+#
+
+if ! test -d "$HOME/.config"; then
+    mkdir "$HOME/.config"
+fi
+
+if ! test -d "$HOME/.config/znt"; then
+    mkdir "$HOME/.config/znt"
+fi
+
+echo ">>> Downloading zsh-navigation-tools to ~/.config/znt"
+if test -d ~/.config/znt/zsh-navigation-tools; then
+    cd ~/.config/znt/zsh-navigation-tools
+    git pull origin master
+else
+    cd ~/.config/znt
+    git clone https://github.com/psprint/zsh-navigation-tools.git zsh-navigation-tools
+fi
+echo ">>> Done"
+
+#
+# Copy configs
+#
+
+echo ">>> Copying config files"
+
+cd ~/.config/znt
+
+set n-aliases.conf n-env.conf n-history.conf n-list.conf n-panelize.conf n-cd.conf n-functions.conf n-kill.conf n-options.conf
+
+for i; do
+    if ! test -f "$i"; then
+        cp -v zsh-navigation-tools/.config/znt/$i .
+    fi
+done
+
+echo ">>> Done"
+
+#
+# Modify .zshrc
+#
+
+echo ">>> Updating .zshrc"
+if ! grep zsh-navigation-tools ~/.zshrc >/dev/null 2>&1; then
+    echo >> ~/.zshrc
+    echo "### ZNT's installer added snippet ###" >> ~/.zshrc
+    echo "fpath=( \"\$fpath[@]\" \"\$HOME/.config/znt/zsh-navigation-tools\" )" >> ~/.zshrc
+    echo "autoload n-aliases n-cd n-env n-functions n-history n-kill n-list n-list-draw n-list-input n-options n-panelize n-help" >> ~/.zshrc
+    echo "autoload znt-usetty-wrapper znt-history-widget znt-cd-widget znt-kill-widget" >> ~/.zshrc
+    echo "alias naliases=n-aliases ncd=n-cd nenv=n-env nfunctions=n-functions nhistory=n-history" >> ~/.zshrc
+    echo "alias nkill=n-kill noptions=n-options npanelize=n-panelize nhelp=n-help" >> ~/.zshrc
+    echo "zle -N znt-history-widget" >> ~/.zshrc
+    echo "bindkey '^R' znt-history-widget" >> ~/.zshrc
+    echo "setopt AUTO_PUSHD HIST_IGNORE_DUPS PUSHD_IGNORE_DUPS" >> ~/.zshrc
+    echo "zstyle ':completion::complete:n-kill::bits' matcher 'r:|=** l:|=*'" >> ~/.zshrc
+    echo "### END ###" >> ~/.zshrc
+    echo ">>> Done"
+else
+    echo ">>> .zshrc already updated, not making changes"
+fi
diff --git a/plugins/zsh-navigation-tools/doc/n-preview b/plugins/zsh-navigation-tools/doc/n-preview
new file mode 100644
index 000000000..2d8eea3fb
--- /dev/null
+++ b/plugins/zsh-navigation-tools/doc/n-preview
@@ -0,0 +1,224 @@
+# Copy this file into /usr/share/zsh/site-functions/
+# and add 'autoload n-preview` to .zshrc
+#
+# This is partially a test if n-list-draw and n-list-input can be
+# used multiple times to create multiple lists. It might become
+# more usable if someone adds more features like previewing of
+# archive contents.
+
+emulate -L zsh
+
+zmodload zsh/curses
+
+setopt typesetsilent extendedglob
+trap "return" TERM INT QUIT
+trap "_vpreview_exit" EXIT
+
+local IFS="
+"
+
+[ -f ~/.config/znt/n-list.conf ] && . ~/.config/znt/n-list.conf
+
+[[ "$colorpair" = "" ]] && colorpair="white/black"
+local background="${colorpair#*/}"
+
+# Drawing and input
+autoload n-list-draw n-list-input
+
+# Cleanup before any exit
+_vpreview_exit() {
+    zcurses 2>/dev/null delwin files
+    zcurses 2>/dev/null delwin body 
+    zcurses 2>/dev/null delwin status
+    zcurses 2>/dev/null refresh
+    zcurses end
+}
+
+# Outputs a message in the bottom of the screen
+_vpreview_status_msg() {
+    zcurses move status 1 2
+    zcurses clear status eol
+    zcurses string status "$1"
+}
+
+# Prefer tput, then module terminfo
+_nlist_cursor_visibility() {
+    if type tput 2>/dev/null 1>&2; then
+        [ "$1" = "1" ] && tput cvvis
+        [ "$1" = "0" ] && tput civis
+    elif [ "$has_termcap" = "1" ]; then
+        [ "$1" = "1" ] && [ -n $terminfo[cvvis] ] && echo -n $terminfo[cvvis]
+        [ "$1" = "0" ] && [ -n $terminfo[civis] ] && echo -n $terminfo[civis]
+    fi 
+}
+
+#
+# Main code
+#
+
+integer term_height="$LINES"
+integer term_width="$COLUMNS"
+if [[ "$term_height" -lt 1 || "$term_width" -lt 1 ]]; then
+    local stty_out=$( stty size )
+    term_height="${stty_out% *}"
+    term_width="${stty_out#* }"
+fi
+
+integer status_height=3
+integer status_width=term_width
+integer status_page_height=1
+integer status_page_width=term_width-2
+
+integer files_height=term_height-status_height
+integer files_width=term_width/5
+integer files_page_height=files_height-2
+integer files_page_width=files_width-2
+
+integer body_height=term_height-status_height
+integer body_width=term_width-files_width
+integer body_page_height=body_height-2
+integer body_page_width=body_width
+
+integer _from_what_idx_list_is_shown_1=1
+integer current_1=1
+
+integer _from_what_idx_list_is_shown_2=1
+integer current_2=1
+integer hscroll_2=0
+
+integer active_window=0
+
+local ansi_mode="ansi"
+[ -f ~/.config/znt/n-preview.conf ] && . ~/.config/znt/n-preview.conf
+typeset -a hcmd
+#if type pygmentize 2>/dev/null 1>&2; then
+#    hcmd=( pygmentize -g )
+if type highlight 2>/dev/null 1>&2; then
+    hcmd=( highlight -q --force -O ansi )
+elif type source-highlight 2>/dev/null 1>&2; then
+    # Warning: source-highlight can have problems
+    hcmd=( source-highlight --failsafe -fesc -o STDOUT -i )
+else
+    ansi_mode="noansi"
+fi
+
+zcurses init
+zcurses addwin status "$status_height" "$status_width" $(( term_height - status_height )) 0
+zcurses addwin files "$files_height" "$files_width" 0 0
+zcurses addwin body "$body_height" "$body_width" 0 "$files_width"
+zcurses bg status white/black
+zcurses bg files white/black
+zcurses bg body white/black
+
+#
+# Listening for input
+#
+
+local key keypad
+
+# Clear input buffer
+zcurses timeout status 0
+zcurses input status key keypad
+zcurses timeout status -1
+key=""
+keypad=""
+
+typeset -a filenames
+integer last_element_1
+
+typeset -a body
+integer last_element_2
+
+filenames=( *(N) )
+filenames=( "${(@M)filenames:#(#i)*$1*}" )
+
+local NLIST_GREP_STRING="$1"
+
+integer last_element_1="$#filenames"
+integer last_element_2=0
+
+local selection action final_key
+
+while (( 1 )); do
+    # Output the lists
+    integer end_idx=$(( _from_what_idx_list_is_shown_1 + files_page_height - 1 ))
+    [ "$end_idx" -gt "$last_element_1" ] && end_idx=last_element_1
+
+    n-list-draw "$(( (current_1 -1) % files_page_height + 1 ))" \
+                    "$files_page_height" "$files_page_width" 1 2 0 files \
+                    "${(@)filenames[_from_what_idx_list_is_shown_1, end_idx]}"
+
+    if [ "$#body" -ge 1 ]; then
+        end_idx=$(( _from_what_idx_list_is_shown_2 + body_page_height - 1 ))
+        [ "$end_idx" -gt "$last_element_2" ] && end_idx=last_element_2
+
+        n-list-draw "$(( (current_2 -1) % body_page_height + 1 ))" \
+                        "$body_page_height" "$body_page_width" 1 0 "$hscroll_2" body \
+                        "${(@)body[_from_what_idx_list_is_shown_2, end_idx]}"
+    fi
+
+    [[ "$active_window" -eq 0 ]] && zcurses border files
+    zcurses border status
+    zcurses refresh files body status 
+
+    # Wait for input
+    zcurses input status key keypad
+
+    # Get the special (i.e. "keypad") key or regular key
+    if [ -n "$key" ]; then
+        final_key="$key" 
+    elif [ -n "$keypad" ]; then
+        final_key="$keypad"
+    else
+        _vpreview_status_msg "Inproper input detected"
+        zcurses refresh status 
+    fi
+
+    if [ "$active_window" -eq 0 ]; then
+        zcurses clear files
+        n-list-input "$current_1" "$_from_what_idx_list_is_shown_1" "$files_page_height" \
+            "$files_page_width" "$last_element_1" 0 "$final_key"
+
+        selection="$reply[1]"
+        action="$reply[2]"
+        current_1="$reply[3]"
+        _from_what_idx_list_is_shown_1="$reply[4]"
+
+        if [ "$action" = "SELECT" ]; then
+            # Load new file and refresh the displaying window
+            local filename="$filenames[$selection]"
+            if [ "$ansi_mode" = "ansi" ]; then
+                body=( "${(@f)"$( "$hcmd[@]" "$filename" )"}" )
+            else
+                body=( "${(@f)"$(<$filename)"}" )
+            fi
+            last_element_2="$#body"
+            current_2=1
+            _from_what_idx_list_is_shown_2=1
+            zcurses clear body
+        fi
+    elif [ "$active_window" -eq 1 ]; then
+        zcurses clear body
+        n-list-input "$current_2" "$_from_what_idx_list_is_shown_2" "$body_page_height" \
+            "$body_page_width" "$last_element_2" "$hscroll_2" "$final_key"
+
+        selection="$reply[1]"
+        action="$reply[2]"
+        current_2="$reply[3]"
+        _from_what_idx_list_is_shown_2="$reply[4]"
+        hscroll_2="$reply[5]"
+
+    fi
+
+    if [ "$action" = "LEAVE" ]; then
+        active_window=1-active_window
+    elif [ "$action" = "QUIT" ]; then
+            break
+    elif [ "$action" = "REDRAW" ]; then
+        zcurses clear files redraw
+        zcurses clear body redraw
+        zcurses clear status redraw
+    fi
+done
+
+# vim: set filetype=zsh:
diff --git a/plugins/zsh-navigation-tools/znt-tmux.zsh b/plugins/zsh-navigation-tools/doc/znt-tmux.zsh
similarity index 97%
rename from plugins/zsh-navigation-tools/znt-tmux.zsh
rename to plugins/zsh-navigation-tools/doc/znt-tmux.zsh
index 6a96e97a1..309c11a0b 100755
--- a/plugins/zsh-navigation-tools/znt-tmux.zsh
+++ b/plugins/zsh-navigation-tools/doc/znt-tmux.zsh
@@ -12,7 +12,7 @@
 # To use, put this line to your ~/.tmux.conf. The tool is invoked with:
 # Ctrl+b h
 #
-# bind h run-shell -b "$ZNT_REPO_DIR/znt-tmux.zsh"
+# bind h run-shell -b "$ZNT_REPO_DIR/doc/znt-tmux.zsh"
 #
 
 # get and save the current active tmux pane id
diff --git a/plugins/zsh-navigation-tools/zsh-navigation-tools.plugin.zsh b/plugins/zsh-navigation-tools/zsh-navigation-tools.plugin.zsh
index f015620f5..85ce87ca4 100644
--- a/plugins/zsh-navigation-tools/zsh-navigation-tools.plugin.zsh
+++ b/plugins/zsh-navigation-tools/zsh-navigation-tools.plugin.zsh
@@ -8,7 +8,7 @@
 #
 
 # According to the standard:
-# http://zdharma.org/Zsh-100-Commits-Club/Zsh-Plugin-Standard.html
+# https://zdharma-continuum.github.io/Zsh-100-Commits-Club/Zsh-Plugin-Standard.html
 0="${${ZERO:-${0:#$ZSH_ARGZERO}}:-${(%):-%N}}"
 0="${${(M)0:#/*}:-$PWD/$0}"
 export ZNT_REPO_DIR="${0:h}"

From e9bc107ad502083d91c5bcca1415634563c8b5dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Sun, 26 Dec 2021 18:29:55 +0100
Subject: [PATCH 634/869] fix(dirhistory): define key bindings for vi mode
 (#10450)

Fixes #10450
---
 plugins/dirhistory/dirhistory.plugin.zsh | 111 +++++++++++++----------
 1 file changed, 65 insertions(+), 46 deletions(-)

diff --git a/plugins/dirhistory/dirhistory.plugin.zsh b/plugins/dirhistory/dirhistory.plugin.zsh
index 8268147f6..7021fc03a 100644
--- a/plugins/dirhistory/dirhistory.plugin.zsh
+++ b/plugins/dirhistory/dirhistory.plugin.zsh
@@ -121,31 +121,39 @@ function dirhistory_zle_dirhistory_future() {
 }
 
 zle -N dirhistory_zle_dirhistory_back
-bindkey "\e[3D" dirhistory_zle_dirhistory_back    # xterm in normal mode
-bindkey "\e[1;3D" dirhistory_zle_dirhistory_back  # xterm in normal mode
-bindkey "\e\e[D" dirhistory_zle_dirhistory_back   # Putty
-bindkey "\eO3D" dirhistory_zle_dirhistory_back    # GNU screen
-case "$TERM_PROGRAM" in
-iTerm.app) bindkey "^[^[[D" dirhistory_zle_dirhistory_back ;;   # iTerm2
-Apple_Terminal) bindkey "^[b" dirhistory_zle_dirhistory_back ;; # Terminal.app
-esac
-if (( ${+terminfo[kcub1]} )); then
-  bindkey "^[${terminfo[kcub1]}" dirhistory_zle_dirhistory_back  # urxvt
-fi
-
 zle -N dirhistory_zle_dirhistory_future
-bindkey "\e[3C" dirhistory_zle_dirhistory_future    # xterm in normal mode
-bindkey "\e[1;3C" dirhistory_zle_dirhistory_future  # xterm in normal mode
-bindkey "\e\e[C" dirhistory_zle_dirhistory_future   # Putty
-bindkey "\eO3C" dirhistory_zle_dirhistory_future    # GNU screen
-case "$TERM_PROGRAM" in
-iTerm.app) bindkey "^[^[[C" dirhistory_zle_dirhistory_future ;;   # iTerm2
-Apple_Terminal) bindkey "^[f" dirhistory_zle_dirhistory_future ;; # Terminal.app
-esac
-if (( ${+terminfo[kcuf1]} )); then
-  bindkey "^[${terminfo[kcuf1]}" dirhistory_zle_dirhistory_future # urxvt
-fi
 
+for keymap in emacs vicmd viins; do
+  # dirhistory_back
+  bindkey -M $keymap "\e[3D" dirhistory_zle_dirhistory_back    # xterm in normal mode
+  bindkey -M $keymap "\e[1;3D" dirhistory_zle_dirhistory_back  # xterm in normal mode
+  bindkey -M $keymap "\e\e[D" dirhistory_zle_dirhistory_back   # Putty
+  bindkey -M $keymap "\eO3D" dirhistory_zle_dirhistory_back    # GNU screen
+
+  case "$TERM_PROGRAM" in
+  Apple_Terminal) bindkey -M $keymap "^[b" dirhistory_zle_dirhistory_back ;; # Terminal.app
+  iTerm.app) bindkey -M $keymap "^[^[[D" dirhistory_zle_dirhistory_back ;;   # iTerm2
+  esac
+
+  if (( ${+terminfo[kcub1]} )); then
+    bindkey -M $keymap "^[${terminfo[kcub1]}" dirhistory_zle_dirhistory_back  # urxvt
+  fi
+
+  # dirhistory_future
+  bindkey -M $keymap "\e[3C" dirhistory_zle_dirhistory_future    # xterm in normal mode
+  bindkey -M $keymap "\e[1;3C" dirhistory_zle_dirhistory_future  # xterm in normal mode
+  bindkey -M $keymap "\e\e[C" dirhistory_zle_dirhistory_future   # Putty
+  bindkey -M $keymap "\eO3C" dirhistory_zle_dirhistory_future    # GNU screen
+
+  case "$TERM_PROGRAM" in
+  Apple_Terminal) bindkey -M $keymap "^[f" dirhistory_zle_dirhistory_future ;; # Terminal.app
+  iTerm.app) bindkey -M $keymap "^[^[[C" dirhistory_zle_dirhistory_future ;;   # iTerm2
+  esac
+
+  if (( ${+terminfo[kcuf1]} )); then
+    bindkey -M $keymap "^[${terminfo[kcuf1]}" dirhistory_zle_dirhistory_future # urxvt
+  fi
+done
 
 #
 # HIERARCHY Implemented in this section, in case someone wants to split it to another plugin if it clashes bindings
@@ -176,27 +184,38 @@ function dirhistory_zle_dirhistory_down() {
 }
 
 zle -N dirhistory_zle_dirhistory_up
-bindkey "\e[3A" dirhistory_zle_dirhistory_up    # xterm in normal mode
-bindkey "\e[1;3A" dirhistory_zle_dirhistory_up  # xterm in normal mode
-bindkey "\e\e[A" dirhistory_zle_dirhistory_up   # Putty
-bindkey "\eO3A" dirhistory_zle_dirhistory_up    # GNU screen
-case "$TERM_PROGRAM" in
-iTerm.app) bindkey "^[^[[A" dirhistory_zle_dirhistory_up ;;     # iTerm2
-Apple_Terminal) bindkey "^[[A" dirhistory_zle_dirhistory_up ;;  # Terminal.app
-esac
-if (( ${+terminfo[kcuu1]} )); then
-  bindkey "^[${terminfo[kcuu1]}" dirhistory_zle_dirhistory_up # urxvt
-fi
-
 zle -N dirhistory_zle_dirhistory_down
-bindkey "\e[3B" dirhistory_zle_dirhistory_down    # xterm in normal mode
-bindkey "\e[1;3B" dirhistory_zle_dirhistory_down  # xterm in normal mode
-bindkey "\e\e[B" dirhistory_zle_dirhistory_down   # Putty
-bindkey "\eO3B" dirhistory_zle_dirhistory_down    # GNU screen
-case "$TERM_PROGRAM" in
-iTerm.app) bindkey "^[^[[B" dirhistory_zle_dirhistory_down ;;     # iTerm2
-Apple_Terminal) bindkey "^[[B" dirhistory_zle_dirhistory_down ;;  # Terminal.app
-esac
-if (( ${+terminfo[kcud1]} )); then
-  bindkey "^[${terminfo[kcud1]}" dirhistory_zle_dirhistory_down # urxvt
-fi
+
+for keymap in emacs vicmd viins; do
+  # dirhistory_up
+  bindkey -M $keymap "\e[3A" dirhistory_zle_dirhistory_up    # xterm in normal mode
+  bindkey -M $keymap "\e[1;3A" dirhistory_zle_dirhistory_up  # xterm in normal mode
+  bindkey -M $keymap "\e\e[A" dirhistory_zle_dirhistory_up   # Putty
+  bindkey -M $keymap "\eO3A" dirhistory_zle_dirhistory_up    # GNU screen
+
+  case "$TERM_PROGRAM" in
+  Apple_Terminal) bindkey -M $keymap "^[[A" dirhistory_zle_dirhistory_up ;;  # Terminal.app
+  iTerm.app) bindkey -M $keymap "^[^[[A" dirhistory_zle_dirhistory_up ;;     # iTerm2
+  esac
+
+  if (( ${+terminfo[kcuu1]} )); then
+    bindkey -M $keymap "^[${terminfo[kcuu1]}" dirhistory_zle_dirhistory_up # urxvt
+  fi
+
+  # dirhistory_down
+  bindkey -M $keymap "\e[3B" dirhistory_zle_dirhistory_down    # xterm in normal mode
+  bindkey -M $keymap "\e[1;3B" dirhistory_zle_dirhistory_down  # xterm in normal mode
+  bindkey -M $keymap "\e\e[B" dirhistory_zle_dirhistory_down   # Putty
+  bindkey -M $keymap "\eO3B" dirhistory_zle_dirhistory_down    # GNU screen
+
+  case "$TERM_PROGRAM" in
+  Apple_Terminal) bindkey -M $keymap "^[[B" dirhistory_zle_dirhistory_down ;;  # Terminal.app
+  iTerm.app) bindkey -M $keymap "^[^[[B" dirhistory_zle_dirhistory_down ;;     # iTerm2
+  esac
+
+  if (( ${+terminfo[kcud1]} )); then
+    bindkey -M $keymap "^[${terminfo[kcud1]}" dirhistory_zle_dirhistory_down # urxvt
+  fi
+done
+
+unset keymap

From 5f6b0ac7fbfbb0e25d0d691efa1bf676ac9f6962 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Sun, 26 Dec 2021 18:58:12 +0100
Subject: [PATCH 635/869] style(composer): fix code and README style

---
 plugins/composer/README.md           | 36 +++++++-------
 plugins/composer/composer.plugin.zsh | 74 ++++++++++++----------------
 2 files changed, 50 insertions(+), 60 deletions(-)

diff --git a/plugins/composer/README.md b/plugins/composer/README.md
index 7a5f7256e..00ada1e13 100644
--- a/plugins/composer/README.md
+++ b/plugins/composer/README.md
@@ -10,22 +10,24 @@ To use it add `composer` to the plugins array in your zshrc file.
 plugins=(... composer)
 ```
 
+Original author: Daniel Gomes <me@danielcsgomes.com>
+
 ## Aliases
 
-| Alias  | Command                                     | Description                                                                             |
-| ------ | ------------------------------------------- | --------------------------------------------------------------------------------------- |
-| `c`    | `composer`                                  | Starts composer                                                                         |
-| `csu`  | `composer self-update`                      | Updates composer to the latest version                                                  |
-| `cu`   | `composer update`                           | Updates composer dependencies and `composer.lock` file                                  |
-| `cr`   | `composer require`                          | Adds new packages to `composer.json`                                                    |
-| `crm`  | `composer remove`                           | Removes packages from `composer.json`                                                   |
-| `ci`   | `composer install`                          | Resolves and installs dependencies from `composer.json`                                 |
-| `ccp`  | `composer create-project`                   | Create new project from an existing package                                             |
-| `cdu`  | `composer dump-autoload`                    | Updates the autoloader                                                                  |
-| `cdo`  | `composer dump-autoload -o`                 | Converts PSR-0/4 autoloading to classmap for a faster autoloader (good for production)  |
-| `cgu`  | `composer global update`                    | Allows update command to run on COMPOSER_HOME directory                                 |
-| `cgr`  | `composer global require`                   | Allows require command to run on COMPOSER_HOME directory                                |
-| `cgrm` | `composer global remove`                    | Allows remove command to run on COMPOSER_HOME directory                                 |
-| `cget` | `curl -s https://getcomposer.org/installer` | Installs composer in the current directory                                              |
-| `co`   | `composer outdated`                         | Shows a list of installed packages with available updates                               |
-| `cod`  | `composer outdated --direct`                | Shows a list of installed packages with available updates which are direct dependencies |
+| Alias  | Command                      | Description                                                                             |
+| ------ | ---------------------------- | --------------------------------------------------------------------------------------- |
+| `c`    | `composer`                   | Starts composer                                                                         |
+| `ccp`  | `composer create-project`    | Create new project from an existing package                                             |
+| `cdo`  | `composer dump-autoload -o`  | Converts PSR-0/4 autoloading to classmap for a faster autoloader (good for production)  |
+| `cdu`  | `composer dump-autoload`     | Updates the autoloader                                                                  |
+| `cget` | `curl -s <installer> \| php` | Installs composer in the current directory                                              |
+| `cgr`  | `composer global require`    | Allows require command to run on COMPOSER_HOME directory                                |
+| `cgrm` | `composer global remove`     | Allows remove command to run on COMPOSER_HOME directory                                 |
+| `cgu`  | `composer global update`     | Allows update command to run on COMPOSER_HOME directory                                 |
+| `ci`   | `composer install`           | Resolves and installs dependencies from `composer.json`                                 |
+| `co`   | `composer outdated`          | Shows a list of installed packages with available updates                               |
+| `cod`  | `composer outdated --direct` | Shows a list of installed packages with available updates which are direct dependencies |
+| `cr`   | `composer require`           | Adds new packages to `composer.json`                                                    |
+| `crm`  | `composer remove`            | Removes packages from `composer.json`                                                   |
+| `csu`  | `composer self-update`       | Updates composer to the latest version                                                  |
+| `cu`   | `composer update`            | Updates composer dependencies and `composer.lock` file                                  |
diff --git a/plugins/composer/composer.plugin.zsh b/plugins/composer/composer.plugin.zsh
index 218a13e5f..ba29503e4 100644
--- a/plugins/composer/composer.plugin.zsh
+++ b/plugins/composer/composer.plugin.zsh
@@ -1,19 +1,3 @@
-# ------------------------------------------------------------------------------
-#          FILE:  composer.plugin.zsh
-#   DESCRIPTION:  oh-my-zsh composer plugin file.
-#        AUTHOR:  Daniel Gomes (me@danielcsgomes.com)
-#       VERSION:  1.0.0
-# ------------------------------------------------------------------------------
-
-# Composer basic command completion
-_composer_get_command_list () {
-    $_comp_command1 --no-ansi 2>/dev/null | sed "1,/Available commands/d" | awk '/^[ \t]*[a-z]+/ { print $1 }'
-}
-
-_composer_get_required_list () {
-    $_comp_command1 show -s --no-ansi 2>/dev/null | sed '1,/requires/d' | awk 'NF > 0 && !/^requires \(dev\)/{ print $1 }'
-}
-
 _composer () {
     local curcontext="$curcontext" state line
     typeset -A opt_args
@@ -30,41 +14,45 @@ _composer () {
 compdef _composer composer
 compdef _composer composer.phar
 
-# Aliases
+
+## Aliases
 alias c='composer'
-alias csu='composer self-update'
-alias cu='composer update'
-alias cr='composer require'
-alias crm='composer remove'
-alias ci='composer install'
 alias ccp='composer create-project'
-alias cdu='composer dump-autoload'
 alias cdo='composer dump-autoload -o'
-alias cgu='composer global update'
+alias cdu='composer dump-autoload'
+alias cget='curl -s https://getcomposer.org/installer | php'
 alias cgr='composer global require'
 alias cgrm='composer global remove'
+alias cgu='composer global update'
+alias ci='composer install'
 alias co='composer outdated'
 alias cod='composer outdated --direct'
+alias cr='composer require'
+alias crm='composer remove'
+alias csu='composer self-update'
+alias cu='composer update'
 
-# install composer in the current directory
-alias cget='curl -s https://getcomposer.org/installer | php'
 
-# Add Composer's global binaries to PATH, using Composer if available.
-if (( $+commands[composer] )); then
-    autoload -Uz _store_cache _retrieve_cache _cache_invalid
+## If Composer not found, try to add known directories to $PATH
+if (( ! $+commands[composer] )); then
+  [[ -d "$HOME/.composer/vendor/bin" ]] && export PATH="$PATH:$HOME/.composer/vendor/bin"
+  [[ -d "$HOME/.config/composer/vendor/bin" ]] && export PATH="$PATH:$HOME/.config/composer/vendor/bin"
 
-    _retrieve_cache composer
-
-    if [[ -z $__composer_bin_dir ]]; then
-        __composer_bin_dir=$(composer global config bin-dir --absolute 2>/dev/null)
-        _store_cache composer __composer_bin_dir
-    fi
-
-    # Add Composer's global binaries to PATH
-    export PATH="$PATH:$__composer_bin_dir"
-
-    unset __composer_bin_dir
-else
-  [ -d $HOME/.composer/vendor/bin ] && export PATH=$PATH:$HOME/.composer/vendor/bin
-  [ -d $HOME/.config/composer/vendor/bin ] && export PATH=$PATH:$HOME/.config/composer/vendor/bin
+  # If still not found, don't do the rest of the script
+  (( $+commands[composer] )) || return 0
 fi
+
+
+## Add Composer's global binaries to PATH
+autoload -Uz _store_cache _retrieve_cache _cache_invalid
+_retrieve_cache composer
+
+if [[ -z $__composer_bin_dir ]]; then
+  __composer_bin_dir=$(composer global config bin-dir --absolute 2>/dev/null)
+  _store_cache composer __composer_bin_dir
+fi
+
+# Add Composer's global binaries to PATH
+export PATH="$PATH:$__composer_bin_dir"
+
+unset __composer_bin_dir

From 70dfb6ef92f3bedc460e300e94e3456942ff328c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Sun, 26 Dec 2021 18:58:22 +0100
Subject: [PATCH 636/869] refactor(composer): improve completion and use
 official Zsh completion if available

---
 plugins/composer/composer.plugin.zsh | 34 ++++++++++++++++++++--------
 1 file changed, 25 insertions(+), 9 deletions(-)

diff --git a/plugins/composer/composer.plugin.zsh b/plugins/composer/composer.plugin.zsh
index ba29503e4..f2076c220 100644
--- a/plugins/composer/composer.plugin.zsh
+++ b/plugins/composer/composer.plugin.zsh
@@ -1,18 +1,34 @@
-_composer () {
+## Basic Composer command completion
+# Since Zsh 5.7, an improved composer command completion is provided
+if ! is-at-least 5.7; then
+  _composer () {
     local curcontext="$curcontext" state line
     typeset -A opt_args
-    _arguments \
-        '*:: :->subcmds'
+    _arguments '*:: :->subcmds'
 
-    if (( CURRENT == 1 )) || ( ((CURRENT == 2)) && [ "$words[1]" = "global" ] ) ; then
-        compadd $(_composer_get_command_list)
+    if (( CURRENT == 1 )) || ( (( CURRENT == 2 )) && [[ "$words[1]" = "global" ]] ); then
+      # Command list
+      local -a subcmds
+      subcmds=("${(@f)"$($_comp_command1 --no-ansi 2>/dev/null | awk '
+        /Available commands/{ r=1 }
+        r == 1 && /^[ \t]*[a-z]+/{
+          gsub(/^[ \t]+/, "")
+          gsub(/  +/, ":")
+          print $0
+        }
+      ')"}")
+      _describe -t commands 'composer command' subcmds
     else
-        compadd $(_composer_get_required_list)
+      # Required list
+      compadd $($_comp_command1 show -s --no-ansi 2>/dev/null \
+        | sed '1,/requires/d' \
+        | awk 'NF > 0 && !/^requires \(dev\)/{ print $1 }')
     fi
-}
+  }
 
-compdef _composer composer
-compdef _composer composer.phar
+  compdef _composer composer
+  compdef _composer composer.phar
+fi
 
 
 ## Aliases

From 96e473a1d65cf3a093be2c742eea427706f18c01 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Sun, 26 Dec 2021 19:24:19 +0100
Subject: [PATCH 637/869] fix(random): fix `ZSH_THEME_RANDOM_QUIET` check
 (#10534)

BREAKING CHANGE: For consistency, `ZSH_THEME_RANDOM_QUIET` now needs to
be `true` if you want to silence the "Random theme loaded" message in the
`random` theme.

The wiki specified that 1 or true was valid, while the code just
checked whether it was set to any value. Being more strict makes
sure that we're consistent with the rest of the Settings.

Fixes #10534
---
 themes/random.zsh-theme | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/themes/random.zsh-theme b/themes/random.zsh-theme
index f0b8e5c18..173d5b33f 100644
--- a/themes/random.zsh-theme
+++ b/themes/random.zsh-theme
@@ -42,6 +42,6 @@ else
   return 1
 fi
 
-if [[ -z "$ZSH_THEME_RANDOM_QUIET" ]]; then
+if [[ "$ZSH_THEME_RANDOM_QUIET" = true ]]; then
   echo "[oh-my-zsh] Random theme '${RANDOM_THEME}' loaded"
 fi

From 8e7cbafb3249993ff152f456ceff60723917755b Mon Sep 17 00:00:00 2001
From: CleanMachine1 <78213164+CleanMachine1@users.noreply.github.com>
Date: Fri, 24 Sep 2021 23:08:38 +0100
Subject: [PATCH 638/869] feat(golang): add `gofx` alias for `go fix` (#10220)

Closes #10220

Co-authored-by: Chaithanya Naik <chaithanyampcrl@gmail.com>
---
 plugins/golang/README.md         | 1 +
 plugins/golang/golang.plugin.zsh | 1 +
 2 files changed, 2 insertions(+)

diff --git a/plugins/golang/README.md b/plugins/golang/README.md
index af2c4dff9..1dc9b080b 100644
--- a/plugins/golang/README.md
+++ b/plugins/golang/README.md
@@ -18,6 +18,7 @@ plugins=(... golang)
 | god     | `go doc`                | Prints documentation comments                                 |
 | gof     | `go fmt`                | Gofmt formats (aligns and indents) Go programs.               |
 | gofa    | `go fmt ./...`          | Run go fmt for all packages in current directory, recursively |
+| gofx    | `go fix`                | Update packages to use a new API                              |
 | gog     | `go get`                | Downloads packages and then installs them to $GOPATH          |
 | gog     | `go get ./...`          | Installs all dependencies in current directory, recursively   |
 | goi     | `go install`            | Compiles and installs packages to $GOPATH                     |
diff --git a/plugins/golang/golang.plugin.zsh b/plugins/golang/golang.plugin.zsh
index fce663fd6..05196acc0 100644
--- a/plugins/golang/golang.plugin.zsh
+++ b/plugins/golang/golang.plugin.zsh
@@ -262,6 +262,7 @@ alias goc='go clean'
 alias god='go doc'
 alias gof='go fmt'
 alias gofa='go fmt ./...'
+alias gofx='go fix'
 alias gog='go get'
 alias goga='go get ./...'
 alias goi='go install'

From 89596597e99676329846efcf9e8512fc389d96cd Mon Sep 17 00:00:00 2001
From: Chaithanya Naik <chaithanyampcrl@gmail.com>
Date: Sat, 30 Oct 2021 11:14:51 +0530
Subject: [PATCH 639/869] feat(golang): add aliases for `go tool` utility
 (#10361)

Closes #10361
---
 plugins/golang/README.md         | 4 ++++
 plugins/golang/golang.plugin.zsh | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/plugins/golang/README.md b/plugins/golang/README.md
index 1dc9b080b..8bfe3ae3d 100644
--- a/plugins/golang/README.md
+++ b/plugins/golang/README.md
@@ -30,4 +30,8 @@ plugins=(... golang)
 | gor     | `go run`                | Compiles and runs your code                                   |
 | got     | `go test`               | Runs tests                                                    |
 | gota    | `go test ./...`         | Runs tests in all subdirectories                              |
+| goto    | `go tool`               | Prints all the available tools                                |
+| gotoc   | `go tool compile`       | Generates object file                                         |
+| gotod   | `go tool dist`          | Utility to bootstrap, build and test go runtime               |
+| gotofx  | `go tool fix`           | Fixes an application to use newer features                    |
 | gov     | `go vet`                | Vet examines Go source code and reports suspicious constructs |
diff --git a/plugins/golang/golang.plugin.zsh b/plugins/golang/golang.plugin.zsh
index 05196acc0..3ef9da6aa 100644
--- a/plugins/golang/golang.plugin.zsh
+++ b/plugins/golang/golang.plugin.zsh
@@ -274,4 +274,8 @@ alias gops='cd $GOPATH/src'
 alias gor='go run'
 alias got='go test'
 alias gota='go test ./...'
+alias goto='go tool'
+alias gotoc='go tool compile'
+alias gotod='go tool dist'
+alias gotofx='go tool fix'
 alias gov='go vet'

From c9a1edeab8270a8fe32848bc31d46814bd2fca87 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Sun, 26 Dec 2021 20:12:14 +0100
Subject: [PATCH 640/869] fix(golang)!: rename `gop` alias to `gopa` to avoid
 conflict with Go+ (#10504)

BREAKING CHANGE: the `gop` alias has been renamed to `gopa` to avoid conflict with
Go+ `gop` command.

Fixes #10504
---
 plugins/golang/README.md         | 48 ++++++++++++++++----------------
 plugins/golang/golang.plugin.zsh | 12 ++++----
 2 files changed, 29 insertions(+), 31 deletions(-)

diff --git a/plugins/golang/README.md b/plugins/golang/README.md
index 8bfe3ae3d..979c89010 100644
--- a/plugins/golang/README.md
+++ b/plugins/golang/README.md
@@ -11,27 +11,27 @@ plugins=(... golang)
 
 ## Aliases
 
-| Alias   | Command                 | Description                                                   |
-| ------- | ----------------------- | ------------------------------------------------------------- |
-| gob     | `go build`              | Build your code                                               |
-| goc     | `go clean`              | Removes object files from package source directories          |
-| god     | `go doc`                | Prints documentation comments                                 |
-| gof     | `go fmt`                | Gofmt formats (aligns and indents) Go programs.               |
-| gofa    | `go fmt ./...`          | Run go fmt for all packages in current directory, recursively |
-| gofx    | `go fix`                | Update packages to use a new API                              |
-| gog     | `go get`                | Downloads packages and then installs them to $GOPATH          |
-| gog     | `go get ./...`          | Installs all dependencies in current directory, recursively   |
-| goi     | `go install`            | Compiles and installs packages to $GOPATH                     |
-| gol     | `go list`               | Lists Go packages                                             |
-| gom     | `go mod`                | Access to operations on modules                               |
-| gop     | `cd $GOPATH`            | Takes you to $GOPATH                                          |
-| gopb    | `cd $GOPATH/bin`        | Takes you to $GOPATH/bin                                      |
-| gops    | `cd $GOPATH/src`        | Takes you to $GOPATH/src                                      |
-| gor     | `go run`                | Compiles and runs your code                                   |
-| got     | `go test`               | Runs tests                                                    |
-| gota    | `go test ./...`         | Runs tests in all subdirectories                              |
-| goto    | `go tool`               | Prints all the available tools                                |
-| gotoc   | `go tool compile`       | Generates object file                                         |
-| gotod   | `go tool dist`          | Utility to bootstrap, build and test go runtime               |
-| gotofx  | `go tool fix`           | Fixes an application to use newer features                    |
-| gov     | `go vet`                | Vet examines Go source code and reports suspicious constructs |
+| Alias  | Command           | Description                                                   |
+| ------ | ----------------- | ------------------------------------------------------------- |
+| gob    | `go build`        | Build your code                                               |
+| goc    | `go clean`        | Removes object files from package source directories          |
+| god    | `go doc`          | Prints documentation comments                                 |
+| gof    | `go fmt`          | Gofmt formats (aligns and indents) Go programs.               |
+| gofa   | `go fmt ./...`    | Run go fmt for all packages in current directory, recursively |
+| gofx   | `go fix`          | Update packages to use a new API                              |
+| gog    | `go get`          | Downloads packages and then installs them to $GOPATH          |
+| gog    | `go get ./...`    | Installs all dependencies in current directory, recursively   |
+| goi    | `go install`      | Compiles and installs packages to $GOPATH                     |
+| gol    | `go list`         | Lists Go packages                                             |
+| gom    | `go mod`          | Access to operations on modules                               |
+| gopa   | `cd $GOPATH`      | Takes you to `$GOPATH`                                        |
+| gopb   | `cd $GOPATH/bin`  | Takes you to `$GOPATH/bin`                                    |
+| gops   | `cd $GOPATH/src`  | Takes you to `$GOPATH/src`                                    |
+| gor    | `go run`          | Compiles and runs your code                                   |
+| got    | `go test`         | Runs tests                                                    |
+| gota   | `go test ./...`   | Runs tests in all subdirectories                              |
+| goto   | `go tool`         | Prints all the available tools                                |
+| gotoc  | `go tool compile` | Generates object file                                         |
+| gotod  | `go tool dist`    | Utility to bootstrap, build and test go runtime               |
+| gotofx | `go tool fix`     | Fixes an application to use newer features                    |
+| gov    | `go vet`          | Vet examines Go source code and reports suspicious constructs |
diff --git a/plugins/golang/golang.plugin.zsh b/plugins/golang/golang.plugin.zsh
index 3ef9da6aa..6d1eb40c2 100644
--- a/plugins/golang/golang.plugin.zsh
+++ b/plugins/golang/golang.plugin.zsh
@@ -1,11 +1,9 @@
-# install in /etc/zsh/zshrc or your personal .zshrc
-
 # gc
-prefixes=(5 6 8)
-for p in $prefixes; do
-	compctl -g "*.${p}" ${p}l
-	compctl -g "*.go" ${p}g
+for p in 5 6 8; do
+  compctl -g "*.${p}" ${p}l
+  compctl -g "*.go" ${p}g
 done
+unset p
 
 # standard go tools
 compctl -g "*.go" gofmt
@@ -268,7 +266,7 @@ alias goga='go get ./...'
 alias goi='go install'
 alias gol='go list'
 alias gom='go mod'
-alias gop='cd $GOPATH'
+alias gopa='cd $GOPATH'
 alias gopb='cd $GOPATH/bin'
 alias gops='cd $GOPATH/src'
 alias gor='go run'

From 2e0cf4a3b07c027312e0c419e083fe125b5883c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Sun, 26 Dec 2021 20:37:08 +0100
Subject: [PATCH 641/869] refactor(golang): move completion out of the plugin

---
 plugins/golang/_golang           | 249 ++++++++++++++++++++++++++++++
 plugins/golang/golang.plugin.zsh | 255 +------------------------------
 2 files changed, 254 insertions(+), 250 deletions(-)
 create mode 100644 plugins/golang/_golang

diff --git a/plugins/golang/_golang b/plugins/golang/_golang
new file mode 100644
index 000000000..01b976b12
--- /dev/null
+++ b/plugins/golang/_golang
@@ -0,0 +1,249 @@
+#compdef go
+
+__go_packages() {
+  local gopaths
+  declare -a gopaths
+  gopaths=("${(s/:/)$(go env GOPATH)}")
+  gopaths+=("$(go env GOROOT)")
+  for p in $gopaths; do
+    _path_files -W "$p/src" -/
+  done
+}
+
+__go_identifiers() {
+  local tmpl_path="${functions_source[$0]:h}/templates"
+  compadd $(godoc -templates "$tmpl_path" ${words[-2]} 2> /dev/null)
+}
+
+_go() {
+  typeset -a commands build_flags
+  commands+=(
+    'build[compile packages and dependencies]'
+    'clean[remove object files]'
+    'doc[run godoc on package sources]'
+    'env[print Go environment information]'
+    'fix[run go tool fix on packages]'
+    'fmt[run gofmt on package sources]'
+    'generate[generate Go files by processing source]'
+    'get[download and install packages and dependencies]'
+    'help[display help]'
+    'install[compile and install packages and dependencies]'
+    'list[list packages]'
+    'mod[modules maintenance]'
+    'run[compile and run Go program]'
+    'test[test packages]'
+    'tool[run specified go tool]'
+    'version[print Go version]'
+    'vet[run go tool vet on packages]'
+  )
+  if (( CURRENT == 2 )); then
+    # explain go commands
+    _values 'go tool commands' ${commands[@]}
+    return
+  fi
+  build_flags=(
+    '-a[force reinstallation of packages that are already up to date]'
+    '-n[print the commands but do not run them]'
+    '-p[number of parallel builds]:number'
+    '-race[enable data race detection]'
+    '-x[print the commands]'
+    '-work[print temporary directory name and keep it]'
+    '-ccflags[flags for 5c/6c/8c]:flags'
+    '-gcflags[flags for 5g/6g/8g]:flags'
+    '-ldflags[flags for 5l/6l/8l]:flags'
+    '-gccgoflags[flags for gccgo]:flags'
+    '-compiler[name of compiler to use]:name'
+    '-installsuffix[suffix to add to package directory]:suffix'
+    '-tags[list of build tags to consider satisfied]:tags'
+  )
+
+  case ${words[2]} in
+  doc)
+    _arguments -s -w \
+      "-c[symbol matching honors case (paths not affected)]" \
+      "-cmd[show symbols with package docs even if package is a command]" \
+      "-u[show unexported symbols as well as exported]" \
+      "2:importpaths:__go_packages" \
+      ":next identifiers:__go_identifiers"
+    ;;
+  clean)
+    _arguments -s -w \
+      "-i[remove the corresponding installed archive or binary (what 'go install' would create)]" \
+      "-n[print the remove commands it would execute, but not run them]" \
+      "-r[apply recursively to all the dependencies of the packages named by the import paths]" \
+      "-x[print remove commands as it executes them]" \
+      "*:importpaths:__go_packages"
+    ;;
+  fix|fmt|vet)
+    _alternative ':importpaths:__go_packages' ':files:_path_files -g "*.go"'
+    ;;
+  install)
+    _arguments -s -w : ${build_flags[@]} \
+      "-v[show package names]" \
+      '*:importpaths:__go_packages'
+    ;;
+  get)
+    _arguments -s -w : \
+      ${build_flags[@]}
+    ;;
+  build)
+    _arguments -s -w : \
+      ${build_flags[@]} \
+      "-v[show package names]" \
+      "-o[output file]:file:_files" \
+      "*:args:{ _alternative ':importpaths:__go_packages' ':files:_path_files -g \"*.go\"' }"
+    ;;
+  test)
+    _arguments -s -w : \
+      ${build_flags[@]} \
+      "-c[do not run, compile the test binary]" \
+      "-i[do not run, install dependencies]" \
+      "-v[print test output]" \
+      "-x[print the commands]" \
+      "-short[use short mode]" \
+      "-parallel[number of parallel tests]:number" \
+      "-cpu[values of GOMAXPROCS to use]:number list" \
+      "-run[run tests and examples matching regexp]:regexp" \
+      "-bench[run benchmarks matching regexp]:regexp" \
+      "-benchmem[print memory allocation stats]" \
+      "-benchtime[run each benchmark until taking this long]:duration" \
+      "-blockprofile[write goroutine blocking profile to file]:file" \
+      "-blockprofilerate[set sampling rate of goroutine blocking profile]:number" \
+      "-timeout[kill test after that duration]:duration" \
+      "-cpuprofile[write CPU profile to file]:file:_files" \
+      "-memprofile[write heap profile to file]:file:_files" \
+      "-memprofilerate[set heap profiling rate]:number" \
+      "*:args:{ _alternative ':importpaths:__go_packages' ':files:_path_files -g \"*.go\"' }"
+    ;;
+  list)
+    _arguments -s -w : \
+      "-f[alternative format for the list]:format" \
+      "-json[print data in json format]" \
+      "-compiled[set CompiledGoFiles to the Go source files presented to the compiler]" \
+      "-deps[iterate over not just the named packages but also all their dependencies]" \
+      "-e[change the handling of erroneous packages]" \
+      "-export[set the Export field to the name of a file containing up-to-date export information for the given package]" \
+      "-find[identify the named packages but not resolve their dependencies]" \
+      "-test[report not only the named packages but also their test binaries]" \
+      "-m[list modules instead of packages]" \
+      "-u[adds information about available upgrades]" \
+      "-versions[set the Module's Versions field to a list of all known versions of that module]:number" \
+      "*:importpaths:__go_packages"
+    ;;
+  mod)
+    local -a mod_commands
+    mod_commands+=(
+      'download[download modules to local cache]'
+      'edit[edit go.mod from tools or scripts]'
+      'graph[print module requirement graph]'
+      'init[initialize new module in current directory]'
+      'tidy[add missing and remove unused modules]'
+      'vendor[make vendored copy of dependencies]'
+      'verify[verify dependencies have expected content]'
+      'why[explain why packages or modules are needed]'
+    )
+
+    if (( CURRENT == 3 )); then
+      _values 'go mod commands' ${mod_commands[@]} "help[display help]"
+      return
+    fi
+
+    case ${words[3]} in
+    help)
+      _values 'go mod commands' ${mod_commands[@]}
+      ;;
+    download)
+      _arguments -s -w : \
+        "-json[print a sequence of JSON objects standard output]" \
+        "*:flags"
+      ;;
+    edit)
+      _arguments -s -w : \
+        "-fmt[reformat the go.mod file]" \
+        "-module[change the module's path]" \
+        "-replace[=old{@v}=new{@v} add a replacement of the given module path and version pair]:name" \
+        "-dropreplace[=old{@v}=new{@v} drop a replacement of the given module path and version pair]:name" \
+        "-go[={version} set the expected Go language version]:number" \
+        "-print[print the final go.mod in its text format]" \
+        "-json[print the final go.mod file in JSON format]" \
+        "*:flags"
+      ;;
+    graph)
+      ;;
+    init)
+      ;;
+    tidy)
+      _arguments -s -w : \
+        "-v[print information about removed modules]" \
+        "*:flags"
+      ;;
+    vendor)
+      _arguments -s -w : \
+        "-v[print the names of vendored]" \
+        "*:flags"
+      ;;
+    verify)
+      ;;
+    why)
+      _arguments -s -w : \
+        "-m[treats the arguments as a list of modules and finds a path to any package in each of the modules]" \
+        "-vendor[exclude tests of dependencies]" \
+        "*:importpaths:__go_packages"
+      ;;
+    esac
+    ;;
+  help)
+    _values "${commands[@]}" \
+      'environment[show Go environment variables available]' \
+      'gopath[GOPATH environment variable]' \
+      'packages[description of package lists]' \
+      'remote[remote import path syntax]' \
+      'testflag[description of testing flags]' \
+      'testfunc[description of testing functions]'
+    ;;
+  run)
+    _arguments -s -w : \
+      ${build_flags[@]} \
+      '*:file:_files -g "*.go"'
+    ;;
+  tool)
+    if (( CURRENT == 3 )); then
+        _values "go tool" $(go tool)
+        return
+    fi
+    case ${words[3]} in
+    [568]g)
+        _arguments -s -w : \
+            '-I[search for packages in DIR]:includes:_path_files -/' \
+            '-L[show full path in file:line prints]' \
+            '-S[print the assembly language]' \
+            '-V[print the compiler version]' \
+            '-e[no limit on number of errors printed]' \
+            '-h[panic on an error]' \
+            '-l[disable inlining]' \
+            '-m[print optimization decisions]' \
+            '-o[file specify output file]:file' \
+            '-p[assumed import path for this code]:importpath' \
+            '-u[disable package unsafe]' \
+            "*:file:_files -g '*.go'"
+        ;;
+    [568]l)
+        local O=${words[3]%l}
+        _arguments -s -w : \
+            '-o[file specify output file]:file' \
+            '-L[search for packages in DIR]:includes:_path_files -/' \
+            "*:file:_files -g '*.[ao$O]'"
+        ;;
+    dist)
+        _values "dist tool" banner bootstrap clean env install version
+        ;;
+    *)
+        # use files by default
+        _files
+        ;;
+    esac
+    ;;
+  esac
+}
+
+_go "$@"
diff --git a/plugins/golang/golang.plugin.zsh b/plugins/golang/golang.plugin.zsh
index 6d1eb40c2..4dafecd86 100644
--- a/plugins/golang/golang.plugin.zsh
+++ b/plugins/golang/golang.plugin.zsh
@@ -1,3 +1,7 @@
+## completion
+compctl -g "*.go" gofmt # standard go tools
+compctl -g "*.go" gccgo # gccgo
+
 # gc
 for p in 5 6 8; do
   compctl -g "*.${p}" ${p}l
@@ -5,256 +9,7 @@ for p in 5 6 8; do
 done
 unset p
 
-# standard go tools
-compctl -g "*.go" gofmt
-
-# gccgo
-compctl -g "*.go" gccgo
-
-# go tool
-__go_tool_complete() {
-  typeset -a commands build_flags
-  commands+=(
-    'build[compile packages and dependencies]'
-    'clean[remove object files]'
-    'doc[run godoc on package sources]'
-    'env[print Go environment information]'
-    'fix[run go tool fix on packages]'
-    'fmt[run gofmt on package sources]'
-    'generate[generate Go files by processing source]'
-    'get[download and install packages and dependencies]'
-    'help[display help]'
-    'install[compile and install packages and dependencies]'
-    'list[list packages]'
-    'mod[modules maintenance]'
-    'run[compile and run Go program]'
-    'test[test packages]'
-    'tool[run specified go tool]'
-    'version[print Go version]'
-    'vet[run go tool vet on packages]'
-  )
-  if (( CURRENT == 2 )); then
-    # explain go commands
-    _values 'go tool commands' ${commands[@]}
-    return
-  fi
-  build_flags=(
-    '-a[force reinstallation of packages that are already up to date]'
-    '-n[print the commands but do not run them]'
-    '-p[number of parallel builds]:number'
-    '-race[enable data race detection]'
-    '-x[print the commands]'
-    '-work[print temporary directory name and keep it]'
-    '-ccflags[flags for 5c/6c/8c]:flags'
-    '-gcflags[flags for 5g/6g/8g]:flags'
-    '-ldflags[flags for 5l/6l/8l]:flags'
-    '-gccgoflags[flags for gccgo]:flags'
-    '-compiler[name of compiler to use]:name'
-    '-installsuffix[suffix to add to package directory]:suffix'
-    '-tags[list of build tags to consider satisfied]:tags'
-  )
-  __go_packages() {
-      local gopaths
-      declare -a gopaths
-      gopaths=("${(s/:/)$(go env GOPATH)}")
-      gopaths+=("$(go env GOROOT)")
-      for p in $gopaths; do
-        _path_files -W "$p/src" -/
-      done
-  }
-  __go_identifiers() {
-      compadd $(godoc -templates $ZSH/plugins/golang/templates ${words[-2]} 2> /dev/null)
-  }
-  case ${words[2]} in
-  doc)
-    _arguments -s -w \
-      "-c[symbol matching honors case (paths not affected)]" \
-      "-cmd[show symbols with package docs even if package is a command]" \
-      "-u[show unexported symbols as well as exported]" \
-      "2:importpaths:__go_packages" \
-      ":next identifiers:__go_identifiers"
-      ;;
-  clean)
-    _arguments -s -w \
-      "-i[remove the corresponding installed archive or binary (what 'go install' would create)]" \
-      "-n[print the remove commands it would execute, but not run them]" \
-      "-r[apply recursively to all the dependencies of the packages named by the import paths]" \
-      "-x[print remove commands as it executes them]" \
-      "*:importpaths:__go_packages"
-      ;;
-  fix|fmt|vet)
-      _alternative ':importpaths:__go_packages' ':files:_path_files -g "*.go"'
-      ;;
-  install)
-      _arguments -s -w : ${build_flags[@]} \
-        "-v[show package names]" \
-        '*:importpaths:__go_packages'
-      ;;
-  get)
-      _arguments -s -w : \
-        ${build_flags[@]}
-      ;;
-  build)
-      _arguments -s -w : \
-        ${build_flags[@]} \
-        "-v[show package names]" \
-        "-o[output file]:file:_files" \
-        "*:args:{ _alternative ':importpaths:__go_packages' ':files:_path_files -g \"*.go\"' }"
-      ;;
-  test)
-      _arguments -s -w : \
-        ${build_flags[@]} \
-        "-c[do not run, compile the test binary]" \
-        "-i[do not run, install dependencies]" \
-        "-v[print test output]" \
-        "-x[print the commands]" \
-        "-short[use short mode]" \
-        "-parallel[number of parallel tests]:number" \
-        "-cpu[values of GOMAXPROCS to use]:number list" \
-        "-run[run tests and examples matching regexp]:regexp" \
-        "-bench[run benchmarks matching regexp]:regexp" \
-        "-benchmem[print memory allocation stats]" \
-        "-benchtime[run each benchmark until taking this long]:duration" \
-        "-blockprofile[write goroutine blocking profile to file]:file" \
-        "-blockprofilerate[set sampling rate of goroutine blocking profile]:number" \
-        "-timeout[kill test after that duration]:duration" \
-        "-cpuprofile[write CPU profile to file]:file:_files" \
-        "-memprofile[write heap profile to file]:file:_files" \
-        "-memprofilerate[set heap profiling rate]:number" \
-        "*:args:{ _alternative ':importpaths:__go_packages' ':files:_path_files -g \"*.go\"' }"
-      ;;
-  list)
-      _arguments -s -w : \
-        "-f[alternative format for the list]:format" \
-        "-json[print data in json format]" \
-        "-compiled[set CompiledGoFiles to the Go source files presented to the compiler]" \
-        "-deps[iterate over not just the named packages but also all their dependencies]" \
-        "-e[change the handling of erroneous packages]" \
-        "-export[set the Export field to the name of a file containing up-to-date export information for the given package]" \
-        "-find[identify the named packages but not resolve their dependencies]" \
-        "-test[report not only the named packages but also their test binaries]" \
-        "-m[list modules instead of packages]" \
-        "-u[adds information about available upgrades]" \
-        "-versions[set the Module's Versions field to a list of all known versions of that module]:number" \
-        "*:importpaths:__go_packages"
-      ;;
-  mod)
-      typeset -a mod_commands
-      mod_commands+=(
-        'download[download modules to local cache]'
-        'edit[edit go.mod from tools or scripts]'
-        'graph[print module requirement graph]'
-        'init[initialize new module in current directory]'
-        'tidy[add missing and remove unused modules]'
-        'vendor[make vendored copy of dependencies]'
-        'verify[verify dependencies have expected content]'
-        'why[explain why packages or modules are needed]'
-      )
-      if (( CURRENT == 3 )); then
-          _values 'go mod commands' ${mod_commands[@]} "help[display help]"
-          return
-      fi
-      case ${words[3]} in
-      help)
-        _values 'go mod commands' ${mod_commands[@]}
-        ;;
-      download)
-        _arguments -s -w : \
-          "-json[print a sequence of JSON objects standard output]" \
-          "*:flags"
-        ;;
-      edit)
-        _arguments -s -w : \
-          "-fmt[reformat the go.mod file]" \
-          "-module[change the module's path]" \
-          "-replace[=old{@v}=new{@v} add a replacement of the given module path and version pair]:name" \
-          "-dropreplace[=old{@v}=new{@v} drop a replacement of the given module path and version pair]:name" \
-          "-go[={version} set the expected Go language version]:number" \
-          "-print[print the final go.mod in its text format]" \
-          "-json[print the final go.mod file in JSON format]" \
-          "*:flags"
-        ;;
-      graph)
-        ;;
-      init)   
-        ;;
-      tidy)
-        _arguments -s -w : \
-          "-v[print information about removed modules]" \
-          "*:flags"
-        ;;
-      vendor)
-        _arguments -s -w : \
-          "-v[print the names of vendored]" \
-          "*:flags"
-        ;;
-      verify)
-        ;;
-      why)
-        _arguments -s -w : \
-          "-m[treats the arguments as a list of modules and finds a path to any package in each of the modules]" \
-          "-vendor[exclude tests of dependencies]" \
-          "*:importpaths:__go_packages"
-        ;;
-      esac
-      ;;
-  help)
-      _values "${commands[@]}" \
-        'environment[show Go environment variables available]' \
-        'gopath[GOPATH environment variable]' \
-        'packages[description of package lists]' \
-        'remote[remote import path syntax]' \
-        'testflag[description of testing flags]' \
-        'testfunc[description of testing functions]'
-      ;;
-  run)
-      _arguments -s -w : \
-          ${build_flags[@]} \
-          '*:file:_files -g "*.go"'
-      ;;
-  tool)
-      if (( CURRENT == 3 )); then
-          _values "go tool" $(go tool)
-          return
-      fi
-      case ${words[3]} in
-      [568]g)
-          _arguments -s -w : \
-              '-I[search for packages in DIR]:includes:_path_files -/' \
-              '-L[show full path in file:line prints]' \
-              '-S[print the assembly language]' \
-              '-V[print the compiler version]' \
-              '-e[no limit on number of errors printed]' \
-              '-h[panic on an error]' \
-              '-l[disable inlining]' \
-              '-m[print optimization decisions]' \
-              '-o[file specify output file]:file' \
-              '-p[assumed import path for this code]:importpath' \
-              '-u[disable package unsafe]' \
-              "*:file:_files -g '*.go'"
-          ;;
-      [568]l)
-          local O=${words[3]%l}
-          _arguments -s -w : \
-              '-o[file specify output file]:file' \
-              '-L[search for packages in DIR]:includes:_path_files -/' \
-              "*:file:_files -g '*.[ao$O]'"
-          ;;
-      dist)
-          _values "dist tool" banner bootstrap clean env install version
-          ;;
-      *)
-          # use files by default
-          _files
-          ;;
-      esac
-      ;;
-  esac
-}
-
-compdef __go_tool_complete go
-
-# aliases: go<~>
+## aliases
 alias gob='go build'
 alias goc='go clean'
 alias god='go doc'

From ba069e7731b3afe90a393fb6a36f8f9bda795f8b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Sun, 26 Dec 2021 22:40:38 +0100
Subject: [PATCH 642/869] fix(installer): don't hard-code user `$HOME`
 directory on install

---
 tools/install.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/install.sh b/tools/install.sh
index 47166059d..d210d8cc9 100755
--- a/tools/install.sh
+++ b/tools/install.sh
@@ -251,7 +251,7 @@ setup_zshrc() {
   echo "${GREEN}Using the Oh My Zsh template file and adding it to ~/.zshrc.${RESET}"
 
   sed "/^export ZSH=/ c\\
-export ZSH=\"$ZSH\"
+export ZSH=\"${ZSH/$HOME\//\$HOME\/}\"
 " "$ZSH/templates/zshrc.zsh-template" > ~/.zshrc-omztemp
   mv -f ~/.zshrc-omztemp ~/.zshrc
 

From f85087005a966445e167bf7962f35032597663c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Sun, 26 Dec 2021 23:27:49 +0100
Subject: [PATCH 643/869] fix(installer): fix POSIX shell syntax of previous
 commit

---
 tools/install.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tools/install.sh b/tools/install.sh
index d210d8cc9..731d89a29 100755
--- a/tools/install.sh
+++ b/tools/install.sh
@@ -250,9 +250,9 @@ setup_zshrc() {
 
   echo "${GREEN}Using the Oh My Zsh template file and adding it to ~/.zshrc.${RESET}"
 
-  sed "/^export ZSH=/ c\\
-export ZSH=\"${ZSH/$HOME\//\$HOME\/}\"
-" "$ZSH/templates/zshrc.zsh-template" > ~/.zshrc-omztemp
+  # Replace $HOME path with '$HOME' in $ZSH variable in .zshrc file
+  omz=$(echo "$ZSH" | sed "s|^$HOME/|\$HOME/|")
+  sed "s|^export ZSH=.*$|export ZSH=\"${omz}\"|" "$ZSH/templates/zshrc.zsh-template" > ~/.zshrc-omztemp
   mv -f ~/.zshrc-omztemp ~/.zshrc
 
   echo

From 0f1de0871327f29c437e3cb0e99c48123892e453 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Sun, 26 Dec 2021 23:29:58 +0100
Subject: [PATCH 644/869] fix(gnu-utils): always reapply GNU coreutils on
 `rehash`

---
 plugins/gnu-utils/gnu-utils.plugin.zsh | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/plugins/gnu-utils/gnu-utils.plugin.zsh b/plugins/gnu-utils/gnu-utils.plugin.zsh
index 539e7fe4d..5b8f71c8a 100644
--- a/plugins/gnu-utils/gnu-utils.plugin.zsh
+++ b/plugins/gnu-utils/gnu-utils.plugin.zsh
@@ -73,11 +73,6 @@ function hash() {
 }
 
 function rehash() {
-  if [[ "$*" =~ "-f" ]]; then
-    builtin rehash "$@"
-    __gnu_utils
-  else
-    builtin rehash "$@"
-  fi
+  builtin rehash "$@"
+  __gnu_utils
 }
-

From 8cb53ba692a3df24a9b3159ef221ec3cf8d058e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Mon, 27 Dec 2021 17:34:06 +0100
Subject: [PATCH 645/869] fix(gnu-utils): reassign GNU utils on `preexec`
 (#10535)

The previous version rebound the `hash` and `rehash` builtins to
reassing GNU utils when they were called. This didn't take into
account that when `$PATH` changes, the commands are rehashed as
well.

This version adds a preexec hook to reassign the GNU utilities
before running any command, if and only if they aren't already
reassigned. This is checked by looking at the `whoami` command.

Fixes #10535
---
 plugins/gnu-utils/gnu-utils.plugin.zsh | 38 +++++++-------------------
 1 file changed, 10 insertions(+), 28 deletions(-)

diff --git a/plugins/gnu-utils/gnu-utils.plugin.zsh b/plugins/gnu-utils/gnu-utils.plugin.zsh
index 5b8f71c8a..6ede9e3a7 100644
--- a/plugins/gnu-utils/gnu-utils.plugin.zsh
+++ b/plugins/gnu-utils/gnu-utils.plugin.zsh
@@ -11,11 +11,8 @@ if [[ ! -x "${commands[gwhoami]}" ]]; then
 fi
 
 __gnu_utils() {
-  emulate -L zsh
-  local gcmds
+  local -a gcmds
   local gcmd
-  local cmd
-  local prefix
 
   # coreutils 
   gcmds=('g[' 'gbase64' 'gbasename' 'gcat' 'gchcon' 'gchgrp' 'gchmod'
@@ -43,36 +40,21 @@ __gnu_utils() {
     (( ${+commands[$gcmd]} )) || continue
     
     # This method allows for builtin commands to be primary but it's
-    # lost if hash -r or rehash -f is executed. Thus, those two 
-    # functions have to be wrapped.
+    # lost if hash -r or rehash is executed, or if $PATH is updated.
+    # Thus, a preexec hook is needed, which will only run if whoami
+    # is not already rehashed.
     #
     hash ${gcmd[2,-1]}=${commands[$gcmd]}
-
-    # This method generates wrapper functions.
-    # It will override shell builtins.
-    #
-    # eval "function $gcmd[2,-1]() { \"${prefix}/${gcmd//"["/"\\["}\" \"\$@\"; }"
-
-    # This method is inflexible since the aliases are at risk of being
-    # overridden resulting in the BSD coreutils being called.
-    #
-    # alias "$gcmd[2,-1]"="${prefix}/${gcmd//"["/"\\["}"
   done
 
   return 0
 }
-__gnu_utils
 
-function hash() {
-  if [[ "$*" =~ "-(r|f)" ]]; then
-    builtin hash "$@"
-    __gnu_utils
-  else
-    builtin hash "$@"
-  fi
+__gnu_utils_preexec() {
+  # Run __gnu_utils when the whoami command is not already rehashed.
+  # This acts as a sign that we need to rehash all GNU utils.
+  [[ "${commands[whoami]}" = "${commands[gwhoami]}" ]] || __gnu_utils
 }
 
-function rehash() {
-  builtin rehash "$@"
-  __gnu_utils
-}
+autoload -Uz add-zsh-hook
+add-zsh-hook preexec __gnu_utils_preexec

From 634296be3c985ed475ffbc1c0ffabe7ebd698808 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Tue, 28 Dec 2021 11:04:13 +0100
Subject: [PATCH 646/869] fix(random): fix negated logic in
 `ZSH_THEME_RANDOM_QUIET`

---
 themes/random.zsh-theme | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/themes/random.zsh-theme b/themes/random.zsh-theme
index 173d5b33f..28af84e23 100644
--- a/themes/random.zsh-theme
+++ b/themes/random.zsh-theme
@@ -42,6 +42,6 @@ else
   return 1
 fi
 
-if [[ "$ZSH_THEME_RANDOM_QUIET" = true ]]; then
+if [[ "$ZSH_THEME_RANDOM_QUIET" != true ]]; then
   echo "[oh-my-zsh] Random theme '${RANDOM_THEME}' loaded"
 fi

From a33ae92f4d78d4e4089d4d04a1d9f18bb11f39e1 Mon Sep 17 00:00:00 2001
From: QuarticCat <QuarticCat@protonmail.com>
Date: Sun, 7 Nov 2021 00:45:51 +0800
Subject: [PATCH 647/869] refactor(rustup): generate completion file in the
 background (#10392)

Closes #10392
---
 plugins/rustup/rustup.plugin.zsh | 44 +++++++++++++++++---------------
 1 file changed, 23 insertions(+), 21 deletions(-)

diff --git a/plugins/rustup/rustup.plugin.zsh b/plugins/rustup/rustup.plugin.zsh
index c6efc1b13..af8cf03a2 100644
--- a/plugins/rustup/rustup.plugin.zsh
+++ b/plugins/rustup/rustup.plugin.zsh
@@ -1,22 +1,24 @@
-if (( $+commands[rustup] )); then
-  # remove old generated completion file
-  command rm -f "${0:A:h}/_rustup"
-
-  ver="$(rustup --version 2>/dev/null)"
-  ver_file="$ZSH_CACHE_DIR/rustup_version"
-  comp_file="$ZSH_CACHE_DIR/completions/_rustup"
-
-  mkdir -p "${comp_file:h}"
-  (( ${fpath[(Ie)${comp_file:h}]} )) || fpath=("${comp_file:h}" $fpath)
-
-  if [[ ! -f "$comp_file" || ! -f "$ver_file" || "$ver" != "$(< "$ver_file")" ]]; then
-    rustup completions zsh >| "$comp_file"
-    echo "$ver" >| "$ver_file"
-  fi
-
-  declare -A _comps
-  autoload -Uz _rustup
-  _comps[rustup]=_rustup
-
-  unset ver ver_file comp_file
+if (( ! $+commands[rustup] )); then
+  return
 fi
+
+# Remove old generated completion file
+# TODO: 2021-09-15: remove this line
+command rm -f "${0:A:h}/_rustup"
+
+# Add completions/ folder in $ZSH_CACHE_DIR
+comp_file="$ZSH_CACHE_DIR/completions/_rustup"
+command mkdir -p "${comp_file:h}"
+(( ${fpath[(Ie)"$ZSH_CACHE_DIR/completions"]} )) || fpath=("$ZSH_CACHE_DIR/completions" $fpath)
+
+# If the completion file doesn't exist yet, we need to autoload it and
+# bind it to `rustup`. Otherwise, compinit will have already done that
+if [[ ! -f "$comp_file" ]]; then
+  autoload -Uz _rustup
+  declare -A _comps
+  _comps[rustup]=_rustup
+fi
+
+# Generate completion file in the background
+rustup completions zsh >| "$comp_file" &|
+unset comp_file

From 5fbd4c83f6e70a66c555fc7ace7dda2c056b8663 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Tue, 28 Dec 2021 11:42:17 +0100
Subject: [PATCH 648/869] refactor(cargo): generate completion file in the
 background

---
 plugins/cargo/cargo.plugin.zsh | 45 +++++++++++++++++-----------------
 1 file changed, 23 insertions(+), 22 deletions(-)

diff --git a/plugins/cargo/cargo.plugin.zsh b/plugins/cargo/cargo.plugin.zsh
index 7082d2d55..9d1d23757 100644
--- a/plugins/cargo/cargo.plugin.zsh
+++ b/plugins/cargo/cargo.plugin.zsh
@@ -1,23 +1,24 @@
-if (( $+commands[rustup] && $+commands[cargo] )); then
-  # remove old generated completion file
-  command rm -f "${0:A:h}/_cargo"
-
-  # generate new completion file
-  ver="$(cargo --version)"
-  ver_file="$ZSH_CACHE_DIR/cargo_version"
-  comp_file="$ZSH_CACHE_DIR/completions/_cargo"
-
-  mkdir -p "${comp_file:h}"
-  (( ${fpath[(Ie)${comp_file:h}]} )) || fpath=("${comp_file:h}" $fpath)
-
-  if [[ ! -f "$comp_file" || ! -f "$ver_file" || "$ver" != "$(< "$ver_file")" ]]; then
-    rustup completions zsh cargo >| "$comp_file"
-    echo "$ver" >| "$ver_file"
-  fi
-
-  declare -A _comps
-  autoload -Uz _cargo
-  _comps[cargo]=_cargo
-
-  unset ver ver_file comp_file
+if ! (( $+commands[rustup] && $+commands[cargo] )); then
+  return
 fi
+
+# Remove old generated completion file
+# TODO: 2021-09-15: remove this line
+command rm -f "${0:A:h}/_cargo"
+
+# Add completions/ folder in $ZSH_CACHE_DIR
+comp_file="$ZSH_CACHE_DIR/completions/_cargo"
+command mkdir -p "${comp_file:h}"
+(( ${fpath[(Ie)"$ZSH_CACHE_DIR/completions"]} )) || fpath=("$ZSH_CACHE_DIR/completions" $fpath)
+
+# If the completion file doesn't exist yet, we need to autoload it and
+# bind it to `cargo`. Otherwise, compinit will have already done that
+if [[ ! -f "$comp_file" ]]; then
+  autoload -Uz _cargo
+  declare -A _comps
+  _comps[cargo]=_cargo
+fi
+
+# Generate completion file in the background
+rustup completions zsh cargo >| "$comp_file" &|
+unset comp_file

From 89a740be2d5487c96f01e4eaae7e280caf555019 Mon Sep 17 00:00:00 2001
From: Carlo Sala <carlosalag@protonmail.com>
Date: Wed, 6 Oct 2021 22:43:09 +0200
Subject: [PATCH 649/869] refactor(rust)!: merge `cargo` and `rustup` plugins
 into `rust` plugin (#10270)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

BREAKING CHANGE: `cargo` and `rustup` plugins have been moved to the `rust` plugin
since they're part of the Rust toolchain. If you're using these, update your .zshrc
file to use `rust` instead.

Closes #10270

Co-authored-by: Marc Cornellà <hello@mcornella.com>
---
 plugins/cargo/README.md          | 10 +---------
 plugins/cargo/cargo.plugin.zsh   | 27 +++++++--------------------
 plugins/rust/README.md           |  2 +-
 plugins/rust/{_rust => _rustc}   |  0
 plugins/rust/rust.plugin.zsh     | 28 ++++++++++++++++++++++++++++
 plugins/rustup/README.md         |  8 +-------
 plugins/rustup/rustup.plugin.zsh | 27 +++++++--------------------
 7 files changed, 45 insertions(+), 57 deletions(-)
 rename plugins/rust/{_rust => _rustc} (100%)
 create mode 100644 plugins/rust/rust.plugin.zsh

diff --git a/plugins/cargo/README.md b/plugins/cargo/README.md
index 31bae4efe..93e69ae7f 100644
--- a/plugins/cargo/README.md
+++ b/plugins/cargo/README.md
@@ -1,11 +1,3 @@
 # cargo
 
-This plugin adds completion for the Rust build tool [`Cargo`](https://github.com/rust-lang/cargo).
-
-To use it, add `cargo` to the plugins array in your zshrc file:
-
-```zsh
-plugins=(... cargo)
-```
-
-Updated on March 3rd, 2019, from [Cargo 0.34.0](https://github.com/rust-lang/cargo/releases/tag/0.34.0).
+**Deprecated: use the [`rust`](https://github.com/ohmyzsh/ohmyzsh/tree/master/plugins/rust) plugin instead.**
diff --git a/plugins/cargo/cargo.plugin.zsh b/plugins/cargo/cargo.plugin.zsh
index 9d1d23757..51a80d4f1 100644
--- a/plugins/cargo/cargo.plugin.zsh
+++ b/plugins/cargo/cargo.plugin.zsh
@@ -1,24 +1,11 @@
-if ! (( $+commands[rustup] && $+commands[cargo] )); then
-  return
-fi
+print ${(%):-'%F{yellow}The `cargo` plugin is deprecated and has been moved to the `rust` plugin.'}
+print ${(%):-'Please update your .zshrc to use the `%Brust%b` plugin instead.%f'}
 
 # Remove old generated completion file
-# TODO: 2021-09-15: remove this line
+# TODO: 2021-12-28: remove this line
 command rm -f "${0:A:h}/_cargo"
 
-# Add completions/ folder in $ZSH_CACHE_DIR
-comp_file="$ZSH_CACHE_DIR/completions/_cargo"
-command mkdir -p "${comp_file:h}"
-(( ${fpath[(Ie)"$ZSH_CACHE_DIR/completions"]} )) || fpath=("$ZSH_CACHE_DIR/completions" $fpath)
-
-# If the completion file doesn't exist yet, we need to autoload it and
-# bind it to `cargo`. Otherwise, compinit will have already done that
-if [[ ! -f "$comp_file" ]]; then
-  autoload -Uz _cargo
-  declare -A _comps
-  _comps[cargo]=_cargo
-fi
-
-# Generate completion file in the background
-rustup completions zsh cargo >| "$comp_file" &|
-unset comp_file
+(( ${fpath[(Ie)$ZSH/plugins/rust]} )) || {
+  fpath=("$ZSH/plugins/rust" $fpath)
+  source "$ZSH/plugins/rust/rust.plugin.zsh"
+}
diff --git a/plugins/rust/README.md b/plugins/rust/README.md
index 83d7d91ba..e05364474 100644
--- a/plugins/rust/README.md
+++ b/plugins/rust/README.md
@@ -1,6 +1,6 @@
 # rust
 
-This plugin adds completion for [`rustc`](https://doc.rust-lang.org/rustc/index.html), the compiler for the Rust programming language.
+This plugin adds completion for [`rustc`](https://doc.rust-lang.org/rustc/index.html), the compiler for the Rust programming language, as well as for `rustup` and `cargo` if you have the Rust toolchain installed.
 
 To use it, add `rust` to the plugins array in your zshrc file:
 
diff --git a/plugins/rust/_rust b/plugins/rust/_rustc
similarity index 100%
rename from plugins/rust/_rust
rename to plugins/rust/_rustc
diff --git a/plugins/rust/rust.plugin.zsh b/plugins/rust/rust.plugin.zsh
new file mode 100644
index 000000000..ced6eb4aa
--- /dev/null
+++ b/plugins/rust/rust.plugin.zsh
@@ -0,0 +1,28 @@
+if ! (( $+commands[rustup] && $+commands[cargo] )); then
+  return
+fi
+
+# Add completions folder in $ZSH_CACHE_DIR
+# TODO: 2021-12-28: remove this bit of code as it exists in oh-my-zsh.sh
+command mkdir -p "$ZSH_CACHE_DIR/completions"
+(( ${fpath[(Ie)"$ZSH_CACHE_DIR/completions"]} )) || fpath=("$ZSH_CACHE_DIR/completions" $fpath)
+
+# If the completion file doesn't exist yet, we need to autoload it and
+# bind it to `cargo`. Otherwise, compinit will have already done that
+if [[ ! -f "$ZSH_CACHE_DIR/completions/_cargo" ]]; then
+  autoload -Uz _cargo
+  declare -A _comps
+  _comps[cargo]=_cargo
+fi
+
+# If the completion file doesn't exist yet, we need to autoload it and
+# bind it to `rustup`. Otherwise, compinit will have already done that
+if [[ ! -f "$ZSH_CACHE_DIR/completions/_rustup" ]]; then
+  autoload -Uz _rustup
+  declare -A _comps
+  _comps[rustup]=_rustup
+fi
+
+# Generate completion files in the background
+rustup completions zsh >| "$ZSH_CACHE_DIR/completions/_rustup" &|
+rustup completions zsh cargo >| "$ZSH_CACHE_DIR/completions/_cargo" &|
diff --git a/plugins/rustup/README.md b/plugins/rustup/README.md
index ba037f8f6..c620e72a8 100644
--- a/plugins/rustup/README.md
+++ b/plugins/rustup/README.md
@@ -1,9 +1,3 @@
 # rustup
 
-This plugin adds completion for [`rustup`](https://rustup.rs/), the toolchain installer for the Rust programming language.
-
-To use it, add `rustup` to the plugins array in your zshrc file:
-
-```zsh
-plugins=(... rustup)
-```
+**Deprecated: use the [`rust`](https://github.com/ohmyzsh/ohmyzsh/tree/master/plugins/rust) plugin instead.**
diff --git a/plugins/rustup/rustup.plugin.zsh b/plugins/rustup/rustup.plugin.zsh
index af8cf03a2..0ca745b7e 100644
--- a/plugins/rustup/rustup.plugin.zsh
+++ b/plugins/rustup/rustup.plugin.zsh
@@ -1,24 +1,11 @@
-if (( ! $+commands[rustup] )); then
-  return
-fi
+print ${(%):-'%F{yellow}The `rustup` plugin is deprecated and has been moved to the `rust` plugin.'}
+print ${(%):-'Please update your .zshrc to use the `%Brust%b` plugin instead.%f'}
 
 # Remove old generated completion file
-# TODO: 2021-09-15: remove this line
+# TODO: 2021-12-28: remove this line
 command rm -f "${0:A:h}/_rustup"
 
-# Add completions/ folder in $ZSH_CACHE_DIR
-comp_file="$ZSH_CACHE_DIR/completions/_rustup"
-command mkdir -p "${comp_file:h}"
-(( ${fpath[(Ie)"$ZSH_CACHE_DIR/completions"]} )) || fpath=("$ZSH_CACHE_DIR/completions" $fpath)
-
-# If the completion file doesn't exist yet, we need to autoload it and
-# bind it to `rustup`. Otherwise, compinit will have already done that
-if [[ ! -f "$comp_file" ]]; then
-  autoload -Uz _rustup
-  declare -A _comps
-  _comps[rustup]=_rustup
-fi
-
-# Generate completion file in the background
-rustup completions zsh >| "$comp_file" &|
-unset comp_file
+(( ${fpath[(Ie)$ZSH/plugins/rust]} )) || {
+  fpath=("$ZSH/plugins/rust" $fpath)
+  source "$ZSH/plugins/rust/rust.plugin.zsh"
+}

From 2d32e9be668672c110405aa2952ab8adaf374856 Mon Sep 17 00:00:00 2001
From: Curtis Rueden <ctrueden@wisc.edu>
Date: Sat, 18 Dec 2021 14:53:49 -0600
Subject: [PATCH 650/869] refactor: handle `$0` according to the Zsh plugin
 standard (#10518)

For details and rationale, see:
https://zdharma-continuum.github.io/Zsh-100-Commits-Club/Zsh-Plugin-Standard.html

Closes #10518
---
 plugins/cargo/cargo.plugin.zsh                              | 6 +++++-
 plugins/colemak/colemak.plugin.zsh                          | 5 +++++
 plugins/colored-man-pages/colored-man-pages.plugin.zsh      | 5 +++++
 plugins/deno/deno.plugin.zsh                                | 5 +++++
 plugins/emacs/emacs.plugin.zsh                              | 5 +++++
 plugins/emoji/emoji.plugin.zsh                              | 5 +++++
 plugins/emotty/emotty.plugin.zsh                            | 5 +++++
 plugins/fnm/fnm.plugin.zsh                                  | 5 +++++
 plugins/gh/gh.plugin.zsh                                    | 5 +++++
 plugins/git-prompt/git-prompt.plugin.zsh                    | 5 +++++
 plugins/gitfast/gitfast.plugin.zsh                          | 5 +++++
 .../history-substring-search.plugin.zsh                     | 6 +++++-
 plugins/hitchhiker/hitchhiker.plugin.zsh                    | 5 +++++
 plugins/macos/macos.plugin.zsh                              | 5 +++++
 plugins/rustup/rustup.plugin.zsh                            | 6 +++++-
 plugins/tmux/tmux.plugin.zsh                                | 5 +++++
 plugins/wd/wd.plugin.zsh                                    | 5 +++++
 plugins/z/z.plugin.zsh                                      | 5 +++++
 .../zsh-navigation-tools/zsh-navigation-tools.plugin.zsh    | 1 +
 19 files changed, 91 insertions(+), 3 deletions(-)

diff --git a/plugins/cargo/cargo.plugin.zsh b/plugins/cargo/cargo.plugin.zsh
index 51a80d4f1..20aeb6652 100644
--- a/plugins/cargo/cargo.plugin.zsh
+++ b/plugins/cargo/cargo.plugin.zsh
@@ -1,8 +1,12 @@
 print ${(%):-'%F{yellow}The `cargo` plugin is deprecated and has been moved to the `rust` plugin.'}
 print ${(%):-'Please update your .zshrc to use the `%Brust%b` plugin instead.%f'}
 
+# TODO: 2021-12-28: remove this block
+# Handle $0 according to the standard:
+# # https://zdharma-continuum.github.io/Zsh-100-Commits-Club/Zsh-Plugin-Standard.html
+0="${${ZERO:-${0:#$ZSH_ARGZERO}}:-${(%):-%N}}"
+0="${${(M)0:#/*}:-$PWD/$0}"
 # Remove old generated completion file
-# TODO: 2021-12-28: remove this line
 command rm -f "${0:A:h}/_cargo"
 
 (( ${fpath[(Ie)$ZSH/plugins/rust]} )) || {
diff --git a/plugins/colemak/colemak.plugin.zsh b/plugins/colemak/colemak.plugin.zsh
index 8d3393c44..de0b5b866 100644
--- a/plugins/colemak/colemak.plugin.zsh
+++ b/plugins/colemak/colemak.plugin.zsh
@@ -19,6 +19,11 @@ bindkey -a 'N' vi-join
 bindkey -a 'j' vi-forward-word-end
 bindkey -a 'J' vi-forward-blank-word-end
 
+# Handle $0 according to the standard:
+# # https://zdharma-continuum.github.io/Zsh-100-Commits-Club/Zsh-Plugin-Standard.html
+0="${${ZERO:-${0:#$ZSH_ARGZERO}}:-${(%):-%N}}"
+0="${${(M)0:#/*}:-$PWD/$0}"
+
 # New less versions will read this file directly
 export LESSKEYIN="${0:h:A}/colemak-less"
 
diff --git a/plugins/colored-man-pages/colored-man-pages.plugin.zsh b/plugins/colored-man-pages/colored-man-pages.plugin.zsh
index 37faed672..040e74fc9 100644
--- a/plugins/colored-man-pages/colored-man-pages.plugin.zsh
+++ b/plugins/colored-man-pages/colored-man-pages.plugin.zsh
@@ -16,6 +16,11 @@ less_termcap[se]="${reset_color}"
 less_termcap[us]="${fg_bold[green]}"
 less_termcap[ue]="${reset_color}"
 
+# Handle $0 according to the standard:
+# # https://zdharma-continuum.github.io/Zsh-100-Commits-Club/Zsh-Plugin-Standard.html
+0="${${ZERO:-${0:#$ZSH_ARGZERO}}:-${(%):-%N}}"
+0="${${(M)0:#/*}:-$PWD/$0}"
+
 # Absolute path to this file's directory.
 typeset __colored_man_pages_dir="${0:A:h}"
 
diff --git a/plugins/deno/deno.plugin.zsh b/plugins/deno/deno.plugin.zsh
index eb7191971..88df55af7 100644
--- a/plugins/deno/deno.plugin.zsh
+++ b/plugins/deno/deno.plugin.zsh
@@ -13,6 +13,11 @@ alias dup='deno upgrade'
 
 # COMPLETION FUNCTION
 if (( $+commands[deno] )); then
+  # Handle $0 according to the standard:
+  # # https://zdharma-continuum.github.io/Zsh-100-Commits-Club/Zsh-Plugin-Standard.html
+  0="${${ZERO:-${0:#$ZSH_ARGZERO}}:-${(%):-%N}}"
+  0="${${(M)0:#/*}:-$PWD/$0}"
+
   # remove old generated completion file
   command rm -f "${0:A:h}/_deno"
 
diff --git a/plugins/emacs/emacs.plugin.zsh b/plugins/emacs/emacs.plugin.zsh
index 027c7550f..258e57f24 100644
--- a/plugins/emacs/emacs.plugin.zsh
+++ b/plugins/emacs/emacs.plugin.zsh
@@ -13,6 +13,11 @@
 autoload -Uz is-at-least
 is-at-least 24 "${${(Az)"$(emacsclient --version 2>/dev/null)"}[2]}" || return 0
 
+# Handle $0 according to the standard:
+# # https://zdharma-continuum.github.io/Zsh-100-Commits-Club/Zsh-Plugin-Standard.html
+0="${${ZERO:-${0:#$ZSH_ARGZERO}}:-${(%):-%N}}"
+0="${${(M)0:#/*}:-$PWD/$0}"
+
 # Path to custom emacsclient launcher
 export EMACS_PLUGIN_LAUNCHER="${0:A:h}/emacsclient.sh"
 
diff --git a/plugins/emoji/emoji.plugin.zsh b/plugins/emoji/emoji.plugin.zsh
index f70e09320..60d00d976 100644
--- a/plugins/emoji/emoji.plugin.zsh
+++ b/plugins/emoji/emoji.plugin.zsh
@@ -4,6 +4,11 @@
 #
 # See the README for documentation.
 
+# Handle $0 according to the standard:
+# # https://zdharma-continuum.github.io/Zsh-100-Commits-Club/Zsh-Plugin-Standard.html
+0="${${ZERO:-${0:#$ZSH_ARGZERO}}:-${(%):-%N}}"
+0="${${(M)0:#/*}:-$PWD/$0}"
+
 _omz_emoji_plugin_dir="${0:h}"
 
 () {
diff --git a/plugins/emotty/emotty.plugin.zsh b/plugins/emotty/emotty.plugin.zsh
index 4511275d6..959390a31 100644
--- a/plugins/emotty/emotty.plugin.zsh
+++ b/plugins/emotty/emotty.plugin.zsh
@@ -10,6 +10,11 @@
 # % export emotty_set=nature
 # ------------------------------------------------------------------------------
 
+# Handle $0 according to the standard:
+# # https://zdharma-continuum.github.io/Zsh-100-Commits-Club/Zsh-Plugin-Standard.html
+0="${${ZERO:-${0:#$ZSH_ARGZERO}}:-${(%):-%N}}"
+0="${${(M)0:#/*}:-$PWD/$0}"
+
 typeset -gAH _emotty_sets
 local _emotty_plugin_dir="${0:h}"
 source "$_emotty_plugin_dir/emotty_stellar_set.zsh"
diff --git a/plugins/fnm/fnm.plugin.zsh b/plugins/fnm/fnm.plugin.zsh
index c161b27cd..a5b0d0900 100644
--- a/plugins/fnm/fnm.plugin.zsh
+++ b/plugins/fnm/fnm.plugin.zsh
@@ -1,4 +1,9 @@
 if (( $+commands[fnm] )); then
+  # Handle $0 according to the standard:
+  # # https://zdharma-continuum.github.io/Zsh-100-Commits-Club/Zsh-Plugin-Standard.html
+  0="${${ZERO:-${0:#$ZSH_ARGZERO}}:-${(%):-%N}}"
+  0="${${(M)0:#/*}:-$PWD/$0}"
+
   # remove old generated completion file
   command rm -f "${0:A:h}/_fnm"
 
diff --git a/plugins/gh/gh.plugin.zsh b/plugins/gh/gh.plugin.zsh
index 3e4cdee5e..3092bfa4a 100644
--- a/plugins/gh/gh.plugin.zsh
+++ b/plugins/gh/gh.plugin.zsh
@@ -1,5 +1,10 @@
 # Autocompletion for the GitHub CLI (gh).
 if (( $+commands[gh] )); then
+  # Handle $0 according to the standard:
+  # # https://zdharma-continuum.github.io/Zsh-100-Commits-Club/Zsh-Plugin-Standard.html
+  0="${${ZERO:-${0:#$ZSH_ARGZERO}}:-${(%):-%N}}"
+  0="${${(M)0:#/*}:-$PWD/$0}"
+
   # remove old generated completion file
   command rm -f "${0:A:h}/_gh"
 
diff --git a/plugins/git-prompt/git-prompt.plugin.zsh b/plugins/git-prompt/git-prompt.plugin.zsh
index a4c952471..122542e65 100644
--- a/plugins/git-prompt/git-prompt.plugin.zsh
+++ b/plugins/git-prompt/git-prompt.plugin.zsh
@@ -1,3 +1,8 @@
+# Handle $0 according to the standard:
+# # https://zdharma-continuum.github.io/Zsh-100-Commits-Club/Zsh-Plugin-Standard.html
+0="${${ZERO:-${0:#$ZSH_ARGZERO}}:-${(%):-%N}}"
+0="${${(M)0:#/*}:-$PWD/$0}"
+
 __GIT_PROMPT_DIR="${0:A:h}"
 
 ## Hook function definitions
diff --git a/plugins/gitfast/gitfast.plugin.zsh b/plugins/gitfast/gitfast.plugin.zsh
index 7b6b67e92..f28e3808c 100644
--- a/plugins/gitfast/gitfast.plugin.zsh
+++ b/plugins/gitfast/gitfast.plugin.zsh
@@ -1,3 +1,8 @@
+# Handle $0 according to the standard:
+# # https://zdharma-continuum.github.io/Zsh-100-Commits-Club/Zsh-Plugin-Standard.html
+0="${${ZERO:-${0:#$ZSH_ARGZERO}}:-${(%):-%N}}"
+0="${${(M)0:#/*}:-$PWD/$0}"
+
 source "${0:A:h}/git-prompt.sh"
 
 function git_prompt_info() {
diff --git a/plugins/history-substring-search/history-substring-search.plugin.zsh b/plugins/history-substring-search/history-substring-search.plugin.zsh
index d2c749bc3..bac2c3ab9 100644
--- a/plugins/history-substring-search/history-substring-search.plugin.zsh
+++ b/plugins/history-substring-search/history-substring-search.plugin.zsh
@@ -1,4 +1,8 @@
-0=${(%):-%N}
+# Handle $0 according to the standard:
+# # https://zdharma-continuum.github.io/Zsh-100-Commits-Club/Zsh-Plugin-Standard.html
+0="${${ZERO:-${0:#$ZSH_ARGZERO}}:-${(%):-%N}}"
+0="${${(M)0:#/*}:-$PWD/$0}"
+
 source ${0:A:h}/history-substring-search.zsh
 
 
diff --git a/plugins/hitchhiker/hitchhiker.plugin.zsh b/plugins/hitchhiker/hitchhiker.plugin.zsh
index aeafaf01e..6d0e40052 100644
--- a/plugins/hitchhiker/hitchhiker.plugin.zsh
+++ b/plugins/hitchhiker/hitchhiker.plugin.zsh
@@ -1,3 +1,8 @@
+# Handle $0 according to the standard:
+# # https://zdharma-continuum.github.io/Zsh-100-Commits-Club/Zsh-Plugin-Standard.html
+0="${${ZERO:-${0:#$ZSH_ARGZERO}}:-${(%):-%N}}"
+0="${${(M)0:#/*}:-$PWD/$0}"
+
 HITCHHIKER_DIR="${0:h}/fortunes"
 
 # Aliases
diff --git a/plugins/macos/macos.plugin.zsh b/plugins/macos/macos.plugin.zsh
index 6a91be336..144c17ab2 100644
--- a/plugins/macos/macos.plugin.zsh
+++ b/plugins/macos/macos.plugin.zsh
@@ -1,3 +1,8 @@
+# Handle $0 according to the standard:
+# # https://zdharma-continuum.github.io/Zsh-100-Commits-Club/Zsh-Plugin-Standard.html
+0="${${ZERO:-${0:#$ZSH_ARGZERO}}:-${(%):-%N}}"
+0="${${(M)0:#/*}:-$PWD/$0}"
+
 # Open the current directory in a Finder window
 alias ofd='open_command $PWD'
 
diff --git a/plugins/rustup/rustup.plugin.zsh b/plugins/rustup/rustup.plugin.zsh
index 0ca745b7e..698c081e5 100644
--- a/plugins/rustup/rustup.plugin.zsh
+++ b/plugins/rustup/rustup.plugin.zsh
@@ -1,8 +1,12 @@
 print ${(%):-'%F{yellow}The `rustup` plugin is deprecated and has been moved to the `rust` plugin.'}
 print ${(%):-'Please update your .zshrc to use the `%Brust%b` plugin instead.%f'}
 
+# TODO: 2021-12-28: remove this block
+# Handle $0 according to the standard:
+# # https://zdharma-continuum.github.io/Zsh-100-Commits-Club/Zsh-Plugin-Standard.html
+0="${${ZERO:-${0:#$ZSH_ARGZERO}}:-${(%):-%N}}"
+0="${${(M)0:#/*}:-$PWD/$0}"
 # Remove old generated completion file
-# TODO: 2021-12-28: remove this line
 command rm -f "${0:A:h}/_rustup"
 
 (( ${fpath[(Ie)$ZSH/plugins/rust]} )) || {
diff --git a/plugins/tmux/tmux.plugin.zsh b/plugins/tmux/tmux.plugin.zsh
index 0ea3aa02a..648d12bbf 100644
--- a/plugins/tmux/tmux.plugin.zsh
+++ b/plugins/tmux/tmux.plugin.zsh
@@ -46,6 +46,11 @@ else
   export ZSH_TMUX_TERM=$ZSH_TMUX_FIXTERM_WITHOUT_256COLOR
 fi
 
+# Handle $0 according to the standard:
+# # https://zdharma-continuum.github.io/Zsh-100-Commits-Club/Zsh-Plugin-Standard.html
+0="${${ZERO:-${0:#$ZSH_ARGZERO}}:-${(%):-%N}}"
+0="${${(M)0:#/*}:-$PWD/$0}"
+
 # Set the correct local config file to use.
 if [[ "$ZSH_TMUX_ITERM2" == "false" && -e "$ZSH_TMUX_CONFIG" ]]; then
   export ZSH_TMUX_CONFIG
diff --git a/plugins/wd/wd.plugin.zsh b/plugins/wd/wd.plugin.zsh
index 87d1d0858..222a1483a 100644
--- a/plugins/wd/wd.plugin.zsh
+++ b/plugins/wd/wd.plugin.zsh
@@ -7,4 +7,9 @@
 #
 # @github.com/mfaerevaag/wd
 
+# Handle $0 according to the standard:
+# # https://zdharma-continuum.github.io/Zsh-100-Commits-Club/Zsh-Plugin-Standard.html
+0="${${ZERO:-${0:#$ZSH_ARGZERO}}:-${(%):-%N}}"
+0="${${(M)0:#/*}:-$PWD/$0}"
+
 eval "wd() { source '${0:A:h}/wd.sh' }"
diff --git a/plugins/z/z.plugin.zsh b/plugins/z/z.plugin.zsh
index 96abee890..7ce13afa7 100644
--- a/plugins/z/z.plugin.zsh
+++ b/plugins/z/z.plugin.zsh
@@ -1 +1,6 @@
+# Handle $0 according to the standard:
+# # https://zdharma-continuum.github.io/Zsh-100-Commits-Club/Zsh-Plugin-Standard.html
+0="${${ZERO:-${0:#$ZSH_ARGZERO}}:-${(%):-%N}}"
+0="${${(M)0:#/*}:-$PWD/$0}"
+
 source "${0:h}/z.sh"
diff --git a/plugins/zsh-navigation-tools/zsh-navigation-tools.plugin.zsh b/plugins/zsh-navigation-tools/zsh-navigation-tools.plugin.zsh
index 85ce87ca4..54c819810 100644
--- a/plugins/zsh-navigation-tools/zsh-navigation-tools.plugin.zsh
+++ b/plugins/zsh-navigation-tools/zsh-navigation-tools.plugin.zsh
@@ -11,6 +11,7 @@
 # https://zdharma-continuum.github.io/Zsh-100-Commits-Club/Zsh-Plugin-Standard.html
 0="${${ZERO:-${0:#$ZSH_ARGZERO}}:-${(%):-%N}}"
 0="${${(M)0:#/*}:-$PWD/$0}"
+
 export ZNT_REPO_DIR="${0:h}"
 export ZNT_CONFIG_DIR="$HOME/.config/znt"
 

From c06197ad954baf3567d8711e43ad542aef86e6bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Tue, 28 Dec 2021 14:16:54 +0100
Subject: [PATCH 651/869] chore: fix comment bulk replace

---
 plugins/cargo/cargo.plugin.zsh                                  | 2 +-
 plugins/colemak/colemak.plugin.zsh                              | 2 +-
 plugins/colored-man-pages/colored-man-pages.plugin.zsh          | 2 +-
 plugins/deno/deno.plugin.zsh                                    | 2 +-
 plugins/emacs/emacs.plugin.zsh                                  | 2 +-
 plugins/emoji/emoji.plugin.zsh                                  | 2 +-
 plugins/emotty/emotty.plugin.zsh                                | 2 +-
 plugins/fnm/fnm.plugin.zsh                                      | 2 +-
 plugins/git-prompt/git-prompt.plugin.zsh                        | 2 +-
 plugins/gitfast/gitfast.plugin.zsh                              | 2 +-
 .../history-substring-search.plugin.zsh                         | 2 +-
 plugins/hitchhiker/hitchhiker.plugin.zsh                        | 2 +-
 plugins/macos/macos.plugin.zsh                                  | 2 +-
 plugins/rustup/rustup.plugin.zsh                                | 2 +-
 plugins/tmux/tmux.plugin.zsh                                    | 2 +-
 plugins/wd/wd.plugin.zsh                                        | 2 +-
 plugins/z/z.plugin.zsh                                          | 2 +-
 17 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/plugins/cargo/cargo.plugin.zsh b/plugins/cargo/cargo.plugin.zsh
index 20aeb6652..6651f6432 100644
--- a/plugins/cargo/cargo.plugin.zsh
+++ b/plugins/cargo/cargo.plugin.zsh
@@ -3,7 +3,7 @@ print ${(%):-'Please update your .zshrc to use the `%Brust%b` plugin instead.%f'
 
 # TODO: 2021-12-28: remove this block
 # Handle $0 according to the standard:
-# # https://zdharma-continuum.github.io/Zsh-100-Commits-Club/Zsh-Plugin-Standard.html
+# https://zdharma-continuum.github.io/Zsh-100-Commits-Club/Zsh-Plugin-Standard.html
 0="${${ZERO:-${0:#$ZSH_ARGZERO}}:-${(%):-%N}}"
 0="${${(M)0:#/*}:-$PWD/$0}"
 # Remove old generated completion file
diff --git a/plugins/colemak/colemak.plugin.zsh b/plugins/colemak/colemak.plugin.zsh
index de0b5b866..e6a46f296 100644
--- a/plugins/colemak/colemak.plugin.zsh
+++ b/plugins/colemak/colemak.plugin.zsh
@@ -20,7 +20,7 @@ bindkey -a 'j' vi-forward-word-end
 bindkey -a 'J' vi-forward-blank-word-end
 
 # Handle $0 according to the standard:
-# # https://zdharma-continuum.github.io/Zsh-100-Commits-Club/Zsh-Plugin-Standard.html
+# https://zdharma-continuum.github.io/Zsh-100-Commits-Club/Zsh-Plugin-Standard.html
 0="${${ZERO:-${0:#$ZSH_ARGZERO}}:-${(%):-%N}}"
 0="${${(M)0:#/*}:-$PWD/$0}"
 
diff --git a/plugins/colored-man-pages/colored-man-pages.plugin.zsh b/plugins/colored-man-pages/colored-man-pages.plugin.zsh
index 040e74fc9..087ddce97 100644
--- a/plugins/colored-man-pages/colored-man-pages.plugin.zsh
+++ b/plugins/colored-man-pages/colored-man-pages.plugin.zsh
@@ -17,7 +17,7 @@ less_termcap[us]="${fg_bold[green]}"
 less_termcap[ue]="${reset_color}"
 
 # Handle $0 according to the standard:
-# # https://zdharma-continuum.github.io/Zsh-100-Commits-Club/Zsh-Plugin-Standard.html
+# https://zdharma-continuum.github.io/Zsh-100-Commits-Club/Zsh-Plugin-Standard.html
 0="${${ZERO:-${0:#$ZSH_ARGZERO}}:-${(%):-%N}}"
 0="${${(M)0:#/*}:-$PWD/$0}"
 
diff --git a/plugins/deno/deno.plugin.zsh b/plugins/deno/deno.plugin.zsh
index 88df55af7..15fe15a7b 100644
--- a/plugins/deno/deno.plugin.zsh
+++ b/plugins/deno/deno.plugin.zsh
@@ -14,7 +14,7 @@ alias dup='deno upgrade'
 # COMPLETION FUNCTION
 if (( $+commands[deno] )); then
   # Handle $0 according to the standard:
-  # # https://zdharma-continuum.github.io/Zsh-100-Commits-Club/Zsh-Plugin-Standard.html
+  # https://zdharma-continuum.github.io/Zsh-100-Commits-Club/Zsh-Plugin-Standard.html
   0="${${ZERO:-${0:#$ZSH_ARGZERO}}:-${(%):-%N}}"
   0="${${(M)0:#/*}:-$PWD/$0}"
 
diff --git a/plugins/emacs/emacs.plugin.zsh b/plugins/emacs/emacs.plugin.zsh
index 258e57f24..fede5b0c4 100644
--- a/plugins/emacs/emacs.plugin.zsh
+++ b/plugins/emacs/emacs.plugin.zsh
@@ -14,7 +14,7 @@ autoload -Uz is-at-least
 is-at-least 24 "${${(Az)"$(emacsclient --version 2>/dev/null)"}[2]}" || return 0
 
 # Handle $0 according to the standard:
-# # https://zdharma-continuum.github.io/Zsh-100-Commits-Club/Zsh-Plugin-Standard.html
+# https://zdharma-continuum.github.io/Zsh-100-Commits-Club/Zsh-Plugin-Standard.html
 0="${${ZERO:-${0:#$ZSH_ARGZERO}}:-${(%):-%N}}"
 0="${${(M)0:#/*}:-$PWD/$0}"
 
diff --git a/plugins/emoji/emoji.plugin.zsh b/plugins/emoji/emoji.plugin.zsh
index 60d00d976..876011957 100644
--- a/plugins/emoji/emoji.plugin.zsh
+++ b/plugins/emoji/emoji.plugin.zsh
@@ -5,7 +5,7 @@
 # See the README for documentation.
 
 # Handle $0 according to the standard:
-# # https://zdharma-continuum.github.io/Zsh-100-Commits-Club/Zsh-Plugin-Standard.html
+# https://zdharma-continuum.github.io/Zsh-100-Commits-Club/Zsh-Plugin-Standard.html
 0="${${ZERO:-${0:#$ZSH_ARGZERO}}:-${(%):-%N}}"
 0="${${(M)0:#/*}:-$PWD/$0}"
 
diff --git a/plugins/emotty/emotty.plugin.zsh b/plugins/emotty/emotty.plugin.zsh
index 959390a31..661169a8b 100644
--- a/plugins/emotty/emotty.plugin.zsh
+++ b/plugins/emotty/emotty.plugin.zsh
@@ -11,7 +11,7 @@
 # ------------------------------------------------------------------------------
 
 # Handle $0 according to the standard:
-# # https://zdharma-continuum.github.io/Zsh-100-Commits-Club/Zsh-Plugin-Standard.html
+# https://zdharma-continuum.github.io/Zsh-100-Commits-Club/Zsh-Plugin-Standard.html
 0="${${ZERO:-${0:#$ZSH_ARGZERO}}:-${(%):-%N}}"
 0="${${(M)0:#/*}:-$PWD/$0}"
 
diff --git a/plugins/fnm/fnm.plugin.zsh b/plugins/fnm/fnm.plugin.zsh
index a5b0d0900..73e2b958a 100644
--- a/plugins/fnm/fnm.plugin.zsh
+++ b/plugins/fnm/fnm.plugin.zsh
@@ -1,6 +1,6 @@
 if (( $+commands[fnm] )); then
   # Handle $0 according to the standard:
-  # # https://zdharma-continuum.github.io/Zsh-100-Commits-Club/Zsh-Plugin-Standard.html
+  # https://zdharma-continuum.github.io/Zsh-100-Commits-Club/Zsh-Plugin-Standard.html
   0="${${ZERO:-${0:#$ZSH_ARGZERO}}:-${(%):-%N}}"
   0="${${(M)0:#/*}:-$PWD/$0}"
 
diff --git a/plugins/git-prompt/git-prompt.plugin.zsh b/plugins/git-prompt/git-prompt.plugin.zsh
index 122542e65..c86c1f59b 100644
--- a/plugins/git-prompt/git-prompt.plugin.zsh
+++ b/plugins/git-prompt/git-prompt.plugin.zsh
@@ -1,5 +1,5 @@
 # Handle $0 according to the standard:
-# # https://zdharma-continuum.github.io/Zsh-100-Commits-Club/Zsh-Plugin-Standard.html
+# https://zdharma-continuum.github.io/Zsh-100-Commits-Club/Zsh-Plugin-Standard.html
 0="${${ZERO:-${0:#$ZSH_ARGZERO}}:-${(%):-%N}}"
 0="${${(M)0:#/*}:-$PWD/$0}"
 
diff --git a/plugins/gitfast/gitfast.plugin.zsh b/plugins/gitfast/gitfast.plugin.zsh
index f28e3808c..a6db0c6bd 100644
--- a/plugins/gitfast/gitfast.plugin.zsh
+++ b/plugins/gitfast/gitfast.plugin.zsh
@@ -1,5 +1,5 @@
 # Handle $0 according to the standard:
-# # https://zdharma-continuum.github.io/Zsh-100-Commits-Club/Zsh-Plugin-Standard.html
+# https://zdharma-continuum.github.io/Zsh-100-Commits-Club/Zsh-Plugin-Standard.html
 0="${${ZERO:-${0:#$ZSH_ARGZERO}}:-${(%):-%N}}"
 0="${${(M)0:#/*}:-$PWD/$0}"
 
diff --git a/plugins/history-substring-search/history-substring-search.plugin.zsh b/plugins/history-substring-search/history-substring-search.plugin.zsh
index bac2c3ab9..63f0bdd42 100644
--- a/plugins/history-substring-search/history-substring-search.plugin.zsh
+++ b/plugins/history-substring-search/history-substring-search.plugin.zsh
@@ -1,5 +1,5 @@
 # Handle $0 according to the standard:
-# # https://zdharma-continuum.github.io/Zsh-100-Commits-Club/Zsh-Plugin-Standard.html
+# https://zdharma-continuum.github.io/Zsh-100-Commits-Club/Zsh-Plugin-Standard.html
 0="${${ZERO:-${0:#$ZSH_ARGZERO}}:-${(%):-%N}}"
 0="${${(M)0:#/*}:-$PWD/$0}"
 
diff --git a/plugins/hitchhiker/hitchhiker.plugin.zsh b/plugins/hitchhiker/hitchhiker.plugin.zsh
index 6d0e40052..0b1a30119 100644
--- a/plugins/hitchhiker/hitchhiker.plugin.zsh
+++ b/plugins/hitchhiker/hitchhiker.plugin.zsh
@@ -1,5 +1,5 @@
 # Handle $0 according to the standard:
-# # https://zdharma-continuum.github.io/Zsh-100-Commits-Club/Zsh-Plugin-Standard.html
+# https://zdharma-continuum.github.io/Zsh-100-Commits-Club/Zsh-Plugin-Standard.html
 0="${${ZERO:-${0:#$ZSH_ARGZERO}}:-${(%):-%N}}"
 0="${${(M)0:#/*}:-$PWD/$0}"
 
diff --git a/plugins/macos/macos.plugin.zsh b/plugins/macos/macos.plugin.zsh
index 144c17ab2..b540eecb5 100644
--- a/plugins/macos/macos.plugin.zsh
+++ b/plugins/macos/macos.plugin.zsh
@@ -1,5 +1,5 @@
 # Handle $0 according to the standard:
-# # https://zdharma-continuum.github.io/Zsh-100-Commits-Club/Zsh-Plugin-Standard.html
+# https://zdharma-continuum.github.io/Zsh-100-Commits-Club/Zsh-Plugin-Standard.html
 0="${${ZERO:-${0:#$ZSH_ARGZERO}}:-${(%):-%N}}"
 0="${${(M)0:#/*}:-$PWD/$0}"
 
diff --git a/plugins/rustup/rustup.plugin.zsh b/plugins/rustup/rustup.plugin.zsh
index 698c081e5..d8225901b 100644
--- a/plugins/rustup/rustup.plugin.zsh
+++ b/plugins/rustup/rustup.plugin.zsh
@@ -3,7 +3,7 @@ print ${(%):-'Please update your .zshrc to use the `%Brust%b` plugin instead.%f'
 
 # TODO: 2021-12-28: remove this block
 # Handle $0 according to the standard:
-# # https://zdharma-continuum.github.io/Zsh-100-Commits-Club/Zsh-Plugin-Standard.html
+# https://zdharma-continuum.github.io/Zsh-100-Commits-Club/Zsh-Plugin-Standard.html
 0="${${ZERO:-${0:#$ZSH_ARGZERO}}:-${(%):-%N}}"
 0="${${(M)0:#/*}:-$PWD/$0}"
 # Remove old generated completion file
diff --git a/plugins/tmux/tmux.plugin.zsh b/plugins/tmux/tmux.plugin.zsh
index 648d12bbf..5474c3522 100644
--- a/plugins/tmux/tmux.plugin.zsh
+++ b/plugins/tmux/tmux.plugin.zsh
@@ -47,7 +47,7 @@ else
 fi
 
 # Handle $0 according to the standard:
-# # https://zdharma-continuum.github.io/Zsh-100-Commits-Club/Zsh-Plugin-Standard.html
+# https://zdharma-continuum.github.io/Zsh-100-Commits-Club/Zsh-Plugin-Standard.html
 0="${${ZERO:-${0:#$ZSH_ARGZERO}}:-${(%):-%N}}"
 0="${${(M)0:#/*}:-$PWD/$0}"
 
diff --git a/plugins/wd/wd.plugin.zsh b/plugins/wd/wd.plugin.zsh
index 222a1483a..ca2ca7c65 100644
--- a/plugins/wd/wd.plugin.zsh
+++ b/plugins/wd/wd.plugin.zsh
@@ -8,7 +8,7 @@
 # @github.com/mfaerevaag/wd
 
 # Handle $0 according to the standard:
-# # https://zdharma-continuum.github.io/Zsh-100-Commits-Club/Zsh-Plugin-Standard.html
+# https://zdharma-continuum.github.io/Zsh-100-Commits-Club/Zsh-Plugin-Standard.html
 0="${${ZERO:-${0:#$ZSH_ARGZERO}}:-${(%):-%N}}"
 0="${${(M)0:#/*}:-$PWD/$0}"
 
diff --git a/plugins/z/z.plugin.zsh b/plugins/z/z.plugin.zsh
index 7ce13afa7..7d3eacac0 100644
--- a/plugins/z/z.plugin.zsh
+++ b/plugins/z/z.plugin.zsh
@@ -1,5 +1,5 @@
 # Handle $0 according to the standard:
-# # https://zdharma-continuum.github.io/Zsh-100-Commits-Club/Zsh-Plugin-Standard.html
+# https://zdharma-continuum.github.io/Zsh-100-Commits-Club/Zsh-Plugin-Standard.html
 0="${${ZERO:-${0:#$ZSH_ARGZERO}}:-${(%):-%N}}"
 0="${${(M)0:#/*}:-$PWD/$0}"
 

From 49bae43f6202e7e1171d8911d8b243714dfe888a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Tue, 28 Dec 2021 14:30:13 +0100
Subject: [PATCH 652/869] refactor(plugins): generate completion functions in
 the background

---
 plugins/cargo/cargo.plugin.zsh   |  2 +-
 plugins/deno/deno.plugin.zsh     | 39 ++++++++++++++++----------------
 plugins/fnm/fnm.plugin.zsh       | 38 +++++++++++++++----------------
 plugins/gh/gh.plugin.zsh         | 38 +++++++++++++++----------------
 plugins/rustup/rustup.plugin.zsh |  2 +-
 5 files changed, 57 insertions(+), 62 deletions(-)

diff --git a/plugins/cargo/cargo.plugin.zsh b/plugins/cargo/cargo.plugin.zsh
index 6651f6432..e4b338207 100644
--- a/plugins/cargo/cargo.plugin.zsh
+++ b/plugins/cargo/cargo.plugin.zsh
@@ -7,7 +7,7 @@ print ${(%):-'Please update your .zshrc to use the `%Brust%b` plugin instead.%f'
 0="${${ZERO:-${0:#$ZSH_ARGZERO}}:-${(%):-%N}}"
 0="${${(M)0:#/*}:-$PWD/$0}"
 # Remove old generated completion file
-command rm -f "${0:A:h}/_cargo"
+command rm -f "${0:A:h}/_cargo" "$ZSH_CACHE_DIR/cargo_version"
 
 (( ${fpath[(Ie)$ZSH/plugins/rust]} )) || {
   fpath=("$ZSH/plugins/rust" $fpath)
diff --git a/plugins/deno/deno.plugin.zsh b/plugins/deno/deno.plugin.zsh
index 15fe15a7b..77c2125d2 100644
--- a/plugins/deno/deno.plugin.zsh
+++ b/plugins/deno/deno.plugin.zsh
@@ -12,30 +12,29 @@ alias dts='deno test'
 alias dup='deno upgrade'
 
 # COMPLETION FUNCTION
-if (( $+commands[deno] )); then
-  # Handle $0 according to the standard:
-  # https://zdharma-continuum.github.io/Zsh-100-Commits-Club/Zsh-Plugin-Standard.html
-  0="${${ZERO:-${0:#$ZSH_ARGZERO}}:-${(%):-%N}}"
-  0="${${(M)0:#/*}:-$PWD/$0}"
+if (( ! $+commands[deno] )); then
+  return
+fi
 
-  # remove old generated completion file
-  command rm -f "${0:A:h}/_deno"
+# TODO: 2021-12-28: remove this block
+# Handle $0 according to the standard:
+# https://zdharma-continuum.github.io/Zsh-100-Commits-Club/Zsh-Plugin-Standard.html
+0="${${ZERO:-${0:#$ZSH_ARGZERO}}:-${(%):-%N}}"
+0="${${(M)0:#/*}:-$PWD/$0}"
+# Remove old generated files
+command rm -f "${0:A:h}/_deno" "$ZSH_CACHE_DIR/deno_version"
 
-  ver="$(deno --version)"
-  ver_file="$ZSH_CACHE_DIR/deno_version"
-  comp_file="$ZSH_CACHE_DIR/completions/_deno"
-
-  mkdir -p "${comp_file:h}"
-  (( ${fpath[(Ie)${comp_file:h}]} )) || fpath=("${comp_file:h}" $fpath)
-
-  if [[ ! -f "$comp_file" || ! -f "$ver_file" || "$ver" != "$(< "$ver_file")" ]]; then
-    deno completions zsh >| "$comp_file"
-    echo "$ver" >| "$ver_file"
-  fi
+# TODO: 2021-12-28: remove this bit of code as it exists in oh-my-zsh.sh
+# Add completions folder in $ZSH_CACHE_DIR
+command mkdir -p "$ZSH_CACHE_DIR/completions"
+(( ${fpath[(Ie)"$ZSH_CACHE_DIR/completions"]} )) || fpath=("$ZSH_CACHE_DIR/completions" $fpath)
 
+# If the completion file doesn't exist yet, we need to autoload it and
+# bind it to `deno`. Otherwise, compinit will have already done that.
+if [[ ! -f "$ZSH_CACHE_DIR/completions/_deno" ]]; then
   declare -A _comps
   autoload -Uz _deno
   _comps[deno]=_deno
-
-  unset ver ver_file comp_file
 fi
+
+deno completions zsh >| "$ZSH_CACHE_DIR/completions/_deno" &|
diff --git a/plugins/fnm/fnm.plugin.zsh b/plugins/fnm/fnm.plugin.zsh
index 73e2b958a..e22588792 100644
--- a/plugins/fnm/fnm.plugin.zsh
+++ b/plugins/fnm/fnm.plugin.zsh
@@ -1,28 +1,26 @@
-if (( $+commands[fnm] )); then
-  # Handle $0 according to the standard:
-  # https://zdharma-continuum.github.io/Zsh-100-Commits-Club/Zsh-Plugin-Standard.html
-  0="${${ZERO:-${0:#$ZSH_ARGZERO}}:-${(%):-%N}}"
-  0="${${(M)0:#/*}:-$PWD/$0}"
+if (( ! $+commands[fnm] )); then
+  return
+fi
 
-  # remove old generated completion file
-  command rm -f "${0:A:h}/_fnm"
+# TODO: 2021-12-28: remove this block
+# Handle $0 according to the standard:
+# https://zdharma-continuum.github.io/Zsh-100-Commits-Club/Zsh-Plugin-Standard.html
+0="${${ZERO:-${0:#$ZSH_ARGZERO}}:-${(%):-%N}}"
+0="${${(M)0:#/*}:-$PWD/$0}"
+# remove old generated files
+command rm -f "${0:A:h}/_fnm" "$ZSH_CACHE_DIR/fnm_version"
 
-  ver="$(fnm --version)"
-  ver_file="$ZSH_CACHE_DIR/fnm_version"
-  comp_file="$ZSH_CACHE_DIR/completions/_fnm"
-
-  mkdir -p "${comp_file:h}"
-  (( ${fpath[(Ie)${comp_file:h}]} )) || fpath=("${comp_file:h}" $fpath)
-
-  if [[ ! -f "$comp_file" || ! -f "$ver_file" || "$ver" != "$(< "$ver_file")" ]]; then
-    fnm completions --shell=zsh >| "$comp_file"
-    echo "$ver" >| "$ver_file"
-  fi
+# TODO: 2021-12-28: remove this bit of code as it exists in oh-my-zsh.sh
+# Add completions folder in $ZSH_CACHE_DIR
+command mkdir -p "$ZSH_CACHE_DIR/completions"
+(( ${fpath[(Ie)"$ZSH_CACHE_DIR/completions"]} )) || fpath=("$ZSH_CACHE_DIR/completions" $fpath)
 
+# If the completion file doesn't exist yet, we need to autoload it and
+# bind it to `fnm`. Otherwise, compinit will have already done that.
+if [[ ! -f "$ZSH_CACHE_DIR/completions/_fnm" ]]; then
   declare -A _comps
   autoload -Uz _fnm
   _comps[fnm]=_fnm
-
-  unset ver ver_file comp_file
 fi
 
+fnm completions --shell=zsh >| "$ZSH_CACHE_DIR/completions/_fnm" &|
diff --git a/plugins/gh/gh.plugin.zsh b/plugins/gh/gh.plugin.zsh
index 3092bfa4a..17995e1cf 100644
--- a/plugins/gh/gh.plugin.zsh
+++ b/plugins/gh/gh.plugin.zsh
@@ -1,29 +1,27 @@
 # Autocompletion for the GitHub CLI (gh).
-if (( $+commands[gh] )); then
-  # Handle $0 according to the standard:
-  # # https://zdharma-continuum.github.io/Zsh-100-Commits-Club/Zsh-Plugin-Standard.html
-  0="${${ZERO:-${0:#$ZSH_ARGZERO}}:-${(%):-%N}}"
-  0="${${(M)0:#/*}:-$PWD/$0}"
+if (( ! $+commands[gh] )); then
+  return
+fi
 
-  # remove old generated completion file
-  command rm -f "${0:A:h}/_gh"
+# TODO: 2021-12-28: remove this block
+# Handle $0 according to the standard:
+# https://zdharma-continuum.github.io/Zsh-100-Commits-Club/Zsh-Plugin-Standard.html
+0="${${ZERO:-${0:#$ZSH_ARGZERO}}:-${(%):-%N}}"
+0="${${(M)0:#/*}:-$PWD/$0}"
+# Remove old generated files
+command rm -f "${0:A:h}/_gh" "$ZSH_CACHE_DIR/gh_version"
 
-  ver="$(gh --version)"
-  ver_file="$ZSH_CACHE_DIR/gh_version"
-  comp_file="$ZSH_CACHE_DIR/completions/_gh"
-
-  mkdir -p "${comp_file:h}"
-  (( ${fpath[(Ie)${comp_file:h}]} )) || fpath=("${comp_file:h}" $fpath)
-
-  if [[ ! -f "$comp_file" || ! -f "$ver_file" || "$ver" != "$(< "$ver_file")" ]]; then
-    gh completion --shell zsh >| "$comp_file"
-    echo "$ver" >| "$ver_file"
-  fi
+# TODO: 2021-12-28: remove this bit of code as it exists in oh-my-zsh.sh
+# Add completions folder in $ZSH_CACHE_DIR
+command mkdir -p "$ZSH_CACHE_DIR/completions"
+(( ${fpath[(Ie)"$ZSH_CACHE_DIR/completions"]} )) || fpath=("$ZSH_CACHE_DIR/completions" $fpath)
 
+# If the completion file doesn't exist yet, we need to autoload it and
+# bind it to `gh`. Otherwise, compinit will have already done that.
+if [[ ! -f "$ZSH_CACHE_DIR/completions/_gh" ]]; then
   declare -A _comps
   autoload -Uz _gh
   _comps[gh]=_gh
-
-  unset ver ver_file comp_file
 fi
 
+gh completion --shell zsh >| "$ZSH_CACHE_DIR/completions/_gh" &|
diff --git a/plugins/rustup/rustup.plugin.zsh b/plugins/rustup/rustup.plugin.zsh
index d8225901b..3d59c1c54 100644
--- a/plugins/rustup/rustup.plugin.zsh
+++ b/plugins/rustup/rustup.plugin.zsh
@@ -7,7 +7,7 @@ print ${(%):-'Please update your .zshrc to use the `%Brust%b` plugin instead.%f'
 0="${${ZERO:-${0:#$ZSH_ARGZERO}}:-${(%):-%N}}"
 0="${${(M)0:#/*}:-$PWD/$0}"
 # Remove old generated completion file
-command rm -f "${0:A:h}/_rustup"
+command rm -f "${0:A:h}/_rustup" "$ZSH_CACHE_DIR/rustup_version"
 
 (( ${fpath[(Ie)$ZSH/plugins/rust]} )) || {
   fpath=("$ZSH/plugins/rust" $fpath)

From 79531f7013d9f9a54eaa7ac265c4788bd72a8ada Mon Sep 17 00:00:00 2001
From: Carlo Sala <carlosalag@protonmail.com>
Date: Tue, 28 Dec 2021 14:36:32 +0100
Subject: [PATCH 653/869] feat(pip): alias `pip` to `pip3` if pip is missing
 (#10431)

---
 plugins/pip/pip.plugin.zsh | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/plugins/pip/pip.plugin.zsh b/plugins/pip/pip.plugin.zsh
index 629147bae..a58f5704a 100644
--- a/plugins/pip/pip.plugin.zsh
+++ b/plugins/pip/pip.plugin.zsh
@@ -82,7 +82,11 @@ zsh-pip-test-clean-packages() {
     fi
 }
 
-alias pip="noglob pip" # allows square brackets for pip command invocation
+if (( $+commands[pip3] && !$+commands[pip] )); then
+  alias pip="noglob pip3"
+else
+  alias pip="noglob pip"
+fi
 
 # Create requirements file
 alias pipreq="pip freeze > requirements.txt"

From 543d6c0db197b624f8cf8be296fa2e5d37d3e6c2 Mon Sep 17 00:00:00 2001
From: Carlo Sala <carlosalag@protonmail.com>
Date: Tue, 28 Dec 2021 15:54:59 +0100
Subject: [PATCH 654/869] feat(rbw): add completion for `rbw` Bitwarden client
 (#10346)

---
 .github/actions/spelling/expect.txt |  6 ++++--
 plugins/rbw/README.md               | 12 ++++++++++++
 plugins/rbw/rbw.plugin.zsh          | 19 +++++++++++++++++++
 3 files changed, 35 insertions(+), 2 deletions(-)
 create mode 100644 plugins/rbw/README.md
 create mode 100644 plugins/rbw/rbw.plugin.zsh

diff --git a/.github/actions/spelling/expect.txt b/.github/actions/spelling/expect.txt
index 65215c6c3..5c5a04ff1 100644
--- a/.github/actions/spelling/expect.txt
+++ b/.github/actions/spelling/expect.txt
@@ -22,8 +22,8 @@ acr
 acroread
 acs
 acsc
-acss
 acsp
+acss
 actionformats
 Adamantium
 adb
@@ -312,6 +312,7 @@ bisd
 bitboxer
 bitbucket
 bitswap
+bitwarden
 blkio
 blockprofile
 blockprofilerate
@@ -3119,6 +3120,7 @@ rbenv
 rbenvdirs
 rbfu
 RBUFFER
+rbw
 rcfile
 Rchive
 rcs
@@ -4442,8 +4444,8 @@ zrr
 zrs
 zscore
 zse
-zsh'ed
 zsh
+zsh'ed
 zshaddhistory
 zshcmd
 zshcommands
diff --git a/plugins/rbw/README.md b/plugins/rbw/README.md
new file mode 100644
index 000000000..87d073d24
--- /dev/null
+++ b/plugins/rbw/README.md
@@ -0,0 +1,12 @@
+# Bitwarden (unofficial) CLI plugin
+
+This plugin adds completion for [rbw](https://github.com/doy/rbw), an unofficial
+CLI for [Bitwarden](https://bitwarden.com).
+
+To use it, add `rbw` to the plugins array in your zshrc file:
+
+```zsh
+plugins=(... rbw)
+```
+
+This plugin does not add any aliases.
diff --git a/plugins/rbw/rbw.plugin.zsh b/plugins/rbw/rbw.plugin.zsh
new file mode 100644
index 000000000..3825be7a6
--- /dev/null
+++ b/plugins/rbw/rbw.plugin.zsh
@@ -0,0 +1,19 @@
+if (( ! $+commands[rbw] )); then
+  return
+fi
+
+# TODO: 2021-12-28: remove this bit of code as it exists in oh-my-zsh.sh
+# Add completions folder in $ZSH_CACHE_DIR
+command mkdir -p "$ZSH_CACHE_DIR/completions"
+(( ${fpath[(Ie)"$ZSH_CACHE_DIR/completions"]} )) || fpath=("$ZSH_CACHE_DIR/completions" $fpath)
+
+
+# If the completion file doesn't exist yet, we need to autoload it and
+# bind it to `rbw`. Otherwise, compinit will have already done that.
+if [[ ! -f "$ZSH_CACHE_DIR/completions/_rbw" ]]; then
+  declare -A _comps
+  autoload -Uz _rbw
+  _comps[rbw]=_rbw
+fi
+
+rbw gen-completions zsh >| "$ZSH_CACHE_DIR/completions/_rbw" &|

From df4508ad543236f754b3cd373d474b4af3638115 Mon Sep 17 00:00:00 2001
From: Carlo Sala <carlosalag@protonmail.com>
Date: Tue, 28 Dec 2021 15:55:47 +0100
Subject: [PATCH 655/869] feat(volta): add dynamic completion generation
 (#10515)

---
 plugins/volta/_volta           | 298 ---------------------------------
 plugins/volta/volta.plugin.zsh |  19 +++
 2 files changed, 19 insertions(+), 298 deletions(-)
 delete mode 100644 plugins/volta/_volta
 create mode 100644 plugins/volta/volta.plugin.zsh

diff --git a/plugins/volta/_volta b/plugins/volta/_volta
deleted file mode 100644
index 295b80362..000000000
--- a/plugins/volta/_volta
+++ /dev/null
@@ -1,298 +0,0 @@
-#compdef volta
-
-autoload -U is-at-least
-
-_volta() {
-    typeset -A opt_args
-    typeset -a _arguments_options
-    local ret=1
-
-    if is-at-least 5.2; then
-        _arguments_options=(-s -S -C)
-    else
-        _arguments_options=(-s -C)
-    fi
-
-    local context curcontext="$curcontext" state line
-    _arguments "${_arguments_options[@]}" \
-'--verbose[Enables verbose diagnostics]' \
-'(--verbose)--quiet[Prevents unnecessary output]' \
-'-v[Prints the current version of Volta]' \
-'--version[Prints the current version of Volta]' \
-'-h[Prints help information]' \
-'--help[Prints help information]' \
-":: :_volta_commands" \
-"*::: :->Volta" \
-&& ret=0
-    case $state in
-    (Volta)
-        words=($line[1] "${words[@]}")
-        (( CURRENT += 1 ))
-        curcontext="${curcontext%:*:*}:volta-command-$line[1]:"
-        case $line[1] in
-            (fetch)
-_arguments "${_arguments_options[@]}" \
-'-h[Prints help information]' \
-'--help[Prints help information]' \
-'-V[Prints version information]' \
-'--version[Prints version information]' \
-'--verbose[Enables verbose diagnostics]' \
-'(--verbose)--quiet[Prevents unnecessary output]' \
-':tool[@version] -- Tools to fetch, like `node`, `yarn@latest` or `your-package@^14.4.3`.:_files' \
-&& ret=0
-;;
-(install)
-_arguments "${_arguments_options[@]}" \
-'-h[Prints help information]' \
-'--help[Prints help information]' \
-'-V[Prints version information]' \
-'--version[Prints version information]' \
-'--verbose[Enables verbose diagnostics]' \
-'(--verbose)--quiet[Prevents unnecessary output]' \
-':tool[@version] -- Tools to install, like `node`, `yarn@latest` or `your-package@^14.4.3`.:_files' \
-&& ret=0
-;;
-(uninstall)
-_arguments "${_arguments_options[@]}" \
-'-h[Prints help information]' \
-'--help[Prints help information]' \
-'-V[Prints version information]' \
-'--version[Prints version information]' \
-'--verbose[Enables verbose diagnostics]' \
-'(--verbose)--quiet[Prevents unnecessary output]' \
-':tool -- The tool to uninstall, e.g. `node`, `npm`, `yarn`, or <package>:_files' \
-&& ret=0
-;;
-(pin)
-_arguments "${_arguments_options[@]}" \
-'-h[Prints help information]' \
-'--help[Prints help information]' \
-'-V[Prints version information]' \
-'--version[Prints version information]' \
-'--verbose[Enables verbose diagnostics]' \
-'(--verbose)--quiet[Prevents unnecessary output]' \
-':tool[@version] -- Tools to pin, like `node@lts` or `yarn@^1.14`.:_files' \
-&& ret=0
-;;
-(ls)
-_arguments "${_arguments_options[@]}" \
-'--format=[Specify the output format]: :(human plain)' \
-'(-d --default)-c[Show the currently-active tool(s)]' \
-'(-d --default)--current[Show the currently-active tool(s)]' \
-'(-c --current)-d[Show your default tool(s).]' \
-'(-c --current)--default[Show your default tool(s).]' \
-'-h[Prints help information]' \
-'--help[Prints help information]' \
-'-V[Prints version information]' \
-'--version[Prints version information]' \
-'--verbose[Enables verbose diagnostics]' \
-'(--verbose)--quiet[Prevents unnecessary output]' \
-'::tool -- The tool to lookup - `all`, `node`, `yarn`, or the name of a package or binary.:_files' \
-&& ret=0
-;;
-(list)
-_arguments "${_arguments_options[@]}" \
-'--format=[Specify the output format]: :(human plain)' \
-'(-d --default)-c[Show the currently-active tool(s)]' \
-'(-d --default)--current[Show the currently-active tool(s)]' \
-'(-c --current)-d[Show your default tool(s).]' \
-'(-c --current)--default[Show your default tool(s).]' \
-'-h[Prints help information]' \
-'--help[Prints help information]' \
-'-V[Prints version information]' \
-'--version[Prints version information]' \
-'--verbose[Enables verbose diagnostics]' \
-'(--verbose)--quiet[Prevents unnecessary output]' \
-'::tool -- The tool to lookup - `all`, `node`, `yarn`, or the name of a package or binary.:_files' \
-&& ret=0
-;;
-(completions)
-_arguments "${_arguments_options[@]}" \
-'-o+[File to write generated completions to]' \
-'--output=[File to write generated completions to]' \
-'-f[Write over an existing file, if any.]' \
-'--force[Write over an existing file, if any.]' \
-'-h[Prints help information]' \
-'--help[Prints help information]' \
-'-V[Prints version information]' \
-'--version[Prints version information]' \
-'--verbose[Enables verbose diagnostics]' \
-'(--verbose)--quiet[Prevents unnecessary output]' \
-':shell -- Shell to generate completions for:(zsh bash fish powershell elvish)' \
-&& ret=0
-;;
-(which)
-_arguments "${_arguments_options[@]}" \
-'-h[Prints help information]' \
-'--help[Prints help information]' \
-'-V[Prints version information]' \
-'--version[Prints version information]' \
-'--verbose[Enables verbose diagnostics]' \
-'(--verbose)--quiet[Prevents unnecessary output]' \
-':binary -- The binary to find, e.g. `node` or `npm`:_files' \
-&& ret=0
-;;
-(use)
-_arguments "${_arguments_options[@]}" \
-'-h[Prints help information]' \
-'--help[Prints help information]' \
-'-V[Prints version information]' \
-'--version[Prints version information]' \
-'--verbose[Enables verbose diagnostics]' \
-'(--verbose)--quiet[Prevents unnecessary output]' \
-'::anything:_files' \
-&& ret=0
-;;
-(setup)
-_arguments "${_arguments_options[@]}" \
-'-h[Prints help information]' \
-'--help[Prints help information]' \
-'-V[Prints version information]' \
-'--version[Prints version information]' \
-'--verbose[Enables verbose diagnostics]' \
-'(--verbose)--quiet[Prevents unnecessary output]' \
-&& ret=0
-;;
-(run)
-_arguments "${_arguments_options[@]}" \
-'--node=[Set the custom Node version]' \
-'(--bundled-npm)--npm=[Set the custom npm version]' \
-'(--no-yarn)--yarn=[Set the custom Yarn version]' \
-'*--env=[Set an environment variable (can be used multiple times)]' \
-'(--npm)--bundled-npm[Forces npm to be the version bundled with Node]' \
-'(--yarn)--no-yarn[Disables Yarn]' \
-'-h[Prints help information]' \
-'--help[Prints help information]' \
-'-V[Prints version information]' \
-'--version[Prints version information]' \
-'--verbose[Enables verbose diagnostics]' \
-'(--verbose)--quiet[Prevents unnecessary output]' \
-':command -- The command to run:_files' \
-'::args -- Arguments to pass to the command:_files' \
-&& ret=0
-;;
-(help)
-_arguments "${_arguments_options[@]}" \
-'-h[Prints help information]' \
-'--help[Prints help information]' \
-'-V[Prints version information]' \
-'--version[Prints version information]' \
-'--verbose[Enables verbose diagnostics]' \
-'(--verbose)--quiet[Prevents unnecessary output]' \
-&& ret=0
-;;
-        esac
-    ;;
-esac
-}
-
-(( $+functions[_volta_commands] )) ||
-_volta_commands() {
-    local commands; commands=(
-        "fetch:Fetches a tool to the local machine" \
-"install:Installs a tool in your toolchain" \
-"uninstall:Uninstalls a tool from your toolchain" \
-"pin:Pins your project's runtime or package manager" \
-"list:Displays the current toolchain" \
-"completions:Generates Volta completions" \
-"which:Locates the actual binary that will be called by Volta" \
-"use:" \
-"setup:Enables Volta for the current user / shell" \
-"run:Run a command with custom Node, npm, and/or Yarn versions" \
-"help:Prints this message or the help of the given subcommand(s)" \
-    )
-    _describe -t commands 'volta commands' commands "$@"
-}
-(( $+functions[_volta__completions_commands] )) ||
-_volta__completions_commands() {
-    local commands; commands=(
-        
-    )
-    _describe -t commands 'volta completions commands' commands "$@"
-}
-(( $+functions[_volta__fetch_commands] )) ||
-_volta__fetch_commands() {
-    local commands; commands=(
-        
-    )
-    _describe -t commands 'volta fetch commands' commands "$@"
-}
-(( $+functions[_volta__help_commands] )) ||
-_volta__help_commands() {
-    local commands; commands=(
-        
-    )
-    _describe -t commands 'volta help commands' commands "$@"
-}
-(( $+functions[_volta__install_commands] )) ||
-_volta__install_commands() {
-    local commands; commands=(
-        
-    )
-    _describe -t commands 'volta install commands' commands "$@"
-}
-(( $+functions[_volta__list_commands] )) ||
-_volta__list_commands() {
-    local commands; commands=(
-        
-    )
-    _describe -t commands 'volta list commands' commands "$@"
-}
-(( $+functions[_ls_commands] )) ||
-_ls_commands() {
-    local commands; commands=(
-        
-    )
-    _describe -t commands 'ls commands' commands "$@"
-}
-(( $+functions[_volta__ls_commands] )) ||
-_volta__ls_commands() {
-    local commands; commands=(
-        
-    )
-    _describe -t commands 'volta ls commands' commands "$@"
-}
-(( $+functions[_volta__pin_commands] )) ||
-_volta__pin_commands() {
-    local commands; commands=(
-        
-    )
-    _describe -t commands 'volta pin commands' commands "$@"
-}
-(( $+functions[_volta__run_commands] )) ||
-_volta__run_commands() {
-    local commands; commands=(
-        
-    )
-    _describe -t commands 'volta run commands' commands "$@"
-}
-(( $+functions[_volta__setup_commands] )) ||
-_volta__setup_commands() {
-    local commands; commands=(
-        
-    )
-    _describe -t commands 'volta setup commands' commands "$@"
-}
-(( $+functions[_volta__uninstall_commands] )) ||
-_volta__uninstall_commands() {
-    local commands; commands=(
-        
-    )
-    _describe -t commands 'volta uninstall commands' commands "$@"
-}
-(( $+functions[_volta__use_commands] )) ||
-_volta__use_commands() {
-    local commands; commands=(
-        
-    )
-    _describe -t commands 'volta use commands' commands "$@"
-}
-(( $+functions[_volta__which_commands] )) ||
-_volta__which_commands() {
-    local commands; commands=(
-        
-    )
-    _describe -t commands 'volta which commands' commands "$@"
-}
-
-_volta "$@"
\ No newline at end of file
diff --git a/plugins/volta/volta.plugin.zsh b/plugins/volta/volta.plugin.zsh
new file mode 100644
index 000000000..756dc84b3
--- /dev/null
+++ b/plugins/volta/volta.plugin.zsh
@@ -0,0 +1,19 @@
+# COMPLETION FUNCTION
+if (( ! $+commands[volta] )); then
+  return
+fi
+
+# TODO: 2021-12-28: remove this bit of code as it exists in oh-my-zsh.sh
+# Add completions folder in $ZSH_CACHE_DIR
+command mkdir -p "$ZSH_CACHE_DIR/completions"
+(( ${fpath[(Ie)"$ZSH_CACHE_DIR/completions"]} )) || fpath=("$ZSH_CACHE_DIR/completions" $fpath)
+
+# If the completion file doesn't exist yet, we need to autoload it and
+# bind it to `deno`. Otherwise, compinit will have already done that.
+if [[ ! -f "$ZSH_CACHE_DIR/completions/_volta" ]]; then
+  declare -A _comps
+  autoload -Uz _volta
+  _comps[volta]=_volta
+fi
+
+volta completions zsh >| "$ZSH_CACHE_DIR/completions/_volta" &|

From d5cb1d339f3fb8b181d5ab5527718657587021ea Mon Sep 17 00:00:00 2001
From: Alwyn Kik <alwyn@kik.pw>
Date: Tue, 28 Dec 2021 16:59:48 +0100
Subject: [PATCH 656/869] docs(oc): update link to openshift CLI reference
 (#9667)

---
 plugins/oc/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/oc/README.md b/plugins/oc/README.md
index deae9b2d0..b7903eafe 100644
--- a/plugins/oc/README.md
+++ b/plugins/oc/README.md
@@ -1,6 +1,6 @@
 # OC - OpenShift CLI
 
-This plugin provides autocompletion for [OC](https://docs.openshift.com/container-platform/3.7/cli_reference/index.html) commands, building, managing and updating operations.
+This plugin provides autocompletion for [OC](https://docs.openshift.com/container-platform/latest/cli_reference/openshift_cli/getting-started-cli.html) commands, building, managing and updating operations.
 
 To use it, add `oc` to the plugins array of your zshrc file:
 

From 56de7c85f34a15a4490f4984e128dba78fcebfd3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Malard?= <c.malard-git@valdun.net>
Date: Tue, 28 Dec 2021 17:06:50 +0100
Subject: [PATCH 657/869] docs(aliases): clarify usage (#9990)

---
 plugins/aliases/README.md | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/plugins/aliases/README.md b/plugins/aliases/README.md
index 481c1bd4e..bfb6ab8c4 100644
--- a/plugins/aliases/README.md
+++ b/plugins/aliases/README.md
@@ -1,21 +1,22 @@
-## Aliases Cheatsheet
+# Aliases cheatsheet
 
 **Maintainer:** [@hqingyi](https://github.com/hqingyi)
 
 With lots of 3rd-party amazing aliases installed, this plugin helps list the shortcuts
 that are currently available based on the plugins you have enabled.
 
-Enable this plugin by adding it to your `plugins` definition in `~/.zshrc`.
+To use it, add `aliases` to the plugins array in your zshrc file:
 
-  ```
-  plugins=(aliases)
-  ```
+```zsh
+plugins=(aliases)
+```
 
 Requirements: Python needs to be installed.
 
-### Usage
+## Usage
 
-```
-  acs: group all alias
-  acs $keywordquickly filter alias & highlight
-```
+- `acs`: show all aliases by group.
+
+- `acs <keyword>`: filter aliases by `<keyword>` and highlight.
+
+  ![screenshot](https://cloud.githubusercontent.com/assets/3602957/11581913/cb54fb8a-9a82-11e5-846b-5a67f67ad9ad.png)

From 364e62155de53c3d977b54953a262d7a256d2cd5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Tue, 28 Dec 2021 17:15:16 +0100
Subject: [PATCH 658/869] refactor(ant): extract completion function

---
 plugins/ant/README.md      |  4 ++--
 plugins/ant/_ant           | 22 ++++++++++++++++++++++
 plugins/ant/ant.plugin.zsh | 16 ----------------
 3 files changed, 24 insertions(+), 18 deletions(-)
 create mode 100644 plugins/ant/_ant
 delete mode 100644 plugins/ant/ant.plugin.zsh

diff --git a/plugins/ant/README.md b/plugins/ant/README.md
index 5f88984ac..571237223 100644
--- a/plugins/ant/README.md
+++ b/plugins/ant/README.md
@@ -2,9 +2,9 @@
 
 This plugin provides completion for [Ant](https://ant.apache.org/).
 
-To use it add ant to the plugins array in your zshrc file.
+To use it, add `ant` to the plugins array in your zshrc file:
 
-```bash
+```zsh
 plugins=(... ant)
 ```
 
diff --git a/plugins/ant/_ant b/plugins/ant/_ant
new file mode 100644
index 000000000..24a8e3667
--- /dev/null
+++ b/plugins/ant/_ant
@@ -0,0 +1,22 @@
+#compdef ant
+
+_ant_does_target_list_need_generating () {
+  [[ ! -f .ant_targets ]] && return 0
+  [[ build.xml -nt .ant_targets ]] && return 0
+  return 1
+}
+
+_ant () {
+  if [[ ! -f build.xml ]]; then
+    return
+  fi
+
+  if ! _ant_does_target_list_need_generating; then
+    return
+  fi
+
+  ant -p | awk -F " " 'NR > 5 { print lastTarget } { lastTarget = $1 }' >| .ant_targets
+  compadd -- "$(cat .ant_targets)"
+}
+
+_ant "$@"
diff --git a/plugins/ant/ant.plugin.zsh b/plugins/ant/ant.plugin.zsh
deleted file mode 100644
index 0b738c94f..000000000
--- a/plugins/ant/ant.plugin.zsh
+++ /dev/null
@@ -1,16 +0,0 @@
-_ant_does_target_list_need_generating () {
-  [ ! -f .ant_targets ] && return 0;
-  [ build.xml -nt .ant_targets ] && return 0;
-  return 1;
-}
-
-_ant () {
-  if [ -f build.xml ]; then
-    if _ant_does_target_list_need_generating; then
-    	ant -p | awk -F " " 'NR > 5 { print lastTarget }{lastTarget = $1}' > .ant_targets
-    fi
-    compadd -- `cat .ant_targets`
-  fi
-}
-
-compdef _ant ant

From 1316b31764826e348d2f4753c2b7a8e6ffe4441c Mon Sep 17 00:00:00 2001
From: Brahim Djoudi <jolkdarr@netscape.net>
Date: Thu, 22 Mar 2018 08:58:11 +0100
Subject: [PATCH 659/869] feat(ant): enable colored output by default (#6688)

Closes #6688
---
 plugins/ant/ant.plugin.zsh | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 plugins/ant/ant.plugin.zsh

diff --git a/plugins/ant/ant.plugin.zsh b/plugins/ant/ant.plugin.zsh
new file mode 100644
index 000000000..5f6382521
--- /dev/null
+++ b/plugins/ant/ant.plugin.zsh
@@ -0,0 +1,2 @@
+# Default to colored output
+export ANT_ARGS='-logger org.apache.tools.ant.listener.AnsiColorLogger'

From 292f11e97a2c82e5138ef11624d2ccebb945681b Mon Sep 17 00:00:00 2001
From: "Jason A. Crome" <jason@crome-plated.com>
Date: Tue, 28 Dec 2021 11:20:13 -0500
Subject: [PATCH 660/869] feat(autojump): add support for NetBSD (#9746)

---
 plugins/autojump/autojump.plugin.zsh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/autojump/autojump.plugin.zsh b/plugins/autojump/autojump.plugin.zsh
index 3117c6da4..8593353b2 100644
--- a/plugins/autojump/autojump.plugin.zsh
+++ b/plugins/autojump/autojump.plugin.zsh
@@ -8,6 +8,7 @@ autojump_paths=(
   /etc/profile.d/autojump.zsh                        # manual installation
   /etc/profile.d/autojump.sh                         # Gentoo installation
   /usr/local/share/autojump/autojump.zsh             # FreeBSD installation
+  /usr/pkg/share/autojump/autojump.zsh               # NetBSD installation
   /opt/local/etc/profile.d/autojump.sh               # macOS with MacPorts
   /usr/local/etc/profile.d/autojump.sh               # macOS with Homebrew (default)
   /opt/homebrew/etc/profile.d/autojump.sh            # macOS with Homebrew (default on M1 macs)

From c26e9e807f80f9c219e0ef2c71834fe0af703d80 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Arnas=20Udovi=C4=8Dius?= <zordsdavini@gmail.com>
Date: Fri, 9 Jun 2017 14:14:55 +0300
Subject: [PATCH 661/869] feat(arcanist): add `arbl` and `arho` aliases (#6132)

Closes #6132
---
 plugins/arcanist/README.md           | 2 ++
 plugins/arcanist/arcanist.plugin.zsh | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/plugins/arcanist/README.md b/plugins/arcanist/README.md
index f49e4344b..07e766977 100644
--- a/plugins/arcanist/README.md
+++ b/plugins/arcanist/README.md
@@ -14,6 +14,7 @@ plugins=(... arcanist)
 | ------- | ---------------------------------- |
 | ara     | `arc amend`                        |
 | arb     | `arc branch`                       |
+| arbl    | `arc bland`                        |
 | arco    | `arc cover`                        |
 | arci    | `arc commit`                       |
 | ard     | `arc diff`                         |
@@ -24,6 +25,7 @@ plugins=(... arcanist)
 | ardpc   | `arc diff --plan-changes`          |
 | are     | `arc export`                       |
 | arh     | `arc help`                         |
+| arho    | `arc hotfix`                       |
 | arl     | `arc land`                         |
 | arli    | `arc lint`                         |
 | arls    | `arc list`                         |
diff --git a/plugins/arcanist/arcanist.plugin.zsh b/plugins/arcanist/arcanist.plugin.zsh
index 88e6713e4..380eede75 100644
--- a/plugins/arcanist/arcanist.plugin.zsh
+++ b/plugins/arcanist/arcanist.plugin.zsh
@@ -5,6 +5,7 @@
 
 alias ara='arc amend'
 alias arb='arc branch'
+alias arbl='arc bland'
 alias arco='arc cover'
 alias arci='arc commit'
 
@@ -17,6 +18,7 @@ alias ardp='arc diff --preview' # creates a new diff in the phab interface
 
 alias are='arc export'
 alias arh='arc help'
+alias arho='arc hotfix'
 alias arl='arc land'
 alias arli='arc lint'
 alias arls='arc list'

From d806649028f60ee2efc4aac187faf252e32ba1ef Mon Sep 17 00:00:00 2001
From: michal panoch <mp@maya.cz>
Date: Tue, 28 Dec 2021 17:30:32 +0100
Subject: [PATCH 662/869] feat(bundler): add completion for `info` argument
 (#9594)

---
 plugins/bundler/_bundler | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/plugins/bundler/_bundler b/plugins/bundler/_bundler
index ba647ab80..51678dd7c 100644
--- a/plugins/bundler/_bundler
+++ b/plugins/bundler/_bundler
@@ -18,6 +18,7 @@ case $state in
 			"check[Determine whether the requirements for your application are installed]" \
 			"list[Show all of the gems in the current bundle]" \
 			"show[Show the source location of a particular gem in the bundle]" \
+			"info[Show details of a particular gem in the bundle]" \
 			"outdated[Show all of the outdated gems in the current bundle]" \
 			"console[Start an IRB session in the context of the current bundle]" \
 			"open[Open an installed gem in the editor]" \
@@ -84,7 +85,7 @@ case $state in
 					'(--verbose)--verbose[Enable verbose output mode]'
 				ret=0
 				;;
-			(open|show)
+			(open|show|info)
 				_gems=( $(bundle show 2> /dev/null | sed -e '/^  \*/!d; s/^  \* \([^ ]*\) .*/\1/') )
 				if [[ $_gems != "" ]]; then
 					_values 'gems' $_gems && ret=0

From c4be9294f26a3cf58fc7f1b4e6cd43931c68b639 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Tue, 28 Dec 2021 17:46:35 +0100
Subject: [PATCH 663/869] style(acs): fix style and gitignore __pycache__
 folder

---
 plugins/aliases/.gitignore         | 1 +
 plugins/aliases/aliases.plugin.zsh | 9 +++++----
 2 files changed, 6 insertions(+), 4 deletions(-)
 create mode 100644 plugins/aliases/.gitignore

diff --git a/plugins/aliases/.gitignore b/plugins/aliases/.gitignore
new file mode 100644
index 000000000..bee8a64b7
--- /dev/null
+++ b/plugins/aliases/.gitignore
@@ -0,0 +1 @@
+__pycache__
diff --git a/plugins/aliases/aliases.plugin.zsh b/plugins/aliases/aliases.plugin.zsh
index 28d8fba24..b3d9340f0 100644
--- a/plugins/aliases/aliases.plugin.zsh
+++ b/plugins/aliases/aliases.plugin.zsh
@@ -2,9 +2,10 @@
 #
 # - acs: alias cheatsheet
 #   group alias by command, pass addition argv to grep.
-ALIASES_PLUGIN_ROOT=$(cd `dirname $0` && pwd)
 function acs(){
-    which python >>/dev/null
-    [[ $? -eq 1 ]] && echo "[error]no python executable detected!" && return
-    alias | python $ALIASES_PLUGIN_ROOT/cheatsheet.py $@
+  (( $+commands[python] )) || {
+    echo "[error] No python executable detected"
+    return
+  }
+  alias | python ${functions_source[$0]:h}/cheatsheet.py $@
 }

From 01230fa6e29c54294800c06ac8a4249d5bddf2dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Tue, 28 Dec 2021 17:49:41 +0100
Subject: [PATCH 664/869] style(drush): fix code and README style

---
 plugins/drush/README.md        | 111 +++++++++++++--------------------
 plugins/drush/drush.plugin.zsh |  87 +++++++++++++-------------
 2 files changed, 86 insertions(+), 112 deletions(-)

diff --git a/plugins/drush/README.md b/plugins/drush/README.md
index df7b82bdd..dfd1eaf82 100644
--- a/plugins/drush/README.md
+++ b/plugins/drush/README.md
@@ -1,83 +1,60 @@
 # Drush
 
-## Description
-This plugin offers aliases and functions to make the work with drush easier and more productive.
+This plugin adds aliases and functions for [Drush](https://www.drush.org), a command-line shell
+and Unix scripting interface for Drupal. It also adds completion for the `drush` command.
 
-To enable it, add the `drush` to your `plugins` array in `~/.zshrc`:
+To enable it, add `drush` to the plugins array in zshrc file:
 
-```
+```zsh
 plugins=(... drush)
 ```
 
 ## Aliases
-| Alias | Description                                                           | Command                     |
-|-------|-----------------------------------------------------------------------|-----------------------------|
-| dr    | Display drush help                                                    | drush                       |
-| drca  | Clear all drupal caches.                                              | drush cc all                |
-| drcb  | Clear block cache.                                                    | drush cc block              |
-| drcg  | Clear registry cache.                                                 | drush cc registry           |
-| drcj  | Clear css-js cache.                                                   | drush cc css-js             |
-| drcm  | Clear menu cache.                                                     | drush cc menu               |
-| drcml | Clear module-list cache.                                              | drush cc module-list        |
-| drcr  | Run all cron hooks in all active modules for specified site.          | drush core-cron             |
-| drct  | Clear theme-registry cache.                                           | drush cc theme-registry     |
-| drcv  | Clear views cache. (Make sure that the views module is enabled)       | drush cc views              |
-| drdmp | Backup database in a new dump.sql file                                | drush drush sql-dump --ordered-dump --result-file=dump.sql|
-| drf   | Display features status                                               | drush features              |
-| drfr  | Revert a feature module on your site.                                 | drush features-revert -y    |
-| drfu  | Update a feature module on your site.                                 | drush features-update -y    |
-| drfra | Revert all enabled feature module on your site.                       | drush features-revert-all   |
-| drif  | Flush all derived images.                                             | drush image-flush --all     |
-| drpm  | Show a list of available modules.                                     | drush pm-list --type=module |
-| drst  | Provides a birds-eye view of the current Drupal installation, if any. | drush core-status           |
-| drup  | Apply any database updates required (as with running update.php).     | drush updatedb              |
-| drups | List any pending database updates.                                    | drush updatedb-status       |
-| drv   | Show drush version.                                                   | drush version               |
-| drvd	| Delete a variable.																										| drush variable-del					|
-| drvg	| Get a list of some or all site variables and values.									| drush variable-get					|
-| drvs	| Set a variable.																												| drush variable-set					|
+
+| Alias   | Command                                                      | Description                                                           |
+| ------- | ------------------------------------------------------------ | --------------------------------------------------------------------- |
+| `dr`    | `drush`                                                      | Display drush help                                                    |
+| `drca`  | `drush cc all`                                               | _(Deprecated in Drush 8)_ Clear all drupal caches.                    |
+| `drcb`  | `drush cc block`                                             | _(Deprecated in Drush 8)_ Clear block cache.                          |
+| `drcg`  | `drush cc registry`                                          | _(Deprecated in Drush 8)_ Clear registry cache.                       |
+| `drcj`  | `drush cc css-js`                                            | Clear css-js cache.                                                   |
+| `drcm`  | `drush cc menu`                                              | Clear menu cache.                                                     |
+| `drcml` | `drush cc module-list`                                       | Clear module-list cache.                                              |
+| `drcr`  | `drush core-cron`                                            | Run all cron hooks in all active modules for specified site.          |
+| `drct`  | `drush cc theme-registry`                                    | Clear theme-registry cache.                                           |
+| `drcv`  | `drush cc views`                                             | Clear views cache. (Make sure that the views module is enabled)       |
+| `drdmp` | `drush drush sql-dump --ordered-dump --result-file=dump.sql` | Backup database in a new dump.sql file                                |
+| `drf`   | `drush features`                                             | Display features status                                               |
+| `drfr`  | `drush features-revert -y`                                   | Revert a feature module on your site.                                 |
+| `drfra` | `drush features-revert-all`                                  | Revert all enabled feature module on your site.                       |
+| `drfu`  | `drush features-update -y`                                   | Update a feature module on your site.                                 |
+| `drif`  | `drush image-flush --all`                                    | Flush all derived images.                                             |
+| `drpm`  | `drush pm-list --type=module`                                | Show a list of available modules.                                     |
+| `drst`  | `drush core-status`                                          | Provides a birds-eye view of the current Drupal installation, if any. |
+| `drup`  | `drush updatedb`                                             | Apply any database updates required (as with running update.php).     |
+| `drups` | `drush updatedb-status`                                      | List any pending database updates.                                    |
+| `drv`   | `drush version`                                              | Show drush version.                                                   |
+| `drvd`  | `drush variable-del`                                         | Delete a variable.                                                    |
+| `drvg`  | `drush variable-get`                                         | Get a list of some or all site variables and values.                  |
+| `drvs`  | `drush variable-set`                                         | Set a variable.                                                       |
 
 ## Functions
 
-### dren
-Download and enable one or more extensions (modules or themes).
-Must be invoked with one or more parameters. e.g.:
-`dren devel` or `dren devel module_filter views`
+- `dren`: download and enable one or more extensions (modules or themes). Must be
+  invoked with one or more parameters, e.g.: `dren devel` or `dren devel module_filter views`.
 
-### drf
-Edit drushrc, site alias, and Drupal settings.php files.
-Can be invoked with one or without parameters. e.g.:
-`drf 1`
+- `drf`: edit drushrc, site alias, and Drupal settings.php files.
+  Can be invoked with one or without parameters, e.g.: `drf 1`.
 
-### dris
-Disable one or more extensions (modules or themes)
-Must be invoked with one or more parameters. e.g.:
-`dris devel` or `dris devel module_filter views`
+- `dris`: disable one or more extensions (modules or themes). Must be invoked with
+  one or more parameters, e.g.: `dris devel` or `dris devel module_filter views`.
 
-### drpu
-Uninstall one or more modules.
-Must be invoked with one or more parameters. e.g.:
-`drpu devel` or `drpu devel module_filter views`
+- `drpu`: uninstall one or more modules. Must be invoked with one or more
+  parameters, e.g.: `drpu devel` or `drpu devel module_filter views`.
 
-### drnew
-Creates a brand new drupal website.
-Note: As soon as the installation is complete, drush will print a username and a random password into the terminal:
-```
-Installation complete.  User name: admin  User password: cf7t8yqNEm
-```
+- `drnew`: creates a brand new drupal website. Note: as soon as the installation
+  is complete, `drush` will print a username and a random password into the terminal:
 
-## Additional features
-
-### Autocomplete
-The [completion script for drush](https://github.com/drush-ops/drush/blob/8.0.1/drush.complete.sh) comes enabled with this plugin.
-So, it is possible to type a command:
-```
-drush sql
-```
-
-And as soon as the tab key is pressed, the script will display the available commands:
-```
-drush sql
-sqlc           sql-conf       sql-create     sql-dump       sql-query      sql-sanitize                
-sql-cli        sql-connect    sql-drop       sqlq           sqlsan         sql-sync
-```
+  ```text
+  Installation complete.  User name: admin  User password: cf7t8yqNEm
+  ```
diff --git a/plugins/drush/drush.plugin.zsh b/plugins/drush/drush.plugin.zsh
index 8a20d79f2..fbf9656e6 100644
--- a/plugins/drush/drush.plugin.zsh
+++ b/plugins/drush/drush.plugin.zsh
@@ -1,19 +1,18 @@
-# Drush support.
-
+# Functions
 function dren() {
-  drush en $@ -y
+  drush en "$@" -y
 }
 
 function dris() {
-  drush pm-disable $@ -y
+  drush pm-disable "$@" -y
 }
 
 function drpu() {
-  drush pm-uninstall $@ -y
+  drush pm-uninstall "$@" -y
 }
 
 function drf() {
-  if [[ $1 == "" ]] then
+  if [[ -z "$1" ]] then
     drush core-config
   else
     drush core-config --choice=$1
@@ -21,58 +20,56 @@ function drf() {
 }
 
 function drfi() {
-  if [[ $1 == "fields" ]]; then
-    drush field-info fields
-  elif [[ $1 == "types" ]]; then
-    drush field-info types
-  else
-    drush field-info
-  fi
+  case "$1" in
+  fields) drush field-info fields ;;
+  types) drush field-info types ;;
+  *) drush field-info ;;
+  esac
 }
 
 function drnew() {
+  (
+    cd
+    echo "Website's name: "
+    read WEBSITE_NAME
 
-  cd ~
-  echo "Website's name: "
-  read WEBSITE_NAME
+    HOST=http://$(hostname -i)/
 
-  HOST=http://$(hostname -i)/
+    if [[ $WEBSITE_NAME == "" ]] then
+      MINUTES=$(date +%M:%S)
+      WEBSITE_NAME="Drupal-$MINUTES"
+      echo "Your website will be named: $WEBSITE_NAME"
+    fi
 
-  if [[ $WEBSITE_NAME == "" ]] then
-    MINUTES=$(date +%M:%S)
-    WEBSITE_NAME="Drupal-$MINUTES"
-    echo "Your website will be named: $WEBSITE_NAME"
-  fi
+    drush dl drupal --drupal-project-rename=$WEBSITE_NAME
 
-  drush dl drupal --drupal-project-rename=$WEBSITE_NAME
+    echo "Type your localhost directory: (Leave empty for /var/www/html/)"
+    read DIRECTORY
 
-  echo "Type your localhost directory: (Leave empty for /var/www/html/)"
-  read DIRECTORY
+    if [[ $DIRECTORY == "" ]] then
+      DIRECTORY="/var/www/html/"
+    fi
 
-  if [[ $DIRECTORY == "" ]] then
-    DIRECTORY="/var/www/html/"
-  fi
+    echo "Moving to $DIRECTORY$WEBSITE_NAME"
+    sudo mv $WEBSITE_NAME $DIRECTORY
+    cd $DIRECTORY$WEBSITE_NAME
 
-  echo "Moving to $DIRECTORY$WEBSITE_NAME"
-  sudo mv $WEBSITE_NAME $DIRECTORY
-  cd $DIRECTORY$WEBSITE_NAME
+    echo "Database's user: "
+    read DATABASE_USR
+    echo "Database's password: "
+    read -s DATABASE_PWD
+    echo "Database's name for your project: "
+    read DATABASE
 
-  echo "Database's user: "
-  read DATABASE_USR
-  echo "Database's password: "
-  read -s DATABASE_PWD
-  echo "Database's name for your project: "
-  read DATABASE
-
-  DB_URL="mysql://$DATABASE_USR:$DATABASE_PWD@localhost/$DATABASE"
-  drush site-install standard --db-url=$DB_URL --site-name=$WEBSITE_NAME
-
-  open_command $HOST$WEBSITE_NAME
-  echo "Done"
+    DB_URL="mysql://$DATABASE_USR:$DATABASE_PWD@localhost/$DATABASE"
+    drush site-install standard --db-url=$DB_URL --site-name=$WEBSITE_NAME
 
+    open_command $HOST$WEBSITE_NAME
+    echo "Done"
+  )
 }
 
-# Aliases, sorted alphabetically.
+# Aliases
 alias dr="drush"
 alias drca="drush cc all" # Deprecated for Drush 8
 alias drcb="drush cc block" # Deprecated for Drush 8
@@ -86,8 +83,8 @@ alias drcv="drush cc views"
 alias drdmp="drush sql-dump --ordered-dump --result-file=dump.sql"
 alias drf="drush features"
 alias drfr="drush features-revert -y"
-alias drfu="drush features-update -y"
 alias drfra="drush features-revert-all"
+alias drfu="drush features-update -y"
 alias drif="drush image-flush --all"
 alias drpm="drush pm-list --type=module"
 alias drst="drush core-status"

From d3bc4b41523b18dd75a7f3ba1a153afc8e8dcedd Mon Sep 17 00:00:00 2001
From: Sean MacCath-Moran <sean@Seans-MacBook-Pro.local>
Date: Wed, 9 Dec 2020 18:17:30 -0400
Subject: [PATCH 665/869] feat(drush): add Drupal 8 aliases to `drush` plugin
 (#9498)

Closes #9498
---
 plugins/drush/README.md        | 58 +++++++++++++++++++---------------
 plugins/drush/drush.plugin.zsh |  6 ++++
 2 files changed, 38 insertions(+), 26 deletions(-)

diff --git a/plugins/drush/README.md b/plugins/drush/README.md
index dfd1eaf82..29b429e3b 100644
--- a/plugins/drush/README.md
+++ b/plugins/drush/README.md
@@ -11,32 +11,38 @@ plugins=(... drush)
 
 ## Aliases
 
-| Alias   | Command                                                      | Description                                                           |
-| ------- | ------------------------------------------------------------ | --------------------------------------------------------------------- |
-| `dr`    | `drush`                                                      | Display drush help                                                    |
-| `drca`  | `drush cc all`                                               | _(Deprecated in Drush 8)_ Clear all drupal caches.                    |
-| `drcb`  | `drush cc block`                                             | _(Deprecated in Drush 8)_ Clear block cache.                          |
-| `drcg`  | `drush cc registry`                                          | _(Deprecated in Drush 8)_ Clear registry cache.                       |
-| `drcj`  | `drush cc css-js`                                            | Clear css-js cache.                                                   |
-| `drcm`  | `drush cc menu`                                              | Clear menu cache.                                                     |
-| `drcml` | `drush cc module-list`                                       | Clear module-list cache.                                              |
-| `drcr`  | `drush core-cron`                                            | Run all cron hooks in all active modules for specified site.          |
-| `drct`  | `drush cc theme-registry`                                    | Clear theme-registry cache.                                           |
-| `drcv`  | `drush cc views`                                             | Clear views cache. (Make sure that the views module is enabled)       |
-| `drdmp` | `drush drush sql-dump --ordered-dump --result-file=dump.sql` | Backup database in a new dump.sql file                                |
-| `drf`   | `drush features`                                             | Display features status                                               |
-| `drfr`  | `drush features-revert -y`                                   | Revert a feature module on your site.                                 |
-| `drfra` | `drush features-revert-all`                                  | Revert all enabled feature module on your site.                       |
-| `drfu`  | `drush features-update -y`                                   | Update a feature module on your site.                                 |
-| `drif`  | `drush image-flush --all`                                    | Flush all derived images.                                             |
-| `drpm`  | `drush pm-list --type=module`                                | Show a list of available modules.                                     |
-| `drst`  | `drush core-status`                                          | Provides a birds-eye view of the current Drupal installation, if any. |
-| `drup`  | `drush updatedb`                                             | Apply any database updates required (as with running update.php).     |
-| `drups` | `drush updatedb-status`                                      | List any pending database updates.                                    |
-| `drv`   | `drush version`                                              | Show drush version.                                                   |
-| `drvd`  | `drush variable-del`                                         | Delete a variable.                                                    |
-| `drvg`  | `drush variable-get`                                         | Get a list of some or all site variables and values.                  |
-| `drvs`  | `drush variable-set`                                         | Set a variable.                                                       |
+| Alias   | Command                                                     | Description                                                          |
+| ------- | ----------------------------------------------------------- | -------------------------------------------------------------------- |
+| `dr`    | `drush`                                                     | Display drush help                                                   |
+| `drca`  | `drush cc all`                                              | _(Deprecated in Drush 8)_ Clear all drupal caches                    |
+| `drcb`  | `drush cc block`                                            | _(Deprecated in Drush 8)_ Clear block cache                          |
+| `drcex` | `drush config:export -y`                                    | Export Drupal configuration to a directory                           |
+| `drcg`  | `drush cc registry`                                         | _(Deprecated in Drush 8)_ Clear registry cache                       |
+| `drcim` | `drush config:import -y`                                    | Import config from a config directory                                |
+| `drcj`  | `drush cc css-js`                                           | Clear css-js cache                                                   |
+| `drcm`  | `drush cc menu`                                             | Clear menu cache                                                     |
+| `drcml` | `drush cc module-list`                                      | Clear module-list cache                                              |
+| `drcr`  | `drush core-cron`                                           | Run all cron hooks in all active modules for specified site          |
+| `drct`  | `drush cc theme-registry`                                   | Clear theme-registry cache                                           |
+| `drcv`  | `drush cc views`                                            | Clear views cache _(make sure that the views module is enabled)_     |
+| `drdmp` | `drush drush sql-dump --ordered-dump --result-file=dumpsql` | Backup database in a new dump.sql file                               |
+| `drf`   | `drush features`                                            | Display features status                                              |
+| `drfr`  | `drush features-revert -y`                                  | Revert a feature module on your site                                 |
+| `drfra` | `drush features-revert-all`                                 | Revert all enabled feature module on your site                       |
+| `drfu`  | `drush features-update -y`                                  | Update a feature module on your site                                 |
+| `drif`  | `drush image-flush --all`                                   | Flush all derived images                                             |
+| `drpm`  | `drush pm-list --type=module`                               | Show a list of available modules                                     |
+| `drst`  | `drush core-status`                                         | Provides a birds-eye view of the current Drupal installation, if any |
+| `druli` | `drush user:login`                                          | Display a one time login link for user ID 1, or another user         |
+| `drup`  | `drush updatedb`                                            | Apply any database updates required (as with running update.php)     |
+| `drups` | `drush updatedb-status`                                     | List any pending database updates                                    |
+| `drv`   | `drush version`                                             | Show drush version                                                   |
+| `drvd`  | `drush variable-del`                                        | Delete a variable                                                    |
+| `drvg`  | `drush variable-get`                                        | Get a list of some or all site variables and values                  |
+| `drvs`  | `drush variable-set`                                        | Set a variable                                                       |
+| `drws`  | `drush watchdog:show`                                       | Show watchdog messages                                               |
+| `drwse` | `drush watchdog:show --extended`                            | Show watchdog messages with extended information                     |
+| `drwst` | `drush watchdog:tail`                                       | Tail watchdog messages                                              |
 
 ## Functions
 
diff --git a/plugins/drush/drush.plugin.zsh b/plugins/drush/drush.plugin.zsh
index fbf9656e6..48e8ddb1e 100644
--- a/plugins/drush/drush.plugin.zsh
+++ b/plugins/drush/drush.plugin.zsh
@@ -73,7 +73,9 @@ function drnew() {
 alias dr="drush"
 alias drca="drush cc all" # Deprecated for Drush 8
 alias drcb="drush cc block" # Deprecated for Drush 8
+alias drcex="drush config:export -y"
 alias drcg="drush cc registry" # Deprecated for Drush 8
+alias drcim="drush config:import -y"
 alias drcj="drush cc css-js"
 alias drcm="drush cc menu"
 alias drcml="drush cc module-list"
@@ -88,12 +90,16 @@ alias drfu="drush features-update -y"
 alias drif="drush image-flush --all"
 alias drpm="drush pm-list --type=module"
 alias drst="drush core-status"
+alias druli="drush user:login"
 alias drup="drush updatedb"
 alias drups="drush updatedb-status"
 alias drv="drush version"
 alias drvd="drush variable-del"
 alias drvg="drush variable-get"
 alias drvs="drush variable-set"
+alias drws="drush watchdog:show"
+alias drwse="drush watchdog:show --extended"
+alias drwst="drush watchdog:tail"
 
 # Enable drush autocomplete support
 autoload bashcompinit

From 02d8cf6e9a1123b9c0b47c6d051a8c70c392f635 Mon Sep 17 00:00:00 2001
From: t-sauer <t-sauer@outlook.de>
Date: Sun, 26 Feb 2017 16:58:57 +0100
Subject: [PATCH 666/869] feat(ember-cli): add completions for ember-cli
 (#5916)

Closes #5916
---
 plugins/ember-cli/README.md            |  45 +++---
 plugins/ember-cli/_ember-cli           | 189 +++++++++++++++++++++++++
 plugins/ember-cli/ember-cli.plugin.zsh |   9 +-
 3 files changed, 219 insertions(+), 24 deletions(-)
 create mode 100644 plugins/ember-cli/_ember-cli

diff --git a/plugins/ember-cli/README.md b/plugins/ember-cli/README.md
index b46373619..419704ade 100644
--- a/plugins/ember-cli/README.md
+++ b/plugins/ember-cli/README.md
@@ -1,22 +1,33 @@
 # Ember CLI
 
-**Maintainers:** [BilalBudhani](https://github.com/BilalBudhani), [eubenesa](https://github.com/eubenesa), [scottkidder](https://github.com/scottkidder]
+This plugin adds completion and aliases for using [`ember-cli`](https://cli.emberjs.com/).
 
-Ember CLI (https://www.ember-cli.com/)
+To use it, add `ember-cli` to the plugins array in your zshrc file:
 
-### List of Aliases
+```zsh
+plugins=(... ember-cli)
+```
 
-Alias | Ember-CLI command
------ | -----------------
-**es** | *ember serve*
-**ea** | *ember addon*
-**eb** | *ember build*
-**ed** | *ember destroy*
-**eg** | *ember generate*
-**eh** | *ember help*
-**ein** | *ember init*
-**ei** | *ember install*
-**et** | *ember test*
-**ets** | *ember test --serve*
-**eu** | *ember update*
-**ev** | *ember version*
+## Aliases
+
+| Alias | Command              |
+| ----- | -------------------- |
+| `ea`  | `ember addon`        |
+| `eb`  | `ember build`        |
+| `ed`  | `ember destroy`      |
+| `eg`  | `ember generate`     |
+| `eh`  | `ember help`         |
+| `ei`  | `ember install`      |
+| `ein` | `ember init`         |
+| `es`  | `ember serve`        |
+| `et`  | `ember test`         |
+| `ets` | `ember test --serve` |
+| `eu`  | `ember update`       |
+| `ev`  | `ember version`      |
+
+## Maintainers
+
+- [BilalBudhani](https://github.com/BilalBudhani)
+- [eubenesa](https://github.com/eubenesa)
+- [scottkidder](https://github.com/scottkidder]
+- [t-sauer](https://www.github.com/t-sauer)
diff --git a/plugins/ember-cli/_ember-cli b/plugins/ember-cli/_ember-cli
new file mode 100644
index 000000000..41c3c1fd4
--- /dev/null
+++ b/plugins/ember-cli/_ember-cli
@@ -0,0 +1,189 @@
+#compdef ember
+
+local curcontext="$curcontext" state line ret=1
+
+_arguments -C -A "--version" -A "--help" \
+  '(- 1 *)--help' \
+  '(- 1 *)--version' \
+  '1: :->cmds' \
+  '*:: :->args' && ret=0
+
+case $state in
+  cmds)
+    _values "ember command" \
+      "addon[Generates a new folder structure for building an addon, complete with test harness]" \
+      "asset-sizes[Shows the sizes of your asset files]" \
+      "build[Builds your app and places it into the output path (dist/ by default)]" \
+      "destroy[Destroys code generated by generate command]" \
+      "generate[Generates new code from blueprints]" \
+      "help[Outputs the usage instructions for all commands or the provided command]" \
+      "init[Creates a new ember-cli project in the current folder]" \
+      "install[Installs an ember-cli addon from npm]" \
+      "new[Creates a new directory and runs ember init in it]" \
+      "serve[Builds and serves your app, rebuilding on file changes]" \
+      "test[Runs your app's test suite]" \
+      "version[outputs ember-cli version]"
+    ret=0
+    ;;
+  args)
+    case $line[1] in
+      help)
+        _values 'commands' \
+          'addon' \
+          'asset-sizes' \
+          'build' \
+          'destroy' \
+          'generate' \
+          'help' \
+          'init' \
+          'install' \
+          'new' \
+          'serve' \
+          'test' \
+          'vesion' && ret=0
+        ;;
+      addon)
+        _arguments \
+          '(--blueprint)--blueprint=-' \
+          '(--directory)--directory=-' \
+          '(--dry-run)--dry-run' \
+          '(--skip-bower)--skip-bower' \
+          '(--skip-git)--skip-git' \
+          '(--skip-npm)--skip-npm' \
+          '(--verbose)--verbose'
+        ;;
+      asset-sizes)
+        _arguments \
+          '(--output-path)--output-path=-'
+        ;;
+      build)
+        _arguments \
+          '(--environment)--environment=-' \
+          '(--output-path)--output-path=-' \
+          '(--output-path)--suppress-sizes' \
+          '(--watch)--watch' \
+          '(--watcher)--watcher=-' \
+          '(-dev)-dev' \
+          '(-prod)-prod'
+        ;;
+      destroy|generate)
+        _values 'arguments' \
+          '(--classic)--classic' \
+          '(--dry-run)--dry-run' \
+          '(--dummy)--dummy' \
+          '(--in-repo-addon)--in-repo-addon-=' \
+          '(--pod)--pod' \
+          '(--verbose)--verbose' && ret=0
+        _values 'blueprints' \
+          'acceptance-test' \
+          'adapter' \
+          'adapter-test' \
+          'component' \
+          'component-addon' \
+          'component-test' \
+          'controller' \
+          'controller-test' \
+          'helper' \
+          'helper-addon' \
+          'helper-test' \
+          'initializer' \
+          'initializer-addon' \
+          'initializer-test' \
+          'instance-initializer' \
+          'instance-initializer-addon' \
+          'instance-initializer-test' \
+          'mixin' \
+          'mixin-test' \
+          'model' \
+          'model-test' \
+          'resource' \
+          'route' \
+          'route-addon' \
+          'route-test' \
+          'serializer' \
+          'serializer-test' \
+          'service' \
+          'service-test' \
+          'template' \
+          'test-helper' \
+          'transform' \
+          'transform-test' \
+          'util' \
+          'util-test' \
+          'view' \
+          'view-test' \
+          'addon' \
+          'addon-import' \
+          'app' \
+          'blueprint' \
+          'http-mock' \
+          'http-proxy' \
+          'in-repo-addon' \
+          'lib' \
+          'server' \
+          'vendor-shim' && ret=0
+        ;;
+      init)
+        _arguments \
+          '(--blueprint)--blueprint=-' \
+          '(--name)--name=-' \
+          '(--dry-run)--dry-run' \
+          '(--skip-bower)--skip-bower' \
+          '(--skip-npm)--skip-npm' \
+          '(--verbose)--verbose'
+        ;;
+      install)
+        _arguments \
+          '(--save-dev)--save-dev' \
+          '(--save)--save'
+        ;;
+      new)
+        _arguments \
+          '(--blueprint)--blueprint=-' \
+          '(--directory)--directory=-' \
+          '(--dry-run)--dry-run' \
+          '(--skip-bower)--skip-bower' \
+          '(--skip-git)--skip-git' \
+          '(--skip-npm)--skip-npm' \
+          '(--verbose)--verbose'
+        ;;
+      serve)
+        _arguments \
+          '(--port)--port=-[To use a port different than 4200. Pass 0 to automatically pick an available port.]' \
+          '(--host)--host=-[Listens on all interfaces by default]' \
+          '(--proxy)--proxy=-' \
+          '(--secure-proxy)--secure-proxy[Set to false to proxy self-signed SSL certificates]' \
+          '(--transparent-proxy)--transparent-proxy[Set to false to omit x-forwarded-* headers when proxying]' \
+          '(--watcher)--watcher=-' \
+          '(--live-reload)--live-reload' \
+          '(--live-reload-host)--live-reload-host=-[Defaults to host]' \
+          '(--live-reload-base-url)--live-reload-base-url=-[Defaults to baseURL]' \
+          '(--live-reload-port)--live-reload-port=-[Defaults to port number within \[49152...65535\]]' \
+          '(--environment)--environment=-' \
+          '(--output-path)--output-path=-' \
+          '(--ssl)--ssl' \
+          '(--ssl-key)--ssl-key=-' \
+          '(--ssl-cert)--ssl-cert=-'
+        ;;
+      test)
+        _arguments \
+          '(--environment)--environment=-' \
+          '(--config-file)--config-file=-' \
+          '(--server)--server' \
+          '(--host)--host=-' \
+          '(--test-port)--test-port=-[The test port to use when running with --server.]' \
+          '(--filter)--filter=-[A string to filter tests to run]' \
+          '(--module)--module=-[The name of a test module to run]' \
+          '(--watcher)--watcher=-' \
+          '(--launch)--launch=-[A comma separated list of browsers to launch for tests.]' \
+          '(--reporter)--reporter=-[Test reporter to use \[tap|dot|xunit\] (default: tap)]' \
+          '(--silent)--silent[Suppress any output except for the test report]' \
+          '(--test-page)--test-page=-[Test page to invoke]' \
+          '(--path)--path=-[Reuse an existing build at given path.]' \
+          '(--query)--query=-[A query string to append to the test page URL.]'
+        ;;
+    esac
+    ;;
+esac
+
+return ret
diff --git a/plugins/ember-cli/ember-cli.plugin.zsh b/plugins/ember-cli/ember-cli.plugin.zsh
index 67842c120..de46b9827 100644
--- a/plugins/ember-cli/ember-cli.plugin.zsh
+++ b/plugins/ember-cli/ember-cli.plugin.zsh
@@ -1,17 +1,12 @@
-# Ember CLI
-# Visit https://www.ember-cli.com/ to view user guide
-
-alias es='ember serve'
 alias ea='ember addon'
 alias eb='ember build'
 alias ed='ember destroy'
 alias eg='ember generate'
 alias eh='ember help'
-alias ein='ember init'
 alias ei='ember install'
+alias ein='ember init'
+alias es='ember serve'
 alias et='ember test'
 alias ets='ember test --serve'
 alias eu='ember update'
-
-# version
 alias ev='ember version'

From 0613232202b92349cee79804fc46e0495152ef12 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=A9opold=20Mebazaa?= <lemeb@users.noreply.github.com>
Date: Fri, 9 Aug 2019 21:56:57 -0400
Subject: [PATCH 667/869] refactor(emoji): rewrite script w/ Python and update
 emojis (#8069)

Closes #8069
---
 plugins/emoji/README.md                  |    42 +-
 plugins/emoji/emoji-char-definitions.zsh |  7893 +++++++-
 plugins/emoji/emoji-data.txt             |  5424 ++++--
 plugins/emoji/emoji.plugin.zsh           |   225 +-
 plugins/emoji/gemoji_db.json             | 21538 +++++++++++++++++++++
 plugins/emoji/update_emoji.pl            |   113 -
 plugins/emoji/update_emoji.py            |   213 +
 7 files changed, 32840 insertions(+), 2608 deletions(-)
 create mode 100644 plugins/emoji/gemoji_db.json
 delete mode 100644 plugins/emoji/update_emoji.pl
 create mode 100644 plugins/emoji/update_emoji.py

diff --git a/plugins/emoji/README.md b/plugins/emoji/README.md
index 8b8860a86..4154ea0dc 100644
--- a/plugins/emoji/README.md
+++ b/plugins/emoji/README.md
@@ -10,7 +10,7 @@ This plugin provides support for working with Unicode emoji characters in `zsh`
 
 Variable          | Description
 ----------------- | --------------------------------
-  $emoji          | Maps emoji names to characters
+  $emoji          | Maps emoji names to characters (except flags)
   $emoji_flags    | Maps country names to flag characters (using region indicators)
   $emoji_groups   | Named groups of emoji. Keys are group names; values are whitespace-separated lists of character names
 
@@ -55,10 +55,8 @@ The defined group names can be found with `echo ${(k)emoji_groups}`.
 To list all available emoji with their names, use:
 ```
 $> display_emoji
-$> display_emoji fruits
-$> display_emoji animals
-$> display_emoji vehicles
 $> display_emoji faces
+$> display_emoji people
 ```
 
 To use emoji in a prompt:
@@ -73,13 +71,13 @@ PROMPT="$surfer  > "
 
 The emoji names and codes are sourced from Unicode Technical Report \#51, which provides information on emoji support in Unicode. It can be found at https://www.unicode.org/reports/tr51/index.html.
 
-The group definitions are added by this OMZ plugin. They are not based on external definitions. (As far as I can tell. -apjanke)
+The group definitions are added by this OMZ plugin. They are not based on external definitions.
 
 The values in the `$emoji*` maps are the emoji characters themselves, not escape sequences or other forms that require interpretation. They can be used in any context and do not require escape sequence support from commands like `echo` or `print`.
 
 The emoji in the main `$emoji` map are standalone character sequences which can all be output on their own, without worrying about combining characters. The values may actually be multi-code-point sequences, instead of a single code point, and may include combining characters in those sequences. But they're arranged so their effects do not extend beyond that sequence.
 
-The exception to this is the skin tone variation selectors. These are included in the main `$emoji` map because they can be displayed on their own, as well as used as combining characters. (If they follow a character that is not one of the emoji characters they combine with, they are displayed as color swatches.)
+The exception to this is the skin tone / hair style variation selectors. These are included in the main `$emoji` map because they can be displayed on their own, as well as used as combining characters. (If they follow a character that is not one of the emoji characters they combine with, they are displayed as color swatches.)
 
 
 ##  Experimental Features
@@ -90,7 +88,6 @@ Variables:
 
 Variable          | Description
 ----------------- | --------------------------------
-  $emoji2         | Auxiliary and combining characters
   $emoji_skintone | Skin tone modifiers (from Unicode 8.0)
 
 
@@ -105,31 +102,26 @@ The "variation selectors" are combining characters which change the appearance o
 The `$emoji_skintone` associative array maps skin tone IDs to the variation selector characters. To use one, output it immediately following a smiley or other human emoji.
 
 ```
-echo "$emoji[smiling_face_with_open_mouth]$emoji_skintone[4]"
+echo $emoji[waving_hand]$emoji_skintone[5]
 ```
 
 Note that `$emoji_skintone` is an associative array, and its keys are the *names* of "Fitzpatrick Skin Type" groups, not linear indexes into a normal array. The names are `1_2`, `3`, `4`, `5`, and `6`. (Types 1 and 2 are combined into a single color.) See the [Diversity section in Unicode TR 51](https://www.unicode.org/reports/tr51/index.html#Diversity) for details.
 
+####  Gemoji support
+
+The [gemoji project](https://github.com/github/gemoji) seems to be the de facto main source for short names and other emoji-related metadata that isn't included in the official Unicode reports. So, our list of emojis incorporates some of their aliases to make your life more convenient:
+
+```
+echo $emoji[grinning_face_with_smiling_eyes]
+echo $emoji[smile]
+```
+
+These two commands yield the same emoji (😄). The first name is the official one, in the Unicode reference, and the second one is the alias that was in Gemoji's database.
+
 ##  TODO
 
 These are things that could be enhanced in future revisions of the plugin.
 
 * Incorporate CLDR data for ordering and groupings
 * Short :bracket: style names (from gemoji)
-* Incorporate `gemoji` data
-* Country codes for flags
-* ZWJ combining function?
-
-####  Gemoji support
-
-The [gemoji project](https://github.com/github/gemoji) seems to be the de facto main source for short names and other emoji-related metadata that isn't included in the official Unicode reports. (I'm saying this just from looking at the google results for "emoji short names" and related searches. -apjanke)
-
-If this plugin is updated to provide short names, CLDR sorting data, and similar stuff, it should probably be changed to use the Gemoji project, and the `update_emoji.pl` script be rewritten in Ruby so it can use the Gemoji library directly instead of parsing its data files.
-
-This does *not* mean that it should use Gemoji at run time. None of the `zsh` plugin stuff should call Gemoji or Ruby code. Rather, the "build time" `update_emoji.pl` script should be rewritten to use Gemoji to generate a pure-native-`zsh` character definition file which would be checked in to the repo and can be called by OMZ users without having Gemoji installed.
-
-####  ZWJ combining function
-
-One of the newer features of Unicode emoji is the ability to use the "Zero-Width Joiner" character to compose multiple emoji characters in to a single "emoji ligature" glyph. For example, this is [how Apple supports "family" emoji with various genders and skin tones](https://www.unicode.org/reports/tr51/index.html#ZWJ_Sequences).
-
-These are a pain to write out (and probably worse to read), and it might be convenient to have a couple functions for concisely composing them, if wider support for them appears.
+* ZWJ combining function?
\ No newline at end of file
diff --git a/plugins/emoji/emoji-char-definitions.zsh b/plugins/emoji/emoji-char-definitions.zsh
index 04693da05..b37c142a1 100644
--- a/plugins/emoji/emoji-char-definitions.zsh
+++ b/plugins/emoji/emoji-char-definitions.zsh
@@ -1,11 +1,18 @@
 
-# emoji-char-definitions.zsh - Emoji character definitions for oh-my-zsh emoji plugin
+# emoji-char-definitions.zsh - Emoji definitions for oh-my-zsh emoji plugin
 #
-# This file is auto-generated by update_emoji.pl. Do not edit it manually.
+# This file is auto-generated by update_emoji.py. Do not edit it manually.
 #
 # This contains the definition for:
 #   $emoji         - which maps character names to Unicode characters
-#   $emoji_flags   - maps country names to Unicode flag characters using region indicators 
+#   $emoji_flags   - maps country names to Unicode flag characters using region
+#                    indicators
+#   $emoji_mod     - maps modifier components to Unicode characters
+#   $emoji_groups  - a single associative array 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.
 
 # Main emoji
 typeset -gAH emoji
@@ -13,938 +20,3102 @@ typeset -gAH emoji
 typeset -gAH emoji_flags
 # Combining modifiers
 typeset -gAH emoji_mod
-
-emoji[copyright_sign]=$'\U00A9'
-emoji[registered_sign]=$'\U00AE'
-emoji[double_exclamation_mark]=$'\U203C'
-emoji[exclamation_question_mark]=$'\U2049'
-emoji[trade_mark_sign]=$'\U2122'
-emoji[information_source]=$'\U2139'
-emoji[left_right_arrow]=$'\U2194'
-emoji[up_down_arrow]=$'\U2195'
-emoji[north_west_arrow]=$'\U2196'
-emoji[north_east_arrow]=$'\U2197'
-emoji[south_east_arrow]=$'\U2198'
-emoji[south_west_arrow]=$'\U2199'
-emoji[leftwards_arrow_with_hook]=$'\U21A9'
-emoji[rightwards_arrow_with_hook]=$'\U21AA'
-emoji[watch]=$'\U231A'
-emoji[hourglass]=$'\U231B'
-emoji[keyboard]=$'\U2328'
-emoji[eject_symbol]=$'\U23CF'
-emoji[black_right_pointing_double_triangle]=$'\U23E9'
-emoji[black_left_pointing_double_triangle]=$'\U23EA'
-emoji[black_up_pointing_double_triangle]=$'\U23EB'
-emoji[black_down_pointing_double_triangle]=$'\U23EC'
-emoji[black_right_pointing_double_triangle_with_vertical_bar]=$'\U23ED'
-emoji[black_left_pointing_double_triangle_with_vertical_bar]=$'\U23EE'
-emoji[black_right_pointing_triangle_with_double_vertical_bar]=$'\U23EF'
-emoji[alarm_clock]=$'\U23F0'
-emoji[stopwatch]=$'\U23F1'
-emoji[timer_clock]=$'\U23F2'
-emoji[hourglass_with_flowing_sand]=$'\U23F3'
-emoji[double_vertical_bar]=$'\U23F8'
-emoji[black_square_for_stop]=$'\U23F9'
-emoji[black_circle_for_record]=$'\U23FA'
-emoji[circled_latin_capital_letter_m]=$'\U24C2'
-emoji[black_small_square]=$'\U25AA'
-emoji[white_small_square]=$'\U25AB'
-emoji[black_right_pointing_triangle]=$'\U25B6'
-emoji[black_left_pointing_triangle]=$'\U25C0'
-emoji[white_medium_square]=$'\U25FB'
-emoji[black_medium_square]=$'\U25FC'
-emoji[white_medium_small_square]=$'\U25FD'
-emoji[black_medium_small_square]=$'\U25FE'
-emoji[black_sun_with_rays]=$'\U2600'
-emoji[cloud]=$'\U2601'
-emoji[umbrella]=$'\U2602'
-emoji[snowman]=$'\U2603'
-emoji[comet]=$'\U2604'
-emoji[black_telephone]=$'\U260E'
-emoji[ballot_box_with_check]=$'\U2611'
-emoji[umbrella_with_rain_drops]=$'\U2614'
-emoji[hot_beverage]=$'\U2615'
-emoji[shamrock]=$'\U2618'
-emoji[white_up_pointing_index]=$'\U261D'
-emoji[skull_and_crossbones]=$'\U2620'
-emoji[radioactive_sign]=$'\U2622'
-emoji[biohazard_sign]=$'\U2623'
-emoji[orthodox_cross]=$'\U2626'
-emoji[star_and_crescent]=$'\U262A'
-emoji[peace_symbol]=$'\U262E'
-emoji[yin_yang]=$'\U262F'
-emoji[wheel_of_dharma]=$'\U2638'
-emoji[white_frowning_face]=$'\U2639'
-emoji[white_smiling_face]=$'\U263A'
-emoji[aries]=$'\U2648'
-emoji[taurus]=$'\U2649'
-emoji[gemini]=$'\U264A'
-emoji[cancer]=$'\U264B'
-emoji[leo]=$'\U264C'
-emoji[virgo]=$'\U264D'
-emoji[libra]=$'\U264E'
-emoji[scorpius]=$'\U264F'
-emoji[sagittarius]=$'\U2650'
-emoji[capricorn]=$'\U2651'
-emoji[aquarius]=$'\U2652'
-emoji[pisces]=$'\U2653'
-emoji[black_spade_suit]=$'\U2660'
-emoji[black_club_suit]=$'\U2663'
-emoji[black_heart_suit]=$'\U2665'
-emoji[black_diamond_suit]=$'\U2666'
-emoji[hot_springs]=$'\U2668'
-emoji[black_universal_recycling_symbol]=$'\U267B'
-emoji[wheelchair_symbol]=$'\U267F'
-emoji[hammer_and_pick]=$'\U2692'
-emoji[anchor]=$'\U2693'
-emoji[crossed_swords]=$'\U2694'
-emoji[scales]=$'\U2696'
-emoji[alembic]=$'\U2697'
-emoji[gear]=$'\U2699'
-emoji[atom_symbol]=$'\U269B'
-emoji[fleur_de_lis]=$'\U269C'
-emoji[warning_sign]=$'\U26A0'
-emoji[high_voltage_sign]=$'\U26A1'
-emoji[medium_white_circle]=$'\U26AA'
-emoji[medium_black_circle]=$'\U26AB'
-emoji[coffin]=$'\U26B0'
-emoji[funeral_urn]=$'\U26B1'
-emoji[soccer_ball]=$'\U26BD'
-emoji[baseball]=$'\U26BE'
-emoji[snowman_without_snow]=$'\U26C4'
-emoji[sun_behind_cloud]=$'\U26C5'
-emoji[thunder_cloud_and_rain]=$'\U26C8'
-emoji[ophiuchus]=$'\U26CE'
-emoji[pick]=$'\U26CF'
-emoji[helmet_with_white_cross]=$'\U26D1'
-emoji[chains]=$'\U26D3'
-emoji[no_entry]=$'\U26D4'
-emoji[shinto_shrine]=$'\U26E9'
-emoji[church]=$'\U26EA'
-emoji[mountain]=$'\U26F0'
-emoji[umbrella_on_ground]=$'\U26F1'
-emoji[fountain]=$'\U26F2'
-emoji[flag_in_hole]=$'\U26F3'
-emoji[ferry]=$'\U26F4'
-emoji[sailboat]=$'\U26F5'
-emoji[skier]=$'\U26F7'
-emoji[ice_skate]=$'\U26F8'
-emoji[person_with_ball]=$'\U26F9'
-emoji[tent]=$'\U26FA'
-emoji[fuel_pump]=$'\U26FD'
-emoji[black_scissors]=$'\U2702'
-emoji[white_heavy_check_mark]=$'\U2705'
-emoji[airplane]=$'\U2708'
-emoji[envelope]=$'\U2709'
-emoji[raised_fist]=$'\U270A'
+# Emoji groups
+typeset -gAH emoji_groups
+emoji[grinning_face]=$'\U1F600'
+emoji[grinning]=$'\U1F600'
+emoji[grinning_face_with_big_eyes]=$'\U1F603'
+emoji[smiley]=$'\U1F603'
+emoji[grinning_face_with_smiling_eyes]=$'\U1F604'
+emoji[smile]=$'\U1F604'
+emoji[beaming_face_with_smiling_eyes]=$'\U1F601'
+emoji[grin]=$'\U1F601'
+emoji[grinning_squinting_face]=$'\U1F606'
+emoji[laughing]=$'\U1F606'
+emoji[satisfied]=$'\U1F606'
+emoji[grinning_face_with_sweat]=$'\U1F605'
+emoji[sweat_smile]=$'\U1F605'
+emoji[rolling_on_the_floor_laughing]=$'\U1F923'
+emoji[rofl]=$'\U1F923'
+emoji[face_with_tears_of_joy]=$'\U1F602'
+emoji[joy]=$'\U1F602'
+emoji[slightly_smiling_face]=$'\U1F642'
+emoji[upside_down_face]=$'\U1F643'
+emoji[winking_face]=$'\U1F609'
+emoji[wink]=$'\U1F609'
+emoji[smiling_face_with_smiling_eyes]=$'\U1F60A'
+emoji[blush]=$'\U1F60A'
+emoji[smiling_face_with_halo]=$'\U1F607'
+emoji[innocent]=$'\U1F607'
+emoji[smiling_face_with_hearts]=$'\U1F970'
+emoji[smiling_face_with_three_hearts]=$'\U1F970'
+emoji[smiling_face_with_heart_eyes]=$'\U1F60D'
+emoji[heart_eyes]=$'\U1F60D'
+emoji[star_struck]=$'\U1F929'
+emoji[face_blowing_a_kiss]=$'\U1F618'
+emoji[kissing_heart]=$'\U1F618'
+emoji[kissing_face]=$'\U1F617'
+emoji[kissing]=$'\U1F617'
+emoji[smiling_face]=$'\U263A\UFE0F'
+emoji[relaxed]=$'\U263A\UFE0F'
+emoji[smiling_face_unqualified]=$'\U263A'
+emoji[kissing_face_with_closed_eyes]=$'\U1F61A'
+emoji[kissing_closed_eyes]=$'\U1F61A'
+emoji[kissing_face_with_smiling_eyes]=$'\U1F619'
+emoji[kissing_smiling_eyes]=$'\U1F619'
+emoji[face_savoring_food]=$'\U1F60B'
+emoji[yum]=$'\U1F60B'
+emoji[face_with_tongue]=$'\U1F61B'
+emoji[stuck_out_tongue]=$'\U1F61B'
+emoji[winking_face_with_tongue]=$'\U1F61C'
+emoji[stuck_out_tongue_winking_eye]=$'\U1F61C'
+emoji[zany_face]=$'\U1F92A'
+emoji[squinting_face_with_tongue]=$'\U1F61D'
+emoji[stuck_out_tongue_closed_eyes]=$'\U1F61D'
+emoji[money_mouth_face]=$'\U1F911'
+emoji[hugging_face]=$'\U1F917'
+emoji[hugs]=$'\U1F917'
+emoji[face_with_hand_over_mouth]=$'\U1F92D'
+emoji[hand_over_mouth]=$'\U1F92D'
+emoji[shushing_face]=$'\U1F92B'
+emoji[thinking_face]=$'\U1F914'
+emoji[thinking]=$'\U1F914'
+emoji[zipper_mouth_face]=$'\U1F910'
+emoji[face_with_raised_eyebrow]=$'\U1F928'
+emoji[raised_eyebrow]=$'\U1F928'
+emoji[neutral_face]=$'\U1F610'
+emoji[expressionless_face]=$'\U1F611'
+emoji[expressionless]=$'\U1F611'
+emoji[face_without_mouth]=$'\U1F636'
+emoji[no_mouth]=$'\U1F636'
+emoji[smirking_face]=$'\U1F60F'
+emoji[smirk]=$'\U1F60F'
+emoji[unamused_face]=$'\U1F612'
+emoji[unamused]=$'\U1F612'
+emoji[face_with_rolling_eyes]=$'\U1F644'
+emoji[roll_eyes]=$'\U1F644'
+emoji[grimacing_face]=$'\U1F62C'
+emoji[grimacing]=$'\U1F62C'
+emoji[lying_face]=$'\U1F925'
+emoji[relieved_face]=$'\U1F60C'
+emoji[relieved]=$'\U1F60C'
+emoji[pensive_face]=$'\U1F614'
+emoji[pensive]=$'\U1F614'
+emoji[sleepy_face]=$'\U1F62A'
+emoji[sleepy]=$'\U1F62A'
+emoji[drooling_face]=$'\U1F924'
+emoji[sleeping_face]=$'\U1F634'
+emoji[sleeping]=$'\U1F634'
+emoji[face_with_medical_mask]=$'\U1F637'
+emoji[mask]=$'\U1F637'
+emoji[face_with_thermometer]=$'\U1F912'
+emoji[face_with_head_bandage]=$'\U1F915'
+emoji[nauseated_face]=$'\U1F922'
+emoji[face_vomiting]=$'\U1F92E'
+emoji[vomiting_face]=$'\U1F92E'
+emoji[sneezing_face]=$'\U1F927'
+emoji[hot_face]=$'\U1F975'
+emoji[cold_face]=$'\U1F976'
+emoji[woozy_face]=$'\U1F974'
+emoji[dizzy_face]=$'\U1F635'
+emoji[exploding_head]=$'\U1F92F'
+emoji[cowboy_hat_face]=$'\U1F920'
+emoji[partying_face]=$'\U1F973'
+emoji[smiling_face_with_sunglasses]=$'\U1F60E'
+emoji[nerd_face]=$'\U1F913'
+emoji[face_with_monocle]=$'\U1F9D0'
+emoji[monocle_face]=$'\U1F9D0'
+emoji[confused_face]=$'\U1F615'
+emoji[confused]=$'\U1F615'
+emoji[worried_face]=$'\U1F61F'
+emoji[worried]=$'\U1F61F'
+emoji[slightly_frowning_face]=$'\U1F641'
+emoji[slightly_frowning_face_1]=$'\U2639\UFE0F'
+emoji[frowning_face_unqualified]=$'\U2639'
+emoji[frowning_face]=$'\U2639'
+emoji[face_with_open_mouth]=$'\U1F62E'
+emoji[open_mouth]=$'\U1F62E'
+emoji[hushed_face]=$'\U1F62F'
+emoji[hushed]=$'\U1F62F'
+emoji[astonished_face]=$'\U1F632'
+emoji[astonished]=$'\U1F632'
+emoji[flushed_face]=$'\U1F633'
+emoji[flushed]=$'\U1F633'
+emoji[pleading_face]=$'\U1F97A'
+emoji[frowning_face_with_open_mouth]=$'\U1F626'
+emoji[frowning]=$'\U1F626'
+emoji[anguished_face]=$'\U1F627'
+emoji[anguished]=$'\U1F627'
+emoji[fearful_face]=$'\U1F628'
+emoji[fearful]=$'\U1F628'
+emoji[anxious_face_with_sweat]=$'\U1F630'
+emoji[cold_sweat]=$'\U1F630'
+emoji[sad_but_relieved_face]=$'\U1F625'
+emoji[disappointed_relieved]=$'\U1F625'
+emoji[crying_face]=$'\U1F622'
+emoji[cry]=$'\U1F622'
+emoji[loudly_crying_face]=$'\U1F62D'
+emoji[sob]=$'\U1F62D'
+emoji[face_screaming_in_fear]=$'\U1F631'
+emoji[scream]=$'\U1F631'
+emoji[confounded_face]=$'\U1F616'
+emoji[confounded]=$'\U1F616'
+emoji[persevering_face]=$'\U1F623'
+emoji[persevere]=$'\U1F623'
+emoji[disappointed_face]=$'\U1F61E'
+emoji[disappointed]=$'\U1F61E'
+emoji[downcast_face_with_sweat]=$'\U1F613'
+emoji[sweat]=$'\U1F613'
+emoji[weary_face]=$'\U1F629'
+emoji[weary]=$'\U1F629'
+emoji[tired_face]=$'\U1F62B'
+emoji[yawning_face]=$'\U1F971'
+emoji[face_with_steam_from_nose]=$'\U1F624'
+emoji[triumph]=$'\U1F624'
+emoji[pouting_face]=$'\U1F621'
+emoji[rage]=$'\U1F621'
+emoji[pout]=$'\U1F621'
+emoji[angry_face]=$'\U1F620'
+emoji[angry]=$'\U1F620'
+emoji[face_with_symbols_on_mouth]=$'\U1F92C'
+emoji[cursing_face]=$'\U1F92C'
+emoji[smiling_face_with_horns]=$'\U1F608'
+emoji[smiling_imp]=$'\U1F608'
+emoji[angry_face_with_horns]=$'\U1F47F'
+emoji[imp]=$'\U1F47F'
+emoji[skull]=$'\U1F480'
+emoji[skull_and_crossbones]=$'\U2620\UFE0F'
+emoji[skull_and_crossbones_unqualified]=$'\U2620'
+emoji[pile_of_poo]=$'\U1F4A9'
+emoji[hankey]=$'\U1F4A9'
+emoji[poop]=$'\U1F4A9'
+emoji[shit]=$'\U1F4A9'
+emoji[clown_face]=$'\U1F921'
+emoji[ogre]=$'\U1F479'
+emoji[japanese_ogre]=$'\U1F479'
+emoji[goblin]=$'\U1F47A'
+emoji[japanese_goblin]=$'\U1F47A'
+emoji[ghost]=$'\U1F47B'
+emoji[alien]=$'\U1F47D'
+emoji[alien_monster]=$'\U1F47E'
+emoji[space_invader]=$'\U1F47E'
+emoji[robot]=$'\U1F916'
+emoji[grinning_cat]=$'\U1F63A'
+emoji[smiley_cat]=$'\U1F63A'
+emoji[grinning_cat_with_smiling_eyes]=$'\U1F638'
+emoji[smile_cat]=$'\U1F638'
+emoji[cat_with_tears_of_joy]=$'\U1F639'
+emoji[joy_cat]=$'\U1F639'
+emoji[smiling_cat_with_heart_eyes]=$'\U1F63B'
+emoji[heart_eyes_cat]=$'\U1F63B'
+emoji[cat_with_wry_smile]=$'\U1F63C'
+emoji[smirk_cat]=$'\U1F63C'
+emoji[kissing_cat]=$'\U1F63D'
+emoji[weary_cat]=$'\U1F640'
+emoji[scream_cat]=$'\U1F640'
+emoji[crying_cat]=$'\U1F63F'
+emoji[crying_cat_face]=$'\U1F63F'
+emoji[pouting_cat]=$'\U1F63E'
+emoji[see_no_evil_monkey]=$'\U1F648'
+emoji[see_no_evil]=$'\U1F648'
+emoji[hear_no_evil_monkey]=$'\U1F649'
+emoji[hear_no_evil]=$'\U1F649'
+emoji[speak_no_evil_monkey]=$'\U1F64A'
+emoji[speak_no_evil]=$'\U1F64A'
+emoji[kiss_mark]=$'\U1F48B'
+emoji[love_letter]=$'\U1F48C'
+emoji[heart_with_arrow]=$'\U1F498'
+emoji[cupid]=$'\U1F498'
+emoji[heart_with_ribbon]=$'\U1F49D'
+emoji[gift_heart]=$'\U1F49D'
+emoji[sparkling_heart]=$'\U1F496'
+emoji[growing_heart]=$'\U1F497'
+emoji[heartpulse]=$'\U1F497'
+emoji[beating_heart]=$'\U1F493'
+emoji[heartbeat]=$'\U1F493'
+emoji[revolving_hearts]=$'\U1F49E'
+emoji[two_hearts]=$'\U1F495'
+emoji[heart_decoration]=$'\U1F49F'
+emoji[heart_exclamation]=$'\U2763\UFE0F'
+emoji[heavy_heart_exclamation]=$'\U2763\UFE0F'
+emoji[heart_exclamation_unqualified]=$'\U2763'
+emoji[broken_heart]=$'\U1F494'
+emoji[red_heart]=$'\U2764\UFE0F'
+emoji[heart]=$'\U2764\UFE0F'
+emoji[red_heart_unqualified]=$'\U2764'
+emoji[orange_heart]=$'\U1F9E1'
+emoji[yellow_heart]=$'\U1F49B'
+emoji[green_heart]=$'\U1F49A'
+emoji[blue_heart]=$'\U1F499'
+emoji[purple_heart]=$'\U1F49C'
+emoji[brown_heart]=$'\U1F90E'
+emoji[black_heart]=$'\U1F5A4'
+emoji[white_heart]=$'\U1F90D'
+emoji[hundred_points]=$'\U1F4AF'
+emoji[100]=$'\U1F4AF'
+emoji[anger_symbol]=$'\U1F4A2'
+emoji[anger]=$'\U1F4A2'
+emoji[collision]=$'\U1F4A5'
+emoji[boom]=$'\U1F4A5'
+emoji[dizzy]=$'\U1F4AB'
+emoji[sweat_droplets]=$'\U1F4A6'
+emoji[sweat_drops]=$'\U1F4A6'
+emoji[dashing_away]=$'\U1F4A8'
+emoji[dash]=$'\U1F4A8'
+emoji[hole]=$'\U1F573\UFE0F'
+emoji[hole_unqualified]=$'\U1F573'
+emoji[bomb]=$'\U1F4A3'
+emoji[speech_balloon]=$'\U1F4AC'
+emoji[eye_in_speech_bubble]=$'\U1F441\UFE0F\U200D\U1F5E8\UFE0F'
+emoji[eye_speech_bubble]=$'\U1F441\UFE0F\U200D\U1F5E8\UFE0F'
+emoji[eye_in_speech_bubble_unqualified]=$'\U1F441\U200D\U1F5E8\UFE0F'
+emoji[eye_in_speech_bubble_unqualified_1]=$'\U1F441\UFE0F\U200D\U1F5E8'
+emoji[eye_in_speech_bubble_unqualified_2]=$'\U1F441\U200D\U1F5E8'
+emoji[left_speech_bubble]=$'\U1F5E8\UFE0F'
+emoji[left_speech_bubble_unqualified]=$'\U1F5E8'
+emoji[right_anger_bubble]=$'\U1F5EF\UFE0F'
+emoji[right_anger_bubble_unqualified]=$'\U1F5EF'
+emoji[thought_balloon]=$'\U1F4AD'
+emoji[zzz]=$'\U1F4A4'
+emoji[waving_hand]=$'\U1F44B'
+emoji[wave]=$'\U1F44B'
+emoji[waving_hand_light_skin_tone]=$'\U1F44B\U1F3FB'
+emoji[waving_hand_medium_light_skin_tone]=$'\U1F44B\U1F3FC'
+emoji[waving_hand_medium_skin_tone]=$'\U1F44B\U1F3FD'
+emoji[waving_hand_medium_dark_skin_tone]=$'\U1F44B\U1F3FE'
+emoji[waving_hand_dark_skin_tone]=$'\U1F44B\U1F3FF'
+emoji[raised_back_of_hand]=$'\U1F91A'
+emoji[raised_back_of_hand_light_skin_tone]=$'\U1F91A\U1F3FB'
+emoji[raised_back_of_hand_medium_light_skin_tone]=$'\U1F91A\U1F3FC'
+emoji[raised_back_of_hand_medium_skin_tone]=$'\U1F91A\U1F3FD'
+emoji[raised_back_of_hand_medium_dark_skin_tone]=$'\U1F91A\U1F3FE'
+emoji[raised_back_of_hand_dark_skin_tone]=$'\U1F91A\U1F3FF'
+emoji[hand_with_fingers_splayed]=$'\U1F590\UFE0F'
+emoji[hand_with_fingers_splayed_unqualified]=$'\U1F590'
+emoji[raised_hand_with_fingers_splayed]=$'\U1F590'
+emoji[hand_with_fingers_splayed_light_skin_tone]=$'\U1F590\U1F3FB'
+emoji[hand_with_fingers_splayed_medium_light_skin_tone]=$'\U1F590\U1F3FC'
+emoji[hand_with_fingers_splayed_medium_skin_tone]=$'\U1F590\U1F3FD'
+emoji[hand_with_fingers_splayed_medium_dark_skin_tone]=$'\U1F590\U1F3FE'
+emoji[hand_with_fingers_splayed_dark_skin_tone]=$'\U1F590\U1F3FF'
 emoji[raised_hand]=$'\U270B'
-emoji[victory_hand]=$'\U270C'
-emoji[writing_hand]=$'\U270D'
-emoji[pencil]=$'\U270F'
-emoji[black_nib]=$'\U2712'
-emoji[heavy_check_mark]=$'\U2714'
-emoji[heavy_multiplication_x]=$'\U2716'
-emoji[latin_cross]=$'\U271D'
-emoji[star_of_david]=$'\U2721'
-emoji[sparkles]=$'\U2728'
-emoji[eight_spoked_asterisk]=$'\U2733'
-emoji[eight_pointed_black_star]=$'\U2734'
-emoji[snowflake]=$'\U2744'
-emoji[sparkle]=$'\U2747'
-emoji[cross_mark]=$'\U274C'
-emoji[negative_squared_cross_mark]=$'\U274E'
-emoji[black_question_mark_ornament]=$'\U2753'
-emoji[white_question_mark_ornament]=$'\U2754'
-emoji[white_exclamation_mark_ornament]=$'\U2755'
-emoji[heavy_exclamation_mark_symbol]=$'\U2757'
-emoji[heavy_heart_exclamation_mark_ornament]=$'\U2763'
-emoji[heavy_black_heart]=$'\U2764'
-emoji[heavy_plus_sign]=$'\U2795'
-emoji[heavy_minus_sign]=$'\U2796'
-emoji[heavy_division_sign]=$'\U2797'
-emoji[black_rightwards_arrow]=$'\U27A1'
-emoji[curly_loop]=$'\U27B0'
-emoji[double_curly_loop]=$'\U27BF'
-emoji[arrow_pointing_rightwards_then_curving_upwards]=$'\U2934'
-emoji[arrow_pointing_rightwards_then_curving_downwards]=$'\U2935'
-emoji[leftwards_black_arrow]=$'\U2B05'
-emoji[upwards_black_arrow]=$'\U2B06'
-emoji[downwards_black_arrow]=$'\U2B07'
-emoji[black_large_square]=$'\U2B1B'
-emoji[white_large_square]=$'\U2B1C'
-emoji[white_medium_star]=$'\U2B50'
-emoji[heavy_large_circle]=$'\U2B55'
-emoji[wavy_dash]=$'\U3030'
-emoji[part_alternation_mark]=$'\U303D'
-emoji[circled_ideograph_congratulation]=$'\U3297'
-emoji[circled_ideograph_secret]=$'\U3299'
-emoji[mahjong_tile_red_dragon]=$'\U1F004'
-emoji[playing_card_black_joker]=$'\U1F0CF'
-emoji[negative_squared_latin_capital_letter_a]=$'\U1F170'
-emoji[negative_squared_latin_capital_letter_b]=$'\U1F171'
-emoji[negative_squared_latin_capital_letter_o]=$'\U1F17E'
-emoji[negative_squared_latin_capital_letter_p]=$'\U1F17F'
-emoji[negative_squared_ab]=$'\U1F18E'
-emoji[squared_cl]=$'\U1F191'
-emoji[squared_cool]=$'\U1F192'
-emoji[squared_free]=$'\U1F193'
-emoji[squared_id]=$'\U1F194'
-emoji[squared_new]=$'\U1F195'
-emoji[squared_ng]=$'\U1F196'
-emoji[squared_ok]=$'\U1F197'
-emoji[squared_sos]=$'\U1F198'
-emoji[squared_up_with_exclamation_mark]=$'\U1F199'
-emoji[squared_vs]=$'\U1F19A'
-emoji[squared_katakana_koko]=$'\U1F201'
-emoji[squared_katakana_sa]=$'\U1F202'
-emoji[squared_cjk_unified_ideograph_7121]=$'\U1F21A'
-emoji[squared_cjk_unified_ideograph_6307]=$'\U1F22F'
-emoji[squared_cjk_unified_ideograph_7981]=$'\U1F232'
-emoji[squared_cjk_unified_ideograph_7a7a]=$'\U1F233'
-emoji[squared_cjk_unified_ideograph_5408]=$'\U1F234'
-emoji[squared_cjk_unified_ideograph_6e80]=$'\U1F235'
-emoji[squared_cjk_unified_ideograph_6709]=$'\U1F236'
-emoji[squared_cjk_unified_ideograph_6708]=$'\U1F237'
-emoji[squared_cjk_unified_ideograph_7533]=$'\U1F238'
-emoji[squared_cjk_unified_ideograph_5272]=$'\U1F239'
-emoji[squared_cjk_unified_ideograph_55b6]=$'\U1F23A'
-emoji[circled_ideograph_advantage]=$'\U1F250'
-emoji[circled_ideograph_accept]=$'\U1F251'
-emoji[cyclone]=$'\U1F300'
-emoji[foggy]=$'\U1F301'
-emoji[closed_umbrella]=$'\U1F302'
-emoji[night_with_stars]=$'\U1F303'
-emoji[sunrise_over_mountains]=$'\U1F304'
-emoji[sunrise]=$'\U1F305'
-emoji[cityscape_at_dusk]=$'\U1F306'
-emoji[sunset_over_buildings]=$'\U1F307'
-emoji[rainbow]=$'\U1F308'
-emoji[bridge_at_night]=$'\U1F309'
-emoji[water_wave]=$'\U1F30A'
-emoji[volcano]=$'\U1F30B'
-emoji[milky_way]=$'\U1F30C'
-emoji[earth_globe_europe_africa]=$'\U1F30D'
-emoji[earth_globe_americas]=$'\U1F30E'
-emoji[earth_globe_asia_australia]=$'\U1F30F'
-emoji[globe_with_meridians]=$'\U1F310'
-emoji[new_moon_symbol]=$'\U1F311'
-emoji[waxing_crescent_moon_symbol]=$'\U1F312'
-emoji[first_quarter_moon_symbol]=$'\U1F313'
-emoji[waxing_gibbous_moon_symbol]=$'\U1F314'
-emoji[full_moon_symbol]=$'\U1F315'
-emoji[waning_gibbous_moon_symbol]=$'\U1F316'
-emoji[last_quarter_moon_symbol]=$'\U1F317'
-emoji[waning_crescent_moon_symbol]=$'\U1F318'
-emoji[crescent_moon]=$'\U1F319'
-emoji[new_moon_with_face]=$'\U1F31A'
-emoji[first_quarter_moon_with_face]=$'\U1F31B'
-emoji[last_quarter_moon_with_face]=$'\U1F31C'
-emoji[full_moon_with_face]=$'\U1F31D'
-emoji[sun_with_face]=$'\U1F31E'
-emoji[glowing_star]=$'\U1F31F'
-emoji[shooting_star]=$'\U1F320'
-emoji[thermometer]=$'\U1F321'
-emoji[white_sun_with_small_cloud]=$'\U1F324'
-emoji[white_sun_behind_cloud]=$'\U1F325'
-emoji[white_sun_behind_cloud_with_rain]=$'\U1F326'
-emoji[cloud_with_rain]=$'\U1F327'
-emoji[cloud_with_snow]=$'\U1F328'
-emoji[cloud_with_lightning]=$'\U1F329'
-emoji[cloud_with_tornado]=$'\U1F32A'
-emoji[fog]=$'\U1F32B'
-emoji[wind_blowing_face]=$'\U1F32C'
-emoji[hot_dog]=$'\U1F32D'
-emoji[taco]=$'\U1F32E'
-emoji[burrito]=$'\U1F32F'
-emoji[chestnut]=$'\U1F330'
+emoji[hand]=$'\U270B'
+emoji[raised_hand_light_skin_tone]=$'\U270B\U1F3FB'
+emoji[raised_hand_medium_light_skin_tone]=$'\U270B\U1F3FC'
+emoji[raised_hand_medium_skin_tone]=$'\U270B\U1F3FD'
+emoji[raised_hand_medium_dark_skin_tone]=$'\U270B\U1F3FE'
+emoji[raised_hand_dark_skin_tone]=$'\U270B\U1F3FF'
+emoji[vulcan_salute]=$'\U1F596'
+emoji[vulcan_salute_light_skin_tone]=$'\U1F596\U1F3FB'
+emoji[vulcan_salute_medium_light_skin_tone]=$'\U1F596\U1F3FC'
+emoji[vulcan_salute_medium_skin_tone]=$'\U1F596\U1F3FD'
+emoji[vulcan_salute_medium_dark_skin_tone]=$'\U1F596\U1F3FE'
+emoji[vulcan_salute_dark_skin_tone]=$'\U1F596\U1F3FF'
+emoji[OK_hand]=$'\U1F44C'
+emoji[ok_hand]=$'\U1F44C'
+emoji[OK_hand_light_skin_tone]=$'\U1F44C\U1F3FB'
+emoji[OK_hand_medium_light_skin_tone]=$'\U1F44C\U1F3FC'
+emoji[OK_hand_medium_skin_tone]=$'\U1F44C\U1F3FD'
+emoji[OK_hand_medium_dark_skin_tone]=$'\U1F44C\U1F3FE'
+emoji[OK_hand_dark_skin_tone]=$'\U1F44C\U1F3FF'
+emoji[pinching_hand]=$'\U1F90F'
+emoji[pinching_hand_light_skin_tone]=$'\U1F90F\U1F3FB'
+emoji[pinching_hand_medium_light_skin_tone]=$'\U1F90F\U1F3FC'
+emoji[pinching_hand_medium_skin_tone]=$'\U1F90F\U1F3FD'
+emoji[pinching_hand_medium_dark_skin_tone]=$'\U1F90F\U1F3FE'
+emoji[pinching_hand_dark_skin_tone]=$'\U1F90F\U1F3FF'
+emoji[victory_hand]=$'\U270C\UFE0F'
+emoji[v]=$'\U270C\UFE0F'
+emoji[victory_hand_unqualified]=$'\U270C'
+emoji[victory_hand_light_skin_tone]=$'\U270C\U1F3FB'
+emoji[victory_hand_medium_light_skin_tone]=$'\U270C\U1F3FC'
+emoji[victory_hand_medium_skin_tone]=$'\U270C\U1F3FD'
+emoji[victory_hand_medium_dark_skin_tone]=$'\U270C\U1F3FE'
+emoji[victory_hand_dark_skin_tone]=$'\U270C\U1F3FF'
+emoji[crossed_fingers]=$'\U1F91E'
+emoji[crossed_fingers_light_skin_tone]=$'\U1F91E\U1F3FB'
+emoji[crossed_fingers_medium_light_skin_tone]=$'\U1F91E\U1F3FC'
+emoji[crossed_fingers_medium_skin_tone]=$'\U1F91E\U1F3FD'
+emoji[crossed_fingers_medium_dark_skin_tone]=$'\U1F91E\U1F3FE'
+emoji[crossed_fingers_dark_skin_tone]=$'\U1F91E\U1F3FF'
+emoji[love_you_gesture]=$'\U1F91F'
+emoji[love_you_gesture_light_skin_tone]=$'\U1F91F\U1F3FB'
+emoji[love_you_gesture_medium_light_skin_tone]=$'\U1F91F\U1F3FC'
+emoji[love_you_gesture_medium_skin_tone]=$'\U1F91F\U1F3FD'
+emoji[love_you_gesture_medium_dark_skin_tone]=$'\U1F91F\U1F3FE'
+emoji[love_you_gesture_dark_skin_tone]=$'\U1F91F\U1F3FF'
+emoji[sign_of_the_horns]=$'\U1F918'
+emoji[metal]=$'\U1F918'
+emoji[sign_of_the_horns_light_skin_tone]=$'\U1F918\U1F3FB'
+emoji[sign_of_the_horns_medium_light_skin_tone]=$'\U1F918\U1F3FC'
+emoji[sign_of_the_horns_medium_skin_tone]=$'\U1F918\U1F3FD'
+emoji[sign_of_the_horns_medium_dark_skin_tone]=$'\U1F918\U1F3FE'
+emoji[sign_of_the_horns_dark_skin_tone]=$'\U1F918\U1F3FF'
+emoji[call_me_hand]=$'\U1F919'
+emoji[call_me_hand_light_skin_tone]=$'\U1F919\U1F3FB'
+emoji[call_me_hand_medium_light_skin_tone]=$'\U1F919\U1F3FC'
+emoji[call_me_hand_medium_skin_tone]=$'\U1F919\U1F3FD'
+emoji[call_me_hand_medium_dark_skin_tone]=$'\U1F919\U1F3FE'
+emoji[call_me_hand_dark_skin_tone]=$'\U1F919\U1F3FF'
+emoji[backhand_index_pointing_left]=$'\U1F448'
+emoji[point_left]=$'\U1F448'
+emoji[backhand_index_pointing_left_light_skin_tone]=$'\U1F448\U1F3FB'
+emoji[backhand_index_pointing_left_medium_light_skin_tone]=$'\U1F448\U1F3FC'
+emoji[backhand_index_pointing_left_medium_skin_tone]=$'\U1F448\U1F3FD'
+emoji[backhand_index_pointing_left_medium_dark_skin_tone]=$'\U1F448\U1F3FE'
+emoji[backhand_index_pointing_left_dark_skin_tone]=$'\U1F448\U1F3FF'
+emoji[backhand_index_pointing_right]=$'\U1F449'
+emoji[point_right]=$'\U1F449'
+emoji[backhand_index_pointing_right_light_skin_tone]=$'\U1F449\U1F3FB'
+emoji[backhand_index_pointing_right_medium_light_skin_tone]=$'\U1F449\U1F3FC'
+emoji[backhand_index_pointing_right_medium_skin_tone]=$'\U1F449\U1F3FD'
+emoji[backhand_index_pointing_right_medium_dark_skin_tone]=$'\U1F449\U1F3FE'
+emoji[backhand_index_pointing_right_dark_skin_tone]=$'\U1F449\U1F3FF'
+emoji[backhand_index_pointing_up]=$'\U1F446'
+emoji[point_up_2]=$'\U1F446'
+emoji[backhand_index_pointing_up_light_skin_tone]=$'\U1F446\U1F3FB'
+emoji[backhand_index_pointing_up_medium_light_skin_tone]=$'\U1F446\U1F3FC'
+emoji[backhand_index_pointing_up_medium_skin_tone]=$'\U1F446\U1F3FD'
+emoji[backhand_index_pointing_up_medium_dark_skin_tone]=$'\U1F446\U1F3FE'
+emoji[backhand_index_pointing_up_dark_skin_tone]=$'\U1F446\U1F3FF'
+emoji[middle_finger]=$'\U1F595'
+emoji[fu]=$'\U1F595'
+emoji[middle_finger_light_skin_tone]=$'\U1F595\U1F3FB'
+emoji[middle_finger_medium_light_skin_tone]=$'\U1F595\U1F3FC'
+emoji[middle_finger_medium_skin_tone]=$'\U1F595\U1F3FD'
+emoji[middle_finger_medium_dark_skin_tone]=$'\U1F595\U1F3FE'
+emoji[middle_finger_dark_skin_tone]=$'\U1F595\U1F3FF'
+emoji[backhand_index_pointing_down]=$'\U1F447'
+emoji[point_down]=$'\U1F447'
+emoji[backhand_index_pointing_down_light_skin_tone]=$'\U1F447\U1F3FB'
+emoji[backhand_index_pointing_down_medium_light_skin_tone]=$'\U1F447\U1F3FC'
+emoji[backhand_index_pointing_down_medium_skin_tone]=$'\U1F447\U1F3FD'
+emoji[backhand_index_pointing_down_medium_dark_skin_tone]=$'\U1F447\U1F3FE'
+emoji[backhand_index_pointing_down_dark_skin_tone]=$'\U1F447\U1F3FF'
+emoji[index_pointing_up]=$'\U261D\UFE0F'
+emoji[point_up]=$'\U261D\UFE0F'
+emoji[index_pointing_up_unqualified]=$'\U261D'
+emoji[index_pointing_up_light_skin_tone]=$'\U261D\U1F3FB'
+emoji[index_pointing_up_medium_light_skin_tone]=$'\U261D\U1F3FC'
+emoji[index_pointing_up_medium_skin_tone]=$'\U261D\U1F3FD'
+emoji[index_pointing_up_medium_dark_skin_tone]=$'\U261D\U1F3FE'
+emoji[index_pointing_up_dark_skin_tone]=$'\U261D\U1F3FF'
+emoji[thumbs_up]=$'\U1F44D'
+emoji[+1]=$'\U1F44D'
+emoji[thumbsup]=$'\U1F44D'
+emoji[thumbs_up_light_skin_tone]=$'\U1F44D\U1F3FB'
+emoji[thumbs_up_medium_light_skin_tone]=$'\U1F44D\U1F3FC'
+emoji[thumbs_up_medium_skin_tone]=$'\U1F44D\U1F3FD'
+emoji[thumbs_up_medium_dark_skin_tone]=$'\U1F44D\U1F3FE'
+emoji[thumbs_up_dark_skin_tone]=$'\U1F44D\U1F3FF'
+emoji[thumbs_down]=$'\U1F44E'
+emoji[-1]=$'\U1F44E'
+emoji[thumbsdown]=$'\U1F44E'
+emoji[thumbs_down_light_skin_tone]=$'\U1F44E\U1F3FB'
+emoji[thumbs_down_medium_light_skin_tone]=$'\U1F44E\U1F3FC'
+emoji[thumbs_down_medium_skin_tone]=$'\U1F44E\U1F3FD'
+emoji[thumbs_down_medium_dark_skin_tone]=$'\U1F44E\U1F3FE'
+emoji[thumbs_down_dark_skin_tone]=$'\U1F44E\U1F3FF'
+emoji[raised_fist]=$'\U270A'
+emoji[fist_raised]=$'\U270A'
+emoji[fist]=$'\U270A'
+emoji[raised_fist_light_skin_tone]=$'\U270A\U1F3FB'
+emoji[raised_fist_medium_light_skin_tone]=$'\U270A\U1F3FC'
+emoji[raised_fist_medium_skin_tone]=$'\U270A\U1F3FD'
+emoji[raised_fist_medium_dark_skin_tone]=$'\U270A\U1F3FE'
+emoji[raised_fist_dark_skin_tone]=$'\U270A\U1F3FF'
+emoji[oncoming_fist]=$'\U1F44A'
+emoji[fist_oncoming]=$'\U1F44A'
+emoji[facepunch]=$'\U1F44A'
+emoji[punch]=$'\U1F44A'
+emoji[oncoming_fist_light_skin_tone]=$'\U1F44A\U1F3FB'
+emoji[oncoming_fist_medium_light_skin_tone]=$'\U1F44A\U1F3FC'
+emoji[oncoming_fist_medium_skin_tone]=$'\U1F44A\U1F3FD'
+emoji[oncoming_fist_medium_dark_skin_tone]=$'\U1F44A\U1F3FE'
+emoji[oncoming_fist_dark_skin_tone]=$'\U1F44A\U1F3FF'
+emoji[left_facing_fist]=$'\U1F91B'
+emoji[fist_left]=$'\U1F91B'
+emoji[left_facing_fist_light_skin_tone]=$'\U1F91B\U1F3FB'
+emoji[left_facing_fist_medium_light_skin_tone]=$'\U1F91B\U1F3FC'
+emoji[left_facing_fist_medium_skin_tone]=$'\U1F91B\U1F3FD'
+emoji[left_facing_fist_medium_dark_skin_tone]=$'\U1F91B\U1F3FE'
+emoji[left_facing_fist_dark_skin_tone]=$'\U1F91B\U1F3FF'
+emoji[right_facing_fist]=$'\U1F91C'
+emoji[fist_right]=$'\U1F91C'
+emoji[right_facing_fist_light_skin_tone]=$'\U1F91C\U1F3FB'
+emoji[right_facing_fist_medium_light_skin_tone]=$'\U1F91C\U1F3FC'
+emoji[right_facing_fist_medium_skin_tone]=$'\U1F91C\U1F3FD'
+emoji[right_facing_fist_medium_dark_skin_tone]=$'\U1F91C\U1F3FE'
+emoji[right_facing_fist_dark_skin_tone]=$'\U1F91C\U1F3FF'
+emoji[clapping_hands]=$'\U1F44F'
+emoji[clap]=$'\U1F44F'
+emoji[clapping_hands_light_skin_tone]=$'\U1F44F\U1F3FB'
+emoji[clapping_hands_medium_light_skin_tone]=$'\U1F44F\U1F3FC'
+emoji[clapping_hands_medium_skin_tone]=$'\U1F44F\U1F3FD'
+emoji[clapping_hands_medium_dark_skin_tone]=$'\U1F44F\U1F3FE'
+emoji[clapping_hands_dark_skin_tone]=$'\U1F44F\U1F3FF'
+emoji[raising_hands]=$'\U1F64C'
+emoji[raised_hands]=$'\U1F64C'
+emoji[raising_hands_light_skin_tone]=$'\U1F64C\U1F3FB'
+emoji[raising_hands_medium_light_skin_tone]=$'\U1F64C\U1F3FC'
+emoji[raising_hands_medium_skin_tone]=$'\U1F64C\U1F3FD'
+emoji[raising_hands_medium_dark_skin_tone]=$'\U1F64C\U1F3FE'
+emoji[raising_hands_dark_skin_tone]=$'\U1F64C\U1F3FF'
+emoji[open_hands]=$'\U1F450'
+emoji[open_hands_light_skin_tone]=$'\U1F450\U1F3FB'
+emoji[open_hands_medium_light_skin_tone]=$'\U1F450\U1F3FC'
+emoji[open_hands_medium_skin_tone]=$'\U1F450\U1F3FD'
+emoji[open_hands_medium_dark_skin_tone]=$'\U1F450\U1F3FE'
+emoji[open_hands_dark_skin_tone]=$'\U1F450\U1F3FF'
+emoji[palms_up_together]=$'\U1F932'
+emoji[palms_up_together_light_skin_tone]=$'\U1F932\U1F3FB'
+emoji[palms_up_together_medium_light_skin_tone]=$'\U1F932\U1F3FC'
+emoji[palms_up_together_medium_skin_tone]=$'\U1F932\U1F3FD'
+emoji[palms_up_together_medium_dark_skin_tone]=$'\U1F932\U1F3FE'
+emoji[palms_up_together_dark_skin_tone]=$'\U1F932\U1F3FF'
+emoji[handshake]=$'\U1F91D'
+emoji[folded_hands]=$'\U1F64F'
+emoji[pray]=$'\U1F64F'
+emoji[folded_hands_light_skin_tone]=$'\U1F64F\U1F3FB'
+emoji[folded_hands_medium_light_skin_tone]=$'\U1F64F\U1F3FC'
+emoji[folded_hands_medium_skin_tone]=$'\U1F64F\U1F3FD'
+emoji[folded_hands_medium_dark_skin_tone]=$'\U1F64F\U1F3FE'
+emoji[folded_hands_dark_skin_tone]=$'\U1F64F\U1F3FF'
+emoji[writing_hand]=$'\U270D\UFE0F'
+emoji[writing_hand_unqualified]=$'\U270D'
+emoji[writing_hand_light_skin_tone]=$'\U270D\U1F3FB'
+emoji[writing_hand_medium_light_skin_tone]=$'\U270D\U1F3FC'
+emoji[writing_hand_medium_skin_tone]=$'\U270D\U1F3FD'
+emoji[writing_hand_medium_dark_skin_tone]=$'\U270D\U1F3FE'
+emoji[writing_hand_dark_skin_tone]=$'\U270D\U1F3FF'
+emoji[nail_polish]=$'\U1F485'
+emoji[nail_care]=$'\U1F485'
+emoji[nail_polish_light_skin_tone]=$'\U1F485\U1F3FB'
+emoji[nail_polish_medium_light_skin_tone]=$'\U1F485\U1F3FC'
+emoji[nail_polish_medium_skin_tone]=$'\U1F485\U1F3FD'
+emoji[nail_polish_medium_dark_skin_tone]=$'\U1F485\U1F3FE'
+emoji[nail_polish_dark_skin_tone]=$'\U1F485\U1F3FF'
+emoji[selfie]=$'\U1F933'
+emoji[selfie_light_skin_tone]=$'\U1F933\U1F3FB'
+emoji[selfie_medium_light_skin_tone]=$'\U1F933\U1F3FC'
+emoji[selfie_medium_skin_tone]=$'\U1F933\U1F3FD'
+emoji[selfie_medium_dark_skin_tone]=$'\U1F933\U1F3FE'
+emoji[selfie_dark_skin_tone]=$'\U1F933\U1F3FF'
+emoji[flexed_biceps]=$'\U1F4AA'
+emoji[muscle]=$'\U1F4AA'
+emoji[flexed_biceps_light_skin_tone]=$'\U1F4AA\U1F3FB'
+emoji[flexed_biceps_medium_light_skin_tone]=$'\U1F4AA\U1F3FC'
+emoji[flexed_biceps_medium_skin_tone]=$'\U1F4AA\U1F3FD'
+emoji[flexed_biceps_medium_dark_skin_tone]=$'\U1F4AA\U1F3FE'
+emoji[flexed_biceps_dark_skin_tone]=$'\U1F4AA\U1F3FF'
+emoji[mechanical_arm]=$'\U1F9BE'
+emoji[mechanical_leg]=$'\U1F9BF'
+emoji[mechanical_leg_1]=$'\U1F9B5'
+emoji[leg]=$'\U1F9B5'
+emoji[leg_light_skin_tone]=$'\U1F9B5\U1F3FB'
+emoji[leg_medium_light_skin_tone]=$'\U1F9B5\U1F3FC'
+emoji[leg_medium_skin_tone]=$'\U1F9B5\U1F3FD'
+emoji[leg_medium_dark_skin_tone]=$'\U1F9B5\U1F3FE'
+emoji[leg_dark_skin_tone]=$'\U1F9B5\U1F3FF'
+emoji[foot]=$'\U1F9B6'
+emoji[foot_light_skin_tone]=$'\U1F9B6\U1F3FB'
+emoji[foot_medium_light_skin_tone]=$'\U1F9B6\U1F3FC'
+emoji[foot_medium_skin_tone]=$'\U1F9B6\U1F3FD'
+emoji[foot_medium_dark_skin_tone]=$'\U1F9B6\U1F3FE'
+emoji[foot_dark_skin_tone]=$'\U1F9B6\U1F3FF'
+emoji[ear]=$'\U1F442'
+emoji[ear_light_skin_tone]=$'\U1F442\U1F3FB'
+emoji[ear_medium_light_skin_tone]=$'\U1F442\U1F3FC'
+emoji[ear_medium_skin_tone]=$'\U1F442\U1F3FD'
+emoji[ear_medium_dark_skin_tone]=$'\U1F442\U1F3FE'
+emoji[ear_dark_skin_tone]=$'\U1F442\U1F3FF'
+emoji[ear_with_hearing_aid]=$'\U1F9BB'
+emoji[ear_with_hearing_aid_light_skin_tone]=$'\U1F9BB\U1F3FB'
+emoji[ear_with_hearing_aid_medium_light_skin_tone]=$'\U1F9BB\U1F3FC'
+emoji[ear_with_hearing_aid_medium_skin_tone]=$'\U1F9BB\U1F3FD'
+emoji[ear_with_hearing_aid_medium_dark_skin_tone]=$'\U1F9BB\U1F3FE'
+emoji[ear_with_hearing_aid_dark_skin_tone]=$'\U1F9BB\U1F3FF'
+emoji[nose]=$'\U1F443'
+emoji[nose_light_skin_tone]=$'\U1F443\U1F3FB'
+emoji[nose_medium_light_skin_tone]=$'\U1F443\U1F3FC'
+emoji[nose_medium_skin_tone]=$'\U1F443\U1F3FD'
+emoji[nose_medium_dark_skin_tone]=$'\U1F443\U1F3FE'
+emoji[nose_dark_skin_tone]=$'\U1F443\U1F3FF'
+emoji[brain]=$'\U1F9E0'
+emoji[tooth]=$'\U1F9B7'
+emoji[bone]=$'\U1F9B4'
+emoji[eyes]=$'\U1F440'
+emoji[eyes_1]=$'\U1F441\UFE0F'
+emoji[eye_unqualified]=$'\U1F441'
+emoji[eye]=$'\U1F441'
+emoji[tongue]=$'\U1F445'
+emoji[mouth]=$'\U1F444'
+emoji[lips]=$'\U1F444'
+emoji[baby]=$'\U1F476'
+emoji[baby_light_skin_tone]=$'\U1F476\U1F3FB'
+emoji[baby_medium_light_skin_tone]=$'\U1F476\U1F3FC'
+emoji[baby_medium_skin_tone]=$'\U1F476\U1F3FD'
+emoji[baby_medium_dark_skin_tone]=$'\U1F476\U1F3FE'
+emoji[baby_dark_skin_tone]=$'\U1F476\U1F3FF'
+emoji[child]=$'\U1F9D2'
+emoji[child_light_skin_tone]=$'\U1F9D2\U1F3FB'
+emoji[child_medium_light_skin_tone]=$'\U1F9D2\U1F3FC'
+emoji[child_medium_skin_tone]=$'\U1F9D2\U1F3FD'
+emoji[child_medium_dark_skin_tone]=$'\U1F9D2\U1F3FE'
+emoji[child_dark_skin_tone]=$'\U1F9D2\U1F3FF'
+emoji[boy]=$'\U1F466'
+emoji[boy_light_skin_tone]=$'\U1F466\U1F3FB'
+emoji[boy_medium_light_skin_tone]=$'\U1F466\U1F3FC'
+emoji[boy_medium_skin_tone]=$'\U1F466\U1F3FD'
+emoji[boy_medium_dark_skin_tone]=$'\U1F466\U1F3FE'
+emoji[boy_dark_skin_tone]=$'\U1F466\U1F3FF'
+emoji[girl]=$'\U1F467'
+emoji[girl_light_skin_tone]=$'\U1F467\U1F3FB'
+emoji[girl_medium_light_skin_tone]=$'\U1F467\U1F3FC'
+emoji[girl_medium_skin_tone]=$'\U1F467\U1F3FD'
+emoji[girl_medium_dark_skin_tone]=$'\U1F467\U1F3FE'
+emoji[girl_dark_skin_tone]=$'\U1F467\U1F3FF'
+emoji[person]=$'\U1F9D1'
+emoji[adult]=$'\U1F9D1'
+emoji[person_light_skin_tone]=$'\U1F9D1\U1F3FB'
+emoji[person_medium_light_skin_tone]=$'\U1F9D1\U1F3FC'
+emoji[person_medium_skin_tone]=$'\U1F9D1\U1F3FD'
+emoji[person_medium_dark_skin_tone]=$'\U1F9D1\U1F3FE'
+emoji[person_dark_skin_tone]=$'\U1F9D1\U1F3FF'
+emoji[person_blond_hair]=$'\U1F471'
+emoji[blond_haired_person]=$'\U1F471'
+emoji[person_light_skin_tone_blond_hair]=$'\U1F471\U1F3FB'
+emoji[person_medium_light_skin_tone_blond_hair]=$'\U1F471\U1F3FC'
+emoji[person_medium_skin_tone_blond_hair]=$'\U1F471\U1F3FD'
+emoji[person_medium_dark_skin_tone_blond_hair]=$'\U1F471\U1F3FE'
+emoji[person_dark_skin_tone_blond_hair]=$'\U1F471\U1F3FF'
+emoji[man]=$'\U1F468'
+emoji[man_light_skin_tone]=$'\U1F468\U1F3FB'
+emoji[man_medium_light_skin_tone]=$'\U1F468\U1F3FC'
+emoji[man_medium_skin_tone]=$'\U1F468\U1F3FD'
+emoji[man_medium_dark_skin_tone]=$'\U1F468\U1F3FE'
+emoji[man_dark_skin_tone]=$'\U1F468\U1F3FF'
+emoji[man_beard]=$'\U1F9D4'
+emoji[bearded_person]=$'\U1F9D4'
+emoji[man_light_skin_tone_beard]=$'\U1F9D4\U1F3FB'
+emoji[man_medium_light_skin_tone_beard]=$'\U1F9D4\U1F3FC'
+emoji[man_medium_skin_tone_beard]=$'\U1F9D4\U1F3FD'
+emoji[man_medium_dark_skin_tone_beard]=$'\U1F9D4\U1F3FE'
+emoji[man_dark_skin_tone_beard]=$'\U1F9D4\U1F3FF'
+emoji[man_blond_hair]=$'\U1F471\U200D\U2642\UFE0F'
+emoji[man_blond_hair_minimally]=$'\U1F471\U200D\U2642'
+emoji[blond_haired_man]=$'\U1F471\U200D\U2642'
+emoji[man_light_skin_tone_blond_hair]=$'\U1F471\U1F3FB\U200D\U2642\UFE0F'
+emoji[man_light_skin_tone_blond_hair_minimally]=$'\U1F471\U1F3FB\U200D\U2642'
+emoji[man_medium_light_skin_tone_blond_hair]=$'\U1F471\U1F3FC\U200D\U2642\UFE0F'
+emoji[man_medium_light_skin_tone_blond_hair_minimally]=$'\U1F471\U1F3FC\U200D\U2642'
+emoji[man_medium_skin_tone_blond_hair]=$'\U1F471\U1F3FD\U200D\U2642\UFE0F'
+emoji[man_medium_skin_tone_blond_hair_minimally]=$'\U1F471\U1F3FD\U200D\U2642'
+emoji[man_medium_dark_skin_tone_blond_hair]=$'\U1F471\U1F3FE\U200D\U2642\UFE0F'
+emoji[man_medium_dark_skin_tone_blond_hair_minimally]=$'\U1F471\U1F3FE\U200D\U2642'
+emoji[man_dark_skin_tone_blond_hair]=$'\U1F471\U1F3FF\U200D\U2642\UFE0F'
+emoji[man_dark_skin_tone_blond_hair_minimally]=$'\U1F471\U1F3FF\U200D\U2642'
+emoji[man_red_hair]=$'\U1F468\U200D\U1F9B0'
+emoji[red_haired_man]=$'\U1F468\U200D\U1F9B0'
+emoji[man_light_skin_tone_red_hair]=$'\U1F468\U1F3FB\U200D\U1F9B0'
+emoji[man_medium_light_skin_tone_red_hair]=$'\U1F468\U1F3FC\U200D\U1F9B0'
+emoji[man_medium_skin_tone_red_hair]=$'\U1F468\U1F3FD\U200D\U1F9B0'
+emoji[man_medium_dark_skin_tone_red_hair]=$'\U1F468\U1F3FE\U200D\U1F9B0'
+emoji[man_dark_skin_tone_red_hair]=$'\U1F468\U1F3FF\U200D\U1F9B0'
+emoji[man_curly_hair]=$'\U1F468\U200D\U1F9B1'
+emoji[curly_haired_man]=$'\U1F468\U200D\U1F9B1'
+emoji[man_light_skin_tone_curly_hair]=$'\U1F468\U1F3FB\U200D\U1F9B1'
+emoji[man_medium_light_skin_tone_curly_hair]=$'\U1F468\U1F3FC\U200D\U1F9B1'
+emoji[man_medium_skin_tone_curly_hair]=$'\U1F468\U1F3FD\U200D\U1F9B1'
+emoji[man_medium_dark_skin_tone_curly_hair]=$'\U1F468\U1F3FE\U200D\U1F9B1'
+emoji[man_dark_skin_tone_curly_hair]=$'\U1F468\U1F3FF\U200D\U1F9B1'
+emoji[man_white_hair]=$'\U1F468\U200D\U1F9B3'
+emoji[white_haired_man]=$'\U1F468\U200D\U1F9B3'
+emoji[man_light_skin_tone_white_hair]=$'\U1F468\U1F3FB\U200D\U1F9B3'
+emoji[man_medium_light_skin_tone_white_hair]=$'\U1F468\U1F3FC\U200D\U1F9B3'
+emoji[man_medium_skin_tone_white_hair]=$'\U1F468\U1F3FD\U200D\U1F9B3'
+emoji[man_medium_dark_skin_tone_white_hair]=$'\U1F468\U1F3FE\U200D\U1F9B3'
+emoji[man_dark_skin_tone_white_hair]=$'\U1F468\U1F3FF\U200D\U1F9B3'
+emoji[man_bald]=$'\U1F468\U200D\U1F9B2'
+emoji[bald_man]=$'\U1F468\U200D\U1F9B2'
+emoji[man_light_skin_tone_bald]=$'\U1F468\U1F3FB\U200D\U1F9B2'
+emoji[man_medium_light_skin_tone_bald]=$'\U1F468\U1F3FC\U200D\U1F9B2'
+emoji[man_medium_skin_tone_bald]=$'\U1F468\U1F3FD\U200D\U1F9B2'
+emoji[man_medium_dark_skin_tone_bald]=$'\U1F468\U1F3FE\U200D\U1F9B2'
+emoji[man_dark_skin_tone_bald]=$'\U1F468\U1F3FF\U200D\U1F9B2'
+emoji[woman]=$'\U1F469'
+emoji[woman_light_skin_tone]=$'\U1F469\U1F3FB'
+emoji[woman_medium_light_skin_tone]=$'\U1F469\U1F3FC'
+emoji[woman_medium_skin_tone]=$'\U1F469\U1F3FD'
+emoji[woman_medium_dark_skin_tone]=$'\U1F469\U1F3FE'
+emoji[woman_dark_skin_tone]=$'\U1F469\U1F3FF'
+emoji[woman_blond_hair]=$'\U1F471\U200D\U2640\UFE0F'
+emoji[woman_blond_hair_minimally]=$'\U1F471\U200D\U2640'
+emoji[blond_haired_woman]=$'\U1F471\U200D\U2640'
+emoji[blonde_woman]=$'\U1F471\U200D\U2640'
+emoji[woman_light_skin_tone_blond_hair]=$'\U1F471\U1F3FB\U200D\U2640\UFE0F'
+emoji[woman_light_skin_tone_blond_hair_minimally]=$'\U1F471\U1F3FB\U200D\U2640'
+emoji[woman_medium_light_skin_tone_blond_hair]=$'\U1F471\U1F3FC\U200D\U2640\UFE0F'
+emoji[woman_medium_light_skin_tone_blond_hair_minimally]=$'\U1F471\U1F3FC\U200D\U2640'
+emoji[woman_medium_skin_tone_blond_hair]=$'\U1F471\U1F3FD\U200D\U2640\UFE0F'
+emoji[woman_medium_skin_tone_blond_hair_minimally]=$'\U1F471\U1F3FD\U200D\U2640'
+emoji[woman_medium_dark_skin_tone_blond_hair]=$'\U1F471\U1F3FE\U200D\U2640\UFE0F'
+emoji[woman_medium_dark_skin_tone_blond_hair_minimally]=$'\U1F471\U1F3FE\U200D\U2640'
+emoji[woman_dark_skin_tone_blond_hair]=$'\U1F471\U1F3FF\U200D\U2640\UFE0F'
+emoji[woman_dark_skin_tone_blond_hair_minimally]=$'\U1F471\U1F3FF\U200D\U2640'
+emoji[woman_red_hair]=$'\U1F469\U200D\U1F9B0'
+emoji[red_haired_woman]=$'\U1F469\U200D\U1F9B0'
+emoji[woman_light_skin_tone_red_hair]=$'\U1F469\U1F3FB\U200D\U1F9B0'
+emoji[woman_medium_light_skin_tone_red_hair]=$'\U1F469\U1F3FC\U200D\U1F9B0'
+emoji[woman_medium_skin_tone_red_hair]=$'\U1F469\U1F3FD\U200D\U1F9B0'
+emoji[woman_medium_dark_skin_tone_red_hair]=$'\U1F469\U1F3FE\U200D\U1F9B0'
+emoji[woman_dark_skin_tone_red_hair]=$'\U1F469\U1F3FF\U200D\U1F9B0'
+emoji[woman_curly_hair]=$'\U1F469\U200D\U1F9B1'
+emoji[curly_haired_woman]=$'\U1F469\U200D\U1F9B1'
+emoji[woman_light_skin_tone_curly_hair]=$'\U1F469\U1F3FB\U200D\U1F9B1'
+emoji[woman_medium_light_skin_tone_curly_hair]=$'\U1F469\U1F3FC\U200D\U1F9B1'
+emoji[woman_medium_skin_tone_curly_hair]=$'\U1F469\U1F3FD\U200D\U1F9B1'
+emoji[woman_medium_dark_skin_tone_curly_hair]=$'\U1F469\U1F3FE\U200D\U1F9B1'
+emoji[woman_dark_skin_tone_curly_hair]=$'\U1F469\U1F3FF\U200D\U1F9B1'
+emoji[woman_white_hair]=$'\U1F469\U200D\U1F9B3'
+emoji[white_haired_woman]=$'\U1F469\U200D\U1F9B3'
+emoji[woman_light_skin_tone_white_hair]=$'\U1F469\U1F3FB\U200D\U1F9B3'
+emoji[woman_medium_light_skin_tone_white_hair]=$'\U1F469\U1F3FC\U200D\U1F9B3'
+emoji[woman_medium_skin_tone_white_hair]=$'\U1F469\U1F3FD\U200D\U1F9B3'
+emoji[woman_medium_dark_skin_tone_white_hair]=$'\U1F469\U1F3FE\U200D\U1F9B3'
+emoji[woman_dark_skin_tone_white_hair]=$'\U1F469\U1F3FF\U200D\U1F9B3'
+emoji[woman_bald]=$'\U1F469\U200D\U1F9B2'
+emoji[bald_woman]=$'\U1F469\U200D\U1F9B2'
+emoji[woman_light_skin_tone_bald]=$'\U1F469\U1F3FB\U200D\U1F9B2'
+emoji[woman_medium_light_skin_tone_bald]=$'\U1F469\U1F3FC\U200D\U1F9B2'
+emoji[woman_medium_skin_tone_bald]=$'\U1F469\U1F3FD\U200D\U1F9B2'
+emoji[woman_medium_dark_skin_tone_bald]=$'\U1F469\U1F3FE\U200D\U1F9B2'
+emoji[woman_dark_skin_tone_bald]=$'\U1F469\U1F3FF\U200D\U1F9B2'
+emoji[older_person]=$'\U1F9D3'
+emoji[older_adult]=$'\U1F9D3'
+emoji[older_person_light_skin_tone]=$'\U1F9D3\U1F3FB'
+emoji[older_person_medium_light_skin_tone]=$'\U1F9D3\U1F3FC'
+emoji[older_person_medium_skin_tone]=$'\U1F9D3\U1F3FD'
+emoji[older_person_medium_dark_skin_tone]=$'\U1F9D3\U1F3FE'
+emoji[older_person_dark_skin_tone]=$'\U1F9D3\U1F3FF'
+emoji[old_man]=$'\U1F474'
+emoji[older_man]=$'\U1F474'
+emoji[old_man_light_skin_tone]=$'\U1F474\U1F3FB'
+emoji[old_man_medium_light_skin_tone]=$'\U1F474\U1F3FC'
+emoji[old_man_medium_skin_tone]=$'\U1F474\U1F3FD'
+emoji[old_man_medium_dark_skin_tone]=$'\U1F474\U1F3FE'
+emoji[old_man_dark_skin_tone]=$'\U1F474\U1F3FF'
+emoji[old_woman]=$'\U1F475'
+emoji[older_woman]=$'\U1F475'
+emoji[old_woman_light_skin_tone]=$'\U1F475\U1F3FB'
+emoji[old_woman_medium_light_skin_tone]=$'\U1F475\U1F3FC'
+emoji[old_woman_medium_skin_tone]=$'\U1F475\U1F3FD'
+emoji[old_woman_medium_dark_skin_tone]=$'\U1F475\U1F3FE'
+emoji[old_woman_dark_skin_tone]=$'\U1F475\U1F3FF'
+emoji[person_frowning]=$'\U1F64D'
+emoji[frowning_person]=$'\U1F64D'
+emoji[person_frowning_light_skin_tone]=$'\U1F64D\U1F3FB'
+emoji[person_frowning_medium_light_skin_tone]=$'\U1F64D\U1F3FC'
+emoji[person_frowning_medium_skin_tone]=$'\U1F64D\U1F3FD'
+emoji[person_frowning_medium_dark_skin_tone]=$'\U1F64D\U1F3FE'
+emoji[person_frowning_dark_skin_tone]=$'\U1F64D\U1F3FF'
+emoji[man_frowning]=$'\U1F64D\U200D\U2642\UFE0F'
+emoji[man_frowning_minimally]=$'\U1F64D\U200D\U2642'
+emoji[frowning_man]=$'\U1F64D\U200D\U2642'
+emoji[man_frowning_light_skin_tone]=$'\U1F64D\U1F3FB\U200D\U2642\UFE0F'
+emoji[man_frowning_light_skin_tone_minimally]=$'\U1F64D\U1F3FB\U200D\U2642'
+emoji[man_frowning_medium_light_skin_tone]=$'\U1F64D\U1F3FC\U200D\U2642\UFE0F'
+emoji[man_frowning_medium_light_skin_tone_minimally]=$'\U1F64D\U1F3FC\U200D\U2642'
+emoji[man_frowning_medium_skin_tone]=$'\U1F64D\U1F3FD\U200D\U2642\UFE0F'
+emoji[man_frowning_medium_skin_tone_minimally]=$'\U1F64D\U1F3FD\U200D\U2642'
+emoji[man_frowning_medium_dark_skin_tone]=$'\U1F64D\U1F3FE\U200D\U2642\UFE0F'
+emoji[man_frowning_medium_dark_skin_tone_minimally]=$'\U1F64D\U1F3FE\U200D\U2642'
+emoji[man_frowning_dark_skin_tone]=$'\U1F64D\U1F3FF\U200D\U2642\UFE0F'
+emoji[man_frowning_dark_skin_tone_minimally]=$'\U1F64D\U1F3FF\U200D\U2642'
+emoji[woman_frowning]=$'\U1F64D\U200D\U2640\UFE0F'
+emoji[woman_frowning_minimally]=$'\U1F64D\U200D\U2640'
+emoji[frowning_woman]=$'\U1F64D\U200D\U2640'
+emoji[woman_frowning_light_skin_tone]=$'\U1F64D\U1F3FB\U200D\U2640\UFE0F'
+emoji[woman_frowning_light_skin_tone_minimally]=$'\U1F64D\U1F3FB\U200D\U2640'
+emoji[woman_frowning_medium_light_skin_tone]=$'\U1F64D\U1F3FC\U200D\U2640\UFE0F'
+emoji[woman_frowning_medium_light_skin_tone_minimally]=$'\U1F64D\U1F3FC\U200D\U2640'
+emoji[woman_frowning_medium_skin_tone]=$'\U1F64D\U1F3FD\U200D\U2640\UFE0F'
+emoji[woman_frowning_medium_skin_tone_minimally]=$'\U1F64D\U1F3FD\U200D\U2640'
+emoji[woman_frowning_medium_dark_skin_tone]=$'\U1F64D\U1F3FE\U200D\U2640\UFE0F'
+emoji[woman_frowning_medium_dark_skin_tone_minimally]=$'\U1F64D\U1F3FE\U200D\U2640'
+emoji[woman_frowning_dark_skin_tone]=$'\U1F64D\U1F3FF\U200D\U2640\UFE0F'
+emoji[woman_frowning_dark_skin_tone_minimally]=$'\U1F64D\U1F3FF\U200D\U2640'
+emoji[person_pouting]=$'\U1F64E'
+emoji[person_pouting_light_skin_tone]=$'\U1F64E\U1F3FB'
+emoji[person_pouting_medium_light_skin_tone]=$'\U1F64E\U1F3FC'
+emoji[person_pouting_medium_skin_tone]=$'\U1F64E\U1F3FD'
+emoji[person_pouting_medium_dark_skin_tone]=$'\U1F64E\U1F3FE'
+emoji[person_pouting_dark_skin_tone]=$'\U1F64E\U1F3FF'
+emoji[man_pouting]=$'\U1F64E\U200D\U2642\UFE0F'
+emoji[man_pouting_minimally]=$'\U1F64E\U200D\U2642'
+emoji[pouting_man]=$'\U1F64E\U200D\U2642'
+emoji[man_pouting_light_skin_tone]=$'\U1F64E\U1F3FB\U200D\U2642\UFE0F'
+emoji[man_pouting_light_skin_tone_minimally]=$'\U1F64E\U1F3FB\U200D\U2642'
+emoji[man_pouting_medium_light_skin_tone]=$'\U1F64E\U1F3FC\U200D\U2642\UFE0F'
+emoji[man_pouting_medium_light_skin_tone_minimally]=$'\U1F64E\U1F3FC\U200D\U2642'
+emoji[man_pouting_medium_skin_tone]=$'\U1F64E\U1F3FD\U200D\U2642\UFE0F'
+emoji[man_pouting_medium_skin_tone_minimally]=$'\U1F64E\U1F3FD\U200D\U2642'
+emoji[man_pouting_medium_dark_skin_tone]=$'\U1F64E\U1F3FE\U200D\U2642\UFE0F'
+emoji[man_pouting_medium_dark_skin_tone_minimally]=$'\U1F64E\U1F3FE\U200D\U2642'
+emoji[man_pouting_dark_skin_tone]=$'\U1F64E\U1F3FF\U200D\U2642\UFE0F'
+emoji[man_pouting_dark_skin_tone_minimally]=$'\U1F64E\U1F3FF\U200D\U2642'
+emoji[woman_pouting]=$'\U1F64E\U200D\U2640\UFE0F'
+emoji[woman_pouting_minimally]=$'\U1F64E\U200D\U2640'
+emoji[pouting_woman]=$'\U1F64E\U200D\U2640'
+emoji[woman_pouting_light_skin_tone]=$'\U1F64E\U1F3FB\U200D\U2640\UFE0F'
+emoji[woman_pouting_light_skin_tone_minimally]=$'\U1F64E\U1F3FB\U200D\U2640'
+emoji[woman_pouting_medium_light_skin_tone]=$'\U1F64E\U1F3FC\U200D\U2640\UFE0F'
+emoji[woman_pouting_medium_light_skin_tone_minimally]=$'\U1F64E\U1F3FC\U200D\U2640'
+emoji[woman_pouting_medium_skin_tone]=$'\U1F64E\U1F3FD\U200D\U2640\UFE0F'
+emoji[woman_pouting_medium_skin_tone_minimally]=$'\U1F64E\U1F3FD\U200D\U2640'
+emoji[woman_pouting_medium_dark_skin_tone]=$'\U1F64E\U1F3FE\U200D\U2640\UFE0F'
+emoji[woman_pouting_medium_dark_skin_tone_minimally]=$'\U1F64E\U1F3FE\U200D\U2640'
+emoji[woman_pouting_dark_skin_tone]=$'\U1F64E\U1F3FF\U200D\U2640\UFE0F'
+emoji[woman_pouting_dark_skin_tone_minimally]=$'\U1F64E\U1F3FF\U200D\U2640'
+emoji[person_gesturing_NO]=$'\U1F645'
+emoji[no_good]=$'\U1F645'
+emoji[person_gesturing_NO_light_skin_tone]=$'\U1F645\U1F3FB'
+emoji[person_gesturing_NO_medium_light_skin_tone]=$'\U1F645\U1F3FC'
+emoji[person_gesturing_NO_medium_skin_tone]=$'\U1F645\U1F3FD'
+emoji[person_gesturing_NO_medium_dark_skin_tone]=$'\U1F645\U1F3FE'
+emoji[person_gesturing_NO_dark_skin_tone]=$'\U1F645\U1F3FF'
+emoji[man_gesturing_NO]=$'\U1F645\U200D\U2642\UFE0F'
+emoji[man_gesturing_NO_minimally]=$'\U1F645\U200D\U2642'
+emoji[no_good_man]=$'\U1F645\U200D\U2642'
+emoji[ng_man]=$'\U1F645\U200D\U2642'
+emoji[man_gesturing_NO_light_skin_tone]=$'\U1F645\U1F3FB\U200D\U2642\UFE0F'
+emoji[man_gesturing_NO_light_skin_tone_minimally]=$'\U1F645\U1F3FB\U200D\U2642'
+emoji[man_gesturing_NO_medium_light_skin_tone]=$'\U1F645\U1F3FC\U200D\U2642\UFE0F'
+emoji[man_gesturing_NO_medium_light_skin_tone_minimally]=$'\U1F645\U1F3FC\U200D\U2642'
+emoji[man_gesturing_NO_medium_skin_tone]=$'\U1F645\U1F3FD\U200D\U2642\UFE0F'
+emoji[man_gesturing_NO_medium_skin_tone_minimally]=$'\U1F645\U1F3FD\U200D\U2642'
+emoji[man_gesturing_NO_medium_dark_skin_tone]=$'\U1F645\U1F3FE\U200D\U2642\UFE0F'
+emoji[man_gesturing_NO_medium_dark_skin_tone_minimally]=$'\U1F645\U1F3FE\U200D\U2642'
+emoji[man_gesturing_NO_dark_skin_tone]=$'\U1F645\U1F3FF\U200D\U2642\UFE0F'
+emoji[man_gesturing_NO_dark_skin_tone_minimally]=$'\U1F645\U1F3FF\U200D\U2642'
+emoji[woman_gesturing_NO]=$'\U1F645\U200D\U2640\UFE0F'
+emoji[woman_gesturing_NO_minimally]=$'\U1F645\U200D\U2640'
+emoji[no_good_woman]=$'\U1F645\U200D\U2640'
+emoji[ng_woman]=$'\U1F645\U200D\U2640'
+emoji[woman_gesturing_NO_light_skin_tone]=$'\U1F645\U1F3FB\U200D\U2640\UFE0F'
+emoji[woman_gesturing_NO_light_skin_tone_minimally]=$'\U1F645\U1F3FB\U200D\U2640'
+emoji[woman_gesturing_NO_medium_light_skin_tone]=$'\U1F645\U1F3FC\U200D\U2640\UFE0F'
+emoji[woman_gesturing_NO_medium_light_skin_tone_minimally]=$'\U1F645\U1F3FC\U200D\U2640'
+emoji[woman_gesturing_NO_medium_skin_tone]=$'\U1F645\U1F3FD\U200D\U2640\UFE0F'
+emoji[woman_gesturing_NO_medium_skin_tone_minimally]=$'\U1F645\U1F3FD\U200D\U2640'
+emoji[woman_gesturing_NO_medium_dark_skin_tone]=$'\U1F645\U1F3FE\U200D\U2640\UFE0F'
+emoji[woman_gesturing_NO_medium_dark_skin_tone_minimally]=$'\U1F645\U1F3FE\U200D\U2640'
+emoji[woman_gesturing_NO_dark_skin_tone]=$'\U1F645\U1F3FF\U200D\U2640\UFE0F'
+emoji[woman_gesturing_NO_dark_skin_tone_minimally]=$'\U1F645\U1F3FF\U200D\U2640'
+emoji[person_gesturing_OK]=$'\U1F646'
+emoji[ok_person]=$'\U1F646'
+emoji[person_gesturing_OK_light_skin_tone]=$'\U1F646\U1F3FB'
+emoji[person_gesturing_OK_medium_light_skin_tone]=$'\U1F646\U1F3FC'
+emoji[person_gesturing_OK_medium_skin_tone]=$'\U1F646\U1F3FD'
+emoji[person_gesturing_OK_medium_dark_skin_tone]=$'\U1F646\U1F3FE'
+emoji[person_gesturing_OK_dark_skin_tone]=$'\U1F646\U1F3FF'
+emoji[man_gesturing_OK]=$'\U1F646\U200D\U2642\UFE0F'
+emoji[man_gesturing_OK_minimally]=$'\U1F646\U200D\U2642'
+emoji[ok_man]=$'\U1F646\U200D\U2642'
+emoji[man_gesturing_OK_light_skin_tone]=$'\U1F646\U1F3FB\U200D\U2642\UFE0F'
+emoji[man_gesturing_OK_light_skin_tone_minimally]=$'\U1F646\U1F3FB\U200D\U2642'
+emoji[man_gesturing_OK_medium_light_skin_tone]=$'\U1F646\U1F3FC\U200D\U2642\UFE0F'
+emoji[man_gesturing_OK_medium_light_skin_tone_minimally]=$'\U1F646\U1F3FC\U200D\U2642'
+emoji[man_gesturing_OK_medium_skin_tone]=$'\U1F646\U1F3FD\U200D\U2642\UFE0F'
+emoji[man_gesturing_OK_medium_skin_tone_minimally]=$'\U1F646\U1F3FD\U200D\U2642'
+emoji[man_gesturing_OK_medium_dark_skin_tone]=$'\U1F646\U1F3FE\U200D\U2642\UFE0F'
+emoji[man_gesturing_OK_medium_dark_skin_tone_minimally]=$'\U1F646\U1F3FE\U200D\U2642'
+emoji[man_gesturing_OK_dark_skin_tone]=$'\U1F646\U1F3FF\U200D\U2642\UFE0F'
+emoji[man_gesturing_OK_dark_skin_tone_minimally]=$'\U1F646\U1F3FF\U200D\U2642'
+emoji[woman_gesturing_OK]=$'\U1F646\U200D\U2640\UFE0F'
+emoji[woman_gesturing_OK_minimally]=$'\U1F646\U200D\U2640'
+emoji[ok_woman]=$'\U1F646\U200D\U2640'
+emoji[woman_gesturing_OK_light_skin_tone]=$'\U1F646\U1F3FB\U200D\U2640\UFE0F'
+emoji[woman_gesturing_OK_light_skin_tone_minimally]=$'\U1F646\U1F3FB\U200D\U2640'
+emoji[woman_gesturing_OK_medium_light_skin_tone]=$'\U1F646\U1F3FC\U200D\U2640\UFE0F'
+emoji[woman_gesturing_OK_medium_light_skin_tone_minimally]=$'\U1F646\U1F3FC\U200D\U2640'
+emoji[woman_gesturing_OK_medium_skin_tone]=$'\U1F646\U1F3FD\U200D\U2640\UFE0F'
+emoji[woman_gesturing_OK_medium_skin_tone_minimally]=$'\U1F646\U1F3FD\U200D\U2640'
+emoji[woman_gesturing_OK_medium_dark_skin_tone]=$'\U1F646\U1F3FE\U200D\U2640\UFE0F'
+emoji[woman_gesturing_OK_medium_dark_skin_tone_minimally]=$'\U1F646\U1F3FE\U200D\U2640'
+emoji[woman_gesturing_OK_dark_skin_tone]=$'\U1F646\U1F3FF\U200D\U2640\UFE0F'
+emoji[woman_gesturing_OK_dark_skin_tone_minimally]=$'\U1F646\U1F3FF\U200D\U2640'
+emoji[person_tipping_hand]=$'\U1F481'
+emoji[tipping_hand_person]=$'\U1F481'
+emoji[information_desk_person]=$'\U1F481'
+emoji[person_tipping_hand_light_skin_tone]=$'\U1F481\U1F3FB'
+emoji[person_tipping_hand_medium_light_skin_tone]=$'\U1F481\U1F3FC'
+emoji[person_tipping_hand_medium_skin_tone]=$'\U1F481\U1F3FD'
+emoji[person_tipping_hand_medium_dark_skin_tone]=$'\U1F481\U1F3FE'
+emoji[person_tipping_hand_dark_skin_tone]=$'\U1F481\U1F3FF'
+emoji[man_tipping_hand]=$'\U1F481\U200D\U2642\UFE0F'
+emoji[man_tipping_hand_minimally]=$'\U1F481\U200D\U2642'
+emoji[tipping_hand_man]=$'\U1F481\U200D\U2642'
+emoji[sassy_man]=$'\U1F481\U200D\U2642'
+emoji[man_tipping_hand_light_skin_tone]=$'\U1F481\U1F3FB\U200D\U2642\UFE0F'
+emoji[man_tipping_hand_light_skin_tone_minimally]=$'\U1F481\U1F3FB\U200D\U2642'
+emoji[man_tipping_hand_medium_light_skin_tone]=$'\U1F481\U1F3FC\U200D\U2642\UFE0F'
+emoji[man_tipping_hand_medium_light_skin_tone_minimally]=$'\U1F481\U1F3FC\U200D\U2642'
+emoji[man_tipping_hand_medium_skin_tone]=$'\U1F481\U1F3FD\U200D\U2642\UFE0F'
+emoji[man_tipping_hand_medium_skin_tone_minimally]=$'\U1F481\U1F3FD\U200D\U2642'
+emoji[man_tipping_hand_medium_dark_skin_tone]=$'\U1F481\U1F3FE\U200D\U2642\UFE0F'
+emoji[man_tipping_hand_medium_dark_skin_tone_minimally]=$'\U1F481\U1F3FE\U200D\U2642'
+emoji[man_tipping_hand_dark_skin_tone]=$'\U1F481\U1F3FF\U200D\U2642\UFE0F'
+emoji[man_tipping_hand_dark_skin_tone_minimally]=$'\U1F481\U1F3FF\U200D\U2642'
+emoji[woman_tipping_hand]=$'\U1F481\U200D\U2640\UFE0F'
+emoji[woman_tipping_hand_minimally]=$'\U1F481\U200D\U2640'
+emoji[tipping_hand_woman]=$'\U1F481\U200D\U2640'
+emoji[sassy_woman]=$'\U1F481\U200D\U2640'
+emoji[woman_tipping_hand_light_skin_tone]=$'\U1F481\U1F3FB\U200D\U2640\UFE0F'
+emoji[woman_tipping_hand_light_skin_tone_minimally]=$'\U1F481\U1F3FB\U200D\U2640'
+emoji[woman_tipping_hand_medium_light_skin_tone]=$'\U1F481\U1F3FC\U200D\U2640\UFE0F'
+emoji[woman_tipping_hand_medium_light_skin_tone_minimally]=$'\U1F481\U1F3FC\U200D\U2640'
+emoji[woman_tipping_hand_medium_skin_tone]=$'\U1F481\U1F3FD\U200D\U2640\UFE0F'
+emoji[woman_tipping_hand_medium_skin_tone_minimally]=$'\U1F481\U1F3FD\U200D\U2640'
+emoji[woman_tipping_hand_medium_dark_skin_tone]=$'\U1F481\U1F3FE\U200D\U2640\UFE0F'
+emoji[woman_tipping_hand_medium_dark_skin_tone_minimally]=$'\U1F481\U1F3FE\U200D\U2640'
+emoji[woman_tipping_hand_dark_skin_tone]=$'\U1F481\U1F3FF\U200D\U2640\UFE0F'
+emoji[woman_tipping_hand_dark_skin_tone_minimally]=$'\U1F481\U1F3FF\U200D\U2640'
+emoji[person_raising_hand]=$'\U1F64B'
+emoji[raising_hand]=$'\U1F64B'
+emoji[person_raising_hand_light_skin_tone]=$'\U1F64B\U1F3FB'
+emoji[person_raising_hand_medium_light_skin_tone]=$'\U1F64B\U1F3FC'
+emoji[person_raising_hand_medium_skin_tone]=$'\U1F64B\U1F3FD'
+emoji[person_raising_hand_medium_dark_skin_tone]=$'\U1F64B\U1F3FE'
+emoji[person_raising_hand_dark_skin_tone]=$'\U1F64B\U1F3FF'
+emoji[man_raising_hand]=$'\U1F64B\U200D\U2642\UFE0F'
+emoji[man_raising_hand_minimally]=$'\U1F64B\U200D\U2642'
+emoji[raising_hand_man]=$'\U1F64B\U200D\U2642'
+emoji[man_raising_hand_light_skin_tone]=$'\U1F64B\U1F3FB\U200D\U2642\UFE0F'
+emoji[man_raising_hand_light_skin_tone_minimally]=$'\U1F64B\U1F3FB\U200D\U2642'
+emoji[man_raising_hand_medium_light_skin_tone]=$'\U1F64B\U1F3FC\U200D\U2642\UFE0F'
+emoji[man_raising_hand_medium_light_skin_tone_minimally]=$'\U1F64B\U1F3FC\U200D\U2642'
+emoji[man_raising_hand_medium_skin_tone]=$'\U1F64B\U1F3FD\U200D\U2642\UFE0F'
+emoji[man_raising_hand_medium_skin_tone_minimally]=$'\U1F64B\U1F3FD\U200D\U2642'
+emoji[man_raising_hand_medium_dark_skin_tone]=$'\U1F64B\U1F3FE\U200D\U2642\UFE0F'
+emoji[man_raising_hand_medium_dark_skin_tone_minimally]=$'\U1F64B\U1F3FE\U200D\U2642'
+emoji[man_raising_hand_dark_skin_tone]=$'\U1F64B\U1F3FF\U200D\U2642\UFE0F'
+emoji[man_raising_hand_dark_skin_tone_minimally]=$'\U1F64B\U1F3FF\U200D\U2642'
+emoji[woman_raising_hand]=$'\U1F64B\U200D\U2640\UFE0F'
+emoji[woman_raising_hand_minimally]=$'\U1F64B\U200D\U2640'
+emoji[raising_hand_woman]=$'\U1F64B\U200D\U2640'
+emoji[woman_raising_hand_light_skin_tone]=$'\U1F64B\U1F3FB\U200D\U2640\UFE0F'
+emoji[woman_raising_hand_light_skin_tone_minimally]=$'\U1F64B\U1F3FB\U200D\U2640'
+emoji[woman_raising_hand_medium_light_skin_tone]=$'\U1F64B\U1F3FC\U200D\U2640\UFE0F'
+emoji[woman_raising_hand_medium_light_skin_tone_minimally]=$'\U1F64B\U1F3FC\U200D\U2640'
+emoji[woman_raising_hand_medium_skin_tone]=$'\U1F64B\U1F3FD\U200D\U2640\UFE0F'
+emoji[woman_raising_hand_medium_skin_tone_minimally]=$'\U1F64B\U1F3FD\U200D\U2640'
+emoji[woman_raising_hand_medium_dark_skin_tone]=$'\U1F64B\U1F3FE\U200D\U2640\UFE0F'
+emoji[woman_raising_hand_medium_dark_skin_tone_minimally]=$'\U1F64B\U1F3FE\U200D\U2640'
+emoji[woman_raising_hand_dark_skin_tone]=$'\U1F64B\U1F3FF\U200D\U2640\UFE0F'
+emoji[woman_raising_hand_dark_skin_tone_minimally]=$'\U1F64B\U1F3FF\U200D\U2640'
+emoji[deaf_person]=$'\U1F9CF'
+emoji[deaf_person_light_skin_tone]=$'\U1F9CF\U1F3FB'
+emoji[deaf_person_medium_light_skin_tone]=$'\U1F9CF\U1F3FC'
+emoji[deaf_person_medium_skin_tone]=$'\U1F9CF\U1F3FD'
+emoji[deaf_person_medium_dark_skin_tone]=$'\U1F9CF\U1F3FE'
+emoji[deaf_person_dark_skin_tone]=$'\U1F9CF\U1F3FF'
+emoji[deaf_man]=$'\U1F9CF\U200D\U2642\UFE0F'
+emoji[deaf_man_minimally]=$'\U1F9CF\U200D\U2642'
+emoji[deaf_man_light_skin_tone]=$'\U1F9CF\U1F3FB\U200D\U2642\UFE0F'
+emoji[deaf_man_light_skin_tone_minimally]=$'\U1F9CF\U1F3FB\U200D\U2642'
+emoji[deaf_man_medium_light_skin_tone]=$'\U1F9CF\U1F3FC\U200D\U2642\UFE0F'
+emoji[deaf_man_medium_light_skin_tone_minimally]=$'\U1F9CF\U1F3FC\U200D\U2642'
+emoji[deaf_man_medium_skin_tone]=$'\U1F9CF\U1F3FD\U200D\U2642\UFE0F'
+emoji[deaf_man_medium_skin_tone_minimally]=$'\U1F9CF\U1F3FD\U200D\U2642'
+emoji[deaf_man_medium_dark_skin_tone]=$'\U1F9CF\U1F3FE\U200D\U2642\UFE0F'
+emoji[deaf_man_medium_dark_skin_tone_minimally]=$'\U1F9CF\U1F3FE\U200D\U2642'
+emoji[deaf_man_dark_skin_tone]=$'\U1F9CF\U1F3FF\U200D\U2642\UFE0F'
+emoji[deaf_man_dark_skin_tone_minimally]=$'\U1F9CF\U1F3FF\U200D\U2642'
+emoji[deaf_woman]=$'\U1F9CF\U200D\U2640\UFE0F'
+emoji[deaf_woman_minimally]=$'\U1F9CF\U200D\U2640'
+emoji[deaf_woman_light_skin_tone]=$'\U1F9CF\U1F3FB\U200D\U2640\UFE0F'
+emoji[deaf_woman_light_skin_tone_minimally]=$'\U1F9CF\U1F3FB\U200D\U2640'
+emoji[deaf_woman_medium_light_skin_tone]=$'\U1F9CF\U1F3FC\U200D\U2640\UFE0F'
+emoji[deaf_woman_medium_light_skin_tone_minimally]=$'\U1F9CF\U1F3FC\U200D\U2640'
+emoji[deaf_woman_medium_skin_tone]=$'\U1F9CF\U1F3FD\U200D\U2640\UFE0F'
+emoji[deaf_woman_medium_skin_tone_minimally]=$'\U1F9CF\U1F3FD\U200D\U2640'
+emoji[deaf_woman_medium_dark_skin_tone]=$'\U1F9CF\U1F3FE\U200D\U2640\UFE0F'
+emoji[deaf_woman_medium_dark_skin_tone_minimally]=$'\U1F9CF\U1F3FE\U200D\U2640'
+emoji[deaf_woman_dark_skin_tone]=$'\U1F9CF\U1F3FF\U200D\U2640\UFE0F'
+emoji[deaf_woman_dark_skin_tone_minimally]=$'\U1F9CF\U1F3FF\U200D\U2640'
+emoji[person_bowing]=$'\U1F647'
+emoji[bow]=$'\U1F647'
+emoji[person_bowing_light_skin_tone]=$'\U1F647\U1F3FB'
+emoji[person_bowing_medium_light_skin_tone]=$'\U1F647\U1F3FC'
+emoji[person_bowing_medium_skin_tone]=$'\U1F647\U1F3FD'
+emoji[person_bowing_medium_dark_skin_tone]=$'\U1F647\U1F3FE'
+emoji[person_bowing_dark_skin_tone]=$'\U1F647\U1F3FF'
+emoji[man_bowing]=$'\U1F647\U200D\U2642\UFE0F'
+emoji[man_bowing_minimally]=$'\U1F647\U200D\U2642'
+emoji[bowing_man]=$'\U1F647\U200D\U2642'
+emoji[man_bowing_light_skin_tone]=$'\U1F647\U1F3FB\U200D\U2642\UFE0F'
+emoji[man_bowing_light_skin_tone_minimally]=$'\U1F647\U1F3FB\U200D\U2642'
+emoji[man_bowing_medium_light_skin_tone]=$'\U1F647\U1F3FC\U200D\U2642\UFE0F'
+emoji[man_bowing_medium_light_skin_tone_minimally]=$'\U1F647\U1F3FC\U200D\U2642'
+emoji[man_bowing_medium_skin_tone]=$'\U1F647\U1F3FD\U200D\U2642\UFE0F'
+emoji[man_bowing_medium_skin_tone_minimally]=$'\U1F647\U1F3FD\U200D\U2642'
+emoji[man_bowing_medium_dark_skin_tone]=$'\U1F647\U1F3FE\U200D\U2642\UFE0F'
+emoji[man_bowing_medium_dark_skin_tone_minimally]=$'\U1F647\U1F3FE\U200D\U2642'
+emoji[man_bowing_dark_skin_tone]=$'\U1F647\U1F3FF\U200D\U2642\UFE0F'
+emoji[man_bowing_dark_skin_tone_minimally]=$'\U1F647\U1F3FF\U200D\U2642'
+emoji[woman_bowing]=$'\U1F647\U200D\U2640\UFE0F'
+emoji[woman_bowing_minimally]=$'\U1F647\U200D\U2640'
+emoji[bowing_woman]=$'\U1F647\U200D\U2640'
+emoji[woman_bowing_light_skin_tone]=$'\U1F647\U1F3FB\U200D\U2640\UFE0F'
+emoji[woman_bowing_light_skin_tone_minimally]=$'\U1F647\U1F3FB\U200D\U2640'
+emoji[woman_bowing_medium_light_skin_tone]=$'\U1F647\U1F3FC\U200D\U2640\UFE0F'
+emoji[woman_bowing_medium_light_skin_tone_minimally]=$'\U1F647\U1F3FC\U200D\U2640'
+emoji[woman_bowing_medium_skin_tone]=$'\U1F647\U1F3FD\U200D\U2640\UFE0F'
+emoji[woman_bowing_medium_skin_tone_minimally]=$'\U1F647\U1F3FD\U200D\U2640'
+emoji[woman_bowing_medium_dark_skin_tone]=$'\U1F647\U1F3FE\U200D\U2640\UFE0F'
+emoji[woman_bowing_medium_dark_skin_tone_minimally]=$'\U1F647\U1F3FE\U200D\U2640'
+emoji[woman_bowing_dark_skin_tone]=$'\U1F647\U1F3FF\U200D\U2640\UFE0F'
+emoji[woman_bowing_dark_skin_tone_minimally]=$'\U1F647\U1F3FF\U200D\U2640'
+emoji[person_facepalming]=$'\U1F926'
+emoji[facepalm]=$'\U1F926'
+emoji[person_facepalming_light_skin_tone]=$'\U1F926\U1F3FB'
+emoji[person_facepalming_medium_light_skin_tone]=$'\U1F926\U1F3FC'
+emoji[person_facepalming_medium_skin_tone]=$'\U1F926\U1F3FD'
+emoji[person_facepalming_medium_dark_skin_tone]=$'\U1F926\U1F3FE'
+emoji[person_facepalming_dark_skin_tone]=$'\U1F926\U1F3FF'
+emoji[man_facepalming]=$'\U1F926\U200D\U2642\UFE0F'
+emoji[man_facepalming_minimally]=$'\U1F926\U200D\U2642'
+emoji[man_facepalming_light_skin_tone]=$'\U1F926\U1F3FB\U200D\U2642\UFE0F'
+emoji[man_facepalming_light_skin_tone_minimally]=$'\U1F926\U1F3FB\U200D\U2642'
+emoji[man_facepalming_medium_light_skin_tone]=$'\U1F926\U1F3FC\U200D\U2642\UFE0F'
+emoji[man_facepalming_medium_light_skin_tone_minimally]=$'\U1F926\U1F3FC\U200D\U2642'
+emoji[man_facepalming_medium_skin_tone]=$'\U1F926\U1F3FD\U200D\U2642\UFE0F'
+emoji[man_facepalming_medium_skin_tone_minimally]=$'\U1F926\U1F3FD\U200D\U2642'
+emoji[man_facepalming_medium_dark_skin_tone]=$'\U1F926\U1F3FE\U200D\U2642\UFE0F'
+emoji[man_facepalming_medium_dark_skin_tone_minimally]=$'\U1F926\U1F3FE\U200D\U2642'
+emoji[man_facepalming_dark_skin_tone]=$'\U1F926\U1F3FF\U200D\U2642\UFE0F'
+emoji[man_facepalming_dark_skin_tone_minimally]=$'\U1F926\U1F3FF\U200D\U2642'
+emoji[woman_facepalming]=$'\U1F926\U200D\U2640\UFE0F'
+emoji[woman_facepalming_minimally]=$'\U1F926\U200D\U2640'
+emoji[woman_facepalming_light_skin_tone]=$'\U1F926\U1F3FB\U200D\U2640\UFE0F'
+emoji[woman_facepalming_light_skin_tone_minimally]=$'\U1F926\U1F3FB\U200D\U2640'
+emoji[woman_facepalming_medium_light_skin_tone]=$'\U1F926\U1F3FC\U200D\U2640\UFE0F'
+emoji[woman_facepalming_medium_light_skin_tone_minimally]=$'\U1F926\U1F3FC\U200D\U2640'
+emoji[woman_facepalming_medium_skin_tone]=$'\U1F926\U1F3FD\U200D\U2640\UFE0F'
+emoji[woman_facepalming_medium_skin_tone_minimally]=$'\U1F926\U1F3FD\U200D\U2640'
+emoji[woman_facepalming_medium_dark_skin_tone]=$'\U1F926\U1F3FE\U200D\U2640\UFE0F'
+emoji[woman_facepalming_medium_dark_skin_tone_minimally]=$'\U1F926\U1F3FE\U200D\U2640'
+emoji[woman_facepalming_dark_skin_tone]=$'\U1F926\U1F3FF\U200D\U2640\UFE0F'
+emoji[woman_facepalming_dark_skin_tone_minimally]=$'\U1F926\U1F3FF\U200D\U2640'
+emoji[person_shrugging]=$'\U1F937'
+emoji[shrug]=$'\U1F937'
+emoji[person_shrugging_light_skin_tone]=$'\U1F937\U1F3FB'
+emoji[person_shrugging_medium_light_skin_tone]=$'\U1F937\U1F3FC'
+emoji[person_shrugging_medium_skin_tone]=$'\U1F937\U1F3FD'
+emoji[person_shrugging_medium_dark_skin_tone]=$'\U1F937\U1F3FE'
+emoji[person_shrugging_dark_skin_tone]=$'\U1F937\U1F3FF'
+emoji[man_shrugging]=$'\U1F937\U200D\U2642\UFE0F'
+emoji[man_shrugging_minimally]=$'\U1F937\U200D\U2642'
+emoji[man_shrugging_light_skin_tone]=$'\U1F937\U1F3FB\U200D\U2642\UFE0F'
+emoji[man_shrugging_light_skin_tone_minimally]=$'\U1F937\U1F3FB\U200D\U2642'
+emoji[man_shrugging_medium_light_skin_tone]=$'\U1F937\U1F3FC\U200D\U2642\UFE0F'
+emoji[man_shrugging_medium_light_skin_tone_minimally]=$'\U1F937\U1F3FC\U200D\U2642'
+emoji[man_shrugging_medium_skin_tone]=$'\U1F937\U1F3FD\U200D\U2642\UFE0F'
+emoji[man_shrugging_medium_skin_tone_minimally]=$'\U1F937\U1F3FD\U200D\U2642'
+emoji[man_shrugging_medium_dark_skin_tone]=$'\U1F937\U1F3FE\U200D\U2642\UFE0F'
+emoji[man_shrugging_medium_dark_skin_tone_minimally]=$'\U1F937\U1F3FE\U200D\U2642'
+emoji[man_shrugging_dark_skin_tone]=$'\U1F937\U1F3FF\U200D\U2642\UFE0F'
+emoji[man_shrugging_dark_skin_tone_minimally]=$'\U1F937\U1F3FF\U200D\U2642'
+emoji[woman_shrugging]=$'\U1F937\U200D\U2640\UFE0F'
+emoji[woman_shrugging_minimally]=$'\U1F937\U200D\U2640'
+emoji[woman_shrugging_light_skin_tone]=$'\U1F937\U1F3FB\U200D\U2640\UFE0F'
+emoji[woman_shrugging_light_skin_tone_minimally]=$'\U1F937\U1F3FB\U200D\U2640'
+emoji[woman_shrugging_medium_light_skin_tone]=$'\U1F937\U1F3FC\U200D\U2640\UFE0F'
+emoji[woman_shrugging_medium_light_skin_tone_minimally]=$'\U1F937\U1F3FC\U200D\U2640'
+emoji[woman_shrugging_medium_skin_tone]=$'\U1F937\U1F3FD\U200D\U2640\UFE0F'
+emoji[woman_shrugging_medium_skin_tone_minimally]=$'\U1F937\U1F3FD\U200D\U2640'
+emoji[woman_shrugging_medium_dark_skin_tone]=$'\U1F937\U1F3FE\U200D\U2640\UFE0F'
+emoji[woman_shrugging_medium_dark_skin_tone_minimally]=$'\U1F937\U1F3FE\U200D\U2640'
+emoji[woman_shrugging_dark_skin_tone]=$'\U1F937\U1F3FF\U200D\U2640\UFE0F'
+emoji[woman_shrugging_dark_skin_tone_minimally]=$'\U1F937\U1F3FF\U200D\U2640'
+emoji[man_health_worker]=$'\U1F468\U200D\U2695\UFE0F'
+emoji[man_health_worker_minimally]=$'\U1F468\U200D\U2695'
+emoji[man_health_worker_light_skin_tone]=$'\U1F468\U1F3FB\U200D\U2695\UFE0F'
+emoji[man_health_worker_light_skin_tone_minimally]=$'\U1F468\U1F3FB\U200D\U2695'
+emoji[man_health_worker_medium_light_skin_tone]=$'\U1F468\U1F3FC\U200D\U2695\UFE0F'
+emoji[man_health_worker_medium_light_skin_tone_minimally]=$'\U1F468\U1F3FC\U200D\U2695'
+emoji[man_health_worker_medium_skin_tone]=$'\U1F468\U1F3FD\U200D\U2695\UFE0F'
+emoji[man_health_worker_medium_skin_tone_minimally]=$'\U1F468\U1F3FD\U200D\U2695'
+emoji[man_health_worker_medium_dark_skin_tone]=$'\U1F468\U1F3FE\U200D\U2695\UFE0F'
+emoji[man_health_worker_medium_dark_skin_tone_minimally]=$'\U1F468\U1F3FE\U200D\U2695'
+emoji[man_health_worker_dark_skin_tone]=$'\U1F468\U1F3FF\U200D\U2695\UFE0F'
+emoji[man_health_worker_dark_skin_tone_minimally]=$'\U1F468\U1F3FF\U200D\U2695'
+emoji[woman_health_worker]=$'\U1F469\U200D\U2695\UFE0F'
+emoji[woman_health_worker_minimally]=$'\U1F469\U200D\U2695'
+emoji[woman_health_worker_light_skin_tone]=$'\U1F469\U1F3FB\U200D\U2695\UFE0F'
+emoji[woman_health_worker_light_skin_tone_minimally]=$'\U1F469\U1F3FB\U200D\U2695'
+emoji[woman_health_worker_medium_light_skin_tone]=$'\U1F469\U1F3FC\U200D\U2695\UFE0F'
+emoji[woman_health_worker_medium_light_skin_tone_minimally]=$'\U1F469\U1F3FC\U200D\U2695'
+emoji[woman_health_worker_medium_skin_tone]=$'\U1F469\U1F3FD\U200D\U2695\UFE0F'
+emoji[woman_health_worker_medium_skin_tone_minimally]=$'\U1F469\U1F3FD\U200D\U2695'
+emoji[woman_health_worker_medium_dark_skin_tone]=$'\U1F469\U1F3FE\U200D\U2695\UFE0F'
+emoji[woman_health_worker_medium_dark_skin_tone_minimally]=$'\U1F469\U1F3FE\U200D\U2695'
+emoji[woman_health_worker_dark_skin_tone]=$'\U1F469\U1F3FF\U200D\U2695\UFE0F'
+emoji[woman_health_worker_dark_skin_tone_minimally]=$'\U1F469\U1F3FF\U200D\U2695'
+emoji[man_student]=$'\U1F468\U200D\U1F393'
+emoji[man_student_light_skin_tone]=$'\U1F468\U1F3FB\U200D\U1F393'
+emoji[man_student_medium_light_skin_tone]=$'\U1F468\U1F3FC\U200D\U1F393'
+emoji[man_student_medium_skin_tone]=$'\U1F468\U1F3FD\U200D\U1F393'
+emoji[man_student_medium_dark_skin_tone]=$'\U1F468\U1F3FE\U200D\U1F393'
+emoji[man_student_dark_skin_tone]=$'\U1F468\U1F3FF\U200D\U1F393'
+emoji[woman_student]=$'\U1F469\U200D\U1F393'
+emoji[woman_student_light_skin_tone]=$'\U1F469\U1F3FB\U200D\U1F393'
+emoji[woman_student_medium_light_skin_tone]=$'\U1F469\U1F3FC\U200D\U1F393'
+emoji[woman_student_medium_skin_tone]=$'\U1F469\U1F3FD\U200D\U1F393'
+emoji[woman_student_medium_dark_skin_tone]=$'\U1F469\U1F3FE\U200D\U1F393'
+emoji[woman_student_dark_skin_tone]=$'\U1F469\U1F3FF\U200D\U1F393'
+emoji[man_teacher]=$'\U1F468\U200D\U1F3EB'
+emoji[man_teacher_light_skin_tone]=$'\U1F468\U1F3FB\U200D\U1F3EB'
+emoji[man_teacher_medium_light_skin_tone]=$'\U1F468\U1F3FC\U200D\U1F3EB'
+emoji[man_teacher_medium_skin_tone]=$'\U1F468\U1F3FD\U200D\U1F3EB'
+emoji[man_teacher_medium_dark_skin_tone]=$'\U1F468\U1F3FE\U200D\U1F3EB'
+emoji[man_teacher_dark_skin_tone]=$'\U1F468\U1F3FF\U200D\U1F3EB'
+emoji[woman_teacher]=$'\U1F469\U200D\U1F3EB'
+emoji[woman_teacher_light_skin_tone]=$'\U1F469\U1F3FB\U200D\U1F3EB'
+emoji[woman_teacher_medium_light_skin_tone]=$'\U1F469\U1F3FC\U200D\U1F3EB'
+emoji[woman_teacher_medium_skin_tone]=$'\U1F469\U1F3FD\U200D\U1F3EB'
+emoji[woman_teacher_medium_dark_skin_tone]=$'\U1F469\U1F3FE\U200D\U1F3EB'
+emoji[woman_teacher_dark_skin_tone]=$'\U1F469\U1F3FF\U200D\U1F3EB'
+emoji[man_judge]=$'\U1F468\U200D\U2696\UFE0F'
+emoji[man_judge_minimally]=$'\U1F468\U200D\U2696'
+emoji[man_judge_light_skin_tone]=$'\U1F468\U1F3FB\U200D\U2696\UFE0F'
+emoji[man_judge_light_skin_tone_minimally]=$'\U1F468\U1F3FB\U200D\U2696'
+emoji[man_judge_medium_light_skin_tone]=$'\U1F468\U1F3FC\U200D\U2696\UFE0F'
+emoji[man_judge_medium_light_skin_tone_minimally]=$'\U1F468\U1F3FC\U200D\U2696'
+emoji[man_judge_medium_skin_tone]=$'\U1F468\U1F3FD\U200D\U2696\UFE0F'
+emoji[man_judge_medium_skin_tone_minimally]=$'\U1F468\U1F3FD\U200D\U2696'
+emoji[man_judge_medium_dark_skin_tone]=$'\U1F468\U1F3FE\U200D\U2696\UFE0F'
+emoji[man_judge_medium_dark_skin_tone_minimally]=$'\U1F468\U1F3FE\U200D\U2696'
+emoji[man_judge_dark_skin_tone]=$'\U1F468\U1F3FF\U200D\U2696\UFE0F'
+emoji[man_judge_dark_skin_tone_minimally]=$'\U1F468\U1F3FF\U200D\U2696'
+emoji[woman_judge]=$'\U1F469\U200D\U2696\UFE0F'
+emoji[woman_judge_minimally]=$'\U1F469\U200D\U2696'
+emoji[woman_judge_light_skin_tone]=$'\U1F469\U1F3FB\U200D\U2696\UFE0F'
+emoji[woman_judge_light_skin_tone_minimally]=$'\U1F469\U1F3FB\U200D\U2696'
+emoji[woman_judge_medium_light_skin_tone]=$'\U1F469\U1F3FC\U200D\U2696\UFE0F'
+emoji[woman_judge_medium_light_skin_tone_minimally]=$'\U1F469\U1F3FC\U200D\U2696'
+emoji[woman_judge_medium_skin_tone]=$'\U1F469\U1F3FD\U200D\U2696\UFE0F'
+emoji[woman_judge_medium_skin_tone_minimally]=$'\U1F469\U1F3FD\U200D\U2696'
+emoji[woman_judge_medium_dark_skin_tone]=$'\U1F469\U1F3FE\U200D\U2696\UFE0F'
+emoji[woman_judge_medium_dark_skin_tone_minimally]=$'\U1F469\U1F3FE\U200D\U2696'
+emoji[woman_judge_dark_skin_tone]=$'\U1F469\U1F3FF\U200D\U2696\UFE0F'
+emoji[woman_judge_dark_skin_tone_minimally]=$'\U1F469\U1F3FF\U200D\U2696'
+emoji[man_farmer]=$'\U1F468\U200D\U1F33E'
+emoji[man_farmer_light_skin_tone]=$'\U1F468\U1F3FB\U200D\U1F33E'
+emoji[man_farmer_medium_light_skin_tone]=$'\U1F468\U1F3FC\U200D\U1F33E'
+emoji[man_farmer_medium_skin_tone]=$'\U1F468\U1F3FD\U200D\U1F33E'
+emoji[man_farmer_medium_dark_skin_tone]=$'\U1F468\U1F3FE\U200D\U1F33E'
+emoji[man_farmer_dark_skin_tone]=$'\U1F468\U1F3FF\U200D\U1F33E'
+emoji[woman_farmer]=$'\U1F469\U200D\U1F33E'
+emoji[woman_farmer_light_skin_tone]=$'\U1F469\U1F3FB\U200D\U1F33E'
+emoji[woman_farmer_medium_light_skin_tone]=$'\U1F469\U1F3FC\U200D\U1F33E'
+emoji[woman_farmer_medium_skin_tone]=$'\U1F469\U1F3FD\U200D\U1F33E'
+emoji[woman_farmer_medium_dark_skin_tone]=$'\U1F469\U1F3FE\U200D\U1F33E'
+emoji[woman_farmer_dark_skin_tone]=$'\U1F469\U1F3FF\U200D\U1F33E'
+emoji[man_cook]=$'\U1F468\U200D\U1F373'
+emoji[man_cook_light_skin_tone]=$'\U1F468\U1F3FB\U200D\U1F373'
+emoji[man_cook_medium_light_skin_tone]=$'\U1F468\U1F3FC\U200D\U1F373'
+emoji[man_cook_medium_skin_tone]=$'\U1F468\U1F3FD\U200D\U1F373'
+emoji[man_cook_medium_dark_skin_tone]=$'\U1F468\U1F3FE\U200D\U1F373'
+emoji[man_cook_dark_skin_tone]=$'\U1F468\U1F3FF\U200D\U1F373'
+emoji[woman_cook]=$'\U1F469\U200D\U1F373'
+emoji[woman_cook_light_skin_tone]=$'\U1F469\U1F3FB\U200D\U1F373'
+emoji[woman_cook_medium_light_skin_tone]=$'\U1F469\U1F3FC\U200D\U1F373'
+emoji[woman_cook_medium_skin_tone]=$'\U1F469\U1F3FD\U200D\U1F373'
+emoji[woman_cook_medium_dark_skin_tone]=$'\U1F469\U1F3FE\U200D\U1F373'
+emoji[woman_cook_dark_skin_tone]=$'\U1F469\U1F3FF\U200D\U1F373'
+emoji[man_mechanic]=$'\U1F468\U200D\U1F527'
+emoji[man_mechanic_light_skin_tone]=$'\U1F468\U1F3FB\U200D\U1F527'
+emoji[man_mechanic_medium_light_skin_tone]=$'\U1F468\U1F3FC\U200D\U1F527'
+emoji[man_mechanic_medium_skin_tone]=$'\U1F468\U1F3FD\U200D\U1F527'
+emoji[man_mechanic_medium_dark_skin_tone]=$'\U1F468\U1F3FE\U200D\U1F527'
+emoji[man_mechanic_dark_skin_tone]=$'\U1F468\U1F3FF\U200D\U1F527'
+emoji[woman_mechanic]=$'\U1F469\U200D\U1F527'
+emoji[woman_mechanic_light_skin_tone]=$'\U1F469\U1F3FB\U200D\U1F527'
+emoji[woman_mechanic_medium_light_skin_tone]=$'\U1F469\U1F3FC\U200D\U1F527'
+emoji[woman_mechanic_medium_skin_tone]=$'\U1F469\U1F3FD\U200D\U1F527'
+emoji[woman_mechanic_medium_dark_skin_tone]=$'\U1F469\U1F3FE\U200D\U1F527'
+emoji[woman_mechanic_dark_skin_tone]=$'\U1F469\U1F3FF\U200D\U1F527'
+emoji[man_factory_worker]=$'\U1F468\U200D\U1F3ED'
+emoji[man_factory_worker_light_skin_tone]=$'\U1F468\U1F3FB\U200D\U1F3ED'
+emoji[man_factory_worker_medium_light_skin_tone]=$'\U1F468\U1F3FC\U200D\U1F3ED'
+emoji[man_factory_worker_medium_skin_tone]=$'\U1F468\U1F3FD\U200D\U1F3ED'
+emoji[man_factory_worker_medium_dark_skin_tone]=$'\U1F468\U1F3FE\U200D\U1F3ED'
+emoji[man_factory_worker_dark_skin_tone]=$'\U1F468\U1F3FF\U200D\U1F3ED'
+emoji[woman_factory_worker]=$'\U1F469\U200D\U1F3ED'
+emoji[woman_factory_worker_light_skin_tone]=$'\U1F469\U1F3FB\U200D\U1F3ED'
+emoji[woman_factory_worker_medium_light_skin_tone]=$'\U1F469\U1F3FC\U200D\U1F3ED'
+emoji[woman_factory_worker_medium_skin_tone]=$'\U1F469\U1F3FD\U200D\U1F3ED'
+emoji[woman_factory_worker_medium_dark_skin_tone]=$'\U1F469\U1F3FE\U200D\U1F3ED'
+emoji[woman_factory_worker_dark_skin_tone]=$'\U1F469\U1F3FF\U200D\U1F3ED'
+emoji[man_office_worker]=$'\U1F468\U200D\U1F4BC'
+emoji[man_office_worker_light_skin_tone]=$'\U1F468\U1F3FB\U200D\U1F4BC'
+emoji[man_office_worker_medium_light_skin_tone]=$'\U1F468\U1F3FC\U200D\U1F4BC'
+emoji[man_office_worker_medium_skin_tone]=$'\U1F468\U1F3FD\U200D\U1F4BC'
+emoji[man_office_worker_medium_dark_skin_tone]=$'\U1F468\U1F3FE\U200D\U1F4BC'
+emoji[man_office_worker_dark_skin_tone]=$'\U1F468\U1F3FF\U200D\U1F4BC'
+emoji[woman_office_worker]=$'\U1F469\U200D\U1F4BC'
+emoji[woman_office_worker_light_skin_tone]=$'\U1F469\U1F3FB\U200D\U1F4BC'
+emoji[woman_office_worker_medium_light_skin_tone]=$'\U1F469\U1F3FC\U200D\U1F4BC'
+emoji[woman_office_worker_medium_skin_tone]=$'\U1F469\U1F3FD\U200D\U1F4BC'
+emoji[woman_office_worker_medium_dark_skin_tone]=$'\U1F469\U1F3FE\U200D\U1F4BC'
+emoji[woman_office_worker_dark_skin_tone]=$'\U1F469\U1F3FF\U200D\U1F4BC'
+emoji[man_scientist]=$'\U1F468\U200D\U1F52C'
+emoji[man_scientist_light_skin_tone]=$'\U1F468\U1F3FB\U200D\U1F52C'
+emoji[man_scientist_medium_light_skin_tone]=$'\U1F468\U1F3FC\U200D\U1F52C'
+emoji[man_scientist_medium_skin_tone]=$'\U1F468\U1F3FD\U200D\U1F52C'
+emoji[man_scientist_medium_dark_skin_tone]=$'\U1F468\U1F3FE\U200D\U1F52C'
+emoji[man_scientist_dark_skin_tone]=$'\U1F468\U1F3FF\U200D\U1F52C'
+emoji[woman_scientist]=$'\U1F469\U200D\U1F52C'
+emoji[woman_scientist_light_skin_tone]=$'\U1F469\U1F3FB\U200D\U1F52C'
+emoji[woman_scientist_medium_light_skin_tone]=$'\U1F469\U1F3FC\U200D\U1F52C'
+emoji[woman_scientist_medium_skin_tone]=$'\U1F469\U1F3FD\U200D\U1F52C'
+emoji[woman_scientist_medium_dark_skin_tone]=$'\U1F469\U1F3FE\U200D\U1F52C'
+emoji[woman_scientist_dark_skin_tone]=$'\U1F469\U1F3FF\U200D\U1F52C'
+emoji[man_technologist]=$'\U1F468\U200D\U1F4BB'
+emoji[man_technologist_light_skin_tone]=$'\U1F468\U1F3FB\U200D\U1F4BB'
+emoji[man_technologist_medium_light_skin_tone]=$'\U1F468\U1F3FC\U200D\U1F4BB'
+emoji[man_technologist_medium_skin_tone]=$'\U1F468\U1F3FD\U200D\U1F4BB'
+emoji[man_technologist_medium_dark_skin_tone]=$'\U1F468\U1F3FE\U200D\U1F4BB'
+emoji[man_technologist_dark_skin_tone]=$'\U1F468\U1F3FF\U200D\U1F4BB'
+emoji[woman_technologist]=$'\U1F469\U200D\U1F4BB'
+emoji[woman_technologist_light_skin_tone]=$'\U1F469\U1F3FB\U200D\U1F4BB'
+emoji[woman_technologist_medium_light_skin_tone]=$'\U1F469\U1F3FC\U200D\U1F4BB'
+emoji[woman_technologist_medium_skin_tone]=$'\U1F469\U1F3FD\U200D\U1F4BB'
+emoji[woman_technologist_medium_dark_skin_tone]=$'\U1F469\U1F3FE\U200D\U1F4BB'
+emoji[woman_technologist_dark_skin_tone]=$'\U1F469\U1F3FF\U200D\U1F4BB'
+emoji[man_singer]=$'\U1F468\U200D\U1F3A4'
+emoji[man_singer_light_skin_tone]=$'\U1F468\U1F3FB\U200D\U1F3A4'
+emoji[man_singer_medium_light_skin_tone]=$'\U1F468\U1F3FC\U200D\U1F3A4'
+emoji[man_singer_medium_skin_tone]=$'\U1F468\U1F3FD\U200D\U1F3A4'
+emoji[man_singer_medium_dark_skin_tone]=$'\U1F468\U1F3FE\U200D\U1F3A4'
+emoji[man_singer_dark_skin_tone]=$'\U1F468\U1F3FF\U200D\U1F3A4'
+emoji[woman_singer]=$'\U1F469\U200D\U1F3A4'
+emoji[woman_singer_light_skin_tone]=$'\U1F469\U1F3FB\U200D\U1F3A4'
+emoji[woman_singer_medium_light_skin_tone]=$'\U1F469\U1F3FC\U200D\U1F3A4'
+emoji[woman_singer_medium_skin_tone]=$'\U1F469\U1F3FD\U200D\U1F3A4'
+emoji[woman_singer_medium_dark_skin_tone]=$'\U1F469\U1F3FE\U200D\U1F3A4'
+emoji[woman_singer_dark_skin_tone]=$'\U1F469\U1F3FF\U200D\U1F3A4'
+emoji[man_artist]=$'\U1F468\U200D\U1F3A8'
+emoji[man_artist_light_skin_tone]=$'\U1F468\U1F3FB\U200D\U1F3A8'
+emoji[man_artist_medium_light_skin_tone]=$'\U1F468\U1F3FC\U200D\U1F3A8'
+emoji[man_artist_medium_skin_tone]=$'\U1F468\U1F3FD\U200D\U1F3A8'
+emoji[man_artist_medium_dark_skin_tone]=$'\U1F468\U1F3FE\U200D\U1F3A8'
+emoji[man_artist_dark_skin_tone]=$'\U1F468\U1F3FF\U200D\U1F3A8'
+emoji[woman_artist]=$'\U1F469\U200D\U1F3A8'
+emoji[woman_artist_light_skin_tone]=$'\U1F469\U1F3FB\U200D\U1F3A8'
+emoji[woman_artist_medium_light_skin_tone]=$'\U1F469\U1F3FC\U200D\U1F3A8'
+emoji[woman_artist_medium_skin_tone]=$'\U1F469\U1F3FD\U200D\U1F3A8'
+emoji[woman_artist_medium_dark_skin_tone]=$'\U1F469\U1F3FE\U200D\U1F3A8'
+emoji[woman_artist_dark_skin_tone]=$'\U1F469\U1F3FF\U200D\U1F3A8'
+emoji[man_pilot]=$'\U1F468\U200D\U2708\UFE0F'
+emoji[man_pilot_minimally]=$'\U1F468\U200D\U2708'
+emoji[man_pilot_light_skin_tone]=$'\U1F468\U1F3FB\U200D\U2708\UFE0F'
+emoji[man_pilot_light_skin_tone_minimally]=$'\U1F468\U1F3FB\U200D\U2708'
+emoji[man_pilot_medium_light_skin_tone]=$'\U1F468\U1F3FC\U200D\U2708\UFE0F'
+emoji[man_pilot_medium_light_skin_tone_minimally]=$'\U1F468\U1F3FC\U200D\U2708'
+emoji[man_pilot_medium_skin_tone]=$'\U1F468\U1F3FD\U200D\U2708\UFE0F'
+emoji[man_pilot_medium_skin_tone_minimally]=$'\U1F468\U1F3FD\U200D\U2708'
+emoji[man_pilot_medium_dark_skin_tone]=$'\U1F468\U1F3FE\U200D\U2708\UFE0F'
+emoji[man_pilot_medium_dark_skin_tone_minimally]=$'\U1F468\U1F3FE\U200D\U2708'
+emoji[man_pilot_dark_skin_tone]=$'\U1F468\U1F3FF\U200D\U2708\UFE0F'
+emoji[man_pilot_dark_skin_tone_minimally]=$'\U1F468\U1F3FF\U200D\U2708'
+emoji[woman_pilot]=$'\U1F469\U200D\U2708\UFE0F'
+emoji[woman_pilot_minimally]=$'\U1F469\U200D\U2708'
+emoji[woman_pilot_light_skin_tone]=$'\U1F469\U1F3FB\U200D\U2708\UFE0F'
+emoji[woman_pilot_light_skin_tone_minimally]=$'\U1F469\U1F3FB\U200D\U2708'
+emoji[woman_pilot_medium_light_skin_tone]=$'\U1F469\U1F3FC\U200D\U2708\UFE0F'
+emoji[woman_pilot_medium_light_skin_tone_minimally]=$'\U1F469\U1F3FC\U200D\U2708'
+emoji[woman_pilot_medium_skin_tone]=$'\U1F469\U1F3FD\U200D\U2708\UFE0F'
+emoji[woman_pilot_medium_skin_tone_minimally]=$'\U1F469\U1F3FD\U200D\U2708'
+emoji[woman_pilot_medium_dark_skin_tone]=$'\U1F469\U1F3FE\U200D\U2708\UFE0F'
+emoji[woman_pilot_medium_dark_skin_tone_minimally]=$'\U1F469\U1F3FE\U200D\U2708'
+emoji[woman_pilot_dark_skin_tone]=$'\U1F469\U1F3FF\U200D\U2708\UFE0F'
+emoji[woman_pilot_dark_skin_tone_minimally]=$'\U1F469\U1F3FF\U200D\U2708'
+emoji[man_astronaut]=$'\U1F468\U200D\U1F680'
+emoji[man_astronaut_light_skin_tone]=$'\U1F468\U1F3FB\U200D\U1F680'
+emoji[man_astronaut_medium_light_skin_tone]=$'\U1F468\U1F3FC\U200D\U1F680'
+emoji[man_astronaut_medium_skin_tone]=$'\U1F468\U1F3FD\U200D\U1F680'
+emoji[man_astronaut_medium_dark_skin_tone]=$'\U1F468\U1F3FE\U200D\U1F680'
+emoji[man_astronaut_dark_skin_tone]=$'\U1F468\U1F3FF\U200D\U1F680'
+emoji[woman_astronaut]=$'\U1F469\U200D\U1F680'
+emoji[woman_astronaut_light_skin_tone]=$'\U1F469\U1F3FB\U200D\U1F680'
+emoji[woman_astronaut_medium_light_skin_tone]=$'\U1F469\U1F3FC\U200D\U1F680'
+emoji[woman_astronaut_medium_skin_tone]=$'\U1F469\U1F3FD\U200D\U1F680'
+emoji[woman_astronaut_medium_dark_skin_tone]=$'\U1F469\U1F3FE\U200D\U1F680'
+emoji[woman_astronaut_dark_skin_tone]=$'\U1F469\U1F3FF\U200D\U1F680'
+emoji[man_firefighter]=$'\U1F468\U200D\U1F692'
+emoji[man_firefighter_light_skin_tone]=$'\U1F468\U1F3FB\U200D\U1F692'
+emoji[man_firefighter_medium_light_skin_tone]=$'\U1F468\U1F3FC\U200D\U1F692'
+emoji[man_firefighter_medium_skin_tone]=$'\U1F468\U1F3FD\U200D\U1F692'
+emoji[man_firefighter_medium_dark_skin_tone]=$'\U1F468\U1F3FE\U200D\U1F692'
+emoji[man_firefighter_dark_skin_tone]=$'\U1F468\U1F3FF\U200D\U1F692'
+emoji[woman_firefighter]=$'\U1F469\U200D\U1F692'
+emoji[woman_firefighter_light_skin_tone]=$'\U1F469\U1F3FB\U200D\U1F692'
+emoji[woman_firefighter_medium_light_skin_tone]=$'\U1F469\U1F3FC\U200D\U1F692'
+emoji[woman_firefighter_medium_skin_tone]=$'\U1F469\U1F3FD\U200D\U1F692'
+emoji[woman_firefighter_medium_dark_skin_tone]=$'\U1F469\U1F3FE\U200D\U1F692'
+emoji[woman_firefighter_dark_skin_tone]=$'\U1F469\U1F3FF\U200D\U1F692'
+emoji[police_officer]=$'\U1F46E'
+emoji[cop]=$'\U1F46E'
+emoji[police_officer_light_skin_tone]=$'\U1F46E\U1F3FB'
+emoji[police_officer_medium_light_skin_tone]=$'\U1F46E\U1F3FC'
+emoji[police_officer_medium_skin_tone]=$'\U1F46E\U1F3FD'
+emoji[police_officer_medium_dark_skin_tone]=$'\U1F46E\U1F3FE'
+emoji[police_officer_dark_skin_tone]=$'\U1F46E\U1F3FF'
+emoji[man_police_officer]=$'\U1F46E\U200D\U2642\UFE0F'
+emoji[man_police_officer_minimally]=$'\U1F46E\U200D\U2642'
+emoji[policeman]=$'\U1F46E\U200D\U2642'
+emoji[man_police_officer_light_skin_tone]=$'\U1F46E\U1F3FB\U200D\U2642\UFE0F'
+emoji[man_police_officer_light_skin_tone_minimally]=$'\U1F46E\U1F3FB\U200D\U2642'
+emoji[man_police_officer_medium_light_skin_tone]=$'\U1F46E\U1F3FC\U200D\U2642\UFE0F'
+emoji[man_police_officer_medium_light_skin_tone_minimally]=$'\U1F46E\U1F3FC\U200D\U2642'
+emoji[man_police_officer_medium_skin_tone]=$'\U1F46E\U1F3FD\U200D\U2642\UFE0F'
+emoji[man_police_officer_medium_skin_tone_minimally]=$'\U1F46E\U1F3FD\U200D\U2642'
+emoji[man_police_officer_medium_dark_skin_tone]=$'\U1F46E\U1F3FE\U200D\U2642\UFE0F'
+emoji[man_police_officer_medium_dark_skin_tone_minimally]=$'\U1F46E\U1F3FE\U200D\U2642'
+emoji[man_police_officer_dark_skin_tone]=$'\U1F46E\U1F3FF\U200D\U2642\UFE0F'
+emoji[man_police_officer_dark_skin_tone_minimally]=$'\U1F46E\U1F3FF\U200D\U2642'
+emoji[woman_police_officer]=$'\U1F46E\U200D\U2640\UFE0F'
+emoji[woman_police_officer_minimally]=$'\U1F46E\U200D\U2640'
+emoji[policewoman]=$'\U1F46E\U200D\U2640'
+emoji[woman_police_officer_light_skin_tone]=$'\U1F46E\U1F3FB\U200D\U2640\UFE0F'
+emoji[woman_police_officer_light_skin_tone_minimally]=$'\U1F46E\U1F3FB\U200D\U2640'
+emoji[woman_police_officer_medium_light_skin_tone]=$'\U1F46E\U1F3FC\U200D\U2640\UFE0F'
+emoji[woman_police_officer_medium_light_skin_tone_minimally]=$'\U1F46E\U1F3FC\U200D\U2640'
+emoji[woman_police_officer_medium_skin_tone]=$'\U1F46E\U1F3FD\U200D\U2640\UFE0F'
+emoji[woman_police_officer_medium_skin_tone_minimally]=$'\U1F46E\U1F3FD\U200D\U2640'
+emoji[woman_police_officer_medium_dark_skin_tone]=$'\U1F46E\U1F3FE\U200D\U2640\UFE0F'
+emoji[woman_police_officer_medium_dark_skin_tone_minimally]=$'\U1F46E\U1F3FE\U200D\U2640'
+emoji[woman_police_officer_dark_skin_tone]=$'\U1F46E\U1F3FF\U200D\U2640\UFE0F'
+emoji[woman_police_officer_dark_skin_tone_minimally]=$'\U1F46E\U1F3FF\U200D\U2640'
+emoji[detective]=$'\U1F575\UFE0F'
+emoji[detective_unqualified]=$'\U1F575'
+emoji[detective_light_skin_tone]=$'\U1F575\U1F3FB'
+emoji[detective_medium_light_skin_tone]=$'\U1F575\U1F3FC'
+emoji[detective_medium_skin_tone]=$'\U1F575\U1F3FD'
+emoji[detective_medium_dark_skin_tone]=$'\U1F575\U1F3FE'
+emoji[detective_dark_skin_tone]=$'\U1F575\U1F3FF'
+emoji[man_detective]=$'\U1F575\UFE0F\U200D\U2642\UFE0F'
+emoji[male_detective]=$'\U1F575\UFE0F\U200D\U2642\UFE0F'
+emoji[man_detective_unqualified]=$'\U1F575\U200D\U2642\UFE0F'
+emoji[man_detective_unqualified_1]=$'\U1F575\UFE0F\U200D\U2642'
+emoji[man_detective_unqualified_2]=$'\U1F575\U200D\U2642'
+emoji[man_detective_light_skin_tone]=$'\U1F575\U1F3FB\U200D\U2642\UFE0F'
+emoji[man_detective_light_skin_tone_minimally]=$'\U1F575\U1F3FB\U200D\U2642'
+emoji[man_detective_medium_light_skin_tone]=$'\U1F575\U1F3FC\U200D\U2642\UFE0F'
+emoji[man_detective_medium_light_skin_tone_minimally]=$'\U1F575\U1F3FC\U200D\U2642'
+emoji[man_detective_medium_skin_tone]=$'\U1F575\U1F3FD\U200D\U2642\UFE0F'
+emoji[man_detective_medium_skin_tone_minimally]=$'\U1F575\U1F3FD\U200D\U2642'
+emoji[man_detective_medium_dark_skin_tone]=$'\U1F575\U1F3FE\U200D\U2642\UFE0F'
+emoji[man_detective_medium_dark_skin_tone_minimally]=$'\U1F575\U1F3FE\U200D\U2642'
+emoji[man_detective_dark_skin_tone]=$'\U1F575\U1F3FF\U200D\U2642\UFE0F'
+emoji[man_detective_dark_skin_tone_minimally]=$'\U1F575\U1F3FF\U200D\U2642'
+emoji[woman_detective]=$'\U1F575\UFE0F\U200D\U2640\UFE0F'
+emoji[female_detective]=$'\U1F575\UFE0F\U200D\U2640\UFE0F'
+emoji[woman_detective_unqualified]=$'\U1F575\U200D\U2640\UFE0F'
+emoji[woman_detective_unqualified_1]=$'\U1F575\UFE0F\U200D\U2640'
+emoji[woman_detective_unqualified_2]=$'\U1F575\U200D\U2640'
+emoji[woman_detective_light_skin_tone]=$'\U1F575\U1F3FB\U200D\U2640\UFE0F'
+emoji[woman_detective_light_skin_tone_minimally]=$'\U1F575\U1F3FB\U200D\U2640'
+emoji[woman_detective_medium_light_skin_tone]=$'\U1F575\U1F3FC\U200D\U2640\UFE0F'
+emoji[woman_detective_medium_light_skin_tone_minimally]=$'\U1F575\U1F3FC\U200D\U2640'
+emoji[woman_detective_medium_skin_tone]=$'\U1F575\U1F3FD\U200D\U2640\UFE0F'
+emoji[woman_detective_medium_skin_tone_minimally]=$'\U1F575\U1F3FD\U200D\U2640'
+emoji[woman_detective_medium_dark_skin_tone]=$'\U1F575\U1F3FE\U200D\U2640\UFE0F'
+emoji[woman_detective_medium_dark_skin_tone_minimally]=$'\U1F575\U1F3FE\U200D\U2640'
+emoji[woman_detective_dark_skin_tone]=$'\U1F575\U1F3FF\U200D\U2640\UFE0F'
+emoji[woman_detective_dark_skin_tone_minimally]=$'\U1F575\U1F3FF\U200D\U2640'
+emoji[guard]=$'\U1F482'
+emoji[guard_light_skin_tone]=$'\U1F482\U1F3FB'
+emoji[guard_medium_light_skin_tone]=$'\U1F482\U1F3FC'
+emoji[guard_medium_skin_tone]=$'\U1F482\U1F3FD'
+emoji[guard_medium_dark_skin_tone]=$'\U1F482\U1F3FE'
+emoji[guard_dark_skin_tone]=$'\U1F482\U1F3FF'
+emoji[man_guard]=$'\U1F482\U200D\U2642\UFE0F'
+emoji[man_guard_minimally]=$'\U1F482\U200D\U2642'
+emoji[guardsman]=$'\U1F482\U200D\U2642'
+emoji[man_guard_light_skin_tone]=$'\U1F482\U1F3FB\U200D\U2642\UFE0F'
+emoji[man_guard_light_skin_tone_minimally]=$'\U1F482\U1F3FB\U200D\U2642'
+emoji[man_guard_medium_light_skin_tone]=$'\U1F482\U1F3FC\U200D\U2642\UFE0F'
+emoji[man_guard_medium_light_skin_tone_minimally]=$'\U1F482\U1F3FC\U200D\U2642'
+emoji[man_guard_medium_skin_tone]=$'\U1F482\U1F3FD\U200D\U2642\UFE0F'
+emoji[man_guard_medium_skin_tone_minimally]=$'\U1F482\U1F3FD\U200D\U2642'
+emoji[man_guard_medium_dark_skin_tone]=$'\U1F482\U1F3FE\U200D\U2642\UFE0F'
+emoji[man_guard_medium_dark_skin_tone_minimally]=$'\U1F482\U1F3FE\U200D\U2642'
+emoji[man_guard_dark_skin_tone]=$'\U1F482\U1F3FF\U200D\U2642\UFE0F'
+emoji[man_guard_dark_skin_tone_minimally]=$'\U1F482\U1F3FF\U200D\U2642'
+emoji[woman_guard]=$'\U1F482\U200D\U2640\UFE0F'
+emoji[woman_guard_minimally]=$'\U1F482\U200D\U2640'
+emoji[guardswoman]=$'\U1F482\U200D\U2640'
+emoji[woman_guard_light_skin_tone]=$'\U1F482\U1F3FB\U200D\U2640\UFE0F'
+emoji[woman_guard_light_skin_tone_minimally]=$'\U1F482\U1F3FB\U200D\U2640'
+emoji[woman_guard_medium_light_skin_tone]=$'\U1F482\U1F3FC\U200D\U2640\UFE0F'
+emoji[woman_guard_medium_light_skin_tone_minimally]=$'\U1F482\U1F3FC\U200D\U2640'
+emoji[woman_guard_medium_skin_tone]=$'\U1F482\U1F3FD\U200D\U2640\UFE0F'
+emoji[woman_guard_medium_skin_tone_minimally]=$'\U1F482\U1F3FD\U200D\U2640'
+emoji[woman_guard_medium_dark_skin_tone]=$'\U1F482\U1F3FE\U200D\U2640\UFE0F'
+emoji[woman_guard_medium_dark_skin_tone_minimally]=$'\U1F482\U1F3FE\U200D\U2640'
+emoji[woman_guard_dark_skin_tone]=$'\U1F482\U1F3FF\U200D\U2640\UFE0F'
+emoji[woman_guard_dark_skin_tone_minimally]=$'\U1F482\U1F3FF\U200D\U2640'
+emoji[construction_worker]=$'\U1F477'
+emoji[construction_worker_light_skin_tone]=$'\U1F477\U1F3FB'
+emoji[construction_worker_medium_light_skin_tone]=$'\U1F477\U1F3FC'
+emoji[construction_worker_medium_skin_tone]=$'\U1F477\U1F3FD'
+emoji[construction_worker_medium_dark_skin_tone]=$'\U1F477\U1F3FE'
+emoji[construction_worker_dark_skin_tone]=$'\U1F477\U1F3FF'
+emoji[man_construction_worker]=$'\U1F477\U200D\U2642\UFE0F'
+emoji[man_construction_worker_minimally]=$'\U1F477\U200D\U2642'
+emoji[construction_worker_man]=$'\U1F477\U200D\U2642'
+emoji[man_construction_worker_light_skin_tone]=$'\U1F477\U1F3FB\U200D\U2642\UFE0F'
+emoji[man_construction_worker_light_skin_tone_minimally]=$'\U1F477\U1F3FB\U200D\U2642'
+emoji[man_construction_worker_medium_light_skin_tone]=$'\U1F477\U1F3FC\U200D\U2642\UFE0F'
+emoji[man_construction_worker_medium_light_skin_tone_minimally]=$'\U1F477\U1F3FC\U200D\U2642'
+emoji[man_construction_worker_medium_skin_tone]=$'\U1F477\U1F3FD\U200D\U2642\UFE0F'
+emoji[man_construction_worker_medium_skin_tone_minimally]=$'\U1F477\U1F3FD\U200D\U2642'
+emoji[man_construction_worker_medium_dark_skin_tone]=$'\U1F477\U1F3FE\U200D\U2642\UFE0F'
+emoji[man_construction_worker_medium_dark_skin_tone_minimally]=$'\U1F477\U1F3FE\U200D\U2642'
+emoji[man_construction_worker_dark_skin_tone]=$'\U1F477\U1F3FF\U200D\U2642\UFE0F'
+emoji[man_construction_worker_dark_skin_tone_minimally]=$'\U1F477\U1F3FF\U200D\U2642'
+emoji[woman_construction_worker]=$'\U1F477\U200D\U2640\UFE0F'
+emoji[woman_construction_worker_minimally]=$'\U1F477\U200D\U2640'
+emoji[construction_worker_woman]=$'\U1F477\U200D\U2640'
+emoji[woman_construction_worker_light_skin_tone]=$'\U1F477\U1F3FB\U200D\U2640\UFE0F'
+emoji[woman_construction_worker_light_skin_tone_minimally]=$'\U1F477\U1F3FB\U200D\U2640'
+emoji[woman_construction_worker_medium_light_skin_tone]=$'\U1F477\U1F3FC\U200D\U2640\UFE0F'
+emoji[woman_construction_worker_medium_light_skin_tone_minimally]=$'\U1F477\U1F3FC\U200D\U2640'
+emoji[woman_construction_worker_medium_skin_tone]=$'\U1F477\U1F3FD\U200D\U2640\UFE0F'
+emoji[woman_construction_worker_medium_skin_tone_minimally]=$'\U1F477\U1F3FD\U200D\U2640'
+emoji[woman_construction_worker_medium_dark_skin_tone]=$'\U1F477\U1F3FE\U200D\U2640\UFE0F'
+emoji[woman_construction_worker_medium_dark_skin_tone_minimally]=$'\U1F477\U1F3FE\U200D\U2640'
+emoji[woman_construction_worker_dark_skin_tone]=$'\U1F477\U1F3FF\U200D\U2640\UFE0F'
+emoji[woman_construction_worker_dark_skin_tone_minimally]=$'\U1F477\U1F3FF\U200D\U2640'
+emoji[prince]=$'\U1F934'
+emoji[prince_light_skin_tone]=$'\U1F934\U1F3FB'
+emoji[prince_medium_light_skin_tone]=$'\U1F934\U1F3FC'
+emoji[prince_medium_skin_tone]=$'\U1F934\U1F3FD'
+emoji[prince_medium_dark_skin_tone]=$'\U1F934\U1F3FE'
+emoji[prince_dark_skin_tone]=$'\U1F934\U1F3FF'
+emoji[princess]=$'\U1F478'
+emoji[princess_light_skin_tone]=$'\U1F478\U1F3FB'
+emoji[princess_medium_light_skin_tone]=$'\U1F478\U1F3FC'
+emoji[princess_medium_skin_tone]=$'\U1F478\U1F3FD'
+emoji[princess_medium_dark_skin_tone]=$'\U1F478\U1F3FE'
+emoji[princess_dark_skin_tone]=$'\U1F478\U1F3FF'
+emoji[person_wearing_turban]=$'\U1F473'
+emoji[person_with_turban]=$'\U1F473'
+emoji[person_wearing_turban_light_skin_tone]=$'\U1F473\U1F3FB'
+emoji[person_wearing_turban_medium_light_skin_tone]=$'\U1F473\U1F3FC'
+emoji[person_wearing_turban_medium_skin_tone]=$'\U1F473\U1F3FD'
+emoji[person_wearing_turban_medium_dark_skin_tone]=$'\U1F473\U1F3FE'
+emoji[person_wearing_turban_dark_skin_tone]=$'\U1F473\U1F3FF'
+emoji[man_wearing_turban]=$'\U1F473\U200D\U2642\UFE0F'
+emoji[man_wearing_turban_minimally]=$'\U1F473\U200D\U2642'
+emoji[man_with_turban]=$'\U1F473\U200D\U2642'
+emoji[man_wearing_turban_light_skin_tone]=$'\U1F473\U1F3FB\U200D\U2642\UFE0F'
+emoji[man_wearing_turban_light_skin_tone_minimally]=$'\U1F473\U1F3FB\U200D\U2642'
+emoji[man_wearing_turban_medium_light_skin_tone]=$'\U1F473\U1F3FC\U200D\U2642\UFE0F'
+emoji[man_wearing_turban_medium_light_skin_tone_minimally]=$'\U1F473\U1F3FC\U200D\U2642'
+emoji[man_wearing_turban_medium_skin_tone]=$'\U1F473\U1F3FD\U200D\U2642\UFE0F'
+emoji[man_wearing_turban_medium_skin_tone_minimally]=$'\U1F473\U1F3FD\U200D\U2642'
+emoji[man_wearing_turban_medium_dark_skin_tone]=$'\U1F473\U1F3FE\U200D\U2642\UFE0F'
+emoji[man_wearing_turban_medium_dark_skin_tone_minimally]=$'\U1F473\U1F3FE\U200D\U2642'
+emoji[man_wearing_turban_dark_skin_tone]=$'\U1F473\U1F3FF\U200D\U2642\UFE0F'
+emoji[man_wearing_turban_dark_skin_tone_minimally]=$'\U1F473\U1F3FF\U200D\U2642'
+emoji[woman_wearing_turban]=$'\U1F473\U200D\U2640\UFE0F'
+emoji[woman_wearing_turban_minimally]=$'\U1F473\U200D\U2640'
+emoji[woman_with_turban]=$'\U1F473\U200D\U2640'
+emoji[woman_wearing_turban_light_skin_tone]=$'\U1F473\U1F3FB\U200D\U2640\UFE0F'
+emoji[woman_wearing_turban_light_skin_tone_minimally]=$'\U1F473\U1F3FB\U200D\U2640'
+emoji[woman_wearing_turban_medium_light_skin_tone]=$'\U1F473\U1F3FC\U200D\U2640\UFE0F'
+emoji[woman_wearing_turban_medium_light_skin_tone_minimally]=$'\U1F473\U1F3FC\U200D\U2640'
+emoji[woman_wearing_turban_medium_skin_tone]=$'\U1F473\U1F3FD\U200D\U2640\UFE0F'
+emoji[woman_wearing_turban_medium_skin_tone_minimally]=$'\U1F473\U1F3FD\U200D\U2640'
+emoji[woman_wearing_turban_medium_dark_skin_tone]=$'\U1F473\U1F3FE\U200D\U2640\UFE0F'
+emoji[woman_wearing_turban_medium_dark_skin_tone_minimally]=$'\U1F473\U1F3FE\U200D\U2640'
+emoji[woman_wearing_turban_dark_skin_tone]=$'\U1F473\U1F3FF\U200D\U2640\UFE0F'
+emoji[woman_wearing_turban_dark_skin_tone_minimally]=$'\U1F473\U1F3FF\U200D\U2640'
+emoji[man_with_Chinese_cap]=$'\U1F472'
+emoji[man_with_gua_pi_mao]=$'\U1F472'
+emoji[man_with_Chinese_cap_light_skin_tone]=$'\U1F472\U1F3FB'
+emoji[man_with_Chinese_cap_medium_light_skin_tone]=$'\U1F472\U1F3FC'
+emoji[man_with_Chinese_cap_medium_skin_tone]=$'\U1F472\U1F3FD'
+emoji[man_with_Chinese_cap_medium_dark_skin_tone]=$'\U1F472\U1F3FE'
+emoji[man_with_Chinese_cap_dark_skin_tone]=$'\U1F472\U1F3FF'
+emoji[woman_with_headscarf]=$'\U1F9D5'
+emoji[woman_with_headscarf_light_skin_tone]=$'\U1F9D5\U1F3FB'
+emoji[woman_with_headscarf_medium_light_skin_tone]=$'\U1F9D5\U1F3FC'
+emoji[woman_with_headscarf_medium_skin_tone]=$'\U1F9D5\U1F3FD'
+emoji[woman_with_headscarf_medium_dark_skin_tone]=$'\U1F9D5\U1F3FE'
+emoji[woman_with_headscarf_dark_skin_tone]=$'\U1F9D5\U1F3FF'
+emoji[man_in_tuxedo]=$'\U1F935'
+emoji[man_in_tuxedo_light_skin_tone]=$'\U1F935\U1F3FB'
+emoji[man_in_tuxedo_medium_light_skin_tone]=$'\U1F935\U1F3FC'
+emoji[man_in_tuxedo_medium_skin_tone]=$'\U1F935\U1F3FD'
+emoji[man_in_tuxedo_medium_dark_skin_tone]=$'\U1F935\U1F3FE'
+emoji[man_in_tuxedo_dark_skin_tone]=$'\U1F935\U1F3FF'
+emoji[bride_with_veil]=$'\U1F470'
+emoji[bride_with_veil_light_skin_tone]=$'\U1F470\U1F3FB'
+emoji[bride_with_veil_medium_light_skin_tone]=$'\U1F470\U1F3FC'
+emoji[bride_with_veil_medium_skin_tone]=$'\U1F470\U1F3FD'
+emoji[bride_with_veil_medium_dark_skin_tone]=$'\U1F470\U1F3FE'
+emoji[bride_with_veil_dark_skin_tone]=$'\U1F470\U1F3FF'
+emoji[pregnant_woman]=$'\U1F930'
+emoji[pregnant_woman_light_skin_tone]=$'\U1F930\U1F3FB'
+emoji[pregnant_woman_medium_light_skin_tone]=$'\U1F930\U1F3FC'
+emoji[pregnant_woman_medium_skin_tone]=$'\U1F930\U1F3FD'
+emoji[pregnant_woman_medium_dark_skin_tone]=$'\U1F930\U1F3FE'
+emoji[pregnant_woman_dark_skin_tone]=$'\U1F930\U1F3FF'
+emoji[breast_feeding]=$'\U1F931'
+emoji[breast_feeding_light_skin_tone]=$'\U1F931\U1F3FB'
+emoji[breast_feeding_medium_light_skin_tone]=$'\U1F931\U1F3FC'
+emoji[breast_feeding_medium_skin_tone]=$'\U1F931\U1F3FD'
+emoji[breast_feeding_medium_dark_skin_tone]=$'\U1F931\U1F3FE'
+emoji[breast_feeding_dark_skin_tone]=$'\U1F931\U1F3FF'
+emoji[baby_angel]=$'\U1F47C'
+emoji[angel]=$'\U1F47C'
+emoji[baby_angel_light_skin_tone]=$'\U1F47C\U1F3FB'
+emoji[baby_angel_medium_light_skin_tone]=$'\U1F47C\U1F3FC'
+emoji[baby_angel_medium_skin_tone]=$'\U1F47C\U1F3FD'
+emoji[baby_angel_medium_dark_skin_tone]=$'\U1F47C\U1F3FE'
+emoji[baby_angel_dark_skin_tone]=$'\U1F47C\U1F3FF'
+emoji[Santa_Claus]=$'\U1F385'
+emoji[santa]=$'\U1F385'
+emoji[Santa_Claus_light_skin_tone]=$'\U1F385\U1F3FB'
+emoji[Santa_Claus_medium_light_skin_tone]=$'\U1F385\U1F3FC'
+emoji[Santa_Claus_medium_skin_tone]=$'\U1F385\U1F3FD'
+emoji[Santa_Claus_medium_dark_skin_tone]=$'\U1F385\U1F3FE'
+emoji[Santa_Claus_dark_skin_tone]=$'\U1F385\U1F3FF'
+emoji[Mrs_Claus]=$'\U1F936'
+emoji[mrs_claus]=$'\U1F936'
+emoji[Mrs_Claus_light_skin_tone]=$'\U1F936\U1F3FB'
+emoji[Mrs_Claus_medium_light_skin_tone]=$'\U1F936\U1F3FC'
+emoji[Mrs_Claus_medium_skin_tone]=$'\U1F936\U1F3FD'
+emoji[Mrs_Claus_medium_dark_skin_tone]=$'\U1F936\U1F3FE'
+emoji[Mrs_Claus_dark_skin_tone]=$'\U1F936\U1F3FF'
+emoji[superhero]=$'\U1F9B8'
+emoji[superhero_light_skin_tone]=$'\U1F9B8\U1F3FB'
+emoji[superhero_medium_light_skin_tone]=$'\U1F9B8\U1F3FC'
+emoji[superhero_medium_skin_tone]=$'\U1F9B8\U1F3FD'
+emoji[superhero_medium_dark_skin_tone]=$'\U1F9B8\U1F3FE'
+emoji[superhero_dark_skin_tone]=$'\U1F9B8\U1F3FF'
+emoji[man_superhero]=$'\U1F9B8\U200D\U2642\UFE0F'
+emoji[man_superhero_minimally]=$'\U1F9B8\U200D\U2642'
+emoji[superhero_man]=$'\U1F9B8\U200D\U2642'
+emoji[man_superhero_light_skin_tone]=$'\U1F9B8\U1F3FB\U200D\U2642\UFE0F'
+emoji[man_superhero_light_skin_tone_minimally]=$'\U1F9B8\U1F3FB\U200D\U2642'
+emoji[man_superhero_medium_light_skin_tone]=$'\U1F9B8\U1F3FC\U200D\U2642\UFE0F'
+emoji[man_superhero_medium_light_skin_tone_minimally]=$'\U1F9B8\U1F3FC\U200D\U2642'
+emoji[man_superhero_medium_skin_tone]=$'\U1F9B8\U1F3FD\U200D\U2642\UFE0F'
+emoji[man_superhero_medium_skin_tone_minimally]=$'\U1F9B8\U1F3FD\U200D\U2642'
+emoji[man_superhero_medium_dark_skin_tone]=$'\U1F9B8\U1F3FE\U200D\U2642\UFE0F'
+emoji[man_superhero_medium_dark_skin_tone_minimally]=$'\U1F9B8\U1F3FE\U200D\U2642'
+emoji[man_superhero_dark_skin_tone]=$'\U1F9B8\U1F3FF\U200D\U2642\UFE0F'
+emoji[man_superhero_dark_skin_tone_minimally]=$'\U1F9B8\U1F3FF\U200D\U2642'
+emoji[woman_superhero]=$'\U1F9B8\U200D\U2640\UFE0F'
+emoji[woman_superhero_minimally]=$'\U1F9B8\U200D\U2640'
+emoji[superhero_woman]=$'\U1F9B8\U200D\U2640'
+emoji[woman_superhero_light_skin_tone]=$'\U1F9B8\U1F3FB\U200D\U2640\UFE0F'
+emoji[woman_superhero_light_skin_tone_minimally]=$'\U1F9B8\U1F3FB\U200D\U2640'
+emoji[woman_superhero_medium_light_skin_tone]=$'\U1F9B8\U1F3FC\U200D\U2640\UFE0F'
+emoji[woman_superhero_medium_light_skin_tone_minimally]=$'\U1F9B8\U1F3FC\U200D\U2640'
+emoji[woman_superhero_medium_skin_tone]=$'\U1F9B8\U1F3FD\U200D\U2640\UFE0F'
+emoji[woman_superhero_medium_skin_tone_minimally]=$'\U1F9B8\U1F3FD\U200D\U2640'
+emoji[woman_superhero_medium_dark_skin_tone]=$'\U1F9B8\U1F3FE\U200D\U2640\UFE0F'
+emoji[woman_superhero_medium_dark_skin_tone_minimally]=$'\U1F9B8\U1F3FE\U200D\U2640'
+emoji[woman_superhero_dark_skin_tone]=$'\U1F9B8\U1F3FF\U200D\U2640\UFE0F'
+emoji[woman_superhero_dark_skin_tone_minimally]=$'\U1F9B8\U1F3FF\U200D\U2640'
+emoji[supervillain]=$'\U1F9B9'
+emoji[supervillain_light_skin_tone]=$'\U1F9B9\U1F3FB'
+emoji[supervillain_medium_light_skin_tone]=$'\U1F9B9\U1F3FC'
+emoji[supervillain_medium_skin_tone]=$'\U1F9B9\U1F3FD'
+emoji[supervillain_medium_dark_skin_tone]=$'\U1F9B9\U1F3FE'
+emoji[supervillain_dark_skin_tone]=$'\U1F9B9\U1F3FF'
+emoji[man_supervillain]=$'\U1F9B9\U200D\U2642\UFE0F'
+emoji[man_supervillain_minimally]=$'\U1F9B9\U200D\U2642'
+emoji[supervillain_man]=$'\U1F9B9\U200D\U2642'
+emoji[man_supervillain_light_skin_tone]=$'\U1F9B9\U1F3FB\U200D\U2642\UFE0F'
+emoji[man_supervillain_light_skin_tone_minimally]=$'\U1F9B9\U1F3FB\U200D\U2642'
+emoji[man_supervillain_medium_light_skin_tone]=$'\U1F9B9\U1F3FC\U200D\U2642\UFE0F'
+emoji[man_supervillain_medium_light_skin_tone_minimally]=$'\U1F9B9\U1F3FC\U200D\U2642'
+emoji[man_supervillain_medium_skin_tone]=$'\U1F9B9\U1F3FD\U200D\U2642\UFE0F'
+emoji[man_supervillain_medium_skin_tone_minimally]=$'\U1F9B9\U1F3FD\U200D\U2642'
+emoji[man_supervillain_medium_dark_skin_tone]=$'\U1F9B9\U1F3FE\U200D\U2642\UFE0F'
+emoji[man_supervillain_medium_dark_skin_tone_minimally]=$'\U1F9B9\U1F3FE\U200D\U2642'
+emoji[man_supervillain_dark_skin_tone]=$'\U1F9B9\U1F3FF\U200D\U2642\UFE0F'
+emoji[man_supervillain_dark_skin_tone_minimally]=$'\U1F9B9\U1F3FF\U200D\U2642'
+emoji[woman_supervillain]=$'\U1F9B9\U200D\U2640\UFE0F'
+emoji[woman_supervillain_minimally]=$'\U1F9B9\U200D\U2640'
+emoji[supervillain_woman]=$'\U1F9B9\U200D\U2640'
+emoji[woman_supervillain_light_skin_tone]=$'\U1F9B9\U1F3FB\U200D\U2640\UFE0F'
+emoji[woman_supervillain_light_skin_tone_minimally]=$'\U1F9B9\U1F3FB\U200D\U2640'
+emoji[woman_supervillain_medium_light_skin_tone]=$'\U1F9B9\U1F3FC\U200D\U2640\UFE0F'
+emoji[woman_supervillain_medium_light_skin_tone_minimally]=$'\U1F9B9\U1F3FC\U200D\U2640'
+emoji[woman_supervillain_medium_skin_tone]=$'\U1F9B9\U1F3FD\U200D\U2640\UFE0F'
+emoji[woman_supervillain_medium_skin_tone_minimally]=$'\U1F9B9\U1F3FD\U200D\U2640'
+emoji[woman_supervillain_medium_dark_skin_tone]=$'\U1F9B9\U1F3FE\U200D\U2640\UFE0F'
+emoji[woman_supervillain_medium_dark_skin_tone_minimally]=$'\U1F9B9\U1F3FE\U200D\U2640'
+emoji[woman_supervillain_dark_skin_tone]=$'\U1F9B9\U1F3FF\U200D\U2640\UFE0F'
+emoji[woman_supervillain_dark_skin_tone_minimally]=$'\U1F9B9\U1F3FF\U200D\U2640'
+emoji[mage]=$'\U1F9D9'
+emoji[mage_light_skin_tone]=$'\U1F9D9\U1F3FB'
+emoji[mage_medium_light_skin_tone]=$'\U1F9D9\U1F3FC'
+emoji[mage_medium_skin_tone]=$'\U1F9D9\U1F3FD'
+emoji[mage_medium_dark_skin_tone]=$'\U1F9D9\U1F3FE'
+emoji[mage_dark_skin_tone]=$'\U1F9D9\U1F3FF'
+emoji[man_mage]=$'\U1F9D9\U200D\U2642\UFE0F'
+emoji[man_mage_minimally]=$'\U1F9D9\U200D\U2642'
+emoji[mage_man]=$'\U1F9D9\U200D\U2642'
+emoji[man_mage_light_skin_tone]=$'\U1F9D9\U1F3FB\U200D\U2642\UFE0F'
+emoji[man_mage_light_skin_tone_minimally]=$'\U1F9D9\U1F3FB\U200D\U2642'
+emoji[man_mage_medium_light_skin_tone]=$'\U1F9D9\U1F3FC\U200D\U2642\UFE0F'
+emoji[man_mage_medium_light_skin_tone_minimally]=$'\U1F9D9\U1F3FC\U200D\U2642'
+emoji[man_mage_medium_skin_tone]=$'\U1F9D9\U1F3FD\U200D\U2642\UFE0F'
+emoji[man_mage_medium_skin_tone_minimally]=$'\U1F9D9\U1F3FD\U200D\U2642'
+emoji[man_mage_medium_dark_skin_tone]=$'\U1F9D9\U1F3FE\U200D\U2642\UFE0F'
+emoji[man_mage_medium_dark_skin_tone_minimally]=$'\U1F9D9\U1F3FE\U200D\U2642'
+emoji[man_mage_dark_skin_tone]=$'\U1F9D9\U1F3FF\U200D\U2642\UFE0F'
+emoji[man_mage_dark_skin_tone_minimally]=$'\U1F9D9\U1F3FF\U200D\U2642'
+emoji[woman_mage]=$'\U1F9D9\U200D\U2640\UFE0F'
+emoji[woman_mage_minimally]=$'\U1F9D9\U200D\U2640'
+emoji[mage_woman]=$'\U1F9D9\U200D\U2640'
+emoji[woman_mage_light_skin_tone]=$'\U1F9D9\U1F3FB\U200D\U2640\UFE0F'
+emoji[woman_mage_light_skin_tone_minimally]=$'\U1F9D9\U1F3FB\U200D\U2640'
+emoji[woman_mage_medium_light_skin_tone]=$'\U1F9D9\U1F3FC\U200D\U2640\UFE0F'
+emoji[woman_mage_medium_light_skin_tone_minimally]=$'\U1F9D9\U1F3FC\U200D\U2640'
+emoji[woman_mage_medium_skin_tone]=$'\U1F9D9\U1F3FD\U200D\U2640\UFE0F'
+emoji[woman_mage_medium_skin_tone_minimally]=$'\U1F9D9\U1F3FD\U200D\U2640'
+emoji[woman_mage_medium_dark_skin_tone]=$'\U1F9D9\U1F3FE\U200D\U2640\UFE0F'
+emoji[woman_mage_medium_dark_skin_tone_minimally]=$'\U1F9D9\U1F3FE\U200D\U2640'
+emoji[woman_mage_dark_skin_tone]=$'\U1F9D9\U1F3FF\U200D\U2640\UFE0F'
+emoji[woman_mage_dark_skin_tone_minimally]=$'\U1F9D9\U1F3FF\U200D\U2640'
+emoji[fairy]=$'\U1F9DA'
+emoji[fairy_light_skin_tone]=$'\U1F9DA\U1F3FB'
+emoji[fairy_medium_light_skin_tone]=$'\U1F9DA\U1F3FC'
+emoji[fairy_medium_skin_tone]=$'\U1F9DA\U1F3FD'
+emoji[fairy_medium_dark_skin_tone]=$'\U1F9DA\U1F3FE'
+emoji[fairy_dark_skin_tone]=$'\U1F9DA\U1F3FF'
+emoji[man_fairy]=$'\U1F9DA\U200D\U2642\UFE0F'
+emoji[man_fairy_minimally]=$'\U1F9DA\U200D\U2642'
+emoji[fairy_man]=$'\U1F9DA\U200D\U2642'
+emoji[man_fairy_light_skin_tone]=$'\U1F9DA\U1F3FB\U200D\U2642\UFE0F'
+emoji[man_fairy_light_skin_tone_minimally]=$'\U1F9DA\U1F3FB\U200D\U2642'
+emoji[man_fairy_medium_light_skin_tone]=$'\U1F9DA\U1F3FC\U200D\U2642\UFE0F'
+emoji[man_fairy_medium_light_skin_tone_minimally]=$'\U1F9DA\U1F3FC\U200D\U2642'
+emoji[man_fairy_medium_skin_tone]=$'\U1F9DA\U1F3FD\U200D\U2642\UFE0F'
+emoji[man_fairy_medium_skin_tone_minimally]=$'\U1F9DA\U1F3FD\U200D\U2642'
+emoji[man_fairy_medium_dark_skin_tone]=$'\U1F9DA\U1F3FE\U200D\U2642\UFE0F'
+emoji[man_fairy_medium_dark_skin_tone_minimally]=$'\U1F9DA\U1F3FE\U200D\U2642'
+emoji[man_fairy_dark_skin_tone]=$'\U1F9DA\U1F3FF\U200D\U2642\UFE0F'
+emoji[man_fairy_dark_skin_tone_minimally]=$'\U1F9DA\U1F3FF\U200D\U2642'
+emoji[woman_fairy]=$'\U1F9DA\U200D\U2640\UFE0F'
+emoji[woman_fairy_minimally]=$'\U1F9DA\U200D\U2640'
+emoji[fairy_woman]=$'\U1F9DA\U200D\U2640'
+emoji[woman_fairy_light_skin_tone]=$'\U1F9DA\U1F3FB\U200D\U2640\UFE0F'
+emoji[woman_fairy_light_skin_tone_minimally]=$'\U1F9DA\U1F3FB\U200D\U2640'
+emoji[woman_fairy_medium_light_skin_tone]=$'\U1F9DA\U1F3FC\U200D\U2640\UFE0F'
+emoji[woman_fairy_medium_light_skin_tone_minimally]=$'\U1F9DA\U1F3FC\U200D\U2640'
+emoji[woman_fairy_medium_skin_tone]=$'\U1F9DA\U1F3FD\U200D\U2640\UFE0F'
+emoji[woman_fairy_medium_skin_tone_minimally]=$'\U1F9DA\U1F3FD\U200D\U2640'
+emoji[woman_fairy_medium_dark_skin_tone]=$'\U1F9DA\U1F3FE\U200D\U2640\UFE0F'
+emoji[woman_fairy_medium_dark_skin_tone_minimally]=$'\U1F9DA\U1F3FE\U200D\U2640'
+emoji[woman_fairy_dark_skin_tone]=$'\U1F9DA\U1F3FF\U200D\U2640\UFE0F'
+emoji[woman_fairy_dark_skin_tone_minimally]=$'\U1F9DA\U1F3FF\U200D\U2640'
+emoji[vampire]=$'\U1F9DB'
+emoji[vampire_light_skin_tone]=$'\U1F9DB\U1F3FB'
+emoji[vampire_medium_light_skin_tone]=$'\U1F9DB\U1F3FC'
+emoji[vampire_medium_skin_tone]=$'\U1F9DB\U1F3FD'
+emoji[vampire_medium_dark_skin_tone]=$'\U1F9DB\U1F3FE'
+emoji[vampire_dark_skin_tone]=$'\U1F9DB\U1F3FF'
+emoji[man_vampire]=$'\U1F9DB\U200D\U2642\UFE0F'
+emoji[man_vampire_minimally]=$'\U1F9DB\U200D\U2642'
+emoji[vampire_man]=$'\U1F9DB\U200D\U2642'
+emoji[man_vampire_light_skin_tone]=$'\U1F9DB\U1F3FB\U200D\U2642\UFE0F'
+emoji[man_vampire_light_skin_tone_minimally]=$'\U1F9DB\U1F3FB\U200D\U2642'
+emoji[man_vampire_medium_light_skin_tone]=$'\U1F9DB\U1F3FC\U200D\U2642\UFE0F'
+emoji[man_vampire_medium_light_skin_tone_minimally]=$'\U1F9DB\U1F3FC\U200D\U2642'
+emoji[man_vampire_medium_skin_tone]=$'\U1F9DB\U1F3FD\U200D\U2642\UFE0F'
+emoji[man_vampire_medium_skin_tone_minimally]=$'\U1F9DB\U1F3FD\U200D\U2642'
+emoji[man_vampire_medium_dark_skin_tone]=$'\U1F9DB\U1F3FE\U200D\U2642\UFE0F'
+emoji[man_vampire_medium_dark_skin_tone_minimally]=$'\U1F9DB\U1F3FE\U200D\U2642'
+emoji[man_vampire_dark_skin_tone]=$'\U1F9DB\U1F3FF\U200D\U2642\UFE0F'
+emoji[man_vampire_dark_skin_tone_minimally]=$'\U1F9DB\U1F3FF\U200D\U2642'
+emoji[woman_vampire]=$'\U1F9DB\U200D\U2640\UFE0F'
+emoji[woman_vampire_minimally]=$'\U1F9DB\U200D\U2640'
+emoji[vampire_woman]=$'\U1F9DB\U200D\U2640'
+emoji[woman_vampire_light_skin_tone]=$'\U1F9DB\U1F3FB\U200D\U2640\UFE0F'
+emoji[woman_vampire_light_skin_tone_minimally]=$'\U1F9DB\U1F3FB\U200D\U2640'
+emoji[woman_vampire_medium_light_skin_tone]=$'\U1F9DB\U1F3FC\U200D\U2640\UFE0F'
+emoji[woman_vampire_medium_light_skin_tone_minimally]=$'\U1F9DB\U1F3FC\U200D\U2640'
+emoji[woman_vampire_medium_skin_tone]=$'\U1F9DB\U1F3FD\U200D\U2640\UFE0F'
+emoji[woman_vampire_medium_skin_tone_minimally]=$'\U1F9DB\U1F3FD\U200D\U2640'
+emoji[woman_vampire_medium_dark_skin_tone]=$'\U1F9DB\U1F3FE\U200D\U2640\UFE0F'
+emoji[woman_vampire_medium_dark_skin_tone_minimally]=$'\U1F9DB\U1F3FE\U200D\U2640'
+emoji[woman_vampire_dark_skin_tone]=$'\U1F9DB\U1F3FF\U200D\U2640\UFE0F'
+emoji[woman_vampire_dark_skin_tone_minimally]=$'\U1F9DB\U1F3FF\U200D\U2640'
+emoji[merperson]=$'\U1F9DC'
+emoji[merperson_light_skin_tone]=$'\U1F9DC\U1F3FB'
+emoji[merperson_medium_light_skin_tone]=$'\U1F9DC\U1F3FC'
+emoji[merperson_medium_skin_tone]=$'\U1F9DC\U1F3FD'
+emoji[merperson_medium_dark_skin_tone]=$'\U1F9DC\U1F3FE'
+emoji[merperson_dark_skin_tone]=$'\U1F9DC\U1F3FF'
+emoji[merman]=$'\U1F9DC\U200D\U2642\UFE0F'
+emoji[merman_minimally]=$'\U1F9DC\U200D\U2642'
+emoji[merman_light_skin_tone]=$'\U1F9DC\U1F3FB\U200D\U2642\UFE0F'
+emoji[merman_light_skin_tone_minimally]=$'\U1F9DC\U1F3FB\U200D\U2642'
+emoji[merman_medium_light_skin_tone]=$'\U1F9DC\U1F3FC\U200D\U2642\UFE0F'
+emoji[merman_medium_light_skin_tone_minimally]=$'\U1F9DC\U1F3FC\U200D\U2642'
+emoji[merman_medium_skin_tone]=$'\U1F9DC\U1F3FD\U200D\U2642\UFE0F'
+emoji[merman_medium_skin_tone_minimally]=$'\U1F9DC\U1F3FD\U200D\U2642'
+emoji[merman_medium_dark_skin_tone]=$'\U1F9DC\U1F3FE\U200D\U2642\UFE0F'
+emoji[merman_medium_dark_skin_tone_minimally]=$'\U1F9DC\U1F3FE\U200D\U2642'
+emoji[merman_dark_skin_tone]=$'\U1F9DC\U1F3FF\U200D\U2642\UFE0F'
+emoji[merman_dark_skin_tone_minimally]=$'\U1F9DC\U1F3FF\U200D\U2642'
+emoji[mermaid]=$'\U1F9DC\U200D\U2640\UFE0F'
+emoji[mermaid_minimally]=$'\U1F9DC\U200D\U2640'
+emoji[mermaid_light_skin_tone]=$'\U1F9DC\U1F3FB\U200D\U2640\UFE0F'
+emoji[mermaid_light_skin_tone_minimally]=$'\U1F9DC\U1F3FB\U200D\U2640'
+emoji[mermaid_medium_light_skin_tone]=$'\U1F9DC\U1F3FC\U200D\U2640\UFE0F'
+emoji[mermaid_medium_light_skin_tone_minimally]=$'\U1F9DC\U1F3FC\U200D\U2640'
+emoji[mermaid_medium_skin_tone]=$'\U1F9DC\U1F3FD\U200D\U2640\UFE0F'
+emoji[mermaid_medium_skin_tone_minimally]=$'\U1F9DC\U1F3FD\U200D\U2640'
+emoji[mermaid_medium_dark_skin_tone]=$'\U1F9DC\U1F3FE\U200D\U2640\UFE0F'
+emoji[mermaid_medium_dark_skin_tone_minimally]=$'\U1F9DC\U1F3FE\U200D\U2640'
+emoji[mermaid_dark_skin_tone]=$'\U1F9DC\U1F3FF\U200D\U2640\UFE0F'
+emoji[mermaid_dark_skin_tone_minimally]=$'\U1F9DC\U1F3FF\U200D\U2640'
+emoji[elf]=$'\U1F9DD'
+emoji[elf_light_skin_tone]=$'\U1F9DD\U1F3FB'
+emoji[elf_medium_light_skin_tone]=$'\U1F9DD\U1F3FC'
+emoji[elf_medium_skin_tone]=$'\U1F9DD\U1F3FD'
+emoji[elf_medium_dark_skin_tone]=$'\U1F9DD\U1F3FE'
+emoji[elf_dark_skin_tone]=$'\U1F9DD\U1F3FF'
+emoji[man_elf]=$'\U1F9DD\U200D\U2642\UFE0F'
+emoji[man_elf_minimally]=$'\U1F9DD\U200D\U2642'
+emoji[elf_man]=$'\U1F9DD\U200D\U2642'
+emoji[man_elf_light_skin_tone]=$'\U1F9DD\U1F3FB\U200D\U2642\UFE0F'
+emoji[man_elf_light_skin_tone_minimally]=$'\U1F9DD\U1F3FB\U200D\U2642'
+emoji[man_elf_medium_light_skin_tone]=$'\U1F9DD\U1F3FC\U200D\U2642\UFE0F'
+emoji[man_elf_medium_light_skin_tone_minimally]=$'\U1F9DD\U1F3FC\U200D\U2642'
+emoji[man_elf_medium_skin_tone]=$'\U1F9DD\U1F3FD\U200D\U2642\UFE0F'
+emoji[man_elf_medium_skin_tone_minimally]=$'\U1F9DD\U1F3FD\U200D\U2642'
+emoji[man_elf_medium_dark_skin_tone]=$'\U1F9DD\U1F3FE\U200D\U2642\UFE0F'
+emoji[man_elf_medium_dark_skin_tone_minimally]=$'\U1F9DD\U1F3FE\U200D\U2642'
+emoji[man_elf_dark_skin_tone]=$'\U1F9DD\U1F3FF\U200D\U2642\UFE0F'
+emoji[man_elf_dark_skin_tone_minimally]=$'\U1F9DD\U1F3FF\U200D\U2642'
+emoji[woman_elf]=$'\U1F9DD\U200D\U2640\UFE0F'
+emoji[woman_elf_minimally]=$'\U1F9DD\U200D\U2640'
+emoji[elf_woman]=$'\U1F9DD\U200D\U2640'
+emoji[woman_elf_light_skin_tone]=$'\U1F9DD\U1F3FB\U200D\U2640\UFE0F'
+emoji[woman_elf_light_skin_tone_minimally]=$'\U1F9DD\U1F3FB\U200D\U2640'
+emoji[woman_elf_medium_light_skin_tone]=$'\U1F9DD\U1F3FC\U200D\U2640\UFE0F'
+emoji[woman_elf_medium_light_skin_tone_minimally]=$'\U1F9DD\U1F3FC\U200D\U2640'
+emoji[woman_elf_medium_skin_tone]=$'\U1F9DD\U1F3FD\U200D\U2640\UFE0F'
+emoji[woman_elf_medium_skin_tone_minimally]=$'\U1F9DD\U1F3FD\U200D\U2640'
+emoji[woman_elf_medium_dark_skin_tone]=$'\U1F9DD\U1F3FE\U200D\U2640\UFE0F'
+emoji[woman_elf_medium_dark_skin_tone_minimally]=$'\U1F9DD\U1F3FE\U200D\U2640'
+emoji[woman_elf_dark_skin_tone]=$'\U1F9DD\U1F3FF\U200D\U2640\UFE0F'
+emoji[woman_elf_dark_skin_tone_minimally]=$'\U1F9DD\U1F3FF\U200D\U2640'
+emoji[genie]=$'\U1F9DE'
+emoji[man_genie]=$'\U1F9DE\U200D\U2642\UFE0F'
+emoji[man_genie_minimally]=$'\U1F9DE\U200D\U2642'
+emoji[genie_man]=$'\U1F9DE\U200D\U2642'
+emoji[woman_genie]=$'\U1F9DE\U200D\U2640\UFE0F'
+emoji[woman_genie_minimally]=$'\U1F9DE\U200D\U2640'
+emoji[genie_woman]=$'\U1F9DE\U200D\U2640'
+emoji[zombie]=$'\U1F9DF'
+emoji[man_zombie]=$'\U1F9DF\U200D\U2642\UFE0F'
+emoji[man_zombie_minimally]=$'\U1F9DF\U200D\U2642'
+emoji[zombie_man]=$'\U1F9DF\U200D\U2642'
+emoji[woman_zombie]=$'\U1F9DF\U200D\U2640\UFE0F'
+emoji[woman_zombie_minimally]=$'\U1F9DF\U200D\U2640'
+emoji[zombie_woman]=$'\U1F9DF\U200D\U2640'
+emoji[person_getting_massage]=$'\U1F486'
+emoji[massage]=$'\U1F486'
+emoji[person_getting_massage_light_skin_tone]=$'\U1F486\U1F3FB'
+emoji[person_getting_massage_medium_light_skin_tone]=$'\U1F486\U1F3FC'
+emoji[person_getting_massage_medium_skin_tone]=$'\U1F486\U1F3FD'
+emoji[person_getting_massage_medium_dark_skin_tone]=$'\U1F486\U1F3FE'
+emoji[person_getting_massage_dark_skin_tone]=$'\U1F486\U1F3FF'
+emoji[man_getting_massage]=$'\U1F486\U200D\U2642\UFE0F'
+emoji[man_getting_massage_minimally]=$'\U1F486\U200D\U2642'
+emoji[massage_man]=$'\U1F486\U200D\U2642'
+emoji[man_getting_massage_light_skin_tone]=$'\U1F486\U1F3FB\U200D\U2642\UFE0F'
+emoji[man_getting_massage_light_skin_tone_minimally]=$'\U1F486\U1F3FB\U200D\U2642'
+emoji[man_getting_massage_medium_light_skin_tone]=$'\U1F486\U1F3FC\U200D\U2642\UFE0F'
+emoji[man_getting_massage_medium_light_skin_tone_minimally]=$'\U1F486\U1F3FC\U200D\U2642'
+emoji[man_getting_massage_medium_skin_tone]=$'\U1F486\U1F3FD\U200D\U2642\UFE0F'
+emoji[man_getting_massage_medium_skin_tone_minimally]=$'\U1F486\U1F3FD\U200D\U2642'
+emoji[man_getting_massage_medium_dark_skin_tone]=$'\U1F486\U1F3FE\U200D\U2642\UFE0F'
+emoji[man_getting_massage_medium_dark_skin_tone_minimally]=$'\U1F486\U1F3FE\U200D\U2642'
+emoji[man_getting_massage_dark_skin_tone]=$'\U1F486\U1F3FF\U200D\U2642\UFE0F'
+emoji[man_getting_massage_dark_skin_tone_minimally]=$'\U1F486\U1F3FF\U200D\U2642'
+emoji[woman_getting_massage]=$'\U1F486\U200D\U2640\UFE0F'
+emoji[woman_getting_massage_minimally]=$'\U1F486\U200D\U2640'
+emoji[massage_woman]=$'\U1F486\U200D\U2640'
+emoji[woman_getting_massage_light_skin_tone]=$'\U1F486\U1F3FB\U200D\U2640\UFE0F'
+emoji[woman_getting_massage_light_skin_tone_minimally]=$'\U1F486\U1F3FB\U200D\U2640'
+emoji[woman_getting_massage_medium_light_skin_tone]=$'\U1F486\U1F3FC\U200D\U2640\UFE0F'
+emoji[woman_getting_massage_medium_light_skin_tone_minimally]=$'\U1F486\U1F3FC\U200D\U2640'
+emoji[woman_getting_massage_medium_skin_tone]=$'\U1F486\U1F3FD\U200D\U2640\UFE0F'
+emoji[woman_getting_massage_medium_skin_tone_minimally]=$'\U1F486\U1F3FD\U200D\U2640'
+emoji[woman_getting_massage_medium_dark_skin_tone]=$'\U1F486\U1F3FE\U200D\U2640\UFE0F'
+emoji[woman_getting_massage_medium_dark_skin_tone_minimally]=$'\U1F486\U1F3FE\U200D\U2640'
+emoji[woman_getting_massage_dark_skin_tone]=$'\U1F486\U1F3FF\U200D\U2640\UFE0F'
+emoji[woman_getting_massage_dark_skin_tone_minimally]=$'\U1F486\U1F3FF\U200D\U2640'
+emoji[person_getting_haircut]=$'\U1F487'
+emoji[haircut]=$'\U1F487'
+emoji[person_getting_haircut_light_skin_tone]=$'\U1F487\U1F3FB'
+emoji[person_getting_haircut_medium_light_skin_tone]=$'\U1F487\U1F3FC'
+emoji[person_getting_haircut_medium_skin_tone]=$'\U1F487\U1F3FD'
+emoji[person_getting_haircut_medium_dark_skin_tone]=$'\U1F487\U1F3FE'
+emoji[person_getting_haircut_dark_skin_tone]=$'\U1F487\U1F3FF'
+emoji[man_getting_haircut]=$'\U1F487\U200D\U2642\UFE0F'
+emoji[man_getting_haircut_minimally]=$'\U1F487\U200D\U2642'
+emoji[haircut_man]=$'\U1F487\U200D\U2642'
+emoji[man_getting_haircut_light_skin_tone]=$'\U1F487\U1F3FB\U200D\U2642\UFE0F'
+emoji[man_getting_haircut_light_skin_tone_minimally]=$'\U1F487\U1F3FB\U200D\U2642'
+emoji[man_getting_haircut_medium_light_skin_tone]=$'\U1F487\U1F3FC\U200D\U2642\UFE0F'
+emoji[man_getting_haircut_medium_light_skin_tone_minimally]=$'\U1F487\U1F3FC\U200D\U2642'
+emoji[man_getting_haircut_medium_skin_tone]=$'\U1F487\U1F3FD\U200D\U2642\UFE0F'
+emoji[man_getting_haircut_medium_skin_tone_minimally]=$'\U1F487\U1F3FD\U200D\U2642'
+emoji[man_getting_haircut_medium_dark_skin_tone]=$'\U1F487\U1F3FE\U200D\U2642\UFE0F'
+emoji[man_getting_haircut_medium_dark_skin_tone_minimally]=$'\U1F487\U1F3FE\U200D\U2642'
+emoji[man_getting_haircut_dark_skin_tone]=$'\U1F487\U1F3FF\U200D\U2642\UFE0F'
+emoji[man_getting_haircut_dark_skin_tone_minimally]=$'\U1F487\U1F3FF\U200D\U2642'
+emoji[woman_getting_haircut]=$'\U1F487\U200D\U2640\UFE0F'
+emoji[woman_getting_haircut_minimally]=$'\U1F487\U200D\U2640'
+emoji[haircut_woman]=$'\U1F487\U200D\U2640'
+emoji[woman_getting_haircut_light_skin_tone]=$'\U1F487\U1F3FB\U200D\U2640\UFE0F'
+emoji[woman_getting_haircut_light_skin_tone_minimally]=$'\U1F487\U1F3FB\U200D\U2640'
+emoji[woman_getting_haircut_medium_light_skin_tone]=$'\U1F487\U1F3FC\U200D\U2640\UFE0F'
+emoji[woman_getting_haircut_medium_light_skin_tone_minimally]=$'\U1F487\U1F3FC\U200D\U2640'
+emoji[woman_getting_haircut_medium_skin_tone]=$'\U1F487\U1F3FD\U200D\U2640\UFE0F'
+emoji[woman_getting_haircut_medium_skin_tone_minimally]=$'\U1F487\U1F3FD\U200D\U2640'
+emoji[woman_getting_haircut_medium_dark_skin_tone]=$'\U1F487\U1F3FE\U200D\U2640\UFE0F'
+emoji[woman_getting_haircut_medium_dark_skin_tone_minimally]=$'\U1F487\U1F3FE\U200D\U2640'
+emoji[woman_getting_haircut_dark_skin_tone]=$'\U1F487\U1F3FF\U200D\U2640\UFE0F'
+emoji[woman_getting_haircut_dark_skin_tone_minimally]=$'\U1F487\U1F3FF\U200D\U2640'
+emoji[person_walking]=$'\U1F6B6'
+emoji[walking]=$'\U1F6B6'
+emoji[person_walking_light_skin_tone]=$'\U1F6B6\U1F3FB'
+emoji[person_walking_medium_light_skin_tone]=$'\U1F6B6\U1F3FC'
+emoji[person_walking_medium_skin_tone]=$'\U1F6B6\U1F3FD'
+emoji[person_walking_medium_dark_skin_tone]=$'\U1F6B6\U1F3FE'
+emoji[person_walking_dark_skin_tone]=$'\U1F6B6\U1F3FF'
+emoji[man_walking]=$'\U1F6B6\U200D\U2642\UFE0F'
+emoji[man_walking_minimally]=$'\U1F6B6\U200D\U2642'
+emoji[walking_man]=$'\U1F6B6\U200D\U2642'
+emoji[man_walking_light_skin_tone]=$'\U1F6B6\U1F3FB\U200D\U2642\UFE0F'
+emoji[man_walking_light_skin_tone_minimally]=$'\U1F6B6\U1F3FB\U200D\U2642'
+emoji[man_walking_medium_light_skin_tone]=$'\U1F6B6\U1F3FC\U200D\U2642\UFE0F'
+emoji[man_walking_medium_light_skin_tone_minimally]=$'\U1F6B6\U1F3FC\U200D\U2642'
+emoji[man_walking_medium_skin_tone]=$'\U1F6B6\U1F3FD\U200D\U2642\UFE0F'
+emoji[man_walking_medium_skin_tone_minimally]=$'\U1F6B6\U1F3FD\U200D\U2642'
+emoji[man_walking_medium_dark_skin_tone]=$'\U1F6B6\U1F3FE\U200D\U2642\UFE0F'
+emoji[man_walking_medium_dark_skin_tone_minimally]=$'\U1F6B6\U1F3FE\U200D\U2642'
+emoji[man_walking_dark_skin_tone]=$'\U1F6B6\U1F3FF\U200D\U2642\UFE0F'
+emoji[man_walking_dark_skin_tone_minimally]=$'\U1F6B6\U1F3FF\U200D\U2642'
+emoji[woman_walking]=$'\U1F6B6\U200D\U2640\UFE0F'
+emoji[woman_walking_minimally]=$'\U1F6B6\U200D\U2640'
+emoji[walking_woman]=$'\U1F6B6\U200D\U2640'
+emoji[woman_walking_light_skin_tone]=$'\U1F6B6\U1F3FB\U200D\U2640\UFE0F'
+emoji[woman_walking_light_skin_tone_minimally]=$'\U1F6B6\U1F3FB\U200D\U2640'
+emoji[woman_walking_medium_light_skin_tone]=$'\U1F6B6\U1F3FC\U200D\U2640\UFE0F'
+emoji[woman_walking_medium_light_skin_tone_minimally]=$'\U1F6B6\U1F3FC\U200D\U2640'
+emoji[woman_walking_medium_skin_tone]=$'\U1F6B6\U1F3FD\U200D\U2640\UFE0F'
+emoji[woman_walking_medium_skin_tone_minimally]=$'\U1F6B6\U1F3FD\U200D\U2640'
+emoji[woman_walking_medium_dark_skin_tone]=$'\U1F6B6\U1F3FE\U200D\U2640\UFE0F'
+emoji[woman_walking_medium_dark_skin_tone_minimally]=$'\U1F6B6\U1F3FE\U200D\U2640'
+emoji[woman_walking_dark_skin_tone]=$'\U1F6B6\U1F3FF\U200D\U2640\UFE0F'
+emoji[woman_walking_dark_skin_tone_minimally]=$'\U1F6B6\U1F3FF\U200D\U2640'
+emoji[person_standing]=$'\U1F9CD'
+emoji[standing_person]=$'\U1F9CD'
+emoji[person_standing_light_skin_tone]=$'\U1F9CD\U1F3FB'
+emoji[person_standing_medium_light_skin_tone]=$'\U1F9CD\U1F3FC'
+emoji[person_standing_medium_skin_tone]=$'\U1F9CD\U1F3FD'
+emoji[person_standing_medium_dark_skin_tone]=$'\U1F9CD\U1F3FE'
+emoji[person_standing_dark_skin_tone]=$'\U1F9CD\U1F3FF'
+emoji[man_standing]=$'\U1F9CD\U200D\U2642\UFE0F'
+emoji[man_standing_minimally]=$'\U1F9CD\U200D\U2642'
+emoji[standing_man]=$'\U1F9CD\U200D\U2642'
+emoji[man_standing_light_skin_tone]=$'\U1F9CD\U1F3FB\U200D\U2642\UFE0F'
+emoji[man_standing_light_skin_tone_minimally]=$'\U1F9CD\U1F3FB\U200D\U2642'
+emoji[man_standing_medium_light_skin_tone]=$'\U1F9CD\U1F3FC\U200D\U2642\UFE0F'
+emoji[man_standing_medium_light_skin_tone_minimally]=$'\U1F9CD\U1F3FC\U200D\U2642'
+emoji[man_standing_medium_skin_tone]=$'\U1F9CD\U1F3FD\U200D\U2642\UFE0F'
+emoji[man_standing_medium_skin_tone_minimally]=$'\U1F9CD\U1F3FD\U200D\U2642'
+emoji[man_standing_medium_dark_skin_tone]=$'\U1F9CD\U1F3FE\U200D\U2642\UFE0F'
+emoji[man_standing_medium_dark_skin_tone_minimally]=$'\U1F9CD\U1F3FE\U200D\U2642'
+emoji[man_standing_dark_skin_tone]=$'\U1F9CD\U1F3FF\U200D\U2642\UFE0F'
+emoji[man_standing_dark_skin_tone_minimally]=$'\U1F9CD\U1F3FF\U200D\U2642'
+emoji[woman_standing]=$'\U1F9CD\U200D\U2640\UFE0F'
+emoji[woman_standing_minimally]=$'\U1F9CD\U200D\U2640'
+emoji[standing_woman]=$'\U1F9CD\U200D\U2640'
+emoji[woman_standing_light_skin_tone]=$'\U1F9CD\U1F3FB\U200D\U2640\UFE0F'
+emoji[woman_standing_light_skin_tone_minimally]=$'\U1F9CD\U1F3FB\U200D\U2640'
+emoji[woman_standing_medium_light_skin_tone]=$'\U1F9CD\U1F3FC\U200D\U2640\UFE0F'
+emoji[woman_standing_medium_light_skin_tone_minimally]=$'\U1F9CD\U1F3FC\U200D\U2640'
+emoji[woman_standing_medium_skin_tone]=$'\U1F9CD\U1F3FD\U200D\U2640\UFE0F'
+emoji[woman_standing_medium_skin_tone_minimally]=$'\U1F9CD\U1F3FD\U200D\U2640'
+emoji[woman_standing_medium_dark_skin_tone]=$'\U1F9CD\U1F3FE\U200D\U2640\UFE0F'
+emoji[woman_standing_medium_dark_skin_tone_minimally]=$'\U1F9CD\U1F3FE\U200D\U2640'
+emoji[woman_standing_dark_skin_tone]=$'\U1F9CD\U1F3FF\U200D\U2640\UFE0F'
+emoji[woman_standing_dark_skin_tone_minimally]=$'\U1F9CD\U1F3FF\U200D\U2640'
+emoji[person_kneeling]=$'\U1F9CE'
+emoji[kneeling_person]=$'\U1F9CE'
+emoji[person_kneeling_light_skin_tone]=$'\U1F9CE\U1F3FB'
+emoji[person_kneeling_medium_light_skin_tone]=$'\U1F9CE\U1F3FC'
+emoji[person_kneeling_medium_skin_tone]=$'\U1F9CE\U1F3FD'
+emoji[person_kneeling_medium_dark_skin_tone]=$'\U1F9CE\U1F3FE'
+emoji[person_kneeling_dark_skin_tone]=$'\U1F9CE\U1F3FF'
+emoji[man_kneeling]=$'\U1F9CE\U200D\U2642\UFE0F'
+emoji[man_kneeling_minimally]=$'\U1F9CE\U200D\U2642'
+emoji[kneeling_man]=$'\U1F9CE\U200D\U2642'
+emoji[man_kneeling_light_skin_tone]=$'\U1F9CE\U1F3FB\U200D\U2642\UFE0F'
+emoji[man_kneeling_light_skin_tone_minimally]=$'\U1F9CE\U1F3FB\U200D\U2642'
+emoji[man_kneeling_medium_light_skin_tone]=$'\U1F9CE\U1F3FC\U200D\U2642\UFE0F'
+emoji[man_kneeling_medium_light_skin_tone_minimally]=$'\U1F9CE\U1F3FC\U200D\U2642'
+emoji[man_kneeling_medium_skin_tone]=$'\U1F9CE\U1F3FD\U200D\U2642\UFE0F'
+emoji[man_kneeling_medium_skin_tone_minimally]=$'\U1F9CE\U1F3FD\U200D\U2642'
+emoji[man_kneeling_medium_dark_skin_tone]=$'\U1F9CE\U1F3FE\U200D\U2642\UFE0F'
+emoji[man_kneeling_medium_dark_skin_tone_minimally]=$'\U1F9CE\U1F3FE\U200D\U2642'
+emoji[man_kneeling_dark_skin_tone]=$'\U1F9CE\U1F3FF\U200D\U2642\UFE0F'
+emoji[man_kneeling_dark_skin_tone_minimally]=$'\U1F9CE\U1F3FF\U200D\U2642'
+emoji[woman_kneeling]=$'\U1F9CE\U200D\U2640\UFE0F'
+emoji[woman_kneeling_minimally]=$'\U1F9CE\U200D\U2640'
+emoji[kneeling_woman]=$'\U1F9CE\U200D\U2640'
+emoji[woman_kneeling_light_skin_tone]=$'\U1F9CE\U1F3FB\U200D\U2640\UFE0F'
+emoji[woman_kneeling_light_skin_tone_minimally]=$'\U1F9CE\U1F3FB\U200D\U2640'
+emoji[woman_kneeling_medium_light_skin_tone]=$'\U1F9CE\U1F3FC\U200D\U2640\UFE0F'
+emoji[woman_kneeling_medium_light_skin_tone_minimally]=$'\U1F9CE\U1F3FC\U200D\U2640'
+emoji[woman_kneeling_medium_skin_tone]=$'\U1F9CE\U1F3FD\U200D\U2640\UFE0F'
+emoji[woman_kneeling_medium_skin_tone_minimally]=$'\U1F9CE\U1F3FD\U200D\U2640'
+emoji[woman_kneeling_medium_dark_skin_tone]=$'\U1F9CE\U1F3FE\U200D\U2640\UFE0F'
+emoji[woman_kneeling_medium_dark_skin_tone_minimally]=$'\U1F9CE\U1F3FE\U200D\U2640'
+emoji[woman_kneeling_dark_skin_tone]=$'\U1F9CE\U1F3FF\U200D\U2640\UFE0F'
+emoji[woman_kneeling_dark_skin_tone_minimally]=$'\U1F9CE\U1F3FF\U200D\U2640'
+emoji[man_with_probing_cane]=$'\U1F468\U200D\U1F9AF'
+emoji[man_with_probing_cane_light_skin_tone]=$'\U1F468\U1F3FB\U200D\U1F9AF'
+emoji[man_with_probing_cane_medium_light_skin_tone]=$'\U1F468\U1F3FC\U200D\U1F9AF'
+emoji[man_with_probing_cane_medium_skin_tone]=$'\U1F468\U1F3FD\U200D\U1F9AF'
+emoji[man_with_probing_cane_medium_dark_skin_tone]=$'\U1F468\U1F3FE\U200D\U1F9AF'
+emoji[man_with_probing_cane_dark_skin_tone]=$'\U1F468\U1F3FF\U200D\U1F9AF'
+emoji[woman_with_probing_cane]=$'\U1F469\U200D\U1F9AF'
+emoji[woman_with_probing_cane_light_skin_tone]=$'\U1F469\U1F3FB\U200D\U1F9AF'
+emoji[woman_with_probing_cane_medium_light_skin_tone]=$'\U1F469\U1F3FC\U200D\U1F9AF'
+emoji[woman_with_probing_cane_medium_skin_tone]=$'\U1F469\U1F3FD\U200D\U1F9AF'
+emoji[woman_with_probing_cane_medium_dark_skin_tone]=$'\U1F469\U1F3FE\U200D\U1F9AF'
+emoji[woman_with_probing_cane_dark_skin_tone]=$'\U1F469\U1F3FF\U200D\U1F9AF'
+emoji[man_in_motorized_wheelchair]=$'\U1F468\U200D\U1F9BC'
+emoji[man_in_motorized_wheelchair_light_skin_tone]=$'\U1F468\U1F3FB\U200D\U1F9BC'
+emoji[man_in_motorized_wheelchair_medium_light_skin_tone]=$'\U1F468\U1F3FC\U200D\U1F9BC'
+emoji[man_in_motorized_wheelchair_medium_skin_tone]=$'\U1F468\U1F3FD\U200D\U1F9BC'
+emoji[man_in_motorized_wheelchair_medium_dark_skin_tone]=$'\U1F468\U1F3FE\U200D\U1F9BC'
+emoji[man_in_motorized_wheelchair_dark_skin_tone]=$'\U1F468\U1F3FF\U200D\U1F9BC'
+emoji[woman_in_motorized_wheelchair]=$'\U1F469\U200D\U1F9BC'
+emoji[woman_in_motorized_wheelchair_light_skin_tone]=$'\U1F469\U1F3FB\U200D\U1F9BC'
+emoji[woman_in_motorized_wheelchair_medium_light_skin_tone]=$'\U1F469\U1F3FC\U200D\U1F9BC'
+emoji[woman_in_motorized_wheelchair_medium_skin_tone]=$'\U1F469\U1F3FD\U200D\U1F9BC'
+emoji[woman_in_motorized_wheelchair_medium_dark_skin_tone]=$'\U1F469\U1F3FE\U200D\U1F9BC'
+emoji[woman_in_motorized_wheelchair_dark_skin_tone]=$'\U1F469\U1F3FF\U200D\U1F9BC'
+emoji[man_in_manual_wheelchair]=$'\U1F468\U200D\U1F9BD'
+emoji[man_in_manual_wheelchair_light_skin_tone]=$'\U1F468\U1F3FB\U200D\U1F9BD'
+emoji[man_in_manual_wheelchair_medium_light_skin_tone]=$'\U1F468\U1F3FC\U200D\U1F9BD'
+emoji[man_in_manual_wheelchair_medium_skin_tone]=$'\U1F468\U1F3FD\U200D\U1F9BD'
+emoji[man_in_manual_wheelchair_medium_dark_skin_tone]=$'\U1F468\U1F3FE\U200D\U1F9BD'
+emoji[man_in_manual_wheelchair_dark_skin_tone]=$'\U1F468\U1F3FF\U200D\U1F9BD'
+emoji[woman_in_manual_wheelchair]=$'\U1F469\U200D\U1F9BD'
+emoji[woman_in_manual_wheelchair_light_skin_tone]=$'\U1F469\U1F3FB\U200D\U1F9BD'
+emoji[woman_in_manual_wheelchair_medium_light_skin_tone]=$'\U1F469\U1F3FC\U200D\U1F9BD'
+emoji[woman_in_manual_wheelchair_medium_skin_tone]=$'\U1F469\U1F3FD\U200D\U1F9BD'
+emoji[woman_in_manual_wheelchair_medium_dark_skin_tone]=$'\U1F469\U1F3FE\U200D\U1F9BD'
+emoji[woman_in_manual_wheelchair_dark_skin_tone]=$'\U1F469\U1F3FF\U200D\U1F9BD'
+emoji[person_running]=$'\U1F3C3'
+emoji[runner]=$'\U1F3C3'
+emoji[running]=$'\U1F3C3'
+emoji[person_running_light_skin_tone]=$'\U1F3C3\U1F3FB'
+emoji[person_running_medium_light_skin_tone]=$'\U1F3C3\U1F3FC'
+emoji[person_running_medium_skin_tone]=$'\U1F3C3\U1F3FD'
+emoji[person_running_medium_dark_skin_tone]=$'\U1F3C3\U1F3FE'
+emoji[person_running_dark_skin_tone]=$'\U1F3C3\U1F3FF'
+emoji[man_running]=$'\U1F3C3\U200D\U2642\UFE0F'
+emoji[man_running_minimally]=$'\U1F3C3\U200D\U2642'
+emoji[running_man]=$'\U1F3C3\U200D\U2642'
+emoji[man_running_light_skin_tone]=$'\U1F3C3\U1F3FB\U200D\U2642\UFE0F'
+emoji[man_running_light_skin_tone_minimally]=$'\U1F3C3\U1F3FB\U200D\U2642'
+emoji[man_running_medium_light_skin_tone]=$'\U1F3C3\U1F3FC\U200D\U2642\UFE0F'
+emoji[man_running_medium_light_skin_tone_minimally]=$'\U1F3C3\U1F3FC\U200D\U2642'
+emoji[man_running_medium_skin_tone]=$'\U1F3C3\U1F3FD\U200D\U2642\UFE0F'
+emoji[man_running_medium_skin_tone_minimally]=$'\U1F3C3\U1F3FD\U200D\U2642'
+emoji[man_running_medium_dark_skin_tone]=$'\U1F3C3\U1F3FE\U200D\U2642\UFE0F'
+emoji[man_running_medium_dark_skin_tone_minimally]=$'\U1F3C3\U1F3FE\U200D\U2642'
+emoji[man_running_dark_skin_tone]=$'\U1F3C3\U1F3FF\U200D\U2642\UFE0F'
+emoji[man_running_dark_skin_tone_minimally]=$'\U1F3C3\U1F3FF\U200D\U2642'
+emoji[woman_running]=$'\U1F3C3\U200D\U2640\UFE0F'
+emoji[woman_running_minimally]=$'\U1F3C3\U200D\U2640'
+emoji[running_woman]=$'\U1F3C3\U200D\U2640'
+emoji[woman_running_light_skin_tone]=$'\U1F3C3\U1F3FB\U200D\U2640\UFE0F'
+emoji[woman_running_light_skin_tone_minimally]=$'\U1F3C3\U1F3FB\U200D\U2640'
+emoji[woman_running_medium_light_skin_tone]=$'\U1F3C3\U1F3FC\U200D\U2640\UFE0F'
+emoji[woman_running_medium_light_skin_tone_minimally]=$'\U1F3C3\U1F3FC\U200D\U2640'
+emoji[woman_running_medium_skin_tone]=$'\U1F3C3\U1F3FD\U200D\U2640\UFE0F'
+emoji[woman_running_medium_skin_tone_minimally]=$'\U1F3C3\U1F3FD\U200D\U2640'
+emoji[woman_running_medium_dark_skin_tone]=$'\U1F3C3\U1F3FE\U200D\U2640\UFE0F'
+emoji[woman_running_medium_dark_skin_tone_minimally]=$'\U1F3C3\U1F3FE\U200D\U2640'
+emoji[woman_running_dark_skin_tone]=$'\U1F3C3\U1F3FF\U200D\U2640\UFE0F'
+emoji[woman_running_dark_skin_tone_minimally]=$'\U1F3C3\U1F3FF\U200D\U2640'
+emoji[woman_dancing]=$'\U1F483'
+emoji[dancer]=$'\U1F483'
+emoji[woman_dancing_light_skin_tone]=$'\U1F483\U1F3FB'
+emoji[woman_dancing_medium_light_skin_tone]=$'\U1F483\U1F3FC'
+emoji[woman_dancing_medium_skin_tone]=$'\U1F483\U1F3FD'
+emoji[woman_dancing_medium_dark_skin_tone]=$'\U1F483\U1F3FE'
+emoji[woman_dancing_dark_skin_tone]=$'\U1F483\U1F3FF'
+emoji[woman_dancing_dark_skin_tone_1]=$'\U1F57A'
+emoji[man_dancing]=$'\U1F57A'
+emoji[man_dancing_light_skin_tone]=$'\U1F57A\U1F3FB'
+emoji[man_dancing_medium_light_skin_tone]=$'\U1F57A\U1F3FC'
+emoji[man_dancing_medium_skin_tone]=$'\U1F57A\U1F3FD'
+emoji[man_dancing_medium_dark_skin_tone]=$'\U1F57A\U1F3FE'
+emoji[man_dancing_dark_skin_tone]=$'\U1F57A\U1F3FF'
+emoji[man_in_suit_levitating]=$'\U1F574\UFE0F'
+emoji[man_in_suit_levitating_unqualified]=$'\U1F574'
+emoji[business_suit_levitating]=$'\U1F574'
+emoji[man_in_suit_levitating_light_skin_tone]=$'\U1F574\U1F3FB'
+emoji[man_in_suit_levitating_medium_light_skin_tone]=$'\U1F574\U1F3FC'
+emoji[man_in_suit_levitating_medium_skin_tone]=$'\U1F574\U1F3FD'
+emoji[man_in_suit_levitating_medium_dark_skin_tone]=$'\U1F574\U1F3FE'
+emoji[man_in_suit_levitating_dark_skin_tone]=$'\U1F574\U1F3FF'
+emoji[people_with_bunny_ears]=$'\U1F46F'
+emoji[dancers]=$'\U1F46F'
+emoji[men_with_bunny_ears]=$'\U1F46F\U200D\U2642\UFE0F'
+emoji[men_with_bunny_ears_minimally]=$'\U1F46F\U200D\U2642'
+emoji[dancing_men]=$'\U1F46F\U200D\U2642'
+emoji[women_with_bunny_ears]=$'\U1F46F\U200D\U2640\UFE0F'
+emoji[women_with_bunny_ears_minimally]=$'\U1F46F\U200D\U2640'
+emoji[dancing_women]=$'\U1F46F\U200D\U2640'
+emoji[person_in_steamy_room]=$'\U1F9D6'
+emoji[sauna_person]=$'\U1F9D6'
+emoji[person_in_steamy_room_light_skin_tone]=$'\U1F9D6\U1F3FB'
+emoji[person_in_steamy_room_medium_light_skin_tone]=$'\U1F9D6\U1F3FC'
+emoji[person_in_steamy_room_medium_skin_tone]=$'\U1F9D6\U1F3FD'
+emoji[person_in_steamy_room_medium_dark_skin_tone]=$'\U1F9D6\U1F3FE'
+emoji[person_in_steamy_room_dark_skin_tone]=$'\U1F9D6\U1F3FF'
+emoji[man_in_steamy_room]=$'\U1F9D6\U200D\U2642\UFE0F'
+emoji[man_in_steamy_room_minimally]=$'\U1F9D6\U200D\U2642'
+emoji[sauna_man]=$'\U1F9D6\U200D\U2642'
+emoji[man_in_steamy_room_light_skin_tone]=$'\U1F9D6\U1F3FB\U200D\U2642\UFE0F'
+emoji[man_in_steamy_room_light_skin_tone_minimally]=$'\U1F9D6\U1F3FB\U200D\U2642'
+emoji[man_in_steamy_room_medium_light_skin_tone]=$'\U1F9D6\U1F3FC\U200D\U2642\UFE0F'
+emoji[man_in_steamy_room_medium_light_skin_tone_minimally]=$'\U1F9D6\U1F3FC\U200D\U2642'
+emoji[man_in_steamy_room_medium_skin_tone]=$'\U1F9D6\U1F3FD\U200D\U2642\UFE0F'
+emoji[man_in_steamy_room_medium_skin_tone_minimally]=$'\U1F9D6\U1F3FD\U200D\U2642'
+emoji[man_in_steamy_room_medium_dark_skin_tone]=$'\U1F9D6\U1F3FE\U200D\U2642\UFE0F'
+emoji[man_in_steamy_room_medium_dark_skin_tone_minimally]=$'\U1F9D6\U1F3FE\U200D\U2642'
+emoji[man_in_steamy_room_dark_skin_tone]=$'\U1F9D6\U1F3FF\U200D\U2642\UFE0F'
+emoji[man_in_steamy_room_dark_skin_tone_minimally]=$'\U1F9D6\U1F3FF\U200D\U2642'
+emoji[woman_in_steamy_room]=$'\U1F9D6\U200D\U2640\UFE0F'
+emoji[woman_in_steamy_room_minimally]=$'\U1F9D6\U200D\U2640'
+emoji[sauna_woman]=$'\U1F9D6\U200D\U2640'
+emoji[woman_in_steamy_room_light_skin_tone]=$'\U1F9D6\U1F3FB\U200D\U2640\UFE0F'
+emoji[woman_in_steamy_room_light_skin_tone_minimally]=$'\U1F9D6\U1F3FB\U200D\U2640'
+emoji[woman_in_steamy_room_medium_light_skin_tone]=$'\U1F9D6\U1F3FC\U200D\U2640\UFE0F'
+emoji[woman_in_steamy_room_medium_light_skin_tone_minimally]=$'\U1F9D6\U1F3FC\U200D\U2640'
+emoji[woman_in_steamy_room_medium_skin_tone]=$'\U1F9D6\U1F3FD\U200D\U2640\UFE0F'
+emoji[woman_in_steamy_room_medium_skin_tone_minimally]=$'\U1F9D6\U1F3FD\U200D\U2640'
+emoji[woman_in_steamy_room_medium_dark_skin_tone]=$'\U1F9D6\U1F3FE\U200D\U2640\UFE0F'
+emoji[woman_in_steamy_room_medium_dark_skin_tone_minimally]=$'\U1F9D6\U1F3FE\U200D\U2640'
+emoji[woman_in_steamy_room_dark_skin_tone]=$'\U1F9D6\U1F3FF\U200D\U2640\UFE0F'
+emoji[woman_in_steamy_room_dark_skin_tone_minimally]=$'\U1F9D6\U1F3FF\U200D\U2640'
+emoji[person_climbing]=$'\U1F9D7'
+emoji[climbing]=$'\U1F9D7'
+emoji[person_climbing_light_skin_tone]=$'\U1F9D7\U1F3FB'
+emoji[person_climbing_medium_light_skin_tone]=$'\U1F9D7\U1F3FC'
+emoji[person_climbing_medium_skin_tone]=$'\U1F9D7\U1F3FD'
+emoji[person_climbing_medium_dark_skin_tone]=$'\U1F9D7\U1F3FE'
+emoji[person_climbing_dark_skin_tone]=$'\U1F9D7\U1F3FF'
+emoji[man_climbing]=$'\U1F9D7\U200D\U2642\UFE0F'
+emoji[man_climbing_minimally]=$'\U1F9D7\U200D\U2642'
+emoji[climbing_man]=$'\U1F9D7\U200D\U2642'
+emoji[man_climbing_light_skin_tone]=$'\U1F9D7\U1F3FB\U200D\U2642\UFE0F'
+emoji[man_climbing_light_skin_tone_minimally]=$'\U1F9D7\U1F3FB\U200D\U2642'
+emoji[man_climbing_medium_light_skin_tone]=$'\U1F9D7\U1F3FC\U200D\U2642\UFE0F'
+emoji[man_climbing_medium_light_skin_tone_minimally]=$'\U1F9D7\U1F3FC\U200D\U2642'
+emoji[man_climbing_medium_skin_tone]=$'\U1F9D7\U1F3FD\U200D\U2642\UFE0F'
+emoji[man_climbing_medium_skin_tone_minimally]=$'\U1F9D7\U1F3FD\U200D\U2642'
+emoji[man_climbing_medium_dark_skin_tone]=$'\U1F9D7\U1F3FE\U200D\U2642\UFE0F'
+emoji[man_climbing_medium_dark_skin_tone_minimally]=$'\U1F9D7\U1F3FE\U200D\U2642'
+emoji[man_climbing_dark_skin_tone]=$'\U1F9D7\U1F3FF\U200D\U2642\UFE0F'
+emoji[man_climbing_dark_skin_tone_minimally]=$'\U1F9D7\U1F3FF\U200D\U2642'
+emoji[woman_climbing]=$'\U1F9D7\U200D\U2640\UFE0F'
+emoji[woman_climbing_minimally]=$'\U1F9D7\U200D\U2640'
+emoji[climbing_woman]=$'\U1F9D7\U200D\U2640'
+emoji[woman_climbing_light_skin_tone]=$'\U1F9D7\U1F3FB\U200D\U2640\UFE0F'
+emoji[woman_climbing_light_skin_tone_minimally]=$'\U1F9D7\U1F3FB\U200D\U2640'
+emoji[woman_climbing_medium_light_skin_tone]=$'\U1F9D7\U1F3FC\U200D\U2640\UFE0F'
+emoji[woman_climbing_medium_light_skin_tone_minimally]=$'\U1F9D7\U1F3FC\U200D\U2640'
+emoji[woman_climbing_medium_skin_tone]=$'\U1F9D7\U1F3FD\U200D\U2640\UFE0F'
+emoji[woman_climbing_medium_skin_tone_minimally]=$'\U1F9D7\U1F3FD\U200D\U2640'
+emoji[woman_climbing_medium_dark_skin_tone]=$'\U1F9D7\U1F3FE\U200D\U2640\UFE0F'
+emoji[woman_climbing_medium_dark_skin_tone_minimally]=$'\U1F9D7\U1F3FE\U200D\U2640'
+emoji[woman_climbing_dark_skin_tone]=$'\U1F9D7\U1F3FF\U200D\U2640\UFE0F'
+emoji[woman_climbing_dark_skin_tone_minimally]=$'\U1F9D7\U1F3FF\U200D\U2640'
+emoji[person_fencing]=$'\U1F93A'
+emoji[horse_racing]=$'\U1F3C7'
+emoji[horse_racing_light_skin_tone]=$'\U1F3C7\U1F3FB'
+emoji[horse_racing_medium_light_skin_tone]=$'\U1F3C7\U1F3FC'
+emoji[horse_racing_medium_skin_tone]=$'\U1F3C7\U1F3FD'
+emoji[horse_racing_medium_dark_skin_tone]=$'\U1F3C7\U1F3FE'
+emoji[horse_racing_dark_skin_tone]=$'\U1F3C7\U1F3FF'
+emoji[skier]=$'\U26F7\UFE0F'
+emoji[skier_unqualified]=$'\U26F7'
+emoji[snowboarder]=$'\U1F3C2'
+emoji[snowboarder_light_skin_tone]=$'\U1F3C2\U1F3FB'
+emoji[snowboarder_medium_light_skin_tone]=$'\U1F3C2\U1F3FC'
+emoji[snowboarder_medium_skin_tone]=$'\U1F3C2\U1F3FD'
+emoji[snowboarder_medium_dark_skin_tone]=$'\U1F3C2\U1F3FE'
+emoji[snowboarder_dark_skin_tone]=$'\U1F3C2\U1F3FF'
+emoji[person_golfing]=$'\U1F3CC\UFE0F'
+emoji[person_golfing_unqualified]=$'\U1F3CC'
+emoji[golfing]=$'\U1F3CC'
+emoji[person_golfing_light_skin_tone]=$'\U1F3CC\U1F3FB'
+emoji[person_golfing_medium_light_skin_tone]=$'\U1F3CC\U1F3FC'
+emoji[person_golfing_medium_skin_tone]=$'\U1F3CC\U1F3FD'
+emoji[person_golfing_medium_dark_skin_tone]=$'\U1F3CC\U1F3FE'
+emoji[person_golfing_dark_skin_tone]=$'\U1F3CC\U1F3FF'
+emoji[man_golfing]=$'\U1F3CC\UFE0F\U200D\U2642\UFE0F'
+emoji[golfing_man]=$'\U1F3CC\UFE0F\U200D\U2642\UFE0F'
+emoji[man_golfing_unqualified]=$'\U1F3CC\U200D\U2642\UFE0F'
+emoji[man_golfing_unqualified_1]=$'\U1F3CC\UFE0F\U200D\U2642'
+emoji[man_golfing_unqualified_2]=$'\U1F3CC\U200D\U2642'
+emoji[man_golfing_light_skin_tone]=$'\U1F3CC\U1F3FB\U200D\U2642\UFE0F'
+emoji[man_golfing_light_skin_tone_minimally]=$'\U1F3CC\U1F3FB\U200D\U2642'
+emoji[man_golfing_medium_light_skin_tone]=$'\U1F3CC\U1F3FC\U200D\U2642\UFE0F'
+emoji[man_golfing_medium_light_skin_tone_minimally]=$'\U1F3CC\U1F3FC\U200D\U2642'
+emoji[man_golfing_medium_skin_tone]=$'\U1F3CC\U1F3FD\U200D\U2642\UFE0F'
+emoji[man_golfing_medium_skin_tone_minimally]=$'\U1F3CC\U1F3FD\U200D\U2642'
+emoji[man_golfing_medium_dark_skin_tone]=$'\U1F3CC\U1F3FE\U200D\U2642\UFE0F'
+emoji[man_golfing_medium_dark_skin_tone_minimally]=$'\U1F3CC\U1F3FE\U200D\U2642'
+emoji[man_golfing_dark_skin_tone]=$'\U1F3CC\U1F3FF\U200D\U2642\UFE0F'
+emoji[man_golfing_dark_skin_tone_minimally]=$'\U1F3CC\U1F3FF\U200D\U2642'
+emoji[woman_golfing]=$'\U1F3CC\UFE0F\U200D\U2640\UFE0F'
+emoji[golfing_woman]=$'\U1F3CC\UFE0F\U200D\U2640\UFE0F'
+emoji[woman_golfing_unqualified]=$'\U1F3CC\U200D\U2640\UFE0F'
+emoji[woman_golfing_unqualified_1]=$'\U1F3CC\UFE0F\U200D\U2640'
+emoji[woman_golfing_unqualified_2]=$'\U1F3CC\U200D\U2640'
+emoji[woman_golfing_light_skin_tone]=$'\U1F3CC\U1F3FB\U200D\U2640\UFE0F'
+emoji[woman_golfing_light_skin_tone_minimally]=$'\U1F3CC\U1F3FB\U200D\U2640'
+emoji[woman_golfing_medium_light_skin_tone]=$'\U1F3CC\U1F3FC\U200D\U2640\UFE0F'
+emoji[woman_golfing_medium_light_skin_tone_minimally]=$'\U1F3CC\U1F3FC\U200D\U2640'
+emoji[woman_golfing_medium_skin_tone]=$'\U1F3CC\U1F3FD\U200D\U2640\UFE0F'
+emoji[woman_golfing_medium_skin_tone_minimally]=$'\U1F3CC\U1F3FD\U200D\U2640'
+emoji[woman_golfing_medium_dark_skin_tone]=$'\U1F3CC\U1F3FE\U200D\U2640\UFE0F'
+emoji[woman_golfing_medium_dark_skin_tone_minimally]=$'\U1F3CC\U1F3FE\U200D\U2640'
+emoji[woman_golfing_dark_skin_tone]=$'\U1F3CC\U1F3FF\U200D\U2640\UFE0F'
+emoji[woman_golfing_dark_skin_tone_minimally]=$'\U1F3CC\U1F3FF\U200D\U2640'
+emoji[person_surfing]=$'\U1F3C4'
+emoji[surfer]=$'\U1F3C4'
+emoji[person_surfing_light_skin_tone]=$'\U1F3C4\U1F3FB'
+emoji[person_surfing_medium_light_skin_tone]=$'\U1F3C4\U1F3FC'
+emoji[person_surfing_medium_skin_tone]=$'\U1F3C4\U1F3FD'
+emoji[person_surfing_medium_dark_skin_tone]=$'\U1F3C4\U1F3FE'
+emoji[person_surfing_dark_skin_tone]=$'\U1F3C4\U1F3FF'
+emoji[man_surfing]=$'\U1F3C4\U200D\U2642\UFE0F'
+emoji[man_surfing_minimally]=$'\U1F3C4\U200D\U2642'
+emoji[surfing_man]=$'\U1F3C4\U200D\U2642'
+emoji[man_surfing_light_skin_tone]=$'\U1F3C4\U1F3FB\U200D\U2642\UFE0F'
+emoji[man_surfing_light_skin_tone_minimally]=$'\U1F3C4\U1F3FB\U200D\U2642'
+emoji[man_surfing_medium_light_skin_tone]=$'\U1F3C4\U1F3FC\U200D\U2642\UFE0F'
+emoji[man_surfing_medium_light_skin_tone_minimally]=$'\U1F3C4\U1F3FC\U200D\U2642'
+emoji[man_surfing_medium_skin_tone]=$'\U1F3C4\U1F3FD\U200D\U2642\UFE0F'
+emoji[man_surfing_medium_skin_tone_minimally]=$'\U1F3C4\U1F3FD\U200D\U2642'
+emoji[man_surfing_medium_dark_skin_tone]=$'\U1F3C4\U1F3FE\U200D\U2642\UFE0F'
+emoji[man_surfing_medium_dark_skin_tone_minimally]=$'\U1F3C4\U1F3FE\U200D\U2642'
+emoji[man_surfing_dark_skin_tone]=$'\U1F3C4\U1F3FF\U200D\U2642\UFE0F'
+emoji[man_surfing_dark_skin_tone_minimally]=$'\U1F3C4\U1F3FF\U200D\U2642'
+emoji[woman_surfing]=$'\U1F3C4\U200D\U2640\UFE0F'
+emoji[woman_surfing_minimally]=$'\U1F3C4\U200D\U2640'
+emoji[surfing_woman]=$'\U1F3C4\U200D\U2640'
+emoji[woman_surfing_light_skin_tone]=$'\U1F3C4\U1F3FB\U200D\U2640\UFE0F'
+emoji[woman_surfing_light_skin_tone_minimally]=$'\U1F3C4\U1F3FB\U200D\U2640'
+emoji[woman_surfing_medium_light_skin_tone]=$'\U1F3C4\U1F3FC\U200D\U2640\UFE0F'
+emoji[woman_surfing_medium_light_skin_tone_minimally]=$'\U1F3C4\U1F3FC\U200D\U2640'
+emoji[woman_surfing_medium_skin_tone]=$'\U1F3C4\U1F3FD\U200D\U2640\UFE0F'
+emoji[woman_surfing_medium_skin_tone_minimally]=$'\U1F3C4\U1F3FD\U200D\U2640'
+emoji[woman_surfing_medium_dark_skin_tone]=$'\U1F3C4\U1F3FE\U200D\U2640\UFE0F'
+emoji[woman_surfing_medium_dark_skin_tone_minimally]=$'\U1F3C4\U1F3FE\U200D\U2640'
+emoji[woman_surfing_dark_skin_tone]=$'\U1F3C4\U1F3FF\U200D\U2640\UFE0F'
+emoji[woman_surfing_dark_skin_tone_minimally]=$'\U1F3C4\U1F3FF\U200D\U2640'
+emoji[person_rowing_boat]=$'\U1F6A3'
+emoji[rowboat]=$'\U1F6A3'
+emoji[person_rowing_boat_light_skin_tone]=$'\U1F6A3\U1F3FB'
+emoji[person_rowing_boat_medium_light_skin_tone]=$'\U1F6A3\U1F3FC'
+emoji[person_rowing_boat_medium_skin_tone]=$'\U1F6A3\U1F3FD'
+emoji[person_rowing_boat_medium_dark_skin_tone]=$'\U1F6A3\U1F3FE'
+emoji[person_rowing_boat_dark_skin_tone]=$'\U1F6A3\U1F3FF'
+emoji[man_rowing_boat]=$'\U1F6A3\U200D\U2642\UFE0F'
+emoji[man_rowing_boat_minimally]=$'\U1F6A3\U200D\U2642'
+emoji[rowing_man]=$'\U1F6A3\U200D\U2642'
+emoji[man_rowing_boat_light_skin_tone]=$'\U1F6A3\U1F3FB\U200D\U2642\UFE0F'
+emoji[man_rowing_boat_light_skin_tone_minimally]=$'\U1F6A3\U1F3FB\U200D\U2642'
+emoji[man_rowing_boat_medium_light_skin_tone]=$'\U1F6A3\U1F3FC\U200D\U2642\UFE0F'
+emoji[man_rowing_boat_medium_light_skin_tone_minimally]=$'\U1F6A3\U1F3FC\U200D\U2642'
+emoji[man_rowing_boat_medium_skin_tone]=$'\U1F6A3\U1F3FD\U200D\U2642\UFE0F'
+emoji[man_rowing_boat_medium_skin_tone_minimally]=$'\U1F6A3\U1F3FD\U200D\U2642'
+emoji[man_rowing_boat_medium_dark_skin_tone]=$'\U1F6A3\U1F3FE\U200D\U2642\UFE0F'
+emoji[man_rowing_boat_medium_dark_skin_tone_minimally]=$'\U1F6A3\U1F3FE\U200D\U2642'
+emoji[man_rowing_boat_dark_skin_tone]=$'\U1F6A3\U1F3FF\U200D\U2642\UFE0F'
+emoji[man_rowing_boat_dark_skin_tone_minimally]=$'\U1F6A3\U1F3FF\U200D\U2642'
+emoji[woman_rowing_boat]=$'\U1F6A3\U200D\U2640\UFE0F'
+emoji[woman_rowing_boat_minimally]=$'\U1F6A3\U200D\U2640'
+emoji[rowing_woman]=$'\U1F6A3\U200D\U2640'
+emoji[woman_rowing_boat_light_skin_tone]=$'\U1F6A3\U1F3FB\U200D\U2640\UFE0F'
+emoji[woman_rowing_boat_light_skin_tone_minimally]=$'\U1F6A3\U1F3FB\U200D\U2640'
+emoji[woman_rowing_boat_medium_light_skin_tone]=$'\U1F6A3\U1F3FC\U200D\U2640\UFE0F'
+emoji[woman_rowing_boat_medium_light_skin_tone_minimally]=$'\U1F6A3\U1F3FC\U200D\U2640'
+emoji[woman_rowing_boat_medium_skin_tone]=$'\U1F6A3\U1F3FD\U200D\U2640\UFE0F'
+emoji[woman_rowing_boat_medium_skin_tone_minimally]=$'\U1F6A3\U1F3FD\U200D\U2640'
+emoji[woman_rowing_boat_medium_dark_skin_tone]=$'\U1F6A3\U1F3FE\U200D\U2640\UFE0F'
+emoji[woman_rowing_boat_medium_dark_skin_tone_minimally]=$'\U1F6A3\U1F3FE\U200D\U2640'
+emoji[woman_rowing_boat_dark_skin_tone]=$'\U1F6A3\U1F3FF\U200D\U2640\UFE0F'
+emoji[woman_rowing_boat_dark_skin_tone_minimally]=$'\U1F6A3\U1F3FF\U200D\U2640'
+emoji[person_swimming]=$'\U1F3CA'
+emoji[swimmer]=$'\U1F3CA'
+emoji[person_swimming_light_skin_tone]=$'\U1F3CA\U1F3FB'
+emoji[person_swimming_medium_light_skin_tone]=$'\U1F3CA\U1F3FC'
+emoji[person_swimming_medium_skin_tone]=$'\U1F3CA\U1F3FD'
+emoji[person_swimming_medium_dark_skin_tone]=$'\U1F3CA\U1F3FE'
+emoji[person_swimming_dark_skin_tone]=$'\U1F3CA\U1F3FF'
+emoji[man_swimming]=$'\U1F3CA\U200D\U2642\UFE0F'
+emoji[man_swimming_minimally]=$'\U1F3CA\U200D\U2642'
+emoji[swimming_man]=$'\U1F3CA\U200D\U2642'
+emoji[man_swimming_light_skin_tone]=$'\U1F3CA\U1F3FB\U200D\U2642\UFE0F'
+emoji[man_swimming_light_skin_tone_minimally]=$'\U1F3CA\U1F3FB\U200D\U2642'
+emoji[man_swimming_medium_light_skin_tone]=$'\U1F3CA\U1F3FC\U200D\U2642\UFE0F'
+emoji[man_swimming_medium_light_skin_tone_minimally]=$'\U1F3CA\U1F3FC\U200D\U2642'
+emoji[man_swimming_medium_skin_tone]=$'\U1F3CA\U1F3FD\U200D\U2642\UFE0F'
+emoji[man_swimming_medium_skin_tone_minimally]=$'\U1F3CA\U1F3FD\U200D\U2642'
+emoji[man_swimming_medium_dark_skin_tone]=$'\U1F3CA\U1F3FE\U200D\U2642\UFE0F'
+emoji[man_swimming_medium_dark_skin_tone_minimally]=$'\U1F3CA\U1F3FE\U200D\U2642'
+emoji[man_swimming_dark_skin_tone]=$'\U1F3CA\U1F3FF\U200D\U2642\UFE0F'
+emoji[man_swimming_dark_skin_tone_minimally]=$'\U1F3CA\U1F3FF\U200D\U2642'
+emoji[woman_swimming]=$'\U1F3CA\U200D\U2640\UFE0F'
+emoji[woman_swimming_minimally]=$'\U1F3CA\U200D\U2640'
+emoji[swimming_woman]=$'\U1F3CA\U200D\U2640'
+emoji[woman_swimming_light_skin_tone]=$'\U1F3CA\U1F3FB\U200D\U2640\UFE0F'
+emoji[woman_swimming_light_skin_tone_minimally]=$'\U1F3CA\U1F3FB\U200D\U2640'
+emoji[woman_swimming_medium_light_skin_tone]=$'\U1F3CA\U1F3FC\U200D\U2640\UFE0F'
+emoji[woman_swimming_medium_light_skin_tone_minimally]=$'\U1F3CA\U1F3FC\U200D\U2640'
+emoji[woman_swimming_medium_skin_tone]=$'\U1F3CA\U1F3FD\U200D\U2640\UFE0F'
+emoji[woman_swimming_medium_skin_tone_minimally]=$'\U1F3CA\U1F3FD\U200D\U2640'
+emoji[woman_swimming_medium_dark_skin_tone]=$'\U1F3CA\U1F3FE\U200D\U2640\UFE0F'
+emoji[woman_swimming_medium_dark_skin_tone_minimally]=$'\U1F3CA\U1F3FE\U200D\U2640'
+emoji[woman_swimming_dark_skin_tone]=$'\U1F3CA\U1F3FF\U200D\U2640\UFE0F'
+emoji[woman_swimming_dark_skin_tone_minimally]=$'\U1F3CA\U1F3FF\U200D\U2640'
+emoji[person_bouncing_ball]=$'\U26F9\UFE0F'
+emoji[person_bouncing_ball_unqualified]=$'\U26F9'
+emoji[bouncing_ball_person]=$'\U26F9'
+emoji[person_bouncing_ball_light_skin_tone]=$'\U26F9\U1F3FB'
+emoji[person_bouncing_ball_medium_light_skin_tone]=$'\U26F9\U1F3FC'
+emoji[person_bouncing_ball_medium_skin_tone]=$'\U26F9\U1F3FD'
+emoji[person_bouncing_ball_medium_dark_skin_tone]=$'\U26F9\U1F3FE'
+emoji[person_bouncing_ball_dark_skin_tone]=$'\U26F9\U1F3FF'
+emoji[man_bouncing_ball]=$'\U26F9\UFE0F\U200D\U2642\UFE0F'
+emoji[bouncing_ball_man]=$'\U26F9\UFE0F\U200D\U2642\UFE0F'
+emoji[basketball_man]=$'\U26F9\UFE0F\U200D\U2642\UFE0F'
+emoji[man_bouncing_ball_unqualified]=$'\U26F9\U200D\U2642\UFE0F'
+emoji[man_bouncing_ball_unqualified_1]=$'\U26F9\UFE0F\U200D\U2642'
+emoji[man_bouncing_ball_unqualified_2]=$'\U26F9\U200D\U2642'
+emoji[man_bouncing_ball_light_skin_tone]=$'\U26F9\U1F3FB\U200D\U2642\UFE0F'
+emoji[man_bouncing_ball_light_skin_tone_minimally]=$'\U26F9\U1F3FB\U200D\U2642'
+emoji[man_bouncing_ball_medium_light_skin_tone]=$'\U26F9\U1F3FC\U200D\U2642\UFE0F'
+emoji[man_bouncing_ball_medium_light_skin_tone_minimally]=$'\U26F9\U1F3FC\U200D\U2642'
+emoji[man_bouncing_ball_medium_skin_tone]=$'\U26F9\U1F3FD\U200D\U2642\UFE0F'
+emoji[man_bouncing_ball_medium_skin_tone_minimally]=$'\U26F9\U1F3FD\U200D\U2642'
+emoji[man_bouncing_ball_medium_dark_skin_tone]=$'\U26F9\U1F3FE\U200D\U2642\UFE0F'
+emoji[man_bouncing_ball_medium_dark_skin_tone_minimally]=$'\U26F9\U1F3FE\U200D\U2642'
+emoji[man_bouncing_ball_dark_skin_tone]=$'\U26F9\U1F3FF\U200D\U2642\UFE0F'
+emoji[man_bouncing_ball_dark_skin_tone_minimally]=$'\U26F9\U1F3FF\U200D\U2642'
+emoji[woman_bouncing_ball]=$'\U26F9\UFE0F\U200D\U2640\UFE0F'
+emoji[bouncing_ball_woman]=$'\U26F9\UFE0F\U200D\U2640\UFE0F'
+emoji[basketball_woman]=$'\U26F9\UFE0F\U200D\U2640\UFE0F'
+emoji[woman_bouncing_ball_unqualified]=$'\U26F9\U200D\U2640\UFE0F'
+emoji[woman_bouncing_ball_unqualified_1]=$'\U26F9\UFE0F\U200D\U2640'
+emoji[woman_bouncing_ball_unqualified_2]=$'\U26F9\U200D\U2640'
+emoji[woman_bouncing_ball_light_skin_tone]=$'\U26F9\U1F3FB\U200D\U2640\UFE0F'
+emoji[woman_bouncing_ball_light_skin_tone_minimally]=$'\U26F9\U1F3FB\U200D\U2640'
+emoji[woman_bouncing_ball_medium_light_skin_tone]=$'\U26F9\U1F3FC\U200D\U2640\UFE0F'
+emoji[woman_bouncing_ball_medium_light_skin_tone_minimally]=$'\U26F9\U1F3FC\U200D\U2640'
+emoji[woman_bouncing_ball_medium_skin_tone]=$'\U26F9\U1F3FD\U200D\U2640\UFE0F'
+emoji[woman_bouncing_ball_medium_skin_tone_minimally]=$'\U26F9\U1F3FD\U200D\U2640'
+emoji[woman_bouncing_ball_medium_dark_skin_tone]=$'\U26F9\U1F3FE\U200D\U2640\UFE0F'
+emoji[woman_bouncing_ball_medium_dark_skin_tone_minimally]=$'\U26F9\U1F3FE\U200D\U2640'
+emoji[woman_bouncing_ball_dark_skin_tone]=$'\U26F9\U1F3FF\U200D\U2640\UFE0F'
+emoji[woman_bouncing_ball_dark_skin_tone_minimally]=$'\U26F9\U1F3FF\U200D\U2640'
+emoji[person_lifting_weights]=$'\U1F3CB\UFE0F'
+emoji[person_lifting_weights_unqualified]=$'\U1F3CB'
+emoji[weight_lifting]=$'\U1F3CB'
+emoji[person_lifting_weights_light_skin_tone]=$'\U1F3CB\U1F3FB'
+emoji[person_lifting_weights_medium_light_skin_tone]=$'\U1F3CB\U1F3FC'
+emoji[person_lifting_weights_medium_skin_tone]=$'\U1F3CB\U1F3FD'
+emoji[person_lifting_weights_medium_dark_skin_tone]=$'\U1F3CB\U1F3FE'
+emoji[person_lifting_weights_dark_skin_tone]=$'\U1F3CB\U1F3FF'
+emoji[man_lifting_weights]=$'\U1F3CB\UFE0F\U200D\U2642\UFE0F'
+emoji[weight_lifting_man]=$'\U1F3CB\UFE0F\U200D\U2642\UFE0F'
+emoji[man_lifting_weights_unqualified]=$'\U1F3CB\U200D\U2642\UFE0F'
+emoji[man_lifting_weights_unqualified_1]=$'\U1F3CB\UFE0F\U200D\U2642'
+emoji[man_lifting_weights_unqualified_2]=$'\U1F3CB\U200D\U2642'
+emoji[man_lifting_weights_light_skin_tone]=$'\U1F3CB\U1F3FB\U200D\U2642\UFE0F'
+emoji[man_lifting_weights_light_skin_tone_minimally]=$'\U1F3CB\U1F3FB\U200D\U2642'
+emoji[man_lifting_weights_medium_light_skin_tone]=$'\U1F3CB\U1F3FC\U200D\U2642\UFE0F'
+emoji[man_lifting_weights_medium_light_skin_tone_minimally]=$'\U1F3CB\U1F3FC\U200D\U2642'
+emoji[man_lifting_weights_medium_skin_tone]=$'\U1F3CB\U1F3FD\U200D\U2642\UFE0F'
+emoji[man_lifting_weights_medium_skin_tone_minimally]=$'\U1F3CB\U1F3FD\U200D\U2642'
+emoji[man_lifting_weights_medium_dark_skin_tone]=$'\U1F3CB\U1F3FE\U200D\U2642\UFE0F'
+emoji[man_lifting_weights_medium_dark_skin_tone_minimally]=$'\U1F3CB\U1F3FE\U200D\U2642'
+emoji[man_lifting_weights_dark_skin_tone]=$'\U1F3CB\U1F3FF\U200D\U2642\UFE0F'
+emoji[man_lifting_weights_dark_skin_tone_minimally]=$'\U1F3CB\U1F3FF\U200D\U2642'
+emoji[woman_lifting_weights]=$'\U1F3CB\UFE0F\U200D\U2640\UFE0F'
+emoji[weight_lifting_woman]=$'\U1F3CB\UFE0F\U200D\U2640\UFE0F'
+emoji[woman_lifting_weights_unqualified]=$'\U1F3CB\U200D\U2640\UFE0F'
+emoji[woman_lifting_weights_unqualified_1]=$'\U1F3CB\UFE0F\U200D\U2640'
+emoji[woman_lifting_weights_unqualified_2]=$'\U1F3CB\U200D\U2640'
+emoji[woman_lifting_weights_light_skin_tone]=$'\U1F3CB\U1F3FB\U200D\U2640\UFE0F'
+emoji[woman_lifting_weights_light_skin_tone_minimally]=$'\U1F3CB\U1F3FB\U200D\U2640'
+emoji[woman_lifting_weights_medium_light_skin_tone]=$'\U1F3CB\U1F3FC\U200D\U2640\UFE0F'
+emoji[woman_lifting_weights_medium_light_skin_tone_minimally]=$'\U1F3CB\U1F3FC\U200D\U2640'
+emoji[woman_lifting_weights_medium_skin_tone]=$'\U1F3CB\U1F3FD\U200D\U2640\UFE0F'
+emoji[woman_lifting_weights_medium_skin_tone_minimally]=$'\U1F3CB\U1F3FD\U200D\U2640'
+emoji[woman_lifting_weights_medium_dark_skin_tone]=$'\U1F3CB\U1F3FE\U200D\U2640\UFE0F'
+emoji[woman_lifting_weights_medium_dark_skin_tone_minimally]=$'\U1F3CB\U1F3FE\U200D\U2640'
+emoji[woman_lifting_weights_dark_skin_tone]=$'\U1F3CB\U1F3FF\U200D\U2640\UFE0F'
+emoji[woman_lifting_weights_dark_skin_tone_minimally]=$'\U1F3CB\U1F3FF\U200D\U2640'
+emoji[person_biking]=$'\U1F6B4'
+emoji[bicyclist]=$'\U1F6B4'
+emoji[person_biking_light_skin_tone]=$'\U1F6B4\U1F3FB'
+emoji[person_biking_medium_light_skin_tone]=$'\U1F6B4\U1F3FC'
+emoji[person_biking_medium_skin_tone]=$'\U1F6B4\U1F3FD'
+emoji[person_biking_medium_dark_skin_tone]=$'\U1F6B4\U1F3FE'
+emoji[person_biking_dark_skin_tone]=$'\U1F6B4\U1F3FF'
+emoji[man_biking]=$'\U1F6B4\U200D\U2642\UFE0F'
+emoji[man_biking_minimally]=$'\U1F6B4\U200D\U2642'
+emoji[biking_man]=$'\U1F6B4\U200D\U2642'
+emoji[man_biking_light_skin_tone]=$'\U1F6B4\U1F3FB\U200D\U2642\UFE0F'
+emoji[man_biking_light_skin_tone_minimally]=$'\U1F6B4\U1F3FB\U200D\U2642'
+emoji[man_biking_medium_light_skin_tone]=$'\U1F6B4\U1F3FC\U200D\U2642\UFE0F'
+emoji[man_biking_medium_light_skin_tone_minimally]=$'\U1F6B4\U1F3FC\U200D\U2642'
+emoji[man_biking_medium_skin_tone]=$'\U1F6B4\U1F3FD\U200D\U2642\UFE0F'
+emoji[man_biking_medium_skin_tone_minimally]=$'\U1F6B4\U1F3FD\U200D\U2642'
+emoji[man_biking_medium_dark_skin_tone]=$'\U1F6B4\U1F3FE\U200D\U2642\UFE0F'
+emoji[man_biking_medium_dark_skin_tone_minimally]=$'\U1F6B4\U1F3FE\U200D\U2642'
+emoji[man_biking_dark_skin_tone]=$'\U1F6B4\U1F3FF\U200D\U2642\UFE0F'
+emoji[man_biking_dark_skin_tone_minimally]=$'\U1F6B4\U1F3FF\U200D\U2642'
+emoji[woman_biking]=$'\U1F6B4\U200D\U2640\UFE0F'
+emoji[woman_biking_minimally]=$'\U1F6B4\U200D\U2640'
+emoji[biking_woman]=$'\U1F6B4\U200D\U2640'
+emoji[woman_biking_light_skin_tone]=$'\U1F6B4\U1F3FB\U200D\U2640\UFE0F'
+emoji[woman_biking_light_skin_tone_minimally]=$'\U1F6B4\U1F3FB\U200D\U2640'
+emoji[woman_biking_medium_light_skin_tone]=$'\U1F6B4\U1F3FC\U200D\U2640\UFE0F'
+emoji[woman_biking_medium_light_skin_tone_minimally]=$'\U1F6B4\U1F3FC\U200D\U2640'
+emoji[woman_biking_medium_skin_tone]=$'\U1F6B4\U1F3FD\U200D\U2640\UFE0F'
+emoji[woman_biking_medium_skin_tone_minimally]=$'\U1F6B4\U1F3FD\U200D\U2640'
+emoji[woman_biking_medium_dark_skin_tone]=$'\U1F6B4\U1F3FE\U200D\U2640\UFE0F'
+emoji[woman_biking_medium_dark_skin_tone_minimally]=$'\U1F6B4\U1F3FE\U200D\U2640'
+emoji[woman_biking_dark_skin_tone]=$'\U1F6B4\U1F3FF\U200D\U2640\UFE0F'
+emoji[woman_biking_dark_skin_tone_minimally]=$'\U1F6B4\U1F3FF\U200D\U2640'
+emoji[person_mountain_biking]=$'\U1F6B5'
+emoji[mountain_bicyclist]=$'\U1F6B5'
+emoji[person_mountain_biking_light_skin_tone]=$'\U1F6B5\U1F3FB'
+emoji[person_mountain_biking_medium_light_skin_tone]=$'\U1F6B5\U1F3FC'
+emoji[person_mountain_biking_medium_skin_tone]=$'\U1F6B5\U1F3FD'
+emoji[person_mountain_biking_medium_dark_skin_tone]=$'\U1F6B5\U1F3FE'
+emoji[person_mountain_biking_dark_skin_tone]=$'\U1F6B5\U1F3FF'
+emoji[man_mountain_biking]=$'\U1F6B5\U200D\U2642\UFE0F'
+emoji[man_mountain_biking_minimally]=$'\U1F6B5\U200D\U2642'
+emoji[mountain_biking_man]=$'\U1F6B5\U200D\U2642'
+emoji[man_mountain_biking_light_skin_tone]=$'\U1F6B5\U1F3FB\U200D\U2642\UFE0F'
+emoji[man_mountain_biking_light_skin_tone_minimally]=$'\U1F6B5\U1F3FB\U200D\U2642'
+emoji[man_mountain_biking_medium_light_skin_tone]=$'\U1F6B5\U1F3FC\U200D\U2642\UFE0F'
+emoji[man_mountain_biking_medium_light_skin_tone_minimally]=$'\U1F6B5\U1F3FC\U200D\U2642'
+emoji[man_mountain_biking_medium_skin_tone]=$'\U1F6B5\U1F3FD\U200D\U2642\UFE0F'
+emoji[man_mountain_biking_medium_skin_tone_minimally]=$'\U1F6B5\U1F3FD\U200D\U2642'
+emoji[man_mountain_biking_medium_dark_skin_tone]=$'\U1F6B5\U1F3FE\U200D\U2642\UFE0F'
+emoji[man_mountain_biking_medium_dark_skin_tone_minimally]=$'\U1F6B5\U1F3FE\U200D\U2642'
+emoji[man_mountain_biking_dark_skin_tone]=$'\U1F6B5\U1F3FF\U200D\U2642\UFE0F'
+emoji[man_mountain_biking_dark_skin_tone_minimally]=$'\U1F6B5\U1F3FF\U200D\U2642'
+emoji[woman_mountain_biking]=$'\U1F6B5\U200D\U2640\UFE0F'
+emoji[woman_mountain_biking_minimally]=$'\U1F6B5\U200D\U2640'
+emoji[mountain_biking_woman]=$'\U1F6B5\U200D\U2640'
+emoji[woman_mountain_biking_light_skin_tone]=$'\U1F6B5\U1F3FB\U200D\U2640\UFE0F'
+emoji[woman_mountain_biking_light_skin_tone_minimally]=$'\U1F6B5\U1F3FB\U200D\U2640'
+emoji[woman_mountain_biking_medium_light_skin_tone]=$'\U1F6B5\U1F3FC\U200D\U2640\UFE0F'
+emoji[woman_mountain_biking_medium_light_skin_tone_minimally]=$'\U1F6B5\U1F3FC\U200D\U2640'
+emoji[woman_mountain_biking_medium_skin_tone]=$'\U1F6B5\U1F3FD\U200D\U2640\UFE0F'
+emoji[woman_mountain_biking_medium_skin_tone_minimally]=$'\U1F6B5\U1F3FD\U200D\U2640'
+emoji[woman_mountain_biking_medium_dark_skin_tone]=$'\U1F6B5\U1F3FE\U200D\U2640\UFE0F'
+emoji[woman_mountain_biking_medium_dark_skin_tone_minimally]=$'\U1F6B5\U1F3FE\U200D\U2640'
+emoji[woman_mountain_biking_dark_skin_tone]=$'\U1F6B5\U1F3FF\U200D\U2640\UFE0F'
+emoji[woman_mountain_biking_dark_skin_tone_minimally]=$'\U1F6B5\U1F3FF\U200D\U2640'
+emoji[person_cartwheeling]=$'\U1F938'
+emoji[cartwheeling]=$'\U1F938'
+emoji[person_cartwheeling_light_skin_tone]=$'\U1F938\U1F3FB'
+emoji[person_cartwheeling_medium_light_skin_tone]=$'\U1F938\U1F3FC'
+emoji[person_cartwheeling_medium_skin_tone]=$'\U1F938\U1F3FD'
+emoji[person_cartwheeling_medium_dark_skin_tone]=$'\U1F938\U1F3FE'
+emoji[person_cartwheeling_dark_skin_tone]=$'\U1F938\U1F3FF'
+emoji[man_cartwheeling]=$'\U1F938\U200D\U2642\UFE0F'
+emoji[man_cartwheeling_minimally]=$'\U1F938\U200D\U2642'
+emoji[man_cartwheeling_light_skin_tone]=$'\U1F938\U1F3FB\U200D\U2642\UFE0F'
+emoji[man_cartwheeling_light_skin_tone_minimally]=$'\U1F938\U1F3FB\U200D\U2642'
+emoji[man_cartwheeling_medium_light_skin_tone]=$'\U1F938\U1F3FC\U200D\U2642\UFE0F'
+emoji[man_cartwheeling_medium_light_skin_tone_minimally]=$'\U1F938\U1F3FC\U200D\U2642'
+emoji[man_cartwheeling_medium_skin_tone]=$'\U1F938\U1F3FD\U200D\U2642\UFE0F'
+emoji[man_cartwheeling_medium_skin_tone_minimally]=$'\U1F938\U1F3FD\U200D\U2642'
+emoji[man_cartwheeling_medium_dark_skin_tone]=$'\U1F938\U1F3FE\U200D\U2642\UFE0F'
+emoji[man_cartwheeling_medium_dark_skin_tone_minimally]=$'\U1F938\U1F3FE\U200D\U2642'
+emoji[man_cartwheeling_dark_skin_tone]=$'\U1F938\U1F3FF\U200D\U2642\UFE0F'
+emoji[man_cartwheeling_dark_skin_tone_minimally]=$'\U1F938\U1F3FF\U200D\U2642'
+emoji[woman_cartwheeling]=$'\U1F938\U200D\U2640\UFE0F'
+emoji[woman_cartwheeling_minimally]=$'\U1F938\U200D\U2640'
+emoji[woman_cartwheeling_light_skin_tone]=$'\U1F938\U1F3FB\U200D\U2640\UFE0F'
+emoji[woman_cartwheeling_light_skin_tone_minimally]=$'\U1F938\U1F3FB\U200D\U2640'
+emoji[woman_cartwheeling_medium_light_skin_tone]=$'\U1F938\U1F3FC\U200D\U2640\UFE0F'
+emoji[woman_cartwheeling_medium_light_skin_tone_minimally]=$'\U1F938\U1F3FC\U200D\U2640'
+emoji[woman_cartwheeling_medium_skin_tone]=$'\U1F938\U1F3FD\U200D\U2640\UFE0F'
+emoji[woman_cartwheeling_medium_skin_tone_minimally]=$'\U1F938\U1F3FD\U200D\U2640'
+emoji[woman_cartwheeling_medium_dark_skin_tone]=$'\U1F938\U1F3FE\U200D\U2640\UFE0F'
+emoji[woman_cartwheeling_medium_dark_skin_tone_minimally]=$'\U1F938\U1F3FE\U200D\U2640'
+emoji[woman_cartwheeling_dark_skin_tone]=$'\U1F938\U1F3FF\U200D\U2640\UFE0F'
+emoji[woman_cartwheeling_dark_skin_tone_minimally]=$'\U1F938\U1F3FF\U200D\U2640'
+emoji[people_wrestling]=$'\U1F93C'
+emoji[wrestling]=$'\U1F93C'
+emoji[men_wrestling]=$'\U1F93C\U200D\U2642\UFE0F'
+emoji[men_wrestling_minimally]=$'\U1F93C\U200D\U2642'
+emoji[women_wrestling]=$'\U1F93C\U200D\U2640\UFE0F'
+emoji[women_wrestling_minimally]=$'\U1F93C\U200D\U2640'
+emoji[person_playing_water_polo]=$'\U1F93D'
+emoji[water_polo]=$'\U1F93D'
+emoji[person_playing_water_polo_light_skin_tone]=$'\U1F93D\U1F3FB'
+emoji[person_playing_water_polo_medium_light_skin_tone]=$'\U1F93D\U1F3FC'
+emoji[person_playing_water_polo_medium_skin_tone]=$'\U1F93D\U1F3FD'
+emoji[person_playing_water_polo_medium_dark_skin_tone]=$'\U1F93D\U1F3FE'
+emoji[person_playing_water_polo_dark_skin_tone]=$'\U1F93D\U1F3FF'
+emoji[man_playing_water_polo]=$'\U1F93D\U200D\U2642\UFE0F'
+emoji[man_playing_water_polo_minimally]=$'\U1F93D\U200D\U2642'
+emoji[man_playing_water_polo_light_skin_tone]=$'\U1F93D\U1F3FB\U200D\U2642\UFE0F'
+emoji[man_playing_water_polo_light_skin_tone_minimally]=$'\U1F93D\U1F3FB\U200D\U2642'
+emoji[man_playing_water_polo_medium_light_skin_tone]=$'\U1F93D\U1F3FC\U200D\U2642\UFE0F'
+emoji[man_playing_water_polo_medium_light_skin_tone_minimally]=$'\U1F93D\U1F3FC\U200D\U2642'
+emoji[man_playing_water_polo_medium_skin_tone]=$'\U1F93D\U1F3FD\U200D\U2642\UFE0F'
+emoji[man_playing_water_polo_medium_skin_tone_minimally]=$'\U1F93D\U1F3FD\U200D\U2642'
+emoji[man_playing_water_polo_medium_dark_skin_tone]=$'\U1F93D\U1F3FE\U200D\U2642\UFE0F'
+emoji[man_playing_water_polo_medium_dark_skin_tone_minimally]=$'\U1F93D\U1F3FE\U200D\U2642'
+emoji[man_playing_water_polo_dark_skin_tone]=$'\U1F93D\U1F3FF\U200D\U2642\UFE0F'
+emoji[man_playing_water_polo_dark_skin_tone_minimally]=$'\U1F93D\U1F3FF\U200D\U2642'
+emoji[woman_playing_water_polo]=$'\U1F93D\U200D\U2640\UFE0F'
+emoji[woman_playing_water_polo_minimally]=$'\U1F93D\U200D\U2640'
+emoji[woman_playing_water_polo_light_skin_tone]=$'\U1F93D\U1F3FB\U200D\U2640\UFE0F'
+emoji[woman_playing_water_polo_light_skin_tone_minimally]=$'\U1F93D\U1F3FB\U200D\U2640'
+emoji[woman_playing_water_polo_medium_light_skin_tone]=$'\U1F93D\U1F3FC\U200D\U2640\UFE0F'
+emoji[woman_playing_water_polo_medium_light_skin_tone_minimally]=$'\U1F93D\U1F3FC\U200D\U2640'
+emoji[woman_playing_water_polo_medium_skin_tone]=$'\U1F93D\U1F3FD\U200D\U2640\UFE0F'
+emoji[woman_playing_water_polo_medium_skin_tone_minimally]=$'\U1F93D\U1F3FD\U200D\U2640'
+emoji[woman_playing_water_polo_medium_dark_skin_tone]=$'\U1F93D\U1F3FE\U200D\U2640\UFE0F'
+emoji[woman_playing_water_polo_medium_dark_skin_tone_minimally]=$'\U1F93D\U1F3FE\U200D\U2640'
+emoji[woman_playing_water_polo_dark_skin_tone]=$'\U1F93D\U1F3FF\U200D\U2640\UFE0F'
+emoji[woman_playing_water_polo_dark_skin_tone_minimally]=$'\U1F93D\U1F3FF\U200D\U2640'
+emoji[person_playing_handball]=$'\U1F93E'
+emoji[handball_person]=$'\U1F93E'
+emoji[person_playing_handball_light_skin_tone]=$'\U1F93E\U1F3FB'
+emoji[person_playing_handball_medium_light_skin_tone]=$'\U1F93E\U1F3FC'
+emoji[person_playing_handball_medium_skin_tone]=$'\U1F93E\U1F3FD'
+emoji[person_playing_handball_medium_dark_skin_tone]=$'\U1F93E\U1F3FE'
+emoji[person_playing_handball_dark_skin_tone]=$'\U1F93E\U1F3FF'
+emoji[man_playing_handball]=$'\U1F93E\U200D\U2642\UFE0F'
+emoji[man_playing_handball_minimally]=$'\U1F93E\U200D\U2642'
+emoji[man_playing_handball_light_skin_tone]=$'\U1F93E\U1F3FB\U200D\U2642\UFE0F'
+emoji[man_playing_handball_light_skin_tone_minimally]=$'\U1F93E\U1F3FB\U200D\U2642'
+emoji[man_playing_handball_medium_light_skin_tone]=$'\U1F93E\U1F3FC\U200D\U2642\UFE0F'
+emoji[man_playing_handball_medium_light_skin_tone_minimally]=$'\U1F93E\U1F3FC\U200D\U2642'
+emoji[man_playing_handball_medium_skin_tone]=$'\U1F93E\U1F3FD\U200D\U2642\UFE0F'
+emoji[man_playing_handball_medium_skin_tone_minimally]=$'\U1F93E\U1F3FD\U200D\U2642'
+emoji[man_playing_handball_medium_dark_skin_tone]=$'\U1F93E\U1F3FE\U200D\U2642\UFE0F'
+emoji[man_playing_handball_medium_dark_skin_tone_minimally]=$'\U1F93E\U1F3FE\U200D\U2642'
+emoji[man_playing_handball_dark_skin_tone]=$'\U1F93E\U1F3FF\U200D\U2642\UFE0F'
+emoji[man_playing_handball_dark_skin_tone_minimally]=$'\U1F93E\U1F3FF\U200D\U2642'
+emoji[woman_playing_handball]=$'\U1F93E\U200D\U2640\UFE0F'
+emoji[woman_playing_handball_minimally]=$'\U1F93E\U200D\U2640'
+emoji[woman_playing_handball_light_skin_tone]=$'\U1F93E\U1F3FB\U200D\U2640\UFE0F'
+emoji[woman_playing_handball_light_skin_tone_minimally]=$'\U1F93E\U1F3FB\U200D\U2640'
+emoji[woman_playing_handball_medium_light_skin_tone]=$'\U1F93E\U1F3FC\U200D\U2640\UFE0F'
+emoji[woman_playing_handball_medium_light_skin_tone_minimally]=$'\U1F93E\U1F3FC\U200D\U2640'
+emoji[woman_playing_handball_medium_skin_tone]=$'\U1F93E\U1F3FD\U200D\U2640\UFE0F'
+emoji[woman_playing_handball_medium_skin_tone_minimally]=$'\U1F93E\U1F3FD\U200D\U2640'
+emoji[woman_playing_handball_medium_dark_skin_tone]=$'\U1F93E\U1F3FE\U200D\U2640\UFE0F'
+emoji[woman_playing_handball_medium_dark_skin_tone_minimally]=$'\U1F93E\U1F3FE\U200D\U2640'
+emoji[woman_playing_handball_dark_skin_tone]=$'\U1F93E\U1F3FF\U200D\U2640\UFE0F'
+emoji[woman_playing_handball_dark_skin_tone_minimally]=$'\U1F93E\U1F3FF\U200D\U2640'
+emoji[person_juggling]=$'\U1F939'
+emoji[juggling_person]=$'\U1F939'
+emoji[person_juggling_light_skin_tone]=$'\U1F939\U1F3FB'
+emoji[person_juggling_medium_light_skin_tone]=$'\U1F939\U1F3FC'
+emoji[person_juggling_medium_skin_tone]=$'\U1F939\U1F3FD'
+emoji[person_juggling_medium_dark_skin_tone]=$'\U1F939\U1F3FE'
+emoji[person_juggling_dark_skin_tone]=$'\U1F939\U1F3FF'
+emoji[man_juggling]=$'\U1F939\U200D\U2642\UFE0F'
+emoji[man_juggling_minimally]=$'\U1F939\U200D\U2642'
+emoji[man_juggling_light_skin_tone]=$'\U1F939\U1F3FB\U200D\U2642\UFE0F'
+emoji[man_juggling_light_skin_tone_minimally]=$'\U1F939\U1F3FB\U200D\U2642'
+emoji[man_juggling_medium_light_skin_tone]=$'\U1F939\U1F3FC\U200D\U2642\UFE0F'
+emoji[man_juggling_medium_light_skin_tone_minimally]=$'\U1F939\U1F3FC\U200D\U2642'
+emoji[man_juggling_medium_skin_tone]=$'\U1F939\U1F3FD\U200D\U2642\UFE0F'
+emoji[man_juggling_medium_skin_tone_minimally]=$'\U1F939\U1F3FD\U200D\U2642'
+emoji[man_juggling_medium_dark_skin_tone]=$'\U1F939\U1F3FE\U200D\U2642\UFE0F'
+emoji[man_juggling_medium_dark_skin_tone_minimally]=$'\U1F939\U1F3FE\U200D\U2642'
+emoji[man_juggling_dark_skin_tone]=$'\U1F939\U1F3FF\U200D\U2642\UFE0F'
+emoji[man_juggling_dark_skin_tone_minimally]=$'\U1F939\U1F3FF\U200D\U2642'
+emoji[woman_juggling]=$'\U1F939\U200D\U2640\UFE0F'
+emoji[woman_juggling_minimally]=$'\U1F939\U200D\U2640'
+emoji[woman_juggling_light_skin_tone]=$'\U1F939\U1F3FB\U200D\U2640\UFE0F'
+emoji[woman_juggling_light_skin_tone_minimally]=$'\U1F939\U1F3FB\U200D\U2640'
+emoji[woman_juggling_medium_light_skin_tone]=$'\U1F939\U1F3FC\U200D\U2640\UFE0F'
+emoji[woman_juggling_medium_light_skin_tone_minimally]=$'\U1F939\U1F3FC\U200D\U2640'
+emoji[woman_juggling_medium_skin_tone]=$'\U1F939\U1F3FD\U200D\U2640\UFE0F'
+emoji[woman_juggling_medium_skin_tone_minimally]=$'\U1F939\U1F3FD\U200D\U2640'
+emoji[woman_juggling_medium_dark_skin_tone]=$'\U1F939\U1F3FE\U200D\U2640\UFE0F'
+emoji[woman_juggling_medium_dark_skin_tone_minimally]=$'\U1F939\U1F3FE\U200D\U2640'
+emoji[woman_juggling_dark_skin_tone]=$'\U1F939\U1F3FF\U200D\U2640\UFE0F'
+emoji[woman_juggling_dark_skin_tone_minimally]=$'\U1F939\U1F3FF\U200D\U2640'
+emoji[person_in_lotus_position]=$'\U1F9D8'
+emoji[lotus_position]=$'\U1F9D8'
+emoji[person_in_lotus_position_light_skin_tone]=$'\U1F9D8\U1F3FB'
+emoji[person_in_lotus_position_medium_light_skin_tone]=$'\U1F9D8\U1F3FC'
+emoji[person_in_lotus_position_medium_skin_tone]=$'\U1F9D8\U1F3FD'
+emoji[person_in_lotus_position_medium_dark_skin_tone]=$'\U1F9D8\U1F3FE'
+emoji[person_in_lotus_position_dark_skin_tone]=$'\U1F9D8\U1F3FF'
+emoji[man_in_lotus_position]=$'\U1F9D8\U200D\U2642\UFE0F'
+emoji[man_in_lotus_position_minimally]=$'\U1F9D8\U200D\U2642'
+emoji[lotus_position_man]=$'\U1F9D8\U200D\U2642'
+emoji[man_in_lotus_position_light_skin_tone]=$'\U1F9D8\U1F3FB\U200D\U2642\UFE0F'
+emoji[man_in_lotus_position_light_skin_tone_minimally]=$'\U1F9D8\U1F3FB\U200D\U2642'
+emoji[man_in_lotus_position_medium_light_skin_tone]=$'\U1F9D8\U1F3FC\U200D\U2642\UFE0F'
+emoji[man_in_lotus_position_medium_light_skin_tone_minimally]=$'\U1F9D8\U1F3FC\U200D\U2642'
+emoji[man_in_lotus_position_medium_skin_tone]=$'\U1F9D8\U1F3FD\U200D\U2642\UFE0F'
+emoji[man_in_lotus_position_medium_skin_tone_minimally]=$'\U1F9D8\U1F3FD\U200D\U2642'
+emoji[man_in_lotus_position_medium_dark_skin_tone]=$'\U1F9D8\U1F3FE\U200D\U2642\UFE0F'
+emoji[man_in_lotus_position_medium_dark_skin_tone_minimally]=$'\U1F9D8\U1F3FE\U200D\U2642'
+emoji[man_in_lotus_position_dark_skin_tone]=$'\U1F9D8\U1F3FF\U200D\U2642\UFE0F'
+emoji[man_in_lotus_position_dark_skin_tone_minimally]=$'\U1F9D8\U1F3FF\U200D\U2642'
+emoji[woman_in_lotus_position]=$'\U1F9D8\U200D\U2640\UFE0F'
+emoji[woman_in_lotus_position_minimally]=$'\U1F9D8\U200D\U2640'
+emoji[lotus_position_woman]=$'\U1F9D8\U200D\U2640'
+emoji[woman_in_lotus_position_light_skin_tone]=$'\U1F9D8\U1F3FB\U200D\U2640\UFE0F'
+emoji[woman_in_lotus_position_light_skin_tone_minimally]=$'\U1F9D8\U1F3FB\U200D\U2640'
+emoji[woman_in_lotus_position_medium_light_skin_tone]=$'\U1F9D8\U1F3FC\U200D\U2640\UFE0F'
+emoji[woman_in_lotus_position_medium_light_skin_tone_minimally]=$'\U1F9D8\U1F3FC\U200D\U2640'
+emoji[woman_in_lotus_position_medium_skin_tone]=$'\U1F9D8\U1F3FD\U200D\U2640\UFE0F'
+emoji[woman_in_lotus_position_medium_skin_tone_minimally]=$'\U1F9D8\U1F3FD\U200D\U2640'
+emoji[woman_in_lotus_position_medium_dark_skin_tone]=$'\U1F9D8\U1F3FE\U200D\U2640\UFE0F'
+emoji[woman_in_lotus_position_medium_dark_skin_tone_minimally]=$'\U1F9D8\U1F3FE\U200D\U2640'
+emoji[woman_in_lotus_position_dark_skin_tone]=$'\U1F9D8\U1F3FF\U200D\U2640\UFE0F'
+emoji[woman_in_lotus_position_dark_skin_tone_minimally]=$'\U1F9D8\U1F3FF\U200D\U2640'
+emoji[person_taking_bath]=$'\U1F6C0'
+emoji[bath]=$'\U1F6C0'
+emoji[person_taking_bath_light_skin_tone]=$'\U1F6C0\U1F3FB'
+emoji[person_taking_bath_medium_light_skin_tone]=$'\U1F6C0\U1F3FC'
+emoji[person_taking_bath_medium_skin_tone]=$'\U1F6C0\U1F3FD'
+emoji[person_taking_bath_medium_dark_skin_tone]=$'\U1F6C0\U1F3FE'
+emoji[person_taking_bath_dark_skin_tone]=$'\U1F6C0\U1F3FF'
+emoji[person_in_bed]=$'\U1F6CC'
+emoji[sleeping_bed]=$'\U1F6CC'
+emoji[person_in_bed_light_skin_tone]=$'\U1F6CC\U1F3FB'
+emoji[person_in_bed_medium_light_skin_tone]=$'\U1F6CC\U1F3FC'
+emoji[person_in_bed_medium_skin_tone]=$'\U1F6CC\U1F3FD'
+emoji[person_in_bed_medium_dark_skin_tone]=$'\U1F6CC\U1F3FE'
+emoji[person_in_bed_dark_skin_tone]=$'\U1F6CC\U1F3FF'
+emoji[people_holding_hands]=$'\U1F9D1\U200D\U1F91D\U200D\U1F9D1'
+emoji[people_holding_hands_light_skin_tone]=$'\U1F9D1\U1F3FB\U200D\U1F91D\U200D\U1F9D1\U1F3FB'
+emoji[people_holding_hands_medium_light_skin_tone_light_skin_tone]=$'\U1F9D1\U1F3FC\U200D\U1F91D\U200D\U1F9D1\U1F3FB'
+emoji[people_holding_hands_medium_light_skin_tone_light_skin_tone_1]=$'\U1F9D1\U1F3FC\U200D\U1F91D\U200D\U1F9D1\U1F3FC'
+emoji[people_holding_hands_medium_skin_tone_light_skin_tone]=$'\U1F9D1\U1F3FD\U200D\U1F91D\U200D\U1F9D1\U1F3FB'
+emoji[people_holding_hands_medium_skin_tone_medium_light_skin_tone]=$'\U1F9D1\U1F3FD\U200D\U1F91D\U200D\U1F9D1\U1F3FC'
+emoji[people_holding_hands_medium_skin_tone_medium_light_skin_tone_1]=$'\U1F9D1\U1F3FD\U200D\U1F91D\U200D\U1F9D1\U1F3FD'
+emoji[people_holding_hands_medium_dark_skin_tone_light_skin_tone]=$'\U1F9D1\U1F3FE\U200D\U1F91D\U200D\U1F9D1\U1F3FB'
+emoji[people_holding_hands_medium_dark_skin_tone_medium_light_skin_tone]=$'\U1F9D1\U1F3FE\U200D\U1F91D\U200D\U1F9D1\U1F3FC'
+emoji[people_holding_hands_medium_dark_skin_tone_medium_skin_tone]=$'\U1F9D1\U1F3FE\U200D\U1F91D\U200D\U1F9D1\U1F3FD'
+emoji[people_holding_hands_medium_dark_skin_tone_medium_skin_tone_1]=$'\U1F9D1\U1F3FE\U200D\U1F91D\U200D\U1F9D1\U1F3FE'
+emoji[people_holding_hands_dark_skin_tone_light_skin_tone]=$'\U1F9D1\U1F3FF\U200D\U1F91D\U200D\U1F9D1\U1F3FB'
+emoji[people_holding_hands_dark_skin_tone_medium_light_skin_tone]=$'\U1F9D1\U1F3FF\U200D\U1F91D\U200D\U1F9D1\U1F3FC'
+emoji[people_holding_hands_dark_skin_tone_medium_skin_tone]=$'\U1F9D1\U1F3FF\U200D\U1F91D\U200D\U1F9D1\U1F3FD'
+emoji[people_holding_hands_dark_skin_tone_medium_dark_skin_tone]=$'\U1F9D1\U1F3FF\U200D\U1F91D\U200D\U1F9D1\U1F3FE'
+emoji[people_holding_hands_dark_skin_tone_medium_dark_skin_tone_1]=$'\U1F9D1\U1F3FF\U200D\U1F91D\U200D\U1F9D1\U1F3FF'
+emoji[women_holding_hands]=$'\U1F46D'
+emoji[two_women_holding_hands]=$'\U1F46D'
+emoji[women_holding_hands_light_skin_tone]=$'\U1F46D\U1F3FB'
+emoji[women_holding_hands_medium_light_skin_tone_light_skin_tone]=$'\U1F469\U1F3FC\U200D\U1F91D\U200D\U1F469\U1F3FB'
+emoji[women_holding_hands_medium_light_skin_tone_light_skin_tone_1]=$'\U1F46D\U1F3FC'
+emoji[women_holding_hands_medium_skin_tone_light_skin_tone]=$'\U1F469\U1F3FD\U200D\U1F91D\U200D\U1F469\U1F3FB'
+emoji[women_holding_hands_medium_skin_tone_medium_light_skin_tone]=$'\U1F469\U1F3FD\U200D\U1F91D\U200D\U1F469\U1F3FC'
+emoji[women_holding_hands_medium_skin_tone_medium_light_skin_tone_1]=$'\U1F46D\U1F3FD'
+emoji[women_holding_hands_medium_dark_skin_tone_light_skin_tone]=$'\U1F469\U1F3FE\U200D\U1F91D\U200D\U1F469\U1F3FB'
+emoji[women_holding_hands_medium_dark_skin_tone_medium_light_skin_tone]=$'\U1F469\U1F3FE\U200D\U1F91D\U200D\U1F469\U1F3FC'
+emoji[women_holding_hands_medium_dark_skin_tone_medium_skin_tone]=$'\U1F469\U1F3FE\U200D\U1F91D\U200D\U1F469\U1F3FD'
+emoji[women_holding_hands_medium_dark_skin_tone_medium_skin_tone_1]=$'\U1F46D\U1F3FE'
+emoji[women_holding_hands_dark_skin_tone_light_skin_tone]=$'\U1F469\U1F3FF\U200D\U1F91D\U200D\U1F469\U1F3FB'
+emoji[women_holding_hands_dark_skin_tone_medium_light_skin_tone]=$'\U1F469\U1F3FF\U200D\U1F91D\U200D\U1F469\U1F3FC'
+emoji[women_holding_hands_dark_skin_tone_medium_skin_tone]=$'\U1F469\U1F3FF\U200D\U1F91D\U200D\U1F469\U1F3FD'
+emoji[women_holding_hands_dark_skin_tone_medium_dark_skin_tone]=$'\U1F469\U1F3FF\U200D\U1F91D\U200D\U1F469\U1F3FE'
+emoji[women_holding_hands_dark_skin_tone_medium_dark_skin_tone_1]=$'\U1F46D\U1F3FF'
+emoji[woman_and_man_holding_hands]=$'\U1F46B'
+emoji[couple]=$'\U1F46B'
+emoji[woman_and_man_holding_hands_light_skin_tone]=$'\U1F46B\U1F3FB'
+emoji[woman_and_man_holding_hands_light_skin_tone_medium_light_skin_tone]=$'\U1F469\U1F3FB\U200D\U1F91D\U200D\U1F468\U1F3FC'
+emoji[woman_and_man_holding_hands_light_skin_tone_medium_skin_tone]=$'\U1F469\U1F3FB\U200D\U1F91D\U200D\U1F468\U1F3FD'
+emoji[woman_and_man_holding_hands_light_skin_tone_medium_dark_skin_tone]=$'\U1F469\U1F3FB\U200D\U1F91D\U200D\U1F468\U1F3FE'
+emoji[woman_and_man_holding_hands_light_skin_tone_dark_skin_tone]=$'\U1F469\U1F3FB\U200D\U1F91D\U200D\U1F468\U1F3FF'
+emoji[woman_and_man_holding_hands_medium_light_skin_tone_light_skin_tone]=$'\U1F469\U1F3FC\U200D\U1F91D\U200D\U1F468\U1F3FB'
+emoji[woman_and_man_holding_hands_medium_light_skin_tone_light_skin_tone_1]=$'\U1F46B\U1F3FC'
+emoji[woman_and_man_holding_hands_medium_light_skin_tone_medium_skin_tone]=$'\U1F469\U1F3FC\U200D\U1F91D\U200D\U1F468\U1F3FD'
+emoji[woman_and_man_holding_hands_medium_light_skin_tone_medium_dark_skin_tone]=$'\U1F469\U1F3FC\U200D\U1F91D\U200D\U1F468\U1F3FE'
+emoji[woman_and_man_holding_hands_medium_light_skin_tone_dark_skin_tone]=$'\U1F469\U1F3FC\U200D\U1F91D\U200D\U1F468\U1F3FF'
+emoji[woman_and_man_holding_hands_medium_skin_tone_light_skin_tone]=$'\U1F469\U1F3FD\U200D\U1F91D\U200D\U1F468\U1F3FB'
+emoji[woman_and_man_holding_hands_medium_skin_tone_medium_light_skin_tone]=$'\U1F469\U1F3FD\U200D\U1F91D\U200D\U1F468\U1F3FC'
+emoji[woman_and_man_holding_hands_medium_skin_tone_medium_light_skin_tone_1]=$'\U1F46B\U1F3FD'
+emoji[woman_and_man_holding_hands_medium_skin_tone_medium_dark_skin_tone]=$'\U1F469\U1F3FD\U200D\U1F91D\U200D\U1F468\U1F3FE'
+emoji[woman_and_man_holding_hands_medium_skin_tone_dark_skin_tone]=$'\U1F469\U1F3FD\U200D\U1F91D\U200D\U1F468\U1F3FF'
+emoji[woman_and_man_holding_hands_medium_dark_skin_tone_light_skin_tone]=$'\U1F469\U1F3FE\U200D\U1F91D\U200D\U1F468\U1F3FB'
+emoji[woman_and_man_holding_hands_medium_dark_skin_tone_medium_light_skin_tone]=$'\U1F469\U1F3FE\U200D\U1F91D\U200D\U1F468\U1F3FC'
+emoji[woman_and_man_holding_hands_medium_dark_skin_tone_medium_skin_tone]=$'\U1F469\U1F3FE\U200D\U1F91D\U200D\U1F468\U1F3FD'
+emoji[woman_and_man_holding_hands_medium_dark_skin_tone_medium_skin_tone_1]=$'\U1F46B\U1F3FE'
+emoji[woman_and_man_holding_hands_medium_dark_skin_tone_dark_skin_tone]=$'\U1F469\U1F3FE\U200D\U1F91D\U200D\U1F468\U1F3FF'
+emoji[woman_and_man_holding_hands_dark_skin_tone_light_skin_tone]=$'\U1F469\U1F3FF\U200D\U1F91D\U200D\U1F468\U1F3FB'
+emoji[woman_and_man_holding_hands_dark_skin_tone_medium_light_skin_tone]=$'\U1F469\U1F3FF\U200D\U1F91D\U200D\U1F468\U1F3FC'
+emoji[woman_and_man_holding_hands_dark_skin_tone_medium_skin_tone]=$'\U1F469\U1F3FF\U200D\U1F91D\U200D\U1F468\U1F3FD'
+emoji[woman_and_man_holding_hands_dark_skin_tone_medium_dark_skin_tone]=$'\U1F469\U1F3FF\U200D\U1F91D\U200D\U1F468\U1F3FE'
+emoji[woman_and_man_holding_hands_dark_skin_tone_medium_dark_skin_tone_1]=$'\U1F46B\U1F3FF'
+emoji[men_holding_hands]=$'\U1F46C'
+emoji[two_men_holding_hands]=$'\U1F46C'
+emoji[men_holding_hands_light_skin_tone]=$'\U1F46C\U1F3FB'
+emoji[men_holding_hands_medium_light_skin_tone_light_skin_tone]=$'\U1F468\U1F3FC\U200D\U1F91D\U200D\U1F468\U1F3FB'
+emoji[men_holding_hands_medium_light_skin_tone_light_skin_tone_1]=$'\U1F46C\U1F3FC'
+emoji[men_holding_hands_medium_skin_tone_light_skin_tone]=$'\U1F468\U1F3FD\U200D\U1F91D\U200D\U1F468\U1F3FB'
+emoji[men_holding_hands_medium_skin_tone_medium_light_skin_tone]=$'\U1F468\U1F3FD\U200D\U1F91D\U200D\U1F468\U1F3FC'
+emoji[men_holding_hands_medium_skin_tone_medium_light_skin_tone_1]=$'\U1F46C\U1F3FD'
+emoji[men_holding_hands_medium_dark_skin_tone_light_skin_tone]=$'\U1F468\U1F3FE\U200D\U1F91D\U200D\U1F468\U1F3FB'
+emoji[men_holding_hands_medium_dark_skin_tone_medium_light_skin_tone]=$'\U1F468\U1F3FE\U200D\U1F91D\U200D\U1F468\U1F3FC'
+emoji[men_holding_hands_medium_dark_skin_tone_medium_skin_tone]=$'\U1F468\U1F3FE\U200D\U1F91D\U200D\U1F468\U1F3FD'
+emoji[men_holding_hands_medium_dark_skin_tone_medium_skin_tone_1]=$'\U1F46C\U1F3FE'
+emoji[men_holding_hands_dark_skin_tone_light_skin_tone]=$'\U1F468\U1F3FF\U200D\U1F91D\U200D\U1F468\U1F3FB'
+emoji[men_holding_hands_dark_skin_tone_medium_light_skin_tone]=$'\U1F468\U1F3FF\U200D\U1F91D\U200D\U1F468\U1F3FC'
+emoji[men_holding_hands_dark_skin_tone_medium_skin_tone]=$'\U1F468\U1F3FF\U200D\U1F91D\U200D\U1F468\U1F3FD'
+emoji[men_holding_hands_dark_skin_tone_medium_dark_skin_tone]=$'\U1F468\U1F3FF\U200D\U1F91D\U200D\U1F468\U1F3FE'
+emoji[men_holding_hands_dark_skin_tone_medium_dark_skin_tone_1]=$'\U1F46C\U1F3FF'
+emoji[kiss]=$'\U1F48F'
+emoji[couplekiss]=$'\U1F48F'
+emoji[kiss_woman_man]=$'\U1F469\U200D\U2764\UFE0F\U200D\U1F48B\U200D\U1F468'
+emoji[couplekiss_man_woman]=$'\U1F469\U200D\U2764\UFE0F\U200D\U1F48B\U200D\U1F468'
+emoji[kiss_woman_man_minimally]=$'\U1F469\U200D\U2764\U200D\U1F48B\U200D\U1F468'
+emoji[kiss_man_man]=$'\U1F468\U200D\U2764\UFE0F\U200D\U1F48B\U200D\U1F468'
+emoji[couplekiss_man_man]=$'\U1F468\U200D\U2764\UFE0F\U200D\U1F48B\U200D\U1F468'
+emoji[kiss_man_man_minimally]=$'\U1F468\U200D\U2764\U200D\U1F48B\U200D\U1F468'
+emoji[kiss_woman_woman]=$'\U1F469\U200D\U2764\UFE0F\U200D\U1F48B\U200D\U1F469'
+emoji[couplekiss_woman_woman]=$'\U1F469\U200D\U2764\UFE0F\U200D\U1F48B\U200D\U1F469'
+emoji[kiss_woman_woman_minimally]=$'\U1F469\U200D\U2764\U200D\U1F48B\U200D\U1F469'
+emoji[couple_with_heart]=$'\U1F491'
+emoji[couple_with_heart_woman_man]=$'\U1F469\U200D\U2764\UFE0F\U200D\U1F468'
+emoji[couple_with_heart_woman_man_minimally]=$'\U1F469\U200D\U2764\U200D\U1F468'
+emoji[couple_with_heart_man_man]=$'\U1F468\U200D\U2764\UFE0F\U200D\U1F468'
+emoji[couple_with_heart_man_man_minimally]=$'\U1F468\U200D\U2764\U200D\U1F468'
+emoji[couple_with_heart_woman_woman]=$'\U1F469\U200D\U2764\UFE0F\U200D\U1F469'
+emoji[couple_with_heart_woman_woman_minimally]=$'\U1F469\U200D\U2764\U200D\U1F469'
+emoji[family]=$'\U1F46A'
+emoji[family_man_woman_boy]=$'\U1F468\U200D\U1F469\U200D\U1F466'
+emoji[family_man_woman_girl]=$'\U1F468\U200D\U1F469\U200D\U1F467'
+emoji[family_man_woman_girl_boy]=$'\U1F468\U200D\U1F469\U200D\U1F467\U200D\U1F466'
+emoji[family_man_woman_boy_boy]=$'\U1F468\U200D\U1F469\U200D\U1F466\U200D\U1F466'
+emoji[family_man_woman_girl_girl]=$'\U1F468\U200D\U1F469\U200D\U1F467\U200D\U1F467'
+emoji[family_man_man_boy]=$'\U1F468\U200D\U1F468\U200D\U1F466'
+emoji[family_man_man_girl]=$'\U1F468\U200D\U1F468\U200D\U1F467'
+emoji[family_man_man_girl_boy]=$'\U1F468\U200D\U1F468\U200D\U1F467\U200D\U1F466'
+emoji[family_man_man_boy_boy]=$'\U1F468\U200D\U1F468\U200D\U1F466\U200D\U1F466'
+emoji[family_man_man_girl_girl]=$'\U1F468\U200D\U1F468\U200D\U1F467\U200D\U1F467'
+emoji[family_woman_woman_boy]=$'\U1F469\U200D\U1F469\U200D\U1F466'
+emoji[family_woman_woman_girl]=$'\U1F469\U200D\U1F469\U200D\U1F467'
+emoji[family_woman_woman_girl_boy]=$'\U1F469\U200D\U1F469\U200D\U1F467\U200D\U1F466'
+emoji[family_woman_woman_boy_boy]=$'\U1F469\U200D\U1F469\U200D\U1F466\U200D\U1F466'
+emoji[family_woman_woman_girl_girl]=$'\U1F469\U200D\U1F469\U200D\U1F467\U200D\U1F467'
+emoji[family_man_boy]=$'\U1F468\U200D\U1F466'
+emoji[family_man_boy_boy]=$'\U1F468\U200D\U1F466\U200D\U1F466'
+emoji[family_man_girl]=$'\U1F468\U200D\U1F467'
+emoji[family_man_girl_boy]=$'\U1F468\U200D\U1F467\U200D\U1F466'
+emoji[family_man_girl_girl]=$'\U1F468\U200D\U1F467\U200D\U1F467'
+emoji[family_woman_boy]=$'\U1F469\U200D\U1F466'
+emoji[family_woman_boy_boy]=$'\U1F469\U200D\U1F466\U200D\U1F466'
+emoji[family_woman_girl]=$'\U1F469\U200D\U1F467'
+emoji[family_woman_girl_boy]=$'\U1F469\U200D\U1F467\U200D\U1F466'
+emoji[family_woman_girl_girl]=$'\U1F469\U200D\U1F467\U200D\U1F467'
+emoji[speaking_head]=$'\U1F5E3\UFE0F'
+emoji[speaking_head_unqualified]=$'\U1F5E3'
+emoji[bust_in_silhouette]=$'\U1F464'
+emoji[busts_in_silhouette]=$'\U1F465'
+emoji[footprints]=$'\U1F463'
+emoji_mod[light_skin_tone]=$'\U1F3FB'
+emoji_mod[medium_light_skin_tone]=$'\U1F3FC'
+emoji_mod[medium_skin_tone]=$'\U1F3FD'
+emoji_mod[medium_dark_skin_tone]=$'\U1F3FE'
+emoji_mod[medium_dark_skin_tone_1]=$'\U1F3FF'
+emoji_mod[red_hair]=$'\U1F9B0'
+emoji_mod[curly_hair]=$'\U1F9B1'
+emoji_mod[white_hair]=$'\U1F9B3'
+emoji_mod[bald]=$'\U1F9B2'
+emoji[monkey_face]=$'\U1F435'
+emoji[monkey_face_1]=$'\U1F412'
+emoji[monkey]=$'\U1F412'
+emoji[gorilla]=$'\U1F98D'
+emoji[orangutan]=$'\U1F9A7'
+emoji[dog_face]=$'\U1F436'
+emoji[dog]=$'\U1F436'
+emoji[dog_face_1]=$'\U1F415'
+emoji[dog2]=$'\U1F415'
+emoji[guide_dog]=$'\U1F9AE'
+emoji[service_dog]=$'\U1F415\U200D\U1F9BA'
+emoji[poodle]=$'\U1F429'
+emoji[wolf]=$'\U1F43A'
+emoji[fox]=$'\U1F98A'
+emoji[fox_face]=$'\U1F98A'
+emoji[raccoon]=$'\U1F99D'
+emoji[cat_face]=$'\U1F431'
+emoji[cat]=$'\U1F431'
+emoji[cat_face_1]=$'\U1F408'
+emoji[cat2]=$'\U1F408'
+emoji[lion]=$'\U1F981'
+emoji[tiger_face]=$'\U1F42F'
+emoji[tiger]=$'\U1F42F'
+emoji[tiger_face_1]=$'\U1F405'
+emoji[tiger2]=$'\U1F405'
+emoji[leopard]=$'\U1F406'
+emoji[horse_face]=$'\U1F434'
+emoji[horse]=$'\U1F434'
+emoji[horse_face_1]=$'\U1F40E'
+emoji[racehorse]=$'\U1F40E'
+emoji[unicorn]=$'\U1F984'
+emoji[zebra]=$'\U1F993'
+emoji[deer]=$'\U1F98C'
+emoji[cow_face]=$'\U1F42E'
+emoji[ox]=$'\U1F402'
+emoji[water_buffalo]=$'\U1F403'
+emoji[cow]=$'\U1F404'
+emoji[cow2]=$'\U1F404'
+emoji[pig_face]=$'\U1F437'
+emoji[pig]=$'\U1F437'
+emoji[pig_face_1]=$'\U1F416'
+emoji[pig2]=$'\U1F416'
+emoji[boar]=$'\U1F417'
+emoji[pig_nose]=$'\U1F43D'
+emoji[ram]=$'\U1F40F'
+emoji[ewe]=$'\U1F411'
+emoji[sheep]=$'\U1F411'
+emoji[goat]=$'\U1F410'
+emoji[camel]=$'\U1F42A'
+emoji[dromedary_camel]=$'\U1F42A'
+emoji[two_hump_camel]=$'\U1F42B'
+emoji[llama]=$'\U1F999'
+emoji[giraffe]=$'\U1F992'
+emoji[elephant]=$'\U1F418'
+emoji[rhinoceros]=$'\U1F98F'
+emoji[hippopotamus]=$'\U1F99B'
+emoji[mouse_face]=$'\U1F42D'
+emoji[mouse]=$'\U1F42D'
+emoji[mouse_face_1]=$'\U1F401'
+emoji[mouse2]=$'\U1F401'
+emoji[rat]=$'\U1F400'
+emoji[hamster]=$'\U1F439'
+emoji[rabbit_face]=$'\U1F430'
+emoji[rabbit]=$'\U1F430'
+emoji[rabbit_face_1]=$'\U1F407'
+emoji[rabbit2]=$'\U1F407'
+emoji[chipmunk]=$'\U1F43F\UFE0F'
+emoji[chipmunk_unqualified]=$'\U1F43F'
+emoji[hedgehog]=$'\U1F994'
+emoji[bat]=$'\U1F987'
+emoji[bear]=$'\U1F43B'
+emoji[koala]=$'\U1F428'
+emoji[panda]=$'\U1F43C'
+emoji[panda_face]=$'\U1F43C'
+emoji[sloth]=$'\U1F9A5'
+emoji[otter]=$'\U1F9A6'
+emoji[skunk]=$'\U1F9A8'
+emoji[kangaroo]=$'\U1F998'
+emoji[badger]=$'\U1F9A1'
+emoji[paw_prints]=$'\U1F43E'
+emoji[feet]=$'\U1F43E'
+emoji[turkey]=$'\U1F983'
+emoji[chicken]=$'\U1F414'
+emoji[rooster]=$'\U1F413'
+emoji[hatching_chick]=$'\U1F423'
+emoji[baby_chick]=$'\U1F424'
+emoji[front_facing_baby_chick]=$'\U1F425'
+emoji[hatched_chick]=$'\U1F425'
+emoji[bird]=$'\U1F426'
+emoji[penguin]=$'\U1F427'
+emoji[dove]=$'\U1F54A\UFE0F'
+emoji[dove_unqualified]=$'\U1F54A'
+emoji[eagle]=$'\U1F985'
+emoji[duck]=$'\U1F986'
+emoji[swan]=$'\U1F9A2'
+emoji[owl]=$'\U1F989'
+emoji[flamingo]=$'\U1F9A9'
+emoji[peacock]=$'\U1F99A'
+emoji[parrot]=$'\U1F99C'
+emoji[frog]=$'\U1F438'
+emoji[crocodile]=$'\U1F40A'
+emoji[turtle]=$'\U1F422'
+emoji[lizard]=$'\U1F98E'
+emoji[snake]=$'\U1F40D'
+emoji[dragon_face]=$'\U1F432'
+emoji[dragon_face_1]=$'\U1F409'
+emoji[dragon]=$'\U1F409'
+emoji[sauropod]=$'\U1F995'
+emoji[T_Rex]=$'\U1F996'
+emoji[t-rex]=$'\U1F996'
+emoji[spouting_whale]=$'\U1F433'
+emoji[whale]=$'\U1F433'
+emoji[spouting_whale_1]=$'\U1F40B'
+emoji[whale2]=$'\U1F40B'
+emoji[dolphin]=$'\U1F42C'
+emoji[flipper]=$'\U1F42C'
+emoji[fish]=$'\U1F41F'
+emoji[tropical_fish]=$'\U1F420'
+emoji[blowfish]=$'\U1F421'
+emoji[shark]=$'\U1F988'
+emoji[octopus]=$'\U1F419'
+emoji[spiral_shell]=$'\U1F41A'
+emoji[shell]=$'\U1F41A'
+emoji[snail]=$'\U1F40C'
+emoji[butterfly]=$'\U1F98B'
+emoji[bug]=$'\U1F41B'
+emoji[ant]=$'\U1F41C'
+emoji[honeybee]=$'\U1F41D'
+emoji[bee]=$'\U1F41D'
+emoji[lady_beetle]=$'\U1F41E'
+emoji[beetle]=$'\U1F41E'
+emoji[cricket]=$'\U1F997'
+emoji[spider]=$'\U1F577\UFE0F'
+emoji[spider_unqualified]=$'\U1F577'
+emoji[spider_web]=$'\U1F578\UFE0F'
+emoji[spider_web_unqualified]=$'\U1F578'
+emoji[scorpion]=$'\U1F982'
+emoji[mosquito]=$'\U1F99F'
+emoji[microbe]=$'\U1F9A0'
+emoji[bouquet]=$'\U1F490'
+emoji[cherry_blossom]=$'\U1F338'
+emoji[white_flower]=$'\U1F4AE'
+emoji[rosette]=$'\U1F3F5\UFE0F'
+emoji[rosette_unqualified]=$'\U1F3F5'
+emoji[rosette_unqualified_1]=$'\U1F339'
+emoji[rose]=$'\U1F339'
+emoji[wilted_flower]=$'\U1F940'
+emoji[hibiscus]=$'\U1F33A'
+emoji[sunflower]=$'\U1F33B'
+emoji[blossom]=$'\U1F33C'
+emoji[tulip]=$'\U1F337'
 emoji[seedling]=$'\U1F331'
 emoji[evergreen_tree]=$'\U1F332'
 emoji[deciduous_tree]=$'\U1F333'
 emoji[palm_tree]=$'\U1F334'
 emoji[cactus]=$'\U1F335'
-emoji[hot_pepper]=$'\U1F336'
-emoji[tulip]=$'\U1F337'
-emoji[cherry_blossom]=$'\U1F338'
-emoji[rose]=$'\U1F339'
-emoji[hibiscus]=$'\U1F33A'
-emoji[sunflower]=$'\U1F33B'
-emoji[blossom]=$'\U1F33C'
-emoji[ear_of_maize]=$'\U1F33D'
+emoji[sheaf_of_rice]=$'\U1F33E'
 emoji[ear_of_rice]=$'\U1F33E'
 emoji[herb]=$'\U1F33F'
+emoji[shamrock]=$'\U2618\UFE0F'
+emoji[shamrock_unqualified]=$'\U2618'
 emoji[four_leaf_clover]=$'\U1F340'
 emoji[maple_leaf]=$'\U1F341'
 emoji[fallen_leaf]=$'\U1F342'
 emoji[leaf_fluttering_in_wind]=$'\U1F343'
-emoji[mushroom]=$'\U1F344'
-emoji[tomato]=$'\U1F345'
-emoji[aubergine]=$'\U1F346'
+emoji[leaves]=$'\U1F343'
 emoji[grapes]=$'\U1F347'
 emoji[melon]=$'\U1F348'
 emoji[watermelon]=$'\U1F349'
 emoji[tangerine]=$'\U1F34A'
+emoji[orange]=$'\U1F34A'
+emoji[mandarin]=$'\U1F34A'
 emoji[lemon]=$'\U1F34B'
 emoji[banana]=$'\U1F34C'
 emoji[pineapple]=$'\U1F34D'
+emoji[mango]=$'\U1F96D'
 emoji[red_apple]=$'\U1F34E'
+emoji[apple]=$'\U1F34E'
 emoji[green_apple]=$'\U1F34F'
 emoji[pear]=$'\U1F350'
 emoji[peach]=$'\U1F351'
 emoji[cherries]=$'\U1F352'
 emoji[strawberry]=$'\U1F353'
-emoji[hamburger]=$'\U1F354'
-emoji[slice_of_pizza]=$'\U1F355'
+emoji[kiwi_fruit]=$'\U1F95D'
+emoji[tomato]=$'\U1F345'
+emoji[coconut]=$'\U1F965'
+emoji[avocado]=$'\U1F951'
+emoji[eggplant]=$'\U1F346'
+emoji[potato]=$'\U1F954'
+emoji[carrot]=$'\U1F955'
+emoji[ear_of_corn]=$'\U1F33D'
+emoji[corn]=$'\U1F33D'
+emoji[hot_pepper]=$'\U1F336\UFE0F'
+emoji[hot_pepper_unqualified]=$'\U1F336'
+emoji[cucumber]=$'\U1F952'
+emoji[leafy_green]=$'\U1F96C'
+emoji[broccoli]=$'\U1F966'
+emoji[garlic]=$'\U1F9C4'
+emoji[onion]=$'\U1F9C5'
+emoji[mushroom]=$'\U1F344'
+emoji[peanuts]=$'\U1F95C'
+emoji[chestnut]=$'\U1F330'
+emoji[bread]=$'\U1F35E'
+emoji[croissant]=$'\U1F950'
+emoji[baguette_bread]=$'\U1F956'
+emoji[pretzel]=$'\U1F968'
+emoji[bagel]=$'\U1F96F'
+emoji[pancakes]=$'\U1F95E'
+emoji[waffle]=$'\U1F9C7'
+emoji[cheese_wedge]=$'\U1F9C0'
+emoji[cheese]=$'\U1F9C0'
 emoji[meat_on_bone]=$'\U1F356'
 emoji[poultry_leg]=$'\U1F357'
+emoji[cut_of_meat]=$'\U1F969'
+emoji[bacon]=$'\U1F953'
+emoji[hamburger]=$'\U1F354'
+emoji[french_fries]=$'\U1F35F'
+emoji[fries]=$'\U1F35F'
+emoji[pizza]=$'\U1F355'
+emoji[hot_dog]=$'\U1F32D'
+emoji[hotdog]=$'\U1F32D'
+emoji[sandwich]=$'\U1F96A'
+emoji[taco]=$'\U1F32E'
+emoji[burrito]=$'\U1F32F'
+emoji[stuffed_flatbread]=$'\U1F959'
+emoji[falafel]=$'\U1F9C6'
+emoji[egg]=$'\U1F95A'
+emoji[cooking]=$'\U1F373'
+emoji[fried_egg]=$'\U1F373'
+emoji[shallow_pan_of_food]=$'\U1F958'
+emoji[pot_of_food]=$'\U1F372'
+emoji[stew]=$'\U1F372'
+emoji[bowl_with_spoon]=$'\U1F963'
+emoji[green_salad]=$'\U1F957'
+emoji[popcorn]=$'\U1F37F'
+emoji[butter]=$'\U1F9C8'
+emoji[salt]=$'\U1F9C2'
+emoji[canned_food]=$'\U1F96B'
+emoji[bento_box]=$'\U1F371'
+emoji[bento]=$'\U1F371'
 emoji[rice_cracker]=$'\U1F358'
 emoji[rice_ball]=$'\U1F359'
 emoji[cooked_rice]=$'\U1F35A'
-emoji[curry_and_rice]=$'\U1F35B'
+emoji[rice]=$'\U1F35A'
+emoji[curry_rice]=$'\U1F35B'
+emoji[curry]=$'\U1F35B'
 emoji[steaming_bowl]=$'\U1F35C'
+emoji[ramen]=$'\U1F35C'
 emoji[spaghetti]=$'\U1F35D'
-emoji[bread]=$'\U1F35E'
-emoji[french_fries]=$'\U1F35F'
 emoji[roasted_sweet_potato]=$'\U1F360'
-emoji[dango]=$'\U1F361'
+emoji[sweet_potato]=$'\U1F360'
 emoji[oden]=$'\U1F362'
 emoji[sushi]=$'\U1F363'
 emoji[fried_shrimp]=$'\U1F364'
-emoji[fish_cake_with_swirl_design]=$'\U1F365'
+emoji[fish_cake_with_swirl]=$'\U1F365'
+emoji[fish_cake]=$'\U1F365'
+emoji[moon_cake]=$'\U1F96E'
+emoji[dango]=$'\U1F361'
+emoji[dumpling]=$'\U1F95F'
+emoji[fortune_cookie]=$'\U1F960'
+emoji[takeout_box]=$'\U1F961'
+emoji[crab]=$'\U1F980'
+emoji[lobster]=$'\U1F99E'
+emoji[shrimp]=$'\U1F990'
+emoji[squid]=$'\U1F991'
+emoji[oyster]=$'\U1F9AA'
 emoji[soft_ice_cream]=$'\U1F366'
+emoji[icecream]=$'\U1F366'
 emoji[shaved_ice]=$'\U1F367'
 emoji[ice_cream]=$'\U1F368'
 emoji[doughnut]=$'\U1F369'
 emoji[cookie]=$'\U1F36A'
+emoji[birthday_cake]=$'\U1F382'
+emoji[birthday]=$'\U1F382'
+emoji[shortcake]=$'\U1F370'
+emoji[cake]=$'\U1F370'
+emoji[cupcake]=$'\U1F9C1'
+emoji[pie]=$'\U1F967'
 emoji[chocolate_bar]=$'\U1F36B'
 emoji[candy]=$'\U1F36C'
 emoji[lollipop]=$'\U1F36D'
 emoji[custard]=$'\U1F36E'
 emoji[honey_pot]=$'\U1F36F'
-emoji[shortcake]=$'\U1F370'
-emoji[bento_box]=$'\U1F371'
-emoji[pot_of_food]=$'\U1F372'
-emoji[cooking]=$'\U1F373'
-emoji[fork_and_knife]=$'\U1F374'
+emoji[baby_bottle]=$'\U1F37C'
+emoji[glass_of_milk]=$'\U1F95B'
+emoji[milk_glass]=$'\U1F95B'
+emoji[hot_beverage]=$'\U2615'
+emoji[coffee]=$'\U2615'
 emoji[teacup_without_handle]=$'\U1F375'
-emoji[sake_bottle_and_cup]=$'\U1F376'
+emoji[tea]=$'\U1F375'
+emoji[sake]=$'\U1F376'
+emoji[bottle_with_popping_cork]=$'\U1F37E'
+emoji[champagne]=$'\U1F37E'
 emoji[wine_glass]=$'\U1F377'
 emoji[cocktail_glass]=$'\U1F378'
+emoji[cocktail]=$'\U1F378'
 emoji[tropical_drink]=$'\U1F379'
 emoji[beer_mug]=$'\U1F37A'
+emoji[beer]=$'\U1F37A'
 emoji[clinking_beer_mugs]=$'\U1F37B'
-emoji[baby_bottle]=$'\U1F37C'
-emoji[fork_and_knife_with_plate]=$'\U1F37D'
-emoji[bottle_with_popping_cork]=$'\U1F37E'
-emoji[popcorn]=$'\U1F37F'
-emoji[ribbon]=$'\U1F380'
-emoji[wrapped_present]=$'\U1F381'
-emoji[birthday_cake]=$'\U1F382'
-emoji[jack_o_lantern]=$'\U1F383'
-emoji[christmas_tree]=$'\U1F384'
-emoji[father_christmas]=$'\U1F385'
-emoji[fireworks]=$'\U1F386'
-emoji[firework_sparkler]=$'\U1F387'
-emoji[balloon]=$'\U1F388'
-emoji[party_popper]=$'\U1F389'
-emoji[confetti_ball]=$'\U1F38A'
-emoji[tanabata_tree]=$'\U1F38B'
-emoji[crossed_flags]=$'\U1F38C'
-emoji[pine_decoration]=$'\U1F38D'
-emoji[japanese_dolls]=$'\U1F38E'
-emoji[carp_streamer]=$'\U1F38F'
-emoji[wind_chime]=$'\U1F390'
-emoji[moon_viewing_ceremony]=$'\U1F391'
-emoji[school_satchel]=$'\U1F392'
-emoji[graduation_cap]=$'\U1F393'
-emoji[military_medal]=$'\U1F396'
-emoji[reminder_ribbon]=$'\U1F397'
-emoji[studio_microphone]=$'\U1F399'
-emoji[level_slider]=$'\U1F39A'
-emoji[control_knobs]=$'\U1F39B'
-emoji[film_frames]=$'\U1F39E'
-emoji[admission_tickets]=$'\U1F39F'
-emoji[carousel_horse]=$'\U1F3A0'
-emoji[ferris_wheel]=$'\U1F3A1'
-emoji[roller_coaster]=$'\U1F3A2'
-emoji[fishing_pole_and_fish]=$'\U1F3A3'
-emoji[microphone]=$'\U1F3A4'
-emoji[movie_camera]=$'\U1F3A5'
-emoji[cinema]=$'\U1F3A6'
-emoji[headphone]=$'\U1F3A7'
-emoji[artist_palette]=$'\U1F3A8'
-emoji[top_hat]=$'\U1F3A9'
-emoji[circus_tent]=$'\U1F3AA'
-emoji[ticket]=$'\U1F3AB'
-emoji[clapper_board]=$'\U1F3AC'
-emoji[performing_arts]=$'\U1F3AD'
-emoji[video_game]=$'\U1F3AE'
-emoji[direct_hit]=$'\U1F3AF'
-emoji[slot_machine]=$'\U1F3B0'
-emoji[billiards]=$'\U1F3B1'
-emoji[game_die]=$'\U1F3B2'
-emoji[bowling]=$'\U1F3B3'
-emoji[flower_playing_cards]=$'\U1F3B4'
-emoji[musical_note]=$'\U1F3B5'
-emoji[multiple_musical_notes]=$'\U1F3B6'
-emoji[saxophone]=$'\U1F3B7'
-emoji[guitar]=$'\U1F3B8'
-emoji[musical_keyboard]=$'\U1F3B9'
-emoji[trumpet]=$'\U1F3BA'
-emoji[violin]=$'\U1F3BB'
-emoji[musical_score]=$'\U1F3BC'
-emoji[running_shirt_with_sash]=$'\U1F3BD'
-emoji[tennis_racquet_and_ball]=$'\U1F3BE'
-emoji[ski_and_ski_boot]=$'\U1F3BF'
-emoji[basketball_and_hoop]=$'\U1F3C0'
-emoji[chequered_flag]=$'\U1F3C1'
-emoji[snowboarder]=$'\U1F3C2'
-emoji[runner]=$'\U1F3C3'
-emoji[surfer]=$'\U1F3C4'
-emoji[sports_medal]=$'\U1F3C5'
-emoji[trophy]=$'\U1F3C6'
-emoji[horse_racing]=$'\U1F3C7'
-emoji[american_football]=$'\U1F3C8'
-emoji[rugby_football]=$'\U1F3C9'
-emoji[swimmer]=$'\U1F3CA'
-emoji[weight_lifter]=$'\U1F3CB'
-emoji[golfer]=$'\U1F3CC'
-emoji[racing_motorcycle]=$'\U1F3CD'
-emoji[racing_car]=$'\U1F3CE'
-emoji[cricket_bat_and_ball]=$'\U1F3CF'
-emoji[volleyball]=$'\U1F3D0'
-emoji[field_hockey_stick_and_ball]=$'\U1F3D1'
-emoji[ice_hockey_stick_and_puck]=$'\U1F3D2'
-emoji[table_tennis_paddle_and_ball]=$'\U1F3D3'
-emoji[snow_capped_mountain]=$'\U1F3D4'
-emoji[camping]=$'\U1F3D5'
-emoji[beach_with_umbrella]=$'\U1F3D6'
-emoji[building_construction]=$'\U1F3D7'
-emoji[house_buildings]=$'\U1F3D8'
-emoji[cityscape]=$'\U1F3D9'
-emoji[derelict_house_building]=$'\U1F3DA'
-emoji[classical_building]=$'\U1F3DB'
-emoji[desert]=$'\U1F3DC'
-emoji[desert_island]=$'\U1F3DD'
-emoji[national_park]=$'\U1F3DE'
-emoji[stadium]=$'\U1F3DF'
-emoji[house_building]=$'\U1F3E0'
+emoji[beers]=$'\U1F37B'
+emoji[clinking_glasses]=$'\U1F942'
+emoji[tumbler_glass]=$'\U1F943'
+emoji[cup_with_straw]=$'\U1F964'
+emoji[beverage_box]=$'\U1F9C3'
+emoji[mate]=$'\U1F9C9'
+emoji[ice_cube]=$'\U1F9CA'
+emoji[chopsticks]=$'\U1F962'
+emoji[fork_and_knife_with_plate]=$'\U1F37D\UFE0F'
+emoji[fork_and_knife_with_plate_unqualified]=$'\U1F37D'
+emoji[plate_with_cutlery]=$'\U1F37D'
+emoji[fork_and_knife_with_plate_unqualified_1]=$'\U1F374'
+emoji[fork_and_knife]=$'\U1F374'
+emoji[spoon]=$'\U1F944'
+emoji[kitchen_knife]=$'\U1F52A'
+emoji[hocho]=$'\U1F52A'
+emoji[knife]=$'\U1F52A'
+emoji[amphora]=$'\U1F3FA'
+emoji[globe_showing_Europe_Africa]=$'\U1F30D'
+emoji[earth_africa]=$'\U1F30D'
+emoji[globe_showing_Americas]=$'\U1F30E'
+emoji[earth_americas]=$'\U1F30E'
+emoji[globe_showing_Asia_Australia]=$'\U1F30F'
+emoji[earth_asia]=$'\U1F30F'
+emoji[globe_with_meridians]=$'\U1F310'
+emoji[world_map]=$'\U1F5FA\UFE0F'
+emoji[world_map_unqualified]=$'\U1F5FA'
+emoji[map_of_Japan]=$'\U1F5FE'
+emoji[japan]=$'\U1F5FE'
+emoji[compass]=$'\U1F9ED'
+emoji[snow_capped_mountain]=$'\U1F3D4\UFE0F'
+emoji[snow_capped_mountain_unqualified]=$'\U1F3D4'
+emoji[mountain_snow]=$'\U1F3D4'
+emoji[snow_capped_mountain_unqualified_1]=$'\U26F0\UFE0F'
+emoji[snow_capped_mountain_unqualified_2]=$'\U26F0'
+emoji[mountain]=$'\U26F0'
+emoji[volcano]=$'\U1F30B'
+emoji[mount_fuji]=$'\U1F5FB'
+emoji[camping]=$'\U1F3D5\UFE0F'
+emoji[camping_unqualified]=$'\U1F3D5'
+emoji[beach_with_umbrella]=$'\U1F3D6\UFE0F'
+emoji[beach_with_umbrella_unqualified]=$'\U1F3D6'
+emoji[beach_umbrella]=$'\U1F3D6'
+emoji[desert]=$'\U1F3DC\UFE0F'
+emoji[desert_unqualified]=$'\U1F3DC'
+emoji[desert_island]=$'\U1F3DD\UFE0F'
+emoji[desert_island_unqualified]=$'\U1F3DD'
+emoji[national_park]=$'\U1F3DE\UFE0F'
+emoji[national_park_unqualified]=$'\U1F3DE'
+emoji[stadium]=$'\U1F3DF\UFE0F'
+emoji[stadium_unqualified]=$'\U1F3DF'
+emoji[classical_building]=$'\U1F3DB\UFE0F'
+emoji[classical_building_unqualified]=$'\U1F3DB'
+emoji[building_construction]=$'\U1F3D7\UFE0F'
+emoji[building_construction_unqualified]=$'\U1F3D7'
+emoji[brick]=$'\U1F9F1'
+emoji[bricks]=$'\U1F9F1'
+emoji[houses]=$'\U1F3D8\UFE0F'
+emoji[houses_unqualified]=$'\U1F3D8'
+emoji[derelict_house]=$'\U1F3DA\UFE0F'
+emoji[derelict_house_unqualified]=$'\U1F3DA'
+emoji[derelict_house_unqualified_1]=$'\U1F3E0'
+emoji[house]=$'\U1F3E0'
 emoji[house_with_garden]=$'\U1F3E1'
 emoji[office_building]=$'\U1F3E2'
-emoji[japanese_post_office]=$'\U1F3E3'
+emoji[office]=$'\U1F3E2'
+emoji[Japanese_post_office]=$'\U1F3E3'
+emoji[post_office]=$'\U1F3E3'
+emoji[Japanese_post_office_1]=$'\U1F3E4'
 emoji[european_post_office]=$'\U1F3E4'
 emoji[hospital]=$'\U1F3E5'
 emoji[bank]=$'\U1F3E6'
-emoji[automated_teller_machine]=$'\U1F3E7'
 emoji[hotel]=$'\U1F3E8'
 emoji[love_hotel]=$'\U1F3E9'
 emoji[convenience_store]=$'\U1F3EA'
 emoji[school]=$'\U1F3EB'
 emoji[department_store]=$'\U1F3EC'
 emoji[factory]=$'\U1F3ED'
-emoji[izakaya_lantern]=$'\U1F3EE'
+emoji[Japanese_castle]=$'\U1F3EF'
 emoji[japanese_castle]=$'\U1F3EF'
+emoji[Japanese_castle_1]=$'\U1F3F0'
 emoji[european_castle]=$'\U1F3F0'
-emoji[waving_white_flag]=$'\U1F3F3'
-emoji[waving_black_flag]=$'\U1F3F4'
-emoji[rosette]=$'\U1F3F5'
-emoji[label]=$'\U1F3F7'
-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'
-emoji[water_buffalo]=$'\U1F403'
-emoji[cow]=$'\U1F404'
-emoji[tiger]=$'\U1F405'
-emoji[leopard]=$'\U1F406'
-emoji[rabbit]=$'\U1F407'
-emoji[cat]=$'\U1F408'
-emoji[dragon]=$'\U1F409'
-emoji[crocodile]=$'\U1F40A'
-emoji[whale]=$'\U1F40B'
-emoji[snail]=$'\U1F40C'
-emoji[snake]=$'\U1F40D'
-emoji[horse]=$'\U1F40E'
-emoji[ram]=$'\U1F40F'
-emoji[goat]=$'\U1F410'
-emoji[sheep]=$'\U1F411'
-emoji[monkey]=$'\U1F412'
-emoji[rooster]=$'\U1F413'
-emoji[chicken]=$'\U1F414'
-emoji[dog]=$'\U1F415'
-emoji[pig]=$'\U1F416'
-emoji[boar]=$'\U1F417'
-emoji[elephant]=$'\U1F418'
-emoji[octopus]=$'\U1F419'
-emoji[spiral_shell]=$'\U1F41A'
-emoji[bug]=$'\U1F41B'
-emoji[ant]=$'\U1F41C'
-emoji[honeybee]=$'\U1F41D'
-emoji[lady_beetle]=$'\U1F41E'
-emoji[fish]=$'\U1F41F'
-emoji[tropical_fish]=$'\U1F420'
-emoji[blowfish]=$'\U1F421'
-emoji[turtle]=$'\U1F422'
-emoji[hatching_chick]=$'\U1F423'
-emoji[baby_chick]=$'\U1F424'
-emoji[front_facing_baby_chick]=$'\U1F425'
-emoji[bird]=$'\U1F426'
-emoji[penguin]=$'\U1F427'
-emoji[koala]=$'\U1F428'
-emoji[poodle]=$'\U1F429'
-emoji[dromedary_camel]=$'\U1F42A'
-emoji[bactrian_camel]=$'\U1F42B'
-emoji[dolphin]=$'\U1F42C'
-emoji[mouse_face]=$'\U1F42D'
-emoji[cow_face]=$'\U1F42E'
-emoji[tiger_face]=$'\U1F42F'
-emoji[rabbit_face]=$'\U1F430'
-emoji[cat_face]=$'\U1F431'
-emoji[dragon_face]=$'\U1F432'
-emoji[spouting_whale]=$'\U1F433'
-emoji[horse_face]=$'\U1F434'
-emoji[monkey_face]=$'\U1F435'
-emoji[dog_face]=$'\U1F436'
-emoji[pig_face]=$'\U1F437'
-emoji[frog_face]=$'\U1F438'
-emoji[hamster_face]=$'\U1F439'
-emoji[wolf_face]=$'\U1F43A'
-emoji[bear_face]=$'\U1F43B'
-emoji[panda_face]=$'\U1F43C'
-emoji[pig_nose]=$'\U1F43D'
-emoji[paw_prints]=$'\U1F43E'
-emoji[chipmunk]=$'\U1F43F'
-emoji[eyes]=$'\U1F440'
-emoji[eye]=$'\U1F441'
-emoji[ear]=$'\U1F442'
-emoji[nose]=$'\U1F443'
-emoji[mouth]=$'\U1F444'
-emoji[tongue]=$'\U1F445'
-emoji[white_up_pointing_backhand_index]=$'\U1F446'
-emoji[white_down_pointing_backhand_index]=$'\U1F447'
-emoji[white_left_pointing_backhand_index]=$'\U1F448'
-emoji[white_right_pointing_backhand_index]=$'\U1F449'
-emoji[fisted_hand_sign]=$'\U1F44A'
-emoji[waving_hand_sign]=$'\U1F44B'
-emoji[ok_hand_sign]=$'\U1F44C'
-emoji[thumbs_up_sign]=$'\U1F44D'
-emoji[thumbs_down_sign]=$'\U1F44E'
-emoji[clapping_hands_sign]=$'\U1F44F'
-emoji[open_hands_sign]=$'\U1F450'
-emoji[crown]=$'\U1F451'
-emoji[womans_hat]=$'\U1F452'
-emoji[eyeglasses]=$'\U1F453'
-emoji[necktie]=$'\U1F454'
-emoji[t_shirt]=$'\U1F455'
-emoji[jeans]=$'\U1F456'
-emoji[dress]=$'\U1F457'
-emoji[kimono]=$'\U1F458'
-emoji[bikini]=$'\U1F459'
-emoji[womans_clothes]=$'\U1F45A'
-emoji[purse]=$'\U1F45B'
-emoji[handbag]=$'\U1F45C'
-emoji[pouch]=$'\U1F45D'
-emoji[mans_shoe]=$'\U1F45E'
-emoji[athletic_shoe]=$'\U1F45F'
-emoji[high_heeled_shoe]=$'\U1F460'
-emoji[womans_sandal]=$'\U1F461'
-emoji[womans_boots]=$'\U1F462'
-emoji[footprints]=$'\U1F463'
-emoji[bust_in_silhouette]=$'\U1F464'
-emoji[busts_in_silhouette]=$'\U1F465'
-emoji[boy]=$'\U1F466'
-emoji[girl]=$'\U1F467'
-emoji[man]=$'\U1F468'
-emoji[woman]=$'\U1F469'
-emoji[family]=$'\U1F46A'
-emoji[man_and_woman_holding_hands]=$'\U1F46B'
-emoji[two_men_holding_hands]=$'\U1F46C'
-emoji[two_women_holding_hands]=$'\U1F46D'
-emoji[police_officer]=$'\U1F46E'
-emoji[woman_with_bunny_ears]=$'\U1F46F'
-emoji[bride_with_veil]=$'\U1F470'
-emoji[person_with_blond_hair]=$'\U1F471'
-emoji[man_with_gua_pi_mao]=$'\U1F472'
-emoji[man_with_turban]=$'\U1F473'
-emoji[older_man]=$'\U1F474'
-emoji[older_woman]=$'\U1F475'
-emoji[baby]=$'\U1F476'
-emoji[construction_worker]=$'\U1F477'
-emoji[princess]=$'\U1F478'
-emoji[japanese_ogre]=$'\U1F479'
-emoji[japanese_goblin]=$'\U1F47A'
-emoji[ghost]=$'\U1F47B'
-emoji[baby_angel]=$'\U1F47C'
-emoji[extraterrestrial_alien]=$'\U1F47D'
-emoji[alien_monster]=$'\U1F47E'
-emoji[imp]=$'\U1F47F'
-emoji[skull]=$'\U1F480'
-emoji[information_desk_person]=$'\U1F481'
-emoji[guardsman]=$'\U1F482'
-emoji[dancer]=$'\U1F483'
-emoji[lipstick]=$'\U1F484'
-emoji[nail_polish]=$'\U1F485'
-emoji[face_massage]=$'\U1F486'
-emoji[haircut]=$'\U1F487'
-emoji[barber_pole]=$'\U1F488'
-emoji[syringe]=$'\U1F489'
-emoji[pill]=$'\U1F48A'
-emoji[kiss_mark]=$'\U1F48B'
-emoji[love_letter]=$'\U1F48C'
-emoji[ring]=$'\U1F48D'
-emoji[gem_stone]=$'\U1F48E'
-emoji[kiss]=$'\U1F48F'
-emoji[bouquet]=$'\U1F490'
-emoji[couple_with_heart]=$'\U1F491'
 emoji[wedding]=$'\U1F492'
-emoji[beating_heart]=$'\U1F493'
-emoji[broken_heart]=$'\U1F494'
-emoji[two_hearts]=$'\U1F495'
-emoji[sparkling_heart]=$'\U1F496'
-emoji[growing_heart]=$'\U1F497'
-emoji[heart_with_arrow]=$'\U1F498'
-emoji[blue_heart]=$'\U1F499'
-emoji[green_heart]=$'\U1F49A'
-emoji[yellow_heart]=$'\U1F49B'
-emoji[purple_heart]=$'\U1F49C'
-emoji[heart_with_ribbon]=$'\U1F49D'
-emoji[revolving_hearts]=$'\U1F49E'
-emoji[heart_decoration]=$'\U1F49F'
-emoji[diamond_shape_with_a_dot_inside]=$'\U1F4A0'
-emoji[electric_light_bulb]=$'\U1F4A1'
-emoji[anger_symbol]=$'\U1F4A2'
-emoji[bomb]=$'\U1F4A3'
-emoji[sleeping_symbol]=$'\U1F4A4'
-emoji[collision_symbol]=$'\U1F4A5'
-emoji[splashing_sweat_symbol]=$'\U1F4A6'
-emoji[droplet]=$'\U1F4A7'
-emoji[dash_symbol]=$'\U1F4A8'
-emoji[pile_of_poo]=$'\U1F4A9'
-emoji[flexed_biceps]=$'\U1F4AA'
-emoji[dizzy_symbol]=$'\U1F4AB'
-emoji[speech_balloon]=$'\U1F4AC'
-emoji[thought_balloon]=$'\U1F4AD'
-emoji[white_flower]=$'\U1F4AE'
-emoji[hundred_points_symbol]=$'\U1F4AF'
-emoji[money_bag]=$'\U1F4B0'
-emoji[currency_exchange]=$'\U1F4B1'
-emoji[heavy_dollar_sign]=$'\U1F4B2'
-emoji[credit_card]=$'\U1F4B3'
-emoji[banknote_with_yen_sign]=$'\U1F4B4'
-emoji[banknote_with_dollar_sign]=$'\U1F4B5'
-emoji[banknote_with_euro_sign]=$'\U1F4B6'
-emoji[banknote_with_pound_sign]=$'\U1F4B7'
-emoji[money_with_wings]=$'\U1F4B8'
-emoji[chart_with_upwards_trend_and_yen_sign]=$'\U1F4B9'
-emoji[seat]=$'\U1F4BA'
-emoji[personal_computer]=$'\U1F4BB'
-emoji[briefcase]=$'\U1F4BC'
-emoji[minidisc]=$'\U1F4BD'
-emoji[floppy_disk]=$'\U1F4BE'
-emoji[optical_disc]=$'\U1F4BF'
-emoji[dvd]=$'\U1F4C0'
-emoji[file_folder]=$'\U1F4C1'
-emoji[open_file_folder]=$'\U1F4C2'
-emoji[page_with_curl]=$'\U1F4C3'
-emoji[page_facing_up]=$'\U1F4C4'
-emoji[calendar]=$'\U1F4C5'
-emoji[tear_off_calendar]=$'\U1F4C6'
-emoji[card_index]=$'\U1F4C7'
-emoji[chart_with_upwards_trend]=$'\U1F4C8'
-emoji[chart_with_downwards_trend]=$'\U1F4C9'
-emoji[bar_chart]=$'\U1F4CA'
-emoji[clipboard]=$'\U1F4CB'
-emoji[pushpin]=$'\U1F4CC'
-emoji[round_pushpin]=$'\U1F4CD'
-emoji[paperclip]=$'\U1F4CE'
-emoji[straight_ruler]=$'\U1F4CF'
-emoji[triangular_ruler]=$'\U1F4D0'
-emoji[bookmark_tabs]=$'\U1F4D1'
-emoji[ledger]=$'\U1F4D2'
-emoji[notebook]=$'\U1F4D3'
-emoji[notebook_with_decorative_cover]=$'\U1F4D4'
-emoji[closed_book]=$'\U1F4D5'
-emoji[open_book]=$'\U1F4D6'
-emoji[green_book]=$'\U1F4D7'
-emoji[blue_book]=$'\U1F4D8'
-emoji[orange_book]=$'\U1F4D9'
-emoji[books]=$'\U1F4DA'
-emoji[name_badge]=$'\U1F4DB'
-emoji[scroll]=$'\U1F4DC'
-emoji[memo]=$'\U1F4DD'
-emoji[telephone_receiver]=$'\U1F4DE'
-emoji[pager]=$'\U1F4DF'
-emoji[fax_machine]=$'\U1F4E0'
-emoji[satellite_antenna]=$'\U1F4E1'
-emoji[public_address_loudspeaker]=$'\U1F4E2'
-emoji[cheering_megaphone]=$'\U1F4E3'
-emoji[outbox_tray]=$'\U1F4E4'
-emoji[inbox_tray]=$'\U1F4E5'
-emoji[package]=$'\U1F4E6'
-emoji[e_mail_symbol]=$'\U1F4E7'
-emoji[incoming_envelope]=$'\U1F4E8'
-emoji[envelope_with_downwards_arrow_above]=$'\U1F4E9'
-emoji[closed_mailbox_with_lowered_flag]=$'\U1F4EA'
-emoji[closed_mailbox_with_raised_flag]=$'\U1F4EB'
-emoji[open_mailbox_with_raised_flag]=$'\U1F4EC'
-emoji[open_mailbox_with_lowered_flag]=$'\U1F4ED'
-emoji[postbox]=$'\U1F4EE'
-emoji[postal_horn]=$'\U1F4EF'
-emoji[newspaper]=$'\U1F4F0'
-emoji[mobile_phone]=$'\U1F4F1'
-emoji[mobile_phone_with_rightwards_arrow_at_left]=$'\U1F4F2'
-emoji[vibration_mode]=$'\U1F4F3'
-emoji[mobile_phone_off]=$'\U1F4F4'
-emoji[no_mobile_phones]=$'\U1F4F5'
-emoji[antenna_with_bars]=$'\U1F4F6'
-emoji[camera]=$'\U1F4F7'
-emoji[camera_with_flash]=$'\U1F4F8'
-emoji[video_camera]=$'\U1F4F9'
-emoji[television]=$'\U1F4FA'
-emoji[radio]=$'\U1F4FB'
-emoji[videocassette]=$'\U1F4FC'
-emoji[film_projector]=$'\U1F4FD'
-emoji[prayer_beads]=$'\U1F4FF'
-emoji[twisted_rightwards_arrows]=$'\U1F500'
-emoji[clockwise_rightwards_and_leftwards_open_circle_arrows]=$'\U1F501'
-emoji[clockwise_rightwards_and_leftwards_open_circle_arrows_with_circled_one_overlay]=$'\U1F502'
-emoji[clockwise_downwards_and_upwards_open_circle_arrows]=$'\U1F503'
-emoji[anticlockwise_downwards_and_upwards_open_circle_arrows]=$'\U1F504'
-emoji[low_brightness_symbol]=$'\U1F505'
-emoji[high_brightness_symbol]=$'\U1F506'
-emoji[speaker_with_cancellation_stroke]=$'\U1F507'
-emoji[speaker]=$'\U1F508'
-emoji[speaker_with_one_sound_wave]=$'\U1F509'
-emoji[speaker_with_three_sound_waves]=$'\U1F50A'
-emoji[battery]=$'\U1F50B'
-emoji[electric_plug]=$'\U1F50C'
-emoji[left_pointing_magnifying_glass]=$'\U1F50D'
-emoji[right_pointing_magnifying_glass]=$'\U1F50E'
-emoji[lock_with_ink_pen]=$'\U1F50F'
-emoji[closed_lock_with_key]=$'\U1F510'
-emoji[key]=$'\U1F511'
-emoji[lock]=$'\U1F512'
-emoji[open_lock]=$'\U1F513'
-emoji[bell]=$'\U1F514'
-emoji[bell_with_cancellation_stroke]=$'\U1F515'
-emoji[bookmark]=$'\U1F516'
-emoji[link_symbol]=$'\U1F517'
-emoji[radio_button]=$'\U1F518'
-emoji[back_with_leftwards_arrow_above]=$'\U1F519'
-emoji[end_with_leftwards_arrow_above]=$'\U1F51A'
-emoji[on_with_exclamation_mark_with_left_right_arrow_above]=$'\U1F51B'
-emoji[soon_with_rightwards_arrow_above]=$'\U1F51C'
-emoji[top_with_upwards_arrow_above]=$'\U1F51D'
-emoji[no_one_under_eighteen_symbol]=$'\U1F51E'
-emoji[keycap_ten]=$'\U1F51F'
-emoji[input_symbol_for_latin_capital_letters]=$'\U1F520'
-emoji[input_symbol_for_latin_small_letters]=$'\U1F521'
-emoji[input_symbol_for_numbers]=$'\U1F522'
-emoji[input_symbol_for_symbols]=$'\U1F523'
-emoji[input_symbol_for_latin_letters]=$'\U1F524'
-emoji[fire]=$'\U1F525'
-emoji[electric_torch]=$'\U1F526'
-emoji[wrench]=$'\U1F527'
-emoji[hammer]=$'\U1F528'
-emoji[nut_and_bolt]=$'\U1F529'
-emoji[hocho]=$'\U1F52A'
-emoji[pistol]=$'\U1F52B'
-emoji[microscope]=$'\U1F52C'
-emoji[telescope]=$'\U1F52D'
-emoji[crystal_ball]=$'\U1F52E'
-emoji[six_pointed_star_with_middle_dot]=$'\U1F52F'
-emoji[japanese_symbol_for_beginner]=$'\U1F530'
-emoji[trident_emblem]=$'\U1F531'
-emoji[black_square_button]=$'\U1F532'
-emoji[white_square_button]=$'\U1F533'
-emoji[large_red_circle]=$'\U1F534'
-emoji[large_blue_circle]=$'\U1F535'
-emoji[large_orange_diamond]=$'\U1F536'
-emoji[large_blue_diamond]=$'\U1F537'
-emoji[small_orange_diamond]=$'\U1F538'
-emoji[small_blue_diamond]=$'\U1F539'
-emoji[up_pointing_red_triangle]=$'\U1F53A'
-emoji[down_pointing_red_triangle]=$'\U1F53B'
-emoji[up_pointing_small_red_triangle]=$'\U1F53C'
-emoji[down_pointing_small_red_triangle]=$'\U1F53D'
-emoji[om_symbol]=$'\U1F549'
-emoji[dove_of_peace]=$'\U1F54A'
-emoji[kaaba]=$'\U1F54B'
-emoji[mosque]=$'\U1F54C'
-emoji[synagogue]=$'\U1F54D'
-emoji[menorah_with_nine_branches]=$'\U1F54E'
-emoji[clock_face_one_oclock]=$'\U1F550'
-emoji[clock_face_two_oclock]=$'\U1F551'
-emoji[clock_face_three_oclock]=$'\U1F552'
-emoji[clock_face_four_oclock]=$'\U1F553'
-emoji[clock_face_five_oclock]=$'\U1F554'
-emoji[clock_face_six_oclock]=$'\U1F555'
-emoji[clock_face_seven_oclock]=$'\U1F556'
-emoji[clock_face_eight_oclock]=$'\U1F557'
-emoji[clock_face_nine_oclock]=$'\U1F558'
-emoji[clock_face_ten_oclock]=$'\U1F559'
-emoji[clock_face_eleven_oclock]=$'\U1F55A'
-emoji[clock_face_twelve_oclock]=$'\U1F55B'
-emoji[clock_face_one_thirty]=$'\U1F55C'
-emoji[clock_face_two_thirty]=$'\U1F55D'
-emoji[clock_face_three_thirty]=$'\U1F55E'
-emoji[clock_face_four_thirty]=$'\U1F55F'
-emoji[clock_face_five_thirty]=$'\U1F560'
-emoji[clock_face_six_thirty]=$'\U1F561'
-emoji[clock_face_seven_thirty]=$'\U1F562'
-emoji[clock_face_eight_thirty]=$'\U1F563'
-emoji[clock_face_nine_thirty]=$'\U1F564'
-emoji[clock_face_ten_thirty]=$'\U1F565'
-emoji[clock_face_eleven_thirty]=$'\U1F566'
-emoji[clock_face_twelve_thirty]=$'\U1F567'
-emoji[candle]=$'\U1F56F'
-emoji[mantelpiece_clock]=$'\U1F570'
-emoji[hole]=$'\U1F573'
-emoji[man_in_business_suit_levitating]=$'\U1F574'
-emoji[sleuth_or_spy]=$'\U1F575'
-emoji[dark_sunglasses]=$'\U1F576'
-emoji[spider]=$'\U1F577'
-emoji[spider_web]=$'\U1F578'
-emoji[joystick]=$'\U1F579'
-emoji[linked_paperclips]=$'\U1F587'
-emoji[lower_left_ballpoint_pen]=$'\U1F58A'
-emoji[lower_left_fountain_pen]=$'\U1F58B'
-emoji[lower_left_paintbrush]=$'\U1F58C'
-emoji[lower_left_crayon]=$'\U1F58D'
-emoji[raised_hand_with_fingers_splayed]=$'\U1F590'
-emoji[reversed_hand_with_middle_finger_extended]=$'\U1F595'
-emoji[raised_hand_with_part_between_middle_and_ring_fingers]=$'\U1F596'
-emoji[desktop_computer]=$'\U1F5A5'
-emoji[printer]=$'\U1F5A8'
-emoji[three_button_mouse]=$'\U1F5B1'
-emoji[trackball]=$'\U1F5B2'
-emoji[frame_with_picture]=$'\U1F5BC'
-emoji[card_index_dividers]=$'\U1F5C2'
-emoji[card_file_box]=$'\U1F5C3'
-emoji[file_cabinet]=$'\U1F5C4'
-emoji[wastebasket]=$'\U1F5D1'
-emoji[spiral_note_pad]=$'\U1F5D2'
-emoji[spiral_calendar_pad]=$'\U1F5D3'
-emoji[compression]=$'\U1F5DC'
-emoji[old_key]=$'\U1F5DD'
-emoji[rolled_up_newspaper]=$'\U1F5DE'
-emoji[dagger_knife]=$'\U1F5E1'
-emoji[speaking_head_in_silhouette]=$'\U1F5E3'
-emoji[right_anger_bubble]=$'\U1F5EF'
-emoji[ballot_box_with_ballot]=$'\U1F5F3'
-emoji[world_map]=$'\U1F5FA'
-emoji[mount_fuji]=$'\U1F5FB'
+emoji[Tokyo_tower]=$'\U1F5FC'
 emoji[tokyo_tower]=$'\U1F5FC'
+emoji[Statue_of_Liberty]=$'\U1F5FD'
 emoji[statue_of_liberty]=$'\U1F5FD'
-emoji[silhouette_of_japan]=$'\U1F5FE'
-emoji[moyai]=$'\U1F5FF'
-emoji[grinning_face]=$'\U1F600'
-emoji[grinning_face_with_smiling_eyes]=$'\U1F601'
-emoji[face_with_tears_of_joy]=$'\U1F602'
-emoji[smiling_face_with_open_mouth]=$'\U1F603'
-emoji[smiling_face_with_open_mouth_and_smiling_eyes]=$'\U1F604'
-emoji[smiling_face_with_open_mouth_and_cold_sweat]=$'\U1F605'
-emoji[smiling_face_with_open_mouth_and_tightly_closed_eyes]=$'\U1F606'
-emoji[smiling_face_with_halo]=$'\U1F607'
-emoji[smiling_face_with_horns]=$'\U1F608'
-emoji[winking_face]=$'\U1F609'
-emoji[smiling_face_with_smiling_eyes]=$'\U1F60A'
-emoji[face_savouring_delicious_food]=$'\U1F60B'
-emoji[relieved_face]=$'\U1F60C'
-emoji[smiling_face_with_heart_shaped_eyes]=$'\U1F60D'
-emoji[smiling_face_with_sunglasses]=$'\U1F60E'
-emoji[smirking_face]=$'\U1F60F'
-emoji[neutral_face]=$'\U1F610'
-emoji[expressionless_face]=$'\U1F611'
-emoji[unamused_face]=$'\U1F612'
-emoji[face_with_cold_sweat]=$'\U1F613'
-emoji[pensive_face]=$'\U1F614'
-emoji[confused_face]=$'\U1F615'
-emoji[confounded_face]=$'\U1F616'
-emoji[kissing_face]=$'\U1F617'
-emoji[face_throwing_a_kiss]=$'\U1F618'
-emoji[kissing_face_with_smiling_eyes]=$'\U1F619'
-emoji[kissing_face_with_closed_eyes]=$'\U1F61A'
-emoji[face_with_stuck_out_tongue]=$'\U1F61B'
-emoji[face_with_stuck_out_tongue_and_winking_eye]=$'\U1F61C'
-emoji[face_with_stuck_out_tongue_and_tightly_closed_eyes]=$'\U1F61D'
-emoji[disappointed_face]=$'\U1F61E'
-emoji[worried_face]=$'\U1F61F'
-emoji[angry_face]=$'\U1F620'
-emoji[pouting_face]=$'\U1F621'
-emoji[crying_face]=$'\U1F622'
-emoji[persevering_face]=$'\U1F623'
-emoji[face_with_look_of_triumph]=$'\U1F624'
-emoji[disappointed_but_relieved_face]=$'\U1F625'
-emoji[frowning_face_with_open_mouth]=$'\U1F626'
-emoji[anguished_face]=$'\U1F627'
-emoji[fearful_face]=$'\U1F628'
-emoji[weary_face]=$'\U1F629'
-emoji[sleepy_face]=$'\U1F62A'
-emoji[tired_face]=$'\U1F62B'
-emoji[grimacing_face]=$'\U1F62C'
-emoji[loudly_crying_face]=$'\U1F62D'
-emoji[face_with_open_mouth]=$'\U1F62E'
-emoji[hushed_face]=$'\U1F62F'
-emoji[face_with_open_mouth_and_cold_sweat]=$'\U1F630'
-emoji[face_screaming_in_fear]=$'\U1F631'
-emoji[astonished_face]=$'\U1F632'
-emoji[flushed_face]=$'\U1F633'
-emoji[sleeping_face]=$'\U1F634'
-emoji[dizzy_face]=$'\U1F635'
-emoji[face_without_mouth]=$'\U1F636'
-emoji[face_with_medical_mask]=$'\U1F637'
-emoji[grinning_cat_face_with_smiling_eyes]=$'\U1F638'
-emoji[cat_face_with_tears_of_joy]=$'\U1F639'
-emoji[smiling_cat_face_with_open_mouth]=$'\U1F63A'
-emoji[smiling_cat_face_with_heart_shaped_eyes]=$'\U1F63B'
-emoji[cat_face_with_wry_smile]=$'\U1F63C'
-emoji[kissing_cat_face_with_closed_eyes]=$'\U1F63D'
-emoji[pouting_cat_face]=$'\U1F63E'
-emoji[crying_cat_face]=$'\U1F63F'
-emoji[weary_cat_face]=$'\U1F640'
-emoji[slightly_frowning_face]=$'\U1F641'
-emoji[slightly_smiling_face]=$'\U1F642'
-emoji[upside_down_face]=$'\U1F643'
-emoji[face_with_rolling_eyes]=$'\U1F644'
-emoji[face_with_no_good_gesture]=$'\U1F645'
-emoji[face_with_ok_gesture]=$'\U1F646'
-emoji[person_bowing_deeply]=$'\U1F647'
-emoji[see_no_evil_monkey]=$'\U1F648'
-emoji[hear_no_evil_monkey]=$'\U1F649'
-emoji[speak_no_evil_monkey]=$'\U1F64A'
-emoji[happy_person_raising_one_hand]=$'\U1F64B'
-emoji[person_raising_both_hands_in_celebration]=$'\U1F64C'
-emoji[person_frowning]=$'\U1F64D'
-emoji[person_with_pouting_face]=$'\U1F64E'
-emoji[person_with_folded_hands]=$'\U1F64F'
-emoji[rocket]=$'\U1F680'
-emoji[helicopter]=$'\U1F681'
+emoji[church]=$'\U26EA'
+emoji[mosque]=$'\U1F54C'
+emoji[hindu_temple]=$'\U1F6D5'
+emoji[synagogue]=$'\U1F54D'
+emoji[shinto_shrine]=$'\U26E9\UFE0F'
+emoji[shinto_shrine_unqualified]=$'\U26E9'
+emoji[kaaba]=$'\U1F54B'
+emoji[fountain]=$'\U26F2'
+emoji[tent]=$'\U26FA'
+emoji[foggy]=$'\U1F301'
+emoji[night_with_stars]=$'\U1F303'
+emoji[cityscape]=$'\U1F3D9\UFE0F'
+emoji[cityscape_unqualified]=$'\U1F3D9'
+emoji[sunrise_over_mountains]=$'\U1F304'
+emoji[sunrise_over_mountains_1]=$'\U1F305'
+emoji[sunrise]=$'\U1F305'
+emoji[cityscape_at_dusk]=$'\U1F306'
+emoji[city_sunset]=$'\U1F306'
+emoji[sunset]=$'\U1F307'
+emoji[city_sunrise]=$'\U1F307'
+emoji[bridge_at_night]=$'\U1F309'
+emoji[hot_springs]=$'\U2668\UFE0F'
+emoji[hotsprings]=$'\U2668\UFE0F'
+emoji[hot_springs_unqualified]=$'\U2668'
+emoji[carousel_horse]=$'\U1F3A0'
+emoji[ferris_wheel]=$'\U1F3A1'
+emoji[roller_coaster]=$'\U1F3A2'
+emoji[barber_pole]=$'\U1F488'
+emoji[barber]=$'\U1F488'
+emoji[circus_tent]=$'\U1F3AA'
+emoji[locomotive]=$'\U1F682'
 emoji[steam_locomotive]=$'\U1F682'
 emoji[railway_car]=$'\U1F683'
 emoji[high_speed_train]=$'\U1F684'
-emoji[high_speed_train_with_bullet_nose]=$'\U1F685'
-emoji[train]=$'\U1F686'
+emoji[bullettrain_side]=$'\U1F684'
+emoji[bullet_train]=$'\U1F685'
+emoji[bullettrain_front]=$'\U1F685'
+emoji[bullet_train_1]=$'\U1F686'
+emoji[train2]=$'\U1F686'
 emoji[metro]=$'\U1F687'
 emoji[light_rail]=$'\U1F688'
 emoji[station]=$'\U1F689'
 emoji[tram]=$'\U1F68A'
+emoji[monorail]=$'\U1F69D'
+emoji[mountain_railway]=$'\U1F69E'
 emoji[tram_car]=$'\U1F68B'
+emoji[train]=$'\U1F68B'
 emoji[bus]=$'\U1F68C'
 emoji[oncoming_bus]=$'\U1F68D'
 emoji[trolleybus]=$'\U1F68E'
-emoji[bus_stop]=$'\U1F68F'
 emoji[minibus]=$'\U1F690'
 emoji[ambulance]=$'\U1F691'
 emoji[fire_engine]=$'\U1F692'
@@ -953,351 +3124,4151 @@ emoji[oncoming_police_car]=$'\U1F694'
 emoji[taxi]=$'\U1F695'
 emoji[oncoming_taxi]=$'\U1F696'
 emoji[automobile]=$'\U1F697'
+emoji[car]=$'\U1F697'
+emoji[red_car]=$'\U1F697'
 emoji[oncoming_automobile]=$'\U1F698'
-emoji[recreational_vehicle]=$'\U1F699'
+emoji[sport_utility_vehicle]=$'\U1F699'
+emoji[blue_car]=$'\U1F699'
 emoji[delivery_truck]=$'\U1F69A'
+emoji[truck]=$'\U1F69A'
 emoji[articulated_lorry]=$'\U1F69B'
 emoji[tractor]=$'\U1F69C'
-emoji[monorail]=$'\U1F69D'
-emoji[mountain_railway]=$'\U1F69E'
+emoji[racing_car]=$'\U1F3CE\UFE0F'
+emoji[racing_car_unqualified]=$'\U1F3CE'
+emoji[motorcycle]=$'\U1F3CD\UFE0F'
+emoji[motorcycle_unqualified]=$'\U1F3CD'
+emoji[motor_scooter]=$'\U1F6F5'
+emoji[manual_wheelchair]=$'\U1F9BD'
+emoji[motorized_wheelchair]=$'\U1F9BC'
+emoji[auto_rickshaw]=$'\U1F6FA'
+emoji[bicycle]=$'\U1F6B2'
+emoji[bike]=$'\U1F6B2'
+emoji[kick_scooter]=$'\U1F6F4'
+emoji[skateboard]=$'\U1F6F9'
+emoji[bus_stop]=$'\U1F68F'
+emoji[busstop]=$'\U1F68F'
+emoji[motorway]=$'\U1F6E3\UFE0F'
+emoji[motorway_unqualified]=$'\U1F6E3'
+emoji[railway_track]=$'\U1F6E4\UFE0F'
+emoji[railway_track_unqualified]=$'\U1F6E4'
+emoji[oil_drum]=$'\U1F6E2\UFE0F'
+emoji[oil_drum_unqualified]=$'\U1F6E2'
+emoji[fuel_pump]=$'\U26FD'
+emoji[fuelpump]=$'\U26FD'
+emoji[police_car_light]=$'\U1F6A8'
+emoji[rotating_light]=$'\U1F6A8'
+emoji[horizontal_traffic_light]=$'\U1F6A5'
+emoji[traffic_light]=$'\U1F6A5'
+emoji[vertical_traffic_light]=$'\U1F6A6'
+emoji[stop_sign]=$'\U1F6D1'
+emoji[construction]=$'\U1F6A7'
+emoji[anchor]=$'\U2693'
+emoji[sailboat]=$'\U26F5'
+emoji[boat]=$'\U26F5'
+emoji[canoe]=$'\U1F6F6'
+emoji[speedboat]=$'\U1F6A4'
+emoji[passenger_ship]=$'\U1F6F3\UFE0F'
+emoji[passenger_ship_unqualified]=$'\U1F6F3'
+emoji[ferry]=$'\U26F4\UFE0F'
+emoji[ferry_unqualified]=$'\U26F4'
+emoji[motor_boat]=$'\U1F6E5\UFE0F'
+emoji[motor_boat_unqualified]=$'\U1F6E5'
+emoji[ship]=$'\U1F6A2'
+emoji[airplane]=$'\U2708\UFE0F'
+emoji[airplane_unqualified]=$'\U2708'
+emoji[small_airplane]=$'\U1F6E9\UFE0F'
+emoji[small_airplane_unqualified]=$'\U1F6E9'
+emoji[airplane_departure]=$'\U1F6EB'
+emoji[flight_departure]=$'\U1F6EB'
+emoji[airplane_arrival]=$'\U1F6EC'
+emoji[flight_arrival]=$'\U1F6EC'
+emoji[parachute]=$'\U1FA82'
+emoji[seat]=$'\U1F4BA'
+emoji[helicopter]=$'\U1F681'
 emoji[suspension_railway]=$'\U1F69F'
 emoji[mountain_cableway]=$'\U1F6A0'
 emoji[aerial_tramway]=$'\U1F6A1'
-emoji[ship]=$'\U1F6A2'
-emoji[rowboat]=$'\U1F6A3'
-emoji[speedboat]=$'\U1F6A4'
-emoji[horizontal_traffic_light]=$'\U1F6A5'
-emoji[vertical_traffic_light]=$'\U1F6A6'
-emoji[construction_sign]=$'\U1F6A7'
-emoji[police_cars_revolving_light]=$'\U1F6A8'
-emoji[triangular_flag_on_post]=$'\U1F6A9'
+emoji[satellite]=$'\U1F6F0\UFE0F'
+emoji[satellite_unqualified]=$'\U1F6F0'
+emoji[artificial_satellite]=$'\U1F6F0'
+emoji[rocket]=$'\U1F680'
+emoji[flying_saucer]=$'\U1F6F8'
+emoji[bellhop_bell]=$'\U1F6CE\UFE0F'
+emoji[bellhop_bell_unqualified]=$'\U1F6CE'
+emoji[luggage]=$'\U1F9F3'
+emoji[hourglass_done]=$'\U231B'
+emoji[hourglass]=$'\U231B'
+emoji[hourglass_not_done]=$'\U23F3'
+emoji[hourglass_flowing_sand]=$'\U23F3'
+emoji[watch]=$'\U231A'
+emoji[alarm_clock]=$'\U23F0'
+emoji[stopwatch]=$'\U23F1\UFE0F'
+emoji[stopwatch_unqualified]=$'\U23F1'
+emoji[timer_clock]=$'\U23F2\UFE0F'
+emoji[timer_clock_unqualified]=$'\U23F2'
+emoji[mantelpiece_clock]=$'\U1F570\UFE0F'
+emoji[mantelpiece_clock_unqualified]=$'\U1F570'
+emoji[twelve_o_clock]=$'\U1F55B'
+emoji[clock12]=$'\U1F55B'
+emoji[twelve_thirty]=$'\U1F567'
+emoji[clock1230]=$'\U1F567'
+emoji[one_o_clock]=$'\U1F550'
+emoji[clock1]=$'\U1F550'
+emoji[one_thirty]=$'\U1F55C'
+emoji[clock130]=$'\U1F55C'
+emoji[two_o_clock]=$'\U1F551'
+emoji[clock2]=$'\U1F551'
+emoji[two_thirty]=$'\U1F55D'
+emoji[clock230]=$'\U1F55D'
+emoji[three_o_clock]=$'\U1F552'
+emoji[clock3]=$'\U1F552'
+emoji[three_thirty]=$'\U1F55E'
+emoji[clock330]=$'\U1F55E'
+emoji[four_o_clock]=$'\U1F553'
+emoji[clock4]=$'\U1F553'
+emoji[four_thirty]=$'\U1F55F'
+emoji[clock430]=$'\U1F55F'
+emoji[five_o_clock]=$'\U1F554'
+emoji[clock5]=$'\U1F554'
+emoji[five_thirty]=$'\U1F560'
+emoji[clock530]=$'\U1F560'
+emoji[six_o_clock]=$'\U1F555'
+emoji[clock6]=$'\U1F555'
+emoji[six_thirty]=$'\U1F561'
+emoji[clock630]=$'\U1F561'
+emoji[seven_o_clock]=$'\U1F556'
+emoji[clock7]=$'\U1F556'
+emoji[seven_thirty]=$'\U1F562'
+emoji[clock730]=$'\U1F562'
+emoji[eight_o_clock]=$'\U1F557'
+emoji[clock8]=$'\U1F557'
+emoji[eight_thirty]=$'\U1F563'
+emoji[clock830]=$'\U1F563'
+emoji[nine_o_clock]=$'\U1F558'
+emoji[clock9]=$'\U1F558'
+emoji[nine_thirty]=$'\U1F564'
+emoji[clock930]=$'\U1F564'
+emoji[ten_o_clock]=$'\U1F559'
+emoji[clock10]=$'\U1F559'
+emoji[ten_thirty]=$'\U1F565'
+emoji[clock1030]=$'\U1F565'
+emoji[eleven_o_clock]=$'\U1F55A'
+emoji[clock11]=$'\U1F55A'
+emoji[eleven_thirty]=$'\U1F566'
+emoji[clock1130]=$'\U1F566'
+emoji[new_moon]=$'\U1F311'
+emoji[waxing_crescent_moon]=$'\U1F312'
+emoji[first_quarter_moon]=$'\U1F313'
+emoji[waxing_gibbous_moon]=$'\U1F314'
+emoji[moon]=$'\U1F314'
+emoji[full_moon]=$'\U1F315'
+emoji[waning_gibbous_moon]=$'\U1F316'
+emoji[last_quarter_moon]=$'\U1F317'
+emoji[waning_crescent_moon]=$'\U1F318'
+emoji[waning_crescent_moon_1]=$'\U1F319'
+emoji[crescent_moon]=$'\U1F319'
+emoji[new_moon_face]=$'\U1F31A'
+emoji[new_moon_with_face]=$'\U1F31A'
+emoji[first_quarter_moon_face]=$'\U1F31B'
+emoji[first_quarter_moon_with_face]=$'\U1F31B'
+emoji[last_quarter_moon_face]=$'\U1F31C'
+emoji[last_quarter_moon_with_face]=$'\U1F31C'
+emoji[thermometer]=$'\U1F321\UFE0F'
+emoji[thermometer_unqualified]=$'\U1F321'
+emoji[sun]=$'\U2600\UFE0F'
+emoji[sunny]=$'\U2600\UFE0F'
+emoji[sun_unqualified]=$'\U2600'
+emoji[full_moon_face]=$'\U1F31D'
+emoji[full_moon_with_face]=$'\U1F31D'
+emoji[sun_with_face]=$'\U1F31E'
+emoji[ringed_planet]=$'\U1FA90'
+emoji[star]=$'\U2B50'
+emoji[glowing_star]=$'\U1F31F'
+emoji[star2]=$'\U1F31F'
+emoji[shooting_star]=$'\U1F320'
+emoji[stars]=$'\U1F320'
+emoji[milky_way]=$'\U1F30C'
+emoji[cloud]=$'\U2601\UFE0F'
+emoji[cloud_unqualified]=$'\U2601'
+emoji[sun_behind_cloud]=$'\U26C5'
+emoji[partly_sunny]=$'\U26C5'
+emoji[cloud_with_lightning_and_rain]=$'\U26C8\UFE0F'
+emoji[cloud_with_lightning_and_rain_unqualified]=$'\U26C8'
+emoji[sun_behind_small_cloud]=$'\U1F324\UFE0F'
+emoji[sun_behind_small_cloud_unqualified]=$'\U1F324'
+emoji[sun_behind_large_cloud]=$'\U1F325\UFE0F'
+emoji[sun_behind_large_cloud_unqualified]=$'\U1F325'
+emoji[sun_behind_rain_cloud]=$'\U1F326\UFE0F'
+emoji[sun_behind_rain_cloud_unqualified]=$'\U1F326'
+emoji[cloud_with_rain]=$'\U1F327\UFE0F'
+emoji[cloud_with_rain_unqualified]=$'\U1F327'
+emoji[cloud_with_snow]=$'\U1F328\UFE0F'
+emoji[cloud_with_snow_unqualified]=$'\U1F328'
+emoji[cloud_with_lightning]=$'\U1F329\UFE0F'
+emoji[cloud_with_lightning_unqualified]=$'\U1F329'
+emoji[tornado]=$'\U1F32A\UFE0F'
+emoji[tornado_unqualified]=$'\U1F32A'
+emoji[fog]=$'\U1F32B\UFE0F'
+emoji[fog_unqualified]=$'\U1F32B'
+emoji[wind_face]=$'\U1F32C\UFE0F'
+emoji[wind_face_unqualified]=$'\U1F32C'
+emoji[cyclone]=$'\U1F300'
+emoji[rainbow]=$'\U1F308'
+emoji[closed_umbrella]=$'\U1F302'
+emoji[closed_umbrella_1]=$'\U2602\UFE0F'
+emoji[open_umbrella]=$'\U2602\UFE0F'
+emoji[umbrella_unqualified]=$'\U2602'
+emoji[umbrella_with_rain_drops]=$'\U2614'
+emoji[umbrella]=$'\U2614'
+emoji[umbrella_on_ground]=$'\U26F1\UFE0F'
+emoji[umbrella_on_ground_unqualified]=$'\U26F1'
+emoji[parasol_on_ground]=$'\U26F1'
+emoji[high_voltage]=$'\U26A1'
+emoji[zap]=$'\U26A1'
+emoji[snowflake]=$'\U2744\UFE0F'
+emoji[snowflake_unqualified]=$'\U2744'
+emoji[snowman]=$'\U2603\UFE0F'
+emoji[snowman_with_snow]=$'\U2603\UFE0F'
+emoji[snowman_unqualified]=$'\U2603'
+emoji[snowman_without_snow]=$'\U26C4'
+emoji[comet]=$'\U2604\UFE0F'
+emoji[comet_unqualified]=$'\U2604'
+emoji[fire]=$'\U1F525'
+emoji[droplet]=$'\U1F4A7'
+emoji[water_wave]=$'\U1F30A'
+emoji[ocean]=$'\U1F30A'
+emoji[jack_o_lantern]=$'\U1F383'
+emoji[Christmas_tree]=$'\U1F384'
+emoji[christmas_tree]=$'\U1F384'
+emoji[fireworks]=$'\U1F386'
+emoji[sparkler]=$'\U1F387'
+emoji[firecracker]=$'\U1F9E8'
+emoji[sparkles]=$'\U2728'
+emoji[balloon]=$'\U1F388'
+emoji[party_popper]=$'\U1F389'
+emoji[tada]=$'\U1F389'
+emoji[confetti_ball]=$'\U1F38A'
+emoji[tanabata_tree]=$'\U1F38B'
+emoji[pine_decoration]=$'\U1F38D'
+emoji[bamboo]=$'\U1F38D'
+emoji[Japanese_dolls]=$'\U1F38E'
+emoji[dolls]=$'\U1F38E'
+emoji[carp_streamer]=$'\U1F38F'
+emoji[flags]=$'\U1F38F'
+emoji[wind_chime]=$'\U1F390'
+emoji[moon_viewing_ceremony]=$'\U1F391'
+emoji[rice_scene]=$'\U1F391'
+emoji[red_envelope]=$'\U1F9E7'
+emoji[ribbon]=$'\U1F380'
+emoji[wrapped_gift]=$'\U1F381'
+emoji[gift]=$'\U1F381'
+emoji[reminder_ribbon]=$'\U1F397\UFE0F'
+emoji[reminder_ribbon_unqualified]=$'\U1F397'
+emoji[admission_tickets]=$'\U1F39F\UFE0F'
+emoji[admission_tickets_unqualified]=$'\U1F39F'
+emoji[tickets]=$'\U1F39F'
+emoji[admission_tickets_unqualified_1]=$'\U1F3AB'
+emoji[ticket]=$'\U1F3AB'
+emoji[military_medal]=$'\U1F396\UFE0F'
+emoji[military_medal_unqualified]=$'\U1F396'
+emoji[medal_military]=$'\U1F396'
+emoji[trophy]=$'\U1F3C6'
+emoji[sports_medal]=$'\U1F3C5'
+emoji[medal_sports]=$'\U1F3C5'
+emoji[1st_place_medal]=$'\U1F947'
+emoji[2nd_place_medal]=$'\U1F948'
+emoji[3rd_place_medal]=$'\U1F949'
+emoji[soccer_ball]=$'\U26BD'
+emoji[soccer]=$'\U26BD'
+emoji[baseball]=$'\U26BE'
+emoji[softball]=$'\U1F94E'
+emoji[basketball]=$'\U1F3C0'
+emoji[volleyball]=$'\U1F3D0'
+emoji[american_football]=$'\U1F3C8'
+emoji[football]=$'\U1F3C8'
+emoji[rugby_football]=$'\U1F3C9'
+emoji[tennis]=$'\U1F3BE'
+emoji[flying_disc]=$'\U1F94F'
+emoji[bowling]=$'\U1F3B3'
+emoji[cricket_game]=$'\U1F3CF'
+emoji[field_hockey]=$'\U1F3D1'
+emoji[ice_hockey]=$'\U1F3D2'
+emoji[lacrosse]=$'\U1F94D'
+emoji[ping_pong]=$'\U1F3D3'
+emoji[badminton]=$'\U1F3F8'
+emoji[boxing_glove]=$'\U1F94A'
+emoji[martial_arts_uniform]=$'\U1F94B'
+emoji[goal_net]=$'\U1F945'
+emoji[flag_in_hole]=$'\U26F3'
+emoji[golf]=$'\U26F3'
+emoji[ice_skate]=$'\U26F8\UFE0F'
+emoji[ice_skate_unqualified]=$'\U26F8'
+emoji[fishing_pole]=$'\U1F3A3'
+emoji[fishing_pole_and_fish]=$'\U1F3A3'
+emoji[diving_mask]=$'\U1F93F'
+emoji[running_shirt]=$'\U1F3BD'
+emoji[running_shirt_with_sash]=$'\U1F3BD'
+emoji[skis]=$'\U1F3BF'
+emoji[ski]=$'\U1F3BF'
+emoji[sled]=$'\U1F6F7'
+emoji[curling_stone]=$'\U1F94C'
+emoji[direct_hit]=$'\U1F3AF'
+emoji[dart]=$'\U1F3AF'
+emoji[yo_yo]=$'\U1FA80'
+emoji[kite]=$'\U1FA81'
+emoji[pool_8_ball]=$'\U1F3B1'
+emoji[8ball]=$'\U1F3B1'
+emoji[crystal_ball]=$'\U1F52E'
+emoji[nazar_amulet]=$'\U1F9FF'
+emoji[video_game]=$'\U1F3AE'
+emoji[joystick]=$'\U1F579\UFE0F'
+emoji[joystick_unqualified]=$'\U1F579'
+emoji[slot_machine]=$'\U1F3B0'
+emoji[game_die]=$'\U1F3B2'
+emoji[puzzle_piece]=$'\U1F9E9'
+emoji[jigsaw]=$'\U1F9E9'
+emoji[teddy_bear]=$'\U1F9F8'
+emoji[spade_suit]=$'\U2660\UFE0F'
+emoji[spades]=$'\U2660\UFE0F'
+emoji[spade_suit_unqualified]=$'\U2660'
+emoji[heart_suit]=$'\U2665\UFE0F'
+emoji[hearts]=$'\U2665\UFE0F'
+emoji[heart_suit_unqualified]=$'\U2665'
+emoji[diamond_suit]=$'\U2666\UFE0F'
+emoji[diamonds]=$'\U2666\UFE0F'
+emoji[diamond_suit_unqualified]=$'\U2666'
+emoji[club_suit]=$'\U2663\UFE0F'
+emoji[clubs]=$'\U2663\UFE0F'
+emoji[club_suit_unqualified]=$'\U2663'
+emoji[chess_pawn]=$'\U265F\UFE0F'
+emoji[chess_pawn_unqualified]=$'\U265F'
+emoji[joker]=$'\U1F0CF'
+emoji[black_joker]=$'\U1F0CF'
+emoji[mahjong_red_dragon]=$'\U1F004'
+emoji[mahjong]=$'\U1F004'
+emoji[flower_playing_cards]=$'\U1F3B4'
+emoji[performing_arts]=$'\U1F3AD'
+emoji[framed_picture]=$'\U1F5BC\UFE0F'
+emoji[framed_picture_unqualified]=$'\U1F5BC'
+emoji[artist_palette]=$'\U1F3A8'
+emoji[art]=$'\U1F3A8'
+emoji[thread]=$'\U1F9F5'
+emoji[yarn]=$'\U1F9F6'
+emoji[glasses]=$'\U1F453'
+emoji[eyeglasses]=$'\U1F453'
+emoji[sunglasses]=$'\U1F576\UFE0F'
+emoji[sunglasses_unqualified]=$'\U1F576'
+emoji[dark_sunglasses]=$'\U1F576'
+emoji[goggles]=$'\U1F97D'
+emoji[lab_coat]=$'\U1F97C'
+emoji[safety_vest]=$'\U1F9BA'
+emoji[necktie]=$'\U1F454'
+emoji[t_shirt]=$'\U1F455'
+emoji[shirt]=$'\U1F455'
+emoji[tshirt]=$'\U1F455'
+emoji[jeans]=$'\U1F456'
+emoji[scarf]=$'\U1F9E3'
+emoji[gloves]=$'\U1F9E4'
+emoji[coat]=$'\U1F9E5'
+emoji[socks]=$'\U1F9E6'
+emoji[dress]=$'\U1F457'
+emoji[kimono]=$'\U1F458'
+emoji[sari]=$'\U1F97B'
+emoji[one_piece_swimsuit]=$'\U1FA71'
+emoji[swim_brief]=$'\U1FA72'
+emoji[shorts]=$'\U1FA73'
+emoji[bikini]=$'\U1F459'
+emoji[woman_s_clothes]=$'\U1F45A'
+emoji[womans_clothes]=$'\U1F45A'
+emoji[purse]=$'\U1F45B'
+emoji[handbag]=$'\U1F45C'
+emoji[clutch_bag]=$'\U1F45D'
+emoji[pouch]=$'\U1F45D'
+emoji[shopping_bags]=$'\U1F6CD\UFE0F'
+emoji[shopping_bags_unqualified]=$'\U1F6CD'
+emoji[shopping]=$'\U1F6CD'
+emoji[backpack]=$'\U1F392'
+emoji[school_satchel]=$'\U1F392'
+emoji[man_s_shoe]=$'\U1F45E'
+emoji[mans_shoe]=$'\U1F45E'
+emoji[shoe]=$'\U1F45E'
+emoji[running_shoe]=$'\U1F45F'
+emoji[athletic_shoe]=$'\U1F45F'
+emoji[hiking_boot]=$'\U1F97E'
+emoji[flat_shoe]=$'\U1F97F'
+emoji[high_heeled_shoe]=$'\U1F460'
+emoji[high_heel]=$'\U1F460'
+emoji[woman_s_sandal]=$'\U1F461'
+emoji[sandal]=$'\U1F461'
+emoji[ballet_shoes]=$'\U1FA70'
+emoji[woman_s_boot]=$'\U1F462'
+emoji[boot]=$'\U1F462'
+emoji[crown]=$'\U1F451'
+emoji[woman_s_hat]=$'\U1F452'
+emoji[womans_hat]=$'\U1F452'
+emoji[top_hat]=$'\U1F3A9'
+emoji[tophat]=$'\U1F3A9'
+emoji[graduation_cap]=$'\U1F393'
+emoji[mortar_board]=$'\U1F393'
+emoji[billed_cap]=$'\U1F9E2'
+emoji[rescue_worker_s_helmet]=$'\U26D1\UFE0F'
+emoji[rescue_worker_s_helmet_unqualified]=$'\U26D1'
+emoji[rescue_worker_helmet]=$'\U26D1'
+emoji[prayer_beads]=$'\U1F4FF'
+emoji[lipstick]=$'\U1F484'
+emoji[ring]=$'\U1F48D'
+emoji[gem_stone]=$'\U1F48E'
+emoji[gem]=$'\U1F48E'
+emoji[muted_speaker]=$'\U1F507'
+emoji[mute]=$'\U1F507'
+emoji[speaker_low_volume]=$'\U1F508'
+emoji[speaker]=$'\U1F508'
+emoji[speaker_medium_volume]=$'\U1F509'
+emoji[sound]=$'\U1F509'
+emoji[speaker_high_volume]=$'\U1F50A'
+emoji[loud_sound]=$'\U1F50A'
+emoji[loudspeaker]=$'\U1F4E2'
+emoji[megaphone]=$'\U1F4E3'
+emoji[mega]=$'\U1F4E3'
+emoji[postal_horn]=$'\U1F4EF'
+emoji[bell]=$'\U1F514'
+emoji[bell_with_slash]=$'\U1F515'
+emoji[no_bell]=$'\U1F515'
+emoji[musical_score]=$'\U1F3BC'
+emoji[musical_note]=$'\U1F3B5'
+emoji[musical_notes]=$'\U1F3B6'
+emoji[notes]=$'\U1F3B6'
+emoji[studio_microphone]=$'\U1F399\UFE0F'
+emoji[studio_microphone_unqualified]=$'\U1F399'
+emoji[level_slider]=$'\U1F39A\UFE0F'
+emoji[level_slider_unqualified]=$'\U1F39A'
+emoji[control_knobs]=$'\U1F39B\UFE0F'
+emoji[control_knobs_unqualified]=$'\U1F39B'
+emoji[microphone]=$'\U1F3A4'
+emoji[headphone]=$'\U1F3A7'
+emoji[headphones]=$'\U1F3A7'
+emoji[radio]=$'\U1F4FB'
+emoji[saxophone]=$'\U1F3B7'
+emoji[guitar]=$'\U1F3B8'
+emoji[musical_keyboard]=$'\U1F3B9'
+emoji[trumpet]=$'\U1F3BA'
+emoji[violin]=$'\U1F3BB'
+emoji[banjo]=$'\U1FA95'
+emoji[drum]=$'\U1F941'
+emoji[mobile_phone]=$'\U1F4F1'
+emoji[iphone]=$'\U1F4F1'
+emoji[mobile_phone_with_arrow]=$'\U1F4F2'
+emoji[calling]=$'\U1F4F2'
+emoji[telephone]=$'\U260E\UFE0F'
+emoji[phone]=$'\U260E\UFE0F'
+emoji[telephone_unqualified]=$'\U260E'
+emoji[telephone_receiver]=$'\U1F4DE'
+emoji[pager]=$'\U1F4DF'
+emoji[fax_machine]=$'\U1F4E0'
+emoji[fax]=$'\U1F4E0'
+emoji[battery]=$'\U1F50B'
+emoji[electric_plug]=$'\U1F50C'
+emoji[laptop_computer]=$'\U1F4BB'
+emoji[computer]=$'\U1F4BB'
+emoji[desktop_computer]=$'\U1F5A5\UFE0F'
+emoji[desktop_computer_unqualified]=$'\U1F5A5'
+emoji[printer]=$'\U1F5A8\UFE0F'
+emoji[printer_unqualified]=$'\U1F5A8'
+emoji[keyboard]=$'\U2328\UFE0F'
+emoji[keyboard_unqualified]=$'\U2328'
+emoji[computer_mouse]=$'\U1F5B1\UFE0F'
+emoji[computer_mouse_unqualified]=$'\U1F5B1'
+emoji[trackball]=$'\U1F5B2\UFE0F'
+emoji[trackball_unqualified]=$'\U1F5B2'
+emoji[computer_disk]=$'\U1F4BD'
+emoji[minidisc]=$'\U1F4BD'
+emoji[floppy_disk]=$'\U1F4BE'
+emoji[optical_disk]=$'\U1F4BF'
+emoji[cd]=$'\U1F4BF'
+emoji[dvd]=$'\U1F4C0'
+emoji[abacus]=$'\U1F9EE'
+emoji[movie_camera]=$'\U1F3A5'
+emoji[film_frames]=$'\U1F39E\UFE0F'
+emoji[film_frames_unqualified]=$'\U1F39E'
+emoji[film_strip]=$'\U1F39E'
+emoji[film_projector]=$'\U1F4FD\UFE0F'
+emoji[film_projector_unqualified]=$'\U1F4FD'
+emoji[clapper_board]=$'\U1F3AC'
+emoji[clapper]=$'\U1F3AC'
+emoji[television]=$'\U1F4FA'
+emoji[tv]=$'\U1F4FA'
+emoji[camera]=$'\U1F4F7'
+emoji[camera_with_flash]=$'\U1F4F8'
+emoji[camera_flash]=$'\U1F4F8'
+emoji[video_camera]=$'\U1F4F9'
+emoji[videocassette]=$'\U1F4FC'
+emoji[vhs]=$'\U1F4FC'
+emoji[magnifying_glass_tilted_left]=$'\U1F50D'
+emoji[mag]=$'\U1F50D'
+emoji[magnifying_glass_tilted_right]=$'\U1F50E'
+emoji[mag_right]=$'\U1F50E'
+emoji[candle]=$'\U1F56F\UFE0F'
+emoji[candle_unqualified]=$'\U1F56F'
+emoji[light_bulb]=$'\U1F4A1'
+emoji[bulb]=$'\U1F4A1'
+emoji[flashlight]=$'\U1F526'
+emoji[red_paper_lantern]=$'\U1F3EE'
+emoji[izakaya_lantern]=$'\U1F3EE'
+emoji[lantern]=$'\U1F3EE'
+emoji[diya_lamp]=$'\U1FA94'
+emoji[notebook_with_decorative_cover]=$'\U1F4D4'
+emoji[closed_book]=$'\U1F4D5'
+emoji[open_book]=$'\U1F4D6'
+emoji[book]=$'\U1F4D6'
+emoji[green_book]=$'\U1F4D7'
+emoji[blue_book]=$'\U1F4D8'
+emoji[orange_book]=$'\U1F4D9'
+emoji[books]=$'\U1F4DA'
+emoji[notebook]=$'\U1F4D3'
+emoji[ledger]=$'\U1F4D2'
+emoji[page_with_curl]=$'\U1F4C3'
+emoji[scroll]=$'\U1F4DC'
+emoji[page_facing_up]=$'\U1F4C4'
+emoji[newspaper]=$'\U1F4F0'
+emoji[rolled_up_newspaper]=$'\U1F5DE\UFE0F'
+emoji[rolled_up_newspaper_unqualified]=$'\U1F5DE'
+emoji[newspaper_roll]=$'\U1F5DE'
+emoji[bookmark_tabs]=$'\U1F4D1'
+emoji[bookmark_tabs_1]=$'\U1F516'
+emoji[bookmark]=$'\U1F516'
+emoji[label]=$'\U1F3F7\UFE0F'
+emoji[label_unqualified]=$'\U1F3F7'
+emoji[money_bag]=$'\U1F4B0'
+emoji[moneybag]=$'\U1F4B0'
+emoji[yen_banknote]=$'\U1F4B4'
+emoji[yen]=$'\U1F4B4'
+emoji[dollar_banknote]=$'\U1F4B5'
+emoji[dollar]=$'\U1F4B5'
+emoji[euro_banknote]=$'\U1F4B6'
+emoji[euro]=$'\U1F4B6'
+emoji[pound_banknote]=$'\U1F4B7'
+emoji[pound]=$'\U1F4B7'
+emoji[money_with_wings]=$'\U1F4B8'
+emoji[credit_card]=$'\U1F4B3'
+emoji[receipt]=$'\U1F9FE'
+emoji[chart_increasing_with_yen]=$'\U1F4B9'
+emoji[chart]=$'\U1F4B9'
+emoji[currency_exchange]=$'\U1F4B1'
+emoji[heavy_dollar_sign]=$'\U1F4B2'
+emoji[envelope]=$'\U2709\UFE0F'
+emoji[email]=$'\U2709\UFE0F'
+emoji[envelope_unqualified]=$'\U2709'
+emoji[e_mail]=$'\U1F4E7'
+emoji[e-mail]=$'\U1F4E7'
+emoji[incoming_envelope]=$'\U1F4E8'
+emoji[envelope_with_arrow]=$'\U1F4E9'
+emoji[outbox_tray]=$'\U1F4E4'
+emoji[inbox_tray]=$'\U1F4E5'
+emoji[package]=$'\U1F4E6'
+emoji[closed_mailbox_with_raised_flag]=$'\U1F4EB'
+emoji[mailbox]=$'\U1F4EB'
+emoji[closed_mailbox_with_lowered_flag]=$'\U1F4EA'
+emoji[mailbox_closed]=$'\U1F4EA'
+emoji[open_mailbox_with_raised_flag]=$'\U1F4EC'
+emoji[mailbox_with_mail]=$'\U1F4EC'
+emoji[open_mailbox_with_lowered_flag]=$'\U1F4ED'
+emoji[mailbox_with_no_mail]=$'\U1F4ED'
+emoji[postbox]=$'\U1F4EE'
+emoji[ballot_box_with_ballot]=$'\U1F5F3\UFE0F'
+emoji[ballot_box_with_ballot_unqualified]=$'\U1F5F3'
+emoji[ballot_box]=$'\U1F5F3'
+emoji[pencil]=$'\U270F\UFE0F'
+emoji[pencil2]=$'\U270F\UFE0F'
+emoji[pencil_unqualified]=$'\U270F'
+emoji[black_nib]=$'\U2712\UFE0F'
+emoji[black_nib_unqualified]=$'\U2712'
+emoji[fountain_pen]=$'\U1F58B\UFE0F'
+emoji[fountain_pen_unqualified]=$'\U1F58B'
+emoji[fountain_pen_unqualified_1]=$'\U1F58A\UFE0F'
+emoji[fountain_pen_unqualified_2]=$'\U1F58A'
+emoji[pen]=$'\U1F58A'
+emoji[paintbrush]=$'\U1F58C\UFE0F'
+emoji[paintbrush_unqualified]=$'\U1F58C'
+emoji[crayon]=$'\U1F58D\UFE0F'
+emoji[crayon_unqualified]=$'\U1F58D'
+emoji[memo]=$'\U1F4DD'
+emoji[briefcase]=$'\U1F4BC'
+emoji[file_folder]=$'\U1F4C1'
+emoji[open_file_folder]=$'\U1F4C2'
+emoji[card_index_dividers]=$'\U1F5C2\UFE0F'
+emoji[card_index_dividers_unqualified]=$'\U1F5C2'
+emoji[calendar]=$'\U1F4C5'
+emoji[date]=$'\U1F4C5'
+emoji[tear_off_calendar]=$'\U1F4C6'
+emoji[spiral_notepad]=$'\U1F5D2\UFE0F'
+emoji[spiral_notepad_unqualified]=$'\U1F5D2'
+emoji[spiral_calendar]=$'\U1F5D3\UFE0F'
+emoji[spiral_calendar_unqualified]=$'\U1F5D3'
+emoji[card_index]=$'\U1F4C7'
+emoji[chart_increasing]=$'\U1F4C8'
+emoji[chart_with_upwards_trend]=$'\U1F4C8'
+emoji[chart_decreasing]=$'\U1F4C9'
+emoji[chart_with_downwards_trend]=$'\U1F4C9'
+emoji[bar_chart]=$'\U1F4CA'
+emoji[clipboard]=$'\U1F4CB'
+emoji[pushpin]=$'\U1F4CC'
+emoji[round_pushpin]=$'\U1F4CD'
+emoji[paperclip]=$'\U1F4CE'
+emoji[linked_paperclips]=$'\U1F587\UFE0F'
+emoji[linked_paperclips_unqualified]=$'\U1F587'
+emoji[paperclips]=$'\U1F587'
+emoji[straight_ruler]=$'\U1F4CF'
+emoji[triangular_ruler]=$'\U1F4D0'
+emoji[scissors]=$'\U2702\UFE0F'
+emoji[scissors_unqualified]=$'\U2702'
+emoji[card_file_box]=$'\U1F5C3\UFE0F'
+emoji[card_file_box_unqualified]=$'\U1F5C3'
+emoji[file_cabinet]=$'\U1F5C4\UFE0F'
+emoji[file_cabinet_unqualified]=$'\U1F5C4'
+emoji[wastebasket]=$'\U1F5D1\UFE0F'
+emoji[wastebasket_unqualified]=$'\U1F5D1'
+emoji[locked]=$'\U1F512'
+emoji[lock]=$'\U1F512'
+emoji[unlocked]=$'\U1F513'
+emoji[unlock]=$'\U1F513'
+emoji[locked_with_pen]=$'\U1F50F'
+emoji[lock_with_ink_pen]=$'\U1F50F'
+emoji[locked_with_key]=$'\U1F510'
+emoji[closed_lock_with_key]=$'\U1F510'
+emoji[locked_with_key_1]=$'\U1F511'
+emoji[key]=$'\U1F511'
+emoji[old_key]=$'\U1F5DD\UFE0F'
+emoji[old_key_unqualified]=$'\U1F5DD'
+emoji[hammer]=$'\U1F528'
+emoji[axe]=$'\U1FA93'
+emoji[pick]=$'\U26CF\UFE0F'
+emoji[pick_unqualified]=$'\U26CF'
+emoji[hammer_and_pick]=$'\U2692\UFE0F'
+emoji[hammer_and_pick_unqualified]=$'\U2692'
+emoji[hammer_and_wrench]=$'\U1F6E0\UFE0F'
+emoji[hammer_and_wrench_unqualified]=$'\U1F6E0'
+emoji[dagger]=$'\U1F5E1\UFE0F'
+emoji[dagger_unqualified]=$'\U1F5E1'
+emoji[crossed_swords]=$'\U2694\UFE0F'
+emoji[crossed_swords_unqualified]=$'\U2694'
+emoji[pistol]=$'\U1F52B'
+emoji[gun]=$'\U1F52B'
+emoji[bow_and_arrow]=$'\U1F3F9'
+emoji[shield]=$'\U1F6E1\UFE0F'
+emoji[shield_unqualified]=$'\U1F6E1'
+emoji[wrench]=$'\U1F527'
+emoji[nut_and_bolt]=$'\U1F529'
+emoji[gear]=$'\U2699\UFE0F'
+emoji[gear_unqualified]=$'\U2699'
+emoji[clamp]=$'\U1F5DC\UFE0F'
+emoji[clamp_unqualified]=$'\U1F5DC'
+emoji[balance_scale]=$'\U2696\UFE0F'
+emoji[balance_scale_unqualified]=$'\U2696'
+emoji[probing_cane]=$'\U1F9AF'
+emoji[link]=$'\U1F517'
+emoji[chains]=$'\U26D3\UFE0F'
+emoji[chains_unqualified]=$'\U26D3'
+emoji[toolbox]=$'\U1F9F0'
+emoji[magnet]=$'\U1F9F2'
+emoji[alembic]=$'\U2697\UFE0F'
+emoji[alembic_unqualified]=$'\U2697'
+emoji[test_tube]=$'\U1F9EA'
+emoji[petri_dish]=$'\U1F9EB'
+emoji[dna]=$'\U1F9EC'
+emoji[microscope]=$'\U1F52C'
+emoji[telescope]=$'\U1F52D'
+emoji[satellite_antenna]=$'\U1F4E1'
+emoji[syringe]=$'\U1F489'
+emoji[drop_of_blood]=$'\U1FA78'
+emoji[pill]=$'\U1F48A'
+emoji[adhesive_bandage]=$'\U1FA79'
+emoji[stethoscope]=$'\U1FA7A'
 emoji[door]=$'\U1F6AA'
-emoji[no_entry_sign]=$'\U1F6AB'
-emoji[smoking_symbol]=$'\U1F6AC'
-emoji[no_smoking_symbol]=$'\U1F6AD'
-emoji[put_litter_in_its_place_symbol]=$'\U1F6AE'
-emoji[do_not_litter_symbol]=$'\U1F6AF'
-emoji[potable_water_symbol]=$'\U1F6B0'
-emoji[non_potable_water_symbol]=$'\U1F6B1'
-emoji[bicycle]=$'\U1F6B2'
-emoji[no_bicycles]=$'\U1F6B3'
-emoji[bicyclist]=$'\U1F6B4'
-emoji[mountain_bicyclist]=$'\U1F6B5'
-emoji[pedestrian]=$'\U1F6B6'
-emoji[no_pedestrians]=$'\U1F6B7'
-emoji[children_crossing]=$'\U1F6B8'
-emoji[mens_symbol]=$'\U1F6B9'
-emoji[womens_symbol]=$'\U1F6BA'
+emoji[bed]=$'\U1F6CF\UFE0F'
+emoji[bed_unqualified]=$'\U1F6CF'
+emoji[couch_and_lamp]=$'\U1F6CB\UFE0F'
+emoji[couch_and_lamp_unqualified]=$'\U1F6CB'
+emoji[chair]=$'\U1FA91'
+emoji[toilet]=$'\U1F6BD'
+emoji[shower]=$'\U1F6BF'
+emoji[bathtub]=$'\U1F6C1'
+emoji[razor]=$'\U1FA92'
+emoji[lotion_bottle]=$'\U1F9F4'
+emoji[safety_pin]=$'\U1F9F7'
+emoji[broom]=$'\U1F9F9'
+emoji[basket]=$'\U1F9FA'
+emoji[roll_of_paper]=$'\U1F9FB'
+emoji[soap]=$'\U1F9FC'
+emoji[sponge]=$'\U1F9FD'
+emoji[fire_extinguisher]=$'\U1F9EF'
+emoji[shopping_cart]=$'\U1F6D2'
+emoji[cigarette]=$'\U1F6AC'
+emoji[smoking]=$'\U1F6AC'
+emoji[coffin]=$'\U26B0\UFE0F'
+emoji[coffin_unqualified]=$'\U26B0'
+emoji[funeral_urn]=$'\U26B1\UFE0F'
+emoji[funeral_urn_unqualified]=$'\U26B1'
+emoji[moai]=$'\U1F5FF'
+emoji[moyai]=$'\U1F5FF'
+emoji[ATM_sign]=$'\U1F3E7'
+emoji[atm]=$'\U1F3E7'
+emoji[litter_in_bin_sign]=$'\U1F6AE'
+emoji[put_litter_in_its_place]=$'\U1F6AE'
+emoji[potable_water]=$'\U1F6B0'
+emoji[wheelchair_symbol]=$'\U267F'
+emoji[wheelchair]=$'\U267F'
+emoji[men_s_room]=$'\U1F6B9'
+emoji[mens]=$'\U1F6B9'
+emoji[women_s_room]=$'\U1F6BA'
+emoji[womens]=$'\U1F6BA'
 emoji[restroom]=$'\U1F6BB'
 emoji[baby_symbol]=$'\U1F6BC'
-emoji[toilet]=$'\U1F6BD'
 emoji[water_closet]=$'\U1F6BE'
-emoji[shower]=$'\U1F6BF'
-emoji[bath]=$'\U1F6C0'
-emoji[bathtub]=$'\U1F6C1'
+emoji[wc]=$'\U1F6BE'
 emoji[passport_control]=$'\U1F6C2'
 emoji[customs]=$'\U1F6C3'
 emoji[baggage_claim]=$'\U1F6C4'
 emoji[left_luggage]=$'\U1F6C5'
-emoji[couch_and_lamp]=$'\U1F6CB'
-emoji[sleeping_accommodation]=$'\U1F6CC'
-emoji[shopping_bags]=$'\U1F6CD'
-emoji[bellhop_bell]=$'\U1F6CE'
-emoji[bed]=$'\U1F6CF'
+emoji[warning]=$'\U26A0\UFE0F'
+emoji[warning_unqualified]=$'\U26A0'
+emoji[children_crossing]=$'\U1F6B8'
+emoji[no_entry]=$'\U26D4'
+emoji[prohibited]=$'\U1F6AB'
+emoji[no_entry_sign]=$'\U1F6AB'
+emoji[no_bicycles]=$'\U1F6B3'
+emoji[no_smoking]=$'\U1F6AD'
+emoji[no_littering]=$'\U1F6AF'
+emoji[do_not_litter]=$'\U1F6AF'
+emoji[non_potable_water]=$'\U1F6B1'
+emoji[non-potable_water]=$'\U1F6B1'
+emoji[no_pedestrians]=$'\U1F6B7'
+emoji[no_mobile_phones]=$'\U1F4F5'
+emoji[no_one_under_eighteen]=$'\U1F51E'
+emoji[underage]=$'\U1F51E'
+emoji[radioactive]=$'\U2622\UFE0F'
+emoji[radioactive_unqualified]=$'\U2622'
+emoji[biohazard]=$'\U2623\UFE0F'
+emoji[biohazard_unqualified]=$'\U2623'
+emoji[up_arrow]=$'\U2B06\UFE0F'
+emoji[arrow_up]=$'\U2B06\UFE0F'
+emoji[up_arrow_unqualified]=$'\U2B06'
+emoji[up_right_arrow]=$'\U2197\UFE0F'
+emoji[arrow_upper_right]=$'\U2197\UFE0F'
+emoji[up_right_arrow_unqualified]=$'\U2197'
+emoji[up_right_arrow_unqualified_1]=$'\U27A1\UFE0F'
+emoji[arrow_right]=$'\U27A1\UFE0F'
+emoji[up_right_arrow_unqualified_2]=$'\U27A1'
+emoji[down_right_arrow]=$'\U2198\UFE0F'
+emoji[arrow_lower_right]=$'\U2198\UFE0F'
+emoji[down_right_arrow_unqualified]=$'\U2198'
+emoji[down_arrow]=$'\U2B07\UFE0F'
+emoji[arrow_down]=$'\U2B07\UFE0F'
+emoji[down_arrow_unqualified]=$'\U2B07'
+emoji[down_left_arrow]=$'\U2199\UFE0F'
+emoji[arrow_lower_left]=$'\U2199\UFE0F'
+emoji[down_left_arrow_unqualified]=$'\U2199'
+emoji[down_left_arrow_unqualified_1]=$'\U2B05\UFE0F'
+emoji[arrow_left]=$'\U2B05\UFE0F'
+emoji[down_left_arrow_unqualified_2]=$'\U2B05'
+emoji[up_left_arrow]=$'\U2196\UFE0F'
+emoji[arrow_upper_left]=$'\U2196\UFE0F'
+emoji[up_left_arrow_unqualified]=$'\U2196'
+emoji[up_down_arrow]=$'\U2195\UFE0F'
+emoji[arrow_up_down]=$'\U2195\UFE0F'
+emoji[up_down_arrow_unqualified]=$'\U2195'
+emoji[left_right_arrow]=$'\U2194\UFE0F'
+emoji[left_right_arrow_unqualified]=$'\U2194'
+emoji[right_arrow_curving_left]=$'\U21A9\UFE0F'
+emoji[leftwards_arrow_with_hook]=$'\U21A9\UFE0F'
+emoji[right_arrow_curving_left_unqualified]=$'\U21A9'
+emoji[left_arrow_curving_right]=$'\U21AA\UFE0F'
+emoji[arrow_right_hook]=$'\U21AA\UFE0F'
+emoji[left_arrow_curving_right_unqualified]=$'\U21AA'
+emoji[right_arrow_curving_up]=$'\U2934\UFE0F'
+emoji[arrow_heading_up]=$'\U2934\UFE0F'
+emoji[right_arrow_curving_up_unqualified]=$'\U2934'
+emoji[right_arrow_curving_down]=$'\U2935\UFE0F'
+emoji[arrow_heading_down]=$'\U2935\UFE0F'
+emoji[right_arrow_curving_down_unqualified]=$'\U2935'
+emoji[clockwise_vertical_arrows]=$'\U1F503'
+emoji[arrows_clockwise]=$'\U1F503'
+emoji[counterclockwise_arrows_button]=$'\U1F504'
+emoji[arrows_counterclockwise]=$'\U1F504'
+emoji[BACK_arrow]=$'\U1F519'
+emoji[back]=$'\U1F519'
+emoji[END_arrow]=$'\U1F51A'
+emoji[end]=$'\U1F51A'
+emoji[ON_arrow]=$'\U1F51B'
+emoji[on]=$'\U1F51B'
+emoji[SOON_arrow]=$'\U1F51C'
+emoji[soon]=$'\U1F51C'
+emoji[TOP_arrow]=$'\U1F51D'
+emoji[top]=$'\U1F51D'
 emoji[place_of_worship]=$'\U1F6D0'
-emoji[hammer_and_wrench]=$'\U1F6E0'
-emoji[shield]=$'\U1F6E1'
-emoji[oil_drum]=$'\U1F6E2'
-emoji[motorway]=$'\U1F6E3'
-emoji[railway_track]=$'\U1F6E4'
-emoji[motor_boat]=$'\U1F6E5'
-emoji[small_airplane]=$'\U1F6E9'
-emoji[airplane_departure]=$'\U1F6EB'
-emoji[airplane_arriving]=$'\U1F6EC'
-emoji[satellite]=$'\U1F6F0'
-emoji[passenger_ship]=$'\U1F6F3'
-emoji[zipper_mouth_face]=$'\U1F910'
-emoji[money_mouth_face]=$'\U1F911'
-emoji[face_with_thermometer]=$'\U1F912'
-emoji[nerd_face]=$'\U1F913'
-emoji[thinking_face]=$'\U1F914'
-emoji[face_with_head_bandage]=$'\U1F915'
-emoji[robot_face]=$'\U1F916'
-emoji[hugging_face]=$'\U1F917'
-emoji[sign_of_the_horns]=$'\U1F918'
-emoji[crab]=$'\U1F980'
-emoji[lion_face]=$'\U1F981'
-emoji[scorpion]=$'\U1F982'
-emoji[turkey]=$'\U1F983'
-emoji[unicorn_face]=$'\U1F984'
-emoji[cheese_wedge]=$'\U1F9C0'
-emoji[keycap_number_sign]=$'\U0023\U20E3'
-emoji[keycap_asterisk]=$'\U002A\U20E3'
-emoji[keycap_digit_zero]=$'\U0030\U20E3'
-emoji[keycap_digit_one]=$'\U0031\U20E3'
-emoji[keycap_digit_two]=$'\U0032\U20E3'
-emoji[keycap_digit_three]=$'\U0033\U20E3'
-emoji[keycap_digit_four]=$'\U0034\U20E3'
-emoji[keycap_digit_five]=$'\U0035\U20E3'
-emoji[keycap_digit_six]=$'\U0036\U20E3'
-emoji[keycap_digit_seven]=$'\U0037\U20E3'
-emoji[keycap_digit_eight]=$'\U0038\U20E3'
-emoji[keycap_digit_nine]=$'\U0039\U20E3'
+emoji[atom_symbol]=$'\U269B\UFE0F'
+emoji[atom_symbol_unqualified]=$'\U269B'
+emoji[atom_symbol_unqualified_1]=$'\U1F549\UFE0F'
+emoji[om_unqualified]=$'\U1F549'
+emoji[om]=$'\U1F549'
+emoji[star_of_David]=$'\U2721\UFE0F'
+emoji[star_of_david]=$'\U2721\UFE0F'
+emoji[star_of_David_unqualified]=$'\U2721'
+emoji[wheel_of_dharma]=$'\U2638\UFE0F'
+emoji[wheel_of_dharma_unqualified]=$'\U2638'
+emoji[yin_yang]=$'\U262F\UFE0F'
+emoji[yin_yang_unqualified]=$'\U262F'
+emoji[latin_cross]=$'\U271D\UFE0F'
+emoji[latin_cross_unqualified]=$'\U271D'
+emoji[orthodox_cross]=$'\U2626\UFE0F'
+emoji[orthodox_cross_unqualified]=$'\U2626'
+emoji[star_and_crescent]=$'\U262A\UFE0F'
+emoji[star_and_crescent_unqualified]=$'\U262A'
+emoji[peace_symbol]=$'\U262E\UFE0F'
+emoji[peace_symbol_unqualified]=$'\U262E'
+emoji[menorah]=$'\U1F54E'
+emoji[dotted_six_pointed_star]=$'\U1F52F'
+emoji[six_pointed_star]=$'\U1F52F'
+emoji[Aries]=$'\U2648'
+emoji[aries]=$'\U2648'
+emoji[Taurus]=$'\U2649'
+emoji[taurus]=$'\U2649'
+emoji[Gemini]=$'\U264A'
+emoji[gemini]=$'\U264A'
+emoji[Cancer]=$'\U264B'
+emoji[cancer]=$'\U264B'
+emoji[Leo]=$'\U264C'
+emoji[leo]=$'\U264C'
+emoji[Virgo]=$'\U264D'
+emoji[virgo]=$'\U264D'
+emoji[Libra]=$'\U264E'
+emoji[libra]=$'\U264E'
+emoji[Scorpio]=$'\U264F'
+emoji[scorpius]=$'\U264F'
+emoji[Sagittarius]=$'\U2650'
+emoji[sagittarius]=$'\U2650'
+emoji[Capricorn]=$'\U2651'
+emoji[capricorn]=$'\U2651'
+emoji[Aquarius]=$'\U2652'
+emoji[aquarius]=$'\U2652'
+emoji[Pisces]=$'\U2653'
+emoji[pisces]=$'\U2653'
+emoji[Ophiuchus]=$'\U26CE'
+emoji[ophiuchus]=$'\U26CE'
+emoji[shuffle_tracks_button]=$'\U1F500'
+emoji[twisted_rightwards_arrows]=$'\U1F500'
+emoji[repeat_button]=$'\U1F501'
+emoji[repeat]=$'\U1F501'
+emoji[repeat_single_button]=$'\U1F502'
+emoji[repeat_one]=$'\U1F502'
+emoji[play_button]=$'\U25B6\UFE0F'
+emoji[arrow_forward]=$'\U25B6\UFE0F'
+emoji[play_button_unqualified]=$'\U25B6'
+emoji[fast_forward_button]=$'\U23E9'
+emoji[fast_forward]=$'\U23E9'
+emoji[next_track_button]=$'\U23ED\UFE0F'
+emoji[next_track_button_unqualified]=$'\U23ED'
+emoji[play_or_pause_button]=$'\U23EF\UFE0F'
+emoji[play_or_pause_button_unqualified]=$'\U23EF'
+emoji[reverse_button]=$'\U25C0\UFE0F'
+emoji[arrow_backward]=$'\U25C0\UFE0F'
+emoji[reverse_button_unqualified]=$'\U25C0'
+emoji[fast_reverse_button]=$'\U23EA'
+emoji[rewind]=$'\U23EA'
+emoji[last_track_button]=$'\U23EE\UFE0F'
+emoji[last_track_button_unqualified]=$'\U23EE'
+emoji[previous_track_button]=$'\U23EE'
+emoji[upwards_button]=$'\U1F53C'
+emoji[arrow_up_small]=$'\U1F53C'
+emoji[fast_up_button]=$'\U23EB'
+emoji[arrow_double_up]=$'\U23EB'
+emoji[downwards_button]=$'\U1F53D'
+emoji[arrow_down_small]=$'\U1F53D'
+emoji[fast_down_button]=$'\U23EC'
+emoji[arrow_double_down]=$'\U23EC'
+emoji[pause_button]=$'\U23F8\UFE0F'
+emoji[pause_button_unqualified]=$'\U23F8'
+emoji[stop_button]=$'\U23F9\UFE0F'
+emoji[stop_button_unqualified]=$'\U23F9'
+emoji[record_button]=$'\U23FA\UFE0F'
+emoji[record_button_unqualified]=$'\U23FA'
+emoji[eject_button]=$'\U23CF\UFE0F'
+emoji[eject_button_unqualified]=$'\U23CF'
+emoji[cinema]=$'\U1F3A6'
+emoji[dim_button]=$'\U1F505'
+emoji[low_brightness]=$'\U1F505'
+emoji[bright_button]=$'\U1F506'
+emoji[high_brightness]=$'\U1F506'
+emoji[antenna_bars]=$'\U1F4F6'
+emoji[signal_strength]=$'\U1F4F6'
+emoji[vibration_mode]=$'\U1F4F3'
+emoji[mobile_phone_off]=$'\U1F4F4'
+emoji[female_sign]=$'\U2640\UFE0F'
+emoji[female_sign_unqualified]=$'\U2640'
+emoji[female_sign_unqualified_1]=$'\U2642\UFE0F'
+emoji[male_sign]=$'\U2642\UFE0F'
+emoji[female_sign_unqualified_2]=$'\U2642'
+emoji[medical_symbol]=$'\U2695\UFE0F'
+emoji[medical_symbol_unqualified]=$'\U2695'
+emoji[infinity]=$'\U267E\UFE0F'
+emoji[infinity_unqualified]=$'\U267E'
+emoji[recycling_symbol]=$'\U267B\UFE0F'
+emoji[recycle]=$'\U267B\UFE0F'
+emoji[recycling_symbol_unqualified]=$'\U267B'
+emoji[fleur_de_lis]=$'\U269C\UFE0F'
+emoji[fleur_de_lis_unqualified]=$'\U269C'
+emoji[trident_emblem]=$'\U1F531'
+emoji[trident]=$'\U1F531'
+emoji[name_badge]=$'\U1F4DB'
+emoji[Japanese_symbol_for_beginner]=$'\U1F530'
+emoji[beginner]=$'\U1F530'
+emoji[hollow_red_circle]=$'\U2B55'
+emoji[o]=$'\U2B55'
+emoji[check_mark_button]=$'\U2705'
+emoji[white_check_mark]=$'\U2705'
+emoji[check_box_with_check]=$'\U2611\UFE0F'
+emoji[ballot_box_with_check]=$'\U2611\UFE0F'
+emoji[check_box_with_check_unqualified]=$'\U2611'
+emoji[check_mark]=$'\U2714\UFE0F'
+emoji[heavy_check_mark]=$'\U2714\UFE0F'
+emoji[check_mark_unqualified]=$'\U2714'
+emoji[multiplication_sign]=$'\U2716\UFE0F'
+emoji[heavy_multiplication_x]=$'\U2716\UFE0F'
+emoji[multiplication_sign_unqualified]=$'\U2716'
+emoji[cross_mark]=$'\U274C'
+emoji[x]=$'\U274C'
+emoji[cross_mark_button]=$'\U274E'
+emoji[negative_squared_cross_mark]=$'\U274E'
+emoji[plus_sign]=$'\U2795'
+emoji[heavy_plus_sign]=$'\U2795'
+emoji[minus_sign]=$'\U2796'
+emoji[heavy_minus_sign]=$'\U2796'
+emoji[division_sign]=$'\U2797'
+emoji[heavy_division_sign]=$'\U2797'
+emoji[curly_loop]=$'\U27B0'
+emoji[double_curly_loop]=$'\U27BF'
+emoji[loop]=$'\U27BF'
+emoji[part_alternation_mark]=$'\U303D\UFE0F'
+emoji[part_alternation_mark_unqualified]=$'\U303D'
+emoji[eight_spoked_asterisk]=$'\U2733\UFE0F'
+emoji[eight_spoked_asterisk_unqualified]=$'\U2733'
+emoji[eight_pointed_star]=$'\U2734\UFE0F'
+emoji[eight_pointed_black_star]=$'\U2734\UFE0F'
+emoji[eight_pointed_star_unqualified]=$'\U2734'
+emoji[sparkle]=$'\U2747\UFE0F'
+emoji[sparkle_unqualified]=$'\U2747'
+emoji[double_exclamation_mark]=$'\U203C\UFE0F'
+emoji[bangbang]=$'\U203C\UFE0F'
+emoji[double_exclamation_mark_unqualified]=$'\U203C'
+emoji[exclamation_question_mark]=$'\U2049\UFE0F'
+emoji[interrobang]=$'\U2049\UFE0F'
+emoji[exclamation_question_mark_unqualified]=$'\U2049'
+emoji[exclamation_question_mark_unqualified_1]=$'\U2753'
+emoji[question]=$'\U2753'
+emoji[white_question_mark]=$'\U2754'
+emoji[grey_question]=$'\U2754'
+emoji[white_exclamation_mark]=$'\U2755'
+emoji[grey_exclamation]=$'\U2755'
+emoji[white_exclamation_mark_1]=$'\U2757'
+emoji[exclamation]=$'\U2757'
+emoji[heavy_exclamation_mark]=$'\U2757'
+emoji[wavy_dash]=$'\U3030\UFE0F'
+emoji[wavy_dash_unqualified]=$'\U3030'
+emoji[copyright]=$'\U00A9\UFE0F'
+emoji[copyright_unqualified]=$'\U00A9'
+emoji[registered]=$'\U00AE\UFE0F'
+emoji[registered_unqualified]=$'\U00AE'
+emoji[trade_mark]=$'\U2122\UFE0F'
+emoji[tm]=$'\U2122\UFE0F'
+emoji[trade_mark_unqualified]=$'\U2122'
+emoji[keycap_#]=$'\U0023\UFE0F\U20E3'
+emoji[hash]=$'\U0023\UFE0F\U20E3'
+emoji[keycap_#_unqualified]=$'\U0023\U20E3'
+emoji[keycap_*]=$'\U002A\UFE0F\U20E3'
+emoji[asterisk]=$'\U002A\UFE0F\U20E3'
+emoji[keycap_*_unqualified]=$'\U002A\U20E3'
+emoji[keycap_0]=$'\U0030\UFE0F\U20E3'
+emoji[zero]=$'\U0030\UFE0F\U20E3'
+emoji[keycap_0_unqualified]=$'\U0030\U20E3'
+emoji[keycap_1]=$'\U0031\UFE0F\U20E3'
+emoji[one]=$'\U0031\UFE0F\U20E3'
+emoji[keycap_1_unqualified]=$'\U0031\U20E3'
+emoji[keycap_2]=$'\U0032\UFE0F\U20E3'
+emoji[two]=$'\U0032\UFE0F\U20E3'
+emoji[keycap_2_unqualified]=$'\U0032\U20E3'
+emoji[keycap_3]=$'\U0033\UFE0F\U20E3'
+emoji[three]=$'\U0033\UFE0F\U20E3'
+emoji[keycap_3_unqualified]=$'\U0033\U20E3'
+emoji[keycap_4]=$'\U0034\UFE0F\U20E3'
+emoji[four]=$'\U0034\UFE0F\U20E3'
+emoji[keycap_4_unqualified]=$'\U0034\U20E3'
+emoji[keycap_5]=$'\U0035\UFE0F\U20E3'
+emoji[five]=$'\U0035\UFE0F\U20E3'
+emoji[keycap_5_unqualified]=$'\U0035\U20E3'
+emoji[keycap_6]=$'\U0036\UFE0F\U20E3'
+emoji[six]=$'\U0036\UFE0F\U20E3'
+emoji[keycap_6_unqualified]=$'\U0036\U20E3'
+emoji[keycap_7]=$'\U0037\UFE0F\U20E3'
+emoji[seven]=$'\U0037\UFE0F\U20E3'
+emoji[keycap_7_unqualified]=$'\U0037\U20E3'
+emoji[keycap_8]=$'\U0038\UFE0F\U20E3'
+emoji[eight]=$'\U0038\UFE0F\U20E3'
+emoji[keycap_8_unqualified]=$'\U0038\U20E3'
+emoji[keycap_9]=$'\U0039\UFE0F\U20E3'
+emoji[nine]=$'\U0039\UFE0F\U20E3'
+emoji[keycap_9_unqualified]=$'\U0039\U20E3'
+emoji[keycap_10]=$'\U1F51F'
+emoji[keycap_ten]=$'\U1F51F'
+emoji[input_latin_uppercase]=$'\U1F520'
+emoji[capital_abcd]=$'\U1F520'
+emoji[input_latin_lowercase]=$'\U1F521'
+emoji[abcd]=$'\U1F521'
+emoji[input_numbers]=$'\U1F522'
+emoji[1234]=$'\U1F522'
+emoji[input_symbols]=$'\U1F523'
+emoji[symbols]=$'\U1F523'
+emoji[input_latin_letters]=$'\U1F524'
+emoji[abc]=$'\U1F524'
+emoji[A_button_blood_type_]=$'\U1F170\UFE0F'
+emoji[a]=$'\U1F170\UFE0F'
+emoji[A_button_blood_type__unqualified]=$'\U1F170'
+emoji[AB_button_blood_type_]=$'\U1F18E'
+emoji[ab]=$'\U1F18E'
+emoji[AB_button_blood_type__1]=$'\U1F171\UFE0F'
+emoji[b]=$'\U1F171\UFE0F'
+emoji[B_button_blood_type__unqualified]=$'\U1F171'
+emoji[CL_button]=$'\U1F191'
+emoji[cl]=$'\U1F191'
+emoji[COOL_button]=$'\U1F192'
+emoji[cool]=$'\U1F192'
+emoji[FREE_button]=$'\U1F193'
+emoji[free]=$'\U1F193'
+emoji[information]=$'\U2139\UFE0F'
+emoji[information_source]=$'\U2139\UFE0F'
+emoji[information_unqualified]=$'\U2139'
+emoji[ID_button]=$'\U1F194'
+emoji[id]=$'\U1F194'
+emoji[circled_M]=$'\U24C2\UFE0F'
+emoji[m]=$'\U24C2\UFE0F'
+emoji[circled_M_unqualified]=$'\U24C2'
+emoji[NEW_button]=$'\U1F195'
+emoji[new]=$'\U1F195'
+emoji[NG_button]=$'\U1F196'
+emoji[ng]=$'\U1F196'
+emoji[O_button_blood_type_]=$'\U1F17E\UFE0F'
+emoji[o2]=$'\U1F17E\UFE0F'
+emoji[O_button_blood_type__unqualified]=$'\U1F17E'
+emoji[OK_button]=$'\U1F197'
+emoji[ok]=$'\U1F197'
+emoji[P_button]=$'\U1F17F\UFE0F'
+emoji[parking]=$'\U1F17F\UFE0F'
+emoji[P_button_unqualified]=$'\U1F17F'
+emoji[SOS_button]=$'\U1F198'
+emoji[sos]=$'\U1F198'
+emoji[UP_button]=$'\U1F199'
+emoji[up]=$'\U1F199'
+emoji[VS_button]=$'\U1F19A'
+emoji[vs]=$'\U1F19A'
+emoji[Japanese_here_button]=$'\U1F201'
+emoji[koko]=$'\U1F201'
+emoji[Japanese_service_charge_button]=$'\U1F202\UFE0F'
+emoji[sa]=$'\U1F202\UFE0F'
+emoji[Japanese_service_charge_button_unqualified]=$'\U1F202'
+emoji[Japanese_monthly_amount_button]=$'\U1F237\UFE0F'
+emoji[u6708]=$'\U1F237\UFE0F'
+emoji[Japanese_monthly_amount_button_unqualified]=$'\U1F237'
+emoji[Japanese_not_free_of_charge_button]=$'\U1F236'
+emoji[u6709]=$'\U1F236'
+emoji[Japanese_reserved_button]=$'\U1F22F'
+emoji[u6307]=$'\U1F22F'
+emoji[Japanese_bargain_button]=$'\U1F250'
+emoji[ideograph_advantage]=$'\U1F250'
+emoji[Japanese_discount_button]=$'\U1F239'
+emoji[u5272]=$'\U1F239'
+emoji[Japanese_free_of_charge_button]=$'\U1F21A'
+emoji[u7121]=$'\U1F21A'
+emoji[Japanese_prohibited_button]=$'\U1F232'
+emoji[u7981]=$'\U1F232'
+emoji[Japanese_acceptable_button]=$'\U1F251'
+emoji[accept]=$'\U1F251'
+emoji[Japanese_application_button]=$'\U1F238'
+emoji[u7533]=$'\U1F238'
+emoji[Japanese_passing_grade_button]=$'\U1F234'
+emoji[u5408]=$'\U1F234'
+emoji[Japanese_vacancy_button]=$'\U1F233'
+emoji[u7a7a]=$'\U1F233'
+emoji[Japanese_congratulations_button]=$'\U3297\UFE0F'
+emoji[congratulations]=$'\U3297\UFE0F'
+emoji[Japanese_congratulations_button_unqualified]=$'\U3297'
+emoji[Japanese_secret_button]=$'\U3299\UFE0F'
+emoji[secret]=$'\U3299\UFE0F'
+emoji[Japanese_secret_button_unqualified]=$'\U3299'
+emoji[Japanese_open_for_business_button]=$'\U1F23A'
+emoji[u55b6]=$'\U1F23A'
+emoji[Japanese_no_vacancy_button]=$'\U1F235'
+emoji[u6e80]=$'\U1F235'
+emoji[red_circle]=$'\U1F534'
+emoji[orange_circle]=$'\U1F7E0'
+emoji[yellow_circle]=$'\U1F7E1'
+emoji[green_circle]=$'\U1F7E2'
+emoji[blue_circle]=$'\U1F535'
+emoji[large_blue_circle]=$'\U1F535'
+emoji[purple_circle]=$'\U1F7E3'
+emoji[brown_circle]=$'\U1F7E4'
+emoji[black_circle]=$'\U26AB'
+emoji[white_circle]=$'\U26AA'
+emoji[red_square]=$'\U1F7E5'
+emoji[orange_square]=$'\U1F7E7'
+emoji[yellow_square]=$'\U1F7E8'
+emoji[green_square]=$'\U1F7E9'
+emoji[blue_square]=$'\U1F7E6'
+emoji[purple_square]=$'\U1F7EA'
+emoji[brown_square]=$'\U1F7EB'
+emoji[black_large_square]=$'\U2B1B'
+emoji[white_large_square]=$'\U2B1C'
+emoji[black_medium_square]=$'\U25FC\UFE0F'
+emoji[black_medium_square_unqualified]=$'\U25FC'
+emoji[white_medium_square]=$'\U25FB\UFE0F'
+emoji[white_medium_square_unqualified]=$'\U25FB'
+emoji[black_medium_small_square]=$'\U25FE'
+emoji[white_medium_small_square]=$'\U25FD'
+emoji[black_small_square]=$'\U25AA\UFE0F'
+emoji[black_small_square_unqualified]=$'\U25AA'
+emoji[white_small_square]=$'\U25AB\UFE0F'
+emoji[white_small_square_unqualified]=$'\U25AB'
+emoji[large_orange_diamond]=$'\U1F536'
+emoji[large_blue_diamond]=$'\U1F537'
+emoji[small_orange_diamond]=$'\U1F538'
+emoji[small_blue_diamond]=$'\U1F539'
+emoji[red_triangle_pointed_up]=$'\U1F53A'
+emoji[small_red_triangle]=$'\U1F53A'
+emoji[red_triangle_pointed_down]=$'\U1F53B'
+emoji[small_red_triangle_down]=$'\U1F53B'
+emoji[diamond_with_a_dot]=$'\U1F4A0'
+emoji[diamond_shape_with_a_dot_inside]=$'\U1F4A0'
+emoji[radio_button]=$'\U1F518'
+emoji[white_square_button]=$'\U1F533'
+emoji[black_square_button]=$'\U1F532'
+emoji_flags[chequered_flag]=$'\U1F3C1'
+emoji_flags[checkered_flag]=$'\U1F3C1'
+emoji_flags[triangular_flag]=$'\U1F6A9'
+emoji_flags[triangular_flag_on_post]=$'\U1F6A9'
+emoji_flags[crossed_flags]=$'\U1F38C'
+emoji_flags[black_flag]=$'\U1F3F4'
+emoji_flags[white_flag]=$'\U1F3F3\UFE0F'
+emoji_flags[white_flag_unqualified]=$'\U1F3F3'
+emoji_flags[rainbow_flag]=$'\U1F3F3\UFE0F\U200D\U1F308'
+emoji_flags[rainbow_flag_unqualified]=$'\U1F3F3\U200D\U1F308'
+emoji_flags[pirate_flag]=$'\U1F3F4\U200D\U2620\UFE0F'
+emoji_flags[pirate_flag_minimally]=$'\U1F3F4\U200D\U2620'
 emoji_flags[Ascension_Island]=$'\U1F1E6\U1F1E8'
+emoji_flags[ascension_island]=$'\U1F1E6\U1F1E8'
 emoji_flags[Andorra]=$'\U1F1E6\U1F1E9'
+emoji_flags[AD]=$'\U1F1E6\U1F1E9'
+emoji_flags[AND]=$'\U1F1E6\U1F1E9'
+emoji_flags[andorra]=$'\U1F1E6\U1F1E9'
 emoji_flags[United_Arab_Emirates]=$'\U1F1E6\U1F1EA'
+emoji_flags[AE]=$'\U1F1E6\U1F1EA'
+emoji_flags[ARE]=$'\U1F1E6\U1F1EA'
+emoji_flags[united_arab_emirates]=$'\U1F1E6\U1F1EA'
 emoji_flags[Afghanistan]=$'\U1F1E6\U1F1EB'
-emoji_flags[Antigua___Barbuda]=$'\U1F1E6\U1F1EC'
+emoji_flags[AF]=$'\U1F1E6\U1F1EB'
+emoji_flags[AFG]=$'\U1F1E6\U1F1EB'
+emoji_flags[afghanistan]=$'\U1F1E6\U1F1EB'
+emoji_flags[Antigua_and_Barbuda]=$'\U1F1E6\U1F1EC'
+emoji_flags[AG]=$'\U1F1E6\U1F1EC'
+emoji_flags[ATG]=$'\U1F1E6\U1F1EC'
+emoji_flags[antigua_barbuda]=$'\U1F1E6\U1F1EC'
 emoji_flags[Anguilla]=$'\U1F1E6\U1F1EE'
+emoji_flags[AI]=$'\U1F1E6\U1F1EE'
+emoji_flags[AIA]=$'\U1F1E6\U1F1EE'
+emoji_flags[anguilla]=$'\U1F1E6\U1F1EE'
 emoji_flags[Albania]=$'\U1F1E6\U1F1F1'
+emoji_flags[AL]=$'\U1F1E6\U1F1F1'
+emoji_flags[ALB]=$'\U1F1E6\U1F1F1'
+emoji_flags[albania]=$'\U1F1E6\U1F1F1'
 emoji_flags[Armenia]=$'\U1F1E6\U1F1F2'
+emoji_flags[AM]=$'\U1F1E6\U1F1F2'
+emoji_flags[ARM]=$'\U1F1E6\U1F1F2'
+emoji_flags[armenia]=$'\U1F1E6\U1F1F2'
 emoji_flags[Angola]=$'\U1F1E6\U1F1F4'
+emoji_flags[AO]=$'\U1F1E6\U1F1F4'
+emoji_flags[AGO]=$'\U1F1E6\U1F1F4'
+emoji_flags[angola]=$'\U1F1E6\U1F1F4'
 emoji_flags[Antarctica]=$'\U1F1E6\U1F1F6'
+emoji_flags[AQ]=$'\U1F1E6\U1F1F6'
+emoji_flags[ATA]=$'\U1F1E6\U1F1F6'
+emoji_flags[antarctica]=$'\U1F1E6\U1F1F6'
 emoji_flags[Argentina]=$'\U1F1E6\U1F1F7'
+emoji_flags[AR]=$'\U1F1E6\U1F1F7'
+emoji_flags[ARG]=$'\U1F1E6\U1F1F7'
+emoji_flags[argentina]=$'\U1F1E6\U1F1F7'
 emoji_flags[American_Samoa]=$'\U1F1E6\U1F1F8'
+emoji_flags[AS]=$'\U1F1E6\U1F1F8'
+emoji_flags[ASM]=$'\U1F1E6\U1F1F8'
+emoji_flags[american_samoa]=$'\U1F1E6\U1F1F8'
 emoji_flags[Austria]=$'\U1F1E6\U1F1F9'
+emoji_flags[AT]=$'\U1F1E6\U1F1F9'
+emoji_flags[AUT]=$'\U1F1E6\U1F1F9'
+emoji_flags[austria]=$'\U1F1E6\U1F1F9'
 emoji_flags[Australia]=$'\U1F1E6\U1F1FA'
+emoji_flags[AU]=$'\U1F1E6\U1F1FA'
+emoji_flags[AUS]=$'\U1F1E6\U1F1FA'
+emoji_flags[australia]=$'\U1F1E6\U1F1FA'
 emoji_flags[Aruba]=$'\U1F1E6\U1F1FC'
-emoji_flags[�_land_Islands]=$'\U1F1E6\U1F1FD'
+emoji_flags[AW]=$'\U1F1E6\U1F1FC'
+emoji_flags[ABW]=$'\U1F1E6\U1F1FC'
+emoji_flags[aruba]=$'\U1F1E6\U1F1FC'
+emoji_flags[Åland_Islands]=$'\U1F1E6\U1F1FD'
+emoji_flags[AX]=$'\U1F1E6\U1F1FD'
+emoji_flags[ALA]=$'\U1F1E6\U1F1FD'
+emoji_flags[aland_islands]=$'\U1F1E6\U1F1FD'
 emoji_flags[Azerbaijan]=$'\U1F1E6\U1F1FF'
-emoji_flags[Bosnia___Herzegovina]=$'\U1F1E7\U1F1E6'
+emoji_flags[AZ]=$'\U1F1E6\U1F1FF'
+emoji_flags[AZE]=$'\U1F1E6\U1F1FF'
+emoji_flags[azerbaijan]=$'\U1F1E6\U1F1FF'
+emoji_flags[Bosnia_and_Herzegovina]=$'\U1F1E7\U1F1E6'
+emoji_flags[BA]=$'\U1F1E7\U1F1E6'
+emoji_flags[BIH]=$'\U1F1E7\U1F1E6'
+emoji_flags[bosnia_herzegovina]=$'\U1F1E7\U1F1E6'
 emoji_flags[Barbados]=$'\U1F1E7\U1F1E7'
+emoji_flags[BB]=$'\U1F1E7\U1F1E7'
+emoji_flags[BRB]=$'\U1F1E7\U1F1E7'
+emoji_flags[barbados]=$'\U1F1E7\U1F1E7'
 emoji_flags[Bangladesh]=$'\U1F1E7\U1F1E9'
+emoji_flags[BD]=$'\U1F1E7\U1F1E9'
+emoji_flags[BGD]=$'\U1F1E7\U1F1E9'
+emoji_flags[bangladesh]=$'\U1F1E7\U1F1E9'
 emoji_flags[Belgium]=$'\U1F1E7\U1F1EA'
+emoji_flags[BE]=$'\U1F1E7\U1F1EA'
+emoji_flags[BEL]=$'\U1F1E7\U1F1EA'
+emoji_flags[belgium]=$'\U1F1E7\U1F1EA'
 emoji_flags[Burkina_Faso]=$'\U1F1E7\U1F1EB'
+emoji_flags[BF]=$'\U1F1E7\U1F1EB'
+emoji_flags[BFA]=$'\U1F1E7\U1F1EB'
+emoji_flags[burkina_faso]=$'\U1F1E7\U1F1EB'
 emoji_flags[Bulgaria]=$'\U1F1E7\U1F1EC'
+emoji_flags[BG]=$'\U1F1E7\U1F1EC'
+emoji_flags[BGR]=$'\U1F1E7\U1F1EC'
+emoji_flags[bulgaria]=$'\U1F1E7\U1F1EC'
 emoji_flags[Bahrain]=$'\U1F1E7\U1F1ED'
+emoji_flags[BH]=$'\U1F1E7\U1F1ED'
+emoji_flags[BHR]=$'\U1F1E7\U1F1ED'
+emoji_flags[bahrain]=$'\U1F1E7\U1F1ED'
 emoji_flags[Burundi]=$'\U1F1E7\U1F1EE'
+emoji_flags[BI]=$'\U1F1E7\U1F1EE'
+emoji_flags[BDI]=$'\U1F1E7\U1F1EE'
+emoji_flags[burundi]=$'\U1F1E7\U1F1EE'
 emoji_flags[Benin]=$'\U1F1E7\U1F1EF'
-emoji_flags[St__Barth�_lemy]=$'\U1F1E7\U1F1F1'
+emoji_flags[BJ]=$'\U1F1E7\U1F1EF'
+emoji_flags[BEN]=$'\U1F1E7\U1F1EF'
+emoji_flags[benin]=$'\U1F1E7\U1F1EF'
+emoji_flags[St_Barthélemy]=$'\U1F1E7\U1F1F1'
+emoji_flags[BL]=$'\U1F1E7\U1F1F1'
+emoji_flags[BLM]=$'\U1F1E7\U1F1F1'
+emoji_flags[st_barthelemy]=$'\U1F1E7\U1F1F1'
 emoji_flags[Bermuda]=$'\U1F1E7\U1F1F2'
+emoji_flags[BM]=$'\U1F1E7\U1F1F2'
+emoji_flags[BMU]=$'\U1F1E7\U1F1F2'
+emoji_flags[bermuda]=$'\U1F1E7\U1F1F2'
 emoji_flags[Brunei]=$'\U1F1E7\U1F1F3'
+emoji_flags[BN]=$'\U1F1E7\U1F1F3'
+emoji_flags[BRN]=$'\U1F1E7\U1F1F3'
+emoji_flags[brunei]=$'\U1F1E7\U1F1F3'
 emoji_flags[Bolivia]=$'\U1F1E7\U1F1F4'
+emoji_flags[BO]=$'\U1F1E7\U1F1F4'
+emoji_flags[BOL]=$'\U1F1E7\U1F1F4'
+emoji_flags[bolivia]=$'\U1F1E7\U1F1F4'
 emoji_flags[Caribbean_Netherlands]=$'\U1F1E7\U1F1F6'
+emoji_flags[BQ]=$'\U1F1E7\U1F1F6'
+emoji_flags[BES]=$'\U1F1E7\U1F1F6'
+emoji_flags[caribbean_netherlands]=$'\U1F1E7\U1F1F6'
 emoji_flags[Brazil]=$'\U1F1E7\U1F1F7'
+emoji_flags[BR]=$'\U1F1E7\U1F1F7'
+emoji_flags[BRA]=$'\U1F1E7\U1F1F7'
+emoji_flags[brazil]=$'\U1F1E7\U1F1F7'
 emoji_flags[Bahamas]=$'\U1F1E7\U1F1F8'
+emoji_flags[BS]=$'\U1F1E7\U1F1F8'
+emoji_flags[BHS]=$'\U1F1E7\U1F1F8'
+emoji_flags[bahamas]=$'\U1F1E7\U1F1F8'
 emoji_flags[Bhutan]=$'\U1F1E7\U1F1F9'
+emoji_flags[BT]=$'\U1F1E7\U1F1F9'
+emoji_flags[BTN]=$'\U1F1E7\U1F1F9'
+emoji_flags[bhutan]=$'\U1F1E7\U1F1F9'
 emoji_flags[Bouvet_Island]=$'\U1F1E7\U1F1FB'
+emoji_flags[BV]=$'\U1F1E7\U1F1FB'
+emoji_flags[BVT]=$'\U1F1E7\U1F1FB'
+emoji_flags[bouvet_island]=$'\U1F1E7\U1F1FB'
 emoji_flags[Botswana]=$'\U1F1E7\U1F1FC'
+emoji_flags[BW]=$'\U1F1E7\U1F1FC'
+emoji_flags[BWA]=$'\U1F1E7\U1F1FC'
+emoji_flags[botswana]=$'\U1F1E7\U1F1FC'
 emoji_flags[Belarus]=$'\U1F1E7\U1F1FE'
+emoji_flags[BY]=$'\U1F1E7\U1F1FE'
+emoji_flags[BLR]=$'\U1F1E7\U1F1FE'
+emoji_flags[belarus]=$'\U1F1E7\U1F1FE'
 emoji_flags[Belize]=$'\U1F1E7\U1F1FF'
+emoji_flags[BZ]=$'\U1F1E7\U1F1FF'
+emoji_flags[BLZ]=$'\U1F1E7\U1F1FF'
+emoji_flags[belize]=$'\U1F1E7\U1F1FF'
 emoji_flags[Canada]=$'\U1F1E8\U1F1E6'
-emoji_flags[Cocos__Islands]=$'\U1F1E8\U1F1E8'
-emoji_flags[Congo___Kinshasa]=$'\U1F1E8\U1F1E9'
+emoji_flags[CA]=$'\U1F1E8\U1F1E6'
+emoji_flags[CAN]=$'\U1F1E8\U1F1E6'
+emoji_flags[canada]=$'\U1F1E8\U1F1E6'
+emoji_flags[Cocos_Keeling_Islands]=$'\U1F1E8\U1F1E8'
+emoji_flags[CC]=$'\U1F1E8\U1F1E8'
+emoji_flags[CCK]=$'\U1F1E8\U1F1E8'
+emoji_flags[cocos_islands]=$'\U1F1E8\U1F1E8'
+emoji_flags[Congo__Kinshasa]=$'\U1F1E8\U1F1E9'
+emoji_flags[CD]=$'\U1F1E8\U1F1E9'
+emoji_flags[COD]=$'\U1F1E8\U1F1E9'
+emoji_flags[congo_kinshasa]=$'\U1F1E8\U1F1E9'
 emoji_flags[Central_African_Republic]=$'\U1F1E8\U1F1EB'
-emoji_flags[Congo___Brazzaville]=$'\U1F1E8\U1F1EC'
+emoji_flags[CF]=$'\U1F1E8\U1F1EB'
+emoji_flags[CAF]=$'\U1F1E8\U1F1EB'
+emoji_flags[central_african_republic]=$'\U1F1E8\U1F1EB'
+emoji_flags[Congo__Brazzaville]=$'\U1F1E8\U1F1EC'
+emoji_flags[CG]=$'\U1F1E8\U1F1EC'
+emoji_flags[COG]=$'\U1F1E8\U1F1EC'
+emoji_flags[congo_brazzaville]=$'\U1F1E8\U1F1EC'
 emoji_flags[Switzerland]=$'\U1F1E8\U1F1ED'
-emoji_flags[C�_te_d�__Ivoire]=$'\U1F1E8\U1F1EE'
+emoji_flags[CH]=$'\U1F1E8\U1F1ED'
+emoji_flags[CHE]=$'\U1F1E8\U1F1ED'
+emoji_flags[switzerland]=$'\U1F1E8\U1F1ED'
+emoji_flags[Côte_d_Ivoire]=$'\U1F1E8\U1F1EE'
+emoji_flags[CI]=$'\U1F1E8\U1F1EE'
+emoji_flags[CIV]=$'\U1F1E8\U1F1EE'
+emoji_flags[cote_divoire]=$'\U1F1E8\U1F1EE'
 emoji_flags[Cook_Islands]=$'\U1F1E8\U1F1F0'
+emoji_flags[CK]=$'\U1F1E8\U1F1F0'
+emoji_flags[COK]=$'\U1F1E8\U1F1F0'
+emoji_flags[cook_islands]=$'\U1F1E8\U1F1F0'
 emoji_flags[Chile]=$'\U1F1E8\U1F1F1'
+emoji_flags[CL]=$'\U1F1E8\U1F1F1'
+emoji_flags[CHL]=$'\U1F1E8\U1F1F1'
+emoji_flags[chile]=$'\U1F1E8\U1F1F1'
 emoji_flags[Cameroon]=$'\U1F1E8\U1F1F2'
+emoji_flags[CM]=$'\U1F1E8\U1F1F2'
+emoji_flags[CMR]=$'\U1F1E8\U1F1F2'
+emoji_flags[cameroon]=$'\U1F1E8\U1F1F2'
 emoji_flags[China]=$'\U1F1E8\U1F1F3'
+emoji_flags[CN]=$'\U1F1E8\U1F1F3'
+emoji_flags[CHN]=$'\U1F1E8\U1F1F3'
+emoji_flags[cn]=$'\U1F1E8\U1F1F3'
 emoji_flags[Colombia]=$'\U1F1E8\U1F1F4'
+emoji_flags[CO]=$'\U1F1E8\U1F1F4'
+emoji_flags[COL]=$'\U1F1E8\U1F1F4'
+emoji_flags[colombia]=$'\U1F1E8\U1F1F4'
 emoji_flags[Clipperton_Island]=$'\U1F1E8\U1F1F5'
+emoji_flags[clipperton_island]=$'\U1F1E8\U1F1F5'
 emoji_flags[Costa_Rica]=$'\U1F1E8\U1F1F7'
+emoji_flags[CR]=$'\U1F1E8\U1F1F7'
+emoji_flags[CRI]=$'\U1F1E8\U1F1F7'
+emoji_flags[costa_rica]=$'\U1F1E8\U1F1F7'
 emoji_flags[Cuba]=$'\U1F1E8\U1F1FA'
+emoji_flags[CU]=$'\U1F1E8\U1F1FA'
+emoji_flags[CUB]=$'\U1F1E8\U1F1FA'
+emoji_flags[cuba]=$'\U1F1E8\U1F1FA'
 emoji_flags[Cape_Verde]=$'\U1F1E8\U1F1FB'
-emoji_flags[Cura�_ao]=$'\U1F1E8\U1F1FC'
+emoji_flags[CV]=$'\U1F1E8\U1F1FB'
+emoji_flags[CPV]=$'\U1F1E8\U1F1FB'
+emoji_flags[cape_verde]=$'\U1F1E8\U1F1FB'
+emoji_flags[Curaçao]=$'\U1F1E8\U1F1FC'
+emoji_flags[CW]=$'\U1F1E8\U1F1FC'
+emoji_flags[CUW]=$'\U1F1E8\U1F1FC'
+emoji_flags[curacao]=$'\U1F1E8\U1F1FC'
 emoji_flags[Christmas_Island]=$'\U1F1E8\U1F1FD'
+emoji_flags[CX]=$'\U1F1E8\U1F1FD'
+emoji_flags[CXR]=$'\U1F1E8\U1F1FD'
+emoji_flags[christmas_island]=$'\U1F1E8\U1F1FD'
 emoji_flags[Cyprus]=$'\U1F1E8\U1F1FE'
-emoji_flags[Czech_Republic]=$'\U1F1E8\U1F1FF'
+emoji_flags[CY]=$'\U1F1E8\U1F1FE'
+emoji_flags[CYP]=$'\U1F1E8\U1F1FE'
+emoji_flags[cyprus]=$'\U1F1E8\U1F1FE'
+emoji_flags[Czechia]=$'\U1F1E8\U1F1FF'
+emoji_flags[CZ]=$'\U1F1E8\U1F1FF'
+emoji_flags[CZE]=$'\U1F1E8\U1F1FF'
+emoji_flags[czech_republic]=$'\U1F1E8\U1F1FF'
 emoji_flags[Germany]=$'\U1F1E9\U1F1EA'
+emoji_flags[DE]=$'\U1F1E9\U1F1EA'
+emoji_flags[DEU]=$'\U1F1E9\U1F1EA'
+emoji_flags[de]=$'\U1F1E9\U1F1EA'
 emoji_flags[Diego_Garcia]=$'\U1F1E9\U1F1EC'
+emoji_flags[diego_garcia]=$'\U1F1E9\U1F1EC'
 emoji_flags[Djibouti]=$'\U1F1E9\U1F1EF'
+emoji_flags[DJ]=$'\U1F1E9\U1F1EF'
+emoji_flags[DJI]=$'\U1F1E9\U1F1EF'
+emoji_flags[djibouti]=$'\U1F1E9\U1F1EF'
 emoji_flags[Denmark]=$'\U1F1E9\U1F1F0'
+emoji_flags[DK]=$'\U1F1E9\U1F1F0'
+emoji_flags[DNK]=$'\U1F1E9\U1F1F0'
+emoji_flags[denmark]=$'\U1F1E9\U1F1F0'
 emoji_flags[Dominica]=$'\U1F1E9\U1F1F2'
+emoji_flags[DM]=$'\U1F1E9\U1F1F2'
+emoji_flags[DMA]=$'\U1F1E9\U1F1F2'
+emoji_flags[dominica]=$'\U1F1E9\U1F1F2'
 emoji_flags[Dominican_Republic]=$'\U1F1E9\U1F1F4'
+emoji_flags[DO]=$'\U1F1E9\U1F1F4'
+emoji_flags[DOM]=$'\U1F1E9\U1F1F4'
+emoji_flags[dominican_republic]=$'\U1F1E9\U1F1F4'
 emoji_flags[Algeria]=$'\U1F1E9\U1F1FF'
-emoji_flags[Ceuta___Melilla]=$'\U1F1EA\U1F1E6'
+emoji_flags[DZ]=$'\U1F1E9\U1F1FF'
+emoji_flags[DZA]=$'\U1F1E9\U1F1FF'
+emoji_flags[algeria]=$'\U1F1E9\U1F1FF'
+emoji_flags[Ceuta_and_Melilla]=$'\U1F1EA\U1F1E6'
+emoji_flags[ceuta_melilla]=$'\U1F1EA\U1F1E6'
 emoji_flags[Ecuador]=$'\U1F1EA\U1F1E8'
+emoji_flags[EC]=$'\U1F1EA\U1F1E8'
+emoji_flags[ECU]=$'\U1F1EA\U1F1E8'
+emoji_flags[ecuador]=$'\U1F1EA\U1F1E8'
 emoji_flags[Estonia]=$'\U1F1EA\U1F1EA'
+emoji_flags[EE]=$'\U1F1EA\U1F1EA'
+emoji_flags[EST]=$'\U1F1EA\U1F1EA'
+emoji_flags[estonia]=$'\U1F1EA\U1F1EA'
 emoji_flags[Egypt]=$'\U1F1EA\U1F1EC'
+emoji_flags[EG]=$'\U1F1EA\U1F1EC'
+emoji_flags[EGY]=$'\U1F1EA\U1F1EC'
+emoji_flags[egypt]=$'\U1F1EA\U1F1EC'
 emoji_flags[Western_Sahara]=$'\U1F1EA\U1F1ED'
+emoji_flags[EH]=$'\U1F1EA\U1F1ED'
+emoji_flags[ESH]=$'\U1F1EA\U1F1ED'
+emoji_flags[western_sahara]=$'\U1F1EA\U1F1ED'
 emoji_flags[Eritrea]=$'\U1F1EA\U1F1F7'
+emoji_flags[ER]=$'\U1F1EA\U1F1F7'
+emoji_flags[ERI]=$'\U1F1EA\U1F1F7'
+emoji_flags[eritrea]=$'\U1F1EA\U1F1F7'
 emoji_flags[Spain]=$'\U1F1EA\U1F1F8'
+emoji_flags[ES]=$'\U1F1EA\U1F1F8'
+emoji_flags[ESP]=$'\U1F1EA\U1F1F8'
+emoji_flags[es]=$'\U1F1EA\U1F1F8'
 emoji_flags[Ethiopia]=$'\U1F1EA\U1F1F9'
+emoji_flags[ET]=$'\U1F1EA\U1F1F9'
+emoji_flags[ETH]=$'\U1F1EA\U1F1F9'
+emoji_flags[ethiopia]=$'\U1F1EA\U1F1F9'
 emoji_flags[European_Union]=$'\U1F1EA\U1F1FA'
+emoji_flags[eu]=$'\U1F1EA\U1F1FA'
+emoji_flags[european_union]=$'\U1F1EA\U1F1FA'
 emoji_flags[Finland]=$'\U1F1EB\U1F1EE'
+emoji_flags[FI]=$'\U1F1EB\U1F1EE'
+emoji_flags[FIN]=$'\U1F1EB\U1F1EE'
+emoji_flags[finland]=$'\U1F1EB\U1F1EE'
 emoji_flags[Fiji]=$'\U1F1EB\U1F1EF'
+emoji_flags[FJ]=$'\U1F1EB\U1F1EF'
+emoji_flags[FJI]=$'\U1F1EB\U1F1EF'
+emoji_flags[fiji]=$'\U1F1EB\U1F1EF'
 emoji_flags[Falkland_Islands]=$'\U1F1EB\U1F1F0'
+emoji_flags[FK]=$'\U1F1EB\U1F1F0'
+emoji_flags[FLK]=$'\U1F1EB\U1F1F0'
+emoji_flags[falkland_islands]=$'\U1F1EB\U1F1F0'
 emoji_flags[Micronesia]=$'\U1F1EB\U1F1F2'
+emoji_flags[FM]=$'\U1F1EB\U1F1F2'
+emoji_flags[FSM]=$'\U1F1EB\U1F1F2'
+emoji_flags[micronesia]=$'\U1F1EB\U1F1F2'
 emoji_flags[Faroe_Islands]=$'\U1F1EB\U1F1F4'
+emoji_flags[FO]=$'\U1F1EB\U1F1F4'
+emoji_flags[FRO]=$'\U1F1EB\U1F1F4'
+emoji_flags[faroe_islands]=$'\U1F1EB\U1F1F4'
 emoji_flags[France]=$'\U1F1EB\U1F1F7'
+emoji_flags[FR]=$'\U1F1EB\U1F1F7'
+emoji_flags[FRA]=$'\U1F1EB\U1F1F7'
+emoji_flags[fr]=$'\U1F1EB\U1F1F7'
 emoji_flags[Gabon]=$'\U1F1EC\U1F1E6'
+emoji_flags[GA]=$'\U1F1EC\U1F1E6'
+emoji_flags[GAB]=$'\U1F1EC\U1F1E6'
+emoji_flags[gabon]=$'\U1F1EC\U1F1E6'
 emoji_flags[United_Kingdom]=$'\U1F1EC\U1F1E7'
+emoji_flags[GB]=$'\U1F1EC\U1F1E7'
+emoji_flags[GBR]=$'\U1F1EC\U1F1E7'
+emoji_flags[gb]=$'\U1F1EC\U1F1E7'
+emoji_flags[uk]=$'\U1F1EC\U1F1E7'
 emoji_flags[Grenada]=$'\U1F1EC\U1F1E9'
+emoji_flags[GD]=$'\U1F1EC\U1F1E9'
+emoji_flags[GRD]=$'\U1F1EC\U1F1E9'
+emoji_flags[grenada]=$'\U1F1EC\U1F1E9'
 emoji_flags[Georgia]=$'\U1F1EC\U1F1EA'
+emoji_flags[GE]=$'\U1F1EC\U1F1EA'
+emoji_flags[GEO]=$'\U1F1EC\U1F1EA'
+emoji_flags[georgia]=$'\U1F1EC\U1F1EA'
 emoji_flags[French_Guiana]=$'\U1F1EC\U1F1EB'
+emoji_flags[GF]=$'\U1F1EC\U1F1EB'
+emoji_flags[GUF]=$'\U1F1EC\U1F1EB'
+emoji_flags[french_guiana]=$'\U1F1EC\U1F1EB'
 emoji_flags[Guernsey]=$'\U1F1EC\U1F1EC'
+emoji_flags[GG]=$'\U1F1EC\U1F1EC'
+emoji_flags[GGY]=$'\U1F1EC\U1F1EC'
+emoji_flags[guernsey]=$'\U1F1EC\U1F1EC'
 emoji_flags[Ghana]=$'\U1F1EC\U1F1ED'
+emoji_flags[GH]=$'\U1F1EC\U1F1ED'
+emoji_flags[GHA]=$'\U1F1EC\U1F1ED'
+emoji_flags[ghana]=$'\U1F1EC\U1F1ED'
 emoji_flags[Gibraltar]=$'\U1F1EC\U1F1EE'
+emoji_flags[GI]=$'\U1F1EC\U1F1EE'
+emoji_flags[GIB]=$'\U1F1EC\U1F1EE'
+emoji_flags[gibraltar]=$'\U1F1EC\U1F1EE'
 emoji_flags[Greenland]=$'\U1F1EC\U1F1F1'
+emoji_flags[GL]=$'\U1F1EC\U1F1F1'
+emoji_flags[GRL]=$'\U1F1EC\U1F1F1'
+emoji_flags[greenland]=$'\U1F1EC\U1F1F1'
 emoji_flags[Gambia]=$'\U1F1EC\U1F1F2'
+emoji_flags[GM]=$'\U1F1EC\U1F1F2'
+emoji_flags[GMB]=$'\U1F1EC\U1F1F2'
+emoji_flags[gambia]=$'\U1F1EC\U1F1F2'
 emoji_flags[Guinea]=$'\U1F1EC\U1F1F3'
+emoji_flags[GN]=$'\U1F1EC\U1F1F3'
+emoji_flags[GIN]=$'\U1F1EC\U1F1F3'
+emoji_flags[guinea]=$'\U1F1EC\U1F1F3'
 emoji_flags[Guadeloupe]=$'\U1F1EC\U1F1F5'
+emoji_flags[GP]=$'\U1F1EC\U1F1F5'
+emoji_flags[GLP]=$'\U1F1EC\U1F1F5'
+emoji_flags[guadeloupe]=$'\U1F1EC\U1F1F5'
 emoji_flags[Equatorial_Guinea]=$'\U1F1EC\U1F1F6'
+emoji_flags[GQ]=$'\U1F1EC\U1F1F6'
+emoji_flags[GNQ]=$'\U1F1EC\U1F1F6'
+emoji_flags[equatorial_guinea]=$'\U1F1EC\U1F1F6'
 emoji_flags[Greece]=$'\U1F1EC\U1F1F7'
-emoji_flags[South_Georgia___South_Sandwich_Islands]=$'\U1F1EC\U1F1F8'
+emoji_flags[GR]=$'\U1F1EC\U1F1F7'
+emoji_flags[GRC]=$'\U1F1EC\U1F1F7'
+emoji_flags[greece]=$'\U1F1EC\U1F1F7'
+emoji_flags[South_Georgia_and_South_Sandwich_Islands]=$'\U1F1EC\U1F1F8'
+emoji_flags[GS]=$'\U1F1EC\U1F1F8'
+emoji_flags[SGS]=$'\U1F1EC\U1F1F8'
+emoji_flags[south_georgia_south_sandwich_islands]=$'\U1F1EC\U1F1F8'
 emoji_flags[Guatemala]=$'\U1F1EC\U1F1F9'
+emoji_flags[GT]=$'\U1F1EC\U1F1F9'
+emoji_flags[GTM]=$'\U1F1EC\U1F1F9'
+emoji_flags[guatemala]=$'\U1F1EC\U1F1F9'
 emoji_flags[Guam]=$'\U1F1EC\U1F1FA'
+emoji_flags[GU]=$'\U1F1EC\U1F1FA'
+emoji_flags[GUM]=$'\U1F1EC\U1F1FA'
+emoji_flags[guam]=$'\U1F1EC\U1F1FA'
 emoji_flags[Guinea_Bissau]=$'\U1F1EC\U1F1FC'
+emoji_flags[GW]=$'\U1F1EC\U1F1FC'
+emoji_flags[GNB]=$'\U1F1EC\U1F1FC'
+emoji_flags[guinea_bissau]=$'\U1F1EC\U1F1FC'
 emoji_flags[Guyana]=$'\U1F1EC\U1F1FE'
-emoji_flags[Hong_Kong]=$'\U1F1ED\U1F1F0'
-emoji_flags[Heard___McDonald_Islands]=$'\U1F1ED\U1F1F2'
+emoji_flags[GY]=$'\U1F1EC\U1F1FE'
+emoji_flags[GUY]=$'\U1F1EC\U1F1FE'
+emoji_flags[guyana]=$'\U1F1EC\U1F1FE'
+emoji_flags[Hong_Kong_SAR_China]=$'\U1F1ED\U1F1F0'
+emoji_flags[HK]=$'\U1F1ED\U1F1F0'
+emoji_flags[HKG]=$'\U1F1ED\U1F1F0'
+emoji_flags[hong_kong]=$'\U1F1ED\U1F1F0'
+emoji_flags[Heard_and_McDonald_Islands]=$'\U1F1ED\U1F1F2'
+emoji_flags[HM]=$'\U1F1ED\U1F1F2'
+emoji_flags[HMD]=$'\U1F1ED\U1F1F2'
+emoji_flags[heard_mcdonald_islands]=$'\U1F1ED\U1F1F2'
 emoji_flags[Honduras]=$'\U1F1ED\U1F1F3'
+emoji_flags[HN]=$'\U1F1ED\U1F1F3'
+emoji_flags[HND]=$'\U1F1ED\U1F1F3'
+emoji_flags[honduras]=$'\U1F1ED\U1F1F3'
 emoji_flags[Croatia]=$'\U1F1ED\U1F1F7'
+emoji_flags[HR]=$'\U1F1ED\U1F1F7'
+emoji_flags[HRV]=$'\U1F1ED\U1F1F7'
+emoji_flags[croatia]=$'\U1F1ED\U1F1F7'
 emoji_flags[Haiti]=$'\U1F1ED\U1F1F9'
+emoji_flags[HT]=$'\U1F1ED\U1F1F9'
+emoji_flags[HTI]=$'\U1F1ED\U1F1F9'
+emoji_flags[haiti]=$'\U1F1ED\U1F1F9'
 emoji_flags[Hungary]=$'\U1F1ED\U1F1FA'
+emoji_flags[HU]=$'\U1F1ED\U1F1FA'
+emoji_flags[HUN]=$'\U1F1ED\U1F1FA'
+emoji_flags[hungary]=$'\U1F1ED\U1F1FA'
 emoji_flags[Canary_Islands]=$'\U1F1EE\U1F1E8'
+emoji_flags[canary_islands]=$'\U1F1EE\U1F1E8'
 emoji_flags[Indonesia]=$'\U1F1EE\U1F1E9'
+emoji_flags[ID]=$'\U1F1EE\U1F1E9'
+emoji_flags[IDN]=$'\U1F1EE\U1F1E9'
+emoji_flags[indonesia]=$'\U1F1EE\U1F1E9'
 emoji_flags[Ireland]=$'\U1F1EE\U1F1EA'
+emoji_flags[IE]=$'\U1F1EE\U1F1EA'
+emoji_flags[IRL]=$'\U1F1EE\U1F1EA'
+emoji_flags[ireland]=$'\U1F1EE\U1F1EA'
 emoji_flags[Israel]=$'\U1F1EE\U1F1F1'
+emoji_flags[IL]=$'\U1F1EE\U1F1F1'
+emoji_flags[ISR]=$'\U1F1EE\U1F1F1'
+emoji_flags[israel]=$'\U1F1EE\U1F1F1'
 emoji_flags[Isle_of_Man]=$'\U1F1EE\U1F1F2'
+emoji_flags[IM]=$'\U1F1EE\U1F1F2'
+emoji_flags[IMN]=$'\U1F1EE\U1F1F2'
+emoji_flags[isle_of_man]=$'\U1F1EE\U1F1F2'
 emoji_flags[India]=$'\U1F1EE\U1F1F3'
+emoji_flags[IN]=$'\U1F1EE\U1F1F3'
+emoji_flags[IND]=$'\U1F1EE\U1F1F3'
+emoji_flags[india]=$'\U1F1EE\U1F1F3'
 emoji_flags[British_Indian_Ocean_Territory]=$'\U1F1EE\U1F1F4'
+emoji_flags[IO]=$'\U1F1EE\U1F1F4'
+emoji_flags[IOT]=$'\U1F1EE\U1F1F4'
+emoji_flags[british_indian_ocean_territory]=$'\U1F1EE\U1F1F4'
 emoji_flags[Iraq]=$'\U1F1EE\U1F1F6'
+emoji_flags[IQ]=$'\U1F1EE\U1F1F6'
+emoji_flags[IRQ]=$'\U1F1EE\U1F1F6'
+emoji_flags[iraq]=$'\U1F1EE\U1F1F6'
 emoji_flags[Iran]=$'\U1F1EE\U1F1F7'
+emoji_flags[IR]=$'\U1F1EE\U1F1F7'
+emoji_flags[IRN]=$'\U1F1EE\U1F1F7'
+emoji_flags[iran]=$'\U1F1EE\U1F1F7'
 emoji_flags[Iceland]=$'\U1F1EE\U1F1F8'
+emoji_flags[IS]=$'\U1F1EE\U1F1F8'
+emoji_flags[ISL]=$'\U1F1EE\U1F1F8'
+emoji_flags[iceland]=$'\U1F1EE\U1F1F8'
 emoji_flags[Italy]=$'\U1F1EE\U1F1F9'
+emoji_flags[IT]=$'\U1F1EE\U1F1F9'
+emoji_flags[ITA]=$'\U1F1EE\U1F1F9'
+emoji_flags[it]=$'\U1F1EE\U1F1F9'
 emoji_flags[Jersey]=$'\U1F1EF\U1F1EA'
+emoji_flags[JE]=$'\U1F1EF\U1F1EA'
+emoji_flags[JEY]=$'\U1F1EF\U1F1EA'
+emoji_flags[jersey]=$'\U1F1EF\U1F1EA'
 emoji_flags[Jamaica]=$'\U1F1EF\U1F1F2'
+emoji_flags[JM]=$'\U1F1EF\U1F1F2'
+emoji_flags[JAM]=$'\U1F1EF\U1F1F2'
+emoji_flags[jamaica]=$'\U1F1EF\U1F1F2'
 emoji_flags[Jordan]=$'\U1F1EF\U1F1F4'
+emoji_flags[JO]=$'\U1F1EF\U1F1F4'
+emoji_flags[JOR]=$'\U1F1EF\U1F1F4'
+emoji_flags[jordan]=$'\U1F1EF\U1F1F4'
 emoji_flags[Japan]=$'\U1F1EF\U1F1F5'
+emoji_flags[JP]=$'\U1F1EF\U1F1F5'
+emoji_flags[JPN]=$'\U1F1EF\U1F1F5'
+emoji_flags[jp]=$'\U1F1EF\U1F1F5'
 emoji_flags[Kenya]=$'\U1F1F0\U1F1EA'
+emoji_flags[KE]=$'\U1F1F0\U1F1EA'
+emoji_flags[KEN]=$'\U1F1F0\U1F1EA'
+emoji_flags[kenya]=$'\U1F1F0\U1F1EA'
 emoji_flags[Kyrgyzstan]=$'\U1F1F0\U1F1EC'
+emoji_flags[KG]=$'\U1F1F0\U1F1EC'
+emoji_flags[KGZ]=$'\U1F1F0\U1F1EC'
+emoji_flags[kyrgyzstan]=$'\U1F1F0\U1F1EC'
 emoji_flags[Cambodia]=$'\U1F1F0\U1F1ED'
+emoji_flags[KH]=$'\U1F1F0\U1F1ED'
+emoji_flags[KHM]=$'\U1F1F0\U1F1ED'
+emoji_flags[cambodia]=$'\U1F1F0\U1F1ED'
 emoji_flags[Kiribati]=$'\U1F1F0\U1F1EE'
+emoji_flags[KI]=$'\U1F1F0\U1F1EE'
+emoji_flags[KIR]=$'\U1F1F0\U1F1EE'
+emoji_flags[kiribati]=$'\U1F1F0\U1F1EE'
 emoji_flags[Comoros]=$'\U1F1F0\U1F1F2'
-emoji_flags[St__Kitts___Nevis]=$'\U1F1F0\U1F1F3'
+emoji_flags[KM]=$'\U1F1F0\U1F1F2'
+emoji_flags[COM]=$'\U1F1F0\U1F1F2'
+emoji_flags[comoros]=$'\U1F1F0\U1F1F2'
+emoji_flags[St_Kitts_and_Nevis]=$'\U1F1F0\U1F1F3'
+emoji_flags[KN]=$'\U1F1F0\U1F1F3'
+emoji_flags[KNA]=$'\U1F1F0\U1F1F3'
+emoji_flags[st_kitts_nevis]=$'\U1F1F0\U1F1F3'
 emoji_flags[North_Korea]=$'\U1F1F0\U1F1F5'
+emoji_flags[KP]=$'\U1F1F0\U1F1F5'
+emoji_flags[PRK]=$'\U1F1F0\U1F1F5'
+emoji_flags[north_korea]=$'\U1F1F0\U1F1F5'
 emoji_flags[South_Korea]=$'\U1F1F0\U1F1F7'
+emoji_flags[KR]=$'\U1F1F0\U1F1F7'
+emoji_flags[KOR]=$'\U1F1F0\U1F1F7'
+emoji_flags[kr]=$'\U1F1F0\U1F1F7'
 emoji_flags[Kuwait]=$'\U1F1F0\U1F1FC'
+emoji_flags[KW]=$'\U1F1F0\U1F1FC'
+emoji_flags[KWT]=$'\U1F1F0\U1F1FC'
+emoji_flags[kuwait]=$'\U1F1F0\U1F1FC'
 emoji_flags[Cayman_Islands]=$'\U1F1F0\U1F1FE'
+emoji_flags[KY]=$'\U1F1F0\U1F1FE'
+emoji_flags[CYM]=$'\U1F1F0\U1F1FE'
+emoji_flags[cayman_islands]=$'\U1F1F0\U1F1FE'
 emoji_flags[Kazakhstan]=$'\U1F1F0\U1F1FF'
+emoji_flags[KZ]=$'\U1F1F0\U1F1FF'
+emoji_flags[KAZ]=$'\U1F1F0\U1F1FF'
+emoji_flags[kazakhstan]=$'\U1F1F0\U1F1FF'
 emoji_flags[Laos]=$'\U1F1F1\U1F1E6'
+emoji_flags[LA]=$'\U1F1F1\U1F1E6'
+emoji_flags[LAO]=$'\U1F1F1\U1F1E6'
+emoji_flags[laos]=$'\U1F1F1\U1F1E6'
 emoji_flags[Lebanon]=$'\U1F1F1\U1F1E7'
-emoji_flags[St__Lucia]=$'\U1F1F1\U1F1E8'
+emoji_flags[LB]=$'\U1F1F1\U1F1E7'
+emoji_flags[LBN]=$'\U1F1F1\U1F1E7'
+emoji_flags[lebanon]=$'\U1F1F1\U1F1E7'
+emoji_flags[St_Lucia]=$'\U1F1F1\U1F1E8'
+emoji_flags[LC]=$'\U1F1F1\U1F1E8'
+emoji_flags[LCA]=$'\U1F1F1\U1F1E8'
+emoji_flags[st_lucia]=$'\U1F1F1\U1F1E8'
 emoji_flags[Liechtenstein]=$'\U1F1F1\U1F1EE'
+emoji_flags[LI]=$'\U1F1F1\U1F1EE'
+emoji_flags[LIE]=$'\U1F1F1\U1F1EE'
+emoji_flags[liechtenstein]=$'\U1F1F1\U1F1EE'
 emoji_flags[Sri_Lanka]=$'\U1F1F1\U1F1F0'
+emoji_flags[LK]=$'\U1F1F1\U1F1F0'
+emoji_flags[LKA]=$'\U1F1F1\U1F1F0'
+emoji_flags[sri_lanka]=$'\U1F1F1\U1F1F0'
 emoji_flags[Liberia]=$'\U1F1F1\U1F1F7'
+emoji_flags[LR]=$'\U1F1F1\U1F1F7'
+emoji_flags[LBR]=$'\U1F1F1\U1F1F7'
+emoji_flags[liberia]=$'\U1F1F1\U1F1F7'
 emoji_flags[Lesotho]=$'\U1F1F1\U1F1F8'
+emoji_flags[LS]=$'\U1F1F1\U1F1F8'
+emoji_flags[LSO]=$'\U1F1F1\U1F1F8'
+emoji_flags[lesotho]=$'\U1F1F1\U1F1F8'
 emoji_flags[Lithuania]=$'\U1F1F1\U1F1F9'
+emoji_flags[LT]=$'\U1F1F1\U1F1F9'
+emoji_flags[LTU]=$'\U1F1F1\U1F1F9'
+emoji_flags[lithuania]=$'\U1F1F1\U1F1F9'
 emoji_flags[Luxembourg]=$'\U1F1F1\U1F1FA'
+emoji_flags[LU]=$'\U1F1F1\U1F1FA'
+emoji_flags[LUX]=$'\U1F1F1\U1F1FA'
+emoji_flags[luxembourg]=$'\U1F1F1\U1F1FA'
 emoji_flags[Latvia]=$'\U1F1F1\U1F1FB'
+emoji_flags[LV]=$'\U1F1F1\U1F1FB'
+emoji_flags[LVA]=$'\U1F1F1\U1F1FB'
+emoji_flags[latvia]=$'\U1F1F1\U1F1FB'
 emoji_flags[Libya]=$'\U1F1F1\U1F1FE'
+emoji_flags[LY]=$'\U1F1F1\U1F1FE'
+emoji_flags[LBY]=$'\U1F1F1\U1F1FE'
+emoji_flags[libya]=$'\U1F1F1\U1F1FE'
 emoji_flags[Morocco]=$'\U1F1F2\U1F1E6'
+emoji_flags[MA]=$'\U1F1F2\U1F1E6'
+emoji_flags[MAR]=$'\U1F1F2\U1F1E6'
+emoji_flags[morocco]=$'\U1F1F2\U1F1E6'
 emoji_flags[Monaco]=$'\U1F1F2\U1F1E8'
+emoji_flags[MC]=$'\U1F1F2\U1F1E8'
+emoji_flags[MCO]=$'\U1F1F2\U1F1E8'
+emoji_flags[monaco]=$'\U1F1F2\U1F1E8'
 emoji_flags[Moldova]=$'\U1F1F2\U1F1E9'
+emoji_flags[MD]=$'\U1F1F2\U1F1E9'
+emoji_flags[MDA]=$'\U1F1F2\U1F1E9'
+emoji_flags[moldova]=$'\U1F1F2\U1F1E9'
 emoji_flags[Montenegro]=$'\U1F1F2\U1F1EA'
-emoji_flags[St__Martin]=$'\U1F1F2\U1F1EB'
+emoji_flags[ME]=$'\U1F1F2\U1F1EA'
+emoji_flags[MNE]=$'\U1F1F2\U1F1EA'
+emoji_flags[montenegro]=$'\U1F1F2\U1F1EA'
+emoji_flags[St_Martin]=$'\U1F1F2\U1F1EB'
+emoji_flags[MF]=$'\U1F1F2\U1F1EB'
+emoji_flags[MAF]=$'\U1F1F2\U1F1EB'
+emoji_flags[st_martin]=$'\U1F1F2\U1F1EB'
 emoji_flags[Madagascar]=$'\U1F1F2\U1F1EC'
+emoji_flags[MG]=$'\U1F1F2\U1F1EC'
+emoji_flags[MDG]=$'\U1F1F2\U1F1EC'
+emoji_flags[madagascar]=$'\U1F1F2\U1F1EC'
 emoji_flags[Marshall_Islands]=$'\U1F1F2\U1F1ED'
+emoji_flags[MH]=$'\U1F1F2\U1F1ED'
+emoji_flags[MHL]=$'\U1F1F2\U1F1ED'
+emoji_flags[marshall_islands]=$'\U1F1F2\U1F1ED'
 emoji_flags[Macedonia]=$'\U1F1F2\U1F1F0'
+emoji_flags[MK]=$'\U1F1F2\U1F1F0'
+emoji_flags[MKD]=$'\U1F1F2\U1F1F0'
+emoji_flags[macedonia]=$'\U1F1F2\U1F1F0'
 emoji_flags[Mali]=$'\U1F1F2\U1F1F1'
-emoji_flags[Myanmar]=$'\U1F1F2\U1F1F2'
+emoji_flags[ML]=$'\U1F1F2\U1F1F1'
+emoji_flags[MLI]=$'\U1F1F2\U1F1F1'
+emoji_flags[mali]=$'\U1F1F2\U1F1F1'
+emoji_flags[Myanmar_Burma_]=$'\U1F1F2\U1F1F2'
+emoji_flags[MM]=$'\U1F1F2\U1F1F2'
+emoji_flags[MMR]=$'\U1F1F2\U1F1F2'
+emoji_flags[myanmar]=$'\U1F1F2\U1F1F2'
 emoji_flags[Mongolia]=$'\U1F1F2\U1F1F3'
-emoji_flags[Macau]=$'\U1F1F2\U1F1F4'
+emoji_flags[MN]=$'\U1F1F2\U1F1F3'
+emoji_flags[MNG]=$'\U1F1F2\U1F1F3'
+emoji_flags[mongolia]=$'\U1F1F2\U1F1F3'
+emoji_flags[Macao_SAR_China]=$'\U1F1F2\U1F1F4'
+emoji_flags[MO]=$'\U1F1F2\U1F1F4'
+emoji_flags[MAC]=$'\U1F1F2\U1F1F4'
+emoji_flags[macau]=$'\U1F1F2\U1F1F4'
 emoji_flags[Northern_Mariana_Islands]=$'\U1F1F2\U1F1F5'
+emoji_flags[MP]=$'\U1F1F2\U1F1F5'
+emoji_flags[MNP]=$'\U1F1F2\U1F1F5'
+emoji_flags[northern_mariana_islands]=$'\U1F1F2\U1F1F5'
 emoji_flags[Martinique]=$'\U1F1F2\U1F1F6'
+emoji_flags[MQ]=$'\U1F1F2\U1F1F6'
+emoji_flags[MTQ]=$'\U1F1F2\U1F1F6'
+emoji_flags[martinique]=$'\U1F1F2\U1F1F6'
 emoji_flags[Mauritania]=$'\U1F1F2\U1F1F7'
+emoji_flags[MR]=$'\U1F1F2\U1F1F7'
+emoji_flags[MRT]=$'\U1F1F2\U1F1F7'
+emoji_flags[mauritania]=$'\U1F1F2\U1F1F7'
 emoji_flags[Montserrat]=$'\U1F1F2\U1F1F8'
+emoji_flags[MS]=$'\U1F1F2\U1F1F8'
+emoji_flags[MSR]=$'\U1F1F2\U1F1F8'
+emoji_flags[montserrat]=$'\U1F1F2\U1F1F8'
 emoji_flags[Malta]=$'\U1F1F2\U1F1F9'
+emoji_flags[MT]=$'\U1F1F2\U1F1F9'
+emoji_flags[MLT]=$'\U1F1F2\U1F1F9'
+emoji_flags[malta]=$'\U1F1F2\U1F1F9'
 emoji_flags[Mauritius]=$'\U1F1F2\U1F1FA'
+emoji_flags[MU]=$'\U1F1F2\U1F1FA'
+emoji_flags[MUS]=$'\U1F1F2\U1F1FA'
+emoji_flags[mauritius]=$'\U1F1F2\U1F1FA'
 emoji_flags[Maldives]=$'\U1F1F2\U1F1FB'
+emoji_flags[MV]=$'\U1F1F2\U1F1FB'
+emoji_flags[MDV]=$'\U1F1F2\U1F1FB'
+emoji_flags[maldives]=$'\U1F1F2\U1F1FB'
 emoji_flags[Malawi]=$'\U1F1F2\U1F1FC'
+emoji_flags[MW]=$'\U1F1F2\U1F1FC'
+emoji_flags[MWI]=$'\U1F1F2\U1F1FC'
+emoji_flags[malawi]=$'\U1F1F2\U1F1FC'
 emoji_flags[Mexico]=$'\U1F1F2\U1F1FD'
+emoji_flags[MX]=$'\U1F1F2\U1F1FD'
+emoji_flags[MEX]=$'\U1F1F2\U1F1FD'
+emoji_flags[mexico]=$'\U1F1F2\U1F1FD'
 emoji_flags[Malaysia]=$'\U1F1F2\U1F1FE'
+emoji_flags[MY]=$'\U1F1F2\U1F1FE'
+emoji_flags[MYS]=$'\U1F1F2\U1F1FE'
+emoji_flags[malaysia]=$'\U1F1F2\U1F1FE'
 emoji_flags[Mozambique]=$'\U1F1F2\U1F1FF'
+emoji_flags[MZ]=$'\U1F1F2\U1F1FF'
+emoji_flags[MOZ]=$'\U1F1F2\U1F1FF'
+emoji_flags[mozambique]=$'\U1F1F2\U1F1FF'
 emoji_flags[Namibia]=$'\U1F1F3\U1F1E6'
+emoji_flags[NA]=$'\U1F1F3\U1F1E6'
+emoji_flags[NAM]=$'\U1F1F3\U1F1E6'
+emoji_flags[namibia]=$'\U1F1F3\U1F1E6'
 emoji_flags[New_Caledonia]=$'\U1F1F3\U1F1E8'
+emoji_flags[NC]=$'\U1F1F3\U1F1E8'
+emoji_flags[NCL]=$'\U1F1F3\U1F1E8'
+emoji_flags[new_caledonia]=$'\U1F1F3\U1F1E8'
 emoji_flags[Niger]=$'\U1F1F3\U1F1EA'
+emoji_flags[NE]=$'\U1F1F3\U1F1EA'
+emoji_flags[NER]=$'\U1F1F3\U1F1EA'
+emoji_flags[niger]=$'\U1F1F3\U1F1EA'
 emoji_flags[Norfolk_Island]=$'\U1F1F3\U1F1EB'
+emoji_flags[NF]=$'\U1F1F3\U1F1EB'
+emoji_flags[NFK]=$'\U1F1F3\U1F1EB'
+emoji_flags[norfolk_island]=$'\U1F1F3\U1F1EB'
 emoji_flags[Nigeria]=$'\U1F1F3\U1F1EC'
+emoji_flags[NG]=$'\U1F1F3\U1F1EC'
+emoji_flags[NGA]=$'\U1F1F3\U1F1EC'
+emoji_flags[nigeria]=$'\U1F1F3\U1F1EC'
 emoji_flags[Nicaragua]=$'\U1F1F3\U1F1EE'
+emoji_flags[NI]=$'\U1F1F3\U1F1EE'
+emoji_flags[NIC]=$'\U1F1F3\U1F1EE'
+emoji_flags[nicaragua]=$'\U1F1F3\U1F1EE'
 emoji_flags[Netherlands]=$'\U1F1F3\U1F1F1'
+emoji_flags[NL]=$'\U1F1F3\U1F1F1'
+emoji_flags[NLD]=$'\U1F1F3\U1F1F1'
+emoji_flags[netherlands]=$'\U1F1F3\U1F1F1'
 emoji_flags[Norway]=$'\U1F1F3\U1F1F4'
+emoji_flags[NO]=$'\U1F1F3\U1F1F4'
+emoji_flags[NOR]=$'\U1F1F3\U1F1F4'
+emoji_flags[norway]=$'\U1F1F3\U1F1F4'
 emoji_flags[Nepal]=$'\U1F1F3\U1F1F5'
+emoji_flags[NP]=$'\U1F1F3\U1F1F5'
+emoji_flags[NPL]=$'\U1F1F3\U1F1F5'
+emoji_flags[nepal]=$'\U1F1F3\U1F1F5'
 emoji_flags[Nauru]=$'\U1F1F3\U1F1F7'
+emoji_flags[NR]=$'\U1F1F3\U1F1F7'
+emoji_flags[NRU]=$'\U1F1F3\U1F1F7'
+emoji_flags[nauru]=$'\U1F1F3\U1F1F7'
 emoji_flags[Niue]=$'\U1F1F3\U1F1FA'
+emoji_flags[NU]=$'\U1F1F3\U1F1FA'
+emoji_flags[NIU]=$'\U1F1F3\U1F1FA'
+emoji_flags[niue]=$'\U1F1F3\U1F1FA'
 emoji_flags[New_Zealand]=$'\U1F1F3\U1F1FF'
+emoji_flags[NZ]=$'\U1F1F3\U1F1FF'
+emoji_flags[NZL]=$'\U1F1F3\U1F1FF'
+emoji_flags[new_zealand]=$'\U1F1F3\U1F1FF'
 emoji_flags[Oman]=$'\U1F1F4\U1F1F2'
+emoji_flags[OM]=$'\U1F1F4\U1F1F2'
+emoji_flags[OMN]=$'\U1F1F4\U1F1F2'
+emoji_flags[oman]=$'\U1F1F4\U1F1F2'
 emoji_flags[Panama]=$'\U1F1F5\U1F1E6'
+emoji_flags[PA]=$'\U1F1F5\U1F1E6'
+emoji_flags[PAN]=$'\U1F1F5\U1F1E6'
+emoji_flags[panama]=$'\U1F1F5\U1F1E6'
 emoji_flags[Peru]=$'\U1F1F5\U1F1EA'
+emoji_flags[PE]=$'\U1F1F5\U1F1EA'
+emoji_flags[PER]=$'\U1F1F5\U1F1EA'
+emoji_flags[peru]=$'\U1F1F5\U1F1EA'
 emoji_flags[French_Polynesia]=$'\U1F1F5\U1F1EB'
+emoji_flags[PF]=$'\U1F1F5\U1F1EB'
+emoji_flags[PYF]=$'\U1F1F5\U1F1EB'
+emoji_flags[french_polynesia]=$'\U1F1F5\U1F1EB'
 emoji_flags[Papua_New_Guinea]=$'\U1F1F5\U1F1EC'
+emoji_flags[PG]=$'\U1F1F5\U1F1EC'
+emoji_flags[PNG]=$'\U1F1F5\U1F1EC'
+emoji_flags[papua_new_guinea]=$'\U1F1F5\U1F1EC'
 emoji_flags[Philippines]=$'\U1F1F5\U1F1ED'
+emoji_flags[PH]=$'\U1F1F5\U1F1ED'
+emoji_flags[PHL]=$'\U1F1F5\U1F1ED'
+emoji_flags[philippines]=$'\U1F1F5\U1F1ED'
 emoji_flags[Pakistan]=$'\U1F1F5\U1F1F0'
+emoji_flags[PK]=$'\U1F1F5\U1F1F0'
+emoji_flags[PAK]=$'\U1F1F5\U1F1F0'
+emoji_flags[pakistan]=$'\U1F1F5\U1F1F0'
 emoji_flags[Poland]=$'\U1F1F5\U1F1F1'
-emoji_flags[St__Pierre___Miquelon]=$'\U1F1F5\U1F1F2'
+emoji_flags[PL]=$'\U1F1F5\U1F1F1'
+emoji_flags[POL]=$'\U1F1F5\U1F1F1'
+emoji_flags[poland]=$'\U1F1F5\U1F1F1'
+emoji_flags[St_Pierre_and_Miquelon]=$'\U1F1F5\U1F1F2'
+emoji_flags[PM]=$'\U1F1F5\U1F1F2'
+emoji_flags[SPM]=$'\U1F1F5\U1F1F2'
+emoji_flags[st_pierre_miquelon]=$'\U1F1F5\U1F1F2'
 emoji_flags[Pitcairn_Islands]=$'\U1F1F5\U1F1F3'
+emoji_flags[PN]=$'\U1F1F5\U1F1F3'
+emoji_flags[PCN]=$'\U1F1F5\U1F1F3'
+emoji_flags[pitcairn_islands]=$'\U1F1F5\U1F1F3'
 emoji_flags[Puerto_Rico]=$'\U1F1F5\U1F1F7'
+emoji_flags[PR]=$'\U1F1F5\U1F1F7'
+emoji_flags[PRI]=$'\U1F1F5\U1F1F7'
+emoji_flags[puerto_rico]=$'\U1F1F5\U1F1F7'
 emoji_flags[Palestinian_Territories]=$'\U1F1F5\U1F1F8'
+emoji_flags[PS]=$'\U1F1F5\U1F1F8'
+emoji_flags[PSE]=$'\U1F1F5\U1F1F8'
+emoji_flags[palestinian_territories]=$'\U1F1F5\U1F1F8'
 emoji_flags[Portugal]=$'\U1F1F5\U1F1F9'
+emoji_flags[PT]=$'\U1F1F5\U1F1F9'
+emoji_flags[PRT]=$'\U1F1F5\U1F1F9'
+emoji_flags[portugal]=$'\U1F1F5\U1F1F9'
 emoji_flags[Palau]=$'\U1F1F5\U1F1FC'
+emoji_flags[PW]=$'\U1F1F5\U1F1FC'
+emoji_flags[PLW]=$'\U1F1F5\U1F1FC'
+emoji_flags[palau]=$'\U1F1F5\U1F1FC'
 emoji_flags[Paraguay]=$'\U1F1F5\U1F1FE'
+emoji_flags[PY]=$'\U1F1F5\U1F1FE'
+emoji_flags[PRY]=$'\U1F1F5\U1F1FE'
+emoji_flags[paraguay]=$'\U1F1F5\U1F1FE'
 emoji_flags[Qatar]=$'\U1F1F6\U1F1E6'
-emoji_flags[R�_union]=$'\U1F1F7\U1F1EA'
+emoji_flags[QA]=$'\U1F1F6\U1F1E6'
+emoji_flags[QAT]=$'\U1F1F6\U1F1E6'
+emoji_flags[qatar]=$'\U1F1F6\U1F1E6'
+emoji_flags[Réunion]=$'\U1F1F7\U1F1EA'
+emoji_flags[RE]=$'\U1F1F7\U1F1EA'
+emoji_flags[REU]=$'\U1F1F7\U1F1EA'
+emoji_flags[reunion]=$'\U1F1F7\U1F1EA'
 emoji_flags[Romania]=$'\U1F1F7\U1F1F4'
+emoji_flags[RO]=$'\U1F1F7\U1F1F4'
+emoji_flags[ROU]=$'\U1F1F7\U1F1F4'
+emoji_flags[romania]=$'\U1F1F7\U1F1F4'
 emoji_flags[Serbia]=$'\U1F1F7\U1F1F8'
+emoji_flags[RS]=$'\U1F1F7\U1F1F8'
+emoji_flags[SRB]=$'\U1F1F7\U1F1F8'
+emoji_flags[serbia]=$'\U1F1F7\U1F1F8'
 emoji_flags[Russia]=$'\U1F1F7\U1F1FA'
+emoji_flags[RU]=$'\U1F1F7\U1F1FA'
+emoji_flags[RUS]=$'\U1F1F7\U1F1FA'
+emoji_flags[ru]=$'\U1F1F7\U1F1FA'
 emoji_flags[Rwanda]=$'\U1F1F7\U1F1FC'
+emoji_flags[RW]=$'\U1F1F7\U1F1FC'
+emoji_flags[RWA]=$'\U1F1F7\U1F1FC'
+emoji_flags[rwanda]=$'\U1F1F7\U1F1FC'
 emoji_flags[Saudi_Arabia]=$'\U1F1F8\U1F1E6'
+emoji_flags[SA]=$'\U1F1F8\U1F1E6'
+emoji_flags[SAU]=$'\U1F1F8\U1F1E6'
+emoji_flags[saudi_arabia]=$'\U1F1F8\U1F1E6'
 emoji_flags[Solomon_Islands]=$'\U1F1F8\U1F1E7'
+emoji_flags[SB]=$'\U1F1F8\U1F1E7'
+emoji_flags[SLB]=$'\U1F1F8\U1F1E7'
+emoji_flags[solomon_islands]=$'\U1F1F8\U1F1E7'
 emoji_flags[Seychelles]=$'\U1F1F8\U1F1E8'
+emoji_flags[SC]=$'\U1F1F8\U1F1E8'
+emoji_flags[SYC]=$'\U1F1F8\U1F1E8'
+emoji_flags[seychelles]=$'\U1F1F8\U1F1E8'
 emoji_flags[Sudan]=$'\U1F1F8\U1F1E9'
+emoji_flags[SD]=$'\U1F1F8\U1F1E9'
+emoji_flags[SDN]=$'\U1F1F8\U1F1E9'
+emoji_flags[sudan]=$'\U1F1F8\U1F1E9'
 emoji_flags[Sweden]=$'\U1F1F8\U1F1EA'
+emoji_flags[SE]=$'\U1F1F8\U1F1EA'
+emoji_flags[SWE]=$'\U1F1F8\U1F1EA'
+emoji_flags[sweden]=$'\U1F1F8\U1F1EA'
 emoji_flags[Singapore]=$'\U1F1F8\U1F1EC'
-emoji_flags[St__Helena]=$'\U1F1F8\U1F1ED'
+emoji_flags[SG]=$'\U1F1F8\U1F1EC'
+emoji_flags[SGP]=$'\U1F1F8\U1F1EC'
+emoji_flags[singapore]=$'\U1F1F8\U1F1EC'
+emoji_flags[St_Helena]=$'\U1F1F8\U1F1ED'
+emoji_flags[SH]=$'\U1F1F8\U1F1ED'
+emoji_flags[SHN]=$'\U1F1F8\U1F1ED'
+emoji_flags[st_helena]=$'\U1F1F8\U1F1ED'
 emoji_flags[Slovenia]=$'\U1F1F8\U1F1EE'
-emoji_flags[Svalbard___Jan_Mayen]=$'\U1F1F8\U1F1EF'
+emoji_flags[SI]=$'\U1F1F8\U1F1EE'
+emoji_flags[SVN]=$'\U1F1F8\U1F1EE'
+emoji_flags[slovenia]=$'\U1F1F8\U1F1EE'
+emoji_flags[Svalbard_and_Jan_Mayen]=$'\U1F1F8\U1F1EF'
+emoji_flags[SJ]=$'\U1F1F8\U1F1EF'
+emoji_flags[SJM]=$'\U1F1F8\U1F1EF'
+emoji_flags[svalbard_jan_mayen]=$'\U1F1F8\U1F1EF'
 emoji_flags[Slovakia]=$'\U1F1F8\U1F1F0'
+emoji_flags[SK]=$'\U1F1F8\U1F1F0'
+emoji_flags[SVK]=$'\U1F1F8\U1F1F0'
+emoji_flags[slovakia]=$'\U1F1F8\U1F1F0'
 emoji_flags[Sierra_Leone]=$'\U1F1F8\U1F1F1'
+emoji_flags[SL]=$'\U1F1F8\U1F1F1'
+emoji_flags[SLE]=$'\U1F1F8\U1F1F1'
+emoji_flags[sierra_leone]=$'\U1F1F8\U1F1F1'
 emoji_flags[San_Marino]=$'\U1F1F8\U1F1F2'
+emoji_flags[SM]=$'\U1F1F8\U1F1F2'
+emoji_flags[SMR]=$'\U1F1F8\U1F1F2'
+emoji_flags[san_marino]=$'\U1F1F8\U1F1F2'
 emoji_flags[Senegal]=$'\U1F1F8\U1F1F3'
+emoji_flags[SN]=$'\U1F1F8\U1F1F3'
+emoji_flags[SEN]=$'\U1F1F8\U1F1F3'
+emoji_flags[senegal]=$'\U1F1F8\U1F1F3'
 emoji_flags[Somalia]=$'\U1F1F8\U1F1F4'
+emoji_flags[SO]=$'\U1F1F8\U1F1F4'
+emoji_flags[SOM]=$'\U1F1F8\U1F1F4'
+emoji_flags[somalia]=$'\U1F1F8\U1F1F4'
 emoji_flags[Suriname]=$'\U1F1F8\U1F1F7'
+emoji_flags[SR]=$'\U1F1F8\U1F1F7'
+emoji_flags[SUR]=$'\U1F1F8\U1F1F7'
+emoji_flags[suriname]=$'\U1F1F8\U1F1F7'
 emoji_flags[South_Sudan]=$'\U1F1F8\U1F1F8'
-emoji_flags[S�_o_Tom�____Pr�_ncipe]=$'\U1F1F8\U1F1F9'
+emoji_flags[SS]=$'\U1F1F8\U1F1F8'
+emoji_flags[SSD]=$'\U1F1F8\U1F1F8'
+emoji_flags[south_sudan]=$'\U1F1F8\U1F1F8'
+emoji_flags[São_Tomé_and_Príncipe]=$'\U1F1F8\U1F1F9'
+emoji_flags[sao_tome_principe]=$'\U1F1F8\U1F1F9'
 emoji_flags[El_Salvador]=$'\U1F1F8\U1F1FB'
+emoji_flags[SV]=$'\U1F1F8\U1F1FB'
+emoji_flags[SLV]=$'\U1F1F8\U1F1FB'
+emoji_flags[el_salvador]=$'\U1F1F8\U1F1FB'
 emoji_flags[Sint_Maarten]=$'\U1F1F8\U1F1FD'
+emoji_flags[SX]=$'\U1F1F8\U1F1FD'
+emoji_flags[SXM]=$'\U1F1F8\U1F1FD'
+emoji_flags[sint_maarten]=$'\U1F1F8\U1F1FD'
 emoji_flags[Syria]=$'\U1F1F8\U1F1FE'
-emoji_flags[Swaziland]=$'\U1F1F8\U1F1FF'
+emoji_flags[SY]=$'\U1F1F8\U1F1FE'
+emoji_flags[SYR]=$'\U1F1F8\U1F1FE'
+emoji_flags[syria]=$'\U1F1F8\U1F1FE'
+emoji_flags[Eswatini]=$'\U1F1F8\U1F1FF'
+emoji_flags[SZ]=$'\U1F1F8\U1F1FF'
+emoji_flags[SWZ]=$'\U1F1F8\U1F1FF'
+emoji_flags[swaziland]=$'\U1F1F8\U1F1FF'
 emoji_flags[Tristan_da_Cunha]=$'\U1F1F9\U1F1E6'
-emoji_flags[Turks___Caicos_Islands]=$'\U1F1F9\U1F1E8'
+emoji_flags[tristan_da_cunha]=$'\U1F1F9\U1F1E6'
+emoji_flags[Turks_and_Caicos_Islands]=$'\U1F1F9\U1F1E8'
+emoji_flags[TC]=$'\U1F1F9\U1F1E8'
+emoji_flags[TCA]=$'\U1F1F9\U1F1E8'
+emoji_flags[turks_caicos_islands]=$'\U1F1F9\U1F1E8'
 emoji_flags[Chad]=$'\U1F1F9\U1F1E9'
+emoji_flags[TD]=$'\U1F1F9\U1F1E9'
+emoji_flags[TCD]=$'\U1F1F9\U1F1E9'
+emoji_flags[chad]=$'\U1F1F9\U1F1E9'
 emoji_flags[French_Southern_Territories]=$'\U1F1F9\U1F1EB'
+emoji_flags[TF]=$'\U1F1F9\U1F1EB'
+emoji_flags[ATF]=$'\U1F1F9\U1F1EB'
+emoji_flags[french_southern_territories]=$'\U1F1F9\U1F1EB'
 emoji_flags[Togo]=$'\U1F1F9\U1F1EC'
+emoji_flags[TG]=$'\U1F1F9\U1F1EC'
+emoji_flags[TGO]=$'\U1F1F9\U1F1EC'
+emoji_flags[togo]=$'\U1F1F9\U1F1EC'
 emoji_flags[Thailand]=$'\U1F1F9\U1F1ED'
+emoji_flags[TH]=$'\U1F1F9\U1F1ED'
+emoji_flags[THA]=$'\U1F1F9\U1F1ED'
+emoji_flags[thailand]=$'\U1F1F9\U1F1ED'
 emoji_flags[Tajikistan]=$'\U1F1F9\U1F1EF'
+emoji_flags[TJ]=$'\U1F1F9\U1F1EF'
+emoji_flags[TJK]=$'\U1F1F9\U1F1EF'
+emoji_flags[tajikistan]=$'\U1F1F9\U1F1EF'
 emoji_flags[Tokelau]=$'\U1F1F9\U1F1F0'
+emoji_flags[TK]=$'\U1F1F9\U1F1F0'
+emoji_flags[TKL]=$'\U1F1F9\U1F1F0'
+emoji_flags[tokelau]=$'\U1F1F9\U1F1F0'
 emoji_flags[Timor_Leste]=$'\U1F1F9\U1F1F1'
+emoji_flags[TL]=$'\U1F1F9\U1F1F1'
+emoji_flags[TLS]=$'\U1F1F9\U1F1F1'
+emoji_flags[timor_leste]=$'\U1F1F9\U1F1F1'
 emoji_flags[Turkmenistan]=$'\U1F1F9\U1F1F2'
+emoji_flags[TM]=$'\U1F1F9\U1F1F2'
+emoji_flags[TKM]=$'\U1F1F9\U1F1F2'
+emoji_flags[turkmenistan]=$'\U1F1F9\U1F1F2'
 emoji_flags[Tunisia]=$'\U1F1F9\U1F1F3'
+emoji_flags[TN]=$'\U1F1F9\U1F1F3'
+emoji_flags[TUN]=$'\U1F1F9\U1F1F3'
+emoji_flags[tunisia]=$'\U1F1F9\U1F1F3'
 emoji_flags[Tonga]=$'\U1F1F9\U1F1F4'
+emoji_flags[TO]=$'\U1F1F9\U1F1F4'
+emoji_flags[TON]=$'\U1F1F9\U1F1F4'
+emoji_flags[tonga]=$'\U1F1F9\U1F1F4'
 emoji_flags[Turkey]=$'\U1F1F9\U1F1F7'
-emoji_flags[Trinidad___Tobago]=$'\U1F1F9\U1F1F9'
+emoji_flags[TR]=$'\U1F1F9\U1F1F7'
+emoji_flags[TUR]=$'\U1F1F9\U1F1F7'
+emoji_flags[tr]=$'\U1F1F9\U1F1F7'
+emoji_flags[Trinidad_and_Tobago]=$'\U1F1F9\U1F1F9'
+emoji_flags[TT]=$'\U1F1F9\U1F1F9'
+emoji_flags[TTO]=$'\U1F1F9\U1F1F9'
+emoji_flags[trinidad_tobago]=$'\U1F1F9\U1F1F9'
 emoji_flags[Tuvalu]=$'\U1F1F9\U1F1FB'
+emoji_flags[TV]=$'\U1F1F9\U1F1FB'
+emoji_flags[TUV]=$'\U1F1F9\U1F1FB'
+emoji_flags[tuvalu]=$'\U1F1F9\U1F1FB'
 emoji_flags[Taiwan]=$'\U1F1F9\U1F1FC'
+emoji_flags[TW]=$'\U1F1F9\U1F1FC'
+emoji_flags[TWN]=$'\U1F1F9\U1F1FC'
+emoji_flags[taiwan]=$'\U1F1F9\U1F1FC'
 emoji_flags[Tanzania]=$'\U1F1F9\U1F1FF'
+emoji_flags[TZ]=$'\U1F1F9\U1F1FF'
+emoji_flags[TZA]=$'\U1F1F9\U1F1FF'
+emoji_flags[tanzania]=$'\U1F1F9\U1F1FF'
 emoji_flags[Ukraine]=$'\U1F1FA\U1F1E6'
+emoji_flags[UA]=$'\U1F1FA\U1F1E6'
+emoji_flags[UKR]=$'\U1F1FA\U1F1E6'
+emoji_flags[ukraine]=$'\U1F1FA\U1F1E6'
 emoji_flags[Uganda]=$'\U1F1FA\U1F1EC'
-emoji_flags[U_S__Outlying_Islands]=$'\U1F1FA\U1F1F2'
+emoji_flags[UG]=$'\U1F1FA\U1F1EC'
+emoji_flags[UGA]=$'\U1F1FA\U1F1EC'
+emoji_flags[uganda]=$'\U1F1FA\U1F1EC'
+emoji_flags[U_S_Outlying_Islands]=$'\U1F1FA\U1F1F2'
+emoji_flags[us_outlying_islands]=$'\U1F1FA\U1F1F2'
+emoji_flags[United_Nations]=$'\U1F1FA\U1F1F3'
+emoji_flags[united_nations]=$'\U1F1FA\U1F1F3'
 emoji_flags[United_States]=$'\U1F1FA\U1F1F8'
+emoji_flags[US]=$'\U1F1FA\U1F1F8'
+emoji_flags[USA]=$'\U1F1FA\U1F1F8'
+emoji_flags[us]=$'\U1F1FA\U1F1F8'
 emoji_flags[Uruguay]=$'\U1F1FA\U1F1FE'
+emoji_flags[UY]=$'\U1F1FA\U1F1FE'
+emoji_flags[URY]=$'\U1F1FA\U1F1FE'
+emoji_flags[uruguay]=$'\U1F1FA\U1F1FE'
 emoji_flags[Uzbekistan]=$'\U1F1FA\U1F1FF'
+emoji_flags[UZ]=$'\U1F1FA\U1F1FF'
+emoji_flags[UZB]=$'\U1F1FA\U1F1FF'
+emoji_flags[uzbekistan]=$'\U1F1FA\U1F1FF'
 emoji_flags[Vatican_City]=$'\U1F1FB\U1F1E6'
-emoji_flags[St__Vincent___Grenadines]=$'\U1F1FB\U1F1E8'
+emoji_flags[VA]=$'\U1F1FB\U1F1E6'
+emoji_flags[VAT]=$'\U1F1FB\U1F1E6'
+emoji_flags[vatican_city]=$'\U1F1FB\U1F1E6'
+emoji_flags[St_Vincent_and_Grenadines]=$'\U1F1FB\U1F1E8'
+emoji_flags[VC]=$'\U1F1FB\U1F1E8'
+emoji_flags[VCT]=$'\U1F1FB\U1F1E8'
+emoji_flags[st_vincent_grenadines]=$'\U1F1FB\U1F1E8'
 emoji_flags[Venezuela]=$'\U1F1FB\U1F1EA'
+emoji_flags[VE]=$'\U1F1FB\U1F1EA'
+emoji_flags[VEN]=$'\U1F1FB\U1F1EA'
+emoji_flags[venezuela]=$'\U1F1FB\U1F1EA'
 emoji_flags[British_Virgin_Islands]=$'\U1F1FB\U1F1EC'
-emoji_flags[U_S__Virgin_Islands]=$'\U1F1FB\U1F1EE'
+emoji_flags[VG]=$'\U1F1FB\U1F1EC'
+emoji_flags[VGB]=$'\U1F1FB\U1F1EC'
+emoji_flags[british_virgin_islands]=$'\U1F1FB\U1F1EC'
+emoji_flags[U_S_Virgin_Islands]=$'\U1F1FB\U1F1EE'
+emoji_flags[VI]=$'\U1F1FB\U1F1EE'
+emoji_flags[VIR]=$'\U1F1FB\U1F1EE'
+emoji_flags[us_virgin_islands]=$'\U1F1FB\U1F1EE'
 emoji_flags[Vietnam]=$'\U1F1FB\U1F1F3'
+emoji_flags[VN]=$'\U1F1FB\U1F1F3'
+emoji_flags[VNM]=$'\U1F1FB\U1F1F3'
+emoji_flags[vietnam]=$'\U1F1FB\U1F1F3'
 emoji_flags[Vanuatu]=$'\U1F1FB\U1F1FA'
-emoji_flags[Wallis___Futuna]=$'\U1F1FC\U1F1EB'
+emoji_flags[VU]=$'\U1F1FB\U1F1FA'
+emoji_flags[VUT]=$'\U1F1FB\U1F1FA'
+emoji_flags[vanuatu]=$'\U1F1FB\U1F1FA'
+emoji_flags[Wallis_and_Futuna]=$'\U1F1FC\U1F1EB'
+emoji_flags[WF]=$'\U1F1FC\U1F1EB'
+emoji_flags[WLF]=$'\U1F1FC\U1F1EB'
+emoji_flags[wallis_futuna]=$'\U1F1FC\U1F1EB'
 emoji_flags[Samoa]=$'\U1F1FC\U1F1F8'
+emoji_flags[WS]=$'\U1F1FC\U1F1F8'
+emoji_flags[WSM]=$'\U1F1FC\U1F1F8'
+emoji_flags[samoa]=$'\U1F1FC\U1F1F8'
 emoji_flags[Kosovo]=$'\U1F1FD\U1F1F0'
+emoji_flags[XK]=$'\U1F1FD\U1F1F0'
+emoji_flags[XKX]=$'\U1F1FD\U1F1F0'
+emoji_flags[kosovo]=$'\U1F1FD\U1F1F0'
 emoji_flags[Yemen]=$'\U1F1FE\U1F1EA'
+emoji_flags[YE]=$'\U1F1FE\U1F1EA'
+emoji_flags[YEM]=$'\U1F1FE\U1F1EA'
+emoji_flags[yemen]=$'\U1F1FE\U1F1EA'
 emoji_flags[Mayotte]=$'\U1F1FE\U1F1F9'
+emoji_flags[YT]=$'\U1F1FE\U1F1F9'
+emoji_flags[MYT]=$'\U1F1FE\U1F1F9'
+emoji_flags[mayotte]=$'\U1F1FE\U1F1F9'
 emoji_flags[South_Africa]=$'\U1F1FF\U1F1E6'
+emoji_flags[ZA]=$'\U1F1FF\U1F1E6'
+emoji_flags[ZAF]=$'\U1F1FF\U1F1E6'
+emoji_flags[south_africa]=$'\U1F1FF\U1F1E6'
 emoji_flags[Zambia]=$'\U1F1FF\U1F1F2'
+emoji_flags[ZM]=$'\U1F1FF\U1F1F2'
+emoji_flags[ZMB]=$'\U1F1FF\U1F1F2'
+emoji_flags[zambia]=$'\U1F1FF\U1F1F2'
 emoji_flags[Zimbabwe]=$'\U1F1FF\U1F1FC'
+emoji_flags[ZW]=$'\U1F1FF\U1F1FC'
+emoji_flags[ZWE]=$'\U1F1FF\U1F1FC'
+emoji_flags[zimbabwe]=$'\U1F1FF\U1F1FC'
+emoji_flags[England]=$'\U1F3F4\UE0067\UE0062\UE0065\UE006E\UE0067\UE007F'
+emoji_flags[england]=$'\U1F3F4\UE0067\UE0062\UE0065\UE006E\UE0067\UE007F'
+emoji_flags[Scotland]=$'\U1F3F4\UE0067\UE0062\UE0073\UE0063\UE0074\UE007F'
+emoji_flags[scotland]=$'\U1F3F4\UE0067\UE0062\UE0073\UE0063\UE0074\UE007F'
+emoji_flags[Wales]=$'\U1F3F4\UE0067\UE0062\UE0077\UE006C\UE0073\UE007F'
+emoji_flags[wales]=$'\U1F3F4\UE0067\UE0062\UE0077\UE006C\UE0073\UE007F'
 
+emoji_groups[fruits]="
+  grapes
+  melon
+  watermelon
+  tangerine
+  lemon
+  banana
+  pineapple
+  mango
+  red_apple
+  green_apple
+  pear
+  peach
+  cherries
+  strawberry
+  kiwi_fruit
+  tomato
+  coconut
+"
+
+emoji_groups[vehicles]="
+  locomotive
+  railway_car
+  high_speed_train
+  bullet_train
+  bullet_train_1
+  metro
+  light_rail
+  station
+  tram
+  monorail
+  mountain_railway
+  tram_car
+  bus
+  oncoming_bus
+  trolleybus
+  minibus
+  ambulance
+  fire_engine
+  police_car
+  oncoming_police_car
+  taxi
+  oncoming_taxi
+  automobile
+  oncoming_automobile
+  sport_utility_vehicle
+  delivery_truck
+  articulated_lorry
+  tractor
+  racing_car
+  motorcycle
+  motor_scooter
+  manual_wheelchair
+  motorized_wheelchair
+  auto_rickshaw
+  bicycle
+  kick_scooter
+  skateboard
+  bus_stop
+  motorway
+  railway_track
+  oil_drum
+  fuel_pump
+  police_car_light
+  horizontal_traffic_light
+  vertical_traffic_light
+  stop_sign
+  construction
+  anchor
+  sailboat
+  canoe
+  speedboat
+  passenger_ship
+  ferry
+  motor_boat
+  ship
+  airplane
+  small_airplane
+  airplane_departure
+  airplane_arrival
+  parachute
+  seat
+  helicopter
+  suspension_railway
+  mountain_cableway
+  aerial_tramway
+  satellite
+  rocket
+  flying_saucer
+  ATM_sign
+  litter_in_bin_sign
+  potable_water
+  wheelchair_symbol
+  men_s_room
+  women_s_room
+  restroom
+  baby_symbol
+  water_closet
+  passport_control
+  customs
+  baggage_claim
+  left_luggage
+"
+
+emoji_groups[hands]="
+  waving_hand
+  waving_hand_light_skin_tone
+  waving_hand_medium_light_skin_tone
+  waving_hand_medium_skin_tone
+  waving_hand_medium_dark_skin_tone
+  waving_hand_dark_skin_tone
+  raised_back_of_hand
+  raised_back_of_hand_light_skin_tone
+  raised_back_of_hand_medium_light_skin_tone
+  raised_back_of_hand_medium_skin_tone
+  raised_back_of_hand_medium_dark_skin_tone
+  raised_back_of_hand_dark_skin_tone
+  hand_with_fingers_splayed
+  hand_with_fingers_splayed_light_skin_tone
+  hand_with_fingers_splayed_medium_light_skin_tone
+  hand_with_fingers_splayed_medium_skin_tone
+  hand_with_fingers_splayed_medium_dark_skin_tone
+  hand_with_fingers_splayed_dark_skin_tone
+  raised_hand
+  raised_hand_light_skin_tone
+  raised_hand_medium_light_skin_tone
+  raised_hand_medium_skin_tone
+  raised_hand_medium_dark_skin_tone
+  raised_hand_dark_skin_tone
+  vulcan_salute
+  vulcan_salute_light_skin_tone
+  vulcan_salute_medium_light_skin_tone
+  vulcan_salute_medium_skin_tone
+  vulcan_salute_medium_dark_skin_tone
+  vulcan_salute_dark_skin_tone
+  OK_hand
+  OK_hand_light_skin_tone
+  OK_hand_medium_light_skin_tone
+  OK_hand_medium_skin_tone
+  OK_hand_medium_dark_skin_tone
+  OK_hand_dark_skin_tone
+  pinching_hand
+  pinching_hand_light_skin_tone
+  pinching_hand_medium_light_skin_tone
+  pinching_hand_medium_skin_tone
+  pinching_hand_medium_dark_skin_tone
+  pinching_hand_dark_skin_tone
+  victory_hand
+  victory_hand_light_skin_tone
+  victory_hand_medium_light_skin_tone
+  victory_hand_medium_skin_tone
+  victory_hand_medium_dark_skin_tone
+  victory_hand_dark_skin_tone
+  crossed_fingers
+  crossed_fingers_light_skin_tone
+  crossed_fingers_medium_light_skin_tone
+  crossed_fingers_medium_skin_tone
+  crossed_fingers_medium_dark_skin_tone
+  crossed_fingers_dark_skin_tone
+  love_you_gesture
+  love_you_gesture_light_skin_tone
+  love_you_gesture_medium_light_skin_tone
+  love_you_gesture_medium_skin_tone
+  love_you_gesture_medium_dark_skin_tone
+  love_you_gesture_dark_skin_tone
+  sign_of_the_horns
+  sign_of_the_horns_light_skin_tone
+  sign_of_the_horns_medium_light_skin_tone
+  sign_of_the_horns_medium_skin_tone
+  sign_of_the_horns_medium_dark_skin_tone
+  sign_of_the_horns_dark_skin_tone
+  call_me_hand
+  call_me_hand_light_skin_tone
+  call_me_hand_medium_light_skin_tone
+  call_me_hand_medium_skin_tone
+  call_me_hand_medium_dark_skin_tone
+  call_me_hand_dark_skin_tone
+  backhand_index_pointing_left
+  backhand_index_pointing_left_light_skin_tone
+  backhand_index_pointing_left_medium_light_skin_tone
+  backhand_index_pointing_left_medium_skin_tone
+  backhand_index_pointing_left_medium_dark_skin_tone
+  backhand_index_pointing_left_dark_skin_tone
+  backhand_index_pointing_right
+  backhand_index_pointing_right_light_skin_tone
+  backhand_index_pointing_right_medium_light_skin_tone
+  backhand_index_pointing_right_medium_skin_tone
+  backhand_index_pointing_right_medium_dark_skin_tone
+  backhand_index_pointing_right_dark_skin_tone
+  backhand_index_pointing_up
+  backhand_index_pointing_up_light_skin_tone
+  backhand_index_pointing_up_medium_light_skin_tone
+  backhand_index_pointing_up_medium_skin_tone
+  backhand_index_pointing_up_medium_dark_skin_tone
+  backhand_index_pointing_up_dark_skin_tone
+  middle_finger
+  middle_finger_light_skin_tone
+  middle_finger_medium_light_skin_tone
+  middle_finger_medium_skin_tone
+  middle_finger_medium_dark_skin_tone
+  middle_finger_dark_skin_tone
+  backhand_index_pointing_down
+  backhand_index_pointing_down_light_skin_tone
+  backhand_index_pointing_down_medium_light_skin_tone
+  backhand_index_pointing_down_medium_skin_tone
+  backhand_index_pointing_down_medium_dark_skin_tone
+  backhand_index_pointing_down_dark_skin_tone
+  index_pointing_up
+  index_pointing_up_light_skin_tone
+  index_pointing_up_medium_light_skin_tone
+  index_pointing_up_medium_skin_tone
+  index_pointing_up_medium_dark_skin_tone
+  index_pointing_up_dark_skin_tone
+  thumbs_up
+  thumbs_up_light_skin_tone
+  thumbs_up_medium_light_skin_tone
+  thumbs_up_medium_skin_tone
+  thumbs_up_medium_dark_skin_tone
+  thumbs_up_dark_skin_tone
+  thumbs_down
+  thumbs_down_light_skin_tone
+  thumbs_down_medium_light_skin_tone
+  thumbs_down_medium_skin_tone
+  thumbs_down_medium_dark_skin_tone
+  thumbs_down_dark_skin_tone
+  raised_fist
+  raised_fist_light_skin_tone
+  raised_fist_medium_light_skin_tone
+  raised_fist_medium_skin_tone
+  raised_fist_medium_dark_skin_tone
+  raised_fist_dark_skin_tone
+  oncoming_fist
+  oncoming_fist_light_skin_tone
+  oncoming_fist_medium_light_skin_tone
+  oncoming_fist_medium_skin_tone
+  oncoming_fist_medium_dark_skin_tone
+  oncoming_fist_dark_skin_tone
+  left_facing_fist
+  left_facing_fist_light_skin_tone
+  left_facing_fist_medium_light_skin_tone
+  left_facing_fist_medium_skin_tone
+  left_facing_fist_medium_dark_skin_tone
+  left_facing_fist_dark_skin_tone
+  right_facing_fist
+  right_facing_fist_light_skin_tone
+  right_facing_fist_medium_light_skin_tone
+  right_facing_fist_medium_skin_tone
+  right_facing_fist_medium_dark_skin_tone
+  right_facing_fist_dark_skin_tone
+  writing_hand
+  writing_hand_light_skin_tone
+  writing_hand_medium_light_skin_tone
+  writing_hand_medium_skin_tone
+  writing_hand_medium_dark_skin_tone
+  writing_hand_dark_skin_tone
+  nail_polish
+  nail_polish_light_skin_tone
+  nail_polish_medium_light_skin_tone
+  nail_polish_medium_skin_tone
+  nail_polish_medium_dark_skin_tone
+  nail_polish_dark_skin_tone
+  selfie
+  selfie_light_skin_tone
+  selfie_medium_light_skin_tone
+  selfie_medium_skin_tone
+  selfie_medium_dark_skin_tone
+  selfie_dark_skin_tone
+"
+
+emoji_groups[people]="
+  person_frowning
+  person_frowning_light_skin_tone
+  person_frowning_medium_light_skin_tone
+  person_frowning_medium_skin_tone
+  person_frowning_medium_dark_skin_tone
+  person_frowning_dark_skin_tone
+  man_frowning
+  man_frowning_light_skin_tone
+  man_frowning_medium_light_skin_tone
+  man_frowning_medium_skin_tone
+  man_frowning_medium_dark_skin_tone
+  man_frowning_dark_skin_tone
+  woman_frowning
+  woman_frowning_light_skin_tone
+  woman_frowning_medium_light_skin_tone
+  woman_frowning_medium_skin_tone
+  woman_frowning_medium_dark_skin_tone
+  woman_frowning_dark_skin_tone
+  person_pouting
+  person_pouting_light_skin_tone
+  person_pouting_medium_light_skin_tone
+  person_pouting_medium_skin_tone
+  person_pouting_medium_dark_skin_tone
+  person_pouting_dark_skin_tone
+  man_pouting
+  man_pouting_light_skin_tone
+  man_pouting_medium_light_skin_tone
+  man_pouting_medium_skin_tone
+  man_pouting_medium_dark_skin_tone
+  man_pouting_dark_skin_tone
+  woman_pouting
+  woman_pouting_light_skin_tone
+  woman_pouting_medium_light_skin_tone
+  woman_pouting_medium_skin_tone
+  woman_pouting_medium_dark_skin_tone
+  woman_pouting_dark_skin_tone
+  person_gesturing_NO
+  person_gesturing_NO_light_skin_tone
+  person_gesturing_NO_medium_light_skin_tone
+  person_gesturing_NO_medium_skin_tone
+  person_gesturing_NO_medium_dark_skin_tone
+  person_gesturing_NO_dark_skin_tone
+  man_gesturing_NO
+  man_gesturing_NO_light_skin_tone
+  man_gesturing_NO_medium_light_skin_tone
+  man_gesturing_NO_medium_skin_tone
+  man_gesturing_NO_medium_dark_skin_tone
+  man_gesturing_NO_dark_skin_tone
+  woman_gesturing_NO
+  woman_gesturing_NO_light_skin_tone
+  woman_gesturing_NO_medium_light_skin_tone
+  woman_gesturing_NO_medium_skin_tone
+  woman_gesturing_NO_medium_dark_skin_tone
+  woman_gesturing_NO_dark_skin_tone
+  person_gesturing_OK
+  person_gesturing_OK_light_skin_tone
+  person_gesturing_OK_medium_light_skin_tone
+  person_gesturing_OK_medium_skin_tone
+  person_gesturing_OK_medium_dark_skin_tone
+  person_gesturing_OK_dark_skin_tone
+  man_gesturing_OK
+  man_gesturing_OK_light_skin_tone
+  man_gesturing_OK_medium_light_skin_tone
+  man_gesturing_OK_medium_skin_tone
+  man_gesturing_OK_medium_dark_skin_tone
+  man_gesturing_OK_dark_skin_tone
+  woman_gesturing_OK
+  woman_gesturing_OK_light_skin_tone
+  woman_gesturing_OK_medium_light_skin_tone
+  woman_gesturing_OK_medium_skin_tone
+  woman_gesturing_OK_medium_dark_skin_tone
+  woman_gesturing_OK_dark_skin_tone
+  person_tipping_hand
+  person_tipping_hand_light_skin_tone
+  person_tipping_hand_medium_light_skin_tone
+  person_tipping_hand_medium_skin_tone
+  person_tipping_hand_medium_dark_skin_tone
+  person_tipping_hand_dark_skin_tone
+  man_tipping_hand
+  man_tipping_hand_light_skin_tone
+  man_tipping_hand_medium_light_skin_tone
+  man_tipping_hand_medium_skin_tone
+  man_tipping_hand_medium_dark_skin_tone
+  man_tipping_hand_dark_skin_tone
+  woman_tipping_hand
+  woman_tipping_hand_light_skin_tone
+  woman_tipping_hand_medium_light_skin_tone
+  woman_tipping_hand_medium_skin_tone
+  woman_tipping_hand_medium_dark_skin_tone
+  woman_tipping_hand_dark_skin_tone
+  person_raising_hand
+  person_raising_hand_light_skin_tone
+  person_raising_hand_medium_light_skin_tone
+  person_raising_hand_medium_skin_tone
+  person_raising_hand_medium_dark_skin_tone
+  person_raising_hand_dark_skin_tone
+  man_raising_hand
+  man_raising_hand_light_skin_tone
+  man_raising_hand_medium_light_skin_tone
+  man_raising_hand_medium_skin_tone
+  man_raising_hand_medium_dark_skin_tone
+  man_raising_hand_dark_skin_tone
+  woman_raising_hand
+  woman_raising_hand_light_skin_tone
+  woman_raising_hand_medium_light_skin_tone
+  woman_raising_hand_medium_skin_tone
+  woman_raising_hand_medium_dark_skin_tone
+  woman_raising_hand_dark_skin_tone
+  deaf_person
+  deaf_person_light_skin_tone
+  deaf_person_medium_light_skin_tone
+  deaf_person_medium_skin_tone
+  deaf_person_medium_dark_skin_tone
+  deaf_person_dark_skin_tone
+  deaf_man
+  deaf_man_light_skin_tone
+  deaf_man_medium_light_skin_tone
+  deaf_man_medium_skin_tone
+  deaf_man_medium_dark_skin_tone
+  deaf_man_dark_skin_tone
+  deaf_woman
+  deaf_woman_light_skin_tone
+  deaf_woman_medium_light_skin_tone
+  deaf_woman_medium_skin_tone
+  deaf_woman_medium_dark_skin_tone
+  deaf_woman_dark_skin_tone
+  person_bowing
+  person_bowing_light_skin_tone
+  person_bowing_medium_light_skin_tone
+  person_bowing_medium_skin_tone
+  person_bowing_medium_dark_skin_tone
+  person_bowing_dark_skin_tone
+  man_bowing
+  man_bowing_light_skin_tone
+  man_bowing_medium_light_skin_tone
+  man_bowing_medium_skin_tone
+  man_bowing_medium_dark_skin_tone
+  man_bowing_dark_skin_tone
+  woman_bowing
+  woman_bowing_light_skin_tone
+  woman_bowing_medium_light_skin_tone
+  woman_bowing_medium_skin_tone
+  woman_bowing_medium_dark_skin_tone
+  woman_bowing_dark_skin_tone
+  person_facepalming
+  person_facepalming_light_skin_tone
+  person_facepalming_medium_light_skin_tone
+  person_facepalming_medium_skin_tone
+  person_facepalming_medium_dark_skin_tone
+  person_facepalming_dark_skin_tone
+  man_facepalming
+  man_facepalming_light_skin_tone
+  man_facepalming_medium_light_skin_tone
+  man_facepalming_medium_skin_tone
+  man_facepalming_medium_dark_skin_tone
+  man_facepalming_dark_skin_tone
+  woman_facepalming
+  woman_facepalming_light_skin_tone
+  woman_facepalming_medium_light_skin_tone
+  woman_facepalming_medium_skin_tone
+  woman_facepalming_medium_dark_skin_tone
+  woman_facepalming_dark_skin_tone
+  person_shrugging
+  person_shrugging_light_skin_tone
+  person_shrugging_medium_light_skin_tone
+  person_shrugging_medium_skin_tone
+  person_shrugging_medium_dark_skin_tone
+  person_shrugging_dark_skin_tone
+  man_shrugging
+  man_shrugging_light_skin_tone
+  man_shrugging_medium_light_skin_tone
+  man_shrugging_medium_skin_tone
+  man_shrugging_medium_dark_skin_tone
+  man_shrugging_dark_skin_tone
+  woman_shrugging
+  woman_shrugging_light_skin_tone
+  woman_shrugging_medium_light_skin_tone
+  woman_shrugging_medium_skin_tone
+  woman_shrugging_medium_dark_skin_tone
+  woman_shrugging_dark_skin_tone
+  man_health_worker
+  man_health_worker_light_skin_tone
+  man_health_worker_medium_light_skin_tone
+  man_health_worker_medium_skin_tone
+  man_health_worker_medium_dark_skin_tone
+  man_health_worker_dark_skin_tone
+  woman_health_worker
+  woman_health_worker_light_skin_tone
+  woman_health_worker_medium_light_skin_tone
+  woman_health_worker_medium_skin_tone
+  woman_health_worker_medium_dark_skin_tone
+  woman_health_worker_dark_skin_tone
+  man_student
+  man_student_light_skin_tone
+  man_student_medium_light_skin_tone
+  man_student_medium_skin_tone
+  man_student_medium_dark_skin_tone
+  man_student_dark_skin_tone
+  woman_student
+  woman_student_light_skin_tone
+  woman_student_medium_light_skin_tone
+  woman_student_medium_skin_tone
+  woman_student_medium_dark_skin_tone
+  woman_student_dark_skin_tone
+  man_teacher
+  man_teacher_light_skin_tone
+  man_teacher_medium_light_skin_tone
+  man_teacher_medium_skin_tone
+  man_teacher_medium_dark_skin_tone
+  man_teacher_dark_skin_tone
+  woman_teacher
+  woman_teacher_light_skin_tone
+  woman_teacher_medium_light_skin_tone
+  woman_teacher_medium_skin_tone
+  woman_teacher_medium_dark_skin_tone
+  woman_teacher_dark_skin_tone
+  man_judge
+  man_judge_light_skin_tone
+  man_judge_medium_light_skin_tone
+  man_judge_medium_skin_tone
+  man_judge_medium_dark_skin_tone
+  man_judge_dark_skin_tone
+  woman_judge
+  woman_judge_light_skin_tone
+  woman_judge_medium_light_skin_tone
+  woman_judge_medium_skin_tone
+  woman_judge_medium_dark_skin_tone
+  woman_judge_dark_skin_tone
+  man_farmer
+  man_farmer_light_skin_tone
+  man_farmer_medium_light_skin_tone
+  man_farmer_medium_skin_tone
+  man_farmer_medium_dark_skin_tone
+  man_farmer_dark_skin_tone
+  woman_farmer
+  woman_farmer_light_skin_tone
+  woman_farmer_medium_light_skin_tone
+  woman_farmer_medium_skin_tone
+  woman_farmer_medium_dark_skin_tone
+  woman_farmer_dark_skin_tone
+  man_cook
+  man_cook_light_skin_tone
+  man_cook_medium_light_skin_tone
+  man_cook_medium_skin_tone
+  man_cook_medium_dark_skin_tone
+  man_cook_dark_skin_tone
+  woman_cook
+  woman_cook_light_skin_tone
+  woman_cook_medium_light_skin_tone
+  woman_cook_medium_skin_tone
+  woman_cook_medium_dark_skin_tone
+  woman_cook_dark_skin_tone
+  man_mechanic
+  man_mechanic_light_skin_tone
+  man_mechanic_medium_light_skin_tone
+  man_mechanic_medium_skin_tone
+  man_mechanic_medium_dark_skin_tone
+  man_mechanic_dark_skin_tone
+  woman_mechanic
+  woman_mechanic_light_skin_tone
+  woman_mechanic_medium_light_skin_tone
+  woman_mechanic_medium_skin_tone
+  woman_mechanic_medium_dark_skin_tone
+  woman_mechanic_dark_skin_tone
+  man_factory_worker
+  man_factory_worker_light_skin_tone
+  man_factory_worker_medium_light_skin_tone
+  man_factory_worker_medium_skin_tone
+  man_factory_worker_medium_dark_skin_tone
+  man_factory_worker_dark_skin_tone
+  woman_factory_worker
+  woman_factory_worker_light_skin_tone
+  woman_factory_worker_medium_light_skin_tone
+  woman_factory_worker_medium_skin_tone
+  woman_factory_worker_medium_dark_skin_tone
+  woman_factory_worker_dark_skin_tone
+  man_office_worker
+  man_office_worker_light_skin_tone
+  man_office_worker_medium_light_skin_tone
+  man_office_worker_medium_skin_tone
+  man_office_worker_medium_dark_skin_tone
+  man_office_worker_dark_skin_tone
+  woman_office_worker
+  woman_office_worker_light_skin_tone
+  woman_office_worker_medium_light_skin_tone
+  woman_office_worker_medium_skin_tone
+  woman_office_worker_medium_dark_skin_tone
+  woman_office_worker_dark_skin_tone
+  man_scientist
+  man_scientist_light_skin_tone
+  man_scientist_medium_light_skin_tone
+  man_scientist_medium_skin_tone
+  man_scientist_medium_dark_skin_tone
+  man_scientist_dark_skin_tone
+  woman_scientist
+  woman_scientist_light_skin_tone
+  woman_scientist_medium_light_skin_tone
+  woman_scientist_medium_skin_tone
+  woman_scientist_medium_dark_skin_tone
+  woman_scientist_dark_skin_tone
+  man_technologist
+  man_technologist_light_skin_tone
+  man_technologist_medium_light_skin_tone
+  man_technologist_medium_skin_tone
+  man_technologist_medium_dark_skin_tone
+  man_technologist_dark_skin_tone
+  woman_technologist
+  woman_technologist_light_skin_tone
+  woman_technologist_medium_light_skin_tone
+  woman_technologist_medium_skin_tone
+  woman_technologist_medium_dark_skin_tone
+  woman_technologist_dark_skin_tone
+  man_singer
+  man_singer_light_skin_tone
+  man_singer_medium_light_skin_tone
+  man_singer_medium_skin_tone
+  man_singer_medium_dark_skin_tone
+  man_singer_dark_skin_tone
+  woman_singer
+  woman_singer_light_skin_tone
+  woman_singer_medium_light_skin_tone
+  woman_singer_medium_skin_tone
+  woman_singer_medium_dark_skin_tone
+  woman_singer_dark_skin_tone
+  man_artist
+  man_artist_light_skin_tone
+  man_artist_medium_light_skin_tone
+  man_artist_medium_skin_tone
+  man_artist_medium_dark_skin_tone
+  man_artist_dark_skin_tone
+  woman_artist
+  woman_artist_light_skin_tone
+  woman_artist_medium_light_skin_tone
+  woman_artist_medium_skin_tone
+  woman_artist_medium_dark_skin_tone
+  woman_artist_dark_skin_tone
+  man_pilot
+  man_pilot_light_skin_tone
+  man_pilot_medium_light_skin_tone
+  man_pilot_medium_skin_tone
+  man_pilot_medium_dark_skin_tone
+  man_pilot_dark_skin_tone
+  woman_pilot
+  woman_pilot_light_skin_tone
+  woman_pilot_medium_light_skin_tone
+  woman_pilot_medium_skin_tone
+  woman_pilot_medium_dark_skin_tone
+  woman_pilot_dark_skin_tone
+  man_astronaut
+  man_astronaut_light_skin_tone
+  man_astronaut_medium_light_skin_tone
+  man_astronaut_medium_skin_tone
+  man_astronaut_medium_dark_skin_tone
+  man_astronaut_dark_skin_tone
+  woman_astronaut
+  woman_astronaut_light_skin_tone
+  woman_astronaut_medium_light_skin_tone
+  woman_astronaut_medium_skin_tone
+  woman_astronaut_medium_dark_skin_tone
+  woman_astronaut_dark_skin_tone
+  man_firefighter
+  man_firefighter_light_skin_tone
+  man_firefighter_medium_light_skin_tone
+  man_firefighter_medium_skin_tone
+  man_firefighter_medium_dark_skin_tone
+  man_firefighter_dark_skin_tone
+  woman_firefighter
+  woman_firefighter_light_skin_tone
+  woman_firefighter_medium_light_skin_tone
+  woman_firefighter_medium_skin_tone
+  woman_firefighter_medium_dark_skin_tone
+  woman_firefighter_dark_skin_tone
+  police_officer
+  police_officer_light_skin_tone
+  police_officer_medium_light_skin_tone
+  police_officer_medium_skin_tone
+  police_officer_medium_dark_skin_tone
+  police_officer_dark_skin_tone
+  man_police_officer
+  man_police_officer_light_skin_tone
+  man_police_officer_medium_light_skin_tone
+  man_police_officer_medium_skin_tone
+  man_police_officer_medium_dark_skin_tone
+  man_police_officer_dark_skin_tone
+  woman_police_officer
+  woman_police_officer_light_skin_tone
+  woman_police_officer_medium_light_skin_tone
+  woman_police_officer_medium_skin_tone
+  woman_police_officer_medium_dark_skin_tone
+  woman_police_officer_dark_skin_tone
+  detective
+  detective_light_skin_tone
+  detective_medium_light_skin_tone
+  detective_medium_skin_tone
+  detective_medium_dark_skin_tone
+  detective_dark_skin_tone
+  man_detective
+  man_detective_light_skin_tone
+  man_detective_medium_light_skin_tone
+  man_detective_medium_skin_tone
+  man_detective_medium_dark_skin_tone
+  man_detective_dark_skin_tone
+  woman_detective
+  woman_detective_light_skin_tone
+  woman_detective_medium_light_skin_tone
+  woman_detective_medium_skin_tone
+  woman_detective_medium_dark_skin_tone
+  woman_detective_dark_skin_tone
+  guard
+  guard_light_skin_tone
+  guard_medium_light_skin_tone
+  guard_medium_skin_tone
+  guard_medium_dark_skin_tone
+  guard_dark_skin_tone
+  man_guard
+  man_guard_light_skin_tone
+  man_guard_medium_light_skin_tone
+  man_guard_medium_skin_tone
+  man_guard_medium_dark_skin_tone
+  man_guard_dark_skin_tone
+  woman_guard
+  woman_guard_light_skin_tone
+  woman_guard_medium_light_skin_tone
+  woman_guard_medium_skin_tone
+  woman_guard_medium_dark_skin_tone
+  woman_guard_dark_skin_tone
+  construction_worker
+  construction_worker_light_skin_tone
+  construction_worker_medium_light_skin_tone
+  construction_worker_medium_skin_tone
+  construction_worker_medium_dark_skin_tone
+  construction_worker_dark_skin_tone
+  man_construction_worker
+  man_construction_worker_light_skin_tone
+  man_construction_worker_medium_light_skin_tone
+  man_construction_worker_medium_skin_tone
+  man_construction_worker_medium_dark_skin_tone
+  man_construction_worker_dark_skin_tone
+  woman_construction_worker
+  woman_construction_worker_light_skin_tone
+  woman_construction_worker_medium_light_skin_tone
+  woman_construction_worker_medium_skin_tone
+  woman_construction_worker_medium_dark_skin_tone
+  woman_construction_worker_dark_skin_tone
+  prince
+  prince_light_skin_tone
+  prince_medium_light_skin_tone
+  prince_medium_skin_tone
+  prince_medium_dark_skin_tone
+  prince_dark_skin_tone
+  princess
+  princess_light_skin_tone
+  princess_medium_light_skin_tone
+  princess_medium_skin_tone
+  princess_medium_dark_skin_tone
+  princess_dark_skin_tone
+  person_wearing_turban
+  person_wearing_turban_light_skin_tone
+  person_wearing_turban_medium_light_skin_tone
+  person_wearing_turban_medium_skin_tone
+  person_wearing_turban_medium_dark_skin_tone
+  person_wearing_turban_dark_skin_tone
+  man_wearing_turban
+  man_wearing_turban_light_skin_tone
+  man_wearing_turban_medium_light_skin_tone
+  man_wearing_turban_medium_skin_tone
+  man_wearing_turban_medium_dark_skin_tone
+  man_wearing_turban_dark_skin_tone
+  woman_wearing_turban
+  woman_wearing_turban_light_skin_tone
+  woman_wearing_turban_medium_light_skin_tone
+  woman_wearing_turban_medium_skin_tone
+  woman_wearing_turban_medium_dark_skin_tone
+  woman_wearing_turban_dark_skin_tone
+  man_with_Chinese_cap
+  man_with_Chinese_cap_light_skin_tone
+  man_with_Chinese_cap_medium_light_skin_tone
+  man_with_Chinese_cap_medium_skin_tone
+  man_with_Chinese_cap_medium_dark_skin_tone
+  man_with_Chinese_cap_dark_skin_tone
+  woman_with_headscarf
+  woman_with_headscarf_light_skin_tone
+  woman_with_headscarf_medium_light_skin_tone
+  woman_with_headscarf_medium_skin_tone
+  woman_with_headscarf_medium_dark_skin_tone
+  woman_with_headscarf_dark_skin_tone
+  man_in_tuxedo
+  man_in_tuxedo_light_skin_tone
+  man_in_tuxedo_medium_light_skin_tone
+  man_in_tuxedo_medium_skin_tone
+  man_in_tuxedo_medium_dark_skin_tone
+  man_in_tuxedo_dark_skin_tone
+  bride_with_veil
+  bride_with_veil_light_skin_tone
+  bride_with_veil_medium_light_skin_tone
+  bride_with_veil_medium_skin_tone
+  bride_with_veil_medium_dark_skin_tone
+  bride_with_veil_dark_skin_tone
+  pregnant_woman
+  pregnant_woman_light_skin_tone
+  pregnant_woman_medium_light_skin_tone
+  pregnant_woman_medium_skin_tone
+  pregnant_woman_medium_dark_skin_tone
+  pregnant_woman_dark_skin_tone
+  breast_feeding
+  breast_feeding_light_skin_tone
+  breast_feeding_medium_light_skin_tone
+  breast_feeding_medium_skin_tone
+  breast_feeding_medium_dark_skin_tone
+  breast_feeding_dark_skin_tone
+  baby_angel
+  baby_angel_light_skin_tone
+  baby_angel_medium_light_skin_tone
+  baby_angel_medium_skin_tone
+  baby_angel_medium_dark_skin_tone
+  baby_angel_dark_skin_tone
+  Santa_Claus
+  Santa_Claus_light_skin_tone
+  Santa_Claus_medium_light_skin_tone
+  Santa_Claus_medium_skin_tone
+  Santa_Claus_medium_dark_skin_tone
+  Santa_Claus_dark_skin_tone
+  Mrs_Claus
+  Mrs_Claus_light_skin_tone
+  Mrs_Claus_medium_light_skin_tone
+  Mrs_Claus_medium_skin_tone
+  Mrs_Claus_medium_dark_skin_tone
+  Mrs_Claus_dark_skin_tone
+  superhero
+  superhero_light_skin_tone
+  superhero_medium_light_skin_tone
+  superhero_medium_skin_tone
+  superhero_medium_dark_skin_tone
+  superhero_dark_skin_tone
+  man_superhero
+  man_superhero_light_skin_tone
+  man_superhero_medium_light_skin_tone
+  man_superhero_medium_skin_tone
+  man_superhero_medium_dark_skin_tone
+  man_superhero_dark_skin_tone
+  woman_superhero
+  woman_superhero_light_skin_tone
+  woman_superhero_medium_light_skin_tone
+  woman_superhero_medium_skin_tone
+  woman_superhero_medium_dark_skin_tone
+  woman_superhero_dark_skin_tone
+  supervillain
+  supervillain_light_skin_tone
+  supervillain_medium_light_skin_tone
+  supervillain_medium_skin_tone
+  supervillain_medium_dark_skin_tone
+  supervillain_dark_skin_tone
+  man_supervillain
+  man_supervillain_light_skin_tone
+  man_supervillain_medium_light_skin_tone
+  man_supervillain_medium_skin_tone
+  man_supervillain_medium_dark_skin_tone
+  man_supervillain_dark_skin_tone
+  woman_supervillain
+  woman_supervillain_light_skin_tone
+  woman_supervillain_medium_light_skin_tone
+  woman_supervillain_medium_skin_tone
+  woman_supervillain_medium_dark_skin_tone
+  woman_supervillain_dark_skin_tone
+  mage
+  mage_light_skin_tone
+  mage_medium_light_skin_tone
+  mage_medium_skin_tone
+  mage_medium_dark_skin_tone
+  mage_dark_skin_tone
+  man_mage
+  man_mage_light_skin_tone
+  man_mage_medium_light_skin_tone
+  man_mage_medium_skin_tone
+  man_mage_medium_dark_skin_tone
+  man_mage_dark_skin_tone
+  woman_mage
+  woman_mage_light_skin_tone
+  woman_mage_medium_light_skin_tone
+  woman_mage_medium_skin_tone
+  woman_mage_medium_dark_skin_tone
+  woman_mage_dark_skin_tone
+  fairy
+  fairy_light_skin_tone
+  fairy_medium_light_skin_tone
+  fairy_medium_skin_tone
+  fairy_medium_dark_skin_tone
+  fairy_dark_skin_tone
+  man_fairy
+  man_fairy_light_skin_tone
+  man_fairy_medium_light_skin_tone
+  man_fairy_medium_skin_tone
+  man_fairy_medium_dark_skin_tone
+  man_fairy_dark_skin_tone
+  woman_fairy
+  woman_fairy_light_skin_tone
+  woman_fairy_medium_light_skin_tone
+  woman_fairy_medium_skin_tone
+  woman_fairy_medium_dark_skin_tone
+  woman_fairy_dark_skin_tone
+  vampire
+  vampire_light_skin_tone
+  vampire_medium_light_skin_tone
+  vampire_medium_skin_tone
+  vampire_medium_dark_skin_tone
+  vampire_dark_skin_tone
+  man_vampire
+  man_vampire_light_skin_tone
+  man_vampire_medium_light_skin_tone
+  man_vampire_medium_skin_tone
+  man_vampire_medium_dark_skin_tone
+  man_vampire_dark_skin_tone
+  woman_vampire
+  woman_vampire_light_skin_tone
+  woman_vampire_medium_light_skin_tone
+  woman_vampire_medium_skin_tone
+  woman_vampire_medium_dark_skin_tone
+  woman_vampire_dark_skin_tone
+  merperson
+  merperson_light_skin_tone
+  merperson_medium_light_skin_tone
+  merperson_medium_skin_tone
+  merperson_medium_dark_skin_tone
+  merperson_dark_skin_tone
+  merman
+  merman_light_skin_tone
+  merman_medium_light_skin_tone
+  merman_medium_skin_tone
+  merman_medium_dark_skin_tone
+  merman_dark_skin_tone
+  mermaid
+  mermaid_light_skin_tone
+  mermaid_medium_light_skin_tone
+  mermaid_medium_skin_tone
+  mermaid_medium_dark_skin_tone
+  mermaid_dark_skin_tone
+  elf
+  elf_light_skin_tone
+  elf_medium_light_skin_tone
+  elf_medium_skin_tone
+  elf_medium_dark_skin_tone
+  elf_dark_skin_tone
+  man_elf
+  man_elf_light_skin_tone
+  man_elf_medium_light_skin_tone
+  man_elf_medium_skin_tone
+  man_elf_medium_dark_skin_tone
+  man_elf_dark_skin_tone
+  woman_elf
+  woman_elf_light_skin_tone
+  woman_elf_medium_light_skin_tone
+  woman_elf_medium_skin_tone
+  woman_elf_medium_dark_skin_tone
+  woman_elf_dark_skin_tone
+  genie
+  man_genie
+  woman_genie
+  zombie
+  man_zombie
+  woman_zombie
+  person_getting_massage
+  person_getting_massage_light_skin_tone
+  person_getting_massage_medium_light_skin_tone
+  person_getting_massage_medium_skin_tone
+  person_getting_massage_medium_dark_skin_tone
+  person_getting_massage_dark_skin_tone
+  man_getting_massage
+  man_getting_massage_light_skin_tone
+  man_getting_massage_medium_light_skin_tone
+  man_getting_massage_medium_skin_tone
+  man_getting_massage_medium_dark_skin_tone
+  man_getting_massage_dark_skin_tone
+  woman_getting_massage
+  woman_getting_massage_light_skin_tone
+  woman_getting_massage_medium_light_skin_tone
+  woman_getting_massage_medium_skin_tone
+  woman_getting_massage_medium_dark_skin_tone
+  woman_getting_massage_dark_skin_tone
+  person_getting_haircut
+  person_getting_haircut_light_skin_tone
+  person_getting_haircut_medium_light_skin_tone
+  person_getting_haircut_medium_skin_tone
+  person_getting_haircut_medium_dark_skin_tone
+  person_getting_haircut_dark_skin_tone
+  man_getting_haircut
+  man_getting_haircut_light_skin_tone
+  man_getting_haircut_medium_light_skin_tone
+  man_getting_haircut_medium_skin_tone
+  man_getting_haircut_medium_dark_skin_tone
+  man_getting_haircut_dark_skin_tone
+  woman_getting_haircut
+  woman_getting_haircut_light_skin_tone
+  woman_getting_haircut_medium_light_skin_tone
+  woman_getting_haircut_medium_skin_tone
+  woman_getting_haircut_medium_dark_skin_tone
+  woman_getting_haircut_dark_skin_tone
+  person_walking
+  person_walking_light_skin_tone
+  person_walking_medium_light_skin_tone
+  person_walking_medium_skin_tone
+  person_walking_medium_dark_skin_tone
+  person_walking_dark_skin_tone
+  man_walking
+  man_walking_light_skin_tone
+  man_walking_medium_light_skin_tone
+  man_walking_medium_skin_tone
+  man_walking_medium_dark_skin_tone
+  man_walking_dark_skin_tone
+  woman_walking
+  woman_walking_light_skin_tone
+  woman_walking_medium_light_skin_tone
+  woman_walking_medium_skin_tone
+  woman_walking_medium_dark_skin_tone
+  woman_walking_dark_skin_tone
+  person_standing
+  person_standing_light_skin_tone
+  person_standing_medium_light_skin_tone
+  person_standing_medium_skin_tone
+  person_standing_medium_dark_skin_tone
+  person_standing_dark_skin_tone
+  man_standing
+  man_standing_light_skin_tone
+  man_standing_medium_light_skin_tone
+  man_standing_medium_skin_tone
+  man_standing_medium_dark_skin_tone
+  man_standing_dark_skin_tone
+  woman_standing
+  woman_standing_light_skin_tone
+  woman_standing_medium_light_skin_tone
+  woman_standing_medium_skin_tone
+  woman_standing_medium_dark_skin_tone
+  woman_standing_dark_skin_tone
+  person_kneeling
+  person_kneeling_light_skin_tone
+  person_kneeling_medium_light_skin_tone
+  person_kneeling_medium_skin_tone
+  person_kneeling_medium_dark_skin_tone
+  person_kneeling_dark_skin_tone
+  man_kneeling
+  man_kneeling_light_skin_tone
+  man_kneeling_medium_light_skin_tone
+  man_kneeling_medium_skin_tone
+  man_kneeling_medium_dark_skin_tone
+  man_kneeling_dark_skin_tone
+  woman_kneeling
+  woman_kneeling_light_skin_tone
+  woman_kneeling_medium_light_skin_tone
+  woman_kneeling_medium_skin_tone
+  woman_kneeling_medium_dark_skin_tone
+  woman_kneeling_dark_skin_tone
+  man_with_probing_cane
+  man_with_probing_cane_light_skin_tone
+  man_with_probing_cane_medium_light_skin_tone
+  man_with_probing_cane_medium_skin_tone
+  man_with_probing_cane_medium_dark_skin_tone
+  man_with_probing_cane_dark_skin_tone
+  woman_with_probing_cane
+  woman_with_probing_cane_light_skin_tone
+  woman_with_probing_cane_medium_light_skin_tone
+  woman_with_probing_cane_medium_skin_tone
+  woman_with_probing_cane_medium_dark_skin_tone
+  woman_with_probing_cane_dark_skin_tone
+  man_in_motorized_wheelchair
+  man_in_motorized_wheelchair_light_skin_tone
+  man_in_motorized_wheelchair_medium_light_skin_tone
+  man_in_motorized_wheelchair_medium_skin_tone
+  man_in_motorized_wheelchair_medium_dark_skin_tone
+  man_in_motorized_wheelchair_dark_skin_tone
+  woman_in_motorized_wheelchair
+  woman_in_motorized_wheelchair_light_skin_tone
+  woman_in_motorized_wheelchair_medium_light_skin_tone
+  woman_in_motorized_wheelchair_medium_skin_tone
+  woman_in_motorized_wheelchair_medium_dark_skin_tone
+  woman_in_motorized_wheelchair_dark_skin_tone
+  man_in_manual_wheelchair
+  man_in_manual_wheelchair_light_skin_tone
+  man_in_manual_wheelchair_medium_light_skin_tone
+  man_in_manual_wheelchair_medium_skin_tone
+  man_in_manual_wheelchair_medium_dark_skin_tone
+  man_in_manual_wheelchair_dark_skin_tone
+  woman_in_manual_wheelchair
+  woman_in_manual_wheelchair_light_skin_tone
+  woman_in_manual_wheelchair_medium_light_skin_tone
+  woman_in_manual_wheelchair_medium_skin_tone
+  woman_in_manual_wheelchair_medium_dark_skin_tone
+  woman_in_manual_wheelchair_dark_skin_tone
+  person_running
+  person_running_light_skin_tone
+  person_running_medium_light_skin_tone
+  person_running_medium_skin_tone
+  person_running_medium_dark_skin_tone
+  person_running_dark_skin_tone
+  man_running
+  man_running_light_skin_tone
+  man_running_medium_light_skin_tone
+  man_running_medium_skin_tone
+  man_running_medium_dark_skin_tone
+  man_running_dark_skin_tone
+  woman_running
+  woman_running_light_skin_tone
+  woman_running_medium_light_skin_tone
+  woman_running_medium_skin_tone
+  woman_running_medium_dark_skin_tone
+  woman_running_dark_skin_tone
+  woman_dancing
+  woman_dancing_light_skin_tone
+  woman_dancing_medium_light_skin_tone
+  woman_dancing_medium_skin_tone
+  woman_dancing_medium_dark_skin_tone
+  woman_dancing_dark_skin_tone
+  woman_dancing_dark_skin_tone_1
+  man_dancing_light_skin_tone
+  man_dancing_medium_light_skin_tone
+  man_dancing_medium_skin_tone
+  man_dancing_medium_dark_skin_tone
+  man_dancing_dark_skin_tone
+  man_in_suit_levitating
+  man_in_suit_levitating_light_skin_tone
+  man_in_suit_levitating_medium_light_skin_tone
+  man_in_suit_levitating_medium_skin_tone
+  man_in_suit_levitating_medium_dark_skin_tone
+  man_in_suit_levitating_dark_skin_tone
+  people_with_bunny_ears
+  men_with_bunny_ears
+  women_with_bunny_ears
+  person_in_steamy_room
+  person_in_steamy_room_light_skin_tone
+  person_in_steamy_room_medium_light_skin_tone
+  person_in_steamy_room_medium_skin_tone
+  person_in_steamy_room_medium_dark_skin_tone
+  person_in_steamy_room_dark_skin_tone
+  man_in_steamy_room
+  man_in_steamy_room_light_skin_tone
+  man_in_steamy_room_medium_light_skin_tone
+  man_in_steamy_room_medium_skin_tone
+  man_in_steamy_room_medium_dark_skin_tone
+  man_in_steamy_room_dark_skin_tone
+  woman_in_steamy_room
+  woman_in_steamy_room_light_skin_tone
+  woman_in_steamy_room_medium_light_skin_tone
+  woman_in_steamy_room_medium_skin_tone
+  woman_in_steamy_room_medium_dark_skin_tone
+  woman_in_steamy_room_dark_skin_tone
+  person_climbing
+  person_climbing_light_skin_tone
+  person_climbing_medium_light_skin_tone
+  person_climbing_medium_skin_tone
+  person_climbing_medium_dark_skin_tone
+  person_climbing_dark_skin_tone
+  man_climbing
+  man_climbing_light_skin_tone
+  man_climbing_medium_light_skin_tone
+  man_climbing_medium_skin_tone
+  man_climbing_medium_dark_skin_tone
+  man_climbing_dark_skin_tone
+  woman_climbing
+  woman_climbing_light_skin_tone
+  woman_climbing_medium_light_skin_tone
+  woman_climbing_medium_skin_tone
+  woman_climbing_medium_dark_skin_tone
+  woman_climbing_dark_skin_tone
+  person_fencing
+  horse_racing
+  horse_racing_light_skin_tone
+  horse_racing_medium_light_skin_tone
+  horse_racing_medium_skin_tone
+  horse_racing_medium_dark_skin_tone
+  horse_racing_dark_skin_tone
+  skier
+  snowboarder
+  snowboarder_light_skin_tone
+  snowboarder_medium_light_skin_tone
+  snowboarder_medium_skin_tone
+  snowboarder_medium_dark_skin_tone
+  snowboarder_dark_skin_tone
+  person_golfing
+  person_golfing_light_skin_tone
+  person_golfing_medium_light_skin_tone
+  person_golfing_medium_skin_tone
+  person_golfing_medium_dark_skin_tone
+  person_golfing_dark_skin_tone
+  man_golfing
+  man_golfing_light_skin_tone
+  man_golfing_medium_light_skin_tone
+  man_golfing_medium_skin_tone
+  man_golfing_medium_dark_skin_tone
+  man_golfing_dark_skin_tone
+  woman_golfing
+  woman_golfing_light_skin_tone
+  woman_golfing_medium_light_skin_tone
+  woman_golfing_medium_skin_tone
+  woman_golfing_medium_dark_skin_tone
+  woman_golfing_dark_skin_tone
+  person_surfing
+  person_surfing_light_skin_tone
+  person_surfing_medium_light_skin_tone
+  person_surfing_medium_skin_tone
+  person_surfing_medium_dark_skin_tone
+  person_surfing_dark_skin_tone
+  man_surfing
+  man_surfing_light_skin_tone
+  man_surfing_medium_light_skin_tone
+  man_surfing_medium_skin_tone
+  man_surfing_medium_dark_skin_tone
+  man_surfing_dark_skin_tone
+  woman_surfing
+  woman_surfing_light_skin_tone
+  woman_surfing_medium_light_skin_tone
+  woman_surfing_medium_skin_tone
+  woman_surfing_medium_dark_skin_tone
+  woman_surfing_dark_skin_tone
+  person_rowing_boat
+  person_rowing_boat_light_skin_tone
+  person_rowing_boat_medium_light_skin_tone
+  person_rowing_boat_medium_skin_tone
+  person_rowing_boat_medium_dark_skin_tone
+  person_rowing_boat_dark_skin_tone
+  man_rowing_boat
+  man_rowing_boat_light_skin_tone
+  man_rowing_boat_medium_light_skin_tone
+  man_rowing_boat_medium_skin_tone
+  man_rowing_boat_medium_dark_skin_tone
+  man_rowing_boat_dark_skin_tone
+  woman_rowing_boat
+  woman_rowing_boat_light_skin_tone
+  woman_rowing_boat_medium_light_skin_tone
+  woman_rowing_boat_medium_skin_tone
+  woman_rowing_boat_medium_dark_skin_tone
+  woman_rowing_boat_dark_skin_tone
+  person_swimming
+  person_swimming_light_skin_tone
+  person_swimming_medium_light_skin_tone
+  person_swimming_medium_skin_tone
+  person_swimming_medium_dark_skin_tone
+  person_swimming_dark_skin_tone
+  man_swimming
+  man_swimming_light_skin_tone
+  man_swimming_medium_light_skin_tone
+  man_swimming_medium_skin_tone
+  man_swimming_medium_dark_skin_tone
+  man_swimming_dark_skin_tone
+  woman_swimming
+  woman_swimming_light_skin_tone
+  woman_swimming_medium_light_skin_tone
+  woman_swimming_medium_skin_tone
+  woman_swimming_medium_dark_skin_tone
+  woman_swimming_dark_skin_tone
+  person_bouncing_ball
+  person_bouncing_ball_light_skin_tone
+  person_bouncing_ball_medium_light_skin_tone
+  person_bouncing_ball_medium_skin_tone
+  person_bouncing_ball_medium_dark_skin_tone
+  person_bouncing_ball_dark_skin_tone
+  man_bouncing_ball
+  man_bouncing_ball_light_skin_tone
+  man_bouncing_ball_medium_light_skin_tone
+  man_bouncing_ball_medium_skin_tone
+  man_bouncing_ball_medium_dark_skin_tone
+  man_bouncing_ball_dark_skin_tone
+  woman_bouncing_ball
+  woman_bouncing_ball_light_skin_tone
+  woman_bouncing_ball_medium_light_skin_tone
+  woman_bouncing_ball_medium_skin_tone
+  woman_bouncing_ball_medium_dark_skin_tone
+  woman_bouncing_ball_dark_skin_tone
+  person_lifting_weights
+  person_lifting_weights_light_skin_tone
+  person_lifting_weights_medium_light_skin_tone
+  person_lifting_weights_medium_skin_tone
+  person_lifting_weights_medium_dark_skin_tone
+  person_lifting_weights_dark_skin_tone
+  man_lifting_weights
+  man_lifting_weights_light_skin_tone
+  man_lifting_weights_medium_light_skin_tone
+  man_lifting_weights_medium_skin_tone
+  man_lifting_weights_medium_dark_skin_tone
+  man_lifting_weights_dark_skin_tone
+  woman_lifting_weights
+  woman_lifting_weights_light_skin_tone
+  woman_lifting_weights_medium_light_skin_tone
+  woman_lifting_weights_medium_skin_tone
+  woman_lifting_weights_medium_dark_skin_tone
+  woman_lifting_weights_dark_skin_tone
+  person_biking
+  person_biking_light_skin_tone
+  person_biking_medium_light_skin_tone
+  person_biking_medium_skin_tone
+  person_biking_medium_dark_skin_tone
+  person_biking_dark_skin_tone
+  man_biking
+  man_biking_light_skin_tone
+  man_biking_medium_light_skin_tone
+  man_biking_medium_skin_tone
+  man_biking_medium_dark_skin_tone
+  man_biking_dark_skin_tone
+  woman_biking
+  woman_biking_light_skin_tone
+  woman_biking_medium_light_skin_tone
+  woman_biking_medium_skin_tone
+  woman_biking_medium_dark_skin_tone
+  woman_biking_dark_skin_tone
+  person_mountain_biking
+  person_mountain_biking_light_skin_tone
+  person_mountain_biking_medium_light_skin_tone
+  person_mountain_biking_medium_skin_tone
+  person_mountain_biking_medium_dark_skin_tone
+  person_mountain_biking_dark_skin_tone
+  man_mountain_biking
+  man_mountain_biking_light_skin_tone
+  man_mountain_biking_medium_light_skin_tone
+  man_mountain_biking_medium_skin_tone
+  man_mountain_biking_medium_dark_skin_tone
+  man_mountain_biking_dark_skin_tone
+  woman_mountain_biking
+  woman_mountain_biking_light_skin_tone
+  woman_mountain_biking_medium_light_skin_tone
+  woman_mountain_biking_medium_skin_tone
+  woman_mountain_biking_medium_dark_skin_tone
+  woman_mountain_biking_dark_skin_tone
+  person_cartwheeling
+  person_cartwheeling_light_skin_tone
+  person_cartwheeling_medium_light_skin_tone
+  person_cartwheeling_medium_skin_tone
+  person_cartwheeling_medium_dark_skin_tone
+  person_cartwheeling_dark_skin_tone
+  man_cartwheeling
+  man_cartwheeling_light_skin_tone
+  man_cartwheeling_medium_light_skin_tone
+  man_cartwheeling_medium_skin_tone
+  man_cartwheeling_medium_dark_skin_tone
+  man_cartwheeling_dark_skin_tone
+  woman_cartwheeling
+  woman_cartwheeling_light_skin_tone
+  woman_cartwheeling_medium_light_skin_tone
+  woman_cartwheeling_medium_skin_tone
+  woman_cartwheeling_medium_dark_skin_tone
+  woman_cartwheeling_dark_skin_tone
+  people_wrestling
+  men_wrestling
+  women_wrestling
+  person_playing_water_polo
+  person_playing_water_polo_light_skin_tone
+  person_playing_water_polo_medium_light_skin_tone
+  person_playing_water_polo_medium_skin_tone
+  person_playing_water_polo_medium_dark_skin_tone
+  person_playing_water_polo_dark_skin_tone
+  man_playing_water_polo
+  man_playing_water_polo_light_skin_tone
+  man_playing_water_polo_medium_light_skin_tone
+  man_playing_water_polo_medium_skin_tone
+  man_playing_water_polo_medium_dark_skin_tone
+  man_playing_water_polo_dark_skin_tone
+  woman_playing_water_polo
+  woman_playing_water_polo_light_skin_tone
+  woman_playing_water_polo_medium_light_skin_tone
+  woman_playing_water_polo_medium_skin_tone
+  woman_playing_water_polo_medium_dark_skin_tone
+  woman_playing_water_polo_dark_skin_tone
+  person_playing_handball
+  person_playing_handball_light_skin_tone
+  person_playing_handball_medium_light_skin_tone
+  person_playing_handball_medium_skin_tone
+  person_playing_handball_medium_dark_skin_tone
+  person_playing_handball_dark_skin_tone
+  man_playing_handball
+  man_playing_handball_light_skin_tone
+  man_playing_handball_medium_light_skin_tone
+  man_playing_handball_medium_skin_tone
+  man_playing_handball_medium_dark_skin_tone
+  man_playing_handball_dark_skin_tone
+  woman_playing_handball
+  woman_playing_handball_light_skin_tone
+  woman_playing_handball_medium_light_skin_tone
+  woman_playing_handball_medium_skin_tone
+  woman_playing_handball_medium_dark_skin_tone
+  woman_playing_handball_dark_skin_tone
+  person_juggling
+  person_juggling_light_skin_tone
+  person_juggling_medium_light_skin_tone
+  person_juggling_medium_skin_tone
+  person_juggling_medium_dark_skin_tone
+  person_juggling_dark_skin_tone
+  man_juggling
+  man_juggling_light_skin_tone
+  man_juggling_medium_light_skin_tone
+  man_juggling_medium_skin_tone
+  man_juggling_medium_dark_skin_tone
+  man_juggling_dark_skin_tone
+  woman_juggling
+  woman_juggling_light_skin_tone
+  woman_juggling_medium_light_skin_tone
+  woman_juggling_medium_skin_tone
+  woman_juggling_medium_dark_skin_tone
+  woman_juggling_dark_skin_tone
+  person_in_lotus_position
+  person_in_lotus_position_light_skin_tone
+  person_in_lotus_position_medium_light_skin_tone
+  person_in_lotus_position_medium_skin_tone
+  person_in_lotus_position_medium_dark_skin_tone
+  person_in_lotus_position_dark_skin_tone
+  man_in_lotus_position
+  man_in_lotus_position_light_skin_tone
+  man_in_lotus_position_medium_light_skin_tone
+  man_in_lotus_position_medium_skin_tone
+  man_in_lotus_position_medium_dark_skin_tone
+  man_in_lotus_position_dark_skin_tone
+  woman_in_lotus_position
+  woman_in_lotus_position_light_skin_tone
+  woman_in_lotus_position_medium_light_skin_tone
+  woman_in_lotus_position_medium_skin_tone
+  woman_in_lotus_position_medium_dark_skin_tone
+  woman_in_lotus_position_dark_skin_tone
+  person_taking_bath
+  person_taking_bath_light_skin_tone
+  person_taking_bath_medium_light_skin_tone
+  person_taking_bath_medium_skin_tone
+  person_taking_bath_medium_dark_skin_tone
+  person_taking_bath_dark_skin_tone
+  person_in_bed
+  person_in_bed_light_skin_tone
+  person_in_bed_medium_light_skin_tone
+  person_in_bed_medium_skin_tone
+  person_in_bed_medium_dark_skin_tone
+  person_in_bed_dark_skin_tone
+  people_holding_hands
+  people_holding_hands_light_skin_tone
+  people_holding_hands_medium_light_skin_tone_light_skin_tone
+  people_holding_hands_medium_light_skin_tone_light_skin_tone_1
+  people_holding_hands_medium_skin_tone_light_skin_tone
+  people_holding_hands_medium_skin_tone_medium_light_skin_tone
+  people_holding_hands_medium_skin_tone_medium_light_skin_tone_1
+  people_holding_hands_medium_dark_skin_tone_light_skin_tone
+  people_holding_hands_medium_dark_skin_tone_medium_light_skin_tone
+  people_holding_hands_medium_dark_skin_tone_medium_skin_tone
+  people_holding_hands_medium_dark_skin_tone_medium_skin_tone_1
+  people_holding_hands_dark_skin_tone_light_skin_tone
+  people_holding_hands_dark_skin_tone_medium_light_skin_tone
+  people_holding_hands_dark_skin_tone_medium_skin_tone
+  people_holding_hands_dark_skin_tone_medium_dark_skin_tone
+  people_holding_hands_dark_skin_tone_medium_dark_skin_tone_1
+  women_holding_hands
+  women_holding_hands_light_skin_tone
+  women_holding_hands_medium_light_skin_tone_light_skin_tone
+  women_holding_hands_medium_light_skin_tone_light_skin_tone_1
+  women_holding_hands_medium_skin_tone_light_skin_tone
+  women_holding_hands_medium_skin_tone_medium_light_skin_tone
+  women_holding_hands_medium_skin_tone_medium_light_skin_tone_1
+  women_holding_hands_medium_dark_skin_tone_light_skin_tone
+  women_holding_hands_medium_dark_skin_tone_medium_light_skin_tone
+  women_holding_hands_medium_dark_skin_tone_medium_skin_tone
+  women_holding_hands_medium_dark_skin_tone_medium_skin_tone_1
+  women_holding_hands_dark_skin_tone_light_skin_tone
+  women_holding_hands_dark_skin_tone_medium_light_skin_tone
+  women_holding_hands_dark_skin_tone_medium_skin_tone
+  women_holding_hands_dark_skin_tone_medium_dark_skin_tone
+  women_holding_hands_dark_skin_tone_medium_dark_skin_tone_1
+  woman_and_man_holding_hands
+  woman_and_man_holding_hands_light_skin_tone
+  woman_and_man_holding_hands_light_skin_tone_medium_light_skin_tone
+  woman_and_man_holding_hands_light_skin_tone_medium_skin_tone
+  woman_and_man_holding_hands_light_skin_tone_medium_dark_skin_tone
+  woman_and_man_holding_hands_light_skin_tone_dark_skin_tone
+  woman_and_man_holding_hands_medium_light_skin_tone_light_skin_tone
+  woman_and_man_holding_hands_medium_light_skin_tone_light_skin_tone_1
+  woman_and_man_holding_hands_medium_light_skin_tone_medium_skin_tone
+  woman_and_man_holding_hands_medium_light_skin_tone_medium_dark_skin_tone
+  woman_and_man_holding_hands_medium_light_skin_tone_dark_skin_tone
+  woman_and_man_holding_hands_medium_skin_tone_light_skin_tone
+  woman_and_man_holding_hands_medium_skin_tone_medium_light_skin_tone
+  woman_and_man_holding_hands_medium_skin_tone_medium_light_skin_tone_1
+  woman_and_man_holding_hands_medium_skin_tone_medium_dark_skin_tone
+  woman_and_man_holding_hands_medium_skin_tone_dark_skin_tone
+  woman_and_man_holding_hands_medium_dark_skin_tone_light_skin_tone
+  woman_and_man_holding_hands_medium_dark_skin_tone_medium_light_skin_tone
+  woman_and_man_holding_hands_medium_dark_skin_tone_medium_skin_tone
+  woman_and_man_holding_hands_medium_dark_skin_tone_medium_skin_tone_1
+  woman_and_man_holding_hands_medium_dark_skin_tone_dark_skin_tone
+  woman_and_man_holding_hands_dark_skin_tone_light_skin_tone
+  woman_and_man_holding_hands_dark_skin_tone_medium_light_skin_tone
+  woman_and_man_holding_hands_dark_skin_tone_medium_skin_tone
+  woman_and_man_holding_hands_dark_skin_tone_medium_dark_skin_tone
+  woman_and_man_holding_hands_dark_skin_tone_medium_dark_skin_tone_1
+  men_holding_hands
+  men_holding_hands_light_skin_tone
+  men_holding_hands_medium_light_skin_tone_light_skin_tone
+  men_holding_hands_medium_light_skin_tone_light_skin_tone_1
+  men_holding_hands_medium_skin_tone_light_skin_tone
+  men_holding_hands_medium_skin_tone_medium_light_skin_tone
+  men_holding_hands_medium_skin_tone_medium_light_skin_tone_1
+  men_holding_hands_medium_dark_skin_tone_light_skin_tone
+  men_holding_hands_medium_dark_skin_tone_medium_light_skin_tone
+  men_holding_hands_medium_dark_skin_tone_medium_skin_tone
+  men_holding_hands_medium_dark_skin_tone_medium_skin_tone_1
+  men_holding_hands_dark_skin_tone_light_skin_tone
+  men_holding_hands_dark_skin_tone_medium_light_skin_tone
+  men_holding_hands_dark_skin_tone_medium_skin_tone
+  men_holding_hands_dark_skin_tone_medium_dark_skin_tone
+  men_holding_hands_dark_skin_tone_medium_dark_skin_tone_1
+  kiss
+  kiss_woman_man
+  kiss_man_man
+  kiss_woman_woman
+  couple_with_heart
+  couple_with_heart_woman_man
+  couple_with_heart_man_man
+  couple_with_heart_woman_woman
+  family
+  family_man_woman_boy
+  family_man_woman_girl
+  family_man_woman_girl_boy
+  family_man_woman_boy_boy
+  family_man_woman_girl_girl
+  family_man_man_boy
+  family_man_man_girl
+  family_man_man_girl_boy
+  family_man_man_boy_boy
+  family_man_man_girl_girl
+  family_woman_woman_boy
+  family_woman_woman_girl
+  family_woman_woman_girl_boy
+  family_woman_woman_boy_boy
+  family_woman_woman_girl_girl
+  family_man_boy
+  family_man_boy_boy
+  family_man_girl
+  family_man_girl_boy
+  family_man_girl_girl
+  family_woman_boy
+  family_woman_boy_boy
+  family_woman_girl
+  family_woman_girl_boy
+  family_woman_girl_girl
+  speaking_head
+  bust_in_silhouette
+  busts_in_silhouette
+  footprints
+"
+
+emoji_groups[animals]="
+  monkey_face
+  monkey_face_1
+  gorilla
+  orangutan
+  dog_face
+  dog_face_1
+  guide_dog
+  service_dog
+  poodle
+  wolf
+  fox
+  raccoon
+  cat_face
+  cat_face_1
+  lion
+  tiger_face
+  tiger_face_1
+  leopard
+  horse_face
+  horse_face_1
+  unicorn
+  zebra
+  deer
+  cow_face
+  ox
+  water_buffalo
+  cow
+  pig_face
+  pig_face_1
+  boar
+  pig_nose
+  ram
+  ewe
+  goat
+  camel
+  two_hump_camel
+  llama
+  giraffe
+  elephant
+  rhinoceros
+  hippopotamus
+  mouse_face
+  mouse_face_1
+  rat
+  hamster
+  rabbit_face
+  rabbit_face_1
+  chipmunk
+  hedgehog
+  bat
+  bear
+  koala
+  panda
+  sloth
+  otter
+  skunk
+  kangaroo
+  badger
+  paw_prints
+  turkey
+  chicken
+  rooster
+  hatching_chick
+  baby_chick
+  front_facing_baby_chick
+  bird
+  penguin
+  dove
+  eagle
+  duck
+  swan
+  owl
+  flamingo
+  peacock
+  parrot
+  frog
+  crocodile
+  turtle
+  lizard
+  snake
+  dragon_face
+  dragon_face_1
+  sauropod
+  T_Rex
+  spouting_whale
+  spouting_whale_1
+  dolphin
+  fish
+  tropical_fish
+  blowfish
+  shark
+  octopus
+  spiral_shell
+  snail
+  butterfly
+  bug
+  ant
+  honeybee
+  lady_beetle
+  cricket
+  spider
+  spider_web
+  scorpion
+  mosquito
+  microbe
+"
+
+emoji_groups[faces]="
+  grinning_face
+  grinning_face_with_big_eyes
+  grinning_face_with_smiling_eyes
+  beaming_face_with_smiling_eyes
+  grinning_squinting_face
+  grinning_face_with_sweat
+  rolling_on_the_floor_laughing
+  face_with_tears_of_joy
+  slightly_smiling_face
+  upside_down_face
+  winking_face
+  smiling_face_with_smiling_eyes
+  smiling_face_with_halo
+  smiling_face_with_hearts
+  smiling_face_with_heart_eyes
+  star_struck
+  face_blowing_a_kiss
+  kissing_face
+  smiling_face
+  kissing_face_with_closed_eyes
+  kissing_face_with_smiling_eyes
+  face_savoring_food
+  face_with_tongue
+  winking_face_with_tongue
+  zany_face
+  squinting_face_with_tongue
+  money_mouth_face
+  hugging_face
+  face_with_hand_over_mouth
+  shushing_face
+  thinking_face
+  zipper_mouth_face
+  face_with_raised_eyebrow
+  neutral_face
+  expressionless_face
+  face_without_mouth
+  smirking_face
+  unamused_face
+  face_with_rolling_eyes
+  grimacing_face
+  lying_face
+  relieved_face
+  pensive_face
+  sleepy_face
+  drooling_face
+  sleeping_face
+  face_with_medical_mask
+  face_with_thermometer
+  face_with_head_bandage
+  nauseated_face
+  face_vomiting
+  sneezing_face
+  hot_face
+  cold_face
+  woozy_face
+  dizzy_face
+  exploding_head
+  cowboy_hat_face
+  partying_face
+  smiling_face_with_sunglasses
+  nerd_face
+  face_with_monocle
+  confused_face
+  worried_face
+  slightly_frowning_face
+  slightly_frowning_face_1
+  face_with_open_mouth
+  hushed_face
+  astonished_face
+  flushed_face
+  pleading_face
+  frowning_face_with_open_mouth
+  anguished_face
+  fearful_face
+  anxious_face_with_sweat
+  sad_but_relieved_face
+  crying_face
+  loudly_crying_face
+  face_screaming_in_fear
+  confounded_face
+  persevering_face
+  disappointed_face
+  downcast_face_with_sweat
+  weary_face
+  tired_face
+  yawning_face
+  face_with_steam_from_nose
+  pouting_face
+  angry_face
+  face_with_symbols_on_mouth
+  smiling_face_with_horns
+  angry_face_with_horns
+  skull
+  skull_and_crossbones
+  pile_of_poo
+  clown_face
+  ogre
+  goblin
+  ghost
+  alien
+  alien_monster
+  robot
+"
+
+emoji_groups[flags]="
+  chequered_flag
+  triangular_flag
+  crossed_flags
+  black_flag
+  white_flag
+  rainbow_flag
+  pirate_flag
+  Ascension_Island
+  Andorra
+  United_Arab_Emirates
+  Afghanistan
+  Antigua_and_Barbuda
+  Anguilla
+  Albania
+  Armenia
+  Angola
+  Antarctica
+  Argentina
+  American_Samoa
+  Austria
+  Australia
+  Aruba
+  Åland_Islands
+  Azerbaijan
+  Bosnia_and_Herzegovina
+  Barbados
+  Bangladesh
+  Belgium
+  Burkina_Faso
+  Bulgaria
+  Bahrain
+  Burundi
+  Benin
+  St_Barthélemy
+  Bermuda
+  Brunei
+  Bolivia
+  Caribbean_Netherlands
+  Brazil
+  Bahamas
+  Bhutan
+  Bouvet_Island
+  Botswana
+  Belarus
+  Belize
+  Canada
+  Cocos_Keeling_Islands
+  Congo__Kinshasa
+  Central_African_Republic
+  Congo__Brazzaville
+  Switzerland
+  Côte_d_Ivoire
+  Cook_Islands
+  Chile
+  Cameroon
+  China
+  Colombia
+  Clipperton_Island
+  Costa_Rica
+  Cuba
+  Cape_Verde
+  Curaçao
+  Christmas_Island
+  Cyprus
+  Czechia
+  Germany
+  Diego_Garcia
+  Djibouti
+  Denmark
+  Dominica
+  Dominican_Republic
+  Algeria
+  Ceuta_and_Melilla
+  Ecuador
+  Estonia
+  Egypt
+  Western_Sahara
+  Eritrea
+  Spain
+  Ethiopia
+  European_Union
+  Finland
+  Fiji
+  Falkland_Islands
+  Micronesia
+  Faroe_Islands
+  France
+  Gabon
+  United_Kingdom
+  Grenada
+  Georgia
+  French_Guiana
+  Guernsey
+  Ghana
+  Gibraltar
+  Greenland
+  Gambia
+  Guinea
+  Guadeloupe
+  Equatorial_Guinea
+  Greece
+  South_Georgia_and_South_Sandwich_Islands
+  Guatemala
+  Guam
+  Guinea_Bissau
+  Guyana
+  Hong_Kong_SAR_China
+  Heard_and_McDonald_Islands
+  Honduras
+  Croatia
+  Haiti
+  Hungary
+  Canary_Islands
+  Indonesia
+  Ireland
+  Israel
+  Isle_of_Man
+  India
+  British_Indian_Ocean_Territory
+  Iraq
+  Iran
+  Iceland
+  Italy
+  Jersey
+  Jamaica
+  Jordan
+  Japan
+  Kenya
+  Kyrgyzstan
+  Cambodia
+  Kiribati
+  Comoros
+  St_Kitts_and_Nevis
+  North_Korea
+  South_Korea
+  Kuwait
+  Cayman_Islands
+  Kazakhstan
+  Laos
+  Lebanon
+  St_Lucia
+  Liechtenstein
+  Sri_Lanka
+  Liberia
+  Lesotho
+  Lithuania
+  Luxembourg
+  Latvia
+  Libya
+  Morocco
+  Monaco
+  Moldova
+  Montenegro
+  St_Martin
+  Madagascar
+  Marshall_Islands
+  Macedonia
+  Mali
+  Myanmar_Burma_
+  Mongolia
+  Macao_SAR_China
+  Northern_Mariana_Islands
+  Martinique
+  Mauritania
+  Montserrat
+  Malta
+  Mauritius
+  Maldives
+  Malawi
+  Mexico
+  Malaysia
+  Mozambique
+  Namibia
+  New_Caledonia
+  Niger
+  Norfolk_Island
+  Nigeria
+  Nicaragua
+  Netherlands
+  Norway
+  Nepal
+  Nauru
+  Niue
+  New_Zealand
+  Oman
+  Panama
+  Peru
+  French_Polynesia
+  Papua_New_Guinea
+  Philippines
+  Pakistan
+  Poland
+  St_Pierre_and_Miquelon
+  Pitcairn_Islands
+  Puerto_Rico
+  Palestinian_Territories
+  Portugal
+  Palau
+  Paraguay
+  Qatar
+  Réunion
+  Romania
+  Serbia
+  Russia
+  Rwanda
+  Saudi_Arabia
+  Solomon_Islands
+  Seychelles
+  Sudan
+  Sweden
+  Singapore
+  St_Helena
+  Slovenia
+  Svalbard_and_Jan_Mayen
+  Slovakia
+  Sierra_Leone
+  San_Marino
+  Senegal
+  Somalia
+  Suriname
+  South_Sudan
+  São_Tomé_and_Príncipe
+  El_Salvador
+  Sint_Maarten
+  Syria
+  Eswatini
+  Tristan_da_Cunha
+  Turks_and_Caicos_Islands
+  Chad
+  French_Southern_Territories
+  Togo
+  Thailand
+  Tajikistan
+  Tokelau
+  Timor_Leste
+  Turkmenistan
+  Tunisia
+  Tonga
+  Turkey
+  Trinidad_and_Tobago
+  Tuvalu
+  Taiwan
+  Tanzania
+  Ukraine
+  Uganda
+  U_S_Outlying_Islands
+  United_Nations
+  United_States
+  Uruguay
+  Uzbekistan
+  Vatican_City
+  St_Vincent_and_Grenadines
+  Venezuela
+  British_Virgin_Islands
+  U_S_Virgin_Islands
+  Vietnam
+  Vanuatu
+  Wallis_and_Futuna
+  Samoa
+  Kosovo
+  Yemen
+  Mayotte
+  South_Africa
+  Zambia
+  Zimbabwe
+  England
+  Scotland
+  Wales
+"
diff --git a/plugins/emoji/emoji-data.txt b/plugins/emoji/emoji-data.txt
index 2d6d64e2b..59b7e92d7 100644
--- a/plugins/emoji/emoji-data.txt
+++ b/plugins/emoji/emoji-data.txt
@@ -1,1308 +1,4122 @@
-# DRAFT emoji-data.txt
-# For details about the format and other information, see /../../../reports/tr51/index.html#Data_Files.
+# emoji-data.txt
+# (Originally emoji-test.txt)
+# (Retrieved from https://unicode.org/Public/emoji/12.0/emoji-test.txt)
+
+# Date: 2019-01-27, 15:43:01 GMT
+# © 2019 Unicode®, Inc.
+# Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
+# For terms of use, see http://www.unicode.org/terms_of_use.html
 #
-# Format: Code ; Default_Emoji_Style ; Emoji_Level ; Emoji_Modifier_Status ; Emoji_Sources # Comment
+# Emoji Keyboard/Display Test Data for UTS #51
+# Version: 12.0
 #
-#   Field 1 — Default_Emoji_Style:
-#             text:      default text presentation
-#             emoji:     default emoji presentation
-#   Field 2 — Emoji_Level:
-#             L1:        level 1 emoji
-#             L2:        level 2 emoji
-#             NA:        not applicable
-#   Field 3 — Emoji_Modifier_Status:
-#             modifier:  an emoji modifier
-#             primary:   a primary emoji modifier base
-#             secondary: a secondary emoji modifier base
-#             none:      not applicable
-#   Field 4 — Emoji_Sources:
-#             one or more values from {z, a, j, w, x}
-#             see the key in https://www.unicode.org/draft/reports/tr51/tr51.html#Major_Sources
-#             NA:        not applicable
-#   Comment — currently contains the version where the character was first encoded,
-#             followed by:
-#             - a character name in uppercase (for a single character),
-#             - a keycap name,
-#             - an associated flag, where is associated with value unicode region code
+# For documentation and usage, see http://www.unicode.org/reports/tr51
 #
-00A9 ;	text ;	L1 ;	none ;	j	# V1.1 (©) COPYRIGHT SIGN
-00AE ;	text ;	L1 ;	none ;	j	# V1.1 (®) REGISTERED SIGN
-203C ;	text ;	L1 ;	none ;	a j	# V1.1 (‼) DOUBLE EXCLAMATION MARK
-2049 ;	text ;	L1 ;	none ;	a j	# V3.0 (⁉) EXCLAMATION QUESTION MARK
-2122 ;	text ;	L1 ;	none ;	j	# V1.1 (™) TRADE MARK SIGN
-2139 ;	text ;	L1 ;	none ;	j	# V3.0 (ℹ) INFORMATION SOURCE
-2194 ;	text ;	L1 ;	none ;	z j	# V1.1 (↔) LEFT RIGHT ARROW
-2195 ;	text ;	L1 ;	none ;	z j	# V1.1 (↕) UP DOWN ARROW
-2196 ;	text ;	L1 ;	none ;	j	# V1.1 (↖) NORTH WEST ARROW
-2197 ;	text ;	L1 ;	none ;	j	# V1.1 (↗) NORTH EAST ARROW
-2198 ;	text ;	L1 ;	none ;	j	# V1.1 (↘) SOUTH EAST ARROW
-2199 ;	text ;	L1 ;	none ;	j	# V1.1 (↙) SOUTH WEST ARROW
-21A9 ;	text ;	L1 ;	none ;	j	# V1.1 (↩) LEFTWARDS ARROW WITH HOOK
-21AA ;	text ;	L1 ;	none ;	j	# V1.1 (↪) RIGHTWARDS ARROW WITH HOOK
-231A ;	emoji ;	L1 ;	none ;	j	# V1.1 (⌚) WATCH
-231B ;	emoji ;	L1 ;	none ;	j	# V1.1 (⌛) HOURGLASS
-2328 ;	text ;	L2 ;	none ;	x	# V1.1 (⌨) KEYBOARD
-23CF ;	text ;	L2 ;	none ;	x	# V4.0 (⏏) EJECT SYMBOL
-23E9 ;	emoji ;	L1 ;	none ;	j w	# V6.0 (⏩) BLACK RIGHT-POINTING DOUBLE TRIANGLE
-23EA ;	emoji ;	L1 ;	none ;	j w	# V6.0 (⏪) BLACK LEFT-POINTING DOUBLE TRIANGLE
-23EB ;	emoji ;	L1 ;	none ;	j	# V6.0 (⏫) BLACK UP-POINTING DOUBLE TRIANGLE
-23EC ;	emoji ;	L1 ;	none ;	j	# V6.0 (⏬) BLACK DOWN-POINTING DOUBLE TRIANGLE
-23ED ;	text ;	L2 ;	none ;	w	# V6.0 (⏭) BLACK RIGHT-POINTING DOUBLE TRIANGLE WITH VERTICAL BAR
-23EE ;	text ;	L2 ;	none ;	w	# V6.0 (⏮) BLACK LEFT-POINTING DOUBLE TRIANGLE WITH VERTICAL BAR
-23EF ;	text ;	L2 ;	none ;	x	# V6.0 (⏯) BLACK RIGHT-POINTING TRIANGLE WITH DOUBLE VERTICAL BAR
-23F0 ;	emoji ;	L1 ;	none ;	j	# V6.0 (⏰) ALARM CLOCK
-23F1 ;	text ;	L2 ;	none ;	x	# V6.0 (⏱) STOPWATCH
-23F2 ;	text ;	L2 ;	none ;	x	# V6.0 (⏲) TIMER CLOCK
-23F3 ;	emoji ;	L1 ;	none ;	j w	# V6.0 (⏳) HOURGLASS WITH FLOWING SAND
-23F8 ;	text ;	L2 ;	none ;	w	# V7.0 (⏸) DOUBLE VERTICAL BAR
-23F9 ;	text ;	L2 ;	none ;	w	# V7.0 (⏹) BLACK SQUARE FOR STOP
-23FA ;	text ;	L2 ;	none ;	w	# V7.0 (⏺) BLACK CIRCLE FOR RECORD
-24C2 ;	text ;	L1 ;	none ;	j	# V1.1 (Ⓜ) CIRCLED LATIN CAPITAL LETTER M
-25AA ;	text ;	L1 ;	none ;	j w	# V1.1 (▪) BLACK SMALL SQUARE
-25AB ;	text ;	L1 ;	none ;	j	# V1.1 (▫) WHITE SMALL SQUARE
-25B6 ;	text ;	L1 ;	none ;	a j w	# V1.1 (▶) BLACK RIGHT-POINTING TRIANGLE
-25C0 ;	text ;	L1 ;	none ;	a j w	# V1.1 (◀) BLACK LEFT-POINTING TRIANGLE
-25FB ;	text ;	L1 ;	none ;	j	# V3.2 (◻) WHITE MEDIUM SQUARE
-25FC ;	text ;	L1 ;	none ;	j w	# V3.2 (◼) BLACK MEDIUM SQUARE
-25FD ;	emoji ;	L1 ;	none ;	j	# V3.2 (◽) WHITE MEDIUM SMALL SQUARE
-25FE ;	emoji ;	L1 ;	none ;	j w	# V3.2 (◾) BLACK MEDIUM SMALL SQUARE
-2600 ;	text ;	L1 ;	none ;	a j	# V1.1 (☀) BLACK SUN WITH RAYS
-2601 ;	text ;	L1 ;	none ;	a j w	# V1.1 (☁) CLOUD
-2602 ;	text ;	L2 ;	none ;	a	# V1.1 (☂) UMBRELLA
-2603 ;	text ;	L2 ;	none ;	a	# V1.1 (☃) SNOWMAN
-2604 ;	text ;	L2 ;	none ;	x	# V1.1 (☄) COMET
-260E ;	text ;	L1 ;	none ;	z a j	# V1.1 (☎) BLACK TELEPHONE
-2611 ;	text ;	L1 ;	none ;	j w	# V1.1 (☑) BALLOT BOX WITH CHECK
-2614 ;	emoji ;	L1 ;	none ;	a j	# V4.0 (☔) UMBRELLA WITH RAIN DROPS
-2615 ;	emoji ;	L1 ;	none ;	j	# V4.0 (☕) HOT BEVERAGE
-2618 ;	text ;	L2 ;	none ;	x	# V4.1 (☘) SHAMROCK
-261D ;	text ;	L1 ;	secondary ;	j w	# V1.1 (☝) WHITE UP POINTING INDEX
-2620 ;	text ;	L2 ;	none ;	x	# V1.1 (☠) SKULL AND CROSSBONES
-2622 ;	text ;	L2 ;	none ;	x	# V1.1 (☢) RADIOACTIVE SIGN
-2623 ;	text ;	L2 ;	none ;	x	# V1.1 (☣) BIOHAZARD SIGN
-2626 ;	text ;	L2 ;	none ;	x	# V1.1 (☦) ORTHODOX CROSS
-262A ;	text ;	L2 ;	none ;	w	# V1.1 (☪) STAR AND CRESCENT
-262E ;	text ;	L2 ;	none ;	x	# V1.1 (☮) PEACE SYMBOL
-262F ;	text ;	L2 ;	none ;	w	# V1.1 (☯) YIN YANG
-2638 ;	text ;	L2 ;	none ;	w	# V1.1 (☸) WHEEL OF DHARMA
-2639 ;	text ;	L2 ;	secondary ;	w	# V1.1 (☹) WHITE FROWNING FACE
-263A ;	text ;	L1 ;	secondary ;	j w	# V1.1 (☺) WHITE SMILING FACE
-2648 ;	emoji ;	L1 ;	none ;	j w	# V1.1 (♈) ARIES
-2649 ;	emoji ;	L1 ;	none ;	j w	# V1.1 (♉) TAURUS
-264A ;	emoji ;	L1 ;	none ;	j w	# V1.1 (♊) GEMINI
-264B ;	emoji ;	L1 ;	none ;	j w	# V1.1 (♋) CANCER
-264C ;	emoji ;	L1 ;	none ;	j w	# V1.1 (♌) LEO
-264D ;	emoji ;	L1 ;	none ;	j w	# V1.1 (♍) VIRGO
-264E ;	emoji ;	L1 ;	none ;	j w	# V1.1 (♎) LIBRA
-264F ;	emoji ;	L1 ;	none ;	j w	# V1.1 (♏) SCORPIUS
-2650 ;	emoji ;	L1 ;	none ;	j w	# V1.1 (♐) SAGITTARIUS
-2651 ;	emoji ;	L1 ;	none ;	j w	# V1.1 (♑) CAPRICORN
-2652 ;	emoji ;	L1 ;	none ;	j w	# V1.1 (♒) AQUARIUS
-2653 ;	emoji ;	L1 ;	none ;	j w	# V1.1 (♓) PISCES
-2660 ;	text ;	L1 ;	none ;	z a j	# V1.1 (♠) BLACK SPADE SUIT
-2663 ;	text ;	L1 ;	none ;	z a j	# V1.1 (♣) BLACK CLUB SUIT
-2665 ;	text ;	L1 ;	none ;	z a j	# V1.1 (♥) BLACK HEART SUIT
-2666 ;	text ;	L1 ;	none ;	z a j	# V1.1 (♦) BLACK DIAMOND SUIT
-2668 ;	text ;	L1 ;	none ;	a j	# V1.1 (♨) HOT SPRINGS
-267B ;	text ;	L1 ;	none ;	j	# V3.2 (♻) BLACK UNIVERSAL RECYCLING SYMBOL
-267F ;	emoji ;	L1 ;	none ;	j w	# V4.1 (♿) WHEELCHAIR SYMBOL
-2692 ;	text ;	L2 ;	none ;	x	# V4.1 (⚒) HAMMER AND PICK
-2693 ;	emoji ;	L1 ;	none ;	a j	# V4.1 (⚓) ANCHOR
-2694 ;	text ;	L2 ;	none ;	x	# V4.1 (⚔) CROSSED SWORDS
-2696 ;	text ;	L2 ;	none ;	x	# V4.1 (⚖) SCALES
-2697 ;	text ;	L2 ;	none ;	x	# V4.1 (⚗) ALEMBIC
-2699 ;	text ;	L2 ;	none ;	x	# V4.1 (⚙) GEAR
-269B ;	text ;	L2 ;	none ;	x	# V4.1 (⚛) ATOM SYMBOL
-269C ;	text ;	L2 ;	none ;	x	# V4.1 (⚜) FLEUR-DE-LIS
-26A0 ;	text ;	L1 ;	none ;	j	# V4.0 (⚠) WARNING SIGN
-26A1 ;	emoji ;	L1 ;	none ;	a j	# V4.0 (⚡) HIGH VOLTAGE SIGN
-26AA ;	emoji ;	L1 ;	none ;	j	# V4.1 (⚪) MEDIUM WHITE CIRCLE
-26AB ;	emoji ;	L1 ;	none ;	j w	# V4.1 (⚫) MEDIUM BLACK CIRCLE
-26B0 ;	text ;	L2 ;	none ;	x	# V4.1 (⚰) COFFIN
-26B1 ;	text ;	L2 ;	none ;	x	# V4.1 (⚱) FUNERAL URN
-26BD ;	emoji ;	L1 ;	none ;	j	# V5.2 (⚽) SOCCER BALL
-26BE ;	emoji ;	L1 ;	none ;	a j	# V5.2 (⚾) BASEBALL
-26C4 ;	emoji ;	L1 ;	none ;	a j	# V5.2 (⛄) SNOWMAN WITHOUT SNOW
-26C5 ;	emoji ;	L1 ;	none ;	a j	# V5.2 (⛅) SUN BEHIND CLOUD
-26C8 ;	text ;	L2 ;	none ;	a	# V5.2 (⛈) THUNDER CLOUD AND RAIN
-26CE ;	emoji ;	L1 ;	none ;	a j	# V6.0 (⛎) OPHIUCHUS
-26CF ;	text ;	L2 ;	none ;	a	# V5.2 (⛏) PICK
-26D1 ;	text ;	L2 ;	none ;	a	# V5.2 (⛑) HELMET WITH WHITE CROSS
-26D3 ;	text ;	L2 ;	none ;	a	# V5.2 (⛓) CHAINS
-26D4 ;	emoji ;	L1 ;	none ;	a j	# V5.2 (⛔) NO ENTRY
-26E9 ;	text ;	L2 ;	none ;	a	# V5.2 (⛩) SHINTO SHRINE
-26EA ;	emoji ;	L1 ;	none ;	a j	# V5.2 (⛪) CHURCH
-26F0 ;	text ;	L2 ;	none ;	a	# V5.2 (⛰) MOUNTAIN
-26F1 ;	text ;	L2 ;	none ;	a	# V5.2 (⛱) UMBRELLA ON GROUND
-26F2 ;	emoji ;	L1 ;	none ;	a j	# V5.2 (⛲) FOUNTAIN
-26F3 ;	emoji ;	L1 ;	none ;	a j w	# V5.2 (⛳) FLAG IN HOLE
-26F4 ;	text ;	L2 ;	none ;	a	# V5.2 (⛴) FERRY
-26F5 ;	emoji ;	L1 ;	none ;	a j	# V5.2 (⛵) SAILBOAT
-26F7 ;	text ;	L2 ;	none ;	a w	# V5.2 (⛷) SKIER
-26F8 ;	text ;	L2 ;	none ;	a	# V5.2 (⛸) ICE SKATE
-26F9 ;	text ;	L2 ;	none ;	a	# V5.2 (⛹) PERSON WITH BALL
-26FA ;	emoji ;	L1 ;	none ;	a j	# V5.2 (⛺) TENT
-26FD ;	emoji ;	L1 ;	none ;	a j	# V5.2 (⛽) FUEL PUMP
-2702 ;	text ;	L1 ;	none ;	z j w	# V1.1 (✂) BLACK SCISSORS
-2705 ;	emoji ;	L1 ;	none ;	j	# V6.0 (✅) WHITE HEAVY CHECK MARK
-2708 ;	text ;	L1 ;	none ;	z a j w	# V1.1 (✈) AIRPLANE
-2709 ;	text ;	L1 ;	none ;	z j	# V1.1 (✉) ENVELOPE
-270A ;	emoji ;	L1 ;	secondary ;	j	# V6.0 (✊) RAISED FIST
-270B ;	emoji ;	L1 ;	secondary ;	j	# V6.0 (✋) RAISED HAND
-270C ;	text ;	L1 ;	secondary ;	z j w	# V1.1 (✌) VICTORY HAND
-270D ;	text ;	L2 ;	secondary ;	z w	# V1.1 (✍) WRITING HAND
-270F ;	text ;	L1 ;	none ;	z j	# V1.1 (✏) PENCIL
-2712 ;	text ;	L1 ;	none ;	z j	# V1.1 (✒) BLACK NIB
-2714 ;	text ;	L1 ;	none ;	z j w	# V1.1 (✔) HEAVY CHECK MARK
-2716 ;	text ;	L1 ;	none ;	z j	# V1.1 (✖) HEAVY MULTIPLICATION X
-271D ;	text ;	L2 ;	none ;	w	# V1.1 (✝) LATIN CROSS
-2721 ;	text ;	L2 ;	none ;	w	# V1.1 (✡) STAR OF DAVID
-2728 ;	emoji ;	L1 ;	none ;	j	# V6.0 (✨) SPARKLES
-2733 ;	text ;	L1 ;	none ;	z j	# V1.1 (✳) EIGHT SPOKED ASTERISK
-2734 ;	text ;	L1 ;	none ;	z j	# V1.1 (✴) EIGHT POINTED BLACK STAR
-2744 ;	text ;	L1 ;	none ;	z j w	# V1.1 (❄) SNOWFLAKE
-2747 ;	text ;	L1 ;	none ;	z j	# V1.1 (❇) SPARKLE
-274C ;	emoji ;	L1 ;	none ;	j	# V6.0 (❌) CROSS MARK
-274E ;	emoji ;	L1 ;	none ;	j	# V6.0 (❎) NEGATIVE SQUARED CROSS MARK
-2753 ;	emoji ;	L1 ;	none ;	j w	# V6.0 (❓) BLACK QUESTION MARK ORNAMENT
-2754 ;	emoji ;	L1 ;	none ;	j	# V6.0 (❔) WHITE QUESTION MARK ORNAMENT
-2755 ;	emoji ;	L1 ;	none ;	j	# V6.0 (❕) WHITE EXCLAMATION MARK ORNAMENT
-2757 ;	emoji ;	L1 ;	none ;	j	# V5.2 (❗) HEAVY EXCLAMATION MARK SYMBOL
-2763 ;	text ;	L2 ;	none ;	z	# V1.1 (❣) HEAVY HEART EXCLAMATION MARK ORNAMENT
-2764 ;	text ;	L1 ;	none ;	z j	# V1.1 (❤) HEAVY BLACK HEART
-2795 ;	emoji ;	L1 ;	none ;	j	# V6.0 (➕) HEAVY PLUS SIGN
-2796 ;	emoji ;	L1 ;	none ;	j	# V6.0 (➖) HEAVY MINUS SIGN
-2797 ;	emoji ;	L1 ;	none ;	j	# V6.0 (➗) HEAVY DIVISION SIGN
-27A1 ;	text ;	L1 ;	none ;	z a j	# V1.1 (➡) BLACK RIGHTWARDS ARROW
-27B0 ;	emoji ;	L1 ;	none ;	j	# V6.0 (➰) CURLY LOOP
-27BF ;	emoji ;	L1 ;	none ;	x	# V6.0 (➿) DOUBLE CURLY LOOP
-2934 ;	text ;	L1 ;	none ;	j	# V3.2 (⤴) ARROW POINTING RIGHTWARDS THEN CURVING UPWARDS
-2935 ;	text ;	L1 ;	none ;	j	# V3.2 (⤵) ARROW POINTING RIGHTWARDS THEN CURVING DOWNWARDS
-2B05 ;	text ;	L1 ;	none ;	a j	# V4.0 (⬅) LEFTWARDS BLACK ARROW
-2B06 ;	text ;	L1 ;	none ;	a j	# V4.0 (⬆) UPWARDS BLACK ARROW
-2B07 ;	text ;	L1 ;	none ;	a j	# V4.0 (⬇) DOWNWARDS BLACK ARROW
-2B1B ;	emoji ;	L1 ;	none ;	a j w	# V5.1 (⬛) BLACK LARGE SQUARE
-2B1C ;	emoji ;	L1 ;	none ;	j w	# V5.1 (⬜) WHITE LARGE SQUARE
-2B50 ;	emoji ;	L1 ;	none ;	j	# V5.1 (⭐) WHITE MEDIUM STAR
-2B55 ;	emoji ;	L1 ;	none ;	j	# V5.2 (⭕) HEAVY LARGE CIRCLE
-3030 ;	text ;	L1 ;	none ;	j	# V1.1 (〰) WAVY DASH
-303D ;	text ;	L1 ;	none ;	j	# V3.2 (〽) PART ALTERNATION MARK
-3297 ;	text ;	L1 ;	none ;	j	# V1.1 (㊗) CIRCLED IDEOGRAPH CONGRATULATION
-3299 ;	text ;	L1 ;	none ;	a j	# V1.1 (㊙) CIRCLED IDEOGRAPH SECRET
-1F004 ;	emoji ;	L1 ;	none ;	j	# V5.1 (🀄) MAHJONG TILE RED DRAGON
-1F0CF ;	emoji ;	L1 ;	none ;	j	# V6.0 (🃏) PLAYING CARD BLACK JOKER
-1F170 ;	text ;	L1 ;	none ;	j	# V6.0 (🅰) NEGATIVE SQUARED LATIN CAPITAL LETTER A
-1F171 ;	text ;	L1 ;	none ;	j	# V6.0 (🅱) NEGATIVE SQUARED LATIN CAPITAL LETTER B
-1F17E ;	text ;	L1 ;	none ;	j	# V6.0 (🅾) NEGATIVE SQUARED LATIN CAPITAL LETTER O
-1F17F ;	text ;	L1 ;	none ;	a j	# V5.2 (🅿) NEGATIVE SQUARED LATIN CAPITAL LETTER P
-1F18E ;	emoji ;	L1 ;	none ;	j	# V6.0 (🆎) NEGATIVE SQUARED AB
-1F191 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🆑) SQUARED CL
-1F192 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🆒) SQUARED COOL
-1F193 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🆓) SQUARED FREE
-1F194 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🆔) SQUARED ID
-1F195 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🆕) SQUARED NEW
-1F196 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🆖) SQUARED NG
-1F197 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🆗) SQUARED OK
-1F198 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🆘) SQUARED SOS
-1F199 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🆙) SQUARED UP WITH EXCLAMATION MARK
-1F19A ;	emoji ;	L1 ;	none ;	j	# V6.0 (🆚) SQUARED VS
-1F201 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🈁) SQUARED KATAKANA KOKO
-1F202 ;	text ;	L1 ;	none ;	j	# V6.0 (🈂) SQUARED KATAKANA SA
-1F21A ;	emoji ;	L1 ;	none ;	a j	# V5.2 (🈚) SQUARED CJK UNIFIED IDEOGRAPH-7121
-1F22F ;	emoji ;	L1 ;	none ;	a j	# V5.2 (🈯) SQUARED CJK UNIFIED IDEOGRAPH-6307
-1F232 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🈲) SQUARED CJK UNIFIED IDEOGRAPH-7981
-1F233 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🈳) SQUARED CJK UNIFIED IDEOGRAPH-7A7A
-1F234 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🈴) SQUARED CJK UNIFIED IDEOGRAPH-5408
-1F235 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🈵) SQUARED CJK UNIFIED IDEOGRAPH-6E80
-1F236 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🈶) SQUARED CJK UNIFIED IDEOGRAPH-6709
-1F237 ;	text ;	L1 ;	none ;	j	# V6.0 (🈷) SQUARED CJK UNIFIED IDEOGRAPH-6708
-1F238 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🈸) SQUARED CJK UNIFIED IDEOGRAPH-7533
-1F239 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🈹) SQUARED CJK UNIFIED IDEOGRAPH-5272
-1F23A ;	emoji ;	L1 ;	none ;	j	# V6.0 (🈺) SQUARED CJK UNIFIED IDEOGRAPH-55B6
-1F250 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🉐) CIRCLED IDEOGRAPH ADVANTAGE
-1F251 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🉑) CIRCLED IDEOGRAPH ACCEPT
-1F300 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🌀) CYCLONE
-1F301 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🌁) FOGGY
-1F302 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🌂) CLOSED UMBRELLA
-1F303 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🌃) NIGHT WITH STARS
-1F304 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🌄) SUNRISE OVER MOUNTAINS
-1F305 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🌅) SUNRISE
-1F306 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🌆) CITYSCAPE AT DUSK
-1F307 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🌇) SUNSET OVER BUILDINGS
-1F308 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🌈) RAINBOW
-1F309 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🌉) BRIDGE AT NIGHT
-1F30A ;	emoji ;	L1 ;	none ;	j	# V6.0 (🌊) WATER WAVE
-1F30B ;	emoji ;	L1 ;	none ;	j	# V6.0 (🌋) VOLCANO
-1F30C ;	emoji ;	L1 ;	none ;	j	# V6.0 (🌌) MILKY WAY
-1F30D ;	emoji ;	L1 ;	none ;	w	# V6.0 (🌍) EARTH GLOBE EUROPE-AFRICA
-1F30E ;	emoji ;	L1 ;	none ;	w	# V6.0 (🌎) EARTH GLOBE AMERICAS
-1F30F ;	emoji ;	L1 ;	none ;	j w	# V6.0 (🌏) EARTH GLOBE ASIA-AUSTRALIA
-1F310 ;	emoji ;	L1 ;	none ;	x	# V6.0 (🌐) GLOBE WITH MERIDIANS
-1F311 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🌑) NEW MOON SYMBOL
-1F312 ;	emoji ;	L1 ;	none ;	x	# V6.0 (🌒) WAXING CRESCENT MOON SYMBOL
-1F313 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🌓) FIRST QUARTER MOON SYMBOL
-1F314 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🌔) WAXING GIBBOUS MOON SYMBOL
-1F315 ;	emoji ;	L1 ;	none ;	j w	# V6.0 (🌕) FULL MOON SYMBOL
-1F316 ;	emoji ;	L1 ;	none ;	x	# V6.0 (🌖) WANING GIBBOUS MOON SYMBOL
-1F317 ;	emoji ;	L1 ;	none ;	x	# V6.0 (🌗) LAST QUARTER MOON SYMBOL
-1F318 ;	emoji ;	L1 ;	none ;	x	# V6.0 (🌘) WANING CRESCENT MOON SYMBOL
-1F319 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🌙) CRESCENT MOON
-1F31A ;	emoji ;	L1 ;	none ;	x	# V6.0 (🌚) NEW MOON WITH FACE
-1F31B ;	emoji ;	L1 ;	none ;	j	# V6.0 (🌛) FIRST QUARTER MOON WITH FACE
-1F31C ;	emoji ;	L1 ;	none ;	w	# V6.0 (🌜) LAST QUARTER MOON WITH FACE
-1F31D ;	emoji ;	L1 ;	none ;	x	# V6.0 (🌝) FULL MOON WITH FACE
-1F31E ;	emoji ;	L1 ;	none ;	x	# V6.0 (🌞) SUN WITH FACE
-1F31F ;	emoji ;	L1 ;	none ;	j	# V6.0 (🌟) GLOWING STAR
-1F320 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🌠) SHOOTING STAR
-1F321 ;	text ;	L2 ;	none ;	w	# V7.0 (🌡) THERMOMETER
-1F324 ;	text ;	L2 ;	none ;	w	# V7.0 (🌤) WHITE SUN WITH SMALL CLOUD
-1F325 ;	text ;	L2 ;	none ;	w	# V7.0 (🌥) WHITE SUN BEHIND CLOUD
-1F326 ;	text ;	L2 ;	none ;	w	# V7.0 (🌦) WHITE SUN BEHIND CLOUD WITH RAIN
-1F327 ;	text ;	L2 ;	none ;	w	# V7.0 (🌧) CLOUD WITH RAIN
-1F328 ;	text ;	L2 ;	none ;	w	# V7.0 (🌨) CLOUD WITH SNOW
-1F329 ;	text ;	L2 ;	none ;	w	# V7.0 (🌩) CLOUD WITH LIGHTNING
-1F32A ;	text ;	L2 ;	none ;	w	# V7.0 (🌪) CLOUD WITH TORNADO
-1F32B ;	text ;	L2 ;	none ;	w	# V7.0 (🌫) FOG
-1F32C ;	text ;	L2 ;	none ;	w	# V7.0 (🌬) WIND BLOWING FACE
-1F32D ;	emoji ;	L2 ;	none ;	x	# V8.0 (🌭) HOT DOG
-1F32E ;	emoji ;	L2 ;	none ;	x	# V8.0 (🌮) TACO
-1F32F ;	emoji ;	L2 ;	none ;	x	# V8.0 (🌯) BURRITO
-1F330 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🌰) CHESTNUT
-1F331 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🌱) SEEDLING
-1F332 ;	emoji ;	L1 ;	none ;	x	# V6.0 (🌲) EVERGREEN TREE
-1F333 ;	emoji ;	L1 ;	none ;	x	# V6.0 (🌳) DECIDUOUS TREE
-1F334 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🌴) PALM TREE
-1F335 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🌵) CACTUS
-1F336 ;	text ;	L2 ;	none ;	w	# V7.0 (🌶) HOT PEPPER
-1F337 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🌷) TULIP
-1F338 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🌸) CHERRY BLOSSOM
-1F339 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🌹) ROSE
-1F33A ;	emoji ;	L1 ;	none ;	j	# V6.0 (🌺) HIBISCUS
-1F33B ;	emoji ;	L1 ;	none ;	j	# V6.0 (🌻) SUNFLOWER
-1F33C ;	emoji ;	L1 ;	none ;	j	# V6.0 (🌼) BLOSSOM
-1F33D ;	emoji ;	L1 ;	none ;	j	# V6.0 (🌽) EAR OF MAIZE
-1F33E ;	emoji ;	L1 ;	none ;	j	# V6.0 (🌾) EAR OF RICE
-1F33F ;	emoji ;	L1 ;	none ;	j	# V6.0 (🌿) HERB
-1F340 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🍀) FOUR LEAF CLOVER
-1F341 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🍁) MAPLE LEAF
-1F342 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🍂) FALLEN LEAF
-1F343 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🍃) LEAF FLUTTERING IN WIND
-1F344 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🍄) MUSHROOM
-1F345 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🍅) TOMATO
-1F346 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🍆) AUBERGINE
-1F347 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🍇) GRAPES
-1F348 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🍈) MELON
-1F349 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🍉) WATERMELON
-1F34A ;	emoji ;	L1 ;	none ;	j	# V6.0 (🍊) TANGERINE
-1F34B ;	emoji ;	L1 ;	none ;	x	# V6.0 (🍋) LEMON
-1F34C ;	emoji ;	L1 ;	none ;	j	# V6.0 (🍌) BANANA
-1F34D ;	emoji ;	L1 ;	none ;	j	# V6.0 (🍍) PINEAPPLE
-1F34E ;	emoji ;	L1 ;	none ;	j	# V6.0 (🍎) RED APPLE
-1F34F ;	emoji ;	L1 ;	none ;	j	# V6.0 (🍏) GREEN APPLE
-1F350 ;	emoji ;	L1 ;	none ;	x	# V6.0 (🍐) PEAR
-1F351 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🍑) PEACH
-1F352 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🍒) CHERRIES
-1F353 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🍓) STRAWBERRY
-1F354 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🍔) HAMBURGER
-1F355 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🍕) SLICE OF PIZZA
-1F356 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🍖) MEAT ON BONE
-1F357 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🍗) POULTRY LEG
-1F358 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🍘) RICE CRACKER
-1F359 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🍙) RICE BALL
-1F35A ;	emoji ;	L1 ;	none ;	j	# V6.0 (🍚) COOKED RICE
-1F35B ;	emoji ;	L1 ;	none ;	j	# V6.0 (🍛) CURRY AND RICE
-1F35C ;	emoji ;	L1 ;	none ;	j	# V6.0 (🍜) STEAMING BOWL
-1F35D ;	emoji ;	L1 ;	none ;	j	# V6.0 (🍝) SPAGHETTI
-1F35E ;	emoji ;	L1 ;	none ;	j	# V6.0 (🍞) BREAD
-1F35F ;	emoji ;	L1 ;	none ;	j	# V6.0 (🍟) FRENCH FRIES
-1F360 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🍠) ROASTED SWEET POTATO
-1F361 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🍡) DANGO
-1F362 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🍢) ODEN
-1F363 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🍣) SUSHI
-1F364 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🍤) FRIED SHRIMP
-1F365 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🍥) FISH CAKE WITH SWIRL DESIGN
-1F366 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🍦) SOFT ICE CREAM
-1F367 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🍧) SHAVED ICE
-1F368 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🍨) ICE CREAM
-1F369 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🍩) DOUGHNUT
-1F36A ;	emoji ;	L1 ;	none ;	j	# V6.0 (🍪) COOKIE
-1F36B ;	emoji ;	L1 ;	none ;	j	# V6.0 (🍫) CHOCOLATE BAR
-1F36C ;	emoji ;	L1 ;	none ;	j	# V6.0 (🍬) CANDY
-1F36D ;	emoji ;	L1 ;	none ;	j	# V6.0 (🍭) LOLLIPOP
-1F36E ;	emoji ;	L1 ;	none ;	j	# V6.0 (🍮) CUSTARD
-1F36F ;	emoji ;	L1 ;	none ;	j	# V6.0 (🍯) HONEY POT
-1F370 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🍰) SHORTCAKE
-1F371 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🍱) BENTO BOX
-1F372 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🍲) POT OF FOOD
-1F373 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🍳) COOKING
-1F374 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🍴) FORK AND KNIFE
-1F375 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🍵) TEACUP WITHOUT HANDLE
-1F376 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🍶) SAKE BOTTLE AND CUP
-1F377 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🍷) WINE GLASS
-1F378 ;	emoji ;	L1 ;	none ;	j w	# V6.0 (🍸) COCKTAIL GLASS
-1F379 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🍹) TROPICAL DRINK
-1F37A ;	emoji ;	L1 ;	none ;	j	# V6.0 (🍺) BEER MUG
-1F37B ;	emoji ;	L1 ;	none ;	j	# V6.0 (🍻) CLINKING BEER MUGS
-1F37C ;	emoji ;	L1 ;	none ;	x	# V6.0 (🍼) BABY BOTTLE
-1F37D ;	text ;	L2 ;	none ;	w	# V7.0 (🍽) FORK AND KNIFE WITH PLATE
-1F37E ;	emoji ;	L2 ;	none ;	x	# V8.0 (🍾) BOTTLE WITH POPPING CORK
-1F37F ;	emoji ;	L2 ;	none ;	x	# V8.0 (🍿) POPCORN
-1F380 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🎀) RIBBON
-1F381 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🎁) WRAPPED PRESENT
-1F382 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🎂) BIRTHDAY CAKE
-1F383 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🎃) JACK-O-LANTERN
-1F384 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🎄) CHRISTMAS TREE
-1F385 ;	emoji ;	L1 ;	primary ;	j	# V6.0 (🎅) FATHER CHRISTMAS
-1F386 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🎆) FIREWORKS
-1F387 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🎇) FIREWORK SPARKLER
-1F388 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🎈) BALLOON
-1F389 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🎉) PARTY POPPER
-1F38A ;	emoji ;	L1 ;	none ;	j	# V6.0 (🎊) CONFETTI BALL
-1F38B ;	emoji ;	L1 ;	none ;	j	# V6.0 (🎋) TANABATA TREE
-1F38C ;	emoji ;	L1 ;	none ;	j	# V6.0 (🎌) CROSSED FLAGS
-1F38D ;	emoji ;	L1 ;	none ;	j	# V6.0 (🎍) PINE DECORATION
-1F38E ;	emoji ;	L1 ;	none ;	j	# V6.0 (🎎) JAPANESE DOLLS
-1F38F ;	emoji ;	L1 ;	none ;	j	# V6.0 (🎏) CARP STREAMER
-1F390 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🎐) WIND CHIME
-1F391 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🎑) MOON VIEWING CEREMONY
-1F392 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🎒) SCHOOL SATCHEL
-1F393 ;	emoji ;	L1 ;	none ;	j w	# V6.0 (🎓) GRADUATION CAP
-1F396 ;	text ;	L2 ;	none ;	w	# V7.0 (🎖) MILITARY MEDAL
-1F397 ;	text ;	L2 ;	none ;	w	# V7.0 (🎗) REMINDER RIBBON
-1F399 ;	text ;	L2 ;	none ;	w	# V7.0 (🎙) STUDIO MICROPHONE
-1F39A ;	text ;	L2 ;	none ;	w	# V7.0 (🎚) LEVEL SLIDER
-1F39B ;	text ;	L2 ;	none ;	w	# V7.0 (🎛) CONTROL KNOBS
-1F39E ;	text ;	L2 ;	none ;	w	# V7.0 (🎞) FILM FRAMES
-1F39F ;	text ;	L2 ;	none ;	w	# V7.0 (🎟) ADMISSION TICKETS
-1F3A0 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🎠) CAROUSEL HORSE
-1F3A1 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🎡) FERRIS WHEEL
-1F3A2 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🎢) ROLLER COASTER
-1F3A3 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🎣) FISHING POLE AND FISH
-1F3A4 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🎤) MICROPHONE
-1F3A5 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🎥) MOVIE CAMERA
-1F3A6 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🎦) CINEMA
-1F3A7 ;	emoji ;	L1 ;	none ;	j w	# V6.0 (🎧) HEADPHONE
-1F3A8 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🎨) ARTIST PALETTE
-1F3A9 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🎩) TOP HAT
-1F3AA ;	emoji ;	L1 ;	none ;	j	# V6.0 (🎪) CIRCUS TENT
-1F3AB ;	emoji ;	L1 ;	none ;	j	# V6.0 (🎫) TICKET
-1F3AC ;	emoji ;	L1 ;	none ;	j w	# V6.0 (🎬) CLAPPER BOARD
-1F3AD ;	emoji ;	L1 ;	none ;	j w	# V6.0 (🎭) PERFORMING ARTS
-1F3AE ;	emoji ;	L1 ;	none ;	j w	# V6.0 (🎮) VIDEO GAME
-1F3AF ;	emoji ;	L1 ;	none ;	j	# V6.0 (🎯) DIRECT HIT
-1F3B0 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🎰) SLOT MACHINE
-1F3B1 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🎱) BILLIARDS
-1F3B2 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🎲) GAME DIE
-1F3B3 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🎳) BOWLING
-1F3B4 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🎴) FLOWER PLAYING CARDS
-1F3B5 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🎵) MUSICAL NOTE
-1F3B6 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🎶) MULTIPLE MUSICAL NOTES
-1F3B7 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🎷) SAXOPHONE
-1F3B8 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🎸) GUITAR
-1F3B9 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🎹) MUSICAL KEYBOARD
-1F3BA ;	emoji ;	L1 ;	none ;	j	# V6.0 (🎺) TRUMPET
-1F3BB ;	emoji ;	L1 ;	none ;	j	# V6.0 (🎻) VIOLIN
-1F3BC ;	emoji ;	L1 ;	none ;	j	# V6.0 (🎼) MUSICAL SCORE
-1F3BD ;	emoji ;	L1 ;	none ;	j	# V6.0 (🎽) RUNNING SHIRT WITH SASH
-1F3BE ;	emoji ;	L1 ;	none ;	j	# V6.0 (🎾) TENNIS RACQUET AND BALL
-1F3BF ;	emoji ;	L1 ;	none ;	j	# V6.0 (🎿) SKI AND SKI BOOT
-1F3C0 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🏀) BASKETBALL AND HOOP
-1F3C1 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🏁) CHEQUERED FLAG
-1F3C2 ;	emoji ;	L1 ;	secondary ;	j w	# V6.0 (🏂) SNOWBOARDER
-1F3C3 ;	emoji ;	L1 ;	secondary ;	j	# V6.0 (🏃) RUNNER
-1F3C4 ;	emoji ;	L1 ;	secondary ;	j w	# V6.0 (🏄) SURFER
-1F3C5 ;	emoji ;	L2 ;	none ;	x	# V7.0 (🏅) SPORTS MEDAL
-1F3C6 ;	emoji ;	L1 ;	none ;	j w	# V6.0 (🏆) TROPHY
-1F3C7 ;	emoji ;	L1 ;	secondary ;	x	# V6.0 (🏇) HORSE RACING
-1F3C8 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🏈) AMERICAN FOOTBALL
-1F3C9 ;	emoji ;	L1 ;	none ;	x	# V6.0 (🏉) RUGBY FOOTBALL
-1F3CA ;	emoji ;	L1 ;	secondary ;	j w	# V6.0 (🏊) SWIMMER
-1F3CB ;	text ;	L2 ;	none ;	w	# V7.0 (🏋) WEIGHT LIFTER
-1F3CC ;	text ;	L2 ;	none ;	w	# V7.0 (🏌) GOLFER
-1F3CD ;	text ;	L2 ;	none ;	w	# V7.0 (🏍) RACING MOTORCYCLE
-1F3CE ;	text ;	L2 ;	none ;	w	# V7.0 (🏎) RACING CAR
-1F3CF ;	emoji ;	L2 ;	none ;	x	# V8.0 (🏏) CRICKET BAT AND BALL
-1F3D0 ;	emoji ;	L2 ;	none ;	x	# V8.0 (🏐) VOLLEYBALL
-1F3D1 ;	emoji ;	L2 ;	none ;	x	# V8.0 (🏑) FIELD HOCKEY STICK AND BALL
-1F3D2 ;	emoji ;	L2 ;	none ;	x	# V8.0 (🏒) ICE HOCKEY STICK AND PUCK
-1F3D3 ;	emoji ;	L2 ;	none ;	x	# V8.0 (🏓) TABLE TENNIS PADDLE AND BALL
-1F3D4 ;	text ;	L2 ;	none ;	w	# V7.0 (🏔) SNOW CAPPED MOUNTAIN
-1F3D5 ;	text ;	L2 ;	none ;	w	# V7.0 (🏕) CAMPING
-1F3D6 ;	text ;	L2 ;	none ;	w	# V7.0 (🏖) BEACH WITH UMBRELLA
-1F3D7 ;	text ;	L2 ;	none ;	w	# V7.0 (🏗) BUILDING CONSTRUCTION
-1F3D8 ;	text ;	L2 ;	none ;	w	# V7.0 (🏘) HOUSE BUILDINGS
-1F3D9 ;	text ;	L2 ;	none ;	w	# V7.0 (🏙) CITYSCAPE
-1F3DA ;	text ;	L2 ;	none ;	w	# V7.0 (🏚) DERELICT HOUSE BUILDING
-1F3DB ;	text ;	L2 ;	none ;	w	# V7.0 (🏛) CLASSICAL BUILDING
-1F3DC ;	text ;	L2 ;	none ;	w	# V7.0 (🏜) DESERT
-1F3DD ;	text ;	L2 ;	none ;	w	# V7.0 (🏝) DESERT ISLAND
-1F3DE ;	text ;	L2 ;	none ;	w	# V7.0 (🏞) NATIONAL PARK
-1F3DF ;	text ;	L2 ;	none ;	w	# V7.0 (🏟) STADIUM
-1F3E0 ;	emoji ;	L1 ;	none ;	j w	# V6.0 (🏠) HOUSE BUILDING
-1F3E1 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🏡) HOUSE WITH GARDEN
-1F3E2 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🏢) OFFICE BUILDING
-1F3E3 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🏣) JAPANESE POST OFFICE
-1F3E4 ;	emoji ;	L1 ;	none ;	x	# V6.0 (🏤) EUROPEAN POST OFFICE
-1F3E5 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🏥) HOSPITAL
-1F3E6 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🏦) BANK
-1F3E7 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🏧) AUTOMATED TELLER MACHINE
-1F3E8 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🏨) HOTEL
-1F3E9 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🏩) LOVE HOTEL
-1F3EA ;	emoji ;	L1 ;	none ;	j	# V6.0 (🏪) CONVENIENCE STORE
-1F3EB ;	emoji ;	L1 ;	none ;	j	# V6.0 (🏫) SCHOOL
-1F3EC ;	emoji ;	L1 ;	none ;	j	# V6.0 (🏬) DEPARTMENT STORE
-1F3ED ;	emoji ;	L1 ;	none ;	j w	# V6.0 (🏭) FACTORY
-1F3EE ;	emoji ;	L1 ;	none ;	j	# V6.0 (🏮) IZAKAYA LANTERN
-1F3EF ;	emoji ;	L1 ;	none ;	j	# V6.0 (🏯) JAPANESE CASTLE
-1F3F0 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🏰) EUROPEAN CASTLE
-1F3F3 ;	text ;	L2 ;	none ;	w	# V7.0 (🏳) WAVING WHITE FLAG
-1F3F4 ;	emoji ;	L2 ;	none ;	x	# V7.0 (🏴) WAVING BLACK FLAG
-1F3F5 ;	text ;	L2 ;	none ;	w	# V7.0 (🏵) ROSETTE
-1F3F7 ;	text ;	L2 ;	none ;	w	# V7.0 (🏷) LABEL
-1F3F8 ;	emoji ;	L2 ;	none ;	x	# V8.0 (🏸) BADMINTON RACQUET AND SHUTTLECOCK
-1F3F9 ;	emoji ;	L2 ;	none ;	x	# V8.0 (🏹) BOW AND ARROW
-1F3FA ;	emoji ;	L2 ;	none ;	x	# V8.0 (🏺) AMPHORA
-1F3FB ;	emoji ;	L2 ;	modifier ;	x	# V8.0 (🏻) EMOJI MODIFIER FITZPATRICK TYPE-1-2
-1F3FC ;	emoji ;	L2 ;	modifier ;	x	# V8.0 (🏼) EMOJI MODIFIER FITZPATRICK TYPE-3
-1F3FD ;	emoji ;	L2 ;	modifier ;	x	# V8.0 (🏽) EMOJI MODIFIER FITZPATRICK TYPE-4
-1F3FE ;	emoji ;	L2 ;	modifier ;	x	# V8.0 (🏾) EMOJI MODIFIER FITZPATRICK TYPE-5
-1F3FF ;	emoji ;	L2 ;	modifier ;	x	# V8.0 (🏿) EMOJI MODIFIER FITZPATRICK TYPE-6
-1F400 ;	emoji ;	L1 ;	none ;	x	# V6.0 (🐀) RAT
-1F401 ;	emoji ;	L1 ;	none ;	x	# V6.0 (🐁) MOUSE
-1F402 ;	emoji ;	L1 ;	none ;	x	# V6.0 (🐂) OX
-1F403 ;	emoji ;	L1 ;	none ;	x	# V6.0 (🐃) WATER BUFFALO
-1F404 ;	emoji ;	L1 ;	none ;	x	# V6.0 (🐄) COW
-1F405 ;	emoji ;	L1 ;	none ;	x	# V6.0 (🐅) TIGER
-1F406 ;	emoji ;	L1 ;	none ;	x	# V6.0 (🐆) LEOPARD
-1F407 ;	emoji ;	L1 ;	none ;	x	# V6.0 (🐇) RABBIT
-1F408 ;	emoji ;	L1 ;	none ;	w	# V6.0 (🐈) CAT
-1F409 ;	emoji ;	L1 ;	none ;	x	# V6.0 (🐉) DRAGON
-1F40A ;	emoji ;	L1 ;	none ;	x	# V6.0 (🐊) CROCODILE
-1F40B ;	emoji ;	L1 ;	none ;	x	# V6.0 (🐋) WHALE
-1F40C ;	emoji ;	L1 ;	none ;	j	# V6.0 (🐌) SNAIL
-1F40D ;	emoji ;	L1 ;	none ;	j	# V6.0 (🐍) SNAKE
-1F40E ;	emoji ;	L1 ;	none ;	j	# V6.0 (🐎) HORSE
-1F40F ;	emoji ;	L1 ;	none ;	x	# V6.0 (🐏) RAM
-1F410 ;	emoji ;	L1 ;	none ;	x	# V6.0 (🐐) GOAT
-1F411 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🐑) SHEEP
-1F412 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🐒) MONKEY
-1F413 ;	emoji ;	L1 ;	none ;	x	# V6.0 (🐓) ROOSTER
-1F414 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🐔) CHICKEN
-1F415 ;	emoji ;	L1 ;	none ;	w	# V6.0 (🐕) DOG
-1F416 ;	emoji ;	L1 ;	none ;	x	# V6.0 (🐖) PIG
-1F417 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🐗) BOAR
-1F418 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🐘) ELEPHANT
-1F419 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🐙) OCTOPUS
-1F41A ;	emoji ;	L1 ;	none ;	j	# V6.0 (🐚) SPIRAL SHELL
-1F41B ;	emoji ;	L1 ;	none ;	j	# V6.0 (🐛) BUG
-1F41C ;	emoji ;	L1 ;	none ;	j	# V6.0 (🐜) ANT
-1F41D ;	emoji ;	L1 ;	none ;	j	# V6.0 (🐝) HONEYBEE
-1F41E ;	emoji ;	L1 ;	none ;	j	# V6.0 (🐞) LADY BEETLE
-1F41F ;	emoji ;	L1 ;	none ;	j w	# V6.0 (🐟) FISH
-1F420 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🐠) TROPICAL FISH
-1F421 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🐡) BLOWFISH
-1F422 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🐢) TURTLE
-1F423 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🐣) HATCHING CHICK
-1F424 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🐤) BABY CHICK
-1F425 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🐥) FRONT-FACING BABY CHICK
-1F426 ;	emoji ;	L1 ;	none ;	j w	# V6.0 (🐦) BIRD
-1F427 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🐧) PENGUIN
-1F428 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🐨) KOALA
-1F429 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🐩) POODLE
-1F42A ;	emoji ;	L1 ;	none ;	x	# V6.0 (🐪) DROMEDARY CAMEL
-1F42B ;	emoji ;	L1 ;	none ;	j	# V6.0 (🐫) BACTRIAN CAMEL
-1F42C ;	emoji ;	L1 ;	none ;	j	# V6.0 (🐬) DOLPHIN
-1F42D ;	emoji ;	L1 ;	none ;	j	# V6.0 (🐭) MOUSE FACE
-1F42E ;	emoji ;	L1 ;	none ;	j	# V6.0 (🐮) COW FACE
-1F42F ;	emoji ;	L1 ;	none ;	j	# V6.0 (🐯) TIGER FACE
-1F430 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🐰) RABBIT FACE
-1F431 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🐱) CAT FACE
-1F432 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🐲) DRAGON FACE
-1F433 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🐳) SPOUTING WHALE
-1F434 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🐴) HORSE FACE
-1F435 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🐵) MONKEY FACE
-1F436 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🐶) DOG FACE
-1F437 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🐷) PIG FACE
-1F438 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🐸) FROG FACE
-1F439 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🐹) HAMSTER FACE
-1F43A ;	emoji ;	L1 ;	none ;	j	# V6.0 (🐺) WOLF FACE
-1F43B ;	emoji ;	L1 ;	none ;	j	# V6.0 (🐻) BEAR FACE
-1F43C ;	emoji ;	L1 ;	none ;	j	# V6.0 (🐼) PANDA FACE
-1F43D ;	emoji ;	L1 ;	none ;	j	# V6.0 (🐽) PIG NOSE
-1F43E ;	emoji ;	L1 ;	none ;	j	# V6.0 (🐾) PAW PRINTS
-1F43F ;	text ;	L2 ;	none ;	w	# V7.0 (🐿) CHIPMUNK
-1F440 ;	emoji ;	L1 ;	none ;	j	# V6.0 (👀) EYES
-1F441 ;	text ;	L2 ;	none ;	w	# V7.0 (👁) EYE
-1F442 ;	emoji ;	L1 ;	secondary ;	j w	# V6.0 (👂) EAR
-1F443 ;	emoji ;	L1 ;	secondary ;	j	# V6.0 (👃) NOSE
-1F444 ;	emoji ;	L1 ;	none ;	j	# V6.0 (👄) MOUTH
-1F445 ;	emoji ;	L1 ;	none ;	j	# V6.0 (👅) TONGUE
-1F446 ;	emoji ;	L1 ;	secondary ;	j w	# V6.0 (👆) WHITE UP POINTING BACKHAND INDEX
-1F447 ;	emoji ;	L1 ;	secondary ;	j w	# V6.0 (👇) WHITE DOWN POINTING BACKHAND INDEX
-1F448 ;	emoji ;	L1 ;	secondary ;	j w	# V6.0 (👈) WHITE LEFT POINTING BACKHAND INDEX
-1F449 ;	emoji ;	L1 ;	secondary ;	j w	# V6.0 (👉) WHITE RIGHT POINTING BACKHAND INDEX
-1F44A ;	emoji ;	L1 ;	secondary ;	j	# V6.0 (👊) FISTED HAND SIGN
-1F44B ;	emoji ;	L1 ;	secondary ;	j	# V6.0 (👋) WAVING HAND SIGN
-1F44C ;	emoji ;	L1 ;	secondary ;	j	# V6.0 (👌) OK HAND SIGN
-1F44D ;	emoji ;	L1 ;	secondary ;	j w	# V6.0 (👍) THUMBS UP SIGN
-1F44E ;	emoji ;	L1 ;	secondary ;	j w	# V6.0 (👎) THUMBS DOWN SIGN
-1F44F ;	emoji ;	L1 ;	secondary ;	j	# V6.0 (👏) CLAPPING HANDS SIGN
-1F450 ;	emoji ;	L1 ;	secondary ;	j	# V6.0 (👐) OPEN HANDS SIGN
-1F451 ;	emoji ;	L1 ;	none ;	j	# V6.0 (👑) CROWN
-1F452 ;	emoji ;	L1 ;	none ;	j	# V6.0 (👒) WOMANS HAT
-1F453 ;	emoji ;	L1 ;	none ;	j w	# V6.0 (👓) EYEGLASSES
-1F454 ;	emoji ;	L1 ;	none ;	j	# V6.0 (👔) NECKTIE
-1F455 ;	emoji ;	L1 ;	none ;	j	# V6.0 (👕) T-SHIRT
-1F456 ;	emoji ;	L1 ;	none ;	j	# V6.0 (👖) JEANS
-1F457 ;	emoji ;	L1 ;	none ;	j	# V6.0 (👗) DRESS
-1F458 ;	emoji ;	L1 ;	none ;	j	# V6.0 (👘) KIMONO
-1F459 ;	emoji ;	L1 ;	none ;	j	# V6.0 (👙) BIKINI
-1F45A ;	emoji ;	L1 ;	none ;	j	# V6.0 (👚) WOMANS CLOTHES
-1F45B ;	emoji ;	L1 ;	none ;	j	# V6.0 (👛) PURSE
-1F45C ;	emoji ;	L1 ;	none ;	j	# V6.0 (👜) HANDBAG
-1F45D ;	emoji ;	L1 ;	none ;	j	# V6.0 (👝) POUCH
-1F45E ;	emoji ;	L1 ;	none ;	j	# V6.0 (👞) MANS SHOE
-1F45F ;	emoji ;	L1 ;	none ;	j	# V6.0 (👟) ATHLETIC SHOE
-1F460 ;	emoji ;	L1 ;	none ;	j	# V6.0 (👠) HIGH-HEELED SHOE
-1F461 ;	emoji ;	L1 ;	none ;	j	# V6.0 (👡) WOMANS SANDAL
-1F462 ;	emoji ;	L1 ;	none ;	j	# V6.0 (👢) WOMANS BOOTS
-1F463 ;	emoji ;	L1 ;	none ;	j	# V6.0 (👣) FOOTPRINTS
-1F464 ;	emoji ;	L1 ;	none ;	j	# V6.0 (👤) BUST IN SILHOUETTE
-1F465 ;	emoji ;	L1 ;	none ;	x	# V6.0 (👥) BUSTS IN SILHOUETTE
-1F466 ;	emoji ;	L1 ;	primary ;	j	# V6.0 (👦) BOY
-1F467 ;	emoji ;	L1 ;	primary ;	j	# V6.0 (👧) GIRL
-1F468 ;	emoji ;	L1 ;	primary ;	j	# V6.0 (👨) MAN
-1F469 ;	emoji ;	L1 ;	primary ;	j	# V6.0 (👩) WOMAN
-1F46A ;	emoji ;	L1 ;	none ;	j w	# V6.0 (👪) FAMILY
-1F46B ;	emoji ;	L1 ;	none ;	j	# V6.0 (👫) MAN AND WOMAN HOLDING HANDS
-1F46C ;	emoji ;	L1 ;	none ;	x	# V6.0 (👬) TWO MEN HOLDING HANDS
-1F46D ;	emoji ;	L1 ;	none ;	x	# V6.0 (👭) TWO WOMEN HOLDING HANDS
-1F46E ;	emoji ;	L1 ;	primary ;	j	# V6.0 (👮) POLICE OFFICER
-1F46F ;	emoji ;	L1 ;	none ;	j	# V6.0 (👯) WOMAN WITH BUNNY EARS
-1F470 ;	emoji ;	L1 ;	primary ;	j	# V6.0 (👰) BRIDE WITH VEIL
-1F471 ;	emoji ;	L1 ;	primary ;	j	# V6.0 (👱) PERSON WITH BLOND HAIR
-1F472 ;	emoji ;	L1 ;	primary ;	j	# V6.0 (👲) MAN WITH GUA PI MAO
-1F473 ;	emoji ;	L1 ;	primary ;	j	# V6.0 (👳) MAN WITH TURBAN
-1F474 ;	emoji ;	L1 ;	primary ;	j	# V6.0 (👴) OLDER MAN
-1F475 ;	emoji ;	L1 ;	primary ;	j	# V6.0 (👵) OLDER WOMAN
-1F476 ;	emoji ;	L1 ;	primary ;	j	# V6.0 (👶) BABY
-1F477 ;	emoji ;	L1 ;	primary ;	j	# V6.0 (👷) CONSTRUCTION WORKER
-1F478 ;	emoji ;	L1 ;	primary ;	j	# V6.0 (👸) PRINCESS
-1F479 ;	emoji ;	L1 ;	none ;	j	# V6.0 (👹) JAPANESE OGRE
-1F47A ;	emoji ;	L1 ;	none ;	j	# V6.0 (👺) JAPANESE GOBLIN
-1F47B ;	emoji ;	L1 ;	none ;	j	# V6.0 (👻) GHOST
-1F47C ;	emoji ;	L1 ;	primary ;	j	# V6.0 (👼) BABY ANGEL
-1F47D ;	emoji ;	L1 ;	none ;	j w	# V6.0 (👽) EXTRATERRESTRIAL ALIEN
-1F47E ;	emoji ;	L1 ;	none ;	j	# V6.0 (👾) ALIEN MONSTER
-1F47F ;	emoji ;	L1 ;	secondary ;	j	# V6.0 (👿) IMP
-1F480 ;	emoji ;	L1 ;	none ;	j	# V6.0 (💀) SKULL
-1F481 ;	emoji ;	L1 ;	primary ;	j	# V6.0 (💁) INFORMATION DESK PERSON
-1F482 ;	emoji ;	L1 ;	primary ;	j	# V6.0 (💂) GUARDSMAN
-1F483 ;	emoji ;	L1 ;	secondary ;	j	# V6.0 (💃) DANCER
-1F484 ;	emoji ;	L1 ;	none ;	j	# V6.0 (💄) LIPSTICK
-1F485 ;	emoji ;	L1 ;	secondary ;	j	# V6.0 (💅) NAIL POLISH
-1F486 ;	emoji ;	L1 ;	primary ;	j	# V6.0 (💆) FACE MASSAGE
-1F487 ;	emoji ;	L1 ;	primary ;	j	# V6.0 (💇) HAIRCUT
-1F488 ;	emoji ;	L1 ;	none ;	j	# V6.0 (💈) BARBER POLE
-1F489 ;	emoji ;	L1 ;	none ;	j	# V6.0 (💉) SYRINGE
-1F48A ;	emoji ;	L1 ;	none ;	j	# V6.0 (💊) PILL
-1F48B ;	emoji ;	L1 ;	none ;	j	# V6.0 (💋) KISS MARK
-1F48C ;	emoji ;	L1 ;	none ;	j	# V6.0 (💌) LOVE LETTER
-1F48D ;	emoji ;	L1 ;	none ;	j	# V6.0 (💍) RING
-1F48E ;	emoji ;	L1 ;	none ;	j	# V6.0 (💎) GEM STONE
-1F48F ;	emoji ;	L1 ;	none ;	j	# V6.0 (💏) KISS
-1F490 ;	emoji ;	L1 ;	none ;	j	# V6.0 (💐) BOUQUET
-1F491 ;	emoji ;	L1 ;	none ;	j	# V6.0 (💑) COUPLE WITH HEART
-1F492 ;	emoji ;	L1 ;	none ;	j	# V6.0 (💒) WEDDING
-1F493 ;	emoji ;	L1 ;	none ;	j	# V6.0 (💓) BEATING HEART
-1F494 ;	emoji ;	L1 ;	none ;	j	# V6.0 (💔) BROKEN HEART
-1F495 ;	emoji ;	L1 ;	none ;	j	# V6.0 (💕) TWO HEARTS
-1F496 ;	emoji ;	L1 ;	none ;	j	# V6.0 (💖) SPARKLING HEART
-1F497 ;	emoji ;	L1 ;	none ;	j	# V6.0 (💗) GROWING HEART
-1F498 ;	emoji ;	L1 ;	none ;	j	# V6.0 (💘) HEART WITH ARROW
-1F499 ;	emoji ;	L1 ;	none ;	j	# V6.0 (💙) BLUE HEART
-1F49A ;	emoji ;	L1 ;	none ;	j	# V6.0 (💚) GREEN HEART
-1F49B ;	emoji ;	L1 ;	none ;	j	# V6.0 (💛) YELLOW HEART
-1F49C ;	emoji ;	L1 ;	none ;	j	# V6.0 (💜) PURPLE HEART
-1F49D ;	emoji ;	L1 ;	none ;	j	# V6.0 (💝) HEART WITH RIBBON
-1F49E ;	emoji ;	L1 ;	none ;	j	# V6.0 (💞) REVOLVING HEARTS
-1F49F ;	emoji ;	L1 ;	none ;	j	# V6.0 (💟) HEART DECORATION
-1F4A0 ;	emoji ;	L1 ;	none ;	j	# V6.0 (💠) DIAMOND SHAPE WITH A DOT INSIDE
-1F4A1 ;	emoji ;	L1 ;	none ;	j	# V6.0 (💡) ELECTRIC LIGHT BULB
-1F4A2 ;	emoji ;	L1 ;	none ;	j	# V6.0 (💢) ANGER SYMBOL
-1F4A3 ;	emoji ;	L1 ;	none ;	j w	# V6.0 (💣) BOMB
-1F4A4 ;	emoji ;	L1 ;	none ;	j	# V6.0 (💤) SLEEPING SYMBOL
-1F4A5 ;	emoji ;	L1 ;	none ;	j	# V6.0 (💥) COLLISION SYMBOL
-1F4A6 ;	emoji ;	L1 ;	none ;	j	# V6.0 (💦) SPLASHING SWEAT SYMBOL
-1F4A7 ;	emoji ;	L1 ;	none ;	j	# V6.0 (💧) DROPLET
-1F4A8 ;	emoji ;	L1 ;	none ;	j	# V6.0 (💨) DASH SYMBOL
-1F4A9 ;	emoji ;	L1 ;	none ;	j	# V6.0 (💩) PILE OF POO
-1F4AA ;	emoji ;	L1 ;	secondary ;	j	# V6.0 (💪) FLEXED BICEPS
-1F4AB ;	emoji ;	L1 ;	none ;	j	# V6.0 (💫) DIZZY SYMBOL
-1F4AC ;	emoji ;	L1 ;	none ;	j	# V6.0 (💬) SPEECH BALLOON
-1F4AD ;	emoji ;	L1 ;	none ;	x	# V6.0 (💭) THOUGHT BALLOON
-1F4AE ;	emoji ;	L1 ;	none ;	j	# V6.0 (💮) WHITE FLOWER
-1F4AF ;	emoji ;	L1 ;	none ;	j	# V6.0 (💯) HUNDRED POINTS SYMBOL
-1F4B0 ;	emoji ;	L1 ;	none ;	j w	# V6.0 (💰) MONEY BAG
-1F4B1 ;	emoji ;	L1 ;	none ;	j	# V6.0 (💱) CURRENCY EXCHANGE
-1F4B2 ;	emoji ;	L1 ;	none ;	j	# V6.0 (💲) HEAVY DOLLAR SIGN
-1F4B3 ;	emoji ;	L1 ;	none ;	j w	# V6.0 (💳) CREDIT CARD
-1F4B4 ;	emoji ;	L1 ;	none ;	j	# V6.0 (💴) BANKNOTE WITH YEN SIGN
-1F4B5 ;	emoji ;	L1 ;	none ;	j	# V6.0 (💵) BANKNOTE WITH DOLLAR SIGN
-1F4B6 ;	emoji ;	L1 ;	none ;	x	# V6.0 (💶) BANKNOTE WITH EURO SIGN
-1F4B7 ;	emoji ;	L1 ;	none ;	x	# V6.0 (💷) BANKNOTE WITH POUND SIGN
-1F4B8 ;	emoji ;	L1 ;	none ;	j	# V6.0 (💸) MONEY WITH WINGS
-1F4B9 ;	emoji ;	L1 ;	none ;	j	# V6.0 (💹) CHART WITH UPWARDS TREND AND YEN SIGN
-1F4BA ;	emoji ;	L1 ;	none ;	j	# V6.0 (💺) SEAT
-1F4BB ;	emoji ;	L1 ;	none ;	j w	# V6.0 (💻) PERSONAL COMPUTER
-1F4BC ;	emoji ;	L1 ;	none ;	j	# V6.0 (💼) BRIEFCASE
-1F4BD ;	emoji ;	L1 ;	none ;	j	# V6.0 (💽) MINIDISC
-1F4BE ;	emoji ;	L1 ;	none ;	j	# V6.0 (💾) FLOPPY DISK
-1F4BF ;	emoji ;	L1 ;	none ;	j w	# V6.0 (💿) OPTICAL DISC
-1F4C0 ;	emoji ;	L1 ;	none ;	j	# V6.0 (📀) DVD
-1F4C1 ;	emoji ;	L1 ;	none ;	j	# V6.0 (📁) FILE FOLDER
-1F4C2 ;	emoji ;	L1 ;	none ;	j	# V6.0 (📂) OPEN FILE FOLDER
-1F4C3 ;	emoji ;	L1 ;	none ;	j	# V6.0 (📃) PAGE WITH CURL
-1F4C4 ;	emoji ;	L1 ;	none ;	j	# V6.0 (📄) PAGE FACING UP
-1F4C5 ;	emoji ;	L1 ;	none ;	j	# V6.0 (📅) CALENDAR
-1F4C6 ;	emoji ;	L1 ;	none ;	j	# V6.0 (📆) TEAR-OFF CALENDAR
-1F4C7 ;	emoji ;	L1 ;	none ;	j	# V6.0 (📇) CARD INDEX
-1F4C8 ;	emoji ;	L1 ;	none ;	j	# V6.0 (📈) CHART WITH UPWARDS TREND
-1F4C9 ;	emoji ;	L1 ;	none ;	j	# V6.0 (📉) CHART WITH DOWNWARDS TREND
-1F4CA ;	emoji ;	L1 ;	none ;	j	# V6.0 (📊) BAR CHART
-1F4CB ;	emoji ;	L1 ;	none ;	j w	# V6.0 (📋) CLIPBOARD
-1F4CC ;	emoji ;	L1 ;	none ;	j	# V6.0 (📌) PUSHPIN
-1F4CD ;	emoji ;	L1 ;	none ;	j	# V6.0 (📍) ROUND PUSHPIN
-1F4CE ;	emoji ;	L1 ;	none ;	j	# V6.0 (📎) PAPERCLIP
-1F4CF ;	emoji ;	L1 ;	none ;	j	# V6.0 (📏) STRAIGHT RULER
-1F4D0 ;	emoji ;	L1 ;	none ;	j	# V6.0 (📐) TRIANGULAR RULER
-1F4D1 ;	emoji ;	L1 ;	none ;	j	# V6.0 (📑) BOOKMARK TABS
-1F4D2 ;	emoji ;	L1 ;	none ;	j	# V6.0 (📒) LEDGER
-1F4D3 ;	emoji ;	L1 ;	none ;	j	# V6.0 (📓) NOTEBOOK
-1F4D4 ;	emoji ;	L1 ;	none ;	j	# V6.0 (📔) NOTEBOOK WITH DECORATIVE COVER
-1F4D5 ;	emoji ;	L1 ;	none ;	j	# V6.0 (📕) CLOSED BOOK
-1F4D6 ;	emoji ;	L1 ;	none ;	j	# V6.0 (📖) OPEN BOOK
-1F4D7 ;	emoji ;	L1 ;	none ;	j	# V6.0 (📗) GREEN BOOK
-1F4D8 ;	emoji ;	L1 ;	none ;	j	# V6.0 (📘) BLUE BOOK
-1F4D9 ;	emoji ;	L1 ;	none ;	j	# V6.0 (📙) ORANGE BOOK
-1F4DA ;	emoji ;	L1 ;	none ;	j w	# V6.0 (📚) BOOKS
-1F4DB ;	emoji ;	L1 ;	none ;	j	# V6.0 (📛) NAME BADGE
-1F4DC ;	emoji ;	L1 ;	none ;	j	# V6.0 (📜) SCROLL
-1F4DD ;	emoji ;	L1 ;	none ;	j	# V6.0 (📝) MEMO
-1F4DE ;	emoji ;	L1 ;	none ;	j	# V6.0 (📞) TELEPHONE RECEIVER
-1F4DF ;	emoji ;	L1 ;	none ;	j w	# V6.0 (📟) PAGER
-1F4E0 ;	emoji ;	L1 ;	none ;	j	# V6.0 (📠) FAX MACHINE
-1F4E1 ;	emoji ;	L1 ;	none ;	j	# V6.0 (📡) SATELLITE ANTENNA
-1F4E2 ;	emoji ;	L1 ;	none ;	j	# V6.0 (📢) PUBLIC ADDRESS LOUDSPEAKER
-1F4E3 ;	emoji ;	L1 ;	none ;	j	# V6.0 (📣) CHEERING MEGAPHONE
-1F4E4 ;	emoji ;	L1 ;	none ;	j w	# V6.0 (📤) OUTBOX TRAY
-1F4E5 ;	emoji ;	L1 ;	none ;	j w	# V6.0 (📥) INBOX TRAY
-1F4E6 ;	emoji ;	L1 ;	none ;	j w	# V6.0 (📦) PACKAGE
-1F4E7 ;	emoji ;	L1 ;	none ;	j	# V6.0 (📧) E-MAIL SYMBOL
-1F4E8 ;	emoji ;	L1 ;	none ;	j	# V6.0 (📨) INCOMING ENVELOPE
-1F4E9 ;	emoji ;	L1 ;	none ;	j	# V6.0 (📩) ENVELOPE WITH DOWNWARDS ARROW ABOVE
-1F4EA ;	emoji ;	L1 ;	none ;	j w	# V6.0 (📪) CLOSED MAILBOX WITH LOWERED FLAG
-1F4EB ;	emoji ;	L1 ;	none ;	j w	# V6.0 (📫) CLOSED MAILBOX WITH RAISED FLAG
-1F4EC ;	emoji ;	L1 ;	none ;	w	# V6.0 (📬) OPEN MAILBOX WITH RAISED FLAG
-1F4ED ;	emoji ;	L1 ;	none ;	w	# V6.0 (📭) OPEN MAILBOX WITH LOWERED FLAG
-1F4EE ;	emoji ;	L1 ;	none ;	j	# V6.0 (📮) POSTBOX
-1F4EF ;	emoji ;	L1 ;	none ;	x	# V6.0 (📯) POSTAL HORN
-1F4F0 ;	emoji ;	L1 ;	none ;	j	# V6.0 (📰) NEWSPAPER
-1F4F1 ;	emoji ;	L1 ;	none ;	j	# V6.0 (📱) MOBILE PHONE
-1F4F2 ;	emoji ;	L1 ;	none ;	j	# V6.0 (📲) MOBILE PHONE WITH RIGHTWARDS ARROW AT LEFT
-1F4F3 ;	emoji ;	L1 ;	none ;	j	# V6.0 (📳) VIBRATION MODE
-1F4F4 ;	emoji ;	L1 ;	none ;	j	# V6.0 (📴) MOBILE PHONE OFF
-1F4F5 ;	emoji ;	L1 ;	none ;	x	# V6.0 (📵) NO MOBILE PHONES
-1F4F6 ;	emoji ;	L1 ;	none ;	j	# V6.0 (📶) ANTENNA WITH BARS
-1F4F7 ;	emoji ;	L1 ;	none ;	j w	# V6.0 (📷) CAMERA
-1F4F8 ;	emoji ;	L2 ;	none ;	x	# V7.0 (📸) CAMERA WITH FLASH
-1F4F9 ;	emoji ;	L1 ;	none ;	j w	# V6.0 (📹) VIDEO CAMERA
-1F4FA ;	emoji ;	L1 ;	none ;	j w	# V6.0 (📺) TELEVISION
-1F4FB ;	emoji ;	L1 ;	none ;	j w	# V6.0 (📻) RADIO
-1F4FC ;	emoji ;	L1 ;	none ;	j	# V6.0 (📼) VIDEOCASSETTE
-1F4FD ;	text ;	L2 ;	none ;	w	# V7.0 (📽) FILM PROJECTOR
-1F4FF ;	emoji ;	L2 ;	none ;	x	# V8.0 (📿) PRAYER BEADS
-1F500 ;	emoji ;	L1 ;	none ;	x	# V6.0 (🔀) TWISTED RIGHTWARDS ARROWS
-1F501 ;	emoji ;	L1 ;	none ;	x	# V6.0 (🔁) CLOCKWISE RIGHTWARDS AND LEFTWARDS OPEN CIRCLE ARROWS
-1F502 ;	emoji ;	L1 ;	none ;	x	# V6.0 (🔂) CLOCKWISE RIGHTWARDS AND LEFTWARDS OPEN CIRCLE ARROWS WITH CIRCLED ONE OVERLAY
-1F503 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🔃) CLOCKWISE DOWNWARDS AND UPWARDS OPEN CIRCLE ARROWS
-1F504 ;	emoji ;	L1 ;	none ;	x	# V6.0 (🔄) ANTICLOCKWISE DOWNWARDS AND UPWARDS OPEN CIRCLE ARROWS
-1F505 ;	emoji ;	L1 ;	none ;	x	# V6.0 (🔅) LOW BRIGHTNESS SYMBOL
-1F506 ;	emoji ;	L1 ;	none ;	x	# V6.0 (🔆) HIGH BRIGHTNESS SYMBOL
-1F507 ;	emoji ;	L1 ;	none ;	x	# V6.0 (🔇) SPEAKER WITH CANCELLATION STROKE
-1F508 ;	emoji ;	L1 ;	none ;	w	# V6.0 (🔈) SPEAKER
-1F509 ;	emoji ;	L1 ;	none ;	x	# V6.0 (🔉) SPEAKER WITH ONE SOUND WAVE
-1F50A ;	emoji ;	L1 ;	none ;	j	# V6.0 (🔊) SPEAKER WITH THREE SOUND WAVES
-1F50B ;	emoji ;	L1 ;	none ;	j	# V6.0 (🔋) BATTERY
-1F50C ;	emoji ;	L1 ;	none ;	j	# V6.0 (🔌) ELECTRIC PLUG
-1F50D ;	emoji ;	L1 ;	none ;	j w	# V6.0 (🔍) LEFT-POINTING MAGNIFYING GLASS
-1F50E ;	emoji ;	L1 ;	none ;	j	# V6.0 (🔎) RIGHT-POINTING MAGNIFYING GLASS
-1F50F ;	emoji ;	L1 ;	none ;	j	# V6.0 (🔏) LOCK WITH INK PEN
-1F510 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🔐) CLOSED LOCK WITH KEY
-1F511 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🔑) KEY
-1F512 ;	emoji ;	L1 ;	none ;	j w	# V6.0 (🔒) LOCK
-1F513 ;	emoji ;	L1 ;	none ;	j w	# V6.0 (🔓) OPEN LOCK
-1F514 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🔔) BELL
-1F515 ;	emoji ;	L1 ;	none ;	x	# V6.0 (🔕) BELL WITH CANCELLATION STROKE
-1F516 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🔖) BOOKMARK
-1F517 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🔗) LINK SYMBOL
-1F518 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🔘) RADIO BUTTON
-1F519 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🔙) BACK WITH LEFTWARDS ARROW ABOVE
-1F51A ;	emoji ;	L1 ;	none ;	j	# V6.0 (🔚) END WITH LEFTWARDS ARROW ABOVE
-1F51B ;	emoji ;	L1 ;	none ;	j	# V6.0 (🔛) ON WITH EXCLAMATION MARK WITH LEFT RIGHT ARROW ABOVE
-1F51C ;	emoji ;	L1 ;	none ;	j	# V6.0 (🔜) SOON WITH RIGHTWARDS ARROW ABOVE
-1F51D ;	emoji ;	L1 ;	none ;	j	# V6.0 (🔝) TOP WITH UPWARDS ARROW ABOVE
-1F51E ;	emoji ;	L1 ;	none ;	j	# V6.0 (🔞) NO ONE UNDER EIGHTEEN SYMBOL
-1F51F ;	emoji ;	L1 ;	none ;	j	# V6.0 (🔟) KEYCAP TEN
-1F520 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🔠) INPUT SYMBOL FOR LATIN CAPITAL LETTERS
-1F521 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🔡) INPUT SYMBOL FOR LATIN SMALL LETTERS
-1F522 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🔢) INPUT SYMBOL FOR NUMBERS
-1F523 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🔣) INPUT SYMBOL FOR SYMBOLS
-1F524 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🔤) INPUT SYMBOL FOR LATIN LETTERS
-1F525 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🔥) FIRE
-1F526 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🔦) ELECTRIC TORCH
-1F527 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🔧) WRENCH
-1F528 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🔨) HAMMER
-1F529 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🔩) NUT AND BOLT
-1F52A ;	emoji ;	L1 ;	none ;	j	# V6.0 (🔪) HOCHO
-1F52B ;	emoji ;	L1 ;	none ;	j	# V6.0 (🔫) PISTOL
-1F52C ;	emoji ;	L1 ;	none ;	x	# V6.0 (🔬) MICROSCOPE
-1F52D ;	emoji ;	L1 ;	none ;	x	# V6.0 (🔭) TELESCOPE
-1F52E ;	emoji ;	L1 ;	none ;	j	# V6.0 (🔮) CRYSTAL BALL
-1F52F ;	emoji ;	L1 ;	none ;	j	# V6.0 (🔯) SIX POINTED STAR WITH MIDDLE DOT
-1F530 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🔰) JAPANESE SYMBOL FOR BEGINNER
-1F531 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🔱) TRIDENT EMBLEM
-1F532 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🔲) BLACK SQUARE BUTTON
-1F533 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🔳) WHITE SQUARE BUTTON
-1F534 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🔴) LARGE RED CIRCLE
-1F535 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🔵) LARGE BLUE CIRCLE
-1F536 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🔶) LARGE ORANGE DIAMOND
-1F537 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🔷) LARGE BLUE DIAMOND
-1F538 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🔸) SMALL ORANGE DIAMOND
-1F539 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🔹) SMALL BLUE DIAMOND
-1F53A ;	emoji ;	L1 ;	none ;	j	# V6.0 (🔺) UP-POINTING RED TRIANGLE
-1F53B ;	emoji ;	L1 ;	none ;	j	# V6.0 (🔻) DOWN-POINTING RED TRIANGLE
-1F53C ;	emoji ;	L1 ;	none ;	j	# V6.0 (🔼) UP-POINTING SMALL RED TRIANGLE
-1F53D ;	emoji ;	L1 ;	none ;	j	# V6.0 (🔽) DOWN-POINTING SMALL RED TRIANGLE
-1F549 ;	text ;	L2 ;	none ;	w	# V7.0 (🕉) OM SYMBOL
-1F54A ;	text ;	L2 ;	none ;	w	# V7.0 (🕊) DOVE OF PEACE
-1F54B ;	emoji ;	L2 ;	none ;	x	# V8.0 (🕋) KAABA
-1F54C ;	emoji ;	L2 ;	none ;	x	# V8.0 (🕌) MOSQUE
-1F54D ;	emoji ;	L2 ;	none ;	x	# V8.0 (🕍) SYNAGOGUE
-1F54E ;	emoji ;	L2 ;	none ;	x	# V8.0 (🕎) MENORAH WITH NINE BRANCHES
-1F550 ;	emoji ;	L1 ;	none ;	j w	# V6.0 (🕐) CLOCK FACE ONE OCLOCK
-1F551 ;	emoji ;	L1 ;	none ;	j w	# V6.0 (🕑) CLOCK FACE TWO OCLOCK
-1F552 ;	emoji ;	L1 ;	none ;	j w	# V6.0 (🕒) CLOCK FACE THREE OCLOCK
-1F553 ;	emoji ;	L1 ;	none ;	j w	# V6.0 (🕓) CLOCK FACE FOUR OCLOCK
-1F554 ;	emoji ;	L1 ;	none ;	j w	# V6.0 (🕔) CLOCK FACE FIVE OCLOCK
-1F555 ;	emoji ;	L1 ;	none ;	j w	# V6.0 (🕕) CLOCK FACE SIX OCLOCK
-1F556 ;	emoji ;	L1 ;	none ;	j w	# V6.0 (🕖) CLOCK FACE SEVEN OCLOCK
-1F557 ;	emoji ;	L1 ;	none ;	j w	# V6.0 (🕗) CLOCK FACE EIGHT OCLOCK
-1F558 ;	emoji ;	L1 ;	none ;	j w	# V6.0 (🕘) CLOCK FACE NINE OCLOCK
-1F559 ;	emoji ;	L1 ;	none ;	j w	# V6.0 (🕙) CLOCK FACE TEN OCLOCK
-1F55A ;	emoji ;	L1 ;	none ;	j w	# V6.0 (🕚) CLOCK FACE ELEVEN OCLOCK
-1F55B ;	emoji ;	L1 ;	none ;	j w	# V6.0 (🕛) CLOCK FACE TWELVE OCLOCK
-1F55C ;	emoji ;	L1 ;	none ;	w	# V6.0 (🕜) CLOCK FACE ONE-THIRTY
-1F55D ;	emoji ;	L1 ;	none ;	w	# V6.0 (🕝) CLOCK FACE TWO-THIRTY
-1F55E ;	emoji ;	L1 ;	none ;	w	# V6.0 (🕞) CLOCK FACE THREE-THIRTY
-1F55F ;	emoji ;	L1 ;	none ;	w	# V6.0 (🕟) CLOCK FACE FOUR-THIRTY
-1F560 ;	emoji ;	L1 ;	none ;	w	# V6.0 (🕠) CLOCK FACE FIVE-THIRTY
-1F561 ;	emoji ;	L1 ;	none ;	w	# V6.0 (🕡) CLOCK FACE SIX-THIRTY
-1F562 ;	emoji ;	L1 ;	none ;	w	# V6.0 (🕢) CLOCK FACE SEVEN-THIRTY
-1F563 ;	emoji ;	L1 ;	none ;	w	# V6.0 (🕣) CLOCK FACE EIGHT-THIRTY
-1F564 ;	emoji ;	L1 ;	none ;	w	# V6.0 (🕤) CLOCK FACE NINE-THIRTY
-1F565 ;	emoji ;	L1 ;	none ;	w	# V6.0 (🕥) CLOCK FACE TEN-THIRTY
-1F566 ;	emoji ;	L1 ;	none ;	w	# V6.0 (🕦) CLOCK FACE ELEVEN-THIRTY
-1F567 ;	emoji ;	L1 ;	none ;	w	# V6.0 (🕧) CLOCK FACE TWELVE-THIRTY
-1F56F ;	text ;	L2 ;	none ;	w	# V7.0 (🕯) CANDLE
-1F570 ;	text ;	L2 ;	none ;	w	# V7.0 (🕰) MANTELPIECE CLOCK
-1F573 ;	text ;	L2 ;	none ;	w	# V7.0 (🕳) HOLE
-1F574 ;	text ;	L2 ;	none ;	w	# V7.0 (🕴) MAN IN BUSINESS SUIT LEVITATING
-1F575 ;	text ;	L2 ;	none ;	w	# V7.0 (🕵) SLEUTH OR SPY
-1F576 ;	text ;	L2 ;	none ;	w	# V7.0 (🕶) DARK SUNGLASSES
-1F577 ;	text ;	L2 ;	none ;	w	# V7.0 (🕷) SPIDER
-1F578 ;	text ;	L2 ;	none ;	w	# V7.0 (🕸) SPIDER WEB
-1F579 ;	text ;	L2 ;	none ;	w	# V7.0 (🕹) JOYSTICK
-1F587 ;	text ;	L2 ;	none ;	w	# V7.0 (🖇) LINKED PAPERCLIPS
-1F58A ;	text ;	L2 ;	none ;	w	# V7.0 (🖊) LOWER LEFT BALLPOINT PEN
-1F58B ;	text ;	L2 ;	none ;	w	# V7.0 (🖋) LOWER LEFT FOUNTAIN PEN
-1F58C ;	text ;	L2 ;	none ;	w	# V7.0 (🖌) LOWER LEFT PAINTBRUSH
-1F58D ;	text ;	L2 ;	none ;	w	# V7.0 (🖍) LOWER LEFT CRAYON
-1F590 ;	text ;	L2 ;	secondary ;	w	# V7.0 (🖐) RAISED HAND WITH FINGERS SPLAYED
-1F595 ;	emoji ;	L2 ;	secondary ;	x	# V7.0 (🖕) REVERSED HAND WITH MIDDLE FINGER EXTENDED
-1F596 ;	emoji ;	L2 ;	secondary ;	x	# V7.0 (🖖) RAISED HAND WITH PART BETWEEN MIDDLE AND RING FINGERS
-1F5A5 ;	text ;	L2 ;	none ;	w	# V7.0 (🖥) DESKTOP COMPUTER
-1F5A8 ;	text ;	L2 ;	none ;	w	# V7.0 (🖨) PRINTER
-1F5B1 ;	text ;	L2 ;	none ;	w	# V7.0 (🖱) THREE BUTTON MOUSE
-1F5B2 ;	text ;	L2 ;	none ;	w	# V7.0 (🖲) TRACKBALL
-1F5BC ;	text ;	L2 ;	none ;	w	# V7.0 (🖼) FRAME WITH PICTURE
-1F5C2 ;	text ;	L2 ;	none ;	w	# V7.0 (🗂) CARD INDEX DIVIDERS
-1F5C3 ;	text ;	L2 ;	none ;	w	# V7.0 (🗃) CARD FILE BOX
-1F5C4 ;	text ;	L2 ;	none ;	w	# V7.0 (🗄) FILE CABINET
-1F5D1 ;	text ;	L2 ;	none ;	w	# V7.0 (🗑) WASTEBASKET
-1F5D2 ;	text ;	L2 ;	none ;	w	# V7.0 (🗒) SPIRAL NOTE PAD
-1F5D3 ;	text ;	L2 ;	none ;	w	# V7.0 (🗓) SPIRAL CALENDAR PAD
-1F5DC ;	text ;	L2 ;	none ;	w	# V7.0 (🗜) COMPRESSION
-1F5DD ;	text ;	L2 ;	none ;	w	# V7.0 (🗝) OLD KEY
-1F5DE ;	text ;	L2 ;	none ;	w	# V7.0 (🗞) ROLLED-UP NEWSPAPER
-1F5E1 ;	text ;	L2 ;	none ;	w	# V7.0 (🗡) DAGGER KNIFE
-1F5E3 ;	text ;	L2 ;	none ;	w	# V7.0 (🗣) SPEAKING HEAD IN SILHOUETTE
-1F5EF ;	text ;	L2 ;	none ;	w	# V7.0 (🗯) RIGHT ANGER BUBBLE
-1F5F3 ;	text ;	L2 ;	none ;	w	# V7.0 (🗳) BALLOT BOX WITH BALLOT
-1F5FA ;	text ;	L2 ;	none ;	w	# V7.0 (🗺) WORLD MAP
-1F5FB ;	emoji ;	L1 ;	none ;	j	# V6.0 (🗻) MOUNT FUJI
-1F5FC ;	emoji ;	L1 ;	none ;	j	# V6.0 (🗼) TOKYO TOWER
-1F5FD ;	emoji ;	L1 ;	none ;	j	# V6.0 (🗽) STATUE OF LIBERTY
-1F5FE ;	emoji ;	L1 ;	none ;	j	# V6.0 (🗾) SILHOUETTE OF JAPAN
-1F5FF ;	emoji ;	L1 ;	none ;	j	# V6.0 (🗿) MOYAI
-1F600 ;	emoji ;	L1 ;	secondary ;	x	# V6.1 (😀) GRINNING FACE
-1F601 ;	emoji ;	L1 ;	secondary ;	j	# V6.0 (😁) GRINNING FACE WITH SMILING EYES
-1F602 ;	emoji ;	L1 ;	secondary ;	j	# V6.0 (😂) FACE WITH TEARS OF JOY
-1F603 ;	emoji ;	L1 ;	secondary ;	j	# V6.0 (😃) SMILING FACE WITH OPEN MOUTH
-1F604 ;	emoji ;	L1 ;	secondary ;	j	# V6.0 (😄) SMILING FACE WITH OPEN MOUTH AND SMILING EYES
-1F605 ;	emoji ;	L1 ;	secondary ;	j	# V6.0 (😅) SMILING FACE WITH OPEN MOUTH AND COLD SWEAT
-1F606 ;	emoji ;	L1 ;	secondary ;	j	# V6.0 (😆) SMILING FACE WITH OPEN MOUTH AND TIGHTLY-CLOSED EYES
-1F607 ;	emoji ;	L1 ;	secondary ;	x	# V6.0 (😇) SMILING FACE WITH HALO
-1F608 ;	emoji ;	L1 ;	secondary ;	x	# V6.0 (😈) SMILING FACE WITH HORNS
-1F609 ;	emoji ;	L1 ;	secondary ;	j	# V6.0 (😉) WINKING FACE
-1F60A ;	emoji ;	L1 ;	secondary ;	j	# V6.0 (😊) SMILING FACE WITH SMILING EYES
-1F60B ;	emoji ;	L1 ;	secondary ;	j	# V6.0 (😋) FACE SAVOURING DELICIOUS FOOD
-1F60C ;	emoji ;	L1 ;	secondary ;	j	# V6.0 (😌) RELIEVED FACE
-1F60D ;	emoji ;	L1 ;	secondary ;	j	# V6.0 (😍) SMILING FACE WITH HEART-SHAPED EYES
-1F60E ;	emoji ;	L1 ;	secondary ;	x	# V6.0 (😎) SMILING FACE WITH SUNGLASSES
-1F60F ;	emoji ;	L1 ;	secondary ;	j	# V6.0 (😏) SMIRKING FACE
-1F610 ;	emoji ;	L1 ;	secondary ;	w	# V6.0 (😐) NEUTRAL FACE
-1F611 ;	emoji ;	L1 ;	secondary ;	x	# V6.1 (😑) EXPRESSIONLESS FACE
-1F612 ;	emoji ;	L1 ;	secondary ;	j	# V6.0 (😒) UNAMUSED FACE
-1F613 ;	emoji ;	L1 ;	secondary ;	j	# V6.0 (😓) FACE WITH COLD SWEAT
-1F614 ;	emoji ;	L1 ;	secondary ;	j	# V6.0 (😔) PENSIVE FACE
-1F615 ;	emoji ;	L1 ;	secondary ;	x	# V6.1 (😕) CONFUSED FACE
-1F616 ;	emoji ;	L1 ;	secondary ;	j	# V6.0 (😖) CONFOUNDED FACE
-1F617 ;	emoji ;	L1 ;	secondary ;	x	# V6.1 (😗) KISSING FACE
-1F618 ;	emoji ;	L1 ;	secondary ;	j	# V6.0 (😘) FACE THROWING A KISS
-1F619 ;	emoji ;	L1 ;	secondary ;	x	# V6.1 (😙) KISSING FACE WITH SMILING EYES
-1F61A ;	emoji ;	L1 ;	secondary ;	j	# V6.0 (😚) KISSING FACE WITH CLOSED EYES
-1F61B ;	emoji ;	L1 ;	secondary ;	x	# V6.1 (😛) FACE WITH STUCK-OUT TONGUE
-1F61C ;	emoji ;	L1 ;	secondary ;	j	# V6.0 (😜) FACE WITH STUCK-OUT TONGUE AND WINKING EYE
-1F61D ;	emoji ;	L1 ;	secondary ;	j	# V6.0 (😝) FACE WITH STUCK-OUT TONGUE AND TIGHTLY-CLOSED EYES
-1F61E ;	emoji ;	L1 ;	secondary ;	j	# V6.0 (😞) DISAPPOINTED FACE
-1F61F ;	emoji ;	L1 ;	secondary ;	x	# V6.1 (😟) WORRIED FACE
-1F620 ;	emoji ;	L1 ;	secondary ;	j	# V6.0 (😠) ANGRY FACE
-1F621 ;	emoji ;	L1 ;	secondary ;	j	# V6.0 (😡) POUTING FACE
-1F622 ;	emoji ;	L1 ;	secondary ;	j	# V6.0 (😢) CRYING FACE
-1F623 ;	emoji ;	L1 ;	secondary ;	j	# V6.0 (😣) PERSEVERING FACE
-1F624 ;	emoji ;	L1 ;	secondary ;	j	# V6.0 (😤) FACE WITH LOOK OF TRIUMPH
-1F625 ;	emoji ;	L1 ;	secondary ;	j	# V6.0 (😥) DISAPPOINTED BUT RELIEVED FACE
-1F626 ;	emoji ;	L1 ;	secondary ;	x	# V6.1 (😦) FROWNING FACE WITH OPEN MOUTH
-1F627 ;	emoji ;	L1 ;	secondary ;	x	# V6.1 (😧) ANGUISHED FACE
-1F628 ;	emoji ;	L1 ;	secondary ;	j	# V6.0 (😨) FEARFUL FACE
-1F629 ;	emoji ;	L1 ;	secondary ;	j	# V6.0 (😩) WEARY FACE
-1F62A ;	emoji ;	L1 ;	secondary ;	j	# V6.0 (😪) SLEEPY FACE
-1F62B ;	emoji ;	L1 ;	secondary ;	j	# V6.0 (😫) TIRED FACE
-1F62C ;	emoji ;	L1 ;	secondary ;	x	# V6.1 (😬) GRIMACING FACE
-1F62D ;	emoji ;	L1 ;	secondary ;	j	# V6.0 (😭) LOUDLY CRYING FACE
-1F62E ;	emoji ;	L1 ;	secondary ;	x	# V6.1 (😮) FACE WITH OPEN MOUTH
-1F62F ;	emoji ;	L1 ;	secondary ;	x	# V6.1 (😯) HUSHED FACE
-1F630 ;	emoji ;	L1 ;	secondary ;	j	# V6.0 (😰) FACE WITH OPEN MOUTH AND COLD SWEAT
-1F631 ;	emoji ;	L1 ;	secondary ;	j	# V6.0 (😱) FACE SCREAMING IN FEAR
-1F632 ;	emoji ;	L1 ;	secondary ;	j	# V6.0 (😲) ASTONISHED FACE
-1F633 ;	emoji ;	L1 ;	secondary ;	j	# V6.0 (😳) FLUSHED FACE
-1F634 ;	emoji ;	L1 ;	secondary ;	x	# V6.1 (😴) SLEEPING FACE
-1F635 ;	emoji ;	L1 ;	secondary ;	j	# V6.0 (😵) DIZZY FACE
-1F636 ;	emoji ;	L1 ;	secondary ;	x	# V6.0 (😶) FACE WITHOUT MOUTH
-1F637 ;	emoji ;	L1 ;	secondary ;	j	# V6.0 (😷) FACE WITH MEDICAL MASK
-1F638 ;	emoji ;	L1 ;	none ;	j	# V6.0 (😸) GRINNING CAT FACE WITH SMILING EYES
-1F639 ;	emoji ;	L1 ;	none ;	j	# V6.0 (😹) CAT FACE WITH TEARS OF JOY
-1F63A ;	emoji ;	L1 ;	none ;	j	# V6.0 (😺) SMILING CAT FACE WITH OPEN MOUTH
-1F63B ;	emoji ;	L1 ;	none ;	j	# V6.0 (😻) SMILING CAT FACE WITH HEART-SHAPED EYES
-1F63C ;	emoji ;	L1 ;	none ;	j	# V6.0 (😼) CAT FACE WITH WRY SMILE
-1F63D ;	emoji ;	L1 ;	none ;	j	# V6.0 (😽) KISSING CAT FACE WITH CLOSED EYES
-1F63E ;	emoji ;	L1 ;	none ;	j	# V6.0 (😾) POUTING CAT FACE
-1F63F ;	emoji ;	L1 ;	none ;	j	# V6.0 (😿) CRYING CAT FACE
-1F640 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🙀) WEARY CAT FACE
-1F641 ;	emoji ;	L2 ;	secondary ;	x	# V7.0 (🙁) SLIGHTLY FROWNING FACE
-1F642 ;	emoji ;	L2 ;	secondary ;	x	# V7.0 (🙂) SLIGHTLY SMILING FACE
-1F643 ;	emoji ;	L2 ;	secondary ;	x	# V8.0 (🙃) UPSIDE-DOWN FACE
-1F644 ;	emoji ;	L2 ;	secondary ;	x	# V8.0 (🙄) FACE WITH ROLLING EYES
-1F645 ;	emoji ;	L1 ;	primary ;	j	# V6.0 (🙅) FACE WITH NO GOOD GESTURE
-1F646 ;	emoji ;	L1 ;	primary ;	j	# V6.0 (🙆) FACE WITH OK GESTURE
-1F647 ;	emoji ;	L1 ;	primary ;	j	# V6.0 (🙇) PERSON BOWING DEEPLY
-1F648 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🙈) SEE-NO-EVIL MONKEY
-1F649 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🙉) HEAR-NO-EVIL MONKEY
-1F64A ;	emoji ;	L1 ;	none ;	j	# V6.0 (🙊) SPEAK-NO-EVIL MONKEY
-1F64B ;	emoji ;	L1 ;	primary ;	j	# V6.0 (🙋) HAPPY PERSON RAISING ONE HAND
-1F64C ;	emoji ;	L1 ;	secondary ;	j	# V6.0 (🙌) PERSON RAISING BOTH HANDS IN CELEBRATION
-1F64D ;	emoji ;	L1 ;	primary ;	j	# V6.0 (🙍) PERSON FROWNING
-1F64E ;	emoji ;	L1 ;	primary ;	j	# V6.0 (🙎) PERSON WITH POUTING FACE
-1F64F ;	emoji ;	L1 ;	secondary ;	j	# V6.0 (🙏) PERSON WITH FOLDED HANDS
-1F680 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🚀) ROCKET
-1F681 ;	emoji ;	L1 ;	none ;	x	# V6.0 (🚁) HELICOPTER
-1F682 ;	emoji ;	L1 ;	none ;	x	# V6.0 (🚂) STEAM LOCOMOTIVE
-1F683 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🚃) RAILWAY CAR
-1F684 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🚄) HIGH-SPEED TRAIN
-1F685 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🚅) HIGH-SPEED TRAIN WITH BULLET NOSE
-1F686 ;	emoji ;	L1 ;	none ;	x	# V6.0 (🚆) TRAIN
-1F687 ;	emoji ;	L1 ;	none ;	j w	# V6.0 (🚇) METRO
-1F688 ;	emoji ;	L1 ;	none ;	x	# V6.0 (🚈) LIGHT RAIL
-1F689 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🚉) STATION
-1F68A ;	emoji ;	L1 ;	none ;	x	# V6.0 (🚊) TRAM
-1F68B ;	emoji ;	L1 ;	none ;	x	# V6.0 (🚋) TRAM CAR
-1F68C ;	emoji ;	L1 ;	none ;	j	# V6.0 (🚌) BUS
-1F68D ;	emoji ;	L1 ;	none ;	w	# V6.0 (🚍) ONCOMING BUS
-1F68E ;	emoji ;	L1 ;	none ;	x	# V6.0 (🚎) TROLLEYBUS
-1F68F ;	emoji ;	L1 ;	none ;	j	# V6.0 (🚏) BUS STOP
-1F690 ;	emoji ;	L1 ;	none ;	x	# V6.0 (🚐) MINIBUS
-1F691 ;	emoji ;	L1 ;	none ;	j w	# V6.0 (🚑) AMBULANCE
-1F692 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🚒) FIRE ENGINE
-1F693 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🚓) POLICE CAR
-1F694 ;	emoji ;	L1 ;	none ;	w	# V6.0 (🚔) ONCOMING POLICE CAR
-1F695 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🚕) TAXI
-1F696 ;	emoji ;	L1 ;	none ;	x	# V6.0 (🚖) ONCOMING TAXI
-1F697 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🚗) AUTOMOBILE
-1F698 ;	emoji ;	L1 ;	none ;	w	# V6.0 (🚘) ONCOMING AUTOMOBILE
-1F699 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🚙) RECREATIONAL VEHICLE
-1F69A ;	emoji ;	L1 ;	none ;	j	# V6.0 (🚚) DELIVERY TRUCK
-1F69B ;	emoji ;	L1 ;	none ;	x	# V6.0 (🚛) ARTICULATED LORRY
-1F69C ;	emoji ;	L1 ;	none ;	x	# V6.0 (🚜) TRACTOR
-1F69D ;	emoji ;	L1 ;	none ;	x	# V6.0 (🚝) MONORAIL
-1F69E ;	emoji ;	L1 ;	none ;	x	# V6.0 (🚞) MOUNTAIN RAILWAY
-1F69F ;	emoji ;	L1 ;	none ;	x	# V6.0 (🚟) SUSPENSION RAILWAY
-1F6A0 ;	emoji ;	L1 ;	none ;	x	# V6.0 (🚠) MOUNTAIN CABLEWAY
-1F6A1 ;	emoji ;	L1 ;	none ;	x	# V6.0 (🚡) AERIAL TRAMWAY
-1F6A2 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🚢) SHIP
-1F6A3 ;	emoji ;	L1 ;	secondary ;	x	# V6.0 (🚣) ROWBOAT
-1F6A4 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🚤) SPEEDBOAT
-1F6A5 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🚥) HORIZONTAL TRAFFIC LIGHT
-1F6A6 ;	emoji ;	L1 ;	none ;	x	# V6.0 (🚦) VERTICAL TRAFFIC LIGHT
-1F6A7 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🚧) CONSTRUCTION SIGN
-1F6A8 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🚨) POLICE CARS REVOLVING LIGHT
-1F6A9 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🚩) TRIANGULAR FLAG ON POST
-1F6AA ;	emoji ;	L1 ;	none ;	j	# V6.0 (🚪) DOOR
-1F6AB ;	emoji ;	L1 ;	none ;	j	# V6.0 (🚫) NO ENTRY SIGN
-1F6AC ;	emoji ;	L1 ;	none ;	j	# V6.0 (🚬) SMOKING SYMBOL
-1F6AD ;	emoji ;	L1 ;	none ;	j w	# V6.0 (🚭) NO SMOKING SYMBOL
-1F6AE ;	emoji ;	L1 ;	none ;	x	# V6.0 (🚮) PUT LITTER IN ITS PLACE SYMBOL
-1F6AF ;	emoji ;	L1 ;	none ;	x	# V6.0 (🚯) DO NOT LITTER SYMBOL
-1F6B0 ;	emoji ;	L1 ;	none ;	x	# V6.0 (🚰) POTABLE WATER SYMBOL
-1F6B1 ;	emoji ;	L1 ;	none ;	x	# V6.0 (🚱) NON-POTABLE WATER SYMBOL
-1F6B2 ;	emoji ;	L1 ;	none ;	j w	# V6.0 (🚲) BICYCLE
-1F6B3 ;	emoji ;	L1 ;	none ;	x	# V6.0 (🚳) NO BICYCLES
-1F6B4 ;	emoji ;	L1 ;	secondary ;	x	# V6.0 (🚴) BICYCLIST
-1F6B5 ;	emoji ;	L1 ;	secondary ;	x	# V6.0 (🚵) MOUNTAIN BICYCLIST
-1F6B6 ;	emoji ;	L1 ;	secondary ;	j	# V6.0 (🚶) PEDESTRIAN
-1F6B7 ;	emoji ;	L1 ;	none ;	x	# V6.0 (🚷) NO PEDESTRIANS
-1F6B8 ;	emoji ;	L1 ;	none ;	x	# V6.0 (🚸) CHILDREN CROSSING
-1F6B9 ;	emoji ;	L1 ;	none ;	j w	# V6.0 (🚹) MENS SYMBOL
-1F6BA ;	emoji ;	L1 ;	none ;	j w	# V6.0 (🚺) WOMENS SYMBOL
-1F6BB ;	emoji ;	L1 ;	none ;	j	# V6.0 (🚻) RESTROOM
-1F6BC ;	emoji ;	L1 ;	none ;	j w	# V6.0 (🚼) BABY SYMBOL
-1F6BD ;	emoji ;	L1 ;	none ;	j	# V6.0 (🚽) TOILET
-1F6BE ;	emoji ;	L1 ;	none ;	j	# V6.0 (🚾) WATER CLOSET
-1F6BF ;	emoji ;	L1 ;	none ;	x	# V6.0 (🚿) SHOWER
-1F6C0 ;	emoji ;	L1 ;	secondary ;	j	# V6.0 (🛀) BATH
-1F6C1 ;	emoji ;	L1 ;	none ;	x	# V6.0 (🛁) BATHTUB
-1F6C2 ;	emoji ;	L1 ;	none ;	x	# V6.0 (🛂) PASSPORT CONTROL
-1F6C3 ;	emoji ;	L1 ;	none ;	x	# V6.0 (🛃) CUSTOMS
-1F6C4 ;	emoji ;	L1 ;	none ;	x	# V6.0 (🛄) BAGGAGE CLAIM
-1F6C5 ;	emoji ;	L1 ;	none ;	x	# V6.0 (🛅) LEFT LUGGAGE
-1F6CB ;	text ;	L2 ;	none ;	w	# V7.0 (🛋) COUCH AND LAMP
-1F6CC ;	emoji ;	L2 ;	none ;	x	# V7.0 (🛌) SLEEPING ACCOMMODATION
-1F6CD ;	text ;	L2 ;	none ;	w	# V7.0 (🛍) SHOPPING BAGS
-1F6CE ;	text ;	L2 ;	none ;	w	# V7.0 (🛎) BELLHOP BELL
-1F6CF ;	text ;	L2 ;	none ;	w	# V7.0 (🛏) BED
-1F6D0 ;	emoji ;	L2 ;	none ;	x	# V8.0 (🛐) PLACE OF WORSHIP
-1F6E0 ;	text ;	L2 ;	none ;	w	# V7.0 (🛠) HAMMER AND WRENCH
-1F6E1 ;	text ;	L2 ;	none ;	w	# V7.0 (🛡) SHIELD
-1F6E2 ;	text ;	L2 ;	none ;	w	# V7.0 (🛢) OIL DRUM
-1F6E3 ;	text ;	L2 ;	none ;	w	# V7.0 (🛣) MOTORWAY
-1F6E4 ;	text ;	L2 ;	none ;	w	# V7.0 (🛤) RAILWAY TRACK
-1F6E5 ;	text ;	L2 ;	none ;	w	# V7.0 (🛥) MOTOR BOAT
-1F6E9 ;	text ;	L2 ;	none ;	w	# V7.0 (🛩) SMALL AIRPLANE
-1F6EB ;	emoji ;	L2 ;	none ;	x	# V7.0 (🛫) AIRPLANE DEPARTURE
-1F6EC ;	emoji ;	L2 ;	none ;	x	# V7.0 (🛬) AIRPLANE ARRIVING
-1F6F0 ;	text ;	L2 ;	none ;	w	# V7.0 (🛰) SATELLITE
-1F6F3 ;	text ;	L2 ;	none ;	w	# V7.0 (🛳) PASSENGER SHIP
-1F910 ;	emoji ;	L2 ;	secondary ;	x	# V8.0 (🤐) ZIPPER-MOUTH FACE
-1F911 ;	emoji ;	L2 ;	secondary ;	x	# V8.0 (🤑) MONEY-MOUTH FACE
-1F912 ;	emoji ;	L2 ;	secondary ;	x	# V8.0 (🤒) FACE WITH THERMOMETER
-1F913 ;	emoji ;	L2 ;	secondary ;	x	# V8.0 (🤓) NERD FACE
-1F914 ;	emoji ;	L2 ;	secondary ;	x	# V8.0 (🤔) THINKING FACE
-1F915 ;	emoji ;	L2 ;	secondary ;	x	# V8.0 (🤕) FACE WITH HEAD-BANDAGE
-1F916 ;	emoji ;	L2 ;	none ;	x	# V8.0 (🤖) ROBOT FACE
-1F917 ;	emoji ;	L2 ;	secondary ;	x	# V8.0 (🤗) HUGGING FACE
-1F918 ;	emoji ;	L2 ;	secondary ;	x	# V8.0 (🤘) SIGN OF THE HORNS
-1F980 ;	emoji ;	L2 ;	none ;	x	# V8.0 (🦀) CRAB
-1F981 ;	emoji ;	L2 ;	none ;	x	# V8.0 (🦁) LION FACE
-1F982 ;	emoji ;	L2 ;	none ;	x	# V8.0 (🦂) SCORPION
-1F983 ;	emoji ;	L2 ;	none ;	x	# V8.0 (🦃) TURKEY
-1F984 ;	emoji ;	L2 ;	none ;	x	# V8.0 (🦄) UNICORN FACE
-1F9C0 ;	emoji ;	L2 ;	none ;	x	# V8.0 (🧀) CHEESE WEDGE
-0023 20E3 ;	text ;	L1 ;	none ;	j	# V3.0 (#⃣) keycap NUMBER SIGN
-002A 20E3 ;	text ;	L2 ;	none ;	x	# V3.0 (*⃣) keycap ASTERISK
-0030 20E3 ;	text ;	L1 ;	none ;	j	# V3.0 (0⃣) keycap DIGIT ZERO
-0031 20E3 ;	text ;	L1 ;	none ;	j	# V3.0 (1⃣) keycap DIGIT ONE
-0032 20E3 ;	text ;	L1 ;	none ;	j	# V3.0 (2⃣) keycap DIGIT TWO
-0033 20E3 ;	text ;	L1 ;	none ;	j	# V3.0 (3⃣) keycap DIGIT THREE
-0034 20E3 ;	text ;	L1 ;	none ;	j	# V3.0 (4⃣) keycap DIGIT FOUR
-0035 20E3 ;	text ;	L1 ;	none ;	j	# V3.0 (5⃣) keycap DIGIT FIVE
-0036 20E3 ;	text ;	L1 ;	none ;	j	# V3.0 (6⃣) keycap DIGIT SIX
-0037 20E3 ;	text ;	L1 ;	none ;	j	# V3.0 (7⃣) keycap DIGIT SEVEN
-0038 20E3 ;	text ;	L1 ;	none ;	j	# V3.0 (8⃣) keycap DIGIT EIGHT
-0039 20E3 ;	text ;	L1 ;	none ;	j	# V3.0 (9⃣) keycap DIGIT NINE
-1F1E6 1F1E8 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇦🇨) flag for Ascension Island
-1F1E6 1F1E9 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇦🇩) flag for Andorra
-1F1E6 1F1EA ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇦🇪) flag for United Arab Emirates
-1F1E6 1F1EB ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇦🇫) flag for Afghanistan
-1F1E6 1F1EC ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇦🇬) flag for Antigua & Barbuda
-1F1E6 1F1EE ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇦🇮) flag for Anguilla
-1F1E6 1F1F1 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇦🇱) flag for Albania
-1F1E6 1F1F2 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇦🇲) flag for Armenia
-1F1E6 1F1F4 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇦🇴) flag for Angola
-1F1E6 1F1F6 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇦🇶) flag for Antarctica
-1F1E6 1F1F7 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇦🇷) flag for Argentina
-1F1E6 1F1F8 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇦🇸) flag for American Samoa
-1F1E6 1F1F9 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇦🇹) flag for Austria
-1F1E6 1F1FA ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇦🇺) flag for Australia
-1F1E6 1F1FC ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇦🇼) flag for Aruba
-1F1E6 1F1FD ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇦🇽) flag for Åland Islands
-1F1E6 1F1FF ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇦🇿) flag for Azerbaijan
-1F1E7 1F1E6 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇧🇦) flag for Bosnia & Herzegovina
-1F1E7 1F1E7 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇧🇧) flag for Barbados
-1F1E7 1F1E9 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇧🇩) flag for Bangladesh
-1F1E7 1F1EA ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇧🇪) flag for Belgium
-1F1E7 1F1EB ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇧🇫) flag for Burkina Faso
-1F1E7 1F1EC ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇧🇬) flag for Bulgaria
-1F1E7 1F1ED ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇧🇭) flag for Bahrain
-1F1E7 1F1EE ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇧🇮) flag for Burundi
-1F1E7 1F1EF ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇧🇯) flag for Benin
-1F1E7 1F1F1 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇧🇱) flag for St. Barthélemy
-1F1E7 1F1F2 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇧🇲) flag for Bermuda
-1F1E7 1F1F3 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇧🇳) flag for Brunei
-1F1E7 1F1F4 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇧🇴) flag for Bolivia
-1F1E7 1F1F6 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇧🇶) flag for Caribbean Netherlands
-1F1E7 1F1F7 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇧🇷) flag for Brazil
-1F1E7 1F1F8 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇧🇸) flag for Bahamas
-1F1E7 1F1F9 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇧🇹) flag for Bhutan
-1F1E7 1F1FB ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇧🇻) flag for Bouvet Island
-1F1E7 1F1FC ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇧🇼) flag for Botswana
-1F1E7 1F1FE ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇧🇾) flag for Belarus
-1F1E7 1F1FF ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇧🇿) flag for Belize
-1F1E8 1F1E6 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇨🇦) flag for Canada
-1F1E8 1F1E8 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇨🇨) flag for Cocos  Islands
-1F1E8 1F1E9 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇨🇩) flag for Congo - Kinshasa
-1F1E8 1F1EB ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇨🇫) flag for Central African Republic
-1F1E8 1F1EC ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇨🇬) flag for Congo - Brazzaville
-1F1E8 1F1ED ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇨🇭) flag for Switzerland
-1F1E8 1F1EE ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇨🇮) flag for Côte d’Ivoire
-1F1E8 1F1F0 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇨🇰) flag for Cook Islands
-1F1E8 1F1F1 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇨🇱) flag for Chile
-1F1E8 1F1F2 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇨🇲) flag for Cameroon
-1F1E8 1F1F3 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🇨🇳) flag for China
-1F1E8 1F1F4 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇨🇴) flag for Colombia
-1F1E8 1F1F5 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇨🇵) flag for Clipperton Island
-1F1E8 1F1F7 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇨🇷) flag for Costa Rica
-1F1E8 1F1FA ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇨🇺) flag for Cuba
-1F1E8 1F1FB ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇨🇻) flag for Cape Verde
-1F1E8 1F1FC ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇨🇼) flag for Curaçao
-1F1E8 1F1FD ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇨🇽) flag for Christmas Island
-1F1E8 1F1FE ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇨🇾) flag for Cyprus
-1F1E8 1F1FF ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇨🇿) flag for Czech Republic
-1F1E9 1F1EA ;	emoji ;	L1 ;	none ;	j	# V6.0 (🇩🇪) flag for Germany
-1F1E9 1F1EC ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇩🇬) flag for Diego Garcia
-1F1E9 1F1EF ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇩🇯) flag for Djibouti
-1F1E9 1F1F0 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇩🇰) flag for Denmark
-1F1E9 1F1F2 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇩🇲) flag for Dominica
-1F1E9 1F1F4 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇩🇴) flag for Dominican Republic
-1F1E9 1F1FF ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇩🇿) flag for Algeria
-1F1EA 1F1E6 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇪🇦) flag for Ceuta & Melilla
-1F1EA 1F1E8 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇪🇨) flag for Ecuador
-1F1EA 1F1EA ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇪🇪) flag for Estonia
-1F1EA 1F1EC ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇪🇬) flag for Egypt
-1F1EA 1F1ED ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇪🇭) flag for Western Sahara
-1F1EA 1F1F7 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇪🇷) flag for Eritrea
-1F1EA 1F1F8 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🇪🇸) flag for Spain
-1F1EA 1F1F9 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇪🇹) flag for Ethiopia
-1F1EA 1F1FA ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇪🇺) flag for European Union
-1F1EB 1F1EE ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇫🇮) flag for Finland
-1F1EB 1F1EF ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇫🇯) flag for Fiji
-1F1EB 1F1F0 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇫🇰) flag for Falkland Islands
-1F1EB 1F1F2 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇫🇲) flag for Micronesia
-1F1EB 1F1F4 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇫🇴) flag for Faroe Islands
-1F1EB 1F1F7 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🇫🇷) flag for France
-1F1EC 1F1E6 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇬🇦) flag for Gabon
-1F1EC 1F1E7 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🇬🇧) flag for United Kingdom
-1F1EC 1F1E9 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇬🇩) flag for Grenada
-1F1EC 1F1EA ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇬🇪) flag for Georgia
-1F1EC 1F1EB ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇬🇫) flag for French Guiana
-1F1EC 1F1EC ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇬🇬) flag for Guernsey
-1F1EC 1F1ED ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇬🇭) flag for Ghana
-1F1EC 1F1EE ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇬🇮) flag for Gibraltar
-1F1EC 1F1F1 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇬🇱) flag for Greenland
-1F1EC 1F1F2 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇬🇲) flag for Gambia
-1F1EC 1F1F3 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇬🇳) flag for Guinea
-1F1EC 1F1F5 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇬🇵) flag for Guadeloupe
-1F1EC 1F1F6 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇬🇶) flag for Equatorial Guinea
-1F1EC 1F1F7 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇬🇷) flag for Greece
-1F1EC 1F1F8 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇬🇸) flag for South Georgia & South Sandwich Islands
-1F1EC 1F1F9 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇬🇹) flag for Guatemala
-1F1EC 1F1FA ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇬🇺) flag for Guam
-1F1EC 1F1FC ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇬🇼) flag for Guinea-Bissau
-1F1EC 1F1FE ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇬🇾) flag for Guyana
-1F1ED 1F1F0 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇭🇰) flag for Hong Kong
-1F1ED 1F1F2 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇭🇲) flag for Heard & McDonald Islands
-1F1ED 1F1F3 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇭🇳) flag for Honduras
-1F1ED 1F1F7 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇭🇷) flag for Croatia
-1F1ED 1F1F9 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇭🇹) flag for Haiti
-1F1ED 1F1FA ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇭🇺) flag for Hungary
-1F1EE 1F1E8 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇮🇨) flag for Canary Islands
-1F1EE 1F1E9 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇮🇩) flag for Indonesia
-1F1EE 1F1EA ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇮🇪) flag for Ireland
-1F1EE 1F1F1 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇮🇱) flag for Israel
-1F1EE 1F1F2 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇮🇲) flag for Isle of Man
-1F1EE 1F1F3 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇮🇳) flag for India
-1F1EE 1F1F4 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇮🇴) flag for British Indian Ocean Territory
-1F1EE 1F1F6 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇮🇶) flag for Iraq
-1F1EE 1F1F7 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇮🇷) flag for Iran
-1F1EE 1F1F8 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇮🇸) flag for Iceland
-1F1EE 1F1F9 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🇮🇹) flag for Italy
-1F1EF 1F1EA ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇯🇪) flag for Jersey
-1F1EF 1F1F2 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇯🇲) flag for Jamaica
-1F1EF 1F1F4 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇯🇴) flag for Jordan
-1F1EF 1F1F5 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🇯🇵) flag for Japan
-1F1F0 1F1EA ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇰🇪) flag for Kenya
-1F1F0 1F1EC ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇰🇬) flag for Kyrgyzstan
-1F1F0 1F1ED ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇰🇭) flag for Cambodia
-1F1F0 1F1EE ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇰🇮) flag for Kiribati
-1F1F0 1F1F2 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇰🇲) flag for Comoros
-1F1F0 1F1F3 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇰🇳) flag for St. Kitts & Nevis
-1F1F0 1F1F5 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇰🇵) flag for North Korea
-1F1F0 1F1F7 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🇰🇷) flag for South Korea
-1F1F0 1F1FC ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇰🇼) flag for Kuwait
-1F1F0 1F1FE ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇰🇾) flag for Cayman Islands
-1F1F0 1F1FF ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇰🇿) flag for Kazakhstan
-1F1F1 1F1E6 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇱🇦) flag for Laos
-1F1F1 1F1E7 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇱🇧) flag for Lebanon
-1F1F1 1F1E8 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇱🇨) flag for St. Lucia
-1F1F1 1F1EE ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇱🇮) flag for Liechtenstein
-1F1F1 1F1F0 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇱🇰) flag for Sri Lanka
-1F1F1 1F1F7 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇱🇷) flag for Liberia
-1F1F1 1F1F8 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇱🇸) flag for Lesotho
-1F1F1 1F1F9 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇱🇹) flag for Lithuania
-1F1F1 1F1FA ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇱🇺) flag for Luxembourg
-1F1F1 1F1FB ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇱🇻) flag for Latvia
-1F1F1 1F1FE ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇱🇾) flag for Libya
-1F1F2 1F1E6 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇲🇦) flag for Morocco
-1F1F2 1F1E8 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇲🇨) flag for Monaco
-1F1F2 1F1E9 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇲🇩) flag for Moldova
-1F1F2 1F1EA ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇲🇪) flag for Montenegro
-1F1F2 1F1EB ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇲🇫) flag for St. Martin
-1F1F2 1F1EC ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇲🇬) flag for Madagascar
-1F1F2 1F1ED ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇲🇭) flag for Marshall Islands
-1F1F2 1F1F0 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇲🇰) flag for Macedonia
-1F1F2 1F1F1 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇲🇱) flag for Mali
-1F1F2 1F1F2 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇲🇲) flag for Myanmar
-1F1F2 1F1F3 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇲🇳) flag for Mongolia
-1F1F2 1F1F4 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇲🇴) flag for Macau
-1F1F2 1F1F5 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇲🇵) flag for Northern Mariana Islands
-1F1F2 1F1F6 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇲🇶) flag for Martinique
-1F1F2 1F1F7 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇲🇷) flag for Mauritania
-1F1F2 1F1F8 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇲🇸) flag for Montserrat
-1F1F2 1F1F9 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇲🇹) flag for Malta
-1F1F2 1F1FA ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇲🇺) flag for Mauritius
-1F1F2 1F1FB ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇲🇻) flag for Maldives
-1F1F2 1F1FC ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇲🇼) flag for Malawi
-1F1F2 1F1FD ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇲🇽) flag for Mexico
-1F1F2 1F1FE ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇲🇾) flag for Malaysia
-1F1F2 1F1FF ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇲🇿) flag for Mozambique
-1F1F3 1F1E6 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇳🇦) flag for Namibia
-1F1F3 1F1E8 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇳🇨) flag for New Caledonia
-1F1F3 1F1EA ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇳🇪) flag for Niger
-1F1F3 1F1EB ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇳🇫) flag for Norfolk Island
-1F1F3 1F1EC ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇳🇬) flag for Nigeria
-1F1F3 1F1EE ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇳🇮) flag for Nicaragua
-1F1F3 1F1F1 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇳🇱) flag for Netherlands
-1F1F3 1F1F4 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇳🇴) flag for Norway
-1F1F3 1F1F5 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇳🇵) flag for Nepal
-1F1F3 1F1F7 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇳🇷) flag for Nauru
-1F1F3 1F1FA ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇳🇺) flag for Niue
-1F1F3 1F1FF ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇳🇿) flag for New Zealand
-1F1F4 1F1F2 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇴🇲) flag for Oman
-1F1F5 1F1E6 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇵🇦) flag for Panama
-1F1F5 1F1EA ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇵🇪) flag for Peru
-1F1F5 1F1EB ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇵🇫) flag for French Polynesia
-1F1F5 1F1EC ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇵🇬) flag for Papua New Guinea
-1F1F5 1F1ED ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇵🇭) flag for Philippines
-1F1F5 1F1F0 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇵🇰) flag for Pakistan
-1F1F5 1F1F1 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇵🇱) flag for Poland
-1F1F5 1F1F2 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇵🇲) flag for St. Pierre & Miquelon
-1F1F5 1F1F3 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇵🇳) flag for Pitcairn Islands
-1F1F5 1F1F7 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇵🇷) flag for Puerto Rico
-1F1F5 1F1F8 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇵🇸) flag for Palestinian Territories
-1F1F5 1F1F9 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇵🇹) flag for Portugal
-1F1F5 1F1FC ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇵🇼) flag for Palau
-1F1F5 1F1FE ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇵🇾) flag for Paraguay
-1F1F6 1F1E6 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇶🇦) flag for Qatar
-1F1F7 1F1EA ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇷🇪) flag for Réunion
-1F1F7 1F1F4 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇷🇴) flag for Romania
-1F1F7 1F1F8 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇷🇸) flag for Serbia
-1F1F7 1F1FA ;	emoji ;	L1 ;	none ;	j	# V6.0 (🇷🇺) flag for Russia
-1F1F7 1F1FC ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇷🇼) flag for Rwanda
-1F1F8 1F1E6 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇸🇦) flag for Saudi Arabia
-1F1F8 1F1E7 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇸🇧) flag for Solomon Islands
-1F1F8 1F1E8 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇸🇨) flag for Seychelles
-1F1F8 1F1E9 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇸🇩) flag for Sudan
-1F1F8 1F1EA ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇸🇪) flag for Sweden
-1F1F8 1F1EC ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇸🇬) flag for Singapore
-1F1F8 1F1ED ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇸🇭) flag for St. Helena
-1F1F8 1F1EE ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇸🇮) flag for Slovenia
-1F1F8 1F1EF ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇸🇯) flag for Svalbard & Jan Mayen
-1F1F8 1F1F0 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇸🇰) flag for Slovakia
-1F1F8 1F1F1 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇸🇱) flag for Sierra Leone
-1F1F8 1F1F2 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇸🇲) flag for San Marino
-1F1F8 1F1F3 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇸🇳) flag for Senegal
-1F1F8 1F1F4 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇸🇴) flag for Somalia
-1F1F8 1F1F7 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇸🇷) flag for Suriname
-1F1F8 1F1F8 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇸🇸) flag for South Sudan
-1F1F8 1F1F9 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇸🇹) flag for São Tomé & Príncipe
-1F1F8 1F1FB ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇸🇻) flag for El Salvador
-1F1F8 1F1FD ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇸🇽) flag for Sint Maarten
-1F1F8 1F1FE ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇸🇾) flag for Syria
-1F1F8 1F1FF ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇸🇿) flag for Swaziland
-1F1F9 1F1E6 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇹🇦) flag for Tristan da Cunha
-1F1F9 1F1E8 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇹🇨) flag for Turks & Caicos Islands
-1F1F9 1F1E9 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇹🇩) flag for Chad
-1F1F9 1F1EB ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇹🇫) flag for French Southern Territories
-1F1F9 1F1EC ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇹🇬) flag for Togo
-1F1F9 1F1ED ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇹🇭) flag for Thailand
-1F1F9 1F1EF ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇹🇯) flag for Tajikistan
-1F1F9 1F1F0 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇹🇰) flag for Tokelau
-1F1F9 1F1F1 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇹🇱) flag for Timor-Leste
-1F1F9 1F1F2 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇹🇲) flag for Turkmenistan
-1F1F9 1F1F3 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇹🇳) flag for Tunisia
-1F1F9 1F1F4 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇹🇴) flag for Tonga
-1F1F9 1F1F7 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇹🇷) flag for Turkey
-1F1F9 1F1F9 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇹🇹) flag for Trinidad & Tobago
-1F1F9 1F1FB ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇹🇻) flag for Tuvalu
-1F1F9 1F1FC ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇹🇼) flag for Taiwan
-1F1F9 1F1FF ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇹🇿) flag for Tanzania
-1F1FA 1F1E6 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇺🇦) flag for Ukraine
-1F1FA 1F1EC ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇺🇬) flag for Uganda
-1F1FA 1F1F2 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇺🇲) flag for U.S. Outlying Islands
-1F1FA 1F1F8 ;	emoji ;	L1 ;	none ;	j	# V6.0 (🇺🇸) flag for United States
-1F1FA 1F1FE ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇺🇾) flag for Uruguay
-1F1FA 1F1FF ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇺🇿) flag for Uzbekistan
-1F1FB 1F1E6 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇻🇦) flag for Vatican City
-1F1FB 1F1E8 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇻🇨) flag for St. Vincent & Grenadines
-1F1FB 1F1EA ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇻🇪) flag for Venezuela
-1F1FB 1F1EC ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇻🇬) flag for British Virgin Islands
-1F1FB 1F1EE ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇻🇮) flag for U.S. Virgin Islands
-1F1FB 1F1F3 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇻🇳) flag for Vietnam
-1F1FB 1F1FA ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇻🇺) flag for Vanuatu
-1F1FC 1F1EB ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇼🇫) flag for Wallis & Futuna
-1F1FC 1F1F8 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇼🇸) flag for Samoa
-1F1FD 1F1F0 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇽🇰) flag for Kosovo
-1F1FE 1F1EA ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇾🇪) flag for Yemen
-1F1FE 1F1F9 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇾🇹) flag for Mayotte
-1F1FF 1F1E6 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇿🇦) flag for South Africa
-1F1FF 1F1F2 ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇿🇲) flag for Zambia
-1F1FF 1F1FC ;	emoji ;	L2 ;	none ;	x	# V6.0 (🇿🇼) flag for Zimbabwe
+# This file provides data for testing which emoji forms should be in keyboards and which should also be displayed/processed.
+# Format: code points; status # emoji name
+#     Code points — list of one or more hex code points, separated by spaces
+#     Status
+#       component           — an Emoji_Component,
+#                             excluding Regional_Indicators, ASCII, and non-Emoji.
+#       fully-qualified     — a fully-qualified emoji (see ED-18 in UTS #51),
+#                             excluding Emoji_Component
+#       minimally-qualified — a minimally-qualified emoji (see ED-18a in UTS #51)
+#       unqualified         — a unqualified emoji (See ED-19 in UTS #51)
+# Notes:
+#   • This includes the emoji components that need emoji presentation (skin tone and hair)
+#     when isolated, but omits the components that need not have an emoji
+#     presentation when isolated.
+#   • The RGI set is covered by the listed fully-qualified emoji. 
+#   • The listed minimally-qualified and unqualified cover all cases where an
+#     element of the RGI set is missing one or more emoji presentation selectors.
+#   • The file is in CLDR order, not codepoint order. This is recommended (but not required!) for keyboard palettes.
+#   • The groups and subgroups are illustrative. See the Emoji Order chart for more information.
+
+
+# group: Smileys & Emotion
+
+# subgroup: face-smiling
+1F600                                      ; fully-qualified     # 😀 grinning face
+1F603                                      ; fully-qualified     # 😃 grinning face with big eyes
+1F604                                      ; fully-qualified     # 😄 grinning face with smiling eyes
+1F601                                      ; fully-qualified     # 😁 beaming face with smiling eyes
+1F606                                      ; fully-qualified     # 😆 grinning squinting face
+1F605                                      ; fully-qualified     # 😅 grinning face with sweat
+1F923                                      ; fully-qualified     # 🤣 rolling on the floor laughing
+1F602                                      ; fully-qualified     # 😂 face with tears of joy
+1F642                                      ; fully-qualified     # 🙂 slightly smiling face
+1F643                                      ; fully-qualified     # 🙃 upside-down face
+1F609                                      ; fully-qualified     # 😉 winking face
+1F60A                                      ; fully-qualified     # 😊 smiling face with smiling eyes
+1F607                                      ; fully-qualified     # 😇 smiling face with halo
+
+# subgroup: face-affection
+1F970                                      ; fully-qualified     # 🥰 smiling face with hearts
+1F60D                                      ; fully-qualified     # 😍 smiling face with heart-eyes
+1F929                                      ; fully-qualified     # 🤩 star-struck
+1F618                                      ; fully-qualified     # 😘 face blowing a kiss
+1F617                                      ; fully-qualified     # 😗 kissing face
+263A FE0F                                  ; fully-qualified     # ☺️ smiling face
+263A                                       ; unqualified         # ☺ smiling face
+1F61A                                      ; fully-qualified     # 😚 kissing face with closed eyes
+1F619                                      ; fully-qualified     # 😙 kissing face with smiling eyes
+
+# subgroup: face-tongue
+1F60B                                      ; fully-qualified     # 😋 face savoring food
+1F61B                                      ; fully-qualified     # 😛 face with tongue
+1F61C                                      ; fully-qualified     # 😜 winking face with tongue
+1F92A                                      ; fully-qualified     # 🤪 zany face
+1F61D                                      ; fully-qualified     # 😝 squinting face with tongue
+1F911                                      ; fully-qualified     # 🤑 money-mouth face
+
+# subgroup: face-hand
+1F917                                      ; fully-qualified     # 🤗 hugging face
+1F92D                                      ; fully-qualified     # 🤭 face with hand over mouth
+1F92B                                      ; fully-qualified     # 🤫 shushing face
+1F914                                      ; fully-qualified     # 🤔 thinking face
+
+# subgroup: face-neutral-skeptical
+1F910                                      ; fully-qualified     # 🤐 zipper-mouth face
+1F928                                      ; fully-qualified     # 🤨 face with raised eyebrow
+1F610                                      ; fully-qualified     # 😐 neutral face
+1F611                                      ; fully-qualified     # 😑 expressionless face
+1F636                                      ; fully-qualified     # 😶 face without mouth
+1F60F                                      ; fully-qualified     # 😏 smirking face
+1F612                                      ; fully-qualified     # 😒 unamused face
+1F644                                      ; fully-qualified     # 🙄 face with rolling eyes
+1F62C                                      ; fully-qualified     # 😬 grimacing face
+1F925                                      ; fully-qualified     # 🤥 lying face
+
+# subgroup: face-sleepy
+1F60C                                      ; fully-qualified     # 😌 relieved face
+1F614                                      ; fully-qualified     # 😔 pensive face
+1F62A                                      ; fully-qualified     # 😪 sleepy face
+1F924                                      ; fully-qualified     # 🤤 drooling face
+1F634                                      ; fully-qualified     # 😴 sleeping face
+
+# subgroup: face-unwell
+1F637                                      ; fully-qualified     # 😷 face with medical mask
+1F912                                      ; fully-qualified     # 🤒 face with thermometer
+1F915                                      ; fully-qualified     # 🤕 face with head-bandage
+1F922                                      ; fully-qualified     # 🤢 nauseated face
+1F92E                                      ; fully-qualified     # 🤮 face vomiting
+1F927                                      ; fully-qualified     # 🤧 sneezing face
+1F975                                      ; fully-qualified     # 🥵 hot face
+1F976                                      ; fully-qualified     # 🥶 cold face
+1F974                                      ; fully-qualified     # 🥴 woozy face
+1F635                                      ; fully-qualified     # 😵 dizzy face
+1F92F                                      ; fully-qualified     # 🤯 exploding head
+
+# subgroup: face-hat
+1F920                                      ; fully-qualified     # 🤠 cowboy hat face
+1F973                                      ; fully-qualified     # 🥳 partying face
+
+# subgroup: face-glasses
+1F60E                                      ; fully-qualified     # 😎 smiling face with sunglasses
+1F913                                      ; fully-qualified     # 🤓 nerd face
+1F9D0                                      ; fully-qualified     # 🧐 face with monocle
+
+# subgroup: face-concerned
+1F615                                      ; fully-qualified     # 😕 confused face
+1F61F                                      ; fully-qualified     # 😟 worried face
+1F641                                      ; fully-qualified     # 🙁 slightly frowning face
+2639 FE0F                                  ; fully-qualified     # ☹️ frowning face
+2639                                       ; unqualified         # ☹ frowning face
+1F62E                                      ; fully-qualified     # 😮 face with open mouth
+1F62F                                      ; fully-qualified     # 😯 hushed face
+1F632                                      ; fully-qualified     # 😲 astonished face
+1F633                                      ; fully-qualified     # 😳 flushed face
+1F97A                                      ; fully-qualified     # 🥺 pleading face
+1F626                                      ; fully-qualified     # 😦 frowning face with open mouth
+1F627                                      ; fully-qualified     # 😧 anguished face
+1F628                                      ; fully-qualified     # 😨 fearful face
+1F630                                      ; fully-qualified     # 😰 anxious face with sweat
+1F625                                      ; fully-qualified     # 😥 sad but relieved face
+1F622                                      ; fully-qualified     # 😢 crying face
+1F62D                                      ; fully-qualified     # 😭 loudly crying face
+1F631                                      ; fully-qualified     # 😱 face screaming in fear
+1F616                                      ; fully-qualified     # 😖 confounded face
+1F623                                      ; fully-qualified     # 😣 persevering face
+1F61E                                      ; fully-qualified     # 😞 disappointed face
+1F613                                      ; fully-qualified     # 😓 downcast face with sweat
+1F629                                      ; fully-qualified     # 😩 weary face
+1F62B                                      ; fully-qualified     # 😫 tired face
+1F971                                      ; fully-qualified     # 🥱 yawning face
+
+# subgroup: face-negative
+1F624                                      ; fully-qualified     # 😤 face with steam from nose
+1F621                                      ; fully-qualified     # 😡 pouting face
+1F620                                      ; fully-qualified     # 😠 angry face
+1F92C                                      ; fully-qualified     # 🤬 face with symbols on mouth
+1F608                                      ; fully-qualified     # 😈 smiling face with horns
+1F47F                                      ; fully-qualified     # 👿 angry face with horns
+1F480                                      ; fully-qualified     # 💀 skull
+2620 FE0F                                  ; fully-qualified     # ☠️ skull and crossbones
+2620                                       ; unqualified         # ☠ skull and crossbones
+
+# subgroup: face-costume
+1F4A9                                      ; fully-qualified     # 💩 pile of poo
+1F921                                      ; fully-qualified     # 🤡 clown face
+1F479                                      ; fully-qualified     # 👹 ogre
+1F47A                                      ; fully-qualified     # 👺 goblin
+1F47B                                      ; fully-qualified     # 👻 ghost
+1F47D                                      ; fully-qualified     # 👽 alien
+1F47E                                      ; fully-qualified     # 👾 alien monster
+1F916                                      ; fully-qualified     # 🤖 robot
+
+# subgroup: cat-face
+1F63A                                      ; fully-qualified     # 😺 grinning cat
+1F638                                      ; fully-qualified     # 😸 grinning cat with smiling eyes
+1F639                                      ; fully-qualified     # 😹 cat with tears of joy
+1F63B                                      ; fully-qualified     # 😻 smiling cat with heart-eyes
+1F63C                                      ; fully-qualified     # 😼 cat with wry smile
+1F63D                                      ; fully-qualified     # 😽 kissing cat
+1F640                                      ; fully-qualified     # 🙀 weary cat
+1F63F                                      ; fully-qualified     # 😿 crying cat
+1F63E                                      ; fully-qualified     # 😾 pouting cat
+
+# subgroup: monkey-face
+1F648                                      ; fully-qualified     # 🙈 see-no-evil monkey
+1F649                                      ; fully-qualified     # 🙉 hear-no-evil monkey
+1F64A                                      ; fully-qualified     # 🙊 speak-no-evil monkey
+
+# subgroup: emotion
+1F48B                                      ; fully-qualified     # 💋 kiss mark
+1F48C                                      ; fully-qualified     # 💌 love letter
+1F498                                      ; fully-qualified     # 💘 heart with arrow
+1F49D                                      ; fully-qualified     # 💝 heart with ribbon
+1F496                                      ; fully-qualified     # 💖 sparkling heart
+1F497                                      ; fully-qualified     # 💗 growing heart
+1F493                                      ; fully-qualified     # 💓 beating heart
+1F49E                                      ; fully-qualified     # 💞 revolving hearts
+1F495                                      ; fully-qualified     # 💕 two hearts
+1F49F                                      ; fully-qualified     # 💟 heart decoration
+2763 FE0F                                  ; fully-qualified     # ❣️ heart exclamation
+2763                                       ; unqualified         # ❣ heart exclamation
+1F494                                      ; fully-qualified     # 💔 broken heart
+2764 FE0F                                  ; fully-qualified     # ❤️ red heart
+2764                                       ; unqualified         # ❤ red heart
+1F9E1                                      ; fully-qualified     # 🧡 orange heart
+1F49B                                      ; fully-qualified     # 💛 yellow heart
+1F49A                                      ; fully-qualified     # 💚 green heart
+1F499                                      ; fully-qualified     # 💙 blue heart
+1F49C                                      ; fully-qualified     # 💜 purple heart
+1F90E                                      ; fully-qualified     # 🤎 brown heart
+1F5A4                                      ; fully-qualified     # 🖤 black heart
+1F90D                                      ; fully-qualified     # 🤍 white heart
+1F4AF                                      ; fully-qualified     # 💯 hundred points
+1F4A2                                      ; fully-qualified     # 💢 anger symbol
+1F4A5                                      ; fully-qualified     # 💥 collision
+1F4AB                                      ; fully-qualified     # 💫 dizzy
+1F4A6                                      ; fully-qualified     # 💦 sweat droplets
+1F4A8                                      ; fully-qualified     # 💨 dashing away
+1F573 FE0F                                 ; fully-qualified     # 🕳️ hole
+1F573                                      ; unqualified         # 🕳 hole
+1F4A3                                      ; fully-qualified     # 💣 bomb
+1F4AC                                      ; fully-qualified     # 💬 speech balloon
+1F441 FE0F 200D 1F5E8 FE0F                 ; fully-qualified     # 👁️‍🗨️ eye in speech bubble
+1F441 200D 1F5E8 FE0F                      ; unqualified         # 👁‍🗨️ eye in speech bubble
+1F441 FE0F 200D 1F5E8                      ; unqualified         # 👁️‍🗨 eye in speech bubble
+1F441 200D 1F5E8                           ; unqualified         # 👁‍🗨 eye in speech bubble
+1F5E8 FE0F                                 ; fully-qualified     # 🗨️ left speech bubble
+1F5E8                                      ; unqualified         # 🗨 left speech bubble
+1F5EF FE0F                                 ; fully-qualified     # 🗯️ right anger bubble
+1F5EF                                      ; unqualified         # 🗯 right anger bubble
+1F4AD                                      ; fully-qualified     # 💭 thought balloon
+1F4A4                                      ; fully-qualified     # 💤 zzz
+
+# Smileys & Emotion subtotal:		160
+# Smileys & Emotion subtotal:		160	w/o modifiers
+
+# group: People & Body
+
+# subgroup: hand-fingers-open
+1F44B                                      ; fully-qualified     # 👋 waving hand
+1F44B 1F3FB                                ; fully-qualified     # 👋🏻 waving hand: light skin tone
+1F44B 1F3FC                                ; fully-qualified     # 👋🏼 waving hand: medium-light skin tone
+1F44B 1F3FD                                ; fully-qualified     # 👋🏽 waving hand: medium skin tone
+1F44B 1F3FE                                ; fully-qualified     # 👋🏾 waving hand: medium-dark skin tone
+1F44B 1F3FF                                ; fully-qualified     # 👋🏿 waving hand: dark skin tone
+1F91A                                      ; fully-qualified     # 🤚 raised back of hand
+1F91A 1F3FB                                ; fully-qualified     # 🤚🏻 raised back of hand: light skin tone
+1F91A 1F3FC                                ; fully-qualified     # 🤚🏼 raised back of hand: medium-light skin tone
+1F91A 1F3FD                                ; fully-qualified     # 🤚🏽 raised back of hand: medium skin tone
+1F91A 1F3FE                                ; fully-qualified     # 🤚🏾 raised back of hand: medium-dark skin tone
+1F91A 1F3FF                                ; fully-qualified     # 🤚🏿 raised back of hand: dark skin tone
+1F590 FE0F                                 ; fully-qualified     # 🖐️ hand with fingers splayed
+1F590                                      ; unqualified         # 🖐 hand with fingers splayed
+1F590 1F3FB                                ; fully-qualified     # 🖐🏻 hand with fingers splayed: light skin tone
+1F590 1F3FC                                ; fully-qualified     # 🖐🏼 hand with fingers splayed: medium-light skin tone
+1F590 1F3FD                                ; fully-qualified     # 🖐🏽 hand with fingers splayed: medium skin tone
+1F590 1F3FE                                ; fully-qualified     # 🖐🏾 hand with fingers splayed: medium-dark skin tone
+1F590 1F3FF                                ; fully-qualified     # 🖐🏿 hand with fingers splayed: dark skin tone
+270B                                       ; fully-qualified     # ✋ raised hand
+270B 1F3FB                                 ; fully-qualified     # ✋🏻 raised hand: light skin tone
+270B 1F3FC                                 ; fully-qualified     # ✋🏼 raised hand: medium-light skin tone
+270B 1F3FD                                 ; fully-qualified     # ✋🏽 raised hand: medium skin tone
+270B 1F3FE                                 ; fully-qualified     # ✋🏾 raised hand: medium-dark skin tone
+270B 1F3FF                                 ; fully-qualified     # ✋🏿 raised hand: dark skin tone
+1F596                                      ; fully-qualified     # 🖖 vulcan salute
+1F596 1F3FB                                ; fully-qualified     # 🖖🏻 vulcan salute: light skin tone
+1F596 1F3FC                                ; fully-qualified     # 🖖🏼 vulcan salute: medium-light skin tone
+1F596 1F3FD                                ; fully-qualified     # 🖖🏽 vulcan salute: medium skin tone
+1F596 1F3FE                                ; fully-qualified     # 🖖🏾 vulcan salute: medium-dark skin tone
+1F596 1F3FF                                ; fully-qualified     # 🖖🏿 vulcan salute: dark skin tone
+
+# subgroup: hand-fingers-partial
+1F44C                                      ; fully-qualified     # 👌 OK hand
+1F44C 1F3FB                                ; fully-qualified     # 👌🏻 OK hand: light skin tone
+1F44C 1F3FC                                ; fully-qualified     # 👌🏼 OK hand: medium-light skin tone
+1F44C 1F3FD                                ; fully-qualified     # 👌🏽 OK hand: medium skin tone
+1F44C 1F3FE                                ; fully-qualified     # 👌🏾 OK hand: medium-dark skin tone
+1F44C 1F3FF                                ; fully-qualified     # 👌🏿 OK hand: dark skin tone
+1F90F                                      ; fully-qualified     # 🤏 pinching hand
+1F90F 1F3FB                                ; fully-qualified     # 🤏🏻 pinching hand: light skin tone
+1F90F 1F3FC                                ; fully-qualified     # 🤏🏼 pinching hand: medium-light skin tone
+1F90F 1F3FD                                ; fully-qualified     # 🤏🏽 pinching hand: medium skin tone
+1F90F 1F3FE                                ; fully-qualified     # 🤏🏾 pinching hand: medium-dark skin tone
+1F90F 1F3FF                                ; fully-qualified     # 🤏🏿 pinching hand: dark skin tone
+270C FE0F                                  ; fully-qualified     # ✌️ victory hand
+270C                                       ; unqualified         # ✌ victory hand
+270C 1F3FB                                 ; fully-qualified     # ✌🏻 victory hand: light skin tone
+270C 1F3FC                                 ; fully-qualified     # ✌🏼 victory hand: medium-light skin tone
+270C 1F3FD                                 ; fully-qualified     # ✌🏽 victory hand: medium skin tone
+270C 1F3FE                                 ; fully-qualified     # ✌🏾 victory hand: medium-dark skin tone
+270C 1F3FF                                 ; fully-qualified     # ✌🏿 victory hand: dark skin tone
+1F91E                                      ; fully-qualified     # 🤞 crossed fingers
+1F91E 1F3FB                                ; fully-qualified     # 🤞🏻 crossed fingers: light skin tone
+1F91E 1F3FC                                ; fully-qualified     # 🤞🏼 crossed fingers: medium-light skin tone
+1F91E 1F3FD                                ; fully-qualified     # 🤞🏽 crossed fingers: medium skin tone
+1F91E 1F3FE                                ; fully-qualified     # 🤞🏾 crossed fingers: medium-dark skin tone
+1F91E 1F3FF                                ; fully-qualified     # 🤞🏿 crossed fingers: dark skin tone
+1F91F                                      ; fully-qualified     # 🤟 love-you gesture
+1F91F 1F3FB                                ; fully-qualified     # 🤟🏻 love-you gesture: light skin tone
+1F91F 1F3FC                                ; fully-qualified     # 🤟🏼 love-you gesture: medium-light skin tone
+1F91F 1F3FD                                ; fully-qualified     # 🤟🏽 love-you gesture: medium skin tone
+1F91F 1F3FE                                ; fully-qualified     # 🤟🏾 love-you gesture: medium-dark skin tone
+1F91F 1F3FF                                ; fully-qualified     # 🤟🏿 love-you gesture: dark skin tone
+1F918                                      ; fully-qualified     # 🤘 sign of the horns
+1F918 1F3FB                                ; fully-qualified     # 🤘🏻 sign of the horns: light skin tone
+1F918 1F3FC                                ; fully-qualified     # 🤘🏼 sign of the horns: medium-light skin tone
+1F918 1F3FD                                ; fully-qualified     # 🤘🏽 sign of the horns: medium skin tone
+1F918 1F3FE                                ; fully-qualified     # 🤘🏾 sign of the horns: medium-dark skin tone
+1F918 1F3FF                                ; fully-qualified     # 🤘🏿 sign of the horns: dark skin tone
+1F919                                      ; fully-qualified     # 🤙 call me hand
+1F919 1F3FB                                ; fully-qualified     # 🤙🏻 call me hand: light skin tone
+1F919 1F3FC                                ; fully-qualified     # 🤙🏼 call me hand: medium-light skin tone
+1F919 1F3FD                                ; fully-qualified     # 🤙🏽 call me hand: medium skin tone
+1F919 1F3FE                                ; fully-qualified     # 🤙🏾 call me hand: medium-dark skin tone
+1F919 1F3FF                                ; fully-qualified     # 🤙🏿 call me hand: dark skin tone
+
+# subgroup: hand-single-finger
+1F448                                      ; fully-qualified     # 👈 backhand index pointing left
+1F448 1F3FB                                ; fully-qualified     # 👈🏻 backhand index pointing left: light skin tone
+1F448 1F3FC                                ; fully-qualified     # 👈🏼 backhand index pointing left: medium-light skin tone
+1F448 1F3FD                                ; fully-qualified     # 👈🏽 backhand index pointing left: medium skin tone
+1F448 1F3FE                                ; fully-qualified     # 👈🏾 backhand index pointing left: medium-dark skin tone
+1F448 1F3FF                                ; fully-qualified     # 👈🏿 backhand index pointing left: dark skin tone
+1F449                                      ; fully-qualified     # 👉 backhand index pointing right
+1F449 1F3FB                                ; fully-qualified     # 👉🏻 backhand index pointing right: light skin tone
+1F449 1F3FC                                ; fully-qualified     # 👉🏼 backhand index pointing right: medium-light skin tone
+1F449 1F3FD                                ; fully-qualified     # 👉🏽 backhand index pointing right: medium skin tone
+1F449 1F3FE                                ; fully-qualified     # 👉🏾 backhand index pointing right: medium-dark skin tone
+1F449 1F3FF                                ; fully-qualified     # 👉🏿 backhand index pointing right: dark skin tone
+1F446                                      ; fully-qualified     # 👆 backhand index pointing up
+1F446 1F3FB                                ; fully-qualified     # 👆🏻 backhand index pointing up: light skin tone
+1F446 1F3FC                                ; fully-qualified     # 👆🏼 backhand index pointing up: medium-light skin tone
+1F446 1F3FD                                ; fully-qualified     # 👆🏽 backhand index pointing up: medium skin tone
+1F446 1F3FE                                ; fully-qualified     # 👆🏾 backhand index pointing up: medium-dark skin tone
+1F446 1F3FF                                ; fully-qualified     # 👆🏿 backhand index pointing up: dark skin tone
+1F595                                      ; fully-qualified     # 🖕 middle finger
+1F595 1F3FB                                ; fully-qualified     # 🖕🏻 middle finger: light skin tone
+1F595 1F3FC                                ; fully-qualified     # 🖕🏼 middle finger: medium-light skin tone
+1F595 1F3FD                                ; fully-qualified     # 🖕🏽 middle finger: medium skin tone
+1F595 1F3FE                                ; fully-qualified     # 🖕🏾 middle finger: medium-dark skin tone
+1F595 1F3FF                                ; fully-qualified     # 🖕🏿 middle finger: dark skin tone
+1F447                                      ; fully-qualified     # 👇 backhand index pointing down
+1F447 1F3FB                                ; fully-qualified     # 👇🏻 backhand index pointing down: light skin tone
+1F447 1F3FC                                ; fully-qualified     # 👇🏼 backhand index pointing down: medium-light skin tone
+1F447 1F3FD                                ; fully-qualified     # 👇🏽 backhand index pointing down: medium skin tone
+1F447 1F3FE                                ; fully-qualified     # 👇🏾 backhand index pointing down: medium-dark skin tone
+1F447 1F3FF                                ; fully-qualified     # 👇🏿 backhand index pointing down: dark skin tone
+261D FE0F                                  ; fully-qualified     # ☝️ index pointing up
+261D                                       ; unqualified         # ☝ index pointing up
+261D 1F3FB                                 ; fully-qualified     # ☝🏻 index pointing up: light skin tone
+261D 1F3FC                                 ; fully-qualified     # ☝🏼 index pointing up: medium-light skin tone
+261D 1F3FD                                 ; fully-qualified     # ☝🏽 index pointing up: medium skin tone
+261D 1F3FE                                 ; fully-qualified     # ☝🏾 index pointing up: medium-dark skin tone
+261D 1F3FF                                 ; fully-qualified     # ☝🏿 index pointing up: dark skin tone
+
+# subgroup: hand-fingers-closed
+1F44D                                      ; fully-qualified     # 👍 thumbs up
+1F44D 1F3FB                                ; fully-qualified     # 👍🏻 thumbs up: light skin tone
+1F44D 1F3FC                                ; fully-qualified     # 👍🏼 thumbs up: medium-light skin tone
+1F44D 1F3FD                                ; fully-qualified     # 👍🏽 thumbs up: medium skin tone
+1F44D 1F3FE                                ; fully-qualified     # 👍🏾 thumbs up: medium-dark skin tone
+1F44D 1F3FF                                ; fully-qualified     # 👍🏿 thumbs up: dark skin tone
+1F44E                                      ; fully-qualified     # 👎 thumbs down
+1F44E 1F3FB                                ; fully-qualified     # 👎🏻 thumbs down: light skin tone
+1F44E 1F3FC                                ; fully-qualified     # 👎🏼 thumbs down: medium-light skin tone
+1F44E 1F3FD                                ; fully-qualified     # 👎🏽 thumbs down: medium skin tone
+1F44E 1F3FE                                ; fully-qualified     # 👎🏾 thumbs down: medium-dark skin tone
+1F44E 1F3FF                                ; fully-qualified     # 👎🏿 thumbs down: dark skin tone
+270A                                       ; fully-qualified     # ✊ raised fist
+270A 1F3FB                                 ; fully-qualified     # ✊🏻 raised fist: light skin tone
+270A 1F3FC                                 ; fully-qualified     # ✊🏼 raised fist: medium-light skin tone
+270A 1F3FD                                 ; fully-qualified     # ✊🏽 raised fist: medium skin tone
+270A 1F3FE                                 ; fully-qualified     # ✊🏾 raised fist: medium-dark skin tone
+270A 1F3FF                                 ; fully-qualified     # ✊🏿 raised fist: dark skin tone
+1F44A                                      ; fully-qualified     # 👊 oncoming fist
+1F44A 1F3FB                                ; fully-qualified     # 👊🏻 oncoming fist: light skin tone
+1F44A 1F3FC                                ; fully-qualified     # 👊🏼 oncoming fist: medium-light skin tone
+1F44A 1F3FD                                ; fully-qualified     # 👊🏽 oncoming fist: medium skin tone
+1F44A 1F3FE                                ; fully-qualified     # 👊🏾 oncoming fist: medium-dark skin tone
+1F44A 1F3FF                                ; fully-qualified     # 👊🏿 oncoming fist: dark skin tone
+1F91B                                      ; fully-qualified     # 🤛 left-facing fist
+1F91B 1F3FB                                ; fully-qualified     # 🤛🏻 left-facing fist: light skin tone
+1F91B 1F3FC                                ; fully-qualified     # 🤛🏼 left-facing fist: medium-light skin tone
+1F91B 1F3FD                                ; fully-qualified     # 🤛🏽 left-facing fist: medium skin tone
+1F91B 1F3FE                                ; fully-qualified     # 🤛🏾 left-facing fist: medium-dark skin tone
+1F91B 1F3FF                                ; fully-qualified     # 🤛🏿 left-facing fist: dark skin tone
+1F91C                                      ; fully-qualified     # 🤜 right-facing fist
+1F91C 1F3FB                                ; fully-qualified     # 🤜🏻 right-facing fist: light skin tone
+1F91C 1F3FC                                ; fully-qualified     # 🤜🏼 right-facing fist: medium-light skin tone
+1F91C 1F3FD                                ; fully-qualified     # 🤜🏽 right-facing fist: medium skin tone
+1F91C 1F3FE                                ; fully-qualified     # 🤜🏾 right-facing fist: medium-dark skin tone
+1F91C 1F3FF                                ; fully-qualified     # 🤜🏿 right-facing fist: dark skin tone
+
+# subgroup: hands
+1F44F                                      ; fully-qualified     # 👏 clapping hands
+1F44F 1F3FB                                ; fully-qualified     # 👏🏻 clapping hands: light skin tone
+1F44F 1F3FC                                ; fully-qualified     # 👏🏼 clapping hands: medium-light skin tone
+1F44F 1F3FD                                ; fully-qualified     # 👏🏽 clapping hands: medium skin tone
+1F44F 1F3FE                                ; fully-qualified     # 👏🏾 clapping hands: medium-dark skin tone
+1F44F 1F3FF                                ; fully-qualified     # 👏🏿 clapping hands: dark skin tone
+1F64C                                      ; fully-qualified     # 🙌 raising hands
+1F64C 1F3FB                                ; fully-qualified     # 🙌🏻 raising hands: light skin tone
+1F64C 1F3FC                                ; fully-qualified     # 🙌🏼 raising hands: medium-light skin tone
+1F64C 1F3FD                                ; fully-qualified     # 🙌🏽 raising hands: medium skin tone
+1F64C 1F3FE                                ; fully-qualified     # 🙌🏾 raising hands: medium-dark skin tone
+1F64C 1F3FF                                ; fully-qualified     # 🙌🏿 raising hands: dark skin tone
+1F450                                      ; fully-qualified     # 👐 open hands
+1F450 1F3FB                                ; fully-qualified     # 👐🏻 open hands: light skin tone
+1F450 1F3FC                                ; fully-qualified     # 👐🏼 open hands: medium-light skin tone
+1F450 1F3FD                                ; fully-qualified     # 👐🏽 open hands: medium skin tone
+1F450 1F3FE                                ; fully-qualified     # 👐🏾 open hands: medium-dark skin tone
+1F450 1F3FF                                ; fully-qualified     # 👐🏿 open hands: dark skin tone
+1F932                                      ; fully-qualified     # 🤲 palms up together
+1F932 1F3FB                                ; fully-qualified     # 🤲🏻 palms up together: light skin tone
+1F932 1F3FC                                ; fully-qualified     # 🤲🏼 palms up together: medium-light skin tone
+1F932 1F3FD                                ; fully-qualified     # 🤲🏽 palms up together: medium skin tone
+1F932 1F3FE                                ; fully-qualified     # 🤲🏾 palms up together: medium-dark skin tone
+1F932 1F3FF                                ; fully-qualified     # 🤲🏿 palms up together: dark skin tone
+1F91D                                      ; fully-qualified     # 🤝 handshake
+1F64F                                      ; fully-qualified     # 🙏 folded hands
+1F64F 1F3FB                                ; fully-qualified     # 🙏🏻 folded hands: light skin tone
+1F64F 1F3FC                                ; fully-qualified     # 🙏🏼 folded hands: medium-light skin tone
+1F64F 1F3FD                                ; fully-qualified     # 🙏🏽 folded hands: medium skin tone
+1F64F 1F3FE                                ; fully-qualified     # 🙏🏾 folded hands: medium-dark skin tone
+1F64F 1F3FF                                ; fully-qualified     # 🙏🏿 folded hands: dark skin tone
+
+# subgroup: hand-prop
+270D FE0F                                  ; fully-qualified     # ✍️ writing hand
+270D                                       ; unqualified         # ✍ writing hand
+270D 1F3FB                                 ; fully-qualified     # ✍🏻 writing hand: light skin tone
+270D 1F3FC                                 ; fully-qualified     # ✍🏼 writing hand: medium-light skin tone
+270D 1F3FD                                 ; fully-qualified     # ✍🏽 writing hand: medium skin tone
+270D 1F3FE                                 ; fully-qualified     # ✍🏾 writing hand: medium-dark skin tone
+270D 1F3FF                                 ; fully-qualified     # ✍🏿 writing hand: dark skin tone
+1F485                                      ; fully-qualified     # 💅 nail polish
+1F485 1F3FB                                ; fully-qualified     # 💅🏻 nail polish: light skin tone
+1F485 1F3FC                                ; fully-qualified     # 💅🏼 nail polish: medium-light skin tone
+1F485 1F3FD                                ; fully-qualified     # 💅🏽 nail polish: medium skin tone
+1F485 1F3FE                                ; fully-qualified     # 💅🏾 nail polish: medium-dark skin tone
+1F485 1F3FF                                ; fully-qualified     # 💅🏿 nail polish: dark skin tone
+1F933                                      ; fully-qualified     # 🤳 selfie
+1F933 1F3FB                                ; fully-qualified     # 🤳🏻 selfie: light skin tone
+1F933 1F3FC                                ; fully-qualified     # 🤳🏼 selfie: medium-light skin tone
+1F933 1F3FD                                ; fully-qualified     # 🤳🏽 selfie: medium skin tone
+1F933 1F3FE                                ; fully-qualified     # 🤳🏾 selfie: medium-dark skin tone
+1F933 1F3FF                                ; fully-qualified     # 🤳🏿 selfie: dark skin tone
+
+# subgroup: body-parts
+1F4AA                                      ; fully-qualified     # 💪 flexed biceps
+1F4AA 1F3FB                                ; fully-qualified     # 💪🏻 flexed biceps: light skin tone
+1F4AA 1F3FC                                ; fully-qualified     # 💪🏼 flexed biceps: medium-light skin tone
+1F4AA 1F3FD                                ; fully-qualified     # 💪🏽 flexed biceps: medium skin tone
+1F4AA 1F3FE                                ; fully-qualified     # 💪🏾 flexed biceps: medium-dark skin tone
+1F4AA 1F3FF                                ; fully-qualified     # 💪🏿 flexed biceps: dark skin tone
+1F9BE                                      ; fully-qualified     # 🦾 mechanical arm
+1F9BF                                      ; fully-qualified     # 🦿 mechanical leg
+1F9B5                                      ; fully-qualified     # 🦵 leg
+1F9B5 1F3FB                                ; fully-qualified     # 🦵🏻 leg: light skin tone
+1F9B5 1F3FC                                ; fully-qualified     # 🦵🏼 leg: medium-light skin tone
+1F9B5 1F3FD                                ; fully-qualified     # 🦵🏽 leg: medium skin tone
+1F9B5 1F3FE                                ; fully-qualified     # 🦵🏾 leg: medium-dark skin tone
+1F9B5 1F3FF                                ; fully-qualified     # 🦵🏿 leg: dark skin tone
+1F9B6                                      ; fully-qualified     # 🦶 foot
+1F9B6 1F3FB                                ; fully-qualified     # 🦶🏻 foot: light skin tone
+1F9B6 1F3FC                                ; fully-qualified     # 🦶🏼 foot: medium-light skin tone
+1F9B6 1F3FD                                ; fully-qualified     # 🦶🏽 foot: medium skin tone
+1F9B6 1F3FE                                ; fully-qualified     # 🦶🏾 foot: medium-dark skin tone
+1F9B6 1F3FF                                ; fully-qualified     # 🦶🏿 foot: dark skin tone
+1F442                                      ; fully-qualified     # 👂 ear
+1F442 1F3FB                                ; fully-qualified     # 👂🏻 ear: light skin tone
+1F442 1F3FC                                ; fully-qualified     # 👂🏼 ear: medium-light skin tone
+1F442 1F3FD                                ; fully-qualified     # 👂🏽 ear: medium skin tone
+1F442 1F3FE                                ; fully-qualified     # 👂🏾 ear: medium-dark skin tone
+1F442 1F3FF                                ; fully-qualified     # 👂🏿 ear: dark skin tone
+1F9BB                                      ; fully-qualified     # 🦻 ear with hearing aid
+1F9BB 1F3FB                                ; fully-qualified     # 🦻🏻 ear with hearing aid: light skin tone
+1F9BB 1F3FC                                ; fully-qualified     # 🦻🏼 ear with hearing aid: medium-light skin tone
+1F9BB 1F3FD                                ; fully-qualified     # 🦻🏽 ear with hearing aid: medium skin tone
+1F9BB 1F3FE                                ; fully-qualified     # 🦻🏾 ear with hearing aid: medium-dark skin tone
+1F9BB 1F3FF                                ; fully-qualified     # 🦻🏿 ear with hearing aid: dark skin tone
+1F443                                      ; fully-qualified     # 👃 nose
+1F443 1F3FB                                ; fully-qualified     # 👃🏻 nose: light skin tone
+1F443 1F3FC                                ; fully-qualified     # 👃🏼 nose: medium-light skin tone
+1F443 1F3FD                                ; fully-qualified     # 👃🏽 nose: medium skin tone
+1F443 1F3FE                                ; fully-qualified     # 👃🏾 nose: medium-dark skin tone
+1F443 1F3FF                                ; fully-qualified     # 👃🏿 nose: dark skin tone
+1F9E0                                      ; fully-qualified     # 🧠 brain
+1F9B7                                      ; fully-qualified     # 🦷 tooth
+1F9B4                                      ; fully-qualified     # 🦴 bone
+1F440                                      ; fully-qualified     # 👀 eyes
+1F441 FE0F                                 ; fully-qualified     # 👁️ eye
+1F441                                      ; unqualified         # 👁 eye
+1F445                                      ; fully-qualified     # 👅 tongue
+1F444                                      ; fully-qualified     # 👄 mouth
+
+# subgroup: person
+1F476                                      ; fully-qualified     # 👶 baby
+1F476 1F3FB                                ; fully-qualified     # 👶🏻 baby: light skin tone
+1F476 1F3FC                                ; fully-qualified     # 👶🏼 baby: medium-light skin tone
+1F476 1F3FD                                ; fully-qualified     # 👶🏽 baby: medium skin tone
+1F476 1F3FE                                ; fully-qualified     # 👶🏾 baby: medium-dark skin tone
+1F476 1F3FF                                ; fully-qualified     # 👶🏿 baby: dark skin tone
+1F9D2                                      ; fully-qualified     # 🧒 child
+1F9D2 1F3FB                                ; fully-qualified     # 🧒🏻 child: light skin tone
+1F9D2 1F3FC                                ; fully-qualified     # 🧒🏼 child: medium-light skin tone
+1F9D2 1F3FD                                ; fully-qualified     # 🧒🏽 child: medium skin tone
+1F9D2 1F3FE                                ; fully-qualified     # 🧒🏾 child: medium-dark skin tone
+1F9D2 1F3FF                                ; fully-qualified     # 🧒🏿 child: dark skin tone
+1F466                                      ; fully-qualified     # 👦 boy
+1F466 1F3FB                                ; fully-qualified     # 👦🏻 boy: light skin tone
+1F466 1F3FC                                ; fully-qualified     # 👦🏼 boy: medium-light skin tone
+1F466 1F3FD                                ; fully-qualified     # 👦🏽 boy: medium skin tone
+1F466 1F3FE                                ; fully-qualified     # 👦🏾 boy: medium-dark skin tone
+1F466 1F3FF                                ; fully-qualified     # 👦🏿 boy: dark skin tone
+1F467                                      ; fully-qualified     # 👧 girl
+1F467 1F3FB                                ; fully-qualified     # 👧🏻 girl: light skin tone
+1F467 1F3FC                                ; fully-qualified     # 👧🏼 girl: medium-light skin tone
+1F467 1F3FD                                ; fully-qualified     # 👧🏽 girl: medium skin tone
+1F467 1F3FE                                ; fully-qualified     # 👧🏾 girl: medium-dark skin tone
+1F467 1F3FF                                ; fully-qualified     # 👧🏿 girl: dark skin tone
+1F9D1                                      ; fully-qualified     # 🧑 person
+1F9D1 1F3FB                                ; fully-qualified     # 🧑🏻 person: light skin tone
+1F9D1 1F3FC                                ; fully-qualified     # 🧑🏼 person: medium-light skin tone
+1F9D1 1F3FD                                ; fully-qualified     # 🧑🏽 person: medium skin tone
+1F9D1 1F3FE                                ; fully-qualified     # 🧑🏾 person: medium-dark skin tone
+1F9D1 1F3FF                                ; fully-qualified     # 🧑🏿 person: dark skin tone
+1F471                                      ; fully-qualified     # 👱 person: blond hair
+1F471 1F3FB                                ; fully-qualified     # 👱🏻 person: light skin tone, blond hair
+1F471 1F3FC                                ; fully-qualified     # 👱🏼 person: medium-light skin tone, blond hair
+1F471 1F3FD                                ; fully-qualified     # 👱🏽 person: medium skin tone, blond hair
+1F471 1F3FE                                ; fully-qualified     # 👱🏾 person: medium-dark skin tone, blond hair
+1F471 1F3FF                                ; fully-qualified     # 👱🏿 person: dark skin tone, blond hair
+1F468                                      ; fully-qualified     # 👨 man
+1F468 1F3FB                                ; fully-qualified     # 👨🏻 man: light skin tone
+1F468 1F3FC                                ; fully-qualified     # 👨🏼 man: medium-light skin tone
+1F468 1F3FD                                ; fully-qualified     # 👨🏽 man: medium skin tone
+1F468 1F3FE                                ; fully-qualified     # 👨🏾 man: medium-dark skin tone
+1F468 1F3FF                                ; fully-qualified     # 👨🏿 man: dark skin tone
+1F9D4                                      ; fully-qualified     # 🧔 man: beard
+1F9D4 1F3FB                                ; fully-qualified     # 🧔🏻 man: light skin tone, beard
+1F9D4 1F3FC                                ; fully-qualified     # 🧔🏼 man: medium-light skin tone, beard
+1F9D4 1F3FD                                ; fully-qualified     # 🧔🏽 man: medium skin tone, beard
+1F9D4 1F3FE                                ; fully-qualified     # 🧔🏾 man: medium-dark skin tone, beard
+1F9D4 1F3FF                                ; fully-qualified     # 🧔🏿 man: dark skin tone, beard
+1F471 200D 2642 FE0F                       ; fully-qualified     # 👱‍♂️ man: blond hair
+1F471 200D 2642                            ; minimally-qualified # 👱‍♂ man: blond hair
+1F471 1F3FB 200D 2642 FE0F                 ; fully-qualified     # 👱🏻‍♂️ man: light skin tone, blond hair
+1F471 1F3FB 200D 2642                      ; minimally-qualified # 👱🏻‍♂ man: light skin tone, blond hair
+1F471 1F3FC 200D 2642 FE0F                 ; fully-qualified     # 👱🏼‍♂️ man: medium-light skin tone, blond hair
+1F471 1F3FC 200D 2642                      ; minimally-qualified # 👱🏼‍♂ man: medium-light skin tone, blond hair
+1F471 1F3FD 200D 2642 FE0F                 ; fully-qualified     # 👱🏽‍♂️ man: medium skin tone, blond hair
+1F471 1F3FD 200D 2642                      ; minimally-qualified # 👱🏽‍♂ man: medium skin tone, blond hair
+1F471 1F3FE 200D 2642 FE0F                 ; fully-qualified     # 👱🏾‍♂️ man: medium-dark skin tone, blond hair
+1F471 1F3FE 200D 2642                      ; minimally-qualified # 👱🏾‍♂ man: medium-dark skin tone, blond hair
+1F471 1F3FF 200D 2642 FE0F                 ; fully-qualified     # 👱🏿‍♂️ man: dark skin tone, blond hair
+1F471 1F3FF 200D 2642                      ; minimally-qualified # 👱🏿‍♂ man: dark skin tone, blond hair
+1F468 200D 1F9B0                           ; fully-qualified     # 👨‍🦰 man: red hair
+1F468 1F3FB 200D 1F9B0                     ; fully-qualified     # 👨🏻‍🦰 man: light skin tone, red hair
+1F468 1F3FC 200D 1F9B0                     ; fully-qualified     # 👨🏼‍🦰 man: medium-light skin tone, red hair
+1F468 1F3FD 200D 1F9B0                     ; fully-qualified     # 👨🏽‍🦰 man: medium skin tone, red hair
+1F468 1F3FE 200D 1F9B0                     ; fully-qualified     # 👨🏾‍🦰 man: medium-dark skin tone, red hair
+1F468 1F3FF 200D 1F9B0                     ; fully-qualified     # 👨🏿‍🦰 man: dark skin tone, red hair
+1F468 200D 1F9B1                           ; fully-qualified     # 👨‍🦱 man: curly hair
+1F468 1F3FB 200D 1F9B1                     ; fully-qualified     # 👨🏻‍🦱 man: light skin tone, curly hair
+1F468 1F3FC 200D 1F9B1                     ; fully-qualified     # 👨🏼‍🦱 man: medium-light skin tone, curly hair
+1F468 1F3FD 200D 1F9B1                     ; fully-qualified     # 👨🏽‍🦱 man: medium skin tone, curly hair
+1F468 1F3FE 200D 1F9B1                     ; fully-qualified     # 👨🏾‍🦱 man: medium-dark skin tone, curly hair
+1F468 1F3FF 200D 1F9B1                     ; fully-qualified     # 👨🏿‍🦱 man: dark skin tone, curly hair
+1F468 200D 1F9B3                           ; fully-qualified     # 👨‍🦳 man: white hair
+1F468 1F3FB 200D 1F9B3                     ; fully-qualified     # 👨🏻‍🦳 man: light skin tone, white hair
+1F468 1F3FC 200D 1F9B3                     ; fully-qualified     # 👨🏼‍🦳 man: medium-light skin tone, white hair
+1F468 1F3FD 200D 1F9B3                     ; fully-qualified     # 👨🏽‍🦳 man: medium skin tone, white hair
+1F468 1F3FE 200D 1F9B3                     ; fully-qualified     # 👨🏾‍🦳 man: medium-dark skin tone, white hair
+1F468 1F3FF 200D 1F9B3                     ; fully-qualified     # 👨🏿‍🦳 man: dark skin tone, white hair
+1F468 200D 1F9B2                           ; fully-qualified     # 👨‍🦲 man: bald
+1F468 1F3FB 200D 1F9B2                     ; fully-qualified     # 👨🏻‍🦲 man: light skin tone, bald
+1F468 1F3FC 200D 1F9B2                     ; fully-qualified     # 👨🏼‍🦲 man: medium-light skin tone, bald
+1F468 1F3FD 200D 1F9B2                     ; fully-qualified     # 👨🏽‍🦲 man: medium skin tone, bald
+1F468 1F3FE 200D 1F9B2                     ; fully-qualified     # 👨🏾‍🦲 man: medium-dark skin tone, bald
+1F468 1F3FF 200D 1F9B2                     ; fully-qualified     # 👨🏿‍🦲 man: dark skin tone, bald
+1F469                                      ; fully-qualified     # 👩 woman
+1F469 1F3FB                                ; fully-qualified     # 👩🏻 woman: light skin tone
+1F469 1F3FC                                ; fully-qualified     # 👩🏼 woman: medium-light skin tone
+1F469 1F3FD                                ; fully-qualified     # 👩🏽 woman: medium skin tone
+1F469 1F3FE                                ; fully-qualified     # 👩🏾 woman: medium-dark skin tone
+1F469 1F3FF                                ; fully-qualified     # 👩🏿 woman: dark skin tone
+1F471 200D 2640 FE0F                       ; fully-qualified     # 👱‍♀️ woman: blond hair
+1F471 200D 2640                            ; minimally-qualified # 👱‍♀ woman: blond hair
+1F471 1F3FB 200D 2640 FE0F                 ; fully-qualified     # 👱🏻‍♀️ woman: light skin tone, blond hair
+1F471 1F3FB 200D 2640                      ; minimally-qualified # 👱🏻‍♀ woman: light skin tone, blond hair
+1F471 1F3FC 200D 2640 FE0F                 ; fully-qualified     # 👱🏼‍♀️ woman: medium-light skin tone, blond hair
+1F471 1F3FC 200D 2640                      ; minimally-qualified # 👱🏼‍♀ woman: medium-light skin tone, blond hair
+1F471 1F3FD 200D 2640 FE0F                 ; fully-qualified     # 👱🏽‍♀️ woman: medium skin tone, blond hair
+1F471 1F3FD 200D 2640                      ; minimally-qualified # 👱🏽‍♀ woman: medium skin tone, blond hair
+1F471 1F3FE 200D 2640 FE0F                 ; fully-qualified     # 👱🏾‍♀️ woman: medium-dark skin tone, blond hair
+1F471 1F3FE 200D 2640                      ; minimally-qualified # 👱🏾‍♀ woman: medium-dark skin tone, blond hair
+1F471 1F3FF 200D 2640 FE0F                 ; fully-qualified     # 👱🏿‍♀️ woman: dark skin tone, blond hair
+1F471 1F3FF 200D 2640                      ; minimally-qualified # 👱🏿‍♀ woman: dark skin tone, blond hair
+1F469 200D 1F9B0                           ; fully-qualified     # 👩‍🦰 woman: red hair
+1F469 1F3FB 200D 1F9B0                     ; fully-qualified     # 👩🏻‍🦰 woman: light skin tone, red hair
+1F469 1F3FC 200D 1F9B0                     ; fully-qualified     # 👩🏼‍🦰 woman: medium-light skin tone, red hair
+1F469 1F3FD 200D 1F9B0                     ; fully-qualified     # 👩🏽‍🦰 woman: medium skin tone, red hair
+1F469 1F3FE 200D 1F9B0                     ; fully-qualified     # 👩🏾‍🦰 woman: medium-dark skin tone, red hair
+1F469 1F3FF 200D 1F9B0                     ; fully-qualified     # 👩🏿‍🦰 woman: dark skin tone, red hair
+1F469 200D 1F9B1                           ; fully-qualified     # 👩‍🦱 woman: curly hair
+1F469 1F3FB 200D 1F9B1                     ; fully-qualified     # 👩🏻‍🦱 woman: light skin tone, curly hair
+1F469 1F3FC 200D 1F9B1                     ; fully-qualified     # 👩🏼‍🦱 woman: medium-light skin tone, curly hair
+1F469 1F3FD 200D 1F9B1                     ; fully-qualified     # 👩🏽‍🦱 woman: medium skin tone, curly hair
+1F469 1F3FE 200D 1F9B1                     ; fully-qualified     # 👩🏾‍🦱 woman: medium-dark skin tone, curly hair
+1F469 1F3FF 200D 1F9B1                     ; fully-qualified     # 👩🏿‍🦱 woman: dark skin tone, curly hair
+1F469 200D 1F9B3                           ; fully-qualified     # 👩‍🦳 woman: white hair
+1F469 1F3FB 200D 1F9B3                     ; fully-qualified     # 👩🏻‍🦳 woman: light skin tone, white hair
+1F469 1F3FC 200D 1F9B3                     ; fully-qualified     # 👩🏼‍🦳 woman: medium-light skin tone, white hair
+1F469 1F3FD 200D 1F9B3                     ; fully-qualified     # 👩🏽‍🦳 woman: medium skin tone, white hair
+1F469 1F3FE 200D 1F9B3                     ; fully-qualified     # 👩🏾‍🦳 woman: medium-dark skin tone, white hair
+1F469 1F3FF 200D 1F9B3                     ; fully-qualified     # 👩🏿‍🦳 woman: dark skin tone, white hair
+1F469 200D 1F9B2                           ; fully-qualified     # 👩‍🦲 woman: bald
+1F469 1F3FB 200D 1F9B2                     ; fully-qualified     # 👩🏻‍🦲 woman: light skin tone, bald
+1F469 1F3FC 200D 1F9B2                     ; fully-qualified     # 👩🏼‍🦲 woman: medium-light skin tone, bald
+1F469 1F3FD 200D 1F9B2                     ; fully-qualified     # 👩🏽‍🦲 woman: medium skin tone, bald
+1F469 1F3FE 200D 1F9B2                     ; fully-qualified     # 👩🏾‍🦲 woman: medium-dark skin tone, bald
+1F469 1F3FF 200D 1F9B2                     ; fully-qualified     # 👩🏿‍🦲 woman: dark skin tone, bald
+1F9D3                                      ; fully-qualified     # 🧓 older person
+1F9D3 1F3FB                                ; fully-qualified     # 🧓🏻 older person: light skin tone
+1F9D3 1F3FC                                ; fully-qualified     # 🧓🏼 older person: medium-light skin tone
+1F9D3 1F3FD                                ; fully-qualified     # 🧓🏽 older person: medium skin tone
+1F9D3 1F3FE                                ; fully-qualified     # 🧓🏾 older person: medium-dark skin tone
+1F9D3 1F3FF                                ; fully-qualified     # 🧓🏿 older person: dark skin tone
+1F474                                      ; fully-qualified     # 👴 old man
+1F474 1F3FB                                ; fully-qualified     # 👴🏻 old man: light skin tone
+1F474 1F3FC                                ; fully-qualified     # 👴🏼 old man: medium-light skin tone
+1F474 1F3FD                                ; fully-qualified     # 👴🏽 old man: medium skin tone
+1F474 1F3FE                                ; fully-qualified     # 👴🏾 old man: medium-dark skin tone
+1F474 1F3FF                                ; fully-qualified     # 👴🏿 old man: dark skin tone
+1F475                                      ; fully-qualified     # 👵 old woman
+1F475 1F3FB                                ; fully-qualified     # 👵🏻 old woman: light skin tone
+1F475 1F3FC                                ; fully-qualified     # 👵🏼 old woman: medium-light skin tone
+1F475 1F3FD                                ; fully-qualified     # 👵🏽 old woman: medium skin tone
+1F475 1F3FE                                ; fully-qualified     # 👵🏾 old woman: medium-dark skin tone
+1F475 1F3FF                                ; fully-qualified     # 👵🏿 old woman: dark skin tone
+
+# subgroup: person-gesture
+1F64D                                      ; fully-qualified     # 🙍 person frowning
+1F64D 1F3FB                                ; fully-qualified     # 🙍🏻 person frowning: light skin tone
+1F64D 1F3FC                                ; fully-qualified     # 🙍🏼 person frowning: medium-light skin tone
+1F64D 1F3FD                                ; fully-qualified     # 🙍🏽 person frowning: medium skin tone
+1F64D 1F3FE                                ; fully-qualified     # 🙍🏾 person frowning: medium-dark skin tone
+1F64D 1F3FF                                ; fully-qualified     # 🙍🏿 person frowning: dark skin tone
+1F64D 200D 2642 FE0F                       ; fully-qualified     # 🙍‍♂️ man frowning
+1F64D 200D 2642                            ; minimally-qualified # 🙍‍♂ man frowning
+1F64D 1F3FB 200D 2642 FE0F                 ; fully-qualified     # 🙍🏻‍♂️ man frowning: light skin tone
+1F64D 1F3FB 200D 2642                      ; minimally-qualified # 🙍🏻‍♂ man frowning: light skin tone
+1F64D 1F3FC 200D 2642 FE0F                 ; fully-qualified     # 🙍🏼‍♂️ man frowning: medium-light skin tone
+1F64D 1F3FC 200D 2642                      ; minimally-qualified # 🙍🏼‍♂ man frowning: medium-light skin tone
+1F64D 1F3FD 200D 2642 FE0F                 ; fully-qualified     # 🙍🏽‍♂️ man frowning: medium skin tone
+1F64D 1F3FD 200D 2642                      ; minimally-qualified # 🙍🏽‍♂ man frowning: medium skin tone
+1F64D 1F3FE 200D 2642 FE0F                 ; fully-qualified     # 🙍🏾‍♂️ man frowning: medium-dark skin tone
+1F64D 1F3FE 200D 2642                      ; minimally-qualified # 🙍🏾‍♂ man frowning: medium-dark skin tone
+1F64D 1F3FF 200D 2642 FE0F                 ; fully-qualified     # 🙍🏿‍♂️ man frowning: dark skin tone
+1F64D 1F3FF 200D 2642                      ; minimally-qualified # 🙍🏿‍♂ man frowning: dark skin tone
+1F64D 200D 2640 FE0F                       ; fully-qualified     # 🙍‍♀️ woman frowning
+1F64D 200D 2640                            ; minimally-qualified # 🙍‍♀ woman frowning
+1F64D 1F3FB 200D 2640 FE0F                 ; fully-qualified     # 🙍🏻‍♀️ woman frowning: light skin tone
+1F64D 1F3FB 200D 2640                      ; minimally-qualified # 🙍🏻‍♀ woman frowning: light skin tone
+1F64D 1F3FC 200D 2640 FE0F                 ; fully-qualified     # 🙍🏼‍♀️ woman frowning: medium-light skin tone
+1F64D 1F3FC 200D 2640                      ; minimally-qualified # 🙍🏼‍♀ woman frowning: medium-light skin tone
+1F64D 1F3FD 200D 2640 FE0F                 ; fully-qualified     # 🙍🏽‍♀️ woman frowning: medium skin tone
+1F64D 1F3FD 200D 2640                      ; minimally-qualified # 🙍🏽‍♀ woman frowning: medium skin tone
+1F64D 1F3FE 200D 2640 FE0F                 ; fully-qualified     # 🙍🏾‍♀️ woman frowning: medium-dark skin tone
+1F64D 1F3FE 200D 2640                      ; minimally-qualified # 🙍🏾‍♀ woman frowning: medium-dark skin tone
+1F64D 1F3FF 200D 2640 FE0F                 ; fully-qualified     # 🙍🏿‍♀️ woman frowning: dark skin tone
+1F64D 1F3FF 200D 2640                      ; minimally-qualified # 🙍🏿‍♀ woman frowning: dark skin tone
+1F64E                                      ; fully-qualified     # 🙎 person pouting
+1F64E 1F3FB                                ; fully-qualified     # 🙎🏻 person pouting: light skin tone
+1F64E 1F3FC                                ; fully-qualified     # 🙎🏼 person pouting: medium-light skin tone
+1F64E 1F3FD                                ; fully-qualified     # 🙎🏽 person pouting: medium skin tone
+1F64E 1F3FE                                ; fully-qualified     # 🙎🏾 person pouting: medium-dark skin tone
+1F64E 1F3FF                                ; fully-qualified     # 🙎🏿 person pouting: dark skin tone
+1F64E 200D 2642 FE0F                       ; fully-qualified     # 🙎‍♂️ man pouting
+1F64E 200D 2642                            ; minimally-qualified # 🙎‍♂ man pouting
+1F64E 1F3FB 200D 2642 FE0F                 ; fully-qualified     # 🙎🏻‍♂️ man pouting: light skin tone
+1F64E 1F3FB 200D 2642                      ; minimally-qualified # 🙎🏻‍♂ man pouting: light skin tone
+1F64E 1F3FC 200D 2642 FE0F                 ; fully-qualified     # 🙎🏼‍♂️ man pouting: medium-light skin tone
+1F64E 1F3FC 200D 2642                      ; minimally-qualified # 🙎🏼‍♂ man pouting: medium-light skin tone
+1F64E 1F3FD 200D 2642 FE0F                 ; fully-qualified     # 🙎🏽‍♂️ man pouting: medium skin tone
+1F64E 1F3FD 200D 2642                      ; minimally-qualified # 🙎🏽‍♂ man pouting: medium skin tone
+1F64E 1F3FE 200D 2642 FE0F                 ; fully-qualified     # 🙎🏾‍♂️ man pouting: medium-dark skin tone
+1F64E 1F3FE 200D 2642                      ; minimally-qualified # 🙎🏾‍♂ man pouting: medium-dark skin tone
+1F64E 1F3FF 200D 2642 FE0F                 ; fully-qualified     # 🙎🏿‍♂️ man pouting: dark skin tone
+1F64E 1F3FF 200D 2642                      ; minimally-qualified # 🙎🏿‍♂ man pouting: dark skin tone
+1F64E 200D 2640 FE0F                       ; fully-qualified     # 🙎‍♀️ woman pouting
+1F64E 200D 2640                            ; minimally-qualified # 🙎‍♀ woman pouting
+1F64E 1F3FB 200D 2640 FE0F                 ; fully-qualified     # 🙎🏻‍♀️ woman pouting: light skin tone
+1F64E 1F3FB 200D 2640                      ; minimally-qualified # 🙎🏻‍♀ woman pouting: light skin tone
+1F64E 1F3FC 200D 2640 FE0F                 ; fully-qualified     # 🙎🏼‍♀️ woman pouting: medium-light skin tone
+1F64E 1F3FC 200D 2640                      ; minimally-qualified # 🙎🏼‍♀ woman pouting: medium-light skin tone
+1F64E 1F3FD 200D 2640 FE0F                 ; fully-qualified     # 🙎🏽‍♀️ woman pouting: medium skin tone
+1F64E 1F3FD 200D 2640                      ; minimally-qualified # 🙎🏽‍♀ woman pouting: medium skin tone
+1F64E 1F3FE 200D 2640 FE0F                 ; fully-qualified     # 🙎🏾‍♀️ woman pouting: medium-dark skin tone
+1F64E 1F3FE 200D 2640                      ; minimally-qualified # 🙎🏾‍♀ woman pouting: medium-dark skin tone
+1F64E 1F3FF 200D 2640 FE0F                 ; fully-qualified     # 🙎🏿‍♀️ woman pouting: dark skin tone
+1F64E 1F3FF 200D 2640                      ; minimally-qualified # 🙎🏿‍♀ woman pouting: dark skin tone
+1F645                                      ; fully-qualified     # 🙅 person gesturing NO
+1F645 1F3FB                                ; fully-qualified     # 🙅🏻 person gesturing NO: light skin tone
+1F645 1F3FC                                ; fully-qualified     # 🙅🏼 person gesturing NO: medium-light skin tone
+1F645 1F3FD                                ; fully-qualified     # 🙅🏽 person gesturing NO: medium skin tone
+1F645 1F3FE                                ; fully-qualified     # 🙅🏾 person gesturing NO: medium-dark skin tone
+1F645 1F3FF                                ; fully-qualified     # 🙅🏿 person gesturing NO: dark skin tone
+1F645 200D 2642 FE0F                       ; fully-qualified     # 🙅‍♂️ man gesturing NO
+1F645 200D 2642                            ; minimally-qualified # 🙅‍♂ man gesturing NO
+1F645 1F3FB 200D 2642 FE0F                 ; fully-qualified     # 🙅🏻‍♂️ man gesturing NO: light skin tone
+1F645 1F3FB 200D 2642                      ; minimally-qualified # 🙅🏻‍♂ man gesturing NO: light skin tone
+1F645 1F3FC 200D 2642 FE0F                 ; fully-qualified     # 🙅🏼‍♂️ man gesturing NO: medium-light skin tone
+1F645 1F3FC 200D 2642                      ; minimally-qualified # 🙅🏼‍♂ man gesturing NO: medium-light skin tone
+1F645 1F3FD 200D 2642 FE0F                 ; fully-qualified     # 🙅🏽‍♂️ man gesturing NO: medium skin tone
+1F645 1F3FD 200D 2642                      ; minimally-qualified # 🙅🏽‍♂ man gesturing NO: medium skin tone
+1F645 1F3FE 200D 2642 FE0F                 ; fully-qualified     # 🙅🏾‍♂️ man gesturing NO: medium-dark skin tone
+1F645 1F3FE 200D 2642                      ; minimally-qualified # 🙅🏾‍♂ man gesturing NO: medium-dark skin tone
+1F645 1F3FF 200D 2642 FE0F                 ; fully-qualified     # 🙅🏿‍♂️ man gesturing NO: dark skin tone
+1F645 1F3FF 200D 2642                      ; minimally-qualified # 🙅🏿‍♂ man gesturing NO: dark skin tone
+1F645 200D 2640 FE0F                       ; fully-qualified     # 🙅‍♀️ woman gesturing NO
+1F645 200D 2640                            ; minimally-qualified # 🙅‍♀ woman gesturing NO
+1F645 1F3FB 200D 2640 FE0F                 ; fully-qualified     # 🙅🏻‍♀️ woman gesturing NO: light skin tone
+1F645 1F3FB 200D 2640                      ; minimally-qualified # 🙅🏻‍♀ woman gesturing NO: light skin tone
+1F645 1F3FC 200D 2640 FE0F                 ; fully-qualified     # 🙅🏼‍♀️ woman gesturing NO: medium-light skin tone
+1F645 1F3FC 200D 2640                      ; minimally-qualified # 🙅🏼‍♀ woman gesturing NO: medium-light skin tone
+1F645 1F3FD 200D 2640 FE0F                 ; fully-qualified     # 🙅🏽‍♀️ woman gesturing NO: medium skin tone
+1F645 1F3FD 200D 2640                      ; minimally-qualified # 🙅🏽‍♀ woman gesturing NO: medium skin tone
+1F645 1F3FE 200D 2640 FE0F                 ; fully-qualified     # 🙅🏾‍♀️ woman gesturing NO: medium-dark skin tone
+1F645 1F3FE 200D 2640                      ; minimally-qualified # 🙅🏾‍♀ woman gesturing NO: medium-dark skin tone
+1F645 1F3FF 200D 2640 FE0F                 ; fully-qualified     # 🙅🏿‍♀️ woman gesturing NO: dark skin tone
+1F645 1F3FF 200D 2640                      ; minimally-qualified # 🙅🏿‍♀ woman gesturing NO: dark skin tone
+1F646                                      ; fully-qualified     # 🙆 person gesturing OK
+1F646 1F3FB                                ; fully-qualified     # 🙆🏻 person gesturing OK: light skin tone
+1F646 1F3FC                                ; fully-qualified     # 🙆🏼 person gesturing OK: medium-light skin tone
+1F646 1F3FD                                ; fully-qualified     # 🙆🏽 person gesturing OK: medium skin tone
+1F646 1F3FE                                ; fully-qualified     # 🙆🏾 person gesturing OK: medium-dark skin tone
+1F646 1F3FF                                ; fully-qualified     # 🙆🏿 person gesturing OK: dark skin tone
+1F646 200D 2642 FE0F                       ; fully-qualified     # 🙆‍♂️ man gesturing OK
+1F646 200D 2642                            ; minimally-qualified # 🙆‍♂ man gesturing OK
+1F646 1F3FB 200D 2642 FE0F                 ; fully-qualified     # 🙆🏻‍♂️ man gesturing OK: light skin tone
+1F646 1F3FB 200D 2642                      ; minimally-qualified # 🙆🏻‍♂ man gesturing OK: light skin tone
+1F646 1F3FC 200D 2642 FE0F                 ; fully-qualified     # 🙆🏼‍♂️ man gesturing OK: medium-light skin tone
+1F646 1F3FC 200D 2642                      ; minimally-qualified # 🙆🏼‍♂ man gesturing OK: medium-light skin tone
+1F646 1F3FD 200D 2642 FE0F                 ; fully-qualified     # 🙆🏽‍♂️ man gesturing OK: medium skin tone
+1F646 1F3FD 200D 2642                      ; minimally-qualified # 🙆🏽‍♂ man gesturing OK: medium skin tone
+1F646 1F3FE 200D 2642 FE0F                 ; fully-qualified     # 🙆🏾‍♂️ man gesturing OK: medium-dark skin tone
+1F646 1F3FE 200D 2642                      ; minimally-qualified # 🙆🏾‍♂ man gesturing OK: medium-dark skin tone
+1F646 1F3FF 200D 2642 FE0F                 ; fully-qualified     # 🙆🏿‍♂️ man gesturing OK: dark skin tone
+1F646 1F3FF 200D 2642                      ; minimally-qualified # 🙆🏿‍♂ man gesturing OK: dark skin tone
+1F646 200D 2640 FE0F                       ; fully-qualified     # 🙆‍♀️ woman gesturing OK
+1F646 200D 2640                            ; minimally-qualified # 🙆‍♀ woman gesturing OK
+1F646 1F3FB 200D 2640 FE0F                 ; fully-qualified     # 🙆🏻‍♀️ woman gesturing OK: light skin tone
+1F646 1F3FB 200D 2640                      ; minimally-qualified # 🙆🏻‍♀ woman gesturing OK: light skin tone
+1F646 1F3FC 200D 2640 FE0F                 ; fully-qualified     # 🙆🏼‍♀️ woman gesturing OK: medium-light skin tone
+1F646 1F3FC 200D 2640                      ; minimally-qualified # 🙆🏼‍♀ woman gesturing OK: medium-light skin tone
+1F646 1F3FD 200D 2640 FE0F                 ; fully-qualified     # 🙆🏽‍♀️ woman gesturing OK: medium skin tone
+1F646 1F3FD 200D 2640                      ; minimally-qualified # 🙆🏽‍♀ woman gesturing OK: medium skin tone
+1F646 1F3FE 200D 2640 FE0F                 ; fully-qualified     # 🙆🏾‍♀️ woman gesturing OK: medium-dark skin tone
+1F646 1F3FE 200D 2640                      ; minimally-qualified # 🙆🏾‍♀ woman gesturing OK: medium-dark skin tone
+1F646 1F3FF 200D 2640 FE0F                 ; fully-qualified     # 🙆🏿‍♀️ woman gesturing OK: dark skin tone
+1F646 1F3FF 200D 2640                      ; minimally-qualified # 🙆🏿‍♀ woman gesturing OK: dark skin tone
+1F481                                      ; fully-qualified     # 💁 person tipping hand
+1F481 1F3FB                                ; fully-qualified     # 💁🏻 person tipping hand: light skin tone
+1F481 1F3FC                                ; fully-qualified     # 💁🏼 person tipping hand: medium-light skin tone
+1F481 1F3FD                                ; fully-qualified     # 💁🏽 person tipping hand: medium skin tone
+1F481 1F3FE                                ; fully-qualified     # 💁🏾 person tipping hand: medium-dark skin tone
+1F481 1F3FF                                ; fully-qualified     # 💁🏿 person tipping hand: dark skin tone
+1F481 200D 2642 FE0F                       ; fully-qualified     # 💁‍♂️ man tipping hand
+1F481 200D 2642                            ; minimally-qualified # 💁‍♂ man tipping hand
+1F481 1F3FB 200D 2642 FE0F                 ; fully-qualified     # 💁🏻‍♂️ man tipping hand: light skin tone
+1F481 1F3FB 200D 2642                      ; minimally-qualified # 💁🏻‍♂ man tipping hand: light skin tone
+1F481 1F3FC 200D 2642 FE0F                 ; fully-qualified     # 💁🏼‍♂️ man tipping hand: medium-light skin tone
+1F481 1F3FC 200D 2642                      ; minimally-qualified # 💁🏼‍♂ man tipping hand: medium-light skin tone
+1F481 1F3FD 200D 2642 FE0F                 ; fully-qualified     # 💁🏽‍♂️ man tipping hand: medium skin tone
+1F481 1F3FD 200D 2642                      ; minimally-qualified # 💁🏽‍♂ man tipping hand: medium skin tone
+1F481 1F3FE 200D 2642 FE0F                 ; fully-qualified     # 💁🏾‍♂️ man tipping hand: medium-dark skin tone
+1F481 1F3FE 200D 2642                      ; minimally-qualified # 💁🏾‍♂ man tipping hand: medium-dark skin tone
+1F481 1F3FF 200D 2642 FE0F                 ; fully-qualified     # 💁🏿‍♂️ man tipping hand: dark skin tone
+1F481 1F3FF 200D 2642                      ; minimally-qualified # 💁🏿‍♂ man tipping hand: dark skin tone
+1F481 200D 2640 FE0F                       ; fully-qualified     # 💁‍♀️ woman tipping hand
+1F481 200D 2640                            ; minimally-qualified # 💁‍♀ woman tipping hand
+1F481 1F3FB 200D 2640 FE0F                 ; fully-qualified     # 💁🏻‍♀️ woman tipping hand: light skin tone
+1F481 1F3FB 200D 2640                      ; minimally-qualified # 💁🏻‍♀ woman tipping hand: light skin tone
+1F481 1F3FC 200D 2640 FE0F                 ; fully-qualified     # 💁🏼‍♀️ woman tipping hand: medium-light skin tone
+1F481 1F3FC 200D 2640                      ; minimally-qualified # 💁🏼‍♀ woman tipping hand: medium-light skin tone
+1F481 1F3FD 200D 2640 FE0F                 ; fully-qualified     # 💁🏽‍♀️ woman tipping hand: medium skin tone
+1F481 1F3FD 200D 2640                      ; minimally-qualified # 💁🏽‍♀ woman tipping hand: medium skin tone
+1F481 1F3FE 200D 2640 FE0F                 ; fully-qualified     # 💁🏾‍♀️ woman tipping hand: medium-dark skin tone
+1F481 1F3FE 200D 2640                      ; minimally-qualified # 💁🏾‍♀ woman tipping hand: medium-dark skin tone
+1F481 1F3FF 200D 2640 FE0F                 ; fully-qualified     # 💁🏿‍♀️ woman tipping hand: dark skin tone
+1F481 1F3FF 200D 2640                      ; minimally-qualified # 💁🏿‍♀ woman tipping hand: dark skin tone
+1F64B                                      ; fully-qualified     # 🙋 person raising hand
+1F64B 1F3FB                                ; fully-qualified     # 🙋🏻 person raising hand: light skin tone
+1F64B 1F3FC                                ; fully-qualified     # 🙋🏼 person raising hand: medium-light skin tone
+1F64B 1F3FD                                ; fully-qualified     # 🙋🏽 person raising hand: medium skin tone
+1F64B 1F3FE                                ; fully-qualified     # 🙋🏾 person raising hand: medium-dark skin tone
+1F64B 1F3FF                                ; fully-qualified     # 🙋🏿 person raising hand: dark skin tone
+1F64B 200D 2642 FE0F                       ; fully-qualified     # 🙋‍♂️ man raising hand
+1F64B 200D 2642                            ; minimally-qualified # 🙋‍♂ man raising hand
+1F64B 1F3FB 200D 2642 FE0F                 ; fully-qualified     # 🙋🏻‍♂️ man raising hand: light skin tone
+1F64B 1F3FB 200D 2642                      ; minimally-qualified # 🙋🏻‍♂ man raising hand: light skin tone
+1F64B 1F3FC 200D 2642 FE0F                 ; fully-qualified     # 🙋🏼‍♂️ man raising hand: medium-light skin tone
+1F64B 1F3FC 200D 2642                      ; minimally-qualified # 🙋🏼‍♂ man raising hand: medium-light skin tone
+1F64B 1F3FD 200D 2642 FE0F                 ; fully-qualified     # 🙋🏽‍♂️ man raising hand: medium skin tone
+1F64B 1F3FD 200D 2642                      ; minimally-qualified # 🙋🏽‍♂ man raising hand: medium skin tone
+1F64B 1F3FE 200D 2642 FE0F                 ; fully-qualified     # 🙋🏾‍♂️ man raising hand: medium-dark skin tone
+1F64B 1F3FE 200D 2642                      ; minimally-qualified # 🙋🏾‍♂ man raising hand: medium-dark skin tone
+1F64B 1F3FF 200D 2642 FE0F                 ; fully-qualified     # 🙋🏿‍♂️ man raising hand: dark skin tone
+1F64B 1F3FF 200D 2642                      ; minimally-qualified # 🙋🏿‍♂ man raising hand: dark skin tone
+1F64B 200D 2640 FE0F                       ; fully-qualified     # 🙋‍♀️ woman raising hand
+1F64B 200D 2640                            ; minimally-qualified # 🙋‍♀ woman raising hand
+1F64B 1F3FB 200D 2640 FE0F                 ; fully-qualified     # 🙋🏻‍♀️ woman raising hand: light skin tone
+1F64B 1F3FB 200D 2640                      ; minimally-qualified # 🙋🏻‍♀ woman raising hand: light skin tone
+1F64B 1F3FC 200D 2640 FE0F                 ; fully-qualified     # 🙋🏼‍♀️ woman raising hand: medium-light skin tone
+1F64B 1F3FC 200D 2640                      ; minimally-qualified # 🙋🏼‍♀ woman raising hand: medium-light skin tone
+1F64B 1F3FD 200D 2640 FE0F                 ; fully-qualified     # 🙋🏽‍♀️ woman raising hand: medium skin tone
+1F64B 1F3FD 200D 2640                      ; minimally-qualified # 🙋🏽‍♀ woman raising hand: medium skin tone
+1F64B 1F3FE 200D 2640 FE0F                 ; fully-qualified     # 🙋🏾‍♀️ woman raising hand: medium-dark skin tone
+1F64B 1F3FE 200D 2640                      ; minimally-qualified # 🙋🏾‍♀ woman raising hand: medium-dark skin tone
+1F64B 1F3FF 200D 2640 FE0F                 ; fully-qualified     # 🙋🏿‍♀️ woman raising hand: dark skin tone
+1F64B 1F3FF 200D 2640                      ; minimally-qualified # 🙋🏿‍♀ woman raising hand: dark skin tone
+1F9CF                                      ; fully-qualified     # 🧏 deaf person
+1F9CF 1F3FB                                ; fully-qualified     # 🧏🏻 deaf person: light skin tone
+1F9CF 1F3FC                                ; fully-qualified     # 🧏🏼 deaf person: medium-light skin tone
+1F9CF 1F3FD                                ; fully-qualified     # 🧏🏽 deaf person: medium skin tone
+1F9CF 1F3FE                                ; fully-qualified     # 🧏🏾 deaf person: medium-dark skin tone
+1F9CF 1F3FF                                ; fully-qualified     # 🧏🏿 deaf person: dark skin tone
+1F9CF 200D 2642 FE0F                       ; fully-qualified     # 🧏‍♂️ deaf man
+1F9CF 200D 2642                            ; minimally-qualified # 🧏‍♂ deaf man
+1F9CF 1F3FB 200D 2642 FE0F                 ; fully-qualified     # 🧏🏻‍♂️ deaf man: light skin tone
+1F9CF 1F3FB 200D 2642                      ; minimally-qualified # 🧏🏻‍♂ deaf man: light skin tone
+1F9CF 1F3FC 200D 2642 FE0F                 ; fully-qualified     # 🧏🏼‍♂️ deaf man: medium-light skin tone
+1F9CF 1F3FC 200D 2642                      ; minimally-qualified # 🧏🏼‍♂ deaf man: medium-light skin tone
+1F9CF 1F3FD 200D 2642 FE0F                 ; fully-qualified     # 🧏🏽‍♂️ deaf man: medium skin tone
+1F9CF 1F3FD 200D 2642                      ; minimally-qualified # 🧏🏽‍♂ deaf man: medium skin tone
+1F9CF 1F3FE 200D 2642 FE0F                 ; fully-qualified     # 🧏🏾‍♂️ deaf man: medium-dark skin tone
+1F9CF 1F3FE 200D 2642                      ; minimally-qualified # 🧏🏾‍♂ deaf man: medium-dark skin tone
+1F9CF 1F3FF 200D 2642 FE0F                 ; fully-qualified     # 🧏🏿‍♂️ deaf man: dark skin tone
+1F9CF 1F3FF 200D 2642                      ; minimally-qualified # 🧏🏿‍♂ deaf man: dark skin tone
+1F9CF 200D 2640 FE0F                       ; fully-qualified     # 🧏‍♀️ deaf woman
+1F9CF 200D 2640                            ; minimally-qualified # 🧏‍♀ deaf woman
+1F9CF 1F3FB 200D 2640 FE0F                 ; fully-qualified     # 🧏🏻‍♀️ deaf woman: light skin tone
+1F9CF 1F3FB 200D 2640                      ; minimally-qualified # 🧏🏻‍♀ deaf woman: light skin tone
+1F9CF 1F3FC 200D 2640 FE0F                 ; fully-qualified     # 🧏🏼‍♀️ deaf woman: medium-light skin tone
+1F9CF 1F3FC 200D 2640                      ; minimally-qualified # 🧏🏼‍♀ deaf woman: medium-light skin tone
+1F9CF 1F3FD 200D 2640 FE0F                 ; fully-qualified     # 🧏🏽‍♀️ deaf woman: medium skin tone
+1F9CF 1F3FD 200D 2640                      ; minimally-qualified # 🧏🏽‍♀ deaf woman: medium skin tone
+1F9CF 1F3FE 200D 2640 FE0F                 ; fully-qualified     # 🧏🏾‍♀️ deaf woman: medium-dark skin tone
+1F9CF 1F3FE 200D 2640                      ; minimally-qualified # 🧏🏾‍♀ deaf woman: medium-dark skin tone
+1F9CF 1F3FF 200D 2640 FE0F                 ; fully-qualified     # 🧏🏿‍♀️ deaf woman: dark skin tone
+1F9CF 1F3FF 200D 2640                      ; minimally-qualified # 🧏🏿‍♀ deaf woman: dark skin tone
+1F647                                      ; fully-qualified     # 🙇 person bowing
+1F647 1F3FB                                ; fully-qualified     # 🙇🏻 person bowing: light skin tone
+1F647 1F3FC                                ; fully-qualified     # 🙇🏼 person bowing: medium-light skin tone
+1F647 1F3FD                                ; fully-qualified     # 🙇🏽 person bowing: medium skin tone
+1F647 1F3FE                                ; fully-qualified     # 🙇🏾 person bowing: medium-dark skin tone
+1F647 1F3FF                                ; fully-qualified     # 🙇🏿 person bowing: dark skin tone
+1F647 200D 2642 FE0F                       ; fully-qualified     # 🙇‍♂️ man bowing
+1F647 200D 2642                            ; minimally-qualified # 🙇‍♂ man bowing
+1F647 1F3FB 200D 2642 FE0F                 ; fully-qualified     # 🙇🏻‍♂️ man bowing: light skin tone
+1F647 1F3FB 200D 2642                      ; minimally-qualified # 🙇🏻‍♂ man bowing: light skin tone
+1F647 1F3FC 200D 2642 FE0F                 ; fully-qualified     # 🙇🏼‍♂️ man bowing: medium-light skin tone
+1F647 1F3FC 200D 2642                      ; minimally-qualified # 🙇🏼‍♂ man bowing: medium-light skin tone
+1F647 1F3FD 200D 2642 FE0F                 ; fully-qualified     # 🙇🏽‍♂️ man bowing: medium skin tone
+1F647 1F3FD 200D 2642                      ; minimally-qualified # 🙇🏽‍♂ man bowing: medium skin tone
+1F647 1F3FE 200D 2642 FE0F                 ; fully-qualified     # 🙇🏾‍♂️ man bowing: medium-dark skin tone
+1F647 1F3FE 200D 2642                      ; minimally-qualified # 🙇🏾‍♂ man bowing: medium-dark skin tone
+1F647 1F3FF 200D 2642 FE0F                 ; fully-qualified     # 🙇🏿‍♂️ man bowing: dark skin tone
+1F647 1F3FF 200D 2642                      ; minimally-qualified # 🙇🏿‍♂ man bowing: dark skin tone
+1F647 200D 2640 FE0F                       ; fully-qualified     # 🙇‍♀️ woman bowing
+1F647 200D 2640                            ; minimally-qualified # 🙇‍♀ woman bowing
+1F647 1F3FB 200D 2640 FE0F                 ; fully-qualified     # 🙇🏻‍♀️ woman bowing: light skin tone
+1F647 1F3FB 200D 2640                      ; minimally-qualified # 🙇🏻‍♀ woman bowing: light skin tone
+1F647 1F3FC 200D 2640 FE0F                 ; fully-qualified     # 🙇🏼‍♀️ woman bowing: medium-light skin tone
+1F647 1F3FC 200D 2640                      ; minimally-qualified # 🙇🏼‍♀ woman bowing: medium-light skin tone
+1F647 1F3FD 200D 2640 FE0F                 ; fully-qualified     # 🙇🏽‍♀️ woman bowing: medium skin tone
+1F647 1F3FD 200D 2640                      ; minimally-qualified # 🙇🏽‍♀ woman bowing: medium skin tone
+1F647 1F3FE 200D 2640 FE0F                 ; fully-qualified     # 🙇🏾‍♀️ woman bowing: medium-dark skin tone
+1F647 1F3FE 200D 2640                      ; minimally-qualified # 🙇🏾‍♀ woman bowing: medium-dark skin tone
+1F647 1F3FF 200D 2640 FE0F                 ; fully-qualified     # 🙇🏿‍♀️ woman bowing: dark skin tone
+1F647 1F3FF 200D 2640                      ; minimally-qualified # 🙇🏿‍♀ woman bowing: dark skin tone
+1F926                                      ; fully-qualified     # 🤦 person facepalming
+1F926 1F3FB                                ; fully-qualified     # 🤦🏻 person facepalming: light skin tone
+1F926 1F3FC                                ; fully-qualified     # 🤦🏼 person facepalming: medium-light skin tone
+1F926 1F3FD                                ; fully-qualified     # 🤦🏽 person facepalming: medium skin tone
+1F926 1F3FE                                ; fully-qualified     # 🤦🏾 person facepalming: medium-dark skin tone
+1F926 1F3FF                                ; fully-qualified     # 🤦🏿 person facepalming: dark skin tone
+1F926 200D 2642 FE0F                       ; fully-qualified     # 🤦‍♂️ man facepalming
+1F926 200D 2642                            ; minimally-qualified # 🤦‍♂ man facepalming
+1F926 1F3FB 200D 2642 FE0F                 ; fully-qualified     # 🤦🏻‍♂️ man facepalming: light skin tone
+1F926 1F3FB 200D 2642                      ; minimally-qualified # 🤦🏻‍♂ man facepalming: light skin tone
+1F926 1F3FC 200D 2642 FE0F                 ; fully-qualified     # 🤦🏼‍♂️ man facepalming: medium-light skin tone
+1F926 1F3FC 200D 2642                      ; minimally-qualified # 🤦🏼‍♂ man facepalming: medium-light skin tone
+1F926 1F3FD 200D 2642 FE0F                 ; fully-qualified     # 🤦🏽‍♂️ man facepalming: medium skin tone
+1F926 1F3FD 200D 2642                      ; minimally-qualified # 🤦🏽‍♂ man facepalming: medium skin tone
+1F926 1F3FE 200D 2642 FE0F                 ; fully-qualified     # 🤦🏾‍♂️ man facepalming: medium-dark skin tone
+1F926 1F3FE 200D 2642                      ; minimally-qualified # 🤦🏾‍♂ man facepalming: medium-dark skin tone
+1F926 1F3FF 200D 2642 FE0F                 ; fully-qualified     # 🤦🏿‍♂️ man facepalming: dark skin tone
+1F926 1F3FF 200D 2642                      ; minimally-qualified # 🤦🏿‍♂ man facepalming: dark skin tone
+1F926 200D 2640 FE0F                       ; fully-qualified     # 🤦‍♀️ woman facepalming
+1F926 200D 2640                            ; minimally-qualified # 🤦‍♀ woman facepalming
+1F926 1F3FB 200D 2640 FE0F                 ; fully-qualified     # 🤦🏻‍♀️ woman facepalming: light skin tone
+1F926 1F3FB 200D 2640                      ; minimally-qualified # 🤦🏻‍♀ woman facepalming: light skin tone
+1F926 1F3FC 200D 2640 FE0F                 ; fully-qualified     # 🤦🏼‍♀️ woman facepalming: medium-light skin tone
+1F926 1F3FC 200D 2640                      ; minimally-qualified # 🤦🏼‍♀ woman facepalming: medium-light skin tone
+1F926 1F3FD 200D 2640 FE0F                 ; fully-qualified     # 🤦🏽‍♀️ woman facepalming: medium skin tone
+1F926 1F3FD 200D 2640                      ; minimally-qualified # 🤦🏽‍♀ woman facepalming: medium skin tone
+1F926 1F3FE 200D 2640 FE0F                 ; fully-qualified     # 🤦🏾‍♀️ woman facepalming: medium-dark skin tone
+1F926 1F3FE 200D 2640                      ; minimally-qualified # 🤦🏾‍♀ woman facepalming: medium-dark skin tone
+1F926 1F3FF 200D 2640 FE0F                 ; fully-qualified     # 🤦🏿‍♀️ woman facepalming: dark skin tone
+1F926 1F3FF 200D 2640                      ; minimally-qualified # 🤦🏿‍♀ woman facepalming: dark skin tone
+1F937                                      ; fully-qualified     # 🤷 person shrugging
+1F937 1F3FB                                ; fully-qualified     # 🤷🏻 person shrugging: light skin tone
+1F937 1F3FC                                ; fully-qualified     # 🤷🏼 person shrugging: medium-light skin tone
+1F937 1F3FD                                ; fully-qualified     # 🤷🏽 person shrugging: medium skin tone
+1F937 1F3FE                                ; fully-qualified     # 🤷🏾 person shrugging: medium-dark skin tone
+1F937 1F3FF                                ; fully-qualified     # 🤷🏿 person shrugging: dark skin tone
+1F937 200D 2642 FE0F                       ; fully-qualified     # 🤷‍♂️ man shrugging
+1F937 200D 2642                            ; minimally-qualified # 🤷‍♂ man shrugging
+1F937 1F3FB 200D 2642 FE0F                 ; fully-qualified     # 🤷🏻‍♂️ man shrugging: light skin tone
+1F937 1F3FB 200D 2642                      ; minimally-qualified # 🤷🏻‍♂ man shrugging: light skin tone
+1F937 1F3FC 200D 2642 FE0F                 ; fully-qualified     # 🤷🏼‍♂️ man shrugging: medium-light skin tone
+1F937 1F3FC 200D 2642                      ; minimally-qualified # 🤷🏼‍♂ man shrugging: medium-light skin tone
+1F937 1F3FD 200D 2642 FE0F                 ; fully-qualified     # 🤷🏽‍♂️ man shrugging: medium skin tone
+1F937 1F3FD 200D 2642                      ; minimally-qualified # 🤷🏽‍♂ man shrugging: medium skin tone
+1F937 1F3FE 200D 2642 FE0F                 ; fully-qualified     # 🤷🏾‍♂️ man shrugging: medium-dark skin tone
+1F937 1F3FE 200D 2642                      ; minimally-qualified # 🤷🏾‍♂ man shrugging: medium-dark skin tone
+1F937 1F3FF 200D 2642 FE0F                 ; fully-qualified     # 🤷🏿‍♂️ man shrugging: dark skin tone
+1F937 1F3FF 200D 2642                      ; minimally-qualified # 🤷🏿‍♂ man shrugging: dark skin tone
+1F937 200D 2640 FE0F                       ; fully-qualified     # 🤷‍♀️ woman shrugging
+1F937 200D 2640                            ; minimally-qualified # 🤷‍♀ woman shrugging
+1F937 1F3FB 200D 2640 FE0F                 ; fully-qualified     # 🤷🏻‍♀️ woman shrugging: light skin tone
+1F937 1F3FB 200D 2640                      ; minimally-qualified # 🤷🏻‍♀ woman shrugging: light skin tone
+1F937 1F3FC 200D 2640 FE0F                 ; fully-qualified     # 🤷🏼‍♀️ woman shrugging: medium-light skin tone
+1F937 1F3FC 200D 2640                      ; minimally-qualified # 🤷🏼‍♀ woman shrugging: medium-light skin tone
+1F937 1F3FD 200D 2640 FE0F                 ; fully-qualified     # 🤷🏽‍♀️ woman shrugging: medium skin tone
+1F937 1F3FD 200D 2640                      ; minimally-qualified # 🤷🏽‍♀ woman shrugging: medium skin tone
+1F937 1F3FE 200D 2640 FE0F                 ; fully-qualified     # 🤷🏾‍♀️ woman shrugging: medium-dark skin tone
+1F937 1F3FE 200D 2640                      ; minimally-qualified # 🤷🏾‍♀ woman shrugging: medium-dark skin tone
+1F937 1F3FF 200D 2640 FE0F                 ; fully-qualified     # 🤷🏿‍♀️ woman shrugging: dark skin tone
+1F937 1F3FF 200D 2640                      ; minimally-qualified # 🤷🏿‍♀ woman shrugging: dark skin tone
+
+# subgroup: person-role
+1F468 200D 2695 FE0F                       ; fully-qualified     # 👨‍⚕️ man health worker
+1F468 200D 2695                            ; minimally-qualified # 👨‍⚕ man health worker
+1F468 1F3FB 200D 2695 FE0F                 ; fully-qualified     # 👨🏻‍⚕️ man health worker: light skin tone
+1F468 1F3FB 200D 2695                      ; minimally-qualified # 👨🏻‍⚕ man health worker: light skin tone
+1F468 1F3FC 200D 2695 FE0F                 ; fully-qualified     # 👨🏼‍⚕️ man health worker: medium-light skin tone
+1F468 1F3FC 200D 2695                      ; minimally-qualified # 👨🏼‍⚕ man health worker: medium-light skin tone
+1F468 1F3FD 200D 2695 FE0F                 ; fully-qualified     # 👨🏽‍⚕️ man health worker: medium skin tone
+1F468 1F3FD 200D 2695                      ; minimally-qualified # 👨🏽‍⚕ man health worker: medium skin tone
+1F468 1F3FE 200D 2695 FE0F                 ; fully-qualified     # 👨🏾‍⚕️ man health worker: medium-dark skin tone
+1F468 1F3FE 200D 2695                      ; minimally-qualified # 👨🏾‍⚕ man health worker: medium-dark skin tone
+1F468 1F3FF 200D 2695 FE0F                 ; fully-qualified     # 👨🏿‍⚕️ man health worker: dark skin tone
+1F468 1F3FF 200D 2695                      ; minimally-qualified # 👨🏿‍⚕ man health worker: dark skin tone
+1F469 200D 2695 FE0F                       ; fully-qualified     # 👩‍⚕️ woman health worker
+1F469 200D 2695                            ; minimally-qualified # 👩‍⚕ woman health worker
+1F469 1F3FB 200D 2695 FE0F                 ; fully-qualified     # 👩🏻‍⚕️ woman health worker: light skin tone
+1F469 1F3FB 200D 2695                      ; minimally-qualified # 👩🏻‍⚕ woman health worker: light skin tone
+1F469 1F3FC 200D 2695 FE0F                 ; fully-qualified     # 👩🏼‍⚕️ woman health worker: medium-light skin tone
+1F469 1F3FC 200D 2695                      ; minimally-qualified # 👩🏼‍⚕ woman health worker: medium-light skin tone
+1F469 1F3FD 200D 2695 FE0F                 ; fully-qualified     # 👩🏽‍⚕️ woman health worker: medium skin tone
+1F469 1F3FD 200D 2695                      ; minimally-qualified # 👩🏽‍⚕ woman health worker: medium skin tone
+1F469 1F3FE 200D 2695 FE0F                 ; fully-qualified     # 👩🏾‍⚕️ woman health worker: medium-dark skin tone
+1F469 1F3FE 200D 2695                      ; minimally-qualified # 👩🏾‍⚕ woman health worker: medium-dark skin tone
+1F469 1F3FF 200D 2695 FE0F                 ; fully-qualified     # 👩🏿‍⚕️ woman health worker: dark skin tone
+1F469 1F3FF 200D 2695                      ; minimally-qualified # 👩🏿‍⚕ woman health worker: dark skin tone
+1F468 200D 1F393                           ; fully-qualified     # 👨‍🎓 man student
+1F468 1F3FB 200D 1F393                     ; fully-qualified     # 👨🏻‍🎓 man student: light skin tone
+1F468 1F3FC 200D 1F393                     ; fully-qualified     # 👨🏼‍🎓 man student: medium-light skin tone
+1F468 1F3FD 200D 1F393                     ; fully-qualified     # 👨🏽‍🎓 man student: medium skin tone
+1F468 1F3FE 200D 1F393                     ; fully-qualified     # 👨🏾‍🎓 man student: medium-dark skin tone
+1F468 1F3FF 200D 1F393                     ; fully-qualified     # 👨🏿‍🎓 man student: dark skin tone
+1F469 200D 1F393                           ; fully-qualified     # 👩‍🎓 woman student
+1F469 1F3FB 200D 1F393                     ; fully-qualified     # 👩🏻‍🎓 woman student: light skin tone
+1F469 1F3FC 200D 1F393                     ; fully-qualified     # 👩🏼‍🎓 woman student: medium-light skin tone
+1F469 1F3FD 200D 1F393                     ; fully-qualified     # 👩🏽‍🎓 woman student: medium skin tone
+1F469 1F3FE 200D 1F393                     ; fully-qualified     # 👩🏾‍🎓 woman student: medium-dark skin tone
+1F469 1F3FF 200D 1F393                     ; fully-qualified     # 👩🏿‍🎓 woman student: dark skin tone
+1F468 200D 1F3EB                           ; fully-qualified     # 👨‍🏫 man teacher
+1F468 1F3FB 200D 1F3EB                     ; fully-qualified     # 👨🏻‍🏫 man teacher: light skin tone
+1F468 1F3FC 200D 1F3EB                     ; fully-qualified     # 👨🏼‍🏫 man teacher: medium-light skin tone
+1F468 1F3FD 200D 1F3EB                     ; fully-qualified     # 👨🏽‍🏫 man teacher: medium skin tone
+1F468 1F3FE 200D 1F3EB                     ; fully-qualified     # 👨🏾‍🏫 man teacher: medium-dark skin tone
+1F468 1F3FF 200D 1F3EB                     ; fully-qualified     # 👨🏿‍🏫 man teacher: dark skin tone
+1F469 200D 1F3EB                           ; fully-qualified     # 👩‍🏫 woman teacher
+1F469 1F3FB 200D 1F3EB                     ; fully-qualified     # 👩🏻‍🏫 woman teacher: light skin tone
+1F469 1F3FC 200D 1F3EB                     ; fully-qualified     # 👩🏼‍🏫 woman teacher: medium-light skin tone
+1F469 1F3FD 200D 1F3EB                     ; fully-qualified     # 👩🏽‍🏫 woman teacher: medium skin tone
+1F469 1F3FE 200D 1F3EB                     ; fully-qualified     # 👩🏾‍🏫 woman teacher: medium-dark skin tone
+1F469 1F3FF 200D 1F3EB                     ; fully-qualified     # 👩🏿‍🏫 woman teacher: dark skin tone
+1F468 200D 2696 FE0F                       ; fully-qualified     # 👨‍⚖️ man judge
+1F468 200D 2696                            ; minimally-qualified # 👨‍⚖ man judge
+1F468 1F3FB 200D 2696 FE0F                 ; fully-qualified     # 👨🏻‍⚖️ man judge: light skin tone
+1F468 1F3FB 200D 2696                      ; minimally-qualified # 👨🏻‍⚖ man judge: light skin tone
+1F468 1F3FC 200D 2696 FE0F                 ; fully-qualified     # 👨🏼‍⚖️ man judge: medium-light skin tone
+1F468 1F3FC 200D 2696                      ; minimally-qualified # 👨🏼‍⚖ man judge: medium-light skin tone
+1F468 1F3FD 200D 2696 FE0F                 ; fully-qualified     # 👨🏽‍⚖️ man judge: medium skin tone
+1F468 1F3FD 200D 2696                      ; minimally-qualified # 👨🏽‍⚖ man judge: medium skin tone
+1F468 1F3FE 200D 2696 FE0F                 ; fully-qualified     # 👨🏾‍⚖️ man judge: medium-dark skin tone
+1F468 1F3FE 200D 2696                      ; minimally-qualified # 👨🏾‍⚖ man judge: medium-dark skin tone
+1F468 1F3FF 200D 2696 FE0F                 ; fully-qualified     # 👨🏿‍⚖️ man judge: dark skin tone
+1F468 1F3FF 200D 2696                      ; minimally-qualified # 👨🏿‍⚖ man judge: dark skin tone
+1F469 200D 2696 FE0F                       ; fully-qualified     # 👩‍⚖️ woman judge
+1F469 200D 2696                            ; minimally-qualified # 👩‍⚖ woman judge
+1F469 1F3FB 200D 2696 FE0F                 ; fully-qualified     # 👩🏻‍⚖️ woman judge: light skin tone
+1F469 1F3FB 200D 2696                      ; minimally-qualified # 👩🏻‍⚖ woman judge: light skin tone
+1F469 1F3FC 200D 2696 FE0F                 ; fully-qualified     # 👩🏼‍⚖️ woman judge: medium-light skin tone
+1F469 1F3FC 200D 2696                      ; minimally-qualified # 👩🏼‍⚖ woman judge: medium-light skin tone
+1F469 1F3FD 200D 2696 FE0F                 ; fully-qualified     # 👩🏽‍⚖️ woman judge: medium skin tone
+1F469 1F3FD 200D 2696                      ; minimally-qualified # 👩🏽‍⚖ woman judge: medium skin tone
+1F469 1F3FE 200D 2696 FE0F                 ; fully-qualified     # 👩🏾‍⚖️ woman judge: medium-dark skin tone
+1F469 1F3FE 200D 2696                      ; minimally-qualified # 👩🏾‍⚖ woman judge: medium-dark skin tone
+1F469 1F3FF 200D 2696 FE0F                 ; fully-qualified     # 👩🏿‍⚖️ woman judge: dark skin tone
+1F469 1F3FF 200D 2696                      ; minimally-qualified # 👩🏿‍⚖ woman judge: dark skin tone
+1F468 200D 1F33E                           ; fully-qualified     # 👨‍🌾 man farmer
+1F468 1F3FB 200D 1F33E                     ; fully-qualified     # 👨🏻‍🌾 man farmer: light skin tone
+1F468 1F3FC 200D 1F33E                     ; fully-qualified     # 👨🏼‍🌾 man farmer: medium-light skin tone
+1F468 1F3FD 200D 1F33E                     ; fully-qualified     # 👨🏽‍🌾 man farmer: medium skin tone
+1F468 1F3FE 200D 1F33E                     ; fully-qualified     # 👨🏾‍🌾 man farmer: medium-dark skin tone
+1F468 1F3FF 200D 1F33E                     ; fully-qualified     # 👨🏿‍🌾 man farmer: dark skin tone
+1F469 200D 1F33E                           ; fully-qualified     # 👩‍🌾 woman farmer
+1F469 1F3FB 200D 1F33E                     ; fully-qualified     # 👩🏻‍🌾 woman farmer: light skin tone
+1F469 1F3FC 200D 1F33E                     ; fully-qualified     # 👩🏼‍🌾 woman farmer: medium-light skin tone
+1F469 1F3FD 200D 1F33E                     ; fully-qualified     # 👩🏽‍🌾 woman farmer: medium skin tone
+1F469 1F3FE 200D 1F33E                     ; fully-qualified     # 👩🏾‍🌾 woman farmer: medium-dark skin tone
+1F469 1F3FF 200D 1F33E                     ; fully-qualified     # 👩🏿‍🌾 woman farmer: dark skin tone
+1F468 200D 1F373                           ; fully-qualified     # 👨‍🍳 man cook
+1F468 1F3FB 200D 1F373                     ; fully-qualified     # 👨🏻‍🍳 man cook: light skin tone
+1F468 1F3FC 200D 1F373                     ; fully-qualified     # 👨🏼‍🍳 man cook: medium-light skin tone
+1F468 1F3FD 200D 1F373                     ; fully-qualified     # 👨🏽‍🍳 man cook: medium skin tone
+1F468 1F3FE 200D 1F373                     ; fully-qualified     # 👨🏾‍🍳 man cook: medium-dark skin tone
+1F468 1F3FF 200D 1F373                     ; fully-qualified     # 👨🏿‍🍳 man cook: dark skin tone
+1F469 200D 1F373                           ; fully-qualified     # 👩‍🍳 woman cook
+1F469 1F3FB 200D 1F373                     ; fully-qualified     # 👩🏻‍🍳 woman cook: light skin tone
+1F469 1F3FC 200D 1F373                     ; fully-qualified     # 👩🏼‍🍳 woman cook: medium-light skin tone
+1F469 1F3FD 200D 1F373                     ; fully-qualified     # 👩🏽‍🍳 woman cook: medium skin tone
+1F469 1F3FE 200D 1F373                     ; fully-qualified     # 👩🏾‍🍳 woman cook: medium-dark skin tone
+1F469 1F3FF 200D 1F373                     ; fully-qualified     # 👩🏿‍🍳 woman cook: dark skin tone
+1F468 200D 1F527                           ; fully-qualified     # 👨‍🔧 man mechanic
+1F468 1F3FB 200D 1F527                     ; fully-qualified     # 👨🏻‍🔧 man mechanic: light skin tone
+1F468 1F3FC 200D 1F527                     ; fully-qualified     # 👨🏼‍🔧 man mechanic: medium-light skin tone
+1F468 1F3FD 200D 1F527                     ; fully-qualified     # 👨🏽‍🔧 man mechanic: medium skin tone
+1F468 1F3FE 200D 1F527                     ; fully-qualified     # 👨🏾‍🔧 man mechanic: medium-dark skin tone
+1F468 1F3FF 200D 1F527                     ; fully-qualified     # 👨🏿‍🔧 man mechanic: dark skin tone
+1F469 200D 1F527                           ; fully-qualified     # 👩‍🔧 woman mechanic
+1F469 1F3FB 200D 1F527                     ; fully-qualified     # 👩🏻‍🔧 woman mechanic: light skin tone
+1F469 1F3FC 200D 1F527                     ; fully-qualified     # 👩🏼‍🔧 woman mechanic: medium-light skin tone
+1F469 1F3FD 200D 1F527                     ; fully-qualified     # 👩🏽‍🔧 woman mechanic: medium skin tone
+1F469 1F3FE 200D 1F527                     ; fully-qualified     # 👩🏾‍🔧 woman mechanic: medium-dark skin tone
+1F469 1F3FF 200D 1F527                     ; fully-qualified     # 👩🏿‍🔧 woman mechanic: dark skin tone
+1F468 200D 1F3ED                           ; fully-qualified     # 👨‍🏭 man factory worker
+1F468 1F3FB 200D 1F3ED                     ; fully-qualified     # 👨🏻‍🏭 man factory worker: light skin tone
+1F468 1F3FC 200D 1F3ED                     ; fully-qualified     # 👨🏼‍🏭 man factory worker: medium-light skin tone
+1F468 1F3FD 200D 1F3ED                     ; fully-qualified     # 👨🏽‍🏭 man factory worker: medium skin tone
+1F468 1F3FE 200D 1F3ED                     ; fully-qualified     # 👨🏾‍🏭 man factory worker: medium-dark skin tone
+1F468 1F3FF 200D 1F3ED                     ; fully-qualified     # 👨🏿‍🏭 man factory worker: dark skin tone
+1F469 200D 1F3ED                           ; fully-qualified     # 👩‍🏭 woman factory worker
+1F469 1F3FB 200D 1F3ED                     ; fully-qualified     # 👩🏻‍🏭 woman factory worker: light skin tone
+1F469 1F3FC 200D 1F3ED                     ; fully-qualified     # 👩🏼‍🏭 woman factory worker: medium-light skin tone
+1F469 1F3FD 200D 1F3ED                     ; fully-qualified     # 👩🏽‍🏭 woman factory worker: medium skin tone
+1F469 1F3FE 200D 1F3ED                     ; fully-qualified     # 👩🏾‍🏭 woman factory worker: medium-dark skin tone
+1F469 1F3FF 200D 1F3ED                     ; fully-qualified     # 👩🏿‍🏭 woman factory worker: dark skin tone
+1F468 200D 1F4BC                           ; fully-qualified     # 👨‍💼 man office worker
+1F468 1F3FB 200D 1F4BC                     ; fully-qualified     # 👨🏻‍💼 man office worker: light skin tone
+1F468 1F3FC 200D 1F4BC                     ; fully-qualified     # 👨🏼‍💼 man office worker: medium-light skin tone
+1F468 1F3FD 200D 1F4BC                     ; fully-qualified     # 👨🏽‍💼 man office worker: medium skin tone
+1F468 1F3FE 200D 1F4BC                     ; fully-qualified     # 👨🏾‍💼 man office worker: medium-dark skin tone
+1F468 1F3FF 200D 1F4BC                     ; fully-qualified     # 👨🏿‍💼 man office worker: dark skin tone
+1F469 200D 1F4BC                           ; fully-qualified     # 👩‍💼 woman office worker
+1F469 1F3FB 200D 1F4BC                     ; fully-qualified     # 👩🏻‍💼 woman office worker: light skin tone
+1F469 1F3FC 200D 1F4BC                     ; fully-qualified     # 👩🏼‍💼 woman office worker: medium-light skin tone
+1F469 1F3FD 200D 1F4BC                     ; fully-qualified     # 👩🏽‍💼 woman office worker: medium skin tone
+1F469 1F3FE 200D 1F4BC                     ; fully-qualified     # 👩🏾‍💼 woman office worker: medium-dark skin tone
+1F469 1F3FF 200D 1F4BC                     ; fully-qualified     # 👩🏿‍💼 woman office worker: dark skin tone
+1F468 200D 1F52C                           ; fully-qualified     # 👨‍🔬 man scientist
+1F468 1F3FB 200D 1F52C                     ; fully-qualified     # 👨🏻‍🔬 man scientist: light skin tone
+1F468 1F3FC 200D 1F52C                     ; fully-qualified     # 👨🏼‍🔬 man scientist: medium-light skin tone
+1F468 1F3FD 200D 1F52C                     ; fully-qualified     # 👨🏽‍🔬 man scientist: medium skin tone
+1F468 1F3FE 200D 1F52C                     ; fully-qualified     # 👨🏾‍🔬 man scientist: medium-dark skin tone
+1F468 1F3FF 200D 1F52C                     ; fully-qualified     # 👨🏿‍🔬 man scientist: dark skin tone
+1F469 200D 1F52C                           ; fully-qualified     # 👩‍🔬 woman scientist
+1F469 1F3FB 200D 1F52C                     ; fully-qualified     # 👩🏻‍🔬 woman scientist: light skin tone
+1F469 1F3FC 200D 1F52C                     ; fully-qualified     # 👩🏼‍🔬 woman scientist: medium-light skin tone
+1F469 1F3FD 200D 1F52C                     ; fully-qualified     # 👩🏽‍🔬 woman scientist: medium skin tone
+1F469 1F3FE 200D 1F52C                     ; fully-qualified     # 👩🏾‍🔬 woman scientist: medium-dark skin tone
+1F469 1F3FF 200D 1F52C                     ; fully-qualified     # 👩🏿‍🔬 woman scientist: dark skin tone
+1F468 200D 1F4BB                           ; fully-qualified     # 👨‍💻 man technologist
+1F468 1F3FB 200D 1F4BB                     ; fully-qualified     # 👨🏻‍💻 man technologist: light skin tone
+1F468 1F3FC 200D 1F4BB                     ; fully-qualified     # 👨🏼‍💻 man technologist: medium-light skin tone
+1F468 1F3FD 200D 1F4BB                     ; fully-qualified     # 👨🏽‍💻 man technologist: medium skin tone
+1F468 1F3FE 200D 1F4BB                     ; fully-qualified     # 👨🏾‍💻 man technologist: medium-dark skin tone
+1F468 1F3FF 200D 1F4BB                     ; fully-qualified     # 👨🏿‍💻 man technologist: dark skin tone
+1F469 200D 1F4BB                           ; fully-qualified     # 👩‍💻 woman technologist
+1F469 1F3FB 200D 1F4BB                     ; fully-qualified     # 👩🏻‍💻 woman technologist: light skin tone
+1F469 1F3FC 200D 1F4BB                     ; fully-qualified     # 👩🏼‍💻 woman technologist: medium-light skin tone
+1F469 1F3FD 200D 1F4BB                     ; fully-qualified     # 👩🏽‍💻 woman technologist: medium skin tone
+1F469 1F3FE 200D 1F4BB                     ; fully-qualified     # 👩🏾‍💻 woman technologist: medium-dark skin tone
+1F469 1F3FF 200D 1F4BB                     ; fully-qualified     # 👩🏿‍💻 woman technologist: dark skin tone
+1F468 200D 1F3A4                           ; fully-qualified     # 👨‍🎤 man singer
+1F468 1F3FB 200D 1F3A4                     ; fully-qualified     # 👨🏻‍🎤 man singer: light skin tone
+1F468 1F3FC 200D 1F3A4                     ; fully-qualified     # 👨🏼‍🎤 man singer: medium-light skin tone
+1F468 1F3FD 200D 1F3A4                     ; fully-qualified     # 👨🏽‍🎤 man singer: medium skin tone
+1F468 1F3FE 200D 1F3A4                     ; fully-qualified     # 👨🏾‍🎤 man singer: medium-dark skin tone
+1F468 1F3FF 200D 1F3A4                     ; fully-qualified     # 👨🏿‍🎤 man singer: dark skin tone
+1F469 200D 1F3A4                           ; fully-qualified     # 👩‍🎤 woman singer
+1F469 1F3FB 200D 1F3A4                     ; fully-qualified     # 👩🏻‍🎤 woman singer: light skin tone
+1F469 1F3FC 200D 1F3A4                     ; fully-qualified     # 👩🏼‍🎤 woman singer: medium-light skin tone
+1F469 1F3FD 200D 1F3A4                     ; fully-qualified     # 👩🏽‍🎤 woman singer: medium skin tone
+1F469 1F3FE 200D 1F3A4                     ; fully-qualified     # 👩🏾‍🎤 woman singer: medium-dark skin tone
+1F469 1F3FF 200D 1F3A4                     ; fully-qualified     # 👩🏿‍🎤 woman singer: dark skin tone
+1F468 200D 1F3A8                           ; fully-qualified     # 👨‍🎨 man artist
+1F468 1F3FB 200D 1F3A8                     ; fully-qualified     # 👨🏻‍🎨 man artist: light skin tone
+1F468 1F3FC 200D 1F3A8                     ; fully-qualified     # 👨🏼‍🎨 man artist: medium-light skin tone
+1F468 1F3FD 200D 1F3A8                     ; fully-qualified     # 👨🏽‍🎨 man artist: medium skin tone
+1F468 1F3FE 200D 1F3A8                     ; fully-qualified     # 👨🏾‍🎨 man artist: medium-dark skin tone
+1F468 1F3FF 200D 1F3A8                     ; fully-qualified     # 👨🏿‍🎨 man artist: dark skin tone
+1F469 200D 1F3A8                           ; fully-qualified     # 👩‍🎨 woman artist
+1F469 1F3FB 200D 1F3A8                     ; fully-qualified     # 👩🏻‍🎨 woman artist: light skin tone
+1F469 1F3FC 200D 1F3A8                     ; fully-qualified     # 👩🏼‍🎨 woman artist: medium-light skin tone
+1F469 1F3FD 200D 1F3A8                     ; fully-qualified     # 👩🏽‍🎨 woman artist: medium skin tone
+1F469 1F3FE 200D 1F3A8                     ; fully-qualified     # 👩🏾‍🎨 woman artist: medium-dark skin tone
+1F469 1F3FF 200D 1F3A8                     ; fully-qualified     # 👩🏿‍🎨 woman artist: dark skin tone
+1F468 200D 2708 FE0F                       ; fully-qualified     # 👨‍✈️ man pilot
+1F468 200D 2708                            ; minimally-qualified # 👨‍✈ man pilot
+1F468 1F3FB 200D 2708 FE0F                 ; fully-qualified     # 👨🏻‍✈️ man pilot: light skin tone
+1F468 1F3FB 200D 2708                      ; minimally-qualified # 👨🏻‍✈ man pilot: light skin tone
+1F468 1F3FC 200D 2708 FE0F                 ; fully-qualified     # 👨🏼‍✈️ man pilot: medium-light skin tone
+1F468 1F3FC 200D 2708                      ; minimally-qualified # 👨🏼‍✈ man pilot: medium-light skin tone
+1F468 1F3FD 200D 2708 FE0F                 ; fully-qualified     # 👨🏽‍✈️ man pilot: medium skin tone
+1F468 1F3FD 200D 2708                      ; minimally-qualified # 👨🏽‍✈ man pilot: medium skin tone
+1F468 1F3FE 200D 2708 FE0F                 ; fully-qualified     # 👨🏾‍✈️ man pilot: medium-dark skin tone
+1F468 1F3FE 200D 2708                      ; minimally-qualified # 👨🏾‍✈ man pilot: medium-dark skin tone
+1F468 1F3FF 200D 2708 FE0F                 ; fully-qualified     # 👨🏿‍✈️ man pilot: dark skin tone
+1F468 1F3FF 200D 2708                      ; minimally-qualified # 👨🏿‍✈ man pilot: dark skin tone
+1F469 200D 2708 FE0F                       ; fully-qualified     # 👩‍✈️ woman pilot
+1F469 200D 2708                            ; minimally-qualified # 👩‍✈ woman pilot
+1F469 1F3FB 200D 2708 FE0F                 ; fully-qualified     # 👩🏻‍✈️ woman pilot: light skin tone
+1F469 1F3FB 200D 2708                      ; minimally-qualified # 👩🏻‍✈ woman pilot: light skin tone
+1F469 1F3FC 200D 2708 FE0F                 ; fully-qualified     # 👩🏼‍✈️ woman pilot: medium-light skin tone
+1F469 1F3FC 200D 2708                      ; minimally-qualified # 👩🏼‍✈ woman pilot: medium-light skin tone
+1F469 1F3FD 200D 2708 FE0F                 ; fully-qualified     # 👩🏽‍✈️ woman pilot: medium skin tone
+1F469 1F3FD 200D 2708                      ; minimally-qualified # 👩🏽‍✈ woman pilot: medium skin tone
+1F469 1F3FE 200D 2708 FE0F                 ; fully-qualified     # 👩🏾‍✈️ woman pilot: medium-dark skin tone
+1F469 1F3FE 200D 2708                      ; minimally-qualified # 👩🏾‍✈ woman pilot: medium-dark skin tone
+1F469 1F3FF 200D 2708 FE0F                 ; fully-qualified     # 👩🏿‍✈️ woman pilot: dark skin tone
+1F469 1F3FF 200D 2708                      ; minimally-qualified # 👩🏿‍✈ woman pilot: dark skin tone
+1F468 200D 1F680                           ; fully-qualified     # 👨‍🚀 man astronaut
+1F468 1F3FB 200D 1F680                     ; fully-qualified     # 👨🏻‍🚀 man astronaut: light skin tone
+1F468 1F3FC 200D 1F680                     ; fully-qualified     # 👨🏼‍🚀 man astronaut: medium-light skin tone
+1F468 1F3FD 200D 1F680                     ; fully-qualified     # 👨🏽‍🚀 man astronaut: medium skin tone
+1F468 1F3FE 200D 1F680                     ; fully-qualified     # 👨🏾‍🚀 man astronaut: medium-dark skin tone
+1F468 1F3FF 200D 1F680                     ; fully-qualified     # 👨🏿‍🚀 man astronaut: dark skin tone
+1F469 200D 1F680                           ; fully-qualified     # 👩‍🚀 woman astronaut
+1F469 1F3FB 200D 1F680                     ; fully-qualified     # 👩🏻‍🚀 woman astronaut: light skin tone
+1F469 1F3FC 200D 1F680                     ; fully-qualified     # 👩🏼‍🚀 woman astronaut: medium-light skin tone
+1F469 1F3FD 200D 1F680                     ; fully-qualified     # 👩🏽‍🚀 woman astronaut: medium skin tone
+1F469 1F3FE 200D 1F680                     ; fully-qualified     # 👩🏾‍🚀 woman astronaut: medium-dark skin tone
+1F469 1F3FF 200D 1F680                     ; fully-qualified     # 👩🏿‍🚀 woman astronaut: dark skin tone
+1F468 200D 1F692                           ; fully-qualified     # 👨‍🚒 man firefighter
+1F468 1F3FB 200D 1F692                     ; fully-qualified     # 👨🏻‍🚒 man firefighter: light skin tone
+1F468 1F3FC 200D 1F692                     ; fully-qualified     # 👨🏼‍🚒 man firefighter: medium-light skin tone
+1F468 1F3FD 200D 1F692                     ; fully-qualified     # 👨🏽‍🚒 man firefighter: medium skin tone
+1F468 1F3FE 200D 1F692                     ; fully-qualified     # 👨🏾‍🚒 man firefighter: medium-dark skin tone
+1F468 1F3FF 200D 1F692                     ; fully-qualified     # 👨🏿‍🚒 man firefighter: dark skin tone
+1F469 200D 1F692                           ; fully-qualified     # 👩‍🚒 woman firefighter
+1F469 1F3FB 200D 1F692                     ; fully-qualified     # 👩🏻‍🚒 woman firefighter: light skin tone
+1F469 1F3FC 200D 1F692                     ; fully-qualified     # 👩🏼‍🚒 woman firefighter: medium-light skin tone
+1F469 1F3FD 200D 1F692                     ; fully-qualified     # 👩🏽‍🚒 woman firefighter: medium skin tone
+1F469 1F3FE 200D 1F692                     ; fully-qualified     # 👩🏾‍🚒 woman firefighter: medium-dark skin tone
+1F469 1F3FF 200D 1F692                     ; fully-qualified     # 👩🏿‍🚒 woman firefighter: dark skin tone
+1F46E                                      ; fully-qualified     # 👮 police officer
+1F46E 1F3FB                                ; fully-qualified     # 👮🏻 police officer: light skin tone
+1F46E 1F3FC                                ; fully-qualified     # 👮🏼 police officer: medium-light skin tone
+1F46E 1F3FD                                ; fully-qualified     # 👮🏽 police officer: medium skin tone
+1F46E 1F3FE                                ; fully-qualified     # 👮🏾 police officer: medium-dark skin tone
+1F46E 1F3FF                                ; fully-qualified     # 👮🏿 police officer: dark skin tone
+1F46E 200D 2642 FE0F                       ; fully-qualified     # 👮‍♂️ man police officer
+1F46E 200D 2642                            ; minimally-qualified # 👮‍♂ man police officer
+1F46E 1F3FB 200D 2642 FE0F                 ; fully-qualified     # 👮🏻‍♂️ man police officer: light skin tone
+1F46E 1F3FB 200D 2642                      ; minimally-qualified # 👮🏻‍♂ man police officer: light skin tone
+1F46E 1F3FC 200D 2642 FE0F                 ; fully-qualified     # 👮🏼‍♂️ man police officer: medium-light skin tone
+1F46E 1F3FC 200D 2642                      ; minimally-qualified # 👮🏼‍♂ man police officer: medium-light skin tone
+1F46E 1F3FD 200D 2642 FE0F                 ; fully-qualified     # 👮🏽‍♂️ man police officer: medium skin tone
+1F46E 1F3FD 200D 2642                      ; minimally-qualified # 👮🏽‍♂ man police officer: medium skin tone
+1F46E 1F3FE 200D 2642 FE0F                 ; fully-qualified     # 👮🏾‍♂️ man police officer: medium-dark skin tone
+1F46E 1F3FE 200D 2642                      ; minimally-qualified # 👮🏾‍♂ man police officer: medium-dark skin tone
+1F46E 1F3FF 200D 2642 FE0F                 ; fully-qualified     # 👮🏿‍♂️ man police officer: dark skin tone
+1F46E 1F3FF 200D 2642                      ; minimally-qualified # 👮🏿‍♂ man police officer: dark skin tone
+1F46E 200D 2640 FE0F                       ; fully-qualified     # 👮‍♀️ woman police officer
+1F46E 200D 2640                            ; minimally-qualified # 👮‍♀ woman police officer
+1F46E 1F3FB 200D 2640 FE0F                 ; fully-qualified     # 👮🏻‍♀️ woman police officer: light skin tone
+1F46E 1F3FB 200D 2640                      ; minimally-qualified # 👮🏻‍♀ woman police officer: light skin tone
+1F46E 1F3FC 200D 2640 FE0F                 ; fully-qualified     # 👮🏼‍♀️ woman police officer: medium-light skin tone
+1F46E 1F3FC 200D 2640                      ; minimally-qualified # 👮🏼‍♀ woman police officer: medium-light skin tone
+1F46E 1F3FD 200D 2640 FE0F                 ; fully-qualified     # 👮🏽‍♀️ woman police officer: medium skin tone
+1F46E 1F3FD 200D 2640                      ; minimally-qualified # 👮🏽‍♀ woman police officer: medium skin tone
+1F46E 1F3FE 200D 2640 FE0F                 ; fully-qualified     # 👮🏾‍♀️ woman police officer: medium-dark skin tone
+1F46E 1F3FE 200D 2640                      ; minimally-qualified # 👮🏾‍♀ woman police officer: medium-dark skin tone
+1F46E 1F3FF 200D 2640 FE0F                 ; fully-qualified     # 👮🏿‍♀️ woman police officer: dark skin tone
+1F46E 1F3FF 200D 2640                      ; minimally-qualified # 👮🏿‍♀ woman police officer: dark skin tone
+1F575 FE0F                                 ; fully-qualified     # 🕵️ detective
+1F575                                      ; unqualified         # 🕵 detective
+1F575 1F3FB                                ; fully-qualified     # 🕵🏻 detective: light skin tone
+1F575 1F3FC                                ; fully-qualified     # 🕵🏼 detective: medium-light skin tone
+1F575 1F3FD                                ; fully-qualified     # 🕵🏽 detective: medium skin tone
+1F575 1F3FE                                ; fully-qualified     # 🕵🏾 detective: medium-dark skin tone
+1F575 1F3FF                                ; fully-qualified     # 🕵🏿 detective: dark skin tone
+1F575 FE0F 200D 2642 FE0F                  ; fully-qualified     # 🕵️‍♂️ man detective
+1F575 200D 2642 FE0F                       ; unqualified         # 🕵‍♂️ man detective
+1F575 FE0F 200D 2642                       ; unqualified         # 🕵️‍♂ man detective
+1F575 200D 2642                            ; unqualified         # 🕵‍♂ man detective
+1F575 1F3FB 200D 2642 FE0F                 ; fully-qualified     # 🕵🏻‍♂️ man detective: light skin tone
+1F575 1F3FB 200D 2642                      ; minimally-qualified # 🕵🏻‍♂ man detective: light skin tone
+1F575 1F3FC 200D 2642 FE0F                 ; fully-qualified     # 🕵🏼‍♂️ man detective: medium-light skin tone
+1F575 1F3FC 200D 2642                      ; minimally-qualified # 🕵🏼‍♂ man detective: medium-light skin tone
+1F575 1F3FD 200D 2642 FE0F                 ; fully-qualified     # 🕵🏽‍♂️ man detective: medium skin tone
+1F575 1F3FD 200D 2642                      ; minimally-qualified # 🕵🏽‍♂ man detective: medium skin tone
+1F575 1F3FE 200D 2642 FE0F                 ; fully-qualified     # 🕵🏾‍♂️ man detective: medium-dark skin tone
+1F575 1F3FE 200D 2642                      ; minimally-qualified # 🕵🏾‍♂ man detective: medium-dark skin tone
+1F575 1F3FF 200D 2642 FE0F                 ; fully-qualified     # 🕵🏿‍♂️ man detective: dark skin tone
+1F575 1F3FF 200D 2642                      ; minimally-qualified # 🕵🏿‍♂ man detective: dark skin tone
+1F575 FE0F 200D 2640 FE0F                  ; fully-qualified     # 🕵️‍♀️ woman detective
+1F575 200D 2640 FE0F                       ; unqualified         # 🕵‍♀️ woman detective
+1F575 FE0F 200D 2640                       ; unqualified         # 🕵️‍♀ woman detective
+1F575 200D 2640                            ; unqualified         # 🕵‍♀ woman detective
+1F575 1F3FB 200D 2640 FE0F                 ; fully-qualified     # 🕵🏻‍♀️ woman detective: light skin tone
+1F575 1F3FB 200D 2640                      ; minimally-qualified # 🕵🏻‍♀ woman detective: light skin tone
+1F575 1F3FC 200D 2640 FE0F                 ; fully-qualified     # 🕵🏼‍♀️ woman detective: medium-light skin tone
+1F575 1F3FC 200D 2640                      ; minimally-qualified # 🕵🏼‍♀ woman detective: medium-light skin tone
+1F575 1F3FD 200D 2640 FE0F                 ; fully-qualified     # 🕵🏽‍♀️ woman detective: medium skin tone
+1F575 1F3FD 200D 2640                      ; minimally-qualified # 🕵🏽‍♀ woman detective: medium skin tone
+1F575 1F3FE 200D 2640 FE0F                 ; fully-qualified     # 🕵🏾‍♀️ woman detective: medium-dark skin tone
+1F575 1F3FE 200D 2640                      ; minimally-qualified # 🕵🏾‍♀ woman detective: medium-dark skin tone
+1F575 1F3FF 200D 2640 FE0F                 ; fully-qualified     # 🕵🏿‍♀️ woman detective: dark skin tone
+1F575 1F3FF 200D 2640                      ; minimally-qualified # 🕵🏿‍♀ woman detective: dark skin tone
+1F482                                      ; fully-qualified     # 💂 guard
+1F482 1F3FB                                ; fully-qualified     # 💂🏻 guard: light skin tone
+1F482 1F3FC                                ; fully-qualified     # 💂🏼 guard: medium-light skin tone
+1F482 1F3FD                                ; fully-qualified     # 💂🏽 guard: medium skin tone
+1F482 1F3FE                                ; fully-qualified     # 💂🏾 guard: medium-dark skin tone
+1F482 1F3FF                                ; fully-qualified     # 💂🏿 guard: dark skin tone
+1F482 200D 2642 FE0F                       ; fully-qualified     # 💂‍♂️ man guard
+1F482 200D 2642                            ; minimally-qualified # 💂‍♂ man guard
+1F482 1F3FB 200D 2642 FE0F                 ; fully-qualified     # 💂🏻‍♂️ man guard: light skin tone
+1F482 1F3FB 200D 2642                      ; minimally-qualified # 💂🏻‍♂ man guard: light skin tone
+1F482 1F3FC 200D 2642 FE0F                 ; fully-qualified     # 💂🏼‍♂️ man guard: medium-light skin tone
+1F482 1F3FC 200D 2642                      ; minimally-qualified # 💂🏼‍♂ man guard: medium-light skin tone
+1F482 1F3FD 200D 2642 FE0F                 ; fully-qualified     # 💂🏽‍♂️ man guard: medium skin tone
+1F482 1F3FD 200D 2642                      ; minimally-qualified # 💂🏽‍♂ man guard: medium skin tone
+1F482 1F3FE 200D 2642 FE0F                 ; fully-qualified     # 💂🏾‍♂️ man guard: medium-dark skin tone
+1F482 1F3FE 200D 2642                      ; minimally-qualified # 💂🏾‍♂ man guard: medium-dark skin tone
+1F482 1F3FF 200D 2642 FE0F                 ; fully-qualified     # 💂🏿‍♂️ man guard: dark skin tone
+1F482 1F3FF 200D 2642                      ; minimally-qualified # 💂🏿‍♂ man guard: dark skin tone
+1F482 200D 2640 FE0F                       ; fully-qualified     # 💂‍♀️ woman guard
+1F482 200D 2640                            ; minimally-qualified # 💂‍♀ woman guard
+1F482 1F3FB 200D 2640 FE0F                 ; fully-qualified     # 💂🏻‍♀️ woman guard: light skin tone
+1F482 1F3FB 200D 2640                      ; minimally-qualified # 💂🏻‍♀ woman guard: light skin tone
+1F482 1F3FC 200D 2640 FE0F                 ; fully-qualified     # 💂🏼‍♀️ woman guard: medium-light skin tone
+1F482 1F3FC 200D 2640                      ; minimally-qualified # 💂🏼‍♀ woman guard: medium-light skin tone
+1F482 1F3FD 200D 2640 FE0F                 ; fully-qualified     # 💂🏽‍♀️ woman guard: medium skin tone
+1F482 1F3FD 200D 2640                      ; minimally-qualified # 💂🏽‍♀ woman guard: medium skin tone
+1F482 1F3FE 200D 2640 FE0F                 ; fully-qualified     # 💂🏾‍♀️ woman guard: medium-dark skin tone
+1F482 1F3FE 200D 2640                      ; minimally-qualified # 💂🏾‍♀ woman guard: medium-dark skin tone
+1F482 1F3FF 200D 2640 FE0F                 ; fully-qualified     # 💂🏿‍♀️ woman guard: dark skin tone
+1F482 1F3FF 200D 2640                      ; minimally-qualified # 💂🏿‍♀ woman guard: dark skin tone
+1F477                                      ; fully-qualified     # 👷 construction worker
+1F477 1F3FB                                ; fully-qualified     # 👷🏻 construction worker: light skin tone
+1F477 1F3FC                                ; fully-qualified     # 👷🏼 construction worker: medium-light skin tone
+1F477 1F3FD                                ; fully-qualified     # 👷🏽 construction worker: medium skin tone
+1F477 1F3FE                                ; fully-qualified     # 👷🏾 construction worker: medium-dark skin tone
+1F477 1F3FF                                ; fully-qualified     # 👷🏿 construction worker: dark skin tone
+1F477 200D 2642 FE0F                       ; fully-qualified     # 👷‍♂️ man construction worker
+1F477 200D 2642                            ; minimally-qualified # 👷‍♂ man construction worker
+1F477 1F3FB 200D 2642 FE0F                 ; fully-qualified     # 👷🏻‍♂️ man construction worker: light skin tone
+1F477 1F3FB 200D 2642                      ; minimally-qualified # 👷🏻‍♂ man construction worker: light skin tone
+1F477 1F3FC 200D 2642 FE0F                 ; fully-qualified     # 👷🏼‍♂️ man construction worker: medium-light skin tone
+1F477 1F3FC 200D 2642                      ; minimally-qualified # 👷🏼‍♂ man construction worker: medium-light skin tone
+1F477 1F3FD 200D 2642 FE0F                 ; fully-qualified     # 👷🏽‍♂️ man construction worker: medium skin tone
+1F477 1F3FD 200D 2642                      ; minimally-qualified # 👷🏽‍♂ man construction worker: medium skin tone
+1F477 1F3FE 200D 2642 FE0F                 ; fully-qualified     # 👷🏾‍♂️ man construction worker: medium-dark skin tone
+1F477 1F3FE 200D 2642                      ; minimally-qualified # 👷🏾‍♂ man construction worker: medium-dark skin tone
+1F477 1F3FF 200D 2642 FE0F                 ; fully-qualified     # 👷🏿‍♂️ man construction worker: dark skin tone
+1F477 1F3FF 200D 2642                      ; minimally-qualified # 👷🏿‍♂ man construction worker: dark skin tone
+1F477 200D 2640 FE0F                       ; fully-qualified     # 👷‍♀️ woman construction worker
+1F477 200D 2640                            ; minimally-qualified # 👷‍♀ woman construction worker
+1F477 1F3FB 200D 2640 FE0F                 ; fully-qualified     # 👷🏻‍♀️ woman construction worker: light skin tone
+1F477 1F3FB 200D 2640                      ; minimally-qualified # 👷🏻‍♀ woman construction worker: light skin tone
+1F477 1F3FC 200D 2640 FE0F                 ; fully-qualified     # 👷🏼‍♀️ woman construction worker: medium-light skin tone
+1F477 1F3FC 200D 2640                      ; minimally-qualified # 👷🏼‍♀ woman construction worker: medium-light skin tone
+1F477 1F3FD 200D 2640 FE0F                 ; fully-qualified     # 👷🏽‍♀️ woman construction worker: medium skin tone
+1F477 1F3FD 200D 2640                      ; minimally-qualified # 👷🏽‍♀ woman construction worker: medium skin tone
+1F477 1F3FE 200D 2640 FE0F                 ; fully-qualified     # 👷🏾‍♀️ woman construction worker: medium-dark skin tone
+1F477 1F3FE 200D 2640                      ; minimally-qualified # 👷🏾‍♀ woman construction worker: medium-dark skin tone
+1F477 1F3FF 200D 2640 FE0F                 ; fully-qualified     # 👷🏿‍♀️ woman construction worker: dark skin tone
+1F477 1F3FF 200D 2640                      ; minimally-qualified # 👷🏿‍♀ woman construction worker: dark skin tone
+1F934                                      ; fully-qualified     # 🤴 prince
+1F934 1F3FB                                ; fully-qualified     # 🤴🏻 prince: light skin tone
+1F934 1F3FC                                ; fully-qualified     # 🤴🏼 prince: medium-light skin tone
+1F934 1F3FD                                ; fully-qualified     # 🤴🏽 prince: medium skin tone
+1F934 1F3FE                                ; fully-qualified     # 🤴🏾 prince: medium-dark skin tone
+1F934 1F3FF                                ; fully-qualified     # 🤴🏿 prince: dark skin tone
+1F478                                      ; fully-qualified     # 👸 princess
+1F478 1F3FB                                ; fully-qualified     # 👸🏻 princess: light skin tone
+1F478 1F3FC                                ; fully-qualified     # 👸🏼 princess: medium-light skin tone
+1F478 1F3FD                                ; fully-qualified     # 👸🏽 princess: medium skin tone
+1F478 1F3FE                                ; fully-qualified     # 👸🏾 princess: medium-dark skin tone
+1F478 1F3FF                                ; fully-qualified     # 👸🏿 princess: dark skin tone
+1F473                                      ; fully-qualified     # 👳 person wearing turban
+1F473 1F3FB                                ; fully-qualified     # 👳🏻 person wearing turban: light skin tone
+1F473 1F3FC                                ; fully-qualified     # 👳🏼 person wearing turban: medium-light skin tone
+1F473 1F3FD                                ; fully-qualified     # 👳🏽 person wearing turban: medium skin tone
+1F473 1F3FE                                ; fully-qualified     # 👳🏾 person wearing turban: medium-dark skin tone
+1F473 1F3FF                                ; fully-qualified     # 👳🏿 person wearing turban: dark skin tone
+1F473 200D 2642 FE0F                       ; fully-qualified     # 👳‍♂️ man wearing turban
+1F473 200D 2642                            ; minimally-qualified # 👳‍♂ man wearing turban
+1F473 1F3FB 200D 2642 FE0F                 ; fully-qualified     # 👳🏻‍♂️ man wearing turban: light skin tone
+1F473 1F3FB 200D 2642                      ; minimally-qualified # 👳🏻‍♂ man wearing turban: light skin tone
+1F473 1F3FC 200D 2642 FE0F                 ; fully-qualified     # 👳🏼‍♂️ man wearing turban: medium-light skin tone
+1F473 1F3FC 200D 2642                      ; minimally-qualified # 👳🏼‍♂ man wearing turban: medium-light skin tone
+1F473 1F3FD 200D 2642 FE0F                 ; fully-qualified     # 👳🏽‍♂️ man wearing turban: medium skin tone
+1F473 1F3FD 200D 2642                      ; minimally-qualified # 👳🏽‍♂ man wearing turban: medium skin tone
+1F473 1F3FE 200D 2642 FE0F                 ; fully-qualified     # 👳🏾‍♂️ man wearing turban: medium-dark skin tone
+1F473 1F3FE 200D 2642                      ; minimally-qualified # 👳🏾‍♂ man wearing turban: medium-dark skin tone
+1F473 1F3FF 200D 2642 FE0F                 ; fully-qualified     # 👳🏿‍♂️ man wearing turban: dark skin tone
+1F473 1F3FF 200D 2642                      ; minimally-qualified # 👳🏿‍♂ man wearing turban: dark skin tone
+1F473 200D 2640 FE0F                       ; fully-qualified     # 👳‍♀️ woman wearing turban
+1F473 200D 2640                            ; minimally-qualified # 👳‍♀ woman wearing turban
+1F473 1F3FB 200D 2640 FE0F                 ; fully-qualified     # 👳🏻‍♀️ woman wearing turban: light skin tone
+1F473 1F3FB 200D 2640                      ; minimally-qualified # 👳🏻‍♀ woman wearing turban: light skin tone
+1F473 1F3FC 200D 2640 FE0F                 ; fully-qualified     # 👳🏼‍♀️ woman wearing turban: medium-light skin tone
+1F473 1F3FC 200D 2640                      ; minimally-qualified # 👳🏼‍♀ woman wearing turban: medium-light skin tone
+1F473 1F3FD 200D 2640 FE0F                 ; fully-qualified     # 👳🏽‍♀️ woman wearing turban: medium skin tone
+1F473 1F3FD 200D 2640                      ; minimally-qualified # 👳🏽‍♀ woman wearing turban: medium skin tone
+1F473 1F3FE 200D 2640 FE0F                 ; fully-qualified     # 👳🏾‍♀️ woman wearing turban: medium-dark skin tone
+1F473 1F3FE 200D 2640                      ; minimally-qualified # 👳🏾‍♀ woman wearing turban: medium-dark skin tone
+1F473 1F3FF 200D 2640 FE0F                 ; fully-qualified     # 👳🏿‍♀️ woman wearing turban: dark skin tone
+1F473 1F3FF 200D 2640                      ; minimally-qualified # 👳🏿‍♀ woman wearing turban: dark skin tone
+1F472                                      ; fully-qualified     # 👲 man with Chinese cap
+1F472 1F3FB                                ; fully-qualified     # 👲🏻 man with Chinese cap: light skin tone
+1F472 1F3FC                                ; fully-qualified     # 👲🏼 man with Chinese cap: medium-light skin tone
+1F472 1F3FD                                ; fully-qualified     # 👲🏽 man with Chinese cap: medium skin tone
+1F472 1F3FE                                ; fully-qualified     # 👲🏾 man with Chinese cap: medium-dark skin tone
+1F472 1F3FF                                ; fully-qualified     # 👲🏿 man with Chinese cap: dark skin tone
+1F9D5                                      ; fully-qualified     # 🧕 woman with headscarf
+1F9D5 1F3FB                                ; fully-qualified     # 🧕🏻 woman with headscarf: light skin tone
+1F9D5 1F3FC                                ; fully-qualified     # 🧕🏼 woman with headscarf: medium-light skin tone
+1F9D5 1F3FD                                ; fully-qualified     # 🧕🏽 woman with headscarf: medium skin tone
+1F9D5 1F3FE                                ; fully-qualified     # 🧕🏾 woman with headscarf: medium-dark skin tone
+1F9D5 1F3FF                                ; fully-qualified     # 🧕🏿 woman with headscarf: dark skin tone
+1F935                                      ; fully-qualified     # 🤵 man in tuxedo
+1F935 1F3FB                                ; fully-qualified     # 🤵🏻 man in tuxedo: light skin tone
+1F935 1F3FC                                ; fully-qualified     # 🤵🏼 man in tuxedo: medium-light skin tone
+1F935 1F3FD                                ; fully-qualified     # 🤵🏽 man in tuxedo: medium skin tone
+1F935 1F3FE                                ; fully-qualified     # 🤵🏾 man in tuxedo: medium-dark skin tone
+1F935 1F3FF                                ; fully-qualified     # 🤵🏿 man in tuxedo: dark skin tone
+1F470                                      ; fully-qualified     # 👰 bride with veil
+1F470 1F3FB                                ; fully-qualified     # 👰🏻 bride with veil: light skin tone
+1F470 1F3FC                                ; fully-qualified     # 👰🏼 bride with veil: medium-light skin tone
+1F470 1F3FD                                ; fully-qualified     # 👰🏽 bride with veil: medium skin tone
+1F470 1F3FE                                ; fully-qualified     # 👰🏾 bride with veil: medium-dark skin tone
+1F470 1F3FF                                ; fully-qualified     # 👰🏿 bride with veil: dark skin tone
+1F930                                      ; fully-qualified     # 🤰 pregnant woman
+1F930 1F3FB                                ; fully-qualified     # 🤰🏻 pregnant woman: light skin tone
+1F930 1F3FC                                ; fully-qualified     # 🤰🏼 pregnant woman: medium-light skin tone
+1F930 1F3FD                                ; fully-qualified     # 🤰🏽 pregnant woman: medium skin tone
+1F930 1F3FE                                ; fully-qualified     # 🤰🏾 pregnant woman: medium-dark skin tone
+1F930 1F3FF                                ; fully-qualified     # 🤰🏿 pregnant woman: dark skin tone
+1F931                                      ; fully-qualified     # 🤱 breast-feeding
+1F931 1F3FB                                ; fully-qualified     # 🤱🏻 breast-feeding: light skin tone
+1F931 1F3FC                                ; fully-qualified     # 🤱🏼 breast-feeding: medium-light skin tone
+1F931 1F3FD                                ; fully-qualified     # 🤱🏽 breast-feeding: medium skin tone
+1F931 1F3FE                                ; fully-qualified     # 🤱🏾 breast-feeding: medium-dark skin tone
+1F931 1F3FF                                ; fully-qualified     # 🤱🏿 breast-feeding: dark skin tone
+
+# subgroup: person-fantasy
+1F47C                                      ; fully-qualified     # 👼 baby angel
+1F47C 1F3FB                                ; fully-qualified     # 👼🏻 baby angel: light skin tone
+1F47C 1F3FC                                ; fully-qualified     # 👼🏼 baby angel: medium-light skin tone
+1F47C 1F3FD                                ; fully-qualified     # 👼🏽 baby angel: medium skin tone
+1F47C 1F3FE                                ; fully-qualified     # 👼🏾 baby angel: medium-dark skin tone
+1F47C 1F3FF                                ; fully-qualified     # 👼🏿 baby angel: dark skin tone
+1F385                                      ; fully-qualified     # 🎅 Santa Claus
+1F385 1F3FB                                ; fully-qualified     # 🎅🏻 Santa Claus: light skin tone
+1F385 1F3FC                                ; fully-qualified     # 🎅🏼 Santa Claus: medium-light skin tone
+1F385 1F3FD                                ; fully-qualified     # 🎅🏽 Santa Claus: medium skin tone
+1F385 1F3FE                                ; fully-qualified     # 🎅🏾 Santa Claus: medium-dark skin tone
+1F385 1F3FF                                ; fully-qualified     # 🎅🏿 Santa Claus: dark skin tone
+1F936                                      ; fully-qualified     # 🤶 Mrs. Claus
+1F936 1F3FB                                ; fully-qualified     # 🤶🏻 Mrs. Claus: light skin tone
+1F936 1F3FC                                ; fully-qualified     # 🤶🏼 Mrs. Claus: medium-light skin tone
+1F936 1F3FD                                ; fully-qualified     # 🤶🏽 Mrs. Claus: medium skin tone
+1F936 1F3FE                                ; fully-qualified     # 🤶🏾 Mrs. Claus: medium-dark skin tone
+1F936 1F3FF                                ; fully-qualified     # 🤶🏿 Mrs. Claus: dark skin tone
+1F9B8                                      ; fully-qualified     # 🦸 superhero
+1F9B8 1F3FB                                ; fully-qualified     # 🦸🏻 superhero: light skin tone
+1F9B8 1F3FC                                ; fully-qualified     # 🦸🏼 superhero: medium-light skin tone
+1F9B8 1F3FD                                ; fully-qualified     # 🦸🏽 superhero: medium skin tone
+1F9B8 1F3FE                                ; fully-qualified     # 🦸🏾 superhero: medium-dark skin tone
+1F9B8 1F3FF                                ; fully-qualified     # 🦸🏿 superhero: dark skin tone
+1F9B8 200D 2642 FE0F                       ; fully-qualified     # 🦸‍♂️ man superhero
+1F9B8 200D 2642                            ; minimally-qualified # 🦸‍♂ man superhero
+1F9B8 1F3FB 200D 2642 FE0F                 ; fully-qualified     # 🦸🏻‍♂️ man superhero: light skin tone
+1F9B8 1F3FB 200D 2642                      ; minimally-qualified # 🦸🏻‍♂ man superhero: light skin tone
+1F9B8 1F3FC 200D 2642 FE0F                 ; fully-qualified     # 🦸🏼‍♂️ man superhero: medium-light skin tone
+1F9B8 1F3FC 200D 2642                      ; minimally-qualified # 🦸🏼‍♂ man superhero: medium-light skin tone
+1F9B8 1F3FD 200D 2642 FE0F                 ; fully-qualified     # 🦸🏽‍♂️ man superhero: medium skin tone
+1F9B8 1F3FD 200D 2642                      ; minimally-qualified # 🦸🏽‍♂ man superhero: medium skin tone
+1F9B8 1F3FE 200D 2642 FE0F                 ; fully-qualified     # 🦸🏾‍♂️ man superhero: medium-dark skin tone
+1F9B8 1F3FE 200D 2642                      ; minimally-qualified # 🦸🏾‍♂ man superhero: medium-dark skin tone
+1F9B8 1F3FF 200D 2642 FE0F                 ; fully-qualified     # 🦸🏿‍♂️ man superhero: dark skin tone
+1F9B8 1F3FF 200D 2642                      ; minimally-qualified # 🦸🏿‍♂ man superhero: dark skin tone
+1F9B8 200D 2640 FE0F                       ; fully-qualified     # 🦸‍♀️ woman superhero
+1F9B8 200D 2640                            ; minimally-qualified # 🦸‍♀ woman superhero
+1F9B8 1F3FB 200D 2640 FE0F                 ; fully-qualified     # 🦸🏻‍♀️ woman superhero: light skin tone
+1F9B8 1F3FB 200D 2640                      ; minimally-qualified # 🦸🏻‍♀ woman superhero: light skin tone
+1F9B8 1F3FC 200D 2640 FE0F                 ; fully-qualified     # 🦸🏼‍♀️ woman superhero: medium-light skin tone
+1F9B8 1F3FC 200D 2640                      ; minimally-qualified # 🦸🏼‍♀ woman superhero: medium-light skin tone
+1F9B8 1F3FD 200D 2640 FE0F                 ; fully-qualified     # 🦸🏽‍♀️ woman superhero: medium skin tone
+1F9B8 1F3FD 200D 2640                      ; minimally-qualified # 🦸🏽‍♀ woman superhero: medium skin tone
+1F9B8 1F3FE 200D 2640 FE0F                 ; fully-qualified     # 🦸🏾‍♀️ woman superhero: medium-dark skin tone
+1F9B8 1F3FE 200D 2640                      ; minimally-qualified # 🦸🏾‍♀ woman superhero: medium-dark skin tone
+1F9B8 1F3FF 200D 2640 FE0F                 ; fully-qualified     # 🦸🏿‍♀️ woman superhero: dark skin tone
+1F9B8 1F3FF 200D 2640                      ; minimally-qualified # 🦸🏿‍♀ woman superhero: dark skin tone
+1F9B9                                      ; fully-qualified     # 🦹 supervillain
+1F9B9 1F3FB                                ; fully-qualified     # 🦹🏻 supervillain: light skin tone
+1F9B9 1F3FC                                ; fully-qualified     # 🦹🏼 supervillain: medium-light skin tone
+1F9B9 1F3FD                                ; fully-qualified     # 🦹🏽 supervillain: medium skin tone
+1F9B9 1F3FE                                ; fully-qualified     # 🦹🏾 supervillain: medium-dark skin tone
+1F9B9 1F3FF                                ; fully-qualified     # 🦹🏿 supervillain: dark skin tone
+1F9B9 200D 2642 FE0F                       ; fully-qualified     # 🦹‍♂️ man supervillain
+1F9B9 200D 2642                            ; minimally-qualified # 🦹‍♂ man supervillain
+1F9B9 1F3FB 200D 2642 FE0F                 ; fully-qualified     # 🦹🏻‍♂️ man supervillain: light skin tone
+1F9B9 1F3FB 200D 2642                      ; minimally-qualified # 🦹🏻‍♂ man supervillain: light skin tone
+1F9B9 1F3FC 200D 2642 FE0F                 ; fully-qualified     # 🦹🏼‍♂️ man supervillain: medium-light skin tone
+1F9B9 1F3FC 200D 2642                      ; minimally-qualified # 🦹🏼‍♂ man supervillain: medium-light skin tone
+1F9B9 1F3FD 200D 2642 FE0F                 ; fully-qualified     # 🦹🏽‍♂️ man supervillain: medium skin tone
+1F9B9 1F3FD 200D 2642                      ; minimally-qualified # 🦹🏽‍♂ man supervillain: medium skin tone
+1F9B9 1F3FE 200D 2642 FE0F                 ; fully-qualified     # 🦹🏾‍♂️ man supervillain: medium-dark skin tone
+1F9B9 1F3FE 200D 2642                      ; minimally-qualified # 🦹🏾‍♂ man supervillain: medium-dark skin tone
+1F9B9 1F3FF 200D 2642 FE0F                 ; fully-qualified     # 🦹🏿‍♂️ man supervillain: dark skin tone
+1F9B9 1F3FF 200D 2642                      ; minimally-qualified # 🦹🏿‍♂ man supervillain: dark skin tone
+1F9B9 200D 2640 FE0F                       ; fully-qualified     # 🦹‍♀️ woman supervillain
+1F9B9 200D 2640                            ; minimally-qualified # 🦹‍♀ woman supervillain
+1F9B9 1F3FB 200D 2640 FE0F                 ; fully-qualified     # 🦹🏻‍♀️ woman supervillain: light skin tone
+1F9B9 1F3FB 200D 2640                      ; minimally-qualified # 🦹🏻‍♀ woman supervillain: light skin tone
+1F9B9 1F3FC 200D 2640 FE0F                 ; fully-qualified     # 🦹🏼‍♀️ woman supervillain: medium-light skin tone
+1F9B9 1F3FC 200D 2640                      ; minimally-qualified # 🦹🏼‍♀ woman supervillain: medium-light skin tone
+1F9B9 1F3FD 200D 2640 FE0F                 ; fully-qualified     # 🦹🏽‍♀️ woman supervillain: medium skin tone
+1F9B9 1F3FD 200D 2640                      ; minimally-qualified # 🦹🏽‍♀ woman supervillain: medium skin tone
+1F9B9 1F3FE 200D 2640 FE0F                 ; fully-qualified     # 🦹🏾‍♀️ woman supervillain: medium-dark skin tone
+1F9B9 1F3FE 200D 2640                      ; minimally-qualified # 🦹🏾‍♀ woman supervillain: medium-dark skin tone
+1F9B9 1F3FF 200D 2640 FE0F                 ; fully-qualified     # 🦹🏿‍♀️ woman supervillain: dark skin tone
+1F9B9 1F3FF 200D 2640                      ; minimally-qualified # 🦹🏿‍♀ woman supervillain: dark skin tone
+1F9D9                                      ; fully-qualified     # 🧙 mage
+1F9D9 1F3FB                                ; fully-qualified     # 🧙🏻 mage: light skin tone
+1F9D9 1F3FC                                ; fully-qualified     # 🧙🏼 mage: medium-light skin tone
+1F9D9 1F3FD                                ; fully-qualified     # 🧙🏽 mage: medium skin tone
+1F9D9 1F3FE                                ; fully-qualified     # 🧙🏾 mage: medium-dark skin tone
+1F9D9 1F3FF                                ; fully-qualified     # 🧙🏿 mage: dark skin tone
+1F9D9 200D 2642 FE0F                       ; fully-qualified     # 🧙‍♂️ man mage
+1F9D9 200D 2642                            ; minimally-qualified # 🧙‍♂ man mage
+1F9D9 1F3FB 200D 2642 FE0F                 ; fully-qualified     # 🧙🏻‍♂️ man mage: light skin tone
+1F9D9 1F3FB 200D 2642                      ; minimally-qualified # 🧙🏻‍♂ man mage: light skin tone
+1F9D9 1F3FC 200D 2642 FE0F                 ; fully-qualified     # 🧙🏼‍♂️ man mage: medium-light skin tone
+1F9D9 1F3FC 200D 2642                      ; minimally-qualified # 🧙🏼‍♂ man mage: medium-light skin tone
+1F9D9 1F3FD 200D 2642 FE0F                 ; fully-qualified     # 🧙🏽‍♂️ man mage: medium skin tone
+1F9D9 1F3FD 200D 2642                      ; minimally-qualified # 🧙🏽‍♂ man mage: medium skin tone
+1F9D9 1F3FE 200D 2642 FE0F                 ; fully-qualified     # 🧙🏾‍♂️ man mage: medium-dark skin tone
+1F9D9 1F3FE 200D 2642                      ; minimally-qualified # 🧙🏾‍♂ man mage: medium-dark skin tone
+1F9D9 1F3FF 200D 2642 FE0F                 ; fully-qualified     # 🧙🏿‍♂️ man mage: dark skin tone
+1F9D9 1F3FF 200D 2642                      ; minimally-qualified # 🧙🏿‍♂ man mage: dark skin tone
+1F9D9 200D 2640 FE0F                       ; fully-qualified     # 🧙‍♀️ woman mage
+1F9D9 200D 2640                            ; minimally-qualified # 🧙‍♀ woman mage
+1F9D9 1F3FB 200D 2640 FE0F                 ; fully-qualified     # 🧙🏻‍♀️ woman mage: light skin tone
+1F9D9 1F3FB 200D 2640                      ; minimally-qualified # 🧙🏻‍♀ woman mage: light skin tone
+1F9D9 1F3FC 200D 2640 FE0F                 ; fully-qualified     # 🧙🏼‍♀️ woman mage: medium-light skin tone
+1F9D9 1F3FC 200D 2640                      ; minimally-qualified # 🧙🏼‍♀ woman mage: medium-light skin tone
+1F9D9 1F3FD 200D 2640 FE0F                 ; fully-qualified     # 🧙🏽‍♀️ woman mage: medium skin tone
+1F9D9 1F3FD 200D 2640                      ; minimally-qualified # 🧙🏽‍♀ woman mage: medium skin tone
+1F9D9 1F3FE 200D 2640 FE0F                 ; fully-qualified     # 🧙🏾‍♀️ woman mage: medium-dark skin tone
+1F9D9 1F3FE 200D 2640                      ; minimally-qualified # 🧙🏾‍♀ woman mage: medium-dark skin tone
+1F9D9 1F3FF 200D 2640 FE0F                 ; fully-qualified     # 🧙🏿‍♀️ woman mage: dark skin tone
+1F9D9 1F3FF 200D 2640                      ; minimally-qualified # 🧙🏿‍♀ woman mage: dark skin tone
+1F9DA                                      ; fully-qualified     # 🧚 fairy
+1F9DA 1F3FB                                ; fully-qualified     # 🧚🏻 fairy: light skin tone
+1F9DA 1F3FC                                ; fully-qualified     # 🧚🏼 fairy: medium-light skin tone
+1F9DA 1F3FD                                ; fully-qualified     # 🧚🏽 fairy: medium skin tone
+1F9DA 1F3FE                                ; fully-qualified     # 🧚🏾 fairy: medium-dark skin tone
+1F9DA 1F3FF                                ; fully-qualified     # 🧚🏿 fairy: dark skin tone
+1F9DA 200D 2642 FE0F                       ; fully-qualified     # 🧚‍♂️ man fairy
+1F9DA 200D 2642                            ; minimally-qualified # 🧚‍♂ man fairy
+1F9DA 1F3FB 200D 2642 FE0F                 ; fully-qualified     # 🧚🏻‍♂️ man fairy: light skin tone
+1F9DA 1F3FB 200D 2642                      ; minimally-qualified # 🧚🏻‍♂ man fairy: light skin tone
+1F9DA 1F3FC 200D 2642 FE0F                 ; fully-qualified     # 🧚🏼‍♂️ man fairy: medium-light skin tone
+1F9DA 1F3FC 200D 2642                      ; minimally-qualified # 🧚🏼‍♂ man fairy: medium-light skin tone
+1F9DA 1F3FD 200D 2642 FE0F                 ; fully-qualified     # 🧚🏽‍♂️ man fairy: medium skin tone
+1F9DA 1F3FD 200D 2642                      ; minimally-qualified # 🧚🏽‍♂ man fairy: medium skin tone
+1F9DA 1F3FE 200D 2642 FE0F                 ; fully-qualified     # 🧚🏾‍♂️ man fairy: medium-dark skin tone
+1F9DA 1F3FE 200D 2642                      ; minimally-qualified # 🧚🏾‍♂ man fairy: medium-dark skin tone
+1F9DA 1F3FF 200D 2642 FE0F                 ; fully-qualified     # 🧚🏿‍♂️ man fairy: dark skin tone
+1F9DA 1F3FF 200D 2642                      ; minimally-qualified # 🧚🏿‍♂ man fairy: dark skin tone
+1F9DA 200D 2640 FE0F                       ; fully-qualified     # 🧚‍♀️ woman fairy
+1F9DA 200D 2640                            ; minimally-qualified # 🧚‍♀ woman fairy
+1F9DA 1F3FB 200D 2640 FE0F                 ; fully-qualified     # 🧚🏻‍♀️ woman fairy: light skin tone
+1F9DA 1F3FB 200D 2640                      ; minimally-qualified # 🧚🏻‍♀ woman fairy: light skin tone
+1F9DA 1F3FC 200D 2640 FE0F                 ; fully-qualified     # 🧚🏼‍♀️ woman fairy: medium-light skin tone
+1F9DA 1F3FC 200D 2640                      ; minimally-qualified # 🧚🏼‍♀ woman fairy: medium-light skin tone
+1F9DA 1F3FD 200D 2640 FE0F                 ; fully-qualified     # 🧚🏽‍♀️ woman fairy: medium skin tone
+1F9DA 1F3FD 200D 2640                      ; minimally-qualified # 🧚🏽‍♀ woman fairy: medium skin tone
+1F9DA 1F3FE 200D 2640 FE0F                 ; fully-qualified     # 🧚🏾‍♀️ woman fairy: medium-dark skin tone
+1F9DA 1F3FE 200D 2640                      ; minimally-qualified # 🧚🏾‍♀ woman fairy: medium-dark skin tone
+1F9DA 1F3FF 200D 2640 FE0F                 ; fully-qualified     # 🧚🏿‍♀️ woman fairy: dark skin tone
+1F9DA 1F3FF 200D 2640                      ; minimally-qualified # 🧚🏿‍♀ woman fairy: dark skin tone
+1F9DB                                      ; fully-qualified     # 🧛 vampire
+1F9DB 1F3FB                                ; fully-qualified     # 🧛🏻 vampire: light skin tone
+1F9DB 1F3FC                                ; fully-qualified     # 🧛🏼 vampire: medium-light skin tone
+1F9DB 1F3FD                                ; fully-qualified     # 🧛🏽 vampire: medium skin tone
+1F9DB 1F3FE                                ; fully-qualified     # 🧛🏾 vampire: medium-dark skin tone
+1F9DB 1F3FF                                ; fully-qualified     # 🧛🏿 vampire: dark skin tone
+1F9DB 200D 2642 FE0F                       ; fully-qualified     # 🧛‍♂️ man vampire
+1F9DB 200D 2642                            ; minimally-qualified # 🧛‍♂ man vampire
+1F9DB 1F3FB 200D 2642 FE0F                 ; fully-qualified     # 🧛🏻‍♂️ man vampire: light skin tone
+1F9DB 1F3FB 200D 2642                      ; minimally-qualified # 🧛🏻‍♂ man vampire: light skin tone
+1F9DB 1F3FC 200D 2642 FE0F                 ; fully-qualified     # 🧛🏼‍♂️ man vampire: medium-light skin tone
+1F9DB 1F3FC 200D 2642                      ; minimally-qualified # 🧛🏼‍♂ man vampire: medium-light skin tone
+1F9DB 1F3FD 200D 2642 FE0F                 ; fully-qualified     # 🧛🏽‍♂️ man vampire: medium skin tone
+1F9DB 1F3FD 200D 2642                      ; minimally-qualified # 🧛🏽‍♂ man vampire: medium skin tone
+1F9DB 1F3FE 200D 2642 FE0F                 ; fully-qualified     # 🧛🏾‍♂️ man vampire: medium-dark skin tone
+1F9DB 1F3FE 200D 2642                      ; minimally-qualified # 🧛🏾‍♂ man vampire: medium-dark skin tone
+1F9DB 1F3FF 200D 2642 FE0F                 ; fully-qualified     # 🧛🏿‍♂️ man vampire: dark skin tone
+1F9DB 1F3FF 200D 2642                      ; minimally-qualified # 🧛🏿‍♂ man vampire: dark skin tone
+1F9DB 200D 2640 FE0F                       ; fully-qualified     # 🧛‍♀️ woman vampire
+1F9DB 200D 2640                            ; minimally-qualified # 🧛‍♀ woman vampire
+1F9DB 1F3FB 200D 2640 FE0F                 ; fully-qualified     # 🧛🏻‍♀️ woman vampire: light skin tone
+1F9DB 1F3FB 200D 2640                      ; minimally-qualified # 🧛🏻‍♀ woman vampire: light skin tone
+1F9DB 1F3FC 200D 2640 FE0F                 ; fully-qualified     # 🧛🏼‍♀️ woman vampire: medium-light skin tone
+1F9DB 1F3FC 200D 2640                      ; minimally-qualified # 🧛🏼‍♀ woman vampire: medium-light skin tone
+1F9DB 1F3FD 200D 2640 FE0F                 ; fully-qualified     # 🧛🏽‍♀️ woman vampire: medium skin tone
+1F9DB 1F3FD 200D 2640                      ; minimally-qualified # 🧛🏽‍♀ woman vampire: medium skin tone
+1F9DB 1F3FE 200D 2640 FE0F                 ; fully-qualified     # 🧛🏾‍♀️ woman vampire: medium-dark skin tone
+1F9DB 1F3FE 200D 2640                      ; minimally-qualified # 🧛🏾‍♀ woman vampire: medium-dark skin tone
+1F9DB 1F3FF 200D 2640 FE0F                 ; fully-qualified     # 🧛🏿‍♀️ woman vampire: dark skin tone
+1F9DB 1F3FF 200D 2640                      ; minimally-qualified # 🧛🏿‍♀ woman vampire: dark skin tone
+1F9DC                                      ; fully-qualified     # 🧜 merperson
+1F9DC 1F3FB                                ; fully-qualified     # 🧜🏻 merperson: light skin tone
+1F9DC 1F3FC                                ; fully-qualified     # 🧜🏼 merperson: medium-light skin tone
+1F9DC 1F3FD                                ; fully-qualified     # 🧜🏽 merperson: medium skin tone
+1F9DC 1F3FE                                ; fully-qualified     # 🧜🏾 merperson: medium-dark skin tone
+1F9DC 1F3FF                                ; fully-qualified     # 🧜🏿 merperson: dark skin tone
+1F9DC 200D 2642 FE0F                       ; fully-qualified     # 🧜‍♂️ merman
+1F9DC 200D 2642                            ; minimally-qualified # 🧜‍♂ merman
+1F9DC 1F3FB 200D 2642 FE0F                 ; fully-qualified     # 🧜🏻‍♂️ merman: light skin tone
+1F9DC 1F3FB 200D 2642                      ; minimally-qualified # 🧜🏻‍♂ merman: light skin tone
+1F9DC 1F3FC 200D 2642 FE0F                 ; fully-qualified     # 🧜🏼‍♂️ merman: medium-light skin tone
+1F9DC 1F3FC 200D 2642                      ; minimally-qualified # 🧜🏼‍♂ merman: medium-light skin tone
+1F9DC 1F3FD 200D 2642 FE0F                 ; fully-qualified     # 🧜🏽‍♂️ merman: medium skin tone
+1F9DC 1F3FD 200D 2642                      ; minimally-qualified # 🧜🏽‍♂ merman: medium skin tone
+1F9DC 1F3FE 200D 2642 FE0F                 ; fully-qualified     # 🧜🏾‍♂️ merman: medium-dark skin tone
+1F9DC 1F3FE 200D 2642                      ; minimally-qualified # 🧜🏾‍♂ merman: medium-dark skin tone
+1F9DC 1F3FF 200D 2642 FE0F                 ; fully-qualified     # 🧜🏿‍♂️ merman: dark skin tone
+1F9DC 1F3FF 200D 2642                      ; minimally-qualified # 🧜🏿‍♂ merman: dark skin tone
+1F9DC 200D 2640 FE0F                       ; fully-qualified     # 🧜‍♀️ mermaid
+1F9DC 200D 2640                            ; minimally-qualified # 🧜‍♀ mermaid
+1F9DC 1F3FB 200D 2640 FE0F                 ; fully-qualified     # 🧜🏻‍♀️ mermaid: light skin tone
+1F9DC 1F3FB 200D 2640                      ; minimally-qualified # 🧜🏻‍♀ mermaid: light skin tone
+1F9DC 1F3FC 200D 2640 FE0F                 ; fully-qualified     # 🧜🏼‍♀️ mermaid: medium-light skin tone
+1F9DC 1F3FC 200D 2640                      ; minimally-qualified # 🧜🏼‍♀ mermaid: medium-light skin tone
+1F9DC 1F3FD 200D 2640 FE0F                 ; fully-qualified     # 🧜🏽‍♀️ mermaid: medium skin tone
+1F9DC 1F3FD 200D 2640                      ; minimally-qualified # 🧜🏽‍♀ mermaid: medium skin tone
+1F9DC 1F3FE 200D 2640 FE0F                 ; fully-qualified     # 🧜🏾‍♀️ mermaid: medium-dark skin tone
+1F9DC 1F3FE 200D 2640                      ; minimally-qualified # 🧜🏾‍♀ mermaid: medium-dark skin tone
+1F9DC 1F3FF 200D 2640 FE0F                 ; fully-qualified     # 🧜🏿‍♀️ mermaid: dark skin tone
+1F9DC 1F3FF 200D 2640                      ; minimally-qualified # 🧜🏿‍♀ mermaid: dark skin tone
+1F9DD                                      ; fully-qualified     # 🧝 elf
+1F9DD 1F3FB                                ; fully-qualified     # 🧝🏻 elf: light skin tone
+1F9DD 1F3FC                                ; fully-qualified     # 🧝🏼 elf: medium-light skin tone
+1F9DD 1F3FD                                ; fully-qualified     # 🧝🏽 elf: medium skin tone
+1F9DD 1F3FE                                ; fully-qualified     # 🧝🏾 elf: medium-dark skin tone
+1F9DD 1F3FF                                ; fully-qualified     # 🧝🏿 elf: dark skin tone
+1F9DD 200D 2642 FE0F                       ; fully-qualified     # 🧝‍♂️ man elf
+1F9DD 200D 2642                            ; minimally-qualified # 🧝‍♂ man elf
+1F9DD 1F3FB 200D 2642 FE0F                 ; fully-qualified     # 🧝🏻‍♂️ man elf: light skin tone
+1F9DD 1F3FB 200D 2642                      ; minimally-qualified # 🧝🏻‍♂ man elf: light skin tone
+1F9DD 1F3FC 200D 2642 FE0F                 ; fully-qualified     # 🧝🏼‍♂️ man elf: medium-light skin tone
+1F9DD 1F3FC 200D 2642                      ; minimally-qualified # 🧝🏼‍♂ man elf: medium-light skin tone
+1F9DD 1F3FD 200D 2642 FE0F                 ; fully-qualified     # 🧝🏽‍♂️ man elf: medium skin tone
+1F9DD 1F3FD 200D 2642                      ; minimally-qualified # 🧝🏽‍♂ man elf: medium skin tone
+1F9DD 1F3FE 200D 2642 FE0F                 ; fully-qualified     # 🧝🏾‍♂️ man elf: medium-dark skin tone
+1F9DD 1F3FE 200D 2642                      ; minimally-qualified # 🧝🏾‍♂ man elf: medium-dark skin tone
+1F9DD 1F3FF 200D 2642 FE0F                 ; fully-qualified     # 🧝🏿‍♂️ man elf: dark skin tone
+1F9DD 1F3FF 200D 2642                      ; minimally-qualified # 🧝🏿‍♂ man elf: dark skin tone
+1F9DD 200D 2640 FE0F                       ; fully-qualified     # 🧝‍♀️ woman elf
+1F9DD 200D 2640                            ; minimally-qualified # 🧝‍♀ woman elf
+1F9DD 1F3FB 200D 2640 FE0F                 ; fully-qualified     # 🧝🏻‍♀️ woman elf: light skin tone
+1F9DD 1F3FB 200D 2640                      ; minimally-qualified # 🧝🏻‍♀ woman elf: light skin tone
+1F9DD 1F3FC 200D 2640 FE0F                 ; fully-qualified     # 🧝🏼‍♀️ woman elf: medium-light skin tone
+1F9DD 1F3FC 200D 2640                      ; minimally-qualified # 🧝🏼‍♀ woman elf: medium-light skin tone
+1F9DD 1F3FD 200D 2640 FE0F                 ; fully-qualified     # 🧝🏽‍♀️ woman elf: medium skin tone
+1F9DD 1F3FD 200D 2640                      ; minimally-qualified # 🧝🏽‍♀ woman elf: medium skin tone
+1F9DD 1F3FE 200D 2640 FE0F                 ; fully-qualified     # 🧝🏾‍♀️ woman elf: medium-dark skin tone
+1F9DD 1F3FE 200D 2640                      ; minimally-qualified # 🧝🏾‍♀ woman elf: medium-dark skin tone
+1F9DD 1F3FF 200D 2640 FE0F                 ; fully-qualified     # 🧝🏿‍♀️ woman elf: dark skin tone
+1F9DD 1F3FF 200D 2640                      ; minimally-qualified # 🧝🏿‍♀ woman elf: dark skin tone
+1F9DE                                      ; fully-qualified     # 🧞 genie
+1F9DE 200D 2642 FE0F                       ; fully-qualified     # 🧞‍♂️ man genie
+1F9DE 200D 2642                            ; minimally-qualified # 🧞‍♂ man genie
+1F9DE 200D 2640 FE0F                       ; fully-qualified     # 🧞‍♀️ woman genie
+1F9DE 200D 2640                            ; minimally-qualified # 🧞‍♀ woman genie
+1F9DF                                      ; fully-qualified     # 🧟 zombie
+1F9DF 200D 2642 FE0F                       ; fully-qualified     # 🧟‍♂️ man zombie
+1F9DF 200D 2642                            ; minimally-qualified # 🧟‍♂ man zombie
+1F9DF 200D 2640 FE0F                       ; fully-qualified     # 🧟‍♀️ woman zombie
+1F9DF 200D 2640                            ; minimally-qualified # 🧟‍♀ woman zombie
+
+# subgroup: person-activity
+1F486                                      ; fully-qualified     # 💆 person getting massage
+1F486 1F3FB                                ; fully-qualified     # 💆🏻 person getting massage: light skin tone
+1F486 1F3FC                                ; fully-qualified     # 💆🏼 person getting massage: medium-light skin tone
+1F486 1F3FD                                ; fully-qualified     # 💆🏽 person getting massage: medium skin tone
+1F486 1F3FE                                ; fully-qualified     # 💆🏾 person getting massage: medium-dark skin tone
+1F486 1F3FF                                ; fully-qualified     # 💆🏿 person getting massage: dark skin tone
+1F486 200D 2642 FE0F                       ; fully-qualified     # 💆‍♂️ man getting massage
+1F486 200D 2642                            ; minimally-qualified # 💆‍♂ man getting massage
+1F486 1F3FB 200D 2642 FE0F                 ; fully-qualified     # 💆🏻‍♂️ man getting massage: light skin tone
+1F486 1F3FB 200D 2642                      ; minimally-qualified # 💆🏻‍♂ man getting massage: light skin tone
+1F486 1F3FC 200D 2642 FE0F                 ; fully-qualified     # 💆🏼‍♂️ man getting massage: medium-light skin tone
+1F486 1F3FC 200D 2642                      ; minimally-qualified # 💆🏼‍♂ man getting massage: medium-light skin tone
+1F486 1F3FD 200D 2642 FE0F                 ; fully-qualified     # 💆🏽‍♂️ man getting massage: medium skin tone
+1F486 1F3FD 200D 2642                      ; minimally-qualified # 💆🏽‍♂ man getting massage: medium skin tone
+1F486 1F3FE 200D 2642 FE0F                 ; fully-qualified     # 💆🏾‍♂️ man getting massage: medium-dark skin tone
+1F486 1F3FE 200D 2642                      ; minimally-qualified # 💆🏾‍♂ man getting massage: medium-dark skin tone
+1F486 1F3FF 200D 2642 FE0F                 ; fully-qualified     # 💆🏿‍♂️ man getting massage: dark skin tone
+1F486 1F3FF 200D 2642                      ; minimally-qualified # 💆🏿‍♂ man getting massage: dark skin tone
+1F486 200D 2640 FE0F                       ; fully-qualified     # 💆‍♀️ woman getting massage
+1F486 200D 2640                            ; minimally-qualified # 💆‍♀ woman getting massage
+1F486 1F3FB 200D 2640 FE0F                 ; fully-qualified     # 💆🏻‍♀️ woman getting massage: light skin tone
+1F486 1F3FB 200D 2640                      ; minimally-qualified # 💆🏻‍♀ woman getting massage: light skin tone
+1F486 1F3FC 200D 2640 FE0F                 ; fully-qualified     # 💆🏼‍♀️ woman getting massage: medium-light skin tone
+1F486 1F3FC 200D 2640                      ; minimally-qualified # 💆🏼‍♀ woman getting massage: medium-light skin tone
+1F486 1F3FD 200D 2640 FE0F                 ; fully-qualified     # 💆🏽‍♀️ woman getting massage: medium skin tone
+1F486 1F3FD 200D 2640                      ; minimally-qualified # 💆🏽‍♀ woman getting massage: medium skin tone
+1F486 1F3FE 200D 2640 FE0F                 ; fully-qualified     # 💆🏾‍♀️ woman getting massage: medium-dark skin tone
+1F486 1F3FE 200D 2640                      ; minimally-qualified # 💆🏾‍♀ woman getting massage: medium-dark skin tone
+1F486 1F3FF 200D 2640 FE0F                 ; fully-qualified     # 💆🏿‍♀️ woman getting massage: dark skin tone
+1F486 1F3FF 200D 2640                      ; minimally-qualified # 💆🏿‍♀ woman getting massage: dark skin tone
+1F487                                      ; fully-qualified     # 💇 person getting haircut
+1F487 1F3FB                                ; fully-qualified     # 💇🏻 person getting haircut: light skin tone
+1F487 1F3FC                                ; fully-qualified     # 💇🏼 person getting haircut: medium-light skin tone
+1F487 1F3FD                                ; fully-qualified     # 💇🏽 person getting haircut: medium skin tone
+1F487 1F3FE                                ; fully-qualified     # 💇🏾 person getting haircut: medium-dark skin tone
+1F487 1F3FF                                ; fully-qualified     # 💇🏿 person getting haircut: dark skin tone
+1F487 200D 2642 FE0F                       ; fully-qualified     # 💇‍♂️ man getting haircut
+1F487 200D 2642                            ; minimally-qualified # 💇‍♂ man getting haircut
+1F487 1F3FB 200D 2642 FE0F                 ; fully-qualified     # 💇🏻‍♂️ man getting haircut: light skin tone
+1F487 1F3FB 200D 2642                      ; minimally-qualified # 💇🏻‍♂ man getting haircut: light skin tone
+1F487 1F3FC 200D 2642 FE0F                 ; fully-qualified     # 💇🏼‍♂️ man getting haircut: medium-light skin tone
+1F487 1F3FC 200D 2642                      ; minimally-qualified # 💇🏼‍♂ man getting haircut: medium-light skin tone
+1F487 1F3FD 200D 2642 FE0F                 ; fully-qualified     # 💇🏽‍♂️ man getting haircut: medium skin tone
+1F487 1F3FD 200D 2642                      ; minimally-qualified # 💇🏽‍♂ man getting haircut: medium skin tone
+1F487 1F3FE 200D 2642 FE0F                 ; fully-qualified     # 💇🏾‍♂️ man getting haircut: medium-dark skin tone
+1F487 1F3FE 200D 2642                      ; minimally-qualified # 💇🏾‍♂ man getting haircut: medium-dark skin tone
+1F487 1F3FF 200D 2642 FE0F                 ; fully-qualified     # 💇🏿‍♂️ man getting haircut: dark skin tone
+1F487 1F3FF 200D 2642                      ; minimally-qualified # 💇🏿‍♂ man getting haircut: dark skin tone
+1F487 200D 2640 FE0F                       ; fully-qualified     # 💇‍♀️ woman getting haircut
+1F487 200D 2640                            ; minimally-qualified # 💇‍♀ woman getting haircut
+1F487 1F3FB 200D 2640 FE0F                 ; fully-qualified     # 💇🏻‍♀️ woman getting haircut: light skin tone
+1F487 1F3FB 200D 2640                      ; minimally-qualified # 💇🏻‍♀ woman getting haircut: light skin tone
+1F487 1F3FC 200D 2640 FE0F                 ; fully-qualified     # 💇🏼‍♀️ woman getting haircut: medium-light skin tone
+1F487 1F3FC 200D 2640                      ; minimally-qualified # 💇🏼‍♀ woman getting haircut: medium-light skin tone
+1F487 1F3FD 200D 2640 FE0F                 ; fully-qualified     # 💇🏽‍♀️ woman getting haircut: medium skin tone
+1F487 1F3FD 200D 2640                      ; minimally-qualified # 💇🏽‍♀ woman getting haircut: medium skin tone
+1F487 1F3FE 200D 2640 FE0F                 ; fully-qualified     # 💇🏾‍♀️ woman getting haircut: medium-dark skin tone
+1F487 1F3FE 200D 2640                      ; minimally-qualified # 💇🏾‍♀ woman getting haircut: medium-dark skin tone
+1F487 1F3FF 200D 2640 FE0F                 ; fully-qualified     # 💇🏿‍♀️ woman getting haircut: dark skin tone
+1F487 1F3FF 200D 2640                      ; minimally-qualified # 💇🏿‍♀ woman getting haircut: dark skin tone
+1F6B6                                      ; fully-qualified     # 🚶 person walking
+1F6B6 1F3FB                                ; fully-qualified     # 🚶🏻 person walking: light skin tone
+1F6B6 1F3FC                                ; fully-qualified     # 🚶🏼 person walking: medium-light skin tone
+1F6B6 1F3FD                                ; fully-qualified     # 🚶🏽 person walking: medium skin tone
+1F6B6 1F3FE                                ; fully-qualified     # 🚶🏾 person walking: medium-dark skin tone
+1F6B6 1F3FF                                ; fully-qualified     # 🚶🏿 person walking: dark skin tone
+1F6B6 200D 2642 FE0F                       ; fully-qualified     # 🚶‍♂️ man walking
+1F6B6 200D 2642                            ; minimally-qualified # 🚶‍♂ man walking
+1F6B6 1F3FB 200D 2642 FE0F                 ; fully-qualified     # 🚶🏻‍♂️ man walking: light skin tone
+1F6B6 1F3FB 200D 2642                      ; minimally-qualified # 🚶🏻‍♂ man walking: light skin tone
+1F6B6 1F3FC 200D 2642 FE0F                 ; fully-qualified     # 🚶🏼‍♂️ man walking: medium-light skin tone
+1F6B6 1F3FC 200D 2642                      ; minimally-qualified # 🚶🏼‍♂ man walking: medium-light skin tone
+1F6B6 1F3FD 200D 2642 FE0F                 ; fully-qualified     # 🚶🏽‍♂️ man walking: medium skin tone
+1F6B6 1F3FD 200D 2642                      ; minimally-qualified # 🚶🏽‍♂ man walking: medium skin tone
+1F6B6 1F3FE 200D 2642 FE0F                 ; fully-qualified     # 🚶🏾‍♂️ man walking: medium-dark skin tone
+1F6B6 1F3FE 200D 2642                      ; minimally-qualified # 🚶🏾‍♂ man walking: medium-dark skin tone
+1F6B6 1F3FF 200D 2642 FE0F                 ; fully-qualified     # 🚶🏿‍♂️ man walking: dark skin tone
+1F6B6 1F3FF 200D 2642                      ; minimally-qualified # 🚶🏿‍♂ man walking: dark skin tone
+1F6B6 200D 2640 FE0F                       ; fully-qualified     # 🚶‍♀️ woman walking
+1F6B6 200D 2640                            ; minimally-qualified # 🚶‍♀ woman walking
+1F6B6 1F3FB 200D 2640 FE0F                 ; fully-qualified     # 🚶🏻‍♀️ woman walking: light skin tone
+1F6B6 1F3FB 200D 2640                      ; minimally-qualified # 🚶🏻‍♀ woman walking: light skin tone
+1F6B6 1F3FC 200D 2640 FE0F                 ; fully-qualified     # 🚶🏼‍♀️ woman walking: medium-light skin tone
+1F6B6 1F3FC 200D 2640                      ; minimally-qualified # 🚶🏼‍♀ woman walking: medium-light skin tone
+1F6B6 1F3FD 200D 2640 FE0F                 ; fully-qualified     # 🚶🏽‍♀️ woman walking: medium skin tone
+1F6B6 1F3FD 200D 2640                      ; minimally-qualified # 🚶🏽‍♀ woman walking: medium skin tone
+1F6B6 1F3FE 200D 2640 FE0F                 ; fully-qualified     # 🚶🏾‍♀️ woman walking: medium-dark skin tone
+1F6B6 1F3FE 200D 2640                      ; minimally-qualified # 🚶🏾‍♀ woman walking: medium-dark skin tone
+1F6B6 1F3FF 200D 2640 FE0F                 ; fully-qualified     # 🚶🏿‍♀️ woman walking: dark skin tone
+1F6B6 1F3FF 200D 2640                      ; minimally-qualified # 🚶🏿‍♀ woman walking: dark skin tone
+1F9CD                                      ; fully-qualified     # 🧍 person standing
+1F9CD 1F3FB                                ; fully-qualified     # 🧍🏻 person standing: light skin tone
+1F9CD 1F3FC                                ; fully-qualified     # 🧍🏼 person standing: medium-light skin tone
+1F9CD 1F3FD                                ; fully-qualified     # 🧍🏽 person standing: medium skin tone
+1F9CD 1F3FE                                ; fully-qualified     # 🧍🏾 person standing: medium-dark skin tone
+1F9CD 1F3FF                                ; fully-qualified     # 🧍🏿 person standing: dark skin tone
+1F9CD 200D 2642 FE0F                       ; fully-qualified     # 🧍‍♂️ man standing
+1F9CD 200D 2642                            ; minimally-qualified # 🧍‍♂ man standing
+1F9CD 1F3FB 200D 2642 FE0F                 ; fully-qualified     # 🧍🏻‍♂️ man standing: light skin tone
+1F9CD 1F3FB 200D 2642                      ; minimally-qualified # 🧍🏻‍♂ man standing: light skin tone
+1F9CD 1F3FC 200D 2642 FE0F                 ; fully-qualified     # 🧍🏼‍♂️ man standing: medium-light skin tone
+1F9CD 1F3FC 200D 2642                      ; minimally-qualified # 🧍🏼‍♂ man standing: medium-light skin tone
+1F9CD 1F3FD 200D 2642 FE0F                 ; fully-qualified     # 🧍🏽‍♂️ man standing: medium skin tone
+1F9CD 1F3FD 200D 2642                      ; minimally-qualified # 🧍🏽‍♂ man standing: medium skin tone
+1F9CD 1F3FE 200D 2642 FE0F                 ; fully-qualified     # 🧍🏾‍♂️ man standing: medium-dark skin tone
+1F9CD 1F3FE 200D 2642                      ; minimally-qualified # 🧍🏾‍♂ man standing: medium-dark skin tone
+1F9CD 1F3FF 200D 2642 FE0F                 ; fully-qualified     # 🧍🏿‍♂️ man standing: dark skin tone
+1F9CD 1F3FF 200D 2642                      ; minimally-qualified # 🧍🏿‍♂ man standing: dark skin tone
+1F9CD 200D 2640 FE0F                       ; fully-qualified     # 🧍‍♀️ woman standing
+1F9CD 200D 2640                            ; minimally-qualified # 🧍‍♀ woman standing
+1F9CD 1F3FB 200D 2640 FE0F                 ; fully-qualified     # 🧍🏻‍♀️ woman standing: light skin tone
+1F9CD 1F3FB 200D 2640                      ; minimally-qualified # 🧍🏻‍♀ woman standing: light skin tone
+1F9CD 1F3FC 200D 2640 FE0F                 ; fully-qualified     # 🧍🏼‍♀️ woman standing: medium-light skin tone
+1F9CD 1F3FC 200D 2640                      ; minimally-qualified # 🧍🏼‍♀ woman standing: medium-light skin tone
+1F9CD 1F3FD 200D 2640 FE0F                 ; fully-qualified     # 🧍🏽‍♀️ woman standing: medium skin tone
+1F9CD 1F3FD 200D 2640                      ; minimally-qualified # 🧍🏽‍♀ woman standing: medium skin tone
+1F9CD 1F3FE 200D 2640 FE0F                 ; fully-qualified     # 🧍🏾‍♀️ woman standing: medium-dark skin tone
+1F9CD 1F3FE 200D 2640                      ; minimally-qualified # 🧍🏾‍♀ woman standing: medium-dark skin tone
+1F9CD 1F3FF 200D 2640 FE0F                 ; fully-qualified     # 🧍🏿‍♀️ woman standing: dark skin tone
+1F9CD 1F3FF 200D 2640                      ; minimally-qualified # 🧍🏿‍♀ woman standing: dark skin tone
+1F9CE                                      ; fully-qualified     # 🧎 person kneeling
+1F9CE 1F3FB                                ; fully-qualified     # 🧎🏻 person kneeling: light skin tone
+1F9CE 1F3FC                                ; fully-qualified     # 🧎🏼 person kneeling: medium-light skin tone
+1F9CE 1F3FD                                ; fully-qualified     # 🧎🏽 person kneeling: medium skin tone
+1F9CE 1F3FE                                ; fully-qualified     # 🧎🏾 person kneeling: medium-dark skin tone
+1F9CE 1F3FF                                ; fully-qualified     # 🧎🏿 person kneeling: dark skin tone
+1F9CE 200D 2642 FE0F                       ; fully-qualified     # 🧎‍♂️ man kneeling
+1F9CE 200D 2642                            ; minimally-qualified # 🧎‍♂ man kneeling
+1F9CE 1F3FB 200D 2642 FE0F                 ; fully-qualified     # 🧎🏻‍♂️ man kneeling: light skin tone
+1F9CE 1F3FB 200D 2642                      ; minimally-qualified # 🧎🏻‍♂ man kneeling: light skin tone
+1F9CE 1F3FC 200D 2642 FE0F                 ; fully-qualified     # 🧎🏼‍♂️ man kneeling: medium-light skin tone
+1F9CE 1F3FC 200D 2642                      ; minimally-qualified # 🧎🏼‍♂ man kneeling: medium-light skin tone
+1F9CE 1F3FD 200D 2642 FE0F                 ; fully-qualified     # 🧎🏽‍♂️ man kneeling: medium skin tone
+1F9CE 1F3FD 200D 2642                      ; minimally-qualified # 🧎🏽‍♂ man kneeling: medium skin tone
+1F9CE 1F3FE 200D 2642 FE0F                 ; fully-qualified     # 🧎🏾‍♂️ man kneeling: medium-dark skin tone
+1F9CE 1F3FE 200D 2642                      ; minimally-qualified # 🧎🏾‍♂ man kneeling: medium-dark skin tone
+1F9CE 1F3FF 200D 2642 FE0F                 ; fully-qualified     # 🧎🏿‍♂️ man kneeling: dark skin tone
+1F9CE 1F3FF 200D 2642                      ; minimally-qualified # 🧎🏿‍♂ man kneeling: dark skin tone
+1F9CE 200D 2640 FE0F                       ; fully-qualified     # 🧎‍♀️ woman kneeling
+1F9CE 200D 2640                            ; minimally-qualified # 🧎‍♀ woman kneeling
+1F9CE 1F3FB 200D 2640 FE0F                 ; fully-qualified     # 🧎🏻‍♀️ woman kneeling: light skin tone
+1F9CE 1F3FB 200D 2640                      ; minimally-qualified # 🧎🏻‍♀ woman kneeling: light skin tone
+1F9CE 1F3FC 200D 2640 FE0F                 ; fully-qualified     # 🧎🏼‍♀️ woman kneeling: medium-light skin tone
+1F9CE 1F3FC 200D 2640                      ; minimally-qualified # 🧎🏼‍♀ woman kneeling: medium-light skin tone
+1F9CE 1F3FD 200D 2640 FE0F                 ; fully-qualified     # 🧎🏽‍♀️ woman kneeling: medium skin tone
+1F9CE 1F3FD 200D 2640                      ; minimally-qualified # 🧎🏽‍♀ woman kneeling: medium skin tone
+1F9CE 1F3FE 200D 2640 FE0F                 ; fully-qualified     # 🧎🏾‍♀️ woman kneeling: medium-dark skin tone
+1F9CE 1F3FE 200D 2640                      ; minimally-qualified # 🧎🏾‍♀ woman kneeling: medium-dark skin tone
+1F9CE 1F3FF 200D 2640 FE0F                 ; fully-qualified     # 🧎🏿‍♀️ woman kneeling: dark skin tone
+1F9CE 1F3FF 200D 2640                      ; minimally-qualified # 🧎🏿‍♀ woman kneeling: dark skin tone
+1F468 200D 1F9AF                           ; fully-qualified     # 👨‍🦯 man with probing cane
+1F468 1F3FB 200D 1F9AF                     ; fully-qualified     # 👨🏻‍🦯 man with probing cane: light skin tone
+1F468 1F3FC 200D 1F9AF                     ; fully-qualified     # 👨🏼‍🦯 man with probing cane: medium-light skin tone
+1F468 1F3FD 200D 1F9AF                     ; fully-qualified     # 👨🏽‍🦯 man with probing cane: medium skin tone
+1F468 1F3FE 200D 1F9AF                     ; fully-qualified     # 👨🏾‍🦯 man with probing cane: medium-dark skin tone
+1F468 1F3FF 200D 1F9AF                     ; fully-qualified     # 👨🏿‍🦯 man with probing cane: dark skin tone
+1F469 200D 1F9AF                           ; fully-qualified     # 👩‍🦯 woman with probing cane
+1F469 1F3FB 200D 1F9AF                     ; fully-qualified     # 👩🏻‍🦯 woman with probing cane: light skin tone
+1F469 1F3FC 200D 1F9AF                     ; fully-qualified     # 👩🏼‍🦯 woman with probing cane: medium-light skin tone
+1F469 1F3FD 200D 1F9AF                     ; fully-qualified     # 👩🏽‍🦯 woman with probing cane: medium skin tone
+1F469 1F3FE 200D 1F9AF                     ; fully-qualified     # 👩🏾‍🦯 woman with probing cane: medium-dark skin tone
+1F469 1F3FF 200D 1F9AF                     ; fully-qualified     # 👩🏿‍🦯 woman with probing cane: dark skin tone
+1F468 200D 1F9BC                           ; fully-qualified     # 👨‍🦼 man in motorized wheelchair
+1F468 1F3FB 200D 1F9BC                     ; fully-qualified     # 👨🏻‍🦼 man in motorized wheelchair: light skin tone
+1F468 1F3FC 200D 1F9BC                     ; fully-qualified     # 👨🏼‍🦼 man in motorized wheelchair: medium-light skin tone
+1F468 1F3FD 200D 1F9BC                     ; fully-qualified     # 👨🏽‍🦼 man in motorized wheelchair: medium skin tone
+1F468 1F3FE 200D 1F9BC                     ; fully-qualified     # 👨🏾‍🦼 man in motorized wheelchair: medium-dark skin tone
+1F468 1F3FF 200D 1F9BC                     ; fully-qualified     # 👨🏿‍🦼 man in motorized wheelchair: dark skin tone
+1F469 200D 1F9BC                           ; fully-qualified     # 👩‍🦼 woman in motorized wheelchair
+1F469 1F3FB 200D 1F9BC                     ; fully-qualified     # 👩🏻‍🦼 woman in motorized wheelchair: light skin tone
+1F469 1F3FC 200D 1F9BC                     ; fully-qualified     # 👩🏼‍🦼 woman in motorized wheelchair: medium-light skin tone
+1F469 1F3FD 200D 1F9BC                     ; fully-qualified     # 👩🏽‍🦼 woman in motorized wheelchair: medium skin tone
+1F469 1F3FE 200D 1F9BC                     ; fully-qualified     # 👩🏾‍🦼 woman in motorized wheelchair: medium-dark skin tone
+1F469 1F3FF 200D 1F9BC                     ; fully-qualified     # 👩🏿‍🦼 woman in motorized wheelchair: dark skin tone
+1F468 200D 1F9BD                           ; fully-qualified     # 👨‍🦽 man in manual wheelchair
+1F468 1F3FB 200D 1F9BD                     ; fully-qualified     # 👨🏻‍🦽 man in manual wheelchair: light skin tone
+1F468 1F3FC 200D 1F9BD                     ; fully-qualified     # 👨🏼‍🦽 man in manual wheelchair: medium-light skin tone
+1F468 1F3FD 200D 1F9BD                     ; fully-qualified     # 👨🏽‍🦽 man in manual wheelchair: medium skin tone
+1F468 1F3FE 200D 1F9BD                     ; fully-qualified     # 👨🏾‍🦽 man in manual wheelchair: medium-dark skin tone
+1F468 1F3FF 200D 1F9BD                     ; fully-qualified     # 👨🏿‍🦽 man in manual wheelchair: dark skin tone
+1F469 200D 1F9BD                           ; fully-qualified     # 👩‍🦽 woman in manual wheelchair
+1F469 1F3FB 200D 1F9BD                     ; fully-qualified     # 👩🏻‍🦽 woman in manual wheelchair: light skin tone
+1F469 1F3FC 200D 1F9BD                     ; fully-qualified     # 👩🏼‍🦽 woman in manual wheelchair: medium-light skin tone
+1F469 1F3FD 200D 1F9BD                     ; fully-qualified     # 👩🏽‍🦽 woman in manual wheelchair: medium skin tone
+1F469 1F3FE 200D 1F9BD                     ; fully-qualified     # 👩🏾‍🦽 woman in manual wheelchair: medium-dark skin tone
+1F469 1F3FF 200D 1F9BD                     ; fully-qualified     # 👩🏿‍🦽 woman in manual wheelchair: dark skin tone
+1F3C3                                      ; fully-qualified     # 🏃 person running
+1F3C3 1F3FB                                ; fully-qualified     # 🏃🏻 person running: light skin tone
+1F3C3 1F3FC                                ; fully-qualified     # 🏃🏼 person running: medium-light skin tone
+1F3C3 1F3FD                                ; fully-qualified     # 🏃🏽 person running: medium skin tone
+1F3C3 1F3FE                                ; fully-qualified     # 🏃🏾 person running: medium-dark skin tone
+1F3C3 1F3FF                                ; fully-qualified     # 🏃🏿 person running: dark skin tone
+1F3C3 200D 2642 FE0F                       ; fully-qualified     # 🏃‍♂️ man running
+1F3C3 200D 2642                            ; minimally-qualified # 🏃‍♂ man running
+1F3C3 1F3FB 200D 2642 FE0F                 ; fully-qualified     # 🏃🏻‍♂️ man running: light skin tone
+1F3C3 1F3FB 200D 2642                      ; minimally-qualified # 🏃🏻‍♂ man running: light skin tone
+1F3C3 1F3FC 200D 2642 FE0F                 ; fully-qualified     # 🏃🏼‍♂️ man running: medium-light skin tone
+1F3C3 1F3FC 200D 2642                      ; minimally-qualified # 🏃🏼‍♂ man running: medium-light skin tone
+1F3C3 1F3FD 200D 2642 FE0F                 ; fully-qualified     # 🏃🏽‍♂️ man running: medium skin tone
+1F3C3 1F3FD 200D 2642                      ; minimally-qualified # 🏃🏽‍♂ man running: medium skin tone
+1F3C3 1F3FE 200D 2642 FE0F                 ; fully-qualified     # 🏃🏾‍♂️ man running: medium-dark skin tone
+1F3C3 1F3FE 200D 2642                      ; minimally-qualified # 🏃🏾‍♂ man running: medium-dark skin tone
+1F3C3 1F3FF 200D 2642 FE0F                 ; fully-qualified     # 🏃🏿‍♂️ man running: dark skin tone
+1F3C3 1F3FF 200D 2642                      ; minimally-qualified # 🏃🏿‍♂ man running: dark skin tone
+1F3C3 200D 2640 FE0F                       ; fully-qualified     # 🏃‍♀️ woman running
+1F3C3 200D 2640                            ; minimally-qualified # 🏃‍♀ woman running
+1F3C3 1F3FB 200D 2640 FE0F                 ; fully-qualified     # 🏃🏻‍♀️ woman running: light skin tone
+1F3C3 1F3FB 200D 2640                      ; minimally-qualified # 🏃🏻‍♀ woman running: light skin tone
+1F3C3 1F3FC 200D 2640 FE0F                 ; fully-qualified     # 🏃🏼‍♀️ woman running: medium-light skin tone
+1F3C3 1F3FC 200D 2640                      ; minimally-qualified # 🏃🏼‍♀ woman running: medium-light skin tone
+1F3C3 1F3FD 200D 2640 FE0F                 ; fully-qualified     # 🏃🏽‍♀️ woman running: medium skin tone
+1F3C3 1F3FD 200D 2640                      ; minimally-qualified # 🏃🏽‍♀ woman running: medium skin tone
+1F3C3 1F3FE 200D 2640 FE0F                 ; fully-qualified     # 🏃🏾‍♀️ woman running: medium-dark skin tone
+1F3C3 1F3FE 200D 2640                      ; minimally-qualified # 🏃🏾‍♀ woman running: medium-dark skin tone
+1F3C3 1F3FF 200D 2640 FE0F                 ; fully-qualified     # 🏃🏿‍♀️ woman running: dark skin tone
+1F3C3 1F3FF 200D 2640                      ; minimally-qualified # 🏃🏿‍♀ woman running: dark skin tone
+1F483                                      ; fully-qualified     # 💃 woman dancing
+1F483 1F3FB                                ; fully-qualified     # 💃🏻 woman dancing: light skin tone
+1F483 1F3FC                                ; fully-qualified     # 💃🏼 woman dancing: medium-light skin tone
+1F483 1F3FD                                ; fully-qualified     # 💃🏽 woman dancing: medium skin tone
+1F483 1F3FE                                ; fully-qualified     # 💃🏾 woman dancing: medium-dark skin tone
+1F483 1F3FF                                ; fully-qualified     # 💃🏿 woman dancing: dark skin tone
+1F57A                                      ; fully-qualified     # 🕺 man dancing
+1F57A 1F3FB                                ; fully-qualified     # 🕺🏻 man dancing: light skin tone
+1F57A 1F3FC                                ; fully-qualified     # 🕺🏼 man dancing: medium-light skin tone
+1F57A 1F3FD                                ; fully-qualified     # 🕺🏽 man dancing: medium skin tone
+1F57A 1F3FE                                ; fully-qualified     # 🕺🏾 man dancing: medium-dark skin tone
+1F57A 1F3FF                                ; fully-qualified     # 🕺🏿 man dancing: dark skin tone
+1F574 FE0F                                 ; fully-qualified     # 🕴️ man in suit levitating
+1F574                                      ; unqualified         # 🕴 man in suit levitating
+1F574 1F3FB                                ; fully-qualified     # 🕴🏻 man in suit levitating: light skin tone
+1F574 1F3FC                                ; fully-qualified     # 🕴🏼 man in suit levitating: medium-light skin tone
+1F574 1F3FD                                ; fully-qualified     # 🕴🏽 man in suit levitating: medium skin tone
+1F574 1F3FE                                ; fully-qualified     # 🕴🏾 man in suit levitating: medium-dark skin tone
+1F574 1F3FF                                ; fully-qualified     # 🕴🏿 man in suit levitating: dark skin tone
+1F46F                                      ; fully-qualified     # 👯 people with bunny ears
+1F46F 200D 2642 FE0F                       ; fully-qualified     # 👯‍♂️ men with bunny ears
+1F46F 200D 2642                            ; minimally-qualified # 👯‍♂ men with bunny ears
+1F46F 200D 2640 FE0F                       ; fully-qualified     # 👯‍♀️ women with bunny ears
+1F46F 200D 2640                            ; minimally-qualified # 👯‍♀ women with bunny ears
+1F9D6                                      ; fully-qualified     # 🧖 person in steamy room
+1F9D6 1F3FB                                ; fully-qualified     # 🧖🏻 person in steamy room: light skin tone
+1F9D6 1F3FC                                ; fully-qualified     # 🧖🏼 person in steamy room: medium-light skin tone
+1F9D6 1F3FD                                ; fully-qualified     # 🧖🏽 person in steamy room: medium skin tone
+1F9D6 1F3FE                                ; fully-qualified     # 🧖🏾 person in steamy room: medium-dark skin tone
+1F9D6 1F3FF                                ; fully-qualified     # 🧖🏿 person in steamy room: dark skin tone
+1F9D6 200D 2642 FE0F                       ; fully-qualified     # 🧖‍♂️ man in steamy room
+1F9D6 200D 2642                            ; minimally-qualified # 🧖‍♂ man in steamy room
+1F9D6 1F3FB 200D 2642 FE0F                 ; fully-qualified     # 🧖🏻‍♂️ man in steamy room: light skin tone
+1F9D6 1F3FB 200D 2642                      ; minimally-qualified # 🧖🏻‍♂ man in steamy room: light skin tone
+1F9D6 1F3FC 200D 2642 FE0F                 ; fully-qualified     # 🧖🏼‍♂️ man in steamy room: medium-light skin tone
+1F9D6 1F3FC 200D 2642                      ; minimally-qualified # 🧖🏼‍♂ man in steamy room: medium-light skin tone
+1F9D6 1F3FD 200D 2642 FE0F                 ; fully-qualified     # 🧖🏽‍♂️ man in steamy room: medium skin tone
+1F9D6 1F3FD 200D 2642                      ; minimally-qualified # 🧖🏽‍♂ man in steamy room: medium skin tone
+1F9D6 1F3FE 200D 2642 FE0F                 ; fully-qualified     # 🧖🏾‍♂️ man in steamy room: medium-dark skin tone
+1F9D6 1F3FE 200D 2642                      ; minimally-qualified # 🧖🏾‍♂ man in steamy room: medium-dark skin tone
+1F9D6 1F3FF 200D 2642 FE0F                 ; fully-qualified     # 🧖🏿‍♂️ man in steamy room: dark skin tone
+1F9D6 1F3FF 200D 2642                      ; minimally-qualified # 🧖🏿‍♂ man in steamy room: dark skin tone
+1F9D6 200D 2640 FE0F                       ; fully-qualified     # 🧖‍♀️ woman in steamy room
+1F9D6 200D 2640                            ; minimally-qualified # 🧖‍♀ woman in steamy room
+1F9D6 1F3FB 200D 2640 FE0F                 ; fully-qualified     # 🧖🏻‍♀️ woman in steamy room: light skin tone
+1F9D6 1F3FB 200D 2640                      ; minimally-qualified # 🧖🏻‍♀ woman in steamy room: light skin tone
+1F9D6 1F3FC 200D 2640 FE0F                 ; fully-qualified     # 🧖🏼‍♀️ woman in steamy room: medium-light skin tone
+1F9D6 1F3FC 200D 2640                      ; minimally-qualified # 🧖🏼‍♀ woman in steamy room: medium-light skin tone
+1F9D6 1F3FD 200D 2640 FE0F                 ; fully-qualified     # 🧖🏽‍♀️ woman in steamy room: medium skin tone
+1F9D6 1F3FD 200D 2640                      ; minimally-qualified # 🧖🏽‍♀ woman in steamy room: medium skin tone
+1F9D6 1F3FE 200D 2640 FE0F                 ; fully-qualified     # 🧖🏾‍♀️ woman in steamy room: medium-dark skin tone
+1F9D6 1F3FE 200D 2640                      ; minimally-qualified # 🧖🏾‍♀ woman in steamy room: medium-dark skin tone
+1F9D6 1F3FF 200D 2640 FE0F                 ; fully-qualified     # 🧖🏿‍♀️ woman in steamy room: dark skin tone
+1F9D6 1F3FF 200D 2640                      ; minimally-qualified # 🧖🏿‍♀ woman in steamy room: dark skin tone
+1F9D7                                      ; fully-qualified     # 🧗 person climbing
+1F9D7 1F3FB                                ; fully-qualified     # 🧗🏻 person climbing: light skin tone
+1F9D7 1F3FC                                ; fully-qualified     # 🧗🏼 person climbing: medium-light skin tone
+1F9D7 1F3FD                                ; fully-qualified     # 🧗🏽 person climbing: medium skin tone
+1F9D7 1F3FE                                ; fully-qualified     # 🧗🏾 person climbing: medium-dark skin tone
+1F9D7 1F3FF                                ; fully-qualified     # 🧗🏿 person climbing: dark skin tone
+1F9D7 200D 2642 FE0F                       ; fully-qualified     # 🧗‍♂️ man climbing
+1F9D7 200D 2642                            ; minimally-qualified # 🧗‍♂ man climbing
+1F9D7 1F3FB 200D 2642 FE0F                 ; fully-qualified     # 🧗🏻‍♂️ man climbing: light skin tone
+1F9D7 1F3FB 200D 2642                      ; minimally-qualified # 🧗🏻‍♂ man climbing: light skin tone
+1F9D7 1F3FC 200D 2642 FE0F                 ; fully-qualified     # 🧗🏼‍♂️ man climbing: medium-light skin tone
+1F9D7 1F3FC 200D 2642                      ; minimally-qualified # 🧗🏼‍♂ man climbing: medium-light skin tone
+1F9D7 1F3FD 200D 2642 FE0F                 ; fully-qualified     # 🧗🏽‍♂️ man climbing: medium skin tone
+1F9D7 1F3FD 200D 2642                      ; minimally-qualified # 🧗🏽‍♂ man climbing: medium skin tone
+1F9D7 1F3FE 200D 2642 FE0F                 ; fully-qualified     # 🧗🏾‍♂️ man climbing: medium-dark skin tone
+1F9D7 1F3FE 200D 2642                      ; minimally-qualified # 🧗🏾‍♂ man climbing: medium-dark skin tone
+1F9D7 1F3FF 200D 2642 FE0F                 ; fully-qualified     # 🧗🏿‍♂️ man climbing: dark skin tone
+1F9D7 1F3FF 200D 2642                      ; minimally-qualified # 🧗🏿‍♂ man climbing: dark skin tone
+1F9D7 200D 2640 FE0F                       ; fully-qualified     # 🧗‍♀️ woman climbing
+1F9D7 200D 2640                            ; minimally-qualified # 🧗‍♀ woman climbing
+1F9D7 1F3FB 200D 2640 FE0F                 ; fully-qualified     # 🧗🏻‍♀️ woman climbing: light skin tone
+1F9D7 1F3FB 200D 2640                      ; minimally-qualified # 🧗🏻‍♀ woman climbing: light skin tone
+1F9D7 1F3FC 200D 2640 FE0F                 ; fully-qualified     # 🧗🏼‍♀️ woman climbing: medium-light skin tone
+1F9D7 1F3FC 200D 2640                      ; minimally-qualified # 🧗🏼‍♀ woman climbing: medium-light skin tone
+1F9D7 1F3FD 200D 2640 FE0F                 ; fully-qualified     # 🧗🏽‍♀️ woman climbing: medium skin tone
+1F9D7 1F3FD 200D 2640                      ; minimally-qualified # 🧗🏽‍♀ woman climbing: medium skin tone
+1F9D7 1F3FE 200D 2640 FE0F                 ; fully-qualified     # 🧗🏾‍♀️ woman climbing: medium-dark skin tone
+1F9D7 1F3FE 200D 2640                      ; minimally-qualified # 🧗🏾‍♀ woman climbing: medium-dark skin tone
+1F9D7 1F3FF 200D 2640 FE0F                 ; fully-qualified     # 🧗🏿‍♀️ woman climbing: dark skin tone
+1F9D7 1F3FF 200D 2640                      ; minimally-qualified # 🧗🏿‍♀ woman climbing: dark skin tone
+
+# subgroup: person-sport
+1F93A                                      ; fully-qualified     # 🤺 person fencing
+1F3C7                                      ; fully-qualified     # 🏇 horse racing
+1F3C7 1F3FB                                ; fully-qualified     # 🏇🏻 horse racing: light skin tone
+1F3C7 1F3FC                                ; fully-qualified     # 🏇🏼 horse racing: medium-light skin tone
+1F3C7 1F3FD                                ; fully-qualified     # 🏇🏽 horse racing: medium skin tone
+1F3C7 1F3FE                                ; fully-qualified     # 🏇🏾 horse racing: medium-dark skin tone
+1F3C7 1F3FF                                ; fully-qualified     # 🏇🏿 horse racing: dark skin tone
+26F7 FE0F                                  ; fully-qualified     # ⛷️ skier
+26F7                                       ; unqualified         # ⛷ skier
+1F3C2                                      ; fully-qualified     # 🏂 snowboarder
+1F3C2 1F3FB                                ; fully-qualified     # 🏂🏻 snowboarder: light skin tone
+1F3C2 1F3FC                                ; fully-qualified     # 🏂🏼 snowboarder: medium-light skin tone
+1F3C2 1F3FD                                ; fully-qualified     # 🏂🏽 snowboarder: medium skin tone
+1F3C2 1F3FE                                ; fully-qualified     # 🏂🏾 snowboarder: medium-dark skin tone
+1F3C2 1F3FF                                ; fully-qualified     # 🏂🏿 snowboarder: dark skin tone
+1F3CC FE0F                                 ; fully-qualified     # 🏌️ person golfing
+1F3CC                                      ; unqualified         # 🏌 person golfing
+1F3CC 1F3FB                                ; fully-qualified     # 🏌🏻 person golfing: light skin tone
+1F3CC 1F3FC                                ; fully-qualified     # 🏌🏼 person golfing: medium-light skin tone
+1F3CC 1F3FD                                ; fully-qualified     # 🏌🏽 person golfing: medium skin tone
+1F3CC 1F3FE                                ; fully-qualified     # 🏌🏾 person golfing: medium-dark skin tone
+1F3CC 1F3FF                                ; fully-qualified     # 🏌🏿 person golfing: dark skin tone
+1F3CC FE0F 200D 2642 FE0F                  ; fully-qualified     # 🏌️‍♂️ man golfing
+1F3CC 200D 2642 FE0F                       ; unqualified         # 🏌‍♂️ man golfing
+1F3CC FE0F 200D 2642                       ; unqualified         # 🏌️‍♂ man golfing
+1F3CC 200D 2642                            ; unqualified         # 🏌‍♂ man golfing
+1F3CC 1F3FB 200D 2642 FE0F                 ; fully-qualified     # 🏌🏻‍♂️ man golfing: light skin tone
+1F3CC 1F3FB 200D 2642                      ; minimally-qualified # 🏌🏻‍♂ man golfing: light skin tone
+1F3CC 1F3FC 200D 2642 FE0F                 ; fully-qualified     # 🏌🏼‍♂️ man golfing: medium-light skin tone
+1F3CC 1F3FC 200D 2642                      ; minimally-qualified # 🏌🏼‍♂ man golfing: medium-light skin tone
+1F3CC 1F3FD 200D 2642 FE0F                 ; fully-qualified     # 🏌🏽‍♂️ man golfing: medium skin tone
+1F3CC 1F3FD 200D 2642                      ; minimally-qualified # 🏌🏽‍♂ man golfing: medium skin tone
+1F3CC 1F3FE 200D 2642 FE0F                 ; fully-qualified     # 🏌🏾‍♂️ man golfing: medium-dark skin tone
+1F3CC 1F3FE 200D 2642                      ; minimally-qualified # 🏌🏾‍♂ man golfing: medium-dark skin tone
+1F3CC 1F3FF 200D 2642 FE0F                 ; fully-qualified     # 🏌🏿‍♂️ man golfing: dark skin tone
+1F3CC 1F3FF 200D 2642                      ; minimally-qualified # 🏌🏿‍♂ man golfing: dark skin tone
+1F3CC FE0F 200D 2640 FE0F                  ; fully-qualified     # 🏌️‍♀️ woman golfing
+1F3CC 200D 2640 FE0F                       ; unqualified         # 🏌‍♀️ woman golfing
+1F3CC FE0F 200D 2640                       ; unqualified         # 🏌️‍♀ woman golfing
+1F3CC 200D 2640                            ; unqualified         # 🏌‍♀ woman golfing
+1F3CC 1F3FB 200D 2640 FE0F                 ; fully-qualified     # 🏌🏻‍♀️ woman golfing: light skin tone
+1F3CC 1F3FB 200D 2640                      ; minimally-qualified # 🏌🏻‍♀ woman golfing: light skin tone
+1F3CC 1F3FC 200D 2640 FE0F                 ; fully-qualified     # 🏌🏼‍♀️ woman golfing: medium-light skin tone
+1F3CC 1F3FC 200D 2640                      ; minimally-qualified # 🏌🏼‍♀ woman golfing: medium-light skin tone
+1F3CC 1F3FD 200D 2640 FE0F                 ; fully-qualified     # 🏌🏽‍♀️ woman golfing: medium skin tone
+1F3CC 1F3FD 200D 2640                      ; minimally-qualified # 🏌🏽‍♀ woman golfing: medium skin tone
+1F3CC 1F3FE 200D 2640 FE0F                 ; fully-qualified     # 🏌🏾‍♀️ woman golfing: medium-dark skin tone
+1F3CC 1F3FE 200D 2640                      ; minimally-qualified # 🏌🏾‍♀ woman golfing: medium-dark skin tone
+1F3CC 1F3FF 200D 2640 FE0F                 ; fully-qualified     # 🏌🏿‍♀️ woman golfing: dark skin tone
+1F3CC 1F3FF 200D 2640                      ; minimally-qualified # 🏌🏿‍♀ woman golfing: dark skin tone
+1F3C4                                      ; fully-qualified     # 🏄 person surfing
+1F3C4 1F3FB                                ; fully-qualified     # 🏄🏻 person surfing: light skin tone
+1F3C4 1F3FC                                ; fully-qualified     # 🏄🏼 person surfing: medium-light skin tone
+1F3C4 1F3FD                                ; fully-qualified     # 🏄🏽 person surfing: medium skin tone
+1F3C4 1F3FE                                ; fully-qualified     # 🏄🏾 person surfing: medium-dark skin tone
+1F3C4 1F3FF                                ; fully-qualified     # 🏄🏿 person surfing: dark skin tone
+1F3C4 200D 2642 FE0F                       ; fully-qualified     # 🏄‍♂️ man surfing
+1F3C4 200D 2642                            ; minimally-qualified # 🏄‍♂ man surfing
+1F3C4 1F3FB 200D 2642 FE0F                 ; fully-qualified     # 🏄🏻‍♂️ man surfing: light skin tone
+1F3C4 1F3FB 200D 2642                      ; minimally-qualified # 🏄🏻‍♂ man surfing: light skin tone
+1F3C4 1F3FC 200D 2642 FE0F                 ; fully-qualified     # 🏄🏼‍♂️ man surfing: medium-light skin tone
+1F3C4 1F3FC 200D 2642                      ; minimally-qualified # 🏄🏼‍♂ man surfing: medium-light skin tone
+1F3C4 1F3FD 200D 2642 FE0F                 ; fully-qualified     # 🏄🏽‍♂️ man surfing: medium skin tone
+1F3C4 1F3FD 200D 2642                      ; minimally-qualified # 🏄🏽‍♂ man surfing: medium skin tone
+1F3C4 1F3FE 200D 2642 FE0F                 ; fully-qualified     # 🏄🏾‍♂️ man surfing: medium-dark skin tone
+1F3C4 1F3FE 200D 2642                      ; minimally-qualified # 🏄🏾‍♂ man surfing: medium-dark skin tone
+1F3C4 1F3FF 200D 2642 FE0F                 ; fully-qualified     # 🏄🏿‍♂️ man surfing: dark skin tone
+1F3C4 1F3FF 200D 2642                      ; minimally-qualified # 🏄🏿‍♂ man surfing: dark skin tone
+1F3C4 200D 2640 FE0F                       ; fully-qualified     # 🏄‍♀️ woman surfing
+1F3C4 200D 2640                            ; minimally-qualified # 🏄‍♀ woman surfing
+1F3C4 1F3FB 200D 2640 FE0F                 ; fully-qualified     # 🏄🏻‍♀️ woman surfing: light skin tone
+1F3C4 1F3FB 200D 2640                      ; minimally-qualified # 🏄🏻‍♀ woman surfing: light skin tone
+1F3C4 1F3FC 200D 2640 FE0F                 ; fully-qualified     # 🏄🏼‍♀️ woman surfing: medium-light skin tone
+1F3C4 1F3FC 200D 2640                      ; minimally-qualified # 🏄🏼‍♀ woman surfing: medium-light skin tone
+1F3C4 1F3FD 200D 2640 FE0F                 ; fully-qualified     # 🏄🏽‍♀️ woman surfing: medium skin tone
+1F3C4 1F3FD 200D 2640                      ; minimally-qualified # 🏄🏽‍♀ woman surfing: medium skin tone
+1F3C4 1F3FE 200D 2640 FE0F                 ; fully-qualified     # 🏄🏾‍♀️ woman surfing: medium-dark skin tone
+1F3C4 1F3FE 200D 2640                      ; minimally-qualified # 🏄🏾‍♀ woman surfing: medium-dark skin tone
+1F3C4 1F3FF 200D 2640 FE0F                 ; fully-qualified     # 🏄🏿‍♀️ woman surfing: dark skin tone
+1F3C4 1F3FF 200D 2640                      ; minimally-qualified # 🏄🏿‍♀ woman surfing: dark skin tone
+1F6A3                                      ; fully-qualified     # 🚣 person rowing boat
+1F6A3 1F3FB                                ; fully-qualified     # 🚣🏻 person rowing boat: light skin tone
+1F6A3 1F3FC                                ; fully-qualified     # 🚣🏼 person rowing boat: medium-light skin tone
+1F6A3 1F3FD                                ; fully-qualified     # 🚣🏽 person rowing boat: medium skin tone
+1F6A3 1F3FE                                ; fully-qualified     # 🚣🏾 person rowing boat: medium-dark skin tone
+1F6A3 1F3FF                                ; fully-qualified     # 🚣🏿 person rowing boat: dark skin tone
+1F6A3 200D 2642 FE0F                       ; fully-qualified     # 🚣‍♂️ man rowing boat
+1F6A3 200D 2642                            ; minimally-qualified # 🚣‍♂ man rowing boat
+1F6A3 1F3FB 200D 2642 FE0F                 ; fully-qualified     # 🚣🏻‍♂️ man rowing boat: light skin tone
+1F6A3 1F3FB 200D 2642                      ; minimally-qualified # 🚣🏻‍♂ man rowing boat: light skin tone
+1F6A3 1F3FC 200D 2642 FE0F                 ; fully-qualified     # 🚣🏼‍♂️ man rowing boat: medium-light skin tone
+1F6A3 1F3FC 200D 2642                      ; minimally-qualified # 🚣🏼‍♂ man rowing boat: medium-light skin tone
+1F6A3 1F3FD 200D 2642 FE0F                 ; fully-qualified     # 🚣🏽‍♂️ man rowing boat: medium skin tone
+1F6A3 1F3FD 200D 2642                      ; minimally-qualified # 🚣🏽‍♂ man rowing boat: medium skin tone
+1F6A3 1F3FE 200D 2642 FE0F                 ; fully-qualified     # 🚣🏾‍♂️ man rowing boat: medium-dark skin tone
+1F6A3 1F3FE 200D 2642                      ; minimally-qualified # 🚣🏾‍♂ man rowing boat: medium-dark skin tone
+1F6A3 1F3FF 200D 2642 FE0F                 ; fully-qualified     # 🚣🏿‍♂️ man rowing boat: dark skin tone
+1F6A3 1F3FF 200D 2642                      ; minimally-qualified # 🚣🏿‍♂ man rowing boat: dark skin tone
+1F6A3 200D 2640 FE0F                       ; fully-qualified     # 🚣‍♀️ woman rowing boat
+1F6A3 200D 2640                            ; minimally-qualified # 🚣‍♀ woman rowing boat
+1F6A3 1F3FB 200D 2640 FE0F                 ; fully-qualified     # 🚣🏻‍♀️ woman rowing boat: light skin tone
+1F6A3 1F3FB 200D 2640                      ; minimally-qualified # 🚣🏻‍♀ woman rowing boat: light skin tone
+1F6A3 1F3FC 200D 2640 FE0F                 ; fully-qualified     # 🚣🏼‍♀️ woman rowing boat: medium-light skin tone
+1F6A3 1F3FC 200D 2640                      ; minimally-qualified # 🚣🏼‍♀ woman rowing boat: medium-light skin tone
+1F6A3 1F3FD 200D 2640 FE0F                 ; fully-qualified     # 🚣🏽‍♀️ woman rowing boat: medium skin tone
+1F6A3 1F3FD 200D 2640                      ; minimally-qualified # 🚣🏽‍♀ woman rowing boat: medium skin tone
+1F6A3 1F3FE 200D 2640 FE0F                 ; fully-qualified     # 🚣🏾‍♀️ woman rowing boat: medium-dark skin tone
+1F6A3 1F3FE 200D 2640                      ; minimally-qualified # 🚣🏾‍♀ woman rowing boat: medium-dark skin tone
+1F6A3 1F3FF 200D 2640 FE0F                 ; fully-qualified     # 🚣🏿‍♀️ woman rowing boat: dark skin tone
+1F6A3 1F3FF 200D 2640                      ; minimally-qualified # 🚣🏿‍♀ woman rowing boat: dark skin tone
+1F3CA                                      ; fully-qualified     # 🏊 person swimming
+1F3CA 1F3FB                                ; fully-qualified     # 🏊🏻 person swimming: light skin tone
+1F3CA 1F3FC                                ; fully-qualified     # 🏊🏼 person swimming: medium-light skin tone
+1F3CA 1F3FD                                ; fully-qualified     # 🏊🏽 person swimming: medium skin tone
+1F3CA 1F3FE                                ; fully-qualified     # 🏊🏾 person swimming: medium-dark skin tone
+1F3CA 1F3FF                                ; fully-qualified     # 🏊🏿 person swimming: dark skin tone
+1F3CA 200D 2642 FE0F                       ; fully-qualified     # 🏊‍♂️ man swimming
+1F3CA 200D 2642                            ; minimally-qualified # 🏊‍♂ man swimming
+1F3CA 1F3FB 200D 2642 FE0F                 ; fully-qualified     # 🏊🏻‍♂️ man swimming: light skin tone
+1F3CA 1F3FB 200D 2642                      ; minimally-qualified # 🏊🏻‍♂ man swimming: light skin tone
+1F3CA 1F3FC 200D 2642 FE0F                 ; fully-qualified     # 🏊🏼‍♂️ man swimming: medium-light skin tone
+1F3CA 1F3FC 200D 2642                      ; minimally-qualified # 🏊🏼‍♂ man swimming: medium-light skin tone
+1F3CA 1F3FD 200D 2642 FE0F                 ; fully-qualified     # 🏊🏽‍♂️ man swimming: medium skin tone
+1F3CA 1F3FD 200D 2642                      ; minimally-qualified # 🏊🏽‍♂ man swimming: medium skin tone
+1F3CA 1F3FE 200D 2642 FE0F                 ; fully-qualified     # 🏊🏾‍♂️ man swimming: medium-dark skin tone
+1F3CA 1F3FE 200D 2642                      ; minimally-qualified # 🏊🏾‍♂ man swimming: medium-dark skin tone
+1F3CA 1F3FF 200D 2642 FE0F                 ; fully-qualified     # 🏊🏿‍♂️ man swimming: dark skin tone
+1F3CA 1F3FF 200D 2642                      ; minimally-qualified # 🏊🏿‍♂ man swimming: dark skin tone
+1F3CA 200D 2640 FE0F                       ; fully-qualified     # 🏊‍♀️ woman swimming
+1F3CA 200D 2640                            ; minimally-qualified # 🏊‍♀ woman swimming
+1F3CA 1F3FB 200D 2640 FE0F                 ; fully-qualified     # 🏊🏻‍♀️ woman swimming: light skin tone
+1F3CA 1F3FB 200D 2640                      ; minimally-qualified # 🏊🏻‍♀ woman swimming: light skin tone
+1F3CA 1F3FC 200D 2640 FE0F                 ; fully-qualified     # 🏊🏼‍♀️ woman swimming: medium-light skin tone
+1F3CA 1F3FC 200D 2640                      ; minimally-qualified # 🏊🏼‍♀ woman swimming: medium-light skin tone
+1F3CA 1F3FD 200D 2640 FE0F                 ; fully-qualified     # 🏊🏽‍♀️ woman swimming: medium skin tone
+1F3CA 1F3FD 200D 2640                      ; minimally-qualified # 🏊🏽‍♀ woman swimming: medium skin tone
+1F3CA 1F3FE 200D 2640 FE0F                 ; fully-qualified     # 🏊🏾‍♀️ woman swimming: medium-dark skin tone
+1F3CA 1F3FE 200D 2640                      ; minimally-qualified # 🏊🏾‍♀ woman swimming: medium-dark skin tone
+1F3CA 1F3FF 200D 2640 FE0F                 ; fully-qualified     # 🏊🏿‍♀️ woman swimming: dark skin tone
+1F3CA 1F3FF 200D 2640                      ; minimally-qualified # 🏊🏿‍♀ woman swimming: dark skin tone
+26F9 FE0F                                  ; fully-qualified     # ⛹️ person bouncing ball
+26F9                                       ; unqualified         # ⛹ person bouncing ball
+26F9 1F3FB                                 ; fully-qualified     # ⛹🏻 person bouncing ball: light skin tone
+26F9 1F3FC                                 ; fully-qualified     # ⛹🏼 person bouncing ball: medium-light skin tone
+26F9 1F3FD                                 ; fully-qualified     # ⛹🏽 person bouncing ball: medium skin tone
+26F9 1F3FE                                 ; fully-qualified     # ⛹🏾 person bouncing ball: medium-dark skin tone
+26F9 1F3FF                                 ; fully-qualified     # ⛹🏿 person bouncing ball: dark skin tone
+26F9 FE0F 200D 2642 FE0F                   ; fully-qualified     # ⛹️‍♂️ man bouncing ball
+26F9 200D 2642 FE0F                        ; unqualified         # ⛹‍♂️ man bouncing ball
+26F9 FE0F 200D 2642                        ; unqualified         # ⛹️‍♂ man bouncing ball
+26F9 200D 2642                             ; unqualified         # ⛹‍♂ man bouncing ball
+26F9 1F3FB 200D 2642 FE0F                  ; fully-qualified     # ⛹🏻‍♂️ man bouncing ball: light skin tone
+26F9 1F3FB 200D 2642                       ; minimally-qualified # ⛹🏻‍♂ man bouncing ball: light skin tone
+26F9 1F3FC 200D 2642 FE0F                  ; fully-qualified     # ⛹🏼‍♂️ man bouncing ball: medium-light skin tone
+26F9 1F3FC 200D 2642                       ; minimally-qualified # ⛹🏼‍♂ man bouncing ball: medium-light skin tone
+26F9 1F3FD 200D 2642 FE0F                  ; fully-qualified     # ⛹🏽‍♂️ man bouncing ball: medium skin tone
+26F9 1F3FD 200D 2642                       ; minimally-qualified # ⛹🏽‍♂ man bouncing ball: medium skin tone
+26F9 1F3FE 200D 2642 FE0F                  ; fully-qualified     # ⛹🏾‍♂️ man bouncing ball: medium-dark skin tone
+26F9 1F3FE 200D 2642                       ; minimally-qualified # ⛹🏾‍♂ man bouncing ball: medium-dark skin tone
+26F9 1F3FF 200D 2642 FE0F                  ; fully-qualified     # ⛹🏿‍♂️ man bouncing ball: dark skin tone
+26F9 1F3FF 200D 2642                       ; minimally-qualified # ⛹🏿‍♂ man bouncing ball: dark skin tone
+26F9 FE0F 200D 2640 FE0F                   ; fully-qualified     # ⛹️‍♀️ woman bouncing ball
+26F9 200D 2640 FE0F                        ; unqualified         # ⛹‍♀️ woman bouncing ball
+26F9 FE0F 200D 2640                        ; unqualified         # ⛹️‍♀ woman bouncing ball
+26F9 200D 2640                             ; unqualified         # ⛹‍♀ woman bouncing ball
+26F9 1F3FB 200D 2640 FE0F                  ; fully-qualified     # ⛹🏻‍♀️ woman bouncing ball: light skin tone
+26F9 1F3FB 200D 2640                       ; minimally-qualified # ⛹🏻‍♀ woman bouncing ball: light skin tone
+26F9 1F3FC 200D 2640 FE0F                  ; fully-qualified     # ⛹🏼‍♀️ woman bouncing ball: medium-light skin tone
+26F9 1F3FC 200D 2640                       ; minimally-qualified # ⛹🏼‍♀ woman bouncing ball: medium-light skin tone
+26F9 1F3FD 200D 2640 FE0F                  ; fully-qualified     # ⛹🏽‍♀️ woman bouncing ball: medium skin tone
+26F9 1F3FD 200D 2640                       ; minimally-qualified # ⛹🏽‍♀ woman bouncing ball: medium skin tone
+26F9 1F3FE 200D 2640 FE0F                  ; fully-qualified     # ⛹🏾‍♀️ woman bouncing ball: medium-dark skin tone
+26F9 1F3FE 200D 2640                       ; minimally-qualified # ⛹🏾‍♀ woman bouncing ball: medium-dark skin tone
+26F9 1F3FF 200D 2640 FE0F                  ; fully-qualified     # ⛹🏿‍♀️ woman bouncing ball: dark skin tone
+26F9 1F3FF 200D 2640                       ; minimally-qualified # ⛹🏿‍♀ woman bouncing ball: dark skin tone
+1F3CB FE0F                                 ; fully-qualified     # 🏋️ person lifting weights
+1F3CB                                      ; unqualified         # 🏋 person lifting weights
+1F3CB 1F3FB                                ; fully-qualified     # 🏋🏻 person lifting weights: light skin tone
+1F3CB 1F3FC                                ; fully-qualified     # 🏋🏼 person lifting weights: medium-light skin tone
+1F3CB 1F3FD                                ; fully-qualified     # 🏋🏽 person lifting weights: medium skin tone
+1F3CB 1F3FE                                ; fully-qualified     # 🏋🏾 person lifting weights: medium-dark skin tone
+1F3CB 1F3FF                                ; fully-qualified     # 🏋🏿 person lifting weights: dark skin tone
+1F3CB FE0F 200D 2642 FE0F                  ; fully-qualified     # 🏋️‍♂️ man lifting weights
+1F3CB 200D 2642 FE0F                       ; unqualified         # 🏋‍♂️ man lifting weights
+1F3CB FE0F 200D 2642                       ; unqualified         # 🏋️‍♂ man lifting weights
+1F3CB 200D 2642                            ; unqualified         # 🏋‍♂ man lifting weights
+1F3CB 1F3FB 200D 2642 FE0F                 ; fully-qualified     # 🏋🏻‍♂️ man lifting weights: light skin tone
+1F3CB 1F3FB 200D 2642                      ; minimally-qualified # 🏋🏻‍♂ man lifting weights: light skin tone
+1F3CB 1F3FC 200D 2642 FE0F                 ; fully-qualified     # 🏋🏼‍♂️ man lifting weights: medium-light skin tone
+1F3CB 1F3FC 200D 2642                      ; minimally-qualified # 🏋🏼‍♂ man lifting weights: medium-light skin tone
+1F3CB 1F3FD 200D 2642 FE0F                 ; fully-qualified     # 🏋🏽‍♂️ man lifting weights: medium skin tone
+1F3CB 1F3FD 200D 2642                      ; minimally-qualified # 🏋🏽‍♂ man lifting weights: medium skin tone
+1F3CB 1F3FE 200D 2642 FE0F                 ; fully-qualified     # 🏋🏾‍♂️ man lifting weights: medium-dark skin tone
+1F3CB 1F3FE 200D 2642                      ; minimally-qualified # 🏋🏾‍♂ man lifting weights: medium-dark skin tone
+1F3CB 1F3FF 200D 2642 FE0F                 ; fully-qualified     # 🏋🏿‍♂️ man lifting weights: dark skin tone
+1F3CB 1F3FF 200D 2642                      ; minimally-qualified # 🏋🏿‍♂ man lifting weights: dark skin tone
+1F3CB FE0F 200D 2640 FE0F                  ; fully-qualified     # 🏋️‍♀️ woman lifting weights
+1F3CB 200D 2640 FE0F                       ; unqualified         # 🏋‍♀️ woman lifting weights
+1F3CB FE0F 200D 2640                       ; unqualified         # 🏋️‍♀ woman lifting weights
+1F3CB 200D 2640                            ; unqualified         # 🏋‍♀ woman lifting weights
+1F3CB 1F3FB 200D 2640 FE0F                 ; fully-qualified     # 🏋🏻‍♀️ woman lifting weights: light skin tone
+1F3CB 1F3FB 200D 2640                      ; minimally-qualified # 🏋🏻‍♀ woman lifting weights: light skin tone
+1F3CB 1F3FC 200D 2640 FE0F                 ; fully-qualified     # 🏋🏼‍♀️ woman lifting weights: medium-light skin tone
+1F3CB 1F3FC 200D 2640                      ; minimally-qualified # 🏋🏼‍♀ woman lifting weights: medium-light skin tone
+1F3CB 1F3FD 200D 2640 FE0F                 ; fully-qualified     # 🏋🏽‍♀️ woman lifting weights: medium skin tone
+1F3CB 1F3FD 200D 2640                      ; minimally-qualified # 🏋🏽‍♀ woman lifting weights: medium skin tone
+1F3CB 1F3FE 200D 2640 FE0F                 ; fully-qualified     # 🏋🏾‍♀️ woman lifting weights: medium-dark skin tone
+1F3CB 1F3FE 200D 2640                      ; minimally-qualified # 🏋🏾‍♀ woman lifting weights: medium-dark skin tone
+1F3CB 1F3FF 200D 2640 FE0F                 ; fully-qualified     # 🏋🏿‍♀️ woman lifting weights: dark skin tone
+1F3CB 1F3FF 200D 2640                      ; minimally-qualified # 🏋🏿‍♀ woman lifting weights: dark skin tone
+1F6B4                                      ; fully-qualified     # 🚴 person biking
+1F6B4 1F3FB                                ; fully-qualified     # 🚴🏻 person biking: light skin tone
+1F6B4 1F3FC                                ; fully-qualified     # 🚴🏼 person biking: medium-light skin tone
+1F6B4 1F3FD                                ; fully-qualified     # 🚴🏽 person biking: medium skin tone
+1F6B4 1F3FE                                ; fully-qualified     # 🚴🏾 person biking: medium-dark skin tone
+1F6B4 1F3FF                                ; fully-qualified     # 🚴🏿 person biking: dark skin tone
+1F6B4 200D 2642 FE0F                       ; fully-qualified     # 🚴‍♂️ man biking
+1F6B4 200D 2642                            ; minimally-qualified # 🚴‍♂ man biking
+1F6B4 1F3FB 200D 2642 FE0F                 ; fully-qualified     # 🚴🏻‍♂️ man biking: light skin tone
+1F6B4 1F3FB 200D 2642                      ; minimally-qualified # 🚴🏻‍♂ man biking: light skin tone
+1F6B4 1F3FC 200D 2642 FE0F                 ; fully-qualified     # 🚴🏼‍♂️ man biking: medium-light skin tone
+1F6B4 1F3FC 200D 2642                      ; minimally-qualified # 🚴🏼‍♂ man biking: medium-light skin tone
+1F6B4 1F3FD 200D 2642 FE0F                 ; fully-qualified     # 🚴🏽‍♂️ man biking: medium skin tone
+1F6B4 1F3FD 200D 2642                      ; minimally-qualified # 🚴🏽‍♂ man biking: medium skin tone
+1F6B4 1F3FE 200D 2642 FE0F                 ; fully-qualified     # 🚴🏾‍♂️ man biking: medium-dark skin tone
+1F6B4 1F3FE 200D 2642                      ; minimally-qualified # 🚴🏾‍♂ man biking: medium-dark skin tone
+1F6B4 1F3FF 200D 2642 FE0F                 ; fully-qualified     # 🚴🏿‍♂️ man biking: dark skin tone
+1F6B4 1F3FF 200D 2642                      ; minimally-qualified # 🚴🏿‍♂ man biking: dark skin tone
+1F6B4 200D 2640 FE0F                       ; fully-qualified     # 🚴‍♀️ woman biking
+1F6B4 200D 2640                            ; minimally-qualified # 🚴‍♀ woman biking
+1F6B4 1F3FB 200D 2640 FE0F                 ; fully-qualified     # 🚴🏻‍♀️ woman biking: light skin tone
+1F6B4 1F3FB 200D 2640                      ; minimally-qualified # 🚴🏻‍♀ woman biking: light skin tone
+1F6B4 1F3FC 200D 2640 FE0F                 ; fully-qualified     # 🚴🏼‍♀️ woman biking: medium-light skin tone
+1F6B4 1F3FC 200D 2640                      ; minimally-qualified # 🚴🏼‍♀ woman biking: medium-light skin tone
+1F6B4 1F3FD 200D 2640 FE0F                 ; fully-qualified     # 🚴🏽‍♀️ woman biking: medium skin tone
+1F6B4 1F3FD 200D 2640                      ; minimally-qualified # 🚴🏽‍♀ woman biking: medium skin tone
+1F6B4 1F3FE 200D 2640 FE0F                 ; fully-qualified     # 🚴🏾‍♀️ woman biking: medium-dark skin tone
+1F6B4 1F3FE 200D 2640                      ; minimally-qualified # 🚴🏾‍♀ woman biking: medium-dark skin tone
+1F6B4 1F3FF 200D 2640 FE0F                 ; fully-qualified     # 🚴🏿‍♀️ woman biking: dark skin tone
+1F6B4 1F3FF 200D 2640                      ; minimally-qualified # 🚴🏿‍♀ woman biking: dark skin tone
+1F6B5                                      ; fully-qualified     # 🚵 person mountain biking
+1F6B5 1F3FB                                ; fully-qualified     # 🚵🏻 person mountain biking: light skin tone
+1F6B5 1F3FC                                ; fully-qualified     # 🚵🏼 person mountain biking: medium-light skin tone
+1F6B5 1F3FD                                ; fully-qualified     # 🚵🏽 person mountain biking: medium skin tone
+1F6B5 1F3FE                                ; fully-qualified     # 🚵🏾 person mountain biking: medium-dark skin tone
+1F6B5 1F3FF                                ; fully-qualified     # 🚵🏿 person mountain biking: dark skin tone
+1F6B5 200D 2642 FE0F                       ; fully-qualified     # 🚵‍♂️ man mountain biking
+1F6B5 200D 2642                            ; minimally-qualified # 🚵‍♂ man mountain biking
+1F6B5 1F3FB 200D 2642 FE0F                 ; fully-qualified     # 🚵🏻‍♂️ man mountain biking: light skin tone
+1F6B5 1F3FB 200D 2642                      ; minimally-qualified # 🚵🏻‍♂ man mountain biking: light skin tone
+1F6B5 1F3FC 200D 2642 FE0F                 ; fully-qualified     # 🚵🏼‍♂️ man mountain biking: medium-light skin tone
+1F6B5 1F3FC 200D 2642                      ; minimally-qualified # 🚵🏼‍♂ man mountain biking: medium-light skin tone
+1F6B5 1F3FD 200D 2642 FE0F                 ; fully-qualified     # 🚵🏽‍♂️ man mountain biking: medium skin tone
+1F6B5 1F3FD 200D 2642                      ; minimally-qualified # 🚵🏽‍♂ man mountain biking: medium skin tone
+1F6B5 1F3FE 200D 2642 FE0F                 ; fully-qualified     # 🚵🏾‍♂️ man mountain biking: medium-dark skin tone
+1F6B5 1F3FE 200D 2642                      ; minimally-qualified # 🚵🏾‍♂ man mountain biking: medium-dark skin tone
+1F6B5 1F3FF 200D 2642 FE0F                 ; fully-qualified     # 🚵🏿‍♂️ man mountain biking: dark skin tone
+1F6B5 1F3FF 200D 2642                      ; minimally-qualified # 🚵🏿‍♂ man mountain biking: dark skin tone
+1F6B5 200D 2640 FE0F                       ; fully-qualified     # 🚵‍♀️ woman mountain biking
+1F6B5 200D 2640                            ; minimally-qualified # 🚵‍♀ woman mountain biking
+1F6B5 1F3FB 200D 2640 FE0F                 ; fully-qualified     # 🚵🏻‍♀️ woman mountain biking: light skin tone
+1F6B5 1F3FB 200D 2640                      ; minimally-qualified # 🚵🏻‍♀ woman mountain biking: light skin tone
+1F6B5 1F3FC 200D 2640 FE0F                 ; fully-qualified     # 🚵🏼‍♀️ woman mountain biking: medium-light skin tone
+1F6B5 1F3FC 200D 2640                      ; minimally-qualified # 🚵🏼‍♀ woman mountain biking: medium-light skin tone
+1F6B5 1F3FD 200D 2640 FE0F                 ; fully-qualified     # 🚵🏽‍♀️ woman mountain biking: medium skin tone
+1F6B5 1F3FD 200D 2640                      ; minimally-qualified # 🚵🏽‍♀ woman mountain biking: medium skin tone
+1F6B5 1F3FE 200D 2640 FE0F                 ; fully-qualified     # 🚵🏾‍♀️ woman mountain biking: medium-dark skin tone
+1F6B5 1F3FE 200D 2640                      ; minimally-qualified # 🚵🏾‍♀ woman mountain biking: medium-dark skin tone
+1F6B5 1F3FF 200D 2640 FE0F                 ; fully-qualified     # 🚵🏿‍♀️ woman mountain biking: dark skin tone
+1F6B5 1F3FF 200D 2640                      ; minimally-qualified # 🚵🏿‍♀ woman mountain biking: dark skin tone
+1F938                                      ; fully-qualified     # 🤸 person cartwheeling
+1F938 1F3FB                                ; fully-qualified     # 🤸🏻 person cartwheeling: light skin tone
+1F938 1F3FC                                ; fully-qualified     # 🤸🏼 person cartwheeling: medium-light skin tone
+1F938 1F3FD                                ; fully-qualified     # 🤸🏽 person cartwheeling: medium skin tone
+1F938 1F3FE                                ; fully-qualified     # 🤸🏾 person cartwheeling: medium-dark skin tone
+1F938 1F3FF                                ; fully-qualified     # 🤸🏿 person cartwheeling: dark skin tone
+1F938 200D 2642 FE0F                       ; fully-qualified     # 🤸‍♂️ man cartwheeling
+1F938 200D 2642                            ; minimally-qualified # 🤸‍♂ man cartwheeling
+1F938 1F3FB 200D 2642 FE0F                 ; fully-qualified     # 🤸🏻‍♂️ man cartwheeling: light skin tone
+1F938 1F3FB 200D 2642                      ; minimally-qualified # 🤸🏻‍♂ man cartwheeling: light skin tone
+1F938 1F3FC 200D 2642 FE0F                 ; fully-qualified     # 🤸🏼‍♂️ man cartwheeling: medium-light skin tone
+1F938 1F3FC 200D 2642                      ; minimally-qualified # 🤸🏼‍♂ man cartwheeling: medium-light skin tone
+1F938 1F3FD 200D 2642 FE0F                 ; fully-qualified     # 🤸🏽‍♂️ man cartwheeling: medium skin tone
+1F938 1F3FD 200D 2642                      ; minimally-qualified # 🤸🏽‍♂ man cartwheeling: medium skin tone
+1F938 1F3FE 200D 2642 FE0F                 ; fully-qualified     # 🤸🏾‍♂️ man cartwheeling: medium-dark skin tone
+1F938 1F3FE 200D 2642                      ; minimally-qualified # 🤸🏾‍♂ man cartwheeling: medium-dark skin tone
+1F938 1F3FF 200D 2642 FE0F                 ; fully-qualified     # 🤸🏿‍♂️ man cartwheeling: dark skin tone
+1F938 1F3FF 200D 2642                      ; minimally-qualified # 🤸🏿‍♂ man cartwheeling: dark skin tone
+1F938 200D 2640 FE0F                       ; fully-qualified     # 🤸‍♀️ woman cartwheeling
+1F938 200D 2640                            ; minimally-qualified # 🤸‍♀ woman cartwheeling
+1F938 1F3FB 200D 2640 FE0F                 ; fully-qualified     # 🤸🏻‍♀️ woman cartwheeling: light skin tone
+1F938 1F3FB 200D 2640                      ; minimally-qualified # 🤸🏻‍♀ woman cartwheeling: light skin tone
+1F938 1F3FC 200D 2640 FE0F                 ; fully-qualified     # 🤸🏼‍♀️ woman cartwheeling: medium-light skin tone
+1F938 1F3FC 200D 2640                      ; minimally-qualified # 🤸🏼‍♀ woman cartwheeling: medium-light skin tone
+1F938 1F3FD 200D 2640 FE0F                 ; fully-qualified     # 🤸🏽‍♀️ woman cartwheeling: medium skin tone
+1F938 1F3FD 200D 2640                      ; minimally-qualified # 🤸🏽‍♀ woman cartwheeling: medium skin tone
+1F938 1F3FE 200D 2640 FE0F                 ; fully-qualified     # 🤸🏾‍♀️ woman cartwheeling: medium-dark skin tone
+1F938 1F3FE 200D 2640                      ; minimally-qualified # 🤸🏾‍♀ woman cartwheeling: medium-dark skin tone
+1F938 1F3FF 200D 2640 FE0F                 ; fully-qualified     # 🤸🏿‍♀️ woman cartwheeling: dark skin tone
+1F938 1F3FF 200D 2640                      ; minimally-qualified # 🤸🏿‍♀ woman cartwheeling: dark skin tone
+1F93C                                      ; fully-qualified     # 🤼 people wrestling
+1F93C 200D 2642 FE0F                       ; fully-qualified     # 🤼‍♂️ men wrestling
+1F93C 200D 2642                            ; minimally-qualified # 🤼‍♂ men wrestling
+1F93C 200D 2640 FE0F                       ; fully-qualified     # 🤼‍♀️ women wrestling
+1F93C 200D 2640                            ; minimally-qualified # 🤼‍♀ women wrestling
+1F93D                                      ; fully-qualified     # 🤽 person playing water polo
+1F93D 1F3FB                                ; fully-qualified     # 🤽🏻 person playing water polo: light skin tone
+1F93D 1F3FC                                ; fully-qualified     # 🤽🏼 person playing water polo: medium-light skin tone
+1F93D 1F3FD                                ; fully-qualified     # 🤽🏽 person playing water polo: medium skin tone
+1F93D 1F3FE                                ; fully-qualified     # 🤽🏾 person playing water polo: medium-dark skin tone
+1F93D 1F3FF                                ; fully-qualified     # 🤽🏿 person playing water polo: dark skin tone
+1F93D 200D 2642 FE0F                       ; fully-qualified     # 🤽‍♂️ man playing water polo
+1F93D 200D 2642                            ; minimally-qualified # 🤽‍♂ man playing water polo
+1F93D 1F3FB 200D 2642 FE0F                 ; fully-qualified     # 🤽🏻‍♂️ man playing water polo: light skin tone
+1F93D 1F3FB 200D 2642                      ; minimally-qualified # 🤽🏻‍♂ man playing water polo: light skin tone
+1F93D 1F3FC 200D 2642 FE0F                 ; fully-qualified     # 🤽🏼‍♂️ man playing water polo: medium-light skin tone
+1F93D 1F3FC 200D 2642                      ; minimally-qualified # 🤽🏼‍♂ man playing water polo: medium-light skin tone
+1F93D 1F3FD 200D 2642 FE0F                 ; fully-qualified     # 🤽🏽‍♂️ man playing water polo: medium skin tone
+1F93D 1F3FD 200D 2642                      ; minimally-qualified # 🤽🏽‍♂ man playing water polo: medium skin tone
+1F93D 1F3FE 200D 2642 FE0F                 ; fully-qualified     # 🤽🏾‍♂️ man playing water polo: medium-dark skin tone
+1F93D 1F3FE 200D 2642                      ; minimally-qualified # 🤽🏾‍♂ man playing water polo: medium-dark skin tone
+1F93D 1F3FF 200D 2642 FE0F                 ; fully-qualified     # 🤽🏿‍♂️ man playing water polo: dark skin tone
+1F93D 1F3FF 200D 2642                      ; minimally-qualified # 🤽🏿‍♂ man playing water polo: dark skin tone
+1F93D 200D 2640 FE0F                       ; fully-qualified     # 🤽‍♀️ woman playing water polo
+1F93D 200D 2640                            ; minimally-qualified # 🤽‍♀ woman playing water polo
+1F93D 1F3FB 200D 2640 FE0F                 ; fully-qualified     # 🤽🏻‍♀️ woman playing water polo: light skin tone
+1F93D 1F3FB 200D 2640                      ; minimally-qualified # 🤽🏻‍♀ woman playing water polo: light skin tone
+1F93D 1F3FC 200D 2640 FE0F                 ; fully-qualified     # 🤽🏼‍♀️ woman playing water polo: medium-light skin tone
+1F93D 1F3FC 200D 2640                      ; minimally-qualified # 🤽🏼‍♀ woman playing water polo: medium-light skin tone
+1F93D 1F3FD 200D 2640 FE0F                 ; fully-qualified     # 🤽🏽‍♀️ woman playing water polo: medium skin tone
+1F93D 1F3FD 200D 2640                      ; minimally-qualified # 🤽🏽‍♀ woman playing water polo: medium skin tone
+1F93D 1F3FE 200D 2640 FE0F                 ; fully-qualified     # 🤽🏾‍♀️ woman playing water polo: medium-dark skin tone
+1F93D 1F3FE 200D 2640                      ; minimally-qualified # 🤽🏾‍♀ woman playing water polo: medium-dark skin tone
+1F93D 1F3FF 200D 2640 FE0F                 ; fully-qualified     # 🤽🏿‍♀️ woman playing water polo: dark skin tone
+1F93D 1F3FF 200D 2640                      ; minimally-qualified # 🤽🏿‍♀ woman playing water polo: dark skin tone
+1F93E                                      ; fully-qualified     # 🤾 person playing handball
+1F93E 1F3FB                                ; fully-qualified     # 🤾🏻 person playing handball: light skin tone
+1F93E 1F3FC                                ; fully-qualified     # 🤾🏼 person playing handball: medium-light skin tone
+1F93E 1F3FD                                ; fully-qualified     # 🤾🏽 person playing handball: medium skin tone
+1F93E 1F3FE                                ; fully-qualified     # 🤾🏾 person playing handball: medium-dark skin tone
+1F93E 1F3FF                                ; fully-qualified     # 🤾🏿 person playing handball: dark skin tone
+1F93E 200D 2642 FE0F                       ; fully-qualified     # 🤾‍♂️ man playing handball
+1F93E 200D 2642                            ; minimally-qualified # 🤾‍♂ man playing handball
+1F93E 1F3FB 200D 2642 FE0F                 ; fully-qualified     # 🤾🏻‍♂️ man playing handball: light skin tone
+1F93E 1F3FB 200D 2642                      ; minimally-qualified # 🤾🏻‍♂ man playing handball: light skin tone
+1F93E 1F3FC 200D 2642 FE0F                 ; fully-qualified     # 🤾🏼‍♂️ man playing handball: medium-light skin tone
+1F93E 1F3FC 200D 2642                      ; minimally-qualified # 🤾🏼‍♂ man playing handball: medium-light skin tone
+1F93E 1F3FD 200D 2642 FE0F                 ; fully-qualified     # 🤾🏽‍♂️ man playing handball: medium skin tone
+1F93E 1F3FD 200D 2642                      ; minimally-qualified # 🤾🏽‍♂ man playing handball: medium skin tone
+1F93E 1F3FE 200D 2642 FE0F                 ; fully-qualified     # 🤾🏾‍♂️ man playing handball: medium-dark skin tone
+1F93E 1F3FE 200D 2642                      ; minimally-qualified # 🤾🏾‍♂ man playing handball: medium-dark skin tone
+1F93E 1F3FF 200D 2642 FE0F                 ; fully-qualified     # 🤾🏿‍♂️ man playing handball: dark skin tone
+1F93E 1F3FF 200D 2642                      ; minimally-qualified # 🤾🏿‍♂ man playing handball: dark skin tone
+1F93E 200D 2640 FE0F                       ; fully-qualified     # 🤾‍♀️ woman playing handball
+1F93E 200D 2640                            ; minimally-qualified # 🤾‍♀ woman playing handball
+1F93E 1F3FB 200D 2640 FE0F                 ; fully-qualified     # 🤾🏻‍♀️ woman playing handball: light skin tone
+1F93E 1F3FB 200D 2640                      ; minimally-qualified # 🤾🏻‍♀ woman playing handball: light skin tone
+1F93E 1F3FC 200D 2640 FE0F                 ; fully-qualified     # 🤾🏼‍♀️ woman playing handball: medium-light skin tone
+1F93E 1F3FC 200D 2640                      ; minimally-qualified # 🤾🏼‍♀ woman playing handball: medium-light skin tone
+1F93E 1F3FD 200D 2640 FE0F                 ; fully-qualified     # 🤾🏽‍♀️ woman playing handball: medium skin tone
+1F93E 1F3FD 200D 2640                      ; minimally-qualified # 🤾🏽‍♀ woman playing handball: medium skin tone
+1F93E 1F3FE 200D 2640 FE0F                 ; fully-qualified     # 🤾🏾‍♀️ woman playing handball: medium-dark skin tone
+1F93E 1F3FE 200D 2640                      ; minimally-qualified # 🤾🏾‍♀ woman playing handball: medium-dark skin tone
+1F93E 1F3FF 200D 2640 FE0F                 ; fully-qualified     # 🤾🏿‍♀️ woman playing handball: dark skin tone
+1F93E 1F3FF 200D 2640                      ; minimally-qualified # 🤾🏿‍♀ woman playing handball: dark skin tone
+1F939                                      ; fully-qualified     # 🤹 person juggling
+1F939 1F3FB                                ; fully-qualified     # 🤹🏻 person juggling: light skin tone
+1F939 1F3FC                                ; fully-qualified     # 🤹🏼 person juggling: medium-light skin tone
+1F939 1F3FD                                ; fully-qualified     # 🤹🏽 person juggling: medium skin tone
+1F939 1F3FE                                ; fully-qualified     # 🤹🏾 person juggling: medium-dark skin tone
+1F939 1F3FF                                ; fully-qualified     # 🤹🏿 person juggling: dark skin tone
+1F939 200D 2642 FE0F                       ; fully-qualified     # 🤹‍♂️ man juggling
+1F939 200D 2642                            ; minimally-qualified # 🤹‍♂ man juggling
+1F939 1F3FB 200D 2642 FE0F                 ; fully-qualified     # 🤹🏻‍♂️ man juggling: light skin tone
+1F939 1F3FB 200D 2642                      ; minimally-qualified # 🤹🏻‍♂ man juggling: light skin tone
+1F939 1F3FC 200D 2642 FE0F                 ; fully-qualified     # 🤹🏼‍♂️ man juggling: medium-light skin tone
+1F939 1F3FC 200D 2642                      ; minimally-qualified # 🤹🏼‍♂ man juggling: medium-light skin tone
+1F939 1F3FD 200D 2642 FE0F                 ; fully-qualified     # 🤹🏽‍♂️ man juggling: medium skin tone
+1F939 1F3FD 200D 2642                      ; minimally-qualified # 🤹🏽‍♂ man juggling: medium skin tone
+1F939 1F3FE 200D 2642 FE0F                 ; fully-qualified     # 🤹🏾‍♂️ man juggling: medium-dark skin tone
+1F939 1F3FE 200D 2642                      ; minimally-qualified # 🤹🏾‍♂ man juggling: medium-dark skin tone
+1F939 1F3FF 200D 2642 FE0F                 ; fully-qualified     # 🤹🏿‍♂️ man juggling: dark skin tone
+1F939 1F3FF 200D 2642                      ; minimally-qualified # 🤹🏿‍♂ man juggling: dark skin tone
+1F939 200D 2640 FE0F                       ; fully-qualified     # 🤹‍♀️ woman juggling
+1F939 200D 2640                            ; minimally-qualified # 🤹‍♀ woman juggling
+1F939 1F3FB 200D 2640 FE0F                 ; fully-qualified     # 🤹🏻‍♀️ woman juggling: light skin tone
+1F939 1F3FB 200D 2640                      ; minimally-qualified # 🤹🏻‍♀ woman juggling: light skin tone
+1F939 1F3FC 200D 2640 FE0F                 ; fully-qualified     # 🤹🏼‍♀️ woman juggling: medium-light skin tone
+1F939 1F3FC 200D 2640                      ; minimally-qualified # 🤹🏼‍♀ woman juggling: medium-light skin tone
+1F939 1F3FD 200D 2640 FE0F                 ; fully-qualified     # 🤹🏽‍♀️ woman juggling: medium skin tone
+1F939 1F3FD 200D 2640                      ; minimally-qualified # 🤹🏽‍♀ woman juggling: medium skin tone
+1F939 1F3FE 200D 2640 FE0F                 ; fully-qualified     # 🤹🏾‍♀️ woman juggling: medium-dark skin tone
+1F939 1F3FE 200D 2640                      ; minimally-qualified # 🤹🏾‍♀ woman juggling: medium-dark skin tone
+1F939 1F3FF 200D 2640 FE0F                 ; fully-qualified     # 🤹🏿‍♀️ woman juggling: dark skin tone
+1F939 1F3FF 200D 2640                      ; minimally-qualified # 🤹🏿‍♀ woman juggling: dark skin tone
+
+# subgroup: person-resting
+1F9D8                                      ; fully-qualified     # 🧘 person in lotus position
+1F9D8 1F3FB                                ; fully-qualified     # 🧘🏻 person in lotus position: light skin tone
+1F9D8 1F3FC                                ; fully-qualified     # 🧘🏼 person in lotus position: medium-light skin tone
+1F9D8 1F3FD                                ; fully-qualified     # 🧘🏽 person in lotus position: medium skin tone
+1F9D8 1F3FE                                ; fully-qualified     # 🧘🏾 person in lotus position: medium-dark skin tone
+1F9D8 1F3FF                                ; fully-qualified     # 🧘🏿 person in lotus position: dark skin tone
+1F9D8 200D 2642 FE0F                       ; fully-qualified     # 🧘‍♂️ man in lotus position
+1F9D8 200D 2642                            ; minimally-qualified # 🧘‍♂ man in lotus position
+1F9D8 1F3FB 200D 2642 FE0F                 ; fully-qualified     # 🧘🏻‍♂️ man in lotus position: light skin tone
+1F9D8 1F3FB 200D 2642                      ; minimally-qualified # 🧘🏻‍♂ man in lotus position: light skin tone
+1F9D8 1F3FC 200D 2642 FE0F                 ; fully-qualified     # 🧘🏼‍♂️ man in lotus position: medium-light skin tone
+1F9D8 1F3FC 200D 2642                      ; minimally-qualified # 🧘🏼‍♂ man in lotus position: medium-light skin tone
+1F9D8 1F3FD 200D 2642 FE0F                 ; fully-qualified     # 🧘🏽‍♂️ man in lotus position: medium skin tone
+1F9D8 1F3FD 200D 2642                      ; minimally-qualified # 🧘🏽‍♂ man in lotus position: medium skin tone
+1F9D8 1F3FE 200D 2642 FE0F                 ; fully-qualified     # 🧘🏾‍♂️ man in lotus position: medium-dark skin tone
+1F9D8 1F3FE 200D 2642                      ; minimally-qualified # 🧘🏾‍♂ man in lotus position: medium-dark skin tone
+1F9D8 1F3FF 200D 2642 FE0F                 ; fully-qualified     # 🧘🏿‍♂️ man in lotus position: dark skin tone
+1F9D8 1F3FF 200D 2642                      ; minimally-qualified # 🧘🏿‍♂ man in lotus position: dark skin tone
+1F9D8 200D 2640 FE0F                       ; fully-qualified     # 🧘‍♀️ woman in lotus position
+1F9D8 200D 2640                            ; minimally-qualified # 🧘‍♀ woman in lotus position
+1F9D8 1F3FB 200D 2640 FE0F                 ; fully-qualified     # 🧘🏻‍♀️ woman in lotus position: light skin tone
+1F9D8 1F3FB 200D 2640                      ; minimally-qualified # 🧘🏻‍♀ woman in lotus position: light skin tone
+1F9D8 1F3FC 200D 2640 FE0F                 ; fully-qualified     # 🧘🏼‍♀️ woman in lotus position: medium-light skin tone
+1F9D8 1F3FC 200D 2640                      ; minimally-qualified # 🧘🏼‍♀ woman in lotus position: medium-light skin tone
+1F9D8 1F3FD 200D 2640 FE0F                 ; fully-qualified     # 🧘🏽‍♀️ woman in lotus position: medium skin tone
+1F9D8 1F3FD 200D 2640                      ; minimally-qualified # 🧘🏽‍♀ woman in lotus position: medium skin tone
+1F9D8 1F3FE 200D 2640 FE0F                 ; fully-qualified     # 🧘🏾‍♀️ woman in lotus position: medium-dark skin tone
+1F9D8 1F3FE 200D 2640                      ; minimally-qualified # 🧘🏾‍♀ woman in lotus position: medium-dark skin tone
+1F9D8 1F3FF 200D 2640 FE0F                 ; fully-qualified     # 🧘🏿‍♀️ woman in lotus position: dark skin tone
+1F9D8 1F3FF 200D 2640                      ; minimally-qualified # 🧘🏿‍♀ woman in lotus position: dark skin tone
+1F6C0                                      ; fully-qualified     # 🛀 person taking bath
+1F6C0 1F3FB                                ; fully-qualified     # 🛀🏻 person taking bath: light skin tone
+1F6C0 1F3FC                                ; fully-qualified     # 🛀🏼 person taking bath: medium-light skin tone
+1F6C0 1F3FD                                ; fully-qualified     # 🛀🏽 person taking bath: medium skin tone
+1F6C0 1F3FE                                ; fully-qualified     # 🛀🏾 person taking bath: medium-dark skin tone
+1F6C0 1F3FF                                ; fully-qualified     # 🛀🏿 person taking bath: dark skin tone
+1F6CC                                      ; fully-qualified     # 🛌 person in bed
+1F6CC 1F3FB                                ; fully-qualified     # 🛌🏻 person in bed: light skin tone
+1F6CC 1F3FC                                ; fully-qualified     # 🛌🏼 person in bed: medium-light skin tone
+1F6CC 1F3FD                                ; fully-qualified     # 🛌🏽 person in bed: medium skin tone
+1F6CC 1F3FE                                ; fully-qualified     # 🛌🏾 person in bed: medium-dark skin tone
+1F6CC 1F3FF                                ; fully-qualified     # 🛌🏿 person in bed: dark skin tone
+
+# subgroup: family
+1F9D1 200D 1F91D 200D 1F9D1                ; fully-qualified     # 🧑‍🤝‍🧑 people holding hands
+1F9D1 1F3FB 200D 1F91D 200D 1F9D1 1F3FB    ; fully-qualified     # 🧑🏻‍🤝‍🧑🏻 people holding hands: light skin tone
+1F9D1 1F3FC 200D 1F91D 200D 1F9D1 1F3FB    ; fully-qualified     # 🧑🏼‍🤝‍🧑🏻 people holding hands: medium-light skin tone, light skin tone
+1F9D1 1F3FC 200D 1F91D 200D 1F9D1 1F3FC    ; fully-qualified     # 🧑🏼‍🤝‍🧑🏼 people holding hands: medium-light skin tone
+1F9D1 1F3FD 200D 1F91D 200D 1F9D1 1F3FB    ; fully-qualified     # 🧑🏽‍🤝‍🧑🏻 people holding hands: medium skin tone, light skin tone
+1F9D1 1F3FD 200D 1F91D 200D 1F9D1 1F3FC    ; fully-qualified     # 🧑🏽‍🤝‍🧑🏼 people holding hands: medium skin tone, medium-light skin tone
+1F9D1 1F3FD 200D 1F91D 200D 1F9D1 1F3FD    ; fully-qualified     # 🧑🏽‍🤝‍🧑🏽 people holding hands: medium skin tone
+1F9D1 1F3FE 200D 1F91D 200D 1F9D1 1F3FB    ; fully-qualified     # 🧑🏾‍🤝‍🧑🏻 people holding hands: medium-dark skin tone, light skin tone
+1F9D1 1F3FE 200D 1F91D 200D 1F9D1 1F3FC    ; fully-qualified     # 🧑🏾‍🤝‍🧑🏼 people holding hands: medium-dark skin tone, medium-light skin tone
+1F9D1 1F3FE 200D 1F91D 200D 1F9D1 1F3FD    ; fully-qualified     # 🧑🏾‍🤝‍🧑🏽 people holding hands: medium-dark skin tone, medium skin tone
+1F9D1 1F3FE 200D 1F91D 200D 1F9D1 1F3FE    ; fully-qualified     # 🧑🏾‍🤝‍🧑🏾 people holding hands: medium-dark skin tone
+1F9D1 1F3FF 200D 1F91D 200D 1F9D1 1F3FB    ; fully-qualified     # 🧑🏿‍🤝‍🧑🏻 people holding hands: dark skin tone, light skin tone
+1F9D1 1F3FF 200D 1F91D 200D 1F9D1 1F3FC    ; fully-qualified     # 🧑🏿‍🤝‍🧑🏼 people holding hands: dark skin tone, medium-light skin tone
+1F9D1 1F3FF 200D 1F91D 200D 1F9D1 1F3FD    ; fully-qualified     # 🧑🏿‍🤝‍🧑🏽 people holding hands: dark skin tone, medium skin tone
+1F9D1 1F3FF 200D 1F91D 200D 1F9D1 1F3FE    ; fully-qualified     # 🧑🏿‍🤝‍🧑🏾 people holding hands: dark skin tone, medium-dark skin tone
+1F9D1 1F3FF 200D 1F91D 200D 1F9D1 1F3FF    ; fully-qualified     # 🧑🏿‍🤝‍🧑🏿 people holding hands: dark skin tone
+1F46D                                      ; fully-qualified     # 👭 women holding hands
+1F46D 1F3FB                                ; fully-qualified     # 👭🏻 women holding hands: light skin tone
+1F469 1F3FC 200D 1F91D 200D 1F469 1F3FB    ; fully-qualified     # 👩🏼‍🤝‍👩🏻 women holding hands: medium-light skin tone, light skin tone
+1F46D 1F3FC                                ; fully-qualified     # 👭🏼 women holding hands: medium-light skin tone
+1F469 1F3FD 200D 1F91D 200D 1F469 1F3FB    ; fully-qualified     # 👩🏽‍🤝‍👩🏻 women holding hands: medium skin tone, light skin tone
+1F469 1F3FD 200D 1F91D 200D 1F469 1F3FC    ; fully-qualified     # 👩🏽‍🤝‍👩🏼 women holding hands: medium skin tone, medium-light skin tone
+1F46D 1F3FD                                ; fully-qualified     # 👭🏽 women holding hands: medium skin tone
+1F469 1F3FE 200D 1F91D 200D 1F469 1F3FB    ; fully-qualified     # 👩🏾‍🤝‍👩🏻 women holding hands: medium-dark skin tone, light skin tone
+1F469 1F3FE 200D 1F91D 200D 1F469 1F3FC    ; fully-qualified     # 👩🏾‍🤝‍👩🏼 women holding hands: medium-dark skin tone, medium-light skin tone
+1F469 1F3FE 200D 1F91D 200D 1F469 1F3FD    ; fully-qualified     # 👩🏾‍🤝‍👩🏽 women holding hands: medium-dark skin tone, medium skin tone
+1F46D 1F3FE                                ; fully-qualified     # 👭🏾 women holding hands: medium-dark skin tone
+1F469 1F3FF 200D 1F91D 200D 1F469 1F3FB    ; fully-qualified     # 👩🏿‍🤝‍👩🏻 women holding hands: dark skin tone, light skin tone
+1F469 1F3FF 200D 1F91D 200D 1F469 1F3FC    ; fully-qualified     # 👩🏿‍🤝‍👩🏼 women holding hands: dark skin tone, medium-light skin tone
+1F469 1F3FF 200D 1F91D 200D 1F469 1F3FD    ; fully-qualified     # 👩🏿‍🤝‍👩🏽 women holding hands: dark skin tone, medium skin tone
+1F469 1F3FF 200D 1F91D 200D 1F469 1F3FE    ; fully-qualified     # 👩🏿‍🤝‍👩🏾 women holding hands: dark skin tone, medium-dark skin tone
+1F46D 1F3FF                                ; fully-qualified     # 👭🏿 women holding hands: dark skin tone
+1F46B                                      ; fully-qualified     # 👫 woman and man holding hands
+1F46B 1F3FB                                ; fully-qualified     # 👫🏻 woman and man holding hands: light skin tone
+1F469 1F3FB 200D 1F91D 200D 1F468 1F3FC    ; fully-qualified     # 👩🏻‍🤝‍👨🏼 woman and man holding hands: light skin tone, medium-light skin tone
+1F469 1F3FB 200D 1F91D 200D 1F468 1F3FD    ; fully-qualified     # 👩🏻‍🤝‍👨🏽 woman and man holding hands: light skin tone, medium skin tone
+1F469 1F3FB 200D 1F91D 200D 1F468 1F3FE    ; fully-qualified     # 👩🏻‍🤝‍👨🏾 woman and man holding hands: light skin tone, medium-dark skin tone
+1F469 1F3FB 200D 1F91D 200D 1F468 1F3FF    ; fully-qualified     # 👩🏻‍🤝‍👨🏿 woman and man holding hands: light skin tone, dark skin tone
+1F469 1F3FC 200D 1F91D 200D 1F468 1F3FB    ; fully-qualified     # 👩🏼‍🤝‍👨🏻 woman and man holding hands: medium-light skin tone, light skin tone
+1F46B 1F3FC                                ; fully-qualified     # 👫🏼 woman and man holding hands: medium-light skin tone
+1F469 1F3FC 200D 1F91D 200D 1F468 1F3FD    ; fully-qualified     # 👩🏼‍🤝‍👨🏽 woman and man holding hands: medium-light skin tone, medium skin tone
+1F469 1F3FC 200D 1F91D 200D 1F468 1F3FE    ; fully-qualified     # 👩🏼‍🤝‍👨🏾 woman and man holding hands: medium-light skin tone, medium-dark skin tone
+1F469 1F3FC 200D 1F91D 200D 1F468 1F3FF    ; fully-qualified     # 👩🏼‍🤝‍👨🏿 woman and man holding hands: medium-light skin tone, dark skin tone
+1F469 1F3FD 200D 1F91D 200D 1F468 1F3FB    ; fully-qualified     # 👩🏽‍🤝‍👨🏻 woman and man holding hands: medium skin tone, light skin tone
+1F469 1F3FD 200D 1F91D 200D 1F468 1F3FC    ; fully-qualified     # 👩🏽‍🤝‍👨🏼 woman and man holding hands: medium skin tone, medium-light skin tone
+1F46B 1F3FD                                ; fully-qualified     # 👫🏽 woman and man holding hands: medium skin tone
+1F469 1F3FD 200D 1F91D 200D 1F468 1F3FE    ; fully-qualified     # 👩🏽‍🤝‍👨🏾 woman and man holding hands: medium skin tone, medium-dark skin tone
+1F469 1F3FD 200D 1F91D 200D 1F468 1F3FF    ; fully-qualified     # 👩🏽‍🤝‍👨🏿 woman and man holding hands: medium skin tone, dark skin tone
+1F469 1F3FE 200D 1F91D 200D 1F468 1F3FB    ; fully-qualified     # 👩🏾‍🤝‍👨🏻 woman and man holding hands: medium-dark skin tone, light skin tone
+1F469 1F3FE 200D 1F91D 200D 1F468 1F3FC    ; fully-qualified     # 👩🏾‍🤝‍👨🏼 woman and man holding hands: medium-dark skin tone, medium-light skin tone
+1F469 1F3FE 200D 1F91D 200D 1F468 1F3FD    ; fully-qualified     # 👩🏾‍🤝‍👨🏽 woman and man holding hands: medium-dark skin tone, medium skin tone
+1F46B 1F3FE                                ; fully-qualified     # 👫🏾 woman and man holding hands: medium-dark skin tone
+1F469 1F3FE 200D 1F91D 200D 1F468 1F3FF    ; fully-qualified     # 👩🏾‍🤝‍👨🏿 woman and man holding hands: medium-dark skin tone, dark skin tone
+1F469 1F3FF 200D 1F91D 200D 1F468 1F3FB    ; fully-qualified     # 👩🏿‍🤝‍👨🏻 woman and man holding hands: dark skin tone, light skin tone
+1F469 1F3FF 200D 1F91D 200D 1F468 1F3FC    ; fully-qualified     # 👩🏿‍🤝‍👨🏼 woman and man holding hands: dark skin tone, medium-light skin tone
+1F469 1F3FF 200D 1F91D 200D 1F468 1F3FD    ; fully-qualified     # 👩🏿‍🤝‍👨🏽 woman and man holding hands: dark skin tone, medium skin tone
+1F469 1F3FF 200D 1F91D 200D 1F468 1F3FE    ; fully-qualified     # 👩🏿‍🤝‍👨🏾 woman and man holding hands: dark skin tone, medium-dark skin tone
+1F46B 1F3FF                                ; fully-qualified     # 👫🏿 woman and man holding hands: dark skin tone
+1F46C                                      ; fully-qualified     # 👬 men holding hands
+1F46C 1F3FB                                ; fully-qualified     # 👬🏻 men holding hands: light skin tone
+1F468 1F3FC 200D 1F91D 200D 1F468 1F3FB    ; fully-qualified     # 👨🏼‍🤝‍👨🏻 men holding hands: medium-light skin tone, light skin tone
+1F46C 1F3FC                                ; fully-qualified     # 👬🏼 men holding hands: medium-light skin tone
+1F468 1F3FD 200D 1F91D 200D 1F468 1F3FB    ; fully-qualified     # 👨🏽‍🤝‍👨🏻 men holding hands: medium skin tone, light skin tone
+1F468 1F3FD 200D 1F91D 200D 1F468 1F3FC    ; fully-qualified     # 👨🏽‍🤝‍👨🏼 men holding hands: medium skin tone, medium-light skin tone
+1F46C 1F3FD                                ; fully-qualified     # 👬🏽 men holding hands: medium skin tone
+1F468 1F3FE 200D 1F91D 200D 1F468 1F3FB    ; fully-qualified     # 👨🏾‍🤝‍👨🏻 men holding hands: medium-dark skin tone, light skin tone
+1F468 1F3FE 200D 1F91D 200D 1F468 1F3FC    ; fully-qualified     # 👨🏾‍🤝‍👨🏼 men holding hands: medium-dark skin tone, medium-light skin tone
+1F468 1F3FE 200D 1F91D 200D 1F468 1F3FD    ; fully-qualified     # 👨🏾‍🤝‍👨🏽 men holding hands: medium-dark skin tone, medium skin tone
+1F46C 1F3FE                                ; fully-qualified     # 👬🏾 men holding hands: medium-dark skin tone
+1F468 1F3FF 200D 1F91D 200D 1F468 1F3FB    ; fully-qualified     # 👨🏿‍🤝‍👨🏻 men holding hands: dark skin tone, light skin tone
+1F468 1F3FF 200D 1F91D 200D 1F468 1F3FC    ; fully-qualified     # 👨🏿‍🤝‍👨🏼 men holding hands: dark skin tone, medium-light skin tone
+1F468 1F3FF 200D 1F91D 200D 1F468 1F3FD    ; fully-qualified     # 👨🏿‍🤝‍👨🏽 men holding hands: dark skin tone, medium skin tone
+1F468 1F3FF 200D 1F91D 200D 1F468 1F3FE    ; fully-qualified     # 👨🏿‍🤝‍👨🏾 men holding hands: dark skin tone, medium-dark skin tone
+1F46C 1F3FF                                ; fully-qualified     # 👬🏿 men holding hands: dark skin tone
+1F48F                                      ; fully-qualified     # 💏 kiss
+1F469 200D 2764 FE0F 200D 1F48B 200D 1F468 ; fully-qualified     # 👩‍❤️‍💋‍👨 kiss: woman, man
+1F469 200D 2764 200D 1F48B 200D 1F468      ; minimally-qualified # 👩‍❤‍💋‍👨 kiss: woman, man
+1F468 200D 2764 FE0F 200D 1F48B 200D 1F468 ; fully-qualified     # 👨‍❤️‍💋‍👨 kiss: man, man
+1F468 200D 2764 200D 1F48B 200D 1F468      ; minimally-qualified # 👨‍❤‍💋‍👨 kiss: man, man
+1F469 200D 2764 FE0F 200D 1F48B 200D 1F469 ; fully-qualified     # 👩‍❤️‍💋‍👩 kiss: woman, woman
+1F469 200D 2764 200D 1F48B 200D 1F469      ; minimally-qualified # 👩‍❤‍💋‍👩 kiss: woman, woman
+1F491                                      ; fully-qualified     # 💑 couple with heart
+1F469 200D 2764 FE0F 200D 1F468            ; fully-qualified     # 👩‍❤️‍👨 couple with heart: woman, man
+1F469 200D 2764 200D 1F468                 ; minimally-qualified # 👩‍❤‍👨 couple with heart: woman, man
+1F468 200D 2764 FE0F 200D 1F468            ; fully-qualified     # 👨‍❤️‍👨 couple with heart: man, man
+1F468 200D 2764 200D 1F468                 ; minimally-qualified # 👨‍❤‍👨 couple with heart: man, man
+1F469 200D 2764 FE0F 200D 1F469            ; fully-qualified     # 👩‍❤️‍👩 couple with heart: woman, woman
+1F469 200D 2764 200D 1F469                 ; minimally-qualified # 👩‍❤‍👩 couple with heart: woman, woman
+1F46A                                      ; fully-qualified     # 👪 family
+1F468 200D 1F469 200D 1F466                ; fully-qualified     # 👨‍👩‍👦 family: man, woman, boy
+1F468 200D 1F469 200D 1F467                ; fully-qualified     # 👨‍👩‍👧 family: man, woman, girl
+1F468 200D 1F469 200D 1F467 200D 1F466     ; fully-qualified     # 👨‍👩‍👧‍👦 family: man, woman, girl, boy
+1F468 200D 1F469 200D 1F466 200D 1F466     ; fully-qualified     # 👨‍👩‍👦‍👦 family: man, woman, boy, boy
+1F468 200D 1F469 200D 1F467 200D 1F467     ; fully-qualified     # 👨‍👩‍👧‍👧 family: man, woman, girl, girl
+1F468 200D 1F468 200D 1F466                ; fully-qualified     # 👨‍👨‍👦 family: man, man, boy
+1F468 200D 1F468 200D 1F467                ; fully-qualified     # 👨‍👨‍👧 family: man, man, girl
+1F468 200D 1F468 200D 1F467 200D 1F466     ; fully-qualified     # 👨‍👨‍👧‍👦 family: man, man, girl, boy
+1F468 200D 1F468 200D 1F466 200D 1F466     ; fully-qualified     # 👨‍👨‍👦‍👦 family: man, man, boy, boy
+1F468 200D 1F468 200D 1F467 200D 1F467     ; fully-qualified     # 👨‍👨‍👧‍👧 family: man, man, girl, girl
+1F469 200D 1F469 200D 1F466                ; fully-qualified     # 👩‍👩‍👦 family: woman, woman, boy
+1F469 200D 1F469 200D 1F467                ; fully-qualified     # 👩‍👩‍👧 family: woman, woman, girl
+1F469 200D 1F469 200D 1F467 200D 1F466     ; fully-qualified     # 👩‍👩‍👧‍👦 family: woman, woman, girl, boy
+1F469 200D 1F469 200D 1F466 200D 1F466     ; fully-qualified     # 👩‍👩‍👦‍👦 family: woman, woman, boy, boy
+1F469 200D 1F469 200D 1F467 200D 1F467     ; fully-qualified     # 👩‍👩‍👧‍👧 family: woman, woman, girl, girl
+1F468 200D 1F466                           ; fully-qualified     # 👨‍👦 family: man, boy
+1F468 200D 1F466 200D 1F466                ; fully-qualified     # 👨‍👦‍👦 family: man, boy, boy
+1F468 200D 1F467                           ; fully-qualified     # 👨‍👧 family: man, girl
+1F468 200D 1F467 200D 1F466                ; fully-qualified     # 👨‍👧‍👦 family: man, girl, boy
+1F468 200D 1F467 200D 1F467                ; fully-qualified     # 👨‍👧‍👧 family: man, girl, girl
+1F469 200D 1F466                           ; fully-qualified     # 👩‍👦 family: woman, boy
+1F469 200D 1F466 200D 1F466                ; fully-qualified     # 👩‍👦‍👦 family: woman, boy, boy
+1F469 200D 1F467                           ; fully-qualified     # 👩‍👧 family: woman, girl
+1F469 200D 1F467 200D 1F466                ; fully-qualified     # 👩‍👧‍👦 family: woman, girl, boy
+1F469 200D 1F467 200D 1F467                ; fully-qualified     # 👩‍👧‍👧 family: woman, girl, girl
+
+# subgroup: person-symbol
+1F5E3 FE0F                                 ; fully-qualified     # 🗣️ speaking head
+1F5E3                                      ; unqualified         # 🗣 speaking head
+1F464                                      ; fully-qualified     # 👤 bust in silhouette
+1F465                                      ; fully-qualified     # 👥 busts in silhouette
+1F463                                      ; fully-qualified     # 👣 footprints
+
+# People & Body subtotal:		2212
+# People & Body subtotal:		447	w/o modifiers
+
+# group: Component
+
+# subgroup: skin-tone
+1F3FB                                      ; component           # 🏻 light skin tone
+1F3FC                                      ; component           # 🏼 medium-light skin tone
+1F3FD                                      ; component           # 🏽 medium skin tone
+1F3FE                                      ; component           # 🏾 medium-dark skin tone
+1F3FF                                      ; component           # 🏿 dark skin tone
+
+# subgroup: hair-style
+1F9B0                                      ; component           # 🦰 red hair
+1F9B1                                      ; component           # 🦱 curly hair
+1F9B3                                      ; component           # 🦳 white hair
+1F9B2                                      ; component           # 🦲 bald
+
+# Component subtotal:		9
+# Component subtotal:		4	w/o modifiers
+
+# group: Animals & Nature
+
+# subgroup: animal-mammal
+1F435                                      ; fully-qualified     # 🐵 monkey face
+1F412                                      ; fully-qualified     # 🐒 monkey
+1F98D                                      ; fully-qualified     # 🦍 gorilla
+1F9A7                                      ; fully-qualified     # 🦧 orangutan
+1F436                                      ; fully-qualified     # 🐶 dog face
+1F415                                      ; fully-qualified     # 🐕 dog
+1F9AE                                      ; fully-qualified     # 🦮 guide dog
+1F415 200D 1F9BA                           ; fully-qualified     # 🐕‍🦺 service dog
+1F429                                      ; fully-qualified     # 🐩 poodle
+1F43A                                      ; fully-qualified     # 🐺 wolf
+1F98A                                      ; fully-qualified     # 🦊 fox
+1F99D                                      ; fully-qualified     # 🦝 raccoon
+1F431                                      ; fully-qualified     # 🐱 cat face
+1F408                                      ; fully-qualified     # 🐈 cat
+1F981                                      ; fully-qualified     # 🦁 lion
+1F42F                                      ; fully-qualified     # 🐯 tiger face
+1F405                                      ; fully-qualified     # 🐅 tiger
+1F406                                      ; fully-qualified     # 🐆 leopard
+1F434                                      ; fully-qualified     # 🐴 horse face
+1F40E                                      ; fully-qualified     # 🐎 horse
+1F984                                      ; fully-qualified     # 🦄 unicorn
+1F993                                      ; fully-qualified     # 🦓 zebra
+1F98C                                      ; fully-qualified     # 🦌 deer
+1F42E                                      ; fully-qualified     # 🐮 cow face
+1F402                                      ; fully-qualified     # 🐂 ox
+1F403                                      ; fully-qualified     # 🐃 water buffalo
+1F404                                      ; fully-qualified     # 🐄 cow
+1F437                                      ; fully-qualified     # 🐷 pig face
+1F416                                      ; fully-qualified     # 🐖 pig
+1F417                                      ; fully-qualified     # 🐗 boar
+1F43D                                      ; fully-qualified     # 🐽 pig nose
+1F40F                                      ; fully-qualified     # 🐏 ram
+1F411                                      ; fully-qualified     # 🐑 ewe
+1F410                                      ; fully-qualified     # 🐐 goat
+1F42A                                      ; fully-qualified     # 🐪 camel
+1F42B                                      ; fully-qualified     # 🐫 two-hump camel
+1F999                                      ; fully-qualified     # 🦙 llama
+1F992                                      ; fully-qualified     # 🦒 giraffe
+1F418                                      ; fully-qualified     # 🐘 elephant
+1F98F                                      ; fully-qualified     # 🦏 rhinoceros
+1F99B                                      ; fully-qualified     # 🦛 hippopotamus
+1F42D                                      ; fully-qualified     # 🐭 mouse face
+1F401                                      ; fully-qualified     # 🐁 mouse
+1F400                                      ; fully-qualified     # 🐀 rat
+1F439                                      ; fully-qualified     # 🐹 hamster
+1F430                                      ; fully-qualified     # 🐰 rabbit face
+1F407                                      ; fully-qualified     # 🐇 rabbit
+1F43F FE0F                                 ; fully-qualified     # 🐿️ chipmunk
+1F43F                                      ; unqualified         # 🐿 chipmunk
+1F994                                      ; fully-qualified     # 🦔 hedgehog
+1F987                                      ; fully-qualified     # 🦇 bat
+1F43B                                      ; fully-qualified     # 🐻 bear
+1F428                                      ; fully-qualified     # 🐨 koala
+1F43C                                      ; fully-qualified     # 🐼 panda
+1F9A5                                      ; fully-qualified     # 🦥 sloth
+1F9A6                                      ; fully-qualified     # 🦦 otter
+1F9A8                                      ; fully-qualified     # 🦨 skunk
+1F998                                      ; fully-qualified     # 🦘 kangaroo
+1F9A1                                      ; fully-qualified     # 🦡 badger
+1F43E                                      ; fully-qualified     # 🐾 paw prints
+
+# subgroup: animal-bird
+1F983                                      ; fully-qualified     # 🦃 turkey
+1F414                                      ; fully-qualified     # 🐔 chicken
+1F413                                      ; fully-qualified     # 🐓 rooster
+1F423                                      ; fully-qualified     # 🐣 hatching chick
+1F424                                      ; fully-qualified     # 🐤 baby chick
+1F425                                      ; fully-qualified     # 🐥 front-facing baby chick
+1F426                                      ; fully-qualified     # 🐦 bird
+1F427                                      ; fully-qualified     # 🐧 penguin
+1F54A FE0F                                 ; fully-qualified     # 🕊️ dove
+1F54A                                      ; unqualified         # 🕊 dove
+1F985                                      ; fully-qualified     # 🦅 eagle
+1F986                                      ; fully-qualified     # 🦆 duck
+1F9A2                                      ; fully-qualified     # 🦢 swan
+1F989                                      ; fully-qualified     # 🦉 owl
+1F9A9                                      ; fully-qualified     # 🦩 flamingo
+1F99A                                      ; fully-qualified     # 🦚 peacock
+1F99C                                      ; fully-qualified     # 🦜 parrot
+
+# subgroup: animal-amphibian
+1F438                                      ; fully-qualified     # 🐸 frog
+
+# subgroup: animal-reptile
+1F40A                                      ; fully-qualified     # 🐊 crocodile
+1F422                                      ; fully-qualified     # 🐢 turtle
+1F98E                                      ; fully-qualified     # 🦎 lizard
+1F40D                                      ; fully-qualified     # 🐍 snake
+1F432                                      ; fully-qualified     # 🐲 dragon face
+1F409                                      ; fully-qualified     # 🐉 dragon
+1F995                                      ; fully-qualified     # 🦕 sauropod
+1F996                                      ; fully-qualified     # 🦖 T-Rex
+
+# subgroup: animal-marine
+1F433                                      ; fully-qualified     # 🐳 spouting whale
+1F40B                                      ; fully-qualified     # 🐋 whale
+1F42C                                      ; fully-qualified     # 🐬 dolphin
+1F41F                                      ; fully-qualified     # 🐟 fish
+1F420                                      ; fully-qualified     # 🐠 tropical fish
+1F421                                      ; fully-qualified     # 🐡 blowfish
+1F988                                      ; fully-qualified     # 🦈 shark
+1F419                                      ; fully-qualified     # 🐙 octopus
+1F41A                                      ; fully-qualified     # 🐚 spiral shell
+
+# subgroup: animal-bug
+1F40C                                      ; fully-qualified     # 🐌 snail
+1F98B                                      ; fully-qualified     # 🦋 butterfly
+1F41B                                      ; fully-qualified     # 🐛 bug
+1F41C                                      ; fully-qualified     # 🐜 ant
+1F41D                                      ; fully-qualified     # 🐝 honeybee
+1F41E                                      ; fully-qualified     # 🐞 lady beetle
+1F997                                      ; fully-qualified     # 🦗 cricket
+1F577 FE0F                                 ; fully-qualified     # 🕷️ spider
+1F577                                      ; unqualified         # 🕷 spider
+1F578 FE0F                                 ; fully-qualified     # 🕸️ spider web
+1F578                                      ; unqualified         # 🕸 spider web
+1F982                                      ; fully-qualified     # 🦂 scorpion
+1F99F                                      ; fully-qualified     # 🦟 mosquito
+1F9A0                                      ; fully-qualified     # 🦠 microbe
+
+# subgroup: plant-flower
+1F490                                      ; fully-qualified     # 💐 bouquet
+1F338                                      ; fully-qualified     # 🌸 cherry blossom
+1F4AE                                      ; fully-qualified     # 💮 white flower
+1F3F5 FE0F                                 ; fully-qualified     # 🏵️ rosette
+1F3F5                                      ; unqualified         # 🏵 rosette
+1F339                                      ; fully-qualified     # 🌹 rose
+1F940                                      ; fully-qualified     # 🥀 wilted flower
+1F33A                                      ; fully-qualified     # 🌺 hibiscus
+1F33B                                      ; fully-qualified     # 🌻 sunflower
+1F33C                                      ; fully-qualified     # 🌼 blossom
+1F337                                      ; fully-qualified     # 🌷 tulip
+
+# subgroup: plant-other
+1F331                                      ; fully-qualified     # 🌱 seedling
+1F332                                      ; fully-qualified     # 🌲 evergreen tree
+1F333                                      ; fully-qualified     # 🌳 deciduous tree
+1F334                                      ; fully-qualified     # 🌴 palm tree
+1F335                                      ; fully-qualified     # 🌵 cactus
+1F33E                                      ; fully-qualified     # 🌾 sheaf of rice
+1F33F                                      ; fully-qualified     # 🌿 herb
+2618 FE0F                                  ; fully-qualified     # ☘️ shamrock
+2618                                       ; unqualified         # ☘ shamrock
+1F340                                      ; fully-qualified     # 🍀 four leaf clover
+1F341                                      ; fully-qualified     # 🍁 maple leaf
+1F342                                      ; fully-qualified     # 🍂 fallen leaf
+1F343                                      ; fully-qualified     # 🍃 leaf fluttering in wind
+
+# Animals & Nature subtotal:		133
+# Animals & Nature subtotal:		133	w/o modifiers
+
+# group: Food & Drink
+
+# subgroup: food-fruit
+1F347                                      ; fully-qualified     # 🍇 grapes
+1F348                                      ; fully-qualified     # 🍈 melon
+1F349                                      ; fully-qualified     # 🍉 watermelon
+1F34A                                      ; fully-qualified     # 🍊 tangerine
+1F34B                                      ; fully-qualified     # 🍋 lemon
+1F34C                                      ; fully-qualified     # 🍌 banana
+1F34D                                      ; fully-qualified     # 🍍 pineapple
+1F96D                                      ; fully-qualified     # 🥭 mango
+1F34E                                      ; fully-qualified     # 🍎 red apple
+1F34F                                      ; fully-qualified     # 🍏 green apple
+1F350                                      ; fully-qualified     # 🍐 pear
+1F351                                      ; fully-qualified     # 🍑 peach
+1F352                                      ; fully-qualified     # 🍒 cherries
+1F353                                      ; fully-qualified     # 🍓 strawberry
+1F95D                                      ; fully-qualified     # 🥝 kiwi fruit
+1F345                                      ; fully-qualified     # 🍅 tomato
+1F965                                      ; fully-qualified     # 🥥 coconut
+
+# subgroup: food-vegetable
+1F951                                      ; fully-qualified     # 🥑 avocado
+1F346                                      ; fully-qualified     # 🍆 eggplant
+1F954                                      ; fully-qualified     # 🥔 potato
+1F955                                      ; fully-qualified     # 🥕 carrot
+1F33D                                      ; fully-qualified     # 🌽 ear of corn
+1F336 FE0F                                 ; fully-qualified     # 🌶️ hot pepper
+1F336                                      ; unqualified         # 🌶 hot pepper
+1F952                                      ; fully-qualified     # 🥒 cucumber
+1F96C                                      ; fully-qualified     # 🥬 leafy green
+1F966                                      ; fully-qualified     # 🥦 broccoli
+1F9C4                                      ; fully-qualified     # 🧄 garlic
+1F9C5                                      ; fully-qualified     # 🧅 onion
+1F344                                      ; fully-qualified     # 🍄 mushroom
+1F95C                                      ; fully-qualified     # 🥜 peanuts
+1F330                                      ; fully-qualified     # 🌰 chestnut
+
+# subgroup: food-prepared
+1F35E                                      ; fully-qualified     # 🍞 bread
+1F950                                      ; fully-qualified     # 🥐 croissant
+1F956                                      ; fully-qualified     # 🥖 baguette bread
+1F968                                      ; fully-qualified     # 🥨 pretzel
+1F96F                                      ; fully-qualified     # 🥯 bagel
+1F95E                                      ; fully-qualified     # 🥞 pancakes
+1F9C7                                      ; fully-qualified     # 🧇 waffle
+1F9C0                                      ; fully-qualified     # 🧀 cheese wedge
+1F356                                      ; fully-qualified     # 🍖 meat on bone
+1F357                                      ; fully-qualified     # 🍗 poultry leg
+1F969                                      ; fully-qualified     # 🥩 cut of meat
+1F953                                      ; fully-qualified     # 🥓 bacon
+1F354                                      ; fully-qualified     # 🍔 hamburger
+1F35F                                      ; fully-qualified     # 🍟 french fries
+1F355                                      ; fully-qualified     # 🍕 pizza
+1F32D                                      ; fully-qualified     # 🌭 hot dog
+1F96A                                      ; fully-qualified     # 🥪 sandwich
+1F32E                                      ; fully-qualified     # 🌮 taco
+1F32F                                      ; fully-qualified     # 🌯 burrito
+1F959                                      ; fully-qualified     # 🥙 stuffed flatbread
+1F9C6                                      ; fully-qualified     # 🧆 falafel
+1F95A                                      ; fully-qualified     # 🥚 egg
+1F373                                      ; fully-qualified     # 🍳 cooking
+1F958                                      ; fully-qualified     # 🥘 shallow pan of food
+1F372                                      ; fully-qualified     # 🍲 pot of food
+1F963                                      ; fully-qualified     # 🥣 bowl with spoon
+1F957                                      ; fully-qualified     # 🥗 green salad
+1F37F                                      ; fully-qualified     # 🍿 popcorn
+1F9C8                                      ; fully-qualified     # 🧈 butter
+1F9C2                                      ; fully-qualified     # 🧂 salt
+1F96B                                      ; fully-qualified     # 🥫 canned food
+
+# subgroup: food-asian
+1F371                                      ; fully-qualified     # 🍱 bento box
+1F358                                      ; fully-qualified     # 🍘 rice cracker
+1F359                                      ; fully-qualified     # 🍙 rice ball
+1F35A                                      ; fully-qualified     # 🍚 cooked rice
+1F35B                                      ; fully-qualified     # 🍛 curry rice
+1F35C                                      ; fully-qualified     # 🍜 steaming bowl
+1F35D                                      ; fully-qualified     # 🍝 spaghetti
+1F360                                      ; fully-qualified     # 🍠 roasted sweet potato
+1F362                                      ; fully-qualified     # 🍢 oden
+1F363                                      ; fully-qualified     # 🍣 sushi
+1F364                                      ; fully-qualified     # 🍤 fried shrimp
+1F365                                      ; fully-qualified     # 🍥 fish cake with swirl
+1F96E                                      ; fully-qualified     # 🥮 moon cake
+1F361                                      ; fully-qualified     # 🍡 dango
+1F95F                                      ; fully-qualified     # 🥟 dumpling
+1F960                                      ; fully-qualified     # 🥠 fortune cookie
+1F961                                      ; fully-qualified     # 🥡 takeout box
+
+# subgroup: food-marine
+1F980                                      ; fully-qualified     # 🦀 crab
+1F99E                                      ; fully-qualified     # 🦞 lobster
+1F990                                      ; fully-qualified     # 🦐 shrimp
+1F991                                      ; fully-qualified     # 🦑 squid
+1F9AA                                      ; fully-qualified     # 🦪 oyster
+
+# subgroup: food-sweet
+1F366                                      ; fully-qualified     # 🍦 soft ice cream
+1F367                                      ; fully-qualified     # 🍧 shaved ice
+1F368                                      ; fully-qualified     # 🍨 ice cream
+1F369                                      ; fully-qualified     # 🍩 doughnut
+1F36A                                      ; fully-qualified     # 🍪 cookie
+1F382                                      ; fully-qualified     # 🎂 birthday cake
+1F370                                      ; fully-qualified     # 🍰 shortcake
+1F9C1                                      ; fully-qualified     # 🧁 cupcake
+1F967                                      ; fully-qualified     # 🥧 pie
+1F36B                                      ; fully-qualified     # 🍫 chocolate bar
+1F36C                                      ; fully-qualified     # 🍬 candy
+1F36D                                      ; fully-qualified     # 🍭 lollipop
+1F36E                                      ; fully-qualified     # 🍮 custard
+1F36F                                      ; fully-qualified     # 🍯 honey pot
+
+# subgroup: drink
+1F37C                                      ; fully-qualified     # 🍼 baby bottle
+1F95B                                      ; fully-qualified     # 🥛 glass of milk
+2615                                       ; fully-qualified     # ☕ hot beverage
+1F375                                      ; fully-qualified     # 🍵 teacup without handle
+1F376                                      ; fully-qualified     # 🍶 sake
+1F37E                                      ; fully-qualified     # 🍾 bottle with popping cork
+1F377                                      ; fully-qualified     # 🍷 wine glass
+1F378                                      ; fully-qualified     # 🍸 cocktail glass
+1F379                                      ; fully-qualified     # 🍹 tropical drink
+1F37A                                      ; fully-qualified     # 🍺 beer mug
+1F37B                                      ; fully-qualified     # 🍻 clinking beer mugs
+1F942                                      ; fully-qualified     # 🥂 clinking glasses
+1F943                                      ; fully-qualified     # 🥃 tumbler glass
+1F964                                      ; fully-qualified     # 🥤 cup with straw
+1F9C3                                      ; fully-qualified     # 🧃 beverage box
+1F9C9                                      ; fully-qualified     # 🧉 mate
+1F9CA                                      ; fully-qualified     # 🧊 ice cube
+
+# subgroup: dishware
+1F962                                      ; fully-qualified     # 🥢 chopsticks
+1F37D FE0F                                 ; fully-qualified     # 🍽️ fork and knife with plate
+1F37D                                      ; unqualified         # 🍽 fork and knife with plate
+1F374                                      ; fully-qualified     # 🍴 fork and knife
+1F944                                      ; fully-qualified     # 🥄 spoon
+1F52A                                      ; fully-qualified     # 🔪 kitchen knife
+1F3FA                                      ; fully-qualified     # 🏺 amphora
+
+# Food & Drink subtotal:		123
+# Food & Drink subtotal:		123	w/o modifiers
+
+# group: Travel & Places
+
+# subgroup: place-map
+1F30D                                      ; fully-qualified     # 🌍 globe showing Europe-Africa
+1F30E                                      ; fully-qualified     # 🌎 globe showing Americas
+1F30F                                      ; fully-qualified     # 🌏 globe showing Asia-Australia
+1F310                                      ; fully-qualified     # 🌐 globe with meridians
+1F5FA FE0F                                 ; fully-qualified     # 🗺️ world map
+1F5FA                                      ; unqualified         # 🗺 world map
+1F5FE                                      ; fully-qualified     # 🗾 map of Japan
+1F9ED                                      ; fully-qualified     # 🧭 compass
+
+# subgroup: place-geographic
+1F3D4 FE0F                                 ; fully-qualified     # 🏔️ snow-capped mountain
+1F3D4                                      ; unqualified         # 🏔 snow-capped mountain
+26F0 FE0F                                  ; fully-qualified     # ⛰️ mountain
+26F0                                       ; unqualified         # ⛰ mountain
+1F30B                                      ; fully-qualified     # 🌋 volcano
+1F5FB                                      ; fully-qualified     # 🗻 mount fuji
+1F3D5 FE0F                                 ; fully-qualified     # 🏕️ camping
+1F3D5                                      ; unqualified         # 🏕 camping
+1F3D6 FE0F                                 ; fully-qualified     # 🏖️ beach with umbrella
+1F3D6                                      ; unqualified         # 🏖 beach with umbrella
+1F3DC FE0F                                 ; fully-qualified     # 🏜️ desert
+1F3DC                                      ; unqualified         # 🏜 desert
+1F3DD FE0F                                 ; fully-qualified     # 🏝️ desert island
+1F3DD                                      ; unqualified         # 🏝 desert island
+1F3DE FE0F                                 ; fully-qualified     # 🏞️ national park
+1F3DE                                      ; unqualified         # 🏞 national park
+
+# subgroup: place-building
+1F3DF FE0F                                 ; fully-qualified     # 🏟️ stadium
+1F3DF                                      ; unqualified         # 🏟 stadium
+1F3DB FE0F                                 ; fully-qualified     # 🏛️ classical building
+1F3DB                                      ; unqualified         # 🏛 classical building
+1F3D7 FE0F                                 ; fully-qualified     # 🏗️ building construction
+1F3D7                                      ; unqualified         # 🏗 building construction
+1F9F1                                      ; fully-qualified     # 🧱 brick
+1F3D8 FE0F                                 ; fully-qualified     # 🏘️ houses
+1F3D8                                      ; unqualified         # 🏘 houses
+1F3DA FE0F                                 ; fully-qualified     # 🏚️ derelict house
+1F3DA                                      ; unqualified         # 🏚 derelict house
+1F3E0                                      ; fully-qualified     # 🏠 house
+1F3E1                                      ; fully-qualified     # 🏡 house with garden
+1F3E2                                      ; fully-qualified     # 🏢 office building
+1F3E3                                      ; fully-qualified     # 🏣 Japanese post office
+1F3E4                                      ; fully-qualified     # 🏤 post office
+1F3E5                                      ; fully-qualified     # 🏥 hospital
+1F3E6                                      ; fully-qualified     # 🏦 bank
+1F3E8                                      ; fully-qualified     # 🏨 hotel
+1F3E9                                      ; fully-qualified     # 🏩 love hotel
+1F3EA                                      ; fully-qualified     # 🏪 convenience store
+1F3EB                                      ; fully-qualified     # 🏫 school
+1F3EC                                      ; fully-qualified     # 🏬 department store
+1F3ED                                      ; fully-qualified     # 🏭 factory
+1F3EF                                      ; fully-qualified     # 🏯 Japanese castle
+1F3F0                                      ; fully-qualified     # 🏰 castle
+1F492                                      ; fully-qualified     # 💒 wedding
+1F5FC                                      ; fully-qualified     # 🗼 Tokyo tower
+1F5FD                                      ; fully-qualified     # 🗽 Statue of Liberty
+
+# subgroup: place-religious
+26EA                                       ; fully-qualified     # ⛪ church
+1F54C                                      ; fully-qualified     # 🕌 mosque
+1F6D5                                      ; fully-qualified     # 🛕 hindu temple
+1F54D                                      ; fully-qualified     # 🕍 synagogue
+26E9 FE0F                                  ; fully-qualified     # ⛩️ shinto shrine
+26E9                                       ; unqualified         # ⛩ shinto shrine
+1F54B                                      ; fully-qualified     # 🕋 kaaba
+
+# subgroup: place-other
+26F2                                       ; fully-qualified     # ⛲ fountain
+26FA                                       ; fully-qualified     # ⛺ tent
+1F301                                      ; fully-qualified     # 🌁 foggy
+1F303                                      ; fully-qualified     # 🌃 night with stars
+1F3D9 FE0F                                 ; fully-qualified     # 🏙️ cityscape
+1F3D9                                      ; unqualified         # 🏙 cityscape
+1F304                                      ; fully-qualified     # 🌄 sunrise over mountains
+1F305                                      ; fully-qualified     # 🌅 sunrise
+1F306                                      ; fully-qualified     # 🌆 cityscape at dusk
+1F307                                      ; fully-qualified     # 🌇 sunset
+1F309                                      ; fully-qualified     # 🌉 bridge at night
+2668 FE0F                                  ; fully-qualified     # ♨️ hot springs
+2668                                       ; unqualified         # ♨ hot springs
+1F3A0                                      ; fully-qualified     # 🎠 carousel horse
+1F3A1                                      ; fully-qualified     # 🎡 ferris wheel
+1F3A2                                      ; fully-qualified     # 🎢 roller coaster
+1F488                                      ; fully-qualified     # 💈 barber pole
+1F3AA                                      ; fully-qualified     # 🎪 circus tent
+
+# subgroup: transport-ground
+1F682                                      ; fully-qualified     # 🚂 locomotive
+1F683                                      ; fully-qualified     # 🚃 railway car
+1F684                                      ; fully-qualified     # 🚄 high-speed train
+1F685                                      ; fully-qualified     # 🚅 bullet train
+1F686                                      ; fully-qualified     # 🚆 train
+1F687                                      ; fully-qualified     # 🚇 metro
+1F688                                      ; fully-qualified     # 🚈 light rail
+1F689                                      ; fully-qualified     # 🚉 station
+1F68A                                      ; fully-qualified     # 🚊 tram
+1F69D                                      ; fully-qualified     # 🚝 monorail
+1F69E                                      ; fully-qualified     # 🚞 mountain railway
+1F68B                                      ; fully-qualified     # 🚋 tram car
+1F68C                                      ; fully-qualified     # 🚌 bus
+1F68D                                      ; fully-qualified     # 🚍 oncoming bus
+1F68E                                      ; fully-qualified     # 🚎 trolleybus
+1F690                                      ; fully-qualified     # 🚐 minibus
+1F691                                      ; fully-qualified     # 🚑 ambulance
+1F692                                      ; fully-qualified     # 🚒 fire engine
+1F693                                      ; fully-qualified     # 🚓 police car
+1F694                                      ; fully-qualified     # 🚔 oncoming police car
+1F695                                      ; fully-qualified     # 🚕 taxi
+1F696                                      ; fully-qualified     # 🚖 oncoming taxi
+1F697                                      ; fully-qualified     # 🚗 automobile
+1F698                                      ; fully-qualified     # 🚘 oncoming automobile
+1F699                                      ; fully-qualified     # 🚙 sport utility vehicle
+1F69A                                      ; fully-qualified     # 🚚 delivery truck
+1F69B                                      ; fully-qualified     # 🚛 articulated lorry
+1F69C                                      ; fully-qualified     # 🚜 tractor
+1F3CE FE0F                                 ; fully-qualified     # 🏎️ racing car
+1F3CE                                      ; unqualified         # 🏎 racing car
+1F3CD FE0F                                 ; fully-qualified     # 🏍️ motorcycle
+1F3CD                                      ; unqualified         # 🏍 motorcycle
+1F6F5                                      ; fully-qualified     # 🛵 motor scooter
+1F9BD                                      ; fully-qualified     # 🦽 manual wheelchair
+1F9BC                                      ; fully-qualified     # 🦼 motorized wheelchair
+1F6FA                                      ; fully-qualified     # 🛺 auto rickshaw
+1F6B2                                      ; fully-qualified     # 🚲 bicycle
+1F6F4                                      ; fully-qualified     # 🛴 kick scooter
+1F6F9                                      ; fully-qualified     # 🛹 skateboard
+1F68F                                      ; fully-qualified     # 🚏 bus stop
+1F6E3 FE0F                                 ; fully-qualified     # 🛣️ motorway
+1F6E3                                      ; unqualified         # 🛣 motorway
+1F6E4 FE0F                                 ; fully-qualified     # 🛤️ railway track
+1F6E4                                      ; unqualified         # 🛤 railway track
+1F6E2 FE0F                                 ; fully-qualified     # 🛢️ oil drum
+1F6E2                                      ; unqualified         # 🛢 oil drum
+26FD                                       ; fully-qualified     # ⛽ fuel pump
+1F6A8                                      ; fully-qualified     # 🚨 police car light
+1F6A5                                      ; fully-qualified     # 🚥 horizontal traffic light
+1F6A6                                      ; fully-qualified     # 🚦 vertical traffic light
+1F6D1                                      ; fully-qualified     # 🛑 stop sign
+1F6A7                                      ; fully-qualified     # 🚧 construction
+
+# subgroup: transport-water
+2693                                       ; fully-qualified     # ⚓ anchor
+26F5                                       ; fully-qualified     # ⛵ sailboat
+1F6F6                                      ; fully-qualified     # 🛶 canoe
+1F6A4                                      ; fully-qualified     # 🚤 speedboat
+1F6F3 FE0F                                 ; fully-qualified     # 🛳️ passenger ship
+1F6F3                                      ; unqualified         # 🛳 passenger ship
+26F4 FE0F                                  ; fully-qualified     # ⛴️ ferry
+26F4                                       ; unqualified         # ⛴ ferry
+1F6E5 FE0F                                 ; fully-qualified     # 🛥️ motor boat
+1F6E5                                      ; unqualified         # 🛥 motor boat
+1F6A2                                      ; fully-qualified     # 🚢 ship
+
+# subgroup: transport-air
+2708 FE0F                                  ; fully-qualified     # ✈️ airplane
+2708                                       ; unqualified         # ✈ airplane
+1F6E9 FE0F                                 ; fully-qualified     # 🛩️ small airplane
+1F6E9                                      ; unqualified         # 🛩 small airplane
+1F6EB                                      ; fully-qualified     # 🛫 airplane departure
+1F6EC                                      ; fully-qualified     # 🛬 airplane arrival
+1FA82                                      ; fully-qualified     # 🪂 parachute
+1F4BA                                      ; fully-qualified     # 💺 seat
+1F681                                      ; fully-qualified     # 🚁 helicopter
+1F69F                                      ; fully-qualified     # 🚟 suspension railway
+1F6A0                                      ; fully-qualified     # 🚠 mountain cableway
+1F6A1                                      ; fully-qualified     # 🚡 aerial tramway
+1F6F0 FE0F                                 ; fully-qualified     # 🛰️ satellite
+1F6F0                                      ; unqualified         # 🛰 satellite
+1F680                                      ; fully-qualified     # 🚀 rocket
+1F6F8                                      ; fully-qualified     # 🛸 flying saucer
+
+# subgroup: hotel
+1F6CE FE0F                                 ; fully-qualified     # 🛎️ bellhop bell
+1F6CE                                      ; unqualified         # 🛎 bellhop bell
+1F9F3                                      ; fully-qualified     # 🧳 luggage
+
+# subgroup: time
+231B                                       ; fully-qualified     # ⌛ hourglass done
+23F3                                       ; fully-qualified     # ⏳ hourglass not done
+231A                                       ; fully-qualified     # ⌚ watch
+23F0                                       ; fully-qualified     # ⏰ alarm clock
+23F1 FE0F                                  ; fully-qualified     # ⏱️ stopwatch
+23F1                                       ; unqualified         # ⏱ stopwatch
+23F2 FE0F                                  ; fully-qualified     # ⏲️ timer clock
+23F2                                       ; unqualified         # ⏲ timer clock
+1F570 FE0F                                 ; fully-qualified     # 🕰️ mantelpiece clock
+1F570                                      ; unqualified         # 🕰 mantelpiece clock
+1F55B                                      ; fully-qualified     # 🕛 twelve o’clock
+1F567                                      ; fully-qualified     # 🕧 twelve-thirty
+1F550                                      ; fully-qualified     # 🕐 one o’clock
+1F55C                                      ; fully-qualified     # 🕜 one-thirty
+1F551                                      ; fully-qualified     # 🕑 two o’clock
+1F55D                                      ; fully-qualified     # 🕝 two-thirty
+1F552                                      ; fully-qualified     # 🕒 three o’clock
+1F55E                                      ; fully-qualified     # 🕞 three-thirty
+1F553                                      ; fully-qualified     # 🕓 four o’clock
+1F55F                                      ; fully-qualified     # 🕟 four-thirty
+1F554                                      ; fully-qualified     # 🕔 five o’clock
+1F560                                      ; fully-qualified     # 🕠 five-thirty
+1F555                                      ; fully-qualified     # 🕕 six o’clock
+1F561                                      ; fully-qualified     # 🕡 six-thirty
+1F556                                      ; fully-qualified     # 🕖 seven o’clock
+1F562                                      ; fully-qualified     # 🕢 seven-thirty
+1F557                                      ; fully-qualified     # 🕗 eight o’clock
+1F563                                      ; fully-qualified     # 🕣 eight-thirty
+1F558                                      ; fully-qualified     # 🕘 nine o’clock
+1F564                                      ; fully-qualified     # 🕤 nine-thirty
+1F559                                      ; fully-qualified     # 🕙 ten o’clock
+1F565                                      ; fully-qualified     # 🕥 ten-thirty
+1F55A                                      ; fully-qualified     # 🕚 eleven o’clock
+1F566                                      ; fully-qualified     # 🕦 eleven-thirty
+
+# subgroup: sky & weather
+1F311                                      ; fully-qualified     # 🌑 new moon
+1F312                                      ; fully-qualified     # 🌒 waxing crescent moon
+1F313                                      ; fully-qualified     # 🌓 first quarter moon
+1F314                                      ; fully-qualified     # 🌔 waxing gibbous moon
+1F315                                      ; fully-qualified     # 🌕 full moon
+1F316                                      ; fully-qualified     # 🌖 waning gibbous moon
+1F317                                      ; fully-qualified     # 🌗 last quarter moon
+1F318                                      ; fully-qualified     # 🌘 waning crescent moon
+1F319                                      ; fully-qualified     # 🌙 crescent moon
+1F31A                                      ; fully-qualified     # 🌚 new moon face
+1F31B                                      ; fully-qualified     # 🌛 first quarter moon face
+1F31C                                      ; fully-qualified     # 🌜 last quarter moon face
+1F321 FE0F                                 ; fully-qualified     # 🌡️ thermometer
+1F321                                      ; unqualified         # 🌡 thermometer
+2600 FE0F                                  ; fully-qualified     # ☀️ sun
+2600                                       ; unqualified         # ☀ sun
+1F31D                                      ; fully-qualified     # 🌝 full moon face
+1F31E                                      ; fully-qualified     # 🌞 sun with face
+1FA90                                      ; fully-qualified     # 🪐 ringed planet
+2B50                                       ; fully-qualified     # ⭐ star
+1F31F                                      ; fully-qualified     # 🌟 glowing star
+1F320                                      ; fully-qualified     # 🌠 shooting star
+1F30C                                      ; fully-qualified     # 🌌 milky way
+2601 FE0F                                  ; fully-qualified     # ☁️ cloud
+2601                                       ; unqualified         # ☁ cloud
+26C5                                       ; fully-qualified     # ⛅ sun behind cloud
+26C8 FE0F                                  ; fully-qualified     # ⛈️ cloud with lightning and rain
+26C8                                       ; unqualified         # ⛈ cloud with lightning and rain
+1F324 FE0F                                 ; fully-qualified     # 🌤️ sun behind small cloud
+1F324                                      ; unqualified         # 🌤 sun behind small cloud
+1F325 FE0F                                 ; fully-qualified     # 🌥️ sun behind large cloud
+1F325                                      ; unqualified         # 🌥 sun behind large cloud
+1F326 FE0F                                 ; fully-qualified     # 🌦️ sun behind rain cloud
+1F326                                      ; unqualified         # 🌦 sun behind rain cloud
+1F327 FE0F                                 ; fully-qualified     # 🌧️ cloud with rain
+1F327                                      ; unqualified         # 🌧 cloud with rain
+1F328 FE0F                                 ; fully-qualified     # 🌨️ cloud with snow
+1F328                                      ; unqualified         # 🌨 cloud with snow
+1F329 FE0F                                 ; fully-qualified     # 🌩️ cloud with lightning
+1F329                                      ; unqualified         # 🌩 cloud with lightning
+1F32A FE0F                                 ; fully-qualified     # 🌪️ tornado
+1F32A                                      ; unqualified         # 🌪 tornado
+1F32B FE0F                                 ; fully-qualified     # 🌫️ fog
+1F32B                                      ; unqualified         # 🌫 fog
+1F32C FE0F                                 ; fully-qualified     # 🌬️ wind face
+1F32C                                      ; unqualified         # 🌬 wind face
+1F300                                      ; fully-qualified     # 🌀 cyclone
+1F308                                      ; fully-qualified     # 🌈 rainbow
+1F302                                      ; fully-qualified     # 🌂 closed umbrella
+2602 FE0F                                  ; fully-qualified     # ☂️ umbrella
+2602                                       ; unqualified         # ☂ umbrella
+2614                                       ; fully-qualified     # ☔ umbrella with rain drops
+26F1 FE0F                                  ; fully-qualified     # ⛱️ umbrella on ground
+26F1                                       ; unqualified         # ⛱ umbrella on ground
+26A1                                       ; fully-qualified     # ⚡ high voltage
+2744 FE0F                                  ; fully-qualified     # ❄️ snowflake
+2744                                       ; unqualified         # ❄ snowflake
+2603 FE0F                                  ; fully-qualified     # ☃️ snowman
+2603                                       ; unqualified         # ☃ snowman
+26C4                                       ; fully-qualified     # ⛄ snowman without snow
+2604 FE0F                                  ; fully-qualified     # ☄️ comet
+2604                                       ; unqualified         # ☄ comet
+1F525                                      ; fully-qualified     # 🔥 fire
+1F4A7                                      ; fully-qualified     # 💧 droplet
+1F30A                                      ; fully-qualified     # 🌊 water wave
+
+# Travel & Places subtotal:		259
+# Travel & Places subtotal:		259	w/o modifiers
+
+# group: Activities
+
+# subgroup: event
+1F383                                      ; fully-qualified     # 🎃 jack-o-lantern
+1F384                                      ; fully-qualified     # 🎄 Christmas tree
+1F386                                      ; fully-qualified     # 🎆 fireworks
+1F387                                      ; fully-qualified     # 🎇 sparkler
+1F9E8                                      ; fully-qualified     # 🧨 firecracker
+2728                                       ; fully-qualified     # ✨ sparkles
+1F388                                      ; fully-qualified     # 🎈 balloon
+1F389                                      ; fully-qualified     # 🎉 party popper
+1F38A                                      ; fully-qualified     # 🎊 confetti ball
+1F38B                                      ; fully-qualified     # 🎋 tanabata tree
+1F38D                                      ; fully-qualified     # 🎍 pine decoration
+1F38E                                      ; fully-qualified     # 🎎 Japanese dolls
+1F38F                                      ; fully-qualified     # 🎏 carp streamer
+1F390                                      ; fully-qualified     # 🎐 wind chime
+1F391                                      ; fully-qualified     # 🎑 moon viewing ceremony
+1F9E7                                      ; fully-qualified     # 🧧 red envelope
+1F380                                      ; fully-qualified     # 🎀 ribbon
+1F381                                      ; fully-qualified     # 🎁 wrapped gift
+1F397 FE0F                                 ; fully-qualified     # 🎗️ reminder ribbon
+1F397                                      ; unqualified         # 🎗 reminder ribbon
+1F39F FE0F                                 ; fully-qualified     # 🎟️ admission tickets
+1F39F                                      ; unqualified         # 🎟 admission tickets
+1F3AB                                      ; fully-qualified     # 🎫 ticket
+
+# subgroup: award-medal
+1F396 FE0F                                 ; fully-qualified     # 🎖️ military medal
+1F396                                      ; unqualified         # 🎖 military medal
+1F3C6                                      ; fully-qualified     # 🏆 trophy
+1F3C5                                      ; fully-qualified     # 🏅 sports medal
+1F947                                      ; fully-qualified     # 🥇 1st place medal
+1F948                                      ; fully-qualified     # 🥈 2nd place medal
+1F949                                      ; fully-qualified     # 🥉 3rd place medal
+
+# subgroup: sport
+26BD                                       ; fully-qualified     # ⚽ soccer ball
+26BE                                       ; fully-qualified     # ⚾ baseball
+1F94E                                      ; fully-qualified     # 🥎 softball
+1F3C0                                      ; fully-qualified     # 🏀 basketball
+1F3D0                                      ; fully-qualified     # 🏐 volleyball
+1F3C8                                      ; fully-qualified     # 🏈 american football
+1F3C9                                      ; fully-qualified     # 🏉 rugby football
+1F3BE                                      ; fully-qualified     # 🎾 tennis
+1F94F                                      ; fully-qualified     # 🥏 flying disc
+1F3B3                                      ; fully-qualified     # 🎳 bowling
+1F3CF                                      ; fully-qualified     # 🏏 cricket game
+1F3D1                                      ; fully-qualified     # 🏑 field hockey
+1F3D2                                      ; fully-qualified     # 🏒 ice hockey
+1F94D                                      ; fully-qualified     # 🥍 lacrosse
+1F3D3                                      ; fully-qualified     # 🏓 ping pong
+1F3F8                                      ; fully-qualified     # 🏸 badminton
+1F94A                                      ; fully-qualified     # 🥊 boxing glove
+1F94B                                      ; fully-qualified     # 🥋 martial arts uniform
+1F945                                      ; fully-qualified     # 🥅 goal net
+26F3                                       ; fully-qualified     # ⛳ flag in hole
+26F8 FE0F                                  ; fully-qualified     # ⛸️ ice skate
+26F8                                       ; unqualified         # ⛸ ice skate
+1F3A3                                      ; fully-qualified     # 🎣 fishing pole
+1F93F                                      ; fully-qualified     # 🤿 diving mask
+1F3BD                                      ; fully-qualified     # 🎽 running shirt
+1F3BF                                      ; fully-qualified     # 🎿 skis
+1F6F7                                      ; fully-qualified     # 🛷 sled
+1F94C                                      ; fully-qualified     # 🥌 curling stone
+
+# subgroup: game
+1F3AF                                      ; fully-qualified     # 🎯 direct hit
+1FA80                                      ; fully-qualified     # 🪀 yo-yo
+1FA81                                      ; fully-qualified     # 🪁 kite
+1F3B1                                      ; fully-qualified     # 🎱 pool 8 ball
+1F52E                                      ; fully-qualified     # 🔮 crystal ball
+1F9FF                                      ; fully-qualified     # 🧿 nazar amulet
+1F3AE                                      ; fully-qualified     # 🎮 video game
+1F579 FE0F                                 ; fully-qualified     # 🕹️ joystick
+1F579                                      ; unqualified         # 🕹 joystick
+1F3B0                                      ; fully-qualified     # 🎰 slot machine
+1F3B2                                      ; fully-qualified     # 🎲 game die
+1F9E9                                      ; fully-qualified     # 🧩 puzzle piece
+1F9F8                                      ; fully-qualified     # 🧸 teddy bear
+2660 FE0F                                  ; fully-qualified     # ♠️ spade suit
+2660                                       ; unqualified         # ♠ spade suit
+2665 FE0F                                  ; fully-qualified     # ♥️ heart suit
+2665                                       ; unqualified         # ♥ heart suit
+2666 FE0F                                  ; fully-qualified     # ♦️ diamond suit
+2666                                       ; unqualified         # ♦ diamond suit
+2663 FE0F                                  ; fully-qualified     # ♣️ club suit
+2663                                       ; unqualified         # ♣ club suit
+265F FE0F                                  ; fully-qualified     # ♟️ chess pawn
+265F                                       ; unqualified         # ♟ chess pawn
+1F0CF                                      ; fully-qualified     # 🃏 joker
+1F004                                      ; fully-qualified     # 🀄 mahjong red dragon
+1F3B4                                      ; fully-qualified     # 🎴 flower playing cards
+
+# subgroup: arts & crafts
+1F3AD                                      ; fully-qualified     # 🎭 performing arts
+1F5BC FE0F                                 ; fully-qualified     # 🖼️ framed picture
+1F5BC                                      ; unqualified         # 🖼 framed picture
+1F3A8                                      ; fully-qualified     # 🎨 artist palette
+1F9F5                                      ; fully-qualified     # 🧵 thread
+1F9F6                                      ; fully-qualified     # 🧶 yarn
+
+# Activities subtotal:		90
+# Activities subtotal:		90	w/o modifiers
+
+# group: Objects
+
+# subgroup: clothing
+1F453                                      ; fully-qualified     # 👓 glasses
+1F576 FE0F                                 ; fully-qualified     # 🕶️ sunglasses
+1F576                                      ; unqualified         # 🕶 sunglasses
+1F97D                                      ; fully-qualified     # 🥽 goggles
+1F97C                                      ; fully-qualified     # 🥼 lab coat
+1F9BA                                      ; fully-qualified     # 🦺 safety vest
+1F454                                      ; fully-qualified     # 👔 necktie
+1F455                                      ; fully-qualified     # 👕 t-shirt
+1F456                                      ; fully-qualified     # 👖 jeans
+1F9E3                                      ; fully-qualified     # 🧣 scarf
+1F9E4                                      ; fully-qualified     # 🧤 gloves
+1F9E5                                      ; fully-qualified     # 🧥 coat
+1F9E6                                      ; fully-qualified     # 🧦 socks
+1F457                                      ; fully-qualified     # 👗 dress
+1F458                                      ; fully-qualified     # 👘 kimono
+1F97B                                      ; fully-qualified     # 🥻 sari
+1FA71                                      ; fully-qualified     # 🩱 one-piece swimsuit
+1FA72                                      ; fully-qualified     # 🩲 swim brief
+1FA73                                      ; fully-qualified     # 🩳 shorts
+1F459                                      ; fully-qualified     # 👙 bikini
+1F45A                                      ; fully-qualified     # 👚 woman’s clothes
+1F45B                                      ; fully-qualified     # 👛 purse
+1F45C                                      ; fully-qualified     # 👜 handbag
+1F45D                                      ; fully-qualified     # 👝 clutch bag
+1F6CD FE0F                                 ; fully-qualified     # 🛍️ shopping bags
+1F6CD                                      ; unqualified         # 🛍 shopping bags
+1F392                                      ; fully-qualified     # 🎒 backpack
+1F45E                                      ; fully-qualified     # 👞 man’s shoe
+1F45F                                      ; fully-qualified     # 👟 running shoe
+1F97E                                      ; fully-qualified     # 🥾 hiking boot
+1F97F                                      ; fully-qualified     # 🥿 flat shoe
+1F460                                      ; fully-qualified     # 👠 high-heeled shoe
+1F461                                      ; fully-qualified     # 👡 woman’s sandal
+1FA70                                      ; fully-qualified     # 🩰 ballet shoes
+1F462                                      ; fully-qualified     # 👢 woman’s boot
+1F451                                      ; fully-qualified     # 👑 crown
+1F452                                      ; fully-qualified     # 👒 woman’s hat
+1F3A9                                      ; fully-qualified     # 🎩 top hat
+1F393                                      ; fully-qualified     # 🎓 graduation cap
+1F9E2                                      ; fully-qualified     # 🧢 billed cap
+26D1 FE0F                                  ; fully-qualified     # ⛑️ rescue worker’s helmet
+26D1                                       ; unqualified         # ⛑ rescue worker’s helmet
+1F4FF                                      ; fully-qualified     # 📿 prayer beads
+1F484                                      ; fully-qualified     # 💄 lipstick
+1F48D                                      ; fully-qualified     # 💍 ring
+1F48E                                      ; fully-qualified     # 💎 gem stone
+
+# subgroup: sound
+1F507                                      ; fully-qualified     # 🔇 muted speaker
+1F508                                      ; fully-qualified     # 🔈 speaker low volume
+1F509                                      ; fully-qualified     # 🔉 speaker medium volume
+1F50A                                      ; fully-qualified     # 🔊 speaker high volume
+1F4E2                                      ; fully-qualified     # 📢 loudspeaker
+1F4E3                                      ; fully-qualified     # 📣 megaphone
+1F4EF                                      ; fully-qualified     # 📯 postal horn
+1F514                                      ; fully-qualified     # 🔔 bell
+1F515                                      ; fully-qualified     # 🔕 bell with slash
+
+# subgroup: music
+1F3BC                                      ; fully-qualified     # 🎼 musical score
+1F3B5                                      ; fully-qualified     # 🎵 musical note
+1F3B6                                      ; fully-qualified     # 🎶 musical notes
+1F399 FE0F                                 ; fully-qualified     # 🎙️ studio microphone
+1F399                                      ; unqualified         # 🎙 studio microphone
+1F39A FE0F                                 ; fully-qualified     # 🎚️ level slider
+1F39A                                      ; unqualified         # 🎚 level slider
+1F39B FE0F                                 ; fully-qualified     # 🎛️ control knobs
+1F39B                                      ; unqualified         # 🎛 control knobs
+1F3A4                                      ; fully-qualified     # 🎤 microphone
+1F3A7                                      ; fully-qualified     # 🎧 headphone
+1F4FB                                      ; fully-qualified     # 📻 radio
+
+# subgroup: musical-instrument
+1F3B7                                      ; fully-qualified     # 🎷 saxophone
+1F3B8                                      ; fully-qualified     # 🎸 guitar
+1F3B9                                      ; fully-qualified     # 🎹 musical keyboard
+1F3BA                                      ; fully-qualified     # 🎺 trumpet
+1F3BB                                      ; fully-qualified     # 🎻 violin
+1FA95                                      ; fully-qualified     # 🪕 banjo
+1F941                                      ; fully-qualified     # 🥁 drum
+
+# subgroup: phone
+1F4F1                                      ; fully-qualified     # 📱 mobile phone
+1F4F2                                      ; fully-qualified     # 📲 mobile phone with arrow
+260E FE0F                                  ; fully-qualified     # ☎️ telephone
+260E                                       ; unqualified         # ☎ telephone
+1F4DE                                      ; fully-qualified     # 📞 telephone receiver
+1F4DF                                      ; fully-qualified     # 📟 pager
+1F4E0                                      ; fully-qualified     # 📠 fax machine
+
+# subgroup: computer
+1F50B                                      ; fully-qualified     # 🔋 battery
+1F50C                                      ; fully-qualified     # 🔌 electric plug
+1F4BB                                      ; fully-qualified     # 💻 laptop computer
+1F5A5 FE0F                                 ; fully-qualified     # 🖥️ desktop computer
+1F5A5                                      ; unqualified         # 🖥 desktop computer
+1F5A8 FE0F                                 ; fully-qualified     # 🖨️ printer
+1F5A8                                      ; unqualified         # 🖨 printer
+2328 FE0F                                  ; fully-qualified     # ⌨️ keyboard
+2328                                       ; unqualified         # ⌨ keyboard
+1F5B1 FE0F                                 ; fully-qualified     # 🖱️ computer mouse
+1F5B1                                      ; unqualified         # 🖱 computer mouse
+1F5B2 FE0F                                 ; fully-qualified     # 🖲️ trackball
+1F5B2                                      ; unqualified         # 🖲 trackball
+1F4BD                                      ; fully-qualified     # 💽 computer disk
+1F4BE                                      ; fully-qualified     # 💾 floppy disk
+1F4BF                                      ; fully-qualified     # 💿 optical disk
+1F4C0                                      ; fully-qualified     # 📀 dvd
+1F9EE                                      ; fully-qualified     # 🧮 abacus
+
+# subgroup: light & video
+1F3A5                                      ; fully-qualified     # 🎥 movie camera
+1F39E FE0F                                 ; fully-qualified     # 🎞️ film frames
+1F39E                                      ; unqualified         # 🎞 film frames
+1F4FD FE0F                                 ; fully-qualified     # 📽️ film projector
+1F4FD                                      ; unqualified         # 📽 film projector
+1F3AC                                      ; fully-qualified     # 🎬 clapper board
+1F4FA                                      ; fully-qualified     # 📺 television
+1F4F7                                      ; fully-qualified     # 📷 camera
+1F4F8                                      ; fully-qualified     # 📸 camera with flash
+1F4F9                                      ; fully-qualified     # 📹 video camera
+1F4FC                                      ; fully-qualified     # 📼 videocassette
+1F50D                                      ; fully-qualified     # 🔍 magnifying glass tilted left
+1F50E                                      ; fully-qualified     # 🔎 magnifying glass tilted right
+1F56F FE0F                                 ; fully-qualified     # 🕯️ candle
+1F56F                                      ; unqualified         # 🕯 candle
+1F4A1                                      ; fully-qualified     # 💡 light bulb
+1F526                                      ; fully-qualified     # 🔦 flashlight
+1F3EE                                      ; fully-qualified     # 🏮 red paper lantern
+1FA94                                      ; fully-qualified     # 🪔 diya lamp
+
+# subgroup: book-paper
+1F4D4                                      ; fully-qualified     # 📔 notebook with decorative cover
+1F4D5                                      ; fully-qualified     # 📕 closed book
+1F4D6                                      ; fully-qualified     # 📖 open book
+1F4D7                                      ; fully-qualified     # 📗 green book
+1F4D8                                      ; fully-qualified     # 📘 blue book
+1F4D9                                      ; fully-qualified     # 📙 orange book
+1F4DA                                      ; fully-qualified     # 📚 books
+1F4D3                                      ; fully-qualified     # 📓 notebook
+1F4D2                                      ; fully-qualified     # 📒 ledger
+1F4C3                                      ; fully-qualified     # 📃 page with curl
+1F4DC                                      ; fully-qualified     # 📜 scroll
+1F4C4                                      ; fully-qualified     # 📄 page facing up
+1F4F0                                      ; fully-qualified     # 📰 newspaper
+1F5DE FE0F                                 ; fully-qualified     # 🗞️ rolled-up newspaper
+1F5DE                                      ; unqualified         # 🗞 rolled-up newspaper
+1F4D1                                      ; fully-qualified     # 📑 bookmark tabs
+1F516                                      ; fully-qualified     # 🔖 bookmark
+1F3F7 FE0F                                 ; fully-qualified     # 🏷️ label
+1F3F7                                      ; unqualified         # 🏷 label
+
+# subgroup: money
+1F4B0                                      ; fully-qualified     # 💰 money bag
+1F4B4                                      ; fully-qualified     # 💴 yen banknote
+1F4B5                                      ; fully-qualified     # 💵 dollar banknote
+1F4B6                                      ; fully-qualified     # 💶 euro banknote
+1F4B7                                      ; fully-qualified     # 💷 pound banknote
+1F4B8                                      ; fully-qualified     # 💸 money with wings
+1F4B3                                      ; fully-qualified     # 💳 credit card
+1F9FE                                      ; fully-qualified     # 🧾 receipt
+1F4B9                                      ; fully-qualified     # 💹 chart increasing with yen
+1F4B1                                      ; fully-qualified     # 💱 currency exchange
+1F4B2                                      ; fully-qualified     # 💲 heavy dollar sign
+
+# subgroup: mail
+2709 FE0F                                  ; fully-qualified     # ✉️ envelope
+2709                                       ; unqualified         # ✉ envelope
+1F4E7                                      ; fully-qualified     # 📧 e-mail
+1F4E8                                      ; fully-qualified     # 📨 incoming envelope
+1F4E9                                      ; fully-qualified     # 📩 envelope with arrow
+1F4E4                                      ; fully-qualified     # 📤 outbox tray
+1F4E5                                      ; fully-qualified     # 📥 inbox tray
+1F4E6                                      ; fully-qualified     # 📦 package
+1F4EB                                      ; fully-qualified     # 📫 closed mailbox with raised flag
+1F4EA                                      ; fully-qualified     # 📪 closed mailbox with lowered flag
+1F4EC                                      ; fully-qualified     # 📬 open mailbox with raised flag
+1F4ED                                      ; fully-qualified     # 📭 open mailbox with lowered flag
+1F4EE                                      ; fully-qualified     # 📮 postbox
+1F5F3 FE0F                                 ; fully-qualified     # 🗳️ ballot box with ballot
+1F5F3                                      ; unqualified         # 🗳 ballot box with ballot
+
+# subgroup: writing
+270F FE0F                                  ; fully-qualified     # ✏️ pencil
+270F                                       ; unqualified         # ✏ pencil
+2712 FE0F                                  ; fully-qualified     # ✒️ black nib
+2712                                       ; unqualified         # ✒ black nib
+1F58B FE0F                                 ; fully-qualified     # 🖋️ fountain pen
+1F58B                                      ; unqualified         # 🖋 fountain pen
+1F58A FE0F                                 ; fully-qualified     # 🖊️ pen
+1F58A                                      ; unqualified         # 🖊 pen
+1F58C FE0F                                 ; fully-qualified     # 🖌️ paintbrush
+1F58C                                      ; unqualified         # 🖌 paintbrush
+1F58D FE0F                                 ; fully-qualified     # 🖍️ crayon
+1F58D                                      ; unqualified         # 🖍 crayon
+1F4DD                                      ; fully-qualified     # 📝 memo
+
+# subgroup: office
+1F4BC                                      ; fully-qualified     # 💼 briefcase
+1F4C1                                      ; fully-qualified     # 📁 file folder
+1F4C2                                      ; fully-qualified     # 📂 open file folder
+1F5C2 FE0F                                 ; fully-qualified     # 🗂️ card index dividers
+1F5C2                                      ; unqualified         # 🗂 card index dividers
+1F4C5                                      ; fully-qualified     # 📅 calendar
+1F4C6                                      ; fully-qualified     # 📆 tear-off calendar
+1F5D2 FE0F                                 ; fully-qualified     # 🗒️ spiral notepad
+1F5D2                                      ; unqualified         # 🗒 spiral notepad
+1F5D3 FE0F                                 ; fully-qualified     # 🗓️ spiral calendar
+1F5D3                                      ; unqualified         # 🗓 spiral calendar
+1F4C7                                      ; fully-qualified     # 📇 card index
+1F4C8                                      ; fully-qualified     # 📈 chart increasing
+1F4C9                                      ; fully-qualified     # 📉 chart decreasing
+1F4CA                                      ; fully-qualified     # 📊 bar chart
+1F4CB                                      ; fully-qualified     # 📋 clipboard
+1F4CC                                      ; fully-qualified     # 📌 pushpin
+1F4CD                                      ; fully-qualified     # 📍 round pushpin
+1F4CE                                      ; fully-qualified     # 📎 paperclip
+1F587 FE0F                                 ; fully-qualified     # 🖇️ linked paperclips
+1F587                                      ; unqualified         # 🖇 linked paperclips
+1F4CF                                      ; fully-qualified     # 📏 straight ruler
+1F4D0                                      ; fully-qualified     # 📐 triangular ruler
+2702 FE0F                                  ; fully-qualified     # ✂️ scissors
+2702                                       ; unqualified         # ✂ scissors
+1F5C3 FE0F                                 ; fully-qualified     # 🗃️ card file box
+1F5C3                                      ; unqualified         # 🗃 card file box
+1F5C4 FE0F                                 ; fully-qualified     # 🗄️ file cabinet
+1F5C4                                      ; unqualified         # 🗄 file cabinet
+1F5D1 FE0F                                 ; fully-qualified     # 🗑️ wastebasket
+1F5D1                                      ; unqualified         # 🗑 wastebasket
+
+# subgroup: lock
+1F512                                      ; fully-qualified     # 🔒 locked
+1F513                                      ; fully-qualified     # 🔓 unlocked
+1F50F                                      ; fully-qualified     # 🔏 locked with pen
+1F510                                      ; fully-qualified     # 🔐 locked with key
+1F511                                      ; fully-qualified     # 🔑 key
+1F5DD FE0F                                 ; fully-qualified     # 🗝️ old key
+1F5DD                                      ; unqualified         # 🗝 old key
+
+# subgroup: tool
+1F528                                      ; fully-qualified     # 🔨 hammer
+1FA93                                      ; fully-qualified     # 🪓 axe
+26CF FE0F                                  ; fully-qualified     # ⛏️ pick
+26CF                                       ; unqualified         # ⛏ pick
+2692 FE0F                                  ; fully-qualified     # ⚒️ hammer and pick
+2692                                       ; unqualified         # ⚒ hammer and pick
+1F6E0 FE0F                                 ; fully-qualified     # 🛠️ hammer and wrench
+1F6E0                                      ; unqualified         # 🛠 hammer and wrench
+1F5E1 FE0F                                 ; fully-qualified     # 🗡️ dagger
+1F5E1                                      ; unqualified         # 🗡 dagger
+2694 FE0F                                  ; fully-qualified     # ⚔️ crossed swords
+2694                                       ; unqualified         # ⚔ crossed swords
+1F52B                                      ; fully-qualified     # 🔫 pistol
+1F3F9                                      ; fully-qualified     # 🏹 bow and arrow
+1F6E1 FE0F                                 ; fully-qualified     # 🛡️ shield
+1F6E1                                      ; unqualified         # 🛡 shield
+1F527                                      ; fully-qualified     # 🔧 wrench
+1F529                                      ; fully-qualified     # 🔩 nut and bolt
+2699 FE0F                                  ; fully-qualified     # ⚙️ gear
+2699                                       ; unqualified         # ⚙ gear
+1F5DC FE0F                                 ; fully-qualified     # 🗜️ clamp
+1F5DC                                      ; unqualified         # 🗜 clamp
+2696 FE0F                                  ; fully-qualified     # ⚖️ balance scale
+2696                                       ; unqualified         # ⚖ balance scale
+1F9AF                                      ; fully-qualified     # 🦯 probing cane
+1F517                                      ; fully-qualified     # 🔗 link
+26D3 FE0F                                  ; fully-qualified     # ⛓️ chains
+26D3                                       ; unqualified         # ⛓ chains
+1F9F0                                      ; fully-qualified     # 🧰 toolbox
+1F9F2                                      ; fully-qualified     # 🧲 magnet
+
+# subgroup: science
+2697 FE0F                                  ; fully-qualified     # ⚗️ alembic
+2697                                       ; unqualified         # ⚗ alembic
+1F9EA                                      ; fully-qualified     # 🧪 test tube
+1F9EB                                      ; fully-qualified     # 🧫 petri dish
+1F9EC                                      ; fully-qualified     # 🧬 dna
+1F52C                                      ; fully-qualified     # 🔬 microscope
+1F52D                                      ; fully-qualified     # 🔭 telescope
+1F4E1                                      ; fully-qualified     # 📡 satellite antenna
+
+# subgroup: medical
+1F489                                      ; fully-qualified     # 💉 syringe
+1FA78                                      ; fully-qualified     # 🩸 drop of blood
+1F48A                                      ; fully-qualified     # 💊 pill
+1FA79                                      ; fully-qualified     # 🩹 adhesive bandage
+1FA7A                                      ; fully-qualified     # 🩺 stethoscope
+
+# subgroup: household
+1F6AA                                      ; fully-qualified     # 🚪 door
+1F6CF FE0F                                 ; fully-qualified     # 🛏️ bed
+1F6CF                                      ; unqualified         # 🛏 bed
+1F6CB FE0F                                 ; fully-qualified     # 🛋️ couch and lamp
+1F6CB                                      ; unqualified         # 🛋 couch and lamp
+1FA91                                      ; fully-qualified     # 🪑 chair
+1F6BD                                      ; fully-qualified     # 🚽 toilet
+1F6BF                                      ; fully-qualified     # 🚿 shower
+1F6C1                                      ; fully-qualified     # 🛁 bathtub
+1FA92                                      ; fully-qualified     # 🪒 razor
+1F9F4                                      ; fully-qualified     # 🧴 lotion bottle
+1F9F7                                      ; fully-qualified     # 🧷 safety pin
+1F9F9                                      ; fully-qualified     # 🧹 broom
+1F9FA                                      ; fully-qualified     # 🧺 basket
+1F9FB                                      ; fully-qualified     # 🧻 roll of paper
+1F9FC                                      ; fully-qualified     # 🧼 soap
+1F9FD                                      ; fully-qualified     # 🧽 sponge
+1F9EF                                      ; fully-qualified     # 🧯 fire extinguisher
+1F6D2                                      ; fully-qualified     # 🛒 shopping cart
+
+# subgroup: other-object
+1F6AC                                      ; fully-qualified     # 🚬 cigarette
+26B0 FE0F                                  ; fully-qualified     # ⚰️ coffin
+26B0                                       ; unqualified         # ⚰ coffin
+26B1 FE0F                                  ; fully-qualified     # ⚱️ funeral urn
+26B1                                       ; unqualified         # ⚱ funeral urn
+1F5FF                                      ; fully-qualified     # 🗿 moai
+
+# Objects subtotal:		282
+# Objects subtotal:		282	w/o modifiers
+
+# group: Symbols
+
+# subgroup: transport-sign
+1F3E7                                      ; fully-qualified     # 🏧 ATM sign
+1F6AE                                      ; fully-qualified     # 🚮 litter in bin sign
+1F6B0                                      ; fully-qualified     # 🚰 potable water
+267F                                       ; fully-qualified     # ♿ wheelchair symbol
+1F6B9                                      ; fully-qualified     # 🚹 men’s room
+1F6BA                                      ; fully-qualified     # 🚺 women’s room
+1F6BB                                      ; fully-qualified     # 🚻 restroom
+1F6BC                                      ; fully-qualified     # 🚼 baby symbol
+1F6BE                                      ; fully-qualified     # 🚾 water closet
+1F6C2                                      ; fully-qualified     # 🛂 passport control
+1F6C3                                      ; fully-qualified     # 🛃 customs
+1F6C4                                      ; fully-qualified     # 🛄 baggage claim
+1F6C5                                      ; fully-qualified     # 🛅 left luggage
+
+# subgroup: warning
+26A0 FE0F                                  ; fully-qualified     # ⚠️ warning
+26A0                                       ; unqualified         # ⚠ warning
+1F6B8                                      ; fully-qualified     # 🚸 children crossing
+26D4                                       ; fully-qualified     # ⛔ no entry
+1F6AB                                      ; fully-qualified     # 🚫 prohibited
+1F6B3                                      ; fully-qualified     # 🚳 no bicycles
+1F6AD                                      ; fully-qualified     # 🚭 no smoking
+1F6AF                                      ; fully-qualified     # 🚯 no littering
+1F6B1                                      ; fully-qualified     # 🚱 non-potable water
+1F6B7                                      ; fully-qualified     # 🚷 no pedestrians
+1F4F5                                      ; fully-qualified     # 📵 no mobile phones
+1F51E                                      ; fully-qualified     # 🔞 no one under eighteen
+2622 FE0F                                  ; fully-qualified     # ☢️ radioactive
+2622                                       ; unqualified         # ☢ radioactive
+2623 FE0F                                  ; fully-qualified     # ☣️ biohazard
+2623                                       ; unqualified         # ☣ biohazard
+
+# subgroup: arrow
+2B06 FE0F                                  ; fully-qualified     # ⬆️ up arrow
+2B06                                       ; unqualified         # ⬆ up arrow
+2197 FE0F                                  ; fully-qualified     # ↗️ up-right arrow
+2197                                       ; unqualified         # ↗ up-right arrow
+27A1 FE0F                                  ; fully-qualified     # ➡️ right arrow
+27A1                                       ; unqualified         # ➡ right arrow
+2198 FE0F                                  ; fully-qualified     # ↘️ down-right arrow
+2198                                       ; unqualified         # ↘ down-right arrow
+2B07 FE0F                                  ; fully-qualified     # ⬇️ down arrow
+2B07                                       ; unqualified         # ⬇ down arrow
+2199 FE0F                                  ; fully-qualified     # ↙️ down-left arrow
+2199                                       ; unqualified         # ↙ down-left arrow
+2B05 FE0F                                  ; fully-qualified     # ⬅️ left arrow
+2B05                                       ; unqualified         # ⬅ left arrow
+2196 FE0F                                  ; fully-qualified     # ↖️ up-left arrow
+2196                                       ; unqualified         # ↖ up-left arrow
+2195 FE0F                                  ; fully-qualified     # ↕️ up-down arrow
+2195                                       ; unqualified         # ↕ up-down arrow
+2194 FE0F                                  ; fully-qualified     # ↔️ left-right arrow
+2194                                       ; unqualified         # ↔ left-right arrow
+21A9 FE0F                                  ; fully-qualified     # ↩️ right arrow curving left
+21A9                                       ; unqualified         # ↩ right arrow curving left
+21AA FE0F                                  ; fully-qualified     # ↪️ left arrow curving right
+21AA                                       ; unqualified         # ↪ left arrow curving right
+2934 FE0F                                  ; fully-qualified     # ⤴️ right arrow curving up
+2934                                       ; unqualified         # ⤴ right arrow curving up
+2935 FE0F                                  ; fully-qualified     # ⤵️ right arrow curving down
+2935                                       ; unqualified         # ⤵ right arrow curving down
+1F503                                      ; fully-qualified     # 🔃 clockwise vertical arrows
+1F504                                      ; fully-qualified     # 🔄 counterclockwise arrows button
+1F519                                      ; fully-qualified     # 🔙 BACK arrow
+1F51A                                      ; fully-qualified     # 🔚 END arrow
+1F51B                                      ; fully-qualified     # 🔛 ON! arrow
+1F51C                                      ; fully-qualified     # 🔜 SOON arrow
+1F51D                                      ; fully-qualified     # 🔝 TOP arrow
+
+# subgroup: religion
+1F6D0                                      ; fully-qualified     # 🛐 place of worship
+269B FE0F                                  ; fully-qualified     # ⚛️ atom symbol
+269B                                       ; unqualified         # ⚛ atom symbol
+1F549 FE0F                                 ; fully-qualified     # 🕉️ om
+1F549                                      ; unqualified         # 🕉 om
+2721 FE0F                                  ; fully-qualified     # ✡️ star of David
+2721                                       ; unqualified         # ✡ star of David
+2638 FE0F                                  ; fully-qualified     # ☸️ wheel of dharma
+2638                                       ; unqualified         # ☸ wheel of dharma
+262F FE0F                                  ; fully-qualified     # ☯️ yin yang
+262F                                       ; unqualified         # ☯ yin yang
+271D FE0F                                  ; fully-qualified     # ✝️ latin cross
+271D                                       ; unqualified         # ✝ latin cross
+2626 FE0F                                  ; fully-qualified     # ☦️ orthodox cross
+2626                                       ; unqualified         # ☦ orthodox cross
+262A FE0F                                  ; fully-qualified     # ☪️ star and crescent
+262A                                       ; unqualified         # ☪ star and crescent
+262E FE0F                                  ; fully-qualified     # ☮️ peace symbol
+262E                                       ; unqualified         # ☮ peace symbol
+1F54E                                      ; fully-qualified     # 🕎 menorah
+1F52F                                      ; fully-qualified     # 🔯 dotted six-pointed star
+
+# subgroup: zodiac
+2648                                       ; fully-qualified     # ♈ Aries
+2649                                       ; fully-qualified     # ♉ Taurus
+264A                                       ; fully-qualified     # ♊ Gemini
+264B                                       ; fully-qualified     # ♋ Cancer
+264C                                       ; fully-qualified     # ♌ Leo
+264D                                       ; fully-qualified     # ♍ Virgo
+264E                                       ; fully-qualified     # ♎ Libra
+264F                                       ; fully-qualified     # ♏ Scorpio
+2650                                       ; fully-qualified     # ♐ Sagittarius
+2651                                       ; fully-qualified     # ♑ Capricorn
+2652                                       ; fully-qualified     # ♒ Aquarius
+2653                                       ; fully-qualified     # ♓ Pisces
+26CE                                       ; fully-qualified     # ⛎ Ophiuchus
+
+# subgroup: av-symbol
+1F500                                      ; fully-qualified     # 🔀 shuffle tracks button
+1F501                                      ; fully-qualified     # 🔁 repeat button
+1F502                                      ; fully-qualified     # 🔂 repeat single button
+25B6 FE0F                                  ; fully-qualified     # ▶️ play button
+25B6                                       ; unqualified         # ▶ play button
+23E9                                       ; fully-qualified     # ⏩ fast-forward button
+23ED FE0F                                  ; fully-qualified     # ⏭️ next track button
+23ED                                       ; unqualified         # ⏭ next track button
+23EF FE0F                                  ; fully-qualified     # ⏯️ play or pause button
+23EF                                       ; unqualified         # ⏯ play or pause button
+25C0 FE0F                                  ; fully-qualified     # ◀️ reverse button
+25C0                                       ; unqualified         # ◀ reverse button
+23EA                                       ; fully-qualified     # ⏪ fast reverse button
+23EE FE0F                                  ; fully-qualified     # ⏮️ last track button
+23EE                                       ; unqualified         # ⏮ last track button
+1F53C                                      ; fully-qualified     # 🔼 upwards button
+23EB                                       ; fully-qualified     # ⏫ fast up button
+1F53D                                      ; fully-qualified     # 🔽 downwards button
+23EC                                       ; fully-qualified     # ⏬ fast down button
+23F8 FE0F                                  ; fully-qualified     # ⏸️ pause button
+23F8                                       ; unqualified         # ⏸ pause button
+23F9 FE0F                                  ; fully-qualified     # ⏹️ stop button
+23F9                                       ; unqualified         # ⏹ stop button
+23FA FE0F                                  ; fully-qualified     # ⏺️ record button
+23FA                                       ; unqualified         # ⏺ record button
+23CF FE0F                                  ; fully-qualified     # ⏏️ eject button
+23CF                                       ; unqualified         # ⏏ eject button
+1F3A6                                      ; fully-qualified     # 🎦 cinema
+1F505                                      ; fully-qualified     # 🔅 dim button
+1F506                                      ; fully-qualified     # 🔆 bright button
+1F4F6                                      ; fully-qualified     # 📶 antenna bars
+1F4F3                                      ; fully-qualified     # 📳 vibration mode
+1F4F4                                      ; fully-qualified     # 📴 mobile phone off
+
+# subgroup: gender
+2640 FE0F                                  ; fully-qualified     # ♀️ female sign
+2640                                       ; unqualified         # ♀ female sign
+2642 FE0F                                  ; fully-qualified     # ♂️ male sign
+2642                                       ; unqualified         # ♂ male sign
+
+# subgroup: other-symbol
+2695 FE0F                                  ; fully-qualified     # ⚕️ medical symbol
+2695                                       ; unqualified         # ⚕ medical symbol
+267E FE0F                                  ; fully-qualified     # ♾️ infinity
+267E                                       ; unqualified         # ♾ infinity
+267B FE0F                                  ; fully-qualified     # ♻️ recycling symbol
+267B                                       ; unqualified         # ♻ recycling symbol
+269C FE0F                                  ; fully-qualified     # ⚜️ fleur-de-lis
+269C                                       ; unqualified         # ⚜ fleur-de-lis
+1F531                                      ; fully-qualified     # 🔱 trident emblem
+1F4DB                                      ; fully-qualified     # 📛 name badge
+1F530                                      ; fully-qualified     # 🔰 Japanese symbol for beginner
+2B55                                       ; fully-qualified     # ⭕ hollow red circle
+2705                                       ; fully-qualified     # ✅ check mark button
+2611 FE0F                                  ; fully-qualified     # ☑️ check box with check
+2611                                       ; unqualified         # ☑ check box with check
+2714 FE0F                                  ; fully-qualified     # ✔️ check mark
+2714                                       ; unqualified         # ✔ check mark
+2716 FE0F                                  ; fully-qualified     # ✖️ multiplication sign
+2716                                       ; unqualified         # ✖ multiplication sign
+274C                                       ; fully-qualified     # ❌ cross mark
+274E                                       ; fully-qualified     # ❎ cross mark button
+2795                                       ; fully-qualified     # ➕ plus sign
+2796                                       ; fully-qualified     # ➖ minus sign
+2797                                       ; fully-qualified     # ➗ division sign
+27B0                                       ; fully-qualified     # ➰ curly loop
+27BF                                       ; fully-qualified     # ➿ double curly loop
+303D FE0F                                  ; fully-qualified     # 〽️ part alternation mark
+303D                                       ; unqualified         # 〽 part alternation mark
+2733 FE0F                                  ; fully-qualified     # ✳️ eight-spoked asterisk
+2733                                       ; unqualified         # ✳ eight-spoked asterisk
+2734 FE0F                                  ; fully-qualified     # ✴️ eight-pointed star
+2734                                       ; unqualified         # ✴ eight-pointed star
+2747 FE0F                                  ; fully-qualified     # ❇️ sparkle
+2747                                       ; unqualified         # ❇ sparkle
+203C FE0F                                  ; fully-qualified     # ‼️ double exclamation mark
+203C                                       ; unqualified         # ‼ double exclamation mark
+2049 FE0F                                  ; fully-qualified     # ⁉️ exclamation question mark
+2049                                       ; unqualified         # ⁉ exclamation question mark
+2753                                       ; fully-qualified     # ❓ question mark
+2754                                       ; fully-qualified     # ❔ white question mark
+2755                                       ; fully-qualified     # ❕ white exclamation mark
+2757                                       ; fully-qualified     # ❗ exclamation mark
+3030 FE0F                                  ; fully-qualified     # 〰️ wavy dash
+3030                                       ; unqualified         # 〰 wavy dash
+00A9 FE0F                                  ; fully-qualified     # ©️ copyright
+00A9                                       ; unqualified         # © copyright
+00AE FE0F                                  ; fully-qualified     # ®️ registered
+00AE                                       ; unqualified         # ® registered
+2122 FE0F                                  ; fully-qualified     # ™️ trade mark
+2122                                       ; unqualified         # ™ trade mark
+
+# subgroup: keycap
+0023 FE0F 20E3                             ; fully-qualified     # #️⃣ keycap: #
+0023 20E3                                  ; unqualified         # #⃣ keycap: #
+002A FE0F 20E3                             ; fully-qualified     # *️⃣ keycap: *
+002A 20E3                                  ; unqualified         # *⃣ keycap: *
+0030 FE0F 20E3                             ; fully-qualified     # 0️⃣ keycap: 0
+0030 20E3                                  ; unqualified         # 0⃣ keycap: 0
+0031 FE0F 20E3                             ; fully-qualified     # 1️⃣ keycap: 1
+0031 20E3                                  ; unqualified         # 1⃣ keycap: 1
+0032 FE0F 20E3                             ; fully-qualified     # 2️⃣ keycap: 2
+0032 20E3                                  ; unqualified         # 2⃣ keycap: 2
+0033 FE0F 20E3                             ; fully-qualified     # 3️⃣ keycap: 3
+0033 20E3                                  ; unqualified         # 3⃣ keycap: 3
+0034 FE0F 20E3                             ; fully-qualified     # 4️⃣ keycap: 4
+0034 20E3                                  ; unqualified         # 4⃣ keycap: 4
+0035 FE0F 20E3                             ; fully-qualified     # 5️⃣ keycap: 5
+0035 20E3                                  ; unqualified         # 5⃣ keycap: 5
+0036 FE0F 20E3                             ; fully-qualified     # 6️⃣ keycap: 6
+0036 20E3                                  ; unqualified         # 6⃣ keycap: 6
+0037 FE0F 20E3                             ; fully-qualified     # 7️⃣ keycap: 7
+0037 20E3                                  ; unqualified         # 7⃣ keycap: 7
+0038 FE0F 20E3                             ; fully-qualified     # 8️⃣ keycap: 8
+0038 20E3                                  ; unqualified         # 8⃣ keycap: 8
+0039 FE0F 20E3                             ; fully-qualified     # 9️⃣ keycap: 9
+0039 20E3                                  ; unqualified         # 9⃣ keycap: 9
+1F51F                                      ; fully-qualified     # 🔟 keycap: 10
+
+# subgroup: alphanum
+1F520                                      ; fully-qualified     # 🔠 input latin uppercase
+1F521                                      ; fully-qualified     # 🔡 input latin lowercase
+1F522                                      ; fully-qualified     # 🔢 input numbers
+1F523                                      ; fully-qualified     # 🔣 input symbols
+1F524                                      ; fully-qualified     # 🔤 input latin letters
+1F170 FE0F                                 ; fully-qualified     # 🅰️ A button (blood type)
+1F170                                      ; unqualified         # 🅰 A button (blood type)
+1F18E                                      ; fully-qualified     # 🆎 AB button (blood type)
+1F171 FE0F                                 ; fully-qualified     # 🅱️ B button (blood type)
+1F171                                      ; unqualified         # 🅱 B button (blood type)
+1F191                                      ; fully-qualified     # 🆑 CL button
+1F192                                      ; fully-qualified     # 🆒 COOL button
+1F193                                      ; fully-qualified     # 🆓 FREE button
+2139 FE0F                                  ; fully-qualified     # ℹ️ information
+2139                                       ; unqualified         # ℹ information
+1F194                                      ; fully-qualified     # 🆔 ID button
+24C2 FE0F                                  ; fully-qualified     # Ⓜ️ circled M
+24C2                                       ; unqualified         # Ⓜ circled M
+1F195                                      ; fully-qualified     # 🆕 NEW button
+1F196                                      ; fully-qualified     # 🆖 NG button
+1F17E FE0F                                 ; fully-qualified     # 🅾️ O button (blood type)
+1F17E                                      ; unqualified         # 🅾 O button (blood type)
+1F197                                      ; fully-qualified     # 🆗 OK button
+1F17F FE0F                                 ; fully-qualified     # 🅿️ P button
+1F17F                                      ; unqualified         # 🅿 P button
+1F198                                      ; fully-qualified     # 🆘 SOS button
+1F199                                      ; fully-qualified     # 🆙 UP! button
+1F19A                                      ; fully-qualified     # 🆚 VS button
+1F201                                      ; fully-qualified     # 🈁 Japanese “here” button
+1F202 FE0F                                 ; fully-qualified     # 🈂️ Japanese “service charge” button
+1F202                                      ; unqualified         # 🈂 Japanese “service charge” button
+1F237 FE0F                                 ; fully-qualified     # 🈷️ Japanese “monthly amount” button
+1F237                                      ; unqualified         # 🈷 Japanese “monthly amount” button
+1F236                                      ; fully-qualified     # 🈶 Japanese “not free of charge” button
+1F22F                                      ; fully-qualified     # 🈯 Japanese “reserved” button
+1F250                                      ; fully-qualified     # 🉐 Japanese “bargain” button
+1F239                                      ; fully-qualified     # 🈹 Japanese “discount” button
+1F21A                                      ; fully-qualified     # 🈚 Japanese “free of charge” button
+1F232                                      ; fully-qualified     # 🈲 Japanese “prohibited” button
+1F251                                      ; fully-qualified     # 🉑 Japanese “acceptable” button
+1F238                                      ; fully-qualified     # 🈸 Japanese “application” button
+1F234                                      ; fully-qualified     # 🈴 Japanese “passing grade” button
+1F233                                      ; fully-qualified     # 🈳 Japanese “vacancy” button
+3297 FE0F                                  ; fully-qualified     # ㊗️ Japanese “congratulations” button
+3297                                       ; unqualified         # ㊗ Japanese “congratulations” button
+3299 FE0F                                  ; fully-qualified     # ㊙️ Japanese “secret” button
+3299                                       ; unqualified         # ㊙ Japanese “secret” button
+1F23A                                      ; fully-qualified     # 🈺 Japanese “open for business” button
+1F235                                      ; fully-qualified     # 🈵 Japanese “no vacancy” button
+
+# subgroup: geometric
+1F534                                      ; fully-qualified     # 🔴 red circle
+1F7E0                                      ; fully-qualified     # 🟠 orange circle
+1F7E1                                      ; fully-qualified     # 🟡 yellow circle
+1F7E2                                      ; fully-qualified     # 🟢 green circle
+1F535                                      ; fully-qualified     # 🔵 blue circle
+1F7E3                                      ; fully-qualified     # 🟣 purple circle
+1F7E4                                      ; fully-qualified     # 🟤 brown circle
+26AB                                       ; fully-qualified     # ⚫ black circle
+26AA                                       ; fully-qualified     # ⚪ white circle
+1F7E5                                      ; fully-qualified     # 🟥 red square
+1F7E7                                      ; fully-qualified     # 🟧 orange square
+1F7E8                                      ; fully-qualified     # 🟨 yellow square
+1F7E9                                      ; fully-qualified     # 🟩 green square
+1F7E6                                      ; fully-qualified     # 🟦 blue square
+1F7EA                                      ; fully-qualified     # 🟪 purple square
+1F7EB                                      ; fully-qualified     # 🟫 brown square
+2B1B                                       ; fully-qualified     # ⬛ black large square
+2B1C                                       ; fully-qualified     # ⬜ white large square
+25FC FE0F                                  ; fully-qualified     # ◼️ black medium square
+25FC                                       ; unqualified         # ◼ black medium square
+25FB FE0F                                  ; fully-qualified     # ◻️ white medium square
+25FB                                       ; unqualified         # ◻ white medium square
+25FE                                       ; fully-qualified     # ◾ black medium-small square
+25FD                                       ; fully-qualified     # ◽ white medium-small square
+25AA FE0F                                  ; fully-qualified     # ▪️ black small square
+25AA                                       ; unqualified         # ▪ black small square
+25AB FE0F                                  ; fully-qualified     # ▫️ white small square
+25AB                                       ; unqualified         # ▫ white small square
+1F536                                      ; fully-qualified     # 🔶 large orange diamond
+1F537                                      ; fully-qualified     # 🔷 large blue diamond
+1F538                                      ; fully-qualified     # 🔸 small orange diamond
+1F539                                      ; fully-qualified     # 🔹 small blue diamond
+1F53A                                      ; fully-qualified     # 🔺 red triangle pointed up
+1F53B                                      ; fully-qualified     # 🔻 red triangle pointed down
+1F4A0                                      ; fully-qualified     # 💠 diamond with a dot
+1F518                                      ; fully-qualified     # 🔘 radio button
+1F533                                      ; fully-qualified     # 🔳 white square button
+1F532                                      ; fully-qualified     # 🔲 black square button
+
+# Symbols subtotal:		297
+# Symbols subtotal:		297	w/o modifiers
+
+# group: Flags
+
+# subgroup: flag
+1F3C1                                      ; fully-qualified     # 🏁 chequered flag
+1F6A9                                      ; fully-qualified     # 🚩 triangular flag
+1F38C                                      ; fully-qualified     # 🎌 crossed flags
+1F3F4                                      ; fully-qualified     # 🏴 black flag
+1F3F3 FE0F                                 ; fully-qualified     # 🏳️ white flag
+1F3F3                                      ; unqualified         # 🏳 white flag
+1F3F3 FE0F 200D 1F308                      ; fully-qualified     # 🏳️‍🌈 rainbow flag
+1F3F3 200D 1F308                           ; unqualified         # 🏳‍🌈 rainbow flag
+1F3F4 200D 2620 FE0F                       ; fully-qualified     # 🏴‍☠️ pirate flag
+1F3F4 200D 2620                            ; minimally-qualified # 🏴‍☠ pirate flag
+
+# subgroup: country-flag
+1F1E6 1F1E8                                ; fully-qualified     # 🇦🇨 flag: Ascension Island
+1F1E6 1F1E9                                ; fully-qualified     # 🇦🇩 flag: Andorra
+1F1E6 1F1EA                                ; fully-qualified     # 🇦🇪 flag: United Arab Emirates
+1F1E6 1F1EB                                ; fully-qualified     # 🇦🇫 flag: Afghanistan
+1F1E6 1F1EC                                ; fully-qualified     # 🇦🇬 flag: Antigua & Barbuda
+1F1E6 1F1EE                                ; fully-qualified     # 🇦🇮 flag: Anguilla
+1F1E6 1F1F1                                ; fully-qualified     # 🇦🇱 flag: Albania
+1F1E6 1F1F2                                ; fully-qualified     # 🇦🇲 flag: Armenia
+1F1E6 1F1F4                                ; fully-qualified     # 🇦🇴 flag: Angola
+1F1E6 1F1F6                                ; fully-qualified     # 🇦🇶 flag: Antarctica
+1F1E6 1F1F7                                ; fully-qualified     # 🇦🇷 flag: Argentina
+1F1E6 1F1F8                                ; fully-qualified     # 🇦🇸 flag: American Samoa
+1F1E6 1F1F9                                ; fully-qualified     # 🇦🇹 flag: Austria
+1F1E6 1F1FA                                ; fully-qualified     # 🇦🇺 flag: Australia
+1F1E6 1F1FC                                ; fully-qualified     # 🇦🇼 flag: Aruba
+1F1E6 1F1FD                                ; fully-qualified     # 🇦🇽 flag: Åland Islands
+1F1E6 1F1FF                                ; fully-qualified     # 🇦🇿 flag: Azerbaijan
+1F1E7 1F1E6                                ; fully-qualified     # 🇧🇦 flag: Bosnia & Herzegovina
+1F1E7 1F1E7                                ; fully-qualified     # 🇧🇧 flag: Barbados
+1F1E7 1F1E9                                ; fully-qualified     # 🇧🇩 flag: Bangladesh
+1F1E7 1F1EA                                ; fully-qualified     # 🇧🇪 flag: Belgium
+1F1E7 1F1EB                                ; fully-qualified     # 🇧🇫 flag: Burkina Faso
+1F1E7 1F1EC                                ; fully-qualified     # 🇧🇬 flag: Bulgaria
+1F1E7 1F1ED                                ; fully-qualified     # 🇧🇭 flag: Bahrain
+1F1E7 1F1EE                                ; fully-qualified     # 🇧🇮 flag: Burundi
+1F1E7 1F1EF                                ; fully-qualified     # 🇧🇯 flag: Benin
+1F1E7 1F1F1                                ; fully-qualified     # 🇧🇱 flag: St. Barthélemy
+1F1E7 1F1F2                                ; fully-qualified     # 🇧🇲 flag: Bermuda
+1F1E7 1F1F3                                ; fully-qualified     # 🇧🇳 flag: Brunei
+1F1E7 1F1F4                                ; fully-qualified     # 🇧🇴 flag: Bolivia
+1F1E7 1F1F6                                ; fully-qualified     # 🇧🇶 flag: Caribbean Netherlands
+1F1E7 1F1F7                                ; fully-qualified     # 🇧🇷 flag: Brazil
+1F1E7 1F1F8                                ; fully-qualified     # 🇧🇸 flag: Bahamas
+1F1E7 1F1F9                                ; fully-qualified     # 🇧🇹 flag: Bhutan
+1F1E7 1F1FB                                ; fully-qualified     # 🇧🇻 flag: Bouvet Island
+1F1E7 1F1FC                                ; fully-qualified     # 🇧🇼 flag: Botswana
+1F1E7 1F1FE                                ; fully-qualified     # 🇧🇾 flag: Belarus
+1F1E7 1F1FF                                ; fully-qualified     # 🇧🇿 flag: Belize
+1F1E8 1F1E6                                ; fully-qualified     # 🇨🇦 flag: Canada
+1F1E8 1F1E8                                ; fully-qualified     # 🇨🇨 flag: Cocos (Keeling) Islands
+1F1E8 1F1E9                                ; fully-qualified     # 🇨🇩 flag: Congo - Kinshasa
+1F1E8 1F1EB                                ; fully-qualified     # 🇨🇫 flag: Central African Republic
+1F1E8 1F1EC                                ; fully-qualified     # 🇨🇬 flag: Congo - Brazzaville
+1F1E8 1F1ED                                ; fully-qualified     # 🇨🇭 flag: Switzerland
+1F1E8 1F1EE                                ; fully-qualified     # 🇨🇮 flag: Côte d’Ivoire
+1F1E8 1F1F0                                ; fully-qualified     # 🇨🇰 flag: Cook Islands
+1F1E8 1F1F1                                ; fully-qualified     # 🇨🇱 flag: Chile
+1F1E8 1F1F2                                ; fully-qualified     # 🇨🇲 flag: Cameroon
+1F1E8 1F1F3                                ; fully-qualified     # 🇨🇳 flag: China
+1F1E8 1F1F4                                ; fully-qualified     # 🇨🇴 flag: Colombia
+1F1E8 1F1F5                                ; fully-qualified     # 🇨🇵 flag: Clipperton Island
+1F1E8 1F1F7                                ; fully-qualified     # 🇨🇷 flag: Costa Rica
+1F1E8 1F1FA                                ; fully-qualified     # 🇨🇺 flag: Cuba
+1F1E8 1F1FB                                ; fully-qualified     # 🇨🇻 flag: Cape Verde
+1F1E8 1F1FC                                ; fully-qualified     # 🇨🇼 flag: Curaçao
+1F1E8 1F1FD                                ; fully-qualified     # 🇨🇽 flag: Christmas Island
+1F1E8 1F1FE                                ; fully-qualified     # 🇨🇾 flag: Cyprus
+1F1E8 1F1FF                                ; fully-qualified     # 🇨🇿 flag: Czechia
+1F1E9 1F1EA                                ; fully-qualified     # 🇩🇪 flag: Germany
+1F1E9 1F1EC                                ; fully-qualified     # 🇩🇬 flag: Diego Garcia
+1F1E9 1F1EF                                ; fully-qualified     # 🇩🇯 flag: Djibouti
+1F1E9 1F1F0                                ; fully-qualified     # 🇩🇰 flag: Denmark
+1F1E9 1F1F2                                ; fully-qualified     # 🇩🇲 flag: Dominica
+1F1E9 1F1F4                                ; fully-qualified     # 🇩🇴 flag: Dominican Republic
+1F1E9 1F1FF                                ; fully-qualified     # 🇩🇿 flag: Algeria
+1F1EA 1F1E6                                ; fully-qualified     # 🇪🇦 flag: Ceuta & Melilla
+1F1EA 1F1E8                                ; fully-qualified     # 🇪🇨 flag: Ecuador
+1F1EA 1F1EA                                ; fully-qualified     # 🇪🇪 flag: Estonia
+1F1EA 1F1EC                                ; fully-qualified     # 🇪🇬 flag: Egypt
+1F1EA 1F1ED                                ; fully-qualified     # 🇪🇭 flag: Western Sahara
+1F1EA 1F1F7                                ; fully-qualified     # 🇪🇷 flag: Eritrea
+1F1EA 1F1F8                                ; fully-qualified     # 🇪🇸 flag: Spain
+1F1EA 1F1F9                                ; fully-qualified     # 🇪🇹 flag: Ethiopia
+1F1EA 1F1FA                                ; fully-qualified     # 🇪🇺 flag: European Union
+1F1EB 1F1EE                                ; fully-qualified     # 🇫🇮 flag: Finland
+1F1EB 1F1EF                                ; fully-qualified     # 🇫🇯 flag: Fiji
+1F1EB 1F1F0                                ; fully-qualified     # 🇫🇰 flag: Falkland Islands
+1F1EB 1F1F2                                ; fully-qualified     # 🇫🇲 flag: Micronesia
+1F1EB 1F1F4                                ; fully-qualified     # 🇫🇴 flag: Faroe Islands
+1F1EB 1F1F7                                ; fully-qualified     # 🇫🇷 flag: France
+1F1EC 1F1E6                                ; fully-qualified     # 🇬🇦 flag: Gabon
+1F1EC 1F1E7                                ; fully-qualified     # 🇬🇧 flag: United Kingdom
+1F1EC 1F1E9                                ; fully-qualified     # 🇬🇩 flag: Grenada
+1F1EC 1F1EA                                ; fully-qualified     # 🇬🇪 flag: Georgia
+1F1EC 1F1EB                                ; fully-qualified     # 🇬🇫 flag: French Guiana
+1F1EC 1F1EC                                ; fully-qualified     # 🇬🇬 flag: Guernsey
+1F1EC 1F1ED                                ; fully-qualified     # 🇬🇭 flag: Ghana
+1F1EC 1F1EE                                ; fully-qualified     # 🇬🇮 flag: Gibraltar
+1F1EC 1F1F1                                ; fully-qualified     # 🇬🇱 flag: Greenland
+1F1EC 1F1F2                                ; fully-qualified     # 🇬🇲 flag: Gambia
+1F1EC 1F1F3                                ; fully-qualified     # 🇬🇳 flag: Guinea
+1F1EC 1F1F5                                ; fully-qualified     # 🇬🇵 flag: Guadeloupe
+1F1EC 1F1F6                                ; fully-qualified     # 🇬🇶 flag: Equatorial Guinea
+1F1EC 1F1F7                                ; fully-qualified     # 🇬🇷 flag: Greece
+1F1EC 1F1F8                                ; fully-qualified     # 🇬🇸 flag: South Georgia & South Sandwich Islands
+1F1EC 1F1F9                                ; fully-qualified     # 🇬🇹 flag: Guatemala
+1F1EC 1F1FA                                ; fully-qualified     # 🇬🇺 flag: Guam
+1F1EC 1F1FC                                ; fully-qualified     # 🇬🇼 flag: Guinea-Bissau
+1F1EC 1F1FE                                ; fully-qualified     # 🇬🇾 flag: Guyana
+1F1ED 1F1F0                                ; fully-qualified     # 🇭🇰 flag: Hong Kong SAR China
+1F1ED 1F1F2                                ; fully-qualified     # 🇭🇲 flag: Heard & McDonald Islands
+1F1ED 1F1F3                                ; fully-qualified     # 🇭🇳 flag: Honduras
+1F1ED 1F1F7                                ; fully-qualified     # 🇭🇷 flag: Croatia
+1F1ED 1F1F9                                ; fully-qualified     # 🇭🇹 flag: Haiti
+1F1ED 1F1FA                                ; fully-qualified     # 🇭🇺 flag: Hungary
+1F1EE 1F1E8                                ; fully-qualified     # 🇮🇨 flag: Canary Islands
+1F1EE 1F1E9                                ; fully-qualified     # 🇮🇩 flag: Indonesia
+1F1EE 1F1EA                                ; fully-qualified     # 🇮🇪 flag: Ireland
+1F1EE 1F1F1                                ; fully-qualified     # 🇮🇱 flag: Israel
+1F1EE 1F1F2                                ; fully-qualified     # 🇮🇲 flag: Isle of Man
+1F1EE 1F1F3                                ; fully-qualified     # 🇮🇳 flag: India
+1F1EE 1F1F4                                ; fully-qualified     # 🇮🇴 flag: British Indian Ocean Territory
+1F1EE 1F1F6                                ; fully-qualified     # 🇮🇶 flag: Iraq
+1F1EE 1F1F7                                ; fully-qualified     # 🇮🇷 flag: Iran
+1F1EE 1F1F8                                ; fully-qualified     # 🇮🇸 flag: Iceland
+1F1EE 1F1F9                                ; fully-qualified     # 🇮🇹 flag: Italy
+1F1EF 1F1EA                                ; fully-qualified     # 🇯🇪 flag: Jersey
+1F1EF 1F1F2                                ; fully-qualified     # 🇯🇲 flag: Jamaica
+1F1EF 1F1F4                                ; fully-qualified     # 🇯🇴 flag: Jordan
+1F1EF 1F1F5                                ; fully-qualified     # 🇯🇵 flag: Japan
+1F1F0 1F1EA                                ; fully-qualified     # 🇰🇪 flag: Kenya
+1F1F0 1F1EC                                ; fully-qualified     # 🇰🇬 flag: Kyrgyzstan
+1F1F0 1F1ED                                ; fully-qualified     # 🇰🇭 flag: Cambodia
+1F1F0 1F1EE                                ; fully-qualified     # 🇰🇮 flag: Kiribati
+1F1F0 1F1F2                                ; fully-qualified     # 🇰🇲 flag: Comoros
+1F1F0 1F1F3                                ; fully-qualified     # 🇰🇳 flag: St. Kitts & Nevis
+1F1F0 1F1F5                                ; fully-qualified     # 🇰🇵 flag: North Korea
+1F1F0 1F1F7                                ; fully-qualified     # 🇰🇷 flag: South Korea
+1F1F0 1F1FC                                ; fully-qualified     # 🇰🇼 flag: Kuwait
+1F1F0 1F1FE                                ; fully-qualified     # 🇰🇾 flag: Cayman Islands
+1F1F0 1F1FF                                ; fully-qualified     # 🇰🇿 flag: Kazakhstan
+1F1F1 1F1E6                                ; fully-qualified     # 🇱🇦 flag: Laos
+1F1F1 1F1E7                                ; fully-qualified     # 🇱🇧 flag: Lebanon
+1F1F1 1F1E8                                ; fully-qualified     # 🇱🇨 flag: St. Lucia
+1F1F1 1F1EE                                ; fully-qualified     # 🇱🇮 flag: Liechtenstein
+1F1F1 1F1F0                                ; fully-qualified     # 🇱🇰 flag: Sri Lanka
+1F1F1 1F1F7                                ; fully-qualified     # 🇱🇷 flag: Liberia
+1F1F1 1F1F8                                ; fully-qualified     # 🇱🇸 flag: Lesotho
+1F1F1 1F1F9                                ; fully-qualified     # 🇱🇹 flag: Lithuania
+1F1F1 1F1FA                                ; fully-qualified     # 🇱🇺 flag: Luxembourg
+1F1F1 1F1FB                                ; fully-qualified     # 🇱🇻 flag: Latvia
+1F1F1 1F1FE                                ; fully-qualified     # 🇱🇾 flag: Libya
+1F1F2 1F1E6                                ; fully-qualified     # 🇲🇦 flag: Morocco
+1F1F2 1F1E8                                ; fully-qualified     # 🇲🇨 flag: Monaco
+1F1F2 1F1E9                                ; fully-qualified     # 🇲🇩 flag: Moldova
+1F1F2 1F1EA                                ; fully-qualified     # 🇲🇪 flag: Montenegro
+1F1F2 1F1EB                                ; fully-qualified     # 🇲🇫 flag: St. Martin
+1F1F2 1F1EC                                ; fully-qualified     # 🇲🇬 flag: Madagascar
+1F1F2 1F1ED                                ; fully-qualified     # 🇲🇭 flag: Marshall Islands
+1F1F2 1F1F0                                ; fully-qualified     # 🇲🇰 flag: Macedonia
+1F1F2 1F1F1                                ; fully-qualified     # 🇲🇱 flag: Mali
+1F1F2 1F1F2                                ; fully-qualified     # 🇲🇲 flag: Myanmar (Burma)
+1F1F2 1F1F3                                ; fully-qualified     # 🇲🇳 flag: Mongolia
+1F1F2 1F1F4                                ; fully-qualified     # 🇲🇴 flag: Macao SAR China
+1F1F2 1F1F5                                ; fully-qualified     # 🇲🇵 flag: Northern Mariana Islands
+1F1F2 1F1F6                                ; fully-qualified     # 🇲🇶 flag: Martinique
+1F1F2 1F1F7                                ; fully-qualified     # 🇲🇷 flag: Mauritania
+1F1F2 1F1F8                                ; fully-qualified     # 🇲🇸 flag: Montserrat
+1F1F2 1F1F9                                ; fully-qualified     # 🇲🇹 flag: Malta
+1F1F2 1F1FA                                ; fully-qualified     # 🇲🇺 flag: Mauritius
+1F1F2 1F1FB                                ; fully-qualified     # 🇲🇻 flag: Maldives
+1F1F2 1F1FC                                ; fully-qualified     # 🇲🇼 flag: Malawi
+1F1F2 1F1FD                                ; fully-qualified     # 🇲🇽 flag: Mexico
+1F1F2 1F1FE                                ; fully-qualified     # 🇲🇾 flag: Malaysia
+1F1F2 1F1FF                                ; fully-qualified     # 🇲🇿 flag: Mozambique
+1F1F3 1F1E6                                ; fully-qualified     # 🇳🇦 flag: Namibia
+1F1F3 1F1E8                                ; fully-qualified     # 🇳🇨 flag: New Caledonia
+1F1F3 1F1EA                                ; fully-qualified     # 🇳🇪 flag: Niger
+1F1F3 1F1EB                                ; fully-qualified     # 🇳🇫 flag: Norfolk Island
+1F1F3 1F1EC                                ; fully-qualified     # 🇳🇬 flag: Nigeria
+1F1F3 1F1EE                                ; fully-qualified     # 🇳🇮 flag: Nicaragua
+1F1F3 1F1F1                                ; fully-qualified     # 🇳🇱 flag: Netherlands
+1F1F3 1F1F4                                ; fully-qualified     # 🇳🇴 flag: Norway
+1F1F3 1F1F5                                ; fully-qualified     # 🇳🇵 flag: Nepal
+1F1F3 1F1F7                                ; fully-qualified     # 🇳🇷 flag: Nauru
+1F1F3 1F1FA                                ; fully-qualified     # 🇳🇺 flag: Niue
+1F1F3 1F1FF                                ; fully-qualified     # 🇳🇿 flag: New Zealand
+1F1F4 1F1F2                                ; fully-qualified     # 🇴🇲 flag: Oman
+1F1F5 1F1E6                                ; fully-qualified     # 🇵🇦 flag: Panama
+1F1F5 1F1EA                                ; fully-qualified     # 🇵🇪 flag: Peru
+1F1F5 1F1EB                                ; fully-qualified     # 🇵🇫 flag: French Polynesia
+1F1F5 1F1EC                                ; fully-qualified     # 🇵🇬 flag: Papua New Guinea
+1F1F5 1F1ED                                ; fully-qualified     # 🇵🇭 flag: Philippines
+1F1F5 1F1F0                                ; fully-qualified     # 🇵🇰 flag: Pakistan
+1F1F5 1F1F1                                ; fully-qualified     # 🇵🇱 flag: Poland
+1F1F5 1F1F2                                ; fully-qualified     # 🇵🇲 flag: St. Pierre & Miquelon
+1F1F5 1F1F3                                ; fully-qualified     # 🇵🇳 flag: Pitcairn Islands
+1F1F5 1F1F7                                ; fully-qualified     # 🇵🇷 flag: Puerto Rico
+1F1F5 1F1F8                                ; fully-qualified     # 🇵🇸 flag: Palestinian Territories
+1F1F5 1F1F9                                ; fully-qualified     # 🇵🇹 flag: Portugal
+1F1F5 1F1FC                                ; fully-qualified     # 🇵🇼 flag: Palau
+1F1F5 1F1FE                                ; fully-qualified     # 🇵🇾 flag: Paraguay
+1F1F6 1F1E6                                ; fully-qualified     # 🇶🇦 flag: Qatar
+1F1F7 1F1EA                                ; fully-qualified     # 🇷🇪 flag: Réunion
+1F1F7 1F1F4                                ; fully-qualified     # 🇷🇴 flag: Romania
+1F1F7 1F1F8                                ; fully-qualified     # 🇷🇸 flag: Serbia
+1F1F7 1F1FA                                ; fully-qualified     # 🇷🇺 flag: Russia
+1F1F7 1F1FC                                ; fully-qualified     # 🇷🇼 flag: Rwanda
+1F1F8 1F1E6                                ; fully-qualified     # 🇸🇦 flag: Saudi Arabia
+1F1F8 1F1E7                                ; fully-qualified     # 🇸🇧 flag: Solomon Islands
+1F1F8 1F1E8                                ; fully-qualified     # 🇸🇨 flag: Seychelles
+1F1F8 1F1E9                                ; fully-qualified     # 🇸🇩 flag: Sudan
+1F1F8 1F1EA                                ; fully-qualified     # 🇸🇪 flag: Sweden
+1F1F8 1F1EC                                ; fully-qualified     # 🇸🇬 flag: Singapore
+1F1F8 1F1ED                                ; fully-qualified     # 🇸🇭 flag: St. Helena
+1F1F8 1F1EE                                ; fully-qualified     # 🇸🇮 flag: Slovenia
+1F1F8 1F1EF                                ; fully-qualified     # 🇸🇯 flag: Svalbard & Jan Mayen
+1F1F8 1F1F0                                ; fully-qualified     # 🇸🇰 flag: Slovakia
+1F1F8 1F1F1                                ; fully-qualified     # 🇸🇱 flag: Sierra Leone
+1F1F8 1F1F2                                ; fully-qualified     # 🇸🇲 flag: San Marino
+1F1F8 1F1F3                                ; fully-qualified     # 🇸🇳 flag: Senegal
+1F1F8 1F1F4                                ; fully-qualified     # 🇸🇴 flag: Somalia
+1F1F8 1F1F7                                ; fully-qualified     # 🇸🇷 flag: Suriname
+1F1F8 1F1F8                                ; fully-qualified     # 🇸🇸 flag: South Sudan
+1F1F8 1F1F9                                ; fully-qualified     # 🇸🇹 flag: São Tomé & Príncipe
+1F1F8 1F1FB                                ; fully-qualified     # 🇸🇻 flag: El Salvador
+1F1F8 1F1FD                                ; fully-qualified     # 🇸🇽 flag: Sint Maarten
+1F1F8 1F1FE                                ; fully-qualified     # 🇸🇾 flag: Syria
+1F1F8 1F1FF                                ; fully-qualified     # 🇸🇿 flag: Eswatini
+1F1F9 1F1E6                                ; fully-qualified     # 🇹🇦 flag: Tristan da Cunha
+1F1F9 1F1E8                                ; fully-qualified     # 🇹🇨 flag: Turks & Caicos Islands
+1F1F9 1F1E9                                ; fully-qualified     # 🇹🇩 flag: Chad
+1F1F9 1F1EB                                ; fully-qualified     # 🇹🇫 flag: French Southern Territories
+1F1F9 1F1EC                                ; fully-qualified     # 🇹🇬 flag: Togo
+1F1F9 1F1ED                                ; fully-qualified     # 🇹🇭 flag: Thailand
+1F1F9 1F1EF                                ; fully-qualified     # 🇹🇯 flag: Tajikistan
+1F1F9 1F1F0                                ; fully-qualified     # 🇹🇰 flag: Tokelau
+1F1F9 1F1F1                                ; fully-qualified     # 🇹🇱 flag: Timor-Leste
+1F1F9 1F1F2                                ; fully-qualified     # 🇹🇲 flag: Turkmenistan
+1F1F9 1F1F3                                ; fully-qualified     # 🇹🇳 flag: Tunisia
+1F1F9 1F1F4                                ; fully-qualified     # 🇹🇴 flag: Tonga
+1F1F9 1F1F7                                ; fully-qualified     # 🇹🇷 flag: Turkey
+1F1F9 1F1F9                                ; fully-qualified     # 🇹🇹 flag: Trinidad & Tobago
+1F1F9 1F1FB                                ; fully-qualified     # 🇹🇻 flag: Tuvalu
+1F1F9 1F1FC                                ; fully-qualified     # 🇹🇼 flag: Taiwan
+1F1F9 1F1FF                                ; fully-qualified     # 🇹🇿 flag: Tanzania
+1F1FA 1F1E6                                ; fully-qualified     # 🇺🇦 flag: Ukraine
+1F1FA 1F1EC                                ; fully-qualified     # 🇺🇬 flag: Uganda
+1F1FA 1F1F2                                ; fully-qualified     # 🇺🇲 flag: U.S. Outlying Islands
+1F1FA 1F1F3                                ; fully-qualified     # 🇺🇳 flag: United Nations
+1F1FA 1F1F8                                ; fully-qualified     # 🇺🇸 flag: United States
+1F1FA 1F1FE                                ; fully-qualified     # 🇺🇾 flag: Uruguay
+1F1FA 1F1FF                                ; fully-qualified     # 🇺🇿 flag: Uzbekistan
+1F1FB 1F1E6                                ; fully-qualified     # 🇻🇦 flag: Vatican City
+1F1FB 1F1E8                                ; fully-qualified     # 🇻🇨 flag: St. Vincent & Grenadines
+1F1FB 1F1EA                                ; fully-qualified     # 🇻🇪 flag: Venezuela
+1F1FB 1F1EC                                ; fully-qualified     # 🇻🇬 flag: British Virgin Islands
+1F1FB 1F1EE                                ; fully-qualified     # 🇻🇮 flag: U.S. Virgin Islands
+1F1FB 1F1F3                                ; fully-qualified     # 🇻🇳 flag: Vietnam
+1F1FB 1F1FA                                ; fully-qualified     # 🇻🇺 flag: Vanuatu
+1F1FC 1F1EB                                ; fully-qualified     # 🇼🇫 flag: Wallis & Futuna
+1F1FC 1F1F8                                ; fully-qualified     # 🇼🇸 flag: Samoa
+1F1FD 1F1F0                                ; fully-qualified     # 🇽🇰 flag: Kosovo
+1F1FE 1F1EA                                ; fully-qualified     # 🇾🇪 flag: Yemen
+1F1FE 1F1F9                                ; fully-qualified     # 🇾🇹 flag: Mayotte
+1F1FF 1F1E6                                ; fully-qualified     # 🇿🇦 flag: South Africa
+1F1FF 1F1F2                                ; fully-qualified     # 🇿🇲 flag: Zambia
+1F1FF 1F1FC                                ; fully-qualified     # 🇿🇼 flag: Zimbabwe
+
+# subgroup: subdivision-flag
+1F3F4 E0067 E0062 E0065 E006E E0067 E007F  ; fully-qualified     # 🏴󠁧󠁢󠁥󠁮󠁧󠁿 flag: England
+1F3F4 E0067 E0062 E0073 E0063 E0074 E007F  ; fully-qualified     # 🏴󠁧󠁢󠁳󠁣󠁴󠁿 flag: Scotland
+1F3F4 E0067 E0062 E0077 E006C E0073 E007F  ; fully-qualified     # 🏴󠁧󠁢󠁷󠁬󠁳󠁿 flag: Wales
+
+# Flags subtotal:		271
+# Flags subtotal:		271	w/o modifiers
+
+# Status Counts
+# fully-qualified : 3010
+# minimally-qualified : 571
+# unqualified : 246
+# component : 9
+
+#EOF
diff --git a/plugins/emoji/emoji.plugin.zsh b/plugins/emoji/emoji.plugin.zsh
index 876011957..f9e476ebf 100644
--- a/plugins/emoji/emoji.plugin.zsh
+++ b/plugins/emoji/emoji.plugin.zsh
@@ -15,9 +15,6 @@ _omz_emoji_plugin_dir="${0:h}"
 
 local LC_ALL=en_US.UTF-8
 
-typeset -gAH emoji_groups
-typeset -gAH emoji_con
-typeset -gAH emoji2
 typeset -gAH emoji_skintone
 
 source "$_omz_emoji_plugin_dir/emoji-char-definitions.zsh"
@@ -30,7 +27,6 @@ unset _omz_emoji_plugin_dir
 # The digits 0-9 are already in the emoji table as keycap_digit_<N>, keycap_ten, etc. 
 # It's unclear whether this should be in the $emoji array, because those characters are all ones
 # which can be displayed on their own.
-#emoji[combining_enclosing_keycap]="\U20E3"
 
 emoji[regional_indicator_symbol_letter_d_regional_indicator_symbol_letter_e]=$'\xF0\x9F\x87\xA9\xF0\x9F\x87\xAA'
 emoji[regional_indicator_symbol_letter_g_regional_indicator_symbol_letter_b]=$'\xF0\x9F\x87\xAC\xF0\x9F\x87\xA7'
@@ -43,209 +39,12 @@ emoji[regional_indicator_symbol_letter_i_regional_indicator_symbol_letter_t]=$'\
 emoji[regional_indicator_symbol_letter_u_regional_indicator_symbol_letter_s]=$'\xF0\x9F\x87\xBA\xF0\x9F\x87\xB8'
 emoji[regional_indicator_symbol_letter_r_regional_indicator_symbol_letter_u]=$'\xF0\x9F\x87\xB7\xF0\x9F\x87\xBA'
 
-# Nonstandard alias names
-emoji[vulcan_salute]=$'\U1F596'
-
-
-# Emoji combining and auxiliary characters
-
-# "Variation Selectors" for controlling text vs emoji style presentation
-# These apply to the immediately preceding character
-emoji2[text_style]=$'\UFE0E'
-emoji2[emoji_style]=$'\UFE0F'
-# Joiner that indicates a single combined-form glyph (ligature) should be used
-emoji2[zero_width_joiner]=$'\U200D'
-# Skin tone modifiers
-emoji2[emoji_modifier_fitzpatrick_type_1_2]=$'\U1F3FB'
-emoji2[emoji_modifier_fitzpatrick_type_3]=$'\U1F3FC'
-emoji2[emoji_modifier_fitzpatrick_type_4]=$'\U1F3FD'
-emoji2[emoji_modifier_fitzpatrick_type_5]=$'\U1F3FE'
-emoji2[emoji_modifier_fitzpatrick_type_6]=$'\U1F3FF'
-# Various other combining characters. (Incomplete list; I selected ones that sound useful)
-emoji2[combining_enclosing_circle]=$'\U20DD'
-emoji2[combining_enclosing_square]=$'\U20DE'
-emoji2[combining_enclosing_diamond]=$'\U20DF'
-emoji2[combining_enclosing_circle_backslash]=$'\U20E0'
-emoji2[combining_enclosing_screen]=$'\U20E2'
-emoji2[combining_enclosing_keycap]=$'\U20E3'
-emoji2[combining_enclosing_upward_pointing_triangle]=$'\U20E4'
-
 # Easier access to skin tone modifiers
 emoji_skintone[1_2]=$'\U1F3FB'
 emoji_skintone[3]=$'\U1F3FC'
 emoji_skintone[4]=$'\U1F3FD'
 emoji_skintone[5]=$'\U1F3FE'
 emoji_skintone[6]=$'\U1F3FF'
-
-# Emoji groups
-# 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.
-
-emoji_groups[fruits]="
-  tomato
-  aubergine
-  grapes
-  melon
-  watermelon
-  tangerine
-  banana
-  pineapple
-  red_apple
-  green_apple
-  peach
-  cherries
-  strawberry
-  lemon
-  pear
-"
-
-emoji_groups[vehicles]="
-  airplane
-  rocket
-  railway_car
-  high_speed_train
-  high_speed_train_with_bullet_nose
-  bus
-  ambulance
-  fire_engine
-  police_car
-  taxi
-  automobile
-  recreational_vehicle
-  delivery_truck
-  ship
-  speedboat
-  bicycle
-  helicopter
-  steam_locomotive
-  train
-  light_rail
-  tram
-  oncoming_bus
-  trolleybus
-  minibus
-  oncoming_police_car
-  oncoming_taxi
-  oncoming_automobile
-  articulated_lorry
-  tractor
-  monorail
-  mountain_railway
-  suspension_railway
-  mountain_cableway
-  aerial_tramway
-  rowboat
-  bicyclist
-  mountain_bicyclist
-  sailboat
-"
-
-emoji_groups[animals]="
-  snail
-  snake
-  horse
-  sheep
-  monkey
-  chicken
-  boar
-  elephant
-  octopus
-  spiral_shell
-  bug
-  ant
-  honeybee
-  lady_beetle
-  fish
-  tropical_fish
-  blowfish
-  turtle
-  hatching_chick
-  baby_chick
-  front_facing_baby_chick
-  bird
-  penguin
-  koala
-  poodle
-  bactrian_camel
-  dolphin
-  mouse_face
-  cow_face
-  tiger_face
-  rabbit_face
-  cat_face
-  dragon_face
-  spouting_whale
-  horse_face
-  monkey_face
-  dog_face
-  pig_face
-  frog_face
-  hamster_face
-  wolf_face
-  bear_face
-  panda_face
-  rat
-  mouse
-  ox
-  water_buffalo
-  cow
-  tiger
-  leopard
-  rabbit
-  cat
-  dragon
-  crocodile
-  whale
-  ram
-  goat
-  rooster
-  dog
-  pig
-  dromedary_camel
-"
-
-emoji_groups[faces]="
-  grinning_face_with_smiling_eyes
-  face_with_tears_of_joy
-  smiling_face_with_open_mouth
-  smiling_face_with_open_mouth_and_smiling_eyes
-  smiling_face_with_open_mouth_and_cold_sweat
-  smiling_face_with_open_mouth_and_tightly_closed_eyes
-  winking_face
-  smiling_face_with_smiling_eyes
-  face_savouring_delicious_food
-  relieved_face
-  smiling_face_with_heart_shaped_eyes
-  smirking_face
-  unamused_face
-  face_with_cold_sweat
-  pensive_face
-  confounded_face
-  face_throwing_a_kiss
-  kissing_face_with_closed_eyes
-  face_with_stuck_out_tongue_and_winking_eye
-  face_with_stuck_out_tongue_and_tightly_closed_eyes
-  disappointed_face
-  angry_face
-  pouting_face
-  crying_face
-  persevering_face
-  face_with_look_of_triumph
-  disappointed_but_relieved_face
-  fearful_face
-  weary_face
-  sleepy_face
-  tired_face
-  loudly_crying_face
-  face_with_open_mouth_and_cold_sweat
-  face_screaming_in_fear
-  astonished_face
-  flushed_face
-  dizzy_face
-  face_with_medical_mask
-"
-
 }
 
 # Prints a random emoji character
@@ -264,7 +63,11 @@ function random_emoji() {
   [[ $list_size -eq 0 ]] && return 1
   local random_index=$(( ( RANDOM % $list_size ) + 1 ))
   local name=${names[$random_index]}
-  echo ${emoji[$name]}
+  if [[ "$group" == "flags" ]]; then 
+    echo ${emoji_flags[$name]}
+  else 
+    echo ${emoji[$name]}
+  fi
 }
 
 # Displays a listing of emoji with their names
@@ -281,12 +84,26 @@ function display_emoji() {
   fi
   # The extra spaces in output here are a hack for readability, since some
   # terminals treat these emoji chars as single-width.
+  local counter=1
   for i in $names; do
-    printf '%s  ' "$emoji[$i]"
+    if [[ "$group" == "flags" ]]; then 
+      printf '%s  ' "$emoji_flags[$i]"
+    else 
+      printf '%s  ' "$emoji[$i]" 
+    fi
+    # New line every 20 emoji, to avoid weirdnesses
+    if (($counter % 20 == 0)); then
+      printf "\n" 
+    fi
+    let counter=$counter+1
   done
   print
   for i in $names; do
-    echo "${emoji[$i]}  = $i"
+    if [[ "$group" == "flags" ]]; then 
+      echo "${emoji_flags[$i]}  = $i"
+    else 
+      echo "${emoji[$i]}  = $i"
+    fi
   done
 }
 
diff --git a/plugins/emoji/gemoji_db.json b/plugins/emoji/gemoji_db.json
new file mode 100644
index 000000000..9227c26d1
--- /dev/null
+++ b/plugins/emoji/gemoji_db.json
@@ -0,0 +1,21538 @@
+[
+  {
+    "emoji": "😀"
+  , "description": "grinning face"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "grinning"
+    ]
+  , "tags": [
+      "smile"
+    , "happy"
+    ]
+  , "unicode_version": "6.1"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "😃"
+  , "description": "grinning face with big eyes"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "smiley"
+    ]
+  , "tags": [
+      "happy"
+    , "joy"
+    , "haha"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "😄"
+  , "description": "grinning face with smiling eyes"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "smile"
+    ]
+  , "tags": [
+      "happy"
+    , "joy"
+    , "laugh"
+    , "pleased"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "😁"
+  , "description": "beaming face with smiling eyes"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "grin"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "😆"
+  , "description": "grinning squinting face"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "laughing"
+    , "satisfied"
+    ]
+  , "tags": [
+      "happy"
+    , "haha"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "😅"
+  , "description": "grinning face with sweat"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "sweat_smile"
+    ]
+  , "tags": [
+      "hot"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🤣"
+  , "description": "rolling on the floor laughing"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "rofl"
+    ]
+  , "tags": [
+      "lol"
+    , "laughing"
+    ]
+  , "unicode_version": "9.0"
+  , "ios_version": "10.2"
+  }
+, {
+    "emoji": "😂"
+  , "description": "face with tears of joy"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "joy"
+    ]
+  , "tags": [
+      "tears"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🙂"
+  , "description": "slightly smiling face"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "slightly_smiling_face"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "7.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🙃"
+  , "description": "upside-down face"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "upside_down_face"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "8.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "😉"
+  , "description": "winking face"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "wink"
+    ]
+  , "tags": [
+      "flirt"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "😊"
+  , "description": "smiling face with smiling eyes"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "blush"
+    ]
+  , "tags": [
+      "proud"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "😇"
+  , "description": "smiling face with halo"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "innocent"
+    ]
+  , "tags": [
+      "angel"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🥰"
+  , "description": "smiling face with hearts"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "smiling_face_with_three_hearts"
+    ]
+  , "tags": [
+      "love"
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "😍"
+  , "description": "smiling face with heart-eyes"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "heart_eyes"
+    ]
+  , "tags": [
+      "love"
+    , "crush"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🤩"
+  , "description": "star-struck"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "star_struck"
+    ]
+  , "tags": [
+      "eyes"
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "😘"
+  , "description": "face blowing a kiss"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "kissing_heart"
+    ]
+  , "tags": [
+      "flirt"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "😗"
+  , "description": "kissing face"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "kissing"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.1"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "☺️"
+  , "description": "smiling face"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "relaxed"
+    ]
+  , "tags": [
+      "blush"
+    , "pleased"
+    ]
+  , "unicode_version": ""
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "😚"
+  , "description": "kissing face with closed eyes"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "kissing_closed_eyes"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "😙"
+  , "description": "kissing face with smiling eyes"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "kissing_smiling_eyes"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.1"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "😋"
+  , "description": "face savoring food"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "yum"
+    ]
+  , "tags": [
+      "tongue"
+    , "lick"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "😛"
+  , "description": "face with tongue"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "stuck_out_tongue"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.1"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "😜"
+  , "description": "winking face with tongue"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "stuck_out_tongue_winking_eye"
+    ]
+  , "tags": [
+      "prank"
+    , "silly"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🤪"
+  , "description": "zany face"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "zany_face"
+    ]
+  , "tags": [
+      "goofy"
+    , "wacky"
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "😝"
+  , "description": "squinting face with tongue"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "stuck_out_tongue_closed_eyes"
+    ]
+  , "tags": [
+      "prank"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🤑"
+  , "description": "money-mouth face"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "money_mouth_face"
+    ]
+  , "tags": [
+      "rich"
+    ]
+  , "unicode_version": "8.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🤗"
+  , "description": "hugging face"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "hugs"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "8.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🤭"
+  , "description": "face with hand over mouth"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "hand_over_mouth"
+    ]
+  , "tags": [
+      "quiet"
+    , "whoops"
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "🤫"
+  , "description": "shushing face"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "shushing_face"
+    ]
+  , "tags": [
+      "silence"
+    , "quiet"
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "🤔"
+  , "description": "thinking face"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "thinking"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "8.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🤐"
+  , "description": "zipper-mouth face"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "zipper_mouth_face"
+    ]
+  , "tags": [
+      "silence"
+    , "hush"
+    ]
+  , "unicode_version": "8.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🤨"
+  , "description": "face with raised eyebrow"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "raised_eyebrow"
+    ]
+  , "tags": [
+      "suspicious"
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "😐"
+  , "description": "neutral face"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "neutral_face"
+    ]
+  , "tags": [
+      "meh"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "😑"
+  , "description": "expressionless face"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "expressionless"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.1"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "😶"
+  , "description": "face without mouth"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "no_mouth"
+    ]
+  , "tags": [
+      "mute"
+    , "silence"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "😏"
+  , "description": "smirking face"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "smirk"
+    ]
+  , "tags": [
+      "smug"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "😒"
+  , "description": "unamused face"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "unamused"
+    ]
+  , "tags": [
+      "meh"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🙄"
+  , "description": "face with rolling eyes"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "roll_eyes"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "8.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "😬"
+  , "description": "grimacing face"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "grimacing"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.1"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🤥"
+  , "description": "lying face"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "lying_face"
+    ]
+  , "tags": [
+      "liar"
+    ]
+  , "unicode_version": "9.0"
+  , "ios_version": "10.2"
+  }
+, {
+    "emoji": "😌"
+  , "description": "relieved face"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "relieved"
+    ]
+  , "tags": [
+      "whew"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "😔"
+  , "description": "pensive face"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "pensive"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "😪"
+  , "description": "sleepy face"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "sleepy"
+    ]
+  , "tags": [
+      "tired"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🤤"
+  , "description": "drooling face"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "drooling_face"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "9.0"
+  , "ios_version": "10.2"
+  }
+, {
+    "emoji": "😴"
+  , "description": "sleeping face"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "sleeping"
+    ]
+  , "tags": [
+      "zzz"
+    ]
+  , "unicode_version": "6.1"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "😷"
+  , "description": "face with medical mask"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "mask"
+    ]
+  , "tags": [
+      "sick"
+    , "ill"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🤒"
+  , "description": "face with thermometer"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "face_with_thermometer"
+    ]
+  , "tags": [
+      "sick"
+    ]
+  , "unicode_version": "8.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🤕"
+  , "description": "face with head-bandage"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "face_with_head_bandage"
+    ]
+  , "tags": [
+      "hurt"
+    ]
+  , "unicode_version": "8.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🤢"
+  , "description": "nauseated face"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "nauseated_face"
+    ]
+  , "tags": [
+      "sick"
+    , "barf"
+    , "disgusted"
+    ]
+  , "unicode_version": "9.0"
+  , "ios_version": "10.2"
+  }
+, {
+    "emoji": "🤮"
+  , "description": "face vomiting"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "vomiting_face"
+    ]
+  , "tags": [
+      "barf"
+    , "sick"
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "🤧"
+  , "description": "sneezing face"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "sneezing_face"
+    ]
+  , "tags": [
+      "achoo"
+    , "sick"
+    ]
+  , "unicode_version": "9.0"
+  , "ios_version": "10.2"
+  }
+, {
+    "emoji": "🥵"
+  , "description": "hot face"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "hot_face"
+    ]
+  , "tags": [
+      "heat"
+    , "sweating"
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "🥶"
+  , "description": "cold face"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "cold_face"
+    ]
+  , "tags": [
+      "freezing"
+    , "ice"
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "🥴"
+  , "description": "woozy face"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "woozy_face"
+    ]
+  , "tags": [
+      "groggy"
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "😵"
+  , "description": "dizzy face"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "dizzy_face"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🤯"
+  , "description": "exploding head"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "exploding_head"
+    ]
+  , "tags": [
+      "mind"
+    , "blown"
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "🤠"
+  , "description": "cowboy hat face"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "cowboy_hat_face"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "9.0"
+  , "ios_version": "10.2"
+  }
+, {
+    "emoji": "🥳"
+  , "description": "partying face"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "partying_face"
+    ]
+  , "tags": [
+      "celebration"
+    , "birthday"
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "😎"
+  , "description": "smiling face with sunglasses"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "sunglasses"
+    ]
+  , "tags": [
+      "cool"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🤓"
+  , "description": "nerd face"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "nerd_face"
+    ]
+  , "tags": [
+      "geek"
+    , "glasses"
+    ]
+  , "unicode_version": "8.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🧐"
+  , "description": "face with monocle"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "monocle_face"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "😕"
+  , "description": "confused face"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "confused"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.1"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "😟"
+  , "description": "worried face"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "worried"
+    ]
+  , "tags": [
+      "nervous"
+    ]
+  , "unicode_version": "6.1"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🙁"
+  , "description": "slightly frowning face"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "slightly_frowning_face"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "7.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "☹"
+  , "description": "frowning face"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "frowning_face"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": ""
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "😮"
+  , "description": "face with open mouth"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "open_mouth"
+    ]
+  , "tags": [
+      "surprise"
+    , "impressed"
+    , "wow"
+    ]
+  , "unicode_version": "6.1"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "😯"
+  , "description": "hushed face"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "hushed"
+    ]
+  , "tags": [
+      "silence"
+    , "speechless"
+    ]
+  , "unicode_version": "6.1"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "😲"
+  , "description": "astonished face"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "astonished"
+    ]
+  , "tags": [
+      "amazed"
+    , "gasp"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "😳"
+  , "description": "flushed face"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "flushed"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🥺"
+  , "description": "pleading face"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "pleading_face"
+    ]
+  , "tags": [
+      "puppy"
+    , "eyes"
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "😦"
+  , "description": "frowning face with open mouth"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "frowning"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.1"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "😧"
+  , "description": "anguished face"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "anguished"
+    ]
+  , "tags": [
+      "stunned"
+    ]
+  , "unicode_version": "6.1"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "😨"
+  , "description": "fearful face"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "fearful"
+    ]
+  , "tags": [
+      "scared"
+    , "shocked"
+    , "oops"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "😰"
+  , "description": "anxious face with sweat"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "cold_sweat"
+    ]
+  , "tags": [
+      "nervous"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "😥"
+  , "description": "sad but relieved face"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "disappointed_relieved"
+    ]
+  , "tags": [
+      "phew"
+    , "sweat"
+    , "nervous"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "😢"
+  , "description": "crying face"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "cry"
+    ]
+  , "tags": [
+      "sad"
+    , "tear"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "😭"
+  , "description": "loudly crying face"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "sob"
+    ]
+  , "tags": [
+      "sad"
+    , "cry"
+    , "bawling"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "😱"
+  , "description": "face screaming in fear"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "scream"
+    ]
+  , "tags": [
+      "horror"
+    , "shocked"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "😖"
+  , "description": "confounded face"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "confounded"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "😣"
+  , "description": "persevering face"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "persevere"
+    ]
+  , "tags": [
+      "struggling"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "😞"
+  , "description": "disappointed face"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "disappointed"
+    ]
+  , "tags": [
+      "sad"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "😓"
+  , "description": "downcast face with sweat"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "sweat"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "😩"
+  , "description": "weary face"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "weary"
+    ]
+  , "tags": [
+      "tired"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "😫"
+  , "description": "tired face"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "tired_face"
+    ]
+  , "tags": [
+      "upset"
+    , "whine"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🥱"
+  , "description": "yawning face"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "yawning_face"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "12.0"
+  , "ios_version": "13.0"
+  }
+, {
+    "emoji": "😤"
+  , "description": "face with steam from nose"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "triumph"
+    ]
+  , "tags": [
+      "smug"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "😡"
+  , "description": "pouting face"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "rage"
+    , "pout"
+    ]
+  , "tags": [
+      "angry"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "😠"
+  , "description": "angry face"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "angry"
+    ]
+  , "tags": [
+      "mad"
+    , "annoyed"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🤬"
+  , "description": "face with symbols on mouth"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "cursing_face"
+    ]
+  , "tags": [
+      "foul"
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "😈"
+  , "description": "smiling face with horns"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "smiling_imp"
+    ]
+  , "tags": [
+      "devil"
+    , "evil"
+    , "horns"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "👿"
+  , "description": "angry face with horns"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "imp"
+    ]
+  , "tags": [
+      "angry"
+    , "devil"
+    , "evil"
+    , "horns"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "💀"
+  , "description": "skull"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "skull"
+    ]
+  , "tags": [
+      "dead"
+    , "danger"
+    , "poison"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "☠"
+  , "description": "skull and crossbones"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "skull_and_crossbones"
+    ]
+  , "tags": [
+      "danger"
+    , "pirate"
+    ]
+  , "unicode_version": ""
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "💩"
+  , "description": "pile of poo"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "hankey"
+    , "poop"
+    , "shit"
+    ]
+  , "tags": [
+      "crap"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🤡"
+  , "description": "clown face"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "clown_face"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "9.0"
+  , "ios_version": "10.2"
+  }
+, {
+    "emoji": "👹"
+  , "description": "ogre"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "japanese_ogre"
+    ]
+  , "tags": [
+      "monster"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "👺"
+  , "description": "goblin"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "japanese_goblin"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "👻"
+  , "description": "ghost"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "ghost"
+    ]
+  , "tags": [
+      "halloween"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "👽"
+  , "description": "alien"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "alien"
+    ]
+  , "tags": [
+      "ufo"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "👾"
+  , "description": "alien monster"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "space_invader"
+    ]
+  , "tags": [
+      "game"
+    , "retro"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🤖"
+  , "description": "robot"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "robot"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "8.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "😺"
+  , "description": "grinning cat"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "smiley_cat"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "😸"
+  , "description": "grinning cat with smiling eyes"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "smile_cat"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "😹"
+  , "description": "cat with tears of joy"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "joy_cat"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "😻"
+  , "description": "smiling cat with heart-eyes"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "heart_eyes_cat"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "😼"
+  , "description": "cat with wry smile"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "smirk_cat"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "😽"
+  , "description": "kissing cat"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "kissing_cat"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🙀"
+  , "description": "weary cat"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "scream_cat"
+    ]
+  , "tags": [
+      "horror"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "😿"
+  , "description": "crying cat"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "crying_cat_face"
+    ]
+  , "tags": [
+      "sad"
+    , "tear"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "😾"
+  , "description": "pouting cat"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "pouting_cat"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🙈"
+  , "description": "see-no-evil monkey"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "see_no_evil"
+    ]
+  , "tags": [
+      "monkey"
+    , "blind"
+    , "ignore"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🙉"
+  , "description": "hear-no-evil monkey"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "hear_no_evil"
+    ]
+  , "tags": [
+      "monkey"
+    , "deaf"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🙊"
+  , "description": "speak-no-evil monkey"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "speak_no_evil"
+    ]
+  , "tags": [
+      "monkey"
+    , "mute"
+    , "hush"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "💋"
+  , "description": "kiss mark"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "kiss"
+    ]
+  , "tags": [
+      "lipstick"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "💌"
+  , "description": "love letter"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "love_letter"
+    ]
+  , "tags": [
+      "email"
+    , "envelope"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "💘"
+  , "description": "heart with arrow"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "cupid"
+    ]
+  , "tags": [
+      "love"
+    , "heart"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "💝"
+  , "description": "heart with ribbon"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "gift_heart"
+    ]
+  , "tags": [
+      "chocolates"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "💖"
+  , "description": "sparkling heart"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "sparkling_heart"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "💗"
+  , "description": "growing heart"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "heartpulse"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "💓"
+  , "description": "beating heart"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "heartbeat"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "💞"
+  , "description": "revolving hearts"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "revolving_hearts"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "💕"
+  , "description": "two hearts"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "two_hearts"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "💟"
+  , "description": "heart decoration"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "heart_decoration"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "❣️"
+  , "description": "heart exclamation"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "heavy_heart_exclamation"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": ""
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "💔"
+  , "description": "broken heart"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "broken_heart"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "❤️"
+  , "description": "red heart"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "heart"
+    ]
+  , "tags": [
+      "love"
+    ]
+  , "unicode_version": ""
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🧡"
+  , "description": "orange heart"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "orange_heart"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "💛"
+  , "description": "yellow heart"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "yellow_heart"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "💚"
+  , "description": "green heart"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "green_heart"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "💙"
+  , "description": "blue heart"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "blue_heart"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "💜"
+  , "description": "purple heart"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "purple_heart"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🤎"
+  , "description": "brown heart"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "brown_heart"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "12.0"
+  , "ios_version": "13.0"
+  }
+, {
+    "emoji": "🖤"
+  , "description": "black heart"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "black_heart"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "9.0"
+  , "ios_version": "10.2"
+  }
+, {
+    "emoji": "🤍"
+  , "description": "white heart"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "white_heart"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "12.0"
+  , "ios_version": "13.0"
+  }
+, {
+    "emoji": "💯"
+  , "description": "hundred points"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "100"
+    ]
+  , "tags": [
+      "score"
+    , "perfect"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "💢"
+  , "description": "anger symbol"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "anger"
+    ]
+  , "tags": [
+      "angry"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "💥"
+  , "description": "collision"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "boom"
+    , "collision"
+    ]
+  , "tags": [
+      "explode"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "💫"
+  , "description": "dizzy"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "dizzy"
+    ]
+  , "tags": [
+      "star"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "💦"
+  , "description": "sweat droplets"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "sweat_drops"
+    ]
+  , "tags": [
+      "water"
+    , "workout"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "💨"
+  , "description": "dashing away"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "dash"
+    ]
+  , "tags": [
+      "wind"
+    , "blow"
+    , "fast"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🕳"
+  , "description": "hole"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "hole"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "7.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "💣"
+  , "description": "bomb"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "bomb"
+    ]
+  , "tags": [
+      "boom"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "💬"
+  , "description": "speech balloon"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "speech_balloon"
+    ]
+  , "tags": [
+      "comment"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "👁️‍🗨️"
+  , "description": "eye in speech bubble"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "eye_speech_bubble"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "🗨"
+  , "description": "left speech bubble"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "left_speech_bubble"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "🗯"
+  , "description": "right anger bubble"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "right_anger_bubble"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "7.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "💭"
+  , "description": "thought balloon"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "thought_balloon"
+    ]
+  , "tags": [
+      "thinking"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "💤"
+  , "description": "zzz"
+  , "category": "Smileys & Emotion"
+  , "aliases": [
+      "zzz"
+    ]
+  , "tags": [
+      "sleeping"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "👋"
+  , "description": "waving hand"
+  , "category": "People & Body"
+  , "aliases": [
+      "wave"
+    ]
+  , "tags": [
+      "goodbye"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🤚"
+  , "description": "raised back of hand"
+  , "category": "People & Body"
+  , "aliases": [
+      "raised_back_of_hand"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "9.0"
+  , "ios_version": "10.2"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🖐"
+  , "description": "hand with fingers splayed"
+  , "category": "People & Body"
+  , "aliases": [
+      "raised_hand_with_fingers_splayed"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "7.0"
+  , "ios_version": "9.1"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "✋"
+  , "description": "raised hand"
+  , "category": "People & Body"
+  , "aliases": [
+      "hand"
+    , "raised_hand"
+    ]
+  , "tags": [
+      "highfive"
+    , "stop"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🖖"
+  , "description": "vulcan salute"
+  , "category": "People & Body"
+  , "aliases": [
+      "vulcan_salute"
+    ]
+  , "tags": [
+      "prosper"
+    , "spock"
+    ]
+  , "unicode_version": "7.0"
+  , "ios_version": "8.3"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "👌"
+  , "description": "OK hand"
+  , "category": "People & Body"
+  , "aliases": [
+      "ok_hand"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🤏"
+  , "description": "pinching hand"
+  , "category": "People & Body"
+  , "aliases": [
+      "pinching_hand"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "12.0"
+  , "ios_version": "13.0"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "✌️"
+  , "description": "victory hand"
+  , "category": "People & Body"
+  , "aliases": [
+      "v"
+    ]
+  , "tags": [
+      "victory"
+    , "peace"
+    ]
+  , "unicode_version": ""
+  , "ios_version": "6.0"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🤞"
+  , "description": "crossed fingers"
+  , "category": "People & Body"
+  , "aliases": [
+      "crossed_fingers"
+    ]
+  , "tags": [
+      "luck"
+    , "hopeful"
+    ]
+  , "unicode_version": "9.0"
+  , "ios_version": "10.2"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🤟"
+  , "description": "love-you gesture"
+  , "category": "People & Body"
+  , "aliases": [
+      "love_you_gesture"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🤘"
+  , "description": "sign of the horns"
+  , "category": "People & Body"
+  , "aliases": [
+      "metal"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "8.0"
+  , "ios_version": "9.1"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🤙"
+  , "description": "call me hand"
+  , "category": "People & Body"
+  , "aliases": [
+      "call_me_hand"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "9.0"
+  , "ios_version": "10.2"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "👈"
+  , "description": "backhand index pointing left"
+  , "category": "People & Body"
+  , "aliases": [
+      "point_left"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "👉"
+  , "description": "backhand index pointing right"
+  , "category": "People & Body"
+  , "aliases": [
+      "point_right"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "👆"
+  , "description": "backhand index pointing up"
+  , "category": "People & Body"
+  , "aliases": [
+      "point_up_2"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🖕"
+  , "description": "middle finger"
+  , "category": "People & Body"
+  , "aliases": [
+      "middle_finger"
+    , "fu"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "7.0"
+  , "ios_version": "9.1"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "👇"
+  , "description": "backhand index pointing down"
+  , "category": "People & Body"
+  , "aliases": [
+      "point_down"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "☝️"
+  , "description": "index pointing up"
+  , "category": "People & Body"
+  , "aliases": [
+      "point_up"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": ""
+  , "ios_version": "6.0"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "👍"
+  , "description": "thumbs up"
+  , "category": "People & Body"
+  , "aliases": [
+      "+1"
+    , "thumbsup"
+    ]
+  , "tags": [
+      "approve"
+    , "ok"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "👎"
+  , "description": "thumbs down"
+  , "category": "People & Body"
+  , "aliases": [
+      "-1"
+    , "thumbsdown"
+    ]
+  , "tags": [
+      "disapprove"
+    , "bury"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "✊"
+  , "description": "raised fist"
+  , "category": "People & Body"
+  , "aliases": [
+      "fist_raised"
+    , "fist"
+    ]
+  , "tags": [
+      "power"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "👊"
+  , "description": "oncoming fist"
+  , "category": "People & Body"
+  , "aliases": [
+      "fist_oncoming"
+    , "facepunch"
+    , "punch"
+    ]
+  , "tags": [
+      "attack"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🤛"
+  , "description": "left-facing fist"
+  , "category": "People & Body"
+  , "aliases": [
+      "fist_left"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "9.0"
+  , "ios_version": "10.2"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🤜"
+  , "description": "right-facing fist"
+  , "category": "People & Body"
+  , "aliases": [
+      "fist_right"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "9.0"
+  , "ios_version": "10.2"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "👏"
+  , "description": "clapping hands"
+  , "category": "People & Body"
+  , "aliases": [
+      "clap"
+    ]
+  , "tags": [
+      "praise"
+    , "applause"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🙌"
+  , "description": "raising hands"
+  , "category": "People & Body"
+  , "aliases": [
+      "raised_hands"
+    ]
+  , "tags": [
+      "hooray"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "👐"
+  , "description": "open hands"
+  , "category": "People & Body"
+  , "aliases": [
+      "open_hands"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🤲"
+  , "description": "palms up together"
+  , "category": "People & Body"
+  , "aliases": [
+      "palms_up_together"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🤝"
+  , "description": "handshake"
+  , "category": "People & Body"
+  , "aliases": [
+      "handshake"
+    ]
+  , "tags": [
+      "deal"
+    ]
+  , "unicode_version": "9.0"
+  , "ios_version": "10.2"
+  }
+, {
+    "emoji": "🙏"
+  , "description": "folded hands"
+  , "category": "People & Body"
+  , "aliases": [
+      "pray"
+    ]
+  , "tags": [
+      "please"
+    , "hope"
+    , "wish"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "✍️"
+  , "description": "writing hand"
+  , "category": "People & Body"
+  , "aliases": [
+      "writing_hand"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": ""
+  , "ios_version": "9.1"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "💅"
+  , "description": "nail polish"
+  , "category": "People & Body"
+  , "aliases": [
+      "nail_care"
+    ]
+  , "tags": [
+      "beauty"
+    , "manicure"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🤳"
+  , "description": "selfie"
+  , "category": "People & Body"
+  , "aliases": [
+      "selfie"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "9.0"
+  , "ios_version": "10.2"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "💪"
+  , "description": "flexed biceps"
+  , "category": "People & Body"
+  , "aliases": [
+      "muscle"
+    ]
+  , "tags": [
+      "flex"
+    , "bicep"
+    , "strong"
+    , "workout"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🦾"
+  , "description": "mechanical arm"
+  , "category": "People & Body"
+  , "aliases": [
+      "mechanical_arm"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "12.0"
+  , "ios_version": "13.0"
+  }
+, {
+    "emoji": "🦿"
+  , "description": "mechanical leg"
+  , "category": "People & Body"
+  , "aliases": [
+      "mechanical_leg"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "12.0"
+  , "ios_version": "13.0"
+  }
+, {
+    "emoji": "🦵"
+  , "description": "leg"
+  , "category": "People & Body"
+  , "aliases": [
+      "leg"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🦶"
+  , "description": "foot"
+  , "category": "People & Body"
+  , "aliases": [
+      "foot"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "👂"
+  , "description": "ear"
+  , "category": "People & Body"
+  , "aliases": [
+      "ear"
+    ]
+  , "tags": [
+      "hear"
+    , "sound"
+    , "listen"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🦻"
+  , "description": "ear with hearing aid"
+  , "category": "People & Body"
+  , "aliases": [
+      "ear_with_hearing_aid"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "12.0"
+  , "ios_version": "13.0"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "👃"
+  , "description": "nose"
+  , "category": "People & Body"
+  , "aliases": [
+      "nose"
+    ]
+  , "tags": [
+      "smell"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🧠"
+  , "description": "brain"
+  , "category": "People & Body"
+  , "aliases": [
+      "brain"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "🦷"
+  , "description": "tooth"
+  , "category": "People & Body"
+  , "aliases": [
+      "tooth"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "🦴"
+  , "description": "bone"
+  , "category": "People & Body"
+  , "aliases": [
+      "bone"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "👀"
+  , "description": "eyes"
+  , "category": "People & Body"
+  , "aliases": [
+      "eyes"
+    ]
+  , "tags": [
+      "look"
+    , "see"
+    , "watch"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "👁"
+  , "description": "eye"
+  , "category": "People & Body"
+  , "aliases": [
+      "eye"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "7.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "👅"
+  , "description": "tongue"
+  , "category": "People & Body"
+  , "aliases": [
+      "tongue"
+    ]
+  , "tags": [
+      "taste"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "👄"
+  , "description": "mouth"
+  , "category": "People & Body"
+  , "aliases": [
+      "lips"
+    ]
+  , "tags": [
+      "kiss"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "👶"
+  , "description": "baby"
+  , "category": "People & Body"
+  , "aliases": [
+      "baby"
+    ]
+  , "tags": [
+      "child"
+    , "newborn"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🧒"
+  , "description": "child"
+  , "category": "People & Body"
+  , "aliases": [
+      "child"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "👦"
+  , "description": "boy"
+  , "category": "People & Body"
+  , "aliases": [
+      "boy"
+    ]
+  , "tags": [
+      "child"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "👧"
+  , "description": "girl"
+  , "category": "People & Body"
+  , "aliases": [
+      "girl"
+    ]
+  , "tags": [
+      "child"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🧑"
+  , "description": "person"
+  , "category": "People & Body"
+  , "aliases": [
+      "adult"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "👱"
+  , "description": "person: blond hair"
+  , "category": "People & Body"
+  , "aliases": [
+      "blond_haired_person"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "👨"
+  , "description": "man"
+  , "category": "People & Body"
+  , "aliases": [
+      "man"
+    ]
+  , "tags": [
+      "mustache"
+    , "father"
+    , "dad"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🧔"
+  , "description": "man: beard"
+  , "category": "People & Body"
+  , "aliases": [
+      "bearded_person"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "👱‍♂"
+  , "description": "man: blond hair"
+  , "category": "People & Body"
+  , "aliases": [
+      "blond_haired_man"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "👨‍🦰"
+  , "description": "man: red hair"
+  , "category": "People & Body"
+  , "aliases": [
+      "red_haired_man"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "👨‍🦱"
+  , "description": "man: curly hair"
+  , "category": "People & Body"
+  , "aliases": [
+      "curly_haired_man"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "👨‍🦳"
+  , "description": "man: white hair"
+  , "category": "People & Body"
+  , "aliases": [
+      "white_haired_man"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "👨‍🦲"
+  , "description": "man: bald"
+  , "category": "People & Body"
+  , "aliases": [
+      "bald_man"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "👩"
+  , "description": "woman"
+  , "category": "People & Body"
+  , "aliases": [
+      "woman"
+    ]
+  , "tags": [
+      "girls"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "👱‍♀"
+  , "description": "woman: blond hair"
+  , "category": "People & Body"
+  , "aliases": [
+      "blond_haired_woman"
+    , "blonde_woman"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "10.0"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "👩‍🦰"
+  , "description": "woman: red hair"
+  , "category": "People & Body"
+  , "aliases": [
+      "red_haired_woman"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "👩‍🦱"
+  , "description": "woman: curly hair"
+  , "category": "People & Body"
+  , "aliases": [
+      "curly_haired_woman"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "👩‍🦳"
+  , "description": "woman: white hair"
+  , "category": "People & Body"
+  , "aliases": [
+      "white_haired_woman"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "👩‍🦲"
+  , "description": "woman: bald"
+  , "category": "People & Body"
+  , "aliases": [
+      "bald_woman"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🧓"
+  , "description": "older person"
+  , "category": "People & Body"
+  , "aliases": [
+      "older_adult"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "👴"
+  , "description": "old man"
+  , "category": "People & Body"
+  , "aliases": [
+      "older_man"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "👵"
+  , "description": "old woman"
+  , "category": "People & Body"
+  , "aliases": [
+      "older_woman"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🙍"
+  , "description": "person frowning"
+  , "category": "People & Body"
+  , "aliases": [
+      "frowning_person"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🙍‍♂"
+  , "description": "man frowning"
+  , "category": "People & Body"
+  , "aliases": [
+      "frowning_man"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "10.0"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🙍‍♀"
+  , "description": "woman frowning"
+  , "category": "People & Body"
+  , "aliases": [
+      "frowning_woman"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🙎"
+  , "description": "person pouting"
+  , "category": "People & Body"
+  , "aliases": [
+      "pouting_face"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🙎‍♂"
+  , "description": "man pouting"
+  , "category": "People & Body"
+  , "aliases": [
+      "pouting_man"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "10.0"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🙎‍♀"
+  , "description": "woman pouting"
+  , "category": "People & Body"
+  , "aliases": [
+      "pouting_woman"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🙅"
+  , "description": "person gesturing NO"
+  , "category": "People & Body"
+  , "aliases": [
+      "no_good"
+    ]
+  , "tags": [
+      "stop"
+    , "halt"
+    , "denied"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🙅‍♂"
+  , "description": "man gesturing NO"
+  , "category": "People & Body"
+  , "aliases": [
+      "no_good_man"
+    , "ng_man"
+    ]
+  , "tags": [
+      "stop"
+    , "halt"
+    , "denied"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "10.0"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🙅‍♀"
+  , "description": "woman gesturing NO"
+  , "category": "People & Body"
+  , "aliases": [
+      "no_good_woman"
+    , "ng_woman"
+    ]
+  , "tags": [
+      "stop"
+    , "halt"
+    , "denied"
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🙆"
+  , "description": "person gesturing OK"
+  , "category": "People & Body"
+  , "aliases": [
+      "ok_person"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🙆‍♂"
+  , "description": "man gesturing OK"
+  , "category": "People & Body"
+  , "aliases": [
+      "ok_man"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "10.0"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🙆‍♀"
+  , "description": "woman gesturing OK"
+  , "category": "People & Body"
+  , "aliases": [
+      "ok_woman"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "💁"
+  , "description": "person tipping hand"
+  , "category": "People & Body"
+  , "aliases": [
+      "tipping_hand_person"
+    , "information_desk_person"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "💁‍♂"
+  , "description": "man tipping hand"
+  , "category": "People & Body"
+  , "aliases": [
+      "tipping_hand_man"
+    , "sassy_man"
+    ]
+  , "tags": [
+      "information"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "10.0"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "💁‍♀"
+  , "description": "woman tipping hand"
+  , "category": "People & Body"
+  , "aliases": [
+      "tipping_hand_woman"
+    , "sassy_woman"
+    ]
+  , "tags": [
+      "information"
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🙋"
+  , "description": "person raising hand"
+  , "category": "People & Body"
+  , "aliases": [
+      "raising_hand"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🙋‍♂"
+  , "description": "man raising hand"
+  , "category": "People & Body"
+  , "aliases": [
+      "raising_hand_man"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "10.0"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🙋‍♀"
+  , "description": "woman raising hand"
+  , "category": "People & Body"
+  , "aliases": [
+      "raising_hand_woman"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🧏"
+  , "description": "deaf person"
+  , "category": "People & Body"
+  , "aliases": [
+      "deaf_person"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "12.0"
+  , "ios_version": "13.0"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🧏‍♂"
+  , "description": "deaf man"
+  , "category": "People & Body"
+  , "aliases": [
+      "deaf_man"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "12.0"
+  , "ios_version": "13.0"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🧏‍♀"
+  , "description": "deaf woman"
+  , "category": "People & Body"
+  , "aliases": [
+      "deaf_woman"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "12.0"
+  , "ios_version": "13.0"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🙇"
+  , "description": "person bowing"
+  , "category": "People & Body"
+  , "aliases": [
+      "bow"
+    ]
+  , "tags": [
+      "respect"
+    , "thanks"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🙇‍♂"
+  , "description": "man bowing"
+  , "category": "People & Body"
+  , "aliases": [
+      "bowing_man"
+    ]
+  , "tags": [
+      "respect"
+    , "thanks"
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🙇‍♀"
+  , "description": "woman bowing"
+  , "category": "People & Body"
+  , "aliases": [
+      "bowing_woman"
+    ]
+  , "tags": [
+      "respect"
+    , "thanks"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "10.0"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🤦"
+  , "description": "person facepalming"
+  , "category": "People & Body"
+  , "aliases": [
+      "facepalm"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🤦‍♂"
+  , "description": "man facepalming"
+  , "category": "People & Body"
+  , "aliases": [
+      "man_facepalming"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "9.0"
+  , "ios_version": "10.2"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🤦‍♀"
+  , "description": "woman facepalming"
+  , "category": "People & Body"
+  , "aliases": [
+      "woman_facepalming"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "9.0"
+  , "ios_version": "10.2"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🤷"
+  , "description": "person shrugging"
+  , "category": "People & Body"
+  , "aliases": [
+      "shrug"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🤷‍♂"
+  , "description": "man shrugging"
+  , "category": "People & Body"
+  , "aliases": [
+      "man_shrugging"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "9.0"
+  , "ios_version": "10.2"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🤷‍♀"
+  , "description": "woman shrugging"
+  , "category": "People & Body"
+  , "aliases": [
+      "woman_shrugging"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "9.0"
+  , "ios_version": "10.2"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "👨‍⚕"
+  , "description": "man health worker"
+  , "category": "People & Body"
+  , "aliases": [
+      "man_health_worker"
+    ]
+  , "tags": [
+      "doctor"
+    , "nurse"
+    ]
+  , "unicode_version": ""
+  , "ios_version": "10.2"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "👩‍⚕"
+  , "description": "woman health worker"
+  , "category": "People & Body"
+  , "aliases": [
+      "woman_health_worker"
+    ]
+  , "tags": [
+      "doctor"
+    , "nurse"
+    ]
+  , "unicode_version": ""
+  , "ios_version": "10.2"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "👨‍🎓"
+  , "description": "man student"
+  , "category": "People & Body"
+  , "aliases": [
+      "man_student"
+    ]
+  , "tags": [
+      "graduation"
+    ]
+  , "unicode_version": ""
+  , "ios_version": "10.2"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "👩‍🎓"
+  , "description": "woman student"
+  , "category": "People & Body"
+  , "aliases": [
+      "woman_student"
+    ]
+  , "tags": [
+      "graduation"
+    ]
+  , "unicode_version": ""
+  , "ios_version": "10.2"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "👨‍🏫"
+  , "description": "man teacher"
+  , "category": "People & Body"
+  , "aliases": [
+      "man_teacher"
+    ]
+  , "tags": [
+      "school"
+    , "professor"
+    ]
+  , "unicode_version": ""
+  , "ios_version": "10.2"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "👩‍🏫"
+  , "description": "woman teacher"
+  , "category": "People & Body"
+  , "aliases": [
+      "woman_teacher"
+    ]
+  , "tags": [
+      "school"
+    , "professor"
+    ]
+  , "unicode_version": ""
+  , "ios_version": "10.2"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "👨‍⚖"
+  , "description": "man judge"
+  , "category": "People & Body"
+  , "aliases": [
+      "man_judge"
+    ]
+  , "tags": [
+      "justice"
+    ]
+  , "unicode_version": ""
+  , "ios_version": "10.2"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "👩‍⚖"
+  , "description": "woman judge"
+  , "category": "People & Body"
+  , "aliases": [
+      "woman_judge"
+    ]
+  , "tags": [
+      "justice"
+    ]
+  , "unicode_version": ""
+  , "ios_version": "10.2"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "👨‍🌾"
+  , "description": "man farmer"
+  , "category": "People & Body"
+  , "aliases": [
+      "man_farmer"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": ""
+  , "ios_version": "10.2"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "👩‍🌾"
+  , "description": "woman farmer"
+  , "category": "People & Body"
+  , "aliases": [
+      "woman_farmer"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": ""
+  , "ios_version": "10.2"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "👨‍🍳"
+  , "description": "man cook"
+  , "category": "People & Body"
+  , "aliases": [
+      "man_cook"
+    ]
+  , "tags": [
+      "chef"
+    ]
+  , "unicode_version": ""
+  , "ios_version": "10.2"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "👩‍🍳"
+  , "description": "woman cook"
+  , "category": "People & Body"
+  , "aliases": [
+      "woman_cook"
+    ]
+  , "tags": [
+      "chef"
+    ]
+  , "unicode_version": ""
+  , "ios_version": "10.2"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "👨‍🔧"
+  , "description": "man mechanic"
+  , "category": "People & Body"
+  , "aliases": [
+      "man_mechanic"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": ""
+  , "ios_version": "10.2"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "👩‍🔧"
+  , "description": "woman mechanic"
+  , "category": "People & Body"
+  , "aliases": [
+      "woman_mechanic"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": ""
+  , "ios_version": "10.2"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "👨‍🏭"
+  , "description": "man factory worker"
+  , "category": "People & Body"
+  , "aliases": [
+      "man_factory_worker"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": ""
+  , "ios_version": "10.2"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "👩‍🏭"
+  , "description": "woman factory worker"
+  , "category": "People & Body"
+  , "aliases": [
+      "woman_factory_worker"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": ""
+  , "ios_version": "10.2"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "👨‍💼"
+  , "description": "man office worker"
+  , "category": "People & Body"
+  , "aliases": [
+      "man_office_worker"
+    ]
+  , "tags": [
+      "business"
+    ]
+  , "unicode_version": ""
+  , "ios_version": "10.2"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "👩‍💼"
+  , "description": "woman office worker"
+  , "category": "People & Body"
+  , "aliases": [
+      "woman_office_worker"
+    ]
+  , "tags": [
+      "business"
+    ]
+  , "unicode_version": ""
+  , "ios_version": "10.2"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "👨‍🔬"
+  , "description": "man scientist"
+  , "category": "People & Body"
+  , "aliases": [
+      "man_scientist"
+    ]
+  , "tags": [
+      "research"
+    ]
+  , "unicode_version": ""
+  , "ios_version": "10.2"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "👩‍🔬"
+  , "description": "woman scientist"
+  , "category": "People & Body"
+  , "aliases": [
+      "woman_scientist"
+    ]
+  , "tags": [
+      "research"
+    ]
+  , "unicode_version": ""
+  , "ios_version": "10.2"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "👨‍💻"
+  , "description": "man technologist"
+  , "category": "People & Body"
+  , "aliases": [
+      "man_technologist"
+    ]
+  , "tags": [
+      "coder"
+    ]
+  , "unicode_version": ""
+  , "ios_version": "10.2"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "👩‍💻"
+  , "description": "woman technologist"
+  , "category": "People & Body"
+  , "aliases": [
+      "woman_technologist"
+    ]
+  , "tags": [
+      "coder"
+    ]
+  , "unicode_version": ""
+  , "ios_version": "10.2"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "👨‍🎤"
+  , "description": "man singer"
+  , "category": "People & Body"
+  , "aliases": [
+      "man_singer"
+    ]
+  , "tags": [
+      "rockstar"
+    ]
+  , "unicode_version": ""
+  , "ios_version": "10.2"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "👩‍🎤"
+  , "description": "woman singer"
+  , "category": "People & Body"
+  , "aliases": [
+      "woman_singer"
+    ]
+  , "tags": [
+      "rockstar"
+    ]
+  , "unicode_version": ""
+  , "ios_version": "10.2"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "👨‍🎨"
+  , "description": "man artist"
+  , "category": "People & Body"
+  , "aliases": [
+      "man_artist"
+    ]
+  , "tags": [
+      "painter"
+    ]
+  , "unicode_version": ""
+  , "ios_version": "10.2"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "👩‍🎨"
+  , "description": "woman artist"
+  , "category": "People & Body"
+  , "aliases": [
+      "woman_artist"
+    ]
+  , "tags": [
+      "painter"
+    ]
+  , "unicode_version": ""
+  , "ios_version": "10.2"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "👨‍✈"
+  , "description": "man pilot"
+  , "category": "People & Body"
+  , "aliases": [
+      "man_pilot"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": ""
+  , "ios_version": "10.2"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "👩‍✈"
+  , "description": "woman pilot"
+  , "category": "People & Body"
+  , "aliases": [
+      "woman_pilot"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": ""
+  , "ios_version": "10.2"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "👨‍🚀"
+  , "description": "man astronaut"
+  , "category": "People & Body"
+  , "aliases": [
+      "man_astronaut"
+    ]
+  , "tags": [
+      "space"
+    ]
+  , "unicode_version": ""
+  , "ios_version": "10.2"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "👩‍🚀"
+  , "description": "woman astronaut"
+  , "category": "People & Body"
+  , "aliases": [
+      "woman_astronaut"
+    ]
+  , "tags": [
+      "space"
+    ]
+  , "unicode_version": ""
+  , "ios_version": "10.2"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "👨‍🚒"
+  , "description": "man firefighter"
+  , "category": "People & Body"
+  , "aliases": [
+      "man_firefighter"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": ""
+  , "ios_version": "10.2"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "👩‍🚒"
+  , "description": "woman firefighter"
+  , "category": "People & Body"
+  , "aliases": [
+      "woman_firefighter"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": ""
+  , "ios_version": "10.2"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "👮"
+  , "description": "police officer"
+  , "category": "People & Body"
+  , "aliases": [
+      "police_officer"
+    , "cop"
+    ]
+  , "tags": [
+      "law"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "👮‍♂"
+  , "description": "man police officer"
+  , "category": "People & Body"
+  , "aliases": [
+      "policeman"
+    ]
+  , "tags": [
+      "law"
+    , "cop"
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "👮‍♀"
+  , "description": "woman police officer"
+  , "category": "People & Body"
+  , "aliases": [
+      "policewoman"
+    ]
+  , "tags": [
+      "law"
+    , "cop"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "10.0"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🕵"
+  , "description": "detective"
+  , "category": "People & Body"
+  , "aliases": [
+      "detective"
+    ]
+  , "tags": [
+      "sleuth"
+    ]
+  , "unicode_version": "7.0"
+  , "ios_version": "9.1"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🕵️‍♂️"
+  , "description": "man detective"
+  , "category": "People & Body"
+  , "aliases": [
+      "male_detective"
+    ]
+  , "tags": [
+      "sleuth"
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🕵️‍♀️"
+  , "description": "woman detective"
+  , "category": "People & Body"
+  , "aliases": [
+      "female_detective"
+    ]
+  , "tags": [
+      "sleuth"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "10.0"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "💂"
+  , "description": "guard"
+  , "category": "People & Body"
+  , "aliases": [
+      "guard"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "💂‍♂"
+  , "description": "man guard"
+  , "category": "People & Body"
+  , "aliases": [
+      "guardsman"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "💂‍♀"
+  , "description": "woman guard"
+  , "category": "People & Body"
+  , "aliases": [
+      "guardswoman"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "10.0"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "👷"
+  , "description": "construction worker"
+  , "category": "People & Body"
+  , "aliases": [
+      "construction_worker"
+    ]
+  , "tags": [
+      "helmet"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "👷‍♂"
+  , "description": "man construction worker"
+  , "category": "People & Body"
+  , "aliases": [
+      "construction_worker_man"
+    ]
+  , "tags": [
+      "helmet"
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "👷‍♀"
+  , "description": "woman construction worker"
+  , "category": "People & Body"
+  , "aliases": [
+      "construction_worker_woman"
+    ]
+  , "tags": [
+      "helmet"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "10.0"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🤴"
+  , "description": "prince"
+  , "category": "People & Body"
+  , "aliases": [
+      "prince"
+    ]
+  , "tags": [
+      "crown"
+    , "royal"
+    ]
+  , "unicode_version": "9.0"
+  , "ios_version": "10.2"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "👸"
+  , "description": "princess"
+  , "category": "People & Body"
+  , "aliases": [
+      "princess"
+    ]
+  , "tags": [
+      "crown"
+    , "royal"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "👳"
+  , "description": "person wearing turban"
+  , "category": "People & Body"
+  , "aliases": [
+      "person_with_turban"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "👳‍♂"
+  , "description": "man wearing turban"
+  , "category": "People & Body"
+  , "aliases": [
+      "man_with_turban"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "👳‍♀"
+  , "description": "woman wearing turban"
+  , "category": "People & Body"
+  , "aliases": [
+      "woman_with_turban"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "10.0"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "👲"
+  , "description": "man with Chinese cap"
+  , "category": "People & Body"
+  , "aliases": [
+      "man_with_gua_pi_mao"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🧕"
+  , "description": "woman with headscarf"
+  , "category": "People & Body"
+  , "aliases": [
+      "woman_with_headscarf"
+    ]
+  , "tags": [
+      "hijab"
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🤵"
+  , "description": "man in tuxedo"
+  , "category": "People & Body"
+  , "aliases": [
+      "man_in_tuxedo"
+    ]
+  , "tags": [
+      "groom"
+    , "marriage"
+    , "wedding"
+    ]
+  , "unicode_version": "9.0"
+  , "ios_version": "10.2"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "👰"
+  , "description": "bride with veil"
+  , "category": "People & Body"
+  , "aliases": [
+      "bride_with_veil"
+    ]
+  , "tags": [
+      "marriage"
+    , "wedding"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🤰"
+  , "description": "pregnant woman"
+  , "category": "People & Body"
+  , "aliases": [
+      "pregnant_woman"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "9.0"
+  , "ios_version": "10.2"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🤱"
+  , "description": "breast-feeding"
+  , "category": "People & Body"
+  , "aliases": [
+      "breast_feeding"
+    ]
+  , "tags": [
+      "nursing"
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "👼"
+  , "description": "baby angel"
+  , "category": "People & Body"
+  , "aliases": [
+      "angel"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🎅"
+  , "description": "Santa Claus"
+  , "category": "People & Body"
+  , "aliases": [
+      "santa"
+    ]
+  , "tags": [
+      "christmas"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🤶"
+  , "description": "Mrs. Claus"
+  , "category": "People & Body"
+  , "aliases": [
+      "mrs_claus"
+    ]
+  , "tags": [
+      "santa"
+    ]
+  , "unicode_version": "9.0"
+  , "ios_version": "10.2"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🦸"
+  , "description": "superhero"
+  , "category": "People & Body"
+  , "aliases": [
+      "superhero"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🦸‍♂"
+  , "description": "man superhero"
+  , "category": "People & Body"
+  , "aliases": [
+      "superhero_man"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🦸‍♀"
+  , "description": "woman superhero"
+  , "category": "People & Body"
+  , "aliases": [
+      "superhero_woman"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🦹"
+  , "description": "supervillain"
+  , "category": "People & Body"
+  , "aliases": [
+      "supervillain"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🦹‍♂"
+  , "description": "man supervillain"
+  , "category": "People & Body"
+  , "aliases": [
+      "supervillain_man"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🦹‍♀"
+  , "description": "woman supervillain"
+  , "category": "People & Body"
+  , "aliases": [
+      "supervillain_woman"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🧙"
+  , "description": "mage"
+  , "category": "People & Body"
+  , "aliases": [
+      "mage"
+    ]
+  , "tags": [
+      "wizard"
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🧙‍♂"
+  , "description": "man mage"
+  , "category": "People & Body"
+  , "aliases": [
+      "mage_man"
+    ]
+  , "tags": [
+      "wizard"
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🧙‍♀"
+  , "description": "woman mage"
+  , "category": "People & Body"
+  , "aliases": [
+      "mage_woman"
+    ]
+  , "tags": [
+      "wizard"
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🧚"
+  , "description": "fairy"
+  , "category": "People & Body"
+  , "aliases": [
+      "fairy"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🧚‍♂"
+  , "description": "man fairy"
+  , "category": "People & Body"
+  , "aliases": [
+      "fairy_man"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🧚‍♀"
+  , "description": "woman fairy"
+  , "category": "People & Body"
+  , "aliases": [
+      "fairy_woman"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🧛"
+  , "description": "vampire"
+  , "category": "People & Body"
+  , "aliases": [
+      "vampire"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🧛‍♂"
+  , "description": "man vampire"
+  , "category": "People & Body"
+  , "aliases": [
+      "vampire_man"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🧛‍♀"
+  , "description": "woman vampire"
+  , "category": "People & Body"
+  , "aliases": [
+      "vampire_woman"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🧜"
+  , "description": "merperson"
+  , "category": "People & Body"
+  , "aliases": [
+      "merperson"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🧜‍♂"
+  , "description": "merman"
+  , "category": "People & Body"
+  , "aliases": [
+      "merman"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🧜‍♀"
+  , "description": "mermaid"
+  , "category": "People & Body"
+  , "aliases": [
+      "mermaid"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🧝"
+  , "description": "elf"
+  , "category": "People & Body"
+  , "aliases": [
+      "elf"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🧝‍♂"
+  , "description": "man elf"
+  , "category": "People & Body"
+  , "aliases": [
+      "elf_man"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🧝‍♀"
+  , "description": "woman elf"
+  , "category": "People & Body"
+  , "aliases": [
+      "elf_woman"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🧞"
+  , "description": "genie"
+  , "category": "People & Body"
+  , "aliases": [
+      "genie"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "🧞‍♂"
+  , "description": "man genie"
+  , "category": "People & Body"
+  , "aliases": [
+      "genie_man"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "🧞‍♀"
+  , "description": "woman genie"
+  , "category": "People & Body"
+  , "aliases": [
+      "genie_woman"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "🧟"
+  , "description": "zombie"
+  , "category": "People & Body"
+  , "aliases": [
+      "zombie"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "🧟‍♂"
+  , "description": "man zombie"
+  , "category": "People & Body"
+  , "aliases": [
+      "zombie_man"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "🧟‍♀"
+  , "description": "woman zombie"
+  , "category": "People & Body"
+  , "aliases": [
+      "zombie_woman"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "💆"
+  , "description": "person getting massage"
+  , "category": "People & Body"
+  , "aliases": [
+      "massage"
+    ]
+  , "tags": [
+      "spa"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "💆‍♂"
+  , "description": "man getting massage"
+  , "category": "People & Body"
+  , "aliases": [
+      "massage_man"
+    ]
+  , "tags": [
+      "spa"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "10.0"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "💆‍♀"
+  , "description": "woman getting massage"
+  , "category": "People & Body"
+  , "aliases": [
+      "massage_woman"
+    ]
+  , "tags": [
+      "spa"
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "💇"
+  , "description": "person getting haircut"
+  , "category": "People & Body"
+  , "aliases": [
+      "haircut"
+    ]
+  , "tags": [
+      "beauty"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "💇‍♂"
+  , "description": "man getting haircut"
+  , "category": "People & Body"
+  , "aliases": [
+      "haircut_man"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "10.0"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "💇‍♀"
+  , "description": "woman getting haircut"
+  , "category": "People & Body"
+  , "aliases": [
+      "haircut_woman"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🚶"
+  , "description": "person walking"
+  , "category": "People & Body"
+  , "aliases": [
+      "walking"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🚶‍♂"
+  , "description": "man walking"
+  , "category": "People & Body"
+  , "aliases": [
+      "walking_man"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🚶‍♀"
+  , "description": "woman walking"
+  , "category": "People & Body"
+  , "aliases": [
+      "walking_woman"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "10.0"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🧍"
+  , "description": "person standing"
+  , "category": "People & Body"
+  , "aliases": [
+      "standing_person"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "12.0"
+  , "ios_version": "13.0"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🧍‍♂"
+  , "description": "man standing"
+  , "category": "People & Body"
+  , "aliases": [
+      "standing_man"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "12.0"
+  , "ios_version": "13.0"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🧍‍♀"
+  , "description": "woman standing"
+  , "category": "People & Body"
+  , "aliases": [
+      "standing_woman"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "12.0"
+  , "ios_version": "13.0"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🧎"
+  , "description": "person kneeling"
+  , "category": "People & Body"
+  , "aliases": [
+      "kneeling_person"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "12.0"
+  , "ios_version": "13.0"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🧎‍♂"
+  , "description": "man kneeling"
+  , "category": "People & Body"
+  , "aliases": [
+      "kneeling_man"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "12.0"
+  , "ios_version": "13.0"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🧎‍♀"
+  , "description": "woman kneeling"
+  , "category": "People & Body"
+  , "aliases": [
+      "kneeling_woman"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "12.0"
+  , "ios_version": "13.0"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "👨‍🦯"
+  , "description": "man with probing cane"
+  , "category": "People & Body"
+  , "aliases": [
+      "man_with_probing_cane"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "12.0"
+  , "ios_version": "13.0"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "👩‍🦯"
+  , "description": "woman with probing cane"
+  , "category": "People & Body"
+  , "aliases": [
+      "woman_with_probing_cane"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "12.0"
+  , "ios_version": "13.0"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "👨‍🦼"
+  , "description": "man in motorized wheelchair"
+  , "category": "People & Body"
+  , "aliases": [
+      "man_in_motorized_wheelchair"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "12.0"
+  , "ios_version": "13.0"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "👩‍🦼"
+  , "description": "woman in motorized wheelchair"
+  , "category": "People & Body"
+  , "aliases": [
+      "woman_in_motorized_wheelchair"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "12.0"
+  , "ios_version": "13.0"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "👨‍🦽"
+  , "description": "man in manual wheelchair"
+  , "category": "People & Body"
+  , "aliases": [
+      "man_in_manual_wheelchair"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "12.0"
+  , "ios_version": "13.0"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "👩‍🦽"
+  , "description": "woman in manual wheelchair"
+  , "category": "People & Body"
+  , "aliases": [
+      "woman_in_manual_wheelchair"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "12.0"
+  , "ios_version": "13.0"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🏃"
+  , "description": "person running"
+  , "category": "People & Body"
+  , "aliases": [
+      "runner"
+    , "running"
+    ]
+  , "tags": [
+      "exercise"
+    , "workout"
+    , "marathon"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🏃‍♂"
+  , "description": "man running"
+  , "category": "People & Body"
+  , "aliases": [
+      "running_man"
+    ]
+  , "tags": [
+      "exercise"
+    , "workout"
+    , "marathon"
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🏃‍♀"
+  , "description": "woman running"
+  , "category": "People & Body"
+  , "aliases": [
+      "running_woman"
+    ]
+  , "tags": [
+      "exercise"
+    , "workout"
+    , "marathon"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "10.0"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "💃"
+  , "description": "woman dancing"
+  , "category": "People & Body"
+  , "aliases": [
+      "woman_dancing"
+    , "dancer"
+    ]
+  , "tags": [
+      "dress"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🕺"
+  , "description": "man dancing"
+  , "category": "People & Body"
+  , "aliases": [
+      "man_dancing"
+    ]
+  , "tags": [
+      "dancer"
+    ]
+  , "unicode_version": "9.0"
+  , "ios_version": "10.2"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🕴"
+  , "description": "man in suit levitating"
+  , "category": "People & Body"
+  , "aliases": [
+      "business_suit_levitating"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "7.0"
+  , "ios_version": "9.1"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "👯"
+  , "description": "people with bunny ears"
+  , "category": "People & Body"
+  , "aliases": [
+      "dancers"
+    ]
+  , "tags": [
+      "bunny"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "👯‍♂"
+  , "description": "men with bunny ears"
+  , "category": "People & Body"
+  , "aliases": [
+      "dancing_men"
+    ]
+  , "tags": [
+      "bunny"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "10.0"
+  }
+, {
+    "emoji": "👯‍♀"
+  , "description": "women with bunny ears"
+  , "category": "People & Body"
+  , "aliases": [
+      "dancing_women"
+    ]
+  , "tags": [
+      "bunny"
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "🧖"
+  , "description": "person in steamy room"
+  , "category": "People & Body"
+  , "aliases": [
+      "sauna_person"
+    ]
+  , "tags": [
+      "steamy"
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🧖‍♂"
+  , "description": "man in steamy room"
+  , "category": "People & Body"
+  , "aliases": [
+      "sauna_man"
+    ]
+  , "tags": [
+      "steamy"
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🧖‍♀"
+  , "description": "woman in steamy room"
+  , "category": "People & Body"
+  , "aliases": [
+      "sauna_woman"
+    ]
+  , "tags": [
+      "steamy"
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🧗"
+  , "description": "person climbing"
+  , "category": "People & Body"
+  , "aliases": [
+      "climbing"
+    ]
+  , "tags": [
+      "bouldering"
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🧗‍♂"
+  , "description": "man climbing"
+  , "category": "People & Body"
+  , "aliases": [
+      "climbing_man"
+    ]
+  , "tags": [
+      "bouldering"
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🧗‍♀"
+  , "description": "woman climbing"
+  , "category": "People & Body"
+  , "aliases": [
+      "climbing_woman"
+    ]
+  , "tags": [
+      "bouldering"
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🤺"
+  , "description": "person fencing"
+  , "category": "People & Body"
+  , "aliases": [
+      "person_fencing"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "9.0"
+  , "ios_version": "10.2"
+  }
+, {
+    "emoji": "🏇"
+  , "description": "horse racing"
+  , "category": "People & Body"
+  , "aliases": [
+      "horse_racing"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "⛷"
+  , "description": "skier"
+  , "category": "People & Body"
+  , "aliases": [
+      "skier"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "5.2"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🏂"
+  , "description": "snowboarder"
+  , "category": "People & Body"
+  , "aliases": [
+      "snowboarder"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🏌"
+  , "description": "person golfing"
+  , "category": "People & Body"
+  , "aliases": [
+      "golfing"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "7.0"
+  , "ios_version": "9.1"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🏌️‍♂️"
+  , "description": "man golfing"
+  , "category": "People & Body"
+  , "aliases": [
+      "golfing_man"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🏌️‍♀️"
+  , "description": "woman golfing"
+  , "category": "People & Body"
+  , "aliases": [
+      "golfing_woman"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": ""
+  , "ios_version": "10.0"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🏄"
+  , "description": "person surfing"
+  , "category": "People & Body"
+  , "aliases": [
+      "surfer"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🏄‍♂"
+  , "description": "man surfing"
+  , "category": "People & Body"
+  , "aliases": [
+      "surfing_man"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🏄‍♀"
+  , "description": "woman surfing"
+  , "category": "People & Body"
+  , "aliases": [
+      "surfing_woman"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "7.0"
+  , "ios_version": "10.0"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🚣"
+  , "description": "person rowing boat"
+  , "category": "People & Body"
+  , "aliases": [
+      "rowboat"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🚣‍♂"
+  , "description": "man rowing boat"
+  , "category": "People & Body"
+  , "aliases": [
+      "rowing_man"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🚣‍♀"
+  , "description": "woman rowing boat"
+  , "category": "People & Body"
+  , "aliases": [
+      "rowing_woman"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "10.0"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🏊"
+  , "description": "person swimming"
+  , "category": "People & Body"
+  , "aliases": [
+      "swimmer"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🏊‍♂"
+  , "description": "man swimming"
+  , "category": "People & Body"
+  , "aliases": [
+      "swimming_man"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🏊‍♀"
+  , "description": "woman swimming"
+  , "category": "People & Body"
+  , "aliases": [
+      "swimming_woman"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "10.0"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "⛹"
+  , "description": "person bouncing ball"
+  , "category": "People & Body"
+  , "aliases": [
+      "bouncing_ball_person"
+    ]
+  , "tags": [
+      "basketball"
+    ]
+  , "unicode_version": "5.2"
+  , "ios_version": "9.1"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "⛹️‍♂️"
+  , "description": "man bouncing ball"
+  , "category": "People & Body"
+  , "aliases": [
+      "bouncing_ball_man"
+    , "basketball_man"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "⛹️‍♀️"
+  , "description": "woman bouncing ball"
+  , "category": "People & Body"
+  , "aliases": [
+      "bouncing_ball_woman"
+    , "basketball_woman"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "7.0"
+  , "ios_version": "10.0"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🏋"
+  , "description": "person lifting weights"
+  , "category": "People & Body"
+  , "aliases": [
+      "weight_lifting"
+    ]
+  , "tags": [
+      "gym"
+    , "workout"
+    ]
+  , "unicode_version": "7.0"
+  , "ios_version": "9.1"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🏋️‍♂️"
+  , "description": "man lifting weights"
+  , "category": "People & Body"
+  , "aliases": [
+      "weight_lifting_man"
+    ]
+  , "tags": [
+      "gym"
+    , "workout"
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🏋️‍♀️"
+  , "description": "woman lifting weights"
+  , "category": "People & Body"
+  , "aliases": [
+      "weight_lifting_woman"
+    ]
+  , "tags": [
+      "gym"
+    , "workout"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "10.0"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🚴"
+  , "description": "person biking"
+  , "category": "People & Body"
+  , "aliases": [
+      "bicyclist"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🚴‍♂"
+  , "description": "man biking"
+  , "category": "People & Body"
+  , "aliases": [
+      "biking_man"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🚴‍♀"
+  , "description": "woman biking"
+  , "category": "People & Body"
+  , "aliases": [
+      "biking_woman"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "10.0"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🚵"
+  , "description": "person mountain biking"
+  , "category": "People & Body"
+  , "aliases": [
+      "mountain_bicyclist"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🚵‍♂"
+  , "description": "man mountain biking"
+  , "category": "People & Body"
+  , "aliases": [
+      "mountain_biking_man"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🚵‍♀"
+  , "description": "woman mountain biking"
+  , "category": "People & Body"
+  , "aliases": [
+      "mountain_biking_woman"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "10.0"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🤸"
+  , "description": "person cartwheeling"
+  , "category": "People & Body"
+  , "aliases": [
+      "cartwheeling"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🤸‍♂"
+  , "description": "man cartwheeling"
+  , "category": "People & Body"
+  , "aliases": [
+      "man_cartwheeling"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": ""
+  , "ios_version": "10.2"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🤸‍♀"
+  , "description": "woman cartwheeling"
+  , "category": "People & Body"
+  , "aliases": [
+      "woman_cartwheeling"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": ""
+  , "ios_version": "10.2"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🤼"
+  , "description": "people wrestling"
+  , "category": "People & Body"
+  , "aliases": [
+      "wrestling"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "🤼‍♂"
+  , "description": "men wrestling"
+  , "category": "People & Body"
+  , "aliases": [
+      "men_wrestling"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "9.0"
+  , "ios_version": "10.2"
+  }
+, {
+    "emoji": "🤼‍♀"
+  , "description": "women wrestling"
+  , "category": "People & Body"
+  , "aliases": [
+      "women_wrestling"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "9.0"
+  , "ios_version": "10.2"
+  }
+, {
+    "emoji": "🤽"
+  , "description": "person playing water polo"
+  , "category": "People & Body"
+  , "aliases": [
+      "water_polo"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🤽‍♂"
+  , "description": "man playing water polo"
+  , "category": "People & Body"
+  , "aliases": [
+      "man_playing_water_polo"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "9.0"
+  , "ios_version": "10.2"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🤽‍♀"
+  , "description": "woman playing water polo"
+  , "category": "People & Body"
+  , "aliases": [
+      "woman_playing_water_polo"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "9.0"
+  , "ios_version": "10.2"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🤾"
+  , "description": "person playing handball"
+  , "category": "People & Body"
+  , "aliases": [
+      "handball_person"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🤾‍♂"
+  , "description": "man playing handball"
+  , "category": "People & Body"
+  , "aliases": [
+      "man_playing_handball"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "9.0"
+  , "ios_version": "10.2"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🤾‍♀"
+  , "description": "woman playing handball"
+  , "category": "People & Body"
+  , "aliases": [
+      "woman_playing_handball"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "9.0"
+  , "ios_version": "10.2"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🤹"
+  , "description": "person juggling"
+  , "category": "People & Body"
+  , "aliases": [
+      "juggling_person"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🤹‍♂"
+  , "description": "man juggling"
+  , "category": "People & Body"
+  , "aliases": [
+      "man_juggling"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "9.0"
+  , "ios_version": "10.2"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🤹‍♀"
+  , "description": "woman juggling"
+  , "category": "People & Body"
+  , "aliases": [
+      "woman_juggling"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "9.0"
+  , "ios_version": "10.2"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🧘"
+  , "description": "person in lotus position"
+  , "category": "People & Body"
+  , "aliases": [
+      "lotus_position"
+    ]
+  , "tags": [
+      "meditation"
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🧘‍♂"
+  , "description": "man in lotus position"
+  , "category": "People & Body"
+  , "aliases": [
+      "lotus_position_man"
+    ]
+  , "tags": [
+      "meditation"
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🧘‍♀"
+  , "description": "woman in lotus position"
+  , "category": "People & Body"
+  , "aliases": [
+      "lotus_position_woman"
+    ]
+  , "tags": [
+      "meditation"
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🛀"
+  , "description": "person taking bath"
+  , "category": "People & Body"
+  , "aliases": [
+      "bath"
+    ]
+  , "tags": [
+      "shower"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🛌"
+  , "description": "person in bed"
+  , "category": "People & Body"
+  , "aliases": [
+      "sleeping_bed"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "7.0"
+  , "ios_version": "9.1"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "🧑‍🤝‍🧑"
+  , "description": "people holding hands"
+  , "category": "People & Body"
+  , "aliases": [
+      "people_holding_hands"
+    ]
+  , "tags": [
+      "couple"
+    , "date"
+    ]
+  , "unicode_version": "12.0"
+  , "ios_version": "13.0"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "👭"
+  , "description": "women holding hands"
+  , "category": "People & Body"
+  , "aliases": [
+      "two_women_holding_hands"
+    ]
+  , "tags": [
+      "couple"
+    , "date"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "👫"
+  , "description": "woman and man holding hands"
+  , "category": "People & Body"
+  , "aliases": [
+      "couple"
+    ]
+  , "tags": [
+      "date"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "👬"
+  , "description": "men holding hands"
+  , "category": "People & Body"
+  , "aliases": [
+      "two_men_holding_hands"
+    ]
+  , "tags": [
+      "couple"
+    , "date"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  , "skin_tones": true
+  }
+, {
+    "emoji": "💏"
+  , "description": "kiss"
+  , "category": "People & Body"
+  , "aliases": [
+      "couplekiss"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "👩‍❤️‍💋‍👨"
+  , "description": "kiss: woman, man"
+  , "category": "People & Body"
+  , "aliases": [
+      "couplekiss_man_woman"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "👨‍❤️‍💋‍👨"
+  , "description": "kiss: man, man"
+  , "category": "People & Body"
+  , "aliases": [
+      "couplekiss_man_man"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "👩‍❤️‍💋‍👩"
+  , "description": "kiss: woman, woman"
+  , "category": "People & Body"
+  , "aliases": [
+      "couplekiss_woman_woman"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "💑"
+  , "description": "couple with heart"
+  , "category": "People & Body"
+  , "aliases": [
+      "couple_with_heart"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "👩‍❤️‍👨"
+  , "description": "couple with heart: woman, man"
+  , "category": "People & Body"
+  , "aliases": [
+      "couple_with_heart_woman_man"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "👨‍❤️‍👨"
+  , "description": "couple with heart: man, man"
+  , "category": "People & Body"
+  , "aliases": [
+      "couple_with_heart_man_man"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "👩‍❤️‍👩"
+  , "description": "couple with heart: woman, woman"
+  , "category": "People & Body"
+  , "aliases": [
+      "couple_with_heart_woman_woman"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "👪"
+  , "description": "family"
+  , "category": "People & Body"
+  , "aliases": [
+      "family"
+    ]
+  , "tags": [
+      "home"
+    , "parents"
+    , "child"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "👨‍👩‍👦"
+  , "description": "family: man, woman, boy"
+  , "category": "People & Body"
+  , "aliases": [
+      "family_man_woman_boy"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "👨‍👩‍👧"
+  , "description": "family: man, woman, girl"
+  , "category": "People & Body"
+  , "aliases": [
+      "family_man_woman_girl"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "👨‍👩‍👧‍👦"
+  , "description": "family: man, woman, girl, boy"
+  , "category": "People & Body"
+  , "aliases": [
+      "family_man_woman_girl_boy"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "👨‍👩‍👦‍👦"
+  , "description": "family: man, woman, boy, boy"
+  , "category": "People & Body"
+  , "aliases": [
+      "family_man_woman_boy_boy"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "👨‍👩‍👧‍👧"
+  , "description": "family: man, woman, girl, girl"
+  , "category": "People & Body"
+  , "aliases": [
+      "family_man_woman_girl_girl"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "👨‍👨‍👦"
+  , "description": "family: man, man, boy"
+  , "category": "People & Body"
+  , "aliases": [
+      "family_man_man_boy"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "👨‍👨‍👧"
+  , "description": "family: man, man, girl"
+  , "category": "People & Body"
+  , "aliases": [
+      "family_man_man_girl"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "👨‍👨‍👧‍👦"
+  , "description": "family: man, man, girl, boy"
+  , "category": "People & Body"
+  , "aliases": [
+      "family_man_man_girl_boy"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "👨‍👨‍👦‍👦"
+  , "description": "family: man, man, boy, boy"
+  , "category": "People & Body"
+  , "aliases": [
+      "family_man_man_boy_boy"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "👨‍👨‍👧‍👧"
+  , "description": "family: man, man, girl, girl"
+  , "category": "People & Body"
+  , "aliases": [
+      "family_man_man_girl_girl"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "👩‍👩‍👦"
+  , "description": "family: woman, woman, boy"
+  , "category": "People & Body"
+  , "aliases": [
+      "family_woman_woman_boy"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "👩‍👩‍👧"
+  , "description": "family: woman, woman, girl"
+  , "category": "People & Body"
+  , "aliases": [
+      "family_woman_woman_girl"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "👩‍👩‍👧‍👦"
+  , "description": "family: woman, woman, girl, boy"
+  , "category": "People & Body"
+  , "aliases": [
+      "family_woman_woman_girl_boy"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "👩‍👩‍👦‍👦"
+  , "description": "family: woman, woman, boy, boy"
+  , "category": "People & Body"
+  , "aliases": [
+      "family_woman_woman_boy_boy"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "👩‍👩‍👧‍👧"
+  , "description": "family: woman, woman, girl, girl"
+  , "category": "People & Body"
+  , "aliases": [
+      "family_woman_woman_girl_girl"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "👨‍👦"
+  , "description": "family: man, boy"
+  , "category": "People & Body"
+  , "aliases": [
+      "family_man_boy"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "10.0"
+  }
+, {
+    "emoji": "👨‍👦‍👦"
+  , "description": "family: man, boy, boy"
+  , "category": "People & Body"
+  , "aliases": [
+      "family_man_boy_boy"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "10.0"
+  }
+, {
+    "emoji": "👨‍👧"
+  , "description": "family: man, girl"
+  , "category": "People & Body"
+  , "aliases": [
+      "family_man_girl"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "10.0"
+  }
+, {
+    "emoji": "👨‍👧‍👦"
+  , "description": "family: man, girl, boy"
+  , "category": "People & Body"
+  , "aliases": [
+      "family_man_girl_boy"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "10.0"
+  }
+, {
+    "emoji": "👨‍👧‍👧"
+  , "description": "family: man, girl, girl"
+  , "category": "People & Body"
+  , "aliases": [
+      "family_man_girl_girl"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "10.0"
+  }
+, {
+    "emoji": "👩‍👦"
+  , "description": "family: woman, boy"
+  , "category": "People & Body"
+  , "aliases": [
+      "family_woman_boy"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "10.0"
+  }
+, {
+    "emoji": "👩‍👦‍👦"
+  , "description": "family: woman, boy, boy"
+  , "category": "People & Body"
+  , "aliases": [
+      "family_woman_boy_boy"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "10.0"
+  }
+, {
+    "emoji": "👩‍👧"
+  , "description": "family: woman, girl"
+  , "category": "People & Body"
+  , "aliases": [
+      "family_woman_girl"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "10.0"
+  }
+, {
+    "emoji": "👩‍👧‍👦"
+  , "description": "family: woman, girl, boy"
+  , "category": "People & Body"
+  , "aliases": [
+      "family_woman_girl_boy"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "10.0"
+  }
+, {
+    "emoji": "👩‍👧‍👧"
+  , "description": "family: woman, girl, girl"
+  , "category": "People & Body"
+  , "aliases": [
+      "family_woman_girl_girl"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "10.0"
+  }
+, {
+    "emoji": "🗣"
+  , "description": "speaking head"
+  , "category": "People & Body"
+  , "aliases": [
+      "speaking_head"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "7.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "👤"
+  , "description": "bust in silhouette"
+  , "category": "People & Body"
+  , "aliases": [
+      "bust_in_silhouette"
+    ]
+  , "tags": [
+      "user"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "👥"
+  , "description": "busts in silhouette"
+  , "category": "People & Body"
+  , "aliases": [
+      "busts_in_silhouette"
+    ]
+  , "tags": [
+      "users"
+    , "group"
+    , "team"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "👣"
+  , "description": "footprints"
+  , "category": "People & Body"
+  , "aliases": [
+      "footprints"
+    ]
+  , "tags": [
+      "feet"
+    , "tracks"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🐵"
+  , "description": "monkey face"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "monkey_face"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🐒"
+  , "description": "monkey"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "monkey"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🦍"
+  , "description": "gorilla"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "gorilla"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "9.0"
+  , "ios_version": "10.2"
+  }
+, {
+    "emoji": "🦧"
+  , "description": "orangutan"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "orangutan"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "12.0"
+  , "ios_version": "13.0"
+  }
+, {
+    "emoji": "🐶"
+  , "description": "dog face"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "dog"
+    ]
+  , "tags": [
+      "pet"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🐕"
+  , "description": "dog"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "dog2"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🦮"
+  , "description": "guide dog"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "guide_dog"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "12.0"
+  , "ios_version": "13.0"
+  }
+, {
+    "emoji": "🐕‍🦺"
+  , "description": "service dog"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "service_dog"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "12.0"
+  , "ios_version": "13.0"
+  }
+, {
+    "emoji": "🐩"
+  , "description": "poodle"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "poodle"
+    ]
+  , "tags": [
+      "dog"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🐺"
+  , "description": "wolf"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "wolf"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🦊"
+  , "description": "fox"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "fox_face"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "9.0"
+  , "ios_version": "10.2"
+  }
+, {
+    "emoji": "🦝"
+  , "description": "raccoon"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "raccoon"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "🐱"
+  , "description": "cat face"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "cat"
+    ]
+  , "tags": [
+      "pet"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🐈"
+  , "description": "cat"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "cat2"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🦁"
+  , "description": "lion"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "lion"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "8.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🐯"
+  , "description": "tiger face"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "tiger"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🐅"
+  , "description": "tiger"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "tiger2"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🐆"
+  , "description": "leopard"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "leopard"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🐴"
+  , "description": "horse face"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "horse"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🐎"
+  , "description": "horse"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "racehorse"
+    ]
+  , "tags": [
+      "speed"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🦄"
+  , "description": "unicorn"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "unicorn"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "8.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🦓"
+  , "description": "zebra"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "zebra"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "🦌"
+  , "description": "deer"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "deer"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "9.0"
+  , "ios_version": "10.2"
+  }
+, {
+    "emoji": "🐮"
+  , "description": "cow face"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "cow"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🐂"
+  , "description": "ox"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "ox"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🐃"
+  , "description": "water buffalo"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "water_buffalo"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🐄"
+  , "description": "cow"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "cow2"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🐷"
+  , "description": "pig face"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "pig"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🐖"
+  , "description": "pig"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "pig2"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🐗"
+  , "description": "boar"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "boar"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🐽"
+  , "description": "pig nose"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "pig_nose"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🐏"
+  , "description": "ram"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "ram"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🐑"
+  , "description": "ewe"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "sheep"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🐐"
+  , "description": "goat"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "goat"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🐪"
+  , "description": "camel"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "dromedary_camel"
+    ]
+  , "tags": [
+      "desert"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🐫"
+  , "description": "two-hump camel"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "camel"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🦙"
+  , "description": "llama"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "llama"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "🦒"
+  , "description": "giraffe"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "giraffe"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "🐘"
+  , "description": "elephant"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "elephant"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🦏"
+  , "description": "rhinoceros"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "rhinoceros"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "9.0"
+  , "ios_version": "10.2"
+  }
+, {
+    "emoji": "🦛"
+  , "description": "hippopotamus"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "hippopotamus"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "🐭"
+  , "description": "mouse face"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "mouse"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🐁"
+  , "description": "mouse"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "mouse2"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🐀"
+  , "description": "rat"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "rat"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🐹"
+  , "description": "hamster"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "hamster"
+    ]
+  , "tags": [
+      "pet"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🐰"
+  , "description": "rabbit face"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "rabbit"
+    ]
+  , "tags": [
+      "bunny"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🐇"
+  , "description": "rabbit"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "rabbit2"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🐿"
+  , "description": "chipmunk"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "chipmunk"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "7.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🦔"
+  , "description": "hedgehog"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "hedgehog"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "🦇"
+  , "description": "bat"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "bat"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "9.0"
+  , "ios_version": "10.2"
+  }
+, {
+    "emoji": "🐻"
+  , "description": "bear"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "bear"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🐨"
+  , "description": "koala"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "koala"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🐼"
+  , "description": "panda"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "panda_face"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🦥"
+  , "description": "sloth"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "sloth"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "12.0"
+  , "ios_version": "13.0"
+  }
+, {
+    "emoji": "🦦"
+  , "description": "otter"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "otter"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "12.0"
+  , "ios_version": "13.0"
+  }
+, {
+    "emoji": "🦨"
+  , "description": "skunk"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "skunk"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "12.0"
+  , "ios_version": "13.0"
+  }
+, {
+    "emoji": "🦘"
+  , "description": "kangaroo"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "kangaroo"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "🦡"
+  , "description": "badger"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "badger"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "🐾"
+  , "description": "paw prints"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "feet"
+    , "paw_prints"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🦃"
+  , "description": "turkey"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "turkey"
+    ]
+  , "tags": [
+      "thanksgiving"
+    ]
+  , "unicode_version": "8.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🐔"
+  , "description": "chicken"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "chicken"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🐓"
+  , "description": "rooster"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "rooster"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🐣"
+  , "description": "hatching chick"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "hatching_chick"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🐤"
+  , "description": "baby chick"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "baby_chick"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🐥"
+  , "description": "front-facing baby chick"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "hatched_chick"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🐦"
+  , "description": "bird"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "bird"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🐧"
+  , "description": "penguin"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "penguin"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🕊"
+  , "description": "dove"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "dove"
+    ]
+  , "tags": [
+      "peace"
+    ]
+  , "unicode_version": "7.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🦅"
+  , "description": "eagle"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "eagle"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "9.0"
+  , "ios_version": "10.2"
+  }
+, {
+    "emoji": "🦆"
+  , "description": "duck"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "duck"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "9.0"
+  , "ios_version": "10.2"
+  }
+, {
+    "emoji": "🦢"
+  , "description": "swan"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "swan"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "🦉"
+  , "description": "owl"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "owl"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "9.0"
+  , "ios_version": "10.2"
+  }
+, {
+    "emoji": "🦩"
+  , "description": "flamingo"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "flamingo"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "12.0"
+  , "ios_version": "13.0"
+  }
+, {
+    "emoji": "🦚"
+  , "description": "peacock"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "peacock"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "🦜"
+  , "description": "parrot"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "parrot"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "🐸"
+  , "description": "frog"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "frog"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🐊"
+  , "description": "crocodile"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "crocodile"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🐢"
+  , "description": "turtle"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "turtle"
+    ]
+  , "tags": [
+      "slow"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🦎"
+  , "description": "lizard"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "lizard"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "9.0"
+  , "ios_version": "10.2"
+  }
+, {
+    "emoji": "🐍"
+  , "description": "snake"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "snake"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🐲"
+  , "description": "dragon face"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "dragon_face"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🐉"
+  , "description": "dragon"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "dragon"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🦕"
+  , "description": "sauropod"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "sauropod"
+    ]
+  , "tags": [
+      "dinosaur"
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "🦖"
+  , "description": "T-Rex"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "t-rex"
+    ]
+  , "tags": [
+      "dinosaur"
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "🐳"
+  , "description": "spouting whale"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "whale"
+    ]
+  , "tags": [
+      "sea"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🐋"
+  , "description": "whale"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "whale2"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🐬"
+  , "description": "dolphin"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "dolphin"
+    , "flipper"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🐟"
+  , "description": "fish"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "fish"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🐠"
+  , "description": "tropical fish"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "tropical_fish"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🐡"
+  , "description": "blowfish"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "blowfish"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🦈"
+  , "description": "shark"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "shark"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "9.0"
+  , "ios_version": "10.2"
+  }
+, {
+    "emoji": "🐙"
+  , "description": "octopus"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "octopus"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🐚"
+  , "description": "spiral shell"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "shell"
+    ]
+  , "tags": [
+      "sea"
+    , "beach"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🐌"
+  , "description": "snail"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "snail"
+    ]
+  , "tags": [
+      "slow"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🦋"
+  , "description": "butterfly"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "butterfly"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "9.0"
+  , "ios_version": "10.2"
+  }
+, {
+    "emoji": "🐛"
+  , "description": "bug"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "bug"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🐜"
+  , "description": "ant"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "ant"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🐝"
+  , "description": "honeybee"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "bee"
+    , "honeybee"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🐞"
+  , "description": "lady beetle"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "beetle"
+    ]
+  , "tags": [
+      "bug"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🦗"
+  , "description": "cricket"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "cricket"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "🕷"
+  , "description": "spider"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "spider"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "7.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🕸"
+  , "description": "spider web"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "spider_web"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "7.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🦂"
+  , "description": "scorpion"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "scorpion"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "8.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🦟"
+  , "description": "mosquito"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "mosquito"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "🦠"
+  , "description": "microbe"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "microbe"
+    ]
+  , "tags": [
+      "germ"
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "💐"
+  , "description": "bouquet"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "bouquet"
+    ]
+  , "tags": [
+      "flowers"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🌸"
+  , "description": "cherry blossom"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "cherry_blossom"
+    ]
+  , "tags": [
+      "flower"
+    , "spring"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "💮"
+  , "description": "white flower"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "white_flower"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🏵"
+  , "description": "rosette"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "rosette"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "7.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🌹"
+  , "description": "rose"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "rose"
+    ]
+  , "tags": [
+      "flower"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🥀"
+  , "description": "wilted flower"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "wilted_flower"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "9.0"
+  , "ios_version": "10.2"
+  }
+, {
+    "emoji": "🌺"
+  , "description": "hibiscus"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "hibiscus"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🌻"
+  , "description": "sunflower"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "sunflower"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🌼"
+  , "description": "blossom"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "blossom"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🌷"
+  , "description": "tulip"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "tulip"
+    ]
+  , "tags": [
+      "flower"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🌱"
+  , "description": "seedling"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "seedling"
+    ]
+  , "tags": [
+      "plant"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🌲"
+  , "description": "evergreen tree"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "evergreen_tree"
+    ]
+  , "tags": [
+      "wood"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🌳"
+  , "description": "deciduous tree"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "deciduous_tree"
+    ]
+  , "tags": [
+      "wood"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🌴"
+  , "description": "palm tree"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "palm_tree"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🌵"
+  , "description": "cactus"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "cactus"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🌾"
+  , "description": "sheaf of rice"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "ear_of_rice"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🌿"
+  , "description": "herb"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "herb"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "☘"
+  , "description": "shamrock"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "shamrock"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "4.1"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🍀"
+  , "description": "four leaf clover"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "four_leaf_clover"
+    ]
+  , "tags": [
+      "luck"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🍁"
+  , "description": "maple leaf"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "maple_leaf"
+    ]
+  , "tags": [
+      "canada"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🍂"
+  , "description": "fallen leaf"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "fallen_leaf"
+    ]
+  , "tags": [
+      "autumn"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🍃"
+  , "description": "leaf fluttering in wind"
+  , "category": "Animals & Nature"
+  , "aliases": [
+      "leaves"
+    ]
+  , "tags": [
+      "leaf"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🍇"
+  , "description": "grapes"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "grapes"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🍈"
+  , "description": "melon"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "melon"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🍉"
+  , "description": "watermelon"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "watermelon"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🍊"
+  , "description": "tangerine"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "tangerine"
+    , "orange"
+    , "mandarin"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🍋"
+  , "description": "lemon"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "lemon"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🍌"
+  , "description": "banana"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "banana"
+    ]
+  , "tags": [
+      "fruit"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🍍"
+  , "description": "pineapple"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "pineapple"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🥭"
+  , "description": "mango"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "mango"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "🍎"
+  , "description": "red apple"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "apple"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🍏"
+  , "description": "green apple"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "green_apple"
+    ]
+  , "tags": [
+      "fruit"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🍐"
+  , "description": "pear"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "pear"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🍑"
+  , "description": "peach"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "peach"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🍒"
+  , "description": "cherries"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "cherries"
+    ]
+  , "tags": [
+      "fruit"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🍓"
+  , "description": "strawberry"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "strawberry"
+    ]
+  , "tags": [
+      "fruit"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🥝"
+  , "description": "kiwi fruit"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "kiwi_fruit"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "9.0"
+  , "ios_version": "10.2"
+  }
+, {
+    "emoji": "🍅"
+  , "description": "tomato"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "tomato"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🥥"
+  , "description": "coconut"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "coconut"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "🥑"
+  , "description": "avocado"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "avocado"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "9.0"
+  , "ios_version": "10.2"
+  }
+, {
+    "emoji": "🍆"
+  , "description": "eggplant"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "eggplant"
+    ]
+  , "tags": [
+      "aubergine"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🥔"
+  , "description": "potato"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "potato"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "9.0"
+  , "ios_version": "10.2"
+  }
+, {
+    "emoji": "🥕"
+  , "description": "carrot"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "carrot"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "9.0"
+  , "ios_version": "10.2"
+  }
+, {
+    "emoji": "🌽"
+  , "description": "ear of corn"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "corn"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🌶"
+  , "description": "hot pepper"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "hot_pepper"
+    ]
+  , "tags": [
+      "spicy"
+    ]
+  , "unicode_version": "7.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🥒"
+  , "description": "cucumber"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "cucumber"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "9.0"
+  , "ios_version": "10.2"
+  }
+, {
+    "emoji": "🥬"
+  , "description": "leafy green"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "leafy_green"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "🥦"
+  , "description": "broccoli"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "broccoli"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "🧄"
+  , "description": "garlic"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "garlic"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "12.0"
+  , "ios_version": "13.0"
+  }
+, {
+    "emoji": "🧅"
+  , "description": "onion"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "onion"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "12.0"
+  , "ios_version": "13.0"
+  }
+, {
+    "emoji": "🍄"
+  , "description": "mushroom"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "mushroom"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🥜"
+  , "description": "peanuts"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "peanuts"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "9.0"
+  , "ios_version": "10.2"
+  }
+, {
+    "emoji": "🌰"
+  , "description": "chestnut"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "chestnut"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🍞"
+  , "description": "bread"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "bread"
+    ]
+  , "tags": [
+      "toast"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🥐"
+  , "description": "croissant"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "croissant"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "9.0"
+  , "ios_version": "10.2"
+  }
+, {
+    "emoji": "🥖"
+  , "description": "baguette bread"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "baguette_bread"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "9.0"
+  , "ios_version": "10.2"
+  }
+, {
+    "emoji": "🥨"
+  , "description": "pretzel"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "pretzel"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "🥯"
+  , "description": "bagel"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "bagel"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "🥞"
+  , "description": "pancakes"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "pancakes"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "9.0"
+  , "ios_version": "10.2"
+  }
+, {
+    "emoji": "🧇"
+  , "description": "waffle"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "waffle"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "12.0"
+  , "ios_version": "13.0"
+  }
+, {
+    "emoji": "🧀"
+  , "description": "cheese wedge"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "cheese"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "8.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🍖"
+  , "description": "meat on bone"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "meat_on_bone"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🍗"
+  , "description": "poultry leg"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "poultry_leg"
+    ]
+  , "tags": [
+      "meat"
+    , "chicken"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🥩"
+  , "description": "cut of meat"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "cut_of_meat"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "🥓"
+  , "description": "bacon"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "bacon"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "9.0"
+  , "ios_version": "10.2"
+  }
+, {
+    "emoji": "🍔"
+  , "description": "hamburger"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "hamburger"
+    ]
+  , "tags": [
+      "burger"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🍟"
+  , "description": "french fries"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "fries"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🍕"
+  , "description": "pizza"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "pizza"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🌭"
+  , "description": "hot dog"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "hotdog"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "8.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🥪"
+  , "description": "sandwich"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "sandwich"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "🌮"
+  , "description": "taco"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "taco"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "8.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🌯"
+  , "description": "burrito"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "burrito"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "8.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🥙"
+  , "description": "stuffed flatbread"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "stuffed_flatbread"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "9.0"
+  , "ios_version": "10.2"
+  }
+, {
+    "emoji": "🧆"
+  , "description": "falafel"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "falafel"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "12.0"
+  , "ios_version": "13.0"
+  }
+, {
+    "emoji": "🥚"
+  , "description": "egg"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "egg"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "9.0"
+  , "ios_version": "10.2"
+  }
+, {
+    "emoji": "🍳"
+  , "description": "cooking"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "fried_egg"
+    ]
+  , "tags": [
+      "breakfast"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🥘"
+  , "description": "shallow pan of food"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "shallow_pan_of_food"
+    ]
+  , "tags": [
+      "paella"
+    , "curry"
+    ]
+  , "unicode_version": ""
+  , "ios_version": "10.2"
+  }
+, {
+    "emoji": "🍲"
+  , "description": "pot of food"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "stew"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🥣"
+  , "description": "bowl with spoon"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "bowl_with_spoon"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "🥗"
+  , "description": "green salad"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "green_salad"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "9.0"
+  , "ios_version": "10.2"
+  }
+, {
+    "emoji": "🍿"
+  , "description": "popcorn"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "popcorn"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "8.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🧈"
+  , "description": "butter"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "butter"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "12.0"
+  , "ios_version": "13.0"
+  }
+, {
+    "emoji": "🧂"
+  , "description": "salt"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "salt"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "🥫"
+  , "description": "canned food"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "canned_food"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "🍱"
+  , "description": "bento box"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "bento"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🍘"
+  , "description": "rice cracker"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "rice_cracker"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🍙"
+  , "description": "rice ball"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "rice_ball"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🍚"
+  , "description": "cooked rice"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "rice"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🍛"
+  , "description": "curry rice"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "curry"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🍜"
+  , "description": "steaming bowl"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "ramen"
+    ]
+  , "tags": [
+      "noodle"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🍝"
+  , "description": "spaghetti"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "spaghetti"
+    ]
+  , "tags": [
+      "pasta"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🍠"
+  , "description": "roasted sweet potato"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "sweet_potato"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🍢"
+  , "description": "oden"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "oden"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🍣"
+  , "description": "sushi"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "sushi"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🍤"
+  , "description": "fried shrimp"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "fried_shrimp"
+    ]
+  , "tags": [
+      "tempura"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🍥"
+  , "description": "fish cake with swirl"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "fish_cake"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🥮"
+  , "description": "moon cake"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "moon_cake"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "🍡"
+  , "description": "dango"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "dango"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🥟"
+  , "description": "dumpling"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "dumpling"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "🥠"
+  , "description": "fortune cookie"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "fortune_cookie"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "🥡"
+  , "description": "takeout box"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "takeout_box"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "🦀"
+  , "description": "crab"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "crab"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "8.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🦞"
+  , "description": "lobster"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "lobster"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "🦐"
+  , "description": "shrimp"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "shrimp"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "9.0"
+  , "ios_version": "10.2"
+  }
+, {
+    "emoji": "🦑"
+  , "description": "squid"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "squid"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "9.0"
+  , "ios_version": "10.2"
+  }
+, {
+    "emoji": "🦪"
+  , "description": "oyster"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "oyster"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "12.0"
+  , "ios_version": "13.0"
+  }
+, {
+    "emoji": "🍦"
+  , "description": "soft ice cream"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "icecream"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🍧"
+  , "description": "shaved ice"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "shaved_ice"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🍨"
+  , "description": "ice cream"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "ice_cream"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🍩"
+  , "description": "doughnut"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "doughnut"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🍪"
+  , "description": "cookie"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "cookie"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🎂"
+  , "description": "birthday cake"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "birthday"
+    ]
+  , "tags": [
+      "party"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🍰"
+  , "description": "shortcake"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "cake"
+    ]
+  , "tags": [
+      "dessert"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🧁"
+  , "description": "cupcake"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "cupcake"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "🥧"
+  , "description": "pie"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "pie"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "🍫"
+  , "description": "chocolate bar"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "chocolate_bar"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🍬"
+  , "description": "candy"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "candy"
+    ]
+  , "tags": [
+      "sweet"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🍭"
+  , "description": "lollipop"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "lollipop"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🍮"
+  , "description": "custard"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "custard"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🍯"
+  , "description": "honey pot"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "honey_pot"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🍼"
+  , "description": "baby bottle"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "baby_bottle"
+    ]
+  , "tags": [
+      "milk"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🥛"
+  , "description": "glass of milk"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "milk_glass"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "9.0"
+  , "ios_version": "10.2"
+  }
+, {
+    "emoji": "☕"
+  , "description": "hot beverage"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "coffee"
+    ]
+  , "tags": [
+      "cafe"
+    , "espresso"
+    ]
+  , "unicode_version": "4.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🍵"
+  , "description": "teacup without handle"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "tea"
+    ]
+  , "tags": [
+      "green"
+    , "breakfast"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🍶"
+  , "description": "sake"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "sake"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🍾"
+  , "description": "bottle with popping cork"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "champagne"
+    ]
+  , "tags": [
+      "bottle"
+    , "bubbly"
+    , "celebration"
+    ]
+  , "unicode_version": "8.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🍷"
+  , "description": "wine glass"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "wine_glass"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🍸"
+  , "description": "cocktail glass"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "cocktail"
+    ]
+  , "tags": [
+      "drink"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🍹"
+  , "description": "tropical drink"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "tropical_drink"
+    ]
+  , "tags": [
+      "summer"
+    , "vacation"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🍺"
+  , "description": "beer mug"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "beer"
+    ]
+  , "tags": [
+      "drink"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🍻"
+  , "description": "clinking beer mugs"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "beers"
+    ]
+  , "tags": [
+      "drinks"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🥂"
+  , "description": "clinking glasses"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "clinking_glasses"
+    ]
+  , "tags": [
+      "cheers"
+    , "toast"
+    ]
+  , "unicode_version": "9.0"
+  , "ios_version": "10.2"
+  }
+, {
+    "emoji": "🥃"
+  , "description": "tumbler glass"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "tumbler_glass"
+    ]
+  , "tags": [
+      "whisky"
+    ]
+  , "unicode_version": "9.0"
+  , "ios_version": "10.2"
+  }
+, {
+    "emoji": "🥤"
+  , "description": "cup with straw"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "cup_with_straw"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "🧃"
+  , "description": "beverage box"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "beverage_box"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "12.0"
+  , "ios_version": "13.0"
+  }
+, {
+    "emoji": "🧉"
+  , "description": "mate"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "mate"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "12.0"
+  , "ios_version": "13.0"
+  }
+, {
+    "emoji": "🧊"
+  , "description": "ice cube"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "ice_cube"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "12.0"
+  , "ios_version": "13.0"
+  }
+, {
+    "emoji": "🥢"
+  , "description": "chopsticks"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "chopsticks"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "🍽"
+  , "description": "fork and knife with plate"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "plate_with_cutlery"
+    ]
+  , "tags": [
+      "dining"
+    , "dinner"
+    ]
+  , "unicode_version": "7.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🍴"
+  , "description": "fork and knife"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "fork_and_knife"
+    ]
+  , "tags": [
+      "cutlery"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🥄"
+  , "description": "spoon"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "spoon"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "9.0"
+  , "ios_version": "10.2"
+  }
+, {
+    "emoji": "🔪"
+  , "description": "kitchen knife"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "hocho"
+    , "knife"
+    ]
+  , "tags": [
+      "cut"
+    , "chop"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🏺"
+  , "description": "amphora"
+  , "category": "Food & Drink"
+  , "aliases": [
+      "amphora"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "8.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🌍"
+  , "description": "globe showing Europe-Africa"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "earth_africa"
+    ]
+  , "tags": [
+      "globe"
+    , "world"
+    , "international"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🌎"
+  , "description": "globe showing Americas"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "earth_americas"
+    ]
+  , "tags": [
+      "globe"
+    , "world"
+    , "international"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🌏"
+  , "description": "globe showing Asia-Australia"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "earth_asia"
+    ]
+  , "tags": [
+      "globe"
+    , "world"
+    , "international"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🌐"
+  , "description": "globe with meridians"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "globe_with_meridians"
+    ]
+  , "tags": [
+      "world"
+    , "global"
+    , "international"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🗺"
+  , "description": "world map"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "world_map"
+    ]
+  , "tags": [
+      "travel"
+    ]
+  , "unicode_version": "7.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🗾"
+  , "description": "map of Japan"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "japan"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🧭"
+  , "description": "compass"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "compass"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "🏔"
+  , "description": "snow-capped mountain"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "mountain_snow"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "7.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "⛰"
+  , "description": "mountain"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "mountain"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "5.2"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🌋"
+  , "description": "volcano"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "volcano"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🗻"
+  , "description": "mount fuji"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "mount_fuji"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🏕"
+  , "description": "camping"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "camping"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "7.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🏖"
+  , "description": "beach with umbrella"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "beach_umbrella"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "7.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🏜"
+  , "description": "desert"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "desert"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "7.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🏝"
+  , "description": "desert island"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "desert_island"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "7.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🏞"
+  , "description": "national park"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "national_park"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "7.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🏟"
+  , "description": "stadium"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "stadium"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "7.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🏛"
+  , "description": "classical building"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "classical_building"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "7.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🏗"
+  , "description": "building construction"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "building_construction"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "7.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🧱"
+  , "description": "brick"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "bricks"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "🏘"
+  , "description": "houses"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "houses"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "7.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🏚"
+  , "description": "derelict house"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "derelict_house"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "7.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🏠"
+  , "description": "house"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "house"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🏡"
+  , "description": "house with garden"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "house_with_garden"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🏢"
+  , "description": "office building"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "office"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🏣"
+  , "description": "Japanese post office"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "post_office"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🏤"
+  , "description": "post office"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "european_post_office"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🏥"
+  , "description": "hospital"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "hospital"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🏦"
+  , "description": "bank"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "bank"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🏨"
+  , "description": "hotel"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "hotel"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🏩"
+  , "description": "love hotel"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "love_hotel"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🏪"
+  , "description": "convenience store"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "convenience_store"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🏫"
+  , "description": "school"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "school"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🏬"
+  , "description": "department store"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "department_store"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🏭"
+  , "description": "factory"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "factory"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🏯"
+  , "description": "Japanese castle"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "japanese_castle"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🏰"
+  , "description": "castle"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "european_castle"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "💒"
+  , "description": "wedding"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "wedding"
+    ]
+  , "tags": [
+      "marriage"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🗼"
+  , "description": "Tokyo tower"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "tokyo_tower"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🗽"
+  , "description": "Statue of Liberty"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "statue_of_liberty"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "⛪"
+  , "description": "church"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "church"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "5.2"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🕌"
+  , "description": "mosque"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "mosque"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "8.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🛕"
+  , "description": "hindu temple"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "hindu_temple"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "12.0"
+  , "ios_version": "13.0"
+  }
+, {
+    "emoji": "🕍"
+  , "description": "synagogue"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "synagogue"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "8.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "⛩"
+  , "description": "shinto shrine"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "shinto_shrine"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "5.2"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🕋"
+  , "description": "kaaba"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "kaaba"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "8.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "⛲"
+  , "description": "fountain"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "fountain"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "5.2"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "⛺"
+  , "description": "tent"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "tent"
+    ]
+  , "tags": [
+      "camping"
+    ]
+  , "unicode_version": "5.2"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🌁"
+  , "description": "foggy"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "foggy"
+    ]
+  , "tags": [
+      "karl"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🌃"
+  , "description": "night with stars"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "night_with_stars"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🏙"
+  , "description": "cityscape"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "cityscape"
+    ]
+  , "tags": [
+      "skyline"
+    ]
+  , "unicode_version": "7.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🌄"
+  , "description": "sunrise over mountains"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "sunrise_over_mountains"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🌅"
+  , "description": "sunrise"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "sunrise"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🌆"
+  , "description": "cityscape at dusk"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "city_sunset"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🌇"
+  , "description": "sunset"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "city_sunrise"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🌉"
+  , "description": "bridge at night"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "bridge_at_night"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "♨️"
+  , "description": "hot springs"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "hotsprings"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": ""
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🎠"
+  , "description": "carousel horse"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "carousel_horse"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🎡"
+  , "description": "ferris wheel"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "ferris_wheel"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🎢"
+  , "description": "roller coaster"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "roller_coaster"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "💈"
+  , "description": "barber pole"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "barber"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🎪"
+  , "description": "circus tent"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "circus_tent"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🚂"
+  , "description": "locomotive"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "steam_locomotive"
+    ]
+  , "tags": [
+      "train"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🚃"
+  , "description": "railway car"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "railway_car"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🚄"
+  , "description": "high-speed train"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "bullettrain_side"
+    ]
+  , "tags": [
+      "train"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🚅"
+  , "description": "bullet train"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "bullettrain_front"
+    ]
+  , "tags": [
+      "train"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🚆"
+  , "description": "train"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "train2"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🚇"
+  , "description": "metro"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "metro"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🚈"
+  , "description": "light rail"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "light_rail"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🚉"
+  , "description": "station"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "station"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🚊"
+  , "description": "tram"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "tram"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🚝"
+  , "description": "monorail"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "monorail"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🚞"
+  , "description": "mountain railway"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "mountain_railway"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🚋"
+  , "description": "tram car"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "train"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🚌"
+  , "description": "bus"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "bus"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🚍"
+  , "description": "oncoming bus"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "oncoming_bus"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🚎"
+  , "description": "trolleybus"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "trolleybus"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🚐"
+  , "description": "minibus"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "minibus"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🚑"
+  , "description": "ambulance"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "ambulance"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🚒"
+  , "description": "fire engine"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "fire_engine"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🚓"
+  , "description": "police car"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "police_car"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🚔"
+  , "description": "oncoming police car"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "oncoming_police_car"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🚕"
+  , "description": "taxi"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "taxi"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🚖"
+  , "description": "oncoming taxi"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "oncoming_taxi"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🚗"
+  , "description": "automobile"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "car"
+    , "red_car"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🚘"
+  , "description": "oncoming automobile"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "oncoming_automobile"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🚙"
+  , "description": "sport utility vehicle"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "blue_car"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🚚"
+  , "description": "delivery truck"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "truck"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🚛"
+  , "description": "articulated lorry"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "articulated_lorry"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🚜"
+  , "description": "tractor"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "tractor"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🏎"
+  , "description": "racing car"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "racing_car"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "7.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🏍"
+  , "description": "motorcycle"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "motorcycle"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "7.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🛵"
+  , "description": "motor scooter"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "motor_scooter"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "9.0"
+  , "ios_version": "10.2"
+  }
+, {
+    "emoji": "🦽"
+  , "description": "manual wheelchair"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "manual_wheelchair"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "12.0"
+  , "ios_version": "13.0"
+  }
+, {
+    "emoji": "🦼"
+  , "description": "motorized wheelchair"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "motorized_wheelchair"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "12.0"
+  , "ios_version": "13.0"
+  }
+, {
+    "emoji": "🛺"
+  , "description": "auto rickshaw"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "auto_rickshaw"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "12.0"
+  , "ios_version": "13.0"
+  }
+, {
+    "emoji": "🚲"
+  , "description": "bicycle"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "bike"
+    ]
+  , "tags": [
+      "bicycle"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🛴"
+  , "description": "kick scooter"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "kick_scooter"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "9.0"
+  , "ios_version": "10.2"
+  }
+, {
+    "emoji": "🛹"
+  , "description": "skateboard"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "skateboard"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "🚏"
+  , "description": "bus stop"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "busstop"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🛣"
+  , "description": "motorway"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "motorway"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "7.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🛤"
+  , "description": "railway track"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "railway_track"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "7.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🛢"
+  , "description": "oil drum"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "oil_drum"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "7.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "⛽"
+  , "description": "fuel pump"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "fuelpump"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "5.2"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🚨"
+  , "description": "police car light"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "rotating_light"
+    ]
+  , "tags": [
+      "911"
+    , "emergency"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🚥"
+  , "description": "horizontal traffic light"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "traffic_light"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🚦"
+  , "description": "vertical traffic light"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "vertical_traffic_light"
+    ]
+  , "tags": [
+      "semaphore"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🛑"
+  , "description": "stop sign"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "stop_sign"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "9.0"
+  , "ios_version": "10.2"
+  }
+, {
+    "emoji": "🚧"
+  , "description": "construction"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "construction"
+    ]
+  , "tags": [
+      "wip"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "⚓"
+  , "description": "anchor"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "anchor"
+    ]
+  , "tags": [
+      "ship"
+    ]
+  , "unicode_version": "4.1"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "⛵"
+  , "description": "sailboat"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "boat"
+    , "sailboat"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "5.2"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🛶"
+  , "description": "canoe"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "canoe"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "9.0"
+  , "ios_version": "10.2"
+  }
+, {
+    "emoji": "🚤"
+  , "description": "speedboat"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "speedboat"
+    ]
+  , "tags": [
+      "ship"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🛳"
+  , "description": "passenger ship"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "passenger_ship"
+    ]
+  , "tags": [
+      "cruise"
+    ]
+  , "unicode_version": "7.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "⛴"
+  , "description": "ferry"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "ferry"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "5.2"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🛥"
+  , "description": "motor boat"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "motor_boat"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "7.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🚢"
+  , "description": "ship"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "ship"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "✈️"
+  , "description": "airplane"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "airplane"
+    ]
+  , "tags": [
+      "flight"
+    ]
+  , "unicode_version": ""
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🛩"
+  , "description": "small airplane"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "small_airplane"
+    ]
+  , "tags": [
+      "flight"
+    ]
+  , "unicode_version": "7.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🛫"
+  , "description": "airplane departure"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "flight_departure"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "7.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🛬"
+  , "description": "airplane arrival"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "flight_arrival"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "7.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🪂"
+  , "description": "parachute"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "parachute"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "12.0"
+  , "ios_version": "13.0"
+  }
+, {
+    "emoji": "💺"
+  , "description": "seat"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "seat"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🚁"
+  , "description": "helicopter"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "helicopter"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🚟"
+  , "description": "suspension railway"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "suspension_railway"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🚠"
+  , "description": "mountain cableway"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "mountain_cableway"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🚡"
+  , "description": "aerial tramway"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "aerial_tramway"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🛰"
+  , "description": "satellite"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "artificial_satellite"
+    ]
+  , "tags": [
+      "orbit"
+    , "space"
+    ]
+  , "unicode_version": "7.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🚀"
+  , "description": "rocket"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "rocket"
+    ]
+  , "tags": [
+      "ship"
+    , "launch"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🛸"
+  , "description": "flying saucer"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "flying_saucer"
+    ]
+  , "tags": [
+      "ufo"
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "🛎"
+  , "description": "bellhop bell"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "bellhop_bell"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "7.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🧳"
+  , "description": "luggage"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "luggage"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "⌛"
+  , "description": "hourglass done"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "hourglass"
+    ]
+  , "tags": [
+      "time"
+    ]
+  , "unicode_version": ""
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "⏳"
+  , "description": "hourglass not done"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "hourglass_flowing_sand"
+    ]
+  , "tags": [
+      "time"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "⌚"
+  , "description": "watch"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "watch"
+    ]
+  , "tags": [
+      "time"
+    ]
+  , "unicode_version": ""
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "⏰"
+  , "description": "alarm clock"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "alarm_clock"
+    ]
+  , "tags": [
+      "morning"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "⏱"
+  , "description": "stopwatch"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "stopwatch"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "⏲"
+  , "description": "timer clock"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "timer_clock"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🕰"
+  , "description": "mantelpiece clock"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "mantelpiece_clock"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "7.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🕛"
+  , "description": "twelve o’clock"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "clock12"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🕧"
+  , "description": "twelve-thirty"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "clock1230"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🕐"
+  , "description": "one o’clock"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "clock1"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🕜"
+  , "description": "one-thirty"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "clock130"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🕑"
+  , "description": "two o’clock"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "clock2"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🕝"
+  , "description": "two-thirty"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "clock230"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🕒"
+  , "description": "three o’clock"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "clock3"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🕞"
+  , "description": "three-thirty"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "clock330"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🕓"
+  , "description": "four o’clock"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "clock4"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🕟"
+  , "description": "four-thirty"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "clock430"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🕔"
+  , "description": "five o’clock"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "clock5"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🕠"
+  , "description": "five-thirty"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "clock530"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🕕"
+  , "description": "six o’clock"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "clock6"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🕡"
+  , "description": "six-thirty"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "clock630"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🕖"
+  , "description": "seven o’clock"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "clock7"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🕢"
+  , "description": "seven-thirty"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "clock730"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🕗"
+  , "description": "eight o’clock"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "clock8"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🕣"
+  , "description": "eight-thirty"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "clock830"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🕘"
+  , "description": "nine o’clock"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "clock9"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🕤"
+  , "description": "nine-thirty"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "clock930"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🕙"
+  , "description": "ten o’clock"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "clock10"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🕥"
+  , "description": "ten-thirty"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "clock1030"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🕚"
+  , "description": "eleven o’clock"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "clock11"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🕦"
+  , "description": "eleven-thirty"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "clock1130"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🌑"
+  , "description": "new moon"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "new_moon"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🌒"
+  , "description": "waxing crescent moon"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "waxing_crescent_moon"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🌓"
+  , "description": "first quarter moon"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "first_quarter_moon"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🌔"
+  , "description": "waxing gibbous moon"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "moon"
+    , "waxing_gibbous_moon"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🌕"
+  , "description": "full moon"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "full_moon"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🌖"
+  , "description": "waning gibbous moon"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "waning_gibbous_moon"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🌗"
+  , "description": "last quarter moon"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "last_quarter_moon"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🌘"
+  , "description": "waning crescent moon"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "waning_crescent_moon"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🌙"
+  , "description": "crescent moon"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "crescent_moon"
+    ]
+  , "tags": [
+      "night"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🌚"
+  , "description": "new moon face"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "new_moon_with_face"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🌛"
+  , "description": "first quarter moon face"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "first_quarter_moon_with_face"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🌜"
+  , "description": "last quarter moon face"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "last_quarter_moon_with_face"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🌡"
+  , "description": "thermometer"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "thermometer"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "7.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "☀️"
+  , "description": "sun"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "sunny"
+    ]
+  , "tags": [
+      "weather"
+    ]
+  , "unicode_version": ""
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🌝"
+  , "description": "full moon face"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "full_moon_with_face"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🌞"
+  , "description": "sun with face"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "sun_with_face"
+    ]
+  , "tags": [
+      "summer"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🪐"
+  , "description": "ringed planet"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "ringed_planet"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "12.0"
+  , "ios_version": "13.0"
+  }
+, {
+    "emoji": "⭐"
+  , "description": "star"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "star"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "5.1"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🌟"
+  , "description": "glowing star"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "star2"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🌠"
+  , "description": "shooting star"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "stars"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🌌"
+  , "description": "milky way"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "milky_way"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "☁️"
+  , "description": "cloud"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "cloud"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": ""
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "⛅"
+  , "description": "sun behind cloud"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "partly_sunny"
+    ]
+  , "tags": [
+      "weather"
+    , "cloud"
+    ]
+  , "unicode_version": "5.2"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "⛈"
+  , "description": "cloud with lightning and rain"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "cloud_with_lightning_and_rain"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "5.2"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🌤"
+  , "description": "sun behind small cloud"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "sun_behind_small_cloud"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "7.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🌥"
+  , "description": "sun behind large cloud"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "sun_behind_large_cloud"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "7.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🌦"
+  , "description": "sun behind rain cloud"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "sun_behind_rain_cloud"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "7.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🌧"
+  , "description": "cloud with rain"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "cloud_with_rain"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "7.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🌨"
+  , "description": "cloud with snow"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "cloud_with_snow"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "7.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🌩"
+  , "description": "cloud with lightning"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "cloud_with_lightning"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "7.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🌪"
+  , "description": "tornado"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "tornado"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "7.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🌫"
+  , "description": "fog"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "fog"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "7.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🌬"
+  , "description": "wind face"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "wind_face"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "7.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🌀"
+  , "description": "cyclone"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "cyclone"
+    ]
+  , "tags": [
+      "swirl"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🌈"
+  , "description": "rainbow"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "rainbow"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🌂"
+  , "description": "closed umbrella"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "closed_umbrella"
+    ]
+  , "tags": [
+      "weather"
+    , "rain"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "☂️"
+  , "description": "umbrella"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "open_umbrella"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": ""
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "☔"
+  , "description": "umbrella with rain drops"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "umbrella"
+    ]
+  , "tags": [
+      "rain"
+    , "weather"
+    ]
+  , "unicode_version": "4.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "⛱"
+  , "description": "umbrella on ground"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "parasol_on_ground"
+    ]
+  , "tags": [
+      "beach_umbrella"
+    ]
+  , "unicode_version": "5.2"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "⚡"
+  , "description": "high voltage"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "zap"
+    ]
+  , "tags": [
+      "lightning"
+    , "thunder"
+    ]
+  , "unicode_version": "4.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "❄️"
+  , "description": "snowflake"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "snowflake"
+    ]
+  , "tags": [
+      "winter"
+    , "cold"
+    , "weather"
+    ]
+  , "unicode_version": ""
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "☃️"
+  , "description": "snowman"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "snowman_with_snow"
+    ]
+  , "tags": [
+      "winter"
+    , "christmas"
+    ]
+  , "unicode_version": ""
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "⛄"
+  , "description": "snowman without snow"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "snowman"
+    ]
+  , "tags": [
+      "winter"
+    ]
+  , "unicode_version": "5.2"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "☄"
+  , "description": "comet"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "comet"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": ""
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🔥"
+  , "description": "fire"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "fire"
+    ]
+  , "tags": [
+      "burn"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "💧"
+  , "description": "droplet"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "droplet"
+    ]
+  , "tags": [
+      "water"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🌊"
+  , "description": "water wave"
+  , "category": "Travel & Places"
+  , "aliases": [
+      "ocean"
+    ]
+  , "tags": [
+      "sea"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🎃"
+  , "description": "jack-o-lantern"
+  , "category": "Activities"
+  , "aliases": [
+      "jack_o_lantern"
+    ]
+  , "tags": [
+      "halloween"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🎄"
+  , "description": "Christmas tree"
+  , "category": "Activities"
+  , "aliases": [
+      "christmas_tree"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🎆"
+  , "description": "fireworks"
+  , "category": "Activities"
+  , "aliases": [
+      "fireworks"
+    ]
+  , "tags": [
+      "festival"
+    , "celebration"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🎇"
+  , "description": "sparkler"
+  , "category": "Activities"
+  , "aliases": [
+      "sparkler"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🧨"
+  , "description": "firecracker"
+  , "category": "Activities"
+  , "aliases": [
+      "firecracker"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "✨"
+  , "description": "sparkles"
+  , "category": "Activities"
+  , "aliases": [
+      "sparkles"
+    ]
+  , "tags": [
+      "shiny"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🎈"
+  , "description": "balloon"
+  , "category": "Activities"
+  , "aliases": [
+      "balloon"
+    ]
+  , "tags": [
+      "party"
+    , "birthday"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🎉"
+  , "description": "party popper"
+  , "category": "Activities"
+  , "aliases": [
+      "tada"
+    ]
+  , "tags": [
+      "hooray"
+    , "party"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🎊"
+  , "description": "confetti ball"
+  , "category": "Activities"
+  , "aliases": [
+      "confetti_ball"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🎋"
+  , "description": "tanabata tree"
+  , "category": "Activities"
+  , "aliases": [
+      "tanabata_tree"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🎍"
+  , "description": "pine decoration"
+  , "category": "Activities"
+  , "aliases": [
+      "bamboo"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🎎"
+  , "description": "Japanese dolls"
+  , "category": "Activities"
+  , "aliases": [
+      "dolls"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🎏"
+  , "description": "carp streamer"
+  , "category": "Activities"
+  , "aliases": [
+      "flags"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🎐"
+  , "description": "wind chime"
+  , "category": "Activities"
+  , "aliases": [
+      "wind_chime"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🎑"
+  , "description": "moon viewing ceremony"
+  , "category": "Activities"
+  , "aliases": [
+      "rice_scene"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🧧"
+  , "description": "red envelope"
+  , "category": "Activities"
+  , "aliases": [
+      "red_envelope"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "🎀"
+  , "description": "ribbon"
+  , "category": "Activities"
+  , "aliases": [
+      "ribbon"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🎁"
+  , "description": "wrapped gift"
+  , "category": "Activities"
+  , "aliases": [
+      "gift"
+    ]
+  , "tags": [
+      "present"
+    , "birthday"
+    , "christmas"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🎗"
+  , "description": "reminder ribbon"
+  , "category": "Activities"
+  , "aliases": [
+      "reminder_ribbon"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "7.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🎟"
+  , "description": "admission tickets"
+  , "category": "Activities"
+  , "aliases": [
+      "tickets"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "7.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🎫"
+  , "description": "ticket"
+  , "category": "Activities"
+  , "aliases": [
+      "ticket"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🎖"
+  , "description": "military medal"
+  , "category": "Activities"
+  , "aliases": [
+      "medal_military"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "7.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🏆"
+  , "description": "trophy"
+  , "category": "Activities"
+  , "aliases": [
+      "trophy"
+    ]
+  , "tags": [
+      "award"
+    , "contest"
+    , "winner"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🏅"
+  , "description": "sports medal"
+  , "category": "Activities"
+  , "aliases": [
+      "medal_sports"
+    ]
+  , "tags": [
+      "gold"
+    , "winner"
+    ]
+  , "unicode_version": "7.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🥇"
+  , "description": "1st place medal"
+  , "category": "Activities"
+  , "aliases": [
+      "1st_place_medal"
+    ]
+  , "tags": [
+      "gold"
+    ]
+  , "unicode_version": "9.0"
+  , "ios_version": "10.2"
+  }
+, {
+    "emoji": "🥈"
+  , "description": "2nd place medal"
+  , "category": "Activities"
+  , "aliases": [
+      "2nd_place_medal"
+    ]
+  , "tags": [
+      "silver"
+    ]
+  , "unicode_version": "9.0"
+  , "ios_version": "10.2"
+  }
+, {
+    "emoji": "🥉"
+  , "description": "3rd place medal"
+  , "category": "Activities"
+  , "aliases": [
+      "3rd_place_medal"
+    ]
+  , "tags": [
+      "bronze"
+    ]
+  , "unicode_version": "9.0"
+  , "ios_version": "10.2"
+  }
+, {
+    "emoji": "⚽"
+  , "description": "soccer ball"
+  , "category": "Activities"
+  , "aliases": [
+      "soccer"
+    ]
+  , "tags": [
+      "sports"
+    ]
+  , "unicode_version": "5.2"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "⚾"
+  , "description": "baseball"
+  , "category": "Activities"
+  , "aliases": [
+      "baseball"
+    ]
+  , "tags": [
+      "sports"
+    ]
+  , "unicode_version": "5.2"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🥎"
+  , "description": "softball"
+  , "category": "Activities"
+  , "aliases": [
+      "softball"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "🏀"
+  , "description": "basketball"
+  , "category": "Activities"
+  , "aliases": [
+      "basketball"
+    ]
+  , "tags": [
+      "sports"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🏐"
+  , "description": "volleyball"
+  , "category": "Activities"
+  , "aliases": [
+      "volleyball"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "8.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🏈"
+  , "description": "american football"
+  , "category": "Activities"
+  , "aliases": [
+      "football"
+    ]
+  , "tags": [
+      "sports"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🏉"
+  , "description": "rugby football"
+  , "category": "Activities"
+  , "aliases": [
+      "rugby_football"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🎾"
+  , "description": "tennis"
+  , "category": "Activities"
+  , "aliases": [
+      "tennis"
+    ]
+  , "tags": [
+      "sports"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🥏"
+  , "description": "flying disc"
+  , "category": "Activities"
+  , "aliases": [
+      "flying_disc"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "🎳"
+  , "description": "bowling"
+  , "category": "Activities"
+  , "aliases": [
+      "bowling"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🏏"
+  , "description": "cricket game"
+  , "category": "Activities"
+  , "aliases": [
+      "cricket_game"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "8.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🏑"
+  , "description": "field hockey"
+  , "category": "Activities"
+  , "aliases": [
+      "field_hockey"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "8.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🏒"
+  , "description": "ice hockey"
+  , "category": "Activities"
+  , "aliases": [
+      "ice_hockey"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "8.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🥍"
+  , "description": "lacrosse"
+  , "category": "Activities"
+  , "aliases": [
+      "lacrosse"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "🏓"
+  , "description": "ping pong"
+  , "category": "Activities"
+  , "aliases": [
+      "ping_pong"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "8.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🏸"
+  , "description": "badminton"
+  , "category": "Activities"
+  , "aliases": [
+      "badminton"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "8.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🥊"
+  , "description": "boxing glove"
+  , "category": "Activities"
+  , "aliases": [
+      "boxing_glove"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "9.0"
+  , "ios_version": "10.2"
+  }
+, {
+    "emoji": "🥋"
+  , "description": "martial arts uniform"
+  , "category": "Activities"
+  , "aliases": [
+      "martial_arts_uniform"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "9.0"
+  , "ios_version": "10.2"
+  }
+, {
+    "emoji": "🥅"
+  , "description": "goal net"
+  , "category": "Activities"
+  , "aliases": [
+      "goal_net"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "9.0"
+  , "ios_version": "10.2"
+  }
+, {
+    "emoji": "⛳"
+  , "description": "flag in hole"
+  , "category": "Activities"
+  , "aliases": [
+      "golf"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "5.2"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "⛸"
+  , "description": "ice skate"
+  , "category": "Activities"
+  , "aliases": [
+      "ice_skate"
+    ]
+  , "tags": [
+      "skating"
+    ]
+  , "unicode_version": "5.2"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🎣"
+  , "description": "fishing pole"
+  , "category": "Activities"
+  , "aliases": [
+      "fishing_pole_and_fish"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🤿"
+  , "description": "diving mask"
+  , "category": "Activities"
+  , "aliases": [
+      "diving_mask"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "12.0"
+  , "ios_version": "13.0"
+  }
+, {
+    "emoji": "🎽"
+  , "description": "running shirt"
+  , "category": "Activities"
+  , "aliases": [
+      "running_shirt_with_sash"
+    ]
+  , "tags": [
+      "marathon"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🎿"
+  , "description": "skis"
+  , "category": "Activities"
+  , "aliases": [
+      "ski"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🛷"
+  , "description": "sled"
+  , "category": "Activities"
+  , "aliases": [
+      "sled"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "🥌"
+  , "description": "curling stone"
+  , "category": "Activities"
+  , "aliases": [
+      "curling_stone"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "🎯"
+  , "description": "direct hit"
+  , "category": "Activities"
+  , "aliases": [
+      "dart"
+    ]
+  , "tags": [
+      "target"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🪀"
+  , "description": "yo-yo"
+  , "category": "Activities"
+  , "aliases": [
+      "yo_yo"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "12.0"
+  , "ios_version": "13.0"
+  }
+, {
+    "emoji": "🪁"
+  , "description": "kite"
+  , "category": "Activities"
+  , "aliases": [
+      "kite"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "12.0"
+  , "ios_version": "13.0"
+  }
+, {
+    "emoji": "🎱"
+  , "description": "pool 8 ball"
+  , "category": "Activities"
+  , "aliases": [
+      "8ball"
+    ]
+  , "tags": [
+      "pool"
+    , "billiards"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🔮"
+  , "description": "crystal ball"
+  , "category": "Activities"
+  , "aliases": [
+      "crystal_ball"
+    ]
+  , "tags": [
+      "fortune"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🧿"
+  , "description": "nazar amulet"
+  , "category": "Activities"
+  , "aliases": [
+      "nazar_amulet"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "🎮"
+  , "description": "video game"
+  , "category": "Activities"
+  , "aliases": [
+      "video_game"
+    ]
+  , "tags": [
+      "play"
+    , "controller"
+    , "console"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🕹"
+  , "description": "joystick"
+  , "category": "Activities"
+  , "aliases": [
+      "joystick"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "7.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🎰"
+  , "description": "slot machine"
+  , "category": "Activities"
+  , "aliases": [
+      "slot_machine"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🎲"
+  , "description": "game die"
+  , "category": "Activities"
+  , "aliases": [
+      "game_die"
+    ]
+  , "tags": [
+      "dice"
+    , "gambling"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🧩"
+  , "description": "puzzle piece"
+  , "category": "Activities"
+  , "aliases": [
+      "jigsaw"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "🧸"
+  , "description": "teddy bear"
+  , "category": "Activities"
+  , "aliases": [
+      "teddy_bear"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "♠️"
+  , "description": "spade suit"
+  , "category": "Activities"
+  , "aliases": [
+      "spades"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": ""
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "♥️"
+  , "description": "heart suit"
+  , "category": "Activities"
+  , "aliases": [
+      "hearts"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": ""
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "♦️"
+  , "description": "diamond suit"
+  , "category": "Activities"
+  , "aliases": [
+      "diamonds"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": ""
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "♣️"
+  , "description": "club suit"
+  , "category": "Activities"
+  , "aliases": [
+      "clubs"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": ""
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "♟"
+  , "description": "chess pawn"
+  , "category": "Activities"
+  , "aliases": [
+      "chess_pawn"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "🃏"
+  , "description": "joker"
+  , "category": "Activities"
+  , "aliases": [
+      "black_joker"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🀄"
+  , "description": "mahjong red dragon"
+  , "category": "Activities"
+  , "aliases": [
+      "mahjong"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": ""
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🎴"
+  , "description": "flower playing cards"
+  , "category": "Activities"
+  , "aliases": [
+      "flower_playing_cards"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🎭"
+  , "description": "performing arts"
+  , "category": "Activities"
+  , "aliases": [
+      "performing_arts"
+    ]
+  , "tags": [
+      "theater"
+    , "drama"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🖼"
+  , "description": "framed picture"
+  , "category": "Activities"
+  , "aliases": [
+      "framed_picture"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "7.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🎨"
+  , "description": "artist palette"
+  , "category": "Activities"
+  , "aliases": [
+      "art"
+    ]
+  , "tags": [
+      "design"
+    , "paint"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🧵"
+  , "description": "thread"
+  , "category": "Activities"
+  , "aliases": [
+      "thread"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "🧶"
+  , "description": "yarn"
+  , "category": "Activities"
+  , "aliases": [
+      "yarn"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "👓"
+  , "description": "glasses"
+  , "category": "Objects"
+  , "aliases": [
+      "eyeglasses"
+    ]
+  , "tags": [
+      "glasses"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🕶"
+  , "description": "sunglasses"
+  , "category": "Objects"
+  , "aliases": [
+      "dark_sunglasses"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "7.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🥽"
+  , "description": "goggles"
+  , "category": "Objects"
+  , "aliases": [
+      "goggles"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "🥼"
+  , "description": "lab coat"
+  , "category": "Objects"
+  , "aliases": [
+      "lab_coat"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "🦺"
+  , "description": "safety vest"
+  , "category": "Objects"
+  , "aliases": [
+      "safety_vest"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "12.0"
+  , "ios_version": "13.0"
+  }
+, {
+    "emoji": "👔"
+  , "description": "necktie"
+  , "category": "Objects"
+  , "aliases": [
+      "necktie"
+    ]
+  , "tags": [
+      "shirt"
+    , "formal"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "👕"
+  , "description": "t-shirt"
+  , "category": "Objects"
+  , "aliases": [
+      "shirt"
+    , "tshirt"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "👖"
+  , "description": "jeans"
+  , "category": "Objects"
+  , "aliases": [
+      "jeans"
+    ]
+  , "tags": [
+      "pants"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🧣"
+  , "description": "scarf"
+  , "category": "Objects"
+  , "aliases": [
+      "scarf"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "🧤"
+  , "description": "gloves"
+  , "category": "Objects"
+  , "aliases": [
+      "gloves"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "🧥"
+  , "description": "coat"
+  , "category": "Objects"
+  , "aliases": [
+      "coat"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "🧦"
+  , "description": "socks"
+  , "category": "Objects"
+  , "aliases": [
+      "socks"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "👗"
+  , "description": "dress"
+  , "category": "Objects"
+  , "aliases": [
+      "dress"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "👘"
+  , "description": "kimono"
+  , "category": "Objects"
+  , "aliases": [
+      "kimono"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🥻"
+  , "description": "sari"
+  , "category": "Objects"
+  , "aliases": [
+      "sari"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "12.0"
+  , "ios_version": "13.0"
+  }
+, {
+    "emoji": "🩱"
+  , "description": "one-piece swimsuit"
+  , "category": "Objects"
+  , "aliases": [
+      "one_piece_swimsuit"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "12.0"
+  , "ios_version": "13.0"
+  }
+, {
+    "emoji": "🩲"
+  , "description": "swim brief"
+  , "category": "Objects"
+  , "aliases": [
+      "swim_brief"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "12.0"
+  , "ios_version": "13.0"
+  }
+, {
+    "emoji": "🩳"
+  , "description": "shorts"
+  , "category": "Objects"
+  , "aliases": [
+      "shorts"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "12.0"
+  , "ios_version": "13.0"
+  }
+, {
+    "emoji": "👙"
+  , "description": "bikini"
+  , "category": "Objects"
+  , "aliases": [
+      "bikini"
+    ]
+  , "tags": [
+      "beach"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "👚"
+  , "description": "woman’s clothes"
+  , "category": "Objects"
+  , "aliases": [
+      "womans_clothes"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "👛"
+  , "description": "purse"
+  , "category": "Objects"
+  , "aliases": [
+      "purse"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "👜"
+  , "description": "handbag"
+  , "category": "Objects"
+  , "aliases": [
+      "handbag"
+    ]
+  , "tags": [
+      "bag"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "👝"
+  , "description": "clutch bag"
+  , "category": "Objects"
+  , "aliases": [
+      "pouch"
+    ]
+  , "tags": [
+      "bag"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🛍"
+  , "description": "shopping bags"
+  , "category": "Objects"
+  , "aliases": [
+      "shopping"
+    ]
+  , "tags": [
+      "bags"
+    ]
+  , "unicode_version": "7.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🎒"
+  , "description": "backpack"
+  , "category": "Objects"
+  , "aliases": [
+      "school_satchel"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "👞"
+  , "description": "man’s shoe"
+  , "category": "Objects"
+  , "aliases": [
+      "mans_shoe"
+    , "shoe"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "👟"
+  , "description": "running shoe"
+  , "category": "Objects"
+  , "aliases": [
+      "athletic_shoe"
+    ]
+  , "tags": [
+      "sneaker"
+    , "sport"
+    , "running"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🥾"
+  , "description": "hiking boot"
+  , "category": "Objects"
+  , "aliases": [
+      "hiking_boot"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "🥿"
+  , "description": "flat shoe"
+  , "category": "Objects"
+  , "aliases": [
+      "flat_shoe"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "👠"
+  , "description": "high-heeled shoe"
+  , "category": "Objects"
+  , "aliases": [
+      "high_heel"
+    ]
+  , "tags": [
+      "shoe"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "👡"
+  , "description": "woman’s sandal"
+  , "category": "Objects"
+  , "aliases": [
+      "sandal"
+    ]
+  , "tags": [
+      "shoe"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🩰"
+  , "description": "ballet shoes"
+  , "category": "Objects"
+  , "aliases": [
+      "ballet_shoes"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "12.0"
+  , "ios_version": "13.0"
+  }
+, {
+    "emoji": "👢"
+  , "description": "woman’s boot"
+  , "category": "Objects"
+  , "aliases": [
+      "boot"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "👑"
+  , "description": "crown"
+  , "category": "Objects"
+  , "aliases": [
+      "crown"
+    ]
+  , "tags": [
+      "king"
+    , "queen"
+    , "royal"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "👒"
+  , "description": "woman’s hat"
+  , "category": "Objects"
+  , "aliases": [
+      "womans_hat"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🎩"
+  , "description": "top hat"
+  , "category": "Objects"
+  , "aliases": [
+      "tophat"
+    ]
+  , "tags": [
+      "hat"
+    , "classy"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🎓"
+  , "description": "graduation cap"
+  , "category": "Objects"
+  , "aliases": [
+      "mortar_board"
+    ]
+  , "tags": [
+      "education"
+    , "college"
+    , "university"
+    , "graduation"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🧢"
+  , "description": "billed cap"
+  , "category": "Objects"
+  , "aliases": [
+      "billed_cap"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "⛑"
+  , "description": "rescue worker’s helmet"
+  , "category": "Objects"
+  , "aliases": [
+      "rescue_worker_helmet"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "5.2"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "📿"
+  , "description": "prayer beads"
+  , "category": "Objects"
+  , "aliases": [
+      "prayer_beads"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "8.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "💄"
+  , "description": "lipstick"
+  , "category": "Objects"
+  , "aliases": [
+      "lipstick"
+    ]
+  , "tags": [
+      "makeup"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "💍"
+  , "description": "ring"
+  , "category": "Objects"
+  , "aliases": [
+      "ring"
+    ]
+  , "tags": [
+      "wedding"
+    , "marriage"
+    , "engaged"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "💎"
+  , "description": "gem stone"
+  , "category": "Objects"
+  , "aliases": [
+      "gem"
+    ]
+  , "tags": [
+      "diamond"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🔇"
+  , "description": "muted speaker"
+  , "category": "Objects"
+  , "aliases": [
+      "mute"
+    ]
+  , "tags": [
+      "sound"
+    , "volume"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🔈"
+  , "description": "speaker low volume"
+  , "category": "Objects"
+  , "aliases": [
+      "speaker"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🔉"
+  , "description": "speaker medium volume"
+  , "category": "Objects"
+  , "aliases": [
+      "sound"
+    ]
+  , "tags": [
+      "volume"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🔊"
+  , "description": "speaker high volume"
+  , "category": "Objects"
+  , "aliases": [
+      "loud_sound"
+    ]
+  , "tags": [
+      "volume"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "📢"
+  , "description": "loudspeaker"
+  , "category": "Objects"
+  , "aliases": [
+      "loudspeaker"
+    ]
+  , "tags": [
+      "announcement"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "📣"
+  , "description": "megaphone"
+  , "category": "Objects"
+  , "aliases": [
+      "mega"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "📯"
+  , "description": "postal horn"
+  , "category": "Objects"
+  , "aliases": [
+      "postal_horn"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🔔"
+  , "description": "bell"
+  , "category": "Objects"
+  , "aliases": [
+      "bell"
+    ]
+  , "tags": [
+      "sound"
+    , "notification"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🔕"
+  , "description": "bell with slash"
+  , "category": "Objects"
+  , "aliases": [
+      "no_bell"
+    ]
+  , "tags": [
+      "volume"
+    , "off"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🎼"
+  , "description": "musical score"
+  , "category": "Objects"
+  , "aliases": [
+      "musical_score"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🎵"
+  , "description": "musical note"
+  , "category": "Objects"
+  , "aliases": [
+      "musical_note"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🎶"
+  , "description": "musical notes"
+  , "category": "Objects"
+  , "aliases": [
+      "notes"
+    ]
+  , "tags": [
+      "music"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🎙"
+  , "description": "studio microphone"
+  , "category": "Objects"
+  , "aliases": [
+      "studio_microphone"
+    ]
+  , "tags": [
+      "podcast"
+    ]
+  , "unicode_version": "7.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🎚"
+  , "description": "level slider"
+  , "category": "Objects"
+  , "aliases": [
+      "level_slider"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "7.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🎛"
+  , "description": "control knobs"
+  , "category": "Objects"
+  , "aliases": [
+      "control_knobs"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "7.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🎤"
+  , "description": "microphone"
+  , "category": "Objects"
+  , "aliases": [
+      "microphone"
+    ]
+  , "tags": [
+      "sing"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🎧"
+  , "description": "headphone"
+  , "category": "Objects"
+  , "aliases": [
+      "headphones"
+    ]
+  , "tags": [
+      "music"
+    , "earphones"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "📻"
+  , "description": "radio"
+  , "category": "Objects"
+  , "aliases": [
+      "radio"
+    ]
+  , "tags": [
+      "podcast"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🎷"
+  , "description": "saxophone"
+  , "category": "Objects"
+  , "aliases": [
+      "saxophone"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🎸"
+  , "description": "guitar"
+  , "category": "Objects"
+  , "aliases": [
+      "guitar"
+    ]
+  , "tags": [
+      "rock"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🎹"
+  , "description": "musical keyboard"
+  , "category": "Objects"
+  , "aliases": [
+      "musical_keyboard"
+    ]
+  , "tags": [
+      "piano"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🎺"
+  , "description": "trumpet"
+  , "category": "Objects"
+  , "aliases": [
+      "trumpet"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🎻"
+  , "description": "violin"
+  , "category": "Objects"
+  , "aliases": [
+      "violin"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🪕"
+  , "description": "banjo"
+  , "category": "Objects"
+  , "aliases": [
+      "banjo"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "12.0"
+  , "ios_version": "13.0"
+  }
+, {
+    "emoji": "🥁"
+  , "description": "drum"
+  , "category": "Objects"
+  , "aliases": [
+      "drum"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": ""
+  , "ios_version": "10.2"
+  }
+, {
+    "emoji": "📱"
+  , "description": "mobile phone"
+  , "category": "Objects"
+  , "aliases": [
+      "iphone"
+    ]
+  , "tags": [
+      "smartphone"
+    , "mobile"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "📲"
+  , "description": "mobile phone with arrow"
+  , "category": "Objects"
+  , "aliases": [
+      "calling"
+    ]
+  , "tags": [
+      "call"
+    , "incoming"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "☎️"
+  , "description": "telephone"
+  , "category": "Objects"
+  , "aliases": [
+      "phone"
+    , "telephone"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": ""
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "📞"
+  , "description": "telephone receiver"
+  , "category": "Objects"
+  , "aliases": [
+      "telephone_receiver"
+    ]
+  , "tags": [
+      "phone"
+    , "call"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "📟"
+  , "description": "pager"
+  , "category": "Objects"
+  , "aliases": [
+      "pager"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "📠"
+  , "description": "fax machine"
+  , "category": "Objects"
+  , "aliases": [
+      "fax"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🔋"
+  , "description": "battery"
+  , "category": "Objects"
+  , "aliases": [
+      "battery"
+    ]
+  , "tags": [
+      "power"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🔌"
+  , "description": "electric plug"
+  , "category": "Objects"
+  , "aliases": [
+      "electric_plug"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "💻"
+  , "description": "laptop computer"
+  , "category": "Objects"
+  , "aliases": [
+      "computer"
+    ]
+  , "tags": [
+      "desktop"
+    , "screen"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🖥"
+  , "description": "desktop computer"
+  , "category": "Objects"
+  , "aliases": [
+      "desktop_computer"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "7.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🖨"
+  , "description": "printer"
+  , "category": "Objects"
+  , "aliases": [
+      "printer"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "7.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "⌨"
+  , "description": "keyboard"
+  , "category": "Objects"
+  , "aliases": [
+      "keyboard"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": ""
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🖱"
+  , "description": "computer mouse"
+  , "category": "Objects"
+  , "aliases": [
+      "computer_mouse"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "7.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🖲"
+  , "description": "trackball"
+  , "category": "Objects"
+  , "aliases": [
+      "trackball"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "7.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "💽"
+  , "description": "computer disk"
+  , "category": "Objects"
+  , "aliases": [
+      "minidisc"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "💾"
+  , "description": "floppy disk"
+  , "category": "Objects"
+  , "aliases": [
+      "floppy_disk"
+    ]
+  , "tags": [
+      "save"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "💿"
+  , "description": "optical disk"
+  , "category": "Objects"
+  , "aliases": [
+      "cd"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "📀"
+  , "description": "dvd"
+  , "category": "Objects"
+  , "aliases": [
+      "dvd"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🧮"
+  , "description": "abacus"
+  , "category": "Objects"
+  , "aliases": [
+      "abacus"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "🎥"
+  , "description": "movie camera"
+  , "category": "Objects"
+  , "aliases": [
+      "movie_camera"
+    ]
+  , "tags": [
+      "film"
+    , "video"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🎞"
+  , "description": "film frames"
+  , "category": "Objects"
+  , "aliases": [
+      "film_strip"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "7.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "📽"
+  , "description": "film projector"
+  , "category": "Objects"
+  , "aliases": [
+      "film_projector"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "7.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🎬"
+  , "description": "clapper board"
+  , "category": "Objects"
+  , "aliases": [
+      "clapper"
+    ]
+  , "tags": [
+      "film"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "📺"
+  , "description": "television"
+  , "category": "Objects"
+  , "aliases": [
+      "tv"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "📷"
+  , "description": "camera"
+  , "category": "Objects"
+  , "aliases": [
+      "camera"
+    ]
+  , "tags": [
+      "photo"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "📸"
+  , "description": "camera with flash"
+  , "category": "Objects"
+  , "aliases": [
+      "camera_flash"
+    ]
+  , "tags": [
+      "photo"
+    ]
+  , "unicode_version": "7.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "📹"
+  , "description": "video camera"
+  , "category": "Objects"
+  , "aliases": [
+      "video_camera"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "📼"
+  , "description": "videocassette"
+  , "category": "Objects"
+  , "aliases": [
+      "vhs"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🔍"
+  , "description": "magnifying glass tilted left"
+  , "category": "Objects"
+  , "aliases": [
+      "mag"
+    ]
+  , "tags": [
+      "search"
+    , "zoom"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🔎"
+  , "description": "magnifying glass tilted right"
+  , "category": "Objects"
+  , "aliases": [
+      "mag_right"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🕯"
+  , "description": "candle"
+  , "category": "Objects"
+  , "aliases": [
+      "candle"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "7.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "💡"
+  , "description": "light bulb"
+  , "category": "Objects"
+  , "aliases": [
+      "bulb"
+    ]
+  , "tags": [
+      "idea"
+    , "light"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🔦"
+  , "description": "flashlight"
+  , "category": "Objects"
+  , "aliases": [
+      "flashlight"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🏮"
+  , "description": "red paper lantern"
+  , "category": "Objects"
+  , "aliases": [
+      "izakaya_lantern"
+    , "lantern"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🪔"
+  , "description": "diya lamp"
+  , "category": "Objects"
+  , "aliases": [
+      "diya_lamp"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "12.0"
+  , "ios_version": "13.0"
+  }
+, {
+    "emoji": "📔"
+  , "description": "notebook with decorative cover"
+  , "category": "Objects"
+  , "aliases": [
+      "notebook_with_decorative_cover"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "📕"
+  , "description": "closed book"
+  , "category": "Objects"
+  , "aliases": [
+      "closed_book"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "📖"
+  , "description": "open book"
+  , "category": "Objects"
+  , "aliases": [
+      "book"
+    , "open_book"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "📗"
+  , "description": "green book"
+  , "category": "Objects"
+  , "aliases": [
+      "green_book"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "📘"
+  , "description": "blue book"
+  , "category": "Objects"
+  , "aliases": [
+      "blue_book"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "📙"
+  , "description": "orange book"
+  , "category": "Objects"
+  , "aliases": [
+      "orange_book"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "📚"
+  , "description": "books"
+  , "category": "Objects"
+  , "aliases": [
+      "books"
+    ]
+  , "tags": [
+      "library"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "📓"
+  , "description": "notebook"
+  , "category": "Objects"
+  , "aliases": [
+      "notebook"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "📒"
+  , "description": "ledger"
+  , "category": "Objects"
+  , "aliases": [
+      "ledger"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "📃"
+  , "description": "page with curl"
+  , "category": "Objects"
+  , "aliases": [
+      "page_with_curl"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "📜"
+  , "description": "scroll"
+  , "category": "Objects"
+  , "aliases": [
+      "scroll"
+    ]
+  , "tags": [
+      "document"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "📄"
+  , "description": "page facing up"
+  , "category": "Objects"
+  , "aliases": [
+      "page_facing_up"
+    ]
+  , "tags": [
+      "document"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "📰"
+  , "description": "newspaper"
+  , "category": "Objects"
+  , "aliases": [
+      "newspaper"
+    ]
+  , "tags": [
+      "press"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🗞"
+  , "description": "rolled-up newspaper"
+  , "category": "Objects"
+  , "aliases": [
+      "newspaper_roll"
+    ]
+  , "tags": [
+      "press"
+    ]
+  , "unicode_version": "7.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "📑"
+  , "description": "bookmark tabs"
+  , "category": "Objects"
+  , "aliases": [
+      "bookmark_tabs"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🔖"
+  , "description": "bookmark"
+  , "category": "Objects"
+  , "aliases": [
+      "bookmark"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🏷"
+  , "description": "label"
+  , "category": "Objects"
+  , "aliases": [
+      "label"
+    ]
+  , "tags": [
+      "tag"
+    ]
+  , "unicode_version": "7.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "💰"
+  , "description": "money bag"
+  , "category": "Objects"
+  , "aliases": [
+      "moneybag"
+    ]
+  , "tags": [
+      "dollar"
+    , "cream"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "💴"
+  , "description": "yen banknote"
+  , "category": "Objects"
+  , "aliases": [
+      "yen"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "💵"
+  , "description": "dollar banknote"
+  , "category": "Objects"
+  , "aliases": [
+      "dollar"
+    ]
+  , "tags": [
+      "money"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "💶"
+  , "description": "euro banknote"
+  , "category": "Objects"
+  , "aliases": [
+      "euro"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "💷"
+  , "description": "pound banknote"
+  , "category": "Objects"
+  , "aliases": [
+      "pound"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "💸"
+  , "description": "money with wings"
+  , "category": "Objects"
+  , "aliases": [
+      "money_with_wings"
+    ]
+  , "tags": [
+      "dollar"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "💳"
+  , "description": "credit card"
+  , "category": "Objects"
+  , "aliases": [
+      "credit_card"
+    ]
+  , "tags": [
+      "subscription"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🧾"
+  , "description": "receipt"
+  , "category": "Objects"
+  , "aliases": [
+      "receipt"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "💹"
+  , "description": "chart increasing with yen"
+  , "category": "Objects"
+  , "aliases": [
+      "chart"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "💱"
+  , "description": "currency exchange"
+  , "category": "Objects"
+  , "aliases": [
+      "currency_exchange"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "💲"
+  , "description": "heavy dollar sign"
+  , "category": "Objects"
+  , "aliases": [
+      "heavy_dollar_sign"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "✉️"
+  , "description": "envelope"
+  , "category": "Objects"
+  , "aliases": [
+      "email"
+    , "envelope"
+    ]
+  , "tags": [
+      "letter"
+    ]
+  , "unicode_version": ""
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "📧"
+  , "description": "e-mail"
+  , "category": "Objects"
+  , "aliases": [
+      "e-mail"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "📨"
+  , "description": "incoming envelope"
+  , "category": "Objects"
+  , "aliases": [
+      "incoming_envelope"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "📩"
+  , "description": "envelope with arrow"
+  , "category": "Objects"
+  , "aliases": [
+      "envelope_with_arrow"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "📤"
+  , "description": "outbox tray"
+  , "category": "Objects"
+  , "aliases": [
+      "outbox_tray"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "📥"
+  , "description": "inbox tray"
+  , "category": "Objects"
+  , "aliases": [
+      "inbox_tray"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "📦"
+  , "description": "package"
+  , "category": "Objects"
+  , "aliases": [
+      "package"
+    ]
+  , "tags": [
+      "shipping"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "📫"
+  , "description": "closed mailbox with raised flag"
+  , "category": "Objects"
+  , "aliases": [
+      "mailbox"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "📪"
+  , "description": "closed mailbox with lowered flag"
+  , "category": "Objects"
+  , "aliases": [
+      "mailbox_closed"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "📬"
+  , "description": "open mailbox with raised flag"
+  , "category": "Objects"
+  , "aliases": [
+      "mailbox_with_mail"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "📭"
+  , "description": "open mailbox with lowered flag"
+  , "category": "Objects"
+  , "aliases": [
+      "mailbox_with_no_mail"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "📮"
+  , "description": "postbox"
+  , "category": "Objects"
+  , "aliases": [
+      "postbox"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🗳"
+  , "description": "ballot box with ballot"
+  , "category": "Objects"
+  , "aliases": [
+      "ballot_box"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "7.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "✏️"
+  , "description": "pencil"
+  , "category": "Objects"
+  , "aliases": [
+      "pencil2"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": ""
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "✒️"
+  , "description": "black nib"
+  , "category": "Objects"
+  , "aliases": [
+      "black_nib"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": ""
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🖋"
+  , "description": "fountain pen"
+  , "category": "Objects"
+  , "aliases": [
+      "fountain_pen"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "7.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🖊"
+  , "description": "pen"
+  , "category": "Objects"
+  , "aliases": [
+      "pen"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "7.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🖌"
+  , "description": "paintbrush"
+  , "category": "Objects"
+  , "aliases": [
+      "paintbrush"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "7.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🖍"
+  , "description": "crayon"
+  , "category": "Objects"
+  , "aliases": [
+      "crayon"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "7.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "📝"
+  , "description": "memo"
+  , "category": "Objects"
+  , "aliases": [
+      "memo"
+    , "pencil"
+    ]
+  , "tags": [
+      "document"
+    , "note"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "💼"
+  , "description": "briefcase"
+  , "category": "Objects"
+  , "aliases": [
+      "briefcase"
+    ]
+  , "tags": [
+      "business"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "📁"
+  , "description": "file folder"
+  , "category": "Objects"
+  , "aliases": [
+      "file_folder"
+    ]
+  , "tags": [
+      "directory"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "📂"
+  , "description": "open file folder"
+  , "category": "Objects"
+  , "aliases": [
+      "open_file_folder"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🗂"
+  , "description": "card index dividers"
+  , "category": "Objects"
+  , "aliases": [
+      "card_index_dividers"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "7.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "📅"
+  , "description": "calendar"
+  , "category": "Objects"
+  , "aliases": [
+      "date"
+    ]
+  , "tags": [
+      "calendar"
+    , "schedule"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "📆"
+  , "description": "tear-off calendar"
+  , "category": "Objects"
+  , "aliases": [
+      "calendar"
+    ]
+  , "tags": [
+      "schedule"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🗒"
+  , "description": "spiral notepad"
+  , "category": "Objects"
+  , "aliases": [
+      "spiral_notepad"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "7.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🗓"
+  , "description": "spiral calendar"
+  , "category": "Objects"
+  , "aliases": [
+      "spiral_calendar"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "7.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "📇"
+  , "description": "card index"
+  , "category": "Objects"
+  , "aliases": [
+      "card_index"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "📈"
+  , "description": "chart increasing"
+  , "category": "Objects"
+  , "aliases": [
+      "chart_with_upwards_trend"
+    ]
+  , "tags": [
+      "graph"
+    , "metrics"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "📉"
+  , "description": "chart decreasing"
+  , "category": "Objects"
+  , "aliases": [
+      "chart_with_downwards_trend"
+    ]
+  , "tags": [
+      "graph"
+    , "metrics"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "📊"
+  , "description": "bar chart"
+  , "category": "Objects"
+  , "aliases": [
+      "bar_chart"
+    ]
+  , "tags": [
+      "stats"
+    , "metrics"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "📋"
+  , "description": "clipboard"
+  , "category": "Objects"
+  , "aliases": [
+      "clipboard"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "📌"
+  , "description": "pushpin"
+  , "category": "Objects"
+  , "aliases": [
+      "pushpin"
+    ]
+  , "tags": [
+      "location"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "📍"
+  , "description": "round pushpin"
+  , "category": "Objects"
+  , "aliases": [
+      "round_pushpin"
+    ]
+  , "tags": [
+      "location"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "📎"
+  , "description": "paperclip"
+  , "category": "Objects"
+  , "aliases": [
+      "paperclip"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🖇"
+  , "description": "linked paperclips"
+  , "category": "Objects"
+  , "aliases": [
+      "paperclips"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "7.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "📏"
+  , "description": "straight ruler"
+  , "category": "Objects"
+  , "aliases": [
+      "straight_ruler"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "📐"
+  , "description": "triangular ruler"
+  , "category": "Objects"
+  , "aliases": [
+      "triangular_ruler"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "✂️"
+  , "description": "scissors"
+  , "category": "Objects"
+  , "aliases": [
+      "scissors"
+    ]
+  , "tags": [
+      "cut"
+    ]
+  , "unicode_version": ""
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🗃"
+  , "description": "card file box"
+  , "category": "Objects"
+  , "aliases": [
+      "card_file_box"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "7.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🗄"
+  , "description": "file cabinet"
+  , "category": "Objects"
+  , "aliases": [
+      "file_cabinet"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "7.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🗑"
+  , "description": "wastebasket"
+  , "category": "Objects"
+  , "aliases": [
+      "wastebasket"
+    ]
+  , "tags": [
+      "trash"
+    ]
+  , "unicode_version": "7.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🔒"
+  , "description": "locked"
+  , "category": "Objects"
+  , "aliases": [
+      "lock"
+    ]
+  , "tags": [
+      "security"
+    , "private"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🔓"
+  , "description": "unlocked"
+  , "category": "Objects"
+  , "aliases": [
+      "unlock"
+    ]
+  , "tags": [
+      "security"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🔏"
+  , "description": "locked with pen"
+  , "category": "Objects"
+  , "aliases": [
+      "lock_with_ink_pen"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🔐"
+  , "description": "locked with key"
+  , "category": "Objects"
+  , "aliases": [
+      "closed_lock_with_key"
+    ]
+  , "tags": [
+      "security"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🔑"
+  , "description": "key"
+  , "category": "Objects"
+  , "aliases": [
+      "key"
+    ]
+  , "tags": [
+      "lock"
+    , "password"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🗝"
+  , "description": "old key"
+  , "category": "Objects"
+  , "aliases": [
+      "old_key"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "7.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🔨"
+  , "description": "hammer"
+  , "category": "Objects"
+  , "aliases": [
+      "hammer"
+    ]
+  , "tags": [
+      "tool"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🪓"
+  , "description": "axe"
+  , "category": "Objects"
+  , "aliases": [
+      "axe"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "12.0"
+  , "ios_version": "13.0"
+  }
+, {
+    "emoji": "⛏"
+  , "description": "pick"
+  , "category": "Objects"
+  , "aliases": [
+      "pick"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "5.2"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "⚒"
+  , "description": "hammer and pick"
+  , "category": "Objects"
+  , "aliases": [
+      "hammer_and_pick"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "4.1"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🛠"
+  , "description": "hammer and wrench"
+  , "category": "Objects"
+  , "aliases": [
+      "hammer_and_wrench"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "7.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🗡"
+  , "description": "dagger"
+  , "category": "Objects"
+  , "aliases": [
+      "dagger"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "7.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "⚔"
+  , "description": "crossed swords"
+  , "category": "Objects"
+  , "aliases": [
+      "crossed_swords"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "4.1"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🔫"
+  , "description": "pistol"
+  , "category": "Objects"
+  , "aliases": [
+      "gun"
+    ]
+  , "tags": [
+      "shoot"
+    , "weapon"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🏹"
+  , "description": "bow and arrow"
+  , "category": "Objects"
+  , "aliases": [
+      "bow_and_arrow"
+    ]
+  , "tags": [
+      "archery"
+    ]
+  , "unicode_version": "8.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🛡"
+  , "description": "shield"
+  , "category": "Objects"
+  , "aliases": [
+      "shield"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "7.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🔧"
+  , "description": "wrench"
+  , "category": "Objects"
+  , "aliases": [
+      "wrench"
+    ]
+  , "tags": [
+      "tool"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🔩"
+  , "description": "nut and bolt"
+  , "category": "Objects"
+  , "aliases": [
+      "nut_and_bolt"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "⚙"
+  , "description": "gear"
+  , "category": "Objects"
+  , "aliases": [
+      "gear"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "4.1"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🗜"
+  , "description": "clamp"
+  , "category": "Objects"
+  , "aliases": [
+      "clamp"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "7.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "⚖"
+  , "description": "balance scale"
+  , "category": "Objects"
+  , "aliases": [
+      "balance_scale"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "4.1"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🦯"
+  , "description": "probing cane"
+  , "category": "Objects"
+  , "aliases": [
+      "probing_cane"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "12.0"
+  , "ios_version": "13.0"
+  }
+, {
+    "emoji": "🔗"
+  , "description": "link"
+  , "category": "Objects"
+  , "aliases": [
+      "link"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "⛓"
+  , "description": "chains"
+  , "category": "Objects"
+  , "aliases": [
+      "chains"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "5.2"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🧰"
+  , "description": "toolbox"
+  , "category": "Objects"
+  , "aliases": [
+      "toolbox"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "🧲"
+  , "description": "magnet"
+  , "category": "Objects"
+  , "aliases": [
+      "magnet"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "⚗"
+  , "description": "alembic"
+  , "category": "Objects"
+  , "aliases": [
+      "alembic"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "4.1"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🧪"
+  , "description": "test tube"
+  , "category": "Objects"
+  , "aliases": [
+      "test_tube"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "🧫"
+  , "description": "petri dish"
+  , "category": "Objects"
+  , "aliases": [
+      "petri_dish"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "🧬"
+  , "description": "dna"
+  , "category": "Objects"
+  , "aliases": [
+      "dna"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "🔬"
+  , "description": "microscope"
+  , "category": "Objects"
+  , "aliases": [
+      "microscope"
+    ]
+  , "tags": [
+      "science"
+    , "laboratory"
+    , "investigate"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🔭"
+  , "description": "telescope"
+  , "category": "Objects"
+  , "aliases": [
+      "telescope"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "📡"
+  , "description": "satellite antenna"
+  , "category": "Objects"
+  , "aliases": [
+      "satellite"
+    ]
+  , "tags": [
+      "signal"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "💉"
+  , "description": "syringe"
+  , "category": "Objects"
+  , "aliases": [
+      "syringe"
+    ]
+  , "tags": [
+      "health"
+    , "hospital"
+    , "needle"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🩸"
+  , "description": "drop of blood"
+  , "category": "Objects"
+  , "aliases": [
+      "drop_of_blood"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "12.0"
+  , "ios_version": "13.0"
+  }
+, {
+    "emoji": "💊"
+  , "description": "pill"
+  , "category": "Objects"
+  , "aliases": [
+      "pill"
+    ]
+  , "tags": [
+      "health"
+    , "medicine"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🩹"
+  , "description": "adhesive bandage"
+  , "category": "Objects"
+  , "aliases": [
+      "adhesive_bandage"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "12.0"
+  , "ios_version": "13.0"
+  }
+, {
+    "emoji": "🩺"
+  , "description": "stethoscope"
+  , "category": "Objects"
+  , "aliases": [
+      "stethoscope"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "12.0"
+  , "ios_version": "13.0"
+  }
+, {
+    "emoji": "🚪"
+  , "description": "door"
+  , "category": "Objects"
+  , "aliases": [
+      "door"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🛏"
+  , "description": "bed"
+  , "category": "Objects"
+  , "aliases": [
+      "bed"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "7.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🛋"
+  , "description": "couch and lamp"
+  , "category": "Objects"
+  , "aliases": [
+      "couch_and_lamp"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "7.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🪑"
+  , "description": "chair"
+  , "category": "Objects"
+  , "aliases": [
+      "chair"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "12.0"
+  , "ios_version": "13.0"
+  }
+, {
+    "emoji": "🚽"
+  , "description": "toilet"
+  , "category": "Objects"
+  , "aliases": [
+      "toilet"
+    ]
+  , "tags": [
+      "wc"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🚿"
+  , "description": "shower"
+  , "category": "Objects"
+  , "aliases": [
+      "shower"
+    ]
+  , "tags": [
+      "bath"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🛁"
+  , "description": "bathtub"
+  , "category": "Objects"
+  , "aliases": [
+      "bathtub"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🪒"
+  , "description": "razor"
+  , "category": "Objects"
+  , "aliases": [
+      "razor"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "12.0"
+  , "ios_version": "13.0"
+  }
+, {
+    "emoji": "🧴"
+  , "description": "lotion bottle"
+  , "category": "Objects"
+  , "aliases": [
+      "lotion_bottle"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "🧷"
+  , "description": "safety pin"
+  , "category": "Objects"
+  , "aliases": [
+      "safety_pin"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "🧹"
+  , "description": "broom"
+  , "category": "Objects"
+  , "aliases": [
+      "broom"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "🧺"
+  , "description": "basket"
+  , "category": "Objects"
+  , "aliases": [
+      "basket"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "🧻"
+  , "description": "roll of paper"
+  , "category": "Objects"
+  , "aliases": [
+      "roll_of_paper"
+    ]
+  , "tags": [
+      "toilet"
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "🧼"
+  , "description": "soap"
+  , "category": "Objects"
+  , "aliases": [
+      "soap"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "🧽"
+  , "description": "sponge"
+  , "category": "Objects"
+  , "aliases": [
+      "sponge"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "🧯"
+  , "description": "fire extinguisher"
+  , "category": "Objects"
+  , "aliases": [
+      "fire_extinguisher"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "🛒"
+  , "description": "shopping cart"
+  , "category": "Objects"
+  , "aliases": [
+      "shopping_cart"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "9.0"
+  , "ios_version": "10.2"
+  }
+, {
+    "emoji": "🚬"
+  , "description": "cigarette"
+  , "category": "Objects"
+  , "aliases": [
+      "smoking"
+    ]
+  , "tags": [
+      "cigarette"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "⚰"
+  , "description": "coffin"
+  , "category": "Objects"
+  , "aliases": [
+      "coffin"
+    ]
+  , "tags": [
+      "funeral"
+    ]
+  , "unicode_version": "4.1"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "⚱"
+  , "description": "funeral urn"
+  , "category": "Objects"
+  , "aliases": [
+      "funeral_urn"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "4.1"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🗿"
+  , "description": "moai"
+  , "category": "Objects"
+  , "aliases": [
+      "moyai"
+    ]
+  , "tags": [
+      "stone"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🏧"
+  , "description": "ATM sign"
+  , "category": "Symbols"
+  , "aliases": [
+      "atm"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🚮"
+  , "description": "litter in bin sign"
+  , "category": "Symbols"
+  , "aliases": [
+      "put_litter_in_its_place"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🚰"
+  , "description": "potable water"
+  , "category": "Symbols"
+  , "aliases": [
+      "potable_water"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "♿"
+  , "description": "wheelchair symbol"
+  , "category": "Symbols"
+  , "aliases": [
+      "wheelchair"
+    ]
+  , "tags": [
+      "accessibility"
+    ]
+  , "unicode_version": "4.1"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🚹"
+  , "description": "men’s room"
+  , "category": "Symbols"
+  , "aliases": [
+      "mens"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🚺"
+  , "description": "women’s room"
+  , "category": "Symbols"
+  , "aliases": [
+      "womens"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🚻"
+  , "description": "restroom"
+  , "category": "Symbols"
+  , "aliases": [
+      "restroom"
+    ]
+  , "tags": [
+      "toilet"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🚼"
+  , "description": "baby symbol"
+  , "category": "Symbols"
+  , "aliases": [
+      "baby_symbol"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🚾"
+  , "description": "water closet"
+  , "category": "Symbols"
+  , "aliases": [
+      "wc"
+    ]
+  , "tags": [
+      "toilet"
+    , "restroom"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🛂"
+  , "description": "passport control"
+  , "category": "Symbols"
+  , "aliases": [
+      "passport_control"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🛃"
+  , "description": "customs"
+  , "category": "Symbols"
+  , "aliases": [
+      "customs"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🛄"
+  , "description": "baggage claim"
+  , "category": "Symbols"
+  , "aliases": [
+      "baggage_claim"
+    ]
+  , "tags": [
+      "airport"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🛅"
+  , "description": "left luggage"
+  , "category": "Symbols"
+  , "aliases": [
+      "left_luggage"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "⚠️"
+  , "description": "warning"
+  , "category": "Symbols"
+  , "aliases": [
+      "warning"
+    ]
+  , "tags": [
+      "wip"
+    ]
+  , "unicode_version": "4.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🚸"
+  , "description": "children crossing"
+  , "category": "Symbols"
+  , "aliases": [
+      "children_crossing"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "⛔"
+  , "description": "no entry"
+  , "category": "Symbols"
+  , "aliases": [
+      "no_entry"
+    ]
+  , "tags": [
+      "limit"
+    ]
+  , "unicode_version": "5.2"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🚫"
+  , "description": "prohibited"
+  , "category": "Symbols"
+  , "aliases": [
+      "no_entry_sign"
+    ]
+  , "tags": [
+      "block"
+    , "forbidden"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🚳"
+  , "description": "no bicycles"
+  , "category": "Symbols"
+  , "aliases": [
+      "no_bicycles"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🚭"
+  , "description": "no smoking"
+  , "category": "Symbols"
+  , "aliases": [
+      "no_smoking"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🚯"
+  , "description": "no littering"
+  , "category": "Symbols"
+  , "aliases": [
+      "do_not_litter"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🚱"
+  , "description": "non-potable water"
+  , "category": "Symbols"
+  , "aliases": [
+      "non-potable_water"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🚷"
+  , "description": "no pedestrians"
+  , "category": "Symbols"
+  , "aliases": [
+      "no_pedestrians"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "📵"
+  , "description": "no mobile phones"
+  , "category": "Symbols"
+  , "aliases": [
+      "no_mobile_phones"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🔞"
+  , "description": "no one under eighteen"
+  , "category": "Symbols"
+  , "aliases": [
+      "underage"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "☢"
+  , "description": "radioactive"
+  , "category": "Symbols"
+  , "aliases": [
+      "radioactive"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": ""
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "☣"
+  , "description": "biohazard"
+  , "category": "Symbols"
+  , "aliases": [
+      "biohazard"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": ""
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "⬆️"
+  , "description": "up arrow"
+  , "category": "Symbols"
+  , "aliases": [
+      "arrow_up"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "4.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "↗️"
+  , "description": "up-right arrow"
+  , "category": "Symbols"
+  , "aliases": [
+      "arrow_upper_right"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": ""
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "➡️"
+  , "description": "right arrow"
+  , "category": "Symbols"
+  , "aliases": [
+      "arrow_right"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": ""
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "↘️"
+  , "description": "down-right arrow"
+  , "category": "Symbols"
+  , "aliases": [
+      "arrow_lower_right"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": ""
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "⬇️"
+  , "description": "down arrow"
+  , "category": "Symbols"
+  , "aliases": [
+      "arrow_down"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "4.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "↙️"
+  , "description": "down-left arrow"
+  , "category": "Symbols"
+  , "aliases": [
+      "arrow_lower_left"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": ""
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "⬅️"
+  , "description": "left arrow"
+  , "category": "Symbols"
+  , "aliases": [
+      "arrow_left"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "4.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "↖️"
+  , "description": "up-left arrow"
+  , "category": "Symbols"
+  , "aliases": [
+      "arrow_upper_left"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": ""
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "↕️"
+  , "description": "up-down arrow"
+  , "category": "Symbols"
+  , "aliases": [
+      "arrow_up_down"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": ""
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "↔️"
+  , "description": "left-right arrow"
+  , "category": "Symbols"
+  , "aliases": [
+      "left_right_arrow"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": ""
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "↩️"
+  , "description": "right arrow curving left"
+  , "category": "Symbols"
+  , "aliases": [
+      "leftwards_arrow_with_hook"
+    ]
+  , "tags": [
+      "return"
+    ]
+  , "unicode_version": ""
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "↪️"
+  , "description": "left arrow curving right"
+  , "category": "Symbols"
+  , "aliases": [
+      "arrow_right_hook"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": ""
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "⤴️"
+  , "description": "right arrow curving up"
+  , "category": "Symbols"
+  , "aliases": [
+      "arrow_heading_up"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": ""
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "⤵️"
+  , "description": "right arrow curving down"
+  , "category": "Symbols"
+  , "aliases": [
+      "arrow_heading_down"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": ""
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🔃"
+  , "description": "clockwise vertical arrows"
+  , "category": "Symbols"
+  , "aliases": [
+      "arrows_clockwise"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🔄"
+  , "description": "counterclockwise arrows button"
+  , "category": "Symbols"
+  , "aliases": [
+      "arrows_counterclockwise"
+    ]
+  , "tags": [
+      "sync"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🔙"
+  , "description": "BACK arrow"
+  , "category": "Symbols"
+  , "aliases": [
+      "back"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🔚"
+  , "description": "END arrow"
+  , "category": "Symbols"
+  , "aliases": [
+      "end"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🔛"
+  , "description": "ON! arrow"
+  , "category": "Symbols"
+  , "aliases": [
+      "on"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🔜"
+  , "description": "SOON arrow"
+  , "category": "Symbols"
+  , "aliases": [
+      "soon"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🔝"
+  , "description": "TOP arrow"
+  , "category": "Symbols"
+  , "aliases": [
+      "top"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🛐"
+  , "description": "place of worship"
+  , "category": "Symbols"
+  , "aliases": [
+      "place_of_worship"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "8.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "⚛"
+  , "description": "atom symbol"
+  , "category": "Symbols"
+  , "aliases": [
+      "atom_symbol"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "4.1"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🕉"
+  , "description": "om"
+  , "category": "Symbols"
+  , "aliases": [
+      "om"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "7.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "✡️"
+  , "description": "star of David"
+  , "category": "Symbols"
+  , "aliases": [
+      "star_of_david"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": ""
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "☸"
+  , "description": "wheel of dharma"
+  , "category": "Symbols"
+  , "aliases": [
+      "wheel_of_dharma"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": ""
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "☯️"
+  , "description": "yin yang"
+  , "category": "Symbols"
+  , "aliases": [
+      "yin_yang"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": ""
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "✝️"
+  , "description": "latin cross"
+  , "category": "Symbols"
+  , "aliases": [
+      "latin_cross"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": ""
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "☦"
+  , "description": "orthodox cross"
+  , "category": "Symbols"
+  , "aliases": [
+      "orthodox_cross"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": ""
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "☪"
+  , "description": "star and crescent"
+  , "category": "Symbols"
+  , "aliases": [
+      "star_and_crescent"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": ""
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "☮"
+  , "description": "peace symbol"
+  , "category": "Symbols"
+  , "aliases": [
+      "peace_symbol"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": ""
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🕎"
+  , "description": "menorah"
+  , "category": "Symbols"
+  , "aliases": [
+      "menorah"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "8.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🔯"
+  , "description": "dotted six-pointed star"
+  , "category": "Symbols"
+  , "aliases": [
+      "six_pointed_star"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "♈"
+  , "description": "Aries"
+  , "category": "Symbols"
+  , "aliases": [
+      "aries"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": ""
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "♉"
+  , "description": "Taurus"
+  , "category": "Symbols"
+  , "aliases": [
+      "taurus"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": ""
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "♊"
+  , "description": "Gemini"
+  , "category": "Symbols"
+  , "aliases": [
+      "gemini"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": ""
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "♋"
+  , "description": "Cancer"
+  , "category": "Symbols"
+  , "aliases": [
+      "cancer"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": ""
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "♌"
+  , "description": "Leo"
+  , "category": "Symbols"
+  , "aliases": [
+      "leo"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": ""
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "♍"
+  , "description": "Virgo"
+  , "category": "Symbols"
+  , "aliases": [
+      "virgo"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": ""
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "♎"
+  , "description": "Libra"
+  , "category": "Symbols"
+  , "aliases": [
+      "libra"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": ""
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "♏"
+  , "description": "Scorpio"
+  , "category": "Symbols"
+  , "aliases": [
+      "scorpius"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": ""
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "♐"
+  , "description": "Sagittarius"
+  , "category": "Symbols"
+  , "aliases": [
+      "sagittarius"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": ""
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "♑"
+  , "description": "Capricorn"
+  , "category": "Symbols"
+  , "aliases": [
+      "capricorn"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": ""
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "♒"
+  , "description": "Aquarius"
+  , "category": "Symbols"
+  , "aliases": [
+      "aquarius"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": ""
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "♓"
+  , "description": "Pisces"
+  , "category": "Symbols"
+  , "aliases": [
+      "pisces"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": ""
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "⛎"
+  , "description": "Ophiuchus"
+  , "category": "Symbols"
+  , "aliases": [
+      "ophiuchus"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🔀"
+  , "description": "shuffle tracks button"
+  , "category": "Symbols"
+  , "aliases": [
+      "twisted_rightwards_arrows"
+    ]
+  , "tags": [
+      "shuffle"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🔁"
+  , "description": "repeat button"
+  , "category": "Symbols"
+  , "aliases": [
+      "repeat"
+    ]
+  , "tags": [
+      "loop"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🔂"
+  , "description": "repeat single button"
+  , "category": "Symbols"
+  , "aliases": [
+      "repeat_one"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "▶️"
+  , "description": "play button"
+  , "category": "Symbols"
+  , "aliases": [
+      "arrow_forward"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": ""
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "⏩"
+  , "description": "fast-forward button"
+  , "category": "Symbols"
+  , "aliases": [
+      "fast_forward"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "⏭"
+  , "description": "next track button"
+  , "category": "Symbols"
+  , "aliases": [
+      "next_track_button"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "⏯"
+  , "description": "play or pause button"
+  , "category": "Symbols"
+  , "aliases": [
+      "play_or_pause_button"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "◀️"
+  , "description": "reverse button"
+  , "category": "Symbols"
+  , "aliases": [
+      "arrow_backward"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": ""
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "⏪"
+  , "description": "fast reverse button"
+  , "category": "Symbols"
+  , "aliases": [
+      "rewind"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "⏮"
+  , "description": "last track button"
+  , "category": "Symbols"
+  , "aliases": [
+      "previous_track_button"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🔼"
+  , "description": "upwards button"
+  , "category": "Symbols"
+  , "aliases": [
+      "arrow_up_small"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "⏫"
+  , "description": "fast up button"
+  , "category": "Symbols"
+  , "aliases": [
+      "arrow_double_up"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🔽"
+  , "description": "downwards button"
+  , "category": "Symbols"
+  , "aliases": [
+      "arrow_down_small"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "⏬"
+  , "description": "fast down button"
+  , "category": "Symbols"
+  , "aliases": [
+      "arrow_double_down"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "⏸"
+  , "description": "pause button"
+  , "category": "Symbols"
+  , "aliases": [
+      "pause_button"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "7.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "⏹"
+  , "description": "stop button"
+  , "category": "Symbols"
+  , "aliases": [
+      "stop_button"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "7.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "⏺"
+  , "description": "record button"
+  , "category": "Symbols"
+  , "aliases": [
+      "record_button"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "7.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "⏏️"
+  , "description": "eject button"
+  , "category": "Symbols"
+  , "aliases": [
+      "eject_button"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "🎦"
+  , "description": "cinema"
+  , "category": "Symbols"
+  , "aliases": [
+      "cinema"
+    ]
+  , "tags": [
+      "film"
+    , "movie"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🔅"
+  , "description": "dim button"
+  , "category": "Symbols"
+  , "aliases": [
+      "low_brightness"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🔆"
+  , "description": "bright button"
+  , "category": "Symbols"
+  , "aliases": [
+      "high_brightness"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "📶"
+  , "description": "antenna bars"
+  , "category": "Symbols"
+  , "aliases": [
+      "signal_strength"
+    ]
+  , "tags": [
+      "wifi"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "📳"
+  , "description": "vibration mode"
+  , "category": "Symbols"
+  , "aliases": [
+      "vibration_mode"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "📴"
+  , "description": "mobile phone off"
+  , "category": "Symbols"
+  , "aliases": [
+      "mobile_phone_off"
+    ]
+  , "tags": [
+      "mute"
+    , "off"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "♀️"
+  , "description": "female sign"
+  , "category": "Symbols"
+  , "aliases": [
+      "female_sign"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "♂️"
+  , "description": "male sign"
+  , "category": "Symbols"
+  , "aliases": [
+      "male_sign"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "⚕"
+  , "description": "medical symbol"
+  , "category": "Symbols"
+  , "aliases": [
+      "medical_symbol"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "♾"
+  , "description": "infinity"
+  , "category": "Symbols"
+  , "aliases": [
+      "infinity"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "♻️"
+  , "description": "recycling symbol"
+  , "category": "Symbols"
+  , "aliases": [
+      "recycle"
+    ]
+  , "tags": [
+      "environment"
+    , "green"
+    ]
+  , "unicode_version": "3.2"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "⚜"
+  , "description": "fleur-de-lis"
+  , "category": "Symbols"
+  , "aliases": [
+      "fleur_de_lis"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "4.1"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🔱"
+  , "description": "trident emblem"
+  , "category": "Symbols"
+  , "aliases": [
+      "trident"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "📛"
+  , "description": "name badge"
+  , "category": "Symbols"
+  , "aliases": [
+      "name_badge"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🔰"
+  , "description": "Japanese symbol for beginner"
+  , "category": "Symbols"
+  , "aliases": [
+      "beginner"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "⭕"
+  , "description": "hollow red circle"
+  , "category": "Symbols"
+  , "aliases": [
+      "o"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "5.2"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "✅"
+  , "description": "check mark button"
+  , "category": "Symbols"
+  , "aliases": [
+      "white_check_mark"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "☑️"
+  , "description": "check box with check"
+  , "category": "Symbols"
+  , "aliases": [
+      "ballot_box_with_check"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": ""
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "✔️"
+  , "description": "check mark"
+  , "category": "Symbols"
+  , "aliases": [
+      "heavy_check_mark"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": ""
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "✖️"
+  , "description": "multiplication sign"
+  , "category": "Symbols"
+  , "aliases": [
+      "heavy_multiplication_x"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": ""
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "❌"
+  , "description": "cross mark"
+  , "category": "Symbols"
+  , "aliases": [
+      "x"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "❎"
+  , "description": "cross mark button"
+  , "category": "Symbols"
+  , "aliases": [
+      "negative_squared_cross_mark"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "➕"
+  , "description": "plus sign"
+  , "category": "Symbols"
+  , "aliases": [
+      "heavy_plus_sign"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "➖"
+  , "description": "minus sign"
+  , "category": "Symbols"
+  , "aliases": [
+      "heavy_minus_sign"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "➗"
+  , "description": "division sign"
+  , "category": "Symbols"
+  , "aliases": [
+      "heavy_division_sign"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "➰"
+  , "description": "curly loop"
+  , "category": "Symbols"
+  , "aliases": [
+      "curly_loop"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "➿"
+  , "description": "double curly loop"
+  , "category": "Symbols"
+  , "aliases": [
+      "loop"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "〽️"
+  , "description": "part alternation mark"
+  , "category": "Symbols"
+  , "aliases": [
+      "part_alternation_mark"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "3.2"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "✳️"
+  , "description": "eight-spoked asterisk"
+  , "category": "Symbols"
+  , "aliases": [
+      "eight_spoked_asterisk"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": ""
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "✴️"
+  , "description": "eight-pointed star"
+  , "category": "Symbols"
+  , "aliases": [
+      "eight_pointed_black_star"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": ""
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "❇️"
+  , "description": "sparkle"
+  , "category": "Symbols"
+  , "aliases": [
+      "sparkle"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": ""
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "‼️"
+  , "description": "double exclamation mark"
+  , "category": "Symbols"
+  , "aliases": [
+      "bangbang"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": ""
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "⁉️"
+  , "description": "exclamation question mark"
+  , "category": "Symbols"
+  , "aliases": [
+      "interrobang"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "3.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "❓"
+  , "description": "question mark"
+  , "category": "Symbols"
+  , "aliases": [
+      "question"
+    ]
+  , "tags": [
+      "confused"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "❔"
+  , "description": "white question mark"
+  , "category": "Symbols"
+  , "aliases": [
+      "grey_question"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "❕"
+  , "description": "white exclamation mark"
+  , "category": "Symbols"
+  , "aliases": [
+      "grey_exclamation"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "❗"
+  , "description": "exclamation mark"
+  , "category": "Symbols"
+  , "aliases": [
+      "exclamation"
+    , "heavy_exclamation_mark"
+    ]
+  , "tags": [
+      "bang"
+    ]
+  , "unicode_version": "5.2"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "〰️"
+  , "description": "wavy dash"
+  , "category": "Symbols"
+  , "aliases": [
+      "wavy_dash"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": ""
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "©️"
+  , "description": "copyright"
+  , "category": "Symbols"
+  , "aliases": [
+      "copyright"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": ""
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "®️"
+  , "description": "registered"
+  , "category": "Symbols"
+  , "aliases": [
+      "registered"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": ""
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "™️"
+  , "description": "trade mark"
+  , "category": "Symbols"
+  , "aliases": [
+      "tm"
+    ]
+  , "tags": [
+      "trademark"
+    ]
+  , "unicode_version": ""
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "#️⃣"
+  , "description": "keycap: #"
+  , "category": "Symbols"
+  , "aliases": [
+      "hash"
+    ]
+  , "tags": [
+      "number"
+    ]
+  , "unicode_version": ""
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "*️⃣"
+  , "description": "keycap: *"
+  , "category": "Symbols"
+  , "aliases": [
+      "asterisk"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": ""
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "0️⃣"
+  , "description": "keycap: 0"
+  , "category": "Symbols"
+  , "aliases": [
+      "zero"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": ""
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "1️⃣"
+  , "description": "keycap: 1"
+  , "category": "Symbols"
+  , "aliases": [
+      "one"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": ""
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "2️⃣"
+  , "description": "keycap: 2"
+  , "category": "Symbols"
+  , "aliases": [
+      "two"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": ""
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "3️⃣"
+  , "description": "keycap: 3"
+  , "category": "Symbols"
+  , "aliases": [
+      "three"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": ""
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "4️⃣"
+  , "description": "keycap: 4"
+  , "category": "Symbols"
+  , "aliases": [
+      "four"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": ""
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "5️⃣"
+  , "description": "keycap: 5"
+  , "category": "Symbols"
+  , "aliases": [
+      "five"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": ""
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "6️⃣"
+  , "description": "keycap: 6"
+  , "category": "Symbols"
+  , "aliases": [
+      "six"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": ""
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "7️⃣"
+  , "description": "keycap: 7"
+  , "category": "Symbols"
+  , "aliases": [
+      "seven"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": ""
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "8️⃣"
+  , "description": "keycap: 8"
+  , "category": "Symbols"
+  , "aliases": [
+      "eight"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": ""
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "9️⃣"
+  , "description": "keycap: 9"
+  , "category": "Symbols"
+  , "aliases": [
+      "nine"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": ""
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🔟"
+  , "description": "keycap: 10"
+  , "category": "Symbols"
+  , "aliases": [
+      "keycap_ten"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🔠"
+  , "description": "input latin uppercase"
+  , "category": "Symbols"
+  , "aliases": [
+      "capital_abcd"
+    ]
+  , "tags": [
+      "letters"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🔡"
+  , "description": "input latin lowercase"
+  , "category": "Symbols"
+  , "aliases": [
+      "abcd"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🔢"
+  , "description": "input numbers"
+  , "category": "Symbols"
+  , "aliases": [
+      "1234"
+    ]
+  , "tags": [
+      "numbers"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🔣"
+  , "description": "input symbols"
+  , "category": "Symbols"
+  , "aliases": [
+      "symbols"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🔤"
+  , "description": "input latin letters"
+  , "category": "Symbols"
+  , "aliases": [
+      "abc"
+    ]
+  , "tags": [
+      "alphabet"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🅰️"
+  , "description": "A button (blood type)"
+  , "category": "Symbols"
+  , "aliases": [
+      "a"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🆎"
+  , "description": "AB button (blood type)"
+  , "category": "Symbols"
+  , "aliases": [
+      "ab"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🅱️"
+  , "description": "B button (blood type)"
+  , "category": "Symbols"
+  , "aliases": [
+      "b"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🆑"
+  , "description": "CL button"
+  , "category": "Symbols"
+  , "aliases": [
+      "cl"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🆒"
+  , "description": "COOL button"
+  , "category": "Symbols"
+  , "aliases": [
+      "cool"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🆓"
+  , "description": "FREE button"
+  , "category": "Symbols"
+  , "aliases": [
+      "free"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "ℹ️"
+  , "description": "information"
+  , "category": "Symbols"
+  , "aliases": [
+      "information_source"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "3.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🆔"
+  , "description": "ID button"
+  , "category": "Symbols"
+  , "aliases": [
+      "id"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "Ⓜ️"
+  , "description": "circled M"
+  , "category": "Symbols"
+  , "aliases": [
+      "m"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": ""
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🆕"
+  , "description": "NEW button"
+  , "category": "Symbols"
+  , "aliases": [
+      "new"
+    ]
+  , "tags": [
+      "fresh"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🆖"
+  , "description": "NG button"
+  , "category": "Symbols"
+  , "aliases": [
+      "ng"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🅾️"
+  , "description": "O button (blood type)"
+  , "category": "Symbols"
+  , "aliases": [
+      "o2"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🆗"
+  , "description": "OK button"
+  , "category": "Symbols"
+  , "aliases": [
+      "ok"
+    ]
+  , "tags": [
+      "yes"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🅿️"
+  , "description": "P button"
+  , "category": "Symbols"
+  , "aliases": [
+      "parking"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "5.2"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🆘"
+  , "description": "SOS button"
+  , "category": "Symbols"
+  , "aliases": [
+      "sos"
+    ]
+  , "tags": [
+      "help"
+    , "emergency"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🆙"
+  , "description": "UP! button"
+  , "category": "Symbols"
+  , "aliases": [
+      "up"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🆚"
+  , "description": "VS button"
+  , "category": "Symbols"
+  , "aliases": [
+      "vs"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🈁"
+  , "description": "Japanese “here” button"
+  , "category": "Symbols"
+  , "aliases": [
+      "koko"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🈂️"
+  , "description": "Japanese “service charge” button"
+  , "category": "Symbols"
+  , "aliases": [
+      "sa"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🈷️"
+  , "description": "Japanese “monthly amount” button"
+  , "category": "Symbols"
+  , "aliases": [
+      "u6708"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🈶"
+  , "description": "Japanese “not free of charge” button"
+  , "category": "Symbols"
+  , "aliases": [
+      "u6709"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🈯"
+  , "description": "Japanese “reserved” button"
+  , "category": "Symbols"
+  , "aliases": [
+      "u6307"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": ""
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🉐"
+  , "description": "Japanese “bargain” button"
+  , "category": "Symbols"
+  , "aliases": [
+      "ideograph_advantage"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🈹"
+  , "description": "Japanese “discount” button"
+  , "category": "Symbols"
+  , "aliases": [
+      "u5272"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🈚"
+  , "description": "Japanese “free of charge” button"
+  , "category": "Symbols"
+  , "aliases": [
+      "u7121"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": ""
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🈲"
+  , "description": "Japanese “prohibited” button"
+  , "category": "Symbols"
+  , "aliases": [
+      "u7981"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🉑"
+  , "description": "Japanese “acceptable” button"
+  , "category": "Symbols"
+  , "aliases": [
+      "accept"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🈸"
+  , "description": "Japanese “application” button"
+  , "category": "Symbols"
+  , "aliases": [
+      "u7533"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🈴"
+  , "description": "Japanese “passing grade” button"
+  , "category": "Symbols"
+  , "aliases": [
+      "u5408"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🈳"
+  , "description": "Japanese “vacancy” button"
+  , "category": "Symbols"
+  , "aliases": [
+      "u7a7a"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "㊗️"
+  , "description": "Japanese “congratulations” button"
+  , "category": "Symbols"
+  , "aliases": [
+      "congratulations"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": ""
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "㊙️"
+  , "description": "Japanese “secret” button"
+  , "category": "Symbols"
+  , "aliases": [
+      "secret"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": ""
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🈺"
+  , "description": "Japanese “open for business” button"
+  , "category": "Symbols"
+  , "aliases": [
+      "u55b6"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🈵"
+  , "description": "Japanese “no vacancy” button"
+  , "category": "Symbols"
+  , "aliases": [
+      "u6e80"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🔴"
+  , "description": "red circle"
+  , "category": "Symbols"
+  , "aliases": [
+      "red_circle"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🟠"
+  , "description": "orange circle"
+  , "category": "Symbols"
+  , "aliases": [
+      "orange_circle"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "12.0"
+  , "ios_version": "13.0"
+  }
+, {
+    "emoji": "🟡"
+  , "description": "yellow circle"
+  , "category": "Symbols"
+  , "aliases": [
+      "yellow_circle"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "12.0"
+  , "ios_version": "13.0"
+  }
+, {
+    "emoji": "🟢"
+  , "description": "green circle"
+  , "category": "Symbols"
+  , "aliases": [
+      "green_circle"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "12.0"
+  , "ios_version": "13.0"
+  }
+, {
+    "emoji": "🔵"
+  , "description": "blue circle"
+  , "category": "Symbols"
+  , "aliases": [
+      "large_blue_circle"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🟣"
+  , "description": "purple circle"
+  , "category": "Symbols"
+  , "aliases": [
+      "purple_circle"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "12.0"
+  , "ios_version": "13.0"
+  }
+, {
+    "emoji": "🟤"
+  , "description": "brown circle"
+  , "category": "Symbols"
+  , "aliases": [
+      "brown_circle"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "12.0"
+  , "ios_version": "13.0"
+  }
+, {
+    "emoji": "⚫"
+  , "description": "black circle"
+  , "category": "Symbols"
+  , "aliases": [
+      "black_circle"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "4.1"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "⚪"
+  , "description": "white circle"
+  , "category": "Symbols"
+  , "aliases": [
+      "white_circle"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "4.1"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🟥"
+  , "description": "red square"
+  , "category": "Symbols"
+  , "aliases": [
+      "red_square"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "12.0"
+  , "ios_version": "13.0"
+  }
+, {
+    "emoji": "🟧"
+  , "description": "orange square"
+  , "category": "Symbols"
+  , "aliases": [
+      "orange_square"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "12.0"
+  , "ios_version": "13.0"
+  }
+, {
+    "emoji": "🟨"
+  , "description": "yellow square"
+  , "category": "Symbols"
+  , "aliases": [
+      "yellow_square"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "12.0"
+  , "ios_version": "13.0"
+  }
+, {
+    "emoji": "🟩"
+  , "description": "green square"
+  , "category": "Symbols"
+  , "aliases": [
+      "green_square"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "12.0"
+  , "ios_version": "13.0"
+  }
+, {
+    "emoji": "🟦"
+  , "description": "blue square"
+  , "category": "Symbols"
+  , "aliases": [
+      "blue_square"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "12.0"
+  , "ios_version": "13.0"
+  }
+, {
+    "emoji": "🟪"
+  , "description": "purple square"
+  , "category": "Symbols"
+  , "aliases": [
+      "purple_square"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "12.0"
+  , "ios_version": "13.0"
+  }
+, {
+    "emoji": "🟫"
+  , "description": "brown square"
+  , "category": "Symbols"
+  , "aliases": [
+      "brown_square"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "12.0"
+  , "ios_version": "13.0"
+  }
+, {
+    "emoji": "⬛"
+  , "description": "black large square"
+  , "category": "Symbols"
+  , "aliases": [
+      "black_large_square"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "5.1"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "⬜"
+  , "description": "white large square"
+  , "category": "Symbols"
+  , "aliases": [
+      "white_large_square"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "5.1"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "◼️"
+  , "description": "black medium square"
+  , "category": "Symbols"
+  , "aliases": [
+      "black_medium_square"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "3.2"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "◻️"
+  , "description": "white medium square"
+  , "category": "Symbols"
+  , "aliases": [
+      "white_medium_square"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "3.2"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "◾"
+  , "description": "black medium-small square"
+  , "category": "Symbols"
+  , "aliases": [
+      "black_medium_small_square"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "3.2"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "◽"
+  , "description": "white medium-small square"
+  , "category": "Symbols"
+  , "aliases": [
+      "white_medium_small_square"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "3.2"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "▪️"
+  , "description": "black small square"
+  , "category": "Symbols"
+  , "aliases": [
+      "black_small_square"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": ""
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "▫️"
+  , "description": "white small square"
+  , "category": "Symbols"
+  , "aliases": [
+      "white_small_square"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": ""
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🔶"
+  , "description": "large orange diamond"
+  , "category": "Symbols"
+  , "aliases": [
+      "large_orange_diamond"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🔷"
+  , "description": "large blue diamond"
+  , "category": "Symbols"
+  , "aliases": [
+      "large_blue_diamond"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🔸"
+  , "description": "small orange diamond"
+  , "category": "Symbols"
+  , "aliases": [
+      "small_orange_diamond"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🔹"
+  , "description": "small blue diamond"
+  , "category": "Symbols"
+  , "aliases": [
+      "small_blue_diamond"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🔺"
+  , "description": "red triangle pointed up"
+  , "category": "Symbols"
+  , "aliases": [
+      "small_red_triangle"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🔻"
+  , "description": "red triangle pointed down"
+  , "category": "Symbols"
+  , "aliases": [
+      "small_red_triangle_down"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "💠"
+  , "description": "diamond with a dot"
+  , "category": "Symbols"
+  , "aliases": [
+      "diamond_shape_with_a_dot_inside"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🔘"
+  , "description": "radio button"
+  , "category": "Symbols"
+  , "aliases": [
+      "radio_button"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🔳"
+  , "description": "white square button"
+  , "category": "Symbols"
+  , "aliases": [
+      "white_square_button"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🔲"
+  , "description": "black square button"
+  , "category": "Symbols"
+  , "aliases": [
+      "black_square_button"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🏁"
+  , "description": "chequered flag"
+  , "category": "Flags"
+  , "aliases": [
+      "checkered_flag"
+    ]
+  , "tags": [
+      "milestone"
+    , "finish"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🚩"
+  , "description": "triangular flag"
+  , "category": "Flags"
+  , "aliases": [
+      "triangular_flag_on_post"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🎌"
+  , "description": "crossed flags"
+  , "category": "Flags"
+  , "aliases": [
+      "crossed_flags"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🏴"
+  , "description": "black flag"
+  , "category": "Flags"
+  , "aliases": [
+      "black_flag"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "7.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🏳"
+  , "description": "white flag"
+  , "category": "Flags"
+  , "aliases": [
+      "white_flag"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "7.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🏳️‍🌈"
+  , "description": "rainbow flag"
+  , "category": "Flags"
+  , "aliases": [
+      "rainbow_flag"
+    ]
+  , "tags": [
+      "pride"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "10.0"
+  }
+, {
+    "emoji": "🏴‍☠"
+  , "description": "pirate flag"
+  , "category": "Flags"
+  , "aliases": [
+      "pirate_flag"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "🇦🇨"
+  , "description": "flag: Ascension Island"
+  , "category": "Flags"
+  , "aliases": [
+      "ascension_island"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "🇦🇩"
+  , "description": "flag: Andorra"
+  , "category": "Flags"
+  , "aliases": [
+      "andorra"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇦🇪"
+  , "description": "flag: United Arab Emirates"
+  , "category": "Flags"
+  , "aliases": [
+      "united_arab_emirates"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇦🇫"
+  , "description": "flag: Afghanistan"
+  , "category": "Flags"
+  , "aliases": [
+      "afghanistan"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇦🇬"
+  , "description": "flag: Antigua & Barbuda"
+  , "category": "Flags"
+  , "aliases": [
+      "antigua_barbuda"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇦🇮"
+  , "description": "flag: Anguilla"
+  , "category": "Flags"
+  , "aliases": [
+      "anguilla"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇦🇱"
+  , "description": "flag: Albania"
+  , "category": "Flags"
+  , "aliases": [
+      "albania"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇦🇲"
+  , "description": "flag: Armenia"
+  , "category": "Flags"
+  , "aliases": [
+      "armenia"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇦🇴"
+  , "description": "flag: Angola"
+  , "category": "Flags"
+  , "aliases": [
+      "angola"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇦🇶"
+  , "description": "flag: Antarctica"
+  , "category": "Flags"
+  , "aliases": [
+      "antarctica"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "9.0"
+  }
+, {
+    "emoji": "🇦🇷"
+  , "description": "flag: Argentina"
+  , "category": "Flags"
+  , "aliases": [
+      "argentina"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇦🇸"
+  , "description": "flag: American Samoa"
+  , "category": "Flags"
+  , "aliases": [
+      "american_samoa"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇦🇹"
+  , "description": "flag: Austria"
+  , "category": "Flags"
+  , "aliases": [
+      "austria"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇦🇺"
+  , "description": "flag: Australia"
+  , "category": "Flags"
+  , "aliases": [
+      "australia"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇦🇼"
+  , "description": "flag: Aruba"
+  , "category": "Flags"
+  , "aliases": [
+      "aruba"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇦🇽"
+  , "description": "flag: Åland Islands"
+  , "category": "Flags"
+  , "aliases": [
+      "aland_islands"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "9.0"
+  }
+, {
+    "emoji": "🇦🇿"
+  , "description": "flag: Azerbaijan"
+  , "category": "Flags"
+  , "aliases": [
+      "azerbaijan"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇧🇦"
+  , "description": "flag: Bosnia & Herzegovina"
+  , "category": "Flags"
+  , "aliases": [
+      "bosnia_herzegovina"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇧🇧"
+  , "description": "flag: Barbados"
+  , "category": "Flags"
+  , "aliases": [
+      "barbados"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇧🇩"
+  , "description": "flag: Bangladesh"
+  , "category": "Flags"
+  , "aliases": [
+      "bangladesh"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇧🇪"
+  , "description": "flag: Belgium"
+  , "category": "Flags"
+  , "aliases": [
+      "belgium"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇧🇫"
+  , "description": "flag: Burkina Faso"
+  , "category": "Flags"
+  , "aliases": [
+      "burkina_faso"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇧🇬"
+  , "description": "flag: Bulgaria"
+  , "category": "Flags"
+  , "aliases": [
+      "bulgaria"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇧🇭"
+  , "description": "flag: Bahrain"
+  , "category": "Flags"
+  , "aliases": [
+      "bahrain"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇧🇮"
+  , "description": "flag: Burundi"
+  , "category": "Flags"
+  , "aliases": [
+      "burundi"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇧🇯"
+  , "description": "flag: Benin"
+  , "category": "Flags"
+  , "aliases": [
+      "benin"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇧🇱"
+  , "description": "flag: St. Barthélemy"
+  , "category": "Flags"
+  , "aliases": [
+      "st_barthelemy"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "9.0"
+  }
+, {
+    "emoji": "🇧🇲"
+  , "description": "flag: Bermuda"
+  , "category": "Flags"
+  , "aliases": [
+      "bermuda"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇧🇳"
+  , "description": "flag: Brunei"
+  , "category": "Flags"
+  , "aliases": [
+      "brunei"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇧🇴"
+  , "description": "flag: Bolivia"
+  , "category": "Flags"
+  , "aliases": [
+      "bolivia"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇧🇶"
+  , "description": "flag: Caribbean Netherlands"
+  , "category": "Flags"
+  , "aliases": [
+      "caribbean_netherlands"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "9.0"
+  }
+, {
+    "emoji": "🇧🇷"
+  , "description": "flag: Brazil"
+  , "category": "Flags"
+  , "aliases": [
+      "brazil"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇧🇸"
+  , "description": "flag: Bahamas"
+  , "category": "Flags"
+  , "aliases": [
+      "bahamas"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇧🇹"
+  , "description": "flag: Bhutan"
+  , "category": "Flags"
+  , "aliases": [
+      "bhutan"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇧🇻"
+  , "description": "flag: Bouvet Island"
+  , "category": "Flags"
+  , "aliases": [
+      "bouvet_island"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "🇧🇼"
+  , "description": "flag: Botswana"
+  , "category": "Flags"
+  , "aliases": [
+      "botswana"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇧🇾"
+  , "description": "flag: Belarus"
+  , "category": "Flags"
+  , "aliases": [
+      "belarus"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇧🇿"
+  , "description": "flag: Belize"
+  , "category": "Flags"
+  , "aliases": [
+      "belize"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇨🇦"
+  , "description": "flag: Canada"
+  , "category": "Flags"
+  , "aliases": [
+      "canada"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇨🇨"
+  , "description": "flag: Cocos (Keeling) Islands"
+  , "category": "Flags"
+  , "aliases": [
+      "cocos_islands"
+    ]
+  , "tags": [
+      "keeling"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "9.0"
+  }
+, {
+    "emoji": "🇨🇩"
+  , "description": "flag: Congo - Kinshasa"
+  , "category": "Flags"
+  , "aliases": [
+      "congo_kinshasa"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇨🇫"
+  , "description": "flag: Central African Republic"
+  , "category": "Flags"
+  , "aliases": [
+      "central_african_republic"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇨🇬"
+  , "description": "flag: Congo - Brazzaville"
+  , "category": "Flags"
+  , "aliases": [
+      "congo_brazzaville"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇨🇭"
+  , "description": "flag: Switzerland"
+  , "category": "Flags"
+  , "aliases": [
+      "switzerland"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇨🇮"
+  , "description": "flag: Côte d’Ivoire"
+  , "category": "Flags"
+  , "aliases": [
+      "cote_divoire"
+    ]
+  , "tags": [
+      "ivory"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇨🇰"
+  , "description": "flag: Cook Islands"
+  , "category": "Flags"
+  , "aliases": [
+      "cook_islands"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇨🇱"
+  , "description": "flag: Chile"
+  , "category": "Flags"
+  , "aliases": [
+      "chile"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇨🇲"
+  , "description": "flag: Cameroon"
+  , "category": "Flags"
+  , "aliases": [
+      "cameroon"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇨🇳"
+  , "description": "flag: China"
+  , "category": "Flags"
+  , "aliases": [
+      "cn"
+    ]
+  , "tags": [
+      "china"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🇨🇴"
+  , "description": "flag: Colombia"
+  , "category": "Flags"
+  , "aliases": [
+      "colombia"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇨🇵"
+  , "description": "flag: Clipperton Island"
+  , "category": "Flags"
+  , "aliases": [
+      "clipperton_island"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "🇨🇷"
+  , "description": "flag: Costa Rica"
+  , "category": "Flags"
+  , "aliases": [
+      "costa_rica"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇨🇺"
+  , "description": "flag: Cuba"
+  , "category": "Flags"
+  , "aliases": [
+      "cuba"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇨🇻"
+  , "description": "flag: Cape Verde"
+  , "category": "Flags"
+  , "aliases": [
+      "cape_verde"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇨🇼"
+  , "description": "flag: Curaçao"
+  , "category": "Flags"
+  , "aliases": [
+      "curacao"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇨🇽"
+  , "description": "flag: Christmas Island"
+  , "category": "Flags"
+  , "aliases": [
+      "christmas_island"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "9.0"
+  }
+, {
+    "emoji": "🇨🇾"
+  , "description": "flag: Cyprus"
+  , "category": "Flags"
+  , "aliases": [
+      "cyprus"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇨🇿"
+  , "description": "flag: Czechia"
+  , "category": "Flags"
+  , "aliases": [
+      "czech_republic"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇩🇪"
+  , "description": "flag: Germany"
+  , "category": "Flags"
+  , "aliases": [
+      "de"
+    ]
+  , "tags": [
+      "flag"
+    , "germany"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🇩🇬"
+  , "description": "flag: Diego Garcia"
+  , "category": "Flags"
+  , "aliases": [
+      "diego_garcia"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "🇩🇯"
+  , "description": "flag: Djibouti"
+  , "category": "Flags"
+  , "aliases": [
+      "djibouti"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇩🇰"
+  , "description": "flag: Denmark"
+  , "category": "Flags"
+  , "aliases": [
+      "denmark"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇩🇲"
+  , "description": "flag: Dominica"
+  , "category": "Flags"
+  , "aliases": [
+      "dominica"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇩🇴"
+  , "description": "flag: Dominican Republic"
+  , "category": "Flags"
+  , "aliases": [
+      "dominican_republic"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇩🇿"
+  , "description": "flag: Algeria"
+  , "category": "Flags"
+  , "aliases": [
+      "algeria"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇪🇦"
+  , "description": "flag: Ceuta & Melilla"
+  , "category": "Flags"
+  , "aliases": [
+      "ceuta_melilla"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "🇪🇨"
+  , "description": "flag: Ecuador"
+  , "category": "Flags"
+  , "aliases": [
+      "ecuador"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇪🇪"
+  , "description": "flag: Estonia"
+  , "category": "Flags"
+  , "aliases": [
+      "estonia"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇪🇬"
+  , "description": "flag: Egypt"
+  , "category": "Flags"
+  , "aliases": [
+      "egypt"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇪🇭"
+  , "description": "flag: Western Sahara"
+  , "category": "Flags"
+  , "aliases": [
+      "western_sahara"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "9.0"
+  }
+, {
+    "emoji": "🇪🇷"
+  , "description": "flag: Eritrea"
+  , "category": "Flags"
+  , "aliases": [
+      "eritrea"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇪🇸"
+  , "description": "flag: Spain"
+  , "category": "Flags"
+  , "aliases": [
+      "es"
+    ]
+  , "tags": [
+      "spain"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🇪🇹"
+  , "description": "flag: Ethiopia"
+  , "category": "Flags"
+  , "aliases": [
+      "ethiopia"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇪🇺"
+  , "description": "flag: European Union"
+  , "category": "Flags"
+  , "aliases": [
+      "eu"
+    , "european_union"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "9.0"
+  }
+, {
+    "emoji": "🇫🇮"
+  , "description": "flag: Finland"
+  , "category": "Flags"
+  , "aliases": [
+      "finland"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇫🇯"
+  , "description": "flag: Fiji"
+  , "category": "Flags"
+  , "aliases": [
+      "fiji"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇫🇰"
+  , "description": "flag: Falkland Islands"
+  , "category": "Flags"
+  , "aliases": [
+      "falkland_islands"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "9.0"
+  }
+, {
+    "emoji": "🇫🇲"
+  , "description": "flag: Micronesia"
+  , "category": "Flags"
+  , "aliases": [
+      "micronesia"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "9.0"
+  }
+, {
+    "emoji": "🇫🇴"
+  , "description": "flag: Faroe Islands"
+  , "category": "Flags"
+  , "aliases": [
+      "faroe_islands"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇫🇷"
+  , "description": "flag: France"
+  , "category": "Flags"
+  , "aliases": [
+      "fr"
+    ]
+  , "tags": [
+      "france"
+    , "french"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🇬🇦"
+  , "description": "flag: Gabon"
+  , "category": "Flags"
+  , "aliases": [
+      "gabon"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇬🇧"
+  , "description": "flag: United Kingdom"
+  , "category": "Flags"
+  , "aliases": [
+      "gb"
+    , "uk"
+    ]
+  , "tags": [
+      "flag"
+    , "british"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🇬🇩"
+  , "description": "flag: Grenada"
+  , "category": "Flags"
+  , "aliases": [
+      "grenada"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇬🇪"
+  , "description": "flag: Georgia"
+  , "category": "Flags"
+  , "aliases": [
+      "georgia"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇬🇫"
+  , "description": "flag: French Guiana"
+  , "category": "Flags"
+  , "aliases": [
+      "french_guiana"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇬🇬"
+  , "description": "flag: Guernsey"
+  , "category": "Flags"
+  , "aliases": [
+      "guernsey"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "9.0"
+  }
+, {
+    "emoji": "🇬🇭"
+  , "description": "flag: Ghana"
+  , "category": "Flags"
+  , "aliases": [
+      "ghana"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇬🇮"
+  , "description": "flag: Gibraltar"
+  , "category": "Flags"
+  , "aliases": [
+      "gibraltar"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇬🇱"
+  , "description": "flag: Greenland"
+  , "category": "Flags"
+  , "aliases": [
+      "greenland"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "9.0"
+  }
+, {
+    "emoji": "🇬🇲"
+  , "description": "flag: Gambia"
+  , "category": "Flags"
+  , "aliases": [
+      "gambia"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇬🇳"
+  , "description": "flag: Guinea"
+  , "category": "Flags"
+  , "aliases": [
+      "guinea"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇬🇵"
+  , "description": "flag: Guadeloupe"
+  , "category": "Flags"
+  , "aliases": [
+      "guadeloupe"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "9.0"
+  }
+, {
+    "emoji": "🇬🇶"
+  , "description": "flag: Equatorial Guinea"
+  , "category": "Flags"
+  , "aliases": [
+      "equatorial_guinea"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇬🇷"
+  , "description": "flag: Greece"
+  , "category": "Flags"
+  , "aliases": [
+      "greece"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇬🇸"
+  , "description": "flag: South Georgia & South Sandwich Islands"
+  , "category": "Flags"
+  , "aliases": [
+      "south_georgia_south_sandwich_islands"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "9.0"
+  }
+, {
+    "emoji": "🇬🇹"
+  , "description": "flag: Guatemala"
+  , "category": "Flags"
+  , "aliases": [
+      "guatemala"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇬🇺"
+  , "description": "flag: Guam"
+  , "category": "Flags"
+  , "aliases": [
+      "guam"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇬🇼"
+  , "description": "flag: Guinea-Bissau"
+  , "category": "Flags"
+  , "aliases": [
+      "guinea_bissau"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇬🇾"
+  , "description": "flag: Guyana"
+  , "category": "Flags"
+  , "aliases": [
+      "guyana"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇭🇰"
+  , "description": "flag: Hong Kong SAR China"
+  , "category": "Flags"
+  , "aliases": [
+      "hong_kong"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇭🇲"
+  , "description": "flag: Heard & McDonald Islands"
+  , "category": "Flags"
+  , "aliases": [
+      "heard_mcdonald_islands"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "🇭🇳"
+  , "description": "flag: Honduras"
+  , "category": "Flags"
+  , "aliases": [
+      "honduras"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇭🇷"
+  , "description": "flag: Croatia"
+  , "category": "Flags"
+  , "aliases": [
+      "croatia"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇭🇹"
+  , "description": "flag: Haiti"
+  , "category": "Flags"
+  , "aliases": [
+      "haiti"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇭🇺"
+  , "description": "flag: Hungary"
+  , "category": "Flags"
+  , "aliases": [
+      "hungary"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇮🇨"
+  , "description": "flag: Canary Islands"
+  , "category": "Flags"
+  , "aliases": [
+      "canary_islands"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "9.0"
+  }
+, {
+    "emoji": "🇮🇩"
+  , "description": "flag: Indonesia"
+  , "category": "Flags"
+  , "aliases": [
+      "indonesia"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇮🇪"
+  , "description": "flag: Ireland"
+  , "category": "Flags"
+  , "aliases": [
+      "ireland"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇮🇱"
+  , "description": "flag: Israel"
+  , "category": "Flags"
+  , "aliases": [
+      "israel"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇮🇲"
+  , "description": "flag: Isle of Man"
+  , "category": "Flags"
+  , "aliases": [
+      "isle_of_man"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "9.0"
+  }
+, {
+    "emoji": "🇮🇳"
+  , "description": "flag: India"
+  , "category": "Flags"
+  , "aliases": [
+      "india"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇮🇴"
+  , "description": "flag: British Indian Ocean Territory"
+  , "category": "Flags"
+  , "aliases": [
+      "british_indian_ocean_territory"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "9.0"
+  }
+, {
+    "emoji": "🇮🇶"
+  , "description": "flag: Iraq"
+  , "category": "Flags"
+  , "aliases": [
+      "iraq"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇮🇷"
+  , "description": "flag: Iran"
+  , "category": "Flags"
+  , "aliases": [
+      "iran"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇮🇸"
+  , "description": "flag: Iceland"
+  , "category": "Flags"
+  , "aliases": [
+      "iceland"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇮🇹"
+  , "description": "flag: Italy"
+  , "category": "Flags"
+  , "aliases": [
+      "it"
+    ]
+  , "tags": [
+      "italy"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🇯🇪"
+  , "description": "flag: Jersey"
+  , "category": "Flags"
+  , "aliases": [
+      "jersey"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "9.0"
+  }
+, {
+    "emoji": "🇯🇲"
+  , "description": "flag: Jamaica"
+  , "category": "Flags"
+  , "aliases": [
+      "jamaica"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇯🇴"
+  , "description": "flag: Jordan"
+  , "category": "Flags"
+  , "aliases": [
+      "jordan"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇯🇵"
+  , "description": "flag: Japan"
+  , "category": "Flags"
+  , "aliases": [
+      "jp"
+    ]
+  , "tags": [
+      "japan"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🇰🇪"
+  , "description": "flag: Kenya"
+  , "category": "Flags"
+  , "aliases": [
+      "kenya"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇰🇬"
+  , "description": "flag: Kyrgyzstan"
+  , "category": "Flags"
+  , "aliases": [
+      "kyrgyzstan"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇰🇭"
+  , "description": "flag: Cambodia"
+  , "category": "Flags"
+  , "aliases": [
+      "cambodia"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇰🇮"
+  , "description": "flag: Kiribati"
+  , "category": "Flags"
+  , "aliases": [
+      "kiribati"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇰🇲"
+  , "description": "flag: Comoros"
+  , "category": "Flags"
+  , "aliases": [
+      "comoros"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇰🇳"
+  , "description": "flag: St. Kitts & Nevis"
+  , "category": "Flags"
+  , "aliases": [
+      "st_kitts_nevis"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇰🇵"
+  , "description": "flag: North Korea"
+  , "category": "Flags"
+  , "aliases": [
+      "north_korea"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇰🇷"
+  , "description": "flag: South Korea"
+  , "category": "Flags"
+  , "aliases": [
+      "kr"
+    ]
+  , "tags": [
+      "korea"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🇰🇼"
+  , "description": "flag: Kuwait"
+  , "category": "Flags"
+  , "aliases": [
+      "kuwait"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇰🇾"
+  , "description": "flag: Cayman Islands"
+  , "category": "Flags"
+  , "aliases": [
+      "cayman_islands"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇰🇿"
+  , "description": "flag: Kazakhstan"
+  , "category": "Flags"
+  , "aliases": [
+      "kazakhstan"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇱🇦"
+  , "description": "flag: Laos"
+  , "category": "Flags"
+  , "aliases": [
+      "laos"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇱🇧"
+  , "description": "flag: Lebanon"
+  , "category": "Flags"
+  , "aliases": [
+      "lebanon"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇱🇨"
+  , "description": "flag: St. Lucia"
+  , "category": "Flags"
+  , "aliases": [
+      "st_lucia"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇱🇮"
+  , "description": "flag: Liechtenstein"
+  , "category": "Flags"
+  , "aliases": [
+      "liechtenstein"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇱🇰"
+  , "description": "flag: Sri Lanka"
+  , "category": "Flags"
+  , "aliases": [
+      "sri_lanka"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇱🇷"
+  , "description": "flag: Liberia"
+  , "category": "Flags"
+  , "aliases": [
+      "liberia"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇱🇸"
+  , "description": "flag: Lesotho"
+  , "category": "Flags"
+  , "aliases": [
+      "lesotho"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇱🇹"
+  , "description": "flag: Lithuania"
+  , "category": "Flags"
+  , "aliases": [
+      "lithuania"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇱🇺"
+  , "description": "flag: Luxembourg"
+  , "category": "Flags"
+  , "aliases": [
+      "luxembourg"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇱🇻"
+  , "description": "flag: Latvia"
+  , "category": "Flags"
+  , "aliases": [
+      "latvia"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇱🇾"
+  , "description": "flag: Libya"
+  , "category": "Flags"
+  , "aliases": [
+      "libya"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇲🇦"
+  , "description": "flag: Morocco"
+  , "category": "Flags"
+  , "aliases": [
+      "morocco"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇲🇨"
+  , "description": "flag: Monaco"
+  , "category": "Flags"
+  , "aliases": [
+      "monaco"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "9.0"
+  }
+, {
+    "emoji": "🇲🇩"
+  , "description": "flag: Moldova"
+  , "category": "Flags"
+  , "aliases": [
+      "moldova"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇲🇪"
+  , "description": "flag: Montenegro"
+  , "category": "Flags"
+  , "aliases": [
+      "montenegro"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇲🇫"
+  , "description": "flag: St. Martin"
+  , "category": "Flags"
+  , "aliases": [
+      "st_martin"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "🇲🇬"
+  , "description": "flag: Madagascar"
+  , "category": "Flags"
+  , "aliases": [
+      "madagascar"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇲🇭"
+  , "description": "flag: Marshall Islands"
+  , "category": "Flags"
+  , "aliases": [
+      "marshall_islands"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "9.0"
+  }
+, {
+    "emoji": "🇲🇰"
+  , "description": "flag: Macedonia"
+  , "category": "Flags"
+  , "aliases": [
+      "macedonia"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇲🇱"
+  , "description": "flag: Mali"
+  , "category": "Flags"
+  , "aliases": [
+      "mali"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇲🇲"
+  , "description": "flag: Myanmar (Burma)"
+  , "category": "Flags"
+  , "aliases": [
+      "myanmar"
+    ]
+  , "tags": [
+      "burma"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇲🇳"
+  , "description": "flag: Mongolia"
+  , "category": "Flags"
+  , "aliases": [
+      "mongolia"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇲🇴"
+  , "description": "flag: Macao SAR China"
+  , "category": "Flags"
+  , "aliases": [
+      "macau"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇲🇵"
+  , "description": "flag: Northern Mariana Islands"
+  , "category": "Flags"
+  , "aliases": [
+      "northern_mariana_islands"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇲🇶"
+  , "description": "flag: Martinique"
+  , "category": "Flags"
+  , "aliases": [
+      "martinique"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "9.0"
+  }
+, {
+    "emoji": "🇲🇷"
+  , "description": "flag: Mauritania"
+  , "category": "Flags"
+  , "aliases": [
+      "mauritania"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇲🇸"
+  , "description": "flag: Montserrat"
+  , "category": "Flags"
+  , "aliases": [
+      "montserrat"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇲🇹"
+  , "description": "flag: Malta"
+  , "category": "Flags"
+  , "aliases": [
+      "malta"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇲🇺"
+  , "description": "flag: Mauritius"
+  , "category": "Flags"
+  , "aliases": [
+      "mauritius"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "9.0"
+  }
+, {
+    "emoji": "🇲🇻"
+  , "description": "flag: Maldives"
+  , "category": "Flags"
+  , "aliases": [
+      "maldives"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇲🇼"
+  , "description": "flag: Malawi"
+  , "category": "Flags"
+  , "aliases": [
+      "malawi"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇲🇽"
+  , "description": "flag: Mexico"
+  , "category": "Flags"
+  , "aliases": [
+      "mexico"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇲🇾"
+  , "description": "flag: Malaysia"
+  , "category": "Flags"
+  , "aliases": [
+      "malaysia"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇲🇿"
+  , "description": "flag: Mozambique"
+  , "category": "Flags"
+  , "aliases": [
+      "mozambique"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇳🇦"
+  , "description": "flag: Namibia"
+  , "category": "Flags"
+  , "aliases": [
+      "namibia"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇳🇨"
+  , "description": "flag: New Caledonia"
+  , "category": "Flags"
+  , "aliases": [
+      "new_caledonia"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇳🇪"
+  , "description": "flag: Niger"
+  , "category": "Flags"
+  , "aliases": [
+      "niger"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇳🇫"
+  , "description": "flag: Norfolk Island"
+  , "category": "Flags"
+  , "aliases": [
+      "norfolk_island"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "9.0"
+  }
+, {
+    "emoji": "🇳🇬"
+  , "description": "flag: Nigeria"
+  , "category": "Flags"
+  , "aliases": [
+      "nigeria"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇳🇮"
+  , "description": "flag: Nicaragua"
+  , "category": "Flags"
+  , "aliases": [
+      "nicaragua"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇳🇱"
+  , "description": "flag: Netherlands"
+  , "category": "Flags"
+  , "aliases": [
+      "netherlands"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇳🇴"
+  , "description": "flag: Norway"
+  , "category": "Flags"
+  , "aliases": [
+      "norway"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇳🇵"
+  , "description": "flag: Nepal"
+  , "category": "Flags"
+  , "aliases": [
+      "nepal"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇳🇷"
+  , "description": "flag: Nauru"
+  , "category": "Flags"
+  , "aliases": [
+      "nauru"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "9.0"
+  }
+, {
+    "emoji": "🇳🇺"
+  , "description": "flag: Niue"
+  , "category": "Flags"
+  , "aliases": [
+      "niue"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇳🇿"
+  , "description": "flag: New Zealand"
+  , "category": "Flags"
+  , "aliases": [
+      "new_zealand"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇴🇲"
+  , "description": "flag: Oman"
+  , "category": "Flags"
+  , "aliases": [
+      "oman"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇵🇦"
+  , "description": "flag: Panama"
+  , "category": "Flags"
+  , "aliases": [
+      "panama"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇵🇪"
+  , "description": "flag: Peru"
+  , "category": "Flags"
+  , "aliases": [
+      "peru"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇵🇫"
+  , "description": "flag: French Polynesia"
+  , "category": "Flags"
+  , "aliases": [
+      "french_polynesia"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "9.0"
+  }
+, {
+    "emoji": "🇵🇬"
+  , "description": "flag: Papua New Guinea"
+  , "category": "Flags"
+  , "aliases": [
+      "papua_new_guinea"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇵🇭"
+  , "description": "flag: Philippines"
+  , "category": "Flags"
+  , "aliases": [
+      "philippines"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇵🇰"
+  , "description": "flag: Pakistan"
+  , "category": "Flags"
+  , "aliases": [
+      "pakistan"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇵🇱"
+  , "description": "flag: Poland"
+  , "category": "Flags"
+  , "aliases": [
+      "poland"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇵🇲"
+  , "description": "flag: St. Pierre & Miquelon"
+  , "category": "Flags"
+  , "aliases": [
+      "st_pierre_miquelon"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "9.0"
+  }
+, {
+    "emoji": "🇵🇳"
+  , "description": "flag: Pitcairn Islands"
+  , "category": "Flags"
+  , "aliases": [
+      "pitcairn_islands"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "9.0"
+  }
+, {
+    "emoji": "🇵🇷"
+  , "description": "flag: Puerto Rico"
+  , "category": "Flags"
+  , "aliases": [
+      "puerto_rico"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇵🇸"
+  , "description": "flag: Palestinian Territories"
+  , "category": "Flags"
+  , "aliases": [
+      "palestinian_territories"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇵🇹"
+  , "description": "flag: Portugal"
+  , "category": "Flags"
+  , "aliases": [
+      "portugal"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇵🇼"
+  , "description": "flag: Palau"
+  , "category": "Flags"
+  , "aliases": [
+      "palau"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇵🇾"
+  , "description": "flag: Paraguay"
+  , "category": "Flags"
+  , "aliases": [
+      "paraguay"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇶🇦"
+  , "description": "flag: Qatar"
+  , "category": "Flags"
+  , "aliases": [
+      "qatar"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇷🇪"
+  , "description": "flag: Réunion"
+  , "category": "Flags"
+  , "aliases": [
+      "reunion"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "9.0"
+  }
+, {
+    "emoji": "🇷🇴"
+  , "description": "flag: Romania"
+  , "category": "Flags"
+  , "aliases": [
+      "romania"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇷🇸"
+  , "description": "flag: Serbia"
+  , "category": "Flags"
+  , "aliases": [
+      "serbia"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇷🇺"
+  , "description": "flag: Russia"
+  , "category": "Flags"
+  , "aliases": [
+      "ru"
+    ]
+  , "tags": [
+      "russia"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🇷🇼"
+  , "description": "flag: Rwanda"
+  , "category": "Flags"
+  , "aliases": [
+      "rwanda"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇸🇦"
+  , "description": "flag: Saudi Arabia"
+  , "category": "Flags"
+  , "aliases": [
+      "saudi_arabia"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇸🇧"
+  , "description": "flag: Solomon Islands"
+  , "category": "Flags"
+  , "aliases": [
+      "solomon_islands"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇸🇨"
+  , "description": "flag: Seychelles"
+  , "category": "Flags"
+  , "aliases": [
+      "seychelles"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇸🇩"
+  , "description": "flag: Sudan"
+  , "category": "Flags"
+  , "aliases": [
+      "sudan"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇸🇪"
+  , "description": "flag: Sweden"
+  , "category": "Flags"
+  , "aliases": [
+      "sweden"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇸🇬"
+  , "description": "flag: Singapore"
+  , "category": "Flags"
+  , "aliases": [
+      "singapore"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇸🇭"
+  , "description": "flag: St. Helena"
+  , "category": "Flags"
+  , "aliases": [
+      "st_helena"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "9.0"
+  }
+, {
+    "emoji": "🇸🇮"
+  , "description": "flag: Slovenia"
+  , "category": "Flags"
+  , "aliases": [
+      "slovenia"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇸🇯"
+  , "description": "flag: Svalbard & Jan Mayen"
+  , "category": "Flags"
+  , "aliases": [
+      "svalbard_jan_mayen"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "🇸🇰"
+  , "description": "flag: Slovakia"
+  , "category": "Flags"
+  , "aliases": [
+      "slovakia"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇸🇱"
+  , "description": "flag: Sierra Leone"
+  , "category": "Flags"
+  , "aliases": [
+      "sierra_leone"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇸🇲"
+  , "description": "flag: San Marino"
+  , "category": "Flags"
+  , "aliases": [
+      "san_marino"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇸🇳"
+  , "description": "flag: Senegal"
+  , "category": "Flags"
+  , "aliases": [
+      "senegal"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇸🇴"
+  , "description": "flag: Somalia"
+  , "category": "Flags"
+  , "aliases": [
+      "somalia"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇸🇷"
+  , "description": "flag: Suriname"
+  , "category": "Flags"
+  , "aliases": [
+      "suriname"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇸🇸"
+  , "description": "flag: South Sudan"
+  , "category": "Flags"
+  , "aliases": [
+      "south_sudan"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇸🇹"
+  , "description": "flag: São Tomé & Príncipe"
+  , "category": "Flags"
+  , "aliases": [
+      "sao_tome_principe"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇸🇻"
+  , "description": "flag: El Salvador"
+  , "category": "Flags"
+  , "aliases": [
+      "el_salvador"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇸🇽"
+  , "description": "flag: Sint Maarten"
+  , "category": "Flags"
+  , "aliases": [
+      "sint_maarten"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇸🇾"
+  , "description": "flag: Syria"
+  , "category": "Flags"
+  , "aliases": [
+      "syria"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇸🇿"
+  , "description": "flag: Eswatini"
+  , "category": "Flags"
+  , "aliases": [
+      "swaziland"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇹🇦"
+  , "description": "flag: Tristan da Cunha"
+  , "category": "Flags"
+  , "aliases": [
+      "tristan_da_cunha"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "🇹🇨"
+  , "description": "flag: Turks & Caicos Islands"
+  , "category": "Flags"
+  , "aliases": [
+      "turks_caicos_islands"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇹🇩"
+  , "description": "flag: Chad"
+  , "category": "Flags"
+  , "aliases": [
+      "chad"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "9.0"
+  }
+, {
+    "emoji": "🇹🇫"
+  , "description": "flag: French Southern Territories"
+  , "category": "Flags"
+  , "aliases": [
+      "french_southern_territories"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇹🇬"
+  , "description": "flag: Togo"
+  , "category": "Flags"
+  , "aliases": [
+      "togo"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇹🇭"
+  , "description": "flag: Thailand"
+  , "category": "Flags"
+  , "aliases": [
+      "thailand"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇹🇯"
+  , "description": "flag: Tajikistan"
+  , "category": "Flags"
+  , "aliases": [
+      "tajikistan"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇹🇰"
+  , "description": "flag: Tokelau"
+  , "category": "Flags"
+  , "aliases": [
+      "tokelau"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "9.0"
+  }
+, {
+    "emoji": "🇹🇱"
+  , "description": "flag: Timor-Leste"
+  , "category": "Flags"
+  , "aliases": [
+      "timor_leste"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇹🇲"
+  , "description": "flag: Turkmenistan"
+  , "category": "Flags"
+  , "aliases": [
+      "turkmenistan"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇹🇳"
+  , "description": "flag: Tunisia"
+  , "category": "Flags"
+  , "aliases": [
+      "tunisia"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇹🇴"
+  , "description": "flag: Tonga"
+  , "category": "Flags"
+  , "aliases": [
+      "tonga"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇹🇷"
+  , "description": "flag: Turkey"
+  , "category": "Flags"
+  , "aliases": [
+      "tr"
+    ]
+  , "tags": [
+      "turkey"
+    ]
+  , "unicode_version": "8.0"
+  , "ios_version": "9.1"
+  }
+, {
+    "emoji": "🇹🇹"
+  , "description": "flag: Trinidad & Tobago"
+  , "category": "Flags"
+  , "aliases": [
+      "trinidad_tobago"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇹🇻"
+  , "description": "flag: Tuvalu"
+  , "category": "Flags"
+  , "aliases": [
+      "tuvalu"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇹🇼"
+  , "description": "flag: Taiwan"
+  , "category": "Flags"
+  , "aliases": [
+      "taiwan"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "9.0"
+  }
+, {
+    "emoji": "🇹🇿"
+  , "description": "flag: Tanzania"
+  , "category": "Flags"
+  , "aliases": [
+      "tanzania"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇺🇦"
+  , "description": "flag: Ukraine"
+  , "category": "Flags"
+  , "aliases": [
+      "ukraine"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇺🇬"
+  , "description": "flag: Uganda"
+  , "category": "Flags"
+  , "aliases": [
+      "uganda"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇺🇲"
+  , "description": "flag: U.S. Outlying Islands"
+  , "category": "Flags"
+  , "aliases": [
+      "us_outlying_islands"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "🇺🇳"
+  , "description": "flag: United Nations"
+  , "category": "Flags"
+  , "aliases": [
+      "united_nations"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "🇺🇸"
+  , "description": "flag: United States"
+  , "category": "Flags"
+  , "aliases": [
+      "us"
+    ]
+  , "tags": [
+      "flag"
+    , "united"
+    , "america"
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "6.0"
+  }
+, {
+    "emoji": "🇺🇾"
+  , "description": "flag: Uruguay"
+  , "category": "Flags"
+  , "aliases": [
+      "uruguay"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇺🇿"
+  , "description": "flag: Uzbekistan"
+  , "category": "Flags"
+  , "aliases": [
+      "uzbekistan"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇻🇦"
+  , "description": "flag: Vatican City"
+  , "category": "Flags"
+  , "aliases": [
+      "vatican_city"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "9.0"
+  }
+, {
+    "emoji": "🇻🇨"
+  , "description": "flag: St. Vincent & Grenadines"
+  , "category": "Flags"
+  , "aliases": [
+      "st_vincent_grenadines"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇻🇪"
+  , "description": "flag: Venezuela"
+  , "category": "Flags"
+  , "aliases": [
+      "venezuela"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇻🇬"
+  , "description": "flag: British Virgin Islands"
+  , "category": "Flags"
+  , "aliases": [
+      "british_virgin_islands"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇻🇮"
+  , "description": "flag: U.S. Virgin Islands"
+  , "category": "Flags"
+  , "aliases": [
+      "us_virgin_islands"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇻🇳"
+  , "description": "flag: Vietnam"
+  , "category": "Flags"
+  , "aliases": [
+      "vietnam"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇻🇺"
+  , "description": "flag: Vanuatu"
+  , "category": "Flags"
+  , "aliases": [
+      "vanuatu"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇼🇫"
+  , "description": "flag: Wallis & Futuna"
+  , "category": "Flags"
+  , "aliases": [
+      "wallis_futuna"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "9.0"
+  }
+, {
+    "emoji": "🇼🇸"
+  , "description": "flag: Samoa"
+  , "category": "Flags"
+  , "aliases": [
+      "samoa"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇽🇰"
+  , "description": "flag: Kosovo"
+  , "category": "Flags"
+  , "aliases": [
+      "kosovo"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇾🇪"
+  , "description": "flag: Yemen"
+  , "category": "Flags"
+  , "aliases": [
+      "yemen"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇾🇹"
+  , "description": "flag: Mayotte"
+  , "category": "Flags"
+  , "aliases": [
+      "mayotte"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "9.0"
+  }
+, {
+    "emoji": "🇿🇦"
+  , "description": "flag: South Africa"
+  , "category": "Flags"
+  , "aliases": [
+      "south_africa"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇿🇲"
+  , "description": "flag: Zambia"
+  , "category": "Flags"
+  , "aliases": [
+      "zambia"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🇿🇼"
+  , "description": "flag: Zimbabwe"
+  , "category": "Flags"
+  , "aliases": [
+      "zimbabwe"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "6.0"
+  , "ios_version": "8.3"
+  }
+, {
+    "emoji": "🏴󠁧󠁢󠁥󠁮󠁧󠁿"
+  , "description": "flag: England"
+  , "category": "Flags"
+  , "aliases": [
+      "england"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "🏴󠁧󠁢󠁳󠁣󠁴󠁿"
+  , "description": "flag: Scotland"
+  , "category": "Flags"
+  , "aliases": [
+      "scotland"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+, {
+    "emoji": "🏴󠁧󠁢󠁷󠁬󠁳󠁿"
+  , "description": "flag: Wales"
+  , "category": "Flags"
+  , "aliases": [
+      "wales"
+    ]
+  , "tags": [
+    ]
+  , "unicode_version": "11.0"
+  , "ios_version": "12.1"
+  }
+]
diff --git a/plugins/emoji/update_emoji.pl b/plugins/emoji/update_emoji.pl
deleted file mode 100644
index 8034052b7..000000000
--- a/plugins/emoji/update_emoji.pl
+++ /dev/null
@@ -1,113 +0,0 @@
-#!/usr/bin/perl -w
-#
-# update_emoji.pl
-#
-# This script generates the emoji.plugin.zsh emoji definitions from the Unicode
-# character data for the emoji characters.
-#
-# The data file can be found at https://unicode.org/Public/emoji/latest/emoji-data.txt
-# as referenced in Unicode TR51 (https://www.unicode.org/reports/tr51/index.html).
-#
-# This is known to work with the data file from version 1.0. It may not work with later
-# versions if the format changes. In particular, this reads line comments to get the
-# emoji character name and unicode version.
-#
-# Country names have punctuation and other non-letter characters removed from their name,
-# to avoid possible complications with having to escape the strings when using them as
-# array subscripts. The definition file seems to use some combining characters like accents
-# that get stripped during this process.
-
-use strict;
-use warnings;
-use 5.010;
-use autodie;
-
-use Path::Class;
-use File::Copy;
-
-# Parse definitions out of the data file and convert
-sub process_emoji_data_file {
-	my ( $infile, $outfilename ) = @_;
-	my $file = file($infile);
-	my $outfile = file($outfilename);
-	my $outfilebase = $outfile->basename();
-	my $tempfilename = "$outfilename.tmp";
-	my $tempfile = file($tempfilename);
-	my $outfh = $tempfile->openw();
-	$outfh->print("
-# $outfilebase - Emoji character definitions for oh-my-zsh emoji plugin
-#
-# This file is auto-generated by update_emoji.pl. Do not edit it manually.
-#
-# This contains the definition for:
-#   \$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
-
-");
-
-	my $fh = $file->openr();
-	my $line_num = 0;
-	while ( my $line = $fh->getline() ) {
-		$line_num++;
-		$_ = $line;
-		# Skip all-comment lines (from the header) and blank lines
-		# (But don't strip comments on normal lines; we need to parse those for
-		# the emoji names.)
-		next if /^\s*#/ or /^\s*$/;
-
-		if (/^(\S.*?\S)\s*;\s*(\w+)\s*;\s*(\w+)\s*;\s*(\w+)\s*;\s*(\w.*?)\s*#\s*V(\S+)\s\(.*?\)\s*(\w.*\S)\s*$/) {
-			my ($code, $style, $level, $modifier_status, $sources, $version, $keycap_name)
-				= ($1, $2, $3, $4, $5, $6, $7);
-			#print "code=$code style=$style level=$level modifier_status=$modifier_status sources=$sources version=$version name=$keycap_name\n";
-			my @code_points = split /\s+/, $code;
-			my @sources = split /\s+/, $sources;
-
-			my $flag_country = "";
-			if ( $keycap_name =~ /^flag for (\S.*?)\s*$/) {
-				$flag_country = $1;
-			}
-
-			my $zsh_code = join '', map { "\\U$_" } @code_points;
-			# Convert keycap names to valid associative array names that do not require any
-			# quoting. Works fine for most stuff, but is clumsy for flags.
-			my $omz_name = lc($keycap_name);
-			$omz_name =~ s/[^A-Za-z0-9]/_/g;
-			my $zsh_flag_country = $flag_country;
-			$zsh_flag_country =~ s/[^\p{Letter}]/_/g;
-			if ($flag_country) {
-				$outfh->print("emoji_flags[$zsh_flag_country]=\$'$zsh_code'\n");
-			} else {
-				$outfh->print("emoji[$omz_name]=\$'$zsh_code'\n");
-			}
-			# 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 eq "modifier" ) {
-				$outfh->print("emoji_mod[$omz_name]=\$'$zsh_code'\n");
-			}
-		} else {
-			die "Failed parsing line $line_num: '$_'";
-		}
-	}
-	$fh->close();
-	$outfh->print("\n");
-	$outfh->close();
-
-	move($tempfilename, $outfilename)
-		or die "Failed moving temp file to $outfilename: $!";
-}
-
-my $datafile = "emoji-data.txt";
-my $zsh_def_file = "emoji-char-definitions.zsh";
-process_emoji_data_file($datafile, $zsh_def_file);
-
-print "Updated definition file $zsh_def_file\n";
-
-
-
diff --git a/plugins/emoji/update_emoji.py b/plugins/emoji/update_emoji.py
new file mode 100644
index 000000000..eb945b9ef
--- /dev/null
+++ b/plugins/emoji/update_emoji.py
@@ -0,0 +1,213 @@
+"""
+Update Emoji.py
+Refeshes OMZ emoji database based on the latest Unicode spec
+"""
+import re
+import json
+
+spec = open("emoji-data.txt", "r")
+
+# Regexes
+# regex_emoji will return, respectively:
+# the code points, its type (status), the actual emoji, and its official name
+regex_emoji = r"^([\w ].*?\S)\s*;\s*([\w-]+)\s*#\s*(.*?)\s(\S.*).*$"
+# regex_group returns the group of subgroup that a line opens
+regex_group = r"^#\s*(group|subgroup):\s*(.*)$"
+
+headers = """
+# emoji-char-definitions.zsh - Emoji definitions for oh-my-zsh emoji plugin
+#
+# This file is auto-generated by update_emoji.py. Do not edit it manually.
+#
+# This contains the definition for:
+#   $emoji         - which maps character names to Unicode characters
+#   $emoji_flags   - maps country names to Unicode flag characters using region
+#                    indicators
+#   $emoji_mod     - maps modifier components to Unicode characters
+#   $emoji_groups  - a single associative array 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.
+
+# Main emoji
+typeset -gAH emoji
+# National flags
+typeset -gAH emoji_flags
+# Combining modifiers
+typeset -gAH emoji_mod
+# Emoji groups
+typeset -gAH emoji_groups
+"""
+
+#######
+# Adding country codes
+#######
+# This is the only part of this script that relies on an external library
+# (country_converter), and is hence commented out by default.
+# You can uncomment it to have country codes added as aliases for flag
+# emojis. (By default, when you install this extension, country codes are
+# included as aliases, but not if you re-run this script without uncommenting.)
+# Warning: country_converter is very verbose, and will print warnings all over
+# your terminal.
+
+# import country_converter as coco # pylint: disable=wrong-import-position
+# cc = coco.CountryConverter()
+
+# def country_iso(_all_names, _omz_name):
+#     """ Using the external library country_converter,
+#         this funciton can detect the ISO2 and ISO3 codes
+#         of the country. It takes as argument the array
+#         with all the names of the emoji, and returns that array."""
+#     omz_no_underscore = re.sub(r'_', r' ', _omz_name)
+#     iso2 = cc.convert(names=[omz_no_underscore], to='ISO2')
+#     if iso2 != 'not found':
+#         _all_names.append(iso2)
+#         iso3 = cc.convert(names=[omz_no_underscore], to='ISO3')
+#         _all_names.append(iso3)
+#     return _all_names
+
+
+#######
+# Helper functions
+#######
+
+def code_to_omz(_code_points):
+    """ Returns a ZSH-compatible Unicode string from the code point(s) """
+    return r'\U' + r'\U'.join(_code_points.split(' '))
+
+def name_to_omz(_name, _group, _subgroup, _status):
+    """ Returns a reasonable snake_case name for the emoji. """
+    def snake_case(_string):
+        """ Does the regex work of snake_case """
+        remove_dots = re.sub(r'\.\(\)', r'', _string)
+        replace_ands = re.sub(r'\&', r'and', remove_dots)
+        remove_whitespace = re.sub(r'[^\#\*\w]', r'_', replace_ands)
+        return re.sub(r'__', r'_', remove_whitespace)
+
+    shortname = ""
+    split_at_colon = lambda s: s.split(": ")
+    # Special treatment by group and subgroup
+    # If the emoji is a flag, we strip "flag" from its name
+    if _group == "Flags" and len(split_at_colon(_name)) > 1:
+        shortname = snake_case(split_at_colon(_name)[1])
+    else:
+        shortname = snake_case(_name)
+    # Special treatment by status
+    # Enables us to have every emoji combination,
+    # even the one that are not officially sanctionned
+    # and are implemeted by, say, only one vendor
+    if _status == "unqualified":
+        shortname += "_unqualified"
+    elif _status == "minimally-qualified":
+        shortname += "_minimally"
+    return shortname
+
+def increment_name(_shortname):
+    """ Increment the short name by 1. If you get, say,
+    'woman_detective_unqualified', it returns
+    'woman_detective_unqualified_1', and then
+    'woman_detective_unqualified_2', etc. """
+    last_char = _shortname[-1]
+    if last_char.isdigit():
+        num = int(last_char)
+        return _shortname[:-1] + str(num + 1)
+    return _shortname + "_1"
+
+########
+# Going through every line
+########
+
+group, subgroup, short_name_buffer = "", "", ""
+emoji_database = []
+for line in spec:
+    # First, test if this line opens a group or subgroup
+    group_match = re.findall(regex_group, line)
+    if group_match != []:
+        gr_or_sub, name = group_match[0]
+        if gr_or_sub == "group":
+            group = name
+        elif gr_or_sub == "subgroup":
+            subgroup = name
+        continue # Moving on...
+    # Second, test if this line references one emoji
+    emoji_match = re.findall(regex_emoji, line)
+    if emoji_match != []:
+        code_points, status, emoji, name = emoji_match[0]
+        omz_codes = code_to_omz(code_points)
+        omz_name = name_to_omz(name, group, subgroup, status)
+        # If this emoji has the same shortname as the preceding one
+        if omz_name in short_name_buffer:
+            omz_name = increment_name(short_name_buffer)
+        short_name_buffer = omz_name
+        emoji_database.append(
+            [omz_codes, status, emoji, omz_name, group, subgroup])
+spec.close()
+
+########
+# Write to emoji-char-definitions.zsh
+########
+
+# Aliases for emojis are retrieved through the DB of Gemoji
+# Retrieved on Aug 9 2019 from the following URL:
+# https://raw.githubusercontent.com/github/gemoji/master/db/emoji.json
+
+gemoji_db = open("gemoji_db.json")
+j = json.load(gemoji_db)
+aliases_map = {entry['emoji']: entry['aliases'] for entry in j}
+all_omz_names = [emoji_data[3] for emoji_data in emoji_database]
+
+# Let's begin writing to this file
+output = open("emoji-char-definitions.zsh", "w")
+output.write(headers)
+
+emoji_groups = {"fruits": "\n", "vehicles": "\n", "hands": "\n",
+                "people": "\n", "animals": "\n", "faces": "\n",
+                "flags": "\n"}
+
+# First, write every emoji down
+for _omz_codes, _status, _emoji, _omz_name, _group, _subgroup in emoji_database:
+
+    # One emoji can be mapped to multiple names (aliases or country codes)
+    names_for_this_emoji = [_omz_name]
+
+    # Variable that indicates in which map the emoji will be located
+    emoji_map = "emoji"
+    if _status == "component":
+        emoji_map = "emoji_mod"
+    if _group == "Flags":
+        emoji_map = "emoji_flags"
+        # Adding country codes (Optional, see above)
+        # names_for_this_emoji = country_iso(names_for_this_emoji, _omz_name)
+
+    # Check if there is an alias available in the Gemoji DB
+    if _emoji in aliases_map.keys():
+        for alias in aliases_map[_emoji]:
+            if alias not in all_omz_names:
+                names_for_this_emoji.append(alias)
+
+    # And now we write to the definitions file
+    for one_name in names_for_this_emoji:
+        output.write(f"{emoji_map}[{one_name}]=$'{_omz_codes}'\n")
+
+    # Storing the emoji in defined subgroups for the next step
+    if _status == "fully-qualified":
+        if _subgroup == "food-fruit":
+            emoji_groups["fruits"] += f"  {_omz_name}\n"
+        elif "transport-" in _subgroup:
+            emoji_groups["vehicles"] += f"  {_omz_name}\n"
+        elif "hand-" in _subgroup:
+            emoji_groups["hands"] += f"  {_omz_name}\n"
+        elif "person-" in _subgroup or _subgroup == "family":
+            emoji_groups["people"] += f"  {_omz_name}\n"
+        elif "animal-" in _subgroup:
+            emoji_groups["animals"] += f"  {_omz_name}\n"
+        elif "face-" in _subgroup:
+            emoji_groups["faces"] += f"  {_omz_name}\n"
+        elif _group == "Flags":
+            emoji_groups["flags"] += f"  {_omz_name}\n"
+
+# Second, write the subgroups to the end of the file
+for name, string in emoji_groups.items():
+    output.write(f'\nemoji_groups[{name}]="{string}"\n')
+output.close()

From 79cf2a0d43ddda338487c85c420f67fe9c56687f Mon Sep 17 00:00:00 2001
From: Shundeev Egor <shundeevegor@gmail.com>
Date: Tue, 5 Jan 2021 19:46:05 +0300
Subject: [PATCH 668/869] fix(fastfile): fix multiple bugs in plugin (#9574)

- `fastfile_sync` didn't correctly create the aliases
- `fastfile_rm` didn't correctly remove the alias

Fixes #9151
Closes #9574
---
 plugins/fastfile/README.md           | 13 +++++++------
 plugins/fastfile/fastfile.plugin.zsh | 15 ++++++++-------
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/plugins/fastfile/README.md b/plugins/fastfile/README.md
index 37f5b2f53..32f619ffd 100644
--- a/plugins/fastfile/README.md
+++ b/plugins/fastfile/README.md
@@ -4,6 +4,7 @@ This plugin adds a way to reference certain files or folders used frequently usi
 a global alias or shortcut.
 
 To use it, add `fastfile` to the plugins array in your zshrc file:
+
 ```zsh
 plugins=(... fastfile)
 ```
@@ -13,36 +14,38 @@ plugins=(... fastfile)
 Example: you access folder `/code/project/backend/database` very frequently.
 
 First, generate a shortcut with the name `pjdb`:
+
 ```zsh
 $ fastfile pjdb /code/project/backend/database
 ```
 
 Next time you want to access it, use `§pjdb`. For example:
+
 ```zsh
 $ cd §pjdb
 $ subl §pjdb
 ```
+
 where § is the fastfile prefix (see [below](#options) for how to change).
 
 **Note:** shortcuts with spaces in the name are assigned a global alias
 where the spaces have been substituted with underscores (`_`). For example:
 a shortcut named `"hello world"` corresponds with `§hello_world`.
 
-
 ## Functions
 
-- `fastfile <shortcut_name> <path/to/file/or/folder>`: generate a shortcut.
+- `fastfile <shortcut_name> [path/to/file/or/folder]`: generate a shortcut.
+  If the second argument is not provided, the current directory is used.
 
 - `fastfile_print <shortcut_name>`: prints a shortcut, with the format
   `<prefix><shortcut_name> -> <shortcut_path>`.
 
 - `fastfile_ls`: lists all shortcuts.
 
-- `fastfile_rm <shortcut_name> `: remove a shortcut.
+- `fastfile_rm <shortcut_name>`: remove a shortcut.
 
 - `fastfile_sync`: generates the global aliases for the shortcuts.
 
-
 ### Internal functions
 
 - `fastfile_resolv <shortcut_name>`: resolves the location of the shortcut
@@ -51,7 +54,6 @@ a shortcut named `"hello world"` corresponds with `§hello_world`.
 
 - `fastfile_get <shortcut_name>`: get the real path of the shortcut.
 
-
 ## Aliases
 
 | Alias  | Function         |
@@ -62,7 +64,6 @@ a shortcut named `"hello world"` corresponds with `§hello_world`.
 | ffls   | `fastfile_ls`    |
 | ffsync | `fastfile_sync`  |
 
-
 ## Options
 
 These are options you can set to change certain parts of the plugin. To change
diff --git a/plugins/fastfile/fastfile.plugin.zsh b/plugins/fastfile/fastfile.plugin.zsh
index 6288bb275..896fed5f7 100644
--- a/plugins/fastfile/fastfile.plugin.zsh
+++ b/plugins/fastfile/fastfile.plugin.zsh
@@ -44,7 +44,7 @@ function fastfile() {
 #   The path to the shortcut file
 #
 function fastfile_resolv() {
-    echo "${fastfile_dir}${1}"
+    echo "${fastfile_dir}/${1}"
 }
 
 #
@@ -78,9 +78,9 @@ function fastfile_print() {
 #    (=> fastfile_print) for each shortcut
 #
 function fastfile_ls() {
-    for f in "${fastfile_dir}"/*(NF); do
-        file=`basename "$f"` # To enable simpler handling of spaces in file names
-        varkey=`echo "$file" | tr " " "_"`
+    for f in "${fastfile_dir}"/*(N); do
+        file=$(basename "$f") # To enable simpler handling of spaces in file names
+        varkey=$(echo "$file" | tr " " "_")
 
         # Special format for columns
         echo "${fastfile_var_prefix}${varkey}|->|$(fastfile_get "$file")"
@@ -98,15 +98,16 @@ function fastfile_ls() {
 function fastfile_rm() {
     fastfile_print "$1"
     rm "$(fastfile_resolv "$1")"
+    unalias "${fastfile_var_prefix}${1}"
 }
 
 #
 # Generate the aliases for the shortcuts
 #
 function fastfile_sync() {
-    for f in "${fastfile_dir}"/*(NF); do
-        file=`basename "$f"` # To enable simpler handling of spaces in file names
-        varkey=`echo "$file" | tr " " "_"`
+    for f in "${fastfile_dir}"/*(N); do
+        file=$(basename "$f") # To enable simpler handling of spaces in file names
+        varkey=$(echo "$file" | tr " " "_")
 
         alias -g "${fastfile_var_prefix}${varkey}"="'$(fastfile_get "$file")'"
     done

From ca2652769ce283ddb77807767215e19a78642c51 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A1s=20Svraka?= <svraka.andras@gmail.com>
Date: Thu, 1 Apr 2021 18:01:22 +0200
Subject: [PATCH 669/869] feat(ripgrep): update ripgrep completions (#9775)

Closes #9775
---
 plugins/ripgrep/README.md |  4 ++--
 plugins/ripgrep/_ripgrep  | 32 +++++++++++++++++++++++++++++---
 2 files changed, 31 insertions(+), 5 deletions(-)

diff --git a/plugins/ripgrep/README.md b/plugins/ripgrep/README.md
index 937f73c81..a26f45823 100644
--- a/plugins/ripgrep/README.md
+++ b/plugins/ripgrep/README.md
@@ -8,6 +8,6 @@ To use it, add `ripgrep` to the plugins array in your zshrc file:
 plugins=(... ripgrep)
 ```
 
-Completion is taken from the ripgrep release [`11.0.2`](https://github.com/BurntSushi/ripgrep/releases/tag/11.0.2).
+Completion is taken from the ripgrep release [`12.1.1`](https://github.com/BurntSushi/ripgrep/releases/tag/12.1.1).
 
-Updated on August 16th, 2019.
+Updated on April 1st, 2021.
diff --git a/plugins/ripgrep/_ripgrep b/plugins/ripgrep/_ripgrep
index d7dcfd64a..828a6e601 100644
--- a/plugins/ripgrep/_ripgrep
+++ b/plugins/ripgrep/_ripgrep
@@ -3,7 +3,7 @@
 ##
 # zsh completion function for ripgrep
 #
-# Run ci/test_complete.sh after building to ensure that the options supported by
+# Run ci/test-complete after building to ensure that the options supported by
 # this function stay in synch with the `rg` binary.
 #
 # For convenience, a completion reference guide is included at the bottom of
@@ -72,11 +72,19 @@ _rg() {
     + '(count)' # Counting options
     {-c,--count}'[only show count of matching lines for each file]'
     '--count-matches[only show count of individual matches for each file]'
+    '--include-zero[include files with zero matches in summary]'
 
     + '(encoding)' # Encoding options
     {-E+,--encoding=}'[specify text encoding of files to search]: :_rg_encodings'
     $no'--no-encoding[use default text encoding]'
 
+    + '(engine)' # Engine choice options
+    '--engine=[select which regex engine to use]:when:((
+      default\:"use default engine"
+      pcre2\:"identical to --pcre2"
+      auto\:"identical to --auto-hybrid-regex"
+    ))'
+
     + file # File-input options
     '(1)*'{-f+,--file=}'[specify file containing patterns to search for]: :_files'
 
@@ -128,6 +136,10 @@ _rg() {
     '--ignore-file-case-insensitive[process ignore files case insensitively]'
     $no'--no-ignore-file-case-insensitive[process ignore files case sensitively]'
 
+    + '(ignore-exclude)' # Local exclude (ignore)-file options
+    "--no-ignore-exclude[don't respect local exclude (ignore) files]"
+    $no'--ignore-exclude[respect local exclude (ignore) files]'
+
     + '(ignore-global)' # Global ignore-file options
     "--no-ignore-global[don't respect global ignore files]"
     $no'--ignore-global[respect global ignore files]'
@@ -140,10 +152,18 @@ _rg() {
     "--no-ignore-vcs[don't respect version control ignore files]"
     $no'--ignore-vcs[respect version control ignore files]'
 
-    + '(ignore-dot)' # .ignore-file options
+    + '(require-git)' # git specific settings
+    "--no-require-git[don't require git repository to respect gitignore rules]"
+    $no'--require-git[require git repository to respect gitignore rules]'
+
+    + '(ignore-dot)' # .ignore options
     "--no-ignore-dot[don't respect .ignore files]"
     $no'--ignore-dot[respect .ignore files]'
 
+    + '(ignore-files)' # custom global ignore file options
+    "--no-ignore-files[don't respect --ignore-file flags]"
+    $no'--ignore-files[respect --ignore-file files]'
+
     + '(json)' # JSON options
     '--json[output results in JSON Lines format]'
     $no"--no-json[don't output results in JSON Lines format]"
@@ -263,6 +283,10 @@ _rg() {
     {-w,--word-regexp}'[only show matches surrounded by word boundaries]'
     {-x,--line-regexp}'[only show matches surrounded by line boundaries]'
 
+    + '(unicode)' # Unicode options
+    $no'--unicode[enable Unicode mode]'
+    '--no-unicode[disable Unicode mode]'
+
     + '(zip)' # Compression options
     '(--pre)'{-z,--search-zip}'[search in compressed files]'
     $no"--no-search-zip[don't search in compressed files]"
@@ -277,7 +301,9 @@ _rg() {
     ))'
     '*--colors=[specify color and style settings]: :->colorspec'
     '--context-separator=[specify string used to separate non-continuous context lines in output]:separator'
+    $no"--no-context-separator[don't print context separators]"
     '--debug[show debug messages]'
+    '--trace[show more verbose debug messages]'
     '--dfa-size-limit=[specify upper size limit of generated DFA]:DFA size (bytes)'
     "(1 stats)--files[show each file that would be searched (but don't search)]"
     '*--ignore-file=[specify additional ignore file]:ignore file:_files'
@@ -297,7 +323,7 @@ _rg() {
     '(--type-list)*: :_files'
   )
 
-  # This is used with test_complete.sh to verify that there are no options
+  # This is used with test-complete to verify that there are no options
   # listed in the help output that aren't also defined here
   [[ $_RG_COMPLETE_LIST_ARGS == (1|t*|y*) ]] && {
     print -rl - $args

From 1d6553e631b6b54d3696e093cfe5d3d854d9b684 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A1s=20Svraka?= <svraka.andras@gmail.com>
Date: Thu, 1 Apr 2021 18:05:24 +0200
Subject: [PATCH 670/869] feat(fd): update fd completions (#9775)

Closes #9775
---
 plugins/fd/README.md |   4 +-
 plugins/fd/_fd       | 325 +++++++++++++++++++++++++++++++++----------
 2 files changed, 257 insertions(+), 72 deletions(-)

diff --git a/plugins/fd/README.md b/plugins/fd/README.md
index 4d9cf190f..cf9f7815d 100644
--- a/plugins/fd/README.md
+++ b/plugins/fd/README.md
@@ -8,6 +8,6 @@ To use it, add `fd` to the plugins array in your zshrc file:
 plugins=(... fd)
 ```
 
-Completion is taken from the fd release [`7.3.0`](https://github.com/sharkdp/fd/releases/tag/v7.3.0).
+Completion is taken from the fd release [`8.2.1`](https://github.com/sharkdp/fd/releases/tag/v8.2.1).
 
-Updated on February 13th, 2019.
+Updated on April 1st, 2021.
diff --git a/plugins/fd/_fd b/plugins/fd/_fd
index 7a4c38753..f5d9e01d2 100644
--- a/plugins/fd/_fd
+++ b/plugins/fd/_fd
@@ -1,83 +1,268 @@
 #compdef fd fdfind
 
+##
+# zsh completion function for fd
+#
+# Based on ripgrep completion function.
+# Originally based on code from the zsh-users project — see copyright notice
+# below.
+
 autoload -U is-at-least
 
 _fd() {
-    typeset -A opt_args
-    typeset -a _arguments_options
-    local ret=1
+  local curcontext="$curcontext" no='!' ret=1
+  local -a context line state state_descr _arguments_options fd_types fd_args
+  local -A opt_args
 
-    if is-at-least 5.2; then
-        _arguments_options=(-s -S -C)
-    else
-        _arguments_options=(-s -C)
-    fi
+  if is-at-least 5.2; then
+    _arguments_options=( -s -S )
+  else
+    _arguments_options=( -s )
+  fi
 
-    local context curcontext="$curcontext" state line
-    _arguments "${_arguments_options[@]}" \
-'-d+[Set maximum search depth (default: none)]' \
-'--max-depth=[Set maximum search depth (default: none)]' \
-'--maxdepth=[See --max-depth]' \
-'*-t+[Filter by type: file (f), directory (d), symlink (l),
-executable (x), empty (e)]: :(f file d directory l symlink x executable e empty)' \
-'*--type=[Filter by type: file (f), directory (d), symlink (l),
-executable (x), empty (e)]: :(f file d directory l symlink x executable e empty)' \
-'*-e+[Filter by file extension]' \
-'*--extension=[Filter by file extension]' \
-'-x+[Execute a command for each search result]' \
-'--exec=[Execute a command for each search result]' \
-'(-x --exec)-X+[Execute a command with all search results at once]' \
-'(-x --exec)--exec-batch=[Execute a command with all search results at once]' \
-'*-E+[Exclude entries that match the given glob pattern]' \
-'*--exclude=[Exclude entries that match the given glob pattern]' \
-'*--ignore-file=[Add a custom ignore-file in .gitignore format]' \
-'-c+[When to use colors: never, *auto*, always]: :(never auto always)' \
-'--color=[When to use colors: never, *auto*, always]: :(never auto always)' \
-'-j+[Set number of threads to use for searching & executing]' \
-'--threads=[Set number of threads to use for searching & executing]' \
-'*-S+[Limit results based on the size of files.]' \
-'*--size=[Limit results based on the size of files.]' \
-'--max-buffer-time=[the time (in ms) to buffer, before streaming to the console]' \
-'--changed-within=[Filter by file modification time (newer than)]' \
-'--changed-before=[Filter by file modification time (older than)]' \
-'*--search-path=[(hidden)]' \
-'-H[Search hidden files and directories]' \
-'--hidden[Search hidden files and directories]' \
-'-I[Do not respect .(git|fd)ignore files]' \
-'--no-ignore[Do not respect .(git|fd)ignore files]' \
-'--no-ignore-vcs[Do not respect .gitignore files]' \
-'*-u[Alias for no-ignore and/or hidden]' \
-'-s[Case-sensitive search (default: smart case)]' \
-'--case-sensitive[Case-sensitive search (default: smart case)]' \
-'-i[Case-insensitive search (default: smart case)]' \
-'--ignore-case[Case-insensitive search (default: smart case)]' \
-'-F[Treat the pattern as a literal string]' \
-'--fixed-strings[Treat the pattern as a literal string]' \
-'-a[Show absolute instead of relative paths]' \
-'--absolute-path[Show absolute instead of relative paths]' \
-'-L[Follow symbolic links]' \
-'--follow[Follow symbolic links]' \
-'-p[Search full path (default: file-/dirname only)]' \
-'--full-path[Search full path (default: file-/dirname only)]' \
-'-0[Separate results by the null character]' \
-'--print0[Separate results by the null character]' \
-'--show-errors[Enable display of filesystem errors]' \
-'-h[Prints help information]' \
-'--help[Prints help information]' \
-'-V[Prints version information]' \
-'--version[Prints version information]' \
-'::pattern -- the search pattern, a regular expression (optional):_files' \
-'::path -- the root directory for the filesystem search (optional):_files' \
-&& ret=0
+  fd_types=(
+    {f,file}'\:"regular files"'
+    {d,directory}'\:"directories"'
+    {l,symlink}'\:"symbolic links"'
+    {e,empty}'\:"empty files or directories"'
+    {x,executable}'\:"executable (files)"'
+    {s,socket}'\:"sockets"'
+    {p,pipe}'\:"named pipes (FIFOs)"'
+  )
 
-}
+  # Do not complete rare options unless either the current prefix
+  # matches one of those options or the user has the `complete-all`
+  # style set. Note that this prefix check has to be updated manually to account
+  # for all of the potential negation options listed below!
+  if
+    # (--[bpsu]* => match all options marked with '$no')
+    [[ $PREFIX$SUFFIX == --[bopsu]* ]] ||
+    zstyle -t ":complete:$curcontext:*" complete-all
+  then
+    no=
+  fi
 
-(( $+functions[_fd_commands] )) ||
-_fd_commands() {
-    local commands; commands=(
+  # We make heavy use of argument groups here to prevent the option specs from
+  # growing unwieldy. These aren't supported in zsh <5.4, though, so we'll strip
+  # them out below if necessary. This makes the exclusions inaccurate on those
+  # older versions, but oh well — it's not that big a deal
+  fd_args=(
+    + '(hidden)' # hidden files
+    {-H,--hidden}'[search hidden files/directories]'
 
-    )
-    _describe -t commands 'fd commands' commands "$@"
+    + '(no-ignore-full)' # all ignore files
+    '(no-ignore-partial)'{-I,--no-ignore}"[don't respect .(git|fd)ignore and global ignore files]"
+    $no'(no-ignore-partial)*'{-u,--unrestricted}'[alias for --no-ignore, when repeated also alias for --hidden]'
+
+    + no-ignore-partial # some ignore files
+    "(no-ignore-full --no-ignore-vcs)--no-ignore-vcs[don't respect .gitignore files]"
+    "!(no-ignore-full --no-global-ignore-file)--no-global-ignore-file[don't respect the global ignore file]"
+
+    + '(case)' # case-sensitivity
+    {-s,--case-sensitive}'[perform a case-sensitive search]'
+    {-i,--ignore-case}'[perform a case-insensitive search]'
+
+    + '(regex-pattern)' # regex-based search pattern
+    '(no-regex-pattern)--regex[perform a regex-based search (default)]'
+
+    + '(no-regex-pattern)' # non-regex-based search pattern
+    {-g,--glob}'[perform a glob-based search]'
+    {-F,--fixed-strings}'[treat pattern as literal string instead of a regex]'
+
+    + '(match-full)' # match against full path
+    {-p,--full-path}'[match the pattern against the full path instead of the basename]'
+
+    + '(follow)' # follow symlinks
+    {-L,--follow}'[follow symbolic links to directories]'
+
+    + '(abs-path)' # show absolute paths
+    '(long-listing)'{-a,--absolute-path}'[show absolute paths instead of relative paths]'
+
+    + '(null-sep)' # use null separator for output
+    '(long-listing)'{-0,--print0}'[separate search results by the null character]'
+
+    + '(long-listing)' # long-listing output
+    '(abs-path null-sep max-results exec-cmds)'{-l,--list-details}'[use a long listing format with file metadata]'
+
+    + '(max-results)' # max number of results
+    '(long-listing exec-cmds)--max-results=[limit number of search results to given count and quit]:count'
+    '(long-listing exec-cmds)-1[limit to a single search result and quit]'
+
+    + '(fs-errors)' # file-system errors
+    $no'--show-errors[enable the display of filesystem errors]'
+
+    + '(fs-traversal)' # file-system traversal
+    $no"--one-file-system[don't descend into directories on other file systems]"
+    '!--mount'
+    '!--xdev'
+
+    + dir-depth # directory depth
+    '(--exact-depth -d --max-depth)'{-d+,--max-depth=}'[set max directory depth to descend when searching]:depth'
+    '!(--exact-depth -d --max-depth)--maxdepth:depth'
+    '(--exact-depth --min-depth)--min-depth=[set directory depth to descend before start searching]:depth'
+    '(--exact-depth -d --max-depth --maxdepth --min-depth)--exact-depth=[only search at the exact given directory depth]:depth'
+
+    + prune # pruning
+    "--prune[don't traverse into matching directories]"
+
+    + filter-misc # filter search
+    '*'{-t+,--type=}"[filter search by type]:type:(($fd_types))"
+    '*'{-e+,--extension=}'[filter search by file extension]:extension'
+    '*'{-E+,--exclude=}'[exclude files/directories that match the given glob pattern]:glob pattern'
+    '*'{-S+,--size=}'[limit search by file size]:size limit:->size'
+    '(-o --owner)'{-o+,--owner=}'[filter by owning user and/or group]:owner and/or group:->owner'
+
+    + ignore-file # extra ignore files
+    '*--ignore-file=[add a custom, low-precedence ignore-file with .gitignore format]: :_files'
+
+    + '(filter-mtime-newer)' # filter by files modified after than
+    '--changed-within=[limit search to files/directories modified within the given date/duration]:date or duration'
+    '!--change-newer-than=:date/duration'
+    '!--newer=:date/duration'
+
+    + '(filter-mtime-older)' # filter by files modified before than
+    '--changed-before=[limit search to files/directories modified before the given date/duration]:date or duration'
+    '!--change-older-than=:date/duration'
+    '!--older=:date/duration'
+
+    + '(color)' # colorize output
+    {-c+,--color=}'[declare when to colorize search results]:when to colorize:((
+      auto\:"show colors if the output goes to an interactive console (default)"
+      never\:"do not use colorized output"
+      always\:"always use colorized output"
+    ))'
+
+    + '(threads)'
+    {-j+,--threads=}'[set the number of threads for searching and executing]:number of threads'
+
+    + '(exec-cmds)' # execute command
+    '(long-listing max-results)'{-x+,--exec=}'[execute command for each search result]:command: _command_names -e:*\;::program arguments: _normal'
+    '(long-listing max-results)'{-X+,--exec-batch=}'[execute command for all search results at once]:command: _command_names -e:*\;::program arguments: _normal'
+
+    + other
+    '!(--max-buffer-time)--max-buffer-time=[set amount of time to buffer before showing output]:time (ms)'
+
+    + '(about)' # about flags
+    '(: * -)'{-h,--help}'[display help message]'
+    '(: * -)'{-v,--version}'[display version information]'
+
+    + path-sep # set path separator for output
+    $no'(--path-separator)--path-separator=[set the path separator to use when printing file paths]:path separator'
+
+    + search-path
+    $no'(--base-directory)--base-directory=[change the current working directory to the given path]:directory:_files -/'
+    $no'(*)*--search-path=[set search path (instead of positional <path> arguments)]:directory:_files -/'
+
+    + args # positional arguments
+    '1: :_guard "^-*" pattern'
+    '(--search-path)*:directory:_files -/'
+  )
+
+  # Strip out argument groups where unsupported (see above)
+  is-at-least 5.4 ||
+  fd_args=( ${(@)args:#(#i)(+|[a-z0-9][a-z0-9_-]#|\([a-z0-9][a-z0-9_-]#\))} )
+
+  _arguments $_arguments_options : $fd_args && ret=0
+
+  case ${state} in
+    owner)
+      compset -P '(\\|)\!'
+      if compset -P '*:'; then
+        _groups && ret=0
+      else
+        if
+          compset -S ':*' ||
+          # Do not add the colon suffix when completing "!user<TAB>
+          # (with a starting double-quote) otherwise pressing tab again
+          # after the inserted colon "!user:<TAB> will complete history modifiers
+          [[ $IPREFIX == (\\|\!)*  && ($QIPREFIX == \"* && -z $QISUFFIX) ]]
+        then
+          _users && ret=0
+        else
+          local q
+          # Since quotes are needed when using the negation prefix !,
+          # automatically remove the colon suffix also when closing the quote
+          if [[ $QIPREFIX == [\'\"]* ]]; then
+            q=${QIPREFIX:0:1}
+          fi
+          _users -r ": \t\n\-$q" -S : && ret=0
+        fi
+      fi
+      ;;
+
+    size)
+      if compset -P '[-+][0-9]##'; then
+        local -a suff=(
+          'B:bytes'
+          'K:kilobytes  (10^3  = 1000   bytes)'
+          'M:megabytes  (10^6  = 1000^2 bytes)'
+          'G:gigabytes  (10^9  = 1000^3 bytes)'
+          'T:terabytes  (10^12 = 1000^4 bytes)'
+          'Ki:kibibytes  ( 2^10 = 1024   bytes)'
+          'Mi:mebibytes  ( 2^20 = 1024^2 bytes)'
+          'Gi:gigibytes  ( 2^30 = 1024^3 bytes)'
+          'Ti:tebibytes  ( 2^40 = 1024^4 bytes)'
+        )
+        _describe -t units 'size limit units' suff -V 'units'
+      elif compset -P '[-+]'; then
+        _message -e 'size limit number (full format: <+-><number><unit>)'
+      else
+        _values 'size limit prefix (full format: <prefix><number><unit>)' \
+          '\+[file size must be greater or equal to]'\
+          '-[file size must be less than or equal to]' && ret=0
+      fi
+      ;;
+  esac
+
+  return ret
 }
 
 _fd "$@"
+
+# ------------------------------------------------------------------------------
+# Copyright (c) 2011 Github zsh-users - http://github.com/zsh-users
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#     * Redistributions of source code must retain the above copyright
+#       notice, this list of conditions and the following disclaimer.
+#     * Redistributions in binary form must reproduce the above copyright
+#       notice, this list of conditions and the following disclaimer in the
+#       documentation and/or other materials provided with the distribution.
+#     * Neither the name of the zsh-users nor the
+#       names of its contributors may be used to endorse or promote products
+#       derived from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+# DISCLAIMED. IN NO EVENT SHALL ZSH-USERS BE LIABLE FOR ANY
+# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# ------------------------------------------------------------------------------
+# Description
+# -----------
+#
+#  Completion script for fd
+#
+# ------------------------------------------------------------------------------
+# Authors
+# -------
+#
+#  * smancill (https://github.com/smancill)
+#
+# ------------------------------------------------------------------------------
+
+# Local Variables:
+# mode: shell-script
+# coding: utf-8-unix
+# indent-tabs-mode: nil
+# sh-indentation: 2
+# sh-basic-offset: 2
+# End:
+# vim: ft=zsh sw=2 ts=2 et

From 7df7d5b4f1961083c425c4bfcacc4cf995e6bfb0 Mon Sep 17 00:00:00 2001
From: CGenie <cgenie@pm.me>
Date: Tue, 28 Dec 2021 19:04:45 +0100
Subject: [PATCH 671/869] feat(fossil): add completion for `fossil add` (#8564)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Marc Cornellà <hello@mcornella.com>
---
 plugins/fossil/_fossil           | 32 ++++++++++++++++++++++++++++
 plugins/fossil/fossil.plugin.zsh | 36 +-------------------------------
 2 files changed, 33 insertions(+), 35 deletions(-)
 create mode 100644 plugins/fossil/_fossil

diff --git a/plugins/fossil/_fossil b/plugins/fossil/_fossil
new file mode 100644
index 000000000..d2d48bdec
--- /dev/null
+++ b/plugins/fossil/_fossil
@@ -0,0 +1,32 @@
+#compdef fossil
+
+function _fossil_get_command_list () {
+  fossil help -a | grep -v "Usage|Common|This is"
+}
+
+function _fossil () {
+  local context state state_descr line
+  typeset -A opt_args
+
+  _arguments \
+    '1: :->command'\
+    '2: :->subcommand'
+
+  case $state in
+    command)
+      local _OUTPUT=$(fossil branch 2>&1 | grep "use --repo")
+      if [[ -z "$_OUTPUT" ]]; then
+        compadd "$(_fossil_get_command_list)"
+      else
+        compadd clone init import help version
+      fi ;;
+    subcommand)
+      case "$words[2]" in
+      help) compadd "$(_fossil_get_command_list)" ;;
+      add) compadd "$(fossil extra)" ;;
+      *) compcall -D ;;
+      esac ;;
+  esac
+}
+
+_fossil "$@"
diff --git a/plugins/fossil/fossil.plugin.zsh b/plugins/fossil/fossil.plugin.zsh
index 25a8d121d..dfad73d36 100644
--- a/plugins/fossil/fossil.plugin.zsh
+++ b/plugins/fossil/fossil.plugin.zsh
@@ -12,7 +12,7 @@ ZSH_THEME_FOSSIL_PROMPT_DIRTY=" %{$fg_bold[red]%}✖"
 # Text to display if the branch is clean
 ZSH_THEME_FOSSIL_PROMPT_CLEAN=" %{$fg_bold[green]%}✔"
 
-function fossil_prompt_info () {
+function fossil_prompt_info() {
   local _OUTPUT=`fossil branch 2>&1`
   local _STATUS=`echo $_OUTPUT | grep "use --repo"`
   if [ "$_STATUS" = "" ]; then
@@ -32,37 +32,6 @@ function fossil_prompt_info () {
   fi
 }
 
-function _fossil_get_command_list () {
-  fossil help -a | grep -v "Usage|Common|This is"
-}
-
-function _fossil () {
-  local context state state_descr line
-  typeset -A opt_args
-
-  _arguments \
-    '1: :->command'\
-    '2: :->subcommand'
-
-  case $state in
-    command)
-      local _OUTPUT=`fossil branch 2>&1 | grep "use --repo"`
-      if [ "$_OUTPUT" = "" ]; then
-        compadd `_fossil_get_command_list`
-      else
-        compadd clone init import help version
-      fi
-      ;;
-    subcommand)
-      if [ "$words[2]" = "help" ]; then
-        compadd `_fossil_get_command_list`
-      else
-        compcall -D
-      fi
-    ;;
-  esac
-}
-
 function _fossil_prompt () {
   local current=`echo $PROMPT $RPROMPT | grep fossil`
 
@@ -82,8 +51,5 @@ function _fossil_prompt () {
   fi
 }
 
-compdef _fossil fossil
-
 autoload -U add-zsh-hook
-
 add-zsh-hook precmd _fossil_prompt

From 40e0e72cd746858a9d8ed2ce628ceff5100500f3 Mon Sep 17 00:00:00 2001
From: Franco Catena <francocatena@gmail.com>
Date: Tue, 28 Dec 2021 15:07:05 -0300
Subject: [PATCH 672/869] feat(gcloud): support Homebrew Google Cloud SDK path
 (#9799)


From 89ab38fe648a9c68e8425ed8d97b3dd23ef06402 Mon Sep 17 00:00:00 2001
From: Fidel Torres <fidel.torres@hazzas.com>
Date: Fri, 13 Nov 2020 05:21:48 +1100
Subject: [PATCH 673/869] feat(git-flow): add aliases for current `feature` /
 `release` branch (#9439)

Closes #9439
---
 plugins/git-flow/git-flow.plugin.zsh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/plugins/git-flow/git-flow.plugin.zsh b/plugins/git-flow/git-flow.plugin.zsh
index 8f0714b16..041df3aa5 100644
--- a/plugins/git-flow/git-flow.plugin.zsh
+++ b/plugins/git-flow/git-flow.plugin.zsh
@@ -39,6 +39,10 @@ alias gflrf='git flow release finish'
 alias gflhp='git flow hotfix publish'
 alias gflrp='git flow release publish'
 alias gflfpll='git flow feature pull'
+alias gflffc='git flow feature finish $(echo $(current_branch) | cut -c 9-)'
+alias gflfpc='git flow feature publish $(echo $(current_branch) | cut -c 9-)'
+alias gflrfc='git flow release finish $(echo $(current_branch) | cut -c 9-)'
+alias gflrpc='git flow release publish $(echo $(current_branch) | cut -c 9-)'
 
 _git-flow ()
 {

From 7a38fa35c404fdc17fdb4a310f73e98178c3a84a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Tue, 28 Dec 2021 19:26:27 +0100
Subject: [PATCH 674/869] refactor(git-flow): extract `git-flow` completion
 logic

---
 plugins/git-flow/_git-flow           | 327 ++++++++++++++++++++++++
 plugins/git-flow/git-flow.plugin.zsh | 357 +--------------------------
 2 files changed, 334 insertions(+), 350 deletions(-)
 create mode 100644 plugins/git-flow/_git-flow

diff --git a/plugins/git-flow/_git-flow b/plugins/git-flow/_git-flow
new file mode 100644
index 000000000..eab712707
--- /dev/null
+++ b/plugins/git-flow/_git-flow
@@ -0,0 +1,327 @@
+#compdef git-flow
+
+_git-flow () {
+  local curcontext="$curcontext" state line
+  typeset -A opt_args
+
+  _arguments -C \
+    ':command:->command' \
+    '*::options:->options'
+
+  case $state in
+    (command)
+
+      local -a subcommands
+      subcommands=(
+        'init:Initialize a new git repo with support for the branching model.'
+        'feature:Manage your feature branches.'
+        'release:Manage your release branches.'
+        'hotfix:Manage your hotfix branches.'
+        'support:Manage your support branches.'
+        'version:Shows version information.'
+      )
+      _describe -t commands 'git flow' subcommands
+    ;;
+
+    (options)
+      case $line[1] in
+
+        (init)
+          _arguments \
+            -f'[Force setting of gitflow branches, even if already configured]'
+          ;;
+
+          (version)
+          ;;
+
+          (hotfix)
+            __git-flow-hotfix
+          ;;
+
+          (release)
+            __git-flow-release
+          ;;
+
+          (feature)
+            __git-flow-feature
+          ;;
+      esac
+    ;;
+  esac
+}
+
+__git-flow-release () {
+  local curcontext="$curcontext" state line
+  typeset -A opt_args
+
+  _arguments -C \
+    ':command:->command' \
+    '*::options:->options'
+
+  case $state in
+    (command)
+
+      local -a subcommands
+      subcommands=(
+        'start:Start a new release branch.'
+        'finish:Finish a release branch.'
+        'list:List all your release branches. (Alias to `git flow release`)'
+        'publish: public'
+        'track: track'
+      )
+      _describe -t commands 'git flow release' subcommands
+      _arguments \
+        -v'[Verbose (more) output]'
+    ;;
+
+    (options)
+      case $line[1] in
+
+        (start)
+          _arguments \
+            -F'[Fetch from origin before performing finish]'\
+            ':version:__git_flow_version_list'
+        ;;
+
+        (finish)
+          _arguments \
+            -F'[Fetch from origin before performing finish]' \
+            -s'[Sign the release tag cryptographically]'\
+            -u'[Use the given GPG-key for the digital signature (implies -s)]'\
+            -m'[Use the given tag message]'\
+            -p'[Push to $ORIGIN after performing finish]'\
+            -k'[Keep branch after performing finish]'\
+            -n"[Don't tag this release]"\
+            ':version:__git_flow_version_list'
+        ;;
+
+        (publish)
+          _arguments \
+            ':version:__git_flow_version_list'\
+        ;;
+
+        (track)
+          _arguments \
+            ':version:__git_flow_version_list'\
+        ;;
+
+        *)
+          _arguments \
+            -v'[Verbose (more) output]'
+        ;;
+      esac
+    ;;
+  esac
+}
+
+__git-flow-hotfix () {
+  local curcontext="$curcontext" state line
+  typeset -A opt_args
+
+  _arguments -C \
+    ':command:->command' \
+    '*::options:->options'
+
+  case $state in
+    (command)
+
+      local -a subcommands
+      subcommands=(
+        'start:Start a new hotfix branch.'
+        'finish:Finish a hotfix branch.'
+        'list:List all your hotfix branches. (Alias to `git flow hotfix`)'
+      )
+      _describe -t commands 'git flow hotfix' subcommands
+      _arguments \
+        -v'[Verbose (more) output]'
+    ;;
+
+    (options)
+      case $line[1] in
+
+        (start)
+          _arguments \
+            -F'[Fetch from origin before performing finish]'\
+            ':hotfix:__git_flow_version_list'\
+            ':branch-name:__git_branch_names'
+        ;;
+
+        (finish)
+          _arguments \
+            -F'[Fetch from origin before performing finish]' \
+            -s'[Sign the release tag cryptographically]'\
+            -u'[Use the given GPG-key for the digital signature (implies -s)]'\
+            -m'[Use the given tag message]'\
+            -p'[Push to $ORIGIN after performing finish]'\
+            -k'[Keep branch after performing finish]'\
+            -n"[Don't tag this release]"\
+            ':hotfix:__git_flow_hotfix_list'
+        ;;
+
+        *)
+          _arguments \
+            -v'[Verbose (more) output]'
+        ;;
+      esac
+    ;;
+  esac
+}
+
+__git-flow-feature () {
+  local curcontext="$curcontext" state line
+  typeset -A opt_args
+
+  _arguments -C \
+    ':command:->command' \
+    '*::options:->options'
+
+  case $state in
+    (command)
+
+      local -a subcommands
+      subcommands=(
+        'start:Start a new feature branch.'
+        'finish:Finish a feature branch.'
+        'list:List all your feature branches. (Alias to `git flow feature`)'
+        'publish: publish'
+        'track: track'
+        'diff: diff'
+        'rebase: rebase'
+        'checkout: checkout'
+        'pull: pull'
+      )
+      _describe -t commands 'git flow feature' subcommands
+      _arguments \
+        -v'[Verbose (more) output]'
+    ;;
+
+    (options)
+      case $line[1] in
+
+        (start)
+          _arguments \
+            -F'[Fetch from origin before performing finish]'\
+            ':feature:__git_flow_feature_list'\
+            ':branch-name:__git_branch_names'
+        ;;
+
+        (finish)
+          _arguments \
+            -F'[Fetch from origin before performing finish]' \
+            -r'[Rebase instead of merge]'\
+            -k'[Keep branch after performing finish]'\
+            ':feature:__git_flow_feature_list'
+        ;;
+
+        (publish)
+          _arguments \
+            ':feature:__git_flow_feature_list'\
+        ;;
+
+        (track)
+          _arguments \
+            ':feature:__git_flow_feature_list'\
+        ;;
+
+        (diff)
+          _arguments \
+            ':branch:__git_flow_feature_list'\
+        ;;
+
+        (rebase)
+          _arguments \
+            -i'[Do an interactive rebase]' \
+            ':branch:__git_flow_feature_list'
+        ;;
+
+        (checkout)
+          _arguments \
+            ':branch:__git_flow_feature_list'\
+        ;;
+
+        (pull)
+          _arguments \
+            ':remote:__git_remotes'\
+            ':branch:__git_flow_feature_list'
+        ;;
+
+        *)
+          _arguments \
+            -v'[Verbose (more) output]'
+        ;;
+      esac
+    ;;
+  esac
+}
+
+__git_flow_version_list () {
+  local expl
+  declare -a versions
+
+  versions=(${${(f)"$(_call_program versions git flow release list 2> /dev/null | tr -d ' |*')"}})
+  __git_command_successful || return
+
+  _wanted versions expl 'version' compadd $versions
+}
+
+__git_flow_feature_list () {
+  local expl
+  declare -a features
+
+  features=(${${(f)"$(_call_program features git flow feature list 2> /dev/null | tr -d ' |*')"}})
+  __git_command_successful || return
+
+  _wanted features expl 'feature' compadd $features
+}
+
+__git_remotes () {
+  local expl gitdir remotes
+
+  gitdir=$(_call_program gitdir git rev-parse --git-dir 2>/dev/null)
+  __git_command_successful || return
+
+  remotes=(${${(f)"$(_call_program remotes git config --get-regexp '"^remote\..*\.url$"')"}//#(#b)remote.(*).url */$match[1]})
+  __git_command_successful || return
+
+  # TODO: Should combine the two instead of either or.
+  if (( $#remotes > 0 )); then
+    _wanted remotes expl remote compadd $* - $remotes
+  else
+    _wanted remotes expl remote _files $* - -W "($gitdir/remotes)" -g "$gitdir/remotes/*"
+  fi
+}
+
+__git_flow_hotfix_list () {
+  local expl
+  declare -a hotfixes
+
+  hotfixes=(${${(f)"$(_call_program hotfixes git flow hotfix list 2> /dev/null | tr -d ' |*')"}})
+  __git_command_successful || return
+
+  _wanted hotfixes expl 'hotfix' compadd $hotfixes
+}
+
+__git_branch_names () {
+  local expl
+  declare -a branch_names
+
+  branch_names=(${${(f)"$(_call_program branchrefs git for-each-ref --format='"%(refname)"' refs/heads 2>/dev/null)"}#refs/heads/})
+  __git_command_successful || return
+
+  _wanted branch-names expl branch-name compadd $* - $branch_names
+}
+
+__git_command_successful () {
+  if (( ${#pipestatus:#0} > 0 )); then
+    _message 'not a git repository'
+    return 1
+  fi
+  return 0
+}
+
+zstyle ':completion:*:*:git:*' user-commands flow:'description for foo'
+
+# Detect if script is sourced or called via autoload
+[[ "$ZSH_EVAL_CONTEXT" != *:file ]] || return
+
+_git-flow "$@"
diff --git a/plugins/git-flow/git-flow.plugin.zsh b/plugins/git-flow/git-flow.plugin.zsh
index 041df3aa5..13399aaa3 100644
--- a/plugins/git-flow/git-flow.plugin.zsh
+++ b/plugins/git-flow/git-flow.plugin.zsh
@@ -1,26 +1,4 @@
-#!zsh
-#
-# Installation
-# ------------
-#
-# To achieve git-flow completion nirvana:
-#
-#  0. Update your zsh's git-completion module to the newest version.
-#     From here. https://raw.githubusercontent.com/zsh-users/zsh/master/Completion/Unix/Command/_git
-#
-#  1. Install this file. Either:
-#
-#     a. Place it in your .zshrc:
-#
-#     b. Or, copy it somewhere (e.g. ~/.git-flow-completion.zsh) and put the following line in
-#        your .zshrc:
-#
-#            source ~/.git-flow-completion.zsh
-#
-#     c. Or, use this file as an oh-my-zsh plugin.
-#
-
-#Alias
+# Aliases
 alias gfl='git flow'
 alias gfli='git flow init'
 alias gcd='git checkout $(git config gitflow.branch.develop)'
@@ -44,330 +22,9 @@ alias gflfpc='git flow feature publish $(echo $(current_branch) | cut -c 9-)'
 alias gflrfc='git flow release finish $(echo $(current_branch) | cut -c 9-)'
 alias gflrpc='git flow release publish $(echo $(current_branch) | cut -c 9-)'
 
-_git-flow ()
-{
-	local curcontext="$curcontext" state line
-	typeset -A opt_args
-
-	_arguments -C \
-		':command:->command' \
-		'*::options:->options'
-
-	case $state in
-		(command)
-
-			local -a subcommands
-			subcommands=(
-				'init:Initialize a new git repo with support for the branching model.'
-				'feature:Manage your feature branches.'
-				'release:Manage your release branches.'
-				'hotfix:Manage your hotfix branches.'
-				'support:Manage your support branches.'
-				'version:Shows version information.'
-			)
-			_describe -t commands 'git flow' subcommands
-		;;
-
-		(options)
-			case $line[1] in
-
-				(init)
-					_arguments \
-						-f'[Force setting of gitflow branches, even if already configured]'
-					;;
-
-					(version)
-					;;
-
-					(hotfix)
-						__git-flow-hotfix
-					;;
-
-					(release)
-						__git-flow-release
-					;;
-
-					(feature)
-						__git-flow-feature
-					;;
-			esac
-		;;
-	esac
-}
-
-__git-flow-release ()
-{
-	local curcontext="$curcontext" state line
-	typeset -A opt_args
-
-	_arguments -C \
-		':command:->command' \
-		'*::options:->options'
-
-	case $state in
-		(command)
-
-			local -a subcommands
-			subcommands=(
-				'start:Start a new release branch.'
-				'finish:Finish a release branch.'
-				'list:List all your release branches. (Alias to `git flow release`)'
-				'publish: public'
-				'track: track'
-			)
-			_describe -t commands 'git flow release' subcommands
-			_arguments \
-				-v'[Verbose (more) output]'
-		;;
-
-		(options)
-			case $line[1] in
-
-				(start)
-					_arguments \
-						-F'[Fetch from origin before performing finish]'\
-						':version:__git_flow_version_list'
-				;;
-
-				(finish)
-					_arguments \
-						-F'[Fetch from origin before performing finish]' \
-						-s'[Sign the release tag cryptographically]'\
-						-u'[Use the given GPG-key for the digital signature (implies -s)]'\
-						-m'[Use the given tag message]'\
-						-p'[Push to $ORIGIN after performing finish]'\
-						-k'[Keep branch after performing finish]'\
-						-n"[Don't tag this release]"\
-						':version:__git_flow_version_list'
-				;;
-
-				(publish)
-					_arguments \
-						':version:__git_flow_version_list'\
-				;;
-
-				(track)
-					_arguments \
-						':version:__git_flow_version_list'\
-				;;
-
-				*)
-					_arguments \
-						-v'[Verbose (more) output]'
-				;;
-			esac
-		;;
-	esac
-}
-
-__git-flow-hotfix ()
-{
-	local curcontext="$curcontext" state line
-	typeset -A opt_args
-
-	_arguments -C \
-		':command:->command' \
-		'*::options:->options'
-
-	case $state in
-		(command)
-
-			local -a subcommands
-			subcommands=(
-				'start:Start a new hotfix branch.'
-				'finish:Finish a hotfix branch.'
-				'list:List all your hotfix branches. (Alias to `git flow hotfix`)'
-			)
-			_describe -t commands 'git flow hotfix' subcommands
-			_arguments \
-				-v'[Verbose (more) output]'
-		;;
-
-		(options)
-			case $line[1] in
-
-				(start)
-					_arguments \
-						-F'[Fetch from origin before performing finish]'\
-						':hotfix:__git_flow_version_list'\
-						':branch-name:__git_branch_names'
-				;;
-
-				(finish)
-					_arguments \
-						-F'[Fetch from origin before performing finish]' \
-						-s'[Sign the release tag cryptographically]'\
-						-u'[Use the given GPG-key for the digital signature (implies -s)]'\
-						-m'[Use the given tag message]'\
-						-p'[Push to $ORIGIN after performing finish]'\
-						-k'[Keep branch after performing finish]'\
-						-n"[Don't tag this release]"\
-						':hotfix:__git_flow_hotfix_list'
-				;;
-
-				*)
-					_arguments \
-						-v'[Verbose (more) output]'
-				;;
-			esac
-		;;
-	esac
-}
-
-__git-flow-feature ()
-{
-	local curcontext="$curcontext" state line
-	typeset -A opt_args
-
-	_arguments -C \
-		':command:->command' \
-		'*::options:->options'
-
-	case $state in
-		(command)
-
-			local -a subcommands
-			subcommands=(
-				'start:Start a new feature branch.'
-				'finish:Finish a feature branch.'
-				'list:List all your feature branches. (Alias to `git flow feature`)'
-				'publish: publish'
-				'track: track'
-				'diff: diff'
-				'rebase: rebase'
-				'checkout: checkout'
-				'pull: pull'
-			)
-			_describe -t commands 'git flow feature' subcommands
-			_arguments \
-				-v'[Verbose (more) output]'
-		;;
-
-		(options)
-			case $line[1] in
-
-				(start)
-					_arguments \
-						-F'[Fetch from origin before performing finish]'\
-						':feature:__git_flow_feature_list'\
-						':branch-name:__git_branch_names'
-				;;
-
-				(finish)
-					_arguments \
-						-F'[Fetch from origin before performing finish]' \
-						-r'[Rebase instead of merge]'\
-						-k'[Keep branch after performing finish]'\
-						':feature:__git_flow_feature_list'
-				;;
-
-				(publish)
-					_arguments \
-						':feature:__git_flow_feature_list'\
-				;;
-
-				(track)
-					_arguments \
-						':feature:__git_flow_feature_list'\
-				;;
-
-				(diff)
-					_arguments \
-						':branch:__git_flow_feature_list'\
-				;;
-
-				(rebase)
-					_arguments \
-						-i'[Do an interactive rebase]' \
-						':branch:__git_flow_feature_list'
-				;;
-
-				(checkout)
-					_arguments \
-						':branch:__git_flow_feature_list'\
-				;;
-
-				(pull)
-					_arguments \
-						':remote:__git_remotes'\
-						':branch:__git_flow_feature_list'
-				;;
-
-				*)
-					_arguments \
-						-v'[Verbose (more) output]'
-				;;
-			esac
-		;;
-	esac
-}
-
-__git_flow_version_list ()
-{
-	local expl
-	declare -a versions
-
-	versions=(${${(f)"$(_call_program versions git flow release list 2> /dev/null | tr -d ' |*')"}})
-	__git_command_successful || return
-
-	_wanted versions expl 'version' compadd $versions
-}
-
-__git_flow_feature_list ()
-{
-	local expl
-	declare -a features
-
-	features=(${${(f)"$(_call_program features git flow feature list 2> /dev/null | tr -d ' |*')"}})
-	__git_command_successful || return
-
-	_wanted features expl 'feature' compadd $features
-}
-
-__git_remotes () {
-	local expl gitdir remotes
-
-	gitdir=$(_call_program gitdir git rev-parse --git-dir 2>/dev/null)
-	__git_command_successful || return
-
-	remotes=(${${(f)"$(_call_program remotes git config --get-regexp '"^remote\..*\.url$"')"}//#(#b)remote.(*).url */$match[1]})
-	__git_command_successful || return
-
-	# TODO: Should combine the two instead of either or.
-	if (( $#remotes > 0 )); then
-		_wanted remotes expl remote compadd $* - $remotes
-	else
-		_wanted remotes expl remote _files $* - -W "($gitdir/remotes)" -g "$gitdir/remotes/*"
-	fi
-}
-
-__git_flow_hotfix_list ()
-{
-	local expl
-	declare -a hotfixes
-
-	hotfixes=(${${(f)"$(_call_program hotfixes git flow hotfix list 2> /dev/null | tr -d ' |*')"}})
-	__git_command_successful || return
-
-	_wanted hotfixes expl 'hotfix' compadd $hotfixes
-}
-
-__git_branch_names () {
-	local expl
-	declare -a branch_names
-
-	branch_names=(${${(f)"$(_call_program branchrefs git for-each-ref --format='"%(refname)"' refs/heads 2>/dev/null)"}#refs/heads/})
-	__git_command_successful || return
-
-	_wanted branch-names expl branch-name compadd $* - $branch_names
-}
-
-__git_command_successful () {
-	if (( ${#pipestatus:#0} > 0 )); then
-		_message 'not a git repository'
-		return 1
-	fi
-	return 0
-}
-
-zstyle ':completion:*:*:git:*' user-commands flow:'description for foo'
+# Source completion script
+# Handle $0 according to the standard:
+# https://zdharma-continuum.github.io/Zsh-100-Commits-Club/Zsh-Plugin-Standard.html
+0="${${ZERO:-${0:#$ZSH_ARGZERO}}:-${(%):-%N}}"
+0="${${(M)0:#/*}:-$PWD/$0}"
+source "${0:A:h}/_git-flow"

From 6515850a1432199f8f3eef8e9ac711b8a7860ae5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Tue, 28 Dec 2021 19:29:39 +0100
Subject: [PATCH 675/869] feat(git-flow): add aliases for current `hotfix`
 branch

---
 plugins/git-flow/README.md           | 43 +++++++++++++++++-----------
 plugins/git-flow/git-flow.plugin.zsh | 32 +++++++++++----------
 2 files changed, 43 insertions(+), 32 deletions(-)

diff --git a/plugins/git-flow/README.md b/plugins/git-flow/README.md
index 9c25dec83..fc8ccf0a0 100644
--- a/plugins/git-flow/README.md
+++ b/plugins/git-flow/README.md
@@ -10,22 +10,31 @@ plugins=(... git-flow)
 
 ## Aliases
 
-| Alias   | Command                    | Description                            |
-|---------|----------------------------|----------------------------------------|
-| `gfl`   | `git flow`                 | Git-Flow command                       |
-| `gfli`  | `git flow init`            | Initialize git-flow repository         |
-| `gcd`   | `git checkout develop`     | Check out develop branch               |
-| `gch`   | `git checkout hotfix`      | Check out hotfix branch                |
-| `gcr`   | `git checkout release`     | Check out release branch               |
-| `gflf`  | `git flow feature`         | List existing feature branches         |
-| `gflh`  | `git flow hotfix`          | List existing hotfix branches          |
-| `gflr`  | `git flow release`         | List existing release branches         |
-| `gflfs` | `git flow feature start`   | Start a new feature: `gflfs <name>`    |
-| `gflhs` | `git flow hotfix start`    | Start a new hotfix: `gflhs <version>`  |
-| `gflrs` | `git flow release start`   | Start a new release: `gflrs <version>` |
-| `gflff` | `git flow feature finish`  | Finish feature: `gflff <name>`         |
-| `gflfp` | `git flow feature publish` | Publish feature: `gflfp <name>`        |
-| `gflhf` | `git flow hotfix finish`   | Finish hotfix: `gflhf <version>`       |
-| `gflrf` | `git flow release finish`  | Finish release: `gflrf <version>`      |
+| Alias     | Command                                   | Description                                    |
+| --------- | ----------------------------------------- | ---------------------------------------------- |
+| `gcd`     | `git checkout develop`                    | Check out develop branch                       |
+| `gch`     | `git checkout hotfix`                     | Check out hotfix branch                        |
+| `gcr`     | `git checkout release`                    | Check out release branch                       |
+| `gfl`     | `git flow`                                | Git-Flow command                               |
+| `gflf`    | `git flow feature`                        | List existing feature branches                 |
+| `gflff`   | `git flow feature finish`                 | Finish feature: `gflff <name>`                 |
+| `gflffc`  | `gflff ${$(git_current_branch)#feature/}` | Finish current feature                         |
+| `gflfp`   | `git flow feature publish`                | Publish feature: `gflfp <name>`                |
+| `gflfpc`  | `gflfp ${$(git_current_branch)#feature/}` | Publish current feature                        |
+| `gflfpll` | `git flow feature pull`                   | Pull remote feature: `gflfpll <remote> <name>` |
+| `gflfs`   | `git flow feature start`                  | Start a new feature: `gflfs <name>`            |
+| `gflh`    | `git flow hotfix`                         | List existing hotfix branches                  |
+| `gflhf`   | `git flow hotfix finish`                  | Finish hotfix: `gflhf <version>`               |
+| `gflhfc`  | `gflhf ${$(git_current_branch)#hotfix/}`  | Finish current hotfix                          |
+| `gflhp`   | `git flow hotfix publish`                 | Publish hostfix: `gflhp <version>`             |
+| `gflhpc`  | `gflhp ${$(git_current_branch)#hotfix/}`  | Finish current hotfix                          |
+| `gflhs`   | `git flow hotfix start`                   | Start a new hotfix: `gflhs <version>`          |
+| `gfli`    | `git flow init`                           | Initialize git-flow repository                 |
+| `gflr`    | `git flow release`                        | List existing release branches                 |
+| `gflrf`   | `git flow release finish`                 | Finish release: `gflrf <version>`              |
+| `gflrfc`  | `gflrf ${$(git_current_branch)#release/}` | Finish current release                         |
+| `gflrp`   | `git flow release publish`                | Publish release: `gflrp <version>`             |
+| `gflrpc`  | `gflrp ${$(git_current_branch)#release/}` | Publish current release                        |
+| `gflrs`   | `git flow release start`                  | Start a new release: `gflrs <version>`         |
 
 [More information about `git-flow` commands](https://github.com/nvie/gitflow/wiki/Command-Line-Arguments).
diff --git a/plugins/git-flow/git-flow.plugin.zsh b/plugins/git-flow/git-flow.plugin.zsh
index 13399aaa3..f842de998 100644
--- a/plugins/git-flow/git-flow.plugin.zsh
+++ b/plugins/git-flow/git-flow.plugin.zsh
@@ -1,26 +1,28 @@
 # Aliases
-alias gfl='git flow'
-alias gfli='git flow init'
 alias gcd='git checkout $(git config gitflow.branch.develop)'
 alias gch='git checkout $(git config gitflow.prefix.hotfix)'
 alias gcr='git checkout $(git config gitflow.prefix.release)'
+alias gfl='git flow'
 alias gflf='git flow feature'
-alias gflh='git flow hotfix'
-alias gflr='git flow release'
-alias gflfs='git flow feature start'
-alias gflhs='git flow hotfix start'
-alias gflrs='git flow release start'
 alias gflff='git flow feature finish'
+alias gflffc='git flow feature finish ${$(git_current_branch)#feature/}'
 alias gflfp='git flow feature publish'
-alias gflhf='git flow hotfix finish'
-alias gflrf='git flow release finish'
-alias gflhp='git flow hotfix publish'
-alias gflrp='git flow release publish'
+alias gflfpc='git flow feature publish ${$(git_current_branch)#feature/}'
 alias gflfpll='git flow feature pull'
-alias gflffc='git flow feature finish $(echo $(current_branch) | cut -c 9-)'
-alias gflfpc='git flow feature publish $(echo $(current_branch) | cut -c 9-)'
-alias gflrfc='git flow release finish $(echo $(current_branch) | cut -c 9-)'
-alias gflrpc='git flow release publish $(echo $(current_branch) | cut -c 9-)'
+alias gflfs='git flow feature start'
+alias gflh='git flow hotfix'
+alias gflhf='git flow hotfix finish'
+alias gflhfc='git flow hotfix finish ${$(git_current_branch)#hotfix/}'
+alias gflhp='git flow hotfix publish'
+alias gflhpc='git flow hotfix publish ${$(git_current_branch)#hotfix/}'
+alias gflhs='git flow hotfix start'
+alias gfli='git flow init'
+alias gflr='git flow release'
+alias gflrf='git flow release finish'
+alias gflrfc='git flow release finish ${$(git_current_branch)#release/}'
+alias gflrp='git flow release publish'
+alias gflrpc='git flow release publish ${$(git_current_branch)#release/}'
+alias gflrs='git flow release start'
 
 # Source completion script
 # Handle $0 according to the standard:

From 875e7c4077c08b6cf5547929d403f70a52836388 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=28=E2=95=AF=C2=B0=E2=96=A1=C2=B0=EF=BC=89=E2=95=AF?=
 =?UTF-8?q?=EF=B8=B5=20u=E1=B4=89=C7=9DssnH=20=C9=90=C9=9F=C9=90=CA=87soW?=
 <mostafa.hussein91@gmail.com>
Date: Tue, 28 Dec 2021 10:49:08 -0800
Subject: [PATCH 676/869] feat(helm): cache completion file in the background
 (#8326)

---
 plugins/helm/helm.plugin.zsh | 27 +++++++++++++++++++++------
 1 file changed, 21 insertions(+), 6 deletions(-)

diff --git a/plugins/helm/helm.plugin.zsh b/plugins/helm/helm.plugin.zsh
index 78499c15d..472c1c9dd 100644
--- a/plugins/helm/helm.plugin.zsh
+++ b/plugins/helm/helm.plugin.zsh
@@ -1,7 +1,22 @@
-# Autocompletion for helm.
-#
-# Copy from kubectl : https://github.com/pstadler
-
-if [ $commands[helm] ]; then
-  source <(helm completion zsh)
+if (( ! $+commands[helm] )); then
+  return
 fi
+
+# TODO: 2021-12-28: delete this block
+# Remove old generated file
+command rm -f "${ZSH_CACHE_DIR}/helm_completion"
+
+# TODO: 2021-12-28: remove this bit of code as it exists in oh-my-zsh.sh
+# Add completions folder in $ZSH_CACHE_DIR
+command mkdir -p "$ZSH_CACHE_DIR/completions"
+(( ${fpath[(Ie)"$ZSH_CACHE_DIR/completions"]} )) || fpath=("$ZSH_CACHE_DIR/completions" $fpath)
+
+# If the completion file doesn't exist yet, we need to autoload it and
+# bind it to `helm`. Otherwise, compinit will have already done that.
+if [[ ! -f "$ZSH_CACHE_DIR/completions/_helm" ]]; then
+  declare -A _comps
+  autoload -Uz _helm
+  _comps[helm]=_helm
+fi
+
+helm completion zsh >| "$ZSH_CACHE_DIR/completions/_helm" &|

From 69d0683a8cd3751178b2f7dc58126b50ed48e2ec Mon Sep 17 00:00:00 2001
From: Enrico Maria Crisostomo <enrico.m.crisostomo@gmail.com>
Date: Tue, 28 Dec 2021 20:10:15 +0100
Subject: [PATCH 677/869] feat(macports): add commands to get list of updated
 ports (#8698)

---
 plugins/macports/README.md           | 26 ++++++++++++++++++
 plugins/macports/macports.plugin.zsh | 40 +++++++++++++++++++++++++++-
 2 files changed, 65 insertions(+), 1 deletion(-)

diff --git a/plugins/macports/README.md b/plugins/macports/README.md
index ded823f3f..09bd42df2 100644
--- a/plugins/macports/README.md
+++ b/plugins/macports/README.md
@@ -15,7 +15,33 @@ plugins=(... macports)
 |-------|------------------------------------|--------------------------------------------------------------|
 | pc    | `sudo port clean --all installed`  | Clean up intermediate installation files for installed ports |
 | pi    | `sudo port install`                | Install package given as argument                            |
+| pli   | `port livecheck installed`         | Check for updates for installed ports                        |
+| plm   | `port-livecheck-maintainer`        | Check for updates of ports mainained by the specified users  |
 | psu   | `sudo port selfupdate`             | Update ports tree with MacPorts repository                   |
 | puni  | `sudo port uninstall inactive`     | Uninstall inactive ports                                     |
 | puo   | `sudo port upgrade outdated`       | Upgrade ports with newer versions available                  |
 | pup   | `psu && puo`                       | Update ports tree, then upgrade ports to newest versions     |
+
+## Commands
+
+### port-livecheck-maintainer
+
+```text
+Usage:
+  port-livecheck-maintainer
+  port-livecheck-maintainer (maintainer)+
+  port-livecheck-maintainer -h|--help
+
+Check
+
+Options:
+  maintainer  maintainer id
+  -h          print this help message and exit
+```
+
+Checks whether updates are available for ports whose maintainer is the current
+user, or any of a specified list of maintainer expressions.  The current user
+maintainer id is retrieved as follows:
+
+* The value of the `MACPORTS_MAINTAINER` variable, if set and not null.
+* The value of the `USER` variable.
diff --git a/plugins/macports/macports.plugin.zsh b/plugins/macports/macports.plugin.zsh
index d1fde30d4..d438057f9 100644
--- a/plugins/macports/macports.plugin.zsh
+++ b/plugins/macports/macports.plugin.zsh
@@ -1,6 +1,44 @@
 alias pc="sudo port clean --all installed"
 alias pi="sudo port install"
+alias pli="port livecheck installed"
+alias plm="port-livecheck-maintainer"
 alias psu="sudo port selfupdate"
 alias puni="sudo port uninstall inactive"
 alias puo="sudo port upgrade outdated"
-alias pup="psu && puo"
+alias pup="sudo port selfupdate && sudo port upgrade outdated"
+
+port-livecheck-maintainer() {
+  (( ${+commands[port]} == 0 )) || {
+    print -- "port: not found" >&2
+    return 1
+  }
+
+  local -a help_flag
+  zparseopts -D -E h=help_flag -help=help_flag
+
+  (( ${#help_flag} )) && {
+    cat << EOF >&2
+Usage:
+  port-livecheck-maintainer
+  port-livecheck-maintainer (maintainer)+
+  port-livecheck-maintainer -h|--help
+
+Check
+
+Options:
+  maintainer  maintainer id
+  -h          print this help message and exit
+EOF
+    return 1
+  }
+
+  if (( $# == 0 )); then
+    local default=${MACPORTS_MAINTAINER:-${USER}}
+    port livecheck maintainer:${default}
+    return $?
+  fi
+
+  for i in $@; do
+    port livecheck maintainer:${i}
+  done
+}

From 7568bbd9f57e0d7d90dd4a15abffc7e8a269f88f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Tue, 28 Dec 2021 20:12:33 +0100
Subject: [PATCH 678/869] feat(ng): get `ng` completion from parsed help output
 (#10294)

Co-authored-by: Yannick Galatol <yannick.galatol@gmail.com>
---
 plugins/ng/_ng           | 56 +++++++++++++++++++++++++++++
 plugins/ng/ng.plugin.zsh | 78 ----------------------------------------
 2 files changed, 56 insertions(+), 78 deletions(-)
 create mode 100644 plugins/ng/_ng
 delete mode 100644 plugins/ng/ng.plugin.zsh

diff --git a/plugins/ng/_ng b/plugins/ng/_ng
new file mode 100644
index 000000000..9c96cf7e3
--- /dev/null
+++ b/plugins/ng/_ng
@@ -0,0 +1,56 @@
+#compdef ng
+
+setopt localoptions extendedglob
+
+if (( CURRENT == 2 )); then
+  local -a cmds alias
+  # Sample output (ng help):
+  # Available Commands:
+  #   add Adds support for an external library to your project.
+  for line in ${(@f)"$(ng help 2>/dev/null | sed -n '/^  /p')"}; do
+    if [[ "$line" =~ '^  ([^ ]+) \(([^)]+)\) (.*)$' ]]; then
+      alias=(${match[1]} ${(s:, :)match[2]})
+      cmds+=(${^alias}:"${match[3]//:/}")
+    elif [[ "$line" =~ '^  ([^ ]+) (.*)$' ]]; then
+      cmds+=("${match[1]}:${match[2]//:/}")
+    fi
+  done
+  _describe commands cmds && return 0
+elif (( CURRENT == 3 )); then
+  local -a flags args
+  local section description
+  # Sample output (ng build --help):
+  # --configuration (-c)
+  #   One or more named builder configurations as a comma-separated list as specified in the "configurations" section of angular.json.
+  #   The builder uses the named configurations to run the given target.
+  #   For more information, see https://angular.io/guide/workspace-config#alternate-build-configurations.
+  # Prefix --flags with literal \0, and split on that to get each flag section
+  for section in ${(s:\0:)"$(ng ${words[2]} --help 2>/dev/null | sed -e '1,/^options/ d;s/^  --/\\0--/')"}; do
+    # Split by newline and discard extra description lines (lines > 2)
+    for args description in ${${(@f)section}[1,2]}; do
+      args=(${(s: :)${${args%% #}## #}//[(),]/})
+      description=${${description%% #}## #}
+      flags+=(${^args}":$description")
+    done
+  done
+  _describe flags flags
+
+  case "$words[2]" in
+  b|build|l|lint|t|test)
+    # Sample output (ng config projects):
+    # {
+    #   "angular-project-1": {
+    #     ...
+    #   },
+    #   "angular-project-2": {
+    #     ...
+    #   }
+    # }
+    # In abscence of a proper JSON parser, just grab the lines with
+    # a 2-space indentation and only the stuff inside quotes
+    local -a projects
+    projects=(${(@f)"$(ng config projects 2>/dev/null | sed -n 's/^  "\([^"]\+\)".*$/\1/p')"})
+    _describe projects projects
+    ;;
+  esac
+fi
diff --git a/plugins/ng/ng.plugin.zsh b/plugins/ng/ng.plugin.zsh
deleted file mode 100644
index 44102e2a6..000000000
--- a/plugins/ng/ng.plugin.zsh
+++ /dev/null
@@ -1,78 +0,0 @@
-ng_opts='addon asset-sizes b build completion d destroy doc e2e g generate get github-pages:deploy gh-pages:deploy h help i init install lint make-this-awesome new s serve server set t test update v version -h --help'
-
-_ng_completion () {
-  local words cword opts
-  read -Ac words
-  read -cn cword
-  let cword-=1
-
-  case $words[cword] in
-    addon )
-      opts='-b --blueprint -d -dir --directory --dry-run -sb --skip-bower -sg --skip-git -sn --skip-npm -v --verbose'
-      ;;
-
-    asset-sizes )
-      opts='-o --output-path'
-      ;;
-
-    b | build )
-      opts='--environment --output-path --suppress-sizes --target --watch --watcher -dev -e -prod'
-      ;;
-
-    d | destroy )
-      opts='--dry-run --verbose --pod --classic --dummy --in-repo --in-repo-addon -d -v -p -c -dum -id -ir'
-      ;;
-
-    g | generate )
-      opts='class component directive enum module pipe route service --generate -d --dry-run --verbose -v --pod -p --classic -c --dummy -dum -id --in-repo --in-repo-addon -ir'
-      ;;
-
-    gh-pages:deploy | github-pages:deploy )
-      opts='--environment --gh-token --gh-username --skip-build --user-page --message'
-      ;;
-
-    h | help | -h | --help)
-      opts='--json --verbose -v'
-      ;;
-
-    init )
-      opts='--blueprint --dry-run --link-cli --mobile --name --prefix --skip-bower --skip-npm --source-dir --style --verbose -b -d -lc -n -p -sb -sd -sn -v'
-      ;;
-
-    new )
-      opts='--blueprint --directory --dry-run --link-cli --mobile --prefix --skip-bower --skip-git --skip-npm --source-dir --style --verbose -b -d -dir -lc -p -sb -sd -sg -sn -v'
-      ;;
-
-    s | serve | server )
-      opts='--environment --host --insecure-proxy --inspr --live-reload --live-reload-base-url --live-reload-host --live-reload-live-css --live-reload-port --output-path --port --proxy --ssl --ssl-cert --ssl-key --target --watcher -H -dev -e -lr -lrbu -lrh -lrp -op -out -p -pr -prod -pxy -t -w'
-      ;;
-
-    set )
-      opts='--global -g'
-      ;;
-
-    t | test )
-      opts='--browsers --colors --config-file --environment --filter --host --launch --log-level --module --path --port --query --reporter --server --silent --test-page --test-port --watch -H -c -cf -e -f -m -r -s -tp -w'
-      ;;
-      
-    update )
-      opts='--all --dryRun --force --from --migrate-only --next --registry --to -d'
-      ;;
-
-    v | version )
-      opts='--verbose'
-      ;;
-
-    ng )
-      opts=$ng_opts
-      ;;
-
-    * )
-      opts=''
-      ;;
-  esac
-
-  reply=(${=opts})
-}
-
-compctl -K _ng_completion ng

From 43046cdb35547c9dfbfe474197b2d9dc696edef3 Mon Sep 17 00:00:00 2001
From: idoroiengel <idoroiengel@gmail.com>
Date: Sun, 13 Dec 2020 17:53:59 +0200
Subject: [PATCH 679/869] feat(flutter): add a few more aliases (#9511)

Closes #9511
---
 plugins/flutter/README.md          | 29 ++++++++++++++++++-----------
 plugins/flutter/flutter.plugin.zsh | 15 +++++++++++----
 2 files changed, 29 insertions(+), 15 deletions(-)

diff --git a/plugins/flutter/README.md b/plugins/flutter/README.md
index 9c8169afc..e5a4fd2ea 100644
--- a/plugins/flutter/README.md
+++ b/plugins/flutter/README.md
@@ -2,20 +2,27 @@
 
 The Flutter plugin provides completion and useful aliases
 
-To use it, add flutter to the plugins array of your zshrc file:
+To use it, add `flutter` to the plugins array of your zshrc file:
 
-```
+```zsh
 plugins=(... flutter)
 ```
 
 ## Aliases
 
-| Alias      | Command                | Description                                                                |
-| :--------- | :--------------------- | :------------------------------------------------------------------------- |
-| `fl`       | `flutter`              | Shorthand for flutter command                                              |
-| `flr`      | `flutter run`          | Runs flutter app                                                           |
-| `fldoc`    | `flutter doctor`       | Runs flutter doctor                                                        |
-| `flb`      | `flutter build`        | Build flutter application                                                  |
-| `flattach` | `flutter attach`       | Attaches flutter to a running flutter application with enabled observatory |
-| `flget`    | `flutter packages get` | Installs dependencies                                                      |
-| `flc`      | `flutter clean`        | Cleans flutter project                                                     |
+| Alias      | Command                 | Description                                                                |
+| :--------- | :---------------------- | :------------------------------------------------------------------------- |
+| `fl`       | `flutter`               | Shorthand for flutter command                                              |
+| `flattach` | `flutter attach`        | Attaches flutter to a running flutter application with enabled observatory |
+| `flb`      | `flutter build`         | Build flutter application                                                  |
+| `flchnl`   | `flutter channel`       | Switches flutter channel (requires input of desired channel)               |
+| `flc`      | `flutter clean`         | Cleans flutter project                                                     |
+| `fldvcs`   | `flutter devices`       | List connected devices (if any)                                            |
+| `fldoc`    | `flutter doctor`        | Runs flutter doctor                                                        |
+| `flpub`    | `flutter pub`           | Shorthand for flutter pub command                                          |
+| `flget`    | `flutter pub get`       | Installs dependencies                                                      |
+| `flr`      | `flutter run`           | Runs flutter app                                                           |
+| `flrd`     | `flutter run --debug`   | Runs flutter app in debug mode (default mode)                              |
+| `flrp`     | `flutter run --profile` | Runs flutter app in profile mode                                           |
+| `flrr`     | `flutter run --release` | Runs flutter app in release mode                                           |
+| `flupgrd`  | `flutter upgrade`       | Upgrades flutter version depending on the current channel                  |
diff --git a/plugins/flutter/flutter.plugin.zsh b/plugins/flutter/flutter.plugin.zsh
index 01c4c9f5f..80b74f64a 100644
--- a/plugins/flutter/flutter.plugin.zsh
+++ b/plugins/flutter/flutter.plugin.zsh
@@ -1,7 +1,14 @@
 alias fl="flutter"
-alias flr="flutter run"
-alias fldoc="flutter doctor"
-alias flb="flutter build"
 alias flattach="flutter attach"
-alias flget="flutter packages get"
+alias flb="flutter build"
+alias flchnl="flutter channel"
 alias flc="flutter clean"
+alias fldvcs="flutter devices"
+alias fldoc="flutter doctor"
+alias flpub="flutter pub"
+alias flget="flutter pub get"
+alias flr="flutter run"
+alias flrd="flutter run --debug"
+alias flrp="flutter run --profile"
+alias flrr="flutter run --release"
+alias flupgrd="flutter upgrade"

From b8e4aa2b0cf53301f7decbbea7ab210cefa31e59 Mon Sep 17 00:00:00 2001
From: Roderik Muit <rm@wyz.biz>
Date: Tue, 28 Dec 2021 20:34:05 +0100
Subject: [PATCH 680/869] fix(pass): update `pass` completion to ff5ac38
 (#9761)

This fixes a problem when completion filenames with colons.

Source: https://git.zx2c4.com/password-store/commit/?id=ff5ac38f7984d7b3d2912dba106baa2fed52e530
---
 plugins/pass/_pass | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/plugins/pass/_pass b/plugins/pass/_pass
index 75f3feb4f..d911e122f 100644
--- a/plugins/pass/_pass
+++ b/plugins/pass/_pass
@@ -6,18 +6,9 @@
 #    Brian Mattern <rephorm@rephorm.com>
 #    Jason A. Donenfeld <Jason@zx2c4.com>.
 # All Rights Reserved.
-# This file is licensed under the GPLv2+.
-# Please visit https://git.zx2c4.com/password-store/tree/COPYING for more information.
+# This file is licensed under the GPLv2+. Please see COPYING for more information.
 
 
-# If you use multiple repositories, you can configure completion like this:
-#
-# compdef _pass workpass
-# zstyle ':completion::complete:workpass::' prefix "$HOME/work/pass"
-# workpass() {
-#   PASSWORD_STORE_DIR=$HOME/work/pass pass $@
-# }
-
 # If you use multiple repositories, you can configure completion like this:
 #
 # compdef _pass workpass
@@ -133,7 +124,7 @@ _pass_complete_entries_helper () {
 	local IFS=$'\n'
 	local prefix
 	zstyle -s ":completion:${curcontext}:" prefix prefix || prefix="${PASSWORD_STORE_DIR:-$HOME/.password-store}"
-	_values -C 'passwords' ${$(find -L "$prefix" \( -name .git -o -name .gpg-id \) -prune -o $@ -print 2>/dev/null | sed -e "s#${prefix}/\{0,1\}##" -e 's#\.gpg##' -e 's#\\#\\\\#' | sort):-""}
+	_values -C 'passwords' ${$(find -L "$prefix" \( -name .git -o -name .gpg-id \) -prune -o $@ -print 2>/dev/null | sed -e "s#${prefix}/\{0,1\}##" -e 's#\.gpg##' -e 's#\\#\\\\#g' -e 's#:#\\:#g' | sort):-""}
 }
 
 _pass_complete_entries_with_subdirs () {

From e33bc4035171168ea7134d1494f7476cb9d9f352 Mon Sep 17 00:00:00 2001
From: Julien Negrotto <jtnegrotto@gmail.com>
Date: Thu, 1 Sep 2016 11:08:14 -0500
Subject: [PATCH 681/869] feat(rake): support square brackets with rake binstub
 (#5361)

Closes #5361
---
 plugins/rake/README.md       | 22 +++++++++++++---------
 plugins/rake/rake.plugin.zsh | 15 +++++++--------
 2 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/plugins/rake/README.md b/plugins/rake/README.md
index e888c0785..72f2a8525 100644
--- a/plugins/rake/README.md
+++ b/plugins/rake/README.md
@@ -13,25 +13,29 @@ plugins=(... rake)
 
 The plugin aliases the rake command so you can pass arguments when invoking rake tasks
 without having to escape the brackets, i.e., you can run
-```
+
+```sh
 rake namespace:task['argument']
 ```
+
 instead of having to do
-```
+
+```sh
 rake namespace:task\['argument'\]
 ```
 
-| Alias  | Command                        | Description                                   |
-|--------|--------------------------------|-----------------------------------------------|
-| rake   | `noglob rake`                  | Allows unescaped square brackets              |
-| brake  | `noglob bundle exec rake`      | Same as above but call rake using bundler     |
-| srake  | `noglob sudo rake`             | Same as rake but using sudo                   |
-| sbrake | `noglob sudo bundle exec rake` | Same as above but using both sudo and bundler |
+| Alias      | Command                        | Description                                   |
+| ---------- | ------------------------------ | --------------------------------------------- |
+| `rake`     | `noglob rake`                  | Allows unescaped square brackets              |
+| `bin/rake` | `noglob bin/rake`              | Same as above but using rake binstub          |
+| `brake`    | `noglob bundle exec rake`      | Same as above but call rake using bundler     |
+| `srake`    | `noglob sudo rake`             | Same as rake but using sudo                   |
+| `sbrake`   | `noglob sudo bundle exec rake` | Same as above but using both sudo and bundler |
 
 ## Jim Weirich
 
 The plugin also aliases `rake` to [`jimweirich`](https://github.com/jimweirich), author of Rake
 and big time contributor to the Ruby open source community. He passed away in 2014:
 
-> Thank you Jim for everything you contributed to the Ruby and open source community 
+> Thank you Jim for everything you contributed to the Ruby and open source community
 > over the years. We will miss you dearly. — [**@robbyrussell**](https://github.com/ohmyzsh/ohmyzsh/commit/598a9c6f990756386517d66b6bcf77e53791e905)
diff --git a/plugins/rake/rake.plugin.zsh b/plugins/rake/rake.plugin.zsh
index 3ceb20fea..0c507e628 100644
--- a/plugins/rake/rake.plugin.zsh
+++ b/plugins/rake/rake.plugin.zsh
@@ -1,10 +1,9 @@
-# Thank you Jim for everything you contributed to the Ruby and open source community 
+# Thank you Jim for everything you contributed to the Ruby and open source community
 # over the years. We will miss you dearly.
-alias jimweirich="rake"  
-
-alias rake="noglob rake" # allows square brackets for rake task invocation
-alias brake='noglob bundle exec rake' # execute the bundled rake gem
-alias srake='noglob sudo rake' # noglob must come before sudo
-alias sbrake='noglob sudo bundle exec rake' # altogether now ... 
-
+alias jimweirich='rake'
 
+alias rake='noglob rake'                    # allows square brackts for rake task invocation
+alias 'bin/rake'='noglob bin/rake'          # support use of binstub
+alias brake='noglob bundle exec rake'       # execute the bundled rake gem
+alias srake='noglob sudo rake'              # noglob must come before sudo
+alias sbrake='noglob sudo bundle exec rake' # altogether now ...

From 4491588ac04669c103790c557c6eb4aa40ec0f9e Mon Sep 17 00:00:00 2001
From: Turiok <crd.compte@gmail.com>
Date: Tue, 28 Dec 2021 20:58:50 +0100
Subject: [PATCH 682/869] feat(repo): add command completion for repo 2.8
 (#9388)

---
 plugins/repo/_repo | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/plugins/repo/_repo b/plugins/repo/_repo
index db0ecd14d..2b1f165f1 100644
--- a/plugins/repo/_repo
+++ b/plugins/repo/_repo
@@ -114,7 +114,9 @@ _repo()
         (start)
           _arguments : \
                      "(-h --help)"{-h,--help}"[Show help]" \
-                     "(--all)--all=[begin branch in all projects]"\
+                     "(--all)--all[begin branch in all projects]"\
+                     "(-r --rev --revision)"{-r,--rev,--revision=}"[point branch at this revision instead of upstream]":branch_or_rev:__repo__repo_branch_or_rev\
+                     "(--head)--head[abbreviation for --rev HEAD]"\
                     ':branch name:__repo_new__repo_branch_name' \
                     ':projects:__repo_projects_or_all' \
                     && ret=0
@@ -143,6 +145,13 @@ _repo()
                      "(-h --help)"{-h,--help}"[Show help]" \
                     && ret=0
           ;;
+        (stage)
+          _arguments : \
+                     "(-h --help)"{-h,--help}"[Show help]" \
+                     "(-i --interactive)"{-i,--interactive}"[use interactive staging]" \
+                    ':projects:__repo_projects' \
+                    && ret=0
+          ;;
         (status)
           _arguments : \
                      "(-h --help)"{-h,--help}"[Show help]" \

From 92a862083b2878e5bc090c121aba11c048f90320 Mon Sep 17 00:00:00 2001
From: Vsevolod Voloshyn <seva.voloshin@gmail.com>
Date: Tue, 28 Dec 2021 22:41:08 +0200
Subject: [PATCH 683/869] feat(rvm): add latest `rb*` utility functions (#9812)

---
 plugins/rvm/README.md      |  4 ++++
 plugins/rvm/rvm.plugin.zsh | 48 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 52 insertions(+)

diff --git a/plugins/rvm/README.md b/plugins/rvm/README.md
index b0977f53a..4ddc7cc85 100644
--- a/plugins/rvm/README.md
+++ b/plugins/rvm/README.md
@@ -16,6 +16,10 @@ plugins=(... rvm)
 | `rb19`         | `rvm use ruby-1.9.3` |
 | `rb20`         | `rvm use ruby-2.0.0` |
 | `rb21`         | `rvm use ruby-2.1.2` |
+| `rb25`         | `rvm use ruby-2.5.9` |
+| `rb26`         | `rvm use ruby-2.6.7` |
+| `rb27`         | `rvm use ruby-2.7.3` |
+| `rb30`         | `rvm use ruby-3.0.1` |
 | `rvm-update`   | `rvm get head`       |
 | `gems`         | `gem list`           |
 | `rvms`         | `rvm gemset`         |
diff --git a/plugins/rvm/rvm.plugin.zsh b/plugins/rvm/rvm.plugin.zsh
index c5918f289..64a99278c 100644
--- a/plugins/rvm/rvm.plugin.zsh
+++ b/plugins/rvm/rvm.plugin.zsh
@@ -8,6 +8,10 @@ local ruby18='ruby-1.8.7'
 local ruby19='ruby-1.9.3'
 local ruby20='ruby-2.0.0'
 local ruby21='ruby-2.1.2'
+local ruby25='ruby-2.5.9'
+local ruby26='ruby-2.6.7'
+local ruby27='ruby-2.7.3'
+local ruby30='ruby-3.0.1'
 
 function rb18 {
 	if [ -z "$1" ]; then
@@ -53,6 +57,50 @@ function rb21 {
 _rb21() {compadd `ls -1 $rvm_path/gems | grep "^$ruby21@" | sed -e "s/^$ruby21@//" | awk '{print $1}'`}
 compdef _rb21 rb21
 
+function rb25 {
+	if [ -z "$1" ]; then
+		rvm use "$ruby25"
+	else
+		rvm use "$ruby25@$1"
+	fi
+}
+
+_rb25() {compadd `ls -1 $rvm_path/gems | grep "^$ruby25@" | sed -e "s/^$ruby25@//" | awk '{print $1}'`}
+compdef _rb25 rb25
+
+function rb26 {
+	if [ -z "$1" ]; then
+		rvm use "$ruby26"
+	else
+		rvm use "$ruby26@$1"
+	fi
+}
+
+_rb26() {compadd `ls -1 $rvm_path/gems | grep "^$ruby26@" | sed -e "s/^$ruby26@//" | awk '{print $1}'`}
+compdef _rb26 rb26
+
+function rb27 {
+	if [ -z "$1" ]; then
+		rvm use "$ruby27"
+	else
+		rvm use "$ruby27@$1"
+	fi
+}
+
+_rb27() {compadd `ls -1 $rvm_path/gems | grep "^$ruby27@" | sed -e "s/^$ruby27@//" | awk '{print $1}'`}
+compdef _rb27 rb27
+
+function rb30 {
+	if [ -z "$1" ]; then
+		rvm use "$ruby30"
+	else
+		rvm use "$ruby30@$1"
+	fi
+}
+
+_rb30() {compadd `ls -1 $rvm_path/gems | grep "^$ruby30@" | sed -e "s/^$ruby30@//" | awk '{print $1}'`}
+compdef _rb30 rb30
+
 function rvm-update {
 	rvm get head
 }

From 8861d5c3a7274148cd48b49225cd5f4a0ed363a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Tue, 28 Dec 2021 22:09:11 +0100
Subject: [PATCH 684/869] refactor(rvm): clean up `rb*` utilities definition
 and add more versions

---
 plugins/rvm/README.md      |  36 +++++----
 plugins/rvm/rvm.plugin.zsh | 145 ++++++++++---------------------------
 2 files changed, 61 insertions(+), 120 deletions(-)

diff --git a/plugins/rvm/README.md b/plugins/rvm/README.md
index 4ddc7cc85..258c89420 100644
--- a/plugins/rvm/README.md
+++ b/plugins/rvm/README.md
@@ -10,16 +10,26 @@ plugins=(... rvm)
 
 ## Aliases
 
-| Alias          | Command              |
-|----------------|----------------------|
-| `rb18`         | `rvm use ruby-1.8.7` |
-| `rb19`         | `rvm use ruby-1.9.3` |
-| `rb20`         | `rvm use ruby-2.0.0` |
-| `rb21`         | `rvm use ruby-2.1.2` |
-| `rb25`         | `rvm use ruby-2.5.9` |
-| `rb26`         | `rvm use ruby-2.6.7` |
-| `rb27`         | `rvm use ruby-2.7.3` |
-| `rb30`         | `rvm use ruby-3.0.1` |
-| `rvm-update`   | `rvm get head`       |
-| `gems`         | `gem list`           |
-| `rvms`         | `rvm gemset`         |
+| Alias        | Command              |
+| ------------ | -------------------- |
+| `rb18`       | `rvm use ruby-1.8.7` |
+| `rb19`       | `rvm use ruby-1.9.3` |
+| `rb20`       | `rvm use ruby-2.0.0` |
+| `rb21`       | `rvm use ruby-2.1`   |
+| `rb22`       | `rvm use ruby-2.2`   |
+| `rb23`       | `rvm use ruby-2.3`   |
+| `rb24`       | `rvm use ruby-2.4`   |
+| `rb25`       | `rvm use ruby-2.5`   |
+| `rb26`       | `rvm use ruby-2.6`   |
+| `rb27`       | `rvm use ruby-2.7`   |
+| `rb30`       | `rvm use ruby-3.0`   |
+| `rvm-update` | `rvm get head`       |
+| `gems`       | `gem list`           |
+| `rvms`       | `rvm gemset`         |
+
+## Deprecated versions
+
+At the time of writing this (2021-12-28), Ruby versions until 2.5 are [EOL][1],
+and will be removed in the future.
+
+[1]: https://endoflife.date/ruby
diff --git a/plugins/rvm/rvm.plugin.zsh b/plugins/rvm/rvm.plugin.zsh
index 64a99278c..4ba885563 100644
--- a/plugins/rvm/rvm.plugin.zsh
+++ b/plugins/rvm/rvm.plugin.zsh
@@ -1,123 +1,54 @@
-fpath=($rvm_path/scripts/zsh/Completion $fpath)
+# Completion
+fpath+=("${rvm_path}/scripts/zsh/Completion")
 
+declare -A _comps
+autoload -Uz _rvm
+_comps[rvm]=_rvm
+
+# Aliases
 alias rubies='rvm list rubies'
 alias rvms='rvm gemset'
 alias gemsets='rvms list'
 
-local ruby18='ruby-1.8.7'
-local ruby19='ruby-1.9.3'
-local ruby20='ruby-2.0.0'
-local ruby21='ruby-2.1.2'
-local ruby25='ruby-2.5.9'
-local ruby26='ruby-2.6.7'
-local ruby27='ruby-2.7.3'
-local ruby30='ruby-3.0.1'
 
-function rb18 {
-	if [ -z "$1" ]; then
-		rvm use "$ruby18"
-	else
-		rvm use "$ruby18@$1"
-	fi
-}
+# rb{version} utilities
+# From `rvm list known`
+typeset -A rubies
+rubies=(
+  18  'ruby-1.8.7'
+  19  'ruby-1.9.3'
+  20  'ruby-2.0.0'
+  21  'ruby-2.1'
+  22  'ruby-2.2'
+  23  'ruby-2.3'
+  24  'ruby-2.4'
+  25  'ruby-2.5'
+  26  'ruby-2.6'
+  27  'ruby-2.7'
+  30  'ruby-3.0'
+)
 
-_rb18() {compadd `ls -1 $rvm_path/gems | grep "^$ruby18@" | sed -e "s/^$ruby18@//" | awk '{print $1}'`}
-compdef _rb18 rb18
+for v in ${(k)rubies}; do
+  version="${rubies[$v]}"
+  functions[rb${v}]="rvm use ${version}\${1+"@\$1"}"
+  functions[_rb${v}]="compadd \$(ls -1 \"\${rvm_path}/gems\" | grep '^${version}@' | sed -e 's/^${version}@//' | awk '{print $1}')"
+  compdef _rb$v rb$v
+done
+unset rubies v version
 
-function rb19 {
-	if [ -z "$1" ]; then
-		rvm use "$ruby19"
-	else
-		rvm use "$ruby19@$1"
-	fi
-}
-
-_rb19() {compadd `ls -1 $rvm_path/gems | grep "^$ruby19@" | sed -e "s/^$ruby19@//" | awk '{print $1}'`}
-compdef _rb19 rb19
-
-function rb20 {
-	if [ -z "$1" ]; then
-		rvm use "$ruby20"
-	else
-		rvm use "$ruby20@$1"
-	fi
-}
-
-_rb20() {compadd `ls -1 $rvm_path/gems | grep "^$ruby20@" | sed -e "s/^$ruby20@//" | awk '{print $1}'`}
-compdef _rb20 rb20
-
-function rb21 {
-	if [ -z "$1" ]; then
-		rvm use "$ruby21"
-	else
-		rvm use "$ruby21@$1"
-	fi
-}
-
-_rb21() {compadd `ls -1 $rvm_path/gems | grep "^$ruby21@" | sed -e "s/^$ruby21@//" | awk '{print $1}'`}
-compdef _rb21 rb21
-
-function rb25 {
-	if [ -z "$1" ]; then
-		rvm use "$ruby25"
-	else
-		rvm use "$ruby25@$1"
-	fi
-}
-
-_rb25() {compadd `ls -1 $rvm_path/gems | grep "^$ruby25@" | sed -e "s/^$ruby25@//" | awk '{print $1}'`}
-compdef _rb25 rb25
-
-function rb26 {
-	if [ -z "$1" ]; then
-		rvm use "$ruby26"
-	else
-		rvm use "$ruby26@$1"
-	fi
-}
-
-_rb26() {compadd `ls -1 $rvm_path/gems | grep "^$ruby26@" | sed -e "s/^$ruby26@//" | awk '{print $1}'`}
-compdef _rb26 rb26
-
-function rb27 {
-	if [ -z "$1" ]; then
-		rvm use "$ruby27"
-	else
-		rvm use "$ruby27@$1"
-	fi
-}
-
-_rb27() {compadd `ls -1 $rvm_path/gems | grep "^$ruby27@" | sed -e "s/^$ruby27@//" | awk '{print $1}'`}
-compdef _rb27 rb27
-
-function rb30 {
-	if [ -z "$1" ]; then
-		rvm use "$ruby30"
-	else
-		rvm use "$ruby30@$1"
-	fi
-}
-
-_rb30() {compadd `ls -1 $rvm_path/gems | grep "^$ruby30@" | sed -e "s/^$ruby30@//" | awk '{print $1}'`}
-compdef _rb30 rb30
 
 function rvm-update {
-	rvm get head
+  rvm get head
 }
 
 # TODO: Make this usable w/o rvm.
 function gems {
-	local current_ruby=`rvm-prompt i v p`
-	local current_gemset=`rvm-prompt g`
+  local current_ruby=`rvm-prompt i v p`
+  local current_gemset=`rvm-prompt g`
 
-	gem list $@ | sed -E \
-		-e "s/\([0-9, \.]+( .+)?\)/$fg[blue]&$reset_color/g" \
-		-e "s|$(echo $rvm_path)|$fg[magenta]\$rvm_path$reset_color|g" \
-		-e "s/$current_ruby@global/$fg[yellow]&$reset_color/g" \
-		-e "s/$current_ruby$current_gemset$/$fg[green]&$reset_color/g"
+  gem list $@ | sed -E \
+    -e "s/\([0-9, \.]+( .+)?\)/$fg[blue]&$reset_color/g" \
+    -e "s|$(echo $rvm_path)|$fg[magenta]\$rvm_path$reset_color|g" \
+    -e "s/$current_ruby@global/$fg[yellow]&$reset_color/g" \
+    -e "s/$current_ruby$current_gemset$/$fg[green]&$reset_color/g"
 }
-
-function _rvm_completion {
-  source $rvm_path"/scripts/zsh/Completion/_rvm"
-}
-compdef _rvm_completion rvm

From fe04acd97ccf60b869eb105d8b76fbfed607a90a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Tue, 28 Dec 2021 22:16:43 +0100
Subject: [PATCH 685/869] chore: add maintainer for `shell-proxy` plugin

---
 .github/CODEOWNERS | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 6c3eac6e7..0cb9410fc 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -5,6 +5,7 @@ plugins/genpass/                    @atoponce
 plugins/git-lfs/                    @hellovietduc
 plugins/gitfast/                    @felipec
 plugins/sdk/                        @rgoldberg
+plugins/shell-proxy/                @septs
 plugins/universalarchive/           @Konfekt
 plugins/wp-cli/                     @joshmedeski
 plugins/zoxide/                     @ajeetdsouza

From 234ad7398d5e241ad625d3c0b1666ff8c22c4596 Mon Sep 17 00:00:00 2001
From: Angel Ramboi <angel@ramboi.com>
Date: Tue, 28 Dec 2021 23:37:50 +0100
Subject: [PATCH 686/869] chore(ipfs): update completion script for IPFS
 version 0.8.0 (#9800)

---
 plugins/ipfs/_ipfs | 94 +++++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 84 insertions(+), 10 deletions(-)

diff --git a/plugins/ipfs/_ipfs b/plugins/ipfs/_ipfs
index 90c0a61c8..8771bc4ba 100644
--- a/plugins/ipfs/_ipfs
+++ b/plugins/ipfs/_ipfs
@@ -93,7 +93,8 @@ _ipfs_subcommand(){
             (pin)
               _arguments \
                 '(-t --type)'{-t,--type}'[The type of pinned keys to list. Can be "direct", "indirect", "recursive", or "all". Default: all.]' \
-                '(-q --quiet)'{-q,--quiet}'[Write just hashes of objects.]'
+                '(-q --quiet)'{-q,--quiet}'[Write just hashes of objects.]' \
+                '(-s --stream)'{-s,--stream}'[Enable streaming of pins as they are discovered.]'
             ;;
             (p2p)
               _arguments '(-v --headers)'{-v,--headers}'[Print table headers (Protocol, Listen, Target).]'
@@ -116,7 +117,14 @@ _ipfs_subcommand(){
             ;;
           esac
         ;;
-        (get|query|findpeer)
+        (query|findpeer)
+          case $MAIN_SUBCOMMAND in
+            (dht)
+              _arguments '(-v --verbose)'{-v,--verbose}'[Print extra information.]'
+            ;;
+          esac
+        ;;
+        (get)
           case $MAIN_SUBCOMMAND in
             (dht)
               _arguments '(-v --verbose)'{-v,--verbose}'[Print extra information.]'
@@ -158,22 +166,33 @@ _ipfs_subcommand(){
             ;;
           esac
         ;;
-        (cmds|diff)
+        (cmds)
           case $MAIN_SUBCOMMAND in
-            (diag|object)
+            (diag)
+              _arguments '(-v --verbose)'{-v,--verbose}'[Print extra information.]'
+            ;;
+          esac
+        ;;
+        (diff)
+          case $MAIN_SUBCOMMAND in
+            (object)
               _arguments '(-v --verbose)'{-v,--verbose}'[Print extra information.]'
             ;;
           esac
         ;;
         (stat)
           case $MAIN_SUBCOMMAND in
+            (dag)
+              _arguments \
+                '(-p --progress)'{-p,--progress}'[Return progressive data while reading through the DAG. Default: true.]'
+            ;;
             (object)
               _arguments '--human[Print sizes in human readable format (e.g., 1K 234M 2G).]'
             ;;
             (repo)
               _arguments \
-                '--size-only[Only report RepoSize and StorageMax.]' \
-                '--human[Print sizes in human readable format (e.g., 1K 234M 2G).]'
+                '(-s --size-only)'{-s,--size-only}'[Only report RepoSize and StorageMax.]' \
+                '(-H --human)'{-H,--human}'[Print sizes in human readable format (e.g., 1K 234M 2G).]'
             ;;
           esac
         ;;
@@ -186,7 +205,8 @@ _ipfs_subcommand(){
                 '--allow-offline[When offline, save the IPNS record to the the local datastore without broadcasting to the network instead of simply failing.]' \
                 '--ttl[Time duration this record should be cached for. Uses the same syntax as the lifetime option. (caution: experimental).]' \
                 '(-k --key)'{-k,--key}"[Name of the key to be used or a valid PeerID, as listed by 'ipfs key list -l'. Default: self.]" \
-                '(-Q --quieter)'{-Q,--quieter}'[Write only final hash.]'
+                '(-Q --quieter)'{-Q,--quieter}'[Write only final hash.]' \
+                '--ipns-base[Encoding used for keys: Can either be a multibase encoded CID or a base58btc encoded multihash. Takes {b58mh|base36|k|base32|b...}. Default: base36.]'
             ;;
           esac
         ;;
@@ -254,7 +274,7 @@ _ipfs_subcommand(){
                 '(-p --peer)'{-p,--peer}'[Specify a peer to print bandwidth for.]' \
                 '(-t --proto)'{-t,--proto}'[Specify a protocol to print bandwidth for.]' \
                 '--poll[Print bandwidth at an interval.]' \
-                '(-i --interval)'{-i,--interval}'[Time interval to wait between updating output, if 'poll' is true.]'
+                '(-i --interval)'{-i,--interval}"[Time interval to wait between updating output, if 'poll' is true.]"
             ;;
           esac
         ;;
@@ -289,6 +309,7 @@ _ipfs_subcommand(){
               _arguments \
                 '-f[Printf style format string. Default: %s.]' \
                 '-v[CID version to convert to.]' \
+                '--codec[CID codec to convert to.]' \
                 '-b[Multibase to display CID in.]'
             ;;
           esac
@@ -367,6 +388,45 @@ _ipfs_subcommand(){
             ;;
           esac
         ;;
+        (export)
+          case $MAIN_SUBCOMMAND in
+            (dag)
+              _arguments \
+                '(-p --progress)'{-p,--progress}'[Display progress on CLI. Defaults to true when STDERR is a TTY.]'
+            ;;
+            (key)
+              _arguments \
+                '(-o --output)'{-o,--output}'[The path where the output should be stored.]'
+            ;;
+          esac
+        ;;
+        (import)
+          case $MAIN_SUBCOMMAND in
+            (dag)
+              _arguments \
+                '--silent[No output.]' \
+                '--pin-roots[Pin optional roots listed in the .car headers after importing. Default: true.]'
+            ;;
+            (key)
+              _arguments \
+                '--ipns-base[Encoding used for keys: Can either be a multibase encoded CID or a base58btc encoded multihash. Takes {b58mh|base36|k|base32|b...}. Default: base36.]'
+            ;;
+          esac
+        ;;
+        (remote)
+          case $MAIN_SUBCOMMAND in
+            (pin)
+              local -a _pin_remote_arguments
+              _pin_remote_arguments=(
+                'add:Pin object to remote pinning service.'
+                'ls:List objects pinned to remote pinning service.'
+                'rm:Remove pins from remote pinning service.'
+                'service:Configure remote pinning services.'
+              )
+              _ipfs_subcommand _pin_remote_arguments
+            ;;
+          esac
+        ;;
       esac
     ;;
   esac
@@ -402,6 +462,8 @@ case $MAIN_SUBCOMMAND in
       '(--dereference-args)--dereference-args[Symlinks supplied in arguments are dereferenced.]' \
       '(--stdin-name)--stdin-name[Assign a name if the file source is stdin.]' \
       '(-H --hidden)'{-H,--hidden}'[Include files that are hidden. Only takes effect on recursive add.]' \
+      '(--ignore)--ignore[A rule (.gitignore-stype) defining which file(s) should be ignored (variadic, experimental).]' \
+      '(--ignore-rules-path)--ignore-rules-path[A path to a file with .gitignore-style ignore rules (experimental).]' \
       '(-q --quiet)'{-q,--quiet}'[Write minimal output.]' \
       '(-Q --quieter)'{-Q,--quieter}'[Write only final hash.]' \
       '(--silent)--silent[Write no output.]' \
@@ -483,6 +545,7 @@ case $MAIN_SUBCOMMAND in
   (daemon)
     _arguments \
       '--init[Initialize ipfs with default settings if not already initialized.]' \
+      '--init-config[Path to existing configuration file to be loaded during --init.]' \
       '--init-profile[Configuration profiles to apply for --init. See ipfs init --help for more.]' \
       '--routing[Overrides the routing option. Default: default.]' \
       '--mount[Mounts IPFS to the filesystem.]' \
@@ -501,9 +564,12 @@ case $MAIN_SUBCOMMAND in
   (dag)
     local -a _dag_arguments
     _dag_arguments=(
+      'export:Streams the selected DAG as a .car stream on stdout.'
       'get:Get a dag node from ipfs.'
+      'import:Import the contents of .car files'
       'put:Add a dag node to ipfs.'
       'resolve:Resolve ipld block.'
+      'stat:Gets stats for a DAG'
     )
     _ipfs_subcommand _dag_arguments
   ;;
@@ -564,21 +630,27 @@ case $MAIN_SUBCOMMAND in
       '(-l --compression-level)'{-l,--compression-level}'[The level of compression (1-9).]'
   ;;
   (id)
-    _arguments '(-f --format)'{-f,--format}'[Optional output format.]'
+    _arguments \
+      '(-f --format)'{-f,--format}'[Optional output format.]' \
+      '--peerid-base[Encoding used for peer IDs: Can either be a multibase encoded CID or a base58btc encoded multihash. Takes {b58mh|base36|k|base32|b...}. Default: b58mh.]'
   ;;
   (init)
     _arguments \
-      '(-b --bits)'{-b,--bits}'[Number of bits to use in the generated RSA private key. Default: 2048.]' \
+      '(-a --algorithm)'{-a, --algorithm}'[Cryptographic algorithm to use for key generation. Default: ed25519.]' \
+      '(-b --bits)'{-b,--bits}'[Number of bits to use in the generated RSA private key.]' \
       '(-e --empty-repo)'{-e,--empty-repo}"[Don't add and pin help files to the local storage.]" \
       '(-p --profile)'{-p,--profile}"[Apply profile settings to config. Multiple profiles can be separated by ','.]"
   ;;
   (key)
     local -a _key_arguments
     _key_arguments=(
+      'export:Export a keypair'
       'gen:Create a new keypair'
+      'import:Import a key and prints imported key id'
       'list:List all local keypairs'
       'rename:Rename a keypair'
       'rm:Remove a keypair'
+      'rotate:Rotates the ipfs identity.'
     )
     _ipfs_subcommand _key_arguments
   ;;
@@ -642,6 +714,7 @@ case $MAIN_SUBCOMMAND in
     _pin_arguments=(
       'add:Pin objects to local storage.'
       'ls:List objects pinned to local storage.'
+      'remote:Pin (and unpin) objects to remote pinning service.'
       'rm:Remove pinned objects from local storage.'
       'update:Update a recursive pin'
       'verify:Verify that recursive pins are complete.'
@@ -684,6 +757,7 @@ case $MAIN_SUBCOMMAND in
     _stats_arguments=(
       'bitswap:Show some diagnostic information on the bitswap agent.'
       'bw:Print ipfs bandwidth information.'
+      "dht:Returns statistics about the node's DHT(s)"
       'repo:Get stats for the currently used repo.'
     )
     _ipfs_subcommand _stats_arguments

From eb94df6428808afc74445a3c6433912982e4de75 Mon Sep 17 00:00:00 2001
From: Bryan Lee <doslby@gmail.com>
Date: Wed, 29 Dec 2021 16:42:35 +0800
Subject: [PATCH 687/869] feat(shell-proxy): support SOCKS protocol based on
 URI scheme (#10069)

---
 plugins/shell-proxy/ssh-proxy.py | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/plugins/shell-proxy/ssh-proxy.py b/plugins/shell-proxy/ssh-proxy.py
index 5efd5fd21..6773a77bc 100755
--- a/plugins/shell-proxy/ssh-proxy.py
+++ b/plugins/shell-proxy/ssh-proxy.py
@@ -2,15 +2,30 @@
 import os
 import subprocess
 import sys
-import urllib.parse
+from urllib.parse import urlparse
 
 proxy = next(os.environ[_] for _ in ("HTTP_PROXY", "HTTPS_PROXY") if _ in os.environ)
+
+parsed = urlparse(proxy)
+
+proxy_protocols = {
+    "http": "connect",
+    "https": "connect",
+    "socks": "5",
+    "socks5": "5",
+    "socks4": "4",
+    "socks4a": "4",
+}
+
+if parsed.scheme not in proxy_protocols:
+    raise TypeError('unsupported proxy protocol: "{}"'.format(parsed.scheme))
+
 argv = [
     "nc",
     "-X",
-    "connect",
+    proxy_protocols[parsed.scheme], # Supported protocols are 4 (SOCKS v4), 5 (SOCKS v5) and connect (HTTP proxy). Default SOCKS v5 is used.
     "-x",
-    urllib.parse.urlparse(proxy).netloc,  # proxy-host:proxy-port
+    parsed.netloc,  # proxy-host:proxy-port
     sys.argv[1],  # host
     sys.argv[2],  # port
 ]

From cffa9a2fda28e9b2913776c3db588f4f28412864 Mon Sep 17 00:00:00 2001
From: Celestino Gomes <tinorj@gmail.com>
Date: Wed, 29 Dec 2021 05:44:08 -0300
Subject: [PATCH 688/869] feat(ruby): add new aliases `rrun` and `rserver`
 (#10218)

---
 plugins/ruby/README.md       | 40 +++++++++++++++++++-----------------
 plugins/ruby/ruby.plugin.zsh |  2 ++
 2 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/plugins/ruby/README.md b/plugins/ruby/README.md
index 59594ade7..59d839c5c 100644
--- a/plugins/ruby/README.md
+++ b/plugins/ruby/README.md
@@ -10,22 +10,24 @@ plugins=(... ruby)
 
 ## Aliases
 
-| Alias  | Command                                | Description                                          |
-|--------|----------------------------------------|------------------------------------------------------|
-| rb     | `ruby`                                 | The Ruby command                                     |
-| sgem   | `sudo gem`                             | Run sudo gem on the system ruby, not the active ruby |
-| rfind  | `find . -name "*.rb" \| xargs grep -n` | Find ruby file                                       |
-| gein   | `gem install`                          | Install a gem into the local repository              |
-| geun   | `gem uninstall`                        | Uninstall gems from the local repository             |
-| geli   | `gem list`                             | Display gems installed locally                       |
-| gei    | `gem info`                             | Show information for the given gem                   |
-| geiall | `gem info --all`                       | Display all gem versions                             |
-| geca   | `gem cert --add`                       | Add a trusted certificate                            |
-| gecr   | `gem cert --remove`                    | Remove a trusted certificate                         |
-| gecb   | `gem cert --build`                     | Build private key and self-signed certificate        |
-| geclup | `gem cleanup -n`                       | Do not uninstall gem                                 |
-| gegi   | `gem generate_index`                   | Generate index file for gem server                   |
-| geh    | `gem help`                             | Provide additional help                              |
-| gel    | `gem lock`                             | Generate a lockdown list of gems                     |
-| geo    | `gem open`                             | Open gem source in default editor                    |
-| geoe   | `gem open -e`                          | Open gem sources in preferred editor                 |
+| Alias   | Command                                | Description                                          |
+| ------- | -------------------------------------- | ---------------------------------------------------- |
+| rb      | `ruby`                                 | The Ruby command                                     |
+| sgem    | `sudo gem`                             | Run sudo gem on the system ruby, not the active ruby |
+| rfind   | `find . -name "*.rb" \| xargs grep -n` | Find ruby file                                       |
+| rrun    | `ruby -e`                              | Execute some code: E.g: `rrun "puts 'Hello world!'"` |
+| rserver | `ruby -e httpd . -p 8080`              | Start HTTP Webrick serving local directory/files     |
+| gein    | `gem install`                          | Install a gem into the local repository              |
+| geun    | `gem uninstall`                        | Uninstall gems from the local repository             |
+| geli    | `gem list`                             | Display gems installed locally                       |
+| gei     | `gem info`                             | Show information for the given gem                   |
+| geiall  | `gem info --all`                       | Display all gem versions                             |
+| geca    | `gem cert --add`                       | Add a trusted certificate                            |
+| gecr    | `gem cert --remove`                    | Remove a trusted certificate                         |
+| gecb    | `gem cert --build`                     | Build private key and self-signed certificate        |
+| geclup  | `gem cleanup -n`                       | Do not uninstall gem                                 |
+| gegi    | `gem generate_index`                   | Generate index file for gem server                   |
+| geh     | `gem help`                             | Provide additional help                              |
+| gel     | `gem lock`                             | Generate a lockdown list of gems                     |
+| geo     | `gem open`                             | Open gem source in default editor                    |
+| geoe    | `gem open -e`                          | Open gem sources in preferred editor                 |
diff --git a/plugins/ruby/ruby.plugin.zsh b/plugins/ruby/ruby.plugin.zsh
index 890fcb179..408512110 100644
--- a/plugins/ruby/ruby.plugin.zsh
+++ b/plugins/ruby/ruby.plugin.zsh
@@ -22,3 +22,5 @@ alias geh="gem help"
 alias gel="gem lock"
 alias geo="gem open"
 alias geoe="gem open -e"
+alias rrun="ruby -e"
+alias rserver="ruby -e httpd . -p 8080" # requires webrick

From 5b2f99bcb7186bfb11b91a8686d750af95e41eff Mon Sep 17 00:00:00 2001
From: scrouthtv <lennivh24@gmail.com>
Date: Wed, 29 Dec 2021 10:31:29 +0100
Subject: [PATCH 689/869] fix(systemd): remove `sudo` from power-related
 aliases (#9441)

---
 plugins/systemd/README.md          | 13 ++++---
 plugins/systemd/systemd.plugin.zsh | 62 +++++++++++++++++++++---------
 2 files changed, 52 insertions(+), 23 deletions(-)

diff --git a/plugins/systemd/README.md b/plugins/systemd/README.md
index 3fa1d2118..ffa0567a8 100644
--- a/plugins/systemd/README.md
+++ b/plugins/systemd/README.md
@@ -3,7 +3,8 @@
 The systemd plugin provides many useful aliases for systemd.
 
 To use it, add systemd to the plugins array of your zshrc file:
-```
+
+```zsh
 plugins=(... systemd)
 ```
 
@@ -22,7 +23,7 @@ plugins=(... systemd)
 | `sc-show-environment`  | `systemctl show-environment`       | Dump the systemd manager environment block                       |
 | `sc-cat`               | `systemctl cat`                    | Show backing files of one or more units                          |
 | `sc-list-timers`       | `systemctl list-timers`            | List timer units currently in memory                             |
-| **Aliases with sudo**                                                                                                          |
+| **Aliases with sudo**                                                                                                        |||
 | `sc-start`             | `sudo systemctl start`             | Start Unit(s)                                                    |
 | `sc-stop`              | `sudo systemctl stop`              | Stop Unit(s)                                                     |
 | `sc-reload`            | `sudo systemctl reload`            | Reload Unit(s)                                                   |
@@ -59,9 +60,11 @@ to your prompt, drop `$(systemd_prompt_info [unit]...)` into your prompt (more t
 may be specified).
 
 The plugin will add the following to your prompt for each `$unit`.
-```
+
+```text
 <prefix><unit>:<active|notactive><suffix>
 ```
+
 You can control these parts with the following variables:
 
 - `<prefix>`: Set `$ZSH_THEME_SYSTEMD_PROMPT_PREFIX`.
@@ -79,7 +82,7 @@ You can control these parts with the following variables:
 
 For example, if your prompt contains `PROMPT='$(systemd_prompt_info dhcpd httpd)'` and you set the following variables:
 
-```
+```sh
 ZSH_THEME_SYSTEMD_PROMPT_PREFIX="["
 ZSH_THEME_SYSTEMD_PROMPT_SUFFIX="]"
 ZSH_THEME_SYSTEMD_PROMPT_ACTIVE="+"
@@ -89,6 +92,6 @@ ZSH_THEME_SYSTEMD_PROMPT_CAPS=1
 
 If `dhcpd` is running, and `httpd` is not, then your prompt will look like this:
 
-```
+```text
 [DHCPD: +][HTTPD: X]
 ```
diff --git a/plugins/systemd/systemd.plugin.zsh b/plugins/systemd/systemd.plugin.zsh
index c6fd52990..e9ac64382 100644
--- a/plugins/systemd/systemd.plugin.zsh
+++ b/plugins/systemd/systemd.plugin.zsh
@@ -1,3 +1,4 @@
+# systemctl aliases
 user_commands=(
   cat
   get-default
@@ -14,7 +15,8 @@ user_commands=(
   list-units
   show
   show-environment
-  status)
+  status
+)
 
 sudo_commands=(
   add-requires
@@ -28,8 +30,6 @@ sudo_commands=(
   emergency
   enable
   halt
-  hibernate
-  hybrid-sleep
   import-environment
   isolate
   kexec
@@ -38,34 +38,53 @@ sudo_commands=(
   list-machines
   load
   mask
-  poweroff
   preset
   preset-all
-  reboot
   reenable
   reload
   reload-or-restart
   reset-failed
   rescue
-  restart
   revert
   set-default
   set-environment
   set-property
   start
   stop
-  suspend
   switch-root
   try-reload-or-restart
   try-restart
   unmask
-  unset-environment)
+  unset-environment
+)
 
-for c in $user_commands; do; alias sc-$c="systemctl $c"; done
-for c in $sudo_commands; do; alias sc-$c="sudo systemctl $c"; done
-for c in $user_commands; do; alias scu-$c="systemctl --user $c"; done
-for c in $sudo_commands; do; alias scu-$c="systemctl --user $c"; done
+power_commands=(
+  hibernate
+  hybrid-sleep
+  poweroff
+  reboot
+  restart
+  suspend
+)
 
+for c in $user_commands; do
+  alias "sc-$c"="systemctl $c"
+  alias "scu-$c"="systemctl --user $c"
+done
+
+for c in $sudo_commands; do
+  alias "sc-$c"="sudo systemctl $c"
+  alias "scu-$c"="systemctl --user $c"
+done
+
+for c in $power_commands; do
+  alias "sc-$c"="systemctl $c"
+done
+
+unset c user_commands sudo_commands power_commands
+
+
+# --now commands
 alias sc-enable-now="sc-enable --now"
 alias sc-disable-now="sc-disable --now"
 alias sc-mask-now="sc-mask --now"
@@ -74,17 +93,24 @@ alias scu-enable-now="scu-enable --now"
 alias scu-disable-now="scu-disable --now"
 alias scu-mask-now="scu-mask --now"
 
+
 function systemd_prompt_info {
   local unit
-  for unit in $@; do
+  for unit in "$@"; do
     echo -n "$ZSH_THEME_SYSTEMD_PROMPT_PREFIX"
-    [[ -n "$ZSH_THEME_SYSTEMD_PROMPT_CAPS" ]] && echo -n "${(U)unit}:" || echo -n "$unit:"
-    if systemctl is-active $unit &>/dev/null; then
-        echo -n "$ZSH_THEME_SYSTEMD_PROMPT_ACTIVE" 
+
+    if [[ -n "$ZSH_THEME_SYSTEMD_PROMPT_CAPS" ]]; then
+      echo -n "${(U)unit:gs/%/%%}:"
     else
-        echo -n "$ZSH_THEME_SYSTEMD_PROMPT_NOTACTIVE"
+      echo -n "${unit:gs/%/%%}:"
     fi
+
+    if systemctl is-active "$unit" &>/dev/null; then
+      echo -n "$ZSH_THEME_SYSTEMD_PROMPT_ACTIVE"
+    else
+      echo -n "$ZSH_THEME_SYSTEMD_PROMPT_NOTACTIVE"
+    fi
+
     echo -n "$ZSH_THEME_SYSTEMD_PROMPT_SUFFIX"
   done
 }
-

From 3bb23e8e316452c40eaa0917c8f4be1a2f59ff38 Mon Sep 17 00:00:00 2001
From: Luiz <40257388+luizfelipevbll@users.noreply.github.com>
Date: Wed, 29 Dec 2021 06:32:29 -0300
Subject: [PATCH 690/869] feat(transfer): allow encryption of uploads using GPG
 (#9983)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Marc Cornellà <hello@mcornella.com>
---
 plugins/transfer/README.md           |  39 +++++---
 plugins/transfer/transfer.plugin.zsh | 140 ++++++++++++++++-----------
 2 files changed, 112 insertions(+), 67 deletions(-)

diff --git a/plugins/transfer/README.md b/plugins/transfer/README.md
index 5fa064445..825c9a283 100644
--- a/plugins/transfer/README.md
+++ b/plugins/transfer/README.md
@@ -2,23 +2,40 @@
 
 [`transfer.sh`](https://transfer.sh) is an easy to use file sharing service from the command line
 
-## Usage
+To use it, add `transfer` to the plugins array in your zshrc file:
 
-Add `transfer` to your plugins array in your zshrc file:
 ```zsh
 plugins=(... transfer)
 ```
 
-Then you can:
+## Usage
 
-- transfer a file:
+- Transfer a file: `transfer file.txt`.
 
-```zsh
-transfer file.txt
-```
+- Transfer a whole directory (it will be automatically compressed): `transfer dir`.
 
-- transfer a whole directory (it will be automatically compressed):
+### Encryption / Decryption
 
-```zsh
-transfer directory/
-```
+- Encrypt and upload a file with symmetric cipher and create ASCII armored output:
+
+  ```zsh
+  transfer file -ca
+  ```
+
+- Encrypt and upload directory with symmetric cipher and gpg output:
+
+  ```zsh
+  transfer directory -ca
+  ```
+
+- Decrypt file:
+
+  ```zsh
+  gpg -d file -ca
+  ```
+
+- Decrypt directory:
+
+  ```zsh
+  gpg -d your_archive.tgz.gpg | tar xz
+  ```
diff --git a/plugins/transfer/transfer.plugin.zsh b/plugins/transfer/transfer.plugin.zsh
index db744b0cd..b34e115ce 100644
--- a/plugins/transfer/transfer.plugin.zsh
+++ b/plugins/transfer/transfer.plugin.zsh
@@ -1,69 +1,97 @@
-# transfer.sh Easy file sharing from the command line
-# transfer Plugin
-# Usage Example :
-# > transfer file.txt
-# > transfer directory/
-
-
-
 # Author:
 #   Remco Verhoef <remco@dutchcoders.io>
 #   https://gist.github.com/nl5887/a511f172d3fb3cd0e42d
 #   Modified to use tar command instead of zip
 #
 
-curl --version 2>&1 > /dev/null
-if [ $? -ne 0 ]; then
-  echo "Could not find curl."
+transfer() {
+  # check arguments
+  if [[ $# -eq 0 ]]; then
+  cat <<EOF
+Error: no arguments specified.
+
+Usage: transfer [file/folder] [options]
+
+Examples:
+  transfer /tmp/test.md
+  transfer /tmp/test.md -ca
+  cat /tmp/test.md | transfer test.md
+  cat /tmp/test.md | transfer test.md -ca
+
+Options:
+  -ca  Encrypt file with symmetric cipher and create ASCII armored output
+EOF
   return 1
-fi
+  fi
 
-transfer() { 
-    # check arguments
-    if [ $# -eq 0 ]; 
-    then 
-        echo "No arguments specified. Usage:\necho transfer /tmp/test.md\ncat /tmp/test.md | transfer test.md"
+  if (( ! $+commands[curl] )); then
+    echo "Error: curl is not installed"
+    return 1
+  fi
+
+  local tmpfile tarfile item basename
+
+  # get temporarily filename, output is written to this file show progress can be showed
+  tmpfile=$(mktemp -t transferXXX)
+
+  # upload stdin or file
+  item="$1"
+
+  # crypt file with symmetric cipher and create ASCII armored output
+  local crypt=0
+  if [[ "$2" = -ca ]]; then
+    crypt=1
+    if (( ! $+commands[gpg] )); then
+      echo "Error: gpg is not installed"
+      return 1
+    fi
+  fi
+
+  if ! tty -s; then
+    # transfer from pipe
+    if (( crypt )); then
+      gpg -aco - | curl -X PUT --progress-bar -T - "https://transfer.sh/$item" >> $tmpfile
+    else
+      curl --progress-bar --upload-file - "https://transfer.sh/$item" >> $tmpfile
+    fi
+  else
+    basename=$(basename "$item" | sed -e 's/[^a-zA-Z0-9._-]/-/g')
+
+    if [[ ! -e $item ]]; then
+      echo "File $item doesn't exist."
+      return 1
+    fi
+
+    if [[ -d $item ]]; then
+      # tar directory and transfer
+      tarfile=$(mktemp -t transferXXX.tar.gz)
+      cd $(dirname $item) || {
+        echo "Error: Could not change to directory $(dirname $item)"
         return 1
+      }
+
+      tar -czf $tarfile $(basename $item)
+      if (( crypt )); then
+        gpg -cao - "$tarfile" | curl --progress-bar -T "-" "https://transfer.sh/$basename.tar.gz.gpg" >> $tmpfile
+      else
+        curl --progress-bar --upload-file "$tarfile" "https://transfer.sh/$basename.tar.gz" >> $tmpfile
+      fi
+      rm -f $tarfile
+    else
+      # transfer file
+      if (( crypt )); then
+        gpg -cao - "$item" | curl --progress-bar -T "-" "https://transfer.sh/$basename.gpg" >> $tmpfile
+      else
+        curl --progress-bar --upload-file "$item" "https://transfer.sh/$basename" >> $tmpfile
+      fi
     fi
+  fi
 
-    # get temporarily filename, output is written to this file show progress can be showed
-    tmpfile=$( mktemp -t transferXXX )
-    
-    # upload stdin or file
-    file=$1
+  # cat output link
+  cat $tmpfile
+  # add newline
+  echo
 
-    if tty -s; 
-    then 
-        basefile=$(basename "$file" | sed -e 's/[^a-zA-Z0-9._-]/-/g') 
-
-        if [ ! -e $file ];
-        then
-            echo "File $file doesn't exists."
-            return 1
-        fi
-        
-        if [ -d $file ];
-        then
-            echo $file
-            # tar directory and transfer
-            tarfile=$( mktemp -t transferXXX.tar.gz )
-            cd $(dirname $file) && tar -czf $tarfile $(basename $file)
-            curl --progress-bar --upload-file "$tarfile" "https://transfer.sh/$basefile.tar.gz" >> $tmpfile
-            rm -f $tarfile
-        else
-            # transfer file
-            curl --progress-bar --upload-file "$file" "https://transfer.sh/$basefile" >> $tmpfile
-        fi
-    else 
-        # transfer pipe
-        curl --progress-bar --upload-file "-" "https://transfer.sh/$file" >> $tmpfile
-    fi
-   
-    # cat output link
-    cat $tmpfile
-    # add newline
-    echo
-
-    # cleanup
-    rm -f $tmpfile
+  # cleanup
+  rm -f $tmpfile
 }

From 65bbd24eec6b64f2f526c974781f08373277be0c Mon Sep 17 00:00:00 2001
From: bretello <bretello@users.noreply.github.com>
Date: Wed, 29 Dec 2021 10:34:57 +0100
Subject: [PATCH 691/869] feat(vi-mode): add `INSERT_MODE_INDICATOR` (#9732)

Co-authored-by: bretello <bretello@distruzione.org>
---
 plugins/vi-mode/README.md          | 15 ++++++++++-----
 plugins/vi-mode/vi-mode.plugin.zsh |  4 ++--
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/plugins/vi-mode/README.md b/plugins/vi-mode/README.md
index 46bb6d070..a1d6bc6b0 100644
--- a/plugins/vi-mode/README.md
+++ b/plugins/vi-mode/README.md
@@ -32,16 +32,21 @@ plugins=(... vi-mode)
 - `MODE_INDICATOR`: controls the string displayed when the shell is in normal mode.
   See [Mode indicator](#mode-indicator) for details.
 
-## Mode indicator
+- `INSERT_MODE_INDICATOR`: controls the string displayed when the shell is in insert mode.
+  See [Mode indicator](#mode-indicator) for details.
+
+## Mode indicators
 
 *Normal mode* is indicated with a red `<<<` mark at the right prompt, when it
-hasn't been defined by theme.
+hasn't been defined by theme, *Insert mode* is not displayed by default.
 
-You can change this indicator by setting the `MODE_INDICATOR` variable. This setting
-supports Prompt Expansion sequences. For example:
+You can change these indicators by setting the `MODE_INDICATOR` (*Normal mode*) and
+`INSERT_MODE_INDICATORS` (*Insert mode*) variables.
+This settings support Prompt Expansion sequences. For example:
 
 ```zsh
-MODE_INDICATOR="%F{yellow}+%f"
+MODE_INDICATOR="%F{white}+%f"
+INSERT_MODE_INDICATOR="%F{yellow}+%f"
 ```
 
 You can also use the `vi_mode_prompt_info` function in your prompt, which will display
diff --git a/plugins/vi-mode/vi-mode.plugin.zsh b/plugins/vi-mode/vi-mode.plugin.zsh
index dd4afdd8b..b40b29961 100644
--- a/plugins/vi-mode/vi-mode.plugin.zsh
+++ b/plugins/vi-mode/vi-mode.plugin.zsh
@@ -123,7 +123,7 @@ wrap_clipboard_widgets copy vi-yank vi-yank-eol vi-backward-kill-word vi-change-
 wrap_clipboard_widgets paste vi-put-{before,after}
 unfunction wrap_clipboard_widgets
 
-# if mode indicator wasn't setup by theme, define default
+# if mode indicator wasn't setup by theme, define default, we'll leave INSERT_MODE_INDICATOR empty by default
 if [[ -z "$MODE_INDICATOR" ]]; then
   MODE_INDICATOR='%B%F{red}<%b<<%f'
 fi
@@ -136,7 +136,7 @@ function vi_mode_prompt_info() {
   # set RPS1/RPROMPT to something else in their custom config.
   : "${VI_MODE_RESET_PROMPT_ON_MODE_CHANGE:=true}"
 
-  echo "${${VI_KEYMAP/vicmd/$MODE_INDICATOR}/(main|viins)/}"
+  echo "${${VI_KEYMAP/vicmd/$MODE_INDICATOR}/(main|viins)/$INSERT_MODE_INDICATOR}"
 }
 
 # define right prompt, if it wasn't defined by a theme

From 8d58994d765de350f1dc66132eaab0358e10a4ab Mon Sep 17 00:00:00 2001
From: Matthieu Baerts <matttbe@gmail.com>
Date: Wed, 29 Dec 2021 10:38:00 +0100
Subject: [PATCH 692/869] feat(zbell): add option not to use notify-send
 (#10082)

---
 plugins/zbell/README.md        |  3 +++
 plugins/zbell/zbell.plugin.zsh | 17 +++++++++++++++--
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/plugins/zbell/README.md b/plugins/zbell/README.md
index 1c1c13546..eb87699c4 100644
--- a/plugins/zbell/README.md
+++ b/plugins/zbell/README.md
@@ -24,6 +24,9 @@ These settings need to be set in your zshrc file, before Oh My Zsh is sourced.
   zbell_ignore=($EDITOR $PAGER)
   ```
 
+- `zbell_use_notify_send`: If set to `true`, `notify-send` tool is used -- if
+  available -- to display a popup on the screen. Default: `true` (enabled).
+
 ## Author
 
 Adapted from an original version by [Jean-Philippe Ouellet](https://github.com/jpouellet).
diff --git a/plugins/zbell/zbell.plugin.zsh b/plugins/zbell/zbell.plugin.zsh
index 6d0416502..8e374029b 100644
--- a/plugins/zbell/zbell.plugin.zsh
+++ b/plugins/zbell/zbell.plugin.zsh
@@ -29,18 +29,31 @@ autoload -Uz regexp-replace || return
 # initialize zbell_ignore if not set
 (( ${+zbell_ignore} )) || zbell_ignore=($EDITOR $PAGER)
 
+# initialize zbell_use_notify_send if not set
+(( ${+zbell_use_notify_send} )) || zbell_use_notify_send=true
+
 # initialize it because otherwise we compare a date and an empty string
 # the first time we see the prompt. it's fine to have lastcmd empty on the
 # initial run because it evaluates to an empty string, and splitting an
 # empty string just results in an empty array.
 zbell_timestamp=$EPOCHSECONDS
 
+# UI notification function
+# $1: command
+# $2: duration in seconds
+zbell_ui_notify() {
+	[[ $zbell_use_notify_send != "true" ]] && return
+
+	if type notify-send > /dev/null; then
+		notify-send -i terminal "Command completed in ${2}s:" $1
+	fi
+}
+
 # default notification function
 # $1: command
 # $2: duration in seconds
 zbell_notify() {
-	type notify-send > /dev/null && \
-		notify-send -i terminal "Command completed in ${2}s:" $1
+	zbell_ui_notify "${@}"
 	print -n "\a"
 }
 

From fcd7da3aec8315178991aa25d57dacfc6c331ac6 Mon Sep 17 00:00:00 2001
From: Majid Hadavand <hadavand@users.noreply.github.com>
Date: Wed, 29 Dec 2021 13:15:02 +0330
Subject: [PATCH 693/869] feat(common-aliases): add single-column and recursive
 `ls` aliases (#10096)

---
 plugins/common-aliases/README.md              | 100 +++++++++---------
 .../common-aliases/common-aliases.plugin.zsh  |   2 +
 2 files changed, 53 insertions(+), 49 deletions(-)

diff --git a/plugins/common-aliases/README.md b/plugins/common-aliases/README.md
index b6f34cb54..0354c7a3f 100644
--- a/plugins/common-aliases/README.md
+++ b/plugins/common-aliases/README.md
@@ -12,51 +12,53 @@ plugins=(... common-aliases)
 
 ### ls command
 
-| Alias | Command       | Description                                                                    |
-|-------|---------------|--------------------------------------------------------------------------------|
-| l     | `ls -lFh`     | List files as a long list, show size, type, human-readable                     |
-| la    | `ls -lAFh`    | List almost all files as a long list show size, type, human-readable           |
-| lr    | `ls -tRFh`    | List files recursively sorted by date, show type, human-readable               |
-| lt    | `ls -ltFh`    | List files as a long list sorted by date, show type, human-readable            |
-| ll    | `ls -l`       | List files as a long list                                                      |
-| ldot  | `ls -ld .*`   | List dot files as a long list                                                  |
-| lS    | `ls -1FSsh`   | List files showing only size and name sorted by size                           |
-| lart  | `ls -1Fcart`  | List all files sorted in reverse of create/modification time (oldest first)    |
-| lrt   | `ls -1Fcrt`   | List files sorted in reverse of create/modification time(oldest first)         |
+| Alias | Command      | Description                                                                 |
+| ----- | ------------ | --------------------------------------------------------------------------- |
+| l     | `ls -lFh`    | List files as a long list, show size, type, human-readable                  |
+| la    | `ls -lAFh`   | List almost all files as a long list show size, type, human-readable        |
+| lr    | `ls -tRFh`   | List files recursively sorted by date, show type, human-readable            |
+| lt    | `ls -ltFh`   | List files as a long list sorted by date, show type, human-readable         |
+| ll    | `ls -l`      | List files as a long list                                                   |
+| ldot  | `ls -ld .*`  | List dot files as a long list                                               |
+| lS    | `ls -1FSsh`  | List files showing only size and name sorted by size                        |
+| lart  | `ls -1Fcart` | List all files sorted in reverse of create/modification time (oldest first) |
+| lrt   | `ls -1Fcrt`  | List files sorted in reverse of create/modification time(oldest first)      |
+| lsr   | `ls -lARFh`  | List all files and directories recursively                                  |
+| lsn   | `ls -1`      | List files and directories in a single column                               |
 
 ### File handling
 
-| Alias | Command               | Description                                                                        |
-|-------|-----------------------|------------------------------------------------------------------------------------|
-| rm    | `rm -i`               | Remove a file                                                                      |
-| cp    | `cp -i`               | Copy a file                                                                        |
-| mv    | `mv -i`               | Move a file                                                                        |
-| zshrc | `${=EDITOR} ~/.zshrc` | Quickly access the ~/.zshrc file                                                   |
-| dud   | `du -d 1 -h`          | Display the size of files at depth 1 in current location in human-readable form    |
-| duf   | `du -sh`              | Display the size of files in current location in human-readable form               |
-| t     | `tail -f`             | Shorthand for tail which outputs the last part of a file                           |
+| Alias | Command               | Description                                                                     |
+| ----- | --------------------- | ------------------------------------------------------------------------------- |
+| rm    | `rm -i`               | Remove a file                                                                   |
+| cp    | `cp -i`               | Copy a file                                                                     |
+| mv    | `mv -i`               | Move a file                                                                     |
+| zshrc | `${=EDITOR} ~/.zshrc` | Quickly access the ~/.zshrc file                                                |
+| dud   | `du -d 1 -h`          | Display the size of files at depth 1 in current location in human-readable form |
+| duf   | `du -sh`              | Display the size of files in current location in human-readable form            |
+| t     | `tail -f`             | Shorthand for tail which outputs the last part of a file                        |
 
 ### find and grep
 
-| Alias | Command                                             | Description                             |
-|-------|-----------------------------------------------------|-----------------------------------------|
-| fd\*  | `find . -type d -name`                              | Find a directory with the given name    |
-| ff    | `find . -type f -name`                              | Find a file with the given name         |
-| grep  | `grep --color`                                      | Searches for a query string             |
-| sgrep | `grep -R -n -H -C 5 --exclude-dir={.git,.svn,CVS}`  | Useful for searching within files       |
+| Alias | Command                                            | Description                          |
+| ----- | -------------------------------------------------- | ------------------------------------ |
+| fd\*  | `find . -type d -name`                             | Find a directory with the given name |
+| ff    | `find . -type f -name`                             | Find a file with the given name      |
+| grep  | `grep --color`                                     | Searches for a query string          |
+| sgrep | `grep -R -n -H -C 5 --exclude-dir={.git,.svn,CVS}` | Useful for searching within files    |
 
 \* Only if the [`fd`](https://github.com/sharkdp/fd) command isn't installed.
 
 ### Other Aliases
 
-| Alias     | Command             | Description                                                 |
-|-----------|---------------------|-------------------------------------------------------------|
-| h         | `history`           | Lists all recently used commands                            |
-| hgrep     | `fc -El 0 \| grep`  | Searches for a word in the list of previously used commands |
-| help      | `man`               | Opens up the man page for a command                         |
-| p         | `ps -f`             | Displays currently executing processes                      |
-| sortnr    | `sort -n -r`        | Used to sort the lines of a text file                       |
-| unexport  | `unset`             | Used to unset an environment variable                       |
+| Alias    | Command            | Description                                                 |
+| -------- | ------------------ | ----------------------------------------------------------- |
+| h        | `history`          | Lists all recently used commands                            |
+| hgrep    | `fc -El 0 \| grep` | Searches for a word in the list of previously used commands |
+| help     | `man`              | Opens up the man page for a command                         |
+| p        | `ps -f`            | Displays currently executing processes                      |
+| sortnr   | `sort -n -r`       | Used to sort the lines of a text file                       |
+| unexport | `unset`            | Used to unset an environment variable                       |
 
 ## Global aliases
 
@@ -77,7 +79,7 @@ $ find . -type f 2>/dev/null
 ```
 
 | Alias | Command                     | Description                                                 |
-|-------|-----------------------------|-------------------------------------------------------------| 
+| ----- | --------------------------- | ----------------------------------------------------------- |
 | H     | `\| head`                   | Pipes output to head which outputs the first part of a file |
 | T     | `\| tail`                   | Pipes output to tail which outputs the last part of a file  |
 | G     | `\| grep`                   | Pipes output to grep to search for some word                |
@@ -97,23 +99,23 @@ that file will be open with `acroread`.
 
 ### Reading Docs
 
-| Alias | Command     | Description                         |
-|-------|-------------|-------------------------------------|
-| pdf   | `acroread`  | Opens up a document using acroread  |
-| ps    | `gv`        | Opens up a .ps file using gv        |
-| dvi   | `xdvi`      | Opens up a .dvi file using xdvi     | 
-| chm   | `xchm`      | Opens up a .chm file using xchm     |
-| djvu  | `djview`    | Opens up a .djvu file using djview  |
+| Alias | Command    | Description                        |
+| ----- | ---------- | ---------------------------------- |
+| pdf   | `acroread` | Opens up a document using acroread |
+| ps    | `gv`       | Opens up a .ps file using gv       |
+| dvi   | `xdvi`     | Opens up a .dvi file using xdvi    |
+| chm   | `xchm`     | Opens up a .chm file using xchm    |
+| djvu  | `djview`   | Opens up a .djvu file using djview |
 
 ### Listing files inside a packed file
 
-| Alias   | Command     | Description                         |
-|---------|-------------|-------------------------------------|
-| zip     | `unzip -l`  | Lists files inside a .zip file      |
-| rar     | `unrar l`   | Lists files inside a .rar file      |
-| tar     | `tar tf`    | Lists files inside a .tar file      |
-| tar.gz  | `echo`      | Lists files inside a .tar.gz file   |
-| ace     | `unace l`   | Lists files inside a .ace file      |
+| Alias  | Command    | Description                       |
+| ------ | ---------- | --------------------------------- |
+| zip    | `unzip -l` | Lists files inside a .zip file    |
+| rar    | `unrar l`  | Lists files inside a .rar file    |
+| tar    | `tar tf`   | Lists files inside a .tar file    |
+| tar.gz | `echo`     | Lists files inside a .tar.gz file |
+| ace    | `unace l`  | Lists files inside a .ace file    |
 
 ### Some other features
 
diff --git a/plugins/common-aliases/common-aliases.plugin.zsh b/plugins/common-aliases/common-aliases.plugin.zsh
index 4e5ff848f..8b58b6310 100644
--- a/plugins/common-aliases/common-aliases.plugin.zsh
+++ b/plugins/common-aliases/common-aliases.plugin.zsh
@@ -12,6 +12,8 @@ alias ldot='ls -ld .*'
 alias lS='ls -1FSsh'
 alias lart='ls -1Fcart'
 alias lrt='ls -1Fcrt'
+alias lsr='ls -lARFh' #Recursive list of files and directories
+alias lsn='ls -1'     #A column contains name of files and directories
 
 alias zshrc='${=EDITOR} ${ZDOTDIR:-$HOME}/.zshrc' # Quick access to the .zshrc file
 

From cbd8481fe37dde252ee817a8157ed72b7bcad655 Mon Sep 17 00:00:00 2001
From: mikey dubs <mike@herebox.org>
Date: Fri, 9 Jul 2021 01:12:56 -0700
Subject: [PATCH 694/869] feat(composer): add `cs` alias for `composer show`
 (#10034)

Closes #10034
---
 plugins/composer/README.md           | 1 +
 plugins/composer/composer.plugin.zsh | 1 +
 2 files changed, 2 insertions(+)

diff --git a/plugins/composer/README.md b/plugins/composer/README.md
index 00ada1e13..8c79c4109 100644
--- a/plugins/composer/README.md
+++ b/plugins/composer/README.md
@@ -29,5 +29,6 @@ Original author: Daniel Gomes <me@danielcsgomes.com>
 | `cod`  | `composer outdated --direct` | Shows a list of installed packages with available updates which are direct dependencies |
 | `cr`   | `composer require`           | Adds new packages to `composer.json`                                                    |
 | `crm`  | `composer remove`            | Removes packages from `composer.json`                                                   |
+| `cs`   | `composer show`              | Lists available packages, with optional filtering                                       |
 | `csu`  | `composer self-update`       | Updates composer to the latest version                                                  |
 | `cu`   | `composer update`            | Updates composer dependencies and `composer.lock` file                                  |
diff --git a/plugins/composer/composer.plugin.zsh b/plugins/composer/composer.plugin.zsh
index f2076c220..a3883a1f2 100644
--- a/plugins/composer/composer.plugin.zsh
+++ b/plugins/composer/composer.plugin.zsh
@@ -45,6 +45,7 @@ alias co='composer outdated'
 alias cod='composer outdated --direct'
 alias cr='composer require'
 alias crm='composer remove'
+alias cs='composer show'
 alias csu='composer self-update'
 alias cu='composer update'
 

From d384ccf31dca8b0a768c463087f156b7302c77c5 Mon Sep 17 00:00:00 2001
From: Raphael Stolt <raphael.stolt@gmail.com>
Date: Tue, 25 Apr 2017 19:52:55 +0200
Subject: [PATCH 695/869] feat(composer): add `cuh` alias for updating global
 packages (#6048)

Closes #6048
---
 plugins/composer/README.md           | 37 ++++++++++++++--------------
 plugins/composer/composer.plugin.zsh |  1 +
 2 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/plugins/composer/README.md b/plugins/composer/README.md
index 8c79c4109..ad6ed24bc 100644
--- a/plugins/composer/README.md
+++ b/plugins/composer/README.md
@@ -14,21 +14,22 @@ Original author: Daniel Gomes <me@danielcsgomes.com>
 
 ## Aliases
 
-| Alias  | Command                      | Description                                                                             |
-| ------ | ---------------------------- | --------------------------------------------------------------------------------------- |
-| `c`    | `composer`                   | Starts composer                                                                         |
-| `ccp`  | `composer create-project`    | Create new project from an existing package                                             |
-| `cdo`  | `composer dump-autoload -o`  | Converts PSR-0/4 autoloading to classmap for a faster autoloader (good for production)  |
-| `cdu`  | `composer dump-autoload`     | Updates the autoloader                                                                  |
-| `cget` | `curl -s <installer> \| php` | Installs composer in the current directory                                              |
-| `cgr`  | `composer global require`    | Allows require command to run on COMPOSER_HOME directory                                |
-| `cgrm` | `composer global remove`     | Allows remove command to run on COMPOSER_HOME directory                                 |
-| `cgu`  | `composer global update`     | Allows update command to run on COMPOSER_HOME directory                                 |
-| `ci`   | `composer install`           | Resolves and installs dependencies from `composer.json`                                 |
-| `co`   | `composer outdated`          | Shows a list of installed packages with available updates                               |
-| `cod`  | `composer outdated --direct` | Shows a list of installed packages with available updates which are direct dependencies |
-| `cr`   | `composer require`           | Adds new packages to `composer.json`                                                    |
-| `crm`  | `composer remove`            | Removes packages from `composer.json`                                                   |
-| `cs`   | `composer show`              | Lists available packages, with optional filtering                                       |
-| `csu`  | `composer self-update`       | Updates composer to the latest version                                                  |
-| `cu`   | `composer update`            | Updates composer dependencies and `composer.lock` file                                  |
+| Alias  | Command                            | Description                                                                             |
+| ------ | ---------------------------------- | --------------------------------------------------------------------------------------- |
+| `c`    | `composer`                         | Starts composer                                                                         |
+| `ccp`  | `composer create-project`          | Create new project from an existing package                                             |
+| `cdo`  | `composer dump-autoload -o`        | Converts PSR-0/4 autoloading to classmap for a faster autoloader (good for production)  |
+| `cdu`  | `composer dump-autoload`           | Updates the autoloader                                                                  |
+| `cget` | `curl -s <installer> \| php`       | Installs composer in the current directory                                              |
+| `cgr`  | `composer global require`          | Allows require command to run on COMPOSER_HOME directory                                |
+| `cgrm` | `composer global remove`           | Allows remove command to run on COMPOSER_HOME directory                                 |
+| `cgu`  | `composer global update`           | Allows update command to run on COMPOSER_HOME directory                                 |
+| `ci`   | `composer install`                 | Resolves and installs dependencies from `composer.json`                                 |
+| `co`   | `composer outdated`                | Shows a list of installed packages with available updates                               |
+| `cod`  | `composer outdated --direct`       | Shows a list of installed packages with available updates which are direct dependencies |
+| `cr`   | `composer require`                 | Adds new packages to `composer.json`                                                    |
+| `crm`  | `composer remove`                  | Removes packages from `composer.json`                                                   |
+| `cs`   | `composer show`                    | Lists available packages, with optional filtering                                       |
+| `csu`  | `composer self-update`             | Updates composer to the latest version                                                  |
+| `cu`   | `composer update`                  | Updates composer dependencies and `composer.lock` file                                  |
+| `cuh`  | `composer update -d <config-home>` | Updates globally installed packages                                                     |
diff --git a/plugins/composer/composer.plugin.zsh b/plugins/composer/composer.plugin.zsh
index a3883a1f2..dd0b18e27 100644
--- a/plugins/composer/composer.plugin.zsh
+++ b/plugins/composer/composer.plugin.zsh
@@ -48,6 +48,7 @@ alias crm='composer remove'
 alias cs='composer show'
 alias csu='composer self-update'
 alias cu='composer update'
+alias cuh='composer update --working-dir=$(composer config -g home)'
 
 
 ## If Composer not found, try to add known directories to $PATH

From b38da62b23e08271fad9fc25a0bb47e89215a431 Mon Sep 17 00:00:00 2001
From: Shahed Hosseini <sajjadhusseini92@gmail.com>
Date: Wed, 29 Dec 2021 13:28:47 +0330
Subject: [PATCH 696/869] feat(debian): add `aar` alias for autoremove (#7869)

---
 plugins/debian/debian.plugin.zsh | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/plugins/debian/debian.plugin.zsh b/plugins/debian/debian.plugin.zsh
index bde97cd30..1d2022436 100644
--- a/plugins/debian/debian.plugin.zsh
+++ b/plugins/debian/debian.plugin.zsh
@@ -52,9 +52,11 @@ if [[ $use_sudo -eq 1 ]]; then
     alias ai="sudo $apt_pref install"
     # Install all packages given on the command line while using only the first word of each line:
     # acs ... | ail
+
     alias ail="sed -e 's/  */ /g' -e 's/ *//' | cut -s -d ' ' -f 1 | xargs sudo $apt_pref install"
     alias ap="sudo $apt_pref purge"
     alias ar="sudo $apt_pref remove"
+    alias aar="sudo $apt_pref autoremove"
 
     # apt-get only
     alias ads="sudo apt-get dselect-upgrade"
@@ -98,7 +100,11 @@ else
         print "$cmd"
         eval "$cmd"
     }
-
+    aar() {
+        cmd="su -lc '$apt_pref -P autoremove $@' root"
+        print "$cmd"
+        eval "$cmd"
+    }
     # Install all .deb files in the current directory
     # Assumes glob_subst is off
     alias dia='su -lc "dpkg -i ./*.deb" root'
@@ -139,6 +145,7 @@ apt_pref_compdef ai  "install"
 apt_pref_compdef ail "install"
 apt_pref_compdef ap  "purge"
 apt_pref_compdef ar  "remove"
+apt_pref_compdef aar  "autoremove"
 apt_pref_compdef ads "dselect-upgrade"
 
 # Misc. #####################################################################

From 37b278cd034f8e995a274db92aab7f4a33c0e1d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Wed, 29 Dec 2021 11:08:02 +0100
Subject: [PATCH 697/869] chore(debian): document previous alias

---
 plugins/debian/README.md         | 2 ++
 plugins/debian/debian.plugin.zsh | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/plugins/debian/README.md b/plugins/debian/README.md
index 922d68cb3..ac2eec84d 100644
--- a/plugins/debian/README.md
+++ b/plugins/debian/README.md
@@ -44,6 +44,7 @@ Set `$apt_pref` and `$apt_upgr` to whatever command you want (before sourcing Oh
 | `ail`    | `sed -e 's/  */ /g' -e 's/ *//' \| cut -s -d ' ' -f 1 \| xargs sudo $apt_pref install` | Install all packages given on the command line while using only the first word of each line |
 | `ap`     | `sudo $apt_pref purge`                                                                 | Removes packages along with configuration files                                             |
 | `ar`     | `sudo $apt_pref remove`                                                                | Removes packages, keeps the configuration files                                             |
+| `aar`    | `sudo $apt_pref autoremove`                                                            | Removes packages installed automatically that are no longer needed                          |
 | `ads`    | `sudo apt-get dselect-upgrade`                                                         | Installs packages from list and removes all not in the list                                 |
 | `dia`    | `sudo dpkg -i ./*.deb`                                                                 | Install all .deb files in the current directory                                             |
 | `di`     | `sudo dpkg -i`                                                                         | Install all .deb files in the current directory                                             |
@@ -54,6 +55,7 @@ Set `$apt_pref` and `$apt_upgr` to whatever command you want (before sourcing Oh
 | Alias | Command                                                   |
 | ----- | --------------------------------------------------------- |
 | `aac` | `su -ls "$apt_pref autoclean" root`                       |
+| `aar` | `su -ls "$apt_pref autoremove" root`                      |
 | `ac`  | `su -ls "$apt_pref clean" root`                           |
 | `ad`  | `su -lc "$apt_pref update" root`                          |
 | `adg` | `su -lc "$apt_pref update && aptitude $apt_upgr" root`    |
diff --git a/plugins/debian/debian.plugin.zsh b/plugins/debian/debian.plugin.zsh
index 1d2022436..5fa1270b8 100644
--- a/plugins/debian/debian.plugin.zsh
+++ b/plugins/debian/debian.plugin.zsh
@@ -100,7 +100,7 @@ else
         print "$cmd"
         eval "$cmd"
     }
-    aar() {
+    function aar() {
         cmd="su -lc '$apt_pref -P autoremove $@' root"
         print "$cmd"
         eval "$cmd"

From 7e4273f44075ff4ec81778a16bf578e05cc8ca4c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Daase?= <bjoern.daase@student.hpi.de>
Date: Fri, 14 Jun 2019 20:50:16 +0200
Subject: [PATCH 698/869] feat(debian): add `alu` alias for list and upgrade
 packages (#7928)

Closes #7928
---
 plugins/debian/README.md         | 11 ++++++-----
 plugins/debian/debian.plugin.zsh |  3 +++
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/plugins/debian/README.md b/plugins/debian/README.md
index ac2eec84d..2ce206cfb 100644
--- a/plugins/debian/README.md
+++ b/plugins/debian/README.md
@@ -33,21 +33,22 @@ Set `$apt_pref` and `$apt_upgr` to whatever command you want (before sourcing Oh
 | Alias    | Command                                                                                | Description                                                                                 |
 | -------- | -------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------- |
 | `aac`    | `sudo $apt_pref autoclean`                                                             | Clears out the local repository of retrieved package files                                  |
+| `aar`    | `sudo $apt_pref autoremove`                                                            | Removes packages installed automatically that are no longer needed                          |
 | `abd`    | `sudo $apt_pref build-dep`                                                             | Installs all dependencies for building packages                                             |
 | `ac`     | `sudo $apt_pref clean`                                                                 | Clears out the local repository of retrieved package files except lock files                |
 | `ad`     | `sudo $apt_pref update`                                                                | Updates the package lists for upgrades for packages                                         |
 | `adg`    | `sudo $apt_pref update && sudo $apt_pref $apt_upgr`                                    | Update and upgrade packages                                                                 |
+| `ads`    | `sudo apt-get dselect-upgrade`                                                         | Installs packages from list and removes all not in the list                                 |
 | `adu`    | `sudo $apt_pref update && sudo $apt_pref dist-upgrade`                                 | Smart upgrade that handles dependencies                                                     |
 | `afu`    | `sudo apt-file update`                                                                 | Update the files in packages                                                                |
-| `au`     | `sudo $apt_pref $apt_upgr`                                                             | Install package upgrades                                                                    |
 | `ai`     | `sudo $apt_pref install`                                                               | Command-line tool to install package                                                        |
 | `ail`    | `sed -e 's/  */ /g' -e 's/ *//' \| cut -s -d ' ' -f 1 \| xargs sudo $apt_pref install` | Install all packages given on the command line while using only the first word of each line |
+| `alu`    | `sudo apt update && apt list -u && sudo apt upgrade`                                   | Update, list and upgrade packages                                                           |
 | `ap`     | `sudo $apt_pref purge`                                                                 | Removes packages along with configuration files                                             |
 | `ar`     | `sudo $apt_pref remove`                                                                | Removes packages, keeps the configuration files                                             |
-| `aar`    | `sudo $apt_pref autoremove`                                                            | Removes packages installed automatically that are no longer needed                          |
-| `ads`    | `sudo apt-get dselect-upgrade`                                                         | Installs packages from list and removes all not in the list                                 |
-| `dia`    | `sudo dpkg -i ./*.deb`                                                                 | Install all .deb files in the current directory                                             |
+| `au`     | `sudo $apt_pref $apt_upgr`                                                             | Install package upgrades                                                                    |
 | `di`     | `sudo dpkg -i`                                                                         | Install all .deb files in the current directory                                             |
+| `dia`    | `sudo dpkg -i ./*.deb`                                                                 | Install all .deb files in the current directory                                             |
 | `kclean` | `sudo aptitude remove -P ?and(~i~nlinux-(ima\|hea) ?not(~n$(uname -r)))`               | Remove ALL kernel images and headers EXCEPT the one in use                                  |
 
 ## Aliases - Commands using `su`
@@ -77,8 +78,8 @@ Set `$apt_pref` and `$apt_upgr` to whatever command you want (before sourcing Oh
 | ------------------- | --------------------------------------------------------------- |
 | `apt-copy`          | Create a simple script that can be used to 'duplicate' a system |
 | `apt-history`       | Displays apt history for a command                              |
-| `kerndeb`           | Builds kernel packages                                          |
 | `apt-list-packages` | List packages by size                                           |
+| `kerndeb`           | Builds kernel packages                                          |
 
 ## Authors
 
diff --git a/plugins/debian/debian.plugin.zsh b/plugins/debian/debian.plugin.zsh
index 5fa1270b8..e4db8fe33 100644
--- a/plugins/debian/debian.plugin.zsh
+++ b/plugins/debian/debian.plugin.zsh
@@ -61,6 +61,9 @@ if [[ $use_sudo -eq 1 ]]; then
     # apt-get only
     alias ads="sudo apt-get dselect-upgrade"
 
+    # apt only
+    alias alu="sudo apt update && apt list -u && sudo apt upgrade"
+
     # Install all .deb files in the current directory.
     # Warning: you will need to put the glob in single quotes if you use:
     # glob_subst

From bc7bc74469ee5e412ae54c45ebaa5e07295323c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Wed, 29 Dec 2021 11:51:05 +0100
Subject: [PATCH 699/869] fix(git-prompt): fix clean prompt when stash is not
 empty (#9978)

Fixes #9978
---
 plugins/git-prompt/README.md    | 8 ++++----
 plugins/git-prompt/gitstatus.py | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/plugins/git-prompt/README.md b/plugins/git-prompt/README.md
index c6610fa94..83d365c84 100644
--- a/plugins/git-prompt/README.md
+++ b/plugins/git-prompt/README.md
@@ -11,7 +11,8 @@ plugins=(... git-prompt)
 
 See the [original repository](https://github.com/olivierverdier/zsh-git-prompt).
 
-## Prerequisites
+## Requirements
+
 This plugin uses `python`, so your host needs to have it installed
 
 ## Examples
@@ -30,7 +31,7 @@ The prompt may look like the following:
 
 By default, the general appearance of the prompt is:
 
-```
+```text
 (<branch><branch tracking>|<local status>)
 ```
 
@@ -58,9 +59,8 @@ The symbols are as follows:
 ## Customisation
 
 - Set the variable `ZSH_THEME_GIT_PROMPT_CACHE` to any value in order to enable caching.
-- You may also change a number of variables (whose name start with `ZSH_THEME_GIT_PROMPT_`) 
+- You may also change a number of variables (whose name start with `ZSH_THEME_GIT_PROMPT_`)
   to change the appearance of the prompt. Take a look at the bottom of the [plugin file](git-prompt.plugin.zsh)`
   to see what variables are available.
 
-
 **Enjoy!**
diff --git a/plugins/git-prompt/gitstatus.py b/plugins/git-prompt/gitstatus.py
index 786274a71..4dea8000f 100644
--- a/plugins/git-prompt/gitstatus.py
+++ b/plugins/git-prompt/gitstatus.py
@@ -81,7 +81,7 @@ for st in status:
             staged.append(st)
 
 stashed = get_stash()
-if not changed and not staged and not conflicts and not untracked and not stashed:
+if not changed and not staged and not conflicts and not untracked:
     clean = 1
 else:
     clean = 0

From eec34b32fa586559af463b0d61256a7f5d257bea Mon Sep 17 00:00:00 2001
From: Oluwafemi Sule <oluwafemisule@outlook.com>
Date: Wed, 29 Dec 2021 12:26:17 +0100
Subject: [PATCH 700/869] fix(pip): use `pip3` in `pip3 uninstall` completion
 (#10271)

---
 plugins/pip/_pip | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/pip/_pip b/plugins/pip/_pip
index a5adead4a..e03be6afe 100644
--- a/plugins/pip/_pip
+++ b/plugins/pip/_pip
@@ -13,7 +13,7 @@ _pip_all() {
 }
 
 _pip_installed() {
-  installed_pkgs=(`pip freeze | cut -d '=' -f 1`)
+  installed_pkgs=($($service freeze | cut -d '=' -f 1))
 }
 
 local -a _1st_arguments

From 2acb3071cade6395c1dbcee31b6b8d198ebed66a Mon Sep 17 00:00:00 2001
From: WH-2099 <wh2099@outlook.com>
Date: Wed, 29 Dec 2021 19:55:51 +0800
Subject: [PATCH 701/869] fix(pip): don't overwrite `requirements.txt` in
 internal commands (#10061)

---
 plugins/pip/pip.plugin.zsh | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/plugins/pip/pip.plugin.zsh b/plugins/pip/pip.plugin.zsh
index a58f5704a..7eb2d2a35 100644
--- a/plugins/pip/pip.plugin.zsh
+++ b/plugins/pip/pip.plugin.zsh
@@ -91,11 +91,21 @@ fi
 # Create requirements file
 alias pipreq="pip freeze > requirements.txt"
 
-# Update all installed packages
-alias pipupall="pipreq && sed -i 's/==/>=/g' requirements.txt && pip install -r requirements.txt --upgrade && rm -rf requirements.txt"
-
 # Install packages from requirements file
 alias pipir="pip install -r requirements.txt"
 
+# Update all installed packages
+function pipupall {
+  # non-GNU xargs does not support nor need `--no-run-if-empty`
+  local xargs="xargs --no-run-if-empty"
+  xargs --version 2>/dev/null | grep -q GNU || xargs="xargs"
+  pip list --outdated --format freeze | cut -d= -f1 | ${=xargs} pip install --upgrade
+}
+
 # Uninstalled all installed packages
-alias pipunall="pipreq && pip uninstall -r requirements.txt -y && rm -rf requirements.txt"
+function pipunall {
+  # non-GNU xargs does not support nor need `--no-run-if-empty`
+  local xargs="xargs --no-run-if-empty"
+  xargs --version 2>/dev/null | grep -q GNU || xargs="xargs"
+  pip list --format freeze | cut -d= -f1 | ${=xargs} pip uninstall
+}

From ce9104c4f3d9ea424346d711f0653cd9e5d81303 Mon Sep 17 00:00:00 2001
From: Alex Matheson <Alex.kmatheson@gmail.com>
Date: Wed, 29 Dec 2021 07:12:52 -0600
Subject: [PATCH 702/869] feat(npm): toggle `npm install` / `npm uninstall` by
 pressing F2 twice (#9717)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Marc Cornellà <hello@mcornella.com>
---
 plugins/npm/README.md      | 17 ++++++++++++++++
 plugins/npm/npm.plugin.zsh | 40 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 57 insertions(+)

diff --git a/plugins/npm/README.md b/plugins/npm/README.md
index e970c3c7a..8eafc6d61 100644
--- a/plugins/npm/README.md
+++ b/plugins/npm/README.md
@@ -29,3 +29,20 @@ plugins=(... npm)
 | `npmI`  | `npm init`                   | Run npm init                                                    |
 | `npmi`  | `npm info`                   | Run npm info                                                    |
 | `npmSe` | `npm search`                 | Run npm search                                                  |
+
+## `npm install` / `npm uninstall` toggle
+
+The plugin adds a function that toggles between `npm install` and `npm uninstall` in
+the current command or the last command, for up to 2 previous commands. **The default
+key binding is pressing <kbd>F2</kbd> twice**.
+
+You can change this key binding by adding the following line to your zshrc file:
+
+```zsh
+bindkey -M emacs '<seq>' npm_toggle_install_uninstall
+bindkey -M vicmd '<seq>' npm_toggle_install_uninstall
+bindkey -M viins '<seq>' npm_toggle_install_uninstall
+```
+
+where `<seq>` is a key sequence obtained by running `cat` and pressing the keyboard
+sequence you want.
diff --git a/plugins/npm/npm.plugin.zsh b/plugins/npm/npm.plugin.zsh
index f7d6d3939..6c768d614 100644
--- a/plugins/npm/npm.plugin.zsh
+++ b/plugins/npm/npm.plugin.zsh
@@ -69,3 +69,43 @@ alias npmi="npm info"
 
 # Run npm search
 alias npmSe="npm search"
+
+npm_toggle_install_uninstall() {
+  # Look up to the previous 2 history commands
+  local line
+  for line in "$BUFFER" \
+    "${history[$((HISTCMD-1))]}" \
+    "${history[$((HISTCMD-2))]}"
+  do
+    case "$line" in
+      "npm uninstall"*)
+        BUFFER="${line/npm uninstall/npm install}"
+        (( CURSOR = CURSOR + 2 )) # uninstall -> install: 2 chars removed
+        ;;
+      "npm install"*)
+        BUFFER="${line/npm install/npm uninstall}"
+        (( CURSOR = CURSOR + 2 )) # install -> uninstall: 2 chars added
+        ;;
+      "npm un "*)
+        BUFFER="${line/npm un/npm install}"
+        (( CURSOR = CURSOR + 5 )) # un -> install: 5 chars added
+        ;;
+      "npm i "*)
+        BUFFER="${line/npm i/npm uninstall}"
+        (( CURSOR = CURSOR + 8 )) # i -> uninstall: 8 chars added
+        ;;
+      *) continue ;;
+    esac
+    return 0
+  done
+
+  BUFFER="npm install"
+  CURSOR=${#BUFFER}
+}
+
+zle -N npm_toggle_install_uninstall
+
+# Defined shortcut keys: [F2] [F2]
+bindkey -M emacs '^[OQ^[OQ' npm_toggle_install_uninstall
+bindkey -M vicmd '^[OQ^[OQ' npm_toggle_install_uninstall
+bindkey -M viins '^[OQ^[OQ' npm_toggle_install_uninstall

From c155531402a2ca19490aa81818a0f4f58f73cabf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Wed, 29 Dec 2021 15:07:52 +0100
Subject: [PATCH 703/869] chore(bazel): update completion to f146202c

---
 plugins/bazel/_bazel | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/bazel/_bazel b/plugins/bazel/_bazel
index 827ce545c..c34c572b0 100644
--- a/plugins/bazel/_bazel
+++ b/plugins/bazel/_bazel
@@ -164,7 +164,7 @@ _get_build_targets() {
       ;;
   esac
   completions=(${$(_bazel_b query "kind(\"${rule_re}\", ${pkg}:all)" 2>/dev/null)##*:})
-  if ( (( ${#completions} > 0 )) && [[ $target_type != run ]] ); then
+  if ( (( ${#completions} > 0 )) && [[ $target_type != bin ]] ); then
     completions+=(all)
   fi
   echo ${completions[*]}

From 4ef188cebf054896b47aa91181dacc2c674b5063 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Wed, 29 Dec 2021 15:19:59 +0100
Subject: [PATCH 704/869] perf(yarn): skip `yarn` call if default global bin
 directory exists (#10290)

Fixes #10290
---
 plugins/yarn/yarn.plugin.zsh | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/plugins/yarn/yarn.plugin.zsh b/plugins/yarn/yarn.plugin.zsh
index a4f595c61..9ba24420a 100644
--- a/plugins/yarn/yarn.plugin.zsh
+++ b/plugins/yarn/yarn.plugin.zsh
@@ -1,5 +1,8 @@
-# Add yarn bin directory to $PATH if it exists and not in $PATH already
-bindir=$(yarn global bin 2>/dev/null) \
+# Skip yarn call if default global bin dir exists
+[[ -d "$HOME/.yarn/bin" ]] && bindir="$HOME/.yarn/bin" || bindir="$(yarn global bin 2>/dev/null)"
+
+# Add yarn bin directory to $PATH if it exists and not already in $PATH
+[[ $? -eq 0 ]] \
   && [[ -d "$bindir" ]] \
   && (( ! ${path[(Ie)$bindir]} )) \
   && path+=("$bindir")

From 3e2676f7dcafbec3c8e481e6ebfb2454bd3c232c Mon Sep 17 00:00:00 2001
From: Celestino Gomes <tinorj@gmail.com>
Date: Fri, 24 Sep 2021 17:37:09 -0300
Subject: [PATCH 705/869] feat(python): add `pyserver` alias to start an HTTP
 server (#10217)

Closes #10217
---
 plugins/python/README.md         | 20 +++++++++++---------
 plugins/python/python.plugin.zsh |  3 +++
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/plugins/python/README.md b/plugins/python/README.md
index b95ffe679..eeaa1148a 100644
--- a/plugins/python/README.md
+++ b/plugins/python/README.md
@@ -3,17 +3,19 @@
 The plugin adds several aliases for useful [python](https://www.python.org/) commands.
 
 To use it, add `python` to the plugins array of your zshrc file:
-```
+
+```zsh
 plugins=(... python)
 ```
 
 ## Aliases
 
-| Command          | Description                                                                     |
-|------------------|---------------------------------------------------------------------------------|
-| `py`             | Runs `python`                                                                   |
-| `ipython`        | Runs the appropriate `ipython` version according to the activated virtualenv    |
-| `pyfind`         | Finds .py files recursively in the current directory                            |
-| `pyclean [dirs]` | Deletes byte-code and cache files from a list of directories or the current one |
-| `pygrep <text>`  | Looks for `text` in .py files                                                   |
-| `pyuserpaths`    | Add --user site-packages to PYTHONPATH, for all installed python versions.      |
+| Command          | Description                                                                           |
+| ---------------- | ------------------------------------------------------------------------------------- |
+| `py`             | Runs `python`                                                                         |
+| `ipython`        | Runs the appropriate `ipython` version according to the activated virtualenv          |
+| `pyfind`         | Finds .py files recursively in the current directory                                  |
+| `pyclean [dirs]` | Deletes byte-code and cache files from a list of directories or the current one       |
+| `pygrep <text>`  | Looks for `text` in .py files                                                         |
+| `pyuserpaths`    | Add --user site-packages to PYTHONPATH, for all installed python versions.            |
+| `pyserver`       | Starts an http.server on the current directory. Use `--directory` for a different one |
diff --git a/plugins/python/python.plugin.zsh b/plugins/python/python.plugin.zsh
index 276eb6f91..896fae3ca 100644
--- a/plugins/python/python.plugin.zsh
+++ b/plugins/python/python.plugin.zsh
@@ -48,3 +48,6 @@ alias pygrep='grep -nr --include="*.py"'
 
 # Run proper IPython regarding current virtualenv (if any)
 alias ipython="python -c 'import IPython; IPython.terminal.ipapp.launch_new_instance()'"
+
+# Share local directory as a HTTP server
+alias pyserver="python -m http.server"

From 02eb548d5ac41c57d37af6817c77dfbb57a8d281 Mon Sep 17 00:00:00 2001
From: Marijan Smetko <msmetko@ZVIJER-PC.localdomain>
Date: Thu, 1 Apr 2021 23:35:00 +0200
Subject: [PATCH 706/869] feat(python): add utilities to manage simple virtual
 environments (#9776)

Closes #9776
---
 plugins/python/README.md         |  9 +++++++++
 plugins/python/python.plugin.zsh | 33 ++++++++++++++++++++++++++++++++
 2 files changed, 42 insertions(+)

diff --git a/plugins/python/README.md b/plugins/python/README.md
index eeaa1148a..4968cca6d 100644
--- a/plugins/python/README.md
+++ b/plugins/python/README.md
@@ -10,6 +10,7 @@ plugins=(... python)
 
 ## Aliases
 
+<<<<<<< HEAD
 | Command          | Description                                                                           |
 | ---------------- | ------------------------------------------------------------------------------------- |
 | `py`             | Runs `python`                                                                         |
@@ -19,3 +20,11 @@ plugins=(... python)
 | `pygrep <text>`  | Looks for `text` in .py files                                                         |
 | `pyuserpaths`    | Add --user site-packages to PYTHONPATH, for all installed python versions.            |
 | `pyserver`       | Starts an http.server on the current directory. Use `--directory` for a different one |
+
+## Virtual environments
+
+The plugin provides two utilities to manage Python venvs:
+
+- `mkv [name]`: make a new virtual environment called `name` (default: `venv`) in current directory.
+
+- `vrun [name]`: activate virtual environment called `name` (default: `venv`) in current directory.
diff --git a/plugins/python/python.plugin.zsh b/plugins/python/python.plugin.zsh
index 896fae3ca..6c7fc6cbb 100644
--- a/plugins/python/python.plugin.zsh
+++ b/plugins/python/python.plugin.zsh
@@ -51,3 +51,36 @@ alias ipython="python -c 'import IPython; IPython.terminal.ipapp.launch_new_inst
 
 # Share local directory as a HTTP server
 alias pyserver="python -m http.server"
+
+
+## venv utilities
+
+# Activate a the python virtual environment specified.
+# If none specified, use 'venv'.
+function vrun() {
+  local name="${1:-venv}"
+  local venvpath="${name:P}"
+
+  if [[ ! -d "$venvpath" ]]; then
+    echo >&2 "Error: no such venv in current directory: $name"
+    return 1
+  fi
+
+  if [[ ! -f "${venvpath}/bin/activate" ]]; then
+    echo >&2 "Error: '${name}' is not a proper virtual environment"
+    return 1
+  fi
+
+  . "${venvpath}/bin/activate" || return $?
+  echo "Activated virtual environment ${name}"
+}
+
+# Create a new virtual environment, with default name 'venv'.
+function mkv() {
+  local name="${1:-venv}"
+  local venvpath="${name:P}"
+
+  python3 -m venv "${name}" || return
+  echo >&2 "Created venv in '${venvpath}'"
+  vrun "${name}"
+}

From 0e399d47b96b6007570cd21034e8a3d6144ad111 Mon Sep 17 00:00:00 2001
From: Karn Saheb <hello@karn.io>
Date: Fri, 7 Feb 2020 21:28:18 -0500
Subject: [PATCH 707/869] feat(terraform): add PREFIX and SUFFIX settings to
 `tf_prompt_info` (#8605)

Closes #8605
---
 plugins/terraform/terraform.plugin.zsh | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/plugins/terraform/terraform.plugin.zsh b/plugins/terraform/terraform.plugin.zsh
index 997241c9a..86b12751c 100644
--- a/plugins/terraform/terraform.plugin.zsh
+++ b/plugins/terraform/terraform.plugin.zsh
@@ -1,11 +1,11 @@
 function tf_prompt_info() {
-    # dont show 'default' workspace in home dir
-    [[ "$PWD" == ~ ]] && return
-    # check if in terraform dir
-    if [[ -d .terraform && -r .terraform/environment  ]]; then
-      workspace=$(cat .terraform/environment) || return
-      echo "[${workspace}]"
-    fi
+  # dont show 'default' workspace in home dir
+  [[ "$PWD" != ~ ]] || return
+  # check if in terraform dir and file exists
+  [[ -d .terraform && -r .terraform/environment ]] || return
+
+  local workspace="$(< .terraform/environment)"
+  echo "${ZSH_THEME_TF_PROMPT_PREFIX-[}${workspace:gs/%/%%}${ZSH_THEME_TF_PROMPT_SUFFIX-]}"
 }
 
 alias tf='terraform'

From 659dbb53680c6f931d8e20d267fe879a37ba42f1 Mon Sep 17 00:00:00 2001
From: mehdicopter <mmahfoudi@meilleursagents.com>
Date: Sat, 19 Jun 2021 00:17:40 +0200
Subject: [PATCH 708/869] feat(terraform): add more aliases (#9989)

Closes #9989
---
 plugins/terraform/README.md            | 45 +++++++++++++++++---------
 plugins/terraform/terraform.plugin.zsh |  6 ++++
 2 files changed, 35 insertions(+), 16 deletions(-)

diff --git a/plugins/terraform/README.md b/plugins/terraform/README.md
index 9e9f0cdfb..474346dc0 100644
--- a/plugins/terraform/README.md
+++ b/plugins/terraform/README.md
@@ -1,14 +1,7 @@
-## Terraform oh-my-zsh plugin
+# Terraform plugin
 
 Plugin for Terraform, a tool from Hashicorp for managing infrastructure safely and efficiently.
-
-Current as of Terraform v0.13
-
-### Requirements
-
- * [Terraform](https://terraform.io/)
-
-### Usage
+It adds completion for `terraform`, as well as aliases and a prompt function.
 
 To use it, add `terraform` to the plugins array of your `~/.zshrc` file:
 
@@ -16,14 +9,34 @@ To use it, add `terraform` to the plugins array of your `~/.zshrc` file:
 plugins=(... terraform)
 ```
 
- * Type `terraform` into your prompt and hit `TAB` to see available completion options
- * Type `tf` into your prompt as a short alias to `terraform`
+## Requirements
 
-### Expanding ZSH prompt with current Terraform workspace name
+* [Terraform](https://terraform.io/)
 
-If you want to get current Terraform workspace name in your ZSH prompt open
-your .zsh-theme file and in a chosen place insert:
+## Aliases
 
-```shell
-PROMPT=$'%{$fg[white]%}$(tf_prompt_info)%{$reset_color%} '
+| Alias | Command              |
+| ----- | -------------------- |
+| `tf`  | `terraform`          |
+| `tfa` | `terraform apply`    |
+| `tfd` | `terraform destroy`  |
+| `tff` | `terraform fmt`      |
+| `tfi` | `terraform init`     |
+| `tfp` | `terraform plan`     |
+| `tfv` | `terraform validate` |
+
+## Prompt function
+
+You can add the current Terraform workspace in your prompt by adding `$(tf_prompt_info)`
+to your `PROMPT` or `RPROMPT` variable.
+
+```sh
+RPROMPT='$(tf_prompt_info)'
+```
+
+You can also specify the PREFIX and SUFFIX for the workspace with the following variables:
+
+```sh
+ZSH_THEME_TF_PROMPT_PREFIX="%{$fg[white]%}"
+ZSH_THEME_TF_PROMPT_SUFFIX="%{$reset_color%}"
 ```
diff --git a/plugins/terraform/terraform.plugin.zsh b/plugins/terraform/terraform.plugin.zsh
index 86b12751c..f224b79f0 100644
--- a/plugins/terraform/terraform.plugin.zsh
+++ b/plugins/terraform/terraform.plugin.zsh
@@ -9,3 +9,9 @@ function tf_prompt_info() {
 }
 
 alias tf='terraform'
+alias tfa='terraform apply'
+alias tfd='terraform destroy'
+alias tff='terraform fmt'
+alias tfi='terraform init'
+alias tfp='terraform plan'
+alias tfv='terraform validate'

From 8b231f2aa752238bd8624822df7034a1b9d1188e Mon Sep 17 00:00:00 2001
From: Ian Cowan <38896380+iccowan@users.noreply.github.com>
Date: Wed, 29 Dec 2021 10:18:16 -0500
Subject: [PATCH 709/869] chore(ubuntu): add documentation for `acsp` alias
 (#10325)

---
 plugins/ubuntu/README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/ubuntu/README.md b/plugins/ubuntu/README.md
index 9efef0732..20f5c65ee 100644
--- a/plugins/ubuntu/README.md
+++ b/plugins/ubuntu/README.md
@@ -16,6 +16,7 @@ Commands that use `$APT` will use `apt` if installed or defer to `apt-get` other
 |---------|--------------------------------------------------------------------------|---------------------------------------------------------------------------------------------------|
 | age     | `sudo $APT`                                                              | Run apt-get with sudo                                                                             |
 | acs     | `apt-cache search`                                                       | Search the apt-cache with the specified criteria                                                  |
+| acsp    | `apt-cache showpkg`                                                      | Shows information about the listed packages                                                       |
 | acp     | `apt-cache policy`                                                       | Display the package source priorities                                                             |
 | afs     | `apt-file search --regexp`                                               | Perform a regular expression apt-file search                                                      |
 | afu     | `sudo apt-file update`                                                   | Generates or updates the apt-file package database                                                |

From 8b53d0494241fe044e44e24515f7c6293717557e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Wed, 29 Dec 2021 16:26:35 +0100
Subject: [PATCH 710/869] docs(sudo): document key binding change

---
 plugins/sudo/README.md | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/plugins/sudo/README.md b/plugins/sudo/README.md
index 4f3973ef8..012fc5325 100644
--- a/plugins/sudo/README.md
+++ b/plugins/sudo/README.md
@@ -1,6 +1,6 @@
 # sudo
 
-Easily prefix your current or previous commands with `sudo` by pressing <kbd>esc</kbd> twice
+Easily prefix your current or previous commands with `sudo` by pressing <kbd>esc</kbd> twice.
 
 To use it, add `sudo` to the plugins array in your zshrc file:
 
@@ -43,3 +43,17 @@ $ sudo rm some-system-file.txt
 Password:
 $
 ```
+
+## Key binding
+
+By default, the `sudo` plugin uses <kbd>Esc</kbd><kbd>Esc</kbd> as the trigger.
+If you want to change it, you can use the `bindkey` command to bind it to a different key:
+
+```sh
+bindkey -M emacs '<seq>' sudo-command-line
+bindkey -M vicmd '<seq>' sudo-command-line
+bindkey -M viins '<seq>' sudo-command-line
+```
+
+where `<seq>` is the sequence you want to use. You can find the keyboard sequence
+by running `cat` and pressing the keyboard combination you want to use.

From 4d8d7bed50516aab86079aa5386ee6662bde5ae0 Mon Sep 17 00:00:00 2001
From: Paul Robert Lloyd <paulrobertlloyd@users.noreply.github.com>
Date: Wed, 29 Dec 2021 15:55:35 +0000
Subject: [PATCH 711/869] docs(nvm): clarify how to get Homebrew directory
 (#10393)

---
 plugins/nvm/README.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/plugins/nvm/README.md b/plugins/nvm/README.md
index 0c2bbf9f0..a8bc34ae7 100644
--- a/plugins/nvm/README.md
+++ b/plugins/nvm/README.md
@@ -17,7 +17,9 @@ where you installed nvm.
 These settings should go in your zshrc file, before Oh My Zsh is sourced:
 
 - **`NVM_HOMEBREW`**: if you installed nvm via Homebrew, in a directory other than `/usr/local/opt/nvm`, you
-  can set `NVM_HOMEBREW` to be the directory where you installed it.
+  can set `NVM_HOMEBREW` to be the directory where you installed it. For example, on Apple Silicon-based Macs,
+  [Homebrew is installed in `/opt/homebrew`](https://docs.brew.sh/Installation). To get the directory where
+  nvm has been installed, regardless of chip architecture, use `NVM_HOMEBREW=$(brew --prefix nvm)`.
 
 - **`NVM_LAZY`**: if you want the plugin to defer the load of nvm to speed-up the start of your zsh session,
   set `NVM_LAZY` to `1`. This will use the `--no-use` parameter when loading nvm, and will create a function

From a01cf8562700f3e5594f66daf40f31d9fe7ec570 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Wed, 29 Dec 2021 17:18:21 +0100
Subject: [PATCH 712/869] fix(rust): use default toolchain when completing
 `cargo`

---
 plugins/rust/rust.plugin.zsh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/plugins/rust/rust.plugin.zsh b/plugins/rust/rust.plugin.zsh
index ced6eb4aa..014c73b3b 100644
--- a/plugins/rust/rust.plugin.zsh
+++ b/plugins/rust/rust.plugin.zsh
@@ -25,4 +25,7 @@ fi
 
 # Generate completion files in the background
 rustup completions zsh >| "$ZSH_CACHE_DIR/completions/_rustup" &|
-rustup completions zsh cargo >| "$ZSH_CACHE_DIR/completions/_cargo" &|
+cat >| "$ZSH_CACHE_DIR/completions/_cargo" <<'EOF'
+#compdef cargo
+source $(rustc +${${(z)$(rustup default)}[1]} --print sysroot)/share/zsh/site-functions/_cargo
+EOF

From 116fc2feaa40bf4ce11c3ac72077a0ffba109525 Mon Sep 17 00:00:00 2001
From: scrouthtv <lennivh24@gmail.com>
Date: Thu, 30 Dec 2021 10:44:57 +0100
Subject: [PATCH 713/869] fix(systemd): enable `--user` on restart command
 (#10543)

`restart` is a unit-related command, not power-related, so it should appear as `sc-restart=sudo systemctl restart` and `scu-restart=systemctl --user restart`
---
 plugins/systemd/systemd.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/systemd/systemd.plugin.zsh b/plugins/systemd/systemd.plugin.zsh
index e9ac64382..7afd2be58 100644
--- a/plugins/systemd/systemd.plugin.zsh
+++ b/plugins/systemd/systemd.plugin.zsh
@@ -45,6 +45,7 @@ sudo_commands=(
   reload-or-restart
   reset-failed
   rescue
+  restart
   revert
   set-default
   set-environment
@@ -63,7 +64,6 @@ power_commands=(
   hybrid-sleep
   poweroff
   reboot
-  restart
   suspend
 )
 

From 376beafd17b5e9aeb5ef9975720e4ad3354c0f43 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Fri, 31 Dec 2021 20:01:03 +0100
Subject: [PATCH 714/869] docs(zsh-navigation-tools): remove installation steps
 from README (#10549)

Fixes #10549
---
 plugins/zsh-navigation-tools/README.md | 201 +++----------------------
 1 file changed, 18 insertions(+), 183 deletions(-)

diff --git a/plugins/zsh-navigation-tools/README.md b/plugins/zsh-navigation-tools/README.md
index 9fd2d5414..bdbfac976 100644
--- a/plugins/zsh-navigation-tools/README.md
+++ b/plugins/zsh-navigation-tools/README.md
@@ -3,11 +3,25 @@
 ![ZSH 5.0.0](https://img.shields.io/badge/zsh-v5.0.0-orange.svg?style=flat-square)
 [![Gitter][gitter-image]][gitter-link]
 
-![znt logo](http://imageshack.com/a/img905/2629/WK9qjN.png)
+![znt logo](https://imageshack.com/a/img905/2629/WK9qjN.png)
 
 # Zsh Navigation Tools
 
-Also check out [![ZCA](http://imageshack.com/a/img911/8084/qSpO8a.png) Zsh Command Architect](https://github.com/zdharma-continuum/zsh-cmd-architect)
+Set of tools like `n-history` – multi-word history searcher, `n-cd` – directory
+bookmark manager, `n-kill` – `htop` like kill utility, and more. Based on
+`n-list`, a tool generating selectable curses-based list of elements that has
+access to current `Zsh` session, i.e. has broad capabilities to work together
+with it. Feature highlights include incremental multi-word searching, approximate
+matching, ANSI coloring, themes, unique mode, horizontal scroll, grepping, advanced
+history management and various integrations with `Zsh`.
+
+To use it, add `zsh-navigation-tools` to the plugins array in your zshrc file:
+
+```zsh
+plugins=(... zsh-navigation-tools)
+```
+
+Also check out [![ZCA](https://imageshack.com/a/img911/8084/qSpO8a.png) Zsh Command Architect](https://github.com/zdharma-continuum/zsh-cmd-architect)
 and [Zconvey](https://github.com/zdharma-continuum/zconvey)
 
 
@@ -18,189 +32,10 @@ Videos:
 
 Screenshots:
 
-![n-history](http://imageshack.com/a/img921/5046/bqr0mk.png)
+![n-history](https://imageshack.com/a/img921/5046/bqr0mk.png)
 
-![n-history](http://imageshack.com/a/img633/9905/WzfSdl.gif)
+![n-history](https://imageshack.com/a/img633/9905/WzfSdl.gif)
 
-Set of tools like `n-history` – multi-word history searcher, `n-cd` – directory
-bookmark manager, `n-kill` – `htop` like kill utility, and more. Based on
-`n-list`, a tool generating selectable curses-based list of elements that has
-access to current `Zsh` session, i.e. has broad capabilities to work together
-with it. Feature highlights include incremental multi-word searching, approximate
-matching, ANSI coloring, themes, unique mode, horizontal scroll, grepping, advanced
-history management and various integrations with `Zsh`.
-
-## News
-* 06-10-2016
-  - **Tmux-integration** – `Ctrl-B H` in Tmux to open `n-history` in new window.
-    Then select history entry, it will be copied to the original Tmux window.
-    Use this to execute local commands on remote hosts:
-
-    ![tmux integration](http://imageshack.com/a/img922/4760/oyX7eN.gif)
-
-    All that is needed is this line added to `~/.tmux.conf`:
-
-    ```
-    bind h run-shell -b "$ZNT_REPO_DIR/doc/znt-tmux.zsh"
-    ```
-
-    or – if Homebrew or other package manager is used:
-
-    ```
-    bind h run-shell -b "$ZNT_REPO_DIR/znt-tmux.zsh"
-    ```
-
-* 16-05-2016
-  - `n-kill` has completion. It proposes **words** from what's in `ps -A`. Giving `n-kill`
-    arguments means grepping – it will start only with matching `ps` entries.
-
-* 15-05-2016
-  - Fixed problem where zsh-syntax-highlighting could render `n-history` slow (for
-    long history entries).
-
-* 14-05-2016
-  - Configuration can be set from `zshrc` (starting from `v2.1.12`). Documentation is [below](#configuration). Example:
-
-    ```zsh
-    znt_list_instant_select=1
-    znt_list_border=0
-    znt_list_bold=1
-    znt_list_colorpair="green/black"
-    znt_functions_keywords=( "zplg" "zgen" "match" )
-    znt_cd_active_text="underline"
-    znt_env_nlist_coloring_color=$'\x1b[00;33m'
-    znt_cd_hotlist=( "~/.config/znt" "/usr/share/zsh/site-functions" "/usr/share/zsh"
-                     "/usr/local/share/zsh/site-functions" "/usr/local/share/zsh"
-                     "/usr/local/bin" )
-    ```
-
-* 10-05-2016
-  - Search query rotation – use `Ctrl-A` to rotate entered words right.
-    Words `1 2 3` become `3 1 2`.
-
-* 09-05-2016
-  - New feature: n-help tool, available also from n-history via `H` key. It
-    displays help screen with various information on `ZNT`.
-
-    ![n-help](http://imageshack.com/a/img922/7595/MvtJdI.gif)
-
-* 08-05-2016
-  - Approximate matching – pressing `f` or `Ctrl-F` will enter "`FIX`" mode,
-    in which `1` or `2` errors are allowed in what's searched. This utilizes
-    original Zsh approximate matching features and is intended to be used
-    after entering search query, when a typo is discovered.
-
-    ![fix mode](http://imageshack.com/a/img921/5756/64lFnv.gif)
-
-* 06-05-2016
-  - Private history can be edited. Use `e` key or `Ctrl-E` for that when in
-    n-history. Your `$EDITOR` will start. This is a way to have handy set of
-    bookmarks prepared in private history's file.
-  - Border can be disabled. Use following snippet in `~/.config/znt/n-list.conf`
-    or any other tool-targetted config file:
-
-    ```zsh
-    # Should draw the border?
-    local border=0
-    ```
-
-* 30-04-2016
-  - New feature: color themes. Use `Ctrl-T` and `Ctrl-G` to browse predefined
-    themes. They are listed in [~/.config/znt/n-list.conf](https://github.com/zdharma-continuum/zsh-navigation-tools/blob/master/.config/znt/n-list.conf).
-    Use the file to permanently set a color scheme. Also, I sent a patch to Zsh developers
-    and starting from Zsh > 5.2 (not yet released) supported will be 256 colors.
-    The file [~/.config/znt/n-list.conf](https://github.com/zdharma-continuum/zsh-navigation-tools/blob/master/.config/znt/n-list.conf)
-    already has set of 256-color themes prepared :)
-
-    ![themes](http://imageshack.com/a/img924/4310/EbRh30.gif)
-
-* 29-04-2016
-  - New feature: private history – n-history tracks selected history entries,
-    exposes them via new view (activated with `F1`). It is shared across all
-    sessions
-
-* 28-04-2016
-  - New features:
-    1. New n-history view (activated with `F1`): Most Frequent History Words
-    2. Predefined search keywords – use F2 to quickly search for chosen
-       keywords (video: [https://youtu.be/DN9QqssAYB8](https://youtu.be/DN9QqssAYB8))
-    3. Configuration option for doing instant selection in search mode
-
-## Installation
-
-```
-sh -c "$(curl -fsSL https://raw.githubusercontent.com/zdharma-continuum/zsh-navigation-tools/master/doc/install.sh)"
-```
-
-To update run the command again.
-
-`ZNT` will be installed at `~/.config/znt/zsh-navigation-tools`, config files will be copied to `~/.config/znt`. `.zshrc`
-will be updated with only `8` lines of code, which will be added at the bottom.
-
-After installing and reloading shell give `ZNT` a quick try with `Ctrl-R` – this keyboard shortcut will open `n-history`.
-
-## Installation With [Zinit](https://github.com/zdharma-continuum/zinit)
-Add `zinit load zdharma-continuum/zsh-navigation-tools` to `.zshrc`. The config files will be in `~/.config/znt`.
-
-## Installation With Zgenom/Zgen
-
-Add `zgen load zdharma-continuum/zsh-navigation-tools` to `.zshrc` and issue a `zgen reset` (this assumes that there is a proper `zgen save` construct in `.zshrc`).
-The config files will be available in `~/.config/znt`.
-
-## Installation With Antigen
-Add `antigen bundle zdharma-continuum/zsh-navigation-tools` to `.zshrc`. There also
-should be `antigen apply`. The config files will be in `~/.config/znt`.
-
-## Single File Manual Installation
-
-Running script `doc/generate_single_file` will create single-file version of `ZNT`.
-It can be sourced from `.zshrc`. Don't forget about configuration files as described
-above.
-
-## Manual Installation
-
-After extracting `ZNT` to `{some-directory}` add following two lines
-to `~/.zshrc`:
-
-```zsh
-fpath+=( {some-directory} )
-source "{some-directory}/zsh-navigation-tools.plugin.zsh"
-```
-
-As you can see, no plugin manager is needed to use the `*.plugin.zsh`
-file. The above two lines of code are all that almost **all** plugin
-managers do. In fact, what's actually needed is only:
-
-```zsh
-source "{some-directory}/zsh-navigation-tools.plugin.zsh"
-```
-
-because `ZNT` detects if it is used by **any** plugin manager and can
-handle `$fpath` update by itself.
-
-## Truly Manual Installation
-Copy (or link) all `n-*` and `znt-*` files to **/usr/share/zsh/site-functions/**
-(or **/usr/local/share/zsh/site-functions/**, check with `echo $fpath[1]`) and then add:
-
-    autoload n-list n-cd n-env n-kill n-panelize n-options n-aliases n-functions n-history n-help
-
-to `~/.zshrc`.
-
-Create aliases to avoid typing of the minus sign "-":
-
-```zsh
-alias naliases=n-aliases ncd=n-cd nenv=n-env nfunctions=n-functions nhistory=n-history
-alias nkill=n-kill noptions=n-options npanelize=n-panelize nhelp=n-help
-```
-
-Don't forget to copy [configuration files](https://github.com/zdharma-continuum/zsh-navigation-tools/tree/master/.config/znt). They should go to `~/.config/znt`. Moreover, `n-cd` works together with option `AUTO_PUSHD` and you should have:
-
-```zsh
-setopt AUTO_PUSHD
-```
-
-in `.zshrc` (also recommend `PUSHD_IGNORE_DUPS`). Without the option `n-cd`
-will just work as incremental searcher of directory bookmarks.
 
 ## History Widget
 

From 9c01dbc30bdfedebb986190309106d01d49f9851 Mon Sep 17 00:00:00 2001
From: vladislav doster <mvdoster@gmail.com>
Date: Fri, 31 Dec 2021 01:55:01 -0600
Subject: [PATCH 715/869] chore(python): minor corrections on README (#10548)

Closes #10548
---
 plugins/python/README.md | 25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/plugins/python/README.md b/plugins/python/README.md
index 4968cca6d..c1f0adef8 100644
--- a/plugins/python/README.md
+++ b/plugins/python/README.md
@@ -1,8 +1,8 @@
-# python plugin
+# Python plugin
 
-The plugin adds several aliases for useful [python](https://www.python.org/) commands.
+The plugin adds several aliases for useful [Python](https://www.python.org/) commands.
 
-To use it, add `python` to the plugins array of your zshrc file:
+To use it, add `python` to the plugins array in your zshrc file:
 
 ```zsh
 plugins=(... python)
@@ -10,16 +10,15 @@ plugins=(... python)
 
 ## Aliases
 
-<<<<<<< HEAD
-| Command          | Description                                                                           |
-| ---------------- | ------------------------------------------------------------------------------------- |
-| `py`             | Runs `python`                                                                         |
-| `ipython`        | Runs the appropriate `ipython` version according to the activated virtualenv          |
-| `pyfind`         | Finds .py files recursively in the current directory                                  |
-| `pyclean [dirs]` | Deletes byte-code and cache files from a list of directories or the current one       |
-| `pygrep <text>`  | Looks for `text` in .py files                                                         |
-| `pyuserpaths`    | Add --user site-packages to PYTHONPATH, for all installed python versions.            |
-| `pyserver`       | Starts an http.server on the current directory. Use `--directory` for a different one |
+| Command          | Description                                                                            |
+| ---------------- | -------------------------------------------------------------------------------------- |
+| `py`             | Runs `python`                                                                          |
+| `ipython`        | Runs the appropriate `ipython` version according to the activated virtualenv           |
+| `pyfind`         | Finds .py files recursively in the current directory                                   |
+| `pyclean [dirs]` | Deletes byte-code and cache files from a list of directories or the current one        |
+| `pygrep <text>`  | Looks for `text` in `*.py` files in the current directory, recursively                 |
+| `pyuserpaths`    | Add user site-packages folders to `PYTHONPATH`, for Python 2 and 3                     |
+| `pyserver`       | Starts an HTTP server on the current directory (use `--directory` for a different one) |
 
 ## Virtual environments
 

From 78c91ccbf99c77bd4d9cdb74279a40776721f66d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Fri, 31 Dec 2021 20:45:12 +0100
Subject: [PATCH 716/869] style(python): fix code style and some hidden bugs

---
 plugins/python/python.plugin.zsh | 49 +++++++++++++++-----------------
 1 file changed, 23 insertions(+), 26 deletions(-)

diff --git a/plugins/python/python.plugin.zsh b/plugins/python/python.plugin.zsh
index 6c7fc6cbb..7a73ab92a 100644
--- a/plugins/python/python.plugin.zsh
+++ b/plugins/python/python.plugin.zsh
@@ -7,40 +7,37 @@ alias pyfind='find . -name "*.py"'
 # Remove python compiled byte-code and mypy/pytest cache in either the current
 # directory or in a list of specified directories (including sub directories).
 function pyclean() {
-    ZSH_PYCLEAN_PLACES=${*:-'.'}
-    find ${ZSH_PYCLEAN_PLACES} -type f -name "*.py[co]" -delete
-    find ${ZSH_PYCLEAN_PLACES} -type d -name "__pycache__" -delete
-    find ${ZSH_PYCLEAN_PLACES} -depth -type d -name ".mypy_cache" -exec rm -r "{}" +
-    find ${ZSH_PYCLEAN_PLACES} -depth -type d -name ".pytest_cache" -exec rm -r "{}" +
+  find "${@:-.}" -type f -name "*.py[co]" -delete
+  find "${@:-.}" -type d -name "__pycache__" -delete
+  find "${@:-.}" -depth -type d -name ".mypy_cache" -exec rm -r "{}" +
+  find "${@:-.}" -depth -type d -name ".pytest_cache" -exec rm -r "{}" +
 }
 
 # Add the user installed site-packages paths to PYTHONPATH, only if the
 #   directory exists. Also preserve the current PYTHONPATH value.
 # Feel free to autorun this when .zshrc loads.
 function pyuserpaths() {
-    local targets=("python2" "python3")  # bins
-    
-    # Get existing interpreters.
-    local interps=()
-    for target in $targets; do
-        [ `command -v $target` ] && interps+=($target)
-    done
+  setopt localoptions extendedglob
 
-    # Check for a non-standard install directory.
-    local user_base="${HOME}/.local"
-    [ $PYTHONUSERBASE ] && user_base=$PYTHONUSERBASE
+  # Check for a non-standard install directory.
+  local user_base="${PYTHONUSERBASE:-"${HOME}/.local"}"
 
-    # Add version specific paths, if:
-    #   it exists in the filesystem;
-    #   it isn't in PYTHONPATH already.
-    for interp in $interps; do
-        # Get minor release version.
-        local ver=`$interp -V 2>&1`
-        ver=`echo ${ver:7} | cut -d '.' -f 1,2`  # The patch version is variable length, truncate it.
-        
-        local site_pkgs="${user_base}/lib/python${ver}/site-packages"
-        [[ -d $site_pkgs && ! $PYTHONPATH =~ $site_pkgs ]] && export PYTHONPATH=${site_pkgs}:$PYTHONPATH
-    done
+  local python version site_pkgs
+  for python in python2 python3; do
+    # Check if command exists
+    (( ${+commands[$python]} )) || continue
+
+    # Get minor release version.
+    # The patch version is variable length, truncate it.
+    version=${(M)${"$($python -V 2>&1)":7}#[^.]##.[^.]##}
+
+    # Add version specific path, if:
+    # - it exists in the filesystem
+    # - it isn't in $PYTHONPATH already.
+    site_pkgs="${user_base}/lib/python${version}/site-packages"
+    [[ -d "$site_pkgs" && ! "$PYTHONPATH" =~ (^|:)"$site_pkgs"(:|$) ]] || continue
+    export PYTHONPATH="${site_pkgs}${PYTHONPATH+":${PYTHONPATH}"}"
+  done
 }
 
 # Grep among .py files

From d1c07f9569f4f7bb90345ccc363d71a8b8507687 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Sun, 2 Jan 2022 02:30:00 +0100
Subject: [PATCH 717/869] chore: add Projects Beta GitHub Action

---
 .github/workflows/project.yml | 134 ++++++++++++++++++++++++++++++++++
 1 file changed, 134 insertions(+)
 create mode 100644 .github/workflows/project.yml

diff --git a/.github/workflows/project.yml b/.github/workflows/project.yml
new file mode 100644
index 000000000..ba3e115c9
--- /dev/null
+++ b/.github/workflows/project.yml
@@ -0,0 +1,134 @@
+name: Project tracking
+on:
+  issues:
+    types: [opened]
+  pull_request_target:
+    types: [opened, synchronize]
+
+jobs:
+  add-to-project:
+    name: Add to project
+    runs-on: ubuntu-latest
+    steps:
+      - name: Generate token
+        id: generate_token
+        uses: tibdex/github-app-token@36464acb844fc53b9b8b2401da68844f6b05ebb0
+        with:
+          app_id: ${{ secrets.OHMYZSH_BOT_APP_ID }}
+          private_key: ${{ secrets.OHMYZSH_BOT_APP_PEM }}
+      - name: Read project data
+        env:
+          GITHUB_TOKEN: ${{ steps.generate_token.outputs.token }}
+          ORGANIZATION: ohmyzsh
+          PROJECT_NUMBER: "1"
+        run: |
+          # Get Project data
+          gh api graphql -f query='
+            query($org: String!, $number: Int!) {
+              organization(login: $org){
+                projectNext(number: $number) {
+                  id
+                  fields(first:20) {
+                    nodes {
+                      id
+                      name
+                    }
+                  }
+                }
+              }
+            }
+          ' -f org=$ORGANIZATION -F number=$PROJECT_NUMBER > project_data.json
+
+          # Parse project data
+          cat >> $GITHUB_ENV <<EOF
+          PROJECT_ID=$(jq '.data.organization.projectNext.id' project_data.json)
+          PLUGIN_FIELD_ID=$(jq '.data.organization.projectNext.fields.nodes[] | select(.name == "Plugin") | .id' project_data.json)
+          THEME_FIELD_ID=$(jq '.data.organization.projectNext.fields.nodes[] | select(.name == "Theme") | .id' project_data.json)
+          EOF
+      - name: Add to project
+        env:
+          GITHUB_TOKEN: ${{ steps.generate_token.outputs.token }}
+          ISSUE_ID: ${{ github.event.issue.node_id }}
+          PR_ID: ${{ github.event.pull_request.node_id }}
+        run: |
+          item_id="$(gh api graphql -f query='
+            mutation($project: ID!, $item: ID!) {
+              addProjectNextItem(input: {projectId: $project, contentId: $item}) {
+                projectNextItem {
+                  id
+                }
+              }
+            }
+          ' -f project=$PROJECT_ID -f item=${ISSUE_ID:-$PR_ID} --jq '.data.addProjectNextItem.projectNextItem.id')"
+
+          echo "ITEM_ID=$item_id" >> $GITHUB_ENV
+      - name: Classify Pull Request
+        if: github.event_name == 'pull_request_target'
+        env:
+          GITHUB_TOKEN: ${{ steps.generate_token.outputs.token }}
+        run: |
+          gh pr view ${{ github.event.pull_request.number }} --json files --jq '.files.[].path' | awk -F/ '
+            /^plugins\// {
+              plugins[$2] = 1
+            }
+            /^themes\// {
+              gsub(/\.zsh-theme$/, "", $2)
+              themes[$2] = 1
+            }
+            END {
+              for (plugin in plugins) {
+                print plugin >> "plugins.list"
+              }
+              for (theme in themes) {
+                print theme >> "themes.list"
+              }
+            }
+          '
+          # If only one plugin is modified, add it to the plugin field
+          if [[ $(wc -l < plugins.list) = 1 ]]; then
+            echo "PLUGIN=$(cat plugins.list)" >> $GITHUB_ENV
+          fi
+          # If only one theme is modified, add it to the theme field
+          if [[ $(wc -l < themes.list) = 1 ]]; then
+            echo "THEME=$(cat themes.list)" >> $GITHUB_ENV
+          fi
+      - name: Fill Pull Request fields in project
+        if: github.event_name == 'pull_request_target'
+        env:
+          GITHUB_TOKEN: ${{ steps.generate_token.outputs.token }}
+        run: |
+          gh api graphql -f query='
+            mutation (
+              $project: ID!
+              $item: ID!
+              $plugin_field: ID!
+              $plugin_value: String!
+              $theme_field: ID!
+              $theme_value: String!
+            ) {
+              set_plugin: updateProjectNextItemField(input: {
+                projectId: $project
+                itemId: $item
+                fieldId: $plugin_field
+                value: $plugin_value
+              }) {
+                projectNextItem {
+                  id
+                }
+              }
+              set_theme: updateProjectNextItemField(input: {
+                projectId: $project
+                itemId: $item
+                fieldId: $theme_field
+                value: $theme_value
+              }) {
+                projectNextItem {
+                  id
+                }
+              }
+            }
+          ' -f project=$PROJECT_ID -f item=$ITEM_ID \
+            -f plugin_field=$PLUGIN_FIELD_ID -f plugin_value=$PLUGIN \
+            -f theme_field=$THEME_FIELD_ID -f theme_value=$THEME \
+            --silent
+

From 95a66532d17181693b828bda95f4261e5421b409 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Sun, 2 Jan 2022 03:09:52 +0100
Subject: [PATCH 718/869] chore: use GITHUB_TOKEN auth for Project Beta GitHub
 Action

---
 .github/workflows/project.yml | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/project.yml b/.github/workflows/project.yml
index ba3e115c9..2b3cc732f 100644
--- a/.github/workflows/project.yml
+++ b/.github/workflows/project.yml
@@ -10,15 +10,9 @@ jobs:
     name: Add to project
     runs-on: ubuntu-latest
     steps:
-      - name: Generate token
-        id: generate_token
-        uses: tibdex/github-app-token@36464acb844fc53b9b8b2401da68844f6b05ebb0
-        with:
-          app_id: ${{ secrets.OHMYZSH_BOT_APP_ID }}
-          private_key: ${{ secrets.OHMYZSH_BOT_APP_PEM }}
       - name: Read project data
         env:
-          GITHUB_TOKEN: ${{ steps.generate_token.outputs.token }}
+          GITHUB_TOKEN: ${{ secrets.PROJECT_TOKEN }}
           ORGANIZATION: ohmyzsh
           PROJECT_NUMBER: "1"
         run: |
@@ -45,9 +39,10 @@ jobs:
           PLUGIN_FIELD_ID=$(jq '.data.organization.projectNext.fields.nodes[] | select(.name == "Plugin") | .id' project_data.json)
           THEME_FIELD_ID=$(jq '.data.organization.projectNext.fields.nodes[] | select(.name == "Theme") | .id' project_data.json)
           EOF
+
       - name: Add to project
         env:
-          GITHUB_TOKEN: ${{ steps.generate_token.outputs.token }}
+          GITHUB_TOKEN: ${{ secrets.PROJECT_TOKEN }}
           ISSUE_ID: ${{ github.event.issue.node_id }}
           PR_ID: ${{ github.event.pull_request.node_id }}
         run: |
@@ -62,10 +57,11 @@ jobs:
           ' -f project=$PROJECT_ID -f item=${ISSUE_ID:-$PR_ID} --jq '.data.addProjectNextItem.projectNextItem.id')"
 
           echo "ITEM_ID=$item_id" >> $GITHUB_ENV
+
       - name: Classify Pull Request
         if: github.event_name == 'pull_request_target'
         env:
-          GITHUB_TOKEN: ${{ steps.generate_token.outputs.token }}
+          GITHUB_TOKEN: ${{ secrets.PROJECT_TOKEN }}
         run: |
           gh pr view ${{ github.event.pull_request.number }} --json files --jq '.files.[].path' | awk -F/ '
             /^plugins\// {
@@ -92,10 +88,11 @@ jobs:
           if [[ $(wc -l < themes.list) = 1 ]]; then
             echo "THEME=$(cat themes.list)" >> $GITHUB_ENV
           fi
+
       - name: Fill Pull Request fields in project
         if: github.event_name == 'pull_request_target'
         env:
-          GITHUB_TOKEN: ${{ steps.generate_token.outputs.token }}
+          GITHUB_TOKEN: ${{ secrets.PROJECT_TOKEN }}
         run: |
           gh api graphql -f query='
             mutation (

From 1d35b30461b2cc9a31330ff4e96cc5f97f76fb22 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Sun, 2 Jan 2022 03:17:40 +0100
Subject: [PATCH 719/869] chore: fix auth in Project tracking Action

---
 .github/workflows/project.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/project.yml b/.github/workflows/project.yml
index 2b3cc732f..c25fd2e22 100644
--- a/.github/workflows/project.yml
+++ b/.github/workflows/project.yml
@@ -16,6 +16,8 @@ jobs:
           ORGANIZATION: ohmyzsh
           PROJECT_NUMBER: "1"
         run: |
+          gh auth login --with-token ${{ env.GITHUB_TOKEN }}
+
           # Get Project data
           gh api graphql -f query='
             query($org: String!, $number: Int!) {

From 861e7e24a356ac571af2f362275ddfbac4be69ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Sun, 2 Jan 2022 03:19:46 +0100
Subject: [PATCH 720/869] chore: please work

---
 .github/workflows/project.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/project.yml b/.github/workflows/project.yml
index c25fd2e22..1e66efda8 100644
--- a/.github/workflows/project.yml
+++ b/.github/workflows/project.yml
@@ -16,7 +16,7 @@ jobs:
           ORGANIZATION: ohmyzsh
           PROJECT_NUMBER: "1"
         run: |
-          gh auth login --with-token ${{ env.GITHUB_TOKEN }}
+          gh auth login
 
           # Get Project data
           gh api graphql -f query='

From 17c52ccfc9b06d45f041b24af35d1804d645620f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Sun, 2 Jan 2022 03:27:25 +0100
Subject: [PATCH 721/869] chore: look ma no auth!

---
 .github/workflows/project.yml | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/.github/workflows/project.yml b/.github/workflows/project.yml
index 1e66efda8..7559060d5 100644
--- a/.github/workflows/project.yml
+++ b/.github/workflows/project.yml
@@ -12,12 +12,9 @@ jobs:
     steps:
       - name: Read project data
         env:
-          GITHUB_TOKEN: ${{ secrets.PROJECT_TOKEN }}
           ORGANIZATION: ohmyzsh
           PROJECT_NUMBER: "1"
         run: |
-          gh auth login
-
           # Get Project data
           gh api graphql -f query='
             query($org: String!, $number: Int!) {
@@ -44,7 +41,6 @@ jobs:
 
       - name: Add to project
         env:
-          GITHUB_TOKEN: ${{ secrets.PROJECT_TOKEN }}
           ISSUE_ID: ${{ github.event.issue.node_id }}
           PR_ID: ${{ github.event.pull_request.node_id }}
         run: |
@@ -62,8 +58,6 @@ jobs:
 
       - name: Classify Pull Request
         if: github.event_name == 'pull_request_target'
-        env:
-          GITHUB_TOKEN: ${{ secrets.PROJECT_TOKEN }}
         run: |
           gh pr view ${{ github.event.pull_request.number }} --json files --jq '.files.[].path' | awk -F/ '
             /^plugins\// {
@@ -93,8 +87,6 @@ jobs:
 
       - name: Fill Pull Request fields in project
         if: github.event_name == 'pull_request_target'
-        env:
-          GITHUB_TOKEN: ${{ secrets.PROJECT_TOKEN }}
         run: |
           gh api graphql -f query='
             mutation (

From dd7f0f22111bff8145c46f9638c0c95cbc143ce3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Sun, 2 Jan 2022 03:32:07 +0100
Subject: [PATCH 722/869] chore: let's try again

---
 .github/workflows/project.yml | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/project.yml b/.github/workflows/project.yml
index 7559060d5..0fe897587 100644
--- a/.github/workflows/project.yml
+++ b/.github/workflows/project.yml
@@ -12,11 +12,12 @@ jobs:
     steps:
       - name: Read project data
         env:
+          GITHUB_TOKEN: ${{ secrets.PROJECT_TOKEN }}
           ORGANIZATION: ohmyzsh
           PROJECT_NUMBER: "1"
         run: |
           # Get Project data
-          gh api graphql -f query='
+          GITHUB_TOKEN=$GITHUB_TOKEN gh api graphql -f query='
             query($org: String!, $number: Int!) {
               organization(login: $org){
                 projectNext(number: $number) {
@@ -41,6 +42,7 @@ jobs:
 
       - name: Add to project
         env:
+          GITHUB_TOKEN: ${{ secrets.PROJECT_TOKEN }}
           ISSUE_ID: ${{ github.event.issue.node_id }}
           PR_ID: ${{ github.event.pull_request.node_id }}
         run: |
@@ -58,6 +60,8 @@ jobs:
 
       - name: Classify Pull Request
         if: github.event_name == 'pull_request_target'
+        env:
+          GITHUB_TOKEN: ${{ secrets.PROJECT_TOKEN }}
         run: |
           gh pr view ${{ github.event.pull_request.number }} --json files --jq '.files.[].path' | awk -F/ '
             /^plugins\// {
@@ -87,6 +91,8 @@ jobs:
 
       - name: Fill Pull Request fields in project
         if: github.event_name == 'pull_request_target'
+        env:
+          GITHUB_TOKEN: ${{ secrets.PROJECT_TOKEN }}
         run: |
           gh api graphql -f query='
             mutation (

From 121ee818a52b6c88fa4b7ae993ad15a27dc99038 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Sun, 2 Jan 2022 03:37:05 +0100
Subject: [PATCH 723/869] chore: I'm dumb af

---
 .github/workflows/project.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/project.yml b/.github/workflows/project.yml
index 0fe897587..2b3cc732f 100644
--- a/.github/workflows/project.yml
+++ b/.github/workflows/project.yml
@@ -17,7 +17,7 @@ jobs:
           PROJECT_NUMBER: "1"
         run: |
           # Get Project data
-          GITHUB_TOKEN=$GITHUB_TOKEN gh api graphql -f query='
+          gh api graphql -f query='
             query($org: String!, $number: Int!) {
               organization(login: $org){
                 projectNext(number: $number) {

From 9dd1dc49d92da4641e83057099691a22ebd52bd8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Mon, 3 Jan 2022 12:32:37 +0100
Subject: [PATCH 724/869] chore: simplify `GITHUB_TOKEN` env in project GitHub
 Action

---
 .github/workflows/project.yml | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/project.yml b/.github/workflows/project.yml
index 2b3cc732f..6968e5ad4 100644
--- a/.github/workflows/project.yml
+++ b/.github/workflows/project.yml
@@ -9,10 +9,11 @@ jobs:
   add-to-project:
     name: Add to project
     runs-on: ubuntu-latest
+    env:
+      GITHUB_TOKEN: ${{ secrets.PROJECT_TOKEN }}
     steps:
       - name: Read project data
         env:
-          GITHUB_TOKEN: ${{ secrets.PROJECT_TOKEN }}
           ORGANIZATION: ohmyzsh
           PROJECT_NUMBER: "1"
         run: |
@@ -42,7 +43,6 @@ jobs:
 
       - name: Add to project
         env:
-          GITHUB_TOKEN: ${{ secrets.PROJECT_TOKEN }}
           ISSUE_ID: ${{ github.event.issue.node_id }}
           PR_ID: ${{ github.event.pull_request.node_id }}
         run: |
@@ -60,8 +60,6 @@ jobs:
 
       - name: Classify Pull Request
         if: github.event_name == 'pull_request_target'
-        env:
-          GITHUB_TOKEN: ${{ secrets.PROJECT_TOKEN }}
         run: |
           gh pr view ${{ github.event.pull_request.number }} --json files --jq '.files.[].path' | awk -F/ '
             /^plugins\// {
@@ -91,8 +89,6 @@ jobs:
 
       - name: Fill Pull Request fields in project
         if: github.event_name == 'pull_request_target'
-        env:
-          GITHUB_TOKEN: ${{ secrets.PROJECT_TOKEN }}
         run: |
           gh api graphql -f query='
             mutation (

From 512839ef7800fa32d78c47f160bdae3293ad22c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Mon, 3 Jan 2022 13:02:28 +0100
Subject: [PATCH 725/869] chore: simplify project GitHub Action

---
 .github/workflows/project.yml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/project.yml b/.github/workflows/project.yml
index 6968e5ad4..013255890 100644
--- a/.github/workflows/project.yml
+++ b/.github/workflows/project.yml
@@ -43,8 +43,7 @@ jobs:
 
       - name: Add to project
         env:
-          ISSUE_ID: ${{ github.event.issue.node_id }}
-          PR_ID: ${{ github.event.pull_request.node_id }}
+          ISSUE_OR_PR_ID: ${{ github.event.issue.node_id || github.event.pull_request.node_id }}
         run: |
           item_id="$(gh api graphql -f query='
             mutation($project: ID!, $item: ID!) {
@@ -54,7 +53,7 @@ jobs:
                 }
               }
             }
-          ' -f project=$PROJECT_ID -f item=${ISSUE_ID:-$PR_ID} --jq '.data.addProjectNextItem.projectNextItem.id')"
+          ' -f project=$PROJECT_ID -f item=$ISSUE_OR_PR_ID --jq '.data.addProjectNextItem.projectNextItem.id')"
 
           echo "ITEM_ID=$item_id" >> $GITHUB_ENV
 

From 63345c4e5dd8ce210a43c9e89a883a262e755c69 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Mon, 3 Jan 2022 13:10:53 +0100
Subject: [PATCH 726/869] ci: disable GitHub Actions on forks

---
 .github/workflows/main.yml    | 1 +
 .github/workflows/project.yml | 1 +
 2 files changed, 2 insertions(+)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 7ab7efdd6..cdadc1434 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -14,6 +14,7 @@ jobs:
   tests:
     name: Run tests
     runs-on: ${{ matrix.os }}
+    if: github.repository == 'ohmyzsh/ohmyzsh'
     strategy:
       matrix:
         os: [ubuntu-latest, macos-latest]
diff --git a/.github/workflows/project.yml b/.github/workflows/project.yml
index 013255890..2a27b70fc 100644
--- a/.github/workflows/project.yml
+++ b/.github/workflows/project.yml
@@ -9,6 +9,7 @@ jobs:
   add-to-project:
     name: Add to project
     runs-on: ubuntu-latest
+    if: github.repository == 'ohmyzsh/ohmyzsh'
     env:
       GITHUB_TOKEN: ${{ secrets.PROJECT_TOKEN }}
     steps:

From 596cef84c75261398fe66f713d97d5ca96130146 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Thu, 16 Dec 2021 10:07:35 +0100
Subject: [PATCH 727/869] style(svn-fast-info): fix code style and `svn info`
 locale

---
 .../svn-fast-info/svn-fast-info.plugin.zsh    | 34 +++++++++----------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/plugins/svn-fast-info/svn-fast-info.plugin.zsh b/plugins/svn-fast-info/svn-fast-info.plugin.zsh
index f40a59685..f2f449f79 100644
--- a/plugins/svn-fast-info/svn-fast-info.plugin.zsh
+++ b/plugins/svn-fast-info/svn-fast-info.plugin.zsh
@@ -1,6 +1,6 @@
 function svn_prompt_info() {
   local info
-  info=$(svn info 2>&1) || return 1 # capture stdout and stderr
+  info=$(LANG= svn info 2>&1) || return 1 # capture stdout and stderr
   local repo_need_upgrade=$(svn_repo_need_upgrade $info)
 
   if [[ -n $repo_need_upgrade ]]; then
@@ -31,7 +31,7 @@ function svn_prompt_info() {
 }
 
 function svn_repo_need_upgrade() {
-  grep -q "E155036" <<< "${1:-$(svn info 2> /dev/null)}" && \
+  command grep -q "E155036" <<< "${1:-$(LANG= svn info 2>/dev/null)}" && \
     echo "E155036: upgrade repo with svn upgrade"
 }
 
@@ -40,33 +40,33 @@ function svn_current_branch_name() {
 }
 
 function svn_repo_root_name() {
-  grep '^Repository\ Root:' <<< "${1:-$(svn info 2> /dev/null)}" | sed 's#.*/##'
+  command grep '^Repository\ Root:' <<< "${1:-$(LANG= svn info 2>/dev/null)}" | sed 's#.*/##'
 }
 
 function svn_current_revision() {
-  echo "${1:-$(svn info 2> /dev/null)}" | sed -n 's/Revision: //p'
+  echo "${1:-$(LANG= svn info 2>/dev/null)}" | sed -n 's/Revision: //p'
 }
 
 function svn_status_info() {
   local svn_status_string="$ZSH_THEME_SVN_PROMPT_CLEAN"
-  local svn_status="$(svn status 2> /dev/null)";
-  if command grep -E '^\s*A' &> /dev/null <<< $svn_status; then
-    svn_status_string="$svn_status_string${ZSH_THEME_SVN_PROMPT_ADDITIONS:-+}"
+  local svn_status="$(svn status 2>/dev/null)";
+  if command grep -E '^\s*A' &>/dev/null <<< "$svn_status"; then
+    svn_status_string+="${ZSH_THEME_SVN_PROMPT_ADDITIONS:-+}"
   fi
-  if command grep -E '^\s*D' &> /dev/null <<< $svn_status; then
-    svn_status_string="$svn_status_string${ZSH_THEME_SVN_PROMPT_DELETIONS:-✖}"
+  if command grep -E '^\s*D' &>/dev/null <<< "$svn_status"; then
+    svn_status_string+="${ZSH_THEME_SVN_PROMPT_DELETIONS:-✖}"
   fi
-  if command grep -E '^\s*M' &> /dev/null <<< $svn_status; then
-    svn_status_string="$svn_status_string${ZSH_THEME_SVN_PROMPT_MODIFICATIONS:-✎}"
+  if command grep -E '^\s*M' &>/dev/null <<< "$svn_status"; then
+    svn_status_string+="${ZSH_THEME_SVN_PROMPT_MODIFICATIONS:-✎}"
   fi
-  if command grep -E '^\s*[R~]' &> /dev/null <<< $svn_status; then
-    svn_status_string="$svn_status_string${ZSH_THEME_SVN_PROMPT_REPLACEMENTS:-∿}"
+  if command grep -E '^\s*[R~]' &>/dev/null <<< "$svn_status"; then
+    svn_status_string+="${ZSH_THEME_SVN_PROMPT_REPLACEMENTS:-∿}"
   fi
-  if command grep -E '^\s*\?' &> /dev/null <<< $svn_status; then
-    svn_status_string="$svn_status_string${ZSH_THEME_SVN_PROMPT_UNTRACKED:-?}"
+  if command grep -E '^\s*\?' &>/dev/null <<< "$svn_status"; then
+    svn_status_string+="${ZSH_THEME_SVN_PROMPT_UNTRACKED:-?}"
   fi
-  if command grep -E '^\s*[CI!L]' &> /dev/null <<< $svn_status; then
-    svn_status_string="$svn_status_string${ZSH_THEME_SVN_PROMPT_DIRTY:-!}"
+  if command grep -E '^\s*[CI!L]' &>/dev/null <<< "$svn_status"; then
+    svn_status_string+="${ZSH_THEME_SVN_PROMPT_DIRTY:-!}"
   fi
   echo $svn_status_string
 }

From ef3a85cd42c671217a0bcb58685484a5a5a0ada4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Thu, 16 Dec 2021 10:08:25 +0100
Subject: [PATCH 728/869] fix(svn-fast-info): URL-decode svn branch name

---
 plugins/svn-fast-info/svn-fast-info.plugin.zsh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/plugins/svn-fast-info/svn-fast-info.plugin.zsh b/plugins/svn-fast-info/svn-fast-info.plugin.zsh
index f2f449f79..05f0ac67d 100644
--- a/plugins/svn-fast-info/svn-fast-info.plugin.zsh
+++ b/plugins/svn-fast-info/svn-fast-info.plugin.zsh
@@ -36,7 +36,9 @@ function svn_repo_need_upgrade() {
 }
 
 function svn_current_branch_name() {
-  grep '^URL:' <<< "${1:-$(svn info 2> /dev/null)}" | egrep -o '(tags|branches)/[^/]+|trunk'	
+  omz_urldecode "$(
+    command grep '^URL:' <<< "${1:-$(svn info 2>/dev/null)}" | command grep -Eo '(tags|branches)/[^/]+|trunk'
+  )"
 }
 
 function svn_repo_root_name() {

From 75ed59b7c09e3bb2d04a5d35065bdd9277e9947f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Thu, 16 Dec 2021 10:09:05 +0100
Subject: [PATCH 729/869] fix(svn-fast-info): quote % characters in svn branch
 name

---
 plugins/svn-fast-info/svn-fast-info.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/svn-fast-info/svn-fast-info.plugin.zsh b/plugins/svn-fast-info/svn-fast-info.plugin.zsh
index 05f0ac67d..46dd5cb0c 100644
--- a/plugins/svn-fast-info/svn-fast-info.plugin.zsh
+++ b/plugins/svn-fast-info/svn-fast-info.plugin.zsh
@@ -20,7 +20,7 @@ function svn_prompt_info() {
       "$ZSH_PROMPT_BASE_COLOR" \
       \
       "$ZSH_THEME_BRANCH_NAME_COLOR" \
-      "$(svn_current_branch_name $info)" \
+      "${$(svn_current_branch_name $info):gs/%/%%}" \
       "$ZSH_PROMPT_BASE_COLOR" \
       \
       "$(svn_current_revision $info)" \

From c76dc91e02f7e8885e6eb71d725c21b15616ad05 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Mon, 20 Dec 2021 11:22:54 +0100
Subject: [PATCH 730/869] fix(svn): return true repo name in
 `svn_get_repo_name`

---
 plugins/svn/svn.plugin.zsh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/plugins/svn/svn.plugin.zsh b/plugins/svn/svn.plugin.zsh
index fbc9ee538..851f1a45e 100644
--- a/plugins/svn/svn.plugin.zsh
+++ b/plugins/svn/svn.plugin.zsh
@@ -19,10 +19,10 @@ in_svn() {
 }
 
 svn_get_repo_name() {
-  if in_svn; then
-    LANG=C svn info | sed -n 's/^Repository\ Root:\ .*\///p' | read SVN_ROOT
-    LANG=C svn info | sed -n "s/^URL:\ .*$SVN_ROOT\///p"
-  fi
+  local info name
+  info="${1:-$(LANG= svn info 2>/dev/null)}"
+  name="$(sed -n 's/^Repository\ Root:\ .*\///p' <<< "$info")"
+  omz_urldecode "$name"
 }
 
 svn_get_branch_name() {

From 93ec48fb0a798775b9e5d366c11a4ac3826c3ea4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Mon, 20 Dec 2021 11:24:00 +0100
Subject: [PATCH 731/869] fix(svn): refactor and quote % characters in
 `svn_prompt_info`

---
 plugins/svn/svn.plugin.zsh | 104 +++++++++++++++++++------------------
 1 file changed, 53 insertions(+), 51 deletions(-)

diff --git a/plugins/svn/svn.plugin.zsh b/plugins/svn/svn.plugin.zsh
index 851f1a45e..9c3b50d16 100644
--- a/plugins/svn/svn.plugin.zsh
+++ b/plugins/svn/svn.plugin.zsh
@@ -1,21 +1,28 @@
 svn_prompt_info() {
-  local _DISPLAY
-  if in_svn; then
-    if [[ "$SVN_SHOW_BRANCH" = true ]]; then
-      unset SVN_SHOW_BRANCH
-      _DISPLAY=$(svn_get_branch_name)
-    else
-      _DISPLAY=$(svn_get_repo_name)
-      _DISPLAY=$(omz_urldecode "${_DISPLAY}")
-    fi
-    echo "$ZSH_PROMPT_BASE_COLOR$ZSH_THEME_SVN_PROMPT_PREFIX\
-$ZSH_THEME_REPO_NAME_COLOR$_DISPLAY$ZSH_PROMPT_BASE_COLOR$ZSH_THEME_SVN_PROMPT_SUFFIX$ZSH_PROMPT_BASE_COLOR$(svn_dirty)$(svn_dirty_pwd)$ZSH_PROMPT_BASE_COLOR"
+  local info display
+  info="$(LANG= svn info 2>/dev/null)" || return 1
+
+  if [[ "$SVN_SHOW_BRANCH" = true ]]; then
+    display="$(svn_get_branch_name "$info")"
+  else
+    display="$(svn_get_repo_name "$info")"
   fi
+
+  printf '%s%s%s%s%s%s%s%s%s%s' \
+    "$ZSH_PROMPT_BASE_COLOR" \
+    "$ZSH_THEME_SVN_PROMPT_PREFIX" \
+    "$ZSH_THEME_REPO_NAME_COLOR" \
+    "${display:gs/%/%%}" \
+    "$ZSH_PROMPT_BASE_COLOR" \
+    "$ZSH_THEME_SVN_PROMPT_SUFFIX" \
+    "$ZSH_PROMPT_BASE_COLOR" \
+    "$(svn_dirty $info)" \
+    "$(svn_dirty_pwd)" \
+    "$ZSH_PROMPT_BASE_COLOR"
 }
 
-
 in_svn() {
-  svn info >/dev/null 2>&1
+  svn info &>/dev/null
 }
 
 svn_get_repo_name() {
@@ -26,47 +33,44 @@ svn_get_repo_name() {
 }
 
 svn_get_branch_name() {
-  local _DISPLAY=$(
-    LANG=C svn info 2> /dev/null | \
-      awk -F/ \
-      '/^URL:/ { \
-        for (i=0; i<=NF; i++) { \
-          if ($i == "branches" || $i == "tags" ) { \
-            print $(i+1); \
-            break;\
-          }; \
-          if ($i == "trunk") { print $i; break; } \
-        } \
-      }'
+  local info branch
+  info="${1:-$(LANG= svn info 2>/dev/null)}"
+  branch=$(
+    awk -F/ '/^URL:/ {
+      for (i=0; i<=NF; i++) {
+        if ($i == "branches" || $i == "tags" ) {
+          print $(i+1)
+          break
+        };
+        if ($i == "trunk") {
+          print $i
+          break
+        }
+      }
+    }' <<< "$info"
   )
+  branch="$(omz_urldecode "$branch")"
 
-  if [[ -z "$_DISPLAY" ]]; then
-    svn_get_repo_name
-  else
-    echo $_DISPLAY
-  fi
+  echo "${branch:-$(svn_get_repo_name "$info")}"
 }
 
 svn_get_rev_nr() {
-  if in_svn; then
-    LANG=C svn info 2> /dev/null | sed -n 's/Revision:\ //p'
-  fi
+  sed -n 's/Revision:\ //p' "${1:-$(LANG= svn info 2>/dev/null)}"
 }
 
 svn_dirty() {
-  svn_dirty_choose $ZSH_THEME_SVN_PROMPT_DIRTY $ZSH_THEME_SVN_PROMPT_CLEAN
+  svn_dirty_choose "${1:-$(LANG= svn info 2>/dev/null)}" $ZSH_THEME_SVN_PROMPT_DIRTY $ZSH_THEME_SVN_PROMPT_CLEAN
 }
 
 svn_dirty_choose() {
-  if in_svn; then
-    local root=$(LANG=C svn info 2> /dev/null | sed -n 's/^Working Copy Root Path: //p')
-    if svn status $root 2> /dev/null | command grep -Eq '^\s*[ACDIM!?L]'; then
-      # Grep exits with 0 when "One or more lines were selected", return "dirty".
-      echo $1
-    else
-      # Otherwise, no lines were found, or an error occurred. Return clean.
-      echo $2
-    fi
+  local root
+  root=$(sed -n 's/^Working Copy Root Path: //p' <<< "${1:-$(LANG= svn info 2>/dev/null)}")
+  if LANG= svn status "$root" 2>/dev/null | command grep -Eq '^\s*[ACDIM!?L]'; then
+    # Grep exits with 0 when "One or more lines were selected", return "dirty".
+    echo $1
+  else
+    # Otherwise, no lines were found, or an error occurred. Return clean.
+    echo $2
   fi
 }
 
@@ -75,13 +79,11 @@ svn_dirty_pwd () {
 }
 
 svn_dirty_choose_pwd () {
-  if in_svn; then
-    if svn status "$PWD" 2> /dev/null | command grep -Eq '^\s*[ACDIM!?L]'; then
-      # Grep exits with 0 when "One or more lines were selected", return "dirty".
-      echo $1
-    else
-      # Otherwise, no lines were found, or an error occurred. Return clean.
-      echo $2
-    fi
+  if LANG= svn status "$PWD" 2>/dev/null | command grep -Eq '^\s*[ACDIM!?L]'; then
+    # Grep exits with 0 when "One or more lines were selected", return "dirty".
+    echo $1
+  else
+    # Otherwise, no lines were found, or an error occurred. Return clean.
+    echo $2
   fi
 }

From 304af0a577336abd3090f9dec645052c4c987a47 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Wed, 15 Dec 2021 13:03:16 +0100
Subject: [PATCH 732/869] fix(lib): quote % in `git_remote_status`

---
 lib/git.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/git.zsh b/lib/git.zsh
index 62aac8f39..be9fa7e67 100644
--- a/lib/git.zsh
+++ b/lib/git.zsh
@@ -82,7 +82,7 @@ function git_remote_status() {
         fi
 
         if [[ -n $ZSH_THEME_GIT_PROMPT_REMOTE_STATUS_DETAILED ]]; then
-            git_remote_status="$ZSH_THEME_GIT_PROMPT_REMOTE_STATUS_PREFIX$remote$git_remote_status_detailed$ZSH_THEME_GIT_PROMPT_REMOTE_STATUS_SUFFIX"
+            git_remote_status="$ZSH_THEME_GIT_PROMPT_REMOTE_STATUS_PREFIX${remote:gs/%/%%}$git_remote_status_detailed$ZSH_THEME_GIT_PROMPT_REMOTE_STATUS_SUFFIX"
         fi
 
         echo $git_remote_status

From 5b076eab9bf8b85b48faac20383aa20ba0f8b740 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Sun, 26 Dec 2021 19:31:07 +0100
Subject: [PATCH 733/869] fix(lib): quote % in `nvm_prompt_info`

---
 lib/nvm.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/nvm.zsh b/lib/nvm.zsh
index 2fe57a8f4..a8989f9fe 100644
--- a/lib/nvm.zsh
+++ b/lib/nvm.zsh
@@ -2,5 +2,5 @@
 function nvm_prompt_info() {
   which nvm &>/dev/null || return
   local nvm_prompt=${$(nvm current)#v}
-  echo "${ZSH_THEME_NVM_PROMPT_PREFIX}${nvm_prompt}${ZSH_THEME_NVM_PROMPT_SUFFIX}"
+  echo "${ZSH_THEME_NVM_PROMPT_PREFIX}${nvm_prompt:gs/%/%%}${ZSH_THEME_NVM_PROMPT_SUFFIX}"
 }

From 42afa6e2ea663431ae2ff0a4aae8e57ce175eb4a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Sun, 26 Dec 2021 19:32:52 +0100
Subject: [PATCH 734/869] fix(pyenv): quote % in `pyenv_prompt_info`

---
 plugins/pyenv/pyenv.plugin.zsh | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/plugins/pyenv/pyenv.plugin.zsh b/plugins/pyenv/pyenv.plugin.zsh
index 39897ed16..ebb1a708a 100644
--- a/plugins/pyenv/pyenv.plugin.zsh
+++ b/plugins/pyenv/pyenv.plugin.zsh
@@ -83,12 +83,14 @@ if [[ $FOUND_PYENV -eq 1 ]]; then
   fi
 
   function pyenv_prompt_info() {
-    echo "$(pyenv version-name)"
+    local version="$(pyenv version-name)"
+    echo "${version:gs/%/%%}"
   }
 else
   # Fall back to system python
   function pyenv_prompt_info() {
-    echo "system: $(python -V 2>&1 | cut -f 2 -d ' ')"
+    local version="$(python -V 2>&1 | cut -d' ' -f2)"
+    echo "system: ${version:gs/%/%%}"
   }
 fi
 

From e7390a860374fb38dd7bf67242ec12e8a6925a80 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Sun, 26 Dec 2021 19:34:30 +0100
Subject: [PATCH 735/869] fix(jenv): quote % in `jenv_prompt_info`

---
 plugins/jenv/jenv.plugin.zsh | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/plugins/jenv/jenv.plugin.zsh b/plugins/jenv/jenv.plugin.zsh
index 946ce18a5..240102604 100644
--- a/plugins/jenv/jenv.plugin.zsh
+++ b/plugins/jenv/jenv.plugin.zsh
@@ -18,13 +18,19 @@ if [[ $FOUND_JENV -eq 1 ]]; then
     (( $+commands[jenv] )) || export PATH="${jenvdir}/bin:$PATH"
     eval "$(jenv init - zsh)"
 
-    function jenv_prompt_info() { jenv version-name 2>/dev/null }
+    function jenv_prompt_info() {
+      local version="$(jenv version-name 2>/dev/null)"
+      echo "${version:gs/%/%%}"
+    }
 
     if [[ -d "${jenvdir}/versions" ]]; then
         export JENV_ROOT=$jenvdir
     fi
 else
-    function jenv_prompt_info() { echo "system: $(java -version 2>&1 | cut -f 2 -d ' ')" }
+    function jenv_prompt_info() {
+      local version="$(java -version 2>&1 | cut -d' ' -f2)"
+      echo "system: ${version:gs/%/%%}"
+    }
 fi
 
 unset jenvdir jenvdirs FOUND_JENV

From 3e9fe6e7720cf431d5c24a4037cfb5e8b212a6aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Sun, 26 Dec 2021 20:43:54 +0100
Subject: [PATCH 736/869] fix(virtualenv): quote % in `virtualenv_prompt_info`

---
 plugins/virtualenv/virtualenv.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/virtualenv/virtualenv.plugin.zsh b/plugins/virtualenv/virtualenv.plugin.zsh
index 3041475ed..56707bb98 100644
--- a/plugins/virtualenv/virtualenv.plugin.zsh
+++ b/plugins/virtualenv/virtualenv.plugin.zsh
@@ -1,6 +1,6 @@
 function virtualenv_prompt_info(){
   [[ -n ${VIRTUAL_ENV} ]] || return
-  echo "${ZSH_THEME_VIRTUALENV_PREFIX=[}${VIRTUAL_ENV:t}${ZSH_THEME_VIRTUALENV_SUFFIX=]}"
+  echo "${ZSH_THEME_VIRTUALENV_PREFIX=[}${VIRTUAL_ENV:t:gs/%/%%}${ZSH_THEME_VIRTUALENV_SUFFIX=]}"
 }
 
 # disables prompt mangling in virtual_env/bin/activate

From 9836aebe672159622193f14a89eedc38ccd29a5d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Tue, 14 Dec 2021 11:58:58 +0100
Subject: [PATCH 737/869] fix(agnoster): quote % in prompt functions

---
 themes/agnoster.zsh-theme | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/themes/agnoster.zsh-theme b/themes/agnoster.zsh-theme
index fe7ddbac6..5f4efe813 100644
--- a/themes/agnoster.zsh-theme
+++ b/themes/agnoster.zsh-theme
@@ -135,7 +135,7 @@ prompt_git() {
     zstyle ':vcs_info:*' formats ' %u%c'
     zstyle ':vcs_info:*' actionformats ' %u%c'
     vcs_info
-    echo -n "${ref/refs\/heads\//$PL_BRANCH_CHAR }${vcs_info_msg_0_%% }${mode}"
+    echo -n "${${ref:gs/%/%%}/refs\/heads\//$PL_BRANCH_CHAR }${vcs_info_msg_0_%% }${mode}"
   fi
 }
 
@@ -153,7 +153,7 @@ prompt_bzr() {
   if bzr_status=$(bzr status 2>&1); then
     status_mod=$(echo -n "$bzr_status" | head -n1 | grep "modified" | wc -m)
     status_all=$(echo -n "$bzr_status" | head -n1 | wc -m)
-    revision=$(bzr log -r-1 --log-format line | cut -d: -f1)
+    revision=${$(bzr log -r-1 --log-format line | cut -d: -f1):gs/%/%%}
     if [[ $status_mod -gt 0 ]] ; then
       prompt_segment yellow black "bzr@$revision ✚"
     else
@@ -183,7 +183,7 @@ prompt_hg() {
         # if working copy is clean
         prompt_segment green $CURRENT_FG
       fi
-      echo -n $(hg prompt "☿ {rev}@{branch}") $st
+      echo -n ${$(hg prompt "☿ {rev}@{branch}"):gs/%/%%} $st
     else
       st=""
       rev=$(hg id -n 2>/dev/null | sed 's/[^-0-9]//g')
@@ -197,7 +197,7 @@ prompt_hg() {
       else
         prompt_segment green $CURRENT_FG
       fi
-      echo -n "☿ $rev@$branch" $st
+      echo -n "☿ ${rev:gs/%/%%}@${branch:gs/%/%%}" $st
     fi
   fi
 }
@@ -209,9 +209,8 @@ prompt_dir() {
 
 # Virtualenv: current working virtualenv
 prompt_virtualenv() {
-  local virtualenv_path="$VIRTUAL_ENV"
-  if [[ -n $virtualenv_path && -n $VIRTUAL_ENV_DISABLE_PROMPT ]]; then
-    prompt_segment blue black "(`basename $virtualenv_path`)"
+  if [[ -n "$VIRTUAL_ENV" && -n "$VIRTUAL_ENV_DISABLE_PROMPT" ]]; then
+    prompt_segment blue black "(${VIRTUAL_ENV:t:gs/%/%%})"
   fi
 }
 
@@ -237,8 +236,8 @@ prompt_status() {
 prompt_aws() {
   [[ -z "$AWS_PROFILE" || "$SHOW_AWS_PROMPT" = false ]] && return
   case "$AWS_PROFILE" in
-    *-prod|*production*) prompt_segment red yellow  "AWS: $AWS_PROFILE" ;;
-    *) prompt_segment green black "AWS: $AWS_PROFILE" ;;
+    *-prod|*production*) prompt_segment red yellow  "AWS: ${AWS_PROFILE:gs/%/%%}" ;;
+    *) prompt_segment green black "AWS: ${AWS_PROFILE:gs/%/%%}" ;;
   esac
 }
 

From 4e777ef9d62f70ec971a3eaca71a23b9f4c93a54 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Mon, 27 Dec 2021 00:33:20 +0100
Subject: [PATCH 738/869] fix(trapd00r): fix potential command injection in
 `zsh_path`

---
 themes/trapd00r.zsh-theme | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/themes/trapd00r.zsh-theme b/themes/trapd00r.zsh-theme
index 4e3238393..849daf30b 100644
--- a/themes/trapd00r.zsh-theme
+++ b/themes/trapd00r.zsh-theme
@@ -38,6 +38,8 @@ local c13=$'\e[38;5;196m\e[1m'
 
 
 zsh_path() {
+  setopt localoptions nopromptsubst
+
   local colors
   colors=$(echoti colors)
 

From 43be5ea32150912ae2e85e2cc278c092022ea53f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Mon, 27 Dec 2021 00:38:58 +0100
Subject: [PATCH 739/869] fix(bureau): quote % in git prompt function and
 remove global variables

---
 themes/bureau.zsh-theme | 29 +++++++++++++++++------------
 1 file changed, 17 insertions(+), 12 deletions(-)

diff --git a/themes/bureau.zsh-theme b/themes/bureau.zsh-theme
index 3b3bdc80f..7a253a688 100644
--- a/themes/bureau.zsh-theme
+++ b/themes/bureau.zsh-theme
@@ -17,13 +17,14 @@ ZSH_THEME_GIT_PROMPT_UNSTAGED="%{$fg_bold[yellow]%}●%{$reset_color%}"
 ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$fg_bold[red]%}●%{$reset_color%}"
 
 bureau_git_branch () {
+  local ref
   ref=$(command git symbolic-ref HEAD 2> /dev/null) || \
   ref=$(command git rev-parse --short HEAD 2> /dev/null) || return
   echo "${ref#refs/heads/}"
 }
 
 bureau_git_status() {
-  _STATUS=""
+  local _STATUS _INDEX
 
   # check status of files
   _INDEX=$(command git status --porcelain 2> /dev/null)
@@ -63,18 +64,22 @@ bureau_git_status() {
   echo $_STATUS
 }
 
-bureau_git_prompt () {
-  local _branch=$(bureau_git_branch)
-  local _status=$(bureau_git_status)
-  local _result=""
-  if [[ "${_branch}x" != "x" ]]; then
-    _result="$ZSH_THEME_GIT_PROMPT_PREFIX$_branch"
-    if [[ "${_status}x" != "x" ]]; then
-      _result="$_result $_status"
-    fi
-    _result="$_result$ZSH_THEME_GIT_PROMPT_SUFFIX"
+bureau_git_prompt() {
+  local branch=$(bureau_git_branch)
+  local status=$(bureau_git_status)
+  local info
+
+  if [[ -z "${branch}" ]]; then
+    return
   fi
-  echo $_result
+
+  info="${branch:gs/%/%%}"
+
+  if [[ -n "${status}" ]]; then
+    info+=" $status"
+  fi
+
+  echo "${ZSH_THEME_GIT_PROMPT_PREFIX}${info}${ZSH_THEME_GIT_PROMPT_SUFFIX}"
 }
 
 

From a9d57eb2eec4d6234c4714a430ddfb4c57443570 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Mon, 27 Dec 2021 15:01:25 +0100
Subject: [PATCH 740/869] fix: quote % in `box_name` prompt functions

---
 themes/candy-kingdom.zsh-theme | 4 +++-
 themes/fino-time.zsh-theme     | 5 +++--
 themes/fino.zsh-theme          | 4 +++-
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/themes/candy-kingdom.zsh-theme b/themes/candy-kingdom.zsh-theme
index ad03cc320..31e63df15 100644
--- a/themes/candy-kingdom.zsh-theme
+++ b/themes/candy-kingdom.zsh-theme
@@ -11,7 +11,9 @@ patches: <patches|join( → )|pre_applied(%{$fg[yellow]%})|post_applied(%{$reset
 fi
 
 function box_name {
-    [ -f ~/.box-name ] && cat ~/.box-name || echo ${SHORT_HOST:-$HOST}
+  local box="${SHORT_HOST:-$HOST}"
+  [[ -f ~/.box-name ]] && box="$(< ~/.box-name)"
+  echo "${box:gs/%/%%}"
 }
 
 PROMPT='
diff --git a/themes/fino-time.zsh-theme b/themes/fino-time.zsh-theme
index 57c47db02..c7e2d965e 100644
--- a/themes/fino-time.zsh-theme
+++ b/themes/fino-time.zsh-theme
@@ -21,10 +21,11 @@ function prompt_char {
 }
 
 function box_name {
-    [ -f ~/.box-name ] && cat ~/.box-name || echo ${SHORT_HOST:-$HOST}
+  local box="${SHORT_HOST:-$HOST}"
+  [[ -f ~/.box-name ]] && box="$(< ~/.box-name)"
+  echo "${box:gs/%/%%}"
 }
 
-
 PROMPT="╭─%{$FG[040]%}%n%{$reset_color%} %{$FG[239]%}at%{$reset_color%} %{$FG[033]%}$(box_name)%{$reset_color%} %{$FG[239]%}in%{$reset_color%} %{$terminfo[bold]$FG[226]%}%~%{$reset_color%}\$(git_prompt_info)\$(ruby_prompt_info) %D - %*
 ╰─\$(virtualenv_info)\$(prompt_char) "
 
diff --git a/themes/fino.zsh-theme b/themes/fino.zsh-theme
index 2523c1776..9365a3c42 100644
--- a/themes/fino.zsh-theme
+++ b/themes/fino.zsh-theme
@@ -21,7 +21,9 @@ function prompt_char {
 }
 
 function box_name {
-  [ -f ~/.box-name ] && cat ~/.box-name || echo ${SHORT_HOST:-$HOST}
+  local box="${SHORT_HOST:-$HOST}"
+  [[ -f ~/.box-name ]] && box="$(< ~/.box-name)"
+  echo "${box:gs/%/%%}"
 }
 
 local ruby_env='$(ruby_prompt_info)'

From 1c53ef05833b965779865e457bb8355f0700bfab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Mon, 3 Jan 2022 13:58:14 +0100
Subject: [PATCH 741/869] fix(aws): quote % in `aws_prompt_info`

---
 plugins/aws/aws.plugin.zsh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/aws/aws.plugin.zsh b/plugins/aws/aws.plugin.zsh
index 3a3a111b4..c18bd634b 100644
--- a/plugins/aws/aws.plugin.zsh
+++ b/plugins/aws/aws.plugin.zsh
@@ -155,8 +155,8 @@ compctl -K _aws_profiles asp acp aws_change_access_key
 
 # AWS prompt
 function aws_prompt_info() {
-  [[ -z $AWS_PROFILE ]] && return
-  echo "${ZSH_THEME_AWS_PREFIX:=<aws:}${AWS_PROFILE}${ZSH_THEME_AWS_SUFFIX:=>}"
+  [[ -n "$AWS_PROFILE" ]] || return
+  echo "${ZSH_THEME_AWS_PREFIX:=<aws:}${AWS_PROFILE:gs/%/%%}${ZSH_THEME_AWS_SUFFIX:=>}"
 }
 
 if [[ "$SHOW_AWS_PROMPT" != false && "$RPROMPT" != *'$(aws_prompt_info)'* ]]; then

From a280726d934878a31f6dae35d8677a53551bbcf5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Mon, 3 Jan 2022 14:00:54 +0100
Subject: [PATCH 742/869] fix(fossil): refactor `fossil_prompt_info` and quote
 % in branch

---
 plugins/fossil/fossil.plugin.zsh | 30 ++++++++++++++++--------------
 1 file changed, 16 insertions(+), 14 deletions(-)

diff --git a/plugins/fossil/fossil.plugin.zsh b/plugins/fossil/fossil.plugin.zsh
index dfad73d36..a2123f415 100644
--- a/plugins/fossil/fossil.plugin.zsh
+++ b/plugins/fossil/fossil.plugin.zsh
@@ -13,23 +13,25 @@ ZSH_THEME_FOSSIL_PROMPT_DIRTY=" %{$fg_bold[red]%}✖"
 ZSH_THEME_FOSSIL_PROMPT_CLEAN=" %{$fg_bold[green]%}✔"
 
 function fossil_prompt_info() {
-  local _OUTPUT=`fossil branch 2>&1`
-  local _STATUS=`echo $_OUTPUT | grep "use --repo"`
-  if [ "$_STATUS" = "" ]; then
-    local _EDITED=`fossil changes`
-    local _EDITED_SYM="$ZSH_THEME_FOSSIL_PROMPT_CLEAN"
-    local _BRANCH=`echo $_OUTPUT | grep "* " | sed 's/* //g'`
+  local info=$(fossil branch 2>&1)
 
-    if [ "$_EDITED" != "" ]; then
-      _EDITED_SYM="$ZSH_THEME_FOSSIL_PROMPT_DIRTY"
-    fi
+  # if we're not in a fossil repo, don't show anything
+  ! command grep -q "use --repo" <<< "$info" || return
 
-    echo "$ZSH_THEME_FOSSIL_PROMPT_PREFIX" \
-      "$_BRANCH" \
-      "$ZSH_THEME_FOSSIL_PROMPT_SUFFIX" \
-      "$_EDITED_SYM"\
-      "%{$reset_color%}"
+  local branch=$(echo $info | grep "* " | sed 's/* //g')
+  local changes=$(fossil changes)
+  local dirty="$ZSH_THEME_FOSSIL_PROMPT_CLEAN"
+
+  if [[ -n "$changes" ]]; then
+    dirty="$ZSH_THEME_FOSSIL_PROMPT_DIRTY"
   fi
+
+  printf '%s %s %s %s %s' \
+    "$ZSH_THEME_FOSSIL_PROMPT_PREFIX" \
+    "${branch:gs/%/%%}" \
+    "$ZSH_THEME_FOSSIL_PROMPT_SUFFIX" \
+    "$dirty" \
+    "%{$reset_color%}"
 }
 
 function _fossil_prompt () {

From d87ab251c7fe18626b2d0c4e4a184e7bed7c508b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Mon, 3 Jan 2022 14:03:36 +0100
Subject: [PATCH 743/869] fix(kubectx): quote % in `kubectx_prompt_info`

---
 plugins/kubectx/kubectx.plugin.zsh | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/plugins/kubectx/kubectx.plugin.zsh b/plugins/kubectx/kubectx.plugin.zsh
index abbdc254b..af9a17ef1 100644
--- a/plugins/kubectx/kubectx.plugin.zsh
+++ b/plugins/kubectx/kubectx.plugin.zsh
@@ -1,9 +1,11 @@
 typeset -A kubectx_mapping
 
 function kubectx_prompt_info() {
-  if [ $commands[kubectl] ]; then
-    local current_ctx=`kubectl config current-context`
-    # use value in associative array if it exists, otherwise fall back to the context name
-    echo "${kubectx_mapping[$current_ctx]:-$current_ctx}"
-  fi
+  (( $+commands[kubectl] )) || return
+
+  local current_ctx=$(kubectl config current-context)
+
+  # use value in associative array if it exists
+  # otherwise fall back to the context name
+  echo "${${kubectx_mapping[$current_ctx]:-$current_ctx}:gs/%/%%}"
 }

From 8e973d42bd3bc5028d88ce731113b03ac8a5590c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Mon, 3 Jan 2022 17:05:48 +0100
Subject: [PATCH 744/869] fix(bureau): fix `status` variable name causing error
 (#10561)

Also cleaned up the code a bit

Fixes #10561
---
 themes/bureau.zsh-theme | 53 ++++++++++++++++++++---------------------
 1 file changed, 26 insertions(+), 27 deletions(-)

diff --git a/themes/bureau.zsh-theme b/themes/bureau.zsh-theme
index 7a253a688..50058e213 100644
--- a/themes/bureau.zsh-theme
+++ b/themes/bureau.zsh-theme
@@ -24,59 +24,58 @@ bureau_git_branch () {
 }
 
 bureau_git_status() {
-  local _STATUS _INDEX
+  local result gitstatus
 
   # check status of files
-  _INDEX=$(command git status --porcelain 2> /dev/null)
-  if [[ -n "$_INDEX" ]]; then
-    if $(echo "$_INDEX" | command grep -q '^[AMRD]. '); then
-      _STATUS="$_STATUS$ZSH_THEME_GIT_PROMPT_STAGED"
+  gitstatus=$(command git status --porcelain -b 2> /dev/null)
+  if [[ -n "$gitstatus" ]]; then
+    if $(echo "$gitstatus" | command grep -q '^[AMRD]. '); then
+      result+="$ZSH_THEME_GIT_PROMPT_STAGED"
     fi
-    if $(echo "$_INDEX" | command grep -q '^.[MTD] '); then
-      _STATUS="$_STATUS$ZSH_THEME_GIT_PROMPT_UNSTAGED"
+    if $(echo "$gitstatus" | command grep -q '^.[MTD] '); then
+      result+="$ZSH_THEME_GIT_PROMPT_UNSTAGED"
     fi
-    if $(echo "$_INDEX" | command grep -q -E '^\?\? '); then
-      _STATUS="$_STATUS$ZSH_THEME_GIT_PROMPT_UNTRACKED"
+    if $(echo "$gitstatus" | command grep -q -E '^\?\? '); then
+      result+="$ZSH_THEME_GIT_PROMPT_UNTRACKED"
     fi
-    if $(echo "$_INDEX" | command grep -q '^UU '); then
-      _STATUS="$_STATUS$ZSH_THEME_GIT_PROMPT_UNMERGED"
+    if $(echo "$gitstatus" | command grep -q '^UU '); then
+      result+="$ZSH_THEME_GIT_PROMPT_UNMERGED"
     fi
   else
-    _STATUS="$_STATUS$ZSH_THEME_GIT_PROMPT_CLEAN"
+    result+="$ZSH_THEME_GIT_PROMPT_CLEAN"
   fi
 
   # check status of local repository
-  _INDEX=$(command git status --porcelain -b 2> /dev/null)
-  if $(echo "$_INDEX" | command grep -q '^## .*ahead'); then
-    _STATUS="$_STATUS$ZSH_THEME_GIT_PROMPT_AHEAD"
+  if $(echo "$gitstatus" | command grep -q '^## .*ahead'); then
+    result+="$ZSH_THEME_GIT_PROMPT_AHEAD"
   fi
-  if $(echo "$_INDEX" | command grep -q '^## .*behind'); then
-    _STATUS="$_STATUS$ZSH_THEME_GIT_PROMPT_BEHIND"
+  if $(echo "$gitstatus" | command grep -q '^## .*behind'); then
+    result+="$ZSH_THEME_GIT_PROMPT_BEHIND"
   fi
-  if $(echo "$_INDEX" | command grep -q '^## .*diverged'); then
-    _STATUS="$_STATUS$ZSH_THEME_GIT_PROMPT_DIVERGED"
+  if $(echo "$gitstatus" | command grep -q '^## .*diverged'); then
+    result+="$ZSH_THEME_GIT_PROMPT_DIVERGED"
   fi
 
   if $(command git rev-parse --verify refs/stash &> /dev/null); then
-    _STATUS="$_STATUS$ZSH_THEME_GIT_PROMPT_STASHED"
+    result+="$ZSH_THEME_GIT_PROMPT_STASHED"
   fi
 
-  echo $_STATUS
+  echo $result
 }
 
 bureau_git_prompt() {
-  local branch=$(bureau_git_branch)
-  local status=$(bureau_git_status)
+  local gitbranch=$(bureau_git_branch)
+  local gitstatus=$(bureau_git_status)
   local info
 
-  if [[ -z "${branch}" ]]; then
+  if [[ -z "$gitbranch" ]]; then
     return
   fi
 
-  info="${branch:gs/%/%%}"
+  info="${gitbranch:gs/%/%%}"
 
-  if [[ -n "${status}" ]]; then
-    info+=" $status"
+  if [[ -n "$gitstatus" ]]; then
+    info+=" $gitstatus"
   fi
 
   echo "${ZSH_THEME_GIT_PROMPT_PREFIX}${info}${ZSH_THEME_GIT_PROMPT_SUFFIX}"

From a7c46d0ebdbeb23d751a61be8f9b64935572f720 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Mon, 3 Jan 2022 17:09:59 +0100
Subject: [PATCH 745/869] fix(ubuntu): fix `defining function based on alias`
 error (#10560)

Fixes #10560
---
 plugins/ubuntu/ubuntu.plugin.zsh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/plugins/ubuntu/ubuntu.plugin.zsh b/plugins/ubuntu/ubuntu.plugin.zsh
index 989ffd1ff..7b765a406 100644
--- a/plugins/ubuntu/ubuntu.plugin.zsh
+++ b/plugins/ubuntu/ubuntu.plugin.zsh
@@ -53,7 +53,7 @@ alias mydeb='time dpkg-buildpackage -rfakeroot -us -uc'
 # Usage: aar ppa:xxxxxx/xxxxxx [packagename]
 # If packagename is not given as 2nd argument the function will ask for it and guess the default by taking
 # the part after the / from the ppa name which is sometimes the right name for the package you want to install
-aar() {
+function aar() {
 	if [ -n "$2" ]; then
 		PACKAGE=$2
 	else
@@ -76,7 +76,7 @@ aar() {
 #   apt-history rollback
 #   apt-history list
 # Based On: https://linuxcommando.blogspot.com/2008/08/how-to-show-apt-log-history.html
-apt-history () {
+function apt-history() {
   case "$1" in
     install)
       zgrep --no-filename 'install ' $(ls -rt /var/log/dpkg*)
@@ -105,7 +105,7 @@ apt-history () {
 }
 
 # Kernel-package building shortcut
-kerndeb () {
+function kerndeb() {
   # temporarily unset MAKEFLAGS ( '-j3' will fail )
   MAKEFLAGS=$( print - $MAKEFLAGS | perl -pe 's/-j\s*[\d]+//g' )
   print '$MAKEFLAGS set to '"'$MAKEFLAGS'"

From 31d63ea884e8ef56a40bed8771cdd8d3aec131f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Tue, 4 Jan 2022 11:38:53 +0100
Subject: [PATCH 746/869] fix(kubectx): allow prompt sequences in
 `kubectx_mapping` (#10562)

Fixes #10562
---
 plugins/kubectx/kubectx.plugin.zsh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/kubectx/kubectx.plugin.zsh b/plugins/kubectx/kubectx.plugin.zsh
index af9a17ef1..1419f102f 100644
--- a/plugins/kubectx/kubectx.plugin.zsh
+++ b/plugins/kubectx/kubectx.plugin.zsh
@@ -1,4 +1,4 @@
-typeset -A kubectx_mapping
+typeset -g -A kubectx_mapping
 
 function kubectx_prompt_info() {
   (( $+commands[kubectl] )) || return
@@ -7,5 +7,5 @@ function kubectx_prompt_info() {
 
   # use value in associative array if it exists
   # otherwise fall back to the context name
-  echo "${${kubectx_mapping[$current_ctx]:-$current_ctx}:gs/%/%%}"
+  echo "${kubectx_mapping[$current_ctx]:-${current_ctx:gs/%/%%}}"
 }

From d3bb52d7d825f2a6ce2e1c76ca472b05c6f27b40 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Wed, 5 Jan 2022 09:10:32 +0100
Subject: [PATCH 747/869] style: declare globals properly

By default, `typeset` defines variables locally unless in the main scope.
This is specially bad when using `omz plugin load`, which happens inside
a function, so the declared variables don't continue being defined when
the function finishes and the main scope reappears.
---
 plugins/colored-man-pages/colored-man-pages.plugin.zsh | 2 +-
 plugins/deno/deno.plugin.zsh                           | 2 +-
 plugins/fnm/fnm.plugin.zsh                             | 2 +-
 plugins/gh/gh.plugin.zsh                               | 2 +-
 plugins/helm/helm.plugin.zsh                           | 2 +-
 plugins/rbw/rbw.plugin.zsh                             | 2 +-
 plugins/rust/rust.plugin.zsh                           | 4 ++--
 plugins/rvm/rvm.plugin.zsh                             | 2 +-
 plugins/volta/volta.plugin.zsh                         | 2 +-
 themes/dieter.zsh-theme                                | 2 +-
 themes/jonathan.zsh-theme                              | 2 +-
 11 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/plugins/colored-man-pages/colored-man-pages.plugin.zsh b/plugins/colored-man-pages/colored-man-pages.plugin.zsh
index 087ddce97..981992d88 100644
--- a/plugins/colored-man-pages/colored-man-pages.plugin.zsh
+++ b/plugins/colored-man-pages/colored-man-pages.plugin.zsh
@@ -22,7 +22,7 @@ less_termcap[ue]="${reset_color}"
 0="${${(M)0:#/*}:-$PWD/$0}"
 
 # Absolute path to this file's directory.
-typeset __colored_man_pages_dir="${0:A:h}"
+typeset -g __colored_man_pages_dir="${0:A:h}"
 
 function colored() {
   local -a environment
diff --git a/plugins/deno/deno.plugin.zsh b/plugins/deno/deno.plugin.zsh
index 77c2125d2..6c12bae13 100644
--- a/plugins/deno/deno.plugin.zsh
+++ b/plugins/deno/deno.plugin.zsh
@@ -32,7 +32,7 @@ command mkdir -p "$ZSH_CACHE_DIR/completions"
 # If the completion file doesn't exist yet, we need to autoload it and
 # bind it to `deno`. Otherwise, compinit will have already done that.
 if [[ ! -f "$ZSH_CACHE_DIR/completions/_deno" ]]; then
-  declare -A _comps
+  typeset -g -A _comps
   autoload -Uz _deno
   _comps[deno]=_deno
 fi
diff --git a/plugins/fnm/fnm.plugin.zsh b/plugins/fnm/fnm.plugin.zsh
index e22588792..044e16a04 100644
--- a/plugins/fnm/fnm.plugin.zsh
+++ b/plugins/fnm/fnm.plugin.zsh
@@ -18,7 +18,7 @@ command mkdir -p "$ZSH_CACHE_DIR/completions"
 # If the completion file doesn't exist yet, we need to autoload it and
 # bind it to `fnm`. Otherwise, compinit will have already done that.
 if [[ ! -f "$ZSH_CACHE_DIR/completions/_fnm" ]]; then
-  declare -A _comps
+  typeset -g -A _comps
   autoload -Uz _fnm
   _comps[fnm]=_fnm
 fi
diff --git a/plugins/gh/gh.plugin.zsh b/plugins/gh/gh.plugin.zsh
index 17995e1cf..9263220ca 100644
--- a/plugins/gh/gh.plugin.zsh
+++ b/plugins/gh/gh.plugin.zsh
@@ -19,7 +19,7 @@ command mkdir -p "$ZSH_CACHE_DIR/completions"
 # If the completion file doesn't exist yet, we need to autoload it and
 # bind it to `gh`. Otherwise, compinit will have already done that.
 if [[ ! -f "$ZSH_CACHE_DIR/completions/_gh" ]]; then
-  declare -A _comps
+  typeset -g -A _comps
   autoload -Uz _gh
   _comps[gh]=_gh
 fi
diff --git a/plugins/helm/helm.plugin.zsh b/plugins/helm/helm.plugin.zsh
index 472c1c9dd..c6b91693a 100644
--- a/plugins/helm/helm.plugin.zsh
+++ b/plugins/helm/helm.plugin.zsh
@@ -14,7 +14,7 @@ command mkdir -p "$ZSH_CACHE_DIR/completions"
 # If the completion file doesn't exist yet, we need to autoload it and
 # bind it to `helm`. Otherwise, compinit will have already done that.
 if [[ ! -f "$ZSH_CACHE_DIR/completions/_helm" ]]; then
-  declare -A _comps
+  typeset -g -A _comps
   autoload -Uz _helm
   _comps[helm]=_helm
 fi
diff --git a/plugins/rbw/rbw.plugin.zsh b/plugins/rbw/rbw.plugin.zsh
index 3825be7a6..56683ad06 100644
--- a/plugins/rbw/rbw.plugin.zsh
+++ b/plugins/rbw/rbw.plugin.zsh
@@ -11,7 +11,7 @@ command mkdir -p "$ZSH_CACHE_DIR/completions"
 # If the completion file doesn't exist yet, we need to autoload it and
 # bind it to `rbw`. Otherwise, compinit will have already done that.
 if [[ ! -f "$ZSH_CACHE_DIR/completions/_rbw" ]]; then
-  declare -A _comps
+  typeset -g -A _comps
   autoload -Uz _rbw
   _comps[rbw]=_rbw
 fi
diff --git a/plugins/rust/rust.plugin.zsh b/plugins/rust/rust.plugin.zsh
index 014c73b3b..465b701b0 100644
--- a/plugins/rust/rust.plugin.zsh
+++ b/plugins/rust/rust.plugin.zsh
@@ -11,7 +11,7 @@ command mkdir -p "$ZSH_CACHE_DIR/completions"
 # bind it to `cargo`. Otherwise, compinit will have already done that
 if [[ ! -f "$ZSH_CACHE_DIR/completions/_cargo" ]]; then
   autoload -Uz _cargo
-  declare -A _comps
+  typeset -g -A _comps
   _comps[cargo]=_cargo
 fi
 
@@ -19,7 +19,7 @@ fi
 # bind it to `rustup`. Otherwise, compinit will have already done that
 if [[ ! -f "$ZSH_CACHE_DIR/completions/_rustup" ]]; then
   autoload -Uz _rustup
-  declare -A _comps
+  typeset -g -A _comps
   _comps[rustup]=_rustup
 fi
 
diff --git a/plugins/rvm/rvm.plugin.zsh b/plugins/rvm/rvm.plugin.zsh
index 4ba885563..864389ba8 100644
--- a/plugins/rvm/rvm.plugin.zsh
+++ b/plugins/rvm/rvm.plugin.zsh
@@ -1,7 +1,7 @@
 # Completion
 fpath+=("${rvm_path}/scripts/zsh/Completion")
 
-declare -A _comps
+typeset -g -A _comps
 autoload -Uz _rvm
 _comps[rvm]=_rvm
 
diff --git a/plugins/volta/volta.plugin.zsh b/plugins/volta/volta.plugin.zsh
index 756dc84b3..79319394c 100644
--- a/plugins/volta/volta.plugin.zsh
+++ b/plugins/volta/volta.plugin.zsh
@@ -11,7 +11,7 @@ command mkdir -p "$ZSH_CACHE_DIR/completions"
 # If the completion file doesn't exist yet, we need to autoload it and
 # bind it to `deno`. Otherwise, compinit will have already done that.
 if [[ ! -f "$ZSH_CACHE_DIR/completions/_volta" ]]; then
-  declare -A _comps
+  typeset -g -A _comps
   autoload -Uz _volta
   _comps[volta]=_volta
 fi
diff --git a/themes/dieter.zsh-theme b/themes/dieter.zsh-theme
index 58d9f88a9..83f2dcc7c 100644
--- a/themes/dieter.zsh-theme
+++ b/themes/dieter.zsh-theme
@@ -6,7 +6,7 @@
 # The exit code visual cues will only display once.
 # (i.e. they will be reset, even if you hit enter a few times on empty command prompts)
 
-typeset -A host_repr
+typeset -g -A host_repr
 
 # translate hostnames into shortened, colorcoded strings
 host_repr=('dieter-ws-a7n8x-arch' "%{$fg_bold[green]%}ws" 'dieter-p4sci-arch' "%{$fg_bold[blue]%}p4")
diff --git a/themes/jonathan.zsh-theme b/themes/jonathan.zsh-theme
index 11d799a84..e8c490884 100644
--- a/themes/jonathan.zsh-theme
+++ b/themes/jonathan.zsh-theme
@@ -66,7 +66,7 @@ if [[ "${langinfo[CODESET]}" = UTF-8 ]]; then
   PR_LRCORNER="┘"
   PR_URCORNER="┐"
 else
-  typeset -A altchar
+  typeset -g -A altchar
   set -A altchar ${(s..)terminfo[acsc]}
   # Some stuff to help us draw nice lines
   PR_SET_CHARSET="%{$terminfo[enacs]%}"

From 7ae4f76f6dda1521505c57880ea1e5ee2f1aa183 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Wed, 5 Jan 2022 09:03:30 +0100
Subject: [PATCH 748/869] refactor(kubectl): optimize completion generation

---
 plugins/kubectl/kubectl.plugin.zsh | 32 ++++++++++++++++++++----------
 1 file changed, 21 insertions(+), 11 deletions(-)

diff --git a/plugins/kubectl/kubectl.plugin.zsh b/plugins/kubectl/kubectl.plugin.zsh
index 3630facaa..bf602bb7b 100644
--- a/plugins/kubectl/kubectl.plugin.zsh
+++ b/plugins/kubectl/kubectl.plugin.zsh
@@ -1,13 +1,22 @@
 if (( $+commands[kubectl] )); then
-    __KUBECTL_COMPLETION_FILE="${ZSH_CACHE_DIR}/kubectl_completion"
+  # TODO: 2022-01-05: remove this block
+  # remove old generated files
+  command rm -f "$ZSH_CACHE_DIR/kubectl_completion"
 
-    if [[ ! -f $__KUBECTL_COMPLETION_FILE || ! -s $__KUBECTL_COMPLETION_FILE ]]; then
-        kubectl completion zsh >! $__KUBECTL_COMPLETION_FILE
-    fi
+  # TODO: 2022-01-05: remove this bit of code as it exists in oh-my-zsh.sh
+  # Add completions folder in $ZSH_CACHE_DIR
+  command mkdir -p "$ZSH_CACHE_DIR/completions"
+  (( ${fpath[(Ie)"$ZSH_CACHE_DIR/completions"]} )) || fpath=("$ZSH_CACHE_DIR/completions" $fpath)
 
-    [[ -f $__KUBECTL_COMPLETION_FILE ]] && source $__KUBECTL_COMPLETION_FILE
+  # If the completion file doesn't exist yet, we need to autoload it and
+  # bind it to `kubectl`. Otherwise, compinit will have already done that.
+  if [[ ! -f "$ZSH_CACHE_DIR/completions/_kubectl" ]]; then
+    typeset -g -A _comps
+    autoload -Uz _kubectl
+    _comps[kubectl]=_kubectl
+  fi
 
-    unset __KUBECTL_COMPLETION_FILE
+  kubectl completion zsh >! "$ZSH_CACHE_DIR/completions/_kubectl" &|
 fi
 
 # This command is used a LOT both below and in daily life
@@ -97,8 +106,9 @@ alias kdd='kubectl describe deployment'
 alias kdeld='kubectl delete deployment'
 alias ksd='kubectl scale deployment'
 alias krsd='kubectl rollout status deployment'
-kres(){
-    kubectl set env $@ REFRESHED_AT=$(date +%Y%m%d%H%M%S)
+
+function kres(){
+  kubectl set env $@ REFRESHED_AT=$(date +%Y%m%d%H%M%S)
 }
 
 # Rollout management.
@@ -170,9 +180,9 @@ alias kdelcj='kubectl delete cronjob'
 
 # Only run if the user actually has kubectl installed
 if (( ${+_comps[kubectl]} )); then
-  kj() { kubectl "$@" -o json | jq; }
-  kjx() { kubectl "$@" -o json | fx; }
-  ky() { kubectl "$@" -o yaml | yh; }
+  function kj() { kubectl "$@" -o json | jq; }
+  function kjx() { kubectl "$@" -o json | fx; }
+  function ky() { kubectl "$@" -o yaml | yh; }
 
   compdef kj=kubectl
   compdef kjx=kubectl

From 67cc59b4258a13232cddfddd75f44d8ca2b80172 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Wed, 5 Jan 2022 09:23:27 +0100
Subject: [PATCH 749/869] style: some code style fixes

---
 .../frontend-search.plugin.zsh                | 32 ++++++-------
 plugins/pj/pj.plugin.zsh                      | 47 +++++++++----------
 2 files changed, 37 insertions(+), 42 deletions(-)

diff --git a/plugins/frontend-search/frontend-search.plugin.zsh b/plugins/frontend-search/frontend-search.plugin.zsh
index 437e477b9..7f8d5c90c 100644
--- a/plugins/frontend-search/frontend-search.plugin.zsh
+++ b/plugins/frontend-search/frontend-search.plugin.zsh
@@ -39,7 +39,7 @@ function frontend() {
   emulate -L zsh
 
   # define search context URLS
-  typeset -A urls
+  local -A urls
   urls=(
     angular        'https://angular.io/?search='
     angularjs      $(_frontend_fallback 'angularjs.org')
@@ -73,25 +73,23 @@ function frontend() {
   )
 
   # show help for command list
-  if [[ $# -lt 2 ]]
-  then
-      print -P "Usage: frontend %Ucontext%u %Uterm%u [...%Umore%u] (or just: %Ucontext%u %Uterm%u [...%Umore%u])"
-      print -P ""
-      print -P "%Uterm%u and what follows is what will be searched for in the %Ucontext%u website,"
-      print -P "and %Ucontext%u is one of the following:"
-      print -P ""
-      print -P "  angular, angularjs, bem, bootsnipp, caniuse, codepen, compassdoc, cssflow, packagephobia"
-      print -P "  dartlang, emberjs, fontello, flowtype, github, html5please, jestjs, jquery, lodash,"
-      print -P "  mdn, npmjs, nodejs, qunit, reactjs, smacss, stackoverflow, unheap, vuejs, bundlephobia"
-      print -P ""
-      print -P "For example: frontend npmjs mocha (or just: npmjs mocha)."
-      print -P ""
-      return 1
+  if [[ $# -lt 2 ]]; then
+    print -P "Usage: frontend %Ucontext%u %Uterm%u [...%Umore%u] (or just: %Ucontext%u %Uterm%u [...%Umore%u])"
+    print -P ""
+    print -P "%Uterm%u and what follows is what will be searched for in the %Ucontext%u website,"
+    print -P "and %Ucontext%u is one of the following:"
+    print -P ""
+    print -P "  angular, angularjs, bem, bootsnipp, caniuse, codepen, compassdoc, cssflow, packagephobia"
+    print -P "  dartlang, emberjs, fontello, flowtype, github, html5please, jestjs, jquery, lodash,"
+    print -P "  mdn, npmjs, nodejs, qunit, reactjs, smacss, stackoverflow, unheap, vuejs, bundlephobia"
+    print -P ""
+    print -P "For example: frontend npmjs mocha (or just: npmjs mocha)."
+    print -P ""
+    return 1
   fi
 
   # check whether the search context is supported
-  if [[ -z "$urls[$1]" ]]
-  then
+  if [[ -z "$urls[$1]" ]]; then
     echo "Search context \"$1\" currently not supported."
     echo ""
     echo "Valid contexts are:"
diff --git a/plugins/pj/pj.plugin.zsh b/plugins/pj/pj.plugin.zsh
index e36d49204..431576f4b 100644
--- a/plugins/pj/pj.plugin.zsh
+++ b/plugins/pj/pj.plugin.zsh
@@ -1,37 +1,34 @@
 alias pjo="pj open"
 
-pj () {
-    emulate -L zsh
+function pj() {
+  local cmd="cd"
+  local project="$1"
 
-    cmd="cd"
-    project=$1
+  if [[ "open" == "$project" ]]; then
+    shift
+    project=$*
+    cmd=${=EDITOR}
+  else
+    project=$*
+  fi
 
-    if [[ "open" == "$project" ]]; then
-        shift
-        project=$*
-        cmd=${=EDITOR}
-    else
-        project=$*
+  for basedir ($PROJECT_PATHS); do
+    if [[ -d "$basedir/$project" ]]; then
+      $cmd "$basedir/$project"
+      return
     fi
+  done
 
-    for basedir ($PROJECT_PATHS); do
-        if [[ -d "$basedir/$project" ]]; then
-            $cmd "$basedir/$project"
-            return
-        fi
-    done
-
-    echo "No such project '${project}'."
+  echo "No such project '${project}'."
 }
 
 _pj () {
-    emulate -L zsh
+  local -a projects
+  for basedir ($PROJECT_PATHS); do
+    projects+=(${basedir}/*(/N))
+  done
 
-    typeset -a projects
-    for basedir ($PROJECT_PATHS); do
-        projects+=(${basedir}/*(/N))
-    done
-
-    compadd ${projects:t}
+  compadd ${projects:t}
 }
+
 compdef _pj pj

From 4e2f4cdf686fe560cec3ec7072628c4d0f723929 Mon Sep 17 00:00:00 2001
From: Sang-Yun Oh <syoh@users.noreply.github.com>
Date: Sat, 8 Jan 2022 01:34:42 +0900
Subject: [PATCH 750/869] docs(vi-mode): fix link typo in readme (#10570)

---
 plugins/vi-mode/README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/vi-mode/README.md b/plugins/vi-mode/README.md
index a1d6bc6b0..476666bf6 100644
--- a/plugins/vi-mode/README.md
+++ b/plugins/vi-mode/README.md
@@ -30,10 +30,10 @@ plugins=(... vi-mode)
   ```
 
 - `MODE_INDICATOR`: controls the string displayed when the shell is in normal mode.
-  See [Mode indicator](#mode-indicator) for details.
+  See [Mode indicators](#mode-indicators) for details.
 
 - `INSERT_MODE_INDICATOR`: controls the string displayed when the shell is in insert mode.
-  See [Mode indicator](#mode-indicator) for details.
+  See [Mode indicators](#mode-indicators) for details.
 
 ## Mode indicators
 

From 71e6d5fde87be76205e87eed2e1a306a2f3bc5a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabian=20G=C3=BCnter?= <n4zroth@gmail.com>
Date: Sat, 8 Jan 2022 19:59:59 +0100
Subject: [PATCH 751/869] fix(svn): fix output order in `svn_dirty_choose`
 (#10572)

---
 plugins/svn/svn.plugin.zsh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/svn/svn.plugin.zsh b/plugins/svn/svn.plugin.zsh
index 9c3b50d16..e55e5b2dd 100644
--- a/plugins/svn/svn.plugin.zsh
+++ b/plugins/svn/svn.plugin.zsh
@@ -67,10 +67,10 @@ svn_dirty_choose() {
   root=$(sed -n 's/^Working Copy Root Path: //p' <<< "${1:-$(LANG= svn info 2>/dev/null)}")
   if LANG= svn status "$root" 2>/dev/null | command grep -Eq '^\s*[ACDIM!?L]'; then
     # Grep exits with 0 when "One or more lines were selected", return "dirty".
-    echo $1
+    echo $2
   else
     # Otherwise, no lines were found, or an error occurred. Return clean.
-    echo $2
+    echo $3
   fi
 }
 

From c6e7f8905fb61b927f12f43fb57f8c514cd48a67 Mon Sep 17 00:00:00 2001
From: Joey Territo <54502648+jtt9340@users.noreply.github.com>
Date: Sat, 8 Jan 2022 14:03:32 -0500
Subject: [PATCH 752/869] fix(rust): fix `cargo` completion when sysroot
 contains spaces (#10571)

When generating completions for Cargo, if the Rust sysroot
(i.e. `rustc +${${(z)$(rustup default)}[1]} --print sysroot`) contains
spaces, Cargo completions will not work because the spaces are not
escaped, thus passing two arguments to the "source" command instead of
one. The spaces need to be escaped for this to work.
---
 plugins/rust/rust.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/rust/rust.plugin.zsh b/plugins/rust/rust.plugin.zsh
index 465b701b0..db6ca9e74 100644
--- a/plugins/rust/rust.plugin.zsh
+++ b/plugins/rust/rust.plugin.zsh
@@ -27,5 +27,5 @@ fi
 rustup completions zsh >| "$ZSH_CACHE_DIR/completions/_rustup" &|
 cat >| "$ZSH_CACHE_DIR/completions/_cargo" <<'EOF'
 #compdef cargo
-source $(rustc +${${(z)$(rustup default)}[1]} --print sysroot)/share/zsh/site-functions/_cargo
+source "$(rustc +${${(z)$(rustup default)}[1]} --print sysroot)"/share/zsh/site-functions/_cargo
 EOF

From a92ee838f3e6b1a8dba548673555ebd514939324 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Sun, 9 Jan 2022 20:27:22 +0100
Subject: [PATCH 753/869] fix(cli): follow symlinks in plugin or theme
 completions

---
 lib/cli.zsh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/cli.zsh b/lib/cli.zsh
index 8cf8368e6..0a85402df 100644
--- a/lib/cli.zsh
+++ b/lib/cli.zsh
@@ -61,7 +61,7 @@ function _omz {
           # if command is "disable", only offer already enabled plugins
           valid_plugins=($plugins)
         else
-          valid_plugins=("$ZSH"/plugins/*/{_*,*.plugin.zsh}(.N:h:t) "$ZSH_CUSTOM"/plugins/*/{_*,*.plugin.zsh}(.N:h:t))
+          valid_plugins=("$ZSH"/plugins/*/{_*,*.plugin.zsh}(-.N:h:t) "$ZSH_CUSTOM"/plugins/*/{_*,*.plugin.zsh}(-.N:h:t))
           # if command is "enable", remove already enabled plugins
           [[ "${words[3]}" = enable ]] && valid_plugins=(${valid_plugins:|plugins})
         fi
@@ -69,11 +69,11 @@ function _omz {
         _describe 'plugin' valid_plugins ;;
       plugin::info)
         local -aU plugins
-        plugins=("$ZSH"/plugins/*/{_*,*.plugin.zsh}(.N:h:t) "$ZSH_CUSTOM"/plugins/*/{_*,*.plugin.zsh}(.N:h:t))
+        plugins=("$ZSH"/plugins/*/{_*,*.plugin.zsh}(-.N:h:t) "$ZSH_CUSTOM"/plugins/*/{_*,*.plugin.zsh}(-.N:h:t))
         _describe 'plugin' plugins ;;
       theme::(set|use))
         local -aU themes
-        themes=("$ZSH"/themes/*.zsh-theme(.N:t:r) "$ZSH_CUSTOM"/**/*.zsh-theme(.N:r:gs:"$ZSH_CUSTOM"/themes/:::gs:"$ZSH_CUSTOM"/:::))
+        themes=("$ZSH"/themes/*.zsh-theme(-.N:t:r) "$ZSH_CUSTOM"/**/*.zsh-theme(-.N:r:gs:"$ZSH_CUSTOM"/themes/:::gs:"$ZSH_CUSTOM"/:::))
         _describe 'theme' themes ;;
     esac
   elif (( CURRENT > 4 )); then
@@ -85,7 +85,7 @@ function _omz {
           # if command is "disable", only offer already enabled plugins
           valid_plugins=($plugins)
         else
-          valid_plugins=("$ZSH"/plugins/*/{_*,*.plugin.zsh}(.N:h:t) "$ZSH_CUSTOM"/plugins/*/{_*,*.plugin.zsh}(.N:h:t))
+          valid_plugins=("$ZSH"/plugins/*/{_*,*.plugin.zsh}(-.N:h:t) "$ZSH_CUSTOM"/plugins/*/{_*,*.plugin.zsh}(-.N:h:t))
           # if command is "enable", remove already enabled plugins
           [[ "${words[3]}" = enable ]] && valid_plugins=(${valid_plugins:|plugins})
         fi

From fbdc078fa60c2c34a7f5078846902538d162fbee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Sun, 9 Jan 2022 23:06:34 +0100
Subject: [PATCH 754/869] style: use 24bit colors in Oh My Zsh logo if
 supported

---
 tools/install.sh | 62 ++++++++++++++++++++++++++++++++++++------------
 tools/upgrade.sh | 48 ++++++++++++++++++++++++++++++-------
 2 files changed, 86 insertions(+), 24 deletions(-)

diff --git a/tools/install.sh b/tools/install.sh
index 731d89a29..5009bd586 100755
--- a/tools/install.sh
+++ b/tools/install.sh
@@ -127,6 +127,24 @@ supports_hyperlinks() {
   return 1
 }
 
+# Adapted from code and information by Anton Kochkov (@XVilka)
+# Source: https://gist.github.com/XVilka/8346728
+supports_truecolor() {
+  case "$COLORTERM" in
+  truecolor|24bit) return 0 ;;
+  esac
+
+  case "$TERM" in
+  iterm           |\
+  tmux-truecolor  |\
+  linux-truecolor |\
+  xterm-truecolor |\
+  screen-truecolor) return 0 ;;
+  esac
+
+  return 1
+}
+
 fmt_link() {
   # $1: text, $2: url, $3: fallback mode
   if supports_hyperlinks; then
@@ -155,7 +173,28 @@ fmt_error() {
 
 setup_color() {
   # Only use colors if connected to a terminal
-  if is_tty; then
+  if ! is_tty; then
+    RAINBOW=""
+    RED=""
+    GREEN=""
+    YELLOW=""
+    BLUE=""
+    BOLD=""
+    RESET=""
+    return
+  fi
+
+  if supports_truecolor; then
+    RAINBOW="
+      $(printf '\033[38;2;255;0;0m')
+      $(printf '\033[38;2;255;97;0m')
+      $(printf '\033[38;2;247;255;0m')
+      $(printf '\033[38;2;0;255;30m')
+      $(printf '\033[38;2;77;0;255m')
+      $(printf '\033[38;2;168;0;255m')
+      $(printf '\033[38;2;245;0;172m')
+    "
+  else
     RAINBOW="
       $(printf '\033[38;5;196m')
       $(printf '\033[38;5;202m')
@@ -165,21 +204,14 @@ setup_color() {
       $(printf '\033[38;5;093m')
       $(printf '\033[38;5;163m')
     "
-    RED=$(printf '\033[31m')
-    GREEN=$(printf '\033[32m')
-    YELLOW=$(printf '\033[33m')
-    BLUE=$(printf '\033[34m')
-    BOLD=$(printf '\033[1m')
-    RESET=$(printf '\033[m')
-  else
-    RAINBOW=""
-    RED=""
-    GREEN=""
-    YELLOW=""
-    BLUE=""
-    BOLD=""
-    RESET=""
   fi
+
+  RED=$(printf '\033[31m')
+  GREEN=$(printf '\033[32m')
+  YELLOW=$(printf '\033[33m')
+  BLUE=$(printf '\033[34m')
+  BOLD=$(printf '\033[1m')
+  RESET=$(printf '\033[0m')
 }
 
 setup_ohmyzsh() {
diff --git a/tools/upgrade.sh b/tools/upgrade.sh
index 994ffe9c9..25381de7e 100755
--- a/tools/upgrade.sh
+++ b/tools/upgrade.sh
@@ -86,6 +86,24 @@ supports_hyperlinks() {
   return 1
 }
 
+# Adapted from code and information by Anton Kochkov (@XVilka)
+# Source: https://gist.github.com/XVilka/8346728
+supports_truecolor() {
+  case "$COLORTERM" in
+  truecolor|24bit) return 0 ;;
+  esac
+
+  case "$TERM" in
+  iterm           |\
+  tmux-truecolor  |\
+  linux-truecolor |\
+  xterm-truecolor |\
+  screen-truecolor) return 0 ;;
+  esac
+
+  return 1
+}
+
 fmt_link() {
   # $1: text, $2: url, $3: fallback mode
   if supports_hyperlinks; then
@@ -107,15 +125,27 @@ setopt typeset_silent
 typeset -a RAINBOW
 
 if is_tty; then
-  RAINBOW=(
-    "$(printf '\033[38;5;196m')"
-    "$(printf '\033[38;5;202m')"
-    "$(printf '\033[38;5;226m')"
-    "$(printf '\033[38;5;082m')"
-    "$(printf '\033[38;5;021m')"
-    "$(printf '\033[38;5;093m')"
-    "$(printf '\033[38;5;163m')"
-  )
+  if supports_truecolor; then
+    RAINBOW=(
+      "$(printf '\033[38;2;255;0;0m')"
+      "$(printf '\033[38;2;255;97;0m')"
+      "$(printf '\033[38;2;247;255;0m')"
+      "$(printf '\033[38;2;0;255;30m')"
+      "$(printf '\033[38;2;77;0;255m')"
+      "$(printf '\033[38;2;168;0;255m')"
+      "$(printf '\033[38;2;245;0;172m')"
+    )
+  else
+    RAINBOW=(
+      "$(printf '\033[38;5;196m')"
+      "$(printf '\033[38;5;202m')"
+      "$(printf '\033[38;5;226m')"
+      "$(printf '\033[38;5;082m')"
+      "$(printf '\033[38;5;021m')"
+      "$(printf '\033[38;5;093m')"
+      "$(printf '\033[38;5;163m')"
+    )
+  fi
 
   RED=$(printf '\033[31m')
   GREEN=$(printf '\033[32m')

From 0ca2e48ee8449439a6e0a4ca0652a4ec07031ad3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Mon, 10 Jan 2022 17:22:31 +0100
Subject: [PATCH 755/869] ci(project): fix `gh pr view` call to use ohmyzsh
 repository

---
 .github/workflows/project.yml | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/project.yml b/.github/workflows/project.yml
index 2a27b70fc..bb1063acb 100644
--- a/.github/workflows/project.yml
+++ b/.github/workflows/project.yml
@@ -47,21 +47,23 @@ jobs:
           ISSUE_OR_PR_ID: ${{ github.event.issue.node_id || github.event.pull_request.node_id }}
         run: |
           item_id="$(gh api graphql -f query='
-            mutation($project: ID!, $item: ID!) {
-              addProjectNextItem(input: {projectId: $project, contentId: $item}) {
+            mutation($project: ID!, $content: ID!) {
+              addProjectNextItem(input: {projectId: $project, contentId: $content}) {
                 projectNextItem {
                   id
                 }
               }
             }
-          ' -f project=$PROJECT_ID -f item=$ISSUE_OR_PR_ID --jq '.data.addProjectNextItem.projectNextItem.id')"
+          ' -f project=$PROJECT_ID -f content=$ISSUE_OR_PR_ID --jq '.data.addProjectNextItem.projectNextItem.id')"
 
           echo "ITEM_ID=$item_id" >> $GITHUB_ENV
 
       - name: Classify Pull Request
         if: github.event_name == 'pull_request_target'
         run: |
-          gh pr view ${{ github.event.pull_request.number }} --json files --jq '.files.[].path' | awk -F/ '
+          gh pr view ${{ github.event.pull_request.number }} \
+            --repo ${{ github.repository }} \
+            --json files --jq '.files.[].path' | awk -F/ '
             /^plugins\// {
               plugins[$2] = 1
             }

From 971683762e3aba543b0dc787e8a5ee1c16b5ace7 Mon Sep 17 00:00:00 2001
From: WeZZard <960509+WeZZard@users.noreply.github.com>
Date: Tue, 11 Jan 2022 01:38:35 +0800
Subject: [PATCH 756/869] fix(avit): disable `log.showSignatures` in
 `_git_time_since_commit` (#10072)

---
 themes/avit.zsh-theme | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/themes/avit.zsh-theme b/themes/avit.zsh-theme
index 1e20d8f9f..d117c4e94 100644
--- a/themes/avit.zsh-theme
+++ b/themes/avit.zsh-theme
@@ -31,7 +31,7 @@ function _git_time_since_commit() {
   local last_commit now seconds_since_last_commit
   local minutes hours days years commit_age
   # Only proceed if there is actually a commit.
-  if last_commit=$(git log --pretty=format:'%at' -1 2> /dev/null); then
+  if last_commit=$(command git -c log.showSignatures=false log --format='%at' -1 2>/dev/null); then
     now=$(date +%s)
     seconds_since_last_commit=$((now-last_commit))
 

From 9c84c344d762b200de7acc794b9a0e7832144e7a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Mon, 10 Jan 2022 19:39:05 +0100
Subject: [PATCH 757/869] fix: disable `log.showSignature` in `git log` calls

---
 plugins/git/git.plugin.zsh  | 4 +---
 themes/Soliah.zsh-theme     | 4 +---
 themes/avit.zsh-theme       | 2 +-
 themes/dogenpunk.zsh-theme  | 4 +---
 themes/smt.zsh-theme        | 2 +-
 themes/wedisagree.zsh-theme | 4 +---
 tools/changelog.sh          | 2 +-
 7 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index 648fa0a33..8f7e623ec 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -24,9 +24,7 @@ compdef _git _git_log_prettily=git-log
 
 # Warn if the current branch is a WIP
 function work_in_progress() {
-  if $(git log -n 1 2>/dev/null | grep -q -c "\-\-wip\-\-"); then
-    echo "WIP!!"
-  fi
+  command git -c log.showSignature=false log -n 1 2>/dev/null | grep -q -- "--wip--" && echo "WIP!!"
 }
 
 # Check if main exists and use instead of master
diff --git a/themes/Soliah.zsh-theme b/themes/Soliah.zsh-theme
index 070c54981..c3dd6af89 100644
--- a/themes/Soliah.zsh-theme
+++ b/themes/Soliah.zsh-theme
@@ -45,9 +45,7 @@ function rvm_gemset() {
 function git_time_since_commit() {
     if git rev-parse --git-dir > /dev/null 2>&1; then
         # Only proceed if there is actually a commit.
-        if [[ $(git log 2>&1 > /dev/null | grep -c "^fatal: bad default revision") == 0 ]]; then
-            # Get the last commit.
-            last_commit=`git log --pretty=format:'%at' -1 2> /dev/null`
+        if last_commit=`git -c log.showSignature=false log --pretty=format:'%at' -1 2> /dev/null`; then
             now=`date +%s`
             seconds_since_last_commit=$((now-last_commit))
 
diff --git a/themes/avit.zsh-theme b/themes/avit.zsh-theme
index d117c4e94..f90ba331b 100644
--- a/themes/avit.zsh-theme
+++ b/themes/avit.zsh-theme
@@ -31,7 +31,7 @@ function _git_time_since_commit() {
   local last_commit now seconds_since_last_commit
   local minutes hours days years commit_age
   # Only proceed if there is actually a commit.
-  if last_commit=$(command git -c log.showSignatures=false log --format='%at' -1 2>/dev/null); then
+  if last_commit=$(command git -c log.showSignature=false log --format='%at' -1 2>/dev/null); then
     now=$(date +%s)
     seconds_since_last_commit=$((now-last_commit))
 
diff --git a/themes/dogenpunk.zsh-theme b/themes/dogenpunk.zsh-theme
index 6a9921288..923ca74bc 100644
--- a/themes/dogenpunk.zsh-theme
+++ b/themes/dogenpunk.zsh-theme
@@ -37,9 +37,7 @@ ZSH_THEME_GIT_TIME_SINCE_COMMIT_NEUTRAL="%{$fg[cyan]%}"
 function git_time_since_commit() {
     if git rev-parse --git-dir > /dev/null 2>&1; then
         # Only proceed if there is actually a commit.
-        if git log -n 1  > /dev/null 2>&1; then
-            # Get the last commit.
-            last_commit=`git log --pretty=format:'%at' -1 2> /dev/null`
+        if last_commit=`git -c log.showSignature=false log --pretty=format:'%at' -1 2> /dev/null`; then
             now=`date +%s`
             seconds_since_last_commit=$((now-last_commit))
 
diff --git a/themes/smt.zsh-theme b/themes/smt.zsh-theme
index 7f54472c6..52e6d9a21 100644
--- a/themes/smt.zsh-theme
+++ b/themes/smt.zsh-theme
@@ -40,7 +40,7 @@ function git_time_since_commit() {
     local last_commit seconds_since_last_commit
 
     # Only proceed if there is actually a commit
-    if ! last_commit=$(command git log --pretty=format:'%at' -1 2>/dev/null); then
+    if ! last_commit=$(command git -c log.showSignature=false log --pretty=format:'%at' -1 2>/dev/null); then
         echo "[$ZSH_THEME_GIT_TIME_SINCE_COMMIT_NEUTRAL~%{$reset_color%}]"
         return
     fi
diff --git a/themes/wedisagree.zsh-theme b/themes/wedisagree.zsh-theme
index 07006ecd9..e9e9d6ef8 100644
--- a/themes/wedisagree.zsh-theme
+++ b/themes/wedisagree.zsh-theme
@@ -69,9 +69,7 @@ function rvm_gemset() {
 function git_time_since_commit() {
     if git rev-parse --git-dir > /dev/null 2>&1; then
         # Only proceed if there is actually a commit.
-        if [[ $(git log 2>&1 > /dev/null | grep -c "^fatal: bad default revision") == 0 ]]; then
-            # Get the last commit.
-            last_commit=`git log --pretty=format:'%at' -1 2> /dev/null`
+        if last_commit=`git -c log.showSignature=false log --pretty=format:'%at' -1 2> /dev/null`; then
             now=`date +%s`
             seconds_since_last_commit=$((now-last_commit))
 
diff --git a/tools/changelog.sh b/tools/changelog.sh
index 664f34608..86774a7ea 100755
--- a/tools/changelog.sh
+++ b/tools/changelog.sh
@@ -414,7 +414,7 @@ function main {
   # --first-parent: commits from merged branches are omitted
   local SEP="0mZmAgIcSeP"
   local -a raw_commits
-  raw_commits=(${(0)"$(command git log -z \
+  raw_commits=(${(0)"$(command git -c log.showSignature=false log -z \
     --format="%h${SEP}%D${SEP}%s${SEP}%b" --abbrev=7 \
     --no-merges --first-parent $range)"})
 

From b7a59e6d5c1a699b972a780b4a4eb4ffd89f22b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Tue, 11 Jan 2022 16:18:00 +0100
Subject: [PATCH 758/869] fix(installer): run `chsh` with sudo if user has
 privileges

This fixes the error in Google Cloud Shell, where a password prompt
appears when running `chsh` but the user (hello) does not have a
password.

If ran with `sudo`, the `chsh` command happens without a password
prompt.
---
 tools/install.sh | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/tools/install.sh b/tools/install.sh
index 5009bd586..d3be1ace4 100755
--- a/tools/install.sh
+++ b/tools/install.sh
@@ -317,7 +317,7 @@ EOF
     "$YELLOW" "$RESET"
   read -r opt
   case $opt in
-    y*|Y*|"") echo "Changing the shell..." ;;
+    y*|Y*|"") ;;
     n*|N*) echo "Shell change skipped."; return ;;
     *) echo "Invalid choice. Shell change skipped."; return ;;
   esac
@@ -355,11 +355,20 @@ EOF
   if [ -n "$SHELL" ]; then
     echo "$SHELL" > ~/.shell.pre-oh-my-zsh
   else
-    grep "^$USERNAME:" /etc/passwd | awk -F: '{print $7}' > ~/.shell.pre-oh-my-zsh
+    grep "^$USER:" /etc/passwd | awk -F: '{print $7}' > ~/.shell.pre-oh-my-zsh
   fi
 
-  # Actually change the default shell to zsh
-  if ! chsh -s "$zsh"; then
+  echo "Changing your shell to $zsh..."
+
+  # Check if user has sudo privileges and run `chsh` or `sudo chsh`
+  if LANG= sudo -l -U "$USER" 2>/dev/null | grep -q "is not allowed to run"; then
+    chsh -s "$zsh" "$USER"          # run chsh normally
+  else
+    sudo -k chsh -s "$zsh" "$USER"  # -k forces the password prompt
+  fi
+
+  # Check if the shell change was successful
+  if [ $? -ne 0 ]; then
     fmt_error "chsh command unsuccessful. Change your default shell manually."
   else
     export SHELL="$zsh"

From a0a949de56f7bc63403c521bfb1d7426843ec5b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Tue, 11 Jan 2022 18:56:18 +0100
Subject: [PATCH 759/869] fix(installer): fix `sudo` check for users with
 password or without privileges

The previous check only worked if the user could run `sudo` without typing the
password, which is almost none (I checked in Google Cloud Shell so I failed to
notice this).

This new check works whether the user has no sudo privileges, or if it has,
whether they have to type in the password or not.

It should really be easier to check if the user doesn't have privilege without
having to make them type the password.
---
 tools/install.sh | 34 ++++++++++++++++++++++++++++++++--
 1 file changed, 32 insertions(+), 2 deletions(-)

diff --git a/tools/install.sh b/tools/install.sh
index d3be1ace4..b7498fa64 100755
--- a/tools/install.sh
+++ b/tools/install.sh
@@ -56,6 +56,28 @@ command_exists() {
   command -v "$@" >/dev/null 2>&1
 }
 
+user_can_sudo() {
+  # The following command has 3 parts:
+  #
+  # 1. Run `sudo` with `-v`. Does the following:
+  #    • with privilege: asks for a password immediately.
+  #    • without privilege: exits with error code 1 and prints the message:
+  #      Sorry, user <username> may not run sudo on <hostname>
+  #
+  # 2. Pass `-S` to `sudo` to tell it to get the password from stdin
+  #    instead of from a tty, and pipe `true` to `sudo`, since it doesn't
+  #    output anything. This will make sudo exit with error code 1 and print
+  #    the message:
+  #    sudo: no password was provided
+  #
+  # 3. Check for the words "may not run sudo" in the output to really tell
+  #    whether the user has privileges or not. For that we have to make sure
+  #    to run `sudo` in the default locale (with `LANG=`) so that the message
+  #    stays consistent regardless of the user's locale.
+  #
+  true | LANG= sudo -v -S 2>&1 | grep -q "may not run sudo"
+}
+
 # The [ -t 1 ] check only works when the function is not called from
 # a subshell (like in `$(...)` or `(...)`, so this hack redefines the
 # function at the top level to always return false when stdout is not
@@ -360,8 +382,16 @@ EOF
 
   echo "Changing your shell to $zsh..."
 
-  # Check if user has sudo privileges and run `chsh` or `sudo chsh`
-  if LANG= sudo -l -U "$USER" 2>/dev/null | grep -q "is not allowed to run"; then
+  # Check if user has sudo privileges to run `chsh` with or without `sudo`
+  #
+  # This allows the call to succeed without password on systems where the
+  # user does not have a password but does have sudo privileges, like in
+  # Google Cloud Shell.
+  #
+  # On systems that don't have a user with passwordless sudo, the user will
+  # be prompted for the password either way, so this shouldn't cause any issues.
+  #
+  if user_can_sudo; then
     chsh -s "$zsh" "$USER"          # run chsh normally
   else
     sudo -k chsh -s "$zsh" "$USER"  # -k forces the password prompt

From c63ba17525b0b4344729762253c9d9e1c0823d49 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Tue, 11 Jan 2022 19:53:50 +0100
Subject: [PATCH 760/869] refactor(installer): simplify `user_can_sudo` check

---
 tools/install.sh | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/tools/install.sh b/tools/install.sh
index b7498fa64..d3f1ee640 100755
--- a/tools/install.sh
+++ b/tools/install.sh
@@ -64,18 +64,18 @@ user_can_sudo() {
   #    • without privilege: exits with error code 1 and prints the message:
   #      Sorry, user <username> may not run sudo on <hostname>
   #
-  # 2. Pass `-S` to `sudo` to tell it to get the password from stdin
-  #    instead of from a tty, and pipe `true` to `sudo`, since it doesn't
-  #    output anything. This will make sudo exit with error code 1 and print
-  #    the message:
-  #    sudo: no password was provided
+  # 2. Pass `-n` to `sudo` to tell it to not ask for a password. If the
+  #    password is not required, the command will finish with exit code 0.
+  #    If one is required, sudo will exit with error code 1 and print the
+  #    message:
+  #    sudo: a password is required
   #
   # 3. Check for the words "may not run sudo" in the output to really tell
   #    whether the user has privileges or not. For that we have to make sure
   #    to run `sudo` in the default locale (with `LANG=`) so that the message
   #    stays consistent regardless of the user's locale.
   #
-  true | LANG= sudo -v -S 2>&1 | grep -q "may not run sudo"
+  LANG= sudo -n -v 2>&1 | grep -q "may not run sudo"
 }
 
 # The [ -t 1 ] check only works when the function is not called from

From b4819557618bbf8452c612f614ad824d243bb376 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Tue, 11 Jan 2022 23:40:33 +0100
Subject: [PATCH 761/869] ci(project): fix .list files not found error

---
 .github/workflows/project.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/project.yml b/.github/workflows/project.yml
index bb1063acb..800761554 100644
--- a/.github/workflows/project.yml
+++ b/.github/workflows/project.yml
@@ -61,6 +61,8 @@ jobs:
       - name: Classify Pull Request
         if: github.event_name == 'pull_request_target'
         run: |
+          touch plugins.list themes.list
+
           gh pr view ${{ github.event.pull_request.number }} \
             --repo ${{ github.repository }} \
             --json files --jq '.files.[].path' | awk -F/ '

From 93cea53618ebd3f108275c88c948f790492337b4 Mon Sep 17 00:00:00 2001
From: Carlo Sala <carlosalag@protonmail.com>
Date: Wed, 12 Jan 2022 12:19:34 +0100
Subject: [PATCH 762/869] fix(yarn): update completion (#10579)

Fixes #10578
---
 plugins/yarn/_yarn | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/yarn/_yarn b/plugins/yarn/_yarn
index 9db02602e..1237ba672 100644
--- a/plugins/yarn/_yarn
+++ b/plugins/yarn/_yarn
@@ -116,7 +116,7 @@ _yarn_commands_scripts() {
   fi
 
   if [[ -n $packageJson ]]; then
-    scripts=($(cat "$packageJson" | perl -0777 -MJSON::PP -n -E '%r=decode_json($_); say for sort keys %{$r->{scripts}}'))
+    scripts=($(cat "$packageJson" | perl -0777 -MJSON::PP -n -E '$r=decode_json($_); do{($k=$_)=~s/:/\\:/g;say $k}for sort keys %{$r->{scripts}}'))
   fi
 
   _describe 'command or script' _commands -- _global_commands -- scripts -- binaries
@@ -144,7 +144,7 @@ _yarn_scripts() {
   fi
 
   if [[ -n $packageJson ]]; then
-    scripts=("${(@f)$(cat ${packageJson} | perl -0777 -MJSON::PP -n -E '%r=%{decode_json($_)->{scripts}}; printf "$_:$r{$_}\n" for sort keys %r')}")
+    scripts=("${(@f)$(cat ${packageJson} | perl -0777 -MJSON::PP -n -E '%r=%{decode_json($_)->{scripts}}; do{$k=$_;($e=$k)=~s/:/\\:/g; printf "$e:$r{$k}\n"} for sort keys %r')}")
   fi
 
   commands=('env' $scripts $binaries)

From bddecfed58058910f0aeb78d9010f4f8f6d83692 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Thu, 13 Jan 2022 12:34:10 +0100
Subject: [PATCH 763/869] style(updater): remove statl from `git pull`

---
 tools/upgrade.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/upgrade.sh b/tools/upgrade.sh
index 25381de7e..55412062a 100755
--- a/tools/upgrade.sh
+++ b/tools/upgrade.sh
@@ -194,7 +194,7 @@ last_commit=$(git rev-parse "$branch")
 
 # Update Oh My Zsh
 printf "${BLUE}%s${RESET}\n" "Updating Oh My Zsh"
-if git pull --rebase --stat $remote $branch; then
+if git pull --rebase $remote $branch; then
   # Check if it was really updated or not
   if [[ "$(git rev-parse HEAD)" = "$last_commit" ]]; then
     message="Oh My Zsh is already at the latest version."

From aaebe4c890394cb5d345c949aecb77aaf30b9c56 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Thu, 13 Jan 2022 14:29:12 +0100
Subject: [PATCH 764/869] fix(mvn): fix listing modules in completion (#10586)

---
 plugins/mvn/mvn.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/mvn/mvn.plugin.zsh b/plugins/mvn/mvn.plugin.zsh
index e32729aa6..1b9141f21 100644
--- a/plugins/mvn/mvn.plugin.zsh
+++ b/plugins/mvn/mvn.plugin.zsh
@@ -117,7 +117,7 @@ function listMavenCompletions {
   done
 
   # List modules
-  modules=($(find **/pom.xml -type f | grep -v '/target/classes/META-INF/' | grep '/pom.xml' |sed 's|\(.*\)/pom\.xml|\1|'))
+  modules=($(print -l **/pom.xml(-.N:h) | grep -v '/target/classes/META-INF/'))
 
   reply=(
     # common lifecycle

From 805427e06bc0549c7b9a4f50d3e39bbf68043f16 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Thu, 13 Jan 2022 17:28:15 +0100
Subject: [PATCH 765/869] fix(updater): give priority to `zstyle` settings if
 set (#10587)

Fixes #10587
---
 tools/check_for_upgrade.sh | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/tools/check_for_upgrade.sh b/tools/check_for_upgrade.sh
index 293f48edf..729d8ecb5 100644
--- a/tools/check_for_upgrade.sh
+++ b/tools/check_for_upgrade.sh
@@ -10,11 +10,13 @@ fi
 # - auto: the update is performed automatically when it's time
 # - reminder: a reminder is shown to the user when it's time to update
 # - disabled: automatic update is turned off
-zstyle -s ':omz:update' mode update_mode || update_mode=prompt
+zstyle -s ':omz:update' mode update_mode || {
+  update_mode=prompt
 
-# Support old-style settings
-[[ "$DISABLE_UPDATE_PROMPT" != true ]] || update_mode=auto
-[[ "$DISABLE_AUTO_UPDATE" != true ]] || update_mode=disabled
+  # If the mode zstyle setting is not set, support old-style settings
+  [[ "$DISABLE_UPDATE_PROMPT" != true ]] || update_mode=auto
+  [[ "$DISABLE_AUTO_UPDATE" != true ]] || update_mode=disabled
+}
 
 # Cancel update if:
 # - the automatic update is disabled.

From 035c856c2cbbad2b45252ec8c065c3a9e7eefa65 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Thu, 13 Jan 2022 17:46:09 +0100
Subject: [PATCH 766/869] fix: get branch name first in `omz version` and
 changelog

---
 lib/cli.zsh        | 7 ++++---
 tools/changelog.sh | 6 +++---
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/lib/cli.zsh b/lib/cli.zsh
index 0a85402df..ec59d1d44 100644
--- a/lib/cli.zsh
+++ b/lib/cli.zsh
@@ -791,12 +791,13 @@ function _omz::version {
 
     # Get the version name:
     # 1) try tag-like version
-    # 2) try name-rev
-    # 3) try branch name
+    # 2) try branch name
+    # 3) try name-rev (tag~<rev> or branch~<rev>)
     local version
     version=$(command git describe --tags HEAD 2>/dev/null) \
+    || version=$(command git symbolic-ref --quiet --short HEAD 2>/dev/null) \
     || version=$(command git name-rev --no-undefined --name-only --exclude="remotes/*" HEAD 2>/dev/null) \
-    || version=$(command git symbolic-ref --quiet --short HEAD 2>/dev/null)
+    || version="<detached>"
 
     # Get short hash for the current HEAD
     local commit=$(command git rev-parse --short HEAD 2>/dev/null)
diff --git a/tools/changelog.sh b/tools/changelog.sh
index 86774a7ea..49532a4a4 100755
--- a/tools/changelog.sh
+++ b/tools/changelog.sh
@@ -395,12 +395,12 @@ function main {
 
   # Get the first version name:
   # 1) try tag-like version, or
-  # 2) try name-rev, or
-  # 3) try branch name, or
+  # 2) try branch name, or
+  # 3) try name-rev, or
   # 4) try short hash
   version=$(command git describe --tags $until 2>/dev/null) \
-    || version=$(command git name-rev --no-undefined --name-only --exclude="remotes/*" $until 2>/dev/null) \
     || version=$(command git symbolic-ref --quiet --short $until 2>/dev/null) \
+    || version=$(command git name-rev --no-undefined --name-only --exclude="remotes/*" $until 2>/dev/null) \
     || version=$(command git rev-parse --short $until 2>/dev/null)
 
   # Get commit list from $until commit until $since commit, or until root commit if $since is unset

From 1e277553bcc9f23a904bf728013df6ebfe339e74 Mon Sep 17 00:00:00 2001
From: Mykola Krachkovsky <w01dnick@gmail.com>
Date: Fri, 14 Jan 2022 16:28:39 +0200
Subject: [PATCH 767/869] fix(svn): fix sed call in `svn_get_rev_nr` (#10590)

---
 plugins/svn/svn.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/svn/svn.plugin.zsh b/plugins/svn/svn.plugin.zsh
index e55e5b2dd..22b07b4ec 100644
--- a/plugins/svn/svn.plugin.zsh
+++ b/plugins/svn/svn.plugin.zsh
@@ -55,7 +55,7 @@ svn_get_branch_name() {
 }
 
 svn_get_rev_nr() {
-  sed -n 's/Revision:\ //p' "${1:-$(LANG= svn info 2>/dev/null)}"
+  sed -n 's/Revision:\ //p' <<<"${1:-$(LANG= svn info 2>/dev/null)}"
 }
 
 svn_dirty() {

From 567bd593954641bd59376f6fd5f9c06bf37bc9e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Mon, 17 Jan 2022 13:18:10 +0100
Subject: [PATCH 768/869] refactor(cli): use self-referencing in subcommand
 functions

---
 lib/cli.zsh | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/lib/cli.zsh b/lib/cli.zsh
index ec59d1d44..70076bcfb 100644
--- a/lib/cli.zsh
+++ b/lib/cli.zsh
@@ -182,7 +182,7 @@ function _omz::changelog {
     ! command git rev-parse --verify "${version}^{commit}"
   ) &>/dev/null; then
     cat >&2 <<EOF
-Usage: omz changelog [version]
+Usage: ${(j: :)${(s.::.)0#_}} [version]
 
 NOTE: <version> must be a valid branch, tag or commit.
 EOF
@@ -193,9 +193,9 @@ EOF
 }
 
 function _omz::plugin {
-  (( $# > 0 && $+functions[_omz::plugin::$1] )) || {
+  (( $# > 0 && $+functions[$0::$1] )) || {
     cat >&2 <<EOF
-Usage: omz plugin <command> [options]
+Usage: ${(j: :)${(s.::.)0#_}} <command> [options]
 
 Available commands:
 
@@ -212,12 +212,12 @@ EOF
   local command="$1"
   shift
 
-  _omz::plugin::$command "$@"
+  $0::$command "$@"
 }
 
 function _omz::plugin::disable {
   if [[ -z "$1" ]]; then
-    echo >&2 "Usage: omz plugin disable <plugin> [...]"
+    echo >&2 "Usage: ${(j: :)${(s.::.)0#_}} <plugin> [...]"
     return 1
   fi
 
@@ -307,7 +307,7 @@ multi == 1 && length(\$0) > 0 {
 
 function _omz::plugin::enable {
   if [[ -z "$1" ]]; then
-    echo >&2 "Usage: omz plugin enable <plugin> [...]"
+    echo >&2 "Usage: ${(j: :)${(s.::.)0#_}} <plugin> [...]"
     return 1
   fi
 
@@ -383,7 +383,7 @@ multi == 1 && /^[^#]*\)/ {
 
 function _omz::plugin::info {
   if [[ -z "$1" ]]; then
-    echo >&2 "Usage: omz plugin info <plugin>"
+    echo >&2 "Usage: ${(j: :)${(s.::.)0#_}} <plugin>"
     return 1
   fi
 
@@ -430,7 +430,7 @@ function _omz::plugin::list {
 
 function _omz::plugin::load {
   if [[ -z "$1" ]]; then
-    echo >&2 "Usage: omz plugin load <plugin> [...]"
+    echo >&2 "Usage: ${(j: :)${(s.::.)0#_}} <plugin> [...]"
     return 1
   fi
 
@@ -477,9 +477,9 @@ function _omz::plugin::load {
 }
 
 function _omz::pr {
-  (( $# > 0 && $+functions[_omz::pr::$1] )) || {
+  (( $# > 0 && $+functions[$0::$1] )) || {
     cat >&2 <<EOF
-Usage: omz pr <command> [options]
+Usage: ${(j: :)${(s.::.)0#_}} <command> [options]
 
 Available commands:
 
@@ -493,7 +493,7 @@ EOF
   local command="$1"
   shift
 
-  _omz::pr::$command "$@"
+  $0::$command "$@"
 }
 
 function _omz::pr::clean {
@@ -534,7 +534,7 @@ function _omz::pr::test {
 
   # Check the input
   if ! [[ -n "$1" && "$1" =~ ^[[:digit:]]+$ ]]; then
-    echo >&2 "Usage: omz pr test <PR_NUMBER_or_URL>"
+    echo >&2 "Usage: ${(j: :)${(s.::.)0#_}} <PR_NUMBER_or_URL>"
     return 1
   fi
 
@@ -619,9 +619,9 @@ function _omz::reload {
 }
 
 function _omz::theme {
-  (( $# > 0 && $+functions[_omz::theme::$1] )) || {
+  (( $# > 0 && $+functions[$0::$1] )) || {
     cat >&2 <<EOF
-Usage: omz theme <command> [options]
+Usage: ${(j: :)${(s.::.)0#_}} <command> [options]
 
 Available commands:
 
@@ -636,7 +636,7 @@ EOF
   local command="$1"
   shift
 
-  _omz::theme::$command "$@"
+  $0::$command "$@"
 }
 
 function _omz::theme::list {
@@ -671,7 +671,7 @@ function _omz::theme::list {
 
 function _omz::theme::set {
   if [[ -z "$1" ]]; then
-    echo >&2 "Usage: omz theme set <theme>"
+    echo >&2 "Usage: ${(j: :)${(s.::.)0#_}} <theme>"
     return 1
   fi
 
@@ -739,7 +739,7 @@ EOF
 
 function _omz::theme::use {
   if [[ -z "$1" ]]; then
-    echo >&2 "Usage: omz theme use <theme>"
+    echo >&2 "Usage: ${(j: :)${(s.::.)0#_}} <theme>"
     return 1
   fi
 

From dfaad779a9bbe1f83e30820d227d4b7870bdf33f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Mon, 17 Jan 2022 12:45:59 +0100
Subject: [PATCH 769/869] fix(helm): fix completion loading mechanism

---
 plugins/helm/helm.plugin.zsh | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/plugins/helm/helm.plugin.zsh b/plugins/helm/helm.plugin.zsh
index c6b91693a..cadfa551a 100644
--- a/plugins/helm/helm.plugin.zsh
+++ b/plugins/helm/helm.plugin.zsh
@@ -11,12 +11,12 @@ command rm -f "${ZSH_CACHE_DIR}/helm_completion"
 command mkdir -p "$ZSH_CACHE_DIR/completions"
 (( ${fpath[(Ie)"$ZSH_CACHE_DIR/completions"]} )) || fpath=("$ZSH_CACHE_DIR/completions" $fpath)
 
-# If the completion file doesn't exist yet, we need to autoload it and
-# bind it to `helm`. Otherwise, compinit will have already done that.
+# If the completion file does not exist, generate it and then source it
+# Otherwise, source it and regenerate in the background
 if [[ ! -f "$ZSH_CACHE_DIR/completions/_helm" ]]; then
-  typeset -g -A _comps
-  autoload -Uz _helm
-  _comps[helm]=_helm
+  helm completion zsh >| "$ZSH_CACHE_DIR/completions/_helm"
+  source "$ZSH_CACHE_DIR/completions/_helm"
+else
+  source "$ZSH_CACHE_DIR/completions/_helm"
+  helm completion zsh >| "$ZSH_CACHE_DIR/completions/_helm" &|
 fi
-
-helm completion zsh >| "$ZSH_CACHE_DIR/completions/_helm" &|

From 4f2d8b4d4cbc51e609f4b568e87907883422ab41 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Mon, 17 Jan 2022 12:46:20 +0100
Subject: [PATCH 770/869] fix(kubectl): source completion instead of
 autoloading it

---
 plugins/kubectl/kubectl.plugin.zsh | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/plugins/kubectl/kubectl.plugin.zsh b/plugins/kubectl/kubectl.plugin.zsh
index bf602bb7b..6edb59751 100644
--- a/plugins/kubectl/kubectl.plugin.zsh
+++ b/plugins/kubectl/kubectl.plugin.zsh
@@ -8,15 +8,15 @@ if (( $+commands[kubectl] )); then
   command mkdir -p "$ZSH_CACHE_DIR/completions"
   (( ${fpath[(Ie)"$ZSH_CACHE_DIR/completions"]} )) || fpath=("$ZSH_CACHE_DIR/completions" $fpath)
 
-  # If the completion file doesn't exist yet, we need to autoload it and
-  # bind it to `kubectl`. Otherwise, compinit will have already done that.
+  # If the completion file does not exist, generate it and then source it
+  # Otherwise, source it and regenerate in the background
   if [[ ! -f "$ZSH_CACHE_DIR/completions/_kubectl" ]]; then
-    typeset -g -A _comps
-    autoload -Uz _kubectl
-    _comps[kubectl]=_kubectl
+    kubectl completion zsh >| "$ZSH_CACHE_DIR/completions/_kubectl"
+    source "$ZSH_CACHE_DIR/completions/_kubectl"
+  else
+    source "$ZSH_CACHE_DIR/completions/_kubectl"
+    kubectl completion zsh >| "$ZSH_CACHE_DIR/completions/_kubectl" &|
   fi
-
-  kubectl completion zsh >! "$ZSH_CACHE_DIR/completions/_kubectl" &|
 fi
 
 # This command is used a LOT both below and in daily life

From 540b2200afb68a3282419ffb6c49bbf8f642b67e Mon Sep 17 00:00:00 2001
From: Carlo Sala <carlosalag@protonmail.com>
Date: Tue, 18 Jan 2022 18:46:14 +0100
Subject: [PATCH 771/869] feat(sudo): respect `$SUDO_EDITOR` and `$VISUAL`,
 switch to `sudo -e` (#10596)

---
 plugins/sudo/README.md       | 16 ++++++++++++++++
 plugins/sudo/sudo.plugin.zsh | 15 ++++++++++-----
 2 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/plugins/sudo/README.md b/plugins/sudo/README.md
index 012fc5325..27cd20c18 100644
--- a/plugins/sudo/README.md
+++ b/plugins/sudo/README.md
@@ -24,6 +24,20 @@ By pressing the <kbd>esc</kbd> key twice, you will have the same command with `s
 $ sudo apt-get install build-essential
 ```
 
+The same happens for editing files with your default editor (defined in `$SUDO_EDITOR`, `$VISUAL` or `$EDITOR`, in that order):
+
+If the editor defined were `vim`:
+
+```console
+$ vim /etc/hosts
+```
+
+By pressing the <kbd>esc</kbd> key twice, you will have the same command with `sudo -e` instead of the editor, that would open that editor with root privileges:
+
+```console
+$ sudo -e /etc/hosts
+```
+
 ### Previous executed commands
 
 Say you want to delete a system file and denied:
@@ -44,6 +58,8 @@ Password:
 $
 ```
 
+The same happens for file editing, as told before.
+
 ## Key binding
 
 By default, the `sudo` plugin uses <kbd>Esc</kbd><kbd>Esc</kbd> as the trigger.
diff --git a/plugins/sudo/sudo.plugin.zsh b/plugins/sudo/sudo.plugin.zsh
index e02f88a87..e8d183414 100644
--- a/plugins/sudo/sudo.plugin.zsh
+++ b/plugins/sudo/sudo.plugin.zsh
@@ -2,7 +2,7 @@
 # Description
 # -----------
 #
-# sudo or sudoedit will be inserted before the command
+# sudo or sudo -e (replacement for sudoedit) will be inserted before the command
 #
 # ------------------------------------------------------------------------------
 # Authors
@@ -11,6 +11,7 @@
 # * Dongweiming <ciici123@gmail.com>
 # * Subhaditya Nath <github.com/subnut>
 # * Marc Cornellà <github.com/mcornella>
+# * Carlo Sala <carlosalag@protonmail.com>
 #
 # ------------------------------------------------------------------------------
 
@@ -35,10 +36,14 @@ sudo-command-line() {
     LBUFFER="${LBUFFER:1}"
   fi
 
+  # If $SUDO_EDITOR or $VISUAL are defined, then use that as $EDITOR
+  # Else use the default $EDITOR
+  local EDITOR=${SUDO_EDITOR:-${VISUAL:-$EDITOR}}
+
   # If $EDITOR is not set, just toggle the sudo prefix on and off
   if [[ -z "$EDITOR" ]]; then
     case "$BUFFER" in
-      sudoedit\ *) __sudo-replace-buffer "sudoedit" "" ;;
+      sudo\ -e\ *) __sudo-replace-buffer "sudo -e" "" ;;
       sudo\ *) __sudo-replace-buffer "sudo" "" ;;
       *) LBUFFER="sudo $LBUFFER" ;;
     esac
@@ -72,9 +77,9 @@ sudo-command-line() {
 
     # Check for editor commands in the typed command and replace accordingly
     case "$BUFFER" in
-      $editorcmd\ *) __sudo-replace-buffer "$editorcmd" "sudoedit" ;;
-      \$EDITOR\ *) __sudo-replace-buffer '$EDITOR' "sudoedit" ;;
-      sudoedit\ *) __sudo-replace-buffer "sudoedit" "$EDITOR" ;;
+      $editorcmd\ *) __sudo-replace-buffer "$editorcmd" "sudo -e" ;;
+      \$EDITOR\ *) __sudo-replace-buffer '$EDITOR' "sudo -e" ;;
+      sudo\ -e\ *) __sudo-replace-buffer "sudo -e" "$EDITOR" ;;
       sudo\ *) __sudo-replace-buffer "sudo" "" ;;
       *) LBUFFER="sudo $LBUFFER" ;;
     esac

From 957dca698cd0a0cafc6d2551eeff19fe223f41bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Tue, 18 Jan 2022 19:03:27 +0100
Subject: [PATCH 772/869] style(sudo): clean code style and reorganise logic

---
 plugins/sudo/sudo.plugin.zsh | 50 +++++++++++++++++++++---------------
 1 file changed, 29 insertions(+), 21 deletions(-)

diff --git a/plugins/sudo/sudo.plugin.zsh b/plugins/sudo/sudo.plugin.zsh
index e8d183414..2a0b3bfc4 100644
--- a/plugins/sudo/sudo.plugin.zsh
+++ b/plugins/sudo/sudo.plugin.zsh
@@ -17,9 +17,13 @@
 
 __sudo-replace-buffer() {
   local old=$1 new=$2 space=${2:+ }
-  if [[ ${#LBUFFER} -le ${#old} ]]; then
-    RBUFFER="${space}${BUFFER#$old }"
-    LBUFFER="${new}"
+
+  # if the cursor is positioned in the $old part of the text, make
+  # the substitution and leave the cursor after the $new text
+  if [[ $CURSOR -le ${#old} ]]; then
+    BUFFER="${new}${space}${BUFFER#$old }"
+    CURSOR=${#new}
+  # otherwise just replace $old with $new in the text before the cursor
   else
     LBUFFER="${new}${space}${LBUFFER#$old }"
   fi
@@ -36,18 +40,21 @@ sudo-command-line() {
     LBUFFER="${LBUFFER:1}"
   fi
 
-  # If $SUDO_EDITOR or $VISUAL are defined, then use that as $EDITOR
-  # Else use the default $EDITOR
-  local EDITOR=${SUDO_EDITOR:-${VISUAL:-$EDITOR}}
+  {
+    # If $SUDO_EDITOR or $VISUAL are defined, then use that as $EDITOR
+    # Else use the default $EDITOR
+    local EDITOR=${SUDO_EDITOR:-${VISUAL:-$EDITOR}}
+
+    # If $EDITOR is not set, just toggle the sudo prefix on and off
+    if [[ -z "$EDITOR" ]]; then
+      case "$BUFFER" in
+        sudo\ -e\ *) __sudo-replace-buffer "sudo -e" "" ;;
+        sudo\ *) __sudo-replace-buffer "sudo" "" ;;
+        *) LBUFFER="sudo $LBUFFER" ;;
+      esac
+      return
+    fi
 
-  # If $EDITOR is not set, just toggle the sudo prefix on and off
-  if [[ -z "$EDITOR" ]]; then
-    case "$BUFFER" in
-      sudo\ -e\ *) __sudo-replace-buffer "sudo -e" "" ;;
-      sudo\ *) __sudo-replace-buffer "sudo" "" ;;
-      *) LBUFFER="sudo $LBUFFER" ;;
-    esac
-  else
     # Check if the typed command is really an alias to $EDITOR
 
     # Get the first part of the typed command
@@ -72,7 +79,8 @@ sudo-command-line() {
     if [[ "$realcmd" = (\$EDITOR|$editorcmd|${editorcmd:c}) \
       || "${realcmd:c}" = ($editorcmd|${editorcmd:c}) ]] \
       || builtin which -a "$realcmd" | command grep -Fx -q "$editorcmd"; then
-      editorcmd="$cmd" # replace $editorcmd with the typed command so it matches below
+      __sudo-replace-buffer "$cmd" "sudo -e"
+      return
     fi
 
     # Check for editor commands in the typed command and replace accordingly
@@ -83,13 +91,13 @@ sudo-command-line() {
       sudo\ *) __sudo-replace-buffer "sudo" "" ;;
       *) LBUFFER="sudo $LBUFFER" ;;
     esac
-  fi
+  } always {
+    # Preserve beginning space
+    LBUFFER="${WHITESPACE}${LBUFFER}"
 
-  # Preserve beginning space
-  LBUFFER="${WHITESPACE}${LBUFFER}"
-
-  # Redisplay edit buffer (compatibility with zsh-syntax-highlighting)
-  zle redisplay
+    # Redisplay edit buffer (compatibility with zsh-syntax-highlighting)
+    zle redisplay
+  }
 }
 
 zle -N sudo-command-line

From cddf1b69820c9fe3d33a0f00ac6eab37b9d67377 Mon Sep 17 00:00:00 2001
From: Marco Franssen <marco.franssen@gmail.com>
Date: Tue, 18 Jan 2022 20:57:07 +0100
Subject: [PATCH 773/869] feat(fig): add plugin for Fig (#10432)

---
 plugins/fig/README.md      |  9 +++++++++
 plugins/fig/fig.plugin.zsh | 13 +++++++++++++
 2 files changed, 22 insertions(+)
 create mode 100644 plugins/fig/README.md
 create mode 100644 plugins/fig/fig.plugin.zsh

diff --git a/plugins/fig/README.md b/plugins/fig/README.md
new file mode 100644
index 000000000..3861958d6
--- /dev/null
+++ b/plugins/fig/README.md
@@ -0,0 +1,9 @@
+# Fig plugin
+
+This plugin sets up completion for [Fig](https://fig.io/).
+
+To use it, add `fig` to the plugins array in your zshrc file:
+
+```zsh
+plugins=(... fig)
+```
diff --git a/plugins/fig/fig.plugin.zsh b/plugins/fig/fig.plugin.zsh
new file mode 100644
index 000000000..60678bfda
--- /dev/null
+++ b/plugins/fig/fig.plugin.zsh
@@ -0,0 +1,13 @@
+if ! (( $+commands[fig] )); then
+  return
+fi
+
+# If the completion file doesn't exist yet, we need to autoload it and
+# bind it to `fig`. Otherwise, compinit will have already done that
+if [[ ! -f "$ZSH_CACHE_DIR/completions/_fig" ]]; then
+  autoload -Uz _fig
+  typeset -g -A _comps
+  _comps[fig]=_fig
+fi
+
+fig completions zsh >| "$ZSH_CACHE_DIR/completions/_fig" &|

From 22c11da108764336d92d03d3113c1f486cdb5911 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Tue, 18 Jan 2022 21:26:45 +0100
Subject: [PATCH 774/869] fix(fig): fix typo in completion command

---
 plugins/fig/fig.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/fig/fig.plugin.zsh b/plugins/fig/fig.plugin.zsh
index 60678bfda..cddb6c7c0 100644
--- a/plugins/fig/fig.plugin.zsh
+++ b/plugins/fig/fig.plugin.zsh
@@ -10,4 +10,4 @@ if [[ ! -f "$ZSH_CACHE_DIR/completions/_fig" ]]; then
   _comps[fig]=_fig
 fi
 
-fig completions zsh >| "$ZSH_CACHE_DIR/completions/_fig" &|
+fig completion zsh >| "$ZSH_CACHE_DIR/completions/_fig" &|

From fe9d87d6dc2f3e6194862799b0707f97844e83ac Mon Sep 17 00:00:00 2001
From: Mike Mattice <mmattice@users.noreply.github.com>
Date: Wed, 19 Jan 2022 08:58:34 -0600
Subject: [PATCH 775/869] feat(aws): accept aws mfa tokencode on `acp` cli call
 (#10130)

Co-authored-by: Mike Mattice <mmattice@reliant.io>
---
 plugins/aws/README.md      | 8 ++++----
 plugins/aws/aws.plugin.zsh | 8 +++++---
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/plugins/aws/README.md b/plugins/aws/README.md
index 24c6429dd..d6f4f4600 100644
--- a/plugins/aws/README.md
+++ b/plugins/aws/README.md
@@ -16,10 +16,10 @@ plugins=(... aws)
   Run `asp` without arguments to clear the profile.
 * `asp [<profile>] login`: If AWS SSO has been configured in your aws profile, it will run the `aws sso login` command following profile selection. 
 
-* `acp [<profile>]`: in addition to `asp` functionality, it actually changes the profile by
-   assuming the role specified in the `<profile>` configuration. It supports MFA and sets
-   `$AWS_ACCESS_KEY_ID`, `$AWS_SECRET_ACCESS_KEY` and `$AWS_SESSION_TOKEN`, if obtained. It
-   requires the roles to be configured as per the
+* `acp [<profile>] [<mfa_token>]`: in addition to `asp` functionality, it actually changes
+   the profile by assuming the role specified in the `<profile>` configuration. It supports
+   MFA and sets `$AWS_ACCESS_KEY_ID`, `$AWS_SECRET_ACCESS_KEY` and `$AWS_SESSION_TOKEN`, if
+   obtained. It requires the roles to be configured as per the
    [official guide](https://docs.aws.amazon.com/cli/latest/userguide/cli-configure-role.html).
    Run `acp` without arguments to clear the profile.
 
diff --git a/plugins/aws/aws.plugin.zsh b/plugins/aws/aws.plugin.zsh
index c18bd634b..920a7139d 100644
--- a/plugins/aws/aws.plugin.zsh
+++ b/plugins/aws/aws.plugin.zsh
@@ -45,6 +45,7 @@ function acp() {
   fi
 
   local profile="$1"
+  local mfa_token="$2"
 
   # Get fallback credentials for if the aws command fails or no command is run
   local aws_access_key_id="$(aws configure get aws_access_key_id --profile $profile)"
@@ -58,9 +59,10 @@ function acp() {
 
   if [[ -n "$mfa_serial" ]]; then
     local -a mfa_opt
-    local mfa_token
-    echo -n "Please enter your MFA token for $mfa_serial: "
-    read -r mfa_token
+    if [[ -z "$mfa_token" ]]; then
+      echo -n "Please enter your MFA token for $mfa_serial: "
+      read -r mfa_token
+    fi
     if [[ -z "$sess_duration" ]]; then
       echo -n "Please enter the session duration in seconds (900-43200; default: 3600, which is the default maximum for a role): "
       read -r sess_duration

From 00d0735704d8e1070a51bbd1334db32d2e822fe6 Mon Sep 17 00:00:00 2001
From: kronion <kronion@users.noreply.github.com>
Date: Wed, 19 Jan 2022 09:49:24 -0600
Subject: [PATCH 776/869] feat(poetry): add plugin to provide completion for
 Poetry (#10595)

---
 plugins/poetry/README.md         |  9 +++++++++
 plugins/poetry/poetry.plugin.zsh | 16 ++++++++++++++++
 2 files changed, 25 insertions(+)
 create mode 100644 plugins/poetry/README.md
 create mode 100644 plugins/poetry/poetry.plugin.zsh

diff --git a/plugins/poetry/README.md b/plugins/poetry/README.md
new file mode 100644
index 000000000..51780cbed
--- /dev/null
+++ b/plugins/poetry/README.md
@@ -0,0 +1,9 @@
+# Poetry Plugin
+
+This plugin automatically installs [Poetry](https://python-poetry.org/)'s completions for you, and keeps them up to date as your Poetry version changes.
+
+To use it, add `poetry` to the plugins array in your zshrc file:
+
+```zsh
+plugins=(... poetry)
+```
diff --git a/plugins/poetry/poetry.plugin.zsh b/plugins/poetry/poetry.plugin.zsh
new file mode 100644
index 000000000..e872e9fd6
--- /dev/null
+++ b/plugins/poetry/poetry.plugin.zsh
@@ -0,0 +1,16 @@
+# Return immediately if poetry is not found
+if (( ! $+commands[poetry] )); then
+  return
+fi
+
+# If the completion file doesn't exist yet, we need to autoload it and
+# bind it to `poetry`. Otherwise, compinit will have already done that.
+if [[ ! -f "$ZSH_CACHE_DIR/completions/_poetry" ]]; then
+  typeset -g -A _comps
+  autoload -Uz _poetry
+  _comps[gh]=_poetry
+fi
+
+poetry completions zsh >| "$ZSH_CACHE_DIR/completions/_poetry" &|
+
+unset comp_file

From 0b08b70b0cc7ff286ea942f0e20a41f10bef0ee8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Wed, 19 Jan 2022 17:15:16 +0100
Subject: [PATCH 777/869] chore(poetry): fix copy-paste error

---
 plugins/poetry/poetry.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/poetry/poetry.plugin.zsh b/plugins/poetry/poetry.plugin.zsh
index e872e9fd6..3cb7845d6 100644
--- a/plugins/poetry/poetry.plugin.zsh
+++ b/plugins/poetry/poetry.plugin.zsh
@@ -8,7 +8,7 @@ fi
 if [[ ! -f "$ZSH_CACHE_DIR/completions/_poetry" ]]; then
   typeset -g -A _comps
   autoload -Uz _poetry
-  _comps[gh]=_poetry
+  _comps[poetry]=_poetry
 fi
 
 poetry completions zsh >| "$ZSH_CACHE_DIR/completions/_poetry" &|

From a7efd96a60157965370e1dbc4c7fce66b7a64225 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Wed, 19 Jan 2022 19:27:53 +0100
Subject: [PATCH 778/869] fix(dotenv): match for exact directory path in
 allowed/disallowed files

---
 plugins/dotenv/dotenv.plugin.zsh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/dotenv/dotenv.plugin.zsh b/plugins/dotenv/dotenv.plugin.zsh
index 40ec5c46f..394455ae1 100644
--- a/plugins/dotenv/dotenv.plugin.zsh
+++ b/plugins/dotenv/dotenv.plugin.zsh
@@ -23,12 +23,12 @@ source_env() {
     touch "$ZSH_DOTENV_DISALLOWED_LIST"
 
     # early return if disallowed
-    if command grep -q "$dirpath" "$ZSH_DOTENV_DISALLOWED_LIST" &>/dev/null; then
+    if command grep -Fx -q "$dirpath" "$ZSH_DOTENV_DISALLOWED_LIST" &>/dev/null; then
       return
     fi
 
     # check if current directory's .env file is allowed or ask for confirmation
-    if ! command grep -q "$dirpath" "$ZSH_DOTENV_ALLOWED_LIST" &>/dev/null; then
+    if ! command grep -Fx -q "$dirpath" "$ZSH_DOTENV_ALLOWED_LIST" &>/dev/null; then
       # get cursor column and print new line before prompt if not at line beginning
       local column
       echo -ne "\e[6n" > /dev/tty

From 675a2d9922ffc1f2cf88dd3d871f22136b7e525c Mon Sep 17 00:00:00 2001
From: Billy Mathews <billy@billym.co.uk>
Date: Wed, 17 Jan 2018 00:08:38 +0000
Subject: [PATCH 779/869] feat(tmux): add `tmuxconf` alias to edit .tmux.conf
 (#6555)

Closes #6555
---
 plugins/tmux/README.md       | 21 +++++++++++----------
 plugins/tmux/tmux.plugin.zsh |  1 +
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/plugins/tmux/README.md b/plugins/tmux/README.md
index 551814a39..bc192a40c 100644
--- a/plugins/tmux/README.md
+++ b/plugins/tmux/README.md
@@ -15,20 +15,21 @@ The plugin also supports the following:
 
 ## Aliases
 
-| Alias  | Command                | Description                                               |
-| ------ | -----------------------|---------------------------------------------------------- |
-| `ta`   | tmux attach -t         | Attach new tmux session to already running named session  |
-| `tad`  | tmux attach -d -t      | Detach named tmux session                                 |
-| `ts`   | tmux new-session -s    | Create a new named tmux session                           |
-| `tl`   | tmux list-sessions     | Displays a list of running tmux sessions                  |
-| `tksv` | tmux kill-server       | Terminate all running tmux sessions                       |
-| `tkss` | tmux kill-session -t   | Terminate named running tmux session                      |
-| `tmux` | `_zsh_tmux_plugin_run` | Start a new tmux session                                  |
+| Alias      | Command                | Description                                              |
+| ---------- | ---------------------- | -------------------------------------------------------- |
+| `ta`       | tmux attach -t         | Attach new tmux session to already running named session |
+| `tad`      | tmux attach -d -t      | Detach named tmux session                                |
+| `ts`       | tmux new-session -s    | Create a new named tmux session                          |
+| `tl`       | tmux list-sessions     | Displays a list of running tmux sessions                 |
+| `tksv`     | tmux kill-server       | Terminate all running tmux sessions                      |
+| `tkss`     | tmux kill-session -t   | Terminate named running tmux session                     |
+| `tmux`     | `_zsh_tmux_plugin_run` | Start a new tmux session                                 |
+| `tmuxconf` | `$EDITOR ~/.tmux.conf` | Open .tmux.conf file with an editor                      |
 
 ## Configuration Variables
 
 | Variable                            | Description                                                                   |
-|-------------------------------------|-------------------------------------------------------------------------------|
+| ----------------------------------- | ----------------------------------------------------------------------------- |
 | `ZSH_TMUX_AUTOSTART`                | Automatically starts tmux (default: `false`)                                  |
 | `ZSH_TMUX_AUTOSTART_ONCE`           | Autostart only if tmux hasn't been started previously (default: `true`)       |
 | `ZSH_TMUX_AUTOCONNECT`              | Automatically connect to a previous session if it exits (default: `true`)     |
diff --git a/plugins/tmux/tmux.plugin.zsh b/plugins/tmux/tmux.plugin.zsh
index 5474c3522..9d333257e 100644
--- a/plugins/tmux/tmux.plugin.zsh
+++ b/plugins/tmux/tmux.plugin.zsh
@@ -11,6 +11,7 @@ alias ts='tmux new-session -s'
 alias tl='tmux list-sessions'
 alias tksv='tmux kill-server'
 alias tkss='tmux kill-session -t'
+alias tmuxconf='$EDITOR ~/.tmux.conf'
 
 # CONFIGURATION VARIABLES
 # Automatically start tmux

From 2b492aec93487e8e25cf03df4540aa73dbf5fc9e Mon Sep 17 00:00:00 2001
From: kronion <kronion@users.noreply.github.com>
Date: Fri, 21 Jan 2022 12:52:24 -0600
Subject: [PATCH 780/869] chore(poetry): remove unnecessary unset (#10605)

---
 plugins/poetry/poetry.plugin.zsh | 2 --
 1 file changed, 2 deletions(-)

diff --git a/plugins/poetry/poetry.plugin.zsh b/plugins/poetry/poetry.plugin.zsh
index 3cb7845d6..cebcb46c4 100644
--- a/plugins/poetry/poetry.plugin.zsh
+++ b/plugins/poetry/poetry.plugin.zsh
@@ -12,5 +12,3 @@ if [[ ! -f "$ZSH_CACHE_DIR/completions/_poetry" ]]; then
 fi
 
 poetry completions zsh >| "$ZSH_CACHE_DIR/completions/_poetry" &|
-
-unset comp_file

From 4e0f19cf923163104d86308d2366d37da35c0622 Mon Sep 17 00:00:00 2001
From: "GitHubLeakedPAN, GitHubLeakedMyautsai"
 <mckelvin@users.noreply.github.com>
Date: Sun, 23 Jan 2022 04:56:36 +0800
Subject: [PATCH 781/869] feat(ys): show `svn` repository information (#10582)

---
 themes/ys.zsh-theme | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/themes/ys.zsh-theme b/themes/ys.zsh-theme
index 45bbae2d1..5ef500e14 100644
--- a/themes/ys.zsh-theme
+++ b/themes/ys.zsh-theme
@@ -19,6 +19,13 @@ ZSH_THEME_GIT_PROMPT_SUFFIX="$YS_VCS_PROMPT_SUFFIX"
 ZSH_THEME_GIT_PROMPT_DIRTY="$YS_VCS_PROMPT_DIRTY"
 ZSH_THEME_GIT_PROMPT_CLEAN="$YS_VCS_PROMPT_CLEAN"
 
+# SVN info
+local svn_info='$(svn_prompt_info)'
+ZSH_THEME_SVN_PROMPT_PREFIX="${YS_VCS_PROMPT_PREFIX1}svn${YS_VCS_PROMPT_PREFIX2}"
+ZSH_THEME_SVN_PROMPT_SUFFIX="$YS_VCS_PROMPT_SUFFIX"
+ZSH_THEME_SVN_PROMPT_DIRTY="$YS_VCS_PROMPT_DIRTY"
+ZSH_THEME_SVN_PROMPT_CLEAN="$YS_VCS_PROMPT_CLEAN"
+
 # HG info
 local hg_info='$(ys_hg_prompt_info)'
 ys_hg_prompt_info() {
@@ -66,6 +73,7 @@ PROMPT="
 %{$terminfo[bold]$fg[yellow]%}%~%{$reset_color%}\
 ${hg_info}\
 ${git_info}\
+${svn_info}\
 ${venv_info}\
  \
 [%*] $exit_code

From 84931adcd465e9a3b5e38f3b416a1df2acc33801 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Fri, 21 Jan 2022 19:03:35 +0100
Subject: [PATCH 782/869] fix: do not call chpwd hooks in subshells

---
 lib/cli.zsh                | 10 +++++-----
 tools/check_for_upgrade.sh | 10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/lib/cli.zsh b/lib/cli.zsh
index 70076bcfb..2f3f293da 100644
--- a/lib/cli.zsh
+++ b/lib/cli.zsh
@@ -37,7 +37,7 @@ function _omz {
   elif (( CURRENT == 3 )); then
     case "$words[2]" in
       changelog) local -a refs
-        refs=("${(@f)$(cd "$ZSH"; command git for-each-ref --format="%(refname:short):%(subject)" refs/heads refs/tags)}")
+        refs=("${(@f)$(builtin cd -q "$ZSH"; command git for-each-ref --format="%(refname:short):%(subject)" refs/heads refs/tags)}")
         _describe 'command' refs ;;
       plugin) subcmds=(
         'disable:Disable plugin(s)'
@@ -176,7 +176,7 @@ function _omz::changelog {
   local version=${1:-HEAD} format=${3:-"--text"}
 
   if (
-    cd "$ZSH"
+    builtin cd -q "$ZSH"
     ! command git show-ref --verify refs/heads/$version && \
     ! command git show-ref --verify refs/tags/$version && \
     ! command git rev-parse --verify "${version}^{commit}"
@@ -761,7 +761,7 @@ function _omz::theme::use {
 }
 
 function _omz::update {
-  local last_commit=$(cd "$ZSH"; git rev-parse HEAD)
+  local last_commit=$(builtin cd -q "$ZSH"; git rev-parse HEAD)
 
   # Run update script
   if [[ "$1" != --unattended ]]; then
@@ -777,7 +777,7 @@ function _omz::update {
   command rm -rf "$ZSH/log/update.lock"
 
   # Restart the zsh session if there were changes
-  if [[ "$1" != --unattended && "$(cd "$ZSH"; git rev-parse HEAD)" != "$last_commit" ]]; then
+  if [[ "$1" != --unattended && "$(builtin cd -q "$ZSH"; git rev-parse HEAD)" != "$last_commit" ]]; then
     # Old zsh versions don't have ZSH_ARGZERO
     local zsh="${ZSH_ARGZERO:-${functrace[-1]%:*}}"
     # Check whether to run a login shell
@@ -787,7 +787,7 @@ function _omz::update {
 
 function _omz::version {
   (
-    cd "$ZSH"
+    builtin cd -q "$ZSH"
 
     # Get the version name:
     # 1) try tag-like version
diff --git a/tools/check_for_upgrade.sh b/tools/check_for_upgrade.sh
index 729d8ecb5..3f6d35c3e 100644
--- a/tools/check_for_upgrade.sh
+++ b/tools/check_for_upgrade.sh
@@ -36,11 +36,11 @@ function current_epoch() {
 
 function is_update_available() {
   local branch
-  branch=${"$(cd "$ZSH"; git config --local oh-my-zsh.branch)":-master}
+  branch=${"$(cd -q "$ZSH"; git config --local oh-my-zsh.branch)":-master}
 
   local remote remote_url remote_repo
-  remote=${"$(cd "$ZSH"; git config --local oh-my-zsh.remote)":-origin}
-  remote_url=$(cd "$ZSH"; git config remote.$remote.url)
+  remote=${"$(cd -q "$ZSH"; git config --local oh-my-zsh.remote)":-origin}
+  remote_url=$(cd -q "$ZSH"; git config remote.$remote.url)
 
   local repo
   case "$remote_url" in
@@ -58,7 +58,7 @@ function is_update_available() {
 
   # Get local HEAD. If this fails assume there are updates
   local local_head
-  local_head=$(cd "$ZSH"; git rev-parse $branch 2>/dev/null) || return 0
+  local_head=$(cd -q "$ZSH"; git rev-parse $branch 2>/dev/null) || return 0
 
   # Get remote HEAD. If no suitable command is found assume there are updates
   # On any other error, skip the update (connection may be down)
@@ -136,7 +136,7 @@ function update_ohmyzsh() {
   fi
 
   # Test if Oh My Zsh directory is a git repository
-  if ! (cd "$ZSH" && LANG= git rev-parse &>/dev/null); then
+  if ! (cd -q "$ZSH" && LANG= git rev-parse &>/dev/null); then
     echo >&2 "[oh-my-zsh] Can't update: not a git repository."
     return
   fi

From d4f5fa37e8be25e1b4f281fcf5b90cf700dc3c95 Mon Sep 17 00:00:00 2001
From: Mathias Neerup <manee12@student.sdu.dk>
Date: Thu, 31 Mar 2016 14:51:47 +0200
Subject: [PATCH 783/869] feat(simple): add color to git status indicator
 (#4962)

Closes #4962
---
 themes/simple.zsh-theme | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/themes/simple.zsh-theme b/themes/simple.zsh-theme
index 8d0070ba7..bcdecc1a5 100644
--- a/themes/simple.zsh-theme
+++ b/themes/simple.zsh-theme
@@ -1,6 +1,6 @@
-PROMPT='%(!.%{$fg[red]%}.%{$fg[green]%})%~%{$fg_bold[blue]%}$(git_prompt_info)%{$reset_color%} '
+PROMPT='%(!.%{$fg[red]%}.%{$fg[green]%})%~$(git_prompt_info)%{$reset_color%} '
 
-ZSH_THEME_GIT_PROMPT_PREFIX="("
-ZSH_THEME_GIT_PROMPT_SUFFIX=")"
-ZSH_THEME_GIT_PROMPT_DIRTY=" ✗"
-ZSH_THEME_GIT_PROMPT_CLEAN=" ✔"
+ZSH_THEME_GIT_PROMPT_PREFIX=" %{$fg_bold[blue]%}("
+ZSH_THEME_GIT_PROMPT_SUFFIX="%{$fg_bold[blue]%})"
+ZSH_THEME_GIT_PROMPT_DIRTY=" %{$fg[red]%}✗"
+ZSH_THEME_GIT_PROMPT_CLEAN=" %{$fg[green]%}✔"

From 3f5402e2687475d83ec98613dc93373620e5ce57 Mon Sep 17 00:00:00 2001
From: Ricky Medina <ricky.medina91@gmail.com>
Date: Mon, 24 Jan 2022 09:21:34 -0500
Subject: [PATCH 784/869] feat(1password): add plugin for 1password (#8884)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Marc Cornellà <hello@mcornella.com>
---
 plugins/1password/1password.plugin.zsh | 46 ++++++++++++++++++++++++++
 plugins/1password/README.md            | 35 ++++++++++++++++++++
 2 files changed, 81 insertions(+)
 create mode 100644 plugins/1password/1password.plugin.zsh
 create mode 100644 plugins/1password/README.md

diff --git a/plugins/1password/1password.plugin.zsh b/plugins/1password/1password.plugin.zsh
new file mode 100644
index 000000000..5af5ebb2b
--- /dev/null
+++ b/plugins/1password/1password.plugin.zsh
@@ -0,0 +1,46 @@
+if (( ${+commands[op]} )); then
+  eval "$(op completion zsh)"
+  compdef _op op
+fi
+
+# opswd puts the password of the named service into the clipboard. If there's a
+# one time password, it will be copied into the clipboard after 5 seconds. The
+# clipboard is cleared after another 10 seconds.
+function opswd() {
+  if [[ $# -lt 1 ]]; then
+    echo "Usage: opswd <service>"
+    return 1
+  fi
+
+  local service=$1
+
+  # If not logged in, print error and return
+  op list users > /dev/null || return
+
+  local password
+  # Copy the password to the clipboard
+  if ! password=$(op get item "$service" --fields password 2>/dev/null); then
+    echo "error: could not obtain password for $service"
+    return 1
+  fi
+
+  echo -n "$password" | clipcopy
+  echo "✔ password for $service copied to clipboard"
+
+  # If there's a one time password, copy it to the clipboard after 5 seconds
+  local totp
+  if totp=$(op get totp "$service" 2>/dev/null) && [[ -n "$totp" ]]; then
+    sleep 10 && echo -n "$totp" | clipcopy
+    echo "✔ TOTP for $service copied to clipboard"
+  fi
+
+  (sleep 20 && clipcopy </dev/null 2>/dev/null) &!
+}
+
+function _opswd() {
+  local -a services
+  services=("${(@f)$(op list items --categories Login 2>/dev/null | op get item - --fields title 2>/dev/null)}")
+  [[ -z "$services" ]] || compadd -a -- services
+}
+
+compdef _opswd opswd
diff --git a/plugins/1password/README.md b/plugins/1password/README.md
new file mode 100644
index 000000000..97be45437
--- /dev/null
+++ b/plugins/1password/README.md
@@ -0,0 +1,35 @@
+# 1Password
+
+This plugin adds 1Password functionality to oh-my-zsh.
+
+To use, add `1password` to the list of plugins in your `.zshrc` file:
+
+```zsh
+plugins=(... 1password)
+```
+
+Then, you can use the command `opswd` to copy passwords for services into your
+clipboard.
+
+## `opwsd`
+
+The `opswd` command is a wrapper around the `op` command. It takes a service
+name as an argument and copies the password for that service to the clipboard.
+
+If the service also contains a TOTP, it is copied to the clipboard after 10 seconds.
+Finally, after 20 seconds, the clipboard is cleared.
+
+The function has completion support, so you can use tab completion to select
+which service you want to get.
+
+For example, `opswd github.com` will put your GitHub password into your clipboard, and if
+a TOTP is available, it will be copied to the clipboard after 10 seconds.
+
+> NOTE: you need to be logged in for `opswd` to work. See:
+>
+> - [Sign in or out](https://support.1password.com/command-line/#sign-in-or-out)
+> - [Session management](https://support.1password.com/command-line/#appendix-session-management)
+
+## Requirements
+
+- [1Password's command line utility](https://1password.com/downloads/command-line/).

From c7221c5f257fc42ec8f6c6a6463bc8a5da25b00f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Mon, 24 Jan 2022 15:41:40 +0100
Subject: [PATCH 785/869] style(installer): prefix formatting variables with
 `FMT_`

---
 tools/install.sh | 78 ++++++++++++++++++++++++------------------------
 1 file changed, 39 insertions(+), 39 deletions(-)

diff --git a/tools/install.sh b/tools/install.sh
index d3f1ee640..b4b90a62d 100755
--- a/tools/install.sh
+++ b/tools/install.sh
@@ -190,24 +190,24 @@ fmt_code() {
 }
 
 fmt_error() {
-  printf '%sError: %s%s\n' "$BOLD$RED" "$*" "$RESET" >&2
+  printf '%sError: %s%s\n' "${FMT_BOLD}${FMT_RED}" "$*" "$FMT_RESET" >&2
 }
 
 setup_color() {
   # Only use colors if connected to a terminal
   if ! is_tty; then
-    RAINBOW=""
-    RED=""
-    GREEN=""
-    YELLOW=""
-    BLUE=""
-    BOLD=""
-    RESET=""
+    FMT_RAINBOW=""
+    FMT_RED=""
+    FMT_GREEN=""
+    FMT_YELLOW=""
+    FMT_BLUE=""
+    FMT_BOLD=""
+    FMT_RESET=""
     return
   fi
 
   if supports_truecolor; then
-    RAINBOW="
+    FMT_RAINBOW="
       $(printf '\033[38;2;255;0;0m')
       $(printf '\033[38;2;255;97;0m')
       $(printf '\033[38;2;247;255;0m')
@@ -217,7 +217,7 @@ setup_color() {
       $(printf '\033[38;2;245;0;172m')
     "
   else
-    RAINBOW="
+    FMT_RAINBOW="
       $(printf '\033[38;5;196m')
       $(printf '\033[38;5;202m')
       $(printf '\033[38;5;226m')
@@ -228,12 +228,12 @@ setup_color() {
     "
   fi
 
-  RED=$(printf '\033[31m')
-  GREEN=$(printf '\033[32m')
-  YELLOW=$(printf '\033[33m')
-  BLUE=$(printf '\033[34m')
-  BOLD=$(printf '\033[1m')
-  RESET=$(printf '\033[0m')
+  FMT_RED=$(printf '\033[31m')
+  FMT_GREEN=$(printf '\033[32m')
+  FMT_YELLOW=$(printf '\033[33m')
+  FMT_BLUE=$(printf '\033[34m')
+  FMT_BOLD=$(printf '\033[1m')
+  FMT_RESET=$(printf '\033[0m')
 }
 
 setup_ohmyzsh() {
@@ -244,7 +244,7 @@ setup_ohmyzsh() {
   # precedence over umasks except for filesystems mounted with option "noacl".
   umask g-w,o-w
 
-  echo "${BLUE}Cloning Oh My Zsh...${RESET}"
+  echo "${FMT_BLUE}Cloning Oh My Zsh...${FMT_RESET}"
 
   command_exists git || {
     fmt_error "git is not installed"
@@ -276,14 +276,14 @@ setup_zshrc() {
   # Keep most recent old .zshrc at .zshrc.pre-oh-my-zsh, and older ones
   # with datestamp of installation that moved them aside, so we never actually
   # destroy a user's original zshrc
-  echo "${BLUE}Looking for an existing zsh config...${RESET}"
+  echo "${FMT_BLUE}Looking for an existing zsh config...${FMT_RESET}"
 
   # Must use this exact name so uninstall.sh can find it
   OLD_ZSHRC=~/.zshrc.pre-oh-my-zsh
   if [ -f ~/.zshrc ] || [ -h ~/.zshrc ]; then
     # Skip this if the user doesn't want to replace an existing .zshrc
     if [ "$KEEP_ZSHRC" = yes ]; then
-      echo "${YELLOW}Found ~/.zshrc.${RESET} ${GREEN}Keeping...${RESET}"
+      echo "${FMT_YELLOW}Found ~/.zshrc.${FMT_RESET} ${FMT_GREEN}Keeping...${FMT_RESET}"
       return
     fi
     if [ -e "$OLD_ZSHRC" ]; then
@@ -295,14 +295,14 @@ setup_zshrc() {
       fi
       mv "$OLD_ZSHRC" "${OLD_OLD_ZSHRC}"
 
-      echo "${YELLOW}Found old ~/.zshrc.pre-oh-my-zsh." \
-        "${GREEN}Backing up to ${OLD_OLD_ZSHRC}${RESET}"
+      echo "${FMT_YELLOW}Found old ~/.zshrc.pre-oh-my-zsh." \
+        "${FMT_GREEN}Backing up to ${OLD_OLD_ZSHRC}${FMT_RESET}"
     fi
-    echo "${YELLOW}Found ~/.zshrc.${RESET} ${GREEN}Backing up to ${OLD_ZSHRC}${RESET}"
+    echo "${FMT_YELLOW}Found ~/.zshrc.${FMT_RESET} ${FMT_GREEN}Backing up to ${OLD_ZSHRC}${FMT_RESET}"
     mv ~/.zshrc "$OLD_ZSHRC"
   fi
 
-  echo "${GREEN}Using the Oh My Zsh template file and adding it to ~/.zshrc.${RESET}"
+  echo "${FMT_GREEN}Using the Oh My Zsh template file and adding it to ~/.zshrc.${FMT_RESET}"
 
   # Replace $HOME path with '$HOME' in $ZSH variable in .zshrc file
   omz=$(echo "$ZSH" | sed "s|^$HOME/|\$HOME/|")
@@ -327,16 +327,16 @@ setup_shell() {
   if ! command_exists chsh; then
     cat <<EOF
 I can't change your shell automatically because this system does not have chsh.
-${BLUE}Please manually change your default shell to zsh${RESET}
+${FMT_BLUE}Please manually change your default shell to zsh${FMT_RESET}
 EOF
     return
   fi
 
-  echo "${BLUE}Time to change your default shell to zsh:${RESET}"
+  echo "${FMT_BLUE}Time to change your default shell to zsh:${FMT_RESET}"
 
   # Prompt for user choice on changing the default login shell
   printf '%sDo you want to change your default shell to zsh? [Y/n]%s ' \
-    "$YELLOW" "$RESET"
+    "$FMT_YELLOW" "$FMT_RESET"
   read -r opt
   case $opt in
     y*|Y*|"") ;;
@@ -402,30 +402,30 @@ EOF
     fmt_error "chsh command unsuccessful. Change your default shell manually."
   else
     export SHELL="$zsh"
-    echo "${GREEN}Shell successfully changed to '$zsh'.${RESET}"
+    echo "${FMT_GREEN}Shell successfully changed to '$zsh'.${FMT_RESET}"
   fi
 
   echo
 }
 
-# shellcheck disable=SC2183  # printf string has more %s than arguments ($RAINBOW expands to multiple arguments)
+# shellcheck disable=SC2183  # printf string has more %s than arguments ($FMT_RAINBOW expands to multiple arguments)
 print_success() {
-  printf '%s         %s__      %s           %s        %s       %s     %s__   %s\n'      $RAINBOW $RESET
-  printf '%s  ____  %s/ /_    %s ____ ___  %s__  __  %s ____  %s_____%s/ /_  %s\n'      $RAINBOW $RESET
-  printf '%s / __ \\%s/ __ \\  %s / __ `__ \\%s/ / / / %s /_  / %s/ ___/%s __ \\ %s\n'  $RAINBOW $RESET
-  printf '%s/ /_/ /%s / / / %s / / / / / /%s /_/ / %s   / /_%s(__  )%s / / / %s\n'      $RAINBOW $RESET
-  printf '%s\\____/%s_/ /_/ %s /_/ /_/ /_/%s\\__, / %s   /___/%s____/%s_/ /_/  %s\n'    $RAINBOW $RESET
-  printf '%s    %s        %s           %s /____/ %s       %s     %s          %s....is now installed!%s\n' $RAINBOW $GREEN $RESET
+  printf '%s         %s__      %s           %s        %s       %s     %s__   %s\n'      $FMT_RAINBOW $FMT_RESET
+  printf '%s  ____  %s/ /_    %s ____ ___  %s__  __  %s ____  %s_____%s/ /_  %s\n'      $FMT_RAINBOW $FMT_RESET
+  printf '%s / __ \\%s/ __ \\  %s / __ `__ \\%s/ / / / %s /_  / %s/ ___/%s __ \\ %s\n'  $FMT_RAINBOW $FMT_RESET
+  printf '%s/ /_/ /%s / / / %s / / / / / /%s /_/ / %s   / /_%s(__  )%s / / / %s\n'      $FMT_RAINBOW $FMT_RESET
+  printf '%s\\____/%s_/ /_/ %s /_/ /_/ /_/%s\\__, / %s   /___/%s____/%s_/ /_/  %s\n'    $FMT_RAINBOW $FMT_RESET
+  printf '%s    %s        %s           %s /____/ %s       %s     %s          %s....is now installed!%s\n' $FMT_RAINBOW $FMT_GREEN $FMT_RESET
   printf '\n'
   printf '\n'
-  printf "%s %s %s\n" "Before you scream ${BOLD}${YELLOW}Oh My Zsh!${RESET} look over the" \
+  printf "%s %s %s\n" "Before you scream ${FMT_BOLD}${FMT_YELLOW}Oh My Zsh!${FMT_RESET} look over the" \
     "$(fmt_code "$(fmt_link ".zshrc" "file://$HOME/.zshrc" --text)")" \
     "file to select plugins, themes, and options."
   printf '\n'
   printf '%s\n' "• Follow us on Twitter: $(fmt_link @ohmyzsh https://twitter.com/ohmyzsh)"
   printf '%s\n' "• Join our Discord community: $(fmt_link "Discord server" https://discord.gg/ohmyzsh)"
   printf '%s\n' "• Get stickers, t-shirts, coffee mugs and more: $(fmt_link "Planet Argon Shop" https://shop.planetargon.com/collections/oh-my-zsh)"
-  printf '%s\n' $RESET
+  printf '%s\n' $FMT_RESET
 }
 
 main() {
@@ -448,12 +448,12 @@ main() {
   setup_color
 
   if ! command_exists zsh; then
-    echo "${YELLOW}Zsh is not installed.${RESET} Please install zsh first."
+    echo "${FMT_YELLOW}Zsh is not installed.${FMT_RESET} Please install zsh first."
     exit 1
   fi
 
   if [ -d "$ZSH" ]; then
-    echo "${YELLOW}The \$ZSH folder already exists ($ZSH).${RESET}"
+    echo "${FMT_YELLOW}The \$ZSH folder already exists ($ZSH).${FMT_RESET}"
     if [ "$custom_zsh" = yes ]; then
       cat <<EOF
 
@@ -481,7 +481,7 @@ EOF
   print_success
 
   if [ $RUNZSH = no ]; then
-    echo "${YELLOW}Run zsh to try it out.${RESET}"
+    echo "${FMT_YELLOW}Run zsh to try it out.${FMT_RESET}"
     exit
   fi
 

From 861805b64d4014550808d2db176fa99bc729eebf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Mon, 24 Jan 2022 15:41:57 +0100
Subject: [PATCH 786/869] fix(installer): define `$USER` if not defined

Fixes missing $USER value in ArchLinux sh (bash)
---
 tools/install.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/tools/install.sh b/tools/install.sh
index b4b90a62d..9ad6f7d14 100755
--- a/tools/install.sh
+++ b/tools/install.sh
@@ -51,6 +51,9 @@ CHSH=${CHSH:-yes}
 RUNZSH=${RUNZSH:-yes}
 KEEP_ZSHRC=${KEEP_ZSHRC:-no}
 
+# Sane defaults
+USER=${USER:-$(whoami)}
+
 
 command_exists() {
   command -v "$@" >/dev/null 2>&1

From 788802af68af9a1adbfdb678086939c89d79d999 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Mon, 24 Jan 2022 15:45:42 +0100
Subject: [PATCH 787/869] fix(installer): correct check for `sudo` in shell
 change logic

---
 tools/install.sh | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/tools/install.sh b/tools/install.sh
index 9ad6f7d14..34dca8413 100755
--- a/tools/install.sh
+++ b/tools/install.sh
@@ -60,6 +60,8 @@ command_exists() {
 }
 
 user_can_sudo() {
+  # Check if sudo is installed
+  command_exists sudo || return 1
   # The following command has 3 parts:
   #
   # 1. Run `sudo` with `-v`. Does the following:
@@ -78,7 +80,7 @@ user_can_sudo() {
   #    to run `sudo` in the default locale (with `LANG=`) so that the message
   #    stays consistent regardless of the user's locale.
   #
-  LANG= sudo -n -v 2>&1 | grep -q "may not run sudo"
+  ! LANG= sudo -n -v 2>&1 | grep -q "may not run sudo"
 }
 
 # The [ -t 1 ] check only works when the function is not called from
@@ -395,9 +397,9 @@ EOF
   # be prompted for the password either way, so this shouldn't cause any issues.
   #
   if user_can_sudo; then
-    chsh -s "$zsh" "$USER"          # run chsh normally
-  else
     sudo -k chsh -s "$zsh" "$USER"  # -k forces the password prompt
+  else
+    chsh -s "$zsh" "$USER"          # run chsh normally
   fi
 
   # Check if the shell change was successful

From 8e7c33bf15ba2835da03604b396885ace635689c Mon Sep 17 00:00:00 2001
From: David Chin <david.w.h.chin@gmail.com>
Date: Mon, 24 Jan 2022 10:30:49 -0500
Subject: [PATCH 788/869] chore(1password): fix typo in `opswd` (#10614)

---
 plugins/1password/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/1password/README.md b/plugins/1password/README.md
index 97be45437..f6790ca8a 100644
--- a/plugins/1password/README.md
+++ b/plugins/1password/README.md
@@ -11,7 +11,7 @@ plugins=(... 1password)
 Then, you can use the command `opswd` to copy passwords for services into your
 clipboard.
 
-## `opwsd`
+## `opswd`
 
 The `opswd` command is a wrapper around the `op` command. It takes a service
 name as an argument and copies the password for that service to the clipboard.

From f64cabc780496636b3e4f5283ef8d77c23f18e92 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Mon, 24 Jan 2022 17:38:32 +0100
Subject: [PATCH 789/869] fix(cli): make sure to run `zsh` command if an alias
 exists (#9737)

Fixes #9737
---
 lib/cli.zsh | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/cli.zsh b/lib/cli.zsh
index 2f3f293da..edc10e722 100644
--- a/lib/cli.zsh
+++ b/lib/cli.zsh
@@ -289,7 +289,7 @@ multi == 1 && length(\$0) > 0 {
   }
 
   # Exit if the new .zshrc file has syntax errors
-  if ! zsh -n "$zdot/.zshrc"; then
+  if ! command zsh -n "$zdot/.zshrc"; then
     _omz::log error "broken syntax in '"${zdot/#$HOME/\~}/.zshrc"'. Rolling back changes..."
     command mv -f "$zdot/.zshrc" "$zdot/.zshrc.new"
     command mv -f "$zdot/.zshrc.bck" "$zdot/.zshrc"
@@ -365,7 +365,7 @@ multi == 1 && /^[^#]*\)/ {
   }
 
   # Exit if the new .zshrc file has syntax errors
-  if ! zsh -n "$zdot/.zshrc"; then
+  if ! command zsh -n "$zdot/.zshrc"; then
     _omz::log error "broken syntax in '"${zdot/#$HOME/\~}/.zshrc"'. Rolling back changes..."
     command mv -f "$zdot/.zshrc" "$zdot/.zshrc.new"
     command mv -f "$zdot/.zshrc.bck" "$zdot/.zshrc"
@@ -721,7 +721,7 @@ EOF
   }
 
   # Exit if the new .zshrc file has syntax errors
-  if ! zsh -n "$zdot/.zshrc"; then
+  if ! command zsh -n "$zdot/.zshrc"; then
     _omz::log error "broken syntax in '"${zdot/#$HOME/\~}/.zshrc"'. Rolling back changes..."
     command mv -f "$zdot/.zshrc" "$zdot/.zshrc.new"
     command mv -f "$zdot/.zshrc.bck" "$zdot/.zshrc"
@@ -765,9 +765,9 @@ function _omz::update {
 
   # Run update script
   if [[ "$1" != --unattended ]]; then
-    ZSH="$ZSH" zsh -f "$ZSH/tools/upgrade.sh" --interactive || return $?
+    ZSH="$ZSH" command zsh -f "$ZSH/tools/upgrade.sh" --interactive || return $?
   else
-    ZSH="$ZSH" zsh -f "$ZSH/tools/upgrade.sh" || return $?
+    ZSH="$ZSH" command zsh -f "$ZSH/tools/upgrade.sh" || return $?
   fi
 
   # Update last updated file

From 4417faf84cf538d6b22ec613b043f23ef4023457 Mon Sep 17 00:00:00 2001
From: Carlo Sala <carlosalag@protonmail.com>
Date: Mon, 24 Jan 2022 17:45:09 +0100
Subject: [PATCH 790/869] feat(postgres): support Homebrew for Apple Silicon
 (#10618)

---
 plugins/postgres/postgres.plugin.zsh | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/plugins/postgres/postgres.plugin.zsh b/plugins/postgres/postgres.plugin.zsh
index c2dbef244..b6d365d8a 100644
--- a/plugins/postgres/postgres.plugin.zsh
+++ b/plugins/postgres/postgres.plugin.zsh
@@ -1,8 +1,13 @@
 # Aliases to control Postgres
 # Paths noted below are for Postgres installed via Homebrew on OSX
+if (( ! $+commands[brew] )); then
+  return
+fi
 
-alias startpost='pg_ctl -D /usr/local/var/postgres -l /usr/local/var/postgres/server.log start'
-alias stoppost='pg_ctl -D /usr/local/var/postgres stop -s -m fast'
-alias restartpost='stoppost && sleep 1 && startpost'
-alias reloadpost='pg_ctl reload -D /usr/local/var/postgres -s'
-alias statuspost='pg_ctl status -D /usr/local/var/postgres -s'
\ No newline at end of file
+local PG_BREW_DIR=$(brew --prefix)/var/postgres
+
+alias startpost="pg_ctl -D $PG_BREW_DIR -l $PG_BREW_DIR/server.log start"
+alias stoppost="pg_ctl -D $PG_BREW_DIR stop -s -m fast"
+alias restartpost="stoppost && sleep 1 && startpost"
+alias reloadpost="pg_ctl reload -D $PG_BREW_DIR -s"
+alias statuspost="pg_ctl status -D $PG_BREW_DIR -s"

From fc40b53e6460560ed9b256deb87f2165f8d48f1f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Mon, 24 Jan 2022 18:32:36 +0100
Subject: [PATCH 791/869] style(updater): silence `git pull` output and show
 errors in English

---
 tools/upgrade.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/upgrade.sh b/tools/upgrade.sh
index 55412062a..b6cb10b5a 100755
--- a/tools/upgrade.sh
+++ b/tools/upgrade.sh
@@ -194,7 +194,7 @@ last_commit=$(git rev-parse "$branch")
 
 # Update Oh My Zsh
 printf "${BLUE}%s${RESET}\n" "Updating Oh My Zsh"
-if git pull --rebase $remote $branch; then
+if LANG= git pull --quiet --rebase $remote $branch; then
   # Check if it was really updated or not
   if [[ "$(git rev-parse HEAD)" = "$last_commit" ]]; then
     message="Oh My Zsh is already at the latest version."

From 3741d1aa0253291c432e6ce3469f1d16dedbc914 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Wed, 26 Jan 2022 17:13:10 +0100
Subject: [PATCH 792/869] fix(npx)!: detect new `npx` versions and fail
 gracefully (#10452)

BREAKING CHANGE: the `npx` plugin used a feature of `npx` to check for
npm packages and run them if a command was not found. This feature was
removed in v7.0.0 and was deemed insecure. The `npx` plugin is now
officially deprecated and will be removed soon.

Fixes #10452
---
 plugins/npx/README.md      | 25 +------------------------
 plugins/npx/npx.plugin.zsh | 17 +++++++++++------
 plugins/osx/osx.plugin.zsh |  4 ++--
 3 files changed, 14 insertions(+), 32 deletions(-)

diff --git a/plugins/npx/README.md b/plugins/npx/README.md
index 41e4c1352..4b2aba8f0 100644
--- a/plugins/npx/README.md
+++ b/plugins/npx/README.md
@@ -1,27 +1,4 @@
-# NPX Plugin
-
-> npx(1) -- execute npm package binaries. ([more info](https://github.com/npm/npx))
-
-This plugin automatically registers npx command-not-found handler if `npx` exists in your `$PATH`.
-
-To use it, add `npx` to the plugins array in your zshrc file:
-
-```zsh
-plugins=(.... npx)
-```
-
-## Note
-
-The shell auto-fallback doesn't auto-install plain packages. In order to get it to install something, you need to add `@`:
-
-```
-➜  jasmine@latest # or just `jasmine@`
-npx: installed 13 in 1.896s
-Randomized with seed 54385
-Started
-```
-
-It does it this way so folks using the fallback don't accidentally try to install regular typoes.
+# npx plugin
 
 ## Deprecation
 
diff --git a/plugins/npx/npx.plugin.zsh b/plugins/npx/npx.plugin.zsh
index 32bb67377..c1e2eca98 100644
--- a/plugins/npx/npx.plugin.zsh
+++ b/plugins/npx/npx.plugin.zsh
@@ -1,7 +1,12 @@
-# NPX Plugin
-# https://www.npmjs.com/package/npx
-# Maintainer: Pooya Parsa <pooya@pi0.ir>
+if (( ! $+commands[npx] )); then
+  return
+fi
 
-(( $+commands[npx] )) && {
- source <(npx --shell-auto-fallback zsh)
-}
+if ! npx_fallback_script="$(npx --shell-auto-fallback zsh 2>/dev/null)"; then
+  print -u2 ${(%):-"%F{yellow}This \`npx\` version ($(npx --version)) is not supported.%f"}
+else
+  source <(<<< "$npx_fallback_script")
+fi
+
+print -u2 ${(%):-"%F{yellow}The \`npx\` plugin is deprecated and will be removed soon. %BPlease disable it%b.%f"}
+unset npx_fallback_script
diff --git a/plugins/osx/osx.plugin.zsh b/plugins/osx/osx.plugin.zsh
index 9304e7f32..3b0935981 100644
--- a/plugins/osx/osx.plugin.zsh
+++ b/plugins/osx/osx.plugin.zsh
@@ -1,5 +1,5 @@
-print ${(%):-'%F{yellow}The `osx` plugin is deprecated and has been renamed to `macos`.'}
-print ${(%):-'Please update your .zshrc to use the `%Bmacos%b` plugin instead.%f'}
+print -u2 ${(%):-'%F{yellow}The `osx` plugin is deprecated and has been renamed to `macos`.'}
+print -u2 ${(%):-'Please update your .zshrc to use the `%Bmacos%b` plugin instead.%f'}
 
 (( ${fpath[(Ie)$ZSH/plugins/macos]} )) || fpath=("$ZSH/plugins/macos" $fpath)
 source "$ZSH/plugins/macos/macos.plugin.zsh"

From 59c40eee8e9232f556e9d4c8c97eb1b866846af3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Thu, 27 Jan 2022 18:01:27 +0100
Subject: [PATCH 793/869] fix(installer): avoid `git clone -c` to support git
 v1.7.1 (#10621)

---
 tools/install.sh | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/tools/install.sh b/tools/install.sh
index 34dca8413..2290bc1eb 100755
--- a/tools/install.sh
+++ b/tools/install.sh
@@ -263,13 +263,19 @@ setup_ohmyzsh() {
     exit 1
   fi
 
-  git clone -c core.eol=lf -c core.autocrlf=false \
-    -c fsck.zeroPaddedFilemode=ignore \
-    -c fetch.fsck.zeroPaddedFilemode=ignore \
-    -c receive.fsck.zeroPaddedFilemode=ignore \
-    -c oh-my-zsh.remote=origin \
-    -c oh-my-zsh.branch="$BRANCH" \
-    --depth=1 --branch "$BRANCH" "$REMOTE" "$ZSH" || {
+  # Manual clone with git config options to support git < v1.7.2
+  git init "$ZSH" && cd "$ZSH" \
+  && git config core.eol lf \
+  && git config core.autocrlf false \
+  && git config fsck.zeroPaddedFilemode ignore \
+  && git config fetch.fsck.zeroPaddedFilemode ignore \
+  && git config receive.fsck.zeroPaddedFilemode ignore \
+  && git config oh-my-zsh.remote origin \
+  && git config oh-my-zsh.branch "$BRANCH" \
+  && git remote add origin "$REMOTE" \
+  && git fetch --depth=1 origin \
+  && git checkout -b "$BRANCH" "origin/$BRANCH" || {
+    rm -rf "$ZSH"
     fmt_error "git clone of oh-my-zsh repo failed"
     exit 1
   }

From 303ae79712d8d1df05b3ec6f63eb129c9a2ed031 Mon Sep 17 00:00:00 2001
From: Kuri Schlarb <246386+ntninja@users.noreply.github.com>
Date: Thu, 27 Jan 2022 20:48:42 +0000
Subject: [PATCH 794/869] fix(ys): fix `$VIRTUAL_ENV` check if `nounset` is
 enabled (#9915)

---
 themes/ys.zsh-theme | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/themes/ys.zsh-theme b/themes/ys.zsh-theme
index 5ef500e14..4c3c56ffc 100644
--- a/themes/ys.zsh-theme
+++ b/themes/ys.zsh-theme
@@ -49,7 +49,7 @@ local venv_info='$(virtenv_prompt)'
 YS_THEME_VIRTUALENV_PROMPT_PREFIX=" %{$fg[green]%}"
 YS_THEME_VIRTUALENV_PROMPT_SUFFIX=" %{$reset_color%}%"
 virtenv_prompt() {
-	[[ -n ${VIRTUAL_ENV} ]] || return
+	[[ -n "${VIRTUAL_ENV:-}" ]] || return
 	echo "${YS_THEME_VIRTUALENV_PROMPT_PREFIX}${VIRTUAL_ENV:t}${YS_THEME_VIRTUALENV_PROMPT_SUFFIX}"
 }
 

From ad8220bc6d4529db43c0968175f1b8d0e6637db0 Mon Sep 17 00:00:00 2001
From: ajr-dev <np8r39st8hn854izdxrw.septuagenarians@aleeas.com>
Date: Thu, 27 Jan 2022 17:59:04 +0100
Subject: [PATCH 795/869] fix(tmux): use `$ZSH_TMUX_CONFIG` setting in tmuxconf
 alias

---
 plugins/tmux/README.md       | 20 ++++++++++----------
 plugins/tmux/tmux.plugin.zsh | 20 ++++++++++----------
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/plugins/tmux/README.md b/plugins/tmux/README.md
index bc192a40c..7348f77c9 100644
--- a/plugins/tmux/README.md
+++ b/plugins/tmux/README.md
@@ -15,16 +15,16 @@ The plugin also supports the following:
 
 ## Aliases
 
-| Alias      | Command                | Description                                              |
-| ---------- | ---------------------- | -------------------------------------------------------- |
-| `ta`       | tmux attach -t         | Attach new tmux session to already running named session |
-| `tad`      | tmux attach -d -t      | Detach named tmux session                                |
-| `ts`       | tmux new-session -s    | Create a new named tmux session                          |
-| `tl`       | tmux list-sessions     | Displays a list of running tmux sessions                 |
-| `tksv`     | tmux kill-server       | Terminate all running tmux sessions                      |
-| `tkss`     | tmux kill-session -t   | Terminate named running tmux session                     |
-| `tmux`     | `_zsh_tmux_plugin_run` | Start a new tmux session                                 |
-| `tmuxconf` | `$EDITOR ~/.tmux.conf` | Open .tmux.conf file with an editor                      |
+| Alias      | Command                    | Description                                              |
+| ---------- | -------------------------- | -------------------------------------------------------- |
+| `ta`       | tmux attach -t             | Attach new tmux session to already running named session |
+| `tad`      | tmux attach -d -t          | Detach named tmux session                                |
+| `ts`       | tmux new-session -s        | Create a new named tmux session                          |
+| `tl`       | tmux list-sessions         | Displays a list of running tmux sessions                 |
+| `tksv`     | tmux kill-server           | Terminate all running tmux sessions                      |
+| `tkss`     | tmux kill-session -t       | Terminate named running tmux session                     |
+| `tmux`     | `_zsh_tmux_plugin_run`     | Start a new tmux session                                 |
+| `tmuxconf` | `$EDITOR $ZSH_TMUX_CONFIG` | Open .tmux.conf file with an editor                      |
 
 ## Configuration Variables
 
diff --git a/plugins/tmux/tmux.plugin.zsh b/plugins/tmux/tmux.plugin.zsh
index 9d333257e..b9bb66d59 100644
--- a/plugins/tmux/tmux.plugin.zsh
+++ b/plugins/tmux/tmux.plugin.zsh
@@ -3,16 +3,6 @@ if ! (( $+commands[tmux] )); then
   return 1
 fi
 
-# ALIASES
-
-alias ta='tmux attach -t'
-alias tad='tmux attach -d -t'
-alias ts='tmux new-session -s'
-alias tl='tmux list-sessions'
-alias tksv='tmux kill-server'
-alias tkss='tmux kill-session -t'
-alias tmuxconf='$EDITOR ~/.tmux.conf'
-
 # CONFIGURATION VARIABLES
 # Automatically start tmux
 : ${ZSH_TMUX_AUTOSTART:=false}
@@ -40,6 +30,16 @@ alias tmuxconf='$EDITOR ~/.tmux.conf'
 # Set -u option to support unicode
 : ${ZSH_TMUX_UNICODE:=false}
 
+# ALIASES
+
+alias ta='tmux attach -t'
+alias tad='tmux attach -d -t'
+alias ts='tmux new-session -s'
+alias tl='tmux list-sessions'
+alias tksv='tmux kill-server'
+alias tkss='tmux kill-session -t'
+alias tmuxconf='$EDITOR $ZSH_TMUX_CONFIG'
+
 # Determine if the terminal supports 256 colors
 if [[ $terminfo[colors] == 256 ]]; then
   export ZSH_TMUX_TERM=$ZSH_TMUX_FIXTERM_WITH_256COLOR

From b5edb51ee4bb0b3e9f5cbb0c46348bcbdd941f04 Mon Sep 17 00:00:00 2001
From: Lukas <matthias.doering@mldsc.de>
Date: Thu, 27 Jan 2022 22:00:50 +0100
Subject: [PATCH 796/869] style(rkj-repos): change `white` to `default` to
 support light color schemes (#6195)

Co-authored-by: Matthias Doering <matthias.doering@teamix.de>
---
 themes/rkj-repos.zsh-theme | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/themes/rkj-repos.zsh-theme b/themes/rkj-repos.zsh-theme
index 65a075456..3cb452335 100644
--- a/themes/rkj-repos.zsh-theme
+++ b/themes/rkj-repos.zsh-theme
@@ -30,6 +30,6 @@ function mygit() {
 function retcode() {}
 
 # alternate prompt with git & hg
-PROMPT=$'%{$fg_bold[blue]%}┌─[%{$fg_bold[green]%}%n%b%{$fg[black]%}@%{$fg[cyan]%}%m%{$fg_bold[blue]%}]%{$reset_color%} - %{$fg_bold[blue]%}[%{$fg_bold[white]%}%~%{$fg_bold[blue]%}]%{$reset_color%} - %{$fg_bold[blue]%}[%b%{$fg[yellow]%}'%D{"%Y-%m-%d %I:%M:%S"}%b$'%{$fg_bold[blue]%}]
+PROMPT=$'%{$fg_bold[blue]%}┌─[%{$fg_bold[green]%}%n%b%{$fg[black]%}@%{$fg[cyan]%}%m%{$fg_bold[blue]%}]%{$reset_color%} - %{$fg_bold[blue]%}[%{$fg_bold[default]%}%~%{$fg_bold[blue]%}]%{$reset_color%} - %{$fg_bold[blue]%}[%b%{$fg[yellow]%}'%D{"%Y-%m-%d %I:%M:%S"}%b$'%{$fg_bold[blue]%}]
 %{$fg_bold[blue]%}└─[%{$fg_bold[magenta]%}%?$(retcode)%{$fg_bold[blue]%}] <$(mygit)$(hg_prompt_info)>%{$reset_color%} '
 PS2=$' \e[0;34m%}%B>%{\e[0m%}%b '

From 3c5367d272011e7bca9fa4e8f9a5f9635f938d11 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Fri, 28 Jan 2022 13:22:31 +0100
Subject: [PATCH 797/869] fix(changelog): don't show changelog with only
 ignored type commits

---
 tools/changelog.sh | 34 ++++++++++++++++++++--------------
 1 file changed, 20 insertions(+), 14 deletions(-)

diff --git a/tools/changelog.sh b/tools/changelog.sh
index 49532a4a4..6489a3cb2 100755
--- a/tools/changelog.sh
+++ b/tools/changelog.sh
@@ -23,8 +23,7 @@ TYPES=(
   test      "Testing"
 )
 
-#* Types that will be displayed in their own section,
-#* in the order specified here.
+#* Types that will be displayed in their own section, in the order specified here.
 local -a MAIN_TYPES
 MAIN_TYPES=(feat fix perf docs)
 
@@ -34,7 +33,8 @@ OTHER_TYPES=(refactor style other)
 
 #* Commit types that don't appear in $MAIN_TYPES nor $OTHER_TYPES
 #* will not be displayed and will simply be ignored.
-
+local -a IGNORED_TYPES
+IGNORED_TYPES=(${${${(@k)TYPES}:|MAIN_TYPES}:|OTHER_TYPES})
 
 ############################
 # COMMIT PARSING UTILITIES #
@@ -139,7 +139,7 @@ function parse-commit {
   #  [BREAKING CHANGE: warning]
 
   # commits holds the commit type
-  commits[$hash]="$(commit:type "$subject")"
+  types[$hash]="$(commit:type "$subject")"
   # scopes holds the commit scope
   scopes[$hash]="$(commit:scope "$subject")"
   # subjects holds the commit subject
@@ -164,26 +164,32 @@ function parse-commit {
 function display-release {
 
   # This function uses the following globals: output, version,
-  # commits (A), subjects (A), scopes (A), breaking (A) and reverts (A).
+  # types (A), subjects (A), scopes (A), breaking (A) and reverts (A).
   #
   # - output is the output format to use when formatting (raw|text|md)
   # - version is the version in which the commits are made
-  # - commits, subjects, scopes, breaking, and reverts are associative arrays
+  # - types, subjects, scopes, breaking, and reverts are associative arrays
   #   with commit hashes as keys
 
   # Remove commits that were reverted
   local hash rhash
   for hash rhash in ${(kv)reverts}; do
-    if (( ${+commits[$rhash]} )); then
+    if (( ${+types[$rhash]} )); then
       # Remove revert commit
-      unset "commits[$hash]" "subjects[$hash]" "scopes[$hash]" "breaking[$hash]"
+      unset "types[$hash]" "subjects[$hash]" "scopes[$hash]" "breaking[$hash]"
       # Remove reverted commit
-      unset "commits[$rhash]" "subjects[$rhash]" "scopes[$rhash]" "breaking[$rhash]"
+      unset "types[$rhash]" "subjects[$rhash]" "scopes[$rhash]" "breaking[$rhash]"
     fi
   done
 
+  # Remove commits from ignored types unless it has breaking change information
+  for hash in ${(k)types[(R)${(j:|:)IGNORED_TYPES}]}; do
+    (( ! ${+breaking[$hash]} )) || continue
+    unset "types[$hash]" "subjects[$hash]" "scopes[$hash]"
+  done
+
   # If no commits left skip displaying the release
-  if (( $#commits == 0 )); then
+  if (( $#types == 0 )); then
     return
   fi
 
@@ -313,7 +319,7 @@ function display-release {
     local hash type="$1"
 
     local -a hashes
-    hashes=(${(k)commits[(R)$type]})
+    hashes=(${(k)types[(R)$type]})
 
     # If no commits found of type $type, go to next type
     (( $#hashes != 0 )) || return 0
@@ -330,7 +336,7 @@ function display-release {
 
     # Commits made under types considered other changes
     local -A changes
-    changes=(${(kv)commits[(R)${(j:|:)OTHER_TYPES}]})
+    changes=(${(kv)types[(R)${(j:|:)OTHER_TYPES}]})
 
     # If no commits found under "other" types, don't display anything
     (( $#changes != 0 )) || return 0
@@ -388,7 +394,7 @@ function main {
   fi
 
   # Commit classification arrays
-  local -A commits subjects scopes breaking reverts
+  local -A types subjects scopes breaking reverts
   local truncate=0 read_commits=0
   local version tag
   local hash refs subject body
@@ -441,7 +447,7 @@ function main {
       # Output previous release
       display-release
       # Reinitialize commit storage
-      commits=()
+      types=()
       subjects=()
       scopes=()
       breaking=()

From 6f9650d940f31d9d10f07a176a85ca3b814f448f Mon Sep 17 00:00:00 2001
From: Felipe Contreras <felipe.contreras@gmail.com>
Date: Fri, 28 Jan 2022 06:45:05 -0600
Subject: [PATCH 798/869] fix(gitfast): update to git-completion 1.3.6 (#10633)

---
 plugins/gitfast/_git                |   46 +-
 plugins/gitfast/git-completion.bash | 1007 +++++++++++++--------------
 plugins/gitfast/git-prompt.sh       |    7 +-
 plugins/gitfast/update              |    2 +-
 4 files changed, 518 insertions(+), 544 deletions(-)

diff --git a/plugins/gitfast/_git b/plugins/gitfast/_git
index 988f5b1c6..31bf88c1c 100644
--- a/plugins/gitfast/_git
+++ b/plugins/gitfast/_git
@@ -33,8 +33,9 @@ if [ -z "$script" ]; then
 		bash_completion='/usr/share/bash-completion/completions/'
 
 	locations=(
-		"$(dirname ${funcsourcetrace[1]%:*})"/git-completion.bash
+		"${${funcsourcetrace[1]%:*}:A:h}"/git-completion.bash
 		"$HOME/.local/share/bash-completion/completions/git"
+		'/usr/local/share/bash-completion/completions/git'
 		"$bash_completion/git"
 		'/etc/bash_completion.d/git' # old debian
 		)
@@ -51,13 +52,20 @@ functions[complete]="$old_complete"
 
 __gitcompadd ()
 {
-	compadd -Q -p "${2-}" -S "${3- }" ${@[4,-1]} -- ${=1} && _ret=0
+	compadd -p "${2-}" -S "${3- }" -q -- ${=1} && _ret=0
 }
 
 __gitcomp ()
 {
 	emulate -L zsh
 
+	IFS=$' \t\n' __gitcompadd "$1" "${2-}" "${4- }"
+}
+
+__gitcomp_opts ()
+{
+	emulate -L zsh
+
 	local cur_="${3-$cur}"
 
 	[[ "$cur_" == *= ]] && return
@@ -70,7 +78,7 @@ __gitcomp ()
 			break
 		fi
 
-		if [[ -z "${4-}" ]]; then
+		if [[ -z "${4+set}" ]]; then
 			case $c in
 			*=) c="${c%=}"; sfx="=" ;;
 			*.) sfx="" ;;
@@ -79,7 +87,7 @@ __gitcomp ()
 		else
 			sfx="$4"
 		fi
-		__gitcompadd "$c" "${2-}" "$sfx" -q
+		__gitcompadd "$c" "${2-}" "$sfx"
 	done
 }
 
@@ -87,7 +95,10 @@ __gitcomp_nl ()
 {
 	emulate -L zsh
 
-	IFS=$'\n' __gitcompadd "$1" "${2-}" "${4- }"
+	# words that don't end up in space
+	compadd -p "${2-}" -S "${4- }" -q -- ${${(f)1}:#*\ } && _ret=0
+	# words that end in space
+	compadd -p "${2-}" -S " ${4- }" -q -- ${${(M)${(f)1}:#*\ }% } && _ret=0
 }
 
 __gitcomp_file ()
@@ -107,21 +118,6 @@ __gitcomp_file_direct ()
 	__gitcomp_file "$1" ""
 }
 
-__gitcomp_nl_append ()
-{
-	__gitcomp_nl "$@"
-}
-
-__gitcomp_direct_append ()
-{
-	__gitcomp_direct "$@"
-}
-
-_git_zsh ()
-{
-	__gitcomp "v1.2"
-}
-
 __git_complete_command ()
 {
 	emulate -L zsh
@@ -206,9 +202,7 @@ __git_zsh_main ()
 {
 	local curcontext="$curcontext" state state_descr line
 	typeset -A opt_args
-	local -a orig_words __git_C_args
-
-	orig_words=( ${words[@]} )
+	local -a __git_C_args
 
 	_arguments -C \
 		'(-p --paginate -P --no-pager)'{-p,--paginate}'[pipe all output into ''less'']' \
@@ -245,7 +239,7 @@ __git_zsh_main ()
 		emulate ksh -c __git_complete_config_variable_name_and_value
 		;;
 	(arg)
-		local command="${words[1]}" __git_dir
+		local command="${words[1]}" __git_dir __git_cmd_idx=1
 
 		if (( $+opt_args[--bare] )); then
 			__git_dir='.'
@@ -259,7 +253,7 @@ __git_zsh_main ()
 
 		(( $+opt_args[--help] )) && command='help'
 
-		words=( ${orig_words[@]} )
+		words=( git ${words[@]} )
 
 		__git_zsh_bash_func $command
 		;;
@@ -269,7 +263,7 @@ __git_zsh_main ()
 _git ()
 {
 	local _ret=1
-	local cur cword prev
+	local cur cword prev __git_cmd_idx=0
 
 	cur=${words[CURRENT]}
 	prev=${words[CURRENT-1]}
diff --git a/plugins/gitfast/git-completion.bash b/plugins/gitfast/git-completion.bash
index f7b09b2c1..2603ba7bb 100644
--- a/plugins/gitfast/git-completion.bash
+++ b/plugins/gitfast/git-completion.bash
@@ -29,6 +29,15 @@
 # tell the completion to use commit completion.  This also works with aliases
 # of form "!sh -c '...'".  For example, "!sh -c ': git commit ; ... '".
 #
+# If you have a command that is not part of git, but you would still
+# like completion, you can use __git_complete:
+#
+#   __git_complete gl git_log
+#
+# Or if it's a main command (i.e. git or gitk):
+#
+#   __git_complete gk gitk
+#
 # Compatible with bash 3.2.57.
 #
 # You can set the following environment variables to influence the behavior of
@@ -45,6 +54,145 @@
 #     When set to "1" suggest all options, including options which are
 #     typically hidden (e.g. '--allow-empty' for 'git commit').
 
+# The following functions are meant to modify COMPREPLY, which should not be
+# modified directly.  The purpose is to localize the modifications so it's
+# easier to emulate it in Zsh. Every time a new __gitcomp* function is added,
+# the corresponding function should be added to Zsh.
+
+__gitcompadd ()
+{
+	local x i=${#COMPREPLY[@]}
+	for x in $1; do
+		if [[ "$x" == "$3"* ]]; then
+			COMPREPLY[i++]="$2$x$4"
+		fi
+	done
+}
+
+# Creates completion replies.
+# It accepts 1 to 4 arguments:
+# 1: List of possible completion words.
+# 2: A prefix to be added to each possible completion word (optional).
+# 3: Generate possible completion matches for this word (optional).
+# 4: A suffix to be appended to each possible completion word (optional).
+__gitcomp ()
+{
+	local IFS=$' \t\n'
+	__gitcompadd "$1" "${2-}" "${3-$cur}" "${4- }"
+}
+
+# Generates completion reply from newline-separated possible completion words
+# by appending a space to all of them. The result is appended to COMPREPLY.
+# It accepts 1 to 4 arguments:
+# 1: List of possible completion words, separated by a single newline.
+# 2: A prefix to be added to each possible completion word (optional).
+# 3: Generate possible completion matches for this word (optional).
+# 4: A suffix to be appended to each possible completion word instead of
+#    the default space (optional).  If specified but empty, nothing is
+#    appended.
+__gitcomp_nl ()
+{
+	local IFS=$'\n'
+	__gitcompadd "$1" "${2-}" "${3-$cur}" "${4- }"
+}
+
+# Appends prefiltered words to COMPREPLY without any additional processing.
+# Callers must take care of providing only words that match the current word
+# to be completed and adding any prefix and/or suffix (trailing space!), if
+# necessary.
+# 1: List of newline-separated matching completion words, complete with
+#    prefix and suffix.
+__gitcomp_direct ()
+{
+	local IFS=$'\n'
+
+	COMPREPLY+=($1)
+}
+
+# Generates completion reply with compgen from newline-separated possible
+# completion filenames.
+# It accepts 1 to 3 arguments:
+# 1: List of possible completion filenames, separated by a single newline.
+# 2: A directory prefix to be added to each possible completion filename
+#    (optional).
+# 3: Generate possible completion matches for this word (optional).
+__gitcomp_file ()
+{
+	local IFS=$'\n'
+
+	# XXX does not work when the directory prefix contains a tilde,
+	# since tilde expansion is not applied.
+	# This means that COMPREPLY will be empty and Bash default
+	# completion will be used.
+	__gitcompadd "$1" "${2-}" "${3-$cur}" ""
+
+	# use a hack to enable file mode in bash < 4
+	compopt -o filenames +o nospace 2>/dev/null ||
+	compgen -f /non-existing-dir/ >/dev/null ||
+	true
+}
+
+# Fills the COMPREPLY array with prefiltered paths without any additional
+# processing.
+# Callers must take care of providing only paths that match the current path
+# to be completed and adding any prefix path components, if necessary.
+# 1: List of newline-separated matching paths, complete with all prefix
+#    path components.
+__gitcomp_file_direct ()
+{
+	local IFS=$'\n'
+
+	COMPREPLY+=($1)
+
+	# use a hack to enable file mode in bash < 4
+	compopt -o filenames +o nospace 2>/dev/null ||
+	compgen -f /non-existing-dir/ >/dev/null ||
+	true
+}
+
+# Creates completion replies, reorganizing options and adding suffixes as needed.
+# It accepts 1 to 4 arguments:
+# 1: List of possible completion words.
+# 2: A prefix to be added to each possible completion word (optional).
+# 3: Generate possible completion matches for this word (optional).
+# 4: A suffix to be appended to each possible completion word (optional).
+__gitcomp_opts ()
+{
+	local cur_="${3-$cur}"
+
+	if [[ "$cur_" == *= ]]; then
+		return
+	fi
+
+	local c i=0 IFS=$' \t\n' sfx
+	for c in $1; do
+		if [[ $c == "--" ]]; then
+			if [[ "$cur_" == --no-* ]]; then
+				continue
+			fi
+
+			if [[ --no == "$cur_"* ]]; then
+				COMPREPLY[i++]="--no-... "
+			fi
+			break
+		fi
+		if [[ $c == "$cur_"* ]]; then
+			if [[ -z "${4+set}" ]]; then
+				case $c in
+				*=|*.) sfx="" ;;
+				*) sfx=" " ;;
+				esac
+			else
+				sfx="$4"
+			fi
+			COMPREPLY[i++]="${2-}$c$sfx"
+		fi
+	done
+}
+
+# __gitcomp functions end here
+# ==============================================================================
+
 # Discovers the path to the git repository taking any '--git-dir=<path>' and
 # '-C <path>' options into account and stores it in the $__git_repo_path
 # variable.
@@ -63,7 +211,7 @@ __git_find_repo_path ()
 		test -d "$__git_dir" &&
 		__git_repo_path="$__git_dir"
 	elif [ -n "${GIT_DIR-}" ]; then
-		test -d "${GIT_DIR-}" &&
+		test -d "$GIT_DIR" &&
 		__git_repo_path="$GIT_DIR"
 	elif [ -d .git ]; then
 		__git_repo_path=.git
@@ -159,230 +307,6 @@ __git_dequote ()
 	done
 }
 
-# The following function is based on code from:
-#
-#   bash_completion - programmable completion functions for bash 3.2+
-#
-#   Copyright © 2006-2008, Ian Macdonald <ian@caliban.org>
-#             © 2009-2010, Bash Completion Maintainers
-#                     <bash-completion-devel@lists.alioth.debian.org>
-#
-#   This program is free software; you can redistribute it and/or modify
-#   it under the terms of the GNU General Public License as published by
-#   the Free Software Foundation; either version 2, or (at your option)
-#   any later version.
-#
-#   This program is distributed in the hope that it will be useful,
-#   but WITHOUT ANY WARRANTY; without even the implied warranty of
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#   GNU General Public License for more details.
-#
-#   You should have received a copy of the GNU General Public License
-#   along with this program; if not, see <http://www.gnu.org/licenses/>.
-#
-#   The latest version of this software can be obtained here:
-#
-#   http://bash-completion.alioth.debian.org/
-#
-#   RELEASE: 2.x
-
-# This function can be used to access a tokenized list of words
-# on the command line:
-#
-#	__git_reassemble_comp_words_by_ref '=:'
-#	if test "${words_[cword_-1]}" = -w
-#	then
-#		...
-#	fi
-#
-# The argument should be a collection of characters from the list of
-# word completion separators (COMP_WORDBREAKS) to treat as ordinary
-# characters.
-#
-# This is roughly equivalent to going back in time and setting
-# COMP_WORDBREAKS to exclude those characters.  The intent is to
-# make option types like --date=<type> and <rev>:<path> easy to
-# recognize by treating each shell word as a single token.
-#
-# It is best not to set COMP_WORDBREAKS directly because the value is
-# shared with other completion scripts.  By the time the completion
-# function gets called, COMP_WORDS has already been populated so local
-# changes to COMP_WORDBREAKS have no effect.
-#
-# Output: words_, cword_, cur_.
-
-__git_reassemble_comp_words_by_ref()
-{
-	local exclude i j first
-	# Which word separators to exclude?
-	exclude="${1//[^$COMP_WORDBREAKS]}"
-	cword_=$COMP_CWORD
-	if [ -z "$exclude" ]; then
-		words_=("${COMP_WORDS[@]}")
-		return
-	fi
-	# List of word completion separators has shrunk;
-	# re-assemble words to complete.
-	for ((i=0, j=0; i < ${#COMP_WORDS[@]}; i++, j++)); do
-		# Append each nonempty word consisting of just
-		# word separator characters to the current word.
-		first=t
-		while
-			[ $i -gt 0 ] &&
-			[ -n "${COMP_WORDS[$i]}" ] &&
-			# word consists of excluded word separators
-			[ "${COMP_WORDS[$i]//[^$exclude]}" = "${COMP_WORDS[$i]}" ]
-		do
-			# Attach to the previous token,
-			# unless the previous token is the command name.
-			if [ $j -ge 2 ] && [ -n "$first" ]; then
-				((j--))
-			fi
-			first=
-			words_[$j]=${words_[j]}${COMP_WORDS[i]}
-			if [ $i = $COMP_CWORD ]; then
-				cword_=$j
-			fi
-			if (($i < ${#COMP_WORDS[@]} - 1)); then
-				((i++))
-			else
-				# Done.
-				return
-			fi
-		done
-		words_[$j]=${words_[j]}${COMP_WORDS[i]}
-		if [ $i = $COMP_CWORD ]; then
-			cword_=$j
-		fi
-	done
-}
-
-if ! type _get_comp_words_by_ref >/dev/null 2>&1; then
-_get_comp_words_by_ref ()
-{
-	local exclude cur_ words_ cword_
-	if [ "$1" = "-n" ]; then
-		exclude=$2
-		shift 2
-	fi
-	__git_reassemble_comp_words_by_ref "$exclude"
-	cur_=${words_[cword_]}
-	while [ $# -gt 0 ]; do
-		case "$1" in
-		cur)
-			cur=$cur_
-			;;
-		prev)
-			prev=${words_[$cword_-1]}
-			;;
-		words)
-			words=("${words_[@]}")
-			;;
-		cword)
-			cword=$cword_
-			;;
-		esac
-		shift
-	done
-}
-fi
-
-# Fills the COMPREPLY array with prefiltered words without any additional
-# processing.
-# Callers must take care of providing only words that match the current word
-# to be completed and adding any prefix and/or suffix (trailing space!), if
-# necessary.
-# 1: List of newline-separated matching completion words, complete with
-#    prefix and suffix.
-__gitcomp_direct ()
-{
-	local IFS=$'\n'
-
-	COMPREPLY=($1)
-}
-
-# Similar to __gitcomp_direct, but appends to COMPREPLY instead.
-# Callers must take care of providing only words that match the current word
-# to be completed and adding any prefix and/or suffix (trailing space!), if
-# necessary.
-# 1: List of newline-separated matching completion words, complete with
-#    prefix and suffix.
-__gitcomp_direct_append ()
-{
-	local IFS=$'\n'
-
-	COMPREPLY+=($1)
-}
-
-__gitcompappend ()
-{
-	local x i=${#COMPREPLY[@]}
-	for x in $1; do
-		if [[ "$x" == "$3"* ]]; then
-			COMPREPLY[i++]="$2$x$4"
-		fi
-	done
-}
-
-__gitcompadd ()
-{
-	COMPREPLY=()
-	__gitcompappend "$@"
-}
-
-# Generates completion reply, appending a space to possible completion words,
-# if necessary.
-# It accepts 1 to 4 arguments:
-# 1: List of possible completion words.
-# 2: A prefix to be added to each possible completion word (optional).
-# 3: Generate possible completion matches for this word (optional).
-# 4: A suffix to be appended to each possible completion word (optional).
-__gitcomp ()
-{
-	local cur_="${3-$cur}"
-
-	case "$cur_" in
-	*=)
-		;;
-	--no-*)
-		local c i=0 IFS=$' \t\n'
-		for c in $1; do
-			if [[ $c == "--" ]]; then
-				continue
-			fi
-			c="$c${4-}"
-			if [[ $c == "$cur_"* ]]; then
-				case $c in
-				--*=|*.) ;;
-				*) c="$c " ;;
-				esac
-				COMPREPLY[i++]="${2-}$c"
-			fi
-		done
-		;;
-	*)
-		local c i=0 IFS=$' \t\n'
-		for c in $1; do
-			if [[ $c == "--" ]]; then
-				c="--no-...${4-}"
-				if [[ $c == "$cur_"* ]]; then
-					COMPREPLY[i++]="${2-}$c "
-				fi
-				break
-			fi
-			c="$c${4-}"
-			if [[ $c == "$cur_"* ]]; then
-				case $c in
-				*=|*.) ;;
-				*) c="$c " ;;
-				esac
-				COMPREPLY[i++]="${2-}$c"
-			fi
-		done
-		;;
-	esac
-}
-
 # Clear the variables caching builtins' options when (re-)sourcing
 # the completion script.
 if [[ -n ${ZSH_VERSION-} ]]; then
@@ -391,107 +315,108 @@ else
 	unset $(compgen -v __gitcomp_builtin_)
 fi
 
-__gitcomp_builtin_add_default=" --dry-run --verbose --interactive --patch --edit --force --update --renormalize --intent-to-add --all --ignore-removal --refresh --ignore-errors --ignore-missing --chmod= --pathspec-from-file= --pathspec-file-nul --no-dry-run -- --no-verbose --no-interactive --no-patch --no-edit --no-force --no-update --no-renormalize --no-intent-to-add --no-all --no-ignore-removal --no-refresh --no-ignore-errors --no-ignore-missing --no-chmod --no-pathspec-from-file --no-pathspec-file-nul"
-__gitcomp_builtin_am_default=" --interactive --3way --quiet --signoff --utf8 --keep --keep-non-patch --message-id --keep-cr --no-keep-cr --scissors --whitespace= --ignore-space-change --ignore-whitespace --directory= --exclude= --include= --patch-format= --reject --resolvemsg= --continue --resolved --skip --abort --quit --show-current-patch --committer-date-is-author-date --ignore-date --rerere-autoupdate --gpg-sign -- --no-interactive --no-3way --no-quiet --no-signoff --no-utf8 --no-keep --no-keep-non-patch --no-message-id --no-scissors --no-whitespace --no-ignore-space-change --no-ignore-whitespace --no-directory --no-exclude --no-include --no-patch-format --no-reject --no-resolvemsg --no-committer-date-is-author-date --no-ignore-date --no-rerere-autoupdate --no-gpg-sign"
-__gitcomp_builtin_apply_default=" --exclude= --include= --no-add --stat --numstat --summary --check --index --intent-to-add --cached --apply --3way --build-fake-ancestor= --whitespace= --ignore-space-change --ignore-whitespace --reverse --unidiff-zero --reject --allow-overlap --verbose --inaccurate-eof --recount --directory= --add -- --no-stat --no-numstat --no-summary --no-check --no-index --no-intent-to-add --no-cached --no-apply --no-3way --no-build-fake-ancestor --no-whitespace --no-ignore-space-change --no-ignore-whitespace --no-reverse --no-unidiff-zero --no-reject --no-allow-overlap --no-verbose --no-inaccurate-eof --no-recount --no-directory"
+__gitcomp_builtin_add_default=" --dry-run --verbose --interactive --patch --edit --force --update --renormalize --intent-to-add --all --ignore-removal --refresh --ignore-errors --ignore-missing --sparse --chmod= --pathspec-from-file= --pathspec-file-nul --no-dry-run -- --no-verbose --no-interactive --no-patch --no-edit --no-force --no-update --no-renormalize --no-intent-to-add --no-all --no-ignore-removal --no-refresh --no-ignore-errors --no-ignore-missing --no-sparse --no-chmod --no-pathspec-from-file --no-pathspec-file-nul"
+__gitcomp_builtin_am_default=" --interactive --3way --quiet --signoff --utf8 --keep --keep-non-patch --message-id --keep-cr --no-keep-cr --scissors --quoted-cr= --whitespace= --ignore-space-change --ignore-whitespace --directory= --exclude= --include= --patch-format= --reject --resolvemsg= --continue --resolved --skip --abort --quit --show-current-patch --allow-empty --committer-date-is-author-date --ignore-date --rerere-autoupdate --gpg-sign --empty= -- --no-interactive --no-3way --no-quiet --no-signoff --no-utf8 --no-keep --no-keep-non-patch --no-message-id --no-scissors --no-whitespace --no-ignore-space-change --no-ignore-whitespace --no-directory --no-exclude --no-include --no-patch-format --no-reject --no-resolvemsg --no-committer-date-is-author-date --no-ignore-date --no-rerere-autoupdate --no-gpg-sign"
+__gitcomp_builtin_apply_default=" --exclude= --include= --no-add --stat --numstat --summary --check --index --intent-to-add --cached --apply --3way --build-fake-ancestor= --whitespace= --ignore-space-change --ignore-whitespace --reverse --unidiff-zero --reject --allow-overlap --verbose --quiet --inaccurate-eof --recount --directory= --allow-empty --add -- --no-stat --no-numstat --no-summary --no-check --no-index --no-intent-to-add --no-cached --no-apply --no-3way --no-build-fake-ancestor --no-whitespace --no-ignore-space-change --no-ignore-whitespace --no-reverse --no-unidiff-zero --no-reject --no-allow-overlap --no-verbose --no-quiet --no-inaccurate-eof --no-recount --no-directory --no-allow-empty"
 __gitcomp_builtin_archive_default=" --output= --remote= --exec= --no-output -- --no-remote --no-exec"
-__gitcomp_builtin_bisect__helper_default=" --next-all --write-terms --bisect-clean-state --check-expected-revs --bisect-reset --bisect-write --check-and-set-terms --bisect-next-check --bisect-terms --bisect-start --bisect-next --bisect-auto-next --bisect-autostart --no-log --log"
+__gitcomp_builtin_bisect__helper_default=" --bisect-reset --bisect-next-check --bisect-terms --bisect-start --bisect-next --bisect-state --bisect-log --bisect-replay --bisect-skip --bisect-visualize --bisect-run --no-log --log"
 __gitcomp_builtin_blame_default=" --incremental --root --show-stats --progress --score-debug --show-name --show-number --porcelain --line-porcelain --show-email --ignore-rev= --ignore-revs-file= --color-lines --color-by-age --minimal --contents= --abbrev --no-incremental -- --no-root --no-show-stats --no-progress --no-score-debug --no-show-name --no-show-number --no-porcelain --no-line-porcelain --no-show-email --no-ignore-rev --no-ignore-revs-file --no-color-lines --no-color-by-age --no-minimal --no-contents --no-abbrev"
-__gitcomp_builtin_branch_default=" --verbose --quiet --track --set-upstream-to= --unset-upstream --color --remotes --contains --no-contains --abbrev --all --delete --move --copy --list --show-current --create-reflog --edit-description --merged --no-merged --column --sort= --points-at= --ignore-case --format= -- --no-verbose --no-quiet --no-track --no-set-upstream-to --no-unset-upstream --no-color --no-remotes --no-abbrev --no-all --no-delete --no-move --no-copy --no-list --no-show-current --no-create-reflog --no-edit-description --no-column --no-points-at --no-ignore-case --no-format"
+__gitcomp_builtin_branch_default=" --verbose --quiet --track --set-upstream-to= --unset-upstream --color --remotes --contains --no-contains --abbrev --all --delete --move --copy --list --show-current --create-reflog --edit-description --merged --no-merged --column --sort= --points-at= --ignore-case --format= -- --no-verbose --no-quiet --no-track --no-set-upstream-to --no-unset-upstream --no-color --no-remotes --no-abbrev --no-all --no-delete --no-move --no-copy --no-list --no-show-current --no-create-reflog --no-edit-description --no-column --no-sort --no-points-at --no-ignore-case --no-format"
 __gitcomp_builtin_bugreport_default=" --output-directory= --suffix= --no-output-directory -- --no-suffix"
 __gitcomp_builtin_cat_file_default=" --textconv --filters --path= --allow-unknown-type --buffer --batch --batch-check --follow-symlinks --batch-all-objects --unordered --no-path -- --no-allow-unknown-type --no-buffer --no-follow-symlinks --no-batch-all-objects --no-unordered"
 __gitcomp_builtin_check_attr_default=" --all --cached --stdin --no-all -- --no-cached --no-stdin"
 __gitcomp_builtin_check_ignore_default=" --quiet --verbose --stdin --non-matching --no-index --index -- --no-quiet --no-verbose --no-stdin --no-non-matching"
 __gitcomp_builtin_check_mailmap_default=" --stdin --no-stdin"
 __gitcomp_builtin_checkout_default=" --guess --overlay --quiet --recurse-submodules --progress --merge --conflict= --detach --track --orphan= --ignore-other-worktrees --ours --theirs --patch --ignore-skip-worktree-bits --pathspec-from-file= --pathspec-file-nul --no-guess -- --no-overlay --no-quiet --no-recurse-submodules --no-progress --no-merge --no-conflict --no-detach --no-track --no-orphan --no-ignore-other-worktrees --no-patch --no-ignore-skip-worktree-bits --no-pathspec-from-file --no-pathspec-file-nul"
+__gitcomp_builtin_checkout__worker_default=" --prefix= --no-prefix"
 __gitcomp_builtin_checkout_index_default=" --all --force --quiet --no-create --index --stdin --temp --prefix= --stage= --create -- --no-all --no-force --no-quiet --no-index --no-stdin --no-temp --no-prefix"
 __gitcomp_builtin_cherry_default=" --abbrev --verbose --no-abbrev -- --no-verbose"
 __gitcomp_builtin_cherry_pick_default=" --quit --continue --abort --skip --cleanup= --no-commit --edit --signoff --mainline= --rerere-autoupdate --strategy= --strategy-option= --gpg-sign --ff --allow-empty --allow-empty-message --keep-redundant-commits --commit -- --no-cleanup --no-edit --no-signoff --no-mainline --no-rerere-autoupdate --no-strategy --no-strategy-option --no-gpg-sign --no-ff --no-allow-empty --no-allow-empty-message --no-keep-redundant-commits"
 __gitcomp_builtin_clean_default=" --quiet --dry-run --interactive --exclude= --no-quiet -- --no-dry-run --no-interactive"
-__gitcomp_builtin_clone_default=" --verbose --quiet --progress --no-checkout --bare --mirror --local --no-hardlinks --shared --recurse-submodules --recursive --jobs= --template= --reference= --reference-if-able= --dissociate --origin= --branch= --upload-pack= --depth= --shallow-since= --shallow-exclude= --single-branch --no-tags --shallow-submodules --separate-git-dir= --config= --server-option= --ipv4 --ipv6 --filter= --remote-submodules --sparse --checkout --hardlinks --tags -- --no-verbose --no-quiet --no-progress --no-bare --no-mirror --no-local --no-shared --no-recurse-submodules --no-recursive --no-jobs --no-template --no-reference --no-reference-if-able --no-dissociate --no-origin --no-branch --no-upload-pack --no-depth --no-shallow-since --no-shallow-exclude --no-single-branch --no-shallow-submodules --no-separate-git-dir --no-config --no-server-option --no-ipv4 --no-ipv6 --no-filter --no-remote-submodules --no-sparse"
+__gitcomp_builtin_clone_default=" --verbose --quiet --progress --reject-shallow --no-checkout --bare --mirror --local --no-hardlinks --shared --recurse-submodules --jobs= --template= --reference= --reference-if-able= --dissociate --origin= --branch= --upload-pack= --depth= --shallow-since= --shallow-exclude= --single-branch --no-tags --shallow-submodules --separate-git-dir= --config= --server-option= --ipv4 --ipv6 --filter= --remote-submodules --sparse --checkout --hardlinks --tags -- --no-verbose --no-quiet --no-progress --no-reject-shallow --no-bare --no-mirror --no-local --no-shared --no-recurse-submodules --no-recursive --no-jobs --no-template --no-reference --no-reference-if-able --no-dissociate --no-origin --no-branch --no-upload-pack --no-depth --no-shallow-since --no-shallow-exclude --no-single-branch --no-shallow-submodules --no-separate-git-dir --no-config --no-server-option --no-ipv4 --no-ipv6 --no-filter --no-remote-submodules --no-sparse"
 __gitcomp_builtin_column_default=" --command= --mode --raw-mode= --width= --indent= --nl= --padding= --no-command -- --no-mode --no-raw-mode --no-width --no-indent --no-nl --no-padding"
-__gitcomp_builtin_commit_default=" --quiet --verbose --file= --author= --date= --message= --reedit-message= --reuse-message= --fixup= --squash= --reset-author --signoff --template= --edit --cleanup= --status --gpg-sign --all --include --interactive --patch --only --no-verify --dry-run --short --branch --ahead-behind --porcelain --long --null --amend --no-post-rewrite --untracked-files --pathspec-from-file= --pathspec-file-nul --verify --post-rewrite -- --no-quiet --no-verbose --no-file --no-author --no-date --no-message --no-reedit-message --no-reuse-message --no-fixup --no-squash --no-reset-author --no-signoff --no-template --no-edit --no-cleanup --no-status --no-gpg-sign --no-all --no-include --no-interactive --no-patch --no-only --no-dry-run --no-short --no-branch --no-ahead-behind --no-porcelain --no-long --no-null --no-amend --no-untracked-files --no-pathspec-from-file --no-pathspec-file-nul"
+__gitcomp_builtin_commit_default=" --quiet --verbose --file= --author= --date= --message= --reedit-message= --reuse-message= --fixup= --squash= --reset-author --trailer= --signoff --template= --edit --cleanup= --status --gpg-sign --all --include --interactive --patch --only --no-verify --dry-run --short --branch --ahead-behind --porcelain --long --null --amend --no-post-rewrite --untracked-files --pathspec-from-file= --pathspec-file-nul --verify --post-rewrite -- --no-quiet --no-verbose --no-file --no-author --no-date --no-message --no-reedit-message --no-reuse-message --no-fixup --no-squash --no-reset-author --no-signoff --no-template --no-edit --no-cleanup --no-status --no-gpg-sign --no-all --no-include --no-interactive --no-patch --no-only --no-dry-run --no-short --no-branch --no-ahead-behind --no-porcelain --no-long --no-null --no-amend --no-untracked-files --no-pathspec-from-file --no-pathspec-file-nul"
 __gitcomp_builtin_commit_graph_default=" --object-dir= --no-object-dir"
-__gitcomp_builtin_config_default=" --global --system --local --worktree --file= --blob= --get --get-all --get-regexp --get-urlmatch --replace-all --add --unset --unset-all --rename-section --remove-section --list --edit --get-color --get-colorbool --type= --bool --int --bool-or-int --bool-or-str --path --expiry-date --null --name-only --includes --show-origin --show-scope --default= --no-global -- --no-system --no-local --no-worktree --no-file --no-blob --no-get --no-get-all --no-get-regexp --no-get-urlmatch --no-replace-all --no-add --no-unset --no-unset-all --no-rename-section --no-remove-section --no-list --no-edit --no-get-color --no-get-colorbool --no-type --no-null --no-name-only --no-includes --no-show-origin --no-show-scope --no-default"
+__gitcomp_builtin_config_default=" --global --system --local --worktree --file= --blob= --get --get-all --get-regexp --get-urlmatch --replace-all --add --unset --unset-all --rename-section --remove-section --list --fixed-value --edit --get-color --get-colorbool --type= --bool --int --bool-or-int --bool-or-str --path --expiry-date --null --name-only --includes --show-origin --show-scope --default= --no-global -- --no-system --no-local --no-worktree --no-file --no-blob --no-get --no-get-all --no-get-regexp --no-get-urlmatch --no-replace-all --no-add --no-unset --no-unset-all --no-rename-section --no-remove-section --no-list --no-fixed-value --no-edit --no-get-color --no-get-colorbool --no-type --no-null --no-name-only --no-includes --no-show-origin --no-show-scope --no-default"
 __gitcomp_builtin_count_objects_default=" --verbose --human-readable --no-verbose -- --no-human-readable"
 __gitcomp_builtin_credential_cache_default=" --timeout= --socket= --no-timeout -- --no-socket"
 __gitcomp_builtin_credential_cache__daemon_default=" --debug --no-debug"
 __gitcomp_builtin_credential_store_default=" --file= --no-file"
 __gitcomp_builtin_describe_default=" --contains --debug --all --tags --long --first-parent --abbrev --exact-match --candidates= --match= --exclude= --always --dirty --broken --no-contains -- --no-debug --no-all --no-tags --no-long --no-first-parent --no-abbrev --no-exact-match --no-candidates --no-match --no-exclude --no-always --no-dirty --no-broken"
-__gitcomp_builtin_difftool_default=" --gui --dir-diff --no-prompt --symlinks --tool= --tool-help --trust-exit-code --extcmd= --no-index -- --no-gui --no-dir-diff --no-symlinks --no-tool --no-tool-help --no-trust-exit-code --no-extcmd"
+__gitcomp_builtin_difftool_default=" --gui --dir-diff --no-prompt --symlinks --tool= --tool-help --trust-exit-code --extcmd= --no-index --index -- --no-gui --no-dir-diff --no-symlinks --no-tool --no-tool-help --no-trust-exit-code --no-extcmd"
 __gitcomp_builtin_env__helper_default=" --type= --default= --exit-code --no-default -- --no-exit-code"
 __gitcomp_builtin_fast_export_default=" --progress= --signed-tags= --tag-of-filtered-object= --reencode= --export-marks= --import-marks= --import-marks-if-exists= --fake-missing-tagger --full-tree --use-done-feature --no-data --refspec= --anonymize --anonymize-map= --reference-excluded-parents --show-original-ids --mark-tags --data -- --no-progress --no-signed-tags --no-tag-of-filtered-object --no-reencode --no-export-marks --no-import-marks --no-import-marks-if-exists --no-fake-missing-tagger --no-full-tree --no-use-done-feature --no-refspec --no-anonymize --no-reference-excluded-parents --no-show-original-ids --no-mark-tags"
-__gitcomp_builtin_fetch_default=" --verbose --quiet --all --set-upstream --append --upload-pack= --force --multiple --tags --jobs= --prune --prune-tags --recurse-submodules --dry-run --write-fetch-head --keep --update-head-ok --progress --depth= --shallow-since= --shallow-exclude= --deepen= --unshallow --update-shallow --refmap= --server-option= --ipv4 --ipv6 --negotiation-tip= --filter= --auto-maintenance --auto-gc --show-forced-updates --write-commit-graph --stdin --no-verbose -- --no-quiet --no-all --no-set-upstream --no-append --no-upload-pack --no-force --no-multiple --no-tags --no-jobs --no-prune --no-prune-tags --no-recurse-submodules --no-dry-run --no-write-fetch-head --no-keep --no-update-head-ok --no-progress --no-depth --no-shallow-since --no-shallow-exclude --no-deepen --no-update-shallow --no-server-option --no-ipv4 --no-ipv6 --no-negotiation-tip --no-filter --no-auto-maintenance --no-auto-gc --no-show-forced-updates --no-write-commit-graph --no-stdin"
-__gitcomp_builtin_fmt_merge_msg_default=" --log --message= --file= --no-log -- --no-message --no-file"
-__gitcomp_builtin_for_each_ref_default=" --shell --perl --python --tcl --count= --format= --color --sort= --points-at= --merged --no-merged --contains --no-contains --ignore-case -- --no-shell --no-perl --no-python --no-tcl --no-count --no-format --no-color --no-points-at --no-ignore-case"
-__gitcomp_builtin_format_patch_default=" --numbered --no-numbered --signoff --stdout --cover-letter --numbered-files --suffix= --start-number= --reroll-count= --rfc --cover-from-description= --subject-prefix= --output-directory= --keep-subject --no-binary --zero-commit --ignore-if-in-upstream --no-stat --add-header= --to= --cc= --from --in-reply-to= --attach --inline --thread --signature= --base= --signature-file= --quiet --progress --interdiff= --range-diff= --creation-factor= --binary -- --no-numbered --no-signoff --no-stdout --no-cover-letter --no-numbered-files --no-suffix --no-start-number --no-reroll-count --no-cover-from-description --no-zero-commit --no-ignore-if-in-upstream --no-add-header --no-to --no-cc --no-from --no-in-reply-to --no-attach --no-thread --no-signature --no-base --no-signature-file --no-quiet --no-progress --no-interdiff --no-range-diff --no-creation-factor"
+__gitcomp_builtin_fetch_default=" --verbose --quiet --all --set-upstream --append --atomic --upload-pack= --force --multiple --tags --jobs= --prefetch --prune --prune-tags --recurse-submodules --dry-run --write-fetch-head --keep --update-head-ok --progress --depth= --shallow-since= --shallow-exclude= --deepen= --unshallow --update-shallow --refmap= --server-option= --ipv4 --ipv6 --negotiation-tip= --negotiate-only --filter= --auto-maintenance --auto-gc --show-forced-updates --write-commit-graph --stdin --no-verbose -- --no-quiet --no-all --no-set-upstream --no-append --no-atomic --no-upload-pack --no-force --no-multiple --no-tags --no-jobs --no-prefetch --no-prune --no-prune-tags --no-recurse-submodules --no-dry-run --no-write-fetch-head --no-keep --no-update-head-ok --no-progress --no-depth --no-shallow-since --no-shallow-exclude --no-deepen --no-update-shallow --no-server-option --no-ipv4 --no-ipv6 --no-negotiation-tip --no-negotiate-only --no-filter --no-auto-maintenance --no-auto-gc --no-show-forced-updates --no-write-commit-graph --no-stdin"
+__gitcomp_builtin_fmt_merge_msg_default=" --log --message= --into-name= --file= --no-log -- --no-message --no-into-name --no-file"
+__gitcomp_builtin_for_each_ref_default=" --shell --perl --python --tcl --count= --format= --color --sort= --points-at= --merged --no-merged --contains --no-contains --ignore-case -- --no-shell --no-perl --no-python --no-tcl --no-count --no-format --no-color --no-sort --no-points-at --no-ignore-case"
+__gitcomp_builtin_for_each_repo_default=" --config= --no-config"
+__gitcomp_builtin_format_patch_default=" --numbered --no-numbered --signoff --stdout --cover-letter --numbered-files --suffix= --start-number= --reroll-count= --filename-max-length= --rfc --cover-from-description= --subject-prefix= --output-directory= --keep-subject --no-binary --zero-commit --ignore-if-in-upstream --no-stat --add-header= --to= --cc= --from --in-reply-to= --attach --inline --thread --signature= --base= --signature-file= --quiet --progress --interdiff= --range-diff= --creation-factor= --binary -- --no-numbered --no-signoff --no-stdout --no-cover-letter --no-numbered-files --no-suffix --no-start-number --no-reroll-count --no-filename-max-length --no-cover-from-description --no-zero-commit --no-ignore-if-in-upstream --no-add-header --no-to --no-cc --no-from --no-in-reply-to --no-attach --no-thread --no-signature --no-base --no-signature-file --no-quiet --no-progress --no-interdiff --no-range-diff --no-creation-factor"
 __gitcomp_builtin_fsck_default=" --verbose --unreachable --dangling --tags --root --cache --reflogs --full --connectivity-only --strict --lost-found --progress --name-objects --no-verbose -- --no-unreachable --no-dangling --no-tags --no-root --no-cache --no-reflogs --no-full --no-connectivity-only --no-strict --no-lost-found --no-progress --no-name-objects"
 __gitcomp_builtin_fsck_objects_default=" --verbose --unreachable --dangling --tags --root --cache --reflogs --full --connectivity-only --strict --lost-found --progress --name-objects --no-verbose -- --no-unreachable --no-dangling --no-tags --no-root --no-cache --no-reflogs --no-full --no-connectivity-only --no-strict --no-lost-found --no-progress --no-name-objects"
 __gitcomp_builtin_gc_default=" --quiet --prune --aggressive --keep-largest-pack --no-quiet -- --no-prune --no-aggressive --no-keep-largest-pack"
 __gitcomp_builtin_grep_default=" --cached --no-index --untracked --exclude-standard --recurse-submodules --invert-match --ignore-case --word-regexp --text --textconv --recursive --max-depth= --extended-regexp --basic-regexp --fixed-strings --perl-regexp --line-number --column --full-name --files-with-matches --name-only --files-without-match --only-matching --count --color --break --heading --context= --before-context= --after-context= --threads= --show-function --function-context --and --or --not --quiet --all-match --index -- --no-cached --no-untracked --no-exclude-standard --no-recurse-submodules --no-invert-match --no-ignore-case --no-word-regexp --no-text --no-textconv --no-recursive --no-extended-regexp --no-basic-regexp --no-fixed-strings --no-perl-regexp --no-line-number --no-column --no-full-name --no-files-with-matches --no-name-only --no-files-without-match --no-only-matching --no-count --no-color --no-break --no-heading --no-context --no-before-context --no-after-context --no-threads --no-show-function --no-function-context --no-or --no-quiet --no-all-match"
 __gitcomp_builtin_hash_object_default=" --stdin --stdin-paths --no-filters --literally --path= --filters -- --no-stdin --no-stdin-paths --no-literally --no-path"
-__gitcomp_builtin_help_default=" --all --guides --config --man --web --info --verbose --no-all -- --no-guides --no-config --no-man --no-web --no-info --no-verbose"
+__gitcomp_builtin_help_default=" --all --man --web --info --verbose --guides --config --no-man -- --no-web --no-info --no-verbose"
 __gitcomp_builtin_init_default=" --template= --bare --shared --quiet --separate-git-dir= --initial-branch= --object-format= --no-template -- --no-bare --no-quiet --no-separate-git-dir --no-initial-branch --no-object-format"
 __gitcomp_builtin_init_db_default=" --template= --bare --shared --quiet --separate-git-dir= --initial-branch= --object-format= --no-template -- --no-bare --no-quiet --no-separate-git-dir --no-initial-branch --no-object-format"
 __gitcomp_builtin_interpret_trailers_default=" --in-place --trim-empty --where= --if-exists= --if-missing= --only-trailers --only-input --unfold --parse --no-divider --trailer= --divider -- --no-in-place --no-trim-empty --no-where --no-if-exists --no-if-missing --no-only-trailers --no-only-input --no-unfold --no-trailer"
-__gitcomp_builtin_log_default=" --quiet --source --use-mailmap --mailmap --decorate-refs= --decorate-refs-exclude= --decorate --no-quiet -- --no-source --no-use-mailmap --no-mailmap --no-decorate-refs --no-decorate-refs-exclude --no-decorate"
-__gitcomp_builtin_ls_files_default=" --cached --deleted --modified --others --ignored --stage --killed --directory --eol --empty-directory --unmerged --resolve-undo --exclude= --exclude-from= --exclude-per-directory= --exclude-standard --full-name --recurse-submodules --error-unmatch --with-tree= --abbrev --debug --no-cached -- --no-deleted --no-modified --no-others --no-ignored --no-stage --no-killed --no-directory --no-eol --no-empty-directory --no-unmerged --no-resolve-undo --no-exclude-per-directory --no-recurse-submodules --no-error-unmatch --no-with-tree --no-abbrev --no-debug"
-__gitcomp_builtin_ls_remote_default=" --quiet --upload-pack= --tags --heads --refs --get-url --sort= --symref --server-option= --no-quiet -- --no-upload-pack --no-tags --no-heads --no-refs --no-get-url --no-symref --no-server-option"
+__gitcomp_builtin_log_default=" --quiet --source --use-mailmap --decorate-refs= --decorate-refs-exclude= --decorate --no-quiet -- --no-source --no-use-mailmap --no-mailmap --no-decorate-refs --no-decorate-refs-exclude --no-decorate"
+__gitcomp_builtin_ls_files_default=" --cached --deleted --modified --others --ignored --stage --killed --directory --eol --empty-directory --unmerged --resolve-undo --exclude= --exclude-from= --exclude-per-directory= --exclude-standard --full-name --recurse-submodules --error-unmatch --with-tree= --abbrev --debug --deduplicate --sparse --no-cached -- --no-deleted --no-modified --no-others --no-ignored --no-stage --no-killed --no-directory --no-eol --no-empty-directory --no-unmerged --no-resolve-undo --no-exclude-per-directory --no-recurse-submodules --no-error-unmatch --no-with-tree --no-abbrev --no-debug --no-deduplicate --no-sparse"
+__gitcomp_builtin_ls_remote_default=" --quiet --upload-pack= --tags --heads --refs --get-url --sort= --symref --server-option= --no-quiet -- --no-upload-pack --no-tags --no-heads --no-refs --no-get-url --no-sort --no-symref --no-server-option"
 __gitcomp_builtin_ls_tree_default=" --long --name-only --name-status --full-name --full-tree --abbrev --no-long -- --no-name-only --no-name-status --no-full-name --no-full-tree --no-abbrev"
-__gitcomp_builtin_merge_default=" --stat --summary --log --squash --commit --edit --cleanup= --ff --ff-only --rerere-autoupdate --verify-signatures --strategy= --strategy-option= --message= --file --verbose --quiet --abort --quit --continue --allow-unrelated-histories --progress --gpg-sign --autostash --overwrite-ignore --signoff --no-verify --verify -- --no-stat --no-summary --no-log --no-squash --no-commit --no-edit --no-cleanup --no-ff --no-rerere-autoupdate --no-verify-signatures --no-strategy --no-strategy-option --no-message --no-verbose --no-quiet --no-abort --no-quit --no-continue --no-allow-unrelated-histories --no-progress --no-gpg-sign --no-autostash --no-overwrite-ignore --no-signoff"
+__gitcomp_builtin_merge_default=" --stat --summary --log --squash --commit --edit --cleanup= --ff --ff-only --rerere-autoupdate --verify-signatures --strategy= --strategy-option= --message= --file --into-name= --verbose --quiet --abort --quit --continue --allow-unrelated-histories --progress --gpg-sign --autostash --overwrite-ignore --signoff --no-verify --verify -- --no-stat --no-summary --no-log --no-squash --no-commit --no-edit --no-cleanup --no-ff --no-rerere-autoupdate --no-verify-signatures --no-strategy --no-strategy-option --no-message --no-into-name --no-verbose --no-quiet --no-abort --no-quit --no-continue --no-allow-unrelated-histories --no-progress --no-gpg-sign --no-autostash --no-overwrite-ignore --no-signoff"
 __gitcomp_builtin_merge_base_default=" --all --octopus --independent --is-ancestor --fork-point --no-all"
-__gitcomp_builtin_merge_file_default=" --stdout --diff3 --ours --theirs --union --marker-size= --quiet --no-stdout -- --no-diff3 --no-ours --no-theirs --no-union --no-marker-size --no-quiet"
+__gitcomp_builtin_merge_file_default=" --stdout --diff3 --zdiff3 --ours --theirs --union --marker-size= --quiet --no-stdout -- --no-diff3 --no-zdiff3 --no-ours --no-theirs --no-union --no-marker-size --no-quiet"
 __gitcomp_builtin_mktree_default=" --missing --batch --no-missing -- --no-batch"
-__gitcomp_builtin_multi_pack_index_default=" --object-dir= --progress --batch-size= --no-object-dir -- --no-progress"
-__gitcomp_builtin_mv_default=" --verbose --dry-run --no-verbose -- --no-dry-run"
+__gitcomp_builtin_multi_pack_index_default=" --object-dir= --no-object-dir"
+__gitcomp_builtin_mv_default=" --verbose --dry-run --sparse --no-verbose -- --no-dry-run --no-sparse"
 __gitcomp_builtin_name_rev_default=" --name-only --tags --refs= --exclude= --all --stdin --undefined --always --no-name-only -- --no-tags --no-refs --no-exclude --no-all --no-stdin --no-undefined --no-always"
 __gitcomp_builtin_notes_default=" --ref= --no-ref"
-__gitcomp_builtin_pack_objects_default=" --quiet --progress --all-progress --all-progress-implied --index-version= --max-pack-size= --local --incremental --window= --window-memory= --depth= --reuse-delta --reuse-object --delta-base-offset --threads= --non-empty --revs --unpacked --all --reflog --indexed-objects --stdout --include-tag --keep-unreachable --pack-loose-unreachable --unpack-unreachable --sparse --thin --shallow --honor-pack-keep --keep-pack= --compression= --keep-true-parents --use-bitmap-index --write-bitmap-index --filter= --missing= --exclude-promisor-objects --delta-islands --uri-protocol= --no-quiet -- --no-progress --no-all-progress --no-all-progress-implied --no-local --no-incremental --no-window --no-depth --no-reuse-delta --no-reuse-object --no-delta-base-offset --no-threads --no-non-empty --no-revs --no-stdout --no-include-tag --no-keep-unreachable --no-pack-loose-unreachable --no-unpack-unreachable --no-sparse --no-thin --no-shallow --no-honor-pack-keep --no-keep-pack --no-compression --no-keep-true-parents --no-use-bitmap-index --no-write-bitmap-index --no-filter --no-exclude-promisor-objects --no-delta-islands --no-uri-protocol"
+__gitcomp_builtin_pack_objects_default=" --quiet --progress --all-progress --all-progress-implied --index-version= --max-pack-size= --local --incremental --window= --window-memory= --depth= --reuse-delta --reuse-object --delta-base-offset --threads= --non-empty --revs --unpacked --all --reflog --indexed-objects --stdin-packs --stdout --include-tag --keep-unreachable --pack-loose-unreachable --unpack-unreachable --sparse --thin --shallow --honor-pack-keep --keep-pack= --compression= --keep-true-parents --use-bitmap-index --write-bitmap-index --filter= --missing= --exclude-promisor-objects --delta-islands --uri-protocol= --no-quiet -- --no-progress --no-all-progress --no-all-progress-implied --no-local --no-incremental --no-window --no-depth --no-reuse-delta --no-reuse-object --no-delta-base-offset --no-threads --no-non-empty --no-revs --no-stdin-packs --no-stdout --no-include-tag --no-keep-unreachable --no-pack-loose-unreachable --no-unpack-unreachable --no-sparse --no-thin --no-shallow --no-honor-pack-keep --no-keep-pack --no-compression --no-keep-true-parents --no-use-bitmap-index --no-write-bitmap-index --no-filter --no-exclude-promisor-objects --no-delta-islands --no-uri-protocol"
 __gitcomp_builtin_pack_refs_default=" --all --prune --no-all -- --no-prune"
 __gitcomp_builtin_pickaxe_default=" --incremental --root --show-stats --progress --score-debug --show-name --show-number --porcelain --line-porcelain --show-email --ignore-rev= --ignore-revs-file= --color-lines --color-by-age --minimal --contents= --abbrev --no-incremental -- --no-root --no-show-stats --no-progress --no-score-debug --no-show-name --no-show-number --no-porcelain --no-line-porcelain --no-show-email --no-ignore-rev --no-ignore-revs-file --no-color-lines --no-color-by-age --no-minimal --no-contents --no-abbrev"
 __gitcomp_builtin_prune_default=" --dry-run --verbose --progress --expire= --exclude-promisor-objects --no-dry-run -- --no-verbose --no-progress --no-expire --no-exclude-promisor-objects"
 __gitcomp_builtin_prune_packed_default=" --dry-run --quiet --no-dry-run -- --no-quiet"
-__gitcomp_builtin_pull_default=" --verbose --quiet --progress --recurse-submodules --rebase --stat --log --signoff --squash --commit --edit --cleanup= --ff --ff-only --verify-signatures --autostash --strategy= --strategy-option= --gpg-sign --allow-unrelated-histories --all --append --upload-pack= --force --tags --prune --jobs --dry-run --keep --depth= --shallow-since= --shallow-exclude= --deepen= --unshallow --update-shallow --refmap= --server-option= --ipv4 --ipv6 --negotiation-tip= --show-forced-updates --set-upstream --no-verbose -- --no-quiet --no-progress --no-recurse-submodules --no-rebase --no-stat --no-log --no-signoff --no-squash --no-commit --no-edit --no-cleanup --no-ff --no-verify-signatures --no-autostash --no-strategy --no-strategy-option --no-gpg-sign --no-allow-unrelated-histories --no-all --no-append --no-upload-pack --no-force --no-tags --no-prune --no-jobs --no-dry-run --no-keep --no-depth --no-shallow-since --no-shallow-exclude --no-deepen --no-update-shallow --no-server-option --no-ipv4 --no-ipv6 --no-negotiation-tip --no-show-forced-updates --no-set-upstream"
-__gitcomp_builtin_push_default=" --verbose --quiet --repo= --all --mirror --delete --tags --dry-run --porcelain --force --force-with-lease --recurse-submodules= --receive-pack= --exec= --set-upstream --progress --prune --no-verify --follow-tags --signed --atomic --push-option= --ipv4 --ipv6 --verify -- --no-verbose --no-quiet --no-repo --no-all --no-mirror --no-delete --no-tags --no-dry-run --no-porcelain --no-force --no-force-with-lease --no-recurse-submodules --no-receive-pack --no-exec --no-set-upstream --no-progress --no-prune --no-follow-tags --no-signed --no-atomic --no-push-option --no-ipv4 --no-ipv6"
-__gitcomp_builtin_range_diff_default=" --creation-factor= --no-dual-color --notes --patch --no-patch --unified --function-context --raw --patch-with-raw --patch-with-stat --numstat --shortstat --dirstat --cumulative --dirstat-by-file --check --summary --name-only --name-status --stat --stat-width= --stat-name-width= --stat-graph-width= --stat-count= --compact-summary --binary --full-index --color --ws-error-highlight= --abbrev --src-prefix= --dst-prefix= --line-prefix= --no-prefix --inter-hunk-context= --output-indicator-new= --output-indicator-old= --output-indicator-context= --break-rewrites --find-renames --irreversible-delete --find-copies --find-copies-harder --no-renames --rename-empty --follow --minimal --ignore-all-space --ignore-space-change --ignore-space-at-eol --ignore-cr-at-eol --ignore-blank-lines --indent-heuristic --patience --histogram --diff-algorithm= --anchored= --word-diff --word-diff-regex= --color-words --color-moved --color-moved-ws= --relative --text --exit-code --quiet --ext-diff --textconv --ignore-submodules --submodule --ita-invisible-in-index --ita-visible-in-index --pickaxe-all --pickaxe-regex --find-object= --diff-filter= --output= --dual-color -- --no-creation-factor --no-notes --no-function-context --no-compact-summary --no-full-index --no-color --no-abbrev --no-find-copies-harder --no-rename-empty --no-follow --no-minimal --no-indent-heuristic --no-color-moved --no-color-moved-ws --no-relative --no-text --no-exit-code --no-quiet --no-ext-diff --no-textconv"
+__gitcomp_builtin_pull_default=" --verbose --quiet --progress --recurse-submodules --rebase --stat --log --signoff --squash --commit --edit --cleanup= --ff --ff-only --verify --verify-signatures --autostash --strategy= --strategy-option= --gpg-sign --allow-unrelated-histories --all --append --upload-pack= --force --tags --prune --jobs --dry-run --keep --depth= --shallow-since= --shallow-exclude= --deepen= --unshallow --update-shallow --refmap= --server-option= --ipv4 --ipv6 --negotiation-tip= --show-forced-updates --set-upstream --no-verbose -- --no-quiet --no-progress --no-recurse-submodules --no-rebase --no-stat --no-log --no-signoff --no-squash --no-commit --no-edit --no-cleanup --no-ff --no-verify --no-verify-signatures --no-autostash --no-strategy --no-strategy-option --no-gpg-sign --no-allow-unrelated-histories --no-all --no-append --no-upload-pack --no-force --no-tags --no-prune --no-jobs --no-dry-run --no-keep --no-depth --no-shallow-since --no-shallow-exclude --no-deepen --no-update-shallow --no-server-option --no-ipv4 --no-ipv6 --no-negotiation-tip --no-show-forced-updates --no-set-upstream"
+__gitcomp_builtin_push_default=" --verbose --quiet --repo= --all --mirror --delete --tags --dry-run --porcelain --force --force-with-lease --force-if-includes --recurse-submodules= --receive-pack= --exec= --set-upstream --progress --prune --no-verify --follow-tags --signed --atomic --push-option= --ipv4 --ipv6 --verify -- --no-verbose --no-quiet --no-repo --no-all --no-mirror --no-delete --no-tags --no-dry-run --no-porcelain --no-force --no-force-with-lease --no-force-if-includes --no-recurse-submodules --no-receive-pack --no-exec --no-set-upstream --no-progress --no-prune --no-follow-tags --no-signed --no-atomic --no-push-option --no-ipv4 --no-ipv6"
+__gitcomp_builtin_range_diff_default=" --creation-factor= --no-dual-color --notes --left-only --right-only --patch --no-patch --unified --function-context --raw --patch-with-raw --patch-with-stat --numstat --shortstat --dirstat --cumulative --dirstat-by-file --check --summary --name-only --name-status --stat --stat-width= --stat-name-width= --stat-graph-width= --stat-count= --compact-summary --binary --full-index --color --ws-error-highlight= --abbrev --src-prefix= --dst-prefix= --line-prefix= --no-prefix --inter-hunk-context= --output-indicator-new= --output-indicator-old= --output-indicator-context= --break-rewrites --find-renames --irreversible-delete --find-copies --find-copies-harder --no-renames --rename-empty --follow --minimal --ignore-all-space --ignore-space-change --ignore-space-at-eol --ignore-cr-at-eol --ignore-blank-lines --ignore-matching-lines= --indent-heuristic --patience --histogram --diff-algorithm= --anchored= --word-diff --word-diff-regex= --color-words --color-moved --color-moved-ws= --relative --text --exit-code --quiet --ext-diff --textconv --ignore-submodules --submodule --ita-invisible-in-index --ita-visible-in-index --pickaxe-all --pickaxe-regex --rotate-to= --skip-to= --find-object= --diff-filter= --output= --dual-color -- --no-creation-factor --no-notes --no-left-only --no-right-only --no-function-context --no-compact-summary --no-full-index --no-color --no-abbrev --no-find-copies-harder --no-rename-empty --no-follow --no-minimal --no-ignore-matching-lines --no-indent-heuristic --no-color-moved --no-color-moved-ws --no-relative --no-text --no-exit-code --no-quiet --no-ext-diff --no-textconv"
 __gitcomp_builtin_read_tree_default=" --index-output= --empty --verbose --trivial --aggressive --reset --prefix= --exclude-per-directory= --dry-run --no-sparse-checkout --debug-unpack --recurse-submodules --quiet --sparse-checkout -- --no-empty --no-verbose --no-trivial --no-aggressive --no-reset --no-dry-run --no-debug-unpack --no-recurse-submodules --no-quiet"
 __gitcomp_builtin_rebase_default=" --onto= --keep-base --no-verify --quiet --verbose --no-stat --signoff --committer-date-is-author-date --reset-author-date --ignore-whitespace --whitespace= --force-rebase --no-ff --continue --skip --abort --quit --edit-todo --show-current-patch --apply --merge --interactive --rerere-autoupdate --empty= --autosquash --gpg-sign --autostash --exec= --rebase-merges --fork-point --strategy= --strategy-option= --root --reschedule-failed-exec --reapply-cherry-picks --verify --stat --ff -- --no-onto --no-keep-base --no-quiet --no-verbose --no-signoff --no-committer-date-is-author-date --no-reset-author-date --no-ignore-whitespace --no-whitespace --no-force-rebase --no-rerere-autoupdate --no-autosquash --no-gpg-sign --no-autostash --no-exec --no-rebase-merges --no-fork-point --no-strategy --no-strategy-option --no-root --no-reschedule-failed-exec --no-reapply-cherry-picks"
-__gitcomp_builtin_rebase__interactive_default=" --ff --rebase-merges --rebase-cousins --autosquash --signoff --verbose --continue --skip --edit-todo --show-current-patch --shorten-ids --expand-ids --check-todo-list --rearrange-squash --add-exec-commands --onto= --restrict-revision= --squash-onto= --upstream= --head-name= --gpg-sign --strategy= --strategy-opts= --switch-to= --onto-name= --cmd= --rerere-autoupdate --reschedule-failed-exec --no-ff -- --no-rebase-merges --no-rebase-cousins --no-autosquash --no-signoff --no-verbose --no-head-name --no-gpg-sign --no-strategy --no-strategy-opts --no-switch-to --no-onto-name --no-cmd --no-rerere-autoupdate --no-reschedule-failed-exec"
 __gitcomp_builtin_receive_pack_default=" --quiet --no-quiet"
-__gitcomp_builtin_reflog_default=" --quiet --source --use-mailmap --mailmap --decorate-refs= --decorate-refs-exclude= --decorate --no-quiet -- --no-source --no-use-mailmap --no-mailmap --no-decorate-refs --no-decorate-refs-exclude --no-decorate"
+__gitcomp_builtin_reflog_default=" --quiet --source --use-mailmap --decorate-refs= --decorate-refs-exclude= --decorate --no-quiet -- --no-source --no-use-mailmap --no-mailmap --no-decorate-refs --no-decorate-refs-exclude --no-decorate"
 __gitcomp_builtin_remote_default=" --verbose --no-verbose"
-__gitcomp_builtin_repack_default=" --quiet --local --write-bitmap-index --delta-islands --unpack-unreachable= --keep-unreachable --window= --window-memory= --depth= --threads= --max-pack-size= --pack-kept-objects --keep-pack= --no-quiet -- --no-local --no-write-bitmap-index --no-delta-islands --no-unpack-unreachable --no-keep-unreachable --no-window --no-window-memory --no-depth --no-threads --no-max-pack-size --no-pack-kept-objects --no-keep-pack"
+__gitcomp_builtin_repack_default=" --quiet --local --write-bitmap-index --delta-islands --unpack-unreachable= --keep-unreachable --window= --window-memory= --depth= --threads= --max-pack-size= --pack-kept-objects --keep-pack= --geometric= --write-midx --no-quiet -- --no-local --no-write-bitmap-index --no-delta-islands --no-unpack-unreachable --no-keep-unreachable --no-window --no-window-memory --no-depth --no-threads --no-max-pack-size --no-pack-kept-objects --no-keep-pack --no-geometric --no-write-midx"
 __gitcomp_builtin_replace_default=" --list --delete --edit --graft --convert-graft-file --raw --format= --no-raw -- --no-format"
 __gitcomp_builtin_rerere_default=" --rerere-autoupdate --no-rerere-autoupdate"
 __gitcomp_builtin_reset_default=" --quiet --mixed --soft --hard --merge --keep --recurse-submodules --patch --intent-to-add --pathspec-from-file= --pathspec-file-nul --no-quiet -- --no-mixed --no-soft --no-hard --no-merge --no-keep --no-recurse-submodules --no-patch --no-intent-to-add --no-pathspec-from-file --no-pathspec-file-nul"
 __gitcomp_builtin_restore_default=" --source= --staged --worktree --ignore-unmerged --overlay --quiet --recurse-submodules --progress --merge --conflict= --ours --theirs --patch --ignore-skip-worktree-bits --pathspec-from-file= --pathspec-file-nul --no-source -- --no-staged --no-worktree --no-ignore-unmerged --no-overlay --no-quiet --no-recurse-submodules --no-progress --no-merge --no-conflict --no-patch --no-ignore-skip-worktree-bits --no-pathspec-from-file --no-pathspec-file-nul"
 __gitcomp_builtin_revert_default=" --quit --continue --abort --skip --cleanup= --no-commit --edit --signoff --mainline= --rerere-autoupdate --strategy= --strategy-option= --gpg-sign --commit -- --no-cleanup --no-edit --no-signoff --no-mainline --no-rerere-autoupdate --no-strategy --no-strategy-option --no-gpg-sign"
-__gitcomp_builtin_rm_default=" --dry-run --quiet --cached --ignore-unmatch --pathspec-from-file= --pathspec-file-nul --no-dry-run -- --no-quiet --no-cached --no-ignore-unmatch --no-pathspec-from-file --no-pathspec-file-nul"
-__gitcomp_builtin_send_pack_default=" --verbose --quiet --receive-pack= --exec= --remote= --all --dry-run --mirror --force --signed --push-option= --progress --thin --atomic --stateless-rpc --stdin --helper-status --force-with-lease --no-verbose -- --no-quiet --no-receive-pack --no-exec --no-remote --no-all --no-dry-run --no-mirror --no-force --no-signed --no-push-option --no-progress --no-thin --no-atomic --no-stateless-rpc --no-stdin --no-helper-status --no-force-with-lease"
+__gitcomp_builtin_rm_default=" --dry-run --quiet --cached --ignore-unmatch --sparse --pathspec-from-file= --pathspec-file-nul --no-dry-run -- --no-quiet --no-cached --no-ignore-unmatch --no-sparse --no-pathspec-from-file --no-pathspec-file-nul"
+__gitcomp_builtin_send_pack_default=" --verbose --quiet --receive-pack= --exec= --remote= --all --dry-run --mirror --force --signed --push-option= --progress --thin --atomic --stateless-rpc --stdin --helper-status --force-with-lease --force-if-includes --no-verbose -- --no-quiet --no-receive-pack --no-exec --no-remote --no-all --no-dry-run --no-mirror --no-force --no-signed --no-push-option --no-progress --no-thin --no-atomic --no-stateless-rpc --no-stdin --no-helper-status --no-force-with-lease --no-force-if-includes"
 __gitcomp_builtin_shortlog_default=" --committer --numbered --summary --email --group= --no-committer -- --no-numbered --no-summary --no-email --no-group"
-__gitcomp_builtin_show_default=" --quiet --source --use-mailmap --mailmap --decorate-refs= --decorate-refs-exclude= --decorate --no-quiet -- --no-source --no-use-mailmap --no-mailmap --no-decorate-refs --no-decorate-refs-exclude --no-decorate"
+__gitcomp_builtin_show_default=" --quiet --source --use-mailmap --decorate-refs= --decorate-refs-exclude= --decorate --no-quiet -- --no-source --no-use-mailmap --no-mailmap --no-decorate-refs --no-decorate-refs-exclude --no-decorate"
 __gitcomp_builtin_show_branch_default=" --all --remotes --color --more --list --no-name --current --sha1-name --merge-base --independent --topo-order --topics --sparse --date-order --reflog --name -- --no-all --no-remotes --no-color --no-more --no-list --no-current --no-sha1-name --no-merge-base --no-independent --no-topo-order --no-topics --no-sparse --no-date-order"
 __gitcomp_builtin_show_index_default=" --object-format= --no-object-format"
 __gitcomp_builtin_show_ref_default=" --tags --heads --verify --head --dereference --hash --abbrev --quiet --exclude-existing --no-tags -- --no-heads --no-verify --no-head --no-dereference --no-hash --no-abbrev --no-quiet"
 __gitcomp_builtin_sparse_checkout_default=""
-__gitcomp_builtin_stage_default=" --dry-run --verbose --interactive --patch --edit --force --update --renormalize --intent-to-add --all --ignore-removal --refresh --ignore-errors --ignore-missing --chmod= --pathspec-from-file= --pathspec-file-nul --no-dry-run -- --no-verbose --no-interactive --no-patch --no-edit --no-force --no-update --no-renormalize --no-intent-to-add --no-all --no-ignore-removal --no-refresh --no-ignore-errors --no-ignore-missing --no-chmod --no-pathspec-from-file --no-pathspec-file-nul"
+__gitcomp_builtin_stage_default=" --dry-run --verbose --interactive --patch --edit --force --update --renormalize --intent-to-add --all --ignore-removal --refresh --ignore-errors --ignore-missing --sparse --chmod= --pathspec-from-file= --pathspec-file-nul --no-dry-run -- --no-verbose --no-interactive --no-patch --no-edit --no-force --no-update --no-renormalize --no-intent-to-add --no-all --no-ignore-removal --no-refresh --no-ignore-errors --no-ignore-missing --no-sparse --no-chmod --no-pathspec-from-file --no-pathspec-file-nul"
 __gitcomp_builtin_stash_default=""
 __gitcomp_builtin_status_default=" --verbose --short --branch --show-stash --ahead-behind --porcelain --long --null --untracked-files --ignored --ignore-submodules --column --no-renames --find-renames --renames -- --no-verbose --no-short --no-branch --no-show-stash --no-ahead-behind --no-porcelain --no-long --no-null --no-untracked-files --no-ignored --no-ignore-submodules --no-column"
 __gitcomp_builtin_stripspace_default=" --strip-comments --comment-lines"
 __gitcomp_builtin_switch_default=" --create= --force-create= --guess --discard-changes --quiet --recurse-submodules --progress --merge --conflict= --detach --track --orphan= --ignore-other-worktrees --no-create -- --no-force-create --no-guess --no-discard-changes --no-quiet --no-recurse-submodules --no-progress --no-merge --no-conflict --no-detach --no-track --no-orphan --no-ignore-other-worktrees"
 __gitcomp_builtin_symbolic_ref_default=" --quiet --delete --short --no-quiet -- --no-delete --no-short"
-__gitcomp_builtin_tag_default=" --list --delete --verify --annotate --message= --file= --edit --sign --cleanup= --local-user= --force --create-reflog --column --contains --no-contains --merged --no-merged --sort= --points-at --format= --color --ignore-case -- --no-annotate --no-file --no-edit --no-sign --no-cleanup --no-local-user --no-force --no-create-reflog --no-column --no-points-at --no-format --no-color --no-ignore-case"
+__gitcomp_builtin_tag_default=" --list --delete --verify --annotate --message= --file= --edit --sign --cleanup= --local-user= --force --create-reflog --column --contains --no-contains --merged --no-merged --sort= --points-at --format= --color --ignore-case -- --no-annotate --no-file --no-edit --no-sign --no-cleanup --no-local-user --no-force --no-create-reflog --no-column --no-sort --no-points-at --no-format --no-color --no-ignore-case"
 __gitcomp_builtin_update_index_default=" --ignore-submodules --add --replace --remove --unmerged --refresh --really-refresh --cacheinfo --chmod= --assume-unchanged --no-assume-unchanged --skip-worktree --no-skip-worktree --ignore-skip-worktree-entries --info-only --force-remove --stdin --index-info --unresolve --again --ignore-missing --verbose --clear-resolve-undo --index-version= --split-index --untracked-cache --test-untracked-cache --force-untracked-cache --force-write-index --fsmonitor --fsmonitor-valid --no-fsmonitor-valid -- --no-ignore-submodules --no-add --no-replace --no-remove --no-unmerged --no-ignore-skip-worktree-entries --no-info-only --no-force-remove --no-ignore-missing --no-verbose --no-index-version --no-split-index --no-untracked-cache --no-test-untracked-cache --no-force-untracked-cache --no-force-write-index --no-fsmonitor"
 __gitcomp_builtin_update_ref_default=" --no-deref --stdin --create-reflog --deref -- --no-stdin --no-create-reflog"
 __gitcomp_builtin_update_server_info_default=" --force --no-force"
-__gitcomp_builtin_upload_pack_default=" --stateless-rpc --advertise-refs --strict --timeout= --no-stateless-rpc -- --no-advertise-refs --no-strict --no-timeout"
+__gitcomp_builtin_upload_pack_default=" --stateless-rpc --strict --timeout= --no-stateless-rpc -- --no-strict --no-timeout"
 __gitcomp_builtin_verify_commit_default=" --verbose --raw --no-verbose -- --no-raw"
 __gitcomp_builtin_verify_pack_default=" --verbose --stat-only --object-format= --no-verbose -- --no-stat-only --no-object-format"
 __gitcomp_builtin_verify_tag_default=" --verbose --raw --format= --no-verbose -- --no-raw --no-format"
 __gitcomp_builtin_version_default=" --build-options --no-build-options"
-__gitcomp_builtin_whatchanged_default=" --quiet --source --use-mailmap --mailmap --decorate-refs= --decorate-refs-exclude= --decorate --no-quiet -- --no-source --no-use-mailmap --no-mailmap --no-decorate-refs --no-decorate-refs-exclude --no-decorate"
+__gitcomp_builtin_whatchanged_default=" --quiet --source --use-mailmap --decorate-refs= --decorate-refs-exclude= --decorate --no-quiet -- --no-source --no-use-mailmap --no-mailmap --no-decorate-refs --no-decorate-refs-exclude --no-decorate"
 __gitcomp_builtin_write_tree_default=" --missing-ok --prefix= --no-missing-ok -- --no-prefix"
-__gitcomp_builtin_send_email_default=" --numbered --no-numbered --signoff --stdout --cover-letter --numbered-files --suffix= --start-number= --reroll-count= --rfc --cover-from-description= --subject-prefix= --output-directory= --keep-subject --no-binary --zero-commit --ignore-if-in-upstream --no-stat --add-header= --to= --cc= --from --in-reply-to= --attach --inline --thread --signature= --base= --signature-file= --quiet --progress --interdiff= --range-diff= --creation-factor= --binary -- --no-numbered --no-signoff --no-stdout --no-cover-letter --no-numbered-files --no-suffix --no-start-number --no-reroll-count --no-cover-from-description --no-zero-commit --no-ignore-if-in-upstream --no-add-header --no-to --no-cc --no-from --no-in-reply-to --no-attach --no-thread --no-signature --no-base --no-signature-file --no-quiet --no-progress --no-interdiff --no-range-diff --no-creation-factor"
+__gitcomp_builtin_send_email_default="--cc= --smtp-server= --identity= --smtp-ssl --sender= --from= --cc-cover --no-to-cover --sendmail-cmd= --signed-off-cc --signed-off-by-cc --in-reply-to= --no-cc --confirm= --no-bcc --to= --annotate --smtp-encryption= --relogin-delay= --to-cmd= --smtp-domain= --smtp-auth= --bcc= --quiet --subject= --chain-reply-to --cc-cmd= --no-format-patch --transfer-encoding= --smtp-user= --reply-to= --force --dry-run --no-identity --no-validate --8bit-encoding= --to-cover --compose --thread --format-patch --no-thread --smtp-server-option= --compose-encoding= --smtp-server-port= --no-smtp-auth --no-signed-off-cc --no-signed-off-by-cc --smtp-debug= --no-suppress-from --suppress-from --no-to --dump-aliases --xmailer --no-annotate --no-cc-cover --smtp-pass= --smtp-ssl-cert-path= --no-chain-reply-to --suppress-cc= --validate --batch-size= --envelope-sender= --no-xmailer --numbered --no-numbered --signoff --stdout --cover-letter --numbered-files --suffix= --start-number= --reroll-count= --filename-max-length= --rfc --cover-from-description= --subject-prefix= --output-directory= --keep-subject --no-binary --zero-commit --ignore-if-in-upstream --no-stat --add-header= --from --attach --inline --signature= --base= --signature-file= --progress --interdiff= --range-diff= --creation-factor= --binary -- --no-signoff --no-stdout --no-cover-letter --no-numbered-files --no-suffix --no-start-number --no-reroll-count --no-filename-max-length --no-cover-from-description --no-zero-commit --no-ignore-if-in-upstream --no-add-header --no-from --no-in-reply-to --no-attach --no-signature --no-base --no-signature-file --no-quiet --no-progress --no-interdiff --no-range-diff --no-creation-factor"
 
 __gitcomp_builtin_get_default ()
 {
@@ -500,7 +425,7 @@ __gitcomp_builtin_get_default ()
 
 # This function is equivalent to
 #
-#    __gitcomp "$(git xxx --git-completion-helper) ..."
+#    __gitcomp_opts "$(git xxx --git-completion-helper) ..."
 #
 # except that the output is cached. Accept 1-3 arguments:
 # 1: the git command to execute, this is also the cache key
@@ -520,7 +445,7 @@ __gitcomp_builtin ()
 
 	if [ -z "$options" ]; then
 		local completion_helper
-		if [ "$GIT_COMPLETION_SHOW_ALL" = "1" ]; then
+		if [ "${GIT_COMPLETION_SHOW_ALL-}" = "1" ]; then
 			completion_helper="--git-completion-helper-all"
 		else
 			completion_helper="--git-completion-helper"
@@ -537,71 +462,7 @@ __gitcomp_builtin ()
 		eval "$var=\"$options\""
 	fi
 
-	__gitcomp "$options"
-}
-
-# Variation of __gitcomp_nl () that appends to the existing list of
-# completion candidates, COMPREPLY.
-__gitcomp_nl_append ()
-{
-	local IFS=$'\n'
-	__gitcompappend "$1" "${2-}" "${3-$cur}" "${4- }"
-}
-
-# Generates completion reply from newline-separated possible completion words
-# by appending a space to all of them.
-# It accepts 1 to 4 arguments:
-# 1: List of possible completion words, separated by a single newline.
-# 2: A prefix to be added to each possible completion word (optional).
-# 3: Generate possible completion matches for this word (optional).
-# 4: A suffix to be appended to each possible completion word instead of
-#    the default space (optional).  If specified but empty, nothing is
-#    appended.
-__gitcomp_nl ()
-{
-	COMPREPLY=()
-	__gitcomp_nl_append "$@"
-}
-
-# Fills the COMPREPLY array with prefiltered paths without any additional
-# processing.
-# Callers must take care of providing only paths that match the current path
-# to be completed and adding any prefix path components, if necessary.
-# 1: List of newline-separated matching paths, complete with all prefix
-#    path components.
-__gitcomp_file_direct ()
-{
-	local IFS=$'\n'
-
-	COMPREPLY=($1)
-
-	# use a hack to enable file mode in bash < 4
-	compopt -o filenames +o nospace 2>/dev/null ||
-	compgen -f /non-existing-dir/ >/dev/null ||
-	true
-}
-
-# Generates completion reply with compgen from newline-separated possible
-# completion filenames.
-# It accepts 1 to 3 arguments:
-# 1: List of possible completion filenames, separated by a single newline.
-# 2: A directory prefix to be added to each possible completion filename
-#    (optional).
-# 3: Generate possible completion matches for this word (optional).
-__gitcomp_file ()
-{
-	local IFS=$'\n'
-
-	# XXX does not work when the directory prefix contains a tilde,
-	# since tilde expansion is not applied.
-	# This means that COMPREPLY will be empty and Bash default
-	# completion will be used.
-	__gitcompadd "$1" "${2-}" "${3-$cur}" ""
-
-	# use a hack to enable file mode in bash < 4
-	compopt -o filenames +o nospace 2>/dev/null ||
-	compgen -f /non-existing-dir/ >/dev/null ||
-	true
+	__gitcomp_opts "$options"
 }
 
 # Execute 'git ls-files', unless the --committable option is specified, in
@@ -610,7 +471,7 @@ __gitcomp_file ()
 # argument, and using the options specified in the second argument.
 __git_ls_files_helper ()
 {
-	if [ "$2" == "--committable" ]; then
+	if [ "$2" = "--committable" ]; then
 		__git -C "$1" -c core.quotePath=false diff-index \
 			--name-only --relative HEAD -- "${3//\\/\\\\}*"
 	else
@@ -839,7 +700,7 @@ __git_refs ()
 			track=""
 			;;
 		*)
-			for i in HEAD FETCH_HEAD ORIG_HEAD MERGE_HEAD REBASE_HEAD; do
+			for i in HEAD FETCH_HEAD ORIG_HEAD MERGE_HEAD REBASE_HEAD CHERRY_PICK_HEAD; do
 				case "$i" in
 				$match*)
 					if [ -e "$dir/$i" ]; then
@@ -947,7 +808,7 @@ __git_complete_refs ()
 
 	# Append DWIM remote branch names if requested
 	if [ "$dwim" = "yes" ]; then
-		__gitcomp_direct_append "$(__git_dwim_remote_heads "$pfx" "$cur_" "$sfx")"
+		__gitcomp_direct "$(__git_dwim_remote_heads "$pfx" "$cur_" "$sfx")"
 	fi
 }
 
@@ -1103,8 +964,8 @@ __git_complete_revlist ()
 
 __git_complete_remote_or_refspec ()
 {
-	local cur_="$cur" cmd="${words[1]}"
-	local i c=2 remote="" pfx="" lhs=1 no_complete_refspec=0
+	local cur_="$cur" cmd="${words[__git_cmd_idx]}"
+	local i c=$((__git_cmd_idx+1)) remote="" pfx="" lhs=1 no_complete_refspec=0
 	if [ "$cmd" = "remote" ]; then
 		((c++))
 	fi
@@ -1184,7 +1045,7 @@ __git_complete_strategy ()
 		return 0
 		;;
 	-X)
-		__gitcomp "$__git_merge_strategy_options"
+		__gitcomp_opts "$__git_merge_strategy_options"
 		return 0
 		;;
 	esac
@@ -1194,7 +1055,7 @@ __git_complete_strategy ()
 		return 0
 		;;
 	--strategy-option=*)
-		__gitcomp "$__git_merge_strategy_options" "" "${cur##--strategy-option=}"
+		__gitcomp_opts "$__git_merge_strategy_options" "" "${cur##--strategy-option=}"
 		return 0
 		;;
 	esac
@@ -1226,7 +1087,7 @@ __git_pretty_aliases ()
 # __git_aliased_command requires 1 argument
 __git_aliased_command ()
 {
-	local cur=$1 last list word cmdline
+	local cur=$1 last list= word cmdline
 
 	while [[ -n "$cur" ]]; do
 		if [[ "$list" == *" $cur "* ]]; then
@@ -1273,7 +1134,7 @@ __git_aliased_command ()
 # --show-idx: Optionally show the index of the found word in the $words array.
 __git_find_on_cmdline ()
 {
-	local word c=1 show_idx
+	local word c="$__git_cmd_idx" show_idx
 
 	while test $# -gt 1; do
 		case "$1" in
@@ -1318,7 +1179,7 @@ __git_find_last_on_cmdline ()
 	done
 	local wordlist="$1"
 
-	while [ $c -gt 1 ]; do
+	while [ $c -gt "$__git_cmd_idx" ]; do
 		((c--))
 		for word in $wordlist; do
 			if [ "$word" = "${words[c]}" ]; then
@@ -1403,7 +1264,7 @@ __git_count_arguments ()
 	local word i c=0
 
 	# Skip "git" (first argument)
-	for ((i=1; i < ${#words[@]}; i++)); do
+	for ((i=$__git_cmd_idx; i < ${#words[@]}; i++)); do
 		word="${words[i]}"
 
 		case "$word" in
@@ -1430,12 +1291,13 @@ __git_whitespacelist="nowarn warn error error-all fix"
 __git_patchformat="mbox stgit stgit-series hg mboxrd"
 __git_showcurrentpatch="diff raw"
 __git_am_inprogress_options="--skip --continue --resolved --abort --quit --show-current-patch"
+__git_quoted_cr="nowarn warn strip"
 
 _git_am ()
 {
 	__git_find_repo_path
 	if [ -d "$__git_repo_path"/rebase-apply ]; then
-		__gitcomp "$__git_am_inprogress_options"
+		__gitcomp_opts "$__git_am_inprogress_options"
 		return
 	fi
 	case "$cur" in
@@ -1451,6 +1313,10 @@ _git_am ()
 		__gitcomp "$__git_showcurrentpatch" "" "${cur##--show-current-patch=}"
 		return
 		;;
+	--quoted-cr=*)
+		__gitcomp "$__git_quoted_cr" "" "${cur##--quoted-cr=}"
+		return
+		;;
 	--*)
 		__gitcomp_builtin am "" \
 			"$__git_am_inprogress_options"
@@ -1495,7 +1361,7 @@ _git_archive ()
 {
 	case "$cur" in
 	--format=*)
-		__gitcomp "$(git archive --list)" "" "${cur##--format=}"
+		__gitcomp_nl "$(git archive --list)" "" "${cur##--format=}"
 		return
 		;;
 	--remote=*)
@@ -1539,13 +1405,15 @@ __git_ref_fieldlist="refname objecttype objectsize objectname upstream push HEAD
 
 _git_branch ()
 {
-	local i c=1 only_local_ref="n" has_r="n"
+	local i c="$__git_cmd_idx" only_local_ref="n" has_r="n"
 
 	while [ $c -lt $cword ]; do
 		i="${words[c]}"
 		case "$i" in
-		-d|--delete|-m|--move)	only_local_ref="y" ;;
-		-r|--remotes)		has_r="y" ;;
+		-d|-D|--delete|-m|-M|--move|-c|-C|--copy)
+			only_local_ref="y" ;;
+		-r|--remotes)
+			has_r="y" ;;
 		esac
 		((c++))
 	done
@@ -1569,12 +1437,12 @@ _git_branch ()
 
 _git_bundle ()
 {
-	local cmd="${words[2]}"
+	local cmd="${words[__git_cmd_idx+1]}"
 	case "$cword" in
-	2)
+	$((__git_cmd_idx+1)))
 		__gitcomp "create list-heads verify unbundle"
 		;;
-	3)
+	$((__git_cmd_idx+2)))
 		# looking for a file
 		;;
 	*)
@@ -1590,14 +1458,15 @@ _git_bundle ()
 # Helper function to decide whether or not we should enable DWIM logic for
 # git-switch and git-checkout.
 #
-# To decide between the following rules in priority order
-# 1) the last provided of "--guess" or "--no-guess" explicitly enable or
-#    disable completion of DWIM logic respectively.
-# 2) If the --no-track option is provided, take this as a hint to disable the
-#    DWIM completion logic
-# 3) If GIT_COMPLETION_CHECKOUT_NO_GUESS is set, disable the DWIM completion
-#    logic, as requested by the user.
-# 4) Enable DWIM logic otherwise.
+# To decide between the following rules in decreasing priority order:
+# - the last provided of "--guess" or "--no-guess" explicitly enable or
+#   disable completion of DWIM logic respectively.
+# - If checkout.guess is false, disable completion of DWIM logic.
+# - If the --no-track option is provided, take this as a hint to disable the
+#   DWIM completion logic
+# - If GIT_COMPLETION_CHECKOUT_NO_GUESS is set, disable the DWIM completion
+#   logic, as requested by the user.
+# - Enable DWIM logic otherwise.
 #
 __git_checkout_default_dwim_mode ()
 {
@@ -1608,11 +1477,17 @@ __git_checkout_default_dwim_mode ()
 	fi
 
 	# --no-track disables DWIM, but with lower priority than
-	# --guess/--no-guess
+	# --guess/--no-guess/checkout.guess
 	if [ -n "$(__git_find_on_cmdline "--no-track")" ]; then
 		dwim_opt=""
 	fi
 
+	# checkout.guess = false disables DWIM, but with lower priority than
+	# --guess/--no-guess
+	if [ "$(__git config --type=bool checkout.guess)" = "false" ]; then
+		dwim_opt=""
+	fi
+
 	# Find the last provided --guess or --no-guess
 	last_option="$(__git_find_last_on_cmdline "--guess --no-guess")"
 	case "$last_option" in
@@ -1649,7 +1524,7 @@ _git_checkout ()
 
 	case "$cur" in
 	--conflict=*)
-		__gitcomp "diff3 merge" "" "${cur##--conflict=}"
+		__gitcomp "diff3 merge zdiff3" "" "${cur##--conflict=}"
 		;;
 	--*)
 		__gitcomp_builtin checkout
@@ -1682,7 +1557,7 @@ _git_cherry_pick ()
 {
 	__git_find_repo_path
 	if [ -f "$__git_repo_path"/CHERRY_PICK_HEAD ]; then
-		__gitcomp "$__git_cherry_pick_inprogress_options"
+		__gitcomp_opts "$__git_cherry_pick_inprogress_options"
 		return
 	fi
 
@@ -1811,8 +1686,14 @@ __git_diff_common_options="--stat --numstat --shortstat --summary
 			--submodule --submodule= --ignore-submodules
 			--indent-heuristic --no-indent-heuristic
 			--textconv --no-textconv
+			--patch --no-patch
+			--anchored=
 "
 
+__git_diff_difftool_options="--cached --staged --pickaxe-all --pickaxe-regex
+			--base --ours --theirs --no-index --relative --merge-base
+			$__git_diff_common_options"
+
 _git_diff ()
 {
 	__git_has_doubledash && return
@@ -1835,10 +1716,7 @@ _git_diff ()
 		return
 		;;
 	--*)
-		__gitcomp "--cached --staged --pickaxe-all --pickaxe-regex
-			--base --ours --theirs --no-index
-			$__git_diff_common_options
-			"
+		__gitcomp_opts "$__git_diff_difftool_options"
 		return
 		;;
 	esac
@@ -1860,11 +1738,7 @@ _git_difftool ()
 		return
 		;;
 	--*)
-		__gitcomp_builtin difftool "$__git_diff_common_options
-					--base --cached --ours --theirs
-					--pickaxe-all --pickaxe-regex
-					--relative --staged
-					"
+		__gitcomp_builtin difftool "$__git_diff_difftool_options"
 		return
 		;;
 	esac
@@ -1901,9 +1775,7 @@ _git_format_patch ()
 {
 	case "$cur" in
 	--thread=*)
-		__gitcomp "
-			deep shallow
-			" "" "${cur##--thread=}"
+		__gitcomp "deep shallow" "" "${cur##--thread=}"
 		return
 		;;
 	--base=*|--interdiff=*|--range-diff=*)
@@ -1930,7 +1802,7 @@ _git_fsck ()
 
 _git_gitk ()
 {
-	_gitk
+	__gitk_main
 }
 
 # Lists matching symbol names from a tag (as in ctags) file.
@@ -1984,7 +1856,7 @@ _git_grep ()
 	esac
 
 	case "$cword,$prev" in
-	2,*|*,-*)
+	$((__git_cmd_idx+1)),*|*,-*)
 		__git_complete_symbol && return
 		;;
 	esac
@@ -2000,7 +1872,7 @@ _git_help ()
 		return
 		;;
 	esac
-	if test -n "$GIT_TESTING_ALL_COMMAND_LIST"
+	if test -n "${GIT_TESTING_ALL_COMMAND_LIST-}"
 	then
 		__gitcomp "$GIT_TESTING_ALL_COMMAND_LIST $(__git --list-cmds=alias,list-guide) gitk"
 	else
@@ -2085,7 +1957,7 @@ __git_log_shortlog_options="
 "
 
 __git_log_pretty_formats="oneline short medium full fuller reference email raw format: tformat: mboxrd"
-__git_log_date_formats="relative iso8601 iso8601-strict rfc2822 short local default raw unix format:"
+__git_log_date_formats="relative iso8601 iso8601-strict rfc2822 short local default human raw unix auto: format:"
 
 _git_log ()
 {
@@ -2136,7 +2008,7 @@ _git_log ()
 		return
 		;;
 	--*)
-		__gitcomp "
+		__gitcomp_opts "
 			$__git_log_common_options
 			$__git_log_shortlog_options
 			$__git_log_gitk_options
@@ -2154,11 +2026,9 @@ _git_log ()
 			--no-walk --no-walk= --do-walk
 			--parents --children
 			--expand-tabs --expand-tabs= --no-expand-tabs
-			--patch
 			$merge
 			$__git_diff_common_options
 			--pickaxe-all --pickaxe-regex
-			--patch --no-patch
 			"
 		return
 		;;
@@ -2201,7 +2071,7 @@ _git_mergetool ()
 		return
 		;;
 	--*)
-		__gitcomp "--tool= --prompt --no-prompt --gui --no-gui"
+		__gitcomp_opts "--tool= --prompt --no-prompt --gui --no-gui"
 		return
 		;;
 	esac
@@ -2349,7 +2219,7 @@ _git_range_diff ()
 {
 	case "$cur" in
 	--*)
-		__gitcomp "
+		__gitcomp_opts "
 			--creation-factor= --no-dual-color
 			$__git_diff_common_options
 		"
@@ -2366,11 +2236,11 @@ _git_rebase ()
 {
 	__git_find_repo_path
 	if [ -f "$__git_repo_path"/rebase-merge/interactive ]; then
-		__gitcomp "$__git_rebase_interactive_inprogress_options"
+		__gitcomp_opts "$__git_rebase_interactive_inprogress_options"
 		return
 	elif [ -d "$__git_repo_path"/rebase-apply ] || \
 	     [ -d "$__git_repo_path"/rebase-merge ]; then
-		__gitcomp "$__git_rebase_inprogress_options"
+		__gitcomp_opts "$__git_rebase_inprogress_options"
 		return
 	fi
 	__git_complete_strategy && return
@@ -2404,6 +2274,7 @@ _git_reflog ()
 	fi
 }
 
+__git_send_email_options="--no-cc-cover --cc= --no-bcc --force --relogin-delay= --to= --suppress-cc= --no-annotate --no-chain-reply-to --sendmail-cmd= --no-identity --transfer-encoding= --validate --no-smtp-auth --confirm= --no-format-patch --reply-to= --smtp-pass= --smtp-server= --annotate --envelope-sender= --no-validate --dry-run --no-thread --smtp-debug= --no-to --thread --no-xmailer --identity= --no-signed-off-cc --no-signed-off-by-cc --smtp-domain= --to-cover --8bit-encoding= --bcc= --smtp-ssl-cert-path= --smtp-user= --cc-cmd= --to-cmd= --no-cc --smtp-server-option= --in-reply-to= --subject= --batch-size= --smtp-auth= --compose --smtp-server-port= --xmailer --no-to-cover --chain-reply-to --smtp-encryption= --dump-aliases --quiet --smtp-ssl --signed-off-cc --signed-off-by-cc --suppress-from --compose-encoding= --no-suppress-from --sender= --from= --format-patch --cc-cover --numbered --no-numbered --signoff --stdout --cover-letter --numbered-files --suffix= --start-number= --reroll-count= --filename-max-length= --rfc --cover-from-description= --subject-prefix= --output-directory= --keep-subject --no-binary --zero-commit --ignore-if-in-upstream --no-stat --add-header= --from --attach --inline --signature= --base= --signature-file= --progress --interdiff= --range-diff= --creation-factor= --binary -- --no-signoff --no-stdout --no-cover-letter --no-numbered-files --no-suffix --no-start-number --no-reroll-count --no-filename-max-length --no-cover-from-description --no-zero-commit --no-ignore-if-in-upstream --no-add-header --no-from --no-in-reply-to --no-attach --no-signature --no-base --no-signature-file --no-quiet --no-progress --no-interdiff --no-range-diff --no-creation-factor"
 __git_send_email_confirm_options="always never auto cc compose"
 __git_send_email_suppresscc_options="author self cc bodycc sob cccmd body all"
 
@@ -2411,7 +2282,7 @@ _git_send_email ()
 {
 	case "$prev" in
 	--to|--cc|--bcc|--from)
-		__gitcomp "$(__git send-email --dump-aliases)"
+		__gitcomp_nl "$(__git send-email --dump-aliases)"
 		return
 		;;
 	esac
@@ -2435,9 +2306,7 @@ _git_send_email ()
 		return
 		;;
 	--thread=*)
-		__gitcomp "
-			deep shallow
-			" "" "${cur##--thread=}"
+		__gitcomp "deep shallow" "" "${cur##--thread=}"
 		return
 		;;
 	--to=*|--cc=*|--bcc=*|--from=*)
@@ -2445,16 +2314,7 @@ _git_send_email ()
 		return
 		;;
 	--*)
-		__gitcomp_builtin send-email "--annotate --bcc --cc --cc-cmd --chain-reply-to
-			--compose --confirm= --dry-run --envelope-sender
-			--from --identity
-			--in-reply-to --no-chain-reply-to --no-signed-off-by-cc
-			--no-suppress-from --no-thread --quiet --reply-to
-			--signed-off-by-cc --smtp-pass --smtp-server
-			--smtp-server-port --smtp-encryption= --smtp-user
-			--subject --suppress-cc= --suppress-from --thread --to
-			--validate --no-validate
-			$__git_format_patch_extra_options"
+		__gitcomp_builtin send-email "$__git_send_email_options $__git_format_patch_extra_options"
 		return
 		;;
 	esac
@@ -2532,7 +2392,7 @@ _git_switch ()
 
 	case "$cur" in
 	--conflict=*)
-		__gitcomp "diff3 merge" "" "${cur##--conflict=}"
+		__gitcomp "diff3 merge zdiff3" "" "${cur##--conflict=}"
 		;;
 	--*)
 		__gitcomp_builtin switch
@@ -2566,7 +2426,7 @@ _git_switch ()
 __git_config_get_set_variables ()
 {
 	local prevword word config_file= c=$cword
-	while [ $c -gt 1 ]; do
+	while [ $c -gt "$__git_cmd_idx" ]; do
 		word="${words[c]}"
 		case "$word" in
 		--system|--global|--local|--file=*)
@@ -2629,7 +2489,7 @@ __git_complete_config_variable_value ()
 		return
 		;;
 	branch.*.rebase)
-		__gitcomp "false true merges preserve interactive" "" "$cur_"
+		__gitcomp "false true merges interactive" "" "$cur_"
 		return
 		;;
 	remote.pushdefault)
@@ -2717,7 +2577,7 @@ __git_complete_config_variable_value ()
 #                 subsections) instead of the default space.
 __git_complete_config_variable_name ()
 {
-	local cur_="$cur" sfx
+	local cur_="$cur" sfx=" "
 
 	while test $# != 0; do
 		case "$1" in
@@ -2739,7 +2599,7 @@ __git_complete_config_variable_name ()
 		local pfx="${cur_%.*}."
 		cur_="${cur_#*.}"
 		__gitcomp_direct "$(__git_heads "$pfx" "$cur_" ".")"
-		__gitcomp_nl_append $'autoSetupMerge\nautoSetupRebase\n' "$pfx" "$cur_" "${sfx:- }"
+		__gitcomp "autoSetupMerge autoSetupRebase" "$pfx" "$cur_" "$sfx"
 		return
 		;;
 	guitool.*.*)
@@ -2773,7 +2633,7 @@ __git_complete_config_variable_name ()
 		local pfx="${cur_%.*}."
 		cur_="${cur_#*.}"
 		__git_compute_all_commands
-		__gitcomp_nl "$__git_all_commands" "$pfx" "$cur_" "${sfx:- }"
+		__gitcomp_nl "$__git_all_commands" "$pfx" "$cur_" "$sfx"
 		return
 		;;
 	remote.*.*)
@@ -2789,7 +2649,7 @@ __git_complete_config_variable_name ()
 		local pfx="${cur_%.*}."
 		cur_="${cur_#*.}"
 		__gitcomp_nl "$(__git_remotes)" "$pfx" "$cur_" "."
-		__gitcomp_nl_append "pushDefault" "$pfx" "$cur_" "${sfx:- }"
+		__gitcomp "pushDefault" "$pfx" "$cur_" "$sfx"
 		return
 		;;
 	url.*.*)
@@ -2804,7 +2664,7 @@ __git_complete_config_variable_name ()
 		;;
 	*)
 		__git_compute_config_vars
-		__gitcomp "$(echo "$__git_config_vars" |
+		__gitcomp_nl "$(echo "$__git_config_vars" |
 				awk -F . '{
 					sections[$1] = 1
 				}
@@ -2812,7 +2672,7 @@ __git_complete_config_variable_name ()
 					for (s in sections)
 						print s "."
 				}
-				')" "" "$cur_"
+				')" "" "$cur_" ""
 		;;
 	esac
 }
@@ -2906,7 +2766,7 @@ _git_remote ()
 		__gitcomp_builtin remote_update
 		;;
 	update,*)
-		__gitcomp "$(__git_remotes) $(__git_get_config_variables "remotes")"
+		__gitcomp_nl "$(__git_remotes) $(__git_get_config_variables "remotes")"
 		;;
 	set-url,--*)
 		__gitcomp_builtin remote_set-url
@@ -2973,7 +2833,7 @@ _git_restore ()
 
 	case "$cur" in
 	--conflict=*)
-		__gitcomp "diff3 merge" "" "${cur##--conflict=}"
+		__gitcomp "diff3 merge zdiff3" "" "${cur##--conflict=}"
 		;;
 	--source=*)
 		__git_complete_refs --cur="${cur##--source=}"
@@ -2990,7 +2850,7 @@ _git_revert ()
 {
 	__git_find_repo_path
 	if [ -f "$__git_repo_path"/REVERT_HEAD ]; then
-		__gitcomp "$__git_revert_inprogress_options"
+		__gitcomp_opts "$__git_revert_inprogress_options"
 		return
 	fi
 	__git_complete_strategy && return
@@ -3022,7 +2882,7 @@ _git_shortlog ()
 
 	case "$cur" in
 	--*)
-		__gitcomp "
+		__gitcomp_opts "
 			$__git_log_common_options
 			$__git_log_shortlog_options
 			--numbered --summary --email
@@ -3060,8 +2920,8 @@ _git_show ()
 		return
 		;;
 	--*)
-		__gitcomp "--pretty= --format= --abbrev-commit --no-abbrev-commit
-			--oneline --show-signature --patch
+		__gitcomp_opts "--pretty= --format= --abbrev-commit --no-abbrev-commit
+			--oneline --show-signature
 			--expand-tabs --expand-tabs= --no-expand-tabs
 			$__git_diff_common_options
 			"
@@ -3093,10 +2953,10 @@ _git_sparse_checkout ()
 
 	case "$subcommand,$cur" in
 	init,--*)
-		__gitcomp "--cone"
+		__gitcomp_opts "--cone"
 		;;
 	set,--*)
-		__gitcomp "--stdin"
+		__gitcomp_opts "--stdin"
 		;;
 	*)
 		;;
@@ -3105,63 +2965,48 @@ _git_sparse_checkout ()
 
 _git_stash ()
 {
-	local save_opts='--all --keep-index --no-keep-index --quiet --patch --include-untracked'
 	local subcommands='push list show apply clear drop pop create branch'
 	local subcommand="$(__git_find_on_cmdline "$subcommands save")"
-	if [ -z "$subcommand" -a -n "$(__git_find_on_cmdline "-p")" ]; then
-		subcommand="push"
-	fi
+
 	if [ -z "$subcommand" ]; then
-		case "$cur" in
-		--*)
-			__gitcomp "$save_opts"
+		case "$((cword - __git_cmd_idx)),$cur" in
+		*,--*)
+			__gitcomp_builtin stash_push
 			;;
-		sa*)
-			if [ -z "$(__git_find_on_cmdline "$save_opts")" ]; then
-				__gitcomp "save"
-			fi
+		1,sa*)
+			__gitcomp "save"
 			;;
-		*)
-			if [ -z "$(__git_find_on_cmdline "$save_opts")" ]; then
-				__gitcomp "$subcommands"
-			fi
+		1,*)
+			__gitcomp "$subcommands"
 			;;
 		esac
-	else
-		case "$subcommand,$cur" in
-		push,--*)
-			__gitcomp "$save_opts --message"
-			;;
-		save,--*)
-			__gitcomp "$save_opts"
-			;;
-		apply,--*|pop,--*)
-			__gitcomp "--index --quiet"
-			;;
-		drop,--*)
-			__gitcomp "--quiet"
-			;;
-		list,--*)
-			__gitcomp "--name-status --oneline --patch-with-stat"
-			;;
-		show,--*|branch,--*)
-			;;
-		branch,*)
-			if [ $cword -eq 3 ]; then
-				__git_complete_refs
-			else
-				__gitcomp_nl "$(__git stash list \
-						| sed -n -e 's/:.*//p')"
-			fi
-			;;
-		show,*|apply,*|drop,*|pop,*)
+		return
+	fi
+
+	case "$subcommand,$cur" in
+	list,--*)
+		# NEEDSWORK: can we somehow unify this with the options in _git_log() and _git_show()
+		__gitcomp_builtin stash_list "$__git_log_common_options $__git_diff_common_options"
+		;;
+	show,--*)
+		__gitcomp_builtin stash_show "$__git_diff_common_options"
+		;;
+	*,--*)
+		__gitcomp_builtin "stash_$subcommand"
+		;;
+	branch,*)
+		if [ $cword -eq $((__git_cmd_idx+2)) ]; then
+			__git_complete_refs
+		else
 			__gitcomp_nl "$(__git stash list \
 					| sed -n -e 's/:.*//p')"
-			;;
-		*)
-			;;
-		esac
-	fi
+		fi
+		;;
+	show,*|apply,*|drop,*|pop,*)
+		__gitcomp_nl "$(__git stash list \
+				| sed -n -e 's/:.*//p')"
+		;;
+	esac
 }
 
 _git_submodule ()
@@ -3173,7 +3018,7 @@ _git_submodule ()
 	if [ -z "$subcommand" ]; then
 		case "$cur" in
 		--*)
-			__gitcomp "--quiet"
+			__gitcomp_opts "--quiet"
 			;;
 		*)
 			__gitcomp "$subcommands"
@@ -3184,29 +3029,29 @@ _git_submodule ()
 
 	case "$subcommand,$cur" in
 	add,--*)
-		__gitcomp "--branch --force --name --reference --depth"
+		__gitcomp_opts "--branch --force --name --reference --depth"
 		;;
 	status,--*)
-		__gitcomp "--cached --recursive"
+		__gitcomp_opts "--cached --recursive"
 		;;
 	deinit,--*)
-		__gitcomp "--force --all"
+		__gitcomp_opts "--force --all"
 		;;
 	update,--*)
-		__gitcomp "
+		__gitcomp_opts "
 			--init --remote --no-fetch
 			--recommend-shallow --no-recommend-shallow
 			--force --rebase --merge --reference --depth --recursive --jobs
 		"
 		;;
 	set-branch,--*)
-		__gitcomp "--default --branch"
+		__gitcomp_opts "--default --branch"
 		;;
 	summary,--*)
-		__gitcomp "--cached --files --summary-limit"
+		__gitcomp_opts "--cached --files --summary-limit"
 		;;
 	foreach,--*|sync,--*)
-		__gitcomp "--recursive"
+		__gitcomp_opts "--recursive"
 		;;
 	*)
 		;;
@@ -3247,64 +3092,64 @@ _git_svn ()
 
 		case "$subcommand,$cur" in
 		fetch,--*)
-			__gitcomp "--revision= --fetch-all $fc_opts"
+			__gitcomp_opts "--revision= --fetch-all $fc_opts"
 			;;
 		clone,--*)
-			__gitcomp "--revision= $fc_opts $init_opts"
+			__gitcomp_opts "--revision= $fc_opts $init_opts"
 			;;
 		init,--*)
-			__gitcomp "$init_opts"
+			__gitcomp_opts "$init_opts"
 			;;
 		dcommit,--*)
-			__gitcomp "
+			__gitcomp_opts "
 				--merge --strategy= --verbose --dry-run
 				--fetch-all --no-rebase --commit-url
 				--revision --interactive $cmt_opts $fc_opts
 				"
 			;;
 		set-tree,--*)
-			__gitcomp "--stdin $cmt_opts $fc_opts"
+			__gitcomp_opts "--stdin $cmt_opts $fc_opts"
 			;;
 		create-ignore,--*|propget,--*|proplist,--*|show-ignore,--*|\
 		show-externals,--*|mkdirs,--*)
-			__gitcomp "--revision="
+			__gitcomp_opts "--revision="
 			;;
 		log,--*)
-			__gitcomp "
+			__gitcomp_opts "
 				--limit= --revision= --verbose --incremental
 				--oneline --show-commit --non-recursive
 				--authors-file= --color
 				"
 			;;
 		rebase,--*)
-			__gitcomp "
+			__gitcomp_opts "
 				--merge --verbose --strategy= --local
 				--fetch-all --dry-run $fc_opts
 				"
 			;;
 		commit-diff,--*)
-			__gitcomp "--message= --file= --revision= $cmt_opts"
+			__gitcomp_opts "--message= --file= --revision= $cmt_opts"
 			;;
 		info,--*)
-			__gitcomp "--url"
+			__gitcomp_opts "--url"
 			;;
 		branch,--*)
-			__gitcomp "--dry-run --message --tag"
+			__gitcomp_opts "--dry-run --message --tag"
 			;;
 		tag,--*)
-			__gitcomp "--dry-run --message"
+			__gitcomp_opts "--dry-run --message"
 			;;
 		blame,--*)
-			__gitcomp "--git-format"
+			__gitcomp_opts "--git-format"
 			;;
 		migrate,--*)
-			__gitcomp "
+			__gitcomp_opts "
 				--config-dir= --ignore-paths= --minimize
 				--no-auth-cache --username=
 				"
 			;;
 		reset,--*)
-			__gitcomp "--revision= --parent"
+			__gitcomp_opts "--revision= --parent"
 			;;
 		*)
 			;;
@@ -3314,7 +3159,7 @@ _git_svn ()
 
 _git_tag ()
 {
-	local i c=1 f=0
+	local i c="$__git_cmd_idx" f=0
 	while [ $c -lt $cword ]; do
 		i="${words[c]}"
 		case "$i" in
@@ -3357,9 +3202,10 @@ _git_whatchanged ()
 __git_complete_worktree_paths ()
 {
 	local IFS=$'\n'
+	# Generate completion reply from worktree list skipping the first
+	# entry: it's the path of the main worktree, which can't be moved,
+	# removed, locked, etc.
 	__gitcomp_nl "$(git worktree list --porcelain |
-		# Skip the first entry: it's the path of the main worktree,
-		# which can't be moved, removed, locked, etc.
 		sed -n -e '2,$ s/^worktree //p')"
 }
 
@@ -3458,15 +3304,19 @@ __git_support_parseopt_helper () {
 	esac
 }
 
+__git_have_func () {
+	declare -f -- "$1" >/dev/null 2>&1
+}
+
 __git_complete_command () {
 	local command="$1"
 	local completion_func="_git_${command//-/_}"
-	if ! declare -f $completion_func >/dev/null 2>/dev/null &&
-		declare -f _completion_loader >/dev/null 2>/dev/null
+	if ! __git_have_func $completion_func &&
+		__git_have_func _completion_loader
 	then
 		_completion_loader "git-$command"
 	fi
-	if declare -f $completion_func >/dev/null 2>/dev/null
+	if __git_have_func $completion_func
 	then
 		$completion_func
 		return 0
@@ -3483,21 +3333,40 @@ __git_main ()
 {
 	local i c=1 command __git_dir __git_repo_path
 	local __git_C_args C_args_count=0
+	local __git_cmd_idx
 
 	while [ $c -lt $cword ]; do
 		i="${words[c]}"
 		case "$i" in
-		--git-dir=*) __git_dir="${i#--git-dir=}" ;;
-		--git-dir)   ((c++)) ; __git_dir="${words[c]}" ;;
-		--bare)      __git_dir="." ;;
-		--help) command="help"; break ;;
-		-c|--work-tree|--namespace) ((c++)) ;;
-		-C)	__git_C_args[C_args_count++]=-C
+		--git-dir=*)
+			__git_dir="${i#--git-dir=}"
+			;;
+		--git-dir)
+			((c++))
+			__git_dir="${words[c]}"
+			;;
+		--bare)
+			__git_dir="."
+			;;
+		--help)
+			command="help"
+			break
+			;;
+		-c|--work-tree|--namespace)
+			((c++))
+			;;
+		-C)
+			__git_C_args[C_args_count++]=-C
 			((c++))
 			__git_C_args[C_args_count++]="${words[c]}"
 			;;
-		-*) ;;
-		*) command="$i"; break ;;
+		-*)
+			;;
+		*)
+			command="$i"
+			__git_cmd_idx="$c"
+			break
+			;;
 		esac
 		((c++))
 	done
@@ -3519,7 +3388,8 @@ __git_main ()
 			;;
 		esac
 		case "$cur" in
-		--*)   __gitcomp "
+		--*)
+			__gitcomp_opts "
 			--paginate
 			--no-pager
 			--git-dir=
@@ -3541,7 +3411,7 @@ __git_main ()
 			then
 				__gitcomp "$GIT_TESTING_PORCELAIN_COMMAND_LIST"
 			else
-				__gitcomp "$(__git --list-cmds=list-mainporcelain,others,nohelpers,alias,list-complete,config)"
+				__gitcomp_nl "$(__git --list-cmds=list-mainporcelain,others,nohelpers,alias,list-complete,config)"
 			fi
 			;;
 		esac
@@ -3570,7 +3440,7 @@ __gitk_main ()
 	fi
 	case "$cur" in
 	--*)
-		__gitcomp "
+		__gitcomp_opts "
 			$__git_log_common_options
 			$__git_log_gitk_options
 			$merge
@@ -3586,17 +3456,106 @@ if [[ -n ${ZSH_VERSION-} && -z ${GIT_SOURCING_ZSH_COMPLETION-} ]]; then
 	return
 fi
 
+# The following function is based on code from:
+#
+#   bash_completion - programmable completion functions for bash 3.2+
+#
+#   Copyright © 2006-2008, Ian Macdonald <ian@caliban.org>
+#             © 2009-2010, Bash Completion Maintainers
+#                     <bash-completion-devel@lists.alioth.debian.org>
+#
+#   This program is free software; you can redistribute it and/or modify
+#   it under the terms of the GNU General Public License as published by
+#   the Free Software Foundation; either version 2, or (at your option)
+#   any later version.
+#
+#   This program is distributed in the hope that it will be useful,
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#   GNU General Public License for more details.
+#
+#   You should have received a copy of the GNU General Public License
+#   along with this program; if not, see <http://www.gnu.org/licenses/>.
+#
+#   The latest version of this software can be obtained here:
+#
+#   http://bash-completion.alioth.debian.org/
+#
+#   RELEASE: 2.x
+
+# This function reorganizes the words on the command line to be processed by
+# the rest of the script.
+#
+# This is roughly equivalent to going back in time and setting
+# COMP_WORDBREAKS to exclude '=' and ':'.  The intent is to
+# make option types like --date=<type> and <rev>:<path> easy to
+# recognize by treating each shell word as a single token.
+#
+# It is best not to set COMP_WORDBREAKS directly because the value is
+# shared with other completion scripts.  By the time the completion
+# function gets called, COMP_WORDS has already been populated so local
+# changes to COMP_WORDBREAKS have no effect.
+
+if ! type __git_get_comp_words_by_ref >/dev/null 2>&1; then
+__git_get_comp_words_by_ref ()
+{
+	local exclude i j first
+
+	# Which word separators to exclude?
+	exclude="${COMP_WORDBREAKS//[^=:]}"
+	cword=$COMP_CWORD
+	if [ -n "$exclude" ]; then
+		# List of word completion separators has shrunk;
+		# re-assemble words to complete.
+		for ((i=0, j=0; i < ${#COMP_WORDS[@]}; i++, j++)); do
+			# Append each nonempty word consisting of just
+			# word separator characters to the current word.
+			first=t
+			while
+				[ $i -gt 0 ] &&
+				[ -n "${COMP_WORDS[$i]}" ] &&
+				# word consists of excluded word separators
+				[ "${COMP_WORDS[$i]//[^$exclude]}" = "${COMP_WORDS[$i]}" ]
+			do
+				# Attach to the previous token,
+				# unless the previous token is the command name.
+				if [ $j -ge 2 ] && [ -n "$first" ]; then
+					((j--))
+				fi
+				first=
+				words[$j]=${words[j]}${COMP_WORDS[i]}
+				if [ $i = $COMP_CWORD ]; then
+					cword=$j
+				fi
+				if (($i < ${#COMP_WORDS[@]} - 1)); then
+					((i++))
+				else
+					# Done.
+					break 2
+				fi
+			done
+			words[$j]=${words[j]}${COMP_WORDS[i]}
+			if [ $i = $COMP_CWORD ]; then
+				cword=$j
+			fi
+		done
+	else
+		words=("${COMP_WORDS[@]}")
+	fi
+
+	cur=${words[cword]}
+	prev=${words[cword-1]}
+}
+fi
+
 __git_func_wrap ()
 {
-	local cur words cword prev
-	_get_comp_words_by_ref -n =: cur words cword prev
+	local cur words cword prev __git_cmd_idx=0
+	__git_get_comp_words_by_ref
 	$1
 }
 
-# Setup completion for certain functions defined above by setting common
-# variables and workarounds.
-# This is NOT a public function; use at your own risk.
-__git_complete ()
+___git_complete ()
 {
 	local wrapper="__git_wrap${2}"
 	eval "$wrapper () { __git_func_wrap $2 ; }"
@@ -3604,15 +3563,35 @@ __git_complete ()
 		|| complete -o default -o nospace -F $wrapper $1
 }
 
+# Setup the completion for git commands
+# 1: command or alias
+# 2: function to call (e.g. `git`, `gitk`, `git_fetch`)
+__git_complete ()
+{
+	local func
+
+	if __git_have_func $2; then
+		func=$2
+	elif __git_have_func __$2_main; then
+		func=__$2_main
+	elif __git_have_func _$2; then
+		func=_$2
+	else
+		echo "ERROR: could not find function '$2'" 1>&2
+		return 1
+	fi
+	___git_complete $1 $func
+}
+
 if ! git --list-cmds=main >/dev/null 2>&1; then
 
 	declare -A __git_cmds
 	__git_cmds[list-complete]="apply blame cherry config difftool fsck help instaweb mergetool prune reflog remote repack replace request-pull send-email show-branch stage whatchanged"
-	__git_cmds[list-guide]="attributes cli core-tutorial credentials cvs-migration diffcore everyday faq glossary hooks ignore modules namespaces remote-helpers repository-layout revisions submodules tutorial-2 tutorial workflows"
-	__git_cmds[list-mainporcelain]="add am archive bisect branch bundle checkout cherry-pick citool clean clone commit describe diff fetch format-patch gc grep gui init gitk log maintenance merge mv notes pull push range-diff rebase reset restore revert rm shortlog show sparse-checkout stash status submodule switch tag worktree"
-	__git_cmds[main]="add add--interactive am annotate apply archimport archive bisect bisect--helper blame branch bugreport bundle cat-file check-attr check-ignore check-mailmap check-ref-format checkout checkout-index cherry cherry-pick citool clean clone column commit commit-graph commit-tree config count-objects credential credential-cache credential-cache--daemon credential-gnome-keyring credential-libsecret credential-store cvsexportcommit cvsimport cvsserver daemon describe diff diff-files diff-index diff-tree difftool difftool--helper env--helper fast-export fast-import fetch fetch-pack filter-branch fmt-merge-msg for-each-ref format-patch fsck fsck-objects gc get-tar-commit-id grep gui gui--askpass hash-object help http-backend http-fetch http-push imap-send index-pack init init-db instaweb interpret-trailers log ls-files ls-remote ls-tree mailinfo mailsplit maintenance merge merge-base merge-file merge-index merge-octopus merge-one-file merge-ours merge-recursive merge-recursive-ours merge-recursive-theirs merge-resolve merge-subtree merge-tree mergetool mktag mktree multi-pack-index mv mw name-rev notes p4 pack-objects pack-redundant pack-refs patch-id pickaxe prune prune-packed pull push quiltimport range-diff read-tree rebase rebase--interactive receive-pack reflog remote remote-ext remote-fd remote-ftp remote-ftps remote-http remote-https remote-mediawiki repack replace request-pull rerere reset restore rev-list rev-parse revert rm send-email send-pack sh-i18n--envsubst shell shortlog show show-branch show-index show-ref sparse-checkout stage stash status stripspace submodule submodule--helper subtree svn switch symbolic-ref tag unpack-file unpack-objects update-index update-ref update-server-info upload-archive upload-archive--writer upload-pack var verify-commit verify-pack verify-tag version web--browse whatchanged worktree write-tree"
-	__git_cmds[others]="compare reintegrate related remote-hg remote-sync send-series smartlist"
-	__git_cmds[parseopt]="add am apply archive bisect--helper blame branch bugreport cat-file check-attr check-ignore check-mailmap checkout checkout-index cherry cherry-pick clean clone column commit commit-graph config count-objects credential-cache credential-cache--daemon credential-store describe difftool env--helper fast-export fetch fmt-merge-msg for-each-ref format-patch fsck fsck-objects gc grep hash-object help init init-db interpret-trailers log ls-files ls-remote ls-tree merge merge-base merge-file mktree multi-pack-index mv name-rev notes pack-objects pack-refs pickaxe prune prune-packed pull push range-diff read-tree rebase rebase--interactive receive-pack reflog remote repack replace rerere reset restore revert rm send-pack shortlog show show-branch show-index show-ref sparse-checkout stage stash status stripspace switch symbolic-ref tag update-index update-ref update-server-info upload-pack verify-commit verify-pack verify-tag version whatchanged write-tree "
+	__git_cmds[list-guide]="attributes cli core-tutorial credentials cvs-migration diffcore everyday faq glossary hooks ignore mailmap modules namespaces remote-helpers repository-layout revisions submodules tutorial tutorial-2 workflows"
+	__git_cmds[list-mainporcelain]="add am archive bisect branch bundle checkout cherry-pick citool clean clone commit describe diff fetch format-patch gc grep gui init log maintenance merge mv notes pull push range-diff rebase reset restore revert rm shortlog show sparse-checkout stash status submodule switch tag worktree gitk"
+	__git_cmds[main]="add add--interactive am annotate apply archimport archive bisect bisect--helper blame branch bugreport bundle cat-file check-attr check-ignore check-mailmap check-ref-format checkout checkout--worker checkout-index cherry cherry-pick citool clean clone column commit commit-graph commit-tree config count-objects credential credential-cache credential-cache--daemon credential-gnome-keyring credential-libsecret credential-store cvsexportcommit cvsimport cvsserver daemon describe diff diff-files diff-index diff-tree difftool difftool--helper env--helper fast-export fast-import fetch fetch-pack filter-branch fmt-merge-msg for-each-ref for-each-repo format-patch fsck fsck-objects gc get-tar-commit-id grep gui gui--askpass hash-object help http-backend http-fetch http-push imap-send index-pack init init-db instaweb interpret-trailers log ls-files ls-remote ls-tree mailinfo mailsplit maintenance merge merge-base merge-file merge-index merge-octopus merge-one-file merge-ours merge-recursive merge-recursive-ours merge-recursive-theirs merge-resolve merge-subtree merge-tree mergetool mktag mktree multi-pack-index mv mw name-rev notes p4 pack-objects pack-redundant pack-refs patch-id pickaxe prune prune-packed pull push quiltimport range-diff read-tree rebase receive-pack reflog remote remote-ext remote-fd remote-ftp remote-ftps remote-http remote-https remote-mediawiki repack replace request-pull rerere reset restore rev-list rev-parse revert rm send-email send-pack sh-i18n--envsubst shell shortlog show show-branch show-index show-ref sparse-checkout stage stash status stripspace submodule submodule--helper subtree svn switch symbolic-ref tag unpack-file unpack-objects update-index update-ref update-server-info upload-archive upload-archive--writer upload-pack var verify-commit verify-pack verify-tag version web--browse whatchanged worktree write-tree"
+	__git_cmds[others]=""
+	__git_cmds[parseopt]="add am apply archive bisect--helper blame branch bugreport cat-file check-attr check-ignore check-mailmap checkout checkout--worker checkout-index cherry cherry-pick clean clone column commit commit-graph config count-objects credential-cache credential-cache--daemon credential-store describe difftool env--helper fast-export fetch fmt-merge-msg for-each-ref for-each-repo format-patch fsck fsck-objects gc grep hash-object help init init-db interpret-trailers log ls-files ls-remote ls-tree merge merge-base merge-file mktree multi-pack-index mv name-rev notes pack-objects pack-refs pickaxe prune prune-packed pull push range-diff read-tree rebase receive-pack reflog remote repack replace rerere reset restore revert rm send-pack shortlog show show-branch show-index show-ref sparse-checkout stage stash status stripspace switch symbolic-ref tag update-index update-ref update-server-info upload-pack verify-commit verify-pack verify-tag version whatchanged write-tree "
 
 	# Override __git
 	__git ()
@@ -3641,13 +3620,13 @@ if ! git --list-cmds=main >/dev/null 2>&1; then
 
 fi
 
-__git_complete git __git_main
-__git_complete gitk __gitk_main
+___git_complete git __git_main
+___git_complete gitk __gitk_main
 
 # The following are necessary only for Cygwin, and only are needed
 # when the user has tab-completed the executable name and consequently
 # included the '.exe' suffix.
 #
 if [ "$OSTYPE" = cygwin ]; then
-	__git_complete git.exe __git_main
+	___git_complete git.exe __git_main
 fi
diff --git a/plugins/gitfast/git-prompt.sh b/plugins/gitfast/git-prompt.sh
index 54e123d63..db7c0068f 100644
--- a/plugins/gitfast/git-prompt.sh
+++ b/plugins/gitfast/git-prompt.sh
@@ -138,6 +138,7 @@ __git_ps1_show_upstream ()
 	done <<< "$output"
 
 	# parse configuration values
+	local option
 	for option in ${GIT_PS1_SHOWUPSTREAM}; do
 		case "$option" in
 		git|svn) upstream="$option" ;;
@@ -432,8 +433,8 @@ __git_ps1 ()
 	fi
 
 	local sparse=""
-	if [ -z "${GIT_PS1_COMPRESSSPARSESTATE}" ] &&
-	   [ -z "${GIT_PS1_OMITSPARSESTATE}" ] &&
+	if [ -z "${GIT_PS1_COMPRESSSPARSESTATE-}" ] &&
+	   [ -z "${GIT_PS1_OMITSPARSESTATE-}" ] &&
 	   [ "$(git config --bool core.sparseCheckout)" = "true" ]; then
 		sparse="|SPARSE"
 	fi
@@ -542,7 +543,7 @@ __git_ps1 ()
 			u="%${ZSH_VERSION+%}"
 		fi
 
-		if [ -n "${GIT_PS1_COMPRESSSPARSESTATE}" ] &&
+		if [ -n "${GIT_PS1_COMPRESSSPARSESTATE-}" ] &&
 		   [ "$(git config --bool core.sparseCheckout)" = "true" ]; then
 			h="?"
 		fi
diff --git a/plugins/gitfast/update b/plugins/gitfast/update
index 5311065a1..5ebaaef3d 100755
--- a/plugins/gitfast/update
+++ b/plugins/gitfast/update
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 url="https://raw.githubusercontent.com/felipec/git-completion"
-version="1.2"
+version="1.3.6"
 
 curl -s -o _git "${url}/v${version}/git-completion.zsh" &&
 curl -s -o git-completion.bash "${url}/v${version}/git-completion.bash" &&

From 11a87eac47c579366620f995330532f47dc651f2 Mon Sep 17 00:00:00 2001
From: Gheritarish <ilissiae@gmail.com>
Date: Fri, 28 Jan 2022 13:47:41 +0100
Subject: [PATCH 799/869] chore(1password): fix comments to follow code
 (#10634)

---
 plugins/1password/1password.plugin.zsh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/1password/1password.plugin.zsh b/plugins/1password/1password.plugin.zsh
index 5af5ebb2b..9398b02b4 100644
--- a/plugins/1password/1password.plugin.zsh
+++ b/plugins/1password/1password.plugin.zsh
@@ -4,8 +4,8 @@ if (( ${+commands[op]} )); then
 fi
 
 # opswd puts the password of the named service into the clipboard. If there's a
-# one time password, it will be copied into the clipboard after 5 seconds. The
-# clipboard is cleared after another 10 seconds.
+# one time password, it will be copied into the clipboard after 10 seconds. The
+# clipboard is cleared after another 20 seconds.
 function opswd() {
   if [[ $# -lt 1 ]]; then
     echo "Usage: opswd <service>"

From 46f5d38b1dc6a725e78bd53ca35a6299b4e91ece Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Fri, 28 Jan 2022 20:53:30 +0100
Subject: [PATCH 800/869] refactor(installer): use POSIX-standard's `id -u -n`
 to define `$USER`

---
 tools/install.sh | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/tools/install.sh b/tools/install.sh
index 2290bc1eb..e64e39063 100755
--- a/tools/install.sh
+++ b/tools/install.sh
@@ -37,6 +37,13 @@
 #
 set -e
 
+# Make sure important variables exist if not already defined
+#
+# $USER is defined by login(1) which is not always executed (e.g. containers)
+# POSIX: https://pubs.opengroup.org/onlinepubs/009695299/utilities/id.html
+USER=${USER:-$(id -u -n)}
+
+
 # Track if $ZSH was provided
 custom_zsh=${ZSH:+yes}
 
@@ -51,9 +58,6 @@ CHSH=${CHSH:-yes}
 RUNZSH=${RUNZSH:-yes}
 KEEP_ZSHRC=${KEEP_ZSHRC:-no}
 
-# Sane defaults
-USER=${USER:-$(whoami)}
-
 
 command_exists() {
   command -v "$@" >/dev/null 2>&1

From eabec36586f990b883e7dbf4583e6d86ac46c7ea Mon Sep 17 00:00:00 2001
From: Carlo Sala <carlosalag@protonmail.com>
Date: Fri, 28 Jan 2022 23:28:19 +0100
Subject: [PATCH 801/869] style(init): use consistent code style in init script
 (#10601)

---
 oh-my-zsh.sh | 71 +++++++++++++++++++++++++++++-----------------------
 1 file changed, 39 insertions(+), 32 deletions(-)

diff --git a/oh-my-zsh.sh b/oh-my-zsh.sh
index b388b341d..ab32ee9d3 100644
--- a/oh-my-zsh.sh
+++ b/oh-my-zsh.sh
@@ -57,14 +57,14 @@ mkdir -p "$ZSH_CACHE_DIR/completions"
 (( ${fpath[(Ie)"$ZSH_CACHE_DIR/completions"]} )) || fpath=("$ZSH_CACHE_DIR/completions" $fpath)
 
 # Check for updates on initial load...
-if [ "$DISABLE_AUTO_UPDATE" != "true" ]; then
-  source $ZSH/tools/check_for_upgrade.sh
+if [[ "$DISABLE_AUTO_UPDATE" != true ]]; then
+  source "$ZSH/tools/check_for_upgrade.sh"
 fi
 
 # Initializes Oh My Zsh
 
 # add a function path
-fpath=($ZSH/functions $ZSH/completions $fpath)
+fpath=("$ZSH/functions" "$ZSH/completions" $fpath)
 
 # Load all stock functions (from $fpath files) called below.
 autoload -U compaudit compinit
@@ -75,7 +75,6 @@ if [[ -z "$ZSH_CUSTOM" ]]; then
     ZSH_CUSTOM="$ZSH/custom"
 fi
 
-
 is_plugin() {
   local base_dir=$1
   local name=$2
@@ -86,10 +85,10 @@ is_plugin() {
 # Add all defined plugins to fpath. This must be done
 # before running compinit.
 for plugin ($plugins); do
-  if is_plugin $ZSH_CUSTOM $plugin; then
-    fpath=($ZSH_CUSTOM/plugins/$plugin $fpath)
-  elif is_plugin $ZSH $plugin; then
-    fpath=($ZSH/plugins/$plugin $fpath)
+  if is_plugin "$ZSH_CUSTOM" "$plugin"; then
+    fpath=("$ZSH_CUSTOM/plugins/$plugin" $fpath)
+  elif is_plugin "$ZSH" "$plugin"; then
+    fpath=("$ZSH/plugins/$plugin" $fpath)
   else
     echo "[oh-my-zsh] plugin '$plugin' not found"
   fi
@@ -98,14 +97,14 @@ done
 # Figure out the SHORT hostname
 if [[ "$OSTYPE" = darwin* ]]; then
   # macOS's $HOST changes with dhcp, etc. Use ComputerName if possible.
-  SHORT_HOST=$(scutil --get ComputerName 2>/dev/null) || SHORT_HOST=${HOST/.*/}
+  SHORT_HOST=$(scutil --get ComputerName 2>/dev/null) || SHORT_HOST="${HOST/.*/}"
 else
-  SHORT_HOST=${HOST/.*/}
+  SHORT_HOST="${HOST/.*/}"
 fi
 
 # Save the location of the current completion dump file.
-if [ -z "$ZSH_COMPDUMP" ]; then
-  ZSH_COMPDUMP="${ZDOTDIR:-${HOME}}/.zcompdump-${SHORT_HOST}-${ZSH_VERSION}"
+if [[ -z "$ZSH_COMPDUMP" ]]; then
+  ZSH_COMPDUMP="${ZDOTDIR:-$HOME}/.zcompdump-${SHORT_HOST}-${ZSH_VERSION}"
 fi
 
 # Construct zcompdump OMZ metadata
@@ -119,15 +118,15 @@ if ! command grep -q -Fx "$zcompdump_revision" "$ZSH_COMPDUMP" 2>/dev/null \
   zcompdump_refresh=1
 fi
 
-if [[ $ZSH_DISABLE_COMPFIX != true ]]; then
-  source $ZSH/lib/compfix.zsh
+if [[ "$ZSH_DISABLE_COMPFIX" != true ]]; then
+  source "$ZSH/lib/compfix.zsh"
   # If completion insecurities exist, warn the user
   handle_completion_insecurities
   # Load only from secure directories
-  compinit -i -C -d "${ZSH_COMPDUMP}"
+  compinit -i -C -d "$ZSH_COMPDUMP"
 else
   # If the user wants it, load from all found directories
-  compinit -u -C -d "${ZSH_COMPDUMP}"
+  compinit -u -C -d "$ZSH_COMPDUMP"
 fi
 
 # Append zcompdump metadata if missing
@@ -140,40 +139,48 @@ $zcompdump_revision
 $zcompdump_fpath
 EOF
 fi
-
 unset zcompdump_revision zcompdump_fpath zcompdump_refresh
 
-
 # Load all of the config files in ~/oh-my-zsh that end in .zsh
 # TIP: Add files you don't want in git to .gitignore
-for config_file ($ZSH/lib/*.zsh); do
-  custom_config_file="${ZSH_CUSTOM}/lib/${config_file:t}"
-  [ -f "${custom_config_file}" ] && config_file=${custom_config_file}
-  source $config_file
+for config_file ("$ZSH"/lib/*.zsh); do
+  custom_config_file="$ZSH_CUSTOM/lib/${config_file:t}"
+  [[ -f "$custom_config_file" ]] && config_file="$custom_config_file"
+  source "$config_file"
 done
+unset custom_config_file
 
 # Load all of the plugins that were defined in ~/.zshrc
 for plugin ($plugins); do
-  if [ -f $ZSH_CUSTOM/plugins/$plugin/$plugin.plugin.zsh ]; then
-    source $ZSH_CUSTOM/plugins/$plugin/$plugin.plugin.zsh
-  elif [ -f $ZSH/plugins/$plugin/$plugin.plugin.zsh ]; then
-    source $ZSH/plugins/$plugin/$plugin.plugin.zsh
+  if [[ -f "$ZSH_CUSTOM/plugins/$plugin/$plugin.plugin.zsh" ]]; then
+    source "$ZSH_CUSTOM/plugins/$plugin/$plugin.plugin.zsh"
+  elif [[ -f "$ZSH/plugins/$plugin/$plugin.plugin.zsh" ]]; then
+    source "$ZSH/plugins/$plugin/$plugin.plugin.zsh"
   fi
 done
+unset plugin
 
 # Load all of your custom configurations from custom/
-for config_file ($ZSH_CUSTOM/*.zsh(N)); do
-  source $config_file
+for config_file ("$ZSH_CUSTOM"/*.zsh(N)); do
+  source "$config_file"
 done
 unset config_file
 
 # Load the theme
-if [ ! "$ZSH_THEME" = ""  ]; then
-  if [ -f "$ZSH_CUSTOM/$ZSH_THEME.zsh-theme" ]; then
+is_theme() {
+  local base_dir=$1
+  local name=$2
+  builtin test -f $base_dir/$name.zsh-theme
+}
+
+if [[ -n "$ZSH_THEME" ]]; then
+  if is_theme "$ZSH_CUSTOM" "$ZSH_THEME"; then
     source "$ZSH_CUSTOM/$ZSH_THEME.zsh-theme"
-  elif [ -f "$ZSH_CUSTOM/themes/$ZSH_THEME.zsh-theme" ]; then
+  elif is_theme "$ZSH_CUSTOM/themes" "$ZSH_THEME"; then
     source "$ZSH_CUSTOM/themes/$ZSH_THEME.zsh-theme"
-  else
+  elif is_theme "$ZSH/themes" "$ZSH_THEME"; then
     source "$ZSH/themes/$ZSH_THEME.zsh-theme"
+  else
+    echo "[oh-my-zsh] theme '$ZSH_THEME' not found"
   fi
 fi

From 73001e9382db99ebd6effcf0bdcd227985109142 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Tue, 1 Feb 2022 12:56:22 +0100
Subject: [PATCH 802/869] refactor(django): remove deprecated `django` plugin

BREAKING CHANGE: the `django` plugin was deprecated in 2021-09-22. With
this change it has now been removed altogether. Zsh already provides
built-in completion for Django commands.
---
 plugins/django/README.md         |  12 -
 plugins/django/django.plugin.zsh | 407 -------------------------------
 2 files changed, 419 deletions(-)
 delete mode 100644 plugins/django/README.md
 delete mode 100644 plugins/django/django.plugin.zsh

diff --git a/plugins/django/README.md b/plugins/django/README.md
deleted file mode 100644
index cfab43980..000000000
--- a/plugins/django/README.md
+++ /dev/null
@@ -1,12 +0,0 @@
-# Django plugin
-
-This plugin adds completion for the [Django Project](https://www.djangoproject.com/) commands
-(`manage.py`, `django-admin`, ...).
-
-## Deprecation (2021-09-22)
-
-The plugin used to provide completion for `./manage.py` and `django-admin`, but Zsh already provides
-a better, more extensive completion for those, so this plugin is no longer needed.
-
-Right now a warning message is shown, but in the near future the plugin will stop working altogether.
-So you can remove it from your plugins and you'll automatically start using Zsh's django completion.
diff --git a/plugins/django/django.plugin.zsh b/plugins/django/django.plugin.zsh
deleted file mode 100644
index a07a30889..000000000
--- a/plugins/django/django.plugin.zsh
+++ /dev/null
@@ -1,407 +0,0 @@
-#compdef manage.py
-
-typeset -ga nul_args
-nul_args=(
-  '--verbosity=-[verbosity level; 0=minimal output, 1=normal output, 2=all output.]:Verbosity:((0\:minimal 1\:normal 2\:all))'
-  '--settings=-[the Python path to a settings module.]:file:_files'
-  '--pythonpath=-[a directory to add to the Python path.]:directory:_directories'
-  '--traceback[print traceback on exception.]'
-  "--no-color[Don't colorize the command output.]"
-  "--version[show program's version number and exit.]"
-  {-h,--help}'[show this help message and exit.]'
-)
-
-typeset -ga start_args
-start_args=(
-  '--template=-[The path or URL to load the template from.]:directory:_directories'
-  '--extension=-[The file extension(s) to render (default: "py").]'
-  '--name=-[The file name(s) to render.]:file:_files'
-)
-
-typeset -ga db_args
-db_args=(
-  '--database=-[Nominates a database. Defaults to the "default" database.]'
-)
-
-typeset -ga noinput_args
-noinput_args=(
-  '--noinput[tells Django to NOT prompt the user for input of any kind.]'
-)
-
-typeset -ga no_init_data_args
-no_init_data_args=(
-  '--no-initial-data[Tells Django not to load any initial data after database synchronization.]'
-)
-
-typeset -ga tag_args
-tag_args=(
-  '--tag=-[Run only checks labeled with given tag.]'
-  '--list-tags[List available tags.]'
-)
-
-_managepy-check(){
-  _arguments -s : \
-    $tag_args \
-    $nul_args && ret=0
-}
-
-_managepy-changepassword(){
-  _arguments -s : \
-    $db_args \
-    $nul_args && ret=0
-}
-
-_managepy-createcachetable(){
-  _arguments -s : \
-    $db_args \
-    $nul_args && ret=0
-}
-
-_managepy-createsuperuser(){
-  _arguments -s : \
-    '--username=-[Specifies the login for the superuser.]' \
-    '--email=-[Specifies the email for the superuser.]' \
-    $noinput_args \
-    $db_args \
-    $nul_args && ret=0
-}
-
-_managepy-collectstatic(){
-  _arguments -s : \
-    '--link[Create a symbolic link to each file instead of copying.]' \
-    '--no-post-process[Do NOT post process collected files.]' \
-    '--ignore=-[Ignore files or directories matching this glob-style pattern. Use multiple times to ignore more.]' \
-    '--dry-run[Do everything except modify the filesystem.]' \
-    '--clear[Clear the existing files using the storage before trying to copy or link the original file.]' \
-    '--link[Create a symbolic link to each file instead of copying.]' \
-    '--no-default-ignore[Do not ignore the common private glob-style patterns "CVS", ".*" and "*~".]' \
-    $noinput_args \
-    $nul_args && ret=0
-}
-
-_managepy-dbshell(){
-  _arguments -s : \
-    $db_args \
-    $nul_args && ret=0
-}
-
-_managepy-diffsettings(){
-  _arguments -s : \
-    "--all[Display all settings, regardless of their value.]"
-    $nul_args && ret=0
-}
-
-_managepy-dumpdata(){
-  _arguments -s : \
-    '--format=-[Specifies the output serialization format for fixtures.]:format:(json yaml xml)' \
-    '--indent=-[Specifies the indent level to use when pretty-printing output.]' \
-    '--exclude=-[An app_label or app_label.ModelName to exclude (use multiple --exclude to exclude multiple apps/models).]' \
-    '--natural-foreign[Use natural foreign keys if they are available.]' \
-    '--natural-primary[Use natural primary keys if they are available.]' \
-    "--all[Use Django's base manager to dump all models stored in the database.]" \
-    '--pks=-[Only dump objects with given primary keys.]' \
-    $db_args \
-    $nul_args \
-    '*::appname:_applist' && ret=0
-}
-
-_managepy-flush(){
-  _arguments -s : \
-    $no_init_data_args \
-    $db_args \
-    $noinput_args \
-    $nul_args && ret=0
-}
-
-_managepy-help(){
-  _arguments -s : \
-    '*:command:_managepy_cmds' \
-    $nul_args && ret=0
-}
-
-_managepy_cmds(){
-    local line
-    local -a cmd
-    _call_program help-command ./manage.py help \
-      |& sed -n '/^ /s/[(), ]/ /gp' \
-      | while read -A line; do cmd=($line $cmd) done
-    _describe -t managepy-command 'manage.py command' cmd
-}
-
-_managepy-inspectdb(){
-  _arguments -s : \
-    $db_args \
-    $nul_args && ret=0
-}
-
-_managepy-loaddata(){
-  _arguments -s : \
-    '--ignorenonexistent[Ignores entries in the serialized data for fields that do not currently exist on the model.]' \
-    '--app=-[Only look for fixtures in the specified app.]:appname:_applist' \
-    '*::file:_files' \
-    $db_args \
-    $nul_args && ret=0
-}
-
-_managepy-makemessages(){
-  _arguments -s : \
-    '--locale=-[Creates or updates the message files for the given locale(s) (e.g. pt_BR).]' \
-    '--domain=-[The domain of the message files (default: "django").]' \
-    '--all[Updates the message files for all existing locales.]' \
-    '--extension=-[The file extension(s) to examine (default: "html,txt", or "js" if the domain is "djangojs").]' \
-    '--symlinks[Follows symlinks to directories when examining source code and templates for translation strings.]' \
-    '--ignore=-[Ignore files or directories matching this glob-style pattern.]' \
-    "--no-default-ignore[Don't ignore the common glob-style patterns 'CVS', '.*', '*~' and '*.pyc'.]" \
-    "--no-wrap[Don't break long message lines into several lines.]" \
-    "--no-location[Don't write '#: filename:line' lines.]" \
-    '--no-obsolete[Remove obsolete message strings.]' \
-    '--keep-pot[Keep .pot file after making messages.]' \
-    $nul_args && ret=0
-}
-_managepy-makemigrations(){
-  _arguments -s : \
-    '--dry-run[Just show what migrations would be made]' \
-    '--merge[Enable fixing of migration conflicts.]' \
-    '--empty[Create an empty migration.]' \
-    $noinput_args \
-    $nul_args && ret=0
-}
-_managepy-migrate(){
-  _arguments -s : \
-    '--fake[Mark migrations as run without actually running them]' \
-    '--list[Show a list of all known migrations and which are applied]' \
-    $no_init_data_args \
-    $noinput_args \
-    $db_args \
-    $nul_args && ret=0
-}
-
-_managepy-runfcgi(){
-  local state
-
-  local fcgi_opts
-  fcgi_opts=(
-    'protocol[fcgi, scgi, ajp, ... (default fcgi)]:protocol:(fcgi scgi ajp)'
-    'host[hostname to listen on..]:'
-    'port[port to listen on.]:'
-    'socket[UNIX socket to listen on.]:file:_files'
-    'method[prefork or threaded (default prefork)]:method:(prefork threaded)'
-    'maxrequests[number of requests a child handles before it is killed and a new child is forked (0 = no limit).]:'
-    'maxspare[max number of spare processes / threads.]:'
-    'minspare[min number of spare processes / threads.]:'
-    'maxchildren[hard limit number of processes / threads.]:'
-    'daemonize[whether to detach from terminal.]:boolean:(False True)'
-    'pidfile[write the spawned process-id to this file.]:file:_files'
-    'workdir[change to this directory when daemonizing.]:directory:_files'
-    'outlog[write stdout to this file.]:file:_files'
-    'errlog[write stderr to this file.]:file:_files'
-  )
-
-  _arguments -s : \
-    $nul_args \
-    '*: :_values "FCGI Setting" $fcgi_opts' && ret=0
-}
-
-_managepy-runserver(){
-  _arguments -s : \
-    '--ipv6[Tells Django to use an IPv6 address.]' \
-    '--nothreading[Tells Django to NOT use threading.]' \
-    '--noreload[Tells Django to NOT use the auto-reloader.]' \
-    '--nostatic[Tells Django to NOT automatically serve static files at STATIC_URL.]' \
-    '--insecure[Allows serving static files even if DEBUG is False.]' \
-    $nul_args && ret=0
-}
-
-_managepy-shell(){
-  _arguments -s : \
-    '--plain[Tells Django to use plain Python, not IPython.]' \
-    '--no-startup[When using plain Python, ignore the PYTHONSTARTUP environment variable and ~/.pythonrc.py script.]' \
-    '--interface=-[Specify an interactive interpreter interface.]:INTERFACE:((ipython bpython))' \
-    $nul_args && ret=0
-}
-
-_managepy-sql(){
-  _arguments -s : \
-    $db_args \
-    $nul_args && ret=0
-}
-
-_managepy-sqlall(){
-  _arguments -s : \
-    $db_args \
-    $nul_args && ret=0
-}
-
-_managepy-sqlclear(){
-  _arguments -s : \
-    $db_args \
-    $nul_args && ret=0
-}
-
-_managepy-sqlcustom(){
-  _arguments -s : \
-    $db_args \
-    $nul_args && ret=0
-}
-
-_managepy-dropindexes(){
-  _arguments -s : \
-    $db_args \
-    $nul_args && ret=0
-}
-
-_managepy-sqlflush(){
-  _arguments -s : \
-    $db_args \
-    $nul_args && ret=0
-}
-
-_managepy-sqlindexes(){
-  _arguments -s : \
-    $db_args \
-    $nul_args && ret=0
-}
-
-_managepy-sqlinitialdata(){
-  _arguments -s : \
-    $nul_args && ret=0
-}
-
-_managepy-sqlsequencereset(){
-  _arguments -s : \
-    $db_args \
-    $nul_args && ret=0
-}
-
-_managepy-squashmigrations(){
-  _arguments -s : \
-    '--no-optimize[Do not try to optimize the squashed operations.]' \
-    $noinput_args \
-    $nul_args && ret=0
-}
-
-_managepy-startapp(){
-  _arguments -s : \
-    $start_args \
-    $nul_args && ret=0
-}
-_managepy-startproject(){
-  _arguments -s : \
-    $start_args \
-    $nul_args && ret=0
-}
-
-_managepy-syncdb() {
-  _arguments -s : \
-    $noinput_args \
-    $no_init_data_args \
-    $db_args \
-    $nul_args && ret=0
-}
-
-_managepy-test() {
-  _arguments -s : \
-    '--failfast[Tells Django to stop running the test suite after first failed test.]' \
-    '--testrunner=-[Tells Django to use specified test runner class instead of the one specified by the TEST_RUNNER setting.]' \
-    '--liveserver=-[Overrides the default address where the live server (used with LiveServerTestCase) is expected to run from. The default value is localhost:8081.]' \
-    '--top-level-directory=-[Top level of project for unittest discovery.]' \
-    '--pattern=-[The test matching pattern. Defaults to test*.py.]:' \
-    $noinput_args \
-    '*::appname:_applist' \
-    $nul_args && ret=0
-}
-
-_managepy-testserver() {
-  _arguments -s : \
-    '--addrport=-[port number or ipaddr:port to run the server on.]' \
-    '--ipv6[Tells Django to use an IPv6 address.]' \
-    $noinput_args \
-    '*::fixture:_files' \
-    $nul_args && ret=0
-}
-
-_managepy-validate() {
-  _arguments -s : \
-    $tag_args \
-    $nul_args && ret=0
-}
-
-_managepy-commands() {
-  local -a commands
-
-  commands=(
-    "changepassword:Change a user's password for django.contrib.auth."
-    'check:Checks the entire Django project for potential problems.'
-    'compilemessages:Compiles .po files to .mo files for use with builtin gettext support.'
-    'createcachetable:Creates the table needed to use the SQL cache backend.'
-    'createsuperuser:Used to create a superuser.'
-    'collectstatic:Collect static files in a single location.'
-    'dbshell:Runs the command-line client for the current DATABASE_ENGINE.'
-    "diffsettings:Displays differences between the current settings.py and Django's default settings."
-    'dumpdata:Output the contents of the database as a fixture of the given format.'
-    'flush:Executes ``sqlflush`` on the current database.'
-    'help:manage.py help.'
-    'inspectdb:Introspects the database tables in the given database and outputs a Django model module.'
-    'loaddata:Installs the named fixture(s) in the database.'
-    'makemessages:Runs over the entire source tree of the current directory and pulls out all strings marked for translation.'
-    'makemigrations:Creates new migration(s) for apps.'
-    'migrate:Updates database schema. Manages both apps with migrations and those without.'
-    'runfcgi:Run this project as a fastcgi (or some other protocol supported by flup) application,'
-    'runserver:Starts a lightweight Web server for development.'
-    'shell:Runs a Python interactive interpreter.'
-    'showmigrations:Shows all available migrations for the current project.'
-    'sql:Prints the CREATE TABLE SQL statements for the given app name(s).'
-    'sqlall:Prints the CREATE TABLE, custom SQL and CREATE INDEX SQL statements for the given model module name(s).'
-    'sqlclear:Prints the DROP TABLE SQL statements for the given app name(s).'
-    'sqlcustom:Prints the custom table modifying SQL statements for the given app name(s).'
-    'sqldropindexes:Prints the DROP INDEX SQL statements for the given model module name(s).'
-    'sqlflush:Returns a list of the SQL statements required to return all tables in the database to the state they were in just after they were installed.'
-    'sqlindexes:Prints the CREATE INDEX SQL statements for the given model module name(s).'
-    "sqlinitialdata:RENAMED: see 'sqlcustom'"
-    'sqlsequencereset:Prints the SQL statements for resetting sequences for the given app name(s).'
-    'squashmigrations:Squashes an existing set of migrations (from first until specified) into a single new one.'
-    "startapp:Creates a Django app directory structure for the given app name in this project's directory."
-    "startproject:Creates a Django project directory structure for the given project name in this current directory."
-    "syncdb:Create the database tables for all apps in INSTALLED_APPS whose tables haven't already been created."
-    'test:Runs the test suite for the specified applications, or the entire site if no apps are specified.'
-    'testserver:Runs a development server with data from the given fixture(s).'
-    'validate:Validates all installed models.'
-  )
-
-  _describe -t commands 'manage.py command' commands && ret=0
-}
-
-_applist() {
-  local line
-  local -a apps
-  _call_program help-command "python -c \"import sys; del sys.path[0];\\
-                                          import os.path as op, re, django.conf;\\
-                                          bn=op.basename(op.abspath(op.curdir));[sys\\
-                                          .stdout.write(str(re.sub(r'^%s\.(.*?)$' %
-                                          bn, r'\1', i)) + '\n') for i in django.conf.settings.\\
-                                          INSTALLED_APPS if re.match(r'^%s' % bn, i)]\"" \
-                             | while read -A line; do apps=($line $apps) done
-  _values 'Application' $apps && ret=0
-}
-
-_managepy() {
-  local curcontext=$curcontext ret=1
-
-  if ((CURRENT == 2)); then
-    _managepy-commands
-  else
-    shift words
-    (( CURRENT -- ))
-    curcontext="${curcontext%:*:*}:managepy-$words[1]:"
-    _call_function ret _managepy-$words[1]
-  fi
-}
-
-compdef _managepy manage.py
-compdef _managepy django
-compdef _managepy django-admin
-compdef _managepy django-admin.py
-compdef _managepy django-manage
-
-print -P "%F{yellow}The django plugin is deprecated in favor of Zsh's Django completion.
-%BPlease remove it from your plugins to stop using it.%b%f"

From 3fdad09d095c0d415e0bd9b5710f57fe30fc962a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Tue, 1 Feb 2022 13:07:53 +0100
Subject: [PATCH 803/869] chore: update copyright year

---
 LICENSE.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/LICENSE.txt b/LICENSE.txt
index becd6a7bd..2d7ca6f52 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2009-2021 Robby Russell and contributors (https://github.com/ohmyzsh/ohmyzsh/contributors)
+Copyright (c) 2009-2022 Robby Russell and contributors (https://github.com/ohmyzsh/ohmyzsh/contributors)
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

From 0be7c897f824223fa1cd22976b07ae79eff6aaea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Tue, 1 Feb 2022 13:11:49 +0100
Subject: [PATCH 804/869] refactor(zsh_reload)!: remove deprecated plugin

BREAKING CHANGE: the `zsh_reload` was deprecated long ago and showed
a deprecation message. The `src` function was replaced by the CLI
command `omz reload`, so use that instead from now on.
---
 plugins/zsh_reload/README.md             | 3 ---
 plugins/zsh_reload/zsh_reload.plugin.zsh | 7 -------
 2 files changed, 10 deletions(-)
 delete mode 100644 plugins/zsh_reload/README.md
 delete mode 100644 plugins/zsh_reload/zsh_reload.plugin.zsh

diff --git a/plugins/zsh_reload/README.md b/plugins/zsh_reload/README.md
deleted file mode 100644
index 0b2e2a775..000000000
--- a/plugins/zsh_reload/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# zsh_reload plugin
-
-**This plugin is deprecated.** Use `omz reload` or `exec zsh` instead.
diff --git a/plugins/zsh_reload/zsh_reload.plugin.zsh b/plugins/zsh_reload/zsh_reload.plugin.zsh
deleted file mode 100644
index 6a058ec5e..000000000
--- a/plugins/zsh_reload/zsh_reload.plugin.zsh
+++ /dev/null
@@ -1,7 +0,0 @@
-print ${(%):-"%F{yellow}The \`zsh_reload\` plugin is deprecated and will be removed."}
-print ${(%):-"Use \`%Bomz reload%b\` or \`%Bexec zsh%b\` instead.%f"}
-
-src() {
-  print ${(%):-"%F{yellow}$0 is deprecated. Use \`%Bomz reload%b\` or \`%Bexec zsh%b\` instead.%f\n"}
-  omz reload
-}

From 4ee0cf3cb4c64568430f9af5b1edca2602ab5807 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Civan=20Yavuz=C5=9Fen?= <civanyavuzsen@gmail.com>
Date: Tue, 1 Feb 2022 23:48:14 +0100
Subject: [PATCH 805/869] feat(multipass): add plugin for multipass (#10140)

Co-authored-by: C. Yavuzsen <cyavuzsen@comscore.com>
---
 plugins/multipass/README.md            | 22 ++++++++
 plugins/multipass/_multipass           | 73 ++++++++++++++++++++++++++
 plugins/multipass/multipass.plugin.zsh |  7 +++
 3 files changed, 102 insertions(+)
 create mode 100644 plugins/multipass/README.md
 create mode 100644 plugins/multipass/_multipass
 create mode 100644 plugins/multipass/multipass.plugin.zsh

diff --git a/plugins/multipass/README.md b/plugins/multipass/README.md
new file mode 100644
index 000000000..f6b2d76f4
--- /dev/null
+++ b/plugins/multipass/README.md
@@ -0,0 +1,22 @@
+# multipass
+
+This plugin provides completion for [multipass](https://multipass.run), as well as aliases
+for multipass commands.
+
+To use it, add `multipass` to the plugins array in your zshrc file:
+
+```zsh
+plugins=(... multipass)
+```
+
+## Aliases
+
+| Alias  | Command                                                             |
+| ------ | ------------------------------------------------------------------- |
+| `mp`   | `multipass`                                                         |
+| `mpl`  | `multipass list`                                                    |
+| `mpla` | `multipass launch`                                                  |
+| `mpln` | `multipass launch --network en0 --network name=bridge0,mode=manual` |
+| `mps`  | `multipass shell`                                                   |
+| `mpsp` | `multipass stop`                                                    |
+| `mpst` | `multipass start`                                                   |
diff --git a/plugins/multipass/_multipass b/plugins/multipass/_multipass
new file mode 100644
index 000000000..c742df650
--- /dev/null
+++ b/plugins/multipass/_multipass
@@ -0,0 +1,73 @@
+#compdef multipass
+
+_multipass_get_command_list () {
+  # Sample output:
+  # $ multipass --help
+  # ...
+  # Options:
+  #   -h, --help     Display this help
+  #   -v, --verbose  Increase logging verbosity. Repeat the 'v' in the short option
+  #                  for more detail. Maximum verbosity is obtained with 4 (or more)
+  #                  v's, i.e. -vvvv.
+  # ...
+  # Available commands:
+  #   alias     Create an alias
+  #   aliases   List available aliases
+  #   ...
+  #
+  $_comp_command1 --help | sed '1,/Available commands/d' | awk '/^[ \t]*[a-z]+/ { print $1 }'
+}
+
+_multipass_get_args_list () {
+  # Sample output:
+  # $ multpass help stop
+  # ...
+  # Options:
+  # -h, --help         Display this help
+  # -v, --verbose      Increase logging verbosity. Repeat the 'v' in the short
+  #                     option for more detail. Maximum verbosity is obtained with
+  #                     4 (or more) v's, i.e. -vvvv.
+  # --all              Stop all instances
+  # -t, --time <time>  Time from now, in minutes, to delay shutdown of the
+  #                     instance
+  # -c, --cancel       Cancel a pending delayed shutdown
+  #
+  # Arguments:
+  # name               Names of instances to stop. If omitted, and without the
+  #                     --all option, 'primary' will be assumed.
+  #
+  local arg_name=$($_comp_command1 help ${words[2]} | sed '1,/Arguments/d' | awk '/^[ \t]*[a-z]+/ { print $1; exit }')
+
+  case $arg_name in
+    name)
+      # Sample output:
+      # $ multipass list
+      # Name                    State             IPv4             Image
+      # workable-poacher        Running           10.2.0.28        Ubuntu openHAB Home Appliance
+      #
+      $_comp_command1 list | sed '1d' | awk '/^[ \t]*[^ ]+/ { print $1 }'
+    ;;
+    command)
+      _multipass_get_command_list
+    ;;
+  esac
+}
+
+_multipass () {
+  typeset -A opt_args
+
+  _arguments \
+    '1: :->command'\
+    '*: :->args'
+
+  case $state in
+    command)
+      compadd $(_multipass_get_command_list)
+    ;;
+    *)
+      compadd $(_multipass_get_args_list)
+    ;;
+  esac
+}
+
+_multipass "$@"
diff --git a/plugins/multipass/multipass.plugin.zsh b/plugins/multipass/multipass.plugin.zsh
new file mode 100644
index 000000000..95025b2ad
--- /dev/null
+++ b/plugins/multipass/multipass.plugin.zsh
@@ -0,0 +1,7 @@
+alias mp="multipass"
+alias mpl="multipass list"
+alias mpla="multipass launch"
+alias mpln="multipass launch --network en0 --network name=bridge0,mode=manual"
+alias mps="multipass shell"
+alias mpsp="multipass stop"
+alias mpst="multipass start"

From e1a9d0ce3e142003bf137e8ca3e204474b8c148f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Wed, 2 Feb 2022 23:02:23 +0100
Subject: [PATCH 806/869] fix(cli): allow `omz` commands to be used in a script
 (#10645)

The commands `omz plugin {enable,disable}` and `omz theme set`
automatically reload the zsh session on success. With this
change, the CLI checks whether the commands are run in an
interactive session before reloading the zsh session.

This change also conditionally sets the completion function
for `omz` so that it's not done in a non-interactive session.
---
 lib/cli.zsh | 23 ++++++++++-------------
 1 file changed, 10 insertions(+), 13 deletions(-)

diff --git a/lib/cli.zsh b/lib/cli.zsh
index edc10e722..e7f997013 100644
--- a/lib/cli.zsh
+++ b/lib/cli.zsh
@@ -105,7 +105,10 @@ function _omz {
   return 0
 }
 
-compdef _omz omz
+# If run from a script, do not set the completion function
+if (( ${+functions[compdef]} )); then
+  compdef _omz omz
+fi
 
 ## Utility functions
 
@@ -299,10 +302,8 @@ multi == 1 && length(\$0) > 0 {
   # Restart the zsh session if there were no errors
   _omz::log info "plugins disabled: ${(j:, :)dis_plugins}."
 
-  # Old zsh versions don't have ZSH_ARGZERO
-  local zsh="${ZSH_ARGZERO:-${functrace[-1]%:*}}"
-  # Check whether to run a login shell
-  [[ "$zsh" = -* || -o login ]] && exec -l "${zsh#-}" || exec "$zsh"
+  # Only reload zsh if run in an interactive session
+  [[ ! -o interactive ]] || _omz::reload
 }
 
 function _omz::plugin::enable {
@@ -375,10 +376,8 @@ multi == 1 && /^[^#]*\)/ {
   # Restart the zsh session if there were no errors
   _omz::log info "plugins enabled: ${(j:, :)add_plugins}."
 
-  # Old zsh versions don't have ZSH_ARGZERO
-  local zsh="${ZSH_ARGZERO:-${functrace[-1]%:*}}"
-  # Check whether to run a login shell
-  [[ "$zsh" = -* || -o login ]] && exec -l "${zsh#-}" || exec "$zsh"
+  # Only reload zsh if run in an interactive session
+  [[ ! -o interactive ]] || _omz::reload
 }
 
 function _omz::plugin::info {
@@ -731,10 +730,8 @@ EOF
   # Restart the zsh session if there were no errors
   _omz::log info "'$1' theme set correctly."
 
-  # Old zsh versions don't have ZSH_ARGZERO
-  local zsh="${ZSH_ARGZERO:-${functrace[-1]%:*}}"
-  # Check whether to run a login shell
-  [[ "$zsh" = -* || -o login ]] && exec -l "${zsh#-}" || exec "$zsh"
+  # Only reload zsh if run in an interactive session
+  [[ ! -o interactive ]] || _omz::reload
 }
 
 function _omz::theme::use {

From d9c58d5fa10a1e9911d61adf7ccfbd64b24e713f Mon Sep 17 00:00:00 2001
From: Carlo Sala <carlosalag@protonmail.com>
Date: Thu, 3 Feb 2022 14:42:47 +0100
Subject: [PATCH 807/869] feat(yarn): add setting to disable adding global dir
 to `$PATH` (#10642)

---
 plugins/yarn/README.md       |  9 +++++++++
 plugins/yarn/yarn.plugin.zsh | 18 ++++++++++--------
 2 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/plugins/yarn/README.md b/plugins/yarn/README.md
index 9a0d1708d..9c16ff2c3 100644
--- a/plugins/yarn/README.md
+++ b/plugins/yarn/README.md
@@ -9,6 +9,15 @@ To use it, add `yarn` to the plugins array in your zshrc file:
 plugins=(... yarn)
 ```
 
+## Global scripts directory
+
+It also adds `yarn` global scripts dir (commonly `~/.yarn/bin`) to the `$PATH`.
+To disable this feature, set the following style in your `.zshrc`:
+
+```zsh
+zstyle ':omz:plugins:yarn' global-path false
+```
+
 ## Aliases
 
 | Alias | Command                                   | Description                                                                   |
diff --git a/plugins/yarn/yarn.plugin.zsh b/plugins/yarn/yarn.plugin.zsh
index 9ba24420a..bcb8661cf 100644
--- a/plugins/yarn/yarn.plugin.zsh
+++ b/plugins/yarn/yarn.plugin.zsh
@@ -1,12 +1,14 @@
-# Skip yarn call if default global bin dir exists
-[[ -d "$HOME/.yarn/bin" ]] && bindir="$HOME/.yarn/bin" || bindir="$(yarn global bin 2>/dev/null)"
+if zstyle -T ':omz:plugins:yarn' global-path; then
+  # Skip yarn call if default global bin dir exists
+  [[ -d "$HOME/.yarn/bin" ]] && bindir="$HOME/.yarn/bin" || bindir="$(yarn global bin 2>/dev/null)"
 
-# Add yarn bin directory to $PATH if it exists and not already in $PATH
-[[ $? -eq 0 ]] \
-  && [[ -d "$bindir" ]] \
-  && (( ! ${path[(Ie)$bindir]} )) \
-  && path+=("$bindir")
-unset bindir
+  # Add yarn bin directory to $PATH if it exists and not already in $PATH
+  [[ $? -eq 0 ]] \
+    && [[ -d "$bindir" ]] \
+    && (( ! ${path[(Ie)$bindir]} )) \
+    && path+=("$bindir")
+  unset bindir
+fi
 
 alias y="yarn"
 alias ya="yarn add"

From 2d3bae965a445ac0f6edeed0b277a15d09e6a261 Mon Sep 17 00:00:00 2001
From: Robby Russell <robby@planetargon.com>
Date: Thu, 3 Feb 2022 19:07:27 -0800
Subject: [PATCH 808/869] Introducing the ANSI logo graphic

Trying this on for size for a while.
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 94a200850..5a6b98443 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-<p align="center"><img src="https://s3.amazonaws.com/ohmyzsh/oh-my-zsh-logo.png" alt="Oh My Zsh"></p>
+<p align="center"><img src="https://ohmyzsh.s3.amazonaws.com/omz-ansi-github.png" alt="Oh My Zsh"></p>
 
 Oh My Zsh is an open source, community-driven framework for managing your [zsh](https://www.zsh.org/) configuration.
 

From 9e9831fcf22cf77a797eb277f7155c442ff77f16 Mon Sep 17 00:00:00 2001
From: Harris Miller <hmiller@alteryx.com>
Date: Fri, 4 Feb 2022 13:08:03 -0700
Subject: [PATCH 809/869] fix(bureau): fix never `CLEAN` git status (#10656)

Closes #10656
---
 themes/bureau.zsh-theme | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/themes/bureau.zsh-theme b/themes/bureau.zsh-theme
index 50058e213..3ca231f6f 100644
--- a/themes/bureau.zsh-theme
+++ b/themes/bureau.zsh-theme
@@ -25,20 +25,21 @@ bureau_git_branch () {
 
 bureau_git_status() {
   local result gitstatus
+  gitstatus="$(command git status --porcelain -b 2>/dev/null)"
 
   # check status of files
-  gitstatus=$(command git status --porcelain -b 2> /dev/null)
-  if [[ -n "$gitstatus" ]]; then
-    if $(echo "$gitstatus" | command grep -q '^[AMRD]. '); then
+  local gitfiles="$(tail -n +2 <<< "$gitstatus")"
+  if [[ -n "$gitfiles" ]]; then
+    if $(echo "$gitfiles" | command grep -q '^[AMRD]. '); then
       result+="$ZSH_THEME_GIT_PROMPT_STAGED"
     fi
-    if $(echo "$gitstatus" | command grep -q '^.[MTD] '); then
+    if $(echo "$gitfiles" | command grep -q '^.[MTD] '); then
       result+="$ZSH_THEME_GIT_PROMPT_UNSTAGED"
     fi
-    if $(echo "$gitstatus" | command grep -q -E '^\?\? '); then
+    if $(echo "$gitfiles" | command grep -q -E '^\?\? '); then
       result+="$ZSH_THEME_GIT_PROMPT_UNTRACKED"
     fi
-    if $(echo "$gitstatus" | command grep -q '^UU '); then
+    if $(echo "$gitfiles" | command grep -q '^UU '); then
       result+="$ZSH_THEME_GIT_PROMPT_UNMERGED"
     fi
   else
@@ -46,13 +47,14 @@ bureau_git_status() {
   fi
 
   # check status of local repository
-  if $(echo "$gitstatus" | command grep -q '^## .*ahead'); then
+  local gitbranch="$(head -n 1 <<< "$gitstatus")"
+  if $(echo "$gitbranch" | command grep -q '^## .*ahead'); then
     result+="$ZSH_THEME_GIT_PROMPT_AHEAD"
   fi
-  if $(echo "$gitstatus" | command grep -q '^## .*behind'); then
+  if $(echo "$gitbranch" | command grep -q '^## .*behind'); then
     result+="$ZSH_THEME_GIT_PROMPT_BEHIND"
   fi
-  if $(echo "$gitstatus" | command grep -q '^## .*diverged'); then
+  if $(echo "$gitbranch" | command grep -q '^## .*diverged'); then
     result+="$ZSH_THEME_GIT_PROMPT_DIVERGED"
   fi
 

From 74a3db75e46067ebc627a22b12aac523a9606b92 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Mon, 7 Feb 2022 17:44:05 +0100
Subject: [PATCH 810/869] perf(bureau): remove multiple grep calls in git
 status check

---
 themes/bureau.zsh-theme | 36 +++++++++++++++++++-----------------
 1 file changed, 19 insertions(+), 17 deletions(-)

diff --git a/themes/bureau.zsh-theme b/themes/bureau.zsh-theme
index 3ca231f6f..a5a8a2b20 100644
--- a/themes/bureau.zsh-theme
+++ b/themes/bureau.zsh-theme
@@ -16,7 +16,7 @@ ZSH_THEME_GIT_PROMPT_STAGED="%{$fg_bold[green]%}●%{$reset_color%}"
 ZSH_THEME_GIT_PROMPT_UNSTAGED="%{$fg_bold[yellow]%}●%{$reset_color%}"
 ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$fg_bold[red]%}●%{$reset_color%}"
 
-bureau_git_branch () {
+bureau_git_info () {
   local ref
   ref=$(command git symbolic-ref HEAD 2> /dev/null) || \
   ref=$(command git rev-parse --short HEAD 2> /dev/null) || return
@@ -30,16 +30,16 @@ bureau_git_status() {
   # check status of files
   local gitfiles="$(tail -n +2 <<< "$gitstatus")"
   if [[ -n "$gitfiles" ]]; then
-    if $(echo "$gitfiles" | command grep -q '^[AMRD]. '); then
+    if [[ "$gitfiles" =~ $'(^|\n)[AMRD]. ' ]]; then
       result+="$ZSH_THEME_GIT_PROMPT_STAGED"
     fi
-    if $(echo "$gitfiles" | command grep -q '^.[MTD] '); then
+    if [[ "$gitfiles" =~ $'(^|\n).[MTD] ' ]]; then
       result+="$ZSH_THEME_GIT_PROMPT_UNSTAGED"
     fi
-    if $(echo "$gitfiles" | command grep -q -E '^\?\? '); then
+    if [[ "$gitfiles" =~ $'(^|\n)\\?\\? ' ]]; then
       result+="$ZSH_THEME_GIT_PROMPT_UNTRACKED"
     fi
-    if $(echo "$gitfiles" | command grep -q '^UU '); then
+    if [[ "$gitfiles" =~ $'(^|\n)UU ' ]]; then
       result+="$ZSH_THEME_GIT_PROMPT_UNMERGED"
     fi
   else
@@ -48,17 +48,18 @@ bureau_git_status() {
 
   # check status of local repository
   local gitbranch="$(head -n 1 <<< "$gitstatus")"
-  if $(echo "$gitbranch" | command grep -q '^## .*ahead'); then
+  if [[ "$gitbranch" =~ '^## .*ahead' ]]; then
     result+="$ZSH_THEME_GIT_PROMPT_AHEAD"
   fi
-  if $(echo "$gitbranch" | command grep -q '^## .*behind'); then
+  if [[ "$gitbranch" =~ '^## .*behind' ]]; then
     result+="$ZSH_THEME_GIT_PROMPT_BEHIND"
   fi
-  if $(echo "$gitbranch" | command grep -q '^## .*diverged'); then
+  if [[ "$gitbranch" =~ '^## .*diverged' ]]; then
     result+="$ZSH_THEME_GIT_PROMPT_DIVERGED"
   fi
 
-  if $(command git rev-parse --verify refs/stash &> /dev/null); then
+  # check if there are stashed changes
+  if command git rev-parse --verify refs/stash &> /dev/null; then
     result+="$ZSH_THEME_GIT_PROMPT_STASHED"
   fi
 
@@ -66,21 +67,22 @@ bureau_git_status() {
 }
 
 bureau_git_prompt() {
-  local gitbranch=$(bureau_git_branch)
-  local gitstatus=$(bureau_git_status)
-  local info
-
-  if [[ -z "$gitbranch" ]]; then
+  # check git information
+  local gitinfo=$(bureau_git_info)
+  if [[ -z "$gitinfo" ]]; then
     return
   fi
 
-  info="${gitbranch:gs/%/%%}"
+  # quote % in git information
+  local output="${gitinfo:gs/%/%%}"
 
+  # check git status
+  local gitstatus=$(bureau_git_status)
   if [[ -n "$gitstatus" ]]; then
-    info+=" $gitstatus"
+    output+=" $gitstatus"
   fi
 
-  echo "${ZSH_THEME_GIT_PROMPT_PREFIX}${info}${ZSH_THEME_GIT_PROMPT_SUFFIX}"
+  echo "${ZSH_THEME_GIT_PROMPT_PREFIX}${output}${ZSH_THEME_GIT_PROMPT_SUFFIX}"
 }
 
 

From 1e26ad1187cdee286d0332dbdffb6828a71140c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Mon, 7 Feb 2022 17:52:57 +0100
Subject: [PATCH 811/869] fix(bureau): fix top line space computation

Takes into account $ZLE_RPROMPT_INDENT and doesn't add the extra
space at the end so it doesn't bleed into the next line.
---
 themes/bureau.zsh-theme | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/themes/bureau.zsh-theme b/themes/bureau.zsh-theme
index a5a8a2b20..698aa2ff8 100644
--- a/themes/bureau.zsh-theme
+++ b/themes/bureau.zsh-theme
@@ -103,19 +103,14 @@ get_space () {
   local STR=$1$2
   local zero='%([BSUbfksu]|([FB]|){*})'
   local LENGTH=${#${(S%%)STR//$~zero/}}
-  local SPACES=""
-  (( LENGTH = ${COLUMNS} - $LENGTH - 1))
+  local SPACES=$(( COLUMNS - LENGTH - ${ZLE_RPROMPT_INDENT:-1} ))
 
-  for i in {0..$LENGTH}
-    do
-      SPACES="$SPACES "
-    done
-
-  echo $SPACES
+  (( SPACES > 0 )) || return
+  printf ' %.0s' {1..$SPACES}
 }
 
 _1LEFT="$_USERNAME $_PATH"
-_1RIGHT="[%*] "
+_1RIGHT="[%*]"
 
 bureau_precmd () {
   _1SPACES=`get_space $_1LEFT $_1RIGHT`

From f0f42828fa6842af631cc3dbf45f5454ea88fa3c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Mon, 7 Feb 2022 18:58:47 +0100
Subject: [PATCH 812/869] feat(updater): do not update when user already typed
 some characters (#9699)

Fixes #9699
---
 tools/check_for_upgrade.sh | 43 +++++++++++++++++++++++---------------
 1 file changed, 26 insertions(+), 17 deletions(-)

diff --git a/tools/check_for_upgrade.sh b/tools/check_for_upgrade.sh
index 3f6d35c3e..4484df4fe 100644
--- a/tools/check_for_upgrade.sh
+++ b/tools/check_for_upgrade.sh
@@ -146,26 +146,35 @@ function update_ohmyzsh() {
     return
   fi
 
-  # Ask for confirmation before updating unless in auto mode
+  # Don't ask for confirmation before updating if in auto mode
   if [[ "$update_mode" = auto ]]; then
     update_ohmyzsh
-  elif [[ "$update_mode" = reminder ]]; then
-    echo "[oh-my-zsh] It's time to update! You can do that by running \`omz update\`"
-  else
-    # input sink to swallow all characters typed before the prompt
-    # and add a newline if there wasn't one after characters typed
-    while read -t -k 1 option; do true; done
-    [[ "$option" != ($'\n'|"") ]] && echo
-
-    echo -n "[oh-my-zsh] Would you like to update? [Y/n] "
-    read -r -k 1 option
-    [[ "$option" != $'\n' ]] && echo
-    case "$option" in
-      [yY$'\n']) update_ohmyzsh ;;
-      [nN]) update_last_updated_file ;&
-      *) echo "[oh-my-zsh] You can update manually by running \`omz update\`" ;;
-    esac
+    return $?
   fi
+
+  # If in reminder mode show reminder and exit
+  if [[ "$update_mode" = reminder ]]; then
+    echo "[oh-my-zsh] It's time to update! You can do that by running \`omz update\`"
+    return 0
+  fi
+
+  # If user has typed input, show reminder and exit
+  if read -t -k 1; then
+    echo
+    echo "[oh-my-zsh] It's time to update! You can do that by running \`omz update\`"
+    return 0
+  fi
+
+  # Ask for confirmation and only update on 'y', 'Y' or Enter
+  # Otherwise just show a reminder for how to update
+  echo -n "[oh-my-zsh] Would you like to update? [Y/n] "
+  read -r -k 1 option
+  [[ "$option" = $'\n' ]] || echo
+  case "$option" in
+    [yY$'\n']) update_ohmyzsh ;;
+    [nN]) update_last_updated_file ;&
+    *) echo "[oh-my-zsh] You can update manually by running \`omz update\`" ;;
+  esac
 }
 
 unset update_mode

From 897fa09f1517e648bfbeb8549db4848a66f19c4f Mon Sep 17 00:00:00 2001
From: Michael Favia <michael@favish.com>
Date: Wed, 9 Feb 2022 03:25:12 -0600
Subject: [PATCH 813/869] fix(kubectl): fix arguments in `keti` alias to allow
 completion (#10669)

---
 plugins/kubectl/kubectl.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/kubectl/kubectl.plugin.zsh b/plugins/kubectl/kubectl.plugin.zsh
index 6edb59751..eed5727d1 100644
--- a/plugins/kubectl/kubectl.plugin.zsh
+++ b/plugins/kubectl/kubectl.plugin.zsh
@@ -29,7 +29,7 @@ alias kca='_kca(){ kubectl "$@" --all-namespaces;  unset -f _kca; }; _kca'
 alias kaf='kubectl apply -f'
 
 # Drop into an interactive terminal on a container
-alias keti='kubectl exec -ti'
+alias keti='kubectl exec -t -i'
 
 # Manage configuration quickly to switch contexts between local, dev ad staging.
 alias kcuc='kubectl config use-context'

From c41f2e7a0947139db79ae234b994467ff921f4cb Mon Sep 17 00:00:00 2001
From: Carlo Sala <carlosalag@protonmail.com>
Date: Wed, 9 Feb 2022 22:55:05 +0100
Subject: [PATCH 814/869] feat(rbw): add `rbwpw` function to copy passwords to
 the clipboard (#10639)

---
 plugins/rbw/README.md      | 10 ++++++++++
 plugins/rbw/rbw.plugin.zsh | 30 ++++++++++++++++++++++++++++++
 2 files changed, 40 insertions(+)

diff --git a/plugins/rbw/README.md b/plugins/rbw/README.md
index 87d073d24..cae36cead 100644
--- a/plugins/rbw/README.md
+++ b/plugins/rbw/README.md
@@ -9,4 +9,14 @@ To use it, add `rbw` to the plugins array in your zshrc file:
 plugins=(... rbw)
 ```
 
+## `rbwpw`
+
+The `rbwpw` function is a wrapper around `rbw`. It copies the password in the
+clipboard for the service you ask for and clears the clipboard 20s later.
+The usage is as follows:
+
+```zsh
+rbwpw <service>
+```
+
 This plugin does not add any aliases.
diff --git a/plugins/rbw/rbw.plugin.zsh b/plugins/rbw/rbw.plugin.zsh
index 56683ad06..523e35aff 100644
--- a/plugins/rbw/rbw.plugin.zsh
+++ b/plugins/rbw/rbw.plugin.zsh
@@ -17,3 +17,33 @@ if [[ ! -f "$ZSH_CACHE_DIR/completions/_rbw" ]]; then
 fi
 
 rbw gen-completions zsh >| "$ZSH_CACHE_DIR/completions/_rbw" &|
+
+# rbwpw function copies the password of a service to the clipboard
+# and clears it after 20 seconds
+function rbwpw {
+  if [[ $# -ne 1 ]]; then
+    echo "usage: rbwpw <service>"
+    return 1
+  fi
+  local service=$1
+  if ! rbw unlock; then
+    echo "rbw is locked"
+    return 1
+  fi
+  local pw=$(rbw get $service 2>/dev/null)
+  if [[ -z $pw ]]; then
+    echo "$service not found"
+    return 1
+  fi
+  echo -n $pw | clipcopy
+  echo "password for $service copied!"
+  {sleep 20 && clipcopy </dev/null 2>/dev/null} &|
+}
+
+function _rbwpw {
+  local -a services
+  services=("${(@f)$(rbw ls 2>/dev/null)}")
+  [[ -n "$services" ]] && compadd -a -- services
+}
+
+compdef _rbwpw rbwpw

From f045810697d423d108617ccd48bd7a414cb58734 Mon Sep 17 00:00:00 2001
From: sed-i <82407168+sed-i@users.noreply.github.com>
Date: Mon, 15 Nov 2021 16:27:19 -0500
Subject: [PATCH 815/869] feat(juju): add `jclean` function to destroy all
 registered controllers (#10426)

Closes #10426
---
 plugins/juju/README.md       |  1 +
 plugins/juju/juju.plugin.zsh | 32 ++++++++++++++++++++++++++++++++
 2 files changed, 33 insertions(+)

diff --git a/plugins/juju/README.md b/plugins/juju/README.md
index 49f8b0d47..2417c4669 100644
--- a/plugins/juju/README.md
+++ b/plugins/juju/README.md
@@ -113,5 +113,6 @@ Naming convention:
 
 - `jaddr <app_name> [unit_num]`: display app or unit IP address.
 - `jreld <relation_name> <app_name> <unit_num>`: display app and unit relation data.
+- `jclean`: destroy all controllers
 - `wjst [interval_secs] [args_for_watch]`: watch juju status, with optional interval
   (default: 5s); you may pass additional arguments to `watch`.
diff --git a/plugins/juju/juju.plugin.zsh b/plugins/juju/juju.plugin.zsh
index 07f15b392..cf89418c6 100644
--- a/plugins/juju/juju.plugin.zsh
+++ b/plugins/juju/juju.plugin.zsh
@@ -95,6 +95,37 @@ jaddr() {
   fi
 }
 
+# Destroy all controllers
+jclean() {
+  if (( ! ${+commands[jq]} )); then
+    echo "jq is required but could not be found." >&2
+    return 1
+  fi
+
+  local controllers=$(juju controllers --format=json | jq -r '.controllers | keys[]' 2>/dev/null)
+  if [[ -z "$controllers" ]]; then
+    echo "No controllers registered"
+    return 0
+  fi
+
+  echo "This will forcefully destroy all storages, models and controllers."
+  echo "Controllers to be destroyed:"
+  echo "$controllers"
+
+  if ! read -q '?Are you sure (y/n)? '; then
+    echo
+    echo "Aborted."
+    return 0
+  fi
+
+  echo
+  for controller in ${=controllers}; do
+    timeout 2m juju destroy-controller --destroy-all-models --destroy-storage --force --no-wait -y $controller
+    timeout 2m juju kill-controller -y -t 0 $controller 2>/dev/null
+    timeout 10s juju unregister $controller 2>/dev/null
+  done
+}
+
 # Display app and unit relation data
 jreld() {
   # $1 = relation name
@@ -125,3 +156,4 @@ wjst() {
   shift $(( $# > 0 ))
   watch -n "$interval" --color juju status --relations --storage --color "$@"
 }
+

From cdd2d6efc612b75577db49604eeb7dc35ba5f9b5 Mon Sep 17 00:00:00 2001
From: sed-i <82407168+sed-i@users.noreply.github.com>
Date: Mon, 15 Nov 2021 16:31:19 -0500
Subject: [PATCH 816/869] feat(juju): introduce additional juju aliases
 (#10426)

---
 plugins/juju/README.md       | 34 ++++++++++++++++++++++------------
 plugins/juju/juju.plugin.zsh | 12 +++++++++++-
 2 files changed, 33 insertions(+), 13 deletions(-)

diff --git a/plugins/juju/README.md b/plugins/juju/README.md
index 2417c4669..918c08de5 100644
--- a/plugins/juju/README.md
+++ b/plugins/juju/README.md
@@ -18,26 +18,36 @@ Naming convention:
 
 ### General
 
-| Alias  | Command                                     | Description                                            |
-|--------|---------------------------------------------|--------------------------------------------------------|
-| `jdl`  | `juju debug-log --ms`                       | Display log, with millisecond resolution               |
-| `jdlr` | `juju debug-log --ms --replay`              | Replay entire log                                      |
-| `jh`   | `juju help`                                 | Show help on a command or other topic                  |
-| `jssl` | `juju juju show-status-log`                 | Output past statuses for the specified entity          |
-| `jstj` | `juju status --format=json`                 | Show status in json format (more detailed)             |
-| `jst`  | `juju status --relations --storage --color` | Show status, including relations and storage, in color |
+| Alias   | Command                                     | Description                                            |
+|---------|---------------------------------------------|--------------------------------------------------------|
+| `j`     | `juju`                                      | The juju command                                       |
+| `jcld`  | `juju clouds`                               | Lists all clouds with registered credentials           |
+| `jclda` | `juju clouds --all`                         | Lists all clouds available to Juju                     |
+| `jdl`   | `juju debug-log --ms`                       | Display log, with millisecond resolution               |
+| `jdlr`  | `juju debug-log --ms --replay`              | Replay entire log                                      |
+| `jh`    | `juju help`                                 | Show help on a command or other topic                  |
+| `jssl`  | `juju show-status-log`                      | Output past statuses for the specified entity          |
+| `jstj`  | `juju status --format=json`                 | Show status in json format (more detailed)             |
+| `jst`   | `juju status --relations --color`           | Show status, including relations, in color             |
+| `jsts`  | `juju status --relations --storage --color` | Show status, including relations and storage, in color |
 
 ### Bootstrap
 
-| Alias | Command                   | Description                               |
-|-------|---------------------------|-------------------------------------------|
-| `jb`  | `juju bootstrap`          | Initializing a Juju cloud environment     |
-| `jbm` | `juju bootstrap microk8s` | Initializing a MicroK8s cloud environment |
+| Alias   | Command                             | Description                                           |
+|---------|-------------------------------------|-------------------------------------------------------|
+| `jb`    | `juju bootstrap`                    | Initializing a Juju cloud environment                 |
+| `jbng`  | `juju bootstrap --no-gui`           | Initializing a Juju cloud environment without GUI     |
+| `jbl`   | `juju bootstrap localhost`          | Initializing an lxd cloud environment                 |
+| `jblng` | `juju bootstrap --no-gui localhost` | Initializing an lxd cloud environment without GUI     |
+| `jbm`   | `juju bootstrap microk8s`           | Initializing a MicroK8s cloud environment             |
+| `jbmng` | `juju bootstrap --no-gui microk8s`  | Initializing a MicroK8s cloud environment without GUI |
 
 ### Controller
 
 | Alias    | Command                                                                               | Description                                                       |
 |----------|---------------------------------------------------------------------------------------|-------------------------------------------------------------------|
+| `jctl`   | `juju controllers`                                                                    | List all controllers                                              |
+| `jctlr`  | `juju controllers --refresh`                                                          | List all controllers (download latest details)                    |
 | `jdc`    | `juju destroy-controller --destroy-all-models`                                        | Destroy a controller                                              |
 | `jdc!`   | `juju destroy-controller --destroy-all-models --force --no-wait -y`                   | Destroy a controller                                              |
 | `jdcds`  | `juju destroy-controller --destroy-all-models --destroy-storage`                      | Destroy a controller and associated storage                       |
diff --git a/plugins/juju/juju.plugin.zsh b/plugins/juju/juju.plugin.zsh
index cf89418c6..81fcd6376 100644
--- a/plugins/juju/juju.plugin.zsh
+++ b/plugins/juju/juju.plugin.zsh
@@ -17,11 +17,20 @@ unset completion_file
 #   - `!` means --force --no-wait -y                         #
 #   - `ds` suffix means --destroy-storage                    #
 # ---------------------------------------------------------- #
+alias j="juju"
 alias jam="juju add-model --config logging-config=\"<root>=WARNING; unit=DEBUG\"\
  --config update-status-hook-interval=\"60m\""
 alias jb='juju bootstrap'
+alias jbng='juju bootstrap --no-gui'
+alias jbl='juju bootstrap localhost'
+alias jblng='juju bootstrap --no-gui localhost'
 alias jbm='juju bootstrap microk8s'
+alias jbmng='juju bootstrap --no-gui microk8s'
 alias jc='juju config'
+alias jcld='juju clouds'
+alias jclda='juju clouds --all'
+alias jctl='juju controllers'
+alias jctlr='juju controllers --refresh'
 alias jdc='juju destroy-controller --destroy-all-models'
 alias 'jdc!'='juju destroy-controller --destroy-all-models --force --no-wait -y'
 alias jdcds='juju destroy-controller --destroy-all-models --destroy-storage'
@@ -61,7 +70,8 @@ alias jshc='juju ssh --container'
 alias jshm='juju show-model'
 alias jssl='juju show-status-log'
 alias jstj='juju status --format=json'
-alias jst='juju status --relations --storage --color'
+alias jst='juju status --relations --color'
+alias jsts='juju status --relations --storage --color'
 alias jsu='juju show-unit'
 alias jsw='juju switch'
 

From 564a60608ca3c21d474e27bb436b36ae86c12751 Mon Sep 17 00:00:00 2001
From: sed-i <82407168+sed-i@users.noreply.github.com>
Date: Thu, 3 Feb 2022 02:15:54 -0500
Subject: [PATCH 817/869] style(juju)!: don't show storage status in `wjst` for
 consistency (#10426)

BREAKING CHANGE: `wjst` will no longer show storage in the status
output. This is done for consistency with the `jst` and `jsts`
aliases.
---
 plugins/juju/juju.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/juju/juju.plugin.zsh b/plugins/juju/juju.plugin.zsh
index 81fcd6376..408692dc7 100644
--- a/plugins/juju/juju.plugin.zsh
+++ b/plugins/juju/juju.plugin.zsh
@@ -164,6 +164,6 @@ jreld() {
 wjst() {
   local interval="${1:-5}"
   shift $(( $# > 0 ))
-  watch -n "$interval" --color juju status --relations --storage --color "$@"
+  watch -n "$interval" --color juju status --relations --color "$@"
 }
 

From aaaa55424ad7c440506024fac86927fc9916348f Mon Sep 17 00:00:00 2001
From: sed-i <82407168+sed-i@users.noreply.github.com>
Date: Mon, 7 Feb 2022 01:34:20 -0500
Subject: [PATCH 818/869] refactor(juju)!: use the jsh prefix for `juju show-*`
 commands (#10426)

BREAKING CHANGE: some aliases have been renamed to be consistent with the rest.
Mainly, aliases for `juju show-` commands are renamed to `jsh*`. This also means
that `jsh` and `jshc` have been renamed to `jssh` and `jsshc`. Have a look at the
README for the complete alias changes.
---
 plugins/juju/README.md       | 10 ++++++----
 plugins/juju/juju.plugin.zsh | 11 +++++++----
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/plugins/juju/README.md b/plugins/juju/README.md
index 918c08de5..f0c65309c 100644
--- a/plugins/juju/README.md
+++ b/plugins/juju/README.md
@@ -15,6 +15,7 @@ Naming convention:
 
 - `!` suffix: `--force --no-wait -y`.
 - `ds` suffix: `--destroy-storage`.
+- `jsh` prefix means `juju show-*`.
 
 ### General
 
@@ -26,7 +27,7 @@ Naming convention:
 | `jdl`   | `juju debug-log --ms`                       | Display log, with millisecond resolution               |
 | `jdlr`  | `juju debug-log --ms --replay`              | Replay entire log                                      |
 | `jh`    | `juju help`                                 | Show help on a command or other topic                  |
-| `jssl`  | `juju show-status-log`                      | Output past statuses for the specified entity          |
+| `jshsl` | `juju show-status-log`                      | Output past statuses for the specified entity          |
 | `jstj`  | `juju status --format=json`                 | Show status in json format (more detailed)             |
 | `jst`   | `juju status --relations --color`           | Show status, including relations, in color             |
 | `jsts`  | `juju status --relations --storage --color` | Show status, including relations and storage, in color |
@@ -53,6 +54,7 @@ Naming convention:
 | `jdcds`  | `juju destroy-controller --destroy-all-models --destroy-storage`                      | Destroy a controller and associated storage                       |
 | `jdcds!` | `juju destroy-controller --destroy-all-models --destroy-storage --force --no-wait -y` | Destroy a controller and associated storage                       |
 | `jkc`    | `juju kill-controller -y -t 0`                                                        | Forcibly terminate all associated resources for a Juju controller |
+| `jshc`   | `juju show-controller`                                                                | Shows detailed information of a controller                    |
 | `jsw`    | `juju switch`                                                                         | Select or identify the current controller and model               |
 
 ### Model
@@ -84,9 +86,9 @@ Naming convention:
 | `jrmds!` | `juju remove-application --destroy-storage --force --no-wait` | Remove application forcefully, destroying attached storage                |
 | `jrp`    | `juju refresh --path`                                         | Upgrade charm from local charm file                                       |
 | `jsa`    | `juju scale-application`                                      | Set the desired number of application units                               |
-| `jsh`    | `juju ssh`                                                    | Initiate an SSH session or execute a command on a Juju target             |
-| `jshc`   | `juju ssh --container`                                        | Initiate an SSH session or execute a command on a given container         |
-| `jsu`    | `juju show-unit`                                              | Displays information about a unit                                         |
+| `jssh`   | `juju ssh`                                                    | Initiate an SSH session or execute a command on a Juju target             |
+| `jsshc`  | `juju ssh --container`                                        | Initiate an SSH session or execute a command on a given container         |
+| `jshu`   | `juju show-unit`                                              | Displays information about a unit                                         |
 
 ### Storage
 
diff --git a/plugins/juju/juju.plugin.zsh b/plugins/juju/juju.plugin.zsh
index 408692dc7..be8a2c7ae 100644
--- a/plugins/juju/juju.plugin.zsh
+++ b/plugins/juju/juju.plugin.zsh
@@ -16,6 +16,7 @@ unset completion_file
 # Generally,                                                 #
 #   - `!` means --force --no-wait -y                         #
 #   - `ds` suffix means --destroy-storage                    #
+#   - `jsh` prefix means juju show-*                         #
 # ---------------------------------------------------------- #
 alias j="juju"
 alias jam="juju add-model --config logging-config=\"<root>=WARNING; unit=DEBUG\"\
@@ -65,14 +66,16 @@ alias jrp='juju refresh --path'
 alias jrs='juju remove-storage'
 alias 'jrs!'='juju remove-storage --force'
 alias jsa='juju scale-application'
-alias jsh='juju ssh'
-alias jshc='juju ssh --container'
+alias jsha='juju show-application'
+alias jshc='juju show-controller'
 alias jshm='juju show-model'
-alias jssl='juju show-status-log'
+alias jshsl='juju show-status-log'
+alias jshu='juju show-unit'
+alias jssh='juju ssh'
+alias jsshc='juju ssh --container'
 alias jstj='juju status --format=json'
 alias jst='juju status --relations --color'
 alias jsts='juju status --relations --storage --color'
-alias jsu='juju show-unit'
 alias jsw='juju switch'
 
 # ---------------------------------------------------------- #

From 0da33ca22be19452e26ed44aef8e99972d0bf866 Mon Sep 17 00:00:00 2001
From: Carlo Sala <carlosalag@protonmail.com>
Date: Thu, 10 Feb 2022 11:50:04 +0100
Subject: [PATCH 819/869] fix(cli): disable GPG signing in `omz pr test` to
 avoid key prompt (#10677)

---
 lib/cli.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/cli.zsh b/lib/cli.zsh
index e7f997013..c2fba8556 100644
--- a/lib/cli.zsh
+++ b/lib/cli.zsh
@@ -573,7 +573,7 @@ function _omz::pr::test {
 
     # Rebase pull request branch against the current master
     _omz::log info "rebasing PR #$1..."
-    command git rebase master ohmyzsh/pull-$1 || {
+    command git rebase --no-gpg-sign master ohmyzsh/pull-$1 || {
       command git rebase --abort &>/dev/null
       _omz::log warn "could not rebase PR #$1 on top of master."
       _omz::log warn "you might not see the latest stable changes."

From 1e615b71d636c3697d7e4aee8fbcd1dc01fd7da3 Mon Sep 17 00:00:00 2001
From: Zachary Cutlip <uid000@gmail.com>
Date: Thu, 10 Feb 2022 07:25:23 -0800
Subject: [PATCH 820/869] fix(virtualenvwrapper): only deactivate if virtual
 env is still present (#10671)

---
 plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh b/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh
index c30216f51..d359e0c21 100644
--- a/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh
+++ b/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh
@@ -56,7 +56,13 @@ if [[ ! $DISABLE_VENV_CD -eq 1 ]]; then
       if [[ -n $CD_VIRTUAL_ENV && "$ENV_NAME" != "$CD_VIRTUAL_ENV" ]]; then
         # We've just left the repo, deactivate the environment
         # Note: this only happens if the virtualenv was activated automatically
-        deactivate && unset CD_VIRTUAL_ENV
+        if [[ -n "$VIRTUAL_ENV" ]]; then
+          # Only deactivate if VIRTUAL_ENV was set
+          # User may have deactivated manually or via another mechanism
+          deactivate
+        fi
+        # clean up regardless
+        unset CD_VIRTUAL_ENV
       fi
       if [[ "$ENV_NAME" != "" ]]; then
         # Activate the environment only if it is not already active

From 6396dfb97f13f5fbb0ef98cd5221600b89ff889a Mon Sep 17 00:00:00 2001
From: Sam Cook <sam.lindenrathen@gmail.com>
Date: Thu, 10 Feb 2022 16:00:45 +0000
Subject: [PATCH 821/869] fix(kubectx): don't error on missing k8s context
 (#10675)

---
 plugins/kubectx/kubectx.plugin.zsh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/plugins/kubectx/kubectx.plugin.zsh b/plugins/kubectx/kubectx.plugin.zsh
index 1419f102f..6096feeae 100644
--- a/plugins/kubectx/kubectx.plugin.zsh
+++ b/plugins/kubectx/kubectx.plugin.zsh
@@ -3,7 +3,9 @@ typeset -g -A kubectx_mapping
 function kubectx_prompt_info() {
   (( $+commands[kubectl] )) || return
 
-  local current_ctx=$(kubectl config current-context)
+  local current_ctx=$(kubectl config current-context 2> /dev/null)
+
+  [[ -n "$current_ctx" ]] || return
 
   # use value in associative array if it exists
   # otherwise fall back to the context name

From 7b708519b9395914fb47b6c31132fb67fb8b721b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Thu, 10 Feb 2022 18:25:09 +0100
Subject: [PATCH 822/869] fix(emotty): show error on missing plugin
 dependencies (#9811)

---
 themes/emotty.zsh-theme | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/themes/emotty.zsh-theme b/themes/emotty.zsh-theme
index 044b317e8..ba0840950 100644
--- a/themes/emotty.zsh-theme
+++ b/themes/emotty.zsh-theme
@@ -46,6 +46,16 @@
 # is shown (see vcs_action_glyph variable, default: chevron).
 # ------------------------------------------------------------------------------
 
+(( ${+functions[emotty]} )) || {
+  echo "error: the emotty theme requires the emotty plugin" >&2
+  return 1
+}
+
+(( ${+emoji} )) || {
+  echo "error: the emotty theme requires the emoji plugin" >&2
+  return 1
+}
+
 user_prompt="$(emotty)"
 root_prompt="$emoji[skull]"
 warn_prompt="$emoji[collision_symbol]"

From dbd92a62ce1fc25a6819ae6d0a29dc8b8ec9a7dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Fri, 11 Feb 2022 10:01:48 +0100
Subject: [PATCH 823/869] fix(updater): do not swallow 1 character in check for
 user input

Co-authored-by: Philippe Troin <phil@fifi.org>
---
 tools/check_for_upgrade.sh | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/tools/check_for_upgrade.sh b/tools/check_for_upgrade.sh
index 4484df4fe..33f30c85a 100644
--- a/tools/check_for_upgrade.sh
+++ b/tools/check_for_upgrade.sh
@@ -89,6 +89,23 @@ function update_ohmyzsh() {
   fi
 }
 
+function has_typed_input() {
+  # Created by Philippe Troin <phil@fifi.org>
+  # https://zsh.org/mla/users/2022/msg00062.html
+  emulate -L zsh
+  zmodload zsh/zselect
+
+  {
+    local termios=$(stty --save)
+    stty -icanon
+
+    zselect -t 0 -r 0
+    return $?
+  } always {
+    stty $termios
+  }
+}
+
 () {
   emulate -L zsh
 
@@ -159,7 +176,7 @@ function update_ohmyzsh() {
   fi
 
   # If user has typed input, show reminder and exit
-  if read -t -k 1; then
+  if has_typed_input; then
     echo
     echo "[oh-my-zsh] It's time to update! You can do that by running \`omz update\`"
     return 0

From 69e29378915d53655d8fa8dc181b6cf526754569 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Fri, 11 Feb 2022 19:51:52 +0100
Subject: [PATCH 824/869] fix(updater): fix input check on non-interactive runs

Reference: https://www.zsh.org/mla/users/2022/msg00067.html
---
 tools/check_for_upgrade.sh | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/tools/check_for_upgrade.sh b/tools/check_for_upgrade.sh
index 33f30c85a..a36aecb84 100644
--- a/tools/check_for_upgrade.sh
+++ b/tools/check_for_upgrade.sh
@@ -95,13 +95,21 @@ function has_typed_input() {
   emulate -L zsh
   zmodload zsh/zselect
 
+  # Back up stty settings prior to disabling canonical mode
+  # Consider that no input can be typed if stty fails
+  # (this might happen if stdin is not a terminal)
+  local termios
+  termios=$(stty --save 2>/dev/null) || return 1
   {
-    local termios=$(stty --save)
+    # Disable canonical mode so that typed input counts
+    # regardless of whether Enter was pressed
     stty -icanon
 
+    # Poll stdin (fd 0) for data ready to be read
     zselect -t 0 -r 0
     return $?
   } always {
+    # Restore stty settings
     stty $termios
   }
 }

From 5fad26ca4fae7169f5bba8fa6718d58cb2c0bd20 Mon Sep 17 00:00:00 2001
From: Carlo Sala <carlosalag@protonmail.com>
Date: Fri, 11 Feb 2022 20:45:09 +0100
Subject: [PATCH 825/869] feat(ripgrep): update `rg` completion to v13.0.0
 (#10687)

Source: https://github.com/BurntSushi/ripgrep/blob/13.0.0/complete/_rg
---
 plugins/ripgrep/README.md | 4 ----
 plugins/ripgrep/_ripgrep  | 4 +++-
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/plugins/ripgrep/README.md b/plugins/ripgrep/README.md
index a26f45823..ab9d04116 100644
--- a/plugins/ripgrep/README.md
+++ b/plugins/ripgrep/README.md
@@ -7,7 +7,3 @@ To use it, add `ripgrep` to the plugins array in your zshrc file:
 ```zsh
 plugins=(... ripgrep)
 ```
-
-Completion is taken from the ripgrep release [`12.1.1`](https://github.com/BurntSushi/ripgrep/releases/tag/12.1.1).
-
-Updated on April 1st, 2021.
diff --git a/plugins/ripgrep/_ripgrep b/plugins/ripgrep/_ripgrep
index 828a6e601..31bc697c7 100644
--- a/plugins/ripgrep/_ripgrep
+++ b/plugins/ripgrep/_ripgrep
@@ -121,7 +121,7 @@ _rg() {
     "(pretty-vimgrep)--no-heading[don't show matches grouped by file name]"
 
     + '(hidden)' # Hidden-file options
-    '--hidden[search hidden files and directories]'
+    {-.,--hidden}'[search hidden files and directories]'
     $no"--no-hidden[don't search hidden files and directories]"
 
     + '(hybrid)' # hybrid regex options
@@ -303,6 +303,8 @@ _rg() {
     '--context-separator=[specify string used to separate non-continuous context lines in output]:separator'
     $no"--no-context-separator[don't print context separators]"
     '--debug[show debug messages]'
+    '--field-context-separator[set string to delimit fields in context lines]'
+    '--field-match-separator[set string to delimit fields in matching lines]'
     '--trace[show more verbose debug messages]'
     '--dfa-size-limit=[specify upper size limit of generated DFA]:DFA size (bytes)'
     "(1 stats)--files[show each file that would be searched (but don't search)]"

From 02b52a03a5a78362c57d75c507240f69d4260d9a Mon Sep 17 00:00:00 2001
From: Carlo Sala <carlosalag@protonmail.com>
Date: Fri, 11 Feb 2022 21:47:44 +0100
Subject: [PATCH 826/869] feat(fd): update `fd` completion to v8.3.2 (#10688)

Source: https://github.com/sharkdp/fd/blob/v8.3.2/contrib/completion/_fd
---
 plugins/fd/README.md | 4 ----
 plugins/fd/_fd       | 9 +++++++--
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/plugins/fd/README.md b/plugins/fd/README.md
index cf9f7815d..f3341612f 100644
--- a/plugins/fd/README.md
+++ b/plugins/fd/README.md
@@ -7,7 +7,3 @@ To use it, add `fd` to the plugins array in your zshrc file:
 ```zsh
 plugins=(... fd)
 ```
-
-Completion is taken from the fd release [`8.2.1`](https://github.com/sharkdp/fd/releases/tag/v8.2.1).
-
-Updated on April 1st, 2021.
diff --git a/plugins/fd/_fd b/plugins/fd/_fd
index f5d9e01d2..45b8ca477 100644
--- a/plugins/fd/_fd
+++ b/plugins/fd/_fd
@@ -1,4 +1,4 @@
-#compdef fd fdfind
+#compdef fd
 
 ##
 # zsh completion function for fd
@@ -57,6 +57,7 @@ _fd() {
     + no-ignore-partial # some ignore files
     "(no-ignore-full --no-ignore-vcs)--no-ignore-vcs[don't respect .gitignore files]"
     "!(no-ignore-full --no-global-ignore-file)--no-global-ignore-file[don't respect the global ignore file]"
+    $no'(no-ignore-full --no-ignore-parent)--no-ignore-parent[]'
 
     + '(case)' # case-sensitivity
     {-s,--case-sensitive}'[perform a case-sensitive search]'
@@ -138,6 +139,7 @@ _fd() {
     + '(exec-cmds)' # execute command
     '(long-listing max-results)'{-x+,--exec=}'[execute command for each search result]:command: _command_names -e:*\;::program arguments: _normal'
     '(long-listing max-results)'{-X+,--exec-batch=}'[execute command for all search results at once]:command: _command_names -e:*\;::program arguments: _normal'
+    '(long-listing max-results)--batch-size=[max number of args for each -X call]:size'
 
     + other
     '!(--max-buffer-time)--max-buffer-time=[set amount of time to buffer before showing output]:time (ms)'
@@ -153,6 +155,9 @@ _fd() {
     $no'(--base-directory)--base-directory=[change the current working directory to the given path]:directory:_files -/'
     $no'(*)*--search-path=[set search path (instead of positional <path> arguments)]:directory:_files -/'
 
+    + strip-cwd-prefix
+    $no'(strip-cwd-prefix exec-cmds)--strip-cwd-prefix[Strip ./ prefix when output is redirected]'
+
     + args # positional arguments
     '1: :_guard "^-*" pattern'
     '(--search-path)*:directory:_files -/'
@@ -220,7 +225,7 @@ _fd() {
 _fd "$@"
 
 # ------------------------------------------------------------------------------
-# Copyright (c) 2011 Github zsh-users - http://github.com/zsh-users
+# Copyright (c) 2011 GitHub zsh-users - http://github.com/zsh-users
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without

From ef3f7c43a91eb2c90098843b0ee9193bb52cdc96 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Sun, 13 Feb 2022 18:59:27 +0100
Subject: [PATCH 827/869] fix: apply workaround patch for vcs_info
 (CVE-2021-45444)

This lib function applies a patch to the VCS_INFO_formats function
in zsh versions from v5.0.3 until v5.8, which don't quote % chars
in some arguments received. Normally that just means that some
% characters in these strings (branch names, directories, etc.)
will be incorrectly parsed as formatting sequences.

With CVE-2021-45444, however, this means that one of these strings
from a malicious source (e.g. a malicious git repository) can
trigger command injection and run arbitrary code in the user's
machine when visiting such git repository.

Zsh 5.8.1 fixes this vulnerability [1], but older vcs_info setups
still need a workaround such as this one to patch the vulnerability.

[1] https://github.com/zsh-users/zsh/commit/c3ea1e5d52eff8b7b172fa8c1ccc3462b43b2790
---
 lib/vcs_info.zsh | 50 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 50 insertions(+)
 create mode 100644 lib/vcs_info.zsh

diff --git a/lib/vcs_info.zsh b/lib/vcs_info.zsh
new file mode 100644
index 000000000..01dcd90b6
--- /dev/null
+++ b/lib/vcs_info.zsh
@@ -0,0 +1,50 @@
+# Impacted versions go from v5.0.3 to v5.8 (v5.8.1 is the first patched version)
+autoload -Uz is-at-least
+if is-at-least 5.8.1 || ! is-at-least 5.0.3; then
+  return
+fi
+
+# Quote necessary $hook_com[<field>] items just before they are used
+# in the line "VCS_INFO_hook 'post-backend'" of the VCS_INFO_formats
+# function, where <field> is:
+#
+#   base:       the full path of the repository's root directory.
+#   base-name:  the name of the repository's root directory.
+#   branch:     the name of the currently checked out branch.
+#   misc:       a string that may contain anything the vcs_info backend wants.
+#   revision:   an identifier of the currently checked out revision.
+#   subdir:     the path of the current directory relative to the
+#               repository's root directory.
+#
+# This patch %-quotes these fields previous to their use in vcs_info hooks and
+# the zformat call and, eventually, when they get expanded in the prompt.
+# It's important to quote these here, and not later after hooks have modified the
+# fields, because then we could be quoting % characters from valid prompt sequences,
+# like %F{color}, %B, etc.
+#
+#  32   │ hook_com[subdir]="$(VCS_INFO_reposub ${hook_com[base]})"
+#  33   │ hook_com[subdir_orig]="${hook_com[subdir]}"
+#  34   │
+#  35 + │ for tmp in base base-name branch misc revision subdir; do
+#  36 + │     hook_com[$tmp]="${hook_com[$tmp]//\%/%%}"
+#  37 + │ done
+#  38 + │
+#  39   │ VCS_INFO_hook 'post-backend'
+#
+# This is especially important so that no command substitution is performed
+# due to malicious input as a consequence of CVE-2021-45444, which affects
+# zsh versions from 5.0.3 to 5.8.
+#
+autoload -Uz +X regexp-replace VCS_INFO_formats
+
+# We use $tmp here because it's already a local variable in VCS_INFO_formats
+typeset PATCH='for tmp (base base-name branch misc revision subdir) hook_com[$tmp]="${hook_com[$tmp]//\%/%%}"'
+# Unique string to avoid reapplying the patch if this code gets called twice
+typeset PATCH_ID=vcs_info-patch-9b9840f2-91e5-4471-af84-9e9a0dc68c1b
+# Only patch the VCS_INFO_formats function if not already patched
+if [[ "$functions[VCS_INFO_formats]" != *$PATCH_ID* ]]; then
+  regexp-replace 'functions[VCS_INFO_formats]' \
+    "VCS_INFO_hook 'post-backend'" \
+    ': ${PATCH_ID}; ${PATCH}; ${MATCH}'
+fi
+unset PATCH PATCH_ID

From 3427da4057dbe302933a7b5b19b4e23bfb9d0969 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Fri, 18 Feb 2022 19:41:21 +0100
Subject: [PATCH 828/869] fix(dotenv): actually exit when .env syntax is broken

---
 plugins/dotenv/dotenv.plugin.zsh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/plugins/dotenv/dotenv.plugin.zsh b/plugins/dotenv/dotenv.plugin.zsh
index 394455ae1..46cd4b10a 100644
--- a/plugins/dotenv/dotenv.plugin.zsh
+++ b/plugins/dotenv/dotenv.plugin.zsh
@@ -52,7 +52,10 @@ source_env() {
   fi
 
   # test .env syntax
-  zsh -fn $ZSH_DOTENV_FILE || echo "dotenv: error when sourcing '$ZSH_DOTENV_FILE' file" >&2
+  zsh -fn $ZSH_DOTENV_FILE || {
+    echo "dotenv: error when sourcing '$ZSH_DOTENV_FILE' file" >&2
+    return 1
+  }
 
   setopt localoptions allexport
   source $ZSH_DOTENV_FILE

From 07b829c894738e4ad594dc5f8d73401fbd83f203 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Mon, 21 Feb 2022 18:34:28 +0100
Subject: [PATCH 829/869] fix(vcs_info): quote % in relevant fields on all
 current Zsh releases

---
 lib/vcs_info.zsh | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/lib/vcs_info.zsh b/lib/vcs_info.zsh
index 01dcd90b6..edb515ce0 100644
--- a/lib/vcs_info.zsh
+++ b/lib/vcs_info.zsh
@@ -1,8 +1,11 @@
-# Impacted versions go from v5.0.3 to v5.8 (v5.8.1 is the first patched version)
-autoload -Uz is-at-least
-if is-at-least 5.8.1 || ! is-at-least 5.0.3; then
-  return
-fi
+# Don't skip this file until a Zsh release does the necessary quoting.
+# This is because even though 5.8.1 undid recursive prompt_subst inside
+# prompt sequences, % characters in relevant fields will still be rendered
+# incorrectly in vcs_info, on all Zsh releases up to writing this.
+#
+# There is no release yet that does this right, since it requires changing
+# how what vcs_info hooks expect to receive. Even so, I'd rather be correct
+# and break custom vcs_info hooks than have a broken prompt.
 
 # Quote necessary $hook_com[<field>] items just before they are used
 # in the line "VCS_INFO_hook 'post-backend'" of the VCS_INFO_formats

From ebfd7cb2191bdf02ebdc2df6c47697d3a9d195e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Mon, 21 Feb 2022 19:27:21 +0100
Subject: [PATCH 830/869] ci: cancel current runs on new trigger

---
 .github/workflows/main.yml    | 4 ++++
 .github/workflows/project.yml | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index cdadc1434..50e00f9c9 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -10,6 +10,10 @@ on:
     branches: 
       - master
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
+
 jobs:
   tests:
     name: Run tests
diff --git a/.github/workflows/project.yml b/.github/workflows/project.yml
index 800761554..4b671d449 100644
--- a/.github/workflows/project.yml
+++ b/.github/workflows/project.yml
@@ -5,6 +5,10 @@ on:
   pull_request_target:
     types: [opened, synchronize]
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
+
 jobs:
   add-to-project:
     name: Add to project

From b00b59364a019894ee4b9ba4062d922fedaa5ccd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Mon, 21 Feb 2022 20:28:40 +0100
Subject: [PATCH 831/869] fix(vcs_info): don't patch VCS_INFO_formats if not
 found

---
 lib/vcs_info.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/vcs_info.zsh b/lib/vcs_info.zsh
index edb515ce0..e60938c14 100644
--- a/lib/vcs_info.zsh
+++ b/lib/vcs_info.zsh
@@ -38,7 +38,7 @@
 # due to malicious input as a consequence of CVE-2021-45444, which affects
 # zsh versions from 5.0.3 to 5.8.
 #
-autoload -Uz +X regexp-replace VCS_INFO_formats
+autoload -Uz +X regexp-replace VCS_INFO_formats 2>/dev/null || return
 
 # We use $tmp here because it's already a local variable in VCS_INFO_formats
 typeset PATCH='for tmp (base base-name branch misc revision subdir) hook_com[$tmp]="${hook_com[$tmp]//\%/%%}"'

From 11a23144ad189b6befee2332383188dbffecee6c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Tue, 22 Feb 2022 11:18:43 +0100
Subject: [PATCH 832/869] feat(copypath): add plugin to copy file paths to
 clipboard (#7569)

Closes #7569
Closes #10714
---
 plugins/copypath/README.md           | 15 +++++++++++++++
 plugins/copypath/copypath.plugin.zsh | 15 +++++++++++++++
 2 files changed, 30 insertions(+)
 create mode 100644 plugins/copypath/README.md
 create mode 100644 plugins/copypath/copypath.plugin.zsh

diff --git a/plugins/copypath/README.md b/plugins/copypath/README.md
new file mode 100644
index 000000000..1e5a463a6
--- /dev/null
+++ b/plugins/copypath/README.md
@@ -0,0 +1,15 @@
+# copypath plugin
+
+Copies the path of given directory or file to the system clipboard.
+
+To use it, add `copypath` to the plugins array in your zshrc file:
+
+```zsh
+plugins=(... copypath)
+```
+
+## Usage
+
+- `copypath`: copies the absolute path of the current directory.
+
+- `copypath <file_or_directory>`: copies the absolute path of the given file.
diff --git a/plugins/copypath/copypath.plugin.zsh b/plugins/copypath/copypath.plugin.zsh
new file mode 100644
index 000000000..8fe0a85f4
--- /dev/null
+++ b/plugins/copypath/copypath.plugin.zsh
@@ -0,0 +1,15 @@
+# Copies the path of given directory or file to the system or X Windows clipboard.
+# Copy current directory if no parameter.
+function copypath {
+  # If no argument passed, use current directory
+  local file="${1:-.}"
+
+  # If argument is not an absolute path, prepend $PWD
+  [[ $file = /* ]] || file="$PWD/$file"
+
+  # Copy the absolute path without resolving symlinks
+  # If clipcopy fails, exit the function with an error
+  print -n "${file:a}" | clipcopy || return 1
+
+  echo ${(%):-"%B${file:a}%b copied to clipboard."}
+}

From 6f1036293cdc1af12dbe6390a061c147de1196ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Tue, 22 Feb 2022 11:23:14 +0100
Subject: [PATCH 833/869] refactor(copydir)!: deprecate plugin in favor of
 `copypath`

BREAKING CHANGE: the `copydir` plugin is deprecated. Instead of
using `copydir`, use `copypath` which also supports copying
the path of other files or directories specified.
---
 plugins/copydir/README.md          | 9 +--------
 plugins/copydir/copydir.plugin.zsh | 8 +++++---
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/plugins/copydir/README.md b/plugins/copydir/README.md
index 594bf1065..cf24b789f 100644
--- a/plugins/copydir/README.md
+++ b/plugins/copydir/README.md
@@ -1,10 +1,3 @@
 # copydir plugin
 
-Copies the path of your current folder to the system clipboard.
-
-To use, add `copydir` to your plugins array:
-```
-plugins=(... copydir)
-```
-
-Then use the command `copydir` to copy the $PWD.
+This plugin is deprecated. Use the [`copypath` plugin](https://github.com/ohmyzsh/ohmyzsh/tree/master/plugins/copypath) instead.
diff --git a/plugins/copydir/copydir.plugin.zsh b/plugins/copydir/copydir.plugin.zsh
index c45106240..a2b489ec0 100644
--- a/plugins/copydir/copydir.plugin.zsh
+++ b/plugins/copydir/copydir.plugin.zsh
@@ -1,5 +1,7 @@
-# Copies the pathname of the current directory to the system or X Windows clipboard
+echo ${(%):-'%F{yellow}The `%Bcopydir%b` plugin is deprecated. Use the `%Bcopypath%b` plugin instead.%f'}
+source "$ZSH/plugins/copypath/copypath.plugin.zsh"
+
+# TODO: 2022-02-22: Remove deprecated copydir function.
 function copydir {
-  emulate -L zsh
-  print -n $PWD | clipcopy
+  copypath
 }

From 9b883aa4171585995475d9ddff2ef59401199b36 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Mon, 21 Feb 2022 20:10:18 +0100
Subject: [PATCH 834/869] fix(installer): set `$HOME` if not defined (#10680)

Fixes #10680
---
 tools/install.sh | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/tools/install.sh b/tools/install.sh
index e64e39063..c80c09365 100755
--- a/tools/install.sh
+++ b/tools/install.sh
@@ -42,13 +42,17 @@ set -e
 # $USER is defined by login(1) which is not always executed (e.g. containers)
 # POSIX: https://pubs.opengroup.org/onlinepubs/009695299/utilities/id.html
 USER=${USER:-$(id -u -n)}
+# $HOME is defined at the time of login, but it could be unset. If it is unset,
+# a tilde by itself (~) will not be expanded to the current user's home directory.
+# POSIX: https://pubs.opengroup.org/onlinepubs/009696899/basedefs/xbd_chap08.html#tag_08_03
+HOME="${HOME:-$(getent passwd $USER | cut -d: -f6)}"
 
 
 # Track if $ZSH was provided
 custom_zsh=${ZSH:+yes}
 
 # Default settings
-ZSH=${ZSH:-~/.oh-my-zsh}
+ZSH="${ZSH:-$HOME/.oh-my-zsh}"
 REPO=${REPO:-ohmyzsh/ohmyzsh}
 REMOTE=${REMOTE:-https://github.com/${REPO}.git}
 BRANCH=${BRANCH:-master}

From 914b6399e88a16fdced427c2ae7738785dcb16b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Mon, 21 Feb 2022 20:18:58 +0100
Subject: [PATCH 835/869] fix(installer): silence `git init`

---
 tools/install.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/install.sh b/tools/install.sh
index c80c09365..7953ad112 100755
--- a/tools/install.sh
+++ b/tools/install.sh
@@ -272,7 +272,7 @@ setup_ohmyzsh() {
   fi
 
   # Manual clone with git config options to support git < v1.7.2
-  git init "$ZSH" && cd "$ZSH" \
+  git init --quiet "$ZSH" && cd "$ZSH" \
   && git config core.eol lf \
   && git config core.autocrlf false \
   && git config fsck.zeroPaddedFilemode ignore \

From ff298365626c4366eac930793918c6fbfb8c5d9a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Wed, 23 Feb 2022 18:44:31 +0100
Subject: [PATCH 836/869] fix(updater): timeout after 2s on available update
 check

---
 tools/check_for_upgrade.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tools/check_for_upgrade.sh b/tools/check_for_upgrade.sh
index a36aecb84..2ad1fca92 100644
--- a/tools/check_for_upgrade.sh
+++ b/tools/check_for_upgrade.sh
@@ -65,11 +65,11 @@ function is_update_available() {
   local remote_head
   remote_head=$(
     if (( ${+commands[curl]} )); then
-      curl -fsSL -H 'Accept: application/vnd.github.v3.sha' $api_url 2>/dev/null
+      curl -m 2 -fsSL -H 'Accept: application/vnd.github.v3.sha' $api_url 2>/dev/null
     elif (( ${+commands[wget]} )); then
-      wget -O- --header='Accept: application/vnd.github.v3.sha' $api_url 2>/dev/null
+      wget -T 2 -O- --header='Accept: application/vnd.github.v3.sha' $api_url 2>/dev/null
     elif (( ${+commands[fetch]} )); then
-      HTTP_ACCEPT='Accept: application/vnd.github.v3.sha' fetch -o - $api_url 2>/dev/null
+      HTTP_ACCEPT='Accept: application/vnd.github.v3.sha' fetch -T 2 -o - $api_url 2>/dev/null
     else
       exit 0
     fi

From 0b0af4df6aab075d257d4a0dcfd1bf42318fc69a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Wed, 23 Feb 2022 19:23:54 +0100
Subject: [PATCH 837/869] fix(updater): fix check for latest commit in local
 repository

The previous check simply compared whether the last commit of the branch
was the same in the local and the remote repository.

This commit also checks whether the remote commit is an ancestor of the
local commit. This fixes the case where the local repository has new
commits after the last published commit.
---
 tools/check_for_upgrade.sh | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/tools/check_for_upgrade.sh b/tools/check_for_upgrade.sh
index 2ad1fca92..76d42d388 100644
--- a/tools/check_for_upgrade.sh
+++ b/tools/check_for_upgrade.sh
@@ -75,8 +75,17 @@ function is_update_available() {
     fi
   ) || return 1
 
-  # Compare local and remote HEADs
-  [[ "$local_head" != "$remote_head" ]]
+  # Compare local and remote HEADs (if they're equal there are no updates)
+  [[ "$local_head" != "$remote_head" ]] || return 1
+
+  # If local and remote HEADs don't match, check if there's a common ancestor
+  # If the merge-base call fails, $remote_head might not be downloaded so assume there are updates
+  local base
+  base=$(cd -q "$ZSH"; git merge-base $local_head $remote_head 2>/dev/null) || return 0
+
+  # If the common ancestor ($base) is not $remote_head,
+  # the local HEAD is older than the remote HEAD
+  [[ $base != $remote_head ]]
 }
 
 function update_last_updated_file() {

From 201e9dea594ea0a477370ae8dba6d09f9ae79149 Mon Sep 17 00:00:00 2001
From: Carlo Sala <carlosalag@protonmail.com>
Date: Thu, 24 Feb 2022 13:52:52 +0100
Subject: [PATCH 838/869] fix(michelebologna): use `$HOST` variable instead of
 running `hostname` (#10724)

---
 themes/michelebologna.zsh-theme | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/themes/michelebologna.zsh-theme b/themes/michelebologna.zsh-theme
index 7ff6a7ffe..bb567b3d8 100644
--- a/themes/michelebologna.zsh-theme
+++ b/themes/michelebologna.zsh-theme
@@ -40,7 +40,7 @@ local username_root_color=$red
 local hostname_root_color=$red
 
 # calculating hostname color with hostname characters
-for i in `hostname`; local hostname_normal_color=$color_array[$[((#i))%7+1]]
+for i in $HOST; local hostname_normal_color=$color_array[$[((#i))%7+1]]
 local -a hostname_color
 hostname_color=%(!.$hostname_root_color.$hostname_normal_color)
 

From 28dc8c58ef14325d94feb7f34616839c7975e7d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Wed, 23 Feb 2022 19:55:33 +0100
Subject: [PATCH 839/869] refactor(michelebologna): simplify and clean up code

---
 themes/michelebologna.zsh-theme | 38 ++++++++++++++++++---------------
 1 file changed, 21 insertions(+), 17 deletions(-)

diff --git a/themes/michelebologna.zsh-theme b/themes/michelebologna.zsh-theme
index bb567b3d8..bb86d68db 100644
--- a/themes/michelebologna.zsh-theme
+++ b/themes/michelebologna.zsh-theme
@@ -35,23 +35,17 @@ local reset="%{$reset_color%}"
 local -a color_array
 color_array=($green $red $cyan $yellow $blue $magenta $white)
 
-local username_normal_color=$white
-local username_root_color=$red
-local hostname_root_color=$red
-
-# calculating hostname color with hostname characters
-for i in $HOST; local hostname_normal_color=$color_array[$[((#i))%7+1]]
-local -a hostname_color
-hostname_color=%(!.$hostname_root_color.$hostname_normal_color)
-
+local username_color=$white
+local hostname_color=$color_array[$[((#HOST))%7+1]] # choose hostname color based on first character
 local current_dir_color=$blue
-local username_command="%n"
-local hostname_command="%m"
+
+local username="%n"
+local hostname="%m"
 local current_dir="%~"
 
-local username_output="%(!..$username_normal_color$username_command$reset@)"
-local hostname_output="$hostname_color$hostname_command$reset"
-local current_dir_output="$current_dir_color$current_dir$reset"
+local username_output="%(!..${username_color}${username}${reset}@)"
+local hostname_output="${hostname_color}${hostname}${reset}"
+local current_dir_output="${current_dir_color}${current_dir}${reset}"
 local jobs_bg="${red}fg: %j$reset"
 local last_command_output="%(?.%(!.$red.$green).$yellow)"
 
@@ -68,8 +62,18 @@ ZSH_THEME_GIT_PROMPT_AHEAD_REMOTE=">"
 ZSH_THEME_GIT_PROMPT_BEHIND_REMOTE="<"
 ZSH_THEME_GIT_PROMPT_DIVERGED_REMOTE="$red<>"
 
-PROMPT='$username_output$hostname_output:$current_dir_output%1(j. [$jobs_bg].)'
-GIT_PROMPT='$(out=$(git_prompt_info)$(git_prompt_status)$(git_remote_status);if [[ -n $out ]]; then printf %s " $white($green$out$white)$reset";fi)'
-PROMPT+="$GIT_PROMPT"
+function michelebologna_git_prompt {
+  local out=$(git_prompt_info)$(git_prompt_status)$(git_remote_status)
+  [[ -n $out ]] || return
+  printf " %s(%s%s%s)%s" \
+    "%{$fg_bold[white]%}" \
+    "%{$fg_bold[green]%}" \
+    "$out" \
+    "%{$fg_bold[white]%}" \
+    "%{$reset_color%}"
+}
+
+PROMPT="$username_output$hostname_output:$current_dir_output%1(j. [$jobs_bg].)"
+PROMPT+='$(michelebologna_git_prompt)'
 PROMPT+=" $last_command_output%#$reset "
 RPROMPT=''

From 97e6989729efce1f091d02e0274392ed547b9bb4 Mon Sep 17 00:00:00 2001
From: Carlo Sala <carlosalag@protonmail.com>
Date: Thu, 24 Feb 2022 19:23:15 +0100
Subject: [PATCH 840/869] fix(helm): support completion for snap installs
 (#10723)

---
 plugins/helm/helm.plugin.zsh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/helm/helm.plugin.zsh b/plugins/helm/helm.plugin.zsh
index cadfa551a..05bb19a44 100644
--- a/plugins/helm/helm.plugin.zsh
+++ b/plugins/helm/helm.plugin.zsh
@@ -14,9 +14,9 @@ command mkdir -p "$ZSH_CACHE_DIR/completions"
 # If the completion file does not exist, generate it and then source it
 # Otherwise, source it and regenerate in the background
 if [[ ! -f "$ZSH_CACHE_DIR/completions/_helm" ]]; then
-  helm completion zsh >| "$ZSH_CACHE_DIR/completions/_helm"
+  helm completion zsh | tee "$ZSH_CACHE_DIR/completions/_helm" >/dev/null
   source "$ZSH_CACHE_DIR/completions/_helm"
 else
   source "$ZSH_CACHE_DIR/completions/_helm"
-  helm completion zsh >| "$ZSH_CACHE_DIR/completions/_helm" &|
+  helm completion zsh | tee "$ZSH_CACHE_DIR/completions/_helm" >/dev/null &|
 fi

From e9348575371aa8ec8811356d997942559c026d07 Mon Sep 17 00:00:00 2001
From: Carlo Sala <carlosalag@protonmail.com>
Date: Thu, 24 Feb 2022 19:23:41 +0100
Subject: [PATCH 841/869] fix(kubectl): support completion for snap installs
 (#10727)

---
 plugins/kubectl/kubectl.plugin.zsh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/kubectl/kubectl.plugin.zsh b/plugins/kubectl/kubectl.plugin.zsh
index eed5727d1..89efeaca5 100644
--- a/plugins/kubectl/kubectl.plugin.zsh
+++ b/plugins/kubectl/kubectl.plugin.zsh
@@ -11,11 +11,11 @@ if (( $+commands[kubectl] )); then
   # If the completion file does not exist, generate it and then source it
   # Otherwise, source it and regenerate in the background
   if [[ ! -f "$ZSH_CACHE_DIR/completions/_kubectl" ]]; then
-    kubectl completion zsh >| "$ZSH_CACHE_DIR/completions/_kubectl"
+    kubectl completion zsh | tee "$ZSH_CACHE_DIR/completions/_kubectl" >/dev/null
     source "$ZSH_CACHE_DIR/completions/_kubectl"
   else
     source "$ZSH_CACHE_DIR/completions/_kubectl"
-    kubectl completion zsh >| "$ZSH_CACHE_DIR/completions/_kubectl" &|
+    kubectl completion zsh | tee "$ZSH_CACHE_DIR/completions/_kubectl" >/dev/null &|
   fi
 fi
 

From 99460351eb8d8d9d5ea2e44b66e1b9ceaaa4a368 Mon Sep 17 00:00:00 2001
From: "Markus (Vock) Arians" <mvock@users.noreply.github.com>
Date: Fri, 25 Feb 2022 13:29:22 +0100
Subject: [PATCH 842/869] feat(lib): support auto title in foot terminal
 (#10735)

Co-authored-by: Markus Arians <markus.arians@andrena.de>
---
 lib/termsupport.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/termsupport.zsh b/lib/termsupport.zsh
index 4035d10a1..80ca7ef78 100644
--- a/lib/termsupport.zsh
+++ b/lib/termsupport.zsh
@@ -17,7 +17,7 @@ function title {
   : ${2=$1}
 
   case "$TERM" in
-    cygwin|xterm*|putty*|rxvt*|konsole*|ansi|mlterm*|alacritty|st*)
+    cygwin|xterm*|putty*|rxvt*|konsole*|ansi|mlterm*|alacritty|st*|foot)
       print -Pn "\e]2;${2:q}\a" # set window name
       print -Pn "\e]1;${1:q}\a" # set tab name
       ;;

From c81804825c03e563ab748aae84c3f63458961208 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Fri, 25 Feb 2022 14:06:19 +0100
Subject: [PATCH 843/869] fix(installer): fix removal of OMZ directory on
 failure

When the `git init` call fails, the directory is not created,
so the rm command fails with a not found error. This change
checks whether the directory exists before deleting it.
---
 tools/install.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/install.sh b/tools/install.sh
index 7953ad112..93608eb7c 100755
--- a/tools/install.sh
+++ b/tools/install.sh
@@ -283,7 +283,7 @@ setup_ohmyzsh() {
   && git remote add origin "$REMOTE" \
   && git fetch --depth=1 origin \
   && git checkout -b "$BRANCH" "origin/$BRANCH" || {
-    rm -rf "$ZSH"
+    [ ! -d "$ZSH" ] || rm -rf "$ZSH" 2>/dev/null
     fmt_error "git clone of oh-my-zsh repo failed"
     exit 1
   }

From 511ed65408231d04ed266066bba777d48ebec795 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Mon, 28 Feb 2022 10:03:02 +0100
Subject: [PATCH 844/869] fix(aws): allow empty prefix and suffix in prompt
 function (#10744)

Fixes #10744
---
 plugins/aws/aws.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/aws/aws.plugin.zsh b/plugins/aws/aws.plugin.zsh
index 920a7139d..b8625d7ac 100644
--- a/plugins/aws/aws.plugin.zsh
+++ b/plugins/aws/aws.plugin.zsh
@@ -158,7 +158,7 @@ compctl -K _aws_profiles asp acp aws_change_access_key
 # AWS prompt
 function aws_prompt_info() {
   [[ -n "$AWS_PROFILE" ]] || return
-  echo "${ZSH_THEME_AWS_PREFIX:=<aws:}${AWS_PROFILE:gs/%/%%}${ZSH_THEME_AWS_SUFFIX:=>}"
+  echo "${ZSH_THEME_AWS_PREFIX=<aws:}${AWS_PROFILE:gs/%/%%}${ZSH_THEME_AWS_SUFFIX=>}"
 }
 
 if [[ "$SHOW_AWS_PROMPT" != false && "$RPROMPT" != *'$(aws_prompt_info)'* ]]; then

From eaa60244210ffddb99451910e569790e3630bf89 Mon Sep 17 00:00:00 2001
From: "JM\" (Jason Meridth)" <jmeridth@gmail.com>
Date: Wed, 2 Mar 2022 13:47:55 -0600
Subject: [PATCH 845/869] feat(autoenv): add path for Apple Silicon Homebrew
 (#10749)

---
 plugins/autoenv/autoenv.plugin.zsh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/autoenv/autoenv.plugin.zsh b/plugins/autoenv/autoenv.plugin.zsh
index bd03cf4b2..229a8a834 100644
--- a/plugins/autoenv/autoenv.plugin.zsh
+++ b/plugins/autoenv/autoenv.plugin.zsh
@@ -13,6 +13,7 @@ if ! type autoenv_init >/dev/null; then
       ~/.autoenv
       ~/.local/bin
       /usr/local/opt/autoenv
+      /opt/homebrew/opt/autoenv
       /usr/local/bin
       /usr/share/autoenv-git
       ~/Library/Python/bin

From 04b1b75b9da2d0295c40e12e01ed222a4f00ec39 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Thu, 3 Mar 2022 17:48:31 +0100
Subject: [PATCH 846/869] style: remove VCS_INFO svn settings from themes that
 don't enable it

---
 themes/jnrowe.zsh-theme    | 1 -
 themes/linuxonly.zsh-theme | 1 -
 themes/trapd00r.zsh-theme  | 1 -
 3 files changed, 3 deletions(-)

diff --git a/themes/jnrowe.zsh-theme b/themes/jnrowe.zsh-theme
index 9d8fb2488..5a5ab349f 100644
--- a/themes/jnrowe.zsh-theme
+++ b/themes/jnrowe.zsh-theme
@@ -4,7 +4,6 @@ autoload -Uz vcs_info
 zstyle ':vcs_info:*' actionformats \
        '%F{5}(%f%s%F{5})%F{3}-%F{5}[%F{2}%b%F{3}|%F{1}%a%F{5}]%f '
 zstyle ':vcs_info:*' formats '%F{2}%s%F{7}:%F{2}(%F{1}%b%F{2})%f '
-zstyle ':vcs_info:(sv[nk]|bzr):*' branchformat '%b%F{1}:%F{3}%r'
 zstyle ':vcs_info:*' enable git
 
 add-zsh-hook precmd prompt_vcs
diff --git a/themes/linuxonly.zsh-theme b/themes/linuxonly.zsh-theme
index 2afae8fc3..98572b904 100644
--- a/themes/linuxonly.zsh-theme
+++ b/themes/linuxonly.zsh-theme
@@ -28,7 +28,6 @@ zstyle ':vcs_info:*' actionformats \
     '%{$c8%}(%f%s)%{$c7%}-%F{5}[%F{2}%b%F{3}|%F{1}%a%F{5}]%f '
 zstyle ':vcs_info:*' formats \
     "%{$c8%}%s%{$c7%}:%{$c7%}(%{$c9%}%b%{$c7%})%f "
-zstyle ':vcs_info:(sv[nk]|bzr):*' branchformat '%b%F{1}:%F{3}%r'
 zstyle ':vcs_info:*' enable git
 
 add-zsh-hook precmd prompt_jnrowe_precmd
diff --git a/themes/trapd00r.zsh-theme b/themes/trapd00r.zsh-theme
index 849daf30b..260c9e701 100644
--- a/themes/trapd00r.zsh-theme
+++ b/themes/trapd00r.zsh-theme
@@ -102,7 +102,6 @@ zstyle ':vcs_info:*' actionformats \
 zstyle ':vcs_info:*' formats \
     "%{$c8%}%s%%{$c7%}❨ %{$c9%}%{$c11%}%b%{$c7%} ❩%{$reset_color%}%f "
 
-zstyle ':vcs_info:(sv[nk]|bzr):*' branchformat '%b%F{1}:%F{3}%r'
 zstyle ':vcs_info:*' enable git
 
 add-zsh-hook precmd prompt_jnrowe_precmd

From 46195d3aa7b21c2477e3ddacd57ac82856b3be76 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Thu, 3 Mar 2022 17:53:03 +0100
Subject: [PATCH 847/869] fix: fix svn branch output in themes: apple, gentoo,
 kolo, zhann (#10751)

Fixes #10751
---
 themes/apple.zsh-theme  | 18 +++++++-----------
 themes/gentoo.zsh-theme |  4 +++-
 themes/kolo.zsh-theme   | 18 ++++++++++--------
 themes/zhann.zsh-theme  | 18 ++++++++++--------
 4 files changed, 30 insertions(+), 28 deletions(-)

diff --git a/themes/apple.zsh-theme b/themes/apple.zsh-theme
index 95e6249fa..0c183258e 100644
--- a/themes/apple.zsh-theme
+++ b/themes/apple.zsh-theme
@@ -2,27 +2,23 @@ function toon {
   echo -n ""
 }
 
-get_git_dirty() {
-  git diff --quiet || echo '*'
-}
-
 autoload -Uz vcs_info
 zstyle ':vcs_info:*' check-for-changes true
 zstyle ':vcs_info:*' unstagedstr '%F{red}*'   # display this when there are unstaged changes
 zstyle ':vcs_info:*' stagedstr '%F{yellow}+'  # display this when there are staged changes
-zstyle ':vcs_info:*' actionformats \
-    '%F{5}%F{5}[%F{2}%b%F{3}|%F{1}%a%c%u%F{5}]%f '
-zstyle ':vcs_info:*' formats       \
-    '%F{5}%F{5}[%F{2}%b%c%u%F{5}]%f '
-zstyle ':vcs_info:(sv[nk]|bzr):*' branchformat '%b%F{1}:%F{3}%r'
+zstyle ':vcs_info:*' actionformats '%F{5}[%F{2}%b%F{3}|%F{1}%a%c%u%F{5}]%f '
+zstyle ':vcs_info:*' formats '%F{5}[%F{2}%b%c%u%F{5}]%f '
+zstyle ':vcs_info:svn:*' branchformat '%b'
+zstyle ':vcs_info:svn:*' actionformats '%F{5}[%F{2}%b%F{1}:%F{3}%i%F{3}|%F{1}%a%c%u%F{5}]%f '
+zstyle ':vcs_info:svn:*' formats '%F{5}[%F{2}%b%F{1}:%F{3}%i%c%u%F{5}]%f '
 zstyle ':vcs_info:*' enable git cvs svn
 
 theme_precmd () {
-    vcs_info
+  vcs_info
 }
 
 setopt prompt_subst
 PROMPT='%{$fg[magenta]%}$(toon)%{$reset_color%} %~/ %{$reset_color%}${vcs_info_msg_0_}%{$reset_color%}'
 
 autoload -U add-zsh-hook
-add-zsh-hook precmd theme_precmd
\ No newline at end of file
+add-zsh-hook precmd theme_precmd
diff --git a/themes/gentoo.zsh-theme b/themes/gentoo.zsh-theme
index 7ac461036..b1aef21df 100644
--- a/themes/gentoo.zsh-theme
+++ b/themes/gentoo.zsh-theme
@@ -6,7 +6,9 @@ zstyle ':vcs_info:*' unstagedstr '%F{red}*'   # display this when there are unst
 zstyle ':vcs_info:*' stagedstr '%F{yellow}+'  # display this when there are staged changes
 zstyle ':vcs_info:*' actionformats '%F{5}(%F{2}%b%F{3}|%F{1}%a%c%u%m%F{5})%f '
 zstyle ':vcs_info:*' formats '%F{5}(%F{2}%b%c%u%m%F{5})%f '
-zstyle ':vcs_info:(sv[nk]|bzr):*' branchformat '%b%F{1}:%F{3}%r'
+zstyle ':vcs_info:svn:*' branchformat '%b'
+zstyle ':vcs_info:svn:*' actionformats '%F{5}(%F{2}%b%F{1}:%{3}%i%F{3}|%F{1}%a%c%u%m%F{5})%f '
+zstyle ':vcs_info:svn:*' formats '%F{5}(%F{2}%b%F{1}:%F{3}%i%c%u%m%F{5})%f '
 zstyle ':vcs_info:*' enable git cvs svn
 zstyle ':vcs_info:git*+set-message:*' hooks untracked-git
 
diff --git a/themes/kolo.zsh-theme b/themes/kolo.zsh-theme
index 51b0af724..e07be75c4 100644
--- a/themes/kolo.zsh-theme
+++ b/themes/kolo.zsh-theme
@@ -3,16 +3,18 @@ autoload -Uz vcs_info
 zstyle ':vcs_info:*' stagedstr '%F{green}●'
 zstyle ':vcs_info:*' unstagedstr '%F{yellow}●'
 zstyle ':vcs_info:*' check-for-changes true
-zstyle ':vcs_info:(sv[nk]|bzr):*' branchformat '%b%F{1}:%F{11}%r'
+zstyle ':vcs_info:svn:*' branchformat '%b'
+zstyle ':vcs_info:svn:*' formats ' [%b%F{1}:%F{11}%i%c%u%B%F{green}]'
 zstyle ':vcs_info:*' enable git svn
-theme_precmd () {
-    if [[ -z $(git ls-files --other --exclude-standard 2> /dev/null) ]] {
-        zstyle ':vcs_info:*' formats ' [%b%c%u%B%F{green}]'
-    } else {
-        zstyle ':vcs_info:*' formats ' [%b%c%u%B%F{red}●%F{green}]'
-    }
 
-    vcs_info
+theme_precmd () {
+  if [[ -z $(git ls-files --other --exclude-standard 2> /dev/null) ]]; then
+    zstyle ':vcs_info:git:*' formats ' [%b%c%u%B%F{green}]'
+  else
+    zstyle ':vcs_info:git:*' formats ' [%b%c%u%B%F{red}●%F{green}]'
+  fi
+
+  vcs_info
 }
 
 setopt prompt_subst
diff --git a/themes/zhann.zsh-theme b/themes/zhann.zsh-theme
index 27597ec6c..a00650ac8 100644
--- a/themes/zhann.zsh-theme
+++ b/themes/zhann.zsh-theme
@@ -3,16 +3,18 @@ autoload -Uz vcs_info
 zstyle ':vcs_info:*' stagedstr '%F{green}●'
 zstyle ':vcs_info:*' unstagedstr '%F{yellow}●'
 zstyle ':vcs_info:*' check-for-changes true
-zstyle ':vcs_info:(sv[nk]|bzr):*' branchformat '%b%F{1}:%F{11}%r'
+zstyle ':vcs_info:svn:*' branchformat '%b'
+zstyle ':vcs_info:svn:*' formats ' [%b%F{1}:%F{11}%i%c%u%B%F{green}]'
 zstyle ':vcs_info:*' enable git svn
-theme_precmd () {
-    if [[ -z $(git ls-files --other --exclude-standard 2> /dev/null) ]] {
-        zstyle ':vcs_info:*' formats ' [%b%c%u%B%F{green}]'
-    } else {
-        zstyle ':vcs_info:*' formats ' [%b%c%u%B%F{red}●%F{green}]'
-    }
 
-    vcs_info
+theme_precmd () {
+  if [[ -z $(git ls-files --other --exclude-standard 2> /dev/null) ]]; then
+    zstyle ':vcs_info:git:*' formats ' [%b%c%u%B%F{green}]'
+  else
+    zstyle ':vcs_info:git:*' formats ' [%b%c%u%B%F{red}●%F{green}]'
+  fi
+
+  vcs_info
 }
 
 setopt prompt_subst

From af0c3b64b8c7eb6afcdabc8db89241ff72bcc66a Mon Sep 17 00:00:00 2001
From: SBado <16034687+SBado@users.noreply.github.com>
Date: Fri, 4 Mar 2022 15:54:51 +0000
Subject: [PATCH 848/869] fix(updater): prefix `cd` with `builtin` when it is
 aliased (#10753)

---
 tools/check_for_upgrade.sh | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/tools/check_for_upgrade.sh b/tools/check_for_upgrade.sh
index 76d42d388..d3ad7582c 100644
--- a/tools/check_for_upgrade.sh
+++ b/tools/check_for_upgrade.sh
@@ -36,11 +36,11 @@ function current_epoch() {
 
 function is_update_available() {
   local branch
-  branch=${"$(cd -q "$ZSH"; git config --local oh-my-zsh.branch)":-master}
+  branch=${"$(builtin cd -q "$ZSH"; git config --local oh-my-zsh.branch)":-master}
 
   local remote remote_url remote_repo
-  remote=${"$(cd -q "$ZSH"; git config --local oh-my-zsh.remote)":-origin}
-  remote_url=$(cd -q "$ZSH"; git config remote.$remote.url)
+  remote=${"$(builtin cd -q "$ZSH"; git config --local oh-my-zsh.remote)":-origin}
+  remote_url=$(builtin cd -q "$ZSH"; git config remote.$remote.url)
 
   local repo
   case "$remote_url" in
@@ -58,7 +58,7 @@ function is_update_available() {
 
   # Get local HEAD. If this fails assume there are updates
   local local_head
-  local_head=$(cd -q "$ZSH"; git rev-parse $branch 2>/dev/null) || return 0
+  local_head=$(builtin cd -q "$ZSH"; git rev-parse $branch 2>/dev/null) || return 0
 
   # Get remote HEAD. If no suitable command is found assume there are updates
   # On any other error, skip the update (connection may be down)
@@ -81,7 +81,7 @@ function is_update_available() {
   # If local and remote HEADs don't match, check if there's a common ancestor
   # If the merge-base call fails, $remote_head might not be downloaded so assume there are updates
   local base
-  base=$(cd -q "$ZSH"; git merge-base $local_head $remote_head 2>/dev/null) || return 0
+  base=$(builtin cd -q "$ZSH"; git merge-base $local_head $remote_head 2>/dev/null) || return 0
 
   # If the common ancestor ($base) is not $remote_head,
   # the local HEAD is older than the remote HEAD
@@ -170,7 +170,7 @@ function has_typed_input() {
   fi
 
   # Test if Oh My Zsh directory is a git repository
-  if ! (cd -q "$ZSH" && LANG= git rev-parse &>/dev/null); then
+  if ! (builtin cd -q "$ZSH" && LANG= git rev-parse &>/dev/null); then
     echo >&2 "[oh-my-zsh] Can't update: not a git repository."
     return
   fi

From f96a900ea3f33868310749aaf4e5a68b3118e621 Mon Sep 17 00:00:00 2001
From: Carlo Sala <carlosalag@protonmail.com>
Date: Sat, 5 Mar 2022 19:18:56 +0100
Subject: [PATCH 849/869] feat(fzf)!: default to using `fd` before `rg`
 (#10757)

BREAKING CHANGE: if both `fd` and `rg` are installed, default to using `fd`. This
is the recommendation of the ripgrep author, and it's been found to be faster.
If you want to force using `rg`, set the `FZF_DEFAULT_COMMAND` variable.
---
 plugins/fzf/README.md      | 2 +-
 plugins/fzf/fzf.plugin.zsh | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/plugins/fzf/README.md b/plugins/fzf/README.md
index 15d4d31f3..beedf4690 100644
--- a/plugins/fzf/README.md
+++ b/plugins/fzf/README.md
@@ -31,8 +31,8 @@ export FZF_DEFAULT_COMMAND='<your fzf default command>'
 
 If not set, the plugin will try to set it to these, in the order in which they're found:
 
-- [`rg`](https://github.com/BurntSushi/ripgrep)
 - [`fd`](https://github.com/sharkdp/fd)
+- [`rg`](https://github.com/BurntSushi/ripgrep)
 - [`ag`](https://github.com/ggreer/the_silver_searcher)
 
 ### `DISABLE_FZF_AUTO_COMPLETION`
diff --git a/plugins/fzf/fzf.plugin.zsh b/plugins/fzf/fzf.plugin.zsh
index 102605958..b86af0d2d 100644
--- a/plugins/fzf/fzf.plugin.zsh
+++ b/plugins/fzf/fzf.plugin.zsh
@@ -191,10 +191,10 @@ fzf_setup_using_openbsd \
 unset -f -m 'fzf_setup_*'
 
 if [[ -z "$FZF_DEFAULT_COMMAND" ]]; then
-  if (( $+commands[rg] )); then
-    export FZF_DEFAULT_COMMAND='rg --files --hidden --glob "!.git/*"'
-  elif (( $+commands[fd] )); then
+  if (( $+commands[fd] )); then
     export FZF_DEFAULT_COMMAND='fd --type f --hidden --exclude .git'
+  elif (( $+commands[rg] )); then
+    export FZF_DEFAULT_COMMAND='rg --files --hidden --glob "!.git/*"'
   elif (( $+commands[ag] )); then
     export FZF_DEFAULT_COMMAND='ag -l --hidden -g "" --ignore .git'
   fi

From 3343891ea6e8fd84632fabc6bc11a43f8b024e9e Mon Sep 17 00:00:00 2001
From: Vitul Rana <vitulrana@gmail.com>
Date: Mon, 7 Mar 2022 15:08:56 +0530
Subject: [PATCH 850/869] feat(kubectl): add aliases for job management (#9992)

---
 plugins/kubectl/README.md          | 5 +++++
 plugins/kubectl/kubectl.plugin.zsh | 6 ++++++
 2 files changed, 11 insertions(+)

diff --git a/plugins/kubectl/README.md b/plugins/kubectl/README.md
index f6651c8cd..f77788482 100644
--- a/plugins/kubectl/README.md
+++ b/plugins/kubectl/README.md
@@ -120,6 +120,11 @@ plugins=(... kubectl)
 | kecj    | `kubectl edit cronjob`              | Edit CronJob from the default editor                                                             |
 | kdcj    | `kubectl describe cronjob`          | Describe a CronJob in details                                                                    |
 | kdelcj  | `kubectl delete cronjob`            | Delete the CronJob                                                                               |
+|         |                                     | **Job management**                                                                               |
+| kgj     | `kubectl get job`                   | List all Job in ps output format                                                                 |
+| kej     | `kubectl edit job`                  | Edit a Job in details                                                                            |
+| kdj     | `kubectl describe job`              | Describe the Job                                                                                 |
+| kdelj   | `kubectl delete job`                | Delete the Job                                                                                   |
 
 ## Wrappers
 
diff --git a/plugins/kubectl/kubectl.plugin.zsh b/plugins/kubectl/kubectl.plugin.zsh
index 89efeaca5..3e87c2395 100644
--- a/plugins/kubectl/kubectl.plugin.zsh
+++ b/plugins/kubectl/kubectl.plugin.zsh
@@ -178,6 +178,12 @@ alias kecj='kubectl edit cronjob'
 alias kdcj='kubectl describe cronjob'
 alias kdelcj='kubectl delete cronjob'
 
+# Job management.
+alias kgj='kubectl get job'
+alias kej='kubectl edit job'
+alias kdj='kubectl describe job'
+alias kdelj='kubectl delete job'
+
 # Only run if the user actually has kubectl installed
 if (( ${+_comps[kubectl]} )); then
   function kj() { kubectl "$@" -o json | jq; }

From d4c939d61ebd204599240a60d7473bbc241fb5b7 Mon Sep 17 00:00:00 2001
From: Eric Semeniuc <3838856+esemeniuc@users.noreply.github.com>
Date: Mon, 7 Mar 2022 01:43:05 -0800
Subject: [PATCH 851/869] feat(kubectl): add aliases for replicasets (#10100)

---
 plugins/kubectl/README.md          | 8 +++++---
 plugins/kubectl/kubectl.plugin.zsh | 4 +++-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/plugins/kubectl/README.md b/plugins/kubectl/README.md
index f77788482..579a90b3b 100644
--- a/plugins/kubectl/README.md
+++ b/plugins/kubectl/README.md
@@ -22,7 +22,7 @@ plugins=(... kubectl)
 | kcsc    | `kubectl config set-context`        | Set a context entry in kubeconfig                                                                |
 | kcdc    | `kubectl config delete-context`     | Delete the specified context from the kubeconfig                                                 |
 | kccc    | `kubectl config current-context`    | Display the current-context                                                                      |
-| kcgc    | `kubectl config get-contexts`       | List of contexts available
+| kcgc    | `kubectl config get-contexts`       | List of contexts available                                                                       |
 |         |                                     | **General aliases**                                                                              |
 | kdel    | `kubectl delete`                    | Delete resources by filenames, stdin, resources and names, or by resources and label selector    |
 | kdelf   | `kubectl delete -f`                 | Delete a pod using the type and name specified in -f argument                                    |
@@ -71,9 +71,11 @@ plugins=(... kubectl)
 | kdeld   | `kubectl delete deployment`         | Delete the deployment                                                                            |
 | ksd     | `kubectl scale deployment`          | Scale a deployment                                                                               |
 | krsd    | `kubectl rollout status deployment` | Check the rollout status of a deployment                                                         |
-| kres    | `kubectl set env $@ REFRESHED_AT=...` | Recreate all pods in deployment with zero-downtime                                                         |
+| kres    | `kubectl set env $@ REFRESHED_AT=...` | Recreate all pods in deployment with zero-downtime                                             |
 |         |                                     | **Rollout management**                                                                           |
-| kgrs    | `kubectl get rs`                    | To see the ReplicaSet `rs` created by the deployment                                             |
+| kgrs    | `kubectl get replicaset`            | List all ReplicaSets `rs` created by the deployment                                              |
+| kdrs    | `kubectl describe replicaset`       | Describe ReplicaSet in detail                                                                    |
+| kers    | `kubectl edit replicaset`           | Edit ReplicaSet from the default editor                                                          |
 | krh     | `kubectl rollout history`           | Check the revisions of this deployment                                                           |
 | kru     | `kubectl rollout undo`              | Rollback to the previous revision                                                                |
 |         |                                     | **Port forwarding**                                                                              |
diff --git a/plugins/kubectl/kubectl.plugin.zsh b/plugins/kubectl/kubectl.plugin.zsh
index 3e87c2395..0ee252ac3 100644
--- a/plugins/kubectl/kubectl.plugin.zsh
+++ b/plugins/kubectl/kubectl.plugin.zsh
@@ -112,7 +112,9 @@ function kres(){
 }
 
 # Rollout management.
-alias kgrs='kubectl get rs'
+alias kgrs='kubectl get replicaset'
+alias kdrs='kubectl describe replicaset'
+alias kers='kubectl edit replicaset'
 alias krh='kubectl rollout history'
 alias kru='kubectl rollout undo'
 

From 93b348b172506be46000f3be1cebda76d4c71999 Mon Sep 17 00:00:00 2001
From: Ivan <c.ivan.felix.r@gmail.com>
Date: Mon, 7 Mar 2022 03:58:18 -0600
Subject: [PATCH 852/869] feat(rvm): add `rb31` shortcut to use ruby 3.1
 (#10745)

---
 plugins/rvm/README.md      | 1 +
 plugins/rvm/rvm.plugin.zsh | 1 +
 2 files changed, 2 insertions(+)

diff --git a/plugins/rvm/README.md b/plugins/rvm/README.md
index 258c89420..576b037b0 100644
--- a/plugins/rvm/README.md
+++ b/plugins/rvm/README.md
@@ -23,6 +23,7 @@ plugins=(... rvm)
 | `rb26`       | `rvm use ruby-2.6`   |
 | `rb27`       | `rvm use ruby-2.7`   |
 | `rb30`       | `rvm use ruby-3.0`   |
+| `rb31`       | `rvm use ruby-3.1`   |
 | `rvm-update` | `rvm get head`       |
 | `gems`       | `gem list`           |
 | `rvms`       | `rvm gemset`         |
diff --git a/plugins/rvm/rvm.plugin.zsh b/plugins/rvm/rvm.plugin.zsh
index 864389ba8..2a091d019 100644
--- a/plugins/rvm/rvm.plugin.zsh
+++ b/plugins/rvm/rvm.plugin.zsh
@@ -26,6 +26,7 @@ rubies=(
   26  'ruby-2.6'
   27  'ruby-2.7'
   30  'ruby-3.0'
+  31  'ruby-3.1'
 )
 
 for v in ${(k)rubies}; do

From 9350e1ff8724341534a8def2ce76ede88a4c2868 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Mon, 7 Mar 2022 11:13:18 +0100
Subject: [PATCH 853/869] fix(coffee): fix completion bug on missing `coffee`
 command (#10759)

This commit fixes the error

  _coffee:49: bad math expression: operand expected at `< 2 '

when the coffee command is missing or the `coffee --version` command fails.

It also uses is-at-least to check for the cut-off version for suggesting
`--lint` and `--require` arguments, instead of using `cut` multiple times.

Fixes #10759
---
 plugins/coffee/_coffee | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/plugins/coffee/_coffee b/plugins/coffee/_coffee
index 5e52b30e6..e2814f7ba 100644
--- a/plugins/coffee/_coffee
+++ b/plugins/coffee/_coffee
@@ -39,14 +39,14 @@
 #
 # ------------------------------------------------------------------------------
 
-local curcontext="$curcontext" state line ret=1 version opts first second third
+local curcontext="$curcontext" state line ret=1 version
+local -a opts
 typeset -A opt_args
-version=(${(f)"$(_call_program version $words[1] --version)"})
+version=(${(f)"$(_call_program version $words[1] --version)"}) || return ret
 version=${${(z)${version[1]}}[3]}
-first=$(echo $version|cut -d '.' -f 1)
-second=$(echo $version|cut -d '.' -f 2)
-third=$(echo $version|cut -d '.' -f 3)
-if (( $first < 2 )) &&  (( $second < 7 )) && (( $third < 3 ));then
+
+autoload -Uz is-at-least
+if ! is-at-least 1.6.3 "$version"; then
   opts+=('(-l --lint)'{-l,--lint}'[pipe the compiled JavaScript through JavaScript Lint]'
          '(-r --require)'{-r,--require}'[require a library before executing your script]:library')
 fi

From 4f0b680248e1acf71e9e557af62f3a08bb5b96c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Mon, 7 Mar 2022 11:38:48 +0100
Subject: [PATCH 854/869] fix(installer): fix `$HOME` setting if `getent` is
 not found (macOS)

Related: https://github.com/ohmyzsh/ohmyzsh/pull/10713/files#r820219899
---
 tools/install.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tools/install.sh b/tools/install.sh
index 93608eb7c..f04d0dc9c 100755
--- a/tools/install.sh
+++ b/tools/install.sh
@@ -45,7 +45,9 @@ USER=${USER:-$(id -u -n)}
 # $HOME is defined at the time of login, but it could be unset. If it is unset,
 # a tilde by itself (~) will not be expanded to the current user's home directory.
 # POSIX: https://pubs.opengroup.org/onlinepubs/009696899/basedefs/xbd_chap08.html#tag_08_03
-HOME="${HOME:-$(getent passwd $USER | cut -d: -f6)}"
+HOME="${HOME:-$(getent passwd $USER 2>/dev/null | cut -d: -f6)}"
+# macOS does not have getent, but this works even if $HOME is unset
+HOME="${HOME:-$(eval echo ~$USER)}"
 
 
 # Track if $ZSH was provided

From 3075d0c0ab823fbf3f52e9dfa33edd4be70f4679 Mon Sep 17 00:00:00 2001
From: Alexey Poimtsev <25312+alec-c4@users.noreply.github.com>
Date: Fri, 15 Jan 2021 22:23:15 +0300
Subject: [PATCH 855/869] feat(rails)!: run old rake aliases with `rails`
 (#9601)

BREAKING CHANGE: we've updated the aliases that run `rake` to use
`rails` instead because that's how they are run since Rails v5.
The old `rake` aliases can still be run by using the `rk` prefix
(e.g. the `rake test` alias has been changed from `rt` to `rkt`).

Closes #9601
Closes #9813
Fixes #10696

Co-authored-by: Vsevolod Voloshyn <seva.voloshin@gmail.com>
---
 plugins/rails/README.md        | 111 ++++++++++++++++++++-------------
 plugins/rails/rails.plugin.zsh |  70 +++++++++++++--------
 2 files changed, 113 insertions(+), 68 deletions(-)

diff --git a/plugins/rails/README.md b/plugins/rails/README.md
index efdb8f8ba..0a6c68c75 100644
--- a/plugins/rails/README.md
+++ b/plugins/rails/README.md
@@ -12,47 +12,46 @@ plugins=(... rails)
 
 ### Rails aliases
 
-| Alias | Command                    | Description                                        |
-|-------|----------------------------|----------------------------------------------------|
-| `rc`  | `rails console`            | Interact with your Rails app from the CLI          |
-| `rcs` | `rails console --sandbox`  | Test code in a sandbox, without changing any data  |
-| `rd`  | `rails destroy`            | Undo a generate operation                          |
-| `rdb` | `rails dbconsole`          | Interact with your db from the console             |
-| `rgen`| `rails generate`           | Generate boilerplate code                          |
-| `rgm` | `rails generate migration` | Generate a db migration                            |
-| `rp`  | `rails plugin`             | Run a Rails plugin command                         |
-| `rr`  | `rails routes`             | List all defined routes                            |
-| `rrg` | `rails routes \| grep`     | List and filter the defined routes                 |
-| `ru`  | `rails runner`             | Run Ruby code in the context of Rails              |
-| `rs`  | `rails server`             | Launch a web server                                |
-| `rsd` | `rails server --debugger`  | Launch a web server with debugger                  |
-| `rsp` | `rails server --port`      | Launch a web server and specify the listening port |
-
-### Rake aliases
-
-| Alias   | Command                         | Description                                            |
-|---------|---------------------------------|--------------------------------------------------------|
-| `rdm`   | `rake db:migrate`               | Run pending db migrations                              |
-| `rdms`  | `rake db:migrate:status`        | Show current db migration status                       |
-| `rdmtc` | `rake db:migrate db:test:clone` | Run pending migrations and clone db into test database |
-| `rdr`   | `rake db:rollback`              | Roll back the last migration                           |
-| `rdc`   | `rake db:create`                | Create the database                                    |
-| `rds`   | `rake db:seed`                  | Seed the database                                      |
-| `rdd`   | `rake db:drop`                  | Delete the database                                    |
-| `rdrs`  | `rake db:reset`                 | Delete the database and set it up again                |
-| `rdtc`  | `rake db:test:clone`            | Clone the database into the test database              |
-| `rdtp`  | `rake db:test:prepare`          | Duplicate the db schema into your test database        |
-| `rdsl`  | `rake db:schema:load`           | Load the database schema                               |
-| `rlc`   | `rake log:clear`                | Clear Rails logs                                       |
-| `rn`    | `rake notes`                    | Search for notes (`FIXME`, `TODO`) in code comments    |
-| `rt`    | `rake test`                     | Run Rails tests                                        |
-| `rmd`   | `rake middleware`               | Interact with Rails middlewares                        |
-| `rsts`  | `rake stats`                    | Print code statistics                                  |
+| Alias   | Command                          | Description                                            |
+| ------- | -------------------------------- | ------------------------------------------------------ |
+| `rc`    | `rails console`                  | Interact with your Rails app from the CLI              |
+| `rcs`   | `rails console --sandbox`        | Test code in a sandbox, without changing any data      |
+| `rd`    | `rails destroy`                  | Undo a generate operation                              |
+| `rdb`   | `rails dbconsole`                | Interact with your db from the console                 |
+| `rdc`   | `rails db:create`                | Create the database                                    |
+| `rdd`   | `rails db:drop`                  | Delete the database                                    |
+| `rdm`   | `rails db:migrate`               | Run pending db migrations                              |
+| `rdmd`  | `rails db:migrate:down`          | Undo specific db migration                             |
+| `rdmr`  | `rails db:migrate:redo`          | Redo specific db migration                             |
+| `rdms`  | `rails db:migrate:status`        | Show current db migration status                       |
+| `rdmtc` | `rails db:migrate db:test:clone` | Run pending migrations and clone db into test database |
+| `rdmu`  | `rails db:migrate:up`            | Run specific db migration                              |
+| `rdr`   | `rails db:rollback`              | Roll back the last migration                           |
+| `rdrs`  | `rails db:reset`                 | Delete the database and set it up again                |
+| `rds`   | `rails db:seed`                  | Seed the database                                      |
+| `rdsl`  | `rails db:schema:load`           | Load the database schema                               |
+| `rdtc`  | `rails db:test:clone`            | Clone the database into the test database              |
+| `rdtp`  | `rails db:test:prepare`          | Duplicate the db schema into your test database        |
+| `rgen`  | `rails generate`                 | Generate boilerplate code                              |
+| `rgm`   | `rails generate migration`       | Generate a db migration                                |
+| `rlc`   | `rails log:clear`                | Clear Rails logs                                       |
+| `rmd`   | `rails middleware`               | Interact with Rails middlewares                        |
+| `rn`    | `rails notes`                    | Search for notes (`FIXME`, `TODO`) in code comments    |
+| `rp`    | `rails plugin`                   | Run a Rails plugin command                             |
+| `rr`    | `rails routes`                   | List all defined routes                                |
+| `rrg`   | `rails routes \| grep`           | List and filter the defined routes                     |
+| `rs`    | `rails server`                   | Launch a web server                                    |
+| `rsb`   | `rails server --bind`            | Launch a web server binding it to a specific IP        |
+| `rsd`   | `rails server --debugger`        | Launch a web server with debugger                      |
+| `rsp`   | `rails server --port`            | Launch a web server and specify the listening port     |
+| `rsts`  | `rails stats`                    | Print code statistics                                  |
+| `rt`    | `rails test`                     | Run Rails tests                                        |
+| `ru`    | `rails runner`                   | Run Ruby code in the context of Rails                  |
 
 ### Utility aliases
 
 | Alias     | Command                       | Description                                    |
-|-----------|-------------------------------|------------------------------------------------|
+| --------- | ----------------------------- | ---------------------------------------------- |
 | `devlog`  | `tail -f log/development.log` | Show and follow changes to the development log |
 | `prodlog` | `tail -f log/production.log`  | Show and follow changes to the production log  |
 | `testlog` | `tail -f log/test.log`        | Show and follow changes to the test log        |
@@ -60,7 +59,7 @@ plugins=(... rails)
 ### Environment settings
 
 | Alias | Command                 | Description                     |
-|-------|-------------------------|---------------------------------|
+| ----- | ----------------------- | ------------------------------- |
 | `RED` | `RAILS_ENV=development` | Sets `RAILS_ENV` to development |
 | `REP` | `RAILS_ENV=production`  | Sets `RAILS_ENV` to production  |
 | `RET` | `RAILS_ENV=test`        | Sets `RAILS_ENV` to test        |
@@ -68,15 +67,41 @@ plugins=(... rails)
 These are global aliases. Use in combination with a command or just run them
 separately. For example: `REP rake db:migrate` will migrate the production db.
 
+### Legacy rake aliases
+
+The following commands are run [using `rails` instead of `rake` since Rails v5][1], but are preserved under the
+prefix `rk` for backwards compatibility.
+
+[1]: https://guides.rubyonrails.org/v5.2/command_line.html#bin-rails
+
+| Alias    | Command                         | Description                                            |
+| -------- | ------------------------------- | ------------------------------------------------------ |
+| `rkdc`   | `rake db:create`                | Create the database                                    |
+| `rkdd`   | `rake db:drop`                  | Delete the database                                    |
+| `rkdm`   | `rake db:migrate`               | Run pending db migrations                              |
+| `rkdms`  | `rake db:migrate:status`        | Show current db migration status                       |
+| `rkdmtc` | `rake db:migrate db:test:clone` | Run pending migrations and clone db into test database |
+| `rkdr`   | `rake db:rollback`              | Roll back the last migration                           |
+| `rkdrs`  | `rake db:reset`                 | Delete the database and set it up again                |
+| `rkds`   | `rake db:seed`                  | Seed the database                                      |
+| `rkdsl`  | `rake db:schema:load`           | Load the database schema                               |
+| `rkdtc`  | `rake db:test:clone`            | Clone the database into the test database              |
+| `rkdtp`  | `rake db:test:prepare`          | Duplicate the db schema into your test database        |
+| `rklc`   | `rake log:clear`                | Clear Rails logs                                       |
+| `rkmd`   | `rake middleware`               | Interact with Rails middlewares                        |
+| `rkn`    | `rake notes`                    | Search for notes (`FIXME`, `TODO`) in code comments    |
+| `rksts`  | `rake stats`                    | Print code statistics                                  |
+| `rkt`    | `rake test`                     | Run Rails tests                                        |
+
 ### Legacy stuff
 
 | Alias   | Command                            |
-|---------|------------------------------------|
-| `sstat` | `thin --stats "/thin/stats" start` |
-| `sg`    | `ruby script/generate`             |
+| ------- | ---------------------------------- |
+| `sc`    | `ruby script/console`              |
 | `sd`    | `ruby script/destroy`              |
+| `sd`    | `ruby script/server --debugger`    |
+| `sg`    | `ruby script/generate`             |
 | `sp`    | `ruby script/plugin`               |
 | `sr`    | `ruby script/runner`               |
 | `ssp`   | `ruby script/spec`                 |
-| `sc`    | `ruby script/console`              |
-| `sd`    | `ruby script/server --debugger`    |
+| `sstat` | `thin --stats "/thin/stats" start` |
diff --git a/plugins/rails/rails.plugin.zsh b/plugins/rails/rails.plugin.zsh
index 29b413434..f2b0f8293 100644
--- a/plugins/rails/rails.plugin.zsh
+++ b/plugins/rails/rails.plugin.zsh
@@ -43,47 +43,67 @@ alias rc='rails console'
 alias rcs='rails console --sandbox'
 alias rd='rails destroy'
 alias rdb='rails dbconsole'
+alias rdc='rails db:create'
+alias rdd='rails db:drop'
+alias rdm='rails db:migrate'
+alias rdmd='rails db:migrate:down'
+alias rdmr='rails db:migrate:redo'
+alias rdms='rails db:migrate:status'
+alias rdmtc='rails db:migrate db:test:clone'
+alias rdmu='rails db:migrate:up'
+alias rdr='rails db:rollback'
+alias rdrs='rails db:reset'
+alias rds='rails db:seed'
+alias rdsl='rails db:schema:load'
+alias rdtc='rails db:test:clone'
+alias rdtp='rails db:test:prepare'
 alias rgen='rails generate'
 alias rgm='rails generate migration'
+alias rlc='rails log:clear'
+alias rmd='rails middleware'
+alias rn='rails notes'
 alias rp='rails plugin'
 alias rr='rails routes'
 alias rrg='rails routes | grep'
-alias ru='rails runner'
 alias rs='rails server'
+alias rsb='rails server --bind'
 alias rsd='rails server --debugger'
 alias rsp='rails server --port'
-alias rsb='rails server --bind'
+alias rsts='rails stats'
+alias rt='rails test'
+alias ru='rails runner'
+
 
 # Rake aliases
-alias rdm='rake db:migrate'
-alias rdmr='rake db:migrate:redo'
-alias rdmd='rake db:migrate:down'
-alias rdms='rake db:migrate:status'
-alias rdmu='rake db:migrate:up'
-alias rdr='rake db:rollback'
-alias rdc='rake db:create'
-alias rds='rake db:seed'
-alias rdd='rake db:drop'
-alias rdrs='rake db:reset'
-alias rdtc='rake db:test:clone'
-alias rdtp='rake db:test:prepare'
-alias rdmtc='rake db:migrate db:test:clone'
-alias rdsl='rake db:schema:load'
-alias rlc='rake log:clear'
-alias rn='rake notes'
-alias rt='rake test'
-alias rmd='rake middleware'
-alias rsts='rake stats'
+alias rkdc='rake db:create'
+alias rkdd='rake db:drop'
+alias rkdm='rake db:migrate'
+alias rkdmd='rake db:migrate:down'
+alias rkdmr='rake db:migrate:redo'
+alias rkdms='rake db:migrate:status'
+alias rkdmtc='rake db:migrate db:test:clone'
+alias rkdmu='rake db:migrate:up'
+alias rkdr='rake db:rollback'
+alias rkdrs='rake db:reset'
+alias rkds='rake db:seed'
+alias rkdsl='rake db:schema:load'
+alias rkdtc='rake db:test:clone'
+alias rkdtp='rake db:test:prepare'
+alias rklc='rake log:clear'
+alias rkmd='rake middleware'
+alias rkn='rake notes'
+alias rksts='rake stats'
+alias rkt='rake test'
 
 # legacy stuff
-alias sstat='thin --stats "/thin/stats" start'
-alias sg='ruby script/generate'
+alias sc='ruby script/console'
 alias sd='ruby script/destroy'
+alias sd='ruby script/server --debugger'
+alias sg='ruby script/generate'
 alias sp='ruby script/plugin'
 alias sr='ruby script/runner'
 alias ssp='ruby script/spec'
-alias sc='ruby script/console'
-alias sd='ruby script/server --debugger'
+alias sstat='thin --stats "/thin/stats" start'
 
 function remote_console() {
   /usr/bin/env ssh $1 "( cd $2 && ruby script/console production )"

From 47d313c90409f63ee6b06c65f2372bbf847c106b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Mon, 7 Mar 2022 15:20:03 +0100
Subject: [PATCH 856/869] chore(rails): fix comments and docs

---
 plugins/rails/README.md        | 11 ++++++++---
 plugins/rails/rails.plugin.zsh | 12 ++++++++----
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/plugins/rails/README.md b/plugins/rails/README.md
index 0a6c68c75..3eee12fbd 100644
--- a/plugins/rails/README.md
+++ b/plugins/rails/README.md
@@ -1,6 +1,7 @@
 # Rails
 
-This plugin adds completion for [Ruby On Rails Framework](https://rubyonrails.org/) and [Rake](https://ruby.github.io/rake/) commands, as well as some aliases for logs and environment variables.
+This plugin adds completion for [Ruby On Rails Framework](https://rubyonrails.org/) and
+[Rake](https://ruby.github.io/rake/) commands, as well as some aliases for logs and environment variables.
 
 To use it, add `rails` to the plugins array in your zshrc file:
 
@@ -67,7 +68,9 @@ plugins=(... rails)
 These are global aliases. Use in combination with a command or just run them
 separately. For example: `REP rake db:migrate` will migrate the production db.
 
-### Legacy rake aliases
+## Legacy
+
+### Rake aliases
 
 The following commands are run [using `rails` instead of `rake` since Rails v5][1], but are preserved under the
 prefix `rk` for backwards compatibility.
@@ -93,7 +96,7 @@ prefix `rk` for backwards compatibility.
 | `rksts`  | `rake stats`                    | Print code statistics                                  |
 | `rkt`    | `rake test`                     | Run Rails tests                                        |
 
-### Legacy stuff
+### Other
 
 | Alias   | Command                            |
 | ------- | ---------------------------------- |
@@ -105,3 +108,5 @@ prefix `rk` for backwards compatibility.
 | `sr`    | `ruby script/runner`               |
 | `ssp`   | `ruby script/spec`                 |
 | `sstat` | `thin --stats "/thin/stats" start` |
+
+- `remote_console <server> <directory>`: runs `ruby script/console production` on a remote server.
diff --git a/plugins/rails/rails.plugin.zsh b/plugins/rails/rails.plugin.zsh
index f2b0f8293..e724bffc4 100644
--- a/plugins/rails/rails.plugin.zsh
+++ b/plugins/rails/rails.plugin.zsh
@@ -1,3 +1,4 @@
+# rails command wrapper
 function _rails_command () {
   if [ -e "bin/stubs/rails" ]; then
     bin/stubs/rails $@
@@ -12,28 +13,31 @@ function _rails_command () {
   fi
 }
 
+alias rails='_rails_command'
+compdef _rails_command=rails
+
+# rake command wrapper
 function _rake_command () {
   if [ -e "bin/stubs/rake" ]; then
     bin/stubs/rake $@
   elif [ -e "bin/rake" ]; then
     bin/rake $@
-  elif type bundle &> /dev/null && ([ -e "Gemfile" ] || [ -e "gems.rb" ]); then
+  elif type bundle &> /dev/null && [[ -e "Gemfile" || -e "gems.rb" ]]; then
     bundle exec rake $@
   else
     command rake $@
   fi
 }
 
-alias rails='_rails_command'
-compdef _rails_command=rails
-
 alias rake='_rake_command'
 compdef _rake_command=rake
 
+# Log aliases
 alias devlog='tail -f log/development.log'
 alias prodlog='tail -f log/production.log'
 alias testlog='tail -f log/test.log'
 
+# Environment settings
 alias -g RED='RAILS_ENV=development'
 alias -g REP='RAILS_ENV=production'
 alias -g RET='RAILS_ENV=test'

From 98ed582e6a143517d8c1ac229a4da8e4246217f1 Mon Sep 17 00:00:00 2001
From: romanch <romanchsharma@gmail.com>
Date: Fri, 15 Jan 2021 09:33:48 +0530
Subject: [PATCH 857/869] feat(rails): add `fmns` alias for `foreman start`
 (#9600)

Closes #9600
---
 plugins/rails/README.md        | 6 ++++++
 plugins/rails/rails.plugin.zsh | 2 ++
 2 files changed, 8 insertions(+)

diff --git a/plugins/rails/README.md b/plugins/rails/README.md
index 3eee12fbd..fa66750f0 100644
--- a/plugins/rails/README.md
+++ b/plugins/rails/README.md
@@ -49,6 +49,12 @@ plugins=(... rails)
 | `rt`    | `rails test`                     | Run Rails tests                                        |
 | `ru`    | `rails runner`                   | Run Ruby code in the context of Rails                  |
 
+### Foreman
+
+| Alias  | Command         | Description                               |
+| ------ | --------------- | ----------------------------------------- |
+| `fmns` | `foreman start` | Interact with your Rails app from the CLI |
+
 ### Utility aliases
 
 | Alias     | Command                       | Description                                    |
diff --git a/plugins/rails/rails.plugin.zsh b/plugins/rails/rails.plugin.zsh
index e724bffc4..b11cbb5c7 100644
--- a/plugins/rails/rails.plugin.zsh
+++ b/plugins/rails/rails.plugin.zsh
@@ -77,6 +77,8 @@ alias rsts='rails stats'
 alias rt='rails test'
 alias ru='rails runner'
 
+# Foreman aliases
+alias fmns='foreman start'
 
 # Rake aliases
 alias rkdc='rake db:create'

From 40f49342f587167292461242dc13fdb93363278a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Mon, 7 Mar 2022 16:01:34 +0100
Subject: [PATCH 858/869] fix(rails): bundle more up-to-date zsh-completions
 completion version

Source: https://github.com/zsh-users/zsh-completions/blob/55d07cc/src/_rails
---
 plugins/rails/_rails | 672 +++++++++++++++++++++++++++++++++++++++----
 1 file changed, 615 insertions(+), 57 deletions(-)

diff --git a/plugins/rails/_rails b/plugins/rails/_rails
index ad7505506..6dc85d458 100644
--- a/plugins/rails/_rails
+++ b/plugins/rails/_rails
@@ -1,66 +1,624 @@
 #compdef rails
-#autoload
+# ------------------------------------------------------------------------------
+# Copyright (c) 2016 Github zsh-users - http://github.com/zsh-users
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#     * Redistributions of source code must retain the above copyright
+#       notice, this list of conditions and the following disclaimer.
+#     * Redistributions in binary form must reproduce the above copyright
+#       notice, this list of conditions and the following disclaimer in the
+#       documentation and/or other materials provided with the distribution.
+#     * Neither the name of the zsh-users nor the
+#       names of its contributors may be used to endorse or promote products
+#       derived from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+# DISCLAIMED. IN NO EVENT SHALL ZSH-USERS BE LIABLE FOR ANY
+# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# ------------------------------------------------------------------------------
+# Description
+# -----------
+#
+#  Completion script for Ruby on Rails (http://rubyonrails.org/).
+#
+# ------------------------------------------------------------------------------
+# Authors
+# -------
+#
+#  * Kazuya Takeshima (https://github.com/mitukiii)
+#
+# ------------------------------------------------------------------------------
 
-local -a _1st_arguments
-_1st_arguments=(
-    'generate:Generate new code (short-cut alias: "g")'
-    'console:Start the Rails console (short-cut alias: "c")'
-    'server:Start the Rails server (short-cut alias: "s")'
-    'dbconsole:Start a console for the database specified in config/database.yml (short-cut alias: "db")'
-    'new:Create a new Rails application. "rails new my_app" creates a new application called MyApp in "./my_app"'
-    'application:Generate the Rails application code'
-    'destroy:Undo code generated with "generate"'
 
-    'benchmarker:See how fast a piece of code runs'
-    'profiler:Get profile information from a piece of code'
-    'plugin:Install a plugin'
+_rails() {
+  local context state line curcontext="$curcontext"
 
-    'plugin new:Generates skeleton for developing a Rails plugin'
-    'runner:Run a piece of code in the application environment (short-cut alias: "r")'
-)
-
-_rails_generate_arguments() {
-    generate_arguments=(
-        assets
-        controller
-        decorator
-        generator
-        helper
-        integration_test
-        mailer
-        migration
-        model
-        observer
-        performance_test
-        plugin
-        resource
-        scaffold
-        scaffold_controller
-        session_migration
-        stylesheets
-        task
-    )
+  if (( CURRENT > 2 )); then
+    (( CURRENT-- ))
+    shift words
+    _call_function - "_rails_${words[1]}" || _nothing
+  else
+    __rails_commands
+  fi
 }
 
+__rails_commands() {
+  local context state line curcontext="$curcontext"
 
-_arguments \
-    '(--version)--version[show version]' \
-    '(--help)--help[show help]' \
-    '*:: :->subcmds' && return 0
+  local -a rails_options
+  __rails_setup_rails_options
 
-if (( CURRENT == 1 )); then
-  _describe -t commands "rails subcommand" _1st_arguments
-  return
-else
-  _files
-  return
-fi
+  _arguments -C \
+    $rails_options \
+    ': :->command'
 
-case "$words[1]" in
-  g|generate)
-    _rails_generate_arguments
-    _wanted generate_arguments expl 'all generate' compadd -a generate_arguments ;;
-  d|destroy)
-    _rails_generate_arguments
-    _wanted generate_arguments expl 'all generate' compadd -a generate_arguments ;;
-esac
+  case "$state" in
+    command)
+      local -a commands
+      local application_directory
+      __rails_setup_application_directory
+
+      if [ -n "$application_directory" ]; then
+        commands=(
+          {generate,g}'[Generate new code]'
+          {console,c}'[Start the Rails console]'
+          {server,s}'[Start the Rails server]'
+          {dbconsole,db}'[Start a console for the database specified in config/database.yml]'
+          application'[Generate the Rails application code]'
+          {destroy,d}'[Undo code generated with "generate"]'
+          benchmarker'[See how fast a piece of code runs]'
+          profiler'[Get profile information from a piece of code]'
+          plugin'[Install a plugin]'
+          {runner,r}'[Run a piece of code in the application environment]'
+          {test,t}'[Run tests]'
+        )
+      else
+        commands=(
+          new'[Create a new Rails application]'
+        )
+      fi
+
+      _values 'command' $commands
+      ;;
+  esac
+}
+
+__rails_setup_application_directory() {
+  application_directory="$(pwd)"
+
+  while [ -n "$application_directory" ]; do
+    if [ -f "${application_directory}/script/rails" -o -f "${application_directory}/bin/rails" ]; then
+      return
+    fi
+    application_directory="${application_directory%/*}"
+  done
+
+  application_directory=
+}
+
+__rails_setup_rails_options() {
+  rails_options=(
+    {-h,--help}'[Show this help message and quit]'
+    {-v,--version}'[Show Rails version number and quit]'
+  )
+}
+
+__rails_setup_runtime_options() {
+  runtime_options=(
+    '(-f --force)'{-f,--force}'[Overwrite files that already exist]'
+    '(-p --pretend)'{-p,--pretend}'[Run but do not make any changes]'
+    '(-q --quiet)'{-q,--quiet}'[Suppress status output]'
+    '(-s --skip)'{-s,--skip}'[Skip files that already exist]'
+  )
+}
+
+__rails_setup_generators_options() {
+  local -a runtime_options
+  __rails_setup_runtime_options
+
+  generators_options=(
+    $runtime_options
+    --skip-namespace'[Skip namespace (affects only isolated applications)]'
+    --old-style-hash"[Force using old style hash (:foo => 'bar') on Ruby >= 1.9]"
+  )
+}
+
+__rails_setup_model_generators_options() {
+  local -a generators_options
+  __rails_setup_generators_options
+
+  model_generators_options=(
+    $generators_options
+    '(-o --orm)'{-o,--orm=}'[Orm to be invoked]:orm'
+  )
+}
+
+__rails_setup_resource_generators_options() {
+  local -a model_generators_options
+  __rails_setup_model_generators_options
+
+  resource_generators_options=(
+    $model_generators_options
+    --force-plural'[Forces the use of a plural ModelName]'
+    --resource-route'[Indicates when to generate resource route]: :__rails_boolean'
+  )
+}
+
+__rails_boolean() {
+  _values 'boolean' 'true' 'false'
+}
+
+__rails_migration_fields() {
+  if compset -P '*:*:'; then
+    _values 'index' 'index' 'uniq'
+  else
+    if compset -P '*:'; then
+      _values -s ':' 'type' 'string' 'text' 'integer' 'float' 'decimal' 'datetime' 'timestamp' 'time' 'date' 'binary' 'boolean' 'references'
+    else
+      _guard '[[:alnum:]_]#' 'field'
+    fi
+  fi
+}
+
+_rails_generate() {
+  local context state line curcontext="$curcontext"
+
+  if (( CURRENT > 2 )); then
+    (( CURRENT-- ))
+    shift words
+    _call_function - "_rails_generate_${words[1]}" || _rails_generate_default
+  else
+    __rails_generate_commands
+  fi
+}
+
+_rails_g() {
+  _rails_generate
+}
+
+__rails_generate_commands() {
+  local context curcontext="$curcontext" update_policy
+
+  zstyle -s ":completion:${curcontext}:" cache-policy update_policy
+  if [ -z "$update_policy" ]; then
+    zstyle ":completion:${curcontext}:" cache-policy _rails_generate_commands_caching_policy
+  fi
+
+  local application_directory
+  __rails_setup_application_directory
+  local cache_name
+  cache_name="rails/${application_directory##*/}/all_generators"
+  if ! _retrieve_cache ${cache_name}; then
+    local -a all_generators
+    all_generators=($(_call_program rails_generators rails generate 2> /dev/null | awk '/^  [a-zA-Z_]+/{ print $1 }'))
+    _store_cache ${cache_name} all_generators
+  fi
+
+  local -a rails_generators
+  rails_generators=(${all_generators:#*:*})
+  _describe -t rails_generators 'rails generator' rails_generators
+
+  local -a -U namespaces
+  local namespace
+  local -a generators
+  namespaces=(${(R)${(M)all_generators:#*:*}%:*})
+  for namespace in $namespaces; do
+    generators=(${${(M)all_generators:#${namespace}:*}/:/\\:})
+    _describe -t ${namespace}_generators "${namespace/_/ } generator" generators
+  done
+}
+
+_rails_generate_commands_caching_policy() {
+  local application_directory
+  __rails_setup_application_directory
+
+  if [ "${application_directory}/Gemfile" -nt "$1" ]; then
+    return 0
+  fi
+
+  local -a oldp
+  oldp=( "$1"(Nmw+1) )
+  (( $#oldp ))
+}
+
+_rails_generate_default() {
+  local -a generators_options
+  __rails_setup_generators_options
+
+  _arguments \
+    $generators_options \
+    '*:argument'
+}
+
+_rails_generate_assets() {
+  local -a generators_options
+  __rails_setup_generators_options
+
+  _arguments \
+    $generators_options \
+    '(-j --javascripts)'{-j,--javascripts}'[Generate JavaScripts]: :__rails_boolean' \
+    '(-y --stylesheets)'{-y,--stylesheets}'[Generate Stylesheets]: :__rails_boolean' \
+    '(-je --javascript-engine)'{-je,--javascript-engine=}'[Engine for JavaScripts]:javascript engine' \
+    '(-se --stylesheet-engine)'{-se,--stylesheet-engine=}'[Engine for Stylesheets]:stylesheet engine' \
+    ': :_guard "^-*" "name"'
+}
+
+_rails_generate_controller() {
+  local -a generators_options
+  __rails_setup_generators_options
+
+  _arguments \
+    $generators_options \
+    '(-e --template-engine)'{-e,--template-engine=}'[Template engine to be invoked]:template engine' \
+    '(-t --test-framework)'{-t,--test-framework=}'[Test framework to be invoked]:test framework' \
+    --helper'[Indicates when to generate helper]: :__rails_boolean' \
+    --assets'[Indicates when to generate assets]: :__rails_boolean' \
+    ': :_guard "^-*" "name"' \
+    '*: :_guard "^-*" "action"'
+}
+
+_rails_generate_generator() {
+  local -a generators_options
+  __rails_setup_generators_options
+
+  _arguments \
+    $generators_options \
+    --namespace'[Namespace generator under lib/generators/name]: :__rails_boolean' \
+    ': :_guard "^-*" "name"'
+}
+
+_rails_generate_helper() {
+  local -a generators_options
+  __rails_setup_generators_options
+
+  _arguments \
+    $generators_options \
+    '(-t --test-framework)'{-t,--test-framework=}'[Test framework to be invoked]:test framework' \
+    ': :_guard "^-*" "name"' \
+}
+
+_rails_generate_integration_test() {
+  local -a generators_options
+  __rails_setup_generators_options
+
+  _arguments \
+    $generators_options \
+    --integration-tool='[Integration tool to be invoke]:integration tool' \
+    ': :_guard "^-*" "name"' \
+}
+
+_rails_generate_jbuilder() {
+  local -a generators_options
+  __rails_setup_generators_options
+
+  _arguments \
+    $generators_options \
+    ': :_guard "^-*" "name"' \
+    '*: :__rails_migration_fields'
+}
+
+_rails_generate_mailer() {
+  local -a generators_options
+  __rails_setup_generators_options
+
+  _arguments \
+    $generators_options \
+    '(-e --template-engine)'{-e,--template-engine=}'[Template engine to be invoked]:template engine' \
+    '(-t --test-framework)'{-t,--test-framework=}'[Test framework to be invoked]:test framework' \
+    ': :_guard "^-*" "name"' \
+    '*: :_guard "^-*" "method"'
+}
+
+_rails_generate_migration() {
+  local -a modelgenerators_options
+  __rails_setup_model_generators_options
+
+  _arguments \
+    $model_generators_options \
+    ': :_guard "^-*" "name"' \
+    '*: :__rails_migration_fields'
+}
+
+_rails_generate_model() {
+  _rails_generate_migration
+}
+
+_rails_generate_observer() {
+  local -a model_generators_options
+  __rails_setup_model_generators_options
+
+  _arguments \
+    $model_generators_options \
+    ': :_guard "^-*" "name"'
+}
+
+_rails_generate_performance_test() {
+  local -a generators_options
+  __rails_setup_generators_options
+
+  _arguments \
+    $generators_options \
+    --performance-tool='[Performance tool to be invoked]:performance tool' \
+    ': :_guard "^-*" "name"' \
+}
+
+_rails_generate_resource() {
+  local context state line curcontext="$curcontext"
+
+  local -a resource_generators_options
+  __rails_setup_resource_generators_options
+
+  _arguments -C \
+    $resource_generators_options \
+    '(-c --resource-controller)'{-c,--resource-controller=}'[Resource controller to be invoked]:name' \
+    '(-a --actions)'{-a,--actions=}'[Actions for the resource controller]: :->actions' \
+    ': :->name' \
+    '*: :->fields'
+
+  if (( words[(I)(--actions=*|-a)] > 0 && words[(I)(--actions=*|-a)] == words[(I)-*] )); then
+    state=actions
+  fi
+
+  case "$state" in
+    actions)
+      _guard "[[:alnum:]_]#" "actions"
+      ;;
+    name)
+      _guard "^-*" "name"
+      ;;
+    fields)
+      __rails_migration_fields
+      ;;
+  esac
+}
+
+_rails_generate_scaffold() {
+  local -a resource_generators_options
+  __rails_setup_resource_generators_options
+
+  _arguments \
+    $resource_generators_options \
+    '(-y --stylesheets)'{-y,--stylesheets}'[Generate Stylesheets]: :__rails_boolean' \
+    '(-se --stylesheet-engine)'{-se,--stylesheet-engine=}'[Engine for Stylesheets]:stylesheet engine' \
+    '(-c --scaffold-controller)'{-c,--scaffold-controller=}'[Scaffold controller to be invoked]:name' \
+    --assets'[Indicates when to generate assets]:boolean:(true false)' \
+    ': :_guard "^-*" "name"' \
+    '*: :__rails_migration_fields'
+}
+
+_rails_generate_scaffold_controller() {
+  local -a model_generators_options
+  __rails_setup_model_generators_options
+
+  _arguments \
+    $model_generators_options \
+    '(-e --template-engine)'{-e,--template-engine=}'[Template engine to be invoked]:template engine' \
+    '(-t --test-framework)'{-t,--test-framework=}'[Test framework to be invoked]:test framework' \
+      --helper'[Indicates when to generate helper]: :__rails_boolean' \
+    ': :_guard "^-*" "name"'
+}
+
+_rails_generate_session_migration() {
+  local -a model_generators_options
+  __rails_setup_model_generators_options
+
+  _arguments \
+    $model_generators_options \
+    ': :_guard "^-*" "name"'
+}
+
+_rails_generate_task() {
+  local -a generators_options
+  __rails_setup_generators_options
+
+  _arguments \
+    $generators_options \
+    ': :_guard "^-*" "name"' \
+    '*: :_guard "^-*" "action"'
+}
+
+_rails_console() {
+  _arguments \
+    '(- *)'{-h,--help}'[Show this help message]' \
+    '(-s --sandbox)'{-s,--sandbox}'[Rollback database modifications on exit]' \
+    --debugger'[Enable ruby-debugging for the console]'
+}
+
+_rails_c() {
+  _rails_console
+}
+
+_rails_server() {
+  _arguments \
+    '(- *)'{-h,--help}'[Show this help message]' \
+    '(-p --port)'{-p,--port=}'[Runs Rails on the specified port]: :_guard "[[\:digit\:]]#" "port"' \
+    '(-b --binding)'{-b,--binding=}'[Binds Rails to the specified ip]:ip:_hosts' \
+    '(-c --config)'{-c,--config=}'[Use custom rackup configuration file]:file:_files -g "*.ru"' \
+    '(-d --daemon)'{-d,--daemon}'[Make server run as a Daemon]' \
+    '(-u --debugger)'{-u,--debugger}'[Enable ruby-debugging for the server]' \
+    '(-e --environment)'{-e,--environment=}'[Specifies the environment to run this server under (test/development/production)]:name:(test development production)' \
+    '(-P --pid)'{-P,--pid=}'[Specifies the PID file]:pid:_files -g "*.pid"'
+}
+
+_rails_s() {
+  _rails_server
+}
+
+_rails_dbconsole() {
+  _arguments \
+    '(- *)'--help'[Show this help message]' \
+    '(-p --include-password)'{-p,--include-password}'[Automatically provide the password from database.yml]' \
+    --mode'[Automatically put the sqlite3 database in the specified mode (html, list, line, column)]:mode:(html list line column)' \
+    --header
+}
+
+_rails_new() {
+  local context state line curcontext="$curcontext"
+
+  local _a rails_options runtime_options
+  __rails_setup_rails_options
+  __rails_setup_runtime_options
+
+  _arguments -C \
+    $rails_options \
+    $runtime_options \
+    '(-r --ruby)'{-r,--ruby=}'[Path to the Ruby binary of your choice]:path' \
+    '(-b --builder)'{-b,--builder=}'[Path to a application builder (can be a filesystem path or URL)]: :->path_or_url' \
+    '(-m --template)'{-m,--template=}'[Path to an application template (can be a filesystem path or URL)]: :->path_or_url' \
+    --skip-gemfile"[Don't create a Gemfile]" \
+    --skip-bundle"[Don't run bundle install]" \
+    '(-G --skip-git)'{-G,--skip-git}'[Skip Git ignores and keeps]' \
+    '(-O --skip-active-record)'{-O,--skip-active-record}'[Skip Active Record files]' \
+    '(-S --skip-sprockets)'{-S,--skip-sprockets}'[Skip Sprockets files]' \
+    '(-d --database)'{-d,--database=}'[Preconfigure for selected database]:database:(mysql oracle postgresql sqlite3 frontbase ibm_db sqlserver jdbcmysql jdbcsqlite3 jdbcpostgresql jdbc)' \
+    '(-j --javascript)'{-j,--javascript=}'[Preconfigure for selected JavaScript library]:javascript' \
+    '(-J --skip-javascript)'{-J,--skip-javascript}'[Skip JavaScript files]' \
+    --dev'[Setup the application with Gemfile pointing to your Rails checkout]' \
+    --edge'[Setup the application with Gemfile pointing to Rails repository]' \
+    '(-T --skip-test-unit)'{-T,--skip-test-unit}'[Skip Test::Unit files]' \
+    --old-style-hash"[Force using old style hash (:foo => 'bar') on Ruby >= 1.9]" \
+    ':app path:_directories'
+
+  case "$state" in
+    path_or_url)
+      _alternative \
+        'files:path:_files -g "*.rb"' \
+        'url:url:_urls'
+      ;;
+  esac
+}
+
+_rails_application() {
+  _rails_new
+}
+
+_rails_db() {
+  _rails_dbconsole
+}
+
+_rails_destroy() {
+  _rails_generate
+}
+
+_rails_d() {
+  _rails_destroy
+}
+
+_rails_benchmarker() {
+  _arguments \
+    '(- *)'{-h,--help}'[Show this help message]' \
+    '(-r --runs)'{-r,--runs}'[Number of runs]: :_guard "[[\:digit\:]]#" "number"' \
+    '(-o --output)'{-o,--output}'[Directory to use when writing the results]:directory:_directories' \
+    '(-m --metrics)'{-m,--metrics}'[Metrics to use]: :_values -s "," "metrics" "wall_time" "memory" "objects" "gc_runs" "gc_time"' \
+    '*: :_guard "^-*" "ruby code"'
+}
+
+_rails_profiler() {
+  _arguments \
+    '(- *)'{-h,--help}'[Show this help message]' \
+    '(-r --runs)'{-r,--runs}'[Number of runs]: :_guard "[[\:digit\:]]#" "number"' \
+    '(-o --output)'{-o,--output}'[Directory to use when writing the results]:directory:_directories' \
+    '(-m --metrics)'{-m,--metrics}'[Metrics to use]: :_values -s "," "metrics" "process_time" "memory" "objects"' \
+    '(-f --formats)'{-f,--formats}'[Formats to output to]: :_values -s "," "formats" "flat" "graph" "html" "call_tree" "call_stack"' \
+    '*: :_guard "^-*" "ruby code"'
+}
+
+_rails_plugin() {
+  local context state line curcontext="$curcontext"
+
+  if (( CURRENT > 2 )); then
+    (( CURRENT-- ))
+    shift words
+    _call_function - "_rails_plugin_${words[1]}" || _nothing
+  else
+    __rails_plugin_commands
+  fi
+}
+
+__rails_plugin_commands() {
+  _values 'plugin command' \
+    install'[Install plugin(s) from known repositories or URLs]' \
+    remove'[Uninstall plugins]' \
+    new
+}
+
+_rails_plugin_install() {
+  _arguments \
+    '(-x --externals)'{-x,--externals}'[Use svn:externals to grab the plugin. Enables plugin updates and plugin versioning]' \
+    '(-o --checkout)'{-o,--checkout}'[Use svn checkout to grab the plugin. Enables updating but does not add a svn:externals entry]' \
+    '(-e --export)'{-e,--export}'[Use svn export to grab the plugin. Exports the plugin, allowing you to check it into your local repository. Does not enable updates or add an svn:externals entry]' \
+    '(-q --quiet)'{-q,--quiet}'[Suppresses the output from installation. Ignored if -v is passed (rails plugin -v install ...)]' \
+    '(-r --revision)'{-r,--revision=}'[Checks out the given revision from subversion or git. Ignored if subversion/git is not used]:revision' \
+    '(-f --force)'{-f,--force}"[Reinstalls a plugin if it's already installed]" \
+    '*:plugin:_urls'
+}
+
+_rails_plugin_remove() {
+  local -a plugins
+
+  plugins=($(_call_program rails_plugins ls -1 vendor/plugins))
+
+  _describe -t plugins 'plugin' plugins
+}
+
+_rails_plugin_new() {
+  _rails_new
+}
+
+_rails_runner() {
+  local context state line curcontext="$curcontext"
+
+  _arguments -C \
+    '(- *)'{-h,--help}'[Show this help message]' \
+    '(-e --environment)'{-e,--environment=}'[Specifies the environment for the runner to operate under (test/development/production)]:name:(test development production)' \
+    ': :->code_or_path'
+
+  case "$state" in
+    code_or_path)
+      _alternative \
+        'files:filename:_files -g "*.rb"' \
+        'codes:ruby code:_guard "^-*" "ruby code"'
+      ;;
+  esac
+}
+
+_rails_r() {
+  _rails_runner
+}
+
+_rails_test() {
+  local context state line curcontext="$curcontext"
+
+  _arguments -C \
+    ': :->path'
+
+  case "$state" in
+    path)
+      _alternative \
+        'files:filename:_files -g "*.rb"'
+      ;;
+  esac
+}
+
+_rails_t() {
+  _rails_test
+}
+
+_rails "$@"
+
+# Local Variables:
+# mode: Shell-Script
+# sh-indentation: 2
+# indent-tabs-mode: nil
+# sh-basic-offset: 2
+# End:
+# vim: ft=zsh sw=2 ts=2 et

From c10241f3d1d7bf77d483e11869a6a00f1d2e5e88 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Thu, 10 Mar 2022 12:58:46 +0100
Subject: [PATCH 859/869] chore: add Carlo sponsorship

---
 .github/FUNDING.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
index 484a8cf53..6c86ac450 100644
--- a/.github/FUNDING.yml
+++ b/.github/FUNDING.yml
@@ -1,2 +1,2 @@
-github: [ohmyzsh, robbyrussell, mcornella, larson-carter]
+github: [ohmyzsh, robbyrussell, mcornella, larson-carter, carlosala]
 open_collective: ohmyzsh

From c4699f8ee11ab74cd5ef1d7ae13c170fd5e7f976 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Thu, 10 Mar 2022 20:41:10 +0100
Subject: [PATCH 860/869] fix(dash): fix "no application knows how to open URL"
 error (#10767)

Fixes #10767
---
 plugins/dash/dash.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/dash/dash.plugin.zsh b/plugins/dash/dash.plugin.zsh
index ace2e33c1..0a627cb7d 100644
--- a/plugins/dash/dash.plugin.zsh
+++ b/plugins/dash/dash.plugin.zsh
@@ -1,5 +1,5 @@
 # Usage: dash [keyword:]query
-dash() { open dash://"$*" }
+dash() { open -a Dash.app dash://"$*" }
 compdef _dash dash
 
 _dash() {

From 345976874550efa09fa7e9cdbe1215ce27d1541b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Thu, 10 Mar 2022 20:56:37 +0100
Subject: [PATCH 861/869] perf(dash): improve dash completion performance

---
 plugins/dash/dash.plugin.zsh | 130 ++++++++++++++++++-----------------
 1 file changed, 67 insertions(+), 63 deletions(-)

diff --git a/plugins/dash/dash.plugin.zsh b/plugins/dash/dash.plugin.zsh
index 0a627cb7d..f6801a870 100644
--- a/plugins/dash/dash.plugin.zsh
+++ b/plugins/dash/dash.plugin.zsh
@@ -5,76 +5,80 @@ compdef _dash dash
 _dash() {
   # No sense doing this for anything except the 2nd position and if we haven't
   # specified which docset to query against
-  if [[ $CURRENT -eq 2 && ! "$words[2]" =~ ":" ]]; then
-    local -a _all_docsets
-    _all_docsets=()
-    # Use defaults to get the array of docsets from preferences
-    # Have to smash it into one big line so that each docset is an element of
-    # our DOCSETS array
-    DOCSETS=("${(@f)$(defaults read com.kapeli.dashdoc docsets | tr -d '\n' | grep -oE '\{.*?\}')}")
+  if [[ $CURRENT -ne 2 || "$words[2]" =~ ":" ]]; then
+    return
+  fi
 
-    # remove all newlines since defaults prints so pretty like
-    # Now get each docset and output each on their own line
-    for doc in "$DOCSETS[@]"; do
-      # Only output docsets that are actually enabled
-      if [[ "`echo $doc | grep -Eo \"isEnabled = .*?;\" | sed 's/[^01]//g'`" == "0" ]]; then
+  local -aU docsets
+  docsets=()
+
+  # Use defaults to get the array of docsets from preferences
+  # Have to smash it into one big line so that each docset is an element of our docsets array
+  # Only output docsets that are actually enabled
+  local -a enabled_docsets
+  enabled_docsets=("${(@f)$(defaults read com.kapeli.dashdoc docsets \
+    | tr -d '\n' | grep -oE '\{.*?\}' | grep -E 'isEnabled = 1;')}")
+
+  local docset name keyword
+  # Now get each docset and output each on their own line
+  for docset in "$enabled_docsets[@]"; do
+    keyword=''
+    # Order of preference as explained to me by @kapeli via email
+    for locator in keyword suggestedKeyword platform; do
+      # Echo the docset, try to find the appropriate keyword
+      # Strip doublequotes and colon from any keyword so that everything has the
+      # same format when output (we'll add the colon in the completion)
+      if [[ "$docset" =~ "$locator = ([^;]*);" ]]; then
+        keyword="${match[1]//[\":]}"
+      fi
+
+      if [[ -z "$keyword" ]]; then
         continue
       fi
 
-      keyword=''
-
-      # Order of preference as explained to me by @kapeli via email
-      KEYWORD_LOCATORS=(keyword suggestedKeyword platform)
-      for locator in "$KEYWORD_LOCATORS[@]"; do
-        # Echo the docset, try to find the appropriate keyword
-        # Strip doublequotes and colon from any keyword so that everything has the
-        # same format when output (we'll add the colon in the completion)
-        keyword=`echo $doc | grep -Eo "$locator = .*?;" | sed -e "s/$locator = \(.*\);/\1/" -e "s/[\":]//g"`
-        if [[ ! -z "$keyword" ]]; then
-          # if we fall back to platform, we should do some checking per @kapeli
-          if [[ "$locator" == "platform" ]]; then
-            # Since these are the only special cases right now, let's not do the
-            # expensive processing unless we have to
-            if [[ "$keyword" = (python|java|qt|cocos2d) ]]; then
-              docsetName=`echo $doc | grep -Eo "docsetName = .*?;" | sed -e "s/docsetName = \(.*\);/\1/" -e "s/[\":]//g"`
-              case "$keyword" in
-                python)
-                  case "$docsetName" in
-                    "Python 2") keyword="python2" ;;
-                    "Python 3") keyword="python3" ;;
-                  esac ;;
-                java)
-                  case "$docsetName" in
-                    "Java SE7") keyword="java7" ;;
-                    "Java SE6") keyword="java6" ;;
-                    "Java SE8") keyword="java8" ;;
-                  esac ;;
-                qt)
-                  case "$docsetName" in
-                    "Qt 5") keyword="qt5" ;;
-                    "Qt 4"|Qt) keyword="qt4" ;;
-                  esac ;;
-                cocos2d)
-                  case "$docsetName" in
-                    Cocos3D) keyword="cocos3d" ;;
-                  esac ;;
-              esac
-            fi
+      # if we fall back to platform, we should do some checking per @kapeli
+      if [[ "$locator" == "platform" ]]; then
+        # Since these are the only special cases right now, let's not do the
+        # expensive processing unless we have to
+        if [[ "$keyword" = (python|java|qt|cocos2d) ]]; then
+          if [[ "$docset" =~ "docsetName = ([^;]*);" ]]; then
+            name="${match[1]//[\":]}"
+            case "$keyword" in
+              python)
+                case "$name" in
+                  "Python 2") keyword="python2" ;;
+                  "Python 3") keyword="python3" ;;
+                esac ;;
+              java)
+                case "$name" in
+                  "Java SE7") keyword="java7" ;;
+                  "Java SE6") keyword="java6" ;;
+                  "Java SE8") keyword="java8" ;;
+                esac ;;
+              qt)
+                case "$name" in
+                  "Qt 5") keyword="qt5" ;;
+                  "Qt 4"|Qt) keyword="qt4" ;;
+                esac ;;
+              cocos2d)
+                case "$name" in
+                  Cocos3D) keyword="cocos3d" ;;
+                esac ;;
+            esac
           fi
-
-          # Bail once we have a match
-          break
         fi
-      done
-
-      # If we have a keyword, add it to the list!
-      if [[ ! -z "$keyword" ]]; then
-        _all_docsets+=($keyword)
       fi
+
+      # Bail once we have a match
+      break
     done
 
-    # special thanks to [arx] on #zsh for getting me sorted on this piece
-    compadd -qS: -- "$_all_docsets[@]"
-    return
-  fi
+    # If we have a keyword, add it to the list!
+    if [[ -n "$keyword" ]]; then
+      docsets+=($keyword)
+    fi
+  done
+
+  # special thanks to [arx] on #zsh for getting me sorted on this piece
+  compadd -qS: -- "$docsets[@]"
 }

From 0f2715bb45ef025b48469817712a4cd3e23839b6 Mon Sep 17 00:00:00 2001
From: Bunyamin Shabanov <42899786+MetaMmodern@users.noreply.github.com>
Date: Mon, 14 Mar 2022 19:09:45 +0200
Subject: [PATCH 862/869] docs: add Table of Contents to README (#10766)

Co-authored-by: Mohan Sha <mohansha@outlook.com>
---
 README.md | 55 ++++++++++++++++++++++++++++++++++++++++++++-----------
 1 file changed, 44 insertions(+), 11 deletions(-)

diff --git a/README.md b/README.md
index 5a6b98443..4c41fad81 100644
--- a/README.md
+++ b/README.md
@@ -18,6 +18,41 @@ To learn more, visit [ohmyz.sh](https://ohmyz.sh), follow [@ohmyzsh](https://twi
 [![Gitpod ready](https://img.shields.io/badge/Gitpod-ready-blue?logo=gitpod)](https://gitpod.io/#https://github.com/ohmyzsh/ohmyzsh)
 [![huntr.dev](https://cdn.huntr.dev/huntr_security_badge_mono.svg)](https://huntr.dev/bounties/disclose/?utm_campaign=ohmyzsh%2Fohmyzsh&utm_medium=social&utm_source=github&target=https%3A%2F%2Fgithub.com%2Fohmyzsh%2Fohmyzsh)
 
+<details>
+<summary>Table of Contents</summary>
+
+- [Getting Started](#getting-started)
+  - [Prerequisites](#prerequisites)
+  - [Basic Installation](#basic-installation)
+    - [Manual inspection](#manual-inspection)
+- [Using Oh My Zsh](#using-oh-my-zsh)
+  - [Plugins](#plugins)
+    - [Enabling Plugins](#enabling-plugins)
+    - [Using Plugins](#using-plugins)
+  - [Themes](#themes)
+    - [Selecting a Theme](#selecting-a-theme)
+  - [FAQ](#faq)
+- [Advanced Topics](#advanced-topics)
+  - [Advanced Installation](#advanced-installation)
+    - [Custom Directory](#custom-directory)
+    - [Unattended install](#unattended-install)
+    - [Installing from a forked repository](#installing-from-a-forked-repository)
+    - [Manual Installation](#manual-installation)
+  - [Installation Problems](#installation-problems)
+  - [Custom Plugins and Themes](#custom-plugins-and-themes)
+- [Getting Updates](#getting-updates)
+  - [Manual Updates](#manual-updates)
+- [Uninstalling Oh My Zsh](#uninstalling-oh-my-zsh)
+- [How do I contribute to Oh My Zsh?](#how-do-i-contribute-to-oh-my-zsh)
+  - [Do NOT send us themes](#do-not-send-us-themes)
+- [Contributors](#contributors)
+- [Follow Us](#follow-us)
+- [Merchandise](#merchandise)
+- [License](#license)
+- [About Planet Argon](#about-planet-argon)
+
+</details>
+
 ## Getting Started
 
 ### Prerequisites
@@ -32,7 +67,7 @@ To learn more, visit [ohmyz.sh](https://ohmyz.sh), follow [@ohmyzsh](https://twi
 Oh My Zsh is installed by running one of the following commands in your terminal. You can install this via the command-line with either `curl`, `wget` or another similar tool.
 
 | Method    | Command                                                                                           |
-|:----------|:--------------------------------------------------------------------------------------------------|
+| :-------- | :------------------------------------------------------------------------------------------------ |
 | **curl**  | `sh -c "$(curl -fsSL https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)"` |
 | **wget**  | `sh -c "$(wget -O- https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)"`   |
 | **fetch** | `sh -c "$(fetch -o - https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)"` |
@@ -82,7 +117,7 @@ _Note that the plugins are separated by whitespace (spaces, tabs, new lines...).
 
 #### Using Plugins
 
-Each plugin includes a __README__, documenting it. This README should show the aliases (if the plugin adds any) and extra goodies that are included in that particular plugin.
+Each plugin includes a **README**, documenting it. This README should show the aliases (if the plugin adds any) and extra goodies that are included in that particular plugin.
 
 ### Themes
 
@@ -194,19 +229,19 @@ REPO=apjanke/oh-my-zsh BRANCH=edge sh install.sh
 
 #### Manual Installation
 
-##### 1. Clone the repository
+##### 1. Clone the repository <!-- omit in toc -->
 
 ```sh
 git clone https://github.com/ohmyzsh/ohmyzsh.git ~/.oh-my-zsh
 ```
 
-##### 2. *Optionally*, backup your existing `~/.zshrc` file
+##### 2. _Optionally_, backup your existing `~/.zshrc` file <!-- omit in toc -->
 
 ```sh
 cp ~/.zshrc ~/.zshrc.orig
 ```
 
-##### 3. Create a new zsh configuration file
+##### 3. Create a new zsh configuration file <!-- omit in toc -->
 
 You can create a new zsh config file by copying the template that we have included for you.
 
@@ -214,7 +249,7 @@ You can create a new zsh config file by copying the template that we have includ
 cp ~/.oh-my-zsh/templates/zshrc.zsh-template ~/.zshrc
 ```
 
-##### 4. Change your default shell
+##### 4. Change your default shell <!-- omit in toc -->
 
 ```sh
 chsh -s $(which zsh)
@@ -222,7 +257,7 @@ chsh -s $(which zsh)
 
 You must log out from your user session and log back in to see this change.
 
-##### 5. Initialize your new zsh configuration
+##### 5. Initialize your new zsh configuration <!-- omit in toc -->
 
 Once you open up a new terminal window, it should load zsh with Oh My Zsh's configuration.
 
@@ -230,10 +265,8 @@ Once you open up a new terminal window, it should load zsh with Oh My Zsh's conf
 
 If you have any hiccups installing, here are a few common fixes.
 
-- You _might_ need to modify your `PATH` in `~/.zshrc` if you're not able to find some commands after
-switching to `oh-my-zsh`.
-- If you installed manually or changed the install location, check the `ZSH` environment variable in
-`~/.zshrc`.
+- You _might_ need to modify your `PATH` in `~/.zshrc` if you're not able to find some commands after switching to `oh-my-zsh`.
+- If you installed manually or changed the install location, check the `ZSH` environment variable in `~/.zshrc`.
 
 ### Custom Plugins and Themes
 

From 4a988c46609c4c2d32240092899ae0aae45b11a6 Mon Sep 17 00:00:00 2001
From: thinszx <1217641779@qq.com>
Date: Thu, 17 Mar 2022 19:54:47 +0800
Subject: [PATCH 863/869] fix(updater): change remote using deprecated `git:`
 protocol (#10779)

---
 tools/upgrade.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tools/upgrade.sh b/tools/upgrade.sh
index b6cb10b5a..afc6a98dd 100755
--- a/tools/upgrade.sh
+++ b/tools/upgrade.sh
@@ -164,6 +164,10 @@ git remote -v | while read remote url extra; do
   git@github.com:robbyrussell/oh-my-zsh(|.git))
     git remote set-url "$remote" "git@github.com:ohmyzsh/ohmyzsh.git"
     break ;;
+  # Update out-of-date "unauthenticated git protocol on port 9418" to https
+  git://github.com/robbyrussell/oh-my-zsh(|.git))
+    git remote set-url "$remote" "https://github.com/ohmyzsh/ohmyzsh.git"
+    break ;;
   esac
 done
 

From f0b5cb133063b16c25afd8740a0c96ca884ee822 Mon Sep 17 00:00:00 2001
From: Leon <82407168+sed-i@users.noreply.github.com>
Date: Fri, 18 Mar 2022 12:09:05 +0000
Subject: [PATCH 864/869] feat(terraform): add alias `tfo` for terraform output
 (#10667)

---
 plugins/terraform/README.md            | 1 +
 plugins/terraform/terraform.plugin.zsh | 1 +
 2 files changed, 2 insertions(+)

diff --git a/plugins/terraform/README.md b/plugins/terraform/README.md
index 474346dc0..59c6e7f2a 100644
--- a/plugins/terraform/README.md
+++ b/plugins/terraform/README.md
@@ -22,6 +22,7 @@ plugins=(... terraform)
 | `tfd` | `terraform destroy`  |
 | `tff` | `terraform fmt`      |
 | `tfi` | `terraform init`     |
+| `tfo` | `terraform output`   |
 | `tfp` | `terraform plan`     |
 | `tfv` | `terraform validate` |
 
diff --git a/plugins/terraform/terraform.plugin.zsh b/plugins/terraform/terraform.plugin.zsh
index f224b79f0..d9e39e6ac 100644
--- a/plugins/terraform/terraform.plugin.zsh
+++ b/plugins/terraform/terraform.plugin.zsh
@@ -13,5 +13,6 @@ alias tfa='terraform apply'
 alias tfd='terraform destroy'
 alias tff='terraform fmt'
 alias tfi='terraform init'
+alias tfo='terraform output'
 alias tfp='terraform plan'
 alias tfv='terraform validate'

From c96fc233c4903ba75fba5bc55e7f91f9dc8e460e Mon Sep 17 00:00:00 2001
From: Wayne Lloyd <waynelloyd@outlook.com>
Date: Fri, 18 Mar 2022 12:11:00 +0000
Subject: [PATCH 865/869] fix(gpg-agent): suppress errors from `gpgconf`
 (#10769)

---
 plugins/gpg-agent/gpg-agent.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/gpg-agent/gpg-agent.plugin.zsh b/plugins/gpg-agent/gpg-agent.plugin.zsh
index 0adc8de5d..1f4be20b0 100644
--- a/plugins/gpg-agent/gpg-agent.plugin.zsh
+++ b/plugins/gpg-agent/gpg-agent.plugin.zsh
@@ -9,7 +9,7 @@ autoload -U add-zsh-hook
 add-zsh-hook preexec _gpg-agent_update-tty_preexec
 
 # If enable-ssh-support is set, fix ssh agent integration
-if [[ $(gpgconf --list-options gpg-agent | awk -F: '$1=="enable-ssh-support" {print $10}') = 1 ]]; then
+if [[ $(gpgconf --list-options gpg-agent 2>/dev/null | awk -F: '$1=="enable-ssh-support" {print $10}') = 1 ]]; then
   unset SSH_AGENT_PID
   if [[ "${gnupg_SSH_AUTH_SOCK_by:-0}" -ne $$ ]]; then
     export SSH_AUTH_SOCK="$(gpgconf --list-dirs agent-ssh-socket)"

From 50113a53f379b7d98e6921ba58e8440324beb32c Mon Sep 17 00:00:00 2001
From: Carlo Sala <carlosalag@protonmail.com>
Date: Tue, 22 Mar 2022 22:39:37 +0100
Subject: [PATCH 866/869] feat(toolbox): add plugin to show `toolbox` prompt
 info (#10685)

---
 plugins/toolbox/README.md          | 19 +++++++++++++++++++
 plugins/toolbox/kubectx.plugin.zsh |  3 +++
 2 files changed, 22 insertions(+)
 create mode 100644 plugins/toolbox/README.md
 create mode 100644 plugins/toolbox/kubectx.plugin.zsh

diff --git a/plugins/toolbox/README.md b/plugins/toolbox/README.md
new file mode 100644
index 000000000..aac2bb3b0
--- /dev/null
+++ b/plugins/toolbox/README.md
@@ -0,0 +1,19 @@
+# toolbox plugin
+
+Plugin for [toolbox](https://containertoolbx.org), a tool to use containerized CLI environments.
+
+To use it, add `toolbox` to your plugins array in your `.zshrc` file:
+
+```zsh
+plugins=(... toolbox)
+```
+
+## Prompt function
+
+This plugins adds `toolbox_prompt_info()` function. Using it in your prompt, it will show the toolbox indicator ⬢ (if you are running in a toolbox container), and nothing if not.
+
+You can use it by adding `$(toolbox_prompt_info)` to your `PROMPT` or `RPROMPT` variable:
+
+```zsh
+RPROMPT='$(toolbox_prompt_info)'
+```
diff --git a/plugins/toolbox/kubectx.plugin.zsh b/plugins/toolbox/kubectx.plugin.zsh
new file mode 100644
index 000000000..8b6bf5ecd
--- /dev/null
+++ b/plugins/toolbox/kubectx.plugin.zsh
@@ -0,0 +1,3 @@
+function toolbox_prompt_info() {
+  [[ -f /run/.toolboxenv ]] && echo "⬢"
+}

From 4dce175e0e4a678b7f93be80c64247c8f5fbab3e Mon Sep 17 00:00:00 2001
From: Suchandra Thapa <suchandra+github@gmail.com>
Date: Thu, 24 Mar 2022 01:21:36 -1000
Subject: [PATCH 867/869] feat(fzf): support `fzf` installed with MacPorts
 (#10794)

---
 plugins/fzf/fzf.plugin.zsh | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/plugins/fzf/fzf.plugin.zsh b/plugins/fzf/fzf.plugin.zsh
index b86af0d2d..a946cf762 100644
--- a/plugins/fzf/fzf.plugin.zsh
+++ b/plugins/fzf/fzf.plugin.zsh
@@ -173,6 +173,32 @@ function fzf_setup_using_cygwin() {
   return 0
 }
 
+function fzf_setup_using_macports() {
+  # If the command is not found, the package isn't installed
+  (( $+commands[fzf] )) || return 1
+
+  # The fzf-zsh-completion package installs the auto-completion in
+  local completions="/opt/local/share/zsh/site-functions/fzf"
+  # The fzf-zsh-completion package installs the key-bindings file in
+  local key_bindings="/opt/local/share/fzf/shell/key-bindings.zsh"
+
+  if [[ ! -f "$completions" || ! -f "$key_bindings" ]]; then
+    return 1
+  fi
+
+  # Auto-completion
+  if [[ -o interactive && "$DISABLE_FZF_AUTO_COMPLETION" != "true" ]]; then
+    source "$completions" 2>/dev/null
+  fi
+
+  # Key bindings
+  if [[ "$DISABLE_FZF_KEY_BINDINGS" != "true" ]]; then
+    source "$key_bindings" 2>/dev/null
+  fi
+
+  return 0
+}
+
 # Indicate to user that fzf installation not found if nothing worked
 function fzf_setup_error() {
   cat >&2 <<'EOF'
@@ -185,6 +211,7 @@ fzf_setup_using_openbsd \
   || fzf_setup_using_debian \
   || fzf_setup_using_opensuse \
   || fzf_setup_using_cygwin \
+  || fzf_setup_using_macports \
   || fzf_setup_using_base_dir \
   || fzf_setup_error
 

From a64d9403775f45036daf3b66693c35df7bab3c53 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Sat, 26 Mar 2022 15:10:56 +0100
Subject: [PATCH 868/869] refactor(1password): extract `opswd` function

---
 plugins/1password/1password.plugin.zsh | 51 ++++----------------------
 plugins/1password/_opswd               |  9 +++++
 plugins/1password/opswd                | 37 +++++++++++++++++++
 3 files changed, 53 insertions(+), 44 deletions(-)
 create mode 100644 plugins/1password/_opswd
 create mode 100644 plugins/1password/opswd

diff --git a/plugins/1password/1password.plugin.zsh b/plugins/1password/1password.plugin.zsh
index 9398b02b4..941523ca8 100644
--- a/plugins/1password/1password.plugin.zsh
+++ b/plugins/1password/1password.plugin.zsh
@@ -1,46 +1,9 @@
-if (( ${+commands[op]} )); then
-  eval "$(op completion zsh)"
-  compdef _op op
-fi
+# Do nothing if op is not installed
+(( ${+commands[op]} )) || return
 
-# opswd puts the password of the named service into the clipboard. If there's a
-# one time password, it will be copied into the clipboard after 10 seconds. The
-# clipboard is cleared after another 20 seconds.
-function opswd() {
-  if [[ $# -lt 1 ]]; then
-    echo "Usage: opswd <service>"
-    return 1
-  fi
+# Load op completion
+eval "$(op completion zsh)"
+compdef _op op
 
-  local service=$1
-
-  # If not logged in, print error and return
-  op list users > /dev/null || return
-
-  local password
-  # Copy the password to the clipboard
-  if ! password=$(op get item "$service" --fields password 2>/dev/null); then
-    echo "error: could not obtain password for $service"
-    return 1
-  fi
-
-  echo -n "$password" | clipcopy
-  echo "✔ password for $service copied to clipboard"
-
-  # If there's a one time password, copy it to the clipboard after 5 seconds
-  local totp
-  if totp=$(op get totp "$service" 2>/dev/null) && [[ -n "$totp" ]]; then
-    sleep 10 && echo -n "$totp" | clipcopy
-    echo "✔ TOTP for $service copied to clipboard"
-  fi
-
-  (sleep 20 && clipcopy </dev/null 2>/dev/null) &!
-}
-
-function _opswd() {
-  local -a services
-  services=("${(@f)$(op list items --categories Login 2>/dev/null | op get item - --fields title 2>/dev/null)}")
-  [[ -z "$services" ]] || compadd -a -- services
-}
-
-compdef _opswd opswd
+# Load opswd function
+autoload -Uz opswd
diff --git a/plugins/1password/_opswd b/plugins/1password/_opswd
new file mode 100644
index 000000000..b92bf8fc8
--- /dev/null
+++ b/plugins/1password/_opswd
@@ -0,0 +1,9 @@
+#compdef opswd
+
+function _opswd() {
+  local -a services
+  services=("${(@f)$(op list items --categories Login 2>/dev/null | op get item - --fields title 2>/dev/null)}")
+  [[ -z "$services" ]] || compadd -a -- services
+}
+
+_opswd "$@"
diff --git a/plugins/1password/opswd b/plugins/1password/opswd
new file mode 100644
index 000000000..6849d42b3
--- /dev/null
+++ b/plugins/1password/opswd
@@ -0,0 +1,37 @@
+#autoload
+
+# opswd puts the password of the named service into the clipboard. If there's a
+# one time password, it will be copied into the clipboard after 10 seconds. The
+# clipboard is cleared after another 20 seconds.
+function opswd() {
+  if [[ $# -lt 1 ]]; then
+    echo "Usage: opswd <service>"
+    return 1
+  fi
+
+  local service=$1
+
+  # If not logged in, print error and return
+  op list users > /dev/null || return
+
+  local password
+  # Copy the password to the clipboard
+  if ! password=$(op get item "$service" --fields password 2>/dev/null); then
+    echo "error: could not obtain password for $service"
+    return 1
+  fi
+
+  echo -n "$password" | clipcopy
+  echo "✔ password for $service copied to clipboard"
+
+  # If there's a one time password, copy it to the clipboard after 5 seconds
+  local totp
+  if totp=$(op get totp "$service" 2>/dev/null) && [[ -n "$totp" ]]; then
+    sleep 10 && echo -n "$totp" | clipcopy
+    echo "✔ TOTP for $service copied to clipboard"
+  fi
+
+  (sleep 20 && clipcopy </dev/null 2>/dev/null) &!
+}
+
+opswd "$@"

From dbadfa0810c0be346b98c02cc802c33fa43bee11 Mon Sep 17 00:00:00 2001
From: Adam Pike <adam.pike@1password.com>
Date: Sat, 26 Mar 2022 15:11:04 +0100
Subject: [PATCH 869/869] refactor(1password): support CLI 2 and soft-deprecate
 CLI 1 (#10787)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This change still supports CLI 1, but shows a deprecation warning
on the first run of `opswd`. Support for CLI 1 shall be removed
in the near future.

Closes #10787

Co-authored-by: Marc Cornellà <hello@mcornella.com>
---
 plugins/1password/README.md | 11 ++++++---
 plugins/1password/_opswd    | 12 ++++++++-
 plugins/1password/opswd     | 49 ++++++++++++++++++++++++++++++++++---
 3 files changed, 63 insertions(+), 9 deletions(-)

diff --git a/plugins/1password/README.md b/plugins/1password/README.md
index f6790ca8a..f6854da53 100644
--- a/plugins/1password/README.md
+++ b/plugins/1password/README.md
@@ -25,11 +25,14 @@ which service you want to get.
 For example, `opswd github.com` will put your GitHub password into your clipboard, and if
 a TOTP is available, it will be copied to the clipboard after 10 seconds.
 
-> NOTE: you need to be logged in for `opswd` to work. See:
+> NOTE: you need to be signed in for `opswd` to work. If you are using biometric unlock,
+> 1Password CLI will automatically prompt you to sign in. See:
 >
-> - [Sign in or out](https://support.1password.com/command-line/#sign-in-or-out)
-> - [Session management](https://support.1password.com/command-line/#appendix-session-management)
+> - [Get started with 1Password CLI 2: Sign in](https://developer.1password.com/docs/cli/get-started#sign-in)
+> - [Sign in to your 1Password account manually](https://developer.1password.com/docs/cli/sign-in-manually)
 
 ## Requirements
 
-- [1Password's command line utility](https://1password.com/downloads/command-line/).
+- [1Password CLI 2](https://developer.1password.com/docs/cli/get-started#install)
+
+  > NOTE: if you're using 1Password CLI 1, [see how to upgrade to CLI 2](https://developer.1password.com/docs/cli/upgrade).
diff --git a/plugins/1password/_opswd b/plugins/1password/_opswd
index b92bf8fc8..dbc094f87 100644
--- a/plugins/1password/_opswd
+++ b/plugins/1password/_opswd
@@ -2,8 +2,18 @@
 
 function _opswd() {
   local -a services
-  services=("${(@f)$(op list items --categories Login 2>/dev/null | op get item - --fields title 2>/dev/null)}")
+  services=("${(@f)$(op item list --categories Login --cache 2>/dev/null | awk 'NR != 1 { print $2 }')}")
   [[ -z "$services" ]] || compadd -a -- services
 }
 
+# TODO: 2022-03-26: Remove support for op CLI 1
+autoload -Uz is-at-least
+is-at-least 2.0.0 $(op --version) || {
+  function _opswd() {
+    local -a services
+    services=("${(@f)$(op list items --categories Login 2>/dev/null | op get item - --fields title 2>/dev/null)}")
+    [[ -z "$services" ]] || compadd -a -- services
+  }
+}
+
 _opswd "$@"
diff --git a/plugins/1password/opswd b/plugins/1password/opswd
index 6849d42b3..57672807e 100644
--- a/plugins/1password/opswd
+++ b/plugins/1password/opswd
@@ -12,11 +12,11 @@ function opswd() {
   local service=$1
 
   # If not logged in, print error and return
-  op list users > /dev/null || return
+  op user list > /dev/null || return
 
   local password
   # Copy the password to the clipboard
-  if ! password=$(op get item "$service" --fields password 2>/dev/null); then
+  if ! password=$(op item get "$service" --fields password 2>/dev/null); then
     echo "error: could not obtain password for $service"
     return 1
   fi
@@ -24,9 +24,9 @@ function opswd() {
   echo -n "$password" | clipcopy
   echo "✔ password for $service copied to clipboard"
 
-  # If there's a one time password, copy it to the clipboard after 5 seconds
+  # If there's a one time password, copy it to the clipboard after 10 seconds
   local totp
-  if totp=$(op get totp "$service" 2>/dev/null) && [[ -n "$totp" ]]; then
+  if totp=$(op item get --otp "$service" 2>/dev/null) && [[ -n "$totp" ]]; then
     sleep 10 && echo -n "$totp" | clipcopy
     echo "✔ TOTP for $service copied to clipboard"
   fi
@@ -34,4 +34,45 @@ function opswd() {
   (sleep 20 && clipcopy </dev/null 2>/dev/null) &!
 }
 
+# TODO: 2022-03-26: Remove support for op CLI 1
+autoload -Uz is-at-least
+is-at-least 2.0.0 $(op --version) || {
+  print -ru2 ${(%):-"%F{yellow}opswd: usage with op version $(op --version) is deprecated. Upgrade to CLI 2 and reload zsh.
+For instructions, see https://developer.1password.com/docs/cli/upgrade.%f"}
+
+  # opswd puts the password of the named service into the clipboard. If there's a
+  # one time password, it will be copied into the clipboard after 10 seconds. The
+  # clipboard is cleared after another 20 seconds.
+  function opswd() {
+    if [[ $# -lt 1 ]]; then
+      echo "Usage: opswd <service>"
+      return 1
+    fi
+
+    local service=$1
+
+    # If not logged in, print error and return
+    op list users > /dev/null || return
+
+    local password
+    # Copy the password to the clipboard
+    if ! password=$(op get item "$service" --fields password 2>/dev/null); then
+      echo "error: could not obtain password for $service"
+      return 1
+    fi
+
+    echo -n "$password" | clipcopy
+    echo "✔ password for $service copied to clipboard"
+
+    # If there's a one time password, copy it to the clipboard after 5 seconds
+    local totp
+    if totp=$(op get totp "$service" 2>/dev/null) && [[ -n "$totp" ]]; then
+      sleep 10 && echo -n "$totp" | clipcopy
+      echo "✔ TOTP for $service copied to clipboard"
+    fi
+
+    (sleep 20 && clipcopy </dev/null 2>/dev/null) &!
+  }
+}
+
 opswd "$@"