Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2024-11-10 23:24:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

Indentation fixes, add a few comments, spelling, etc.

Browse source 
darcs-hash:20071028090840-75c98-2ae076441517cd7a0d8172fad28edaf6f034b70c.gz
This commit is contained in:
liljencrantz 2007-10-28 19:08:40 +10:00
parent a1af86cb6b
commit 348e991d7c
4 changed files with 17 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
builtin.c
View file

@ -888,10 +888,10 @@ static int builtin_block( wchar_t **argv )
} }
/** /**
The builtin builtin, used for given builtins precedence over The builtin builtin, used for giving builtins precedence over
functions. Mostly handled by the parser. All this code does is some functions. Mostly handled by the parser. All this code does is some
additional operational modes, such as printing a list of all additional operational modes, such as printing a list of all
builtins. builtins, printing help, etc.
*/ */
static int builtin_builtin( wchar_t **argv ) static int builtin_builtin( wchar_t **argv )
{ {

3
env.c
View file

@ -468,8 +468,7 @@ static void setup_path()
sb_append( &b, sb_append( &b,
ARRAY_SEP_STR, ARRAY_SEP_STR,
path_el[j], path_el[j] );
(void *)0 );
env_set( L"PATH", (wchar_t *)b.buff, ENV_GLOBAL | ENV_EXPORT ); env_set( L"PATH", (wchar_t *)b.buff, ENV_GLOBAL | ENV_EXPORT );

4
reader.c
View file

@ -1129,11 +1129,8 @@ static void run_pager( wchar_t *prefix, int is_quoted, array_list_t *comp )
parse_util_token_extent( data->buff, data->buff_pos, &begin, 0, 0, 0 ); parse_util_token_extent( data->buff, data->buff_pos, &begin, 0, 0, 0 );
base_len = data->buff_pos - (begin-data->buff); base_len = data->buff_pos - (begin-data->buff);
} }
foo = escape( el->completion + base_len, ESCAPE_ALL | ESCAPE_NO_QUOTED ); foo = escape( el->completion + base_len, ESCAPE_ALL | ESCAPE_NO_QUOTED );
} }
else else
@ -1294,6 +1291,7 @@ static int handle_completions( array_list_t *comp )
} }
done = 1; done = 1;
len = 1; len = 1;
break;
} }
} }

12
share/config.fish.in
View file

@ -17,10 +17,12 @@ set -g IFS \n\ \t
# #
set -l configdir ~/.config set -l configdir ~/.config
if set -q XDG_CONFIG_HOME if set -q XDG_CONFIG_HOME
set configdir $XDG_CONFIG_HOME set configdir $XDG_CONFIG_HOME
end end
# These are used internally by fish in various places
if not set -q __fish_datadir if not set -q __fish_datadir
set -g __fish_datadir @datadir@/fish set -g __fish_datadir @datadir@/fish
end end
@ -29,6 +31,9 @@ if not set -q __fish_sysconfdir
set -g __fish_sysconfdir @sysconfdir@/fish set -g __fish_sysconfdir @sysconfdir@/fish
end end
# Set up function and completion paths. Make sure that the fish
# default functions/completions are included in the respective path.
if not set -q fish_function_path if not set -q fish_function_path
set -U fish_function_path $configdir/fish/functions @sysconfdir@/fish/functions @datadir@/fish/functions set -U fish_function_path $configdir/fish/functions @sysconfdir@/fish/functions @datadir@/fish/functions
end end
@ -39,8 +44,13 @@ end
set __fish_help_dir @docdir@ set __fish_help_dir @docdir@
#
# This is a Solaris-specific test to modify the PATH so that # This is a Solaris-specific test to modify the PATH so that
# Posix-conformant tools are used by default. # Posix-conformant tools are used by default. It is separate from the
# other PATH code because this directory needs to be prepended, not
# appended, since it contains POSIX-compliant replacements for various
# system utilities.
#
if test -d /usr/xpg4/bin if test -d /usr/xpg4/bin
if not contains /usr/xpg4/bin $PATH if not contains /usr/xpg4/bin $PATH