aboutsummaryrefslogtreecommitdiffhomepage
path: root/expand.c
diff options
context:
space:
mode:
authorGravatar axel <axel@liljencrantz.se>2005-12-08 01:57:17 +1000
committerGravatar axel <axel@liljencrantz.se>2005-12-08 01:57:17 +1000
commit0c877183b92f7d256d9e82ccf32715f939e4ad4e (patch)
treed53fd2239250d72e5bce22b7373893f2c8dcf444 /expand.c
parenta46be4cadb8de762b658e062eb194b202903a75d (diff)
Spelling
darcs-hash:20051207155717-ac50b-6146b02bd8aff0fd27816acd5e31b38093d8575d.gz
Diffstat (limited to 'expand.c')
-rw-r--r--expand.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/expand.c b/expand.c
index 941ed6f9..7436a77b 100644
--- a/expand.c
+++ b/expand.c
@@ -68,7 +68,7 @@ parameter expansion.
#define COMPLETE_LAST_DESC COMPLETE_SEP_STR L"Last background job"
#define COMPLETE_VAR_DESC L"Variable name is zero characters long."
-#define COMPLETE_VAR2_DESC L" Did you mean {$VARIABLE}? For information on how variable expantion in fish differs from Posix variable expantion, see the manual section on variable expantion by typing 'help expand-variable'."
+#define COMPLETE_VAR2_DESC L" Did you mean {$VARIABLE}? For information on how variable expansion in fish differs from Posix variable expansion, see the manual section on variable expansion by typing 'help expand-variable'."
/**
String in process expansion denoting ourself
@@ -95,8 +95,8 @@ parameter expansion.
any tokens which need to be expanded or otherwise altered. Clean
strings can be passed through expand_string and expand_one without
changing them. About 90% of all strings are clean, so skipping
- expantion on them actually does save a small amount of time, since
- it avoids multiple memory allocations during the expantion process.
+ expansion on them actually does save a small amount of time, since
+ it avoids multiple memory allocations during the expansion process.
*/
static int is_clean( const wchar_t *in )
{
@@ -918,14 +918,14 @@ static int expand_variables( wchar_t *in, array_list_t *out )
if( c == VARIABLE_EXPAND )
{
/*
- Regular expantion, i.e. expand this argument to nothing
+ Regular expansion, i.e. expand this argument to nothing
*/
empty = 1;
}
else
{
/*
- Expantion to single argument.
+ Expansion to single argument.
*/
string_buffer_t res;
sb_init( &res );
@@ -1404,7 +1404,7 @@ static void remove_internal_separator( const void *s, int conv )
/**
- The real expantion function. expand_one is just a wrapper around this one.
+ The real expansion function. expand_one is just a wrapper around this one.
*/
int expand_string( wchar_t *str,
array_list_t *end_out,
@@ -1533,7 +1533,7 @@ int expand_string( wchar_t *str,
if( *next == PROCESS_EXPAND )
{
/*
- If process expantion matches, we are not
+ If process expansion matches, we are not
interested in other completions, so we
short-circut and return
*/