28 files changed, 96 insertions, 96 deletions
diff --git a/doc_src/alias.txt b/doc_src/alias.txt
index 523e4777..2ab277e9 100644
--- a/doc_src/alias.txt
+++ b/doc_src/alias.txt
@@ -12,7 +12,7 @@ shells. For other uses, it is recommended to define a <a
 href='#function'>function</a>.
 
 Alias does not keep track of which functions have been defined using
-alias, nor does it allow erasing of aliases. 
+alias, nor does it allow erasing of aliases.
 
 - NAME is the name of the function to define
 - DEFINITION is the body of the function. The string " $argv" will be appended to the body.
diff --git a/doc_src/begin.txt b/doc_src/begin.txt
index b4a822c3..f5f7f53e 100644
--- a/doc_src/begin.txt
+++ b/doc_src/begin.txt
@@ -37,7 +37,7 @@ In the following code, all output is redirected to the file out.html.
 begin
 	echo $xml_header
 	echo $html_header
-	if test -e $file 
+	if test -e $file
 		...
 	end
 	...
diff --git a/doc_src/commandline.txt b/doc_src/commandline.txt
index 0202bbb3..df03ab13 100644
--- a/doc_src/commandline.txt
+++ b/doc_src/commandline.txt
@@ -13,9 +13,9 @@
 
 The following switches change what the commandline builtin does
 
-- \c -C or \c --cursor set or get the current cursor position, not 
+- \c -C or \c --cursor set or get the current cursor position, not
   the contents of the buffer. If no argument is given, the current
-  cursor position is printed, otherwise the argument is interpreted 
+  cursor position is printed, otherwise the argument is interpreted
   as the new cursor position.
 - \c -f or \c --function inject readline functions into the
   reader. This option can not be combined with any other option. It
@@ -44,7 +44,7 @@ or updated
 - \c -t or \c --current-token select the current token.
 
 The following switch changes the way \c commandline prints the current
-commandline buffer 
+commandline buffer
 
 - \c -c or \c --cut-at-cursor only print selection up until the
   current cursor position
diff --git a/doc_src/commands.hdr.in b/doc_src/commands.hdr.in
index 188d5d8d..b62a6d56 100644
--- a/doc_src/commands.hdr.in
+++ b/doc_src/commands.hdr.in
@@ -1,5 +1,5 @@
 /** \page commands Commands, functions and builtins bundled with fish
-Fish ships with a large number of builtin commands, shellscript functions and external commands. These are all described below. 
+Fish ships with a large number of builtin commands, shellscript functions and external commands. These are all described below.
 
 @command_list@
 
diff --git a/doc_src/design.hdr b/doc_src/design.hdr
index db93fa17..c6fea80a 100644
--- a/doc_src/design.hdr
+++ b/doc_src/design.hdr
@@ -7,8 +7,8 @@ design fish. The fish design has three high level goals. These are:
 
 -# Everything that can be done in other shell languages should be
 possible to do in fish, though fish may rely on external commands in
-doing so. 
--# Fish should be user friendly, but not at the expense of expressiveness. 
+doing so.
+-# Fish should be user friendly, but not at the expense of expressiveness.
 Most tradeoffs between power and ease of use can be avoided with careful design.
 -# Whenever possible without breaking the above goals, fish should
 follow the Posix syntax.
@@ -33,7 +33,7 @@ program harder to maintain and update.
 Examples:
 
 - Here documents are too similar to using echo inside of a pipeline.
-- Subshells, command substitution and process substitution are strongly related. \c fish only supports command substitution, the others can be achived either using a block or the psub shellscript function. 
+- Subshells, command substitution and process substitution are strongly related. \c fish only supports command substitution, the others can be achived either using a block or the psub shellscript function.
 - Having both aliases and functions is confusing, especially since both of them have limitations and problems. \c fish functions have none of the drawbacks of either syntax.
 - The many Posix quoting styles are silly, especially \$''.
 
@@ -57,14 +57,14 @@ take the whole system down.
 Examples:
 
 - Builtin commands should only be created when it cannot be
-avoided. \c echo, \c kill, \c printf and \c time are among the commands 
-that fish does not implement internally since they can be provided as 
-external commands. Several other commands that are commonly implemented 
+avoided. \c echo, \c kill, \c printf and \c time are among the commands
+that fish does not implement internally since they can be provided as
+external commands. Several other commands that are commonly implemented
 as builtins and can not be implemented as external commands,
 including \c type, \c vared, \c pushd and \c popd are implemented as shellscript
 functions in fish.
 - Mathematical calculations, regex matching, generating lists of numbers
-and many other funtions can easily be done in external programs. They 
+and many other funtions can easily be done in external programs. They
 should not be supported internally by the shell.
 
 The law of minimalism does not imply that a large feature set is
diff --git a/doc_src/dirh.txt b/doc_src/dirh.txt
index 0a65bdb6..efd4ac79 100644
--- a/doc_src/dirh.txt
+++ b/doc_src/dirh.txt
@@ -3,6 +3,6 @@
 \subsection dirh-synopsis Synopsis
 <tt>dirh</tt>
 
-\subsection dirh-description Description 
+\subsection dirh-description Description
 <tt>dirh</tt> prints the current directory history. The current position in the
 history is highlighted using <tt>$fish_color_history_current</tt>.
diff --git a/doc_src/dirs.txt b/doc_src/dirs.txt
index 0419440c..b5b9c0ae 100644
--- a/doc_src/dirs.txt
+++ b/doc_src/dirs.txt
@@ -3,5 +3,5 @@
 \subsection dirs-synopsis Synopsis
 <tt>dirs</tt>
 
-\subsection dirs-description Description 
+\subsection dirs-description Description
 <tt>dirs</tt> prints the current directory stack.
diff --git a/doc_src/else.txt b/doc_src/else.txt
index 035abd62..e0f8b85b 100644
--- a/doc_src/else.txt
+++ b/doc_src/else.txt
@@ -13,5 +13,5 @@ status is 0, the commands COMMANDS_TRUE will execute.  If it is not 0 and
 
 The command <tt>if test -f foo.txt; echo foo.txt exists; else; echo foo.txt does not exist; end</tt>
 will print <tt>foo.txt exists</tt> if the file foo.txt
-exists and is a regular file, otherwise it will print 
+exists and is a regular file, otherwise it will print
 <tt>foo.txt does not exist</tt>.
diff --git a/doc_src/emit.txt b/doc_src/emit.txt
index 78d36917..f2821748 100644
--- a/doc_src/emit.txt
+++ b/doc_src/emit.txt
@@ -5,7 +5,7 @@
 
 \subsection emit-description Description
 
-The emit builtin fires a generic fish event. Such events can be caught by special functions called event handlers. 
+The emit builtin fires a generic fish event. Such events can be caught by special functions called event handlers.
 
 \subsection emit-example Example
 
diff --git a/doc_src/faq.hdr b/doc_src/faq.hdr
index d8058ab1..0fc74634 100644
--- a/doc_src/faq.hdr
+++ b/doc_src/faq.hdr
@@ -33,7 +33,7 @@ parent is ~. This issue is not possible to fix without either making
 every single command into a builtin, breaking Unix semantics or
 implementing kludges in every single command.
 
-This issue can also be seen when doing IO redirection. 
+This issue can also be seen when doing IO redirection.
 
 Another related issue is that many programs that operate on recursive
 directory trees, like the find command, silently ignore symlinked
@@ -56,7 +56,7 @@ feature, write <code>set CDPATH .</code> on the commandline.
 
 If fish is unable to locate a command with a given name, fish will
 test if a directory of that name exists. If it does, it is implicitly
-assumed that you want to change working directory. For example, the 
+assumed that you want to change working directory. For example, the
 fastest way to switch to your home directory is to simply press
 <code>~</code> and enter.
 
@@ -141,21 +141,21 @@ set fish_greeting
 
 \section faq-history Why doesn't history substitution ("!$" etc.) work?
 
-Because history substitution is an awkward interface that was invented before 
-interactive line editing was even possible.  Fish drops it in favor of 
-perfecting the interactive history recall interface.  Switching requires a 
-small change of habits: if you want to modify an old line/word, first recall 
-it, then edit.  E.g. don't type "sudo !!" - first press Up, then Home, then 
+Because history substitution is an awkward interface that was invented before
+interactive line editing was even possible.  Fish drops it in favor of
+perfecting the interactive history recall interface.  Switching requires a
+small change of habits: if you want to modify an old line/word, first recall
+it, then edit.  E.g. don't type "sudo !!" - first press Up, then Home, then
 type "sudo ".
 
 Fish history recall is very simple yet effective:
 
  - As in any modern shell, the Up arrow recalls whole lines, starting from the last line executed.  A single press replaces "!!", later presses replace "!-3" and the like.
-    - If the line you want is far back in the history, type any part of the line and then press Up one or more times.  This will constrain the recall to lines that include this text, and you will get to the line you want much faster.  This replaces "!vi", "!?bar.c" and the like. 
+    - If the line you want is far back in the history, type any part of the line and then press Up one or more times.  This will constrain the recall to lines that include this text, and you will get to the line you want much faster.  This replaces "!vi", "!?bar.c" and the like.
  - Alt+Up recalls individual arguments, starting from the last argument in the last line executed.  A single press replaces "!$", later presses replace "!!:4" and the like.
     - If the argument you want is far back in history (e.g. 2 lines back - that's a lot of words!), type any part of it and then press Alt+Up.  This will show only arguments containing that part and you will get what you want much faster.  Try it out, this is very convenient!
     - If you want to reuse several arguments from the same line ("!!:3*" and the like), consider recalling the whole line and removing what you don't need (Alt+D and Alt+Backspace are your friends).
-  
+
 See <a href='index.html#editor'>documentation</a> for more details about line editing in fish.
 
 */
diff --git a/doc_src/for.txt b/doc_src/for.txt
index b4b3dfaf..2ffffe40 100644
--- a/doc_src/for.txt
+++ b/doc_src/for.txt
@@ -11,7 +11,7 @@ not be executed at all.
 
 \subsection for-example Example
 
-The command 
+The command
 
 <tt>for i in foo bar baz; echo $i; end</tt>
 
@@ -21,5 +21,5 @@ would output:
 foo
 bar
 baz
-</pre>		
+</pre>
 
diff --git a/doc_src/functions.txt b/doc_src/functions.txt
index 7643bfc6..4e5d7ddf 100644
--- a/doc_src/functions.txt
+++ b/doc_src/functions.txt
@@ -17,7 +17,7 @@ This builtin command is used to print or erase functions.
 The default behavior of \c functions when called with no arguments,
 is to print the names and definitions of all defined functions. If any
 non-switch parameters are given, only the definition of the specified
-functions are printed. 
+functions are printed.
 
 Automatically loaded functions can not be removed using functions
 -e. Either remove the definition file or change the
diff --git a/doc_src/if.txt b/doc_src/if.txt
index dbbd378f..afad5384 100644
--- a/doc_src/if.txt
+++ b/doc_src/if.txt
@@ -8,7 +8,7 @@
 <tt>if</tt> will execute the command CONDITION.  If the condition's
 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.  
+be executed.
 
 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
@@ -29,5 +29,5 @@ else
 end
 </pre>
 will print <tt>foo.txt exists</tt> if the file foo.txt
-exists and is a regular file, otherwise it will print 
+exists and is a regular file, otherwise it will print
 <tt>foo.txt does not exist</tt>.
diff --git a/doc_src/index.hdr.in b/doc_src/index.hdr.in
index fc8226f5..84dc0a03 100644
--- a/doc_src/index.hdr.in
+++ b/doc_src/index.hdr.in
@@ -59,7 +59,7 @@ Here is a list of some useful commands:
 - \c mv, move (rename) files
 - \c cp, copy files
 - \c open, open files with the default application associated with each filetype
-- \c less, list the contents of files 
+- \c less, list the contents of files
 
 Commands and parameters are separated by the space character
 (&nbsp;). Every command ends with either a newline (i.e. by pressing
@@ -147,7 +147,7 @@ these characters, so called escape sequences are provided. These are:
 Most program use three types of input/output (IO), each represented by
 a number called a file descriptor (FD). These are:
 
-- Standard input, FD 0, for reading, defaults to reading from the keyboard. 
+- Standard input, FD 0, for reading, defaults to reading from the keyboard.
 - Standard output, FD 1, for writing, defaults to writing to the screen.
 - Standard error, FD 2, for writing errors and warnings, defaults to writing to the screen.
 
@@ -160,13 +160,13 @@ default through a simple mechanism called a redirection.
 An example of a file redirection is <code> echo hello \>output.txt</code>,
 which directs the output of the echo command to the file error.txt.
 
-- To redirect standard input, write <code>\<SOURCE_FILE</code> 
-- To redirect standard output, write <code>\>DESTINATION</code> 
-- To redirect standard error, write <code>^DESTINATION</code> 
+- To redirect standard input, write <code>\<SOURCE_FILE</code>
+- To redirect standard output, write <code>\>DESTINATION</code>
+- To redirect standard error, write <code>^DESTINATION</code>
 - To redirect standard output to a file which will be appended, write <code>\>\>DESTINATION_FILE</code>
-- To redirect standard error to a file which will be appended, write <code>^^DESTINATION_FILE</code> 
+- To redirect standard error to a file which will be appended, write <code>^^DESTINATION_FILE</code>
 
-<code>DESTINATION</code> can be one of the following: 
+<code>DESTINATION</code> can be one of the following:
 
 - A filename. The output will be written to the specified file.
 - An ampersand (\&) followed by the number of another file descriptor. The file descriptor will be a duplicate of the specified file descriptor.
@@ -182,7 +182,7 @@ Any FD can be redirected in an arbitrary way by prefixing the
 redirection with the number of the FD.
 
 - To redirect input of FD number N, write <code>N\<DESTINATION</code>
-- To redirect output of FD number N, write <code>N\>DESTINATION</code> 
+- To redirect output of FD number N, write <code>N\>DESTINATION</code>
 - To redirect output of FD number N to a file which will be appended, write <code>N\>\>DESTINATION_FILE</code>
 
 Example: <code>echo Hello 2\>-</code> and <code>echo Hello ^-</code> are
@@ -230,7 +230,7 @@ Example:
 
 <code>emacs \&</code>
 
-will start the emacs text editor in the background. 
+will start the emacs text editor in the background.
 
 \subsection syntax-job-control Job control
 
@@ -323,10 +323,10 @@ function already be loaded, i.e. a circular dependency.
 \subsection syntax-conditional Conditional execution of code
 
 There are four fish builtins that let you execute commands only if a
-specific criterion is met. These builtins are 
-<a href="commands.html#if">if</a>, 
-<a href="commands.html#switch">switch</a>, 
-<a href="commands.html#and">and</a> and 
+specific criterion is met. These builtins are
+<a href="commands.html#if">if</a>,
+<a href="commands.html#switch">switch</a>,
+<a href="commands.html#and">and</a> and
 <a href="commands.html#or">or</a>.
 
 The \c switch command is used to execute one of possibly many blocks
@@ -335,7 +335,7 @@ for <a href="commands.html#switch">switch</a> for more information.
 
 The other conditionals use the <a href='#variables-status'>exit
 status</a> of a command to decide if a command or a block of commands
-should be executed. See the documentation for 
+should be executed. See the documentation for
 <a href="commands.html#if">if</a>, <a href="commands.html#and">and</a>
 and <a href="commands.html#or">or</a> for more information.
 
@@ -392,13 +392,13 @@ These are the general purpose tab completions that \c fish provides:
 of these completions are simple options like the \c -l option for \c
 ls, but some are more advanced. The latter include:
 
-- The programs 'man' and 'whatis' show all installed 
+- The programs 'man' and 'whatis' show all installed
 manual pages as completions.
-- The 'make' program uses all targets in the Makefile in 
+- The 'make' program uses all targets in the Makefile in
 the current directory as completions.
 - The 'mount' command uses all mount points specified in fstab as completions.
-- The 'ssh' command uses all hosts that are stored 
-in the known_hosts file as completions. (see the ssh documentation for more information) 
+- The 'ssh' command uses all hosts that are stored
+in the known_hosts file as completions. (see the ssh documentation for more information)
 - The 'su' command uses all users on the system as completions.
 - The \c apt-get, \c rpm and \c yum commands use all installed packages as completions.
 
@@ -415,7 +415,7 @@ this can be specified as <code>complete -c myprog -a 'start
 stop'</code>. The argument to the \c -a switch is always a single
 string. At completion time, it will be tokenized on spaces and tabs,
 and variable expansion, command substitution and other forms of
-parameter expansion will take place. 
+parameter expansion will take place.
 
 Fish has a special syntax to support specifying switches accepted by a
 command. The switches \c -s, \c -l and \c -o are used to specify a
@@ -532,7 +532,7 @@ performing wildcard matching on files, inserting the value of
 environment variables into the parameter or even using the output of
 another command as a parameter list.
 
-\subsection expand-wildcard Wildcards 
+\subsection expand-wildcard Wildcards
 
 If a star (*) or a question mark (?) is present in the parameter, \c
 fish attempts to match the given parameter to any files in such a
@@ -609,7 +609,7 @@ href="#variables"> Environment variables</a> section.
 Example:
 
 <code> echo \$HOME</code> prints the home directory of the current
-user. 
+user.
 
 If you wish to combine environment variables with text, you can
 encase the variables within braces to embed a variable inside running
@@ -687,9 +687,9 @@ performed:
 - If the string is the entire word \c self, the shells pid is the result
 - Otherwise, if the string is the id of a job, the result is the process
 group id of the job.
-- Otherwise, if any child processes match the specified string, their 
-pids are the result of the expansion. 
-- Otherwise, if any processes owned by the user match the specified 
+- Otherwise, if any child processes match the specified string, their
+pids are the result of the expansion.
+- Otherwise, if any processes owned by the user match the specified
 string, their pids are the result of the expansion.
 
 This form of expansion is useful for commands like kill and fg, which
@@ -739,7 +739,7 @@ expansion</a>.
 To set a variable value, use the <a href="commands.html#set"> \c set
 command</a>.
 
-Example: 
+Example:
 
 To set the variable \c smurf_color to the value \c blue, use the command
 <code>set smurf_color blue</code>.
@@ -869,7 +869,7 @@ echo $PATH[3]
 
 Note that array indices start at 1 in fish, not 0, as is more common
 in other languages. This is because many common Unix tools like seq
-are more suited to such use. 
+are more suited to such use.
 
 If you do not use any brackets, all the elements of the array will be
 written as separate items. This means you can easily iterate over an
@@ -921,13 +921,13 @@ certain environment variables.
 
 \c fish also sends additional information to the user through the
 values of certain environment variables. The user can not change the
-values of most of these variables. 
+values of most of these variables.
 
 - \c _, which is the name of the currently running command.
 - \c argv, which is an array of arguments to the shell or function. \c argv is only defined when inside a function call, or if fish was invoked with a list of arguments, like 'fish myscript.fish foo bar'. This variable can be changed by the user.
 - \c history, which is an array containing the last commands that where entered.
 - \c HOME, which is the users home directory. This variable can only be changed by the root user.
-- \c PWD, which is the current working directory. 
+- \c PWD, which is the current working directory.
 - \c status, which is the exit status of the last foreground job to exit. If the job was terminated through a signal, the exit status will be 128 plus the signal number.
 - \c USER, which is the username. This variable can only be changed by the root user.
 
@@ -1024,7 +1024,7 @@ variables set the specified aspect of the locale information. LANG
 is a fallback value, it will be used if none of the LC_ variables are
 specified.
 
-\section builtin-overview Builtins 
+\section builtin-overview Builtins
 
 Many other shells have a large library of builtin commands. Most of
 these commands are also available as standalone commands, but have
@@ -1042,7 +1042,7 @@ switch of the command.
 
 The \c fish editor features copy and paste, a searchable history and
 many editor functions that can be bound to special keyboard
-shortcuts. The most important keybinding is probably the tab key, which is bound to the complete function. 
+shortcuts. The most important keybinding is probably the tab key, which is bound to the complete function.
 Here are some of the commands available in the editor:
 
 - Tab completes the current token
@@ -1060,12 +1060,12 @@ Here are some of the commands available in the editor:
 - Ctrl-l clear and repaint screen
 - Ctrl-w move previous word to the <a href="#killring">killring</a>
 - Alt-d move next word to the <a href="#killring">killring</a>
-- Alt-w prints a short description of the command under the cursor 
-- Alt-l lists the contents of the current directory, unless the cursor is over a directory argument, in which case the contents of that directory will be listed 
+- Alt-w prints a short description of the command under the cursor
+- Alt-l lists the contents of the current directory, unless the cursor is over a directory argument, in which case the contents of that directory will be listed
 - Alt-p adds the string '| less;' to the end of the job under the cursor. The result is that the output of the command will be paged.
 
-You can change these key bindings using the 
-<a href="commands.html#bind">bind</a> builtin command. 
+You can change these key bindings using the
+<a href="commands.html#bind">bind</a> builtin command.
 
 
 - \c backward-char, moves one character to the left
@@ -1096,7 +1096,7 @@ If such a script produces output, the script needs to finish by
 calling 'commandline -f repaint' in order to tell fish that a repaint
 is in order.
 
-\subsection killring Copy and paste (Kill Ring) 
+\subsection killring Copy and paste (Kill Ring)
 
 \c fish uses an Emacs style kill ring for copy and paste
 functionality. Use Ctrl-K to cut from the current cursor position to
@@ -1107,7 +1107,7 @@ Meta-Y to rotate to the previous kill.
 
 If the environment variable DISPLAY is set, \c fish will try to
 connect to the X-windows server specified by this variable, and use
-the clipboard on the X server for copying and pasting. 
+the clipboard on the X server for copying and pasting.
 
 \subsection history Searchable history
 
@@ -1158,7 +1158,7 @@ graphical user interface from the terminal, and then be able to
 continue using the shell. In such cases, there are several ways in
 which the user can change <code>fish</code>'s behavior.
 
--# By ending a command with the \& (ampersand) symbol, the user tells \c fish to put the specified command into the background. A background process will be run simultaneous with \c fish. \c fish will retain control of the terminal, so the program will not be able to read from the keyboard. 
+-# By ending a command with the \& (ampersand) symbol, the user tells \c fish to put the specified command into the background. A background process will be run simultaneous with \c fish. \c fish will retain control of the terminal, so the program will not be able to read from the keyboard.
 -# By pressing ^Z, the user stops a currently running foreground  program and returns control to \c fish. Some programs do not support this feature, or remap it to another key. Gnu emacs uses ^X z to stop running.
 -# By using the <a href="commands.html#fg">fg</a> and <a href="commands.html#bg">bg</a> builtin commands, the user can send any currently running job into the foreground or background.
 
@@ -1247,7 +1247,7 @@ returning to the shell) when the \c fish_prompt function is called.
 
 Example:
 <p>
-The default \c fish title is 
+The default \c fish title is
 </p>
 <p>
 <pre>
@@ -1379,9 +1379,9 @@ href='fish-users@lists.sf.net'>fish-users@lists.sf.net</a>.
 \subsection todo-features Missing features
 
 - Complete vi-mode key bindings
-- More completions (for example konsole, gnome-terminal, 
+- More completions (for example konsole, gnome-terminal,
 rlogin, rsync, arch, finger, bibtex, aspell, xpdf,
-compress, wine, dig, batch, 
+compress, wine, dig, batch,
 g++, javac, java, gcj, lpr, doxygen, whois)
 - Undo support
 - wait shellscript
@@ -1391,7 +1391,7 @@ g++, javac, java, gcj, lpr, doxygen, whois)
 
 \subsection todo-possible Possible features
 
-- mouse support like zsh has with http://stchaz.free.fr/mouse.zsh 
+- mouse support like zsh has with http://stchaz.free.fr/mouse.zsh
   installed would be awesome
 - suggest a completion on unique matches by writing it out in an understated color
 - Highlight beginning/end of block when moving over a block command
@@ -1408,7 +1408,7 @@ g++, javac, java, gcj, lpr, doxygen, whois)
 - History could reload itself when the file is updated. This would need to be done in a clever way to avoid chain reactions
 - The error function should probably be moved into it's own library, and be made mere general purpose.
 - The code validation functions should be moved from the parser to parse_util.
-- Try to remove more malloc calls to reduce memory usage. The time_t arrays used by the autoloader sound like a good candidate. 
+- Try to remove more malloc calls to reduce memory usage. The time_t arrays used by the autoloader sound like a good candidate.
 - The code validator should warn about unknown commands.
 - Auto-newlines
 - A fault injector could be written to increase robustness and testing of error recovery paths
@@ -1417,7 +1417,7 @@ g++, javac, java, gcj, lpr, doxygen, whois)
 - exec_subshell should be either merged with eval or moved to parser.c
 - Don't use expand_string to perform completions. wildcard_complete can be called directly, the brace expansion handling should be universal, and the process expansion can be moved to complete.c.
 - Make the history search support incremental searching
-- An automatic logout feature 
+- An automatic logout feature
 - Make tab completions completely silent by default, i.e. kill stderr when running completion commands. This needs to be overridalbe for debugging purposes.
 - Move history to an environment variable
 
@@ -1426,8 +1426,8 @@ g++, javac, java, gcj, lpr, doxygen, whois)
 - Suspending and then resuming pipelines containing a builtin or a shellscript function is broken. Ideally, the exec function in exec.c should be able to resume execution of a partially executed job.
 - delete-word is broken on the commandline 'sudo update-alternatives --config x-'
 - Sometimes autoheader needs to be run on a fresh tarball. Fix dates before creating tarballs.
-- The completion autoloader does not remember which completions where actually autoloaded, and may unload manually specified completions. 
-- There have been stray reports of issues with strange values of the PATH variable during startup. 
+- The completion autoloader does not remember which completions where actually autoloaded, and may unload manually specified completions.
+- There have been stray reports of issues with strange values of the PATH variable during startup.
 - bindings in config.fish are overwritten by default key bindings.
 - Adding 'bind -k ...' doesn't overwrite non-keybinding binds of the same sequence.
 - History file does not remove duplicates.
diff --git a/doc_src/license.hdr b/doc_src/license.hdr
index 5a5654c2..a05927b9 100644
--- a/doc_src/license.hdr
+++ b/doc_src/license.hdr
@@ -14,7 +14,7 @@ Version 2, June 1991
 </P>
 
 <PRE>
-Copyright (C) 1989, 1991 Free Software Foundation, Inc.  
+Copyright (C) 1989, 1991 Free Software Foundation, Inc.
 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
 
 Everyone is permitted to copy and distribute verbatim copies
@@ -447,7 +447,7 @@ PERFORMANCE OF THIS SOFTWARE.
 <h2>License for XSel</h2>
 
 The XSel command, written and copyrighted by Conrad Parker, is
-distributed together with \c fish. 
+distributed together with \c fish.
 
 
 It is Copyright (C) 2001 Conrad Parker <conrad@vergenet.net>
@@ -802,7 +802,7 @@ of these things:
     that the user who changes the contents of definitions files in the
     Library will not necessarily be able to recompile the application
     to use the modified definitions.)
-	 
+
     <LI><STRONG>b)</STRONG> Use a suitable shared library mechanism for linking with the
     Library.  A suitable mechanism is one that (1) uses at run time a
     copy of the library already present on the user's computer system,
diff --git a/doc_src/math.txt b/doc_src/math.txt
index 0bef1437..9455e0da 100644
--- a/doc_src/math.txt
+++ b/doc_src/math.txt
@@ -9,7 +9,7 @@
 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>. 
+or a pipeline. Simply use a command like <code>math 1+1</code>.
 
 For a description of the syntax supported by math, see the manual for
 the bc program. Keep in mind that parameter expansion takes place on
diff --git a/doc_src/mimedb.txt b/doc_src/mimedb.txt
index fbfcdf9e..6a4e9944 100644
--- a/doc_src/mimedb.txt
+++ b/doc_src/mimedb.txt
@@ -5,7 +5,7 @@
 
 \subsection mimedb-description Description
 
-- \c FILES is a list of files to analyse 
+- \c FILES is a list of files to analyse
 - \c -t, \c --input-file-data the specified files type should be determined both by their filename and by their contents (Default)
 - \c -f, \c --input-filename the specified files type should be determined by their filename
 - \c -i, \c --input-mime the arguments are not files but mimetypes
diff --git a/doc_src/not.txt b/doc_src/not.txt
index 5adedc3a..bb053da7 100644
--- a/doc_src/not.txt
+++ b/doc_src/not.txt
@@ -5,7 +5,7 @@
 
 \subsection not-description Description
 
-The \c not builtin is used to negate the exit status of another command. 
+The \c not builtin is used to negate the exit status of another command.
 
 \subsection not-example Example
 
diff --git a/doc_src/popd.txt b/doc_src/popd.txt
index 521059ab..b3c87584 100644
--- a/doc_src/popd.txt
+++ b/doc_src/popd.txt
@@ -3,6 +3,6 @@
 \subsection popd-synopsis Synopsis
 <tt>popd</tt>
 
-\subsection popd-description Description 
-<tt>popd</tt> removes the top directory from the directory stack and 
+\subsection popd-description Description
+<tt>popd</tt> removes the top directory from the directory stack and
 cd's to the new top directory.
diff --git a/doc_src/prevd.txt b/doc_src/prevd.txt
index 57917f10..83d6b909 100644
--- a/doc_src/prevd.txt
+++ b/doc_src/prevd.txt
@@ -3,7 +3,7 @@
 \subsection prevd-synopsis Synopsis
 <tt>prevd [-l | --list] [pos]</tt>
 
-\subsection prevd-description Description 
+\subsection prevd-description Description
 
 <tt>prevd</tt> moves backwards <tt>pos</tt> positions in the history
 of visited directories; if the beginning of the history has been hit,
diff --git a/doc_src/pushd.txt b/doc_src/pushd.txt
index 4a208791..52569072 100644
--- a/doc_src/pushd.txt
+++ b/doc_src/pushd.txt
@@ -3,7 +3,7 @@
 \subsection pushd-synopsis Synopsis
 <tt>pushd [DIRECTORY]</tt>
 
-\subsection pushd-description Description 
+\subsection pushd-description Description
 The <tt>pushd</tt> function adds DIRECTORY to the top of the directory stack
 and makes it the current directory. Use <tt>popd</tt> to pop it off and and
 return to the original directory.
diff --git a/doc_src/random.txt b/doc_src/random.txt
index f6dd0928..ad9b658a 100644
--- a/doc_src/random.txt
+++ b/doc_src/random.txt
@@ -21,4 +21,4 @@ for i in (seq (random) -1 1)
 	echo $i
 	sleep
 end
-</pre> 
+</pre>
diff --git a/doc_src/read.txt b/doc_src/read.txt
index 564b890a..b85b5fd8 100644
--- a/doc_src/read.txt
+++ b/doc_src/read.txt
@@ -6,12 +6,12 @@
 \subsection read-description Description
 
 The <tt>read</tt> builtin causes fish to read one line from standard
-input and store the result in one or more environment variables. 
+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 history 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/return.txt b/doc_src/return.txt
index e7883f37..2cfd5ab6 100644
--- a/doc_src/return.txt
+++ b/doc_src/return.txt
@@ -3,7 +3,7 @@
 \subsection return-synopsis Synopsis
 <tt>function NAME; [COMMANDS...;] return [STATUS]; [COMMANDS...;] end</tt>
 
-\subsection return-description Description 
+\subsection return-description Description
 
 The \c return builtin is used to halt a currently running function. It
 is usually added inside of a conditional block such as an <a
diff --git a/doc_src/set_color.txt b/doc_src/set_color.txt
index d6683b7f..94e8b869 100644
--- a/doc_src/set_color.txt
+++ b/doc_src/set_color.txt
@@ -7,7 +7,7 @@
 
 Change the foreground and/or background color of the terminal.
 COLOR is one of black, red, green, brown, yellow, blue, magenta,
-purple, cyan, white and normal. 
+purple, cyan, white and normal.
 
 - \c -b, \c --background Set the background color
 - \c -c, \c --print-colors Prints a list of all valid color names
@@ -26,7 +26,7 @@ in a grey font color, while <code>set_color --bold white</code> will
 result in a white font color.
 
 Not all terminal emulators support all these features. This is not a
-bug in set_color but a missing feature in the terminal emulator. 
+bug in set_color but a missing feature in the terminal emulator.
 
 set_color uses the terminfo database to look up how to change terminal
 colors on whatever terminal is in use. Some systems have old and
diff --git a/doc_src/source.txt b/doc_src/source.txt
index 05abc4fc..9c6f11d3 100644
--- a/doc_src/source.txt
+++ b/doc_src/source.txt
@@ -3,7 +3,7 @@
 \subsection source-synopsis Synopsis
 <tt>. FILENAME [ARGUMENTS...]</tt>
 
-\subsection source-description Description 
+\subsection source-description Description
 
 Evaluates the commands of the specified file in the current
 shell. This is different from starting a new process to perform the
diff --git a/doc_src/ulimit.txt b/doc_src/ulimit.txt
index ebed0f09..6e21eba3 100644
--- a/doc_src/ulimit.txt
+++ b/doc_src/ulimit.txt
@@ -27,7 +27,7 @@ Note that not all these limits are available in all operating systems.
 The value of limit can be a number in the unit specified for
 the resource or one of the special values hard, soft, or unlimited,
 which stand for the current hard limit, the current soft limit, and no
-limit, respectively. 
+limit, respectively.
 
 If limit is given, it is the new value of the specified resource. If
 no option is given, then -f is assumed. Values are in kilobytes,
diff --git a/doc_src/vared.txt b/doc_src/vared.txt
index bf383560..9f1cef53 100644
--- a/doc_src/vared.txt
+++ b/doc_src/vared.txt
@@ -1,4 +1,4 @@
-\section vared vared - interactively edit the value of an environment variable 
+\section vared vared - interactively edit the value of an environment variable
 
 \subsection vared-synopsis Synopsis
  <tt>vared VARIABLE_NAME</tt>
@@ -7,7 +7,7 @@
 
 vared is used to interactively edit the value of an environment
 variable. Array variables as a whole can not be edited using vared,
-but individual array elements can. 
+but individual array elements can.
 
 \subsection vared-example Example