remove trialing spaces #2

Doxyfile.user

@@ -10,8 +10,8 @@ ABBREVIATE_BRIEF       = YES
 ALWAYS_DETAILED_SEC    = NO
 INLINE_INHERITED_MEMB  = NO
 FULL_PATH_NAMES        = YES
-STRIP_FROM_PATH        = 
-STRIP_FROM_INC_PATH    = 
+STRIP_FROM_PATH        =
+STRIP_FROM_INC_PATH    =
 SHORT_NAMES            = NO
 JAVADOC_AUTOBRIEF      = YES
 MULTILINE_CPP_IS_BRIEF = NO
@@ -19,7 +19,7 @@ DETAILS_AT_TOP         = NO
 INHERIT_DOCS           = YES
 DISTRIBUTE_GROUP_DOC   = NO
 TAB_SIZE               = 8
-ALIASES                = 
+ALIASES                =
 OPTIMIZE_OUTPUT_FOR_C  = YES
 OPTIMIZE_OUTPUT_JAVA   = NO
 SUBGROUPING            = YES
@@ -44,7 +44,7 @@ GENERATE_TODOLIST      = YES
 GENERATE_TESTLIST      = YES
 GENERATE_BUGLIST       = YES
 GENERATE_DEPRECATEDLIST= YES
-ENABLED_SECTIONS       = 
+ENABLED_SECTIONS       =
 MAX_INITIALIZER_LINES  = 30
 SHOW_USED_FILES        = YES
 SHOW_DIRECTORIES       = YES
@@ -53,19 +53,19 @@ WARNINGS               = YES
 WARN_IF_UNDOCUMENTED   = YES
 WARN_IF_DOC_ERROR      = YES
 WARN_FORMAT            = "$file:$line: $text"
-WARN_LOGFILE           = 
-INPUT                  = 
+WARN_LOGFILE           =
+INPUT                  =
 FILE_PATTERNS          =  doc.h
 RECURSIVE              = NO
-EXCLUDE                = 
+EXCLUDE                =
 EXCLUDE_SYMLINKS       = NO
-EXCLUDE_PATTERNS       = 
-EXAMPLE_PATH           = 
-EXAMPLE_PATTERNS       = 
+EXCLUDE_PATTERNS       =
+EXAMPLE_PATH           =
+EXAMPLE_PATTERNS       =
 EXAMPLE_RECURSIVE      = NO
-IMAGE_PATH             = 
-INPUT_FILTER           = 
-FILTER_PATTERNS        = 
+IMAGE_PATH             =
+INPUT_FILTER           =
+FILTER_PATTERNS        =
 FILTER_SOURCE_FILES    = NO
 SOURCE_BROWSER         = NO
 INLINE_SOURCES         = NO
@@ -75,17 +75,17 @@ REFERENCES_RELATION    = YES
 VERBATIM_HEADERS       = YES
 ALPHABETICAL_INDEX     = NO
 COLS_IN_ALPHA_INDEX    = 5
-IGNORE_PREFIX          = 
+IGNORE_PREFIX          =
 GENERATE_HTML          = YES
 HTML_OUTPUT            = html
 HTML_FILE_EXTENSION    = .html
 HTML_HEADER            = user_doc.head.html
-HTML_FOOTER            = 
-HTML_STYLESHEET        = 
+HTML_FOOTER            =
+HTML_STYLESHEET        =
 HTML_ALIGN_MEMBERS     = YES
 GENERATE_HTMLHELP      = NO
-CHM_FILE               = 
-HHC_LOCATION           = 
+CHM_FILE               =
+HHC_LOCATION           =
 GENERATE_CHI           = NO
 BINARY_TOC             = NO
 TOC_EXPAND             = NO
@@ -99,8 +99,8 @@ LATEX_CMD_NAME         = latex
 MAKEINDEX_CMD_NAME     = makeindex
 COMPACT_LATEX          = NO
 PAPER_TYPE             = a4wide
-EXTRA_PACKAGES         = 
-LATEX_HEADER           = 
+EXTRA_PACKAGES         =
+LATEX_HEADER           =
 PDF_HYPERLINKS         = YES
 USE_PDFLATEX           = YES
 LATEX_BATCHMODE        = NO
@@ -109,33 +109,33 @@ GENERATE_RTF           = NO
 RTF_OUTPUT             = rtf
 COMPACT_RTF            = NO
 RTF_HYPERLINKS         = NO
-RTF_STYLESHEET_FILE    = 
-RTF_EXTENSIONS_FILE    = 
+RTF_STYLESHEET_FILE    =
+RTF_EXTENSIONS_FILE    =
 GENERATE_MAN           = NO
 MAN_OUTPUT             = man
 MAN_EXTENSION          = .3
 MAN_LINKS              = NO
 GENERATE_XML           = NO
 XML_OUTPUT             = xml
-XML_SCHEMA             = 
-XML_DTD                = 
+XML_SCHEMA             =
+XML_DTD                =
 XML_PROGRAMLISTING     = YES
 GENERATE_AUTOGEN_DEF   = NO
 GENERATE_PERLMOD       = NO
 PERLMOD_LATEX          = NO
 PERLMOD_PRETTY         = YES
-PERLMOD_MAKEVAR_PREFIX = 
+PERLMOD_MAKEVAR_PREFIX =
 ENABLE_PREPROCESSING   = YES
 MACRO_EXPANSION        = NO
 EXPAND_ONLY_PREDEF     = NO
 SEARCH_INCLUDES        = YES
-INCLUDE_PATH           = 
-INCLUDE_FILE_PATTERNS  = 
-PREDEFINED             = 
-EXPAND_AS_DEFINED      = 
+INCLUDE_PATH           =
+INCLUDE_FILE_PATTERNS  =
+PREDEFINED             =
+EXPAND_AS_DEFINED      =
 SKIP_FUNCTION_MACROS   = YES
-TAGFILES               = 
-GENERATE_TAGFILE       = 
+TAGFILES               =
+GENERATE_TAGFILE       =
 ALLEXTERNALS           = NO
 EXTERNAL_GROUPS        = YES
 PERL_PATH              = /usr/bin/perl
@@ -151,8 +151,8 @@ INCLUDED_BY_GRAPH      = YES
 CALL_GRAPH             = YES
 GRAPHICAL_HIERARCHY    = YES
 DOT_IMAGE_FORMAT       = png
-DOT_PATH               = 
-DOTFILE_DIRS           = 
+DOT_PATH               =
+DOTFILE_DIRS           =
 MAX_DOT_GRAPH_WIDTH    = 750
 MAX_DOT_GRAPH_HEIGHT   = 1024
 MAX_DOT_GRAPH_DEPTH    = 0

INSTALL

@@ -49,7 +49,7 @@ Then, use following commands to compile fish:
 Finally, if you wish to use fish as your default shell, use the
 following command:
 
- % chsh -s /usr/local/bin/fish			 
+ % chsh -s /usr/local/bin/fish
 
 chsh will prompt you for your password, and change your default shell.
 

Makefile.in

@@ -53,16 +53,16 @@ sysconfdir = @sysconfdir@
 docdir = @docdir@
 localedir = @localedir@
 prefix = @prefix@
-optbindirs = @optbindirs@ 
+optbindirs = @optbindirs@
 
 #
 # Various flags
 #
 
-MACROS = -DLOCALEDIR=\"$(localedir)\" -DPREFIX=L\"$(prefix)\" -DDATADIR=L\"$(datadir)\" -DSYSCONFDIR=L\"$(sysconfdir)\" 
-CFLAGS = @CFLAGS@ $(MACROS) 
-CPPFLAGS = @CPPFLAGS@ 
-LDFLAGS = @LIBS@ @LDFLAGS@ 
+MACROS = -DLOCALEDIR=\"$(localedir)\" -DPREFIX=L\"$(prefix)\" -DDATADIR=L\"$(datadir)\" -DSYSCONFDIR=L\"$(sysconfdir)\"
+CFLAGS = @CFLAGS@ $(MACROS)
+CPPFLAGS = @CPPFLAGS@
+LDFLAGS = @LIBS@ @LDFLAGS@
 LDFLAGS_FISH = ${LDFLAGS} @LIBS_FISH@ @LDFLAGS_FISH@
 LDFLAGS_FISH_INDENT = ${LDFLAGS} @LIBS_FISH_INDENT@
 LDFLAGS_FISH_PAGER = ${LDFLAGS} @LIBS_FISH_PAGER@
@@ -158,7 +158,7 @@ HDR_FILES_SRC := doc_src/index.hdr.in doc_src/commands.hdr.in doc_src/design.hdr
 HDR_FILES := $(subst .hdr.in,.hdr,$(HDR_FILES_SRC))
 
 #
-# Files containing documentation for external commands. 
+# Files containing documentation for external commands.
 #
 
 HELP_SRC := $(wildcard doc_src/*.txt)
@@ -208,7 +208,7 @@ MAIN_DIR_FILES := $(sort $(MAIN_DIR_FILES_UNSORTED))
 # Files in ./etc/
 #
 
-ETC_DIR_FILES :=etc/config.fish.in	
+ETC_DIR_FILES :=etc/config.fish.in
 
 
 #
@@ -245,7 +245,7 @@ FUNCTIONS_DIR_FILES := $(wildcard share/functions/*.fish)
 #
 
 SIMPLE_PROGRAMS := fish set_color mimedb fish_pager fishd fish_indent
-PROGRAMS := $(SIMPLE_PROGRAMS) @XSEL@ @SEQ_FALLBACK@ 
+PROGRAMS := $(SIMPLE_PROGRAMS) @XSEL@ @SEQ_FALLBACK@
 
 
 #
@@ -269,7 +269,7 @@ TRANSLATIONS := $(TRANSLATIONS_SRC:.po=.gmo)
 #
 
 all: $(PROGRAMS) user_doc share/man etc/config.fish share/config.fish $(TRANSLATIONS)
-	@echo fish has now been built. 
+	@echo fish has now been built.
 	@echo Use \'$(MAKE) install\' to install fish.
 .PHONY: all
 
@@ -300,7 +300,7 @@ debug:
 # User documentation, describing the features of the fish shell.
 #
 
-# Depend on the sources (*.hdr.in) and manually make the 
+# Depend on the sources (*.hdr.in) and manually make the
 # intermediate *.hdr and doc.h files if needed
 
 user_doc: $(HDR_FILES_SRC) Doxyfile.user user_doc.head.html $(HELP_SRC)
@@ -313,19 +313,19 @@ user_doc: $(HDR_FILES_SRC) Doxyfile.user user_doc.head.html $(HELP_SRC)
 # Source code documentation. Also includes user documentation.
 #
 
-doc: *.h *.c doc.h Doxyfile 
-	doxygen; 
+doc: *.h *.c doc.h Doxyfile
+	doxygen;
 
 
 #
 # PDF version of the source code documentation.
 #
 
-doc/refman.pdf: doc 
-	cd doc/latex; 
-	make; 
-	mv refman.pdf ..; 
-	cd ../..; 
+doc/refman.pdf: doc
+	cd doc/latex;
+	make;
+	mv refman.pdf ..;
+	cd ../..;
 	rm -r doc/latex;
 
 
@@ -362,7 +362,7 @@ doc_src/commands.hdr:$(HELP_SRC) doc_src/commands.hdr.in
 		echo >>command_list.tmp; \
 		echo >>command_list.tmp; \
 		echo "Back to <a href='index.html#toc-commands'>index</a>". >>command_list.tmp; \
-	done 
+	done
 	mv command_list.tmp command_list.txt
 	cat $@.in | awk '{if ($$0 ~ /@command_list@/){ system("cat command_list.txt");} else{ print $$0;}}' >$@
 
@@ -400,19 +400,19 @@ doc.h: $(HDR_FILES)
 #
 
 %.doxygen:%.txt
-	echo  "/** \page " `basename $*` >$@; 
-	cat $*.txt >>$@; 
+	echo  "/** \page " `basename $*` >$@;
+	cat $*.txt >>$@;
 	echo "*/" >>$@
 
-%: %.in 
+%: %.in
 	sed <$@.in >$@ \
 		-e "s,@sysconfdir\@,$(sysconfdir),g" \
 		-e "s,@datadir\@,$(datadir),g" \
 		-e "s,@docdir\@,$(docdir),g" \
 		-e "s|@configure_input\@|$@, generated from $@.in by the Makefile. DO NOT MANUALLY EDIT THIS FILE!|g" \
 		-e "s,@prefix\@,$(prefix),g" \
-		-e "s,@optbindirs\@,$(optbindirs),g" 
-#-e "s,@\@,$()," 
+		-e "s,@optbindirs\@,$(optbindirs),g"
+#-e "s,@\@,$(),"
 
 
 #
@@ -477,8 +477,8 @@ common.o: $(COMMON_FILES)
 # (__fish_print_help)
 #       ||
 #       \/
-#   formated text 
-#   with escape 
+#   formated text
+#   with escape
 #    sequences
 #
 #
@@ -500,7 +500,7 @@ share/man: $(HELP_SRC)
 	for i in $(HELP_SRC); do \
 		CMD_NAME=`basename $$i .txt`; \
 		sed -e "s/\(.\)\\.SH/\1/" -e "s/$$CMD_NAME *\\\\- *\"\(.*\)\"/\1/" <help_doc/man/man1/$$CMD_NAME.1 >share/man/$$CMD_NAME.1; \
-	done 
+	done
 	rm doc_src/*.doxygen   # Clean up intermediate files in doc_src/
 	rm -r help_doc         # Clean up intermediate help_doc tree
 
@@ -565,7 +565,7 @@ install: all install-sh check-uninstall install-force
 #
 
 install-force: all install-translations
-	$(INSTALL) -m 755 -d $(DESTDIR)$(bindir) 
+	$(INSTALL) -m 755 -d $(DESTDIR)$(bindir)
 	for i in $(PROGRAMS); do\
 		$(INSTALL) -m 755 $$i $(DESTDIR)$(bindir) ; \
 	done;
@@ -595,7 +595,7 @@ install-force: all install-translations
 	for i in $(MANUALS); do \
 		$(INSTALL) -m 644 $$i $(DESTDIR)$(mandir)/man1/; \
 	done;
-	@echo fish is now installed on your system. 
+	@echo fish is now installed on your system.
 	@echo To run fish, type \'fish\' in your terminal.
 	@echo
 	@echo To use fish as your login shell:
@@ -652,7 +652,7 @@ uninstall-legacy: uninstall
 	-rmdir $(DESTDIR)$(sysconfdir)/fish.d/completions
 	-rmdir $(DESTDIR)$(sysconfdir)/fish.d
 	-rm $(DESTDIR)$(sysconfdir)/fish
-	@echo The previous fish installation has been removed. 
+	@echo The previous fish installation has been removed.
 .PHONY: uninstall-legacy
 
 install-translations: $(TRANSLATIONS)
@@ -665,7 +665,7 @@ install-translations: $(TRANSLATIONS)
 	fi;
 .PHONY: install-translations
 
-uninstall-translations: 
+uninstall-translations:
 	if test $(HAVE_GETTEXT) = 1; then \
 		for i in $(TRANSLATIONS_SRC); do \
 			rm -f $(DESTDIR)$(datadir)/locale/*/LC_MESSAGES/fish.mo; \
@@ -682,7 +682,7 @@ uninstall-translations:
 # Build the fish program.
 #
 
-fish: $(FISH_OBJS) fish.o 
+fish: $(FISH_OBJS) fish.o
 	$(CC) $(FISH_OBJS) fish.o $(LDFLAGS_FISH) -o $@
 
 
@@ -698,7 +698,7 @@ fish_pager: $(FISH_PAGER_OBJS)
 # Build the fishd program.
 #
 
-fishd: $(FISHD_OBJS) 
+fishd: $(FISHD_OBJS)
 	$(CC) $(FISHD_OBJS) $(LDFLAGS_FISHD) -o $@
 
 
@@ -756,7 +756,7 @@ key_reader: key_reader.o input_common.o common.o env_universal.o env_universal_c
 # Update dependencies
 #
 depend:
-	makedepend -fMakefile.in -Y *.c 
+	makedepend -fMakefile.in -Y *.c
 	./config.status
 .PHONY: depend
 
@@ -765,7 +765,7 @@ depend:
 # an archive from it. Simplest way I could think of to make an archive
 # witout backups, autogenerated files, etc.
 #
-# Uses install instead of mkdir so build won't fail if the directory 
+# Uses install instead of mkdir so build won't fail if the directory
 # exists
 #
 
@@ -817,7 +817,7 @@ dist: fish-@PACKAGE_VERSION@.tar.bz2
 .PHONY: dist
 
 #
-# Build the RPM spec file. 
+# Build the RPM spec file.
 #
 
 fish.spec: fish.spec.in
@@ -854,7 +854,7 @@ rpm: fish-@PACKAGE_VERSION@.tar.bz2 fish.spec
 #
 
 distclean: clean
-	rm -f fish.spec Doxyfile.help 
+	rm -f fish.spec Doxyfile.help
 	rm -f etc/config.fish seq share/config.fish
 	rm -f config.status config.log config.h Makefile
 .PHONY: distclean
@@ -868,12 +868,12 @@ distclean: clean
 clean:
 	rm -f *.o doc.h doc.tmp doc_src/*.doxygen doc_src/*.c doc_src/*.o doc_src/commands.hdr
 	rm -f tests/tmp.err tests/tmp.out tests/tmp.status tests/foo.txt
-	rm -f $(PROGRAMS) fish_tests tokenizer_test key_reader 
+	rm -f $(PROGRAMS) fish_tests tokenizer_test key_reader
 	rm -f share/config.fish etc/config.fish doc_src/index.hdr doc_src/commands.hdr
-	rm -f fish-@PACKAGE_VERSION@.tar 
-	rm -f fish-@PACKAGE_VERSION@.tar.gz 
+	rm -f fish-@PACKAGE_VERSION@.tar
+	rm -f fish-@PACKAGE_VERSION@.tar.gz
 	rm -f fish-@PACKAGE_VERSION@.tar.bz2
-	rm -rf doc; 
+	rm -rf doc;
 	rm -rf fish-@PACKAGE_VERSION@
 	rm -rf xsel-0.9.6/
 	rm -f $(TRANSLATIONS)

configure.ac

@@ -54,7 +54,7 @@ if test configure -ot configure.ac; then
 		fi
 		exit 1
 	else
-		AC_MSG_ERROR( 
+		AC_MSG_ERROR(
 			[cannot find the autoconf program in your path.
 This program needs to be run whenever the configure.ac file is modified.
 Please install it and try again.]
@@ -79,7 +79,7 @@ if test ! -f ./config.h.in -o config.h.in -ot configure.ac; then
 		AC_MSG_NOTICE([running autoheader])
 		autoheader || exit 1
 	else
-		AC_MSG_ERROR( 
+		AC_MSG_ERROR(
 			[cannot find the autoheader program in your path.
 This program needs to be run whenever the configure.ac file is modified.
 Please install it and try again.]
@@ -130,7 +130,7 @@ done
 
 
 #
-# Tell autoconf to create config.h header 
+# Tell autoconf to create config.h header
 #
 AC_CONFIG_HEADERS(config.h)
 
@@ -144,8 +144,8 @@ AH_BOTTOM([#if __GNUC__ >= 3
 #define __warn_unused __attribute__ ((warn_unused_result))
 #define __sentinel __attribute__ ((sentinel))
 #else
-#define __warn_unused 
-#define __sentinel 
+#define __warn_unused
+#define __sentinel
 #endif])
 
 
@@ -195,14 +195,14 @@ fi
 # Optionally drop xsel command
 #
 
-AC_ARG_WITH( 
-	xsel, 
+AC_ARG_WITH(
+	xsel,
 	AC_HELP_STRING(
 		[--without-xsel],
 		[do not build the xsel program needed for X clipboard integration]
 	),
 	[xsel=$withval],
-	[xsel=with_xsel] 
+	[xsel=with_xsel]
 )
 
 if [[ "$xsel" = "with_xsel" ]]; then
@@ -226,7 +226,7 @@ AC_ARG_WITH(
 	[local_gettext=yes]
 )
 
-if test x$local_gettext != xno; then 
+if test x$local_gettext != xno; then
 	AC_DEFINE([USE_GETTEXT],[1],[Perform string translations with gettext])
 fi
 
@@ -338,9 +338,9 @@ AC_RUN_IFELSE(
 				return STATUS;
 			]
 		)
-	], 
-	[glibc=yes], 
-	[glibc=no] 
+	],
+	[glibc=yes],
+	[glibc=no]
 )
 
 if test "$glibc" = yes; then
@@ -383,7 +383,7 @@ fi
 
 AC_MSG_CHECKING([if we are under Solaris])
 case $target_os in
-	solaris*) 
+	solaris*)
 		AC_DEFINE( __EXTENSIONS__, 1, [Macro to enable additional prototypes under Solaris])
 		AC_MSG_RESULT(yes)
 		;;
@@ -397,7 +397,7 @@ AC_MSG_CHECKING([if we are using non varargs tparm.])
 AC_COMPILE_IFELSE(
 	[
 		AC_LANG_PROGRAM(
-			[			
+			[
 				#include <curses.h>
 				#include <term.h>
 			],
@@ -406,8 +406,8 @@ AC_COMPILE_IFELSE(
 			]
 		)
 	],
-	[tparm_solaris_kludge=no], 
-	[tparm_solaris_kludge=yes] 
+	[tparm_solaris_kludge=no],
+	[tparm_solaris_kludge=yes]
 )
 if test "x$tparm_solaris_kludge" = "xyes"; then
 	AC_MSG_RESULT(yes)
@@ -427,7 +427,7 @@ fi
 
 AC_MSG_CHECKING([if we are under BSD])
 case $target_os in
-	*bsd*) 
+	*bsd*)
 		AC_DEFINE( __BSD_VISIBLE, 1, [Macro to enable additional prototypes under BSD])
 		AC_DEFINE( _NETBSD_SOURCE, 1, [Macro to enable additional prototypes under BSD])
 		AC_MSG_RESULT(yes)
@@ -486,7 +486,7 @@ AC_CHECK_FILES([/proc/self/stat])
 #
 
 AC_DEFINE(
-	[HAVE_TRANSLATE_H], 
+	[HAVE_TRANSLATE_H],
 	[1],
 	[Define to 1 if the wgettext function should be used for translating strings.]
 )
@@ -510,12 +510,12 @@ LIBS_SHARED=$LIBS
 LIBS=$LIBS_COMMON
 
 #
-# Check for libraries needed by fish. 
+# Check for libraries needed by fish.
 #
 
 LIBS_COMMON=$LIBS
 LIBS="$LIBS_SHARED"
-if test x$local_gettext != xno; then 
+if test x$local_gettext != xno; then
 	AC_SEARCH_LIBS( gettext, intl,,)
 fi
 
@@ -527,24 +527,24 @@ LIBS_FISH=$LIBS
 LIBS=$LIBS_COMMON
 
 #
-# Check for libraries needed by fish_indent. 
+# Check for libraries needed by fish_indent.
 #
 
 LIBS_COMMON=$LIBS
 LIBS="$LIBS_SHARED"
-if test x$local_gettext != xno; then 
+if test x$local_gettext != xno; then
 	AC_SEARCH_LIBS( gettext, intl,,)
 fi
 LIBS_FISH_INDENT=$LIBS
 LIBS=$LIBS_COMMON
 
 #
-# Check for libraries needed by fish_pager. 
+# Check for libraries needed by fish_pager.
 #
 
 LIBS_COMMON=$LIBS
 LIBS="$LIBS_SHARED"
-if test x$local_gettext != xno; then 
+if test x$local_gettext != xno; then
 	AC_SEARCH_LIBS( gettext, intl,,)
 fi
 AC_SEARCH_LIBS( iconv_open, iconv, , [AC_MSG_ERROR([Could not find an iconv implementation, needed to build fish])] )
@@ -552,12 +552,12 @@ LIBS_FISH_PAGER=$LIBS
 LIBS=$LIBS_COMMON
 
 #
-# Check for libraries needed by fishd. 
+# Check for libraries needed by fishd.
 #
 
 LIBS_COMMON=$LIBS
 LIBS="$LIBS_SHARED"
-if test x$local_gettext != xno; then 
+if test x$local_gettext != xno; then
 	AC_SEARCH_LIBS( gettext, intl,,)
 fi
 AC_SEARCH_LIBS( iconv_open, iconv, , [AC_MSG_ERROR([Could not find an iconv implementation, needed to build fish])] )
@@ -565,12 +565,12 @@ LIBS_FISHD=$LIBS
 LIBS=$LIBS_COMMON
 
 #
-# Check for libraries needed by mimedb. 
+# Check for libraries needed by mimedb.
 #
 
 LIBS_COMMON=$LIBS
 LIBS="$LIBS_SHARED"
-if test x$local_gettext != xno; then 
+if test x$local_gettext != xno; then
 	AC_SEARCH_LIBS( gettext, intl,,)
 fi
 LIBS_MIMEDB=$LIBS
@@ -578,12 +578,12 @@ LIBS=$LIBS_COMMON
 
 
 #
-# Check for libraries needed by set_color 
+# Check for libraries needed by set_color
 #
 
 LIBS_COMMON=$LIBS
 LIBS="$LIBS_SHARED"
-if test x$local_gettext != xno; then 
+if test x$local_gettext != xno; then
 	AC_SEARCH_LIBS( gettext, intl,,)
 fi
 LIBS_SET_COLOR=$LIBS
@@ -599,8 +599,8 @@ AC_CHECK_HEADER(
 	[regex.h],
 	[
 		AC_DEFINE(
-			[HAVE_REGEX_H], 
-			[1], 
+			[HAVE_REGEX_H],
+			[1],
 			[Define to 1 if you have the <regex.h> header file.]
 		)
 	],
@@ -697,10 +697,10 @@ for i in "" "-D_POSIX_C_SOURCE=200112L" "-D_XOPEN_SOURCE=600 -D_POSIX_C_SOURCE=2
 			/* Extended-POSIX: might be unhidden by _XOPEN_SOURCE. */
 			ret += killpg( 0, 0 );
 			/* Non-standard: might be hidden by the macros. */
-			{ 
+			{
 				struct winsize termsize;
 				ret += (int)(void *)&termsize;
-				ret += SIGWINCH + TIOCGWINSZ + SIGIO; 
+				ret += SIGWINCH + TIOCGWINSZ + SIGIO;
 			}
 			return ret;
 
@@ -744,7 +744,7 @@ AC_CHECK_FUNCS( dcgettext backtrace backtrace_symbols sysconf )
 # the translations should be installed.
 #
 
-if test x$local_gettext != xno; then 
+if test x$local_gettext != xno; then
 	AC_CHECK_FUNC( gettext, HAVE_GETTEXT=1, HAVE_GETTEXT=0 )
 fi
 
@@ -768,22 +768,22 @@ AC_RUN_IFELSE(
 				#include <stdlib.h>
 			],
 			[
-				int status; 
-				char *res; 
-				res = realpath( "somefile", 0 ); 
-				status = !(res != 0 || errno == ENOENT); 
+				int status;
+				char *res;
+				res = realpath( "somefile", 0 );
+				status = !(res != 0 || errno == ENOENT);
 				exit( status );
 			]
 		)
-	], 
-	[have_realpath_null=yes], 
-	[have_realpath_null=no] 
+	],
+	[have_realpath_null=yes],
+	[have_realpath_null=no]
 )
 
 if test "$have_realpath_null" = yes; then
 	AC_MSG_RESULT(yes)
 	AC_DEFINE(
-		[HAVE_REALPATH_NULL], 
+		[HAVE_REALPATH_NULL],
 		[1],
 		[Define to 1 if realpath accepts null for its second argument.]
 	)
@@ -810,15 +810,15 @@ AC_LINK_IFELSE(
 				#endif
 			],
 			[
-				struct winsize termsize = {0}; 
+				struct winsize termsize = {0};
 				TIOCGWINSZ;
 			]
 		)
-	], 
+	],
 	[
-		AC_MSG_RESULT(yes); 
+		AC_MSG_RESULT(yes);
 		AC_DEFINE([HAVE_WINSIZE], [1], [Define to 1 if the winsize struct and TIOCGWINSZ macro exist])
-	], 
+	],
 	[
 		AC_MSG_RESULT(no)
 	]
@@ -854,7 +854,7 @@ if test "$ac_cv_func_fwprintf" = yes; then
 		[
 			AC_MSG_RESULT([yes])
 			AC_DEFINE([HAVE_BROKEN_FWPRINTF], [1], [Define to 1 one if the implemented fwprintf is broken])
-		] 
+		]
 	)
 
 fi
@@ -870,19 +870,19 @@ AC_TRY_LINK(
 	],
 	[
 		extern int  _nl_msg_cat_cntr;
-		int tmp = _nl_msg_cat_cntr; 
+		int tmp = _nl_msg_cat_cntr;
 		exit(tmp);
 	],
-	have__nl_msg_cat_cntr=yes, 
+	have__nl_msg_cat_cntr=yes,
 	have__nl_msg_cat_cntr=no
 )
 if test "$have__nl_msg_cat_cntr" = yes; then
 	AC_MSG_RESULT(yes)
 	AC_DEFINE(
-		[HAVE__NL_MSG_CAT_CNTR], 
+		[HAVE__NL_MSG_CAT_CNTR],
 		[1],
 		[Define to 1 if the _nl_msg_cat_cntr symbol is exported.]
-	)	
+	)
 else
 	AC_MSG_RESULT(no)
 fi
@@ -895,19 +895,19 @@ AC_TRY_LINK(
 	],
 	[
 		extern char **__environ;
-		char **tmp = __environ; 
+		char **tmp = __environ;
 		exit(tmp!=0);
 	],
-	have___environ=yes, 
+	have___environ=yes,
 	have___environ=no
 )
 if test "$have___environ" = yes; then
 	AC_MSG_RESULT(yes)
 	AC_DEFINE(
-		[HAVE___ENVIRON], 
+		[HAVE___ENVIRON],
 		[1],
 		[Define to 1 if the __environ symbol is exported.]
-	)	
+	)
 else
 	AC_MSG_RESULT(no)
 fi
@@ -924,26 +924,26 @@ AC_TRY_LINK(
 		static struct option
 			long_options[] =
 			{
-				0, 0, 0, 0 
+				0, 0, 0, 0
 			}
 		;
 		int opt = getopt_long( 0,
-							   0, 
 							   0,
-							   long_options, 
+							   0,
+							   long_options,
 							   0 );
-		
+
 	],
-	have_working_getopt_long=yes, 
+	have_working_getopt_long=yes,
 	have_working_getopt_long=no
 )
 if test "$have_working_getopt_long" = yes; then
 	AC_MSG_RESULT(yes)
 	AC_DEFINE(
-		[HAVE_WORKING_GETOPT_LONG], 
+		[HAVE_WORKING_GETOPT_LONG],
 		[1],
 		[Define to 1 if getopt_long exists and works.]
-	)	
+	)
 else
 	AC_MSG_RESULT(no)
 fi

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.

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
 	...

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

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@
 

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

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>.

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.

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>.

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
 

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.
 
 */

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>
 

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

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>.

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
 ( ). 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.

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,

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

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

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
 

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.

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,

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.

doc_src/random.txt

@@ -21,4 +21,4 @@ for i in (seq (random) -1 1)
 	echo $i
 	sleep
 end
-</pre> 
+</pre>

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

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

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

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

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,

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
 

etc/config.fish.in

@@ -39,7 +39,7 @@ if status --is-login
 end
 
 #
-# There are variables that contain colons that are not arrays. This 
+# There are variables that contain colons that are not arrays. This
 # reverts them back to regular strings.
 #
 

fish.spec.in

@@ -11,7 +11,7 @@ URL:                    http://www.fishshell.org
 Source0:                http://www.fishshell.org/files/%{version}/%{name}-%{version}.tar.bz2
 
 BuildRoot:              %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:          ncurses-devel gettext groff 
+BuildRequires:          ncurses-devel gettext groff
 
 
 # Locate correct build time-dependencies for providing X headers
@@ -50,10 +50,10 @@ BuildRequires:          %{xinclude}/X11/Intrinsic.h,  %{xinclude}/X11/Xatom.h
 %endif
 
 
-%description 
+%description
 
-fish is a shell geared towards interactive use. Its features are 
-focused on user friendliness and discoverability. The language syntax 
+fish is a shell geared towards interactive use. Its features are
+focused on user friendliness and discoverability. The language syntax
 is simple but incompatible with other shell languages.
 
 
@@ -75,7 +75,7 @@ make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR="$RPM_BUILD_ROOT" 
+make install DESTDIR="$RPM_BUILD_ROOT"
 
 # Find translation files
 %find_lang %{name}.\*

install-sh

@@ -115,7 +115,7 @@ fi
 if [ x"$dir_arg" != x ]; then
 	dst=$src
 	src=""
-	
+
 	if [ -d $dst ]; then
 		instcmd=:
 		chmodcmd=""
@@ -125,7 +125,7 @@ if [ x"$dir_arg" != x ]; then
 else
 
 # Waiting for this to be detected by the "$instcmd $src $dsttmp" command
-# might cause directories to be created, which would be especially bad 
+# might cause directories to be created, which would be especially bad
 # if $src (and thus $dsttmp) contains '*'.
 
 	if [ -f $src -o -d $src ]
@@ -135,7 +135,7 @@ else
 		echo "install:  $src does not exist"
 		exit 1
 	fi
-	
+
 	if [ x"$dst" = x ]
 	then
 		echo "install:	no destination specified"
@@ -163,7 +163,7 @@ dstdir=`echo $dst | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
 
 # Skip lots of stat calls in the usual case.
 if [ ! -d "$dstdir" ]; then
-defaultIFS='	
+defaultIFS='
 '
 IFS="${IFS-${defaultIFS}}"
 
@@ -202,17 +202,17 @@ else
 
 # If we're going to rename the final executable, determine the name now.
 
-	if [ x"$transformarg" = x ] 
+	if [ x"$transformarg" = x ]
 	then
 		dstfile=`basename $dst`
 	else
-		dstfile=`basename $dst $transformbasename | 
+		dstfile=`basename $dst $transformbasename |
 			sed $transformarg`$transformbasename
 	fi
 
 # don't allow the sed command to completely eliminate the filename
 
-	if [ x"$dstfile" = x ] 
+	if [ x"$dstfile" = x ]
 	then
 		dstfile=`basename $dst`
 	else
@@ -243,7 +243,7 @@ else
 # Now rename the file to the real destination.
 
 	$doit $rmcmd -f $dstdir/$dstfile &&
-	$doit $mvcmd $dsttmp $dstdir/$dstfile 
+	$doit $mvcmd $dsttmp $dstdir/$dstfile
 
 fi &&
 

make_completions.py

@@ -39,13 +39,13 @@ def print_completion( cmd, switch_arr, arg, desc ):
 
   if len(switch_arr)==0:
     return
-  
+
   res = "complete -c %s" % (cmd)
   for sw in switch_arr:
-    
+
     offset=1
     switch_type = "o"
-    
+
     if len(sw) == 2:
       switch_type = "s"
 
@@ -98,7 +98,7 @@ for c in man:
       can_be_switch = True
     elif before_switch.find(c)<0:
       can_be_switch = False
-      
+
 
   elif mode == MODE_SWITCH:
     if not switch_end.find(c)>=0:
@@ -106,7 +106,7 @@ for c in man:
     else:
       if len(sw) > 1:
         sw_arr.append(sw)
-      
+
       if switch_between_ignore.find(c) >= 0:
         mode=MODE_BETWEEN_IGNORE
       else:
@@ -124,7 +124,7 @@ for c in man:
     elif not switch_between_continue.find(c) >= 0:
       mode = MODE_DESC
       desc = c
-        
+
   elif mode == MODE_BETWEEN_IGNORE:
     if between_ignore.find(c)>=0:
       mode = MODE_BETWEEN
@@ -139,20 +139,20 @@ for c in man:
     if c == '\n' and pc == '\n':
       stop=True
 
-    if stop:      
+    if stop:
       mode=MODE_NONE
-      
+
       print_completion( cmd, sw_arr, None, desc )
 
       sw_arr = []
 
       desc = ''
-      
+
     else:
       desc += c
 
   else:
     print "Unknown mode", mode
-      
+
   pc = c
 

make_vcs_completions.fish

@@ -21,7 +21,7 @@ end
 
 #
 # This function formats a list of completion information into a set of fish completions
-# 
+#
 # The first argument is the condition string, which will be copied to
 # the resulting commandline verbatim
 #
@@ -42,7 +42,7 @@ function complete_from_list
 		set arg $exploded[3]
 		set desc (cap (esc $exploded[4]))
 
-		set str 
+		set str
 
 		switch $short
 			case '-?'
@@ -65,7 +65,7 @@ function complete_from_list
 				set str $str -x -a "'(__fish_complete_users)'"
 
 			case '=FILENAME' '=FILE' ' <file>'
-				set str $str -r 
+				set str $str -r
 
 			case ' arg'
 				set str $str -x
@@ -89,7 +89,7 @@ function complete_from_list
 				set str $str --description \'$desc\'
 		end
 
-		echo complete -c $cmd $condition $str 
+		echo complete -c $cmd $condition $str
 
 	end
 
@@ -101,7 +101,7 @@ function write_completions
 	set -g cmd $argv[1]; or return 1
 
 	echo "Making completions for $cmd" >&2
-	
+
 
 	echo '
 #
@@ -129,7 +129,7 @@ function write_completions
 	switch $cmd
 		case svn
 
-		function list_subcommand 
+		function list_subcommand
 			set cmd1 '\([^ ]*\)'
 			set cmd2 '\([^,)]*\)'
 			set cmdn '\(, \([^,)]*\)\|\)'
@@ -155,7 +155,7 @@ function write_completions
 
 		case cvs
 
-		function list_subcommand 
+		function list_subcommand
 			cmd --help-commands 2>| sed -n -e 's/^   *\([^ ][^ ]*\) .*$/\1/p'
 		end
 
@@ -167,7 +167,7 @@ function write_completions
 		function list_subcommand_help
 #'s/^[ \t]*\(-.\)[ \t]\([^- \t][^ \t]*\)*[ \t]*\([^-].*\)$/\1\t\2\t\3/p'
 
-			cmd -H $argv 2>| sed -n -e 's/'$re'/\1\t\t\2\t\4/p' 
+			cmd -H $argv 2>| sed -n -e 's/'$re'/\1\t\t\2\t\4/p'
 		end
 
 		echo '
@@ -181,12 +181,12 @@ function write_completions
 		set cmd_str_internal (cmd --help-commands 2>| sed -n -e 's/^  *\([^ ][^ ]*\)[\t ]*\([^ ].*\)$/\1\t\2/p')
 		for i in $cmd_str_internal
 			set exploded (echo $i|tr \t \n)
-			set cmd_str $cmd_str "-a $exploded[1] --description '"(esc $exploded[2])"'"		 
+			set cmd_str $cmd_str "-a $exploded[1] --description '"(esc $exploded[2])"'"
 		end
 
 		case '*'
 
-		function list_subcommand 
+		function list_subcommand
 			cmd help | sed -n -e 's/^  *\([^ ][^ ]*\) .*$/\1/p'
 		end
 
@@ -203,7 +203,7 @@ function write_completions
 		set cmd_str (cmd help | sed -n -e 's/^  *\([^ ][^ ]*\)[\t ]*\([^ ].*[^.]\)\(\|\\.\)$/-a \1 --description \'\2\'/p')
 
 	end
-	
+
 	echo '
 #
 # subcommands
@@ -228,8 +228,8 @@ function write_completions
 
 end
 
-set darcs_comp 'complete -c darcs -n "not __fish_use_subcommand" -a "(test -f _darcs/prefs/repos; and cat _darcs/prefs/repos)" --description "Darcs repo"' 
-set darcs_comp $darcs_comp 'complete -c darcs -a "test predist boringfile binariesfile" -n "contains setpref (commandline -poc)" --description "Set the specified option" -x' 
+set darcs_comp 'complete -c darcs -n "not __fish_use_subcommand" -a "(test -f _darcs/prefs/repos; and cat _darcs/prefs/repos)" --description "Darcs repo"'
+set darcs_comp $darcs_comp 'complete -c darcs -a "test predist boringfile binariesfile" -n "contains setpref (commandline -poc)" --description "Set the specified option" -x'
 
 write_completions darcs $darcs_comp >share/completions/darcs.fish
 write_completions hg >share/completions/hg.fish

po/en.po

@@ -562,7 +562,7 @@ msgid "%ls: Values cannot be specfied with erase\n"
 msgstr "%ls: Values cannot be specfied with erase\n"
 
 #: common.c:1756
-#, 
+#,
 msgid "This is a bug. "
 msgstr "This is a bug. "
 
@@ -637,7 +637,7 @@ msgid "handler for generic event '%ls'"
 msgstr "handler for generic event “%ls”"
 
 #: event.c:264
-#, 
+#,
 msgid "Unknown event type"
 msgstr "Unknown event type"
 
@@ -791,7 +791,7 @@ msgid "Could not set up output file descriptors for pager"
 msgstr ""
 
 #: fish_pager.c:1047
-#, 
+#,
 msgid "Could not set up input file descriptors for pager"
 msgstr "Could not set up input file descriptors for pager"
 
@@ -817,7 +817,7 @@ msgid "Unspecified file descriptors"
 msgstr "Unspecified file descriptors"
 
 #: fish_pager.c:1359
-#, 
+#,
 msgid "Could not read completions"
 msgstr "Could not read completions"
 
@@ -2609,7 +2609,7 @@ msgid "Specify a dir"
 msgstr "Specify a dir"
 
 #: share/completions/apt-src.fish:19
-#, 
+#,
 msgid "Omit debian version"
 msgstr "Omit debian version"
 

seq.in

@@ -1,5 +1,5 @@
 #!/usr/bin/env fish
-# 
+#
 # Fallback implementation of the seq command
 #
 # @configure_input@
@@ -45,4 +45,4 @@ for i in $from $step $to
 	end
 end
 
-echo "for( i=$from; i<=$to ; i+=$step ) i;" | bc 
+echo "for( i=$from; i<=$to ; i+=$step ) i;" | bc

share/completions/adduser.fish

@@ -13,7 +13,7 @@ complete -c adduser -l gecos --description 'Set the gecos field for the new entr
 complete -c adduser -l gid --description 'When creating a group, this option forces the new groupid to be the given number' -r
 complete -c adduser -l group --description 'When combined with --system, a group with the same name and ID as the system user is created'
 complete -c adduser -l help --description 'Display brief instructions'
-complete -c adduser -l home --description 'Use specified directory as the user's home directory' -x -a '(__fish_complete_directories)' 
+complete -c adduser -l home --description 'Use specified directory as the user's home directory' -x -a '(__fish_complete_directories)'
 complete -c adduser -l shell --description 'Use shell as the user's login shell, rather than the default specified by the configuration file' -x -a '(cat /etc/shells)'
 complete -c adduser -l ingroup --description 'Add the new user to GROUP instead of a usergroup or the default group defined by USERS_GID in the configuration file' -x -a '(cat /etc/group|cut -d : -f 1)'
 complete -c adduser -l no-create-home --description 'Do not create the home directory, even if it doesn't exist'

share/completions/arp.fish

@@ -7,5 +7,5 @@ complete -x -c arp -s d -l delete -a "(__fish_print_hostnames)" --description "R
 complete -c arp -s D -l use-device --description "Use hardware address"
 complete -x -c arp -s i -l device -a "(__fish_print_interfaces)" --description "Select interface"
 complete -x -c arp -s s -l set --description "Manually create ARP address" -a "(__fish_print_hostnames)"
-complete -f -c arp -s f -l file --description "Take addr from filename, default /etc/ethers" 
+complete -f -c arp -s f -l file --description "Take addr from filename, default /etc/ethers"
 

share/completions/at.fish

@@ -2,7 +2,7 @@
 complete -f -c at -s V --description "Display version and exit"
 complete -f -c at -s q --description "Use specified queue"
 complete -f -c at -s m --description "Send mail to user"
-complete -c at -s f -x -a "(__fish_complete_suffix (commandline -ct) '' 'At job')" --description "Read job from file" 
+complete -c at -s f -x -a "(__fish_complete_suffix (commandline -ct) '' 'At job')" --description "Read job from file"
 complete -f -c at -s l --description "Alias for atq"
 complete -f -c at -s d --description "Alias for atrm"
 complete -f -c at -s v --description "Show the time"

share/completions/bind.fish

@@ -2,7 +2,7 @@
 complete -c bind -s a -l all --description 'Show unavaliable key bindings/erase all bindings'
 complete -c bind -s e -l erase --description 'Erase mode'
 complete -c bind -s f -l function-names --description 'Print names of available functions'
-complete -c bind -s h -l help --description "Display help and exit" 
+complete -c bind -s h -l help --description "Display help and exit"
 complete -c bind -s k -l key --description 'Specify key name, not sequence'
 complete -c bind -s K -l key-names --description 'Print names of available keys'
 

share/completions/bunzip2.fish

@@ -5,8 +5,8 @@ complete -c bunzip2 -x -a "(
 "
 
 complete -c bunzip2 -x -a "(
-	__fish_complete_suffix .bz 
-	__fish_complete_suffix .bz2 
+	__fish_complete_suffix .bz
+	__fish_complete_suffix .bz2
 )
 "
 

share/completions/bzcat.fish

@@ -5,8 +5,8 @@ complete -c bzcat -x -a "(
 "
 
 complete -c bzcat -x -a "(
-	__fish_complete_suffix .bz 
-	__fish_complete_suffix .bz2 
+	__fish_complete_suffix .bz
+	__fish_complete_suffix .bz2
 )
 "
 

share/completions/bzip2.fish

@@ -6,8 +6,8 @@ complete -c bzip2 -s d -l decompress -x -a "(
 "
 
 complete -c bzip2 -s d -l decompress -x -a "(
-	__fish_complete_suffix .bz 
-	__fish_complete_suffix .bz2 
+	__fish_complete_suffix .bz
+	__fish_complete_suffix .bz2
 )
 "
 

share/completions/bzip2recover.fish

@@ -5,7 +5,7 @@ complete -c bzip2recover -x -a "(
 "
 
 complete -c bzip2recover -x -a "(
-	__fish_complete_suffix .bz 
-	__fish_complete_suffix .bz2 
+	__fish_complete_suffix .bz
+	__fish_complete_suffix .bz2
 )
 "

share/completions/cdrecord.fish

@@ -2,7 +2,7 @@
 # Completions for Cdrecord
 #
 
-complete -c cdrecord -o version --description "Display version and exit" 
+complete -c cdrecord -o version --description "Display version and exit"
 complete -c cdrecord -s v --description "Increment the level of general verbosity by one"
 complete -c cdrecord -s V --description "Increment the verbose level in respect of SCSI command transport by one"
 complete -c cdrecord -a "debug={1,2,3,4,5}" --description "Set the misc debug value to #"
@@ -30,7 +30,7 @@ complete -c cdrecord -o waiti --description "Wait for input to become available
 complete -c cdrecord -o load --description "Load the media and exit"
 complete -c cdrecord -o lock --description "Load the media, lock the door and exit"
 complete -c cdrecord -o eject --description "Eject disk after doing the work"
-complete -c cdrecord -a "speed={0,150,172,1385}" --description "Set the speed factor of the writing process to #" 
+complete -c cdrecord -a "speed={0,150,172,1385}" --description "Set the speed factor of the writing process to #"
 complete -c cdrecord -a "blank={help,all,fast,track,unreserve,trtail,unclose,session}" --description "Blank a CD-RW and exit or blank a CD-RW before writing"
 complete -c cdrecord -o format --description "Format a CD-RW/DVD-RW/DVD+RW disc"
 complete -c cdrecord -a "fs=" --description "Set the FIFO (ring buffer) size to #"

share/completions/configure.fish

@@ -9,6 +9,6 @@ complete -c configure -l prefix --description "Architecture-independent install
 complete -c configure -l exec-prefix --description "Architecture-dependent install directory" -a "__fish_complete_directories (commandline -ct)" -x
 complete -c configure -l build --description "Configure for building on BUILD" -x
 complete -c configure -l host --description "Cross-compile to build programs to run on HOST" -x
-complete -c configure -l target --description "Configure for building compilers for TARGET" -x 
+complete -c configure -l target --description "Configure for building compilers for TARGET" -x
 
 complete -c configure -u

share/completions/df.fish

@@ -6,7 +6,7 @@
 # Test if we are using GNU sed
 #
 
-set -l is_gnu 
+set -l is_gnu
 df --version >/dev/null ^/dev/null; and set is_gnu --is-gnu
 
 __fish_gnu_complete -c df -s h -l human-readable --description "Human readable sizes" $is_gnu

share/completions/find.fish

@@ -9,7 +9,7 @@ complete -c find -s L -o follow --description "Follow symlinks"
 complete -c find -s H --description "Do  not  follow symbolic links, except while processing the command line arguments"
 
 
-# General options 
+# General options
 
 complete -c find -o daystart --description "Measure from the beginning of today rather than  from  24  hours ago"
 complete -c find -s d -o depth --description "Process subdirectories before the directory itself"
@@ -36,8 +36,8 @@ complete -c find -o cmin --description "File status last changed specified numbe
 complete -c find -o cnewer --description "File status last changed more recently than file was modified" -r
 complete -c find -o ctime --description "File status last changed specified number of days ago" -r
 
-complete -c find -o empty --description "File is empty and is either a regular file or a directory" 
-complete -c find -o false --description "Always false" 
+complete -c find -o empty --description "File is empty and is either a regular file or a directory"
+complete -c find -o false --description "Always false"
 complete -c find -o fstype --description "File is on filesystem of specified type" -a "(__fish_print_filesystems)" -r
 complete -c find -o gid --description "Numeric group id of file" -r
 complete -c find -o group --description "Group name of file" -a "(__fish_complete_groups)"
@@ -99,7 +99,7 @@ complete -c find -o prune --description "Do not recurse unless -depth is specifi
 complete -c find -o quit --description "Exit at once"
 complete -c find -o ls --description "List file in ls -dils format" -r
 
-# Grouping 
+# Grouping
 
 complete -c find -o not --description "Negate result of action"
 complete -c find -o and -s a --description "Result is only true if both previous and next action are true"

share/completions/flac.fish

@@ -74,7 +74,7 @@ complete -c flac -l no-replay-gain -d "Don't calculate ReplayGain & store in Vor
 complete -c flac -l no-residual-gnuplot -d "Don't generate gnuplot files of residual distribution"
 complete -c flac -l no-residual-text -d "Don't include residual signal in text output"
 complete -c flac -l no-sector-align -d "Don't align multiple files on sector boundaries"
-complete -c flac -l no-seektable 
+complete -c flac -l no-seektable
 complete -c flac -l no-silent -d "Write runtime encode/decode statistics"
 complete -c flac -l no-force -d "Don't force overwriting of output files"
 complete -c flac -l no-verify -d "Don't verify a correct encoding"

share/completions/git.fish

@@ -117,7 +117,7 @@ complete -f -c git -n '__fish_git_using_command branch' -s M -d 'Force renaming
 complete -f -c git -n '__fish_git_using_command branch' -s a -d 'Lists both local and remote branches'
 
 ### cherry-pick
-complete -f -c git -n '__fish_git_needs_command' -a cherry-pick -d 'Apply the change introduced by an existing commit' 
+complete -f -c git -n '__fish_git_needs_command' -a cherry-pick -d 'Apply the change introduced by an existing commit'
 complete -f -c git -n '__fish_git_using_command cherry-pick' -a '(__fish_git_branches)' -d 'Branch'
 # TODO options
 

share/completions/gpg.fish

@@ -1,5 +1,5 @@
 #
-# Completions for the gpg command. 
+# Completions for the gpg command.
 #
 # This program accepts an rather large number of switches. It allows
 # you to do things like changing what file descriptor errors should be
@@ -22,7 +22,7 @@
 function __fish_complete_gpg_user_id -d "Complete using gpg user ids"
 	# gpg doesn't seem to like it when you use the whole key name as a
 	# completion, so we skip the <EMAIL> part and use it a s a
-	# description.	
+	# description.
 	gpg --list-keys --with-colon|cut -d : -f 10|sed -ne 's/\(.*\) <\(.*\)>/\1'\t'\2/p'
 end
 
@@ -49,7 +49,7 @@ complete -c gpg -s s -l sign --description "Make a signature"
 complete -c gpg -l clearsign --description "Make a clear text signature"
 complete -c gpg -s b -l detach-sign --description "Make a detached signature"
 complete -c gpg -s e -l encrypt --description "Encrypt data"
-complete -c gpg -s c -l symmetric --description "Encrypt with a symmetric cipher using a passphrase" 
+complete -c gpg -s c -l symmetric --description "Encrypt with a symmetric cipher using a passphrase"
 complete -c gpg -l store --description "Store only (make a simple RFC1991 packet)"
 complete -c gpg -l decrypt --description "Decrypt specified file or stdin"
 complete -c gpg -l verify --description "Assume specified file or stdin is sigfile and verify it"
@@ -76,7 +76,7 @@ complete -c gpg -l delete-key -xa "(__fish_complete_gpg_user_id)" --description
 complete -c gpg -l delete-secret-key -xa "(__fish_complete_gpg_user_id)" --description "Remove key from the secret and public keyring"
 complete -c gpg -l delete-secret-and-public-key -xa "(__fish_complete_gpg_user_id)" --description "Same as --delete-key, but if a secret key exists, it will be removed first"
 
-complete -c gpg -l gen-revoke -xa "(__fish_complete_gpg_user_id)" --description "Generate a revocation certificate for the complete key" 
+complete -c gpg -l gen-revoke -xa "(__fish_complete_gpg_user_id)" --description "Generate a revocation certificate for the complete key"
 complete -c gpg -l desig-revoke -xa "(__fish_complete_gpg_user_id)" --description "Generate a designated revocation certificate for a key"
 
 complete -c gpg -l export -xa "(__fish_append , (__fish_complete_gpg_user_id))" --description 'Export all or the given keys from all keyrings'
@@ -91,7 +91,7 @@ complete -c gpg -l recv-keys -xa "(__fish_complete_gpg_key_id)" --description "I
 complete -c gpg -l refresh-keys -xa "(__fish_complete_gpg_key_id)" --description "Request updates from a keyserver for keys that already exist on the local keyring"
 complete -c gpg -l search-keys -xa "(__fish_append , (__fish_complete_gpg_user_id) )" --description "Search the keyserver for the given names"
 complete -c gpg -l update-trustdb --description "Do trust database maintenance"
-complete -c gpg -l check-trustdb --description "Do trust database maintenance without user interaction" 
+complete -c gpg -l check-trustdb --description "Do trust database maintenance without user interaction"
 
 complete -c gpg -l export-ownertrust --description "Send the ownertrust values to stdout"
 complete -c gpg -l import-ownertrust --description "Update the trustdb with the ownertrust values stored in specified files or stdin"
@@ -137,7 +137,7 @@ complete -c gpg -l bzip2-decompress-lowmem --description "Use a different decomp
 complete -c gpg -s t -l textmode --description "Treat input files as text and store them in the OpenPGP canonical text form with standard 'CRLF' line endings"
 complete -c gpg -l no-textmode --description "Don't treat input files as text and store them in the OpenPGP canonical text form with standard 'CRLF' line endings"
 
-complete -c gpg -s n -l dry-run --description "Don't make any changes (this is not completely implemented)" 
+complete -c gpg -s n -l dry-run --description "Don't make any changes (this is not completely implemented)"
 
 complete -c gpg -s i -l interactive --description "Prompt before overwrite"
 
@@ -210,7 +210,7 @@ complete -c gpg -l sig-keyserver-url -x --description "Use specified URL as a pr
 complete -c gpg -l set-filename -x --description "Use specified string as the filename which is stored inside messages"
 
 complete -c gpg -l for-your-eyes-only --description "Set the 'for your eyes only' flag in the message"
-complete -c gpg -l no-for-your-eyes-only --description "Clear the 'for your eyes only' flag in the message" 
+complete -c gpg -l no-for-your-eyes-only --description "Clear the 'for your eyes only' flag in the message"
 
 complete -c gpg -l use-embedded-filename --description "Create file with name as given in data"
 complete -c gpg -l no-use-embedded-filename --description "Don't create file with name as given in data"

share/completions/gprof.fish

@@ -19,7 +19,7 @@ complete -c gprof -s x -l all-lines --description "Annotate every line"
 complete -xc gprof -l demangle --description "Set demangling style"
 complete -c gprof -l no-demangle --description "Turn of demangling"
 complete -xc gprof -s a -l no-static --description "Supress static functions"
-complete -xc gprof -s c -l static-call-graph 
+complete -xc gprof -s c -l static-call-graph
 complete -xc gprof -s D -l ignore-non-functions --description "Ignore symbols not known to be functions"
 complete -xc gprof -s k -r --description "Delete arcs from callgraph"
 complete -xc gprof -s l -l line --description "Line by line profiling"

share/completions/gzip.fish

@@ -1,7 +1,7 @@
 complete -c gzip -s c -l stdout --description "Compress to stdout"
 complete -c gzip -s d -l decompress -x -a "
 (
-	__fish_complete_suffix .gz 
+	__fish_complete_suffix .gz
 	__fish_complete_suffix .tgz
 )
 "

share/completions/kill.fish

@@ -4,7 +4,7 @@ set -l signals
 
 if kill -L ^/dev/null >/dev/null
 
-	# Debian and some related systems use 'kill -L' to write out a numbered list 
+	# Debian and some related systems use 'kill -L' to write out a numbered list
 	# of signals. Use this to complete on both number _and_ on signal name.
 
 	complete -c kill -s L --description "List codes and names of available signals"
@@ -12,7 +12,7 @@ if kill -L ^/dev/null >/dev/null
 	set signals (kill -L | sed -e 's/\([0-9][0-9]*\)  *\([A-Z,0-9][A-Z,0-9]*\)/\1 \2\n/g;s/ +/ /g' | sed -e 's/^ //' | sgrep -E '^[^ ]+')
 
 else
-	
+
 	# Posix systems print out the name of a signal using 'kill -l
 	# SIGNUM', so we use this instead.
 
@@ -30,7 +30,7 @@ for i in $signals
 	complete -c kill -o $number -d $name
 	complete -c kill -o $name -d $name
 	complete -c kill -o s -x -a \"$number\tSend\ $name\ signal\"
-	complete -c kill -o s -x -a \"$name\tSend\ $name\ signal\" 
+	complete -c kill -o s -x -a \"$name\tSend\ $name\ signal\"
 end
 
 

share/completions/make.fish

@@ -5,7 +5,7 @@
 # filename completion.  Unfortunatly, this turns out to be a bit
 # complicated to do.
 
-set -l is_assignment "commandline -ct|sgrep '..*='" 
+set -l is_assignment "commandline -ct|sgrep '..*='"
 set -l complete_file_assignment '(commandline -ct)(complete --do-complete=this_command_does_not_exist\ (commandline -ct|sed -e \'s/.*=//\'))'
 complete -c make --condition $is_assignment -a $complete_file_assignment
 

share/completions/modprobe.fish

@@ -15,7 +15,7 @@ complete -c modprobe -s V -l version --description "Display version and exit"
 complete -c modprobe -s f -l force --description "Ignore all version information"
 complete -c modprobe -l force-vermagic --description "Ignore version magic information"
 complete -c modprobe -l force-modversion --description "Ignore module interface version"
-complete -c modprobe -s l -l list --description "List all modules matching the given wildcard" 
+complete -c modprobe -s l -l list --description "List all modules matching the given wildcard"
 complete -c modprobe -s a -l all --description "Insert modules matching the given wildcard"
 complete -c modprobe -s t -l type --description "Restrict wildcards to specified directory"
 complete -c modprobe -s s -l syslog --description "Send error messages through syslog"

share/completions/mplayer.fish

@@ -7,19 +7,19 @@
 #
 
 set mplayer_lang "
-	de\tGerman 
-	dk\tDanish 
-	en\tEnglish 
+	de\tGerman
+	dk\tDanish
+	en\tEnglish
 	es\tSpanish
-	fi\tFinnish 
-	fr\tFrench 
+	fi\tFinnish
+	fr\tFrench
 	gr\tGreek
 	hu\tHungarian
 	it\tItalian
-	jp\tJapanese 
-	no\tNorwegian 
-	hu\tHungarian 
-	pl\tPolish 
+	jp\tJapanese
+	no\tNorwegian
+	hu\tHungarian
+	pl\tPolish
 	pt\tPortugese
 	se\Swedish
 "

share/completions/pacman.fish

@@ -32,9 +32,9 @@ complete -c pacman -n '__fish_contains_opt -s Q' -s l -d 'List all files owned b
 complete -c pacman -n '__fish_contains_opt -s Q' -s p -d 'Apply the query to a package file and not to an installed package'
 
 # Remove options
-complete -c pacman -n '__fish_contains_opt -s R' -s c -d 'Remove also the packages that depends on the target packages' 
-complete -c pacman -n '__fish_contains_opt -s R' -s k -d 'Remove the database entries only' 
-complete -c pacman -n '__fish_contains_opt -s R' -s n -d 'Ignore file backup designations' 
+complete -c pacman -n '__fish_contains_opt -s R' -s c -d 'Remove also the packages that depends on the target packages'
+complete -c pacman -n '__fish_contains_opt -s R' -s k -d 'Remove the database entries only'
+complete -c pacman -n '__fish_contains_opt -s R' -s n -d 'Ignore file backup designations'
 complete -c pacman -n '__fish_contains_opt -s R' -s s -d 'Remove also the dependencies of the target packages'
 
 # Sync options
@@ -54,6 +54,6 @@ complete -c pacman -n '__fish_contains_opt -s S' -l noprogressbar -d 'Do not sho
 # Complete with local packages
 complete -c pacman -n '__fish_contains_opt -s A -s F -s U' -a '(__fish_complete_suffix pkg.tar.gz)' -d 'Local package'
 # Complete with installed packages
-complete -c pacman -n '__fish_contains_opt -s Q -s R' -a '(pacman -Q | cut --delim " " --fields 1)' -d 'Installed package' 
+complete -c pacman -n '__fish_contains_opt -s Q -s R' -a '(pacman -Q | cut --delim " " --fields 1)' -d 'Installed package'
 # Complete with packages in the repos
 complete -c pacman -n '__fish_contains_opt -s S' -a '(pacman -Sl | cut --delim " " --fields 2 | sort)' -d 'Repo package'

share/completions/ping.fish

@@ -13,7 +13,7 @@ complete -c ping -s l --description "Send the specified number of packets withou
 complete -c ping -s L --description "Suppress loopback of multicast packets"
 complete -c ping -s n --description "Numeric output only"
 complete -c ping -s p --description "Pad packet with empty bytes" -x
-complete -c ping -s Q --description "Set Quality of Service -related bits in ICMP datagrams" -x 
+complete -c ping -s Q --description "Set Quality of Service -related bits in ICMP datagrams" -x
 complete -c ping -s q --description "Quiet mode"
 complete -c ping -s R --description "Record route"
 complete -c ping -s r --description "Bypass the normal routing tables and send directly to a host on an attached interface"

share/completions/quilt.fish

@@ -16,7 +16,7 @@ complete -c quilt -a fork -r --no-file -d " Fork the topmost patch"
 complete -c quilt -a graph -r --no-file -d "Generate  a  dot(1) directed graph showing the dependencies between applied patches"
 complete -c quilt -a grep -r --no-file -d "Grep through the source files, recursively, skipping patches and quilt meta-information"
 complete -c quilt -a header -r --no-file -d " Print or change the header of the topmost or specified patch"
-complete -c quilt -a import -r -d "Import external patches" 
+complete -c quilt -a import -r -d "Import external patches"
 complete -c quilt -a mail -r -d "Create  mail  messages  from all patches in the series file, and either store or send them"
 complete -c quilt -a new -r -d "Create a new patch with the specified file name, and  insert  it after the topmost patch"
 complete -c quilt -a next -r -d "Print  the  name  of  the next patch after the specified or topmost patch in the series file"

share/completions/scons.fish

@@ -12,8 +12,8 @@ complete -c scons -l cache-force -l cache-populate --description 'When using Cac
 complete -c scons -l cache-show --description 'When using CacheDir() and retrieving a derived file from the cache, show the command that would have been executed to build the file, instead of the usual report, "Retrieved file from cache'
 
 complete -c scons -l config --description 'This specifies how the Configure call should use or generate the results of configuration tests' -a '
-	auto\t"Use normal dependency mechanism" 
-	force\t"Rerun all tests" 
+	auto\t"Use normal dependency mechanism"
+	force\t"Rerun all tests"
 	cache\t"Take all results from cache"' -x
 
 complete -c scons -s C --description 'Directory, --directory=directory Change to the specified directory before searching for the SCon struct, Sconstruct, or sconstruct file, or doing anything else'

share/completions/sed.fish

@@ -4,12 +4,12 @@
 
 # Test if we are using GNU sed
 
-set -l is_gnu 
+set -l is_gnu
 sed --version >/dev/null ^/dev/null; and set is_gnu --is-gnu
 
 # Shared ls switches
 
-__fish_gnu_complete -c sed -s n -l quiet --description "Silent mode" $is_gnu 
+__fish_gnu_complete -c sed -s n -l quiet --description "Silent mode" $is_gnu
 __fish_gnu_complete -c sed -s e -l expression -x --description "Evaluate expression" $is_gnu
 __fish_gnu_complete -c sed -s f -l file -r --description "Evalute file" $is_gnu
 __fish_gnu_complete -c sed -s i -l in-place --description "Edit files in place" $is_gnu

share/completions/set.fish

@@ -22,11 +22,11 @@ function __fish_set_is_color -d 'Test if We are specifying a color value for the
 				return 0
 
 			case '-*'
-				 
+
 			case '*'
 				 return 1
 		end
-	end	
+	end
 	return 1
 end
 
@@ -40,11 +40,11 @@ function __fish_set_is_locale -d 'Test if We are specifying a locale value for t
 				return 0
 
 			case '-*'
-				 
+
 			case '*'
 				 return 1
 		end
-	end	
+	end
 	return 1
 end
 

share/completions/status.fish

@@ -7,5 +7,5 @@ complete -c status -l is-login --description "Test if this is a login shell"
 complete -c status -l is-full-job-control --description "Test if all new jobs are put under job control"
 complete -c status -l is-interactive-job-control --description "Test if only interactive new jobs are put under job control"
 complete -c status -l is-no-job-control --description "Test if new jobs are never put under job control"
-complete -c status -s j -l job-control -xa "full interactive none" --description "Set which jobs are out under job control" 
+complete -c status -s j -l job-control -xa "full interactive none" --description "Set which jobs are out under job control"
 complete -c status -s t -l print-stack-trace --description "Print a list of all function calls leading up to running the current command"

share/completions/su.fish

@@ -2,7 +2,7 @@
 
 complete -x -c su -a "(__fish_complete_users)"
 complete -c su -s l -l login --description "Make login shell"
-complete -r -c su -s c -l command --description "Pass command to shell" -xa "(__fish_complete_command)" 
+complete -r -c su -s c -l command --description "Pass command to shell" -xa "(__fish_complete_command)"
 complete -c su -s f -l fast --description "Pass -f to the shell"
 complete -c su -s m -l preserve_environment --description "Preserve environment"
 complete -c su -s p --description "Preserve environment"

share/completions/unrar.fish

@@ -3,9 +3,9 @@
 complete -c unrar -a "(__fish_complete_unrar)"
 
 complete -x -c unrar -n '__fish_use_subcommand' -a e --description "Extract files to current directory"
-complete -x -c unrar -n '__fish_use_subcommand' -a l --description "List archive" 
-complete -x -c unrar -n '__fish_use_subcommand' -a lt --description "List archive (technical)" 
-complete -x -c unrar -n '__fish_use_subcommand' -a lb --description "List archive (bare)" 
+complete -x -c unrar -n '__fish_use_subcommand' -a l --description "List archive"
+complete -x -c unrar -n '__fish_use_subcommand' -a lt --description "List archive (technical)"
+complete -x -c unrar -n '__fish_use_subcommand' -a lb --description "List archive (bare)"
 complete -x -c unrar -n '__fish_use_subcommand' -a p --description "Print file to stdout"
 complete -x -c unrar -n '__fish_use_subcommand' -a t --description "Test archive files"
 complete -x -c unrar -n '__fish_use_subcommand' -a v --description "Verbosely list archive"

share/completions/xargs.fish

@@ -6,15 +6,15 @@ complete -c xargs -s 0 -l null --description "Input filenames are terminated by
 complete -c xargs -s e -l eof --description "Set the end of file string to eof-str"
 complete -c xargs -s E -r -f --description "Set the end of file string to eof-str"
 complete -c xargs -l help --description "Display help and exit"
-complete -c xargs -s i -l replace --description "Replace replace-str in the initial arguments with names from standard input" 
+complete -c xargs -s i -l replace --description "Replace replace-str in the initial arguments with names from standard input"
 complete -c xargs -s I -r -f --description "Replace replace-str in the initial arguments with names from standard input"
 complete -c xargs -s l -l max-lines --description "Use at most max-lines nonblank input lines per command line"
 complete -c xargs -s L -r -f --description "Use at most max-lines nonblank input lines per command line"
 complete -c xargs -s n -l max-args -r -f --description "Use at most max-args arguments per command line"
 complete -c xargs -s p -l interactive --description "Prompt the user about whether to run each command line and read a line from the terminal"
-complete -c xargs -s r -l no-run-if-empty --description "If the standard input does not contain any nonblanks, do not run the command" 
+complete -c xargs -s r -l no-run-if-empty --description "If the standard input does not contain any nonblanks, do not run the command"
 complete -c xargs -s s -l max-chars -r -f --description "Use at most max-chars characters per command line"
 complete -c xargs -s t -l verbose --description "Print the command line on the standard error output before executing it"
 complete -c xargs -l version --description "Display version and exit"
 complete -c xargs -s x -l exit --description "Exit if the size is exceeded"
-complete -c xargs -s P -l max-procs -r -f --description "Run up to max-procs processes at a time" 
+complete -c xargs -s P -l max-procs -r -f --description "Run up to max-procs processes at a time"

share/completions/xprop.fish

@@ -9,7 +9,7 @@ complete -c xprop -o display --description "Specify X server"
 complete -c xprop -o len -x --description "Maximum display length"
 complete -c xprop -o notype --description "Do not show property type"
 complete -c xprop -o fs -r --description "Set format file"
-complete -c xprop -o frame --description "Select a window by clicking on its frame" 
+complete -c xprop -o frame --description "Select a window by clicking on its frame"
 complete -c xprop -o remove --description "Remove property" -x -a "
 (
 	xprop -root -notype|cut -d ' ' -f 1|cut -d \t -f 1

share/completions/yum.fish

@@ -7,7 +7,7 @@
 # Test if completing using package names is appropriate
 function __fish_yum_package_ok
 	for i in (commandline -poc)
-		if contains $i update upgrade remove erase 
+		if contains $i update upgrade remove erase
 			return 0
 		end
 	end
@@ -27,21 +27,21 @@ complete -c yum -n '__fish_use_subcommand' -xa generate-rss --description "Gener
 
 complete -c yum -n '__fish_yum_package_ok' -a "(__fish_print_packages)"
 
-complete -c yum -s h -l help --description "Display help and exit" 
-complete -c yum -s y --description "Assume yes to all questions" 
-complete -c yum -s c --description "Configuration file" -r 
-complete -c yum -s d --description "Set debug level" -x 
-complete -c yum -s e --description "Set error level" -x 
-complete -c yum -s t -l tolerant --description "Be tolerant of errors in commandline" 
+complete -c yum -s h -l help --description "Display help and exit"
+complete -c yum -s y --description "Assume yes to all questions"
+complete -c yum -s c --description "Configuration file" -r
+complete -c yum -s d --description "Set debug level" -x
+complete -c yum -s e --description "Set error level" -x
+complete -c yum -s t -l tolerant --description "Be tolerant of errors in commandline"
 complete -c yum -s R --description "Set maximum delay between commands" -x
-complete -c yum -s c --description "Run commands from cache" 
-complete -c yum -l version --description "Display version and exit" 
-complete -c yum -l installroot --description "Specify installroot" -r 
-complete -c yum -l enablerepo --description "Enable repository" -r 
+complete -c yum -s c --description "Run commands from cache"
+complete -c yum -l version --description "Display version and exit"
+complete -c yum -l installroot --description "Specify installroot" -r
+complete -c yum -l enablerepo --description "Enable repository" -r
 complete -c yum -l disablerepo --description "Disable repository" -r
-complete -c yum -l obsoletes --description "Enables obsolets processing logic" 
-complete -c yum -l rss-filename --description "Output rss-data to file" -r 
-complete -c yum -l exclude --description "Exclude specified package from updates" -a "(__fish_print_packages)" 
+complete -c yum -l obsoletes --description "Enables obsolets processing logic"
+complete -c yum -l rss-filename --description "Output rss-data to file" -r
+complete -c yum -l exclude --description "Exclude specified package from updates" -a "(__fish_print_packages)"
 
 complete -c yum -n 'contains list (commandline -poc)' -a all --description 'List all packages'
 complete -c yum -n 'contains list (commandline -poc)' -a available --description 'List packages available for installation'

share/config.fish.in

@@ -34,20 +34,20 @@ 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 
-	set -U fish_function_path $configdir/fish/functions    @sysconfdir@/fish/functions    @datadir@/fish/functions 
+if not set -q fish_function_path
+	set -U fish_function_path $configdir/fish/functions    @sysconfdir@/fish/functions    @datadir@/fish/functions
 end
 
-if not contains @datadir@/fish/functions $fish_function_path 
-	set fish_function_path[-1] @datadir@/fish/functions 
+if not contains @datadir@/fish/functions $fish_function_path
+	set fish_function_path[-1] @datadir@/fish/functions
 end
 
-if not set -q fish_complete_path 
-	set -U fish_complete_path $configdir/fish/completions  @sysconfdir@/fish/completions  @datadir@/fish/completions 
+if not set -q fish_complete_path
+	set -U fish_complete_path $configdir/fish/completions  @sysconfdir@/fish/completions  @datadir@/fish/completions
 end
 
-if not contains @datadir@/fish/completions $fish_complete_path 
-	set fish_complete_path[-1] @datadir@/fish/completions 
+if not contains @datadir@/fish/completions $fish_complete_path
+	set fish_complete_path[-1] @datadir@/fish/completions
 end
 
 set __fish_help_dir @docdir@
@@ -62,9 +62,9 @@ set __fish_help_dir @docdir@
 
 if test -d /usr/xpg4/bin
 	if not contains /usr/xpg4/bin $PATH
-		set PATH /usr/xpg4/bin $PATH 
+		set PATH /usr/xpg4/bin $PATH
 	end
-end   
+end
 
 #
 # Add a few common directories to path, if they exists. Note that pure

share/functions/__fish_append.fish

@@ -1,7 +1,7 @@
 function __fish_append -d "Internal completion function for appending string to the commandline" --argument separator
 	set -e argv[1]
 	set str (commandline -tc| sed -ne "s/\(.*$separator\)[^$separator]*/\1/p"|sed -e "s/--.*=//")
-	printf "%s\n" "$str"$argv "$str"(printf "%s\n" $argv|sed -e "s/\(\t\|\$\)/,\1/") 
+	printf "%s\n" "$str"$argv "$str"(printf "%s\n" $argv|sed -e "s/\(\t\|\$\)/,\1/")
 end
 
 

share/functions/__fish_bind_test1.fish

@@ -3,13 +3,13 @@ function __fish_bind_test1
 
 set -l args
 set -l use_keys no
-for i in (commandline -poc) 
+for i in (commandline -poc)
 	switch $i
 		case -k --k --ke --key
 		set use_keys yes
 
 		case "-*"
-		
+
 		case "*"
 		set args $args $i
 	end

share/functions/__fish_bind_test2.fish

@@ -4,7 +4,7 @@ set -l args
 for i in (commandline -poc)
 	switch $i
 		case "-*"
-		
+
 		case "*"
 		set args $args $i
 	end

share/functions/__fish_commandline_test.fish

@@ -2,7 +2,7 @@
 function __fish_commandline_test
 
 set -l is_function no
-for i in (commandline -poc) 
+for i in (commandline -poc)
 	switch $i
 		case -f --f --fu --fun --func --funct --functi --functio --function
 		set is_function yes
@@ -10,7 +10,7 @@ for i in (commandline -poc)
 		case --
 		break
 
-		
+
 	end
 end
 

share/functions/__fish_complete_ant_targets.fish

@@ -8,7 +8,7 @@ function __fish_complete_ant_targets -d "Print list of targets from build.xml an
 		set files (sed -n "s/^.*<import[^>]* file=[\"']\([^\"']*\)[\"'].*\$/\1/p" < $buildfile)
 
 		# iterate through files and display their targets
-		for file in $files; 
+		for file in $files;
 			__fish_filter_ant_targets $file
 		end
 	end

share/functions/__fish_complete_cd.fish

@@ -17,17 +17,17 @@ function __fish_complete_cd -d "Completions for the cd command"
 		set mycdpath $CDPATH
 	end
 
-	
+
 	if echo (commandline -ct)|sgrep '^/\|^\./\|^\.\./' >/dev/null
 		# This is an absolute search path
 		eval printf '\%s\\tDirectory\\n' (commandline -ct)\*/
 	else
 		# This is a relative search path
-		# Iterate over every directory in CDPATH 
+		# Iterate over every directory in CDPATH
 		# and check for possible completions
 
 		for i in $mycdpath
-			# Move to the initial directory first, 
+			# Move to the initial directory first,
 			# in case the CDPATH directory is relative
 
 			builtin cd $wd

share/functions/__fish_complete_file_url.fish

@@ -12,7 +12,7 @@ function __fish_complete_file_url
 
 	if test file:// = $prefix
 		set -l stripped (echo $comp|cut -c 8-)
-		printf "%s\n" file://(complete -C"echo $stripped") 
+		printf "%s\n" file://(complete -C"echo $stripped")
 	else
 		echo file://
 	end

share/functions/__fish_complete_ls.fish

@@ -5,14 +5,14 @@
 # Test if we are using GNU ls
 
 function __fish_complete_ls -d "Compleletions for ls and its aliases"
-	
-	set -l is_gnu 
+
+	set -l is_gnu
 	command ls --version >/dev/null ^/dev/null; and set is_gnu --is-gnu
-	
+
 	set -l cmds -c $argv
-	
+
 	# Shared ls switches
-	
+
 	__fish_gnu_complete $cmds -s a -l all --description "Show hidden" $is_gnu
 	__fish_gnu_complete $cmds -s A -l almost-all --description "Show hidden except . and .." $is_gnu
 	__fish_gnu_complete $cmds -s F -l classify --description "Append filetype indicator" $is_gnu
@@ -28,7 +28,7 @@ function __fish_complete_ls -d "Compleletions for ls and its aliases"
 	__fish_gnu_complete $cmds -s q -l hide-control-chars --description "Replace non-graphic characters with '?'" $is_gnu
 	__fish_gnu_complete $cmds -s r -l reverse --description "Reverse sort order" $is_gnu
 	__fish_gnu_complete $cmds -s s -l size --description "Print size of files" $is_gnu
-	
+
 	complete $cmds -s C --description "List by columns"
 	complete $cmds -s S --description "Sort by size"
 	complete $cmds -s c --description "Show and sort by ctime"
@@ -41,11 +41,11 @@ function __fish_complete_ls -d "Compleletions for ls and its aliases"
 	complete $cmds -s u --description "Show access time"
 	complete $cmds -s x --description "List entries by lines"
 	complete $cmds -s 1 --description "List one file per line"
-	
+
 	if test -n "$is_gnu"
-	   
+
 	   	# GNU specific ls switches
-	
+
 		complete $cmds -l hide --description "Do not list implied entries matching specified shell pattern" -r
 		complete $cmds -l lcontext --description "Display security context"
 		complete $cmds -l context -s Z --description "Display  security  context  so  it fits on most displays"
@@ -94,11 +94,11 @@ function __fish_complete_ls -d "Compleletions for ls and its aliases"
 		complete $cmds -s X --description "Sort by extension"
 		complete $cmds -l help --description "Display help and exit"
 		complete $cmds -l version --description "Display version and exit"
-	
+
 	else
-	
+
 		# If not a GNU system, assume we have standard BSD ls features instead
-	
+
 		complete $cmds -s B --description "Octal escapes for non graphic characters"
 		complete $cmds -s G --description "Use colors"
 		complete $cmds -s I --description "Prevent -A from being automatically set for root"
@@ -108,7 +108,7 @@ function __fish_complete_ls -d "Compleletions for ls and its aliases"
 		complete $cmds -s Z --description "Display each file's MAC label"
 		complete $cmds -s o --description "Include the file flags in a long (-l) output"
 		complete $cmds -s w --description "Print raw entry names"
-	
+
 	end
-	
+
 end

share/functions/__fish_complete_man.fish

@@ -1,5 +1,5 @@
 
-function __fish_complete_man 
+function __fish_complete_man
 	if test (commandline -ct)
 
 		# Try to guess what section to search in. If we don't know, we
@@ -11,13 +11,13 @@ function __fish_complete_man
 		while count $prev
 			switch $prev[1]
 			case '-**'
-				
+
 			case '*'
 				set section $prev[1]
 			end
 			set -e prev[1]
 		end
-		
+
 		set section $section"[^)]*"
 
 		# Do the actual search

share/functions/__fish_complete_subcommand.fish

@@ -24,7 +24,7 @@ function __fish_complete_subcommand  -d "Complete subcommand"
 			switch $i
 				case '-*'
 				case '*=*'
-					 
+
 				case '*'
 					set had_cmd 1
 					set res $i

share/functions/__fish_complete_subcommand_root.fish

@@ -1,7 +1,7 @@
 
 
 function __fish_complete_subcommand_root -d "Run the __fish_complete_subcommand function using a PATH containing /sbin and /usr/sbin"
-	set -l PATH_OLD $PATH 
+	set -l PATH_OLD $PATH
 	set PATH /sbin /usr/sbin $PATH
 	__fish_complete_subcommand
 	set PATH $PATH_OLD

share/functions/__fish_complete_suffix.fish

@@ -9,9 +9,9 @@ function __fish_complete_suffix -d "Complete using files"
 
 	# Variable declarations
 
-	set -l comp 
-	set -l suff 
-	set -l desc 
+	set -l comp
+	set -l suff
+	set -l desc
 	set -l files
 
 	switch (count $argv)

share/functions/__fish_complete_tar.fish

@@ -11,21 +11,21 @@ function __fish_complete_tar -d "Peek inside of archives and list all files"
 			case '*.tar.bz' '*.tar.bz2' '*.tbz' '*.tbz2'
 				if test -f $i
 					set -l file_list (tar -jt <$i)
-					printf (_ "%s\tArchived file\n") $file_list 
+					printf (_ "%s\tArchived file\n") $file_list
 				end
 				return
 
 			case '*.tar.gz'  '*.tgz'
 				if test -f $i
 					set -l file_list (tar -it <$i)
-					printf (_ "%s\tArchived file\n") $file_list 
+					printf (_ "%s\tArchived file\n") $file_list
 				end
 				return
 
 			case '*.tar'
 				if test -f $i
 					set -l file_list (tar -t <$i)
-					printf (_ "%s\tArchived file\n") $file_list 
+					printf (_ "%s\tArchived file\n") $file_list
 				end
 				return
 		end

share/functions/__fish_complete_unrar.fish

@@ -11,7 +11,7 @@ function __fish_complete_unrar -d "Peek inside of archives and list all files"
 			case '*.rar'
 				if test -f $i
 					set -l file_list (unrar vb $i)
-					printf (_ "%s\tArchived file\n") $file_list 
+					printf (_ "%s\tArchived file\n") $file_list
 				end
 				return
 		end

share/functions/__fish_complete_vi.fish

@@ -4,13 +4,13 @@ function __fish_complete_vi -d "Compleletions for vi and its aliases"
 
 	set -l is_vim
 	command vi --version >/dev/null ^/dev/null; and set is_vim vim
-	
+
 	set -l cmds -c $argv
 
 	# vim
 	if test -n "$is_vim"
 
-		
+
 		# these don't work
 		#complete $cmds -a - --description 'The file to edit is read from stdin. Commands are read from stderr, which should be a tty'
 
@@ -105,7 +105,7 @@ function __fish_complete_vi -d "Compleletions for vi and its aliases"
 		complete $cmds -r -c t --description 'Begin editing by executing the specified  editor command'
 
 	end
-	
+
 end
 
 

share/functions/__fish_config_interactive.fish

@@ -32,8 +32,8 @@ function __fish_config_interactive -d "Initializations that should be performed
 			end
 
 			if test -d $configdir
-				if command mkdir $configdir/fish 
-	
+				if command mkdir $configdir/fish
+
 					# These files are sometimes overwritten to by fish, so
 					# we want backups of them in case something goes wrong
 
@@ -51,7 +51,7 @@ function __fish_config_interactive -d "Initializations that should be performed
 					#
 					# Move the fishd stuff from another shell to avoid concurrency problems
 					#
-	
+
 					/bin/sh -c mv\ \~/.fishd.(hostname)\ $configdir/fish/fishd.(hostname)\;kill\ -9\ (echo %fishd)
 
 					# Update paths to point to new configuration locations
@@ -70,12 +70,12 @@ function __fish_config_interactive -d "Initializations that should be performed
 
 		# Make sure this is only done once
 		set -U __fish_init_1_22_0
-   
+
 	end
 
 	#
 	# If we are starting up for the first time, set various defaults
-	# 
+	#
 
 	if not set -q __fish_init_1_23_0
 		if not set -q fish_greeting
@@ -91,7 +91,7 @@ function __fish_config_interactive -d "Initializations that should be performed
 
 		function set_default -d "Set a universal variable, unless it has already been set"
 			if not set -q $argv[1]
-				set -U -- $argv	
+				set -U -- $argv
 			end
 		end
 
@@ -139,11 +139,11 @@ function __fish_config_interactive -d "Initializations that should be performed
 		#
 
 		functions -e set_default
-	
+
 	end
 
 	#
-	# Print a greeting 
+	# Print a greeting
 	#
 
 	if functions -q fish_greeting
@@ -153,7 +153,7 @@ function __fish_config_interactive -d "Initializations that should be performed
 			switch $fish_greeting
 				case ''
 				# If variable is empty, don't print anything, saves us a fork
-		
+
 				case '*'
 				echo $fish_greeting
 			end
@@ -189,7 +189,7 @@ function __fish_config_interactive -d "Initializations that should be performed
 	end
 
 	#
-	# Completions for SysV startup scripts. These aren't bound to any 
+	# Completions for SysV startup scripts. These aren't bound to any
 	# specific command, so they can't be autoloaded.
 	#
 
@@ -203,11 +203,11 @@ function __fish_config_interactive -d "Initializations that should be performed
 	if not set -q fish_key_bindings
 		set -U fish_key_bindings fish_default_key_bindings
 	end
-	
+
 	# Reload keybindings when binding variable change
 	function __fish_reload_key_bindings -d "Reload keybindings when binding variable change" --on-variable fish_key_bindings
 		eval $fish_key_bindings ^/dev/null
-	end 
+	end
 
 	# Load keybindings
 	__fish_reload_key_bindings
@@ -220,11 +220,11 @@ function __fish_config_interactive -d "Initializations that should be performed
 	# If the ubuntu command-not-found package can be found, add a handler for it
 
 	# First check in /usr/lib, this is where modern Ubuntus place this command
-	if test -f /usr/lib/command-not-found 
+	if test -f /usr/lib/command-not-found
 		function fish_command_not_found_handler --on-event fish_command_not_found
 			/usr/lib/command-not-found $argv
 		end
-	else 
+	else
 		# Ubuntu Feisty places this command in the regular path instead
 		if type -p command-not-found >/dev/null
 			function fish_command_not_found_handler --on-event fish_command_not_found

share/functions/__fish_contains_opt.fish

@@ -1,13 +1,13 @@
 
 function __fish_contains_opt -d "Checks if a specific option has been given in the current commandline"
-	set -l next_short 
+	set -l next_short
 
 	set -l short_opt
-	set -l long_opt 
+	set -l long_opt
 
 	for i in $argv
-		if test $next_short 
-			set next_short 
+		if test $next_short
+			set next_short
 			set short_opt $short_opt $i
 		else
 			switch $i
@@ -32,7 +32,7 @@ function __fish_contains_opt -d "Checks if a specific option has been given in t
 		if commandline -cpo | sgrep -- "^-"$i"\|^-[^-]*"$i >/dev/null
 			return 0
 		end
-		
+
 		if commandline -ct | sgrep -- "^-"$i"\|^-[^-]*"$i >/dev/null
 			return 0
 		end

share/functions/__fish_crux_packages.fish

@@ -1,4 +1,4 @@
-# a function to obtain a list of installed packages with CRUX pkgutils 
+# a function to obtain a list of installed packages with CRUX pkgutils
 function __fish_crux_packages -d 'Obtain a list of installed packages'
         pkginfo -i|cut -d' ' -f1
 end

share/functions/__fish_gnu_complete.fish

@@ -6,7 +6,7 @@ function __fish_gnu_complete -d "Wrapper for the complete builtin. Skips the lon
 	# Check if we are using a gnu system
 	for i in $argv
 		switch  $i
-			
+
 			case -g --is-gnu
 				set is_gnu 1
 
@@ -31,7 +31,7 @@ function __fish_gnu_complete -d "Wrapper for the complete builtin. Skips the lon
 						 continue
 
 				end
-	
+
 				switch $i
 
 					case -l --long
@@ -45,7 +45,7 @@ function __fish_gnu_complete -d "Wrapper for the complete builtin. Skips the lon
 			set argv $argv_out
 
 	end
-	
+
 	complete $argv
 
 end

share/functions/__fish_move_last.fish

@@ -14,14 +14,14 @@ function __fish_move_last -d "Move the last element of a directory history from
 	set -g (echo $dest) $$dest (command pwd)
 
 	set ssrc $$src
-		
+
 	# Change dir to the last entry in the source dir-hist
 	builtin cd $ssrc[$size_src]
 
-	# Keep all but the last from the source dir-hist 
+	# Keep all but the last from the source dir-hist
 	set -e (echo $src)\[$size_src]
 
 	# All ok, return success
 	return 0
-end	
+end
 

share/functions/__fish_no_arguments.fish

@@ -5,7 +5,7 @@ function __fish_no_arguments -d "Internal fish function"
 	for i in $cmd
 		switch $i
 			case '-*'
-				 
+
 			case '*'
 				 return 1
 		end

share/functions/__fish_not_contain_opt.fish

@@ -1,12 +1,12 @@
 function __fish_not_contain_opt -d "Checks that a specific option is not in the current commandline"
-	set -l next_short 
+	set -l next_short
 
 	set -l short_opt
-	set -l long_opt 
+	set -l long_opt
 
 	for i in $argv
-		if test $next_short 
-			set next_short 
+		if test $next_short
+			set next_short
 			set short_opt $short_opt $i
 		else
 			switch $i
@@ -31,7 +31,7 @@ function __fish_not_contain_opt -d "Checks that a specific option is not in the
 		if commandline -cpo | sgrep -- "^-"$i"\|^-[^-]*"$i >/dev/null
 			return 1
 		end
-		
+
 		if commandline -ct | sgrep -- "^-"$i"\|^-[^-]*"$i >/dev/null
 			return 1
 		end

share/functions/__fish_paginate.fish

@@ -6,7 +6,7 @@ function __fish_paginate -d "Paginate the current command using the users defaul
 	end
 
 	if commandline -j|grep -v "$cmd *\$" >/dev/null
-	
+
 		commandline -aj "|$cmd;"
 	end
 

share/functions/__fish_print_filesystems.fish

@@ -1,8 +1,8 @@
 
 function __fish_print_filesystems -d "Print a list of all known filesystem types"
-	set -l fs adfs affs autofs coda coherent cramfs devpts efs ext ext2 ext3 
-	set fs $fs hfs hpfs iso9660 jfs minix msdos ncpfs nfs ntfs proc qnx4 ramfs 
+	set -l fs adfs affs autofs coda coherent cramfs devpts efs ext ext2 ext3
+	set fs $fs hfs hpfs iso9660 jfs minix msdos ncpfs nfs ntfs proc qnx4 ramfs
 	set fs $fs reiserfs romfs smbfs sysv tmpfs udf ufs umsdos vfat xenix xfs xiafs
-	printf "%s\n" $fs 
+	printf "%s\n" $fs
 end
 

share/functions/__fish_print_help.fish

@@ -20,7 +20,7 @@ function __fish_print_help --description "Print help message for the specified f
 	set -l cmd3 s/.\x08'\(.\)'/(set_color --bold)\\1(set_color normal)/g
 
 	# Combine all expressions in a single variable
-	set -l sed_cmd -e $cmd1 -e $cmd2 -e $cmd3 
+	set -l sed_cmd -e $cmd1 -e $cmd2 -e $cmd3
 
 	# Render help output, save output into the variable 'help'
 	set -l help (nroff -man $__fish_datadir/man/$item.1)