Archives/oh-my-fish_theme-bobthefish
1
0
Fork 0
mirror of https://github.com/oh-my-fish/theme-bobthefish.git synced 2024-10-27 20:34:23 +00:00
Code Issues Projects Releases Wiki Activity

Add $theme_avoid_ambiguous_glyphs

Browse Source 
Allow users to avoid ambiguous width glyphs to prevent issues with guessing the width of multibyte characters.

For now, this just avoids `…`. We'll add some more if we run into them.

Fixes #10
This commit is contained in:
Justin Hileman 2015-10-13 20:34:35 -07:00
parent e71317aa19
commit 160bc9683e
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
README.md
View File

@ -72,6 +72,7 @@ set -g theme_display_user yes
set -g theme_title_display_process yes set -g theme_title_display_process yes
set -g theme_title_display_path no set -g theme_title_display_path no
set -g theme_date_format "+%a %H:%M" set -g theme_date_format "+%a %H:%M"
set -g theme_avoid_ambiguous_glyphs yes
set -g default_user your_normal_user set -g default_user your_normal_user
``` ```

10
fish_prompt.fish
View File

@ -22,6 +22,7 @@
# set -g theme_title_display_process yes # set -g theme_title_display_process yes
# set -g theme_title_display_path no # set -g theme_title_display_path no
# set -g theme_date_format "+%a %H:%M" # set -g theme_date_format "+%a %H:%M"
# set -g theme_avoid_ambiguous_glyphs yes
# set -g default_user your_normal_user # set -g default_user your_normal_user
set -g __bobthefish_current_bg NONE set -g __bobthefish_current_bg NONE
@ -324,8 +325,13 @@ function __bobthefish_prompt_git -d 'Display the actual git state'
set -l new '' set -l new ''
set -l show_untracked (git config --bool bash.showUntrackedFiles) set -l show_untracked (git config --bool bash.showUntrackedFiles)
if [ "$theme_display_git_untracked" != 'no' -a "$show_untracked" != 'false' ] if [ "$theme_display_git_untracked" != 'no' -a "$show_untracked" != 'false' ]
set new (command git ls-files --other --exclude-standard) if [ (command git ls-files --other --exclude-standard) ]
[ "$new" ]; and set new '…' if [ "$theme_avoid_ambiguous_glyphs" = 'yes' ]
set new '...'
else
set new '…'
end
end
end end
set -l flags "$dirty$staged$stashed$ahead$new" set -l flags "$dirty$staged$stashed$ahead$new"