github-mirror/fish-shell
github-mirror/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2025-02-22 13:01:12 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix bug in completion pager where non-ascii characters where escaped because the locale was set after the completion strings where read in. Thanks to mikeX for the report.

Browse Source 
darcs-hash:20070103125702-ac50b-752f6e1182dba4356e068191b52fdb05d3cb5649.gz
This commit is contained in:
axel 2007-01-03 22:57:02 +10:00
parent 2ec7428e32
commit 9c23d50e92
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
fish_pager.c
View File

@ -916,6 +916,7 @@ static void mangle_completions( array_list_t *l, const wchar_t *prefix )
{ {
*end = 0; *end = 0;
wchar_t * str = escape( start, 1 ); wchar_t * str = escape( start, 1 );
comp->comp_width += my_wcswidth( str ); comp->comp_width += my_wcswidth( str );
halloc_register( global_context, str ); halloc_register( global_context, str );
al_push( comp->comp, str ); al_push( comp->comp, str );
@ -981,7 +982,6 @@ static void init()
program_name = L"fish_pager"; program_name = L"fish_pager";
wsetlocale( LC_ALL, L"" );
/* /*
Make fd 1 output to screen, and use some other fd for writing Make fd 1 output to screen, and use some other fd for writing
@ -1156,6 +1156,7 @@ int main( int argc, char **argv )
else else
{ {
wsetlocale( LC_ALL, L"" );
comp = al_halloc( global_context ); comp = al_halloc( global_context );
prefix = str2wcs( argv[2] ); prefix = str2wcs( argv[2] );
is_quoted = strcmp( "1", argv[1] )==0; is_quoted = strcmp( "1", argv[1] )==0;