mirror of
https://github.com/fish-shell/fish-shell
synced 2024-12-26 12:53:13 +00:00
Smaller edits
darcs-hash:20060124181410-ac50b-4ec9e2990852a678de7d47a565ed41780b5279fc.gz
This commit is contained in:
parent
452558624c
commit
18d06cf10f
2 changed files with 9 additions and 20 deletions
27
builtin.c
27
builtin.c
|
@ -277,13 +277,9 @@ static int builtin_block( wchar_t **argv )
|
|||
;
|
||||
|
||||
int scope=UNSET;
|
||||
|
||||
int erase = 0;
|
||||
|
||||
int argc=builtin_count_args( argv );
|
||||
|
||||
int type = (1<<EVENT_ANY);
|
||||
|
||||
int type = (1<<EVENT_ANY);
|
||||
|
||||
woptind=0;
|
||||
|
||||
|
@ -645,7 +641,7 @@ static int builtin_exec( wchar_t **argv )
|
|||
}
|
||||
|
||||
/**
|
||||
Print the definitions of the given function to sb_out
|
||||
Print the definition of the given function to sb_out
|
||||
stringbuffer. Used by the functions builtin.
|
||||
*/
|
||||
static void functions_def( wchar_t *name )
|
||||
|
@ -910,7 +906,7 @@ static int builtin_functions( wchar_t **argv )
|
|||
(void *)0 );
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
free( names_arr );
|
||||
al_destroy( &names );
|
||||
return 0;
|
||||
|
@ -932,16 +928,14 @@ static int builtin_functions( wchar_t **argv )
|
|||
for( i=0; i<al_get_count( &names ); i++ )
|
||||
{
|
||||
functions_def( names_arr[i] );
|
||||
|
||||
}
|
||||
free( names_arr );
|
||||
al_destroy( &names );
|
||||
break;
|
||||
}
|
||||
|
||||
|
||||
default:
|
||||
{
|
||||
|
||||
for( i=woptind; i<argc; i++ )
|
||||
{
|
||||
if( !function_exists( argv[i] ) )
|
||||
|
@ -951,23 +945,19 @@ static int builtin_functions( wchar_t **argv )
|
|||
functions_def( argv[i] );
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
break;
|
||||
}
|
||||
}
|
||||
return res;
|
||||
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
Test whether the specified string is a valid name for a keybinding
|
||||
*/
|
||||
static int wcsbindingname( wchar_t *str )
|
||||
{
|
||||
|
||||
|
||||
{
|
||||
while( *str )
|
||||
{
|
||||
if( (!iswalnum(*str)) && (*str != L'-' ) )
|
||||
|
@ -1062,10 +1052,9 @@ static int builtin_function( wchar_t **argv )
|
|||
argv[0],
|
||||
long_options[opt_index].name );
|
||||
builtin_print_help( argv[0], sb_err );
|
||||
|
||||
|
||||
res = 1;
|
||||
break;
|
||||
|
||||
break;
|
||||
|
||||
case 'd':
|
||||
desc=woptarg;
|
||||
|
|
2
env.c
2
env.c
|
@ -305,7 +305,7 @@ static void handle_locale()
|
|||
++_nl_msg_cat_cntr;
|
||||
}
|
||||
#elif HAVE_DCGETTEXT
|
||||
dcgettext("fish","",LC_MESSAGES);
|
||||
dcgettext("fish","Changing language to English",LC_MESSAGES);
|
||||
#endif
|
||||
|
||||
if( is_interactive )
|
||||
|
|
Loading…
Reference in a new issue