From 88f42b6132adedff7557170168416d575569b56e Mon Sep 17 00:00:00 2001
From: Andrew Janke <janke@pobox.com>
Date: Sat, 21 Feb 2015 16:25:28 -0500
Subject: [PATCH] Add support for variant "utf8" locale suffix spelling. Fix
 dumb bug in iconv call that would cause it to hang.

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

diff --git a/lib/termsupport.zsh b/lib/termsupport.zsh
index 7cb3791e..52622f5a 100644
--- a/lib/termsupport.zsh
+++ b/lib/termsupport.zsh
@@ -64,12 +64,12 @@ if [[ "$TERM_PROGRAM" == "Apple_Terminal" ]] && [[ -z "$INSIDE_EMACS" ]]; then
   # Returns nonzero if encoding failed
   function _omz_urlencode() {
     local str=$1
-    local url_str=''
+    local url_str=""
 
     # URLs must use UTF-8 encoding; convert if required
     local encoding=${LC_CTYPE/*./}
-    if [[ -n $encoding && $encoding != UTF-8 ]]; then
-      str=$(iconv -f $encoding -t UTF-8)
+    if [[ -n $encoding && $encoding != UTF-8 && $encoding != utf8 ]]; then
+      str=$(echo $str | iconv -f $encoding -t UTF-8)
       if [[ $? != 0 ]]; then
         echo "Error converting string from $encoding to UTF-8" >&2
         return 1