diff options
| -rw-r--r-- | builtin_complete.c | 26 | ||||
| -rw-r--r-- | complete.c | 20 | ||||
| -rw-r--r-- | complete.h | 4 | ||||
| -rw-r--r-- | doc_src/and.txt | 2 | ||||
| -rw-r--r-- | doc_src/bind.txt | 2 | ||||
| -rw-r--r-- | doc_src/case.txt | 2 | ||||
| -rw-r--r-- | doc_src/complete.txt | 4 | ||||
| -rw-r--r-- | doc_src/if.txt | 4 | ||||
| -rw-r--r-- | doc_src/math.txt | 2 | ||||
| -rw-r--r-- | doc_src/mimedb.txt | 2 | ||||
| -rw-r--r-- | doc_src/or.txt | 2 | ||||
| -rw-r--r-- | doc_src/prevd.txt | 2 | ||||
| -rw-r--r-- | doc_src/read.txt | 2 | ||||
| -rw-r--r-- | doc_src/set.txt | 2 | ||||
| -rw-r--r-- | doc_src/switch.txt | 2 | ||||
| -rw-r--r-- | doc_src/ulimit.txt | 3 | ||||
| -rw-r--r-- | fish_indent.c | 1 |
17 files changed, 41 insertions, 41 deletions
diff --git a/builtin_complete.c b/builtin_complete.c index 19453366..7f4e8975 100644 --- a/builtin_complete.c +++ b/builtin_complete.c @@ -122,7 +122,7 @@ static void builtin_complete_add( array_list_t *cmd, array_list_t *gnu_opt, array_list_t *old_opt, int result_mode, - int authorative, + int authoritative, const wchar_t *condition, const wchar_t *comp, const wchar_t *desc, @@ -143,11 +143,11 @@ static void builtin_complete_add( array_list_t *cmd, desc, flags ); - if( authorative != -1 ) + if( authoritative != -1 ) { - complete_set_authorative( al_get( cmd, i ), + complete_set_authoritative( al_get( cmd, i ), COMMAND, - authorative ); + authoritative ); } } @@ -165,11 +165,11 @@ static void builtin_complete_add( array_list_t *cmd, desc, flags ); - if( authorative != -1 ) + if( authoritative != -1 ) { - complete_set_authorative( al_get( path, i ), + complete_set_authoritative( al_get( path, i ), PATH, - authorative ); + authoritative ); } } @@ -294,7 +294,7 @@ static int builtin_complete( wchar_t **argv ) int argc=0; int result_mode=SHARED; int remove = 0; - int authorative = -1; + int authoritative = -1; int flags = COMPLETE_AUTO_SPACE; string_buffer_t short_opt; @@ -373,11 +373,11 @@ static int builtin_complete( wchar_t **argv ) } , { - L"unauthorative", no_argument, 0, 'u' + L"unauthoritative", no_argument, 0, 'u' } , { - L"authorative", no_argument, 0, 'A' + L"authoritative", no_argument, 0, 'A' } , { @@ -456,11 +456,11 @@ static int builtin_complete( wchar_t **argv ) break; case 'u': - authorative=0; + authoritative=0; break; case 'A': - authorative=1; + authoritative=1; break; case 's': @@ -628,7 +628,7 @@ static int builtin_complete( wchar_t **argv ) &gnu_opt, &old_opt, result_mode, - authorative, + authoritative, condition, comp, desc, @@ -160,7 +160,7 @@ typedef struct complete_entry /** Next command completion in the linked list */ struct complete_entry *next; /** True if no other options than the ones supplied are possible */ - int authorative; + int authoritative; } complete_entry_t; @@ -370,22 +370,22 @@ static complete_entry_t *complete_get_exact_entry( const wchar_t *cmd, c->cmd = intern( cmd ); c->cmd_type = cmd_type; c->short_opt_str = wcsdup(L""); - c->authorative = 1; + c->authoritative = 1; } return c; } -void complete_set_authorative( const wchar_t *cmd, +void complete_set_authoritative( const wchar_t *cmd, int cmd_type, - int authorative ) + int authoritative ) { complete_entry_t *c; CHECK( cmd, ); c = complete_get_exact_entry( cmd, cmd_type ); - c->authorative = authorative; + c->authoritative = authoritative; } @@ -608,7 +608,7 @@ int complete_is_valid_option( const wchar_t *str, complete_entry_opt_t *o; wchar_t *cmd, *path; int found_match = 0; - int authorative = 1; + int authoritative = 1; int opt_found=0; hash_table_t gnu_match_hash; int is_gnu_opt=0; @@ -702,9 +702,9 @@ int complete_is_valid_option( const wchar_t *str, found_match = 1; - if( !i->authorative ) + if( !i->authoritative ) { - authorative = 0; + authoritative = 0; break; } @@ -783,7 +783,7 @@ int complete_is_valid_option( const wchar_t *str, } } - if( authorative ) + if( authoritative ) { if( !is_gnu_opt && !is_old_opt ) @@ -838,7 +838,7 @@ int complete_is_valid_option( const wchar_t *str, halloc_free( context ); - return (authorative && found_match)?opt_found:1; + return (authoritative && found_match)?opt_found:1; } int complete_is_valid_argument( const wchar_t *str, @@ -180,9 +180,9 @@ void complete_add( const wchar_t *cmd, true, any options not matching one of the provided options will be flagged as an error by syntax highlighting. */ -void complete_set_authorative( const wchar_t *cmd, +void complete_set_authoritative( const wchar_t *cmd, int cmd_type, - int authorative ); + int authoritative ); /** Remove a previously defined completion diff --git a/doc_src/and.txt b/doc_src/and.txt index bf75170e..4af50bbb 100644 --- a/doc_src/and.txt +++ b/doc_src/and.txt @@ -17,7 +17,7 @@ variable. \subsection and-example Example The following code runs the \c make command to build a program, if the -build succceds, the program is installed. If either step fails, +build succceeds, the program is installed. If either step fails, <tt>make clean</tt> is run, which removes the files created by the build process diff --git a/doc_src/bind.txt b/doc_src/bind.txt index dc2eebf6..13f22f38 100644 --- a/doc_src/bind.txt +++ b/doc_src/bind.txt @@ -6,7 +6,7 @@ The <tt>bind</tt> builtin causes fish to add the readline style bindings specified by BINDINGS to the list of key bindings, as if they appeared in your <tt>~/.fish_inputrc</tt> file. For more information on the syntax keyboard bindings, use <tt>man -readline</tt> to access the readline documentation. The availiable commands +readline</tt> to access the readline documentation. The available commands are listed in the <a href="index.html#editor">Command Line Editor</a> section of the fish manual - but you may also use any fish command! To write such commands, see the <a href="#commandline">commandline</a> builtin. It's good diff --git a/doc_src/case.txt b/doc_src/case.txt index c8354755..6f124984 100644 --- a/doc_src/case.txt +++ b/doc_src/case.txt @@ -19,7 +19,7 @@ regular wildcard expansion using filenames. Note that fish does not fall through on case statements. Though the syntax may look a bit like C switch statements, it behaves more like -the case stamantes of traditional shells. +the case statementes of traditional shells. Also note that command substitutions in a case statement will be evaluated even if it's body is not taken. This may seem diff --git a/doc_src/complete.txt b/doc_src/complete.txt index 20a0ad34..dfc7cc91 100644 --- a/doc_src/complete.txt +++ b/doc_src/complete.txt @@ -21,8 +21,8 @@ the fish manual. - <tt>-o</tt> or <tt>--old-option</tt> implies that the command uses old long style options with only one dash - <tt>-p</tt> or <tt>--path</tt> implies that the string COMMAND is the full path of the command - <tt>-r</tt> or <tt>--require-parameter</tt> specifies that the option specified by this completion always must have an option argument, i.e. may not be followed by another option -- <tt>-u</tt> or <tt>--unauthorative</tt> implies that there may be more options than the ones specified, and that fish should not assume that options not listed are spelling errors -- <tt>-A</tt> or <tt>--authorative</tt> implies that there may be no more options than the ones specified, and that fish should assume that options not listed are spelling errors +- <tt>-u</tt> or <tt>--unauthoritative</tt> implies that there may be more options than the ones specified, and that fish should not assume that options not listed are spelling errors +- <tt>-A</tt> or <tt>--authoritative</tt> implies that there may be no more options than the ones specified, and that fish should assume that options not listed are spelling errors - <tt>-x</tt> or <tt>--exclusive</tt> implies both <tt>-r</tt> and <tt>-f</tt> Command specific tab-completions in \c fish are based on the notion diff --git a/doc_src/if.txt b/doc_src/if.txt index ed19fbe0..dbbd378f 100644 --- a/doc_src/if.txt +++ b/doc_src/if.txt @@ -10,9 +10,9 @@ exit status is 0, the commands COMMANDS_TRUE will execute. If the exit status is not 0 and <tt>else</tt> is given, COMMANDS_FALSE will be executed. -In order to use the exit status of mutiple commands as the condition +In order to use the exit status of multiple commands as the condition of an if block, use <a href="#begin"><tt>begin; ...; end</tt></a> and -the short circut commands <a href="commands.html#and">and</a> and <a +the short circuit commands <a href="commands.html#and">and</a> and <a href="commands.html#or">or</a>. The exit status of the last foreground command to exit can always be diff --git a/doc_src/math.txt b/doc_src/math.txt index b58527f9..0bef1437 100644 --- a/doc_src/math.txt +++ b/doc_src/math.txt @@ -6,7 +6,7 @@ \subsection math-description Description -math is used to perform mathematical calcualtions. It is only a very +math is used to perform mathematical calculations. It is only a very thin wrapper for the bc program, that makes it possible to specify an expression from the command line without using non-standard extensions or a pipeline. Simply use a command like <code>math 1+1</code>. diff --git a/doc_src/mimedb.txt b/doc_src/mimedb.txt index 202d2aaf..fbfcdf9e 100644 --- a/doc_src/mimedb.txt +++ b/doc_src/mimedb.txt @@ -18,7 +18,7 @@ The mimedb command is used to query the mimetype database and the .desktop files installed on the system in order to find information on -a file. The information that mimedb can retrive includes the mimetype +a file. The information that mimedb can retrieve includes the mimetype for a file, a description of the type and what its default action is. mimedb can also be used to launch the default action for this file. diff --git a/doc_src/or.txt b/doc_src/or.txt index 6227170a..9fc62a6a 100644 --- a/doc_src/or.txt +++ b/doc_src/or.txt @@ -17,7 +17,7 @@ variable. \subsection or-example Example The following code runs the \c make command to build a program, if the -build succceds, the program is installed. If either step fails, +build succceeds, the program is installed. If either step fails, <tt>make clean</tt> is run, which removes the files created by the build process diff --git a/doc_src/prevd.txt b/doc_src/prevd.txt index 8f548254..57917f10 100644 --- a/doc_src/prevd.txt +++ b/doc_src/prevd.txt @@ -1,4 +1,4 @@ -\section prevd prevd - move backward through direcotry history +\section prevd prevd - move backward through directory history \subsection prevd-synopsis Synopsis <tt>prevd [-l | --list] [pos]</tt> diff --git a/doc_src/read.txt b/doc_src/read.txt index 69566e19..564b890a 100644 --- a/doc_src/read.txt +++ b/doc_src/read.txt @@ -11,7 +11,7 @@ input and store the result in one or more environment variables. - <tt>-c CMD</tt> or <tt>--command=CMD</tt> specifies that the initial string in the interactive mode command buffer should be CMD. - <tt>-e</tt> or <tt>--export</tt> specifies that the variables will be exported to subshells. - <tt>-g</tt> or <tt>--global</tt> specifies that the variables will be made global. -- <tt>-m NAME</tt> or <tt>--mode-name=NAME</tt> specifies that the name NAME should be used to save/load the hiustory file. If NAME is fish, the regular fish history will be available. +- <tt>-m NAME</tt> or <tt>--mode-name=NAME</tt> specifies that the name NAME should be used to save/load the history file. If NAME is fish, the regular fish history will be available. - <tt>-p PROMPT_CMD</tt> or <tt>--prompt=PROMPT_CMD</tt> specifies that the output of the shell command PROMPT_CMD should be used as the prompt for the interactive mode prompt. The default prompt command is <tt>set_color green; echo read; set_color normal; echo "> "</tt>. - <code>-s</code> or <code>--shell</code> Use syntax highlighting, tab completions and command termination suitable for entering shellscript code - <code>-u</code> or <code>--unexport</code> causes the specified environment not to be exported to child processes diff --git a/doc_src/set.txt b/doc_src/set.txt index a7d72abb..6d5b0fe8 100644 --- a/doc_src/set.txt +++ b/doc_src/set.txt @@ -43,7 +43,7 @@ the last index of an array. The scoping rules when creating or updating a variable are: -# If a variable is explicitly set to either universal, global or local, that setting will be honored. If a variable of the same name exists in a different scope, that variable will not be changed. --# If a variable is not explicitly set to be either universal, global or local, but has been previously defined, the previos variable scope is used. +-# If a variable is not explicitly set to be either universal, global or local, but has been previously defined, the previous variable scope is used. -# If a variable is not explicitly set to be either universal, global or local and has never before been defined, the variable will be local to the currently executing functions. If no function is executing, the variable will be global. The exporting rules when creating or updating a variable are identical diff --git a/doc_src/switch.txt b/doc_src/switch.txt index 100e21f0..cbfb4be9 100644 --- a/doc_src/switch.txt +++ b/doc_src/switch.txt @@ -19,7 +19,7 @@ regular wildcard expansion using filenames. Note that fish does not fall through on case statements. Though the syntax may look a bit like C switch statements, it behaves more like -the case stamantes of traditional shells. +the case statements of traditional shells. Also note that command substitutions in a case statement will be evaluated even if it's body is not taken. This may seem diff --git a/doc_src/ulimit.txt b/doc_src/ulimit.txt index e8229a9b..bb95a2a7 100644 --- a/doc_src/ulimit.txt +++ b/doc_src/ulimit.txt @@ -35,7 +35,8 @@ except for -t, which is in seconds and -n and -u, which are unscaled values. The return status is 0 unless an invalid option or argument is supplied, or an error occurs while setting a new limit. -ulimit also accepts the following switches that determine what type of limit to set: +ulimit also accepts the following switches that determine what type of +limit to set: - <code>-H</code> or <code>--hard</code> Set hard resource limit - <code>-S</code> or <code>--soft</code> Set soft resource limit diff --git a/fish_indent.c b/fish_indent.c index eb9c2ca5..7fcfb6b7 100644 --- a/fish_indent.c +++ b/fish_indent.c @@ -22,7 +22,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "config.h" - #include <stdlib.h> #include <stdio.h> #include <wchar.h> |