533e31f2cc232c6c58529be9ce634979db9dde31

 1diff --git a/themes/jonathan.zsh-theme b/themes/jonathan.zsh-theme
 2index 9f0f3027163637ebd286a85f4866945c0b487b5b..bca92970c48f63748e4df10b92d1c43fe6386d18 100644
 3--- a/themes/jonathan.zsh-theme
 4+++ b/themes/jonathan.zsh-theme
 5@@ -71,17 +71,30 @@ setprompt () {
 6 
 7     ###
 8     # See if we can use extended characters to look nicer.
 9-
10-    typeset -A altchar
11-    set -A altchar ${(s..)terminfo[acsc]}
12-    PR_SET_CHARSET="%{$terminfo[enacs]%}"
13-    PR_SHIFT_IN="%{$terminfo[smacs]%}"
14-    PR_SHIFT_OUT="%{$terminfo[rmacs]%}"
15-    PR_HBAR=${altchar[q]:--}
16-    PR_ULCORNER=${altchar[l]:--}
17-    PR_LLCORNER=${altchar[m]:--}
18-    PR_LRCORNER=${altchar[j]:--}
19-    PR_URCORNER=${altchar[k]:--}
20+    # UTF-8 Fixed
21+
22+    if [[ $(locale charmap) == "UTF-8" ]]; then
23+	PR_SET_CHARSET=""
24+	PR_SHIFT_IN=""
25+	PR_SHIFT_OUT=""
26+	PR_HBAR="─"
27+        PR_ULCORNER="┌"
28+        PR_LLCORNER="└"
29+        PR_LRCORNER="┘"
30+        PR_URCORNER="┐"
31+    else
32+        typeset -A altchar
33+        set -A altchar ${(s..)terminfo[acsc]}
34+        # Some stuff to help us draw nice lines
35+        PR_SET_CHARSET="%{$terminfo[enacs]%}"
36+        PR_SHIFT_IN="%{$terminfo[smacs]%}"
37+        PR_SHIFT_OUT="%{$terminfo[rmacs]%}"
38+        PR_HBAR='$PR_SHIFT_IN${altchar[q]:--}$PR_SHIFT_OUT'
39+        PR_ULCORNER='$PR_SHIFT_IN${altchar[l]:--}$PR_SHIFT_OUT'
40+        PR_LLCORNER='$PR_SHIFT_IN${altchar[m]:--}$PR_SHIFT_OUT'
41+        PR_LRCORNER='$PR_SHIFT_IN${altchar[j]:--}$PR_SHIFT_OUT'
42+        PR_URCORNER='$PR_SHIFT_IN${altchar[k]:--}$PR_SHIFT_OUT'
43+     fi
44 
45 
46     ###
47@@ -113,31 +126,31 @@ setprompt () {
48     # Finally, the prompt.
49 
50     PROMPT='$PR_SET_CHARSET$PR_STITLE${(e)PR_TITLEBAR}\
51-$PR_CYAN$PR_SHIFT_IN$PR_ULCORNER$PR_HBAR$PR_SHIFT_OUT$PR_GREY(\
52+$PR_CYAN$PR_ULCORNER$PR_HBAR$PR_GREY(\
53 $PR_GREEN%$PR_PWDLEN<...<%~%<<\
54-$PR_GREY)`rvm_prompt_info || rbenv_prompt_info`$PR_CYAN$PR_SHIFT_IN$PR_HBAR$PR_HBAR${(e)PR_FILLBAR}$PR_HBAR$PR_SHIFT_OUT$PR_GREY(\
55+$PR_GREY)`rvm_prompt_info || rbenv_prompt_info`$PR_CYAN$PR_HBAR$PR_HBAR${(e)PR_FILLBAR}$PR_HBAR$PR_GREY(\
56 $PR_CYAN%(!.%SROOT%s.%n)$PR_GREY@$PR_GREEN%m:%l\
57-$PR_GREY)$PR_CYAN$PR_SHIFT_IN$PR_HBAR$PR_URCORNER$PR_SHIFT_OUT\
58+$PR_GREY)$PR_CYAN$PR_HBAR$PR_URCORNER\
59 
60-$PR_CYAN$PR_SHIFT_IN$PR_LLCORNER$PR_BLUE$PR_HBAR$PR_SHIFT_OUT(\
61+$PR_CYAN$PR_LLCORNER$PR_BLUE$PR_HBAR(\
62 $PR_YELLOW%D{%H:%M:%S}\
63-$PR_LIGHT_BLUE%{$reset_color%}`git_prompt_info``git_prompt_status`$PR_BLUE)$PR_CYAN$PR_SHIFT_IN$PR_HBAR\
64-$PR_SHIFT_IN$PR_HBAR$PR_SHIFT_OUT\
65+$PR_LIGHT_BLUE%{$reset_color%}`git_prompt_info``git_prompt_status`$PR_BLUE)$PR_CYAN$PR_HBAR\
66+$PR_HBAR\
67 >$PR_NO_COLOUR '
68 
69     # display exitcode on the right when >0
70     return_code="%(?..%{$fg[red]%}%? ↵ %{$reset_color%})"
71-    RPROMPT=' $return_code$PR_CYAN$PR_SHIFT_IN$PR_HBAR$PR_BLUE$PR_HBAR$PR_SHIFT_OUT\
72-($PR_YELLOW%D{%a,%b%d}$PR_BLUE)$PR_SHIFT_IN$PR_HBAR$PR_CYAN$PR_LRCORNER$PR_SHIFT_OUT$PR_NO_COLOUR'
73+    RPROMPT=' $return_code$PR_CYAN$PR_HBAR$PR_BLUE$PR_HBAR\
74+($PR_YELLOW%D{%a,%b%d}$PR_BLUE)$PR_HBAR$PR_CYAN$PR_LRCORNER$PR_NO_COLOUR'
75 
76-    PS2='$PR_CYAN$PR_SHIFT_IN$PR_HBAR$PR_SHIFT_OUT\
77-$PR_BLUE$PR_SHIFT_IN$PR_HBAR$PR_SHIFT_OUT(\
78-$PR_LIGHT_GREEN%_$PR_BLUE)$PR_SHIFT_IN$PR_HBAR$PR_SHIFT_OUT\
79-$PR_CYAN$PR_SHIFT_IN$PR_HBAR$PR_SHIFT_OUT$PR_NO_COLOUR '
80+    PS2='$PR_CYAN$PR_HBAR\
81+$PR_BLUE$PR_HBAR(\
82+$PR_LIGHT_GREEN%_$PR_BLUE)$PR_HBAR\
83+$PR_CYAN$PR_HBAR$PR_NO_COLOUR '
84 }
85 
86 setprompt
87 
88 autoload -U add-zsh-hook
89 add-zsh-hook precmd  theme_precmd
90-add-zsh-hook preexec theme_preexec
91+add-zsh-hook preexec theme_preexec