From 88d21fea6c0d90e58f221f9a2320ba7b73dac97a Mon Sep 17 00:00:00 2001
From: Alexis Hildebrandt <afh@surryhill.net>
Date: Sun, 15 Apr 2018 15:16:44 +0200
Subject: Improve emotty plugin (#5999)

* The display_emotty function show the name of the displayed emotty set

* Unless an emotty set was given show the emotty set configured
  in $emotty_set
---
 plugins/emotty/emotty.plugin.zsh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'plugins/emotty/emotty.plugin.zsh')

diff --git a/plugins/emotty/emotty.plugin.zsh b/plugins/emotty/emotty.plugin.zsh
index b32dd1a4c..6a8bf6127 100644
--- a/plugins/emotty/emotty.plugin.zsh
+++ b/plugins/emotty/emotty.plugin.zsh
@@ -32,7 +32,8 @@ function emotty() {
 }
 
 function display_emotty() {
-  local name=$1
+  local name=${1:-$emotty_set}
+  echo $name
   for i in ${=_emotty_sets[$name]}; do
     printf "${emoji[$i]}${emoji2[emoji_style]}  "
   done
-- 
cgit v1.2.3-70-g09d2


From aa5279f2dc2502d13ae0e7d2fa8647db833e31f1 Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Sun, 15 Apr 2018 15:20:26 +0200
Subject: Fix typo that resulted in math error (#6731)

[emotty] fix typo that resulted in math error
---
 plugins/emotty/emotty.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'plugins/emotty/emotty.plugin.zsh')

diff --git a/plugins/emotty/emotty.plugin.zsh b/plugins/emotty/emotty.plugin.zsh
index 6a8bf6127..b0d24c322 100644
--- a/plugins/emotty/emotty.plugin.zsh
+++ b/plugins/emotty/emotty.plugin.zsh
@@ -26,7 +26,7 @@ function emotty() {
   # Use emotty set defined by user, fallback to default
   local emotty=${_emotty_sets[${emotty_set:-$emotty_default_set}]}
   # Parse $TTY number, normalizing it to an emotty set index
-  (( tty = (${TTY##/dev/ttys} % ${#${=emotty}}) + 1 ))
+  (( tty = (${TTY##/dev/tty} % ${#${=emotty}}) + 1 ))
   local character_name=${${=emotty}[tty]}
   echo "${emoji[${character_name}]}${emoji2[emoji_style]}"
 }
-- 
cgit v1.2.3-70-g09d2


From 1f078898887bf96e793772a80e0dae1e96eeadc8 Mon Sep 17 00:00:00 2001
From: Marc Cornellà <marc.cornella@live.com>
Date: Sat, 25 May 2019 12:19:51 +0200
Subject: emotty: fix for undefined $TTY (FreeBSD) (#7844)

See https://github.com/robbyrussell/oh-my-zsh/pull/6731#issuecomment-449653115
---
 plugins/emotty/emotty.plugin.zsh | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'plugins/emotty/emotty.plugin.zsh')

diff --git a/plugins/emotty/emotty.plugin.zsh b/plugins/emotty/emotty.plugin.zsh
index b0d24c322..e288b5cfb 100644
--- a/plugins/emotty/emotty.plugin.zsh
+++ b/plugins/emotty/emotty.plugin.zsh
@@ -25,8 +25,14 @@ emotty_default_set=emoji
 function emotty() {
   # Use emotty set defined by user, fallback to default
   local emotty=${_emotty_sets[${emotty_set:-$emotty_default_set}]}
-  # Parse $TTY number, normalizing it to an emotty set index
-  (( tty = (${TTY##/dev/tty} % ${#${=emotty}}) + 1 ))
+
+  # Parse tty number via prompt expansion. %l equals:
+  # - N      if tty = /dev/ttyN
+  # - pts/N  if tty = /dev/pts/N
+  local tty = ${${(%):-%l}##pts/}
+  # Normalize it to an emotty set index
+  (( tty = (tty % ${#${=emotty}}) + 1 ))
+
   local character_name=${${=emotty}[tty]}
   echo "${emoji[${character_name}]}${emoji2[emoji_style]}"
 }
-- 
cgit v1.2.3-70-g09d2