Release 1.21.3

darcs-hash:20060402111721-ac50b-f5df9a3a3154a9bb37f4fcc6db3d4f44d12830ce.gz
Swedish translation checkin
2026-05-09 17:01:16 -03:00 · 2006-04-02 21:17:21 +10:00 · 2006-04-02 21:16:59 +10:00 · 2006-04-02 21:16:22 +10:00 · 2006-04-02 21:15:25 +10:00 · 2006-04-01 02:56:26 +10:00
425 changed files with 31068 additions and 14827 deletions
--- a/34
+++ b/34
@@ -2,39 +2,39 @@
 Known issues
 ============

-Older versions of Doxygen has bugs in the man-page generation which
-cause the builtin help to render incorrectly. Version 1.2.14 is known
-to have this problem.
+Fish is developed using GCC, with the goal of using only C89 language
+features. Fish does, however use the *wprintf family of functions,
+which are new to the C99 standrard. It is not unlikely that any given
+release contains a few GCC:isms, but ICC 9.0.030 has been found to
+produce working binaries. GCC 2.95.* won't compile fish, but GCC 3.2.3
+is known to work. Patches to fix any remaining GNU:isms are welcome.

-In version 1.9.2, the installation prefix for fish rpms and debs has
-changed from /usr/local to /usr. The package should automatically
-change any instances of /usr/local/bin/fish in /etc/passwd to
-/usr/bin/fish, but some programs, like screen, may need to be
-restarted to notice the changes.  You may also run into problems when
-switching between using a package and personal builds.
+Older versions of Doxygen has bugs in the man-page generation which
+cause the builtin help to render incorrectly. Doxygen 1.2.14 is known
+to have this problem.


 Prerequisites
 =============

-Fish requires the following packages to build:
+Fish requires the following programs and libraries to build:

 - Doxygen
 - Curses or Ncurses
+ - GNU make
+ - GCC

 fish also relies on standard unix tools such as cat, cut, grep, sed,
-whoami and echo. Fish does not support cross-compilation, separate
-build directories or any other fancy configure options. Use a recent
-version of Doxygen, since older versions have bugs that make the
-builtin help pages render incorrectly. Version 1.2.14 is known to be
-broken.
+whoami, bc and echo. Fish does not yet support cross-compilation,
+separate build directories or any other fancy configure options.


 Simple install procedure
 ========================

 If you have downloaded the darcs repository of fish, you need to run
-autoconf.
+the autoconf command first. Then use the following commands to compile
+fish:

 % ./configure
 % make                                   # Compile fish
@@ -53,7 +53,7 @@ Local install procedure
 =======================

 If you have downloaded the darcs repository of fish, you need to run
-autoconf first.
+autoconf to generate the configure script.

 To install fish in your own home directory (typically as non-root),
 type:
--- a/Makefile.in
+++ b/Makefile.in
@@ -16,6 +16,10 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #

+#
+# @configure_input@
+#
+
 #
 # Makefile for the fish shell. Can build fish and associated
 # applications, install them, recalculate dependencies and also create
@@ -28,58 +32,74 @@
 # hallucinations.
 #

-# Compiler flags
-
+# Programs
 CC := @CC@
-CFLAGS := @CFLAGS@ @INCLUDEDIR@ -Wall -std=gnu99 -fno-strict-aliasing
-CPPFLAGS=@CPPFLAGS@
-LDFLAGS:= -l@CURSESLIB@ @LIBS@ @LDFLAGS@ @LIBDIR@
 INSTALL:=@INSTALL@

+CFLAGS:=@CFLAGS@
+CPPFLAGS=@CPPFLAGS@
+LDFLAGS:= @LIBS@ @LDFLAGS@ 
+
+# Installation directories
 prefix = @prefix@
 exec_prefix = @exec_prefix@
 datadir = @datadir@
 bindir = @bindir@
 mandir = @mandir@
 sysconfdir = @sysconfdir@
-fishdir = @fishdir@
-fishfile = @fishfile@
 fishinputfile = @fishinputfile@
 docdir = @docdir@

+#etc files to install
+ETC_DIR_INSTALL = etc/fish_interactive.fish 
+
+# Set to 1 if we have gettext
 HAVE_GETTEXT=@HAVE_GETTEXT@

+CORE_OBJS := util.o common.o halloc.o halloc_util.o fallback.o
+
 # All objects used by fish, that are compiled from an ordinary .c file
 # using an ordinary .h file.
-COMMON_OBJS := function.o builtin.o common.o complete.o env.o exec.o	\
+COMMON_OBJS := function.o builtin.o complete.o env.o exec.o	\
 	expand.o highlight.o history.o kill.o parser.o proc.o reader.o		\
-	sanity.o tokenizer.o util.o wildcard.o wgetopt.o wutil.o input.o	\
+	sanity.o tokenizer.o wildcard.o wgetopt.o wutil.o input.o	\
 	output.o intern.o env_universal.o env_universal_common.o			\
-	input_common.o event.o signal.o io.o translate.o
+	input_common.o event.o signal.o io.o translate.o parse_util.o		\
+	$(CORE_OBJS)

 # builtin_help.h exists, but builtin_help.c is autogenerated
 COMMON_OBJS_WITH_HEADER := builtin_help.o

 # main.c exists, but main.h does not, etc.
-COMMON_OBJS_WITH_CODE := builtin_set.o builtin_commandline.o builtin_ulimit.c
+COMMON_OBJS_WITH_CODE := builtin_set.o builtin_commandline.o	\
+	builtin_ulimit.o builtin_complete.o

 # All objects that the system needs to build fish
-FISH_OBJS := $(COMMON_OBJS) $(COMMON_OBJS_WITH_CODE) $(COMMON_OBJS_WITH_HEADER) main.o
-FISH_PAGER_OBJS := fish_pager.o common.o output.o util.o wutil.o tokenizer.o input_common.o env_universal.o env_universal_common.o translate.o
-FISH_TESTS_OBJS := $(COMMON_OBJS) $(COMMON_OBJS_WITH_CODE) $(COMMON_OBJS_WITH_HEADER) fish_tests.o 
-FISHD_OBJS := fishd.o env_universal_common.o common.o util.o wutil.o	\
+FISH_OBJS := $(COMMON_OBJS) $(COMMON_OBJS_WITH_CODE)	\
+	$(COMMON_OBJS_WITH_HEADER) main.o

+# All objects that the system needs to build fish_pager
+FISH_PAGER_OBJS := fish_pager.o output.o wutil.o		\
+	tokenizer.o input_common.o env_universal.o env_universal_common.o	\
+	translate.o $(CORE_OBJS)

-#All objects that the system needs to build mimedb
-MIME_OBJS := mimedb.o xdgmimealias.o xdgmime.o xdgmimeglob.o	\
-	xdgmimeint.o xdgmimemagic.o xdgmimeparent.o wutil.o
+# All objects that the system needs to build fish_tests
+FISH_TESTS_OBJS := $(COMMON_OBJS) $(COMMON_OBJS_WITH_CODE)	\
+	$(COMMON_OBJS_WITH_HEADER) fish_tests.o
+
+# All objects that the system needs to build fishd
+FISHD_OBJS := fishd.o env_universal_common.o wutil.o	\
+	doc_src/fishd.o $(CORE_OBJS)
+
+# All objects needed to build mimedb
+MIME_OBJS := mimedb.o xdgmimealias.o xdgmime.o xdgmimeglob.o		\
+	xdgmimeint.o xdgmimemagic.o xdgmimeparent.o wutil.o $(CORE_OBJS)

 #
 # Files containing documentation for builtins. Should be listed
 # alphabetically, since this is the order in which they will be written
 # in the help file.
 #
-
 BUILTIN_DOC_SRC := doc_src/source.txt doc_src/and.txt					\
 	doc_src/begin.txt doc_src/bg.txt doc_src/bind.txt					\
 	doc_src/block.txt doc_src/break.txt doc_src/builtin.txt				\
@@ -103,19 +123,22 @@ BUILTIN_DOC_HDR := $(BUILTIN_DOC_SRC:.txt=.doxygen)
 # alphabetically, since this is the order in which they will be written
 # in the help file.
 #
-
-CMD_DOC_SRC := doc_src/count.txt doc_src/dirh.txt doc_src/dirs.txt	\
-	doc_src/fishd.txt doc_src/help.txt doc_src/mimedb.txt			\
-	doc_src/nextd.txt doc_src/open.txt doc_src/popd.txt				\
-	doc_src/prevd.txt doc_src/psub.txt doc_src/pushd.txt			\
-	doc_src/set_color.txt doc_src/trap.txt doc_src/type.txt			\
-	doc_src/umask.txt doc_src/vared.txt
+CMD_DOC_SRC := doc_src/contains.txt doc_src/count.txt doc_src/dirh.txt	\
+	doc_src/dirs.txt doc_src/fish_pager.txt doc_src/fishd.txt			\
+	doc_src/help.txt doc_src/mimedb.txt doc_src/nextd.txt				\
+	doc_src/open.txt doc_src/popd.txt doc_src/prevd.txt					\
+	doc_src/psub.txt doc_src/pushd.txt doc_src/set_color.txt			\
+	doc_src/trap.txt doc_src/type.txt doc_src/umask.txt					\
+	doc_src/vared.txt

 #
 # Files generated by running doxygen on the files in $(CMD_DOC_SRC)
 #
 CMD_DOC_HDR := $(CMD_DOC_SRC:.txt=.doxygen)

+#
+# Files in the test directory
+#
 TEST_IN := $(wildcard tests/test*.in)

 #
@@ -134,27 +157,35 @@ MAIN_DIR_FILES := Doxyfile Doxyfile.user Makefile.in configure			\
    $(COMMON_OBJS:.o=.h) $(COMMON_OBJS_WITH_CODE:.o=.c)					\
    $(COMMON_OBJS:.o=.c) builtin_help.hdr fish.spec.in INSTALL README	\
    user_doc.head.html xsel-0.9.6.tar ChangeLog config.sub				\
-    config.guess fish_tests.c main.c fish_pager.c fishd.c
+    config.guess fish_tests.c main.c fish_pager.c fishd.c seq.in

-# Files in ./init/
-INIT_DIR_FILES :=init/fish.in init/fish_complete.fish.in	\
-	init/fish_function.fish init/fish_inputrc			\
-	init/fish_interactive.fish.in
+# Files in ./etc/
+ETC_DIR_FILES :=etc/fish.in etc/fish_inputrc	\
+	etc/fish_interactive.fish.in
+
+# Files in ./share/
+SHARE_DIR_FILES :=share/fish.in

 # Files in ./tests/
 TESTS_DIR_FILES := $(TEST_IN) $(TEST_IN:.in=.out) $(TEST_IN:.in=.err)	\
 	$(TEST_IN:.in=.status) tests/test.fish tests/gen_output.fish

-COMPLETIONS_DIR_FILES := $(wildcard init/completions/*.fish)
+# Files in ./share/completions/
+COMPLETIONS_DIR_FILES := $(wildcard share/completions/*.fish)
+
+# Files in ./share/functions/
+FUNCTIONS_DIR_FILES := $(wildcard share/functions/*.fish)

 # Programs to build
-PROGRAMS:=fish set_color @XSEL@ mimedb count fish_pager fishd
+PROGRAMS:=fish set_color @XSEL@ @SEQ_FALLBACK@ mimedb count fish_pager fishd

 # Manuals to install
 MANUALS:=doc_src/fish.1 @XSEL_MAN_PATH@			\
 	doc_src/builtin_doc/man/man1/mimedb.1		\
 	doc_src/builtin_doc/man/man1/set_color.1	\
-	doc_src/builtin_doc/man/man1/count.1
+	doc_src/builtin_doc/man/man1/count.1 \
+	doc_src/builtin_doc/man/man1/fishd.1 \
+	doc_src/builtin_doc/man/man1/fish_pager.1

 #All translation message catalogs
 TRANSLATIONS_SRC := $(wildcard po/*.po)
@@ -162,15 +193,26 @@ TRANSLATIONS := $(TRANSLATIONS_SRC:.po=.gmo)

 #Make everything needed for installing fish
 all: $(PROGRAMS) user_doc
+	@echo fish has now been built. 
+	@echo Use \'make install\' to install fish.
+.PHONY: all
+
+configure: configure.ac
+	autoconf
+	./config.status --recheck
+
+Makefile: Makefile.in configure
+	./config.status

 debug:
-	make fish CFLAGS="-O0 -Wno-unused -Werror -g @INCLUDEDIR@ -Wall -std=gnu99 -fno-strict-aliasing"
+	make fish CFLAGS="@CFLAGS@ -O0 -Wno-unused -Werror -g"
+.PHONY: debug

 # User documentation, describing the features of the fish shell.
 user_doc: doc.h Doxyfile.user user_doc.head.html
 	doxygen Doxyfile.user

-#Source code documentation. Also includes user documentation.
+# Source code documentation. Also includes user documentation.
 doc: *.h *.c doc.h Doxyfile builtin_help.c
 	doxygen; 

@@ -184,6 +226,7 @@ doc/refman.pdf: doc

 test: $(PROGRAMS) fish_tests
 	./fish_tests; cd tests; ../fish <test.fish;
+.PHONY: test

 xsel-0.9.6:
 	tar -xf xsel-0.9.6.tar
@@ -215,26 +258,30 @@ doc.h:$(BUILTIN_DOC_SRC) $(CMD_DOC_SRC) doc_src/doc.hdr
 	echo "*/" >>$@

 # Compile translation file
-%.gmo:%.po
+%.gmo:
 	if test $(HAVE_GETTEXT) = 1; then \
 		msgfmt $*.po -o $*.gmo; \
 	fi

 # Update existing po file or copy messages.pot
-%.po: messages.pot
+%.po:messages.pot
 	if test $(HAVE_GETTEXT) = 1;then \
 		if test -f $*.po; then \
-			msgmerge -U --backup=existing --no-wrap $*.po messages.pot;\
+			msgmerge -U --backup=existing $*.po messages.pot;\
 		else \
 			cp messages.pot $*.po;\
 		fi; \
 	fi

 # Create a template translation object
-messages.pot: *.c *.h init/*.in init/*.fish init/completions/*.fish
+messages.pot: *.c *.h etc/*.in share/fish share/completions/*.fish share/functions/*.fish seq
 	if test $(HAVE_GETTEXT) = 1;then \
-		xgettext -k_ -kN_ -kcomplete_desc --no-wrap *.c *.h -o messages.pot; \
-		xgettext -j -k_ -LShell --no-wrap init/*.in init/*.fish init/completions/*.fish -o messages.pot; \
+		xgettext -k_ -kN_ *.c *.h -o messages.pot; \
+		if ! xgettext -j -k_ -kN_ -LShell etc/*.in share/fish share/completions/*.fish share/functions/*.fish seq -o messages.pot; then \
+			echo "Your xgettext version is too old to build the messages.pot file"\
+			rm messages.pot\
+			false;\
+		fi; \
 	fi

 # Generate the internal help functions by making doxygen create
@@ -272,6 +319,7 @@ messages.pot: *.c *.h init/*.in init/*.fish init/completions/*.fish
 builtin_help.c: $(BUILTIN_DOC_HDR) doc_src/count.doxygen gen_hdr2 gen_hdr.sh builtin_help.hdr $(CMD_DOC_HDR)
 	cd doc_src; doxygen; cd ..; 
 	cp builtin_help.hdr builtin_help.c; 
+	chmod 755 gen_hdr.sh
 	for i in $(BUILTIN_DOC_HDR) doc_src/count.doxygen ; do \
 		echo '    hash_put( &tbl, L"'`basename $$i .doxygen`'",' >>$@; \
 		./gen_hdr.sh $$i >>$@; \
@@ -293,26 +341,61 @@ builtin_help.c: $(BUILTIN_DOC_HDR) doc_src/count.doxygen gen_hdr2 gen_hdr.sh bui
 	echo "void print_help()" >>$@
 	echo "{" >>$@
 	echo '    printf( "%s",' >>$@
+	chmod 755 gen_hdr.sh
 	./gen_hdr.sh $*.doxygen >>$@
 	echo ");" >>$@
 	echo "}" >>$@
 #man -- doc_src/builtin_doc/man/man1/`basename $@ .c`.1 | cat -s | ./gen_hdr2 >>$@

-install: all install-translations
+#
+# The build rules for installing/uninstalling fish
+#
+
+# Check for an incompatible installed fish version, and fail with an
+# error if found
+
+check-uninstall:
+	if test -f $(DESTDIR)$(sysconfdir)/fish.d/fish_function.fish -o -f $(DESTDIR)$(sysconfdir)/fish.d/fish_complete.fish; then \
+		echo;\
+		echo ERROR;\
+		echo;\
+		echo An older fish installation using an incompatible filesystem hierarchy was detected;\
+		echo You must uninstall this fish version before installing proceeding;\
+		echo type \'make uninstall-legacy\' to uninstall these files,;\
+		echo or type \'make force-install\' to force installation.;\
+		echo The latter may result in a broken installation.;\
+		echo;\
+		false;\
+	fi;
+.PHONY: check-uninstall
+
+# Try to install after checking for incompatible installed versions
+install: all check-uninstall install-force
+.PHONY: install
+
+# Force installation, even in presense of incompatible previous
+# version
+install-force: all install-translations
 	$(INSTALL) -m 755 -d $(DESTDIR)$(bindir) 
 	for i in $(PROGRAMS); do\
 		$(INSTALL) -m 755 $$i $(DESTDIR)$(bindir) ; \
 	done;
-	$(INSTALL) -m 755 -d $(DESTDIR)$(sysconfdir)$(fishdir)
-	$(INSTALL) -m 755 -d $(DESTDIR)$(sysconfdir)$(fishdir)/completions
-	$(INSTALL) -m 644 init/fish $(DESTDIR)$(sysconfdir)$(fishfile)
-	for i in init/fish_interactive.fish init/fish_function.fish init/fish_complete.fish ; do \
-		$(INSTALL) -m 644 $$i $(DESTDIR)$(sysconfdir)$(fishdir); \
+	$(INSTALL) -m 755 -d $(DESTDIR)$(sysconfdir)/fish.d
+	$(INSTALL) -m 755 -d $(DESTDIR)$(datadir)/fish
+	$(INSTALL) -m 755 -d $(DESTDIR)$(datadir)/fish/completions
+	$(INSTALL) -m 755 -d $(DESTDIR)$(datadir)/fish/functions
+	$(INSTALL) -m 644 etc/fish $(DESTDIR)$(sysconfdir)/fish
+	$(INSTALL) -m 644 share/fish $(DESTDIR)$(datadir)/fish
+	for i in $(ETC_DIR_INSTALL); do \
+		$(INSTALL) -m 644 $$i $(DESTDIR)$(sysconfdir)/fish.d; \
 	done;
 	for i in $(COMPLETIONS_DIR_FILES); do \
-		$(INSTALL) -m 644 $$i $(DESTDIR)$(sysconfdir)$(fishdir)/completions/; \
+		$(INSTALL) -m 644 $$i $(DESTDIR)$(datadir)/fish/completions/; \
 	done;
-	$(INSTALL) -m 644 init/fish_inputrc $(DESTDIR)$(sysconfdir)$(fishinputfile);
+	for i in $(FUNCTIONS_DIR_FILES); do \
+		$(INSTALL) -m 644 $$i $(DESTDIR)$(datadir)/fish/functions/; \
+	done;
+	$(INSTALL) -m 644 etc/fish_inputrc $(DESTDIR)$(sysconfdir)/fish_inputrc;
 	$(INSTALL) -m 755 -d $(DESTDIR)$(docdir)
 	for i in user_doc/html/* ChangeLog; do \
 		if test -f $$i; then \
@@ -323,67 +406,113 @@ install: all install-translations
 	for i in $(MANUALS); do \
 		$(INSTALL) -m 644 $$i $(DESTDIR)$(mandir)/man1/; \
 	done;
-	@echo If you want to use fish as the default shell, remember to first
-	@echo add the line \'$(DESTDIR)$(bindir)/fish\' to the file \'/etc/shells\'.
+	@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:
+	@echo \* add the line \'$(DESTDIR)$(bindir)/fish\' to the file \'/etc/shells\'.
+	@echo \* use the command \'chsh -s $(DESTDIR)$(bindir)/fish\'.
+	@echo
+	@echo Have fun!
+.PHONY: force-install
+
+
+# Uninstall this fish version

 uninstall: uninstall-translations
 	for i in $(PROGRAMS); do \
 		rm -f $(DESTDIR)$(bindir)/$$i; \
 	done;
 	rm -f $(DESTDIR)$(bindir)/xsel
-	rm -f $(DESTDIR)$(sysconfdir)$(fishfile)
-	rm -f $(DESTDIR)$(sysconfdir)$(fishinputfile)
-	rm -r $(DESTDIR)$(sysconfdir)$(fishdir)
-	rm -r $(DESTDIR)$(docdir)
-	for i in fish.1* @XSEL_MAN@ mimedb.1* set_color.1* count.1*; do \
-		rm $(DESTDIR)$(mandir)/man1/$$i; \
+	rm -f $(DESTDIR)$(sysconfdir)/fish
+	rm -f $(DESTDIR)$(sysconfdir)/fish_inputrc
+	if test -d $(DESTDIR)$(datadir)/fish; then \
+		rm -r $(DESTDIR)$(datadir)/fish; \
+	fi
+	if test -d $(DESTDIR)$(docdir); then \
+		rm -r $(DESTDIR)$(docdir);\
+	fi
+	for i in fish.1 @XSEL_MAN@ mimedb.1 fishd.1 set_color.1 count.1; do \
+		rm -f $(DESTDIR)$(mandir)/man1/$$i*; \
 	done;
+.PHONY: uninstall
+
+# Uninstall older fish release. This is not the default uninstall
+# since there is a slight chance that it removes a file put in place by
+# the sysadmin.
+
+uninstall-legacy: uninstall
+	rm -f $(DESTDIR)$(sysconfdir)/fish.d/fish_interactive.fish
+	rm -f $(DESTDIR)$(sysconfdir)/fish.d/fish_complete.fish
+	rm -f $(DESTDIR)$(sysconfdir)/fish.d/fish_function.fish
+	if test -d $(DESTDIR)$(sysconfdir)/fish.d/completions; then \
+		for i in $(COMPLETIONS_DIR_FILES); do \
+			basename=`basename $$i`; \
+			if test -f $(DESTDIR)$(sysconfdir)/fish.d/completions/$$basename; then \
+				rm $(DESTDIR)$(sysconfdir)/fish.d/completions/$$basename; \
+			fi; \
+		done; \
+	fi;
+	rmdir $(DESTDIR)$(sysconfdir)/fish.d/completions; true
+	rmdir $(DESTDIR)$(sysconfdir)/fish.d; true
+	@echo The previous fish installation has been removed. 

 install-translations: $(TRANSLATIONS)
 	if test $(HAVE_GETTEXT) = 1; then \
 		for i in $(TRANSLATIONS); do \
-			$(INSTALL) -m 755 -d $(DESTDIR)$(datadir)/locale/$$(basename $$i .gmo)/LC_MESSAGES; \
-			$(INSTALL) -m 644 $$i $(DESTDIR)$(datadir)/locale/$$(basename $$i .gmo)/LC_MESSAGES/fish.mo; \
-			echo $(DESTDIR)$(datadir)/locale/$$(basename $$i .gmo)/LC_MESSAGES/fish.mo;\
+			$(INSTALL) -m 755 -d $(DESTDIR)$(datadir)/locale/`basename $$i .gmo`/LC_MESSAGES; \
+			$(INSTALL) -m 644 $$i $(DESTDIR)$(datadir)/locale/`basename $$i .gmo`/LC_MESSAGES/fish.mo; \
+			echo $(DESTDIR)$(datadir)/locale/`basename $$i .gmo`/LC_MESSAGES/fish.mo;\
 		done; \
-	fi
+	fi;
+.PHONY: install-translations

 uninstall-translations: 
 	if test $(HAVE_GETTEXT) = 1; then \
 		for i in $(TRANSLATIONS_SRC); do \
-			rm -f $(DESTDIR)$(datadir)/locale/$$(basename $$i .po)/LC_MESSAGES/fish.mo; \
+			rm -f $(DESTDIR)$(datadir)/locale/*/LC_MESSAGES/fish.mo; \
 		done; \
 	fi
+.PHONY: uninstall-translations
+
+#
+# The build rules for all the commands
+#

-# The fish shell
 fish: $(FISH_OBJS) 
 	$(CC) $(FISH_OBJS) $(LDFLAGS) -o $@

 fish_pager: $(FISH_PAGER_OBJS)
 	$(CC) $(FISH_PAGER_OBJS) $(LDFLAGS) -o $@

-fishd: $(FISHD_OBJS)
+fishd: $(FISHD_OBJS) 
 	$(CC) $(FISHD_OBJS) $(LDFLAGS) -o $@

 fish_tests: $(FISH_TESTS_OBJS)
 	$(CC) $(FISH_TESTS_OBJS) $(LDFLAGS) -o $@


-mimedb: $(MIME_OBJS) util.o common.o doc_src/mimedb.c
-	$(CC) ${MIME_OBJS} util.o common.o doc_src/mimedb.c $(LDFLAGS) -o $@
+mimedb: $(MIME_OBJS) doc_src/mimedb.o
+	$(CC) ${MIME_OBJS} doc_src/mimedb.o $(LDFLAGS) -o $@

-set_color: set_color.o doc_src/set_color.c 
-	$(CC) set_color.o doc_src/set_color.c $(LDFLAGS) -o $@
+set_color: set_color.o doc_src/set_color.o 
+	$(CC) set_color.o doc_src/set_color.o $(LDFLAGS) -o $@

 # Test program for the tokenizer library
 tokenizer_test: tokenizer.c tokenizer.h util.o wutil.o common.o
 	$(CC) ${CFLAGS} tokenizer.c util.o wutil.o common.o -D TOKENIZER_TEST $(LDFLAGS) -o $@

-key_reader: key_reader.o input_common.o common.o env_universal.o env_universal_common.o util.o wutil.o
-	$(CC) key_reader.o input_common.o common.o env_universal.o env_universal_common.o util.o wutil.o $(LDFLAGS) -o $@
+# Neat little program to show output from terminal
+key_reader: key_reader.o input_common.o $(CORE_OBJS) env_universal.o env_universal_common.o wutil.o
+	$(CC) key_reader.o input_common.o $(CORE_OBJS) env_universal.o env_universal_common.o wutil.o $(LDFLAGS) -o $@

+#
+# Update dependencies
+#
 depend:
 	makedepend -fMakefile.in -Y *.c 
+	./config.status
+.PHONY: depend

 # Copy all the source files into a new directory and use tar to create
 # an archive from it. Simplest way I could think of to make an archive
@@ -391,48 +520,70 @@ depend:
 #
 # Uses install instead of mkdir so build won't fail if the directory 
 # exists
-fish-@PACKAGE_VERSION@.tar: $(DOC_SRC_DIR_FILES) $(MAIN_DIR_FILES) $(INIT_DIR_FILES) $(TEST_DIR_FILES) $(COMPLETIONS_DIR_FILES) ChangeLog $(TRANSLATIONS_SRC)
+fish-@PACKAGE_VERSION@.tar: $(DOC_SRC_DIR_FILES) $(MAIN_DIR_FILES) $(ETC_DIR_FILES) $(TEST_DIR_FILES) $(SHARE_DIR_FILES) $(FUNCTIONS_DIR_FILES) $(COMPLETIONS_DIR_FILES) ChangeLog 
 	rm -rf fish-@PACKAGE_VERSION@
 	$(INSTALL) -d fish-@PACKAGE_VERSION@
 	$(INSTALL) -d fish-@PACKAGE_VERSION@/doc_src
-	$(INSTALL) -d fish-@PACKAGE_VERSION@/init
-	$(INSTALL) -d fish-@PACKAGE_VERSION@/init/completions
+	$(INSTALL) -d fish-@PACKAGE_VERSION@/etc
+	$(INSTALL) -d fish-@PACKAGE_VERSION@/share
+	$(INSTALL) -d fish-@PACKAGE_VERSION@/share/completions
+	$(INSTALL) -d fish-@PACKAGE_VERSION@/share/functions
 	$(INSTALL) -d fish-@PACKAGE_VERSION@/tests
 	$(INSTALL) -d fish-@PACKAGE_VERSION@/po
 	cp -f $(DOC_SRC_DIR_FILES) fish-@PACKAGE_VERSION@/doc_src
 	cp -f $(MAIN_DIR_FILES) fish-@PACKAGE_VERSION@/
-	cp -f $(INIT_DIR_FILES) fish-@PACKAGE_VERSION@/init/
-	cp -f $(COMPLETIONS_DIR_FILES) fish-@PACKAGE_VERSION@/init/completions/
+	cp -f $(ETC_DIR_FILES) fish-@PACKAGE_VERSION@/etc/
+	cp -f $(SHARE_DIR_FILES) fish-@PACKAGE_VERSION@/share/
+	cp -f $(COMPLETIONS_DIR_FILES) fish-@PACKAGE_VERSION@/share/completions/
+	cp -f $(FUNCTIONS_DIR_FILES) fish-@PACKAGE_VERSION@/share/functions/
 	cp -f $(TESTS_DIR_FILES) fish-@PACKAGE_VERSION@/tests/
 	cp -f $(TRANSLATIONS_SRC) fish-@PACKAGE_VERSION@/po/
 	tar -c fish-@PACKAGE_VERSION@ >fish-@PACKAGE_VERSION@.tar
 	rm -rf fish-@PACKAGE_VERSION@

+tar: fish-@PACKAGE_VERSION@.tar
+.PHONY: tar
+
 fish-@PACKAGE_VERSION@.tar.gz: fish-@PACKAGE_VERSION@.tar
 	gzip -f --best -c fish-@PACKAGE_VERSION@.tar >fish-@PACKAGE_VERSION@.tar.gz

 fish-@PACKAGE_VERSION@.tar.bz2: fish-@PACKAGE_VERSION@.tar
 	bzip2 -f --best -k fish-@PACKAGE_VERSION@.tar

+dist: fish-@PACKAGE_VERSION@.tar.bz2
+.PHONY: dist
+
 # Create .rpm file for the current systems architecture and an
 # .src.rpm file.
 rpm: fish-@PACKAGE_VERSION@.tar.bz2
+	@if ! which rpmbuild; then \
+		echo Could not find the rpmbuild command, needed to build an rpm; \
+		echo You may be able to install it using the following command:; \
+		echo \'yum install rpm-build\'; \
+		false; \
+	fi
 	cp fish.spec /usr/src/redhat/SPECS/
 	cp fish-@PACKAGE_VERSION@.tar.bz2 /usr/src/redhat/SOURCES/
 	rpmbuild -ba --clean /usr/src/redhat/SPECS/fish.spec
 	mv /usr/src/redhat/RPMS/*/fish*@PACKAGE_VERSION@*.rpm .
 	mv /usr/src/redhat/SRPMS/fish*@PACKAGE_VERSION@*.src.rpm .
+.PHONY: rpm
+
+#
+# Cleanup targets
+#

 distclean: clean
 	rm -f fish.spec doc_src/fish.1 doc_src/Doxyfile 
-	rm -f init/fish init/fish_interactive.fish init/fish_complete.fish
+	rm -f etc/fish etc/fish_interactive.fish seq
 	rm -f config.status config.log config.h Makefile
+.PHONY: distclean

 clean:
 	rm -f *.o doc.h doc_src/*.doxygen doc_src/*.c builtin_help.c 
 	rm -f tests/tmp.err tests/tmp.out tests/tmp.status tests/foo.txt
 	rm -f tokenizer_test fish key_reader set_color gen_hdr2 mimedb
-	rm -f fishd fish_pager count 
+	rm -f fishd fish_pager count fish_tests 
 	rm -f fish-@PACKAGE_VERSION@.tar 
 	rm -f fish-@PACKAGE_VERSION@.tar.gz 
 	rm -f fish-@PACKAGE_VERSION@.tar.bz2
@@ -442,90 +593,116 @@ clean:
 	rm -rf fish-@PACKAGE_VERSION@
 	rm -rf xsel-0.9.6/
 	rm -f $(TRANSLATIONS)
+.PHONY: clean

 # DO NOT DELETE THIS LINE -- make depend depends on it.

-builtin.o: config.h util.h wutil.h builtin.h function.h complete.h proc.h
-builtin.o: io.h parser.h reader.h env.h expand.h common.h wgetopt.h sanity.h
-builtin.o: tokenizer.h builtin_help.h wildcard.h input_common.h input.h
-builtin.o: intern.h event.h signal.h translate.h
-builtin_commandline.o: signal.h config.h util.h builtin.h common.h wgetopt.h
-builtin_commandline.o: reader.h proc.h io.h parser.h tokenizer.h
-builtin_commandline.o: input_common.h input.h translate.h
+builtin.o: config.h fallback.h common.h util.h wutil.h builtin.h function.h
+builtin.o: complete.h proc.h io.h parser.h event.h reader.h env.h wgetopt.h
+builtin.o: sanity.h tokenizer.h builtin_help.h wildcard.h input_common.h
+builtin.o: input.h intern.h signal.h translate.h halloc.h halloc_util.h
+builtin.o: parse_util.h expand.h
+builtin_commandline.o: signal.h config.h fallback.h common.h util.h wutil.h
+builtin_commandline.o: builtin.h wgetopt.h reader.h proc.h io.h parser.h
+builtin_commandline.o: event.h tokenizer.h input_common.h input.h translate.h
+builtin_commandline.o: parse_util.h
+builtin_complete.o: signal.h config.h fallback.h common.h util.h wutil.h
+builtin_complete.o: builtin.h complete.h wgetopt.h parser.h proc.h io.h
+builtin_complete.o: event.h reader.h translate.h
 builtin_help.o: config.h util.h common.h builtin_help.h
-builtin_set.o: signal.h config.h util.h builtin.h env.h expand.h common.h
-builtin_set.o: wgetopt.h proc.h io.h parser.h translate.h
-builtin_ulimit.o: config.h util.h builtin.h common.h wgetopt.h translate.h
-common.o: config.h signal.h util.h wutil.h common.h expand.h proc.h io.h
-common.o: wildcard.h parser.h
-complete.o: signal.h config.h util.h tokenizer.h wildcard.h proc.h io.h
-complete.o: parser.h function.h complete.h builtin.h env.h exec.h expand.h
-complete.o: common.h reader.h history.h intern.h translate.h wutil.h
-env.o: config.h signal.h util.h wutil.h proc.h io.h common.h env.h sanity.h
-env.o: expand.h history.h reader.h parser.h env_universal.h
-env.o: env_universal_common.h input_common.h event.h translate.h
-env_universal.o: config.h signal.h util.h common.h wutil.h
+builtin_set.o: signal.h config.h fallback.h common.h util.h wutil.h builtin.h
+builtin_set.o: env.h expand.h wgetopt.h proc.h io.h parser.h event.h
+builtin_set.o: translate.h
+builtin_ulimit.o: config.h fallback.h common.h util.h builtin.h wgetopt.h
+builtin_ulimit.o: translate.h
+common.o: config.h fallback.h common.h util.h wutil.h expand.h proc.h io.h
+common.o: wildcard.h parser.h event.h
+complete.o: signal.h config.h fallback.h common.h util.h tokenizer.h
+complete.o: wildcard.h proc.h io.h parser.h event.h function.h complete.h
+complete.o: builtin.h env.h exec.h expand.h reader.h history.h intern.h
+complete.o: translate.h parse_util.h halloc_util.h wutil.h
+dragon.o: signal.h
+env.o: config.h signal.h fallback.h common.h util.h wutil.h proc.h io.h env.h
+env.o: sanity.h expand.h history.h reader.h parser.h event.h env_universal.h
+env.o: env_universal_common.h input_common.h translate.h complete.h
+env_universal.o: config.h signal.h fallback.h common.h util.h wutil.h
 env_universal.o: env_universal_common.h env_universal.h
-env_universal_common.o: signal.h util.h common.h wutil.h
+env_universal_common.o: config.h signal.h fallback.h common.h util.h wutil.h
 env_universal_common.o: env_universal_common.h
-event.o: signal.h config.h util.h function.h proc.h io.h parser.h common.h
-event.o: event.h translate.h
-exec.o: signal.h config.h util.h common.h wutil.h proc.h io.h exec.h parser.h
-exec.o: builtin.h function.h env.h wildcard.h sanity.h expand.h
-exec.o: env_universal.h env_universal_common.h translate.h
-expand.o: signal.h config.h util.h common.h wutil.h env.h proc.h io.h
-expand.o: parser.h expand.h wildcard.h exec.h tokenizer.h complete.h
-fishd.o: signal.h util.h common.h wutil.h env_universal_common.h
-fish_pager.o: config.h signal.h util.h wutil.h common.h complete.h output.h
-fish_pager.o: input_common.h env_universal.h env_universal_common.h
-fish_tests.o: config.h signal.h util.h common.h proc.h io.h reader.h
-fish_tests.o: builtin.h function.h complete.h wutil.h env.h expand.h parser.h
-fish_tests.o: tokenizer.h output.h exec.h event.h
-function.o: signal.h config.h util.h function.h proc.h io.h parser.h common.h
-function.o: intern.h event.h
-highlight.o: signal.h config.h util.h wutil.h highlight.h tokenizer.h proc.h
-highlight.o: io.h parser.h builtin.h function.h env.h expand.h sanity.h
-highlight.o: common.h complete.h output.h
-history.o: config.h util.h wutil.h history.h common.h reader.h env.h sanity.h
-input.o: config.h signal.h util.h wutil.h reader.h proc.h io.h common.h
-input.o: sanity.h input_common.h input.h parser.h env.h expand.h event.h
-input.o: translate.h
-input_common.o: config.h util.h common.h wutil.h input_common.h
+event.o: signal.h config.h fallback.h common.h util.h wutil.h function.h
+event.o: proc.h io.h parser.h event.h translate.h halloc_util.h
+exec.o: signal.h config.h fallback.h common.h util.h wutil.h proc.h io.h
+exec.o: exec.h parser.h event.h builtin.h function.h env.h wildcard.h
+exec.o: sanity.h expand.h env_universal.h env_universal_common.h translate.h
+exec.o: halloc.h halloc_util.h parse_util.h
+expand.o: signal.h config.h fallback.h common.h util.h wutil.h env.h proc.h
+expand.o: io.h parser.h event.h expand.h wildcard.h exec.h tokenizer.h
+expand.o: complete.h translate.h parse_util.h halloc_util.h
+fallback.o: config.h common.h util.h
+fishd.o: config.h signal.h fallback.h common.h util.h wutil.h
+fishd.o: env_universal_common.h
+fish_pager.o: config.h signal.h fallback.h common.h util.h wutil.h complete.h
+fish_pager.o: output.h input_common.h env_universal.h env_universal_common.h
+fish_pager.o: halloc.h halloc_util.h
+fish_tests.o: config.h signal.h fallback.h common.h util.h proc.h io.h
+fish_tests.o: reader.h builtin.h function.h complete.h wutil.h env.h expand.h
+fish_tests.o: parser.h event.h tokenizer.h output.h exec.h halloc_util.h
+function.o: signal.h config.h wutil.h fallback.h common.h util.h function.h
+function.o: proc.h io.h translate.h parser.h event.h intern.h reader.h
+function.o: parse_util.h env.h expand.h
+halloc.o: config.h fallback.h common.h util.h halloc.h
+halloc_util.o: config.h fallback.h common.h util.h halloc.h
+highlight.o: signal.h config.h fallback.h common.h util.h wutil.h highlight.h
+highlight.o: tokenizer.h proc.h io.h parser.h event.h parse_util.h builtin.h
+highlight.o: function.h env.h expand.h sanity.h complete.h output.h
+history.o: config.h fallback.h common.h util.h wutil.h history.h reader.h
+history.o: env.h sanity.h signal.h
+input.o: config.h signal.h fallback.h common.h util.h wutil.h reader.h proc.h
+input.o: io.h sanity.h input_common.h input.h parser.h event.h env.h expand.h
+input.o: translate.h output.h
+input_common.o: config.h fallback.h common.h util.h wutil.h input_common.h
 input_common.o: env_universal.h env_universal_common.h
-intern.o: config.h util.h common.h intern.h
-io.o: config.h util.h wutil.h exec.h proc.h io.h common.h translate.h
-key_reader.o: input_common.h
-kill.o: signal.h config.h util.h wutil.h kill.h proc.h io.h sanity.h common.h
-kill.o: env.h expand.h exec.h parser.h
-main.o: config.h signal.h util.h common.h reader.h builtin.h function.h
-main.o: complete.h wutil.h env.h sanity.h proc.h io.h parser.h expand.h
-main.o: intern.h exec.h event.h output.h translate.h
-mimedb.o: config.h xdgmime.h util.h
-output.o: config.h signal.h util.h wutil.h expand.h common.h output.h
-output.o: highlight.h
-parser.o: signal.h config.h util.h common.h wutil.h proc.h io.h parser.h
-parser.o: tokenizer.h exec.h wildcard.h function.h builtin.h builtin_help.h
-parser.o: env.h expand.h reader.h sanity.h env_universal.h
-parser.o: env_universal_common.h event.h translate.h
-proc.o: config.h signal.h util.h wutil.h proc.h io.h common.h reader.h
-proc.o: sanity.h env.h parser.h event.h translate.h
-reader.o: config.h signal.h util.h wutil.h highlight.h reader.h proc.h io.h
-reader.o: parser.h complete.h history.h common.h sanity.h env.h exec.h
-reader.o: expand.h tokenizer.h kill.h input_common.h input.h function.h
-reader.o: output.h translate.h
-sanity.o: signal.h config.h util.h common.h sanity.h proc.h io.h history.h
-sanity.o: reader.h kill.h wutil.h
+intern.o: config.h fallback.h common.h util.h wutil.h intern.h
+io.o: config.h fallback.h common.h util.h wutil.h exec.h proc.h io.h
+io.o: translate.h halloc.h
+key_reader.o: fallback.h common.h util.h input_common.h
+kill.o: signal.h config.h fallback.h common.h util.h wutil.h kill.h proc.h
+kill.o: io.h sanity.h env.h exec.h parser.h event.h
+main.o: config.h signal.h fallback.h common.h util.h reader.h builtin.h
+main.o: function.h complete.h wutil.h env.h sanity.h proc.h io.h parser.h
+main.o: event.h expand.h intern.h exec.h output.h translate.h halloc_util.h
+mimedb.o: config.h xdgmime.h fallback.h common.h util.h
+output.o: config.h signal.h fallback.h common.h util.h wutil.h expand.h
+output.o: output.h halloc_util.h highlight.h
+parser.o: signal.h config.h fallback.h common.h util.h wutil.h proc.h io.h
+parser.o: parser.h event.h tokenizer.h exec.h wildcard.h function.h builtin.h
+parser.o: builtin_help.h env.h expand.h reader.h sanity.h env_universal.h
+parser.o: env_universal_common.h translate.h intern.h parse_util.h halloc.h
+parser.o: halloc_util.h
+parse_util.o: config.h fallback.h common.h util.h wutil.h tokenizer.h
+parse_util.o: parse_util.h expand.h intern.h exec.h proc.h io.h env.h
+parse_util.o: wildcard.h halloc_util.h
+proc.o: config.h signal.h fallback.h common.h util.h wutil.h proc.h io.h
+proc.o: reader.h sanity.h env.h parser.h event.h translate.h halloc.h
+proc.o: halloc_util.h output.h
+reader.o: config.h signal.h fallback.h common.h util.h wutil.h highlight.h
+reader.o: reader.h proc.h io.h parser.h event.h complete.h history.h sanity.h
+reader.o: env.h exec.h expand.h tokenizer.h kill.h input_common.h input.h
+reader.o: function.h output.h translate.h parse_util.h
+refcount.o: config.h fallback.h common.h util.h wutil.h refcount.h
+sanity.o: signal.h config.h fallback.h common.h util.h sanity.h proc.h io.h
+sanity.o: history.h reader.h kill.h wutil.h translate.h
 set_color.o: config.h
-signal.o: config.h signal.h common.h util.h wutil.h event.h reader.h proc.h
-signal.o: io.h translate.h
-tokenizer.o: config.h util.h wutil.h tokenizer.h common.h wildcard.h
-tokenizer.o: translate.h
-translate.o: config.h common.h util.h
-util.o: config.h util.h common.h wutil.h
-wgetopt.o: config.h wgetopt.h wutil.h
-wildcard.o: config.h util.h wutil.h complete.h common.h wildcard.h reader.h
-wildcard.o: expand.h translate.h
-wutil.o: config.h util.h common.h wutil.h
+signal.o: config.h signal.h common.h util.h fallback.h wutil.h event.h
+signal.o: reader.h proc.h io.h translate.h
+tokenizer.o: config.h fallback.h common.h util.h wutil.h tokenizer.h
+tokenizer.o: wildcard.h translate.h
+translate.o: config.h common.h util.h fallback.h halloc_util.h
+util.o: config.h fallback.h common.h util.h wutil.h
+wgetopt.o: config.h wgetopt.h wutil.h fallback.h common.h util.h translate.h
+wildcard.o: config.h fallback.h common.h util.h wutil.h complete.h wildcard.h
+wildcard.o: reader.h expand.h translate.h
+wutil.o: config.h fallback.h common.h util.h wutil.h
 xdgmimealias.o: xdgmimealias.h xdgmime.h xdgmimeint.h
 xdgmime.o: xdgmime.h xdgmimeint.h xdgmimeglob.h xdgmimemagic.h xdgmimealias.h
 xdgmime.o: xdgmimeparent.h
--- a/builtin.c
+++ b/builtin.c
--- a/builtin.h
+++ b/builtin.h
@@ -47,8 +47,14 @@ enum
 */
 #define BUILTIN_ERR_UNKNOWN	_( L"%ls: Unknown option '%ls'\n" )

+/**
+   Error message for invalid character in variable name
+*/
 #define BUILTIN_ERR_VARCHAR _( L"%ls: Invalid character '%lc' in variable name. Only alphanumerical characters and underscores are valid in a variable name.\n" )

+/**
+   Error message for invalid (empty) variable name
+*/
 #define BUILTIN_ERR_VARNAME_ZERO _( L"%ls: Variable name can not be the empty string\n" )

 /**
@@ -146,6 +152,15 @@ int builtin_commandline(wchar_t **argv);
 */
 int builtin_ulimit(wchar_t **argv);

+/**
+   The complete builtin. Used for specifying programmable
+   tab-completions. Calls the functions in complete.c for any heavy
+   lifting.
+*/
+int builtin_complete(wchar_t **argv);
+
+const wchar_t *builtin_complete_get_temporary_buffer();
+
 /** 
 	This function works like wperror, but it prints its result into
 	the sb_err string_buffer_t instead of to stderr. Used by the builtin
--- a/builtin_commandline.c
+++ b/builtin_commandline.c
@@ -12,7 +12,11 @@ Functions used for implementing the commandline builtin.
 #include <signal.h>

 #include "config.h"
+
+#include "fallback.h"
 #include "util.h"
+
+#include "wutil.h"
 #include "builtin.h"
 #include "common.h"
 #include "wgetopt.h"
@@ -23,6 +27,7 @@ Functions used for implementing the commandline builtin.
 #include "input_common.h"
 #include "input.h"
 #include "translate.h"
+#include "parse_util.h"

 /**
   Which part of the comandbuffer are we operating on
@@ -47,6 +52,26 @@ enum
 }
 	;

+/**
+   Returns the current commandline buffer.
+*/
+static const wchar_t *get_buffer()
+{
+	const wchar_t *buff = builtin_complete_get_temporary_buffer();
+	if( !buff )
+		buff = reader_get_buffer();
+	return buff;
+}
+
+static int get_cursor_pos()
+{
+	const wchar_t *buff = builtin_complete_get_temporary_buffer();
+	if( buff )
+		return wcslen( buff );
+	else
+		return reader_get_cursor_pos();
+}
+

 /**
   Replace/append/insert the selection with/at/after the specified string.
@@ -56,14 +81,14 @@ enum
   \param insert the string to insert
   \param append_mode can be one of REPLACE_MODE, INSERT_MODE or APPEND_MODE, affects the way the test update is performed
 */
-static void replace_part( wchar_t *begin,
-						  wchar_t *end,
+static void replace_part( const wchar_t *begin,
+						  const wchar_t *end,
 						  wchar_t *insert,
 						  int append_mode )
 {
-	wchar_t *buff = reader_get_buffer();
+	const wchar_t *buff = get_buffer();
 	string_buffer_t out;
-	int out_pos=reader_get_cursor_pos();
+	int out_pos=get_cursor_pos();
 					
 	sb_init( &out );

@@ -87,7 +112,7 @@ static void replace_part( wchar_t *begin,
 		}
 		case INSERT_MODE:
 		{
-			int cursor = reader_get_cursor_pos() -(begin-buff);
+			int cursor = get_cursor_pos() -(begin-buff);
 			sb_append_substring( &out, begin, cursor );
 			sb_append( &out, insert );
 			sb_append_substring( &out, begin+cursor, end-begin-cursor );
@@ -108,8 +133,8 @@ static void replace_part( wchar_t *begin,
   \param cut_at_cursor whether printing should stop at the surrent cursor position
   \param tokenize whether the string should be tokenized, printing one string token on every line and skipping non-string tokens
 */
-static void write_part( wchar_t *begin, 
-						wchar_t *end, 
+static void write_part( const wchar_t *begin, 
+						const wchar_t *end, 
 						int cut_at_cursor, 
 						int tokenize )
 {	
@@ -118,7 +143,7 @@ static void write_part( wchar_t *begin,
 	wchar_t *buff;
 	int pos;

-	pos = reader_get_cursor_pos()-(begin-reader_get_buffer());
+	pos = get_cursor_pos()-(begin-get_buffer());

 	if( tokenize )
 	{
@@ -183,7 +208,7 @@ int builtin_commandline( wchar_t **argv )
 	
 	int tokenize = 0;	

-	if( !reader_get_buffer() )
+	if( !get_buffer() )
 	{
 		sb_append2( sb_err,
 					argv[0],
@@ -428,32 +453,42 @@ int builtin_commandline( wchar_t **argv )
 		buffer_part = STRING_MODE;
 	}
 		
-	wchar_t *begin, *end;
+	const wchar_t *begin, *end;
 	
 	switch( buffer_part )
 	{
 		case STRING_MODE:
 		{			
-			begin = reader_get_buffer();
+			begin = get_buffer();
 			end = begin+wcslen(begin);
 			break;			
 		}

 		case PROCESS_MODE:
 		{
-			reader_current_process_extent( &begin, &end );
+			parse_util_process_extent( get_buffer(),
+									   get_cursor_pos(),
+									   &begin, 
+									   &end );
 			break;
 		}
 		
 		case JOB_MODE:
 		{
-			reader_current_job_extent( &begin, &end );					
+			parse_util_job_extent( get_buffer(),
+								   get_cursor_pos(),
+								   &begin,
+								   &end );					
 			break;			
 		}
 		
 		case TOKEN_MODE:
 		{
-			reader_current_token_extent( &begin, &end, 0, 0 );
+			parse_util_token_extent( get_buffer(),
+									 get_cursor_pos(),
+									 &begin, 
+									 &end, 
+									 0, 0 );
 			break;			
 		}
 				
--- a/builtin_complete.c
+++ b/builtin_complete.c
@@ -0,0 +1,535 @@
+/** \file builtin_complete.c Functions defining the complete builtin
+
+Functions used for implementing the complete builtin. 
+
+*/
+#include <stdlib.h>
+#include <stdio.h>
+#include <wchar.h>
+#include <wctype.h>
+#include <sys/types.h>
+#include <termios.h>
+#include <signal.h>
+
+#include "config.h"
+
+#include "fallback.h"
+#include "util.h"
+
+#include "wutil.h"
+#include "builtin.h"
+#include "common.h"
+#include "complete.h"
+#include "wgetopt.h"
+#include "parser.h"
+#include "reader.h"
+#include "translate.h"
+
+const static wchar_t *temporary_buffer;
+
+/*
+  builtin_complete_* are a set of rather silly looping functions that
+  make sure that all the proper combinations of complete_add or
+  complete_remove get called. 
+*/
+
+static void	builtin_complete_add2( const wchar_t *cmd,
+								   int cmd_type,
+								   const wchar_t *short_opt,
+								   array_list_t *gnu_opt,
+								   array_list_t *old_opt, 
+								   int result_mode, 
+								   int authorative,
+								   const wchar_t *condition,
+								   const wchar_t *comp,
+								   const wchar_t *desc )
+{
+	int i;
+	const wchar_t *s;
+	
+	for( s=short_opt; *s; s++ )
+	{
+		complete_add( cmd, 
+					  cmd_type,
+					  *s,
+					  0,
+					  0,
+					  result_mode,
+					  authorative,
+					  condition,
+					  comp,
+					  desc );
+	}
+	
+	for( i=0; i<al_get_count( gnu_opt ); i++ )
+	{
+		complete_add( cmd, 
+					  cmd_type,
+					  0,
+					  (wchar_t *)al_get(gnu_opt, i ),
+					  0,
+					  result_mode,
+					  authorative,
+					  condition,
+					  comp,
+					  desc );
+	}
+	
+	for( i=0; i<al_get_count( old_opt ); i++ )
+	{
+		complete_add( cmd, 
+					  cmd_type,
+					  0,
+					  (wchar_t *)al_get(old_opt, i ),
+					  1,
+					  result_mode,
+					  authorative,
+					  condition,
+					  comp,
+					  desc );
+	}	
+
+	if( al_get_count( old_opt )+al_get_count( gnu_opt )+wcslen(short_opt) == 0 )
+	{
+		complete_add( cmd, 
+					  cmd_type,
+					  0,
+					  0,
+					  0,
+					  result_mode,
+					  authorative,
+					  condition,
+					  comp,
+					  desc );
+	}	
+}
+
+static void	builtin_complete_add( array_list_t *cmd, 
+								  array_list_t *path,
+								  const wchar_t *short_opt,
+								  array_list_t *gnu_opt,
+								  array_list_t *old_opt, 
+								  int result_mode, 
+								  int authorative,
+								  const wchar_t *condition,
+								  const wchar_t *comp,
+								  const wchar_t *desc )
+{
+	int i;
+	
+	for( i=0; i<al_get_count( cmd ); i++ )
+	{
+		builtin_complete_add2( al_get( cmd, i ),
+							   COMMAND,
+							   short_opt, 
+							   gnu_opt,
+							   old_opt, 
+							   result_mode, 
+							   authorative,
+							   condition, 
+							   comp, 
+							   desc );
+	}
+	
+	for( i=0; i<al_get_count( path ); i++ )
+	{
+		builtin_complete_add2( al_get( path, i ),
+							   PATH,
+							   short_opt, 
+							   gnu_opt,
+							   old_opt, 
+							   result_mode, 
+							   authorative,
+							   condition, 
+							   comp, 
+							   desc );
+	}
+	
+}
+
+static void builtin_complete_remove3( wchar_t *cmd,
+									  int cmd_type,
+									  wchar_t short_opt,
+									  array_list_t *long_opt )		
+{
+	int i;
+	
+	for( i=0; i<al_get_count( long_opt ); i++ )
+	{
+		complete_remove( cmd,
+						 cmd_type,
+						 short_opt,
+						 (wchar_t *)al_get( long_opt, i ) );
+	}	
+}
+
+static void	builtin_complete_remove2( wchar_t *cmd,
+									  int cmd_type,
+									  const wchar_t *short_opt,
+									  array_list_t *gnu_opt,
+									  array_list_t *old_opt )
+{
+	const wchar_t *s = (wchar_t *)short_opt;
+	if( *s )
+	{
+		for( ; *s; s++ )
+		{
+			if( al_get_count( old_opt) + al_get_count( gnu_opt ) == 0 )
+			{
+				complete_remove(cmd,
+								cmd_type,
+								*s,
+								0 );
+				
+			}
+			else
+			{
+				builtin_complete_remove3( cmd,
+										  cmd_type,
+										  *s,
+										  gnu_opt );
+				builtin_complete_remove3( cmd,
+										  cmd_type,
+										  *s,
+										  old_opt );
+			}
+		}
+	}
+	else
+	{
+		builtin_complete_remove3( cmd,
+								  cmd_type,
+								  0,
+								  gnu_opt );
+		builtin_complete_remove3( cmd,
+								  cmd_type,
+								  0,
+								  old_opt );
+										  
+	}				
+
+	
+}
+
+static void	builtin_complete_remove( array_list_t *cmd, 
+									 array_list_t *path,
+									 const wchar_t *short_opt,
+									 array_list_t *gnu_opt,
+									 array_list_t *old_opt )
+{
+	
+	int i;
+	
+	for( i=0; i<al_get_count( cmd ); i++ )
+	{
+		builtin_complete_remove2( (wchar_t *)al_get( cmd, i ),
+								  COMMAND,
+								  short_opt, 
+								  gnu_opt,
+								  old_opt );
+	}
+	
+	for( i=0; i<al_get_count( path ); i++ )
+	{
+		builtin_complete_remove2( (wchar_t *)al_get( path, i ),
+								  PATH,
+								  short_opt, 
+								  gnu_opt,
+								  old_opt );
+	}
+	
+}
+
+
+const wchar_t *builtin_complete_get_temporary_buffer()
+{
+	return temporary_buffer;
+}
+
+int builtin_complete( wchar_t **argv )
+{
+	int res=0;
+	int argc=0;
+	int result_mode=SHARED;
+	int remove = 0;
+	int authorative = 1;
+	
+	string_buffer_t short_opt;
+	array_list_t gnu_opt, old_opt;
+	wchar_t *comp=L"", *desc=L"", *condition=L"";
+
+	wchar_t *do_complete = 0;
+	
+	array_list_t cmd;
+	array_list_t path;
+
+	static int recursion_level=0;
+	
+	if( !is_interactive_session )
+	{
+		debug( 1, _(L"%ls: Command only available in interactive sessions"), argv[0] );
+	}
+	
+	al_init( &cmd );
+	al_init( &path );
+	sb_init( &short_opt );
+	al_init( &gnu_opt );
+	al_init( &old_opt );
+	
+	argc = builtin_count_args( argv );	
+	
+	woptind=0;
+	
+	while( res == 0 )
+	{
+		const static struct woption
+			long_options[] =
+			{
+				{
+					L"exclusive", no_argument, 0, 'x' 
+				}
+				,
+				{
+					L"no-files", no_argument, 0, 'f' 
+				}
+				,
+				{
+					L"require-parameter", no_argument, 0, 'r' 
+				}
+				,
+				{
+					L"path", required_argument, 0, 'p'
+				}
+				,					
+				{
+					L"command", required_argument, 0, 'c' 
+				}
+				,					
+				{
+					L"short-option", required_argument, 0, 's' 
+				}
+				,
+				{
+					L"long-option", required_argument, 0, 'l'
+				}
+				,
+				{
+					L"old-option", required_argument, 0, 'o' 
+				}
+				,
+				{
+					L"description", required_argument, 0, 'd'
+				}
+				,
+				{
+					L"arguments", required_argument, 0, 'a'
+				}
+				,
+				{
+					L"erase", no_argument, 0, 'e'
+				}
+				,
+				{
+					L"unauthorative", no_argument, 0, 'u'
+				}
+				,
+				{
+					L"condition", required_argument, 0, 'n'
+				}
+				,
+				{
+					L"do-complete", required_argument, 0, 'C'
+				}
+				,
+				{ 
+					0, 0, 0, 0 
+				}
+			}
+		;		
+		
+		int opt_index = 0;
+		
+		int opt = wgetopt_long( argc,
+								argv, 
+								L"a:c:p:s:l:o:d:frxeun:C:", 
+								long_options, 
+								&opt_index );
+		if( opt == -1 )
+			break;
+			
+		switch( opt )
+		{
+			case 0:
+				if(long_options[opt_index].flag != 0)
+					break;
+                sb_printf( sb_err,
+                           BUILTIN_ERR_UNKNOWN,
+                           argv[0],
+                           long_options[opt_index].name );
+				sb_append( sb_err, 
+						   parser_current_line() );
+				
+//				builtin_print_help( argv[0], sb_err );
+
+				
+				res = 1;
+				break;
+				
+			case 'x':					
+				result_mode |= EXCLUSIVE;
+				break;
+					
+			case 'f':					
+				result_mode |= NO_FILES;
+				break;
+				
+			case 'r':					
+				result_mode |= NO_COMMON;
+				break;
+					
+			case 'p':	
+				al_push( &cmd, unescape( woptarg, 1));
+				break;
+				
+			case 'c':
+				al_push( &cmd, unescape( woptarg, 1) );
+				break;
+				
+			case 'd':
+				desc = woptarg;
+				break;
+				
+			case 'u':
+				authorative=0;
+				break;
+				
+			case 's':
+				sb_append( &short_opt, woptarg );
+				break;
+					
+			case 'l':
+				al_push( &gnu_opt, woptarg );
+				break;
+				
+			case 'o':
+				al_push( &old_opt, woptarg );
+				break;
+
+			case 'a':
+				comp = woptarg;
+				break;
+				
+			case 'e':
+				remove = 1;
+				break;
+
+			case 'n':
+				condition = woptarg;
+				break;
+				
+			case 'C':
+				do_complete = woptarg?woptarg:reader_get_buffer();
+				break;
+				
+			case '?':
+				sb_append( sb_err, 
+						   parser_current_line() );
+				//	builtin_print_help( argv[0], sb_err );
+				
+				res = 1;
+				break;
+				
+		}
+		
+	}
+
+	if( !res )
+	{
+		if( do_complete )
+		{
+			array_list_t comp;
+			int i;
+
+			const wchar_t *prev_temporary_buffer = temporary_buffer;
+			temporary_buffer = do_complete;		
+
+			if( recursion_level < 1 )
+			{
+				recursion_level++;
+			
+				al_init( &comp );
+			
+				complete( do_complete, &comp );
+			
+				for( i=0; i<al_get_count( &comp ); i++ )
+				{
+					wchar_t *next = (wchar_t *)al_get( &comp, i );
+					wchar_t *sep = wcschr( next, COMPLETE_SEP );
+					if( sep )
+						*sep = L'\t';
+					sb_printf( sb_out, L"%ls\n", next );
+				}
+			
+				al_foreach( &comp, (void (*)(const void *))&free );
+				al_destroy( &comp );
+				recursion_level--;
+			}
+		
+			temporary_buffer = prev_temporary_buffer;		
+		
+		}
+		else if( woptind != argc )
+		{
+			sb_printf( sb_err, 
+					   _( L"%ls: Too many arguments\n" ),
+					   argv[0] );
+			sb_append( sb_err, 
+					   parser_current_line() );
+			//			builtin_print_help( argv[0], sb_err );
+
+			res = 1;
+		}
+		else if( (al_get_count( &cmd) == 0 ) && (al_get_count( &path) == 0 ) )
+		{
+			/* No arguments specified, meaning we print the definitions of
+			 * all specified completions to stdout.*/
+			complete_print( sb_out );		
+		}
+		else
+		{
+			if( remove )
+			{
+				builtin_complete_remove( &cmd,
+										 &path,
+										 (wchar_t *)short_opt.buff,
+										 &gnu_opt,
+										 &old_opt );									 
+			}
+			else
+			{
+				builtin_complete_add( &cmd, 
+									  &path,
+									  (wchar_t *)short_opt.buff,
+									  &gnu_opt,
+									  &old_opt, 
+									  result_mode, 
+									  authorative,
+									  condition,
+									  comp,
+									  desc ); 
+			}
+
+		}	
+	}
+	
+	al_foreach( &cmd, (void (*)(const void *))&free );
+	al_foreach( &path, (void (*)(const void *))&free );
+
+	al_destroy( &cmd );
+	al_destroy( &path );
+	sb_destroy( &short_opt );
+	al_destroy( &gnu_opt );
+	al_destroy( &old_opt );
+
+	return res;
+}
--- a/builtin_set.c
+++ b/builtin_set.c
@@ -12,7 +12,11 @@ Functions used for implementing the set builtin.
 #include <signal.h>

 #include "config.h"
+
+#include "fallback.h"
 #include "util.h"
+
+#include "wutil.h"
 #include "builtin.h"
 #include "env.h"
 #include "expand.h"
@@ -508,9 +512,6 @@ int builtin_set( wchar_t **argv )
 				!erase &&
 				!list )
 			{
-				/*
-				  Only update the variable scope
-				*/
 				env_set( name, 0, scope );
 				finished = 1;
 			}
--- a/builtin_ulimit.c
+++ b/builtin_ulimit.c
@@ -3,6 +3,8 @@
 Functions used for implementing the ulimit builtin. 

 */
+#include "config.h"
+
 #include <stdlib.h>
 #include <stdio.h>
 #include <wchar.h>
@@ -12,8 +14,9 @@ Functions used for implementing the ulimit builtin.
 #include <unistd.h>
 #include <errno.h>

-#include "config.h"
+#include "fallback.h"
 #include "util.h"
+
 #include "builtin.h"
 #include "common.h"
 #include "wgetopt.h"
--- a/common.c
+++ b/common.c
@@ -6,6 +6,7 @@ parts of fish.

 #include "config.h"

+
 #include <stdlib.h>
 #include <termios.h>
 #include <wchar.h>
@@ -20,7 +21,6 @@ parts of fish.
 #include <errno.h>
 #include <limits.h>
 #include <stdarg.h>		
-#include <signal.h>		
 #include <locale.h>
 #include <time.h>
 #include <sys/time.h>
@@ -45,10 +45,15 @@ parts of fish.
 #include <termio.h>
 #endif

+#if HAVE_TERM_H
 #include <term.h>
+#elif HAVE_NCURSES_TERM_H
+#include <ncurses/term.h>
+#endif

-
+#include "fallback.h"
 #include "util.h"
+
 #include "wutil.h"
 #include "common.h"
 #include "expand.h"
@@ -56,11 +61,6 @@ parts of fish.
 #include "wildcard.h"
 #include "parser.h"

-/**
-   Error message to show on string convertion error
-*/
-#define STR2WCS_MSG "fish: Invalid multibyte sequence \'"
-
 /**
   The maximum number of minor errors to report. Further errors will be omitted.
 */
@@ -74,19 +74,10 @@ parts of fish.

 struct termios shell_modes;      

-/**
-   Number of error encountered. This is reset after each command, and
-   used to limit the number of error messages on commands with many
-   string convertion problems.
-*/
-static int error_count=0;
-
 int error_max=1;

 wchar_t ellipsis_char;

-static int c1=0, c2=0, c3=0, c4=0, c5;
-
 char *profile=0;

 wchar_t *program_name;
@@ -98,27 +89,24 @@ int debug_level=1;
 */
 static struct winsize termsize;

-
 /**
-   Number of nested calls to the block function. Unblock when this reaches 0.
+   String buffer used by the wsetlocale function
 */
-static int block_count=0;
-
 static string_buffer_t *setlocale_buff=0;

-
 void common_destroy()
 {
+	
 	if( setlocale_buff )
 	{
 		sb_destroy( setlocale_buff );
 		free( setlocale_buff );
 	}
-	
-	debug( 3, L"Calls: wcsdupcat %d, wcsdupcat2 %d, wcsndup %d, str2wcs %d, wcs2str %d", c1, c2, c3, c4, c5 );
 }

-
+void common_init()
+{
+}

 wchar_t **list_to_char_arr( array_list_t *l )
 {
@@ -129,38 +117,13 @@ wchar_t **list_to_char_arr( array_list_t *l )
 		die_mem();
 	}
 	for( i=0; i<al_get_count( l ); i++ )
+	{		
 		res[i] = (wchar_t *)al_get(l,i);
+	}
 	res[i]='\0';
 	return res;	
 }

-void block()
-{
-	block_count++;
-	if( block_count == 1 )
-	{
-		sigset_t chldset; 
-		sigemptyset( &chldset );
-		sigaddset( &chldset, SIGCHLD );
-		sigprocmask(SIG_BLOCK, &chldset, 0);
-	}
-}
-
-
-void unblock()
-{
-	block_count--;
-	if( block_count == 0 )
-	{
-		sigset_t chldset; 
-		sigemptyset( &chldset );
-		sigaddset( &chldset, SIGCHLD );
-		sigprocmask(SIG_UNBLOCK, &chldset, 0);
-	}
-}
-
-
-
 int fgetws2( wchar_t **b, int *len, FILE *f )
 {
 	int i=0;
@@ -174,8 +137,6 @@ int fgetws2( wchar_t **b, int *len, FILE *f )
 	  watching for EINTR errors, bytes are lost. 
 	*/

-	block();
-
 	while( 1 )
 	{
 		/* Reallocate the buffer if necessary */
@@ -214,8 +175,6 @@ int fgetws2( wchar_t **b, int *len, FILE *f )
 			case L'\n':
 			case L'\0':
 				buff[i]=L'\0';
-				unblock();
-
 				return i;				
 				/* Ignore carriage returns */
 			case L'\r':
@@ -228,7 +187,6 @@ int fgetws2( wchar_t **b, int *len, FILE *f )


 	}
-	unblock();

 }

@@ -253,64 +211,110 @@ void sort_list( array_list_t *comp )

 wchar_t *str2wcs( const char *in )
 {
-	c4++;
+	wchar_t *out;
+	size_t len = strlen(in);
 	
-	wchar_t *res;
-	
-	res = malloc( sizeof(wchar_t)*(strlen(in)+1) );
-	
-	if( !res )
+	out = malloc( sizeof(wchar_t)*(len+1) );
+
+	if( !out )
 	{
 		die_mem();
 	}
-	
-	if( (size_t)-1 == mbstowcs( res, in, sizeof(wchar_t)*(strlen(in)) +1) )
-	{
-		error_count++;
-		if( error_count <=error_max )
-		{
-			fflush( stderr );			
-			write( 2,
-				   STR2WCS_MSG,
-				   strlen(STR2WCS_MSG) );
-			write( 2,
-				   in,
-				   strlen(in ));
-			write( 2, 
-				   "\'\n",
-				   2 );
-		}
-		
-		free(res);
-		return 0;
-	}	
-	
-	return res;
-	
+
+	return str2wcs_internal( in, out );
 }

-void error_reset()
+wchar_t *str2wcs_internal( const char *in, wchar_t *out )
 {
-	error_count=0;
+	size_t res=0;
+	int in_pos=0;
+	int out_pos = 0;
+	mbstate_t state;
+	size_t len = strlen(in);
+	
+	memset( &state, 0, sizeof(state) );
+	
+	while( in[in_pos] )
+	{
+		res = mbrtowc( &out[out_pos], &in[in_pos], len-in_pos, &state );
+
+		switch( res )
+		{
+			case (size_t)(-2):
+			case (size_t)(-1):
+			{
+				out[out_pos] = ENCODE_DIRECT_BASE + (unsigned char)in[in_pos];
+				in_pos++;
+				memset( &state, 0, sizeof(state) );
+				break;
+			}
+				
+			case 0:
+			{
+				return out;
+			}
+		
+			default:
+			{
+				in_pos += res;
+				break;
+			}
+		}
+		out_pos++;
+	}
+	out[out_pos] = 0;
+	
+	return out;	
 }

 char *wcs2str( const wchar_t *in )
 {
-	c5++;
+	char *out;	
+	
+	out = malloc( MAX_UTF8_BYTES*wcslen(in)+1 );

-	char *res = malloc( MAX_UTF8_BYTES*wcslen(in)+1 );
-	if( res == 0 )
+	if( !out )
 	{
 		die_mem();
 	}

-	wcstombs( res, 
-			  in,
-			  MAX_UTF8_BYTES*wcslen(in)+1 );
+	return wcs2str_internal( in, out );
+}

-//	res = realloc( res, strlen( res )+1 );
-
-	return res;
+char *wcs2str_internal( const wchar_t *in, char *out )
+{
+	size_t res=0;
+	int in_pos=0;
+	int out_pos = 0;
+	mbstate_t state;
+	memset( &state, 0, sizeof(state) );
+	
+	while( in[in_pos] )
+	{
+		if( ( in[in_pos] >= ENCODE_DIRECT_BASE) &&
+			( in[in_pos] < ENCODE_DIRECT_BASE+256) )
+		{
+			out[out_pos++] = in[in_pos]- ENCODE_DIRECT_BASE;
+		}
+		else
+		{
+			res = wcrtomb( &out[out_pos], in[in_pos], &state );
+			
+			if( res == (size_t)(-1) )
+			{
+				debug( 1, L"Wide character has no narrow representation" );
+				memset( &state, 0, sizeof(state) );
+			}
+			else
+			{
+				out_pos += res;
+			}
+		}
+		in_pos++;
+	}
+	out[out_pos] = 0;
+	
+	return out;	
 }

 char **wcsv2strv( const wchar_t **in )
@@ -337,15 +341,11 @@ char **wcsv2strv( const wchar_t **in )

 wchar_t *wcsdupcat( const wchar_t *a, const wchar_t *b )
 {
-	c1++;
-
 	return wcsdupcat2( a, b, 0 );
 }

 wchar_t *wcsdupcat2( const wchar_t *a, ... )
 {
-	c2++;
-	
 	int len=wcslen(a);
 	int pos;
 	va_list va, va2;
@@ -401,87 +401,6 @@ wchar_t **strv2wcsv( const char **in )
 }


-#ifndef HAVE_WCSNDUP
-wchar_t *wcsndup( const wchar_t *in, int c )
-{
-	c3++;
-	
-	wchar_t *res = malloc( sizeof(wchar_t)*(c+1) );
-	if( res == 0 )
-	{
-		die_mem();
-	}
-	wcsncpy( res, in, c );
-	res[c] = L'\0';	
-	return res;	
-}
-#endif
-
-long convert_digit( wchar_t d, int base )
-{
-	long res=-1;
-	if( (d <= L'9') && (d >= L'0') )
-	{
-		res = d - L'0';
-	}
-	else if( (d <= L'z') && (d >= L'a') )
-	{
-		res = d + 10 - L'a';		
-	}
-	else if( (d <= L'Z') && (d >= L'A') )
-	{
-		res = d + 10 - L'A';		
-	}
-	if( res >= base )
-	{
-		res = -1;
-	}
-	
-	return res;
-}
-
-
-long wcstol(const wchar_t *nptr, 
-			wchar_t **endptr,
-			int base)
-{
-	long long res=0;
-	int is_set=0;
-	if( base > 36 )
-	{
-		errno = EINVAL;
-		return 0;
-	}
-
-	while( 1 )
-	{
-		long nxt = convert_digit( *nptr, base );
-		if( endptr != 0 )
-			*endptr = (wchar_t *)nptr;
-		if( nxt < 0 )
-		{
-			if( !is_set )
-			{
-				errno = EINVAL;
-			}
-			return res;			
-		}
-		res = (res*base)+nxt;
-		is_set = 1;
-		if( res > LONG_MAX )
-		{
-			errno = ERANGE;
-			return LONG_MAX;
-		}
-		if( res < LONG_MIN )
-		{
-			errno = ERANGE;
-			return LONG_MIN;
-		}
-		nptr++;
-	}
-}
-
 /*$OpenBSD: strlcat.c,v 1.11 2003/06/17 21:56:24 millert Exp $*/

 /*
@@ -583,75 +502,6 @@ wcslcpy(wchar_t *dst, const wchar_t *src, size_t siz)
 	/* count does not include NUL */
 }

-#ifndef HAVE_WCSDUP
-wchar_t *wcsdup( const wchar_t *in )
-{
-	size_t len=wcslen(in);
-	wchar_t *out = malloc( sizeof( wchar_t)*(len+1));
-	if( out == 0 )
-	{
-		die_mem();
-	}
-
-	memcpy( out, in, sizeof( wchar_t)*(len+1));
-	return out;
-	
-}
-#endif
-
-#ifndef HAVE_WCSLEN
-size_t wcslen(const wchar_t *in)
-{
-	const wchar_t *end=in;
-	while( *end )
-		end++;
-	return end-in;
-}
-#endif
-
-
-#ifndef HAVE_WCSCASECMP
-int wcscasecmp( const wchar_t *a, const wchar_t *b )
-{
-	if( *a == 0 )
-	{
-		return (*b==0)?0:-1;
-	}
-	else if( *b == 0 )
-	{
-		return 1;
-	}
-	int diff = towlower(*a)-towlower(*b);
-	if( diff != 0 )
-		return diff;
-	else
-		return wcscasecmp( a+1,b+1);
-}
-#endif
-
-
-#ifndef HAVE_WCSNCASECMP
-int wcsncasecmp( const wchar_t *a, const wchar_t *b, int count )
-{
-	if( count == 0 )
-		return 0;
-	
-	if( *a == 0 )
-	{
-		return (*b==0)?0:-1;
-	}
-	else if( *b == 0 )
-	{
-		return 1;
-	}
-	int diff = towlower(*a)-towlower(*b);
-	if( diff != 0 )
-		return diff;
-	else
-		return wcsncasecmp( a+1,b+1, count-1);
-}
-#endif
-
 int wcsvarname( wchar_t *str )
 {
 	while( *str )
@@ -663,27 +513,8 @@ int wcsvarname( wchar_t *str )
 		str++;
 	}
 	return 1;
-	
-	
 }

-#if !HAVE_WCWIDTH
-/**
-   Return the number of columns used by a character. 
-
-   In locales without a native wcwidth, Unicode is probably so broken
-   that it isn't worth trying to implement a real wcwidth. This
-   wcwidth assumes any printing character takes up one column.
-*/
-int wcwidth( wchar_t c )
-{
-	if( c < 32 )
-		return 0;
-	if ( c == 127 )
-		return 0;
-	return 1;
-}
-#endif

 /** 
 	The glibc version of wcswidth seems to hang on some strings. fish uses this replacement.
@@ -704,30 +535,34 @@ int my_wcswidth( const wchar_t *c )
 	return res;
 }

-wchar_t *quote_end( const wchar_t *in )
+const wchar_t *quote_end( const wchar_t *pos )
 {
-	switch( *in )
+	wchar_t c = *pos;
+	
+	while( 1 )
 	{
-		case '"':
+		pos++;
+
+		if( !*pos )
+			return 0;
+		
+		if( *pos == L'\\')
 		{
-			while(1)
-			{
-				in = wcschr( in+1, L'"' );
-				if( !in )
-					return 0;
-				if( *(in-1) != L'\\' )
-					return (wchar_t *)in;
-			}
+			pos++;
 		}
-		case '\'':
+		else
 		{
-			return wcschr( in+1, L'\'' );
+			if( *pos == c )
+			{
+				return pos;
+			}
 		}
 	}
 	return 0;
+	
 }

-
+				
 const wchar_t *wsetlocale(int category, const wchar_t *locale)
 {

@@ -790,12 +625,6 @@ int read_blocked(int fd, void *buf, size_t count)
 	return res;	
 }

-int writeb( tputs_arg_t b )
-{
-	write( 1, &b, 1 );
-//	putc( b, stdout );
-	return 0;
-}

 void die_mem()
 {
@@ -924,6 +753,26 @@ wchar_t *escape( const wchar_t *in,
 	
 	while( *in != 0 )
 	{
+
+		if( ( *in >= ENCODE_DIRECT_BASE) &&
+			( *in < ENCODE_DIRECT_BASE+256) )
+		{
+			int val = *in - ENCODE_DIRECT_BASE;
+			int tmp;
+			
+			*(pos++) = L'\\';
+			*(pos++) = L'X';
+			
+			tmp = val/16;			
+			*pos++ = tmp > 9? L'a'+(tmp-10):L'0'+tmp;
+			
+			tmp = val%16;			
+			*pos++ = tmp > 9? L'a'+(tmp-10):L'0'+tmp;
+			
+		}
+		else
+		{
+			
 		switch( *in )
 		{
 			case L'\t':
@@ -992,6 +841,8 @@ wchar_t *escape( const wchar_t *in,
 					*pos++ = *in;
 				break;
 		}
+		}
+		
 		in++;
 	}
 	*pos = 0;
@@ -1067,60 +918,84 @@ wchar_t *unescape( const wchar_t * orig, int unescape_special )
 						case L'u':
 						case L'U':
 						case L'x':
-						case L'o':
+						case L'X':
+						case L'0':
+						case L'1':
+						case L'2':
+						case L'3':
+						case L'4':
+						case L'5':
+						case L'6':
+						case L'7':
 						{
 							int i;
-							wchar_t res=0;
+							long long res=0;
 							int chars=2;
 							int base=16;
-					
+							
+							int byte = 0;
+							int max_val = 127;
+							
 							switch( in[in_pos] )
 							{
 								case L'u':
 								{
-									base=16;
 									chars=4;
+									max_val = 35535;
 									break;
 								}
 								
 								case L'U':
 								{
-									base=16;
 									chars=8;
+									max_val = WCHAR_MAX;
 									break;
 								}
 								
 								case L'x':
 								{
-									base=16;
-									chars=2;
 									break;
 								}
 								
-								case L'o':
+								case L'X':
+								{
+									byte=1;
+									max_val = 255;
+									break;
+								}
+								
+								default:
 								{
 									base=8;
 									chars=3;
+									in_pos--;
 									break;
-								}
-								
+								}								
 							}
 					
 							for( i=0; i<chars; i++ )
 							{
 								int d = convert_digit( in[++in_pos],base);
+								
 								if( d < 0 )
 								{
 									in_pos--;
 									break;
 								}
-						
+								
 								res=(res*base)|d;
-						
 							}
-					
-							in[out_pos] = res;
-					
+
+							if( (res > 0) && (res <= max_val) )
+							{
+								in[out_pos] = (byte?ENCODE_DIRECT_BASE:0)+res;
+							}
+							else
+							{	
+								free(in);	
+								return 0;
+							}
+							
 							break;
 						}

@@ -1275,6 +1150,31 @@ wchar_t *unescape( const wchar_t * orig, int unescape_special )
 			*/
 			case 1:
 			{
+				if( c == L'\\' )
+				{
+					switch( in[++in_pos] )
+					{
+						case '\\':
+						case L'\'':
+						{
+							in[out_pos]=in[in_pos];
+							break;
+						}
+						
+						case 0:
+						{
+							free(in);
+							return 0;
+						}
+						
+						default:
+						{
+							in[out_pos++] = L'\\';
+							in[out_pos]= in[in_pos];
+						}
+					}
+					
+				}
 				if( c == L'\'' )
 				{
 					in[out_pos] = INTERNAL_SEPARATOR;							
@@ -1312,12 +1212,14 @@ wchar_t *unescape( const wchar_t * orig, int unescape_special )
 								return 0;
 							}
 							
+							case '\\':
 							case L'$':
+							case '"':
 							{
 								in[out_pos]=in[in_pos];
 								break;
 							}
-							
+
 							default:
 							{
 								in[out_pos++] = L'\\';
--- a/common.h
+++ b/common.h
@@ -8,24 +8,13 @@
 */
 #define FISH_COMMON_H

+#include <stdlib.h>
+#include <stdio.h>
 #include <wchar.h>
 #include <termios.h>

 #include "util.h"

-/**
-   Under curses, tputs expects an int (*func)(char) as its last
-   parameter, but in ncurses, tputs expects a int (*func)(int) as its
-   last parameter. tputs_arg_t is defined to always be what tputs
-   expects. Hopefully.
-*/
-
-#ifdef NCURSES_VERSION
-typedef int tputs_arg_t;
-#else
-typedef char tputs_arg_t;
-#endif
-
 /**
   Maximum number of bytes used by a single utf-8 character
 */
@@ -42,6 +31,11 @@ typedef char tputs_arg_t;
 */
 #define FISH_COLOR_RESET -2

+/**
+   This is in the unicode private use area.
+*/
+#define ENCODE_DIRECT_BASE 0xf100
+
 /** 
 	Save the shell mode on startup so we can restore them on exit
 */
@@ -76,7 +70,10 @@ extern wchar_t *program_name;

 /**
   Take an array_list_t containing wide strings and converts them to a
-   single null-terminated wchar_t **.
+   single null-terminated wchar_t **. The array is allocated using
+   halloc, and uses the \c context parameter as context. If \c context
+   is not noll, all elements of the \c array_list_t are also
+   registered to \c context using \c halloc_register().
 */
 wchar_t **list_to_char_arr( array_list_t *l );

@@ -104,6 +101,7 @@ void sort_list( array_list_t *comp );
   specified multibyte character string
 */
 wchar_t *str2wcs( const char *in );
+wchar_t *str2wcs_internal( const char *in, wchar_t *out );

 /**
   Returns a newly allocated multibyte character string equivalent of
@@ -111,6 +109,8 @@ wchar_t *str2wcs( const char *in );
 */
 char *wcs2str( const wchar_t *in );

+char *wcs2str_internal( const wchar_t *in, char *out );
+
 /**
   Returns a newly allocated wide character string array equivalent of
   the specified multibyte character string array
@@ -134,31 +134,6 @@ wchar_t *wcsdupcat( const wchar_t *a, const wchar_t *b );
 */
 wchar_t *wcsdupcat2( const wchar_t *a, ... );

-/**
-   Returns a newly allocated wide character string wich is a copy of
-   the string in, but of length c or shorter. The returned string is
-   always null terminated, and the null is not included in the string
-   length.
-*/
-wchar_t *wcsndup( const wchar_t *in, int c );
-
-/**
-   Converts from wide char to digit in the specified base. If d is not
-   a valid digit in the specified base, return -1.
-*/
-long convert_digit( wchar_t d, int base );
-
-
-/**
-   Convert a wide character string to a number in the specified
-   base. This functions is the wide character string equivalent of
-   strtol. For bases of 10 or lower, 0..9 are used to represent
-   numbers. For bases below 36, a-z and A-Z are used to represent
-   numbers higher than 9. Higher bases than 36 are not supported.
-*/
-long wcstol(const wchar_t *nptr,
-			wchar_t **endptr,
-			int base);

 /**
   Appends src to string dst of size siz (unlike wcsncat, siz is the
@@ -183,53 +158,12 @@ size_t wcslcat( wchar_t *dst, const wchar_t *src, size_t siz );
 */
 size_t wcslcpy( wchar_t *dst, const wchar_t *src, size_t siz );

-/**
-   Create a duplicate string. Wide string version of strdup. Will
-   automatically exit if out of memory.
-*/
-wchar_t *wcsdup(const wchar_t *in);
-
-size_t wcslen(const wchar_t *in);
-
-/**
-   Case insensitive string compare function. Wide string version of
-   strcasecmp.
-
-   This implementation of wcscasecmp does not take into account
-   esoteric locales where uppercase and lowercase do not cleanly
-   transform between each other. Hopefully this should be fine since
-   fish only uses this function with one of the strings supplied by
-   fish and guaranteed to be a sane, english word. Using wcscasecmp on
-   a user-supplied string should be considered a bug.
-*/
-int wcscasecmp( const wchar_t *a, const wchar_t *b );
-
-/**
-   Case insensitive string compare function. Wide string version of
-   strncasecmp.
-
-   This implementation of wcsncasecmp does not take into account
-   esoteric locales where uppercase and lowercase do not cleanly
-   transform between each other. Hopefully this should be fine since
-   fish only uses this function with one of the strings supplied by
-   fish and guaranteed to be a sane, english word. Using wcsncasecmp on
-   a user-supplied string should be considered a bug.
-*/
-int wcsncasecmp( const wchar_t *a, const wchar_t *b, int count );
-
 /**
   Test if the given string is a valid variable name
 */

 int wcsvarname( wchar_t *str );

-/**
-   The prototype for this function is missing in some libc
-   implementations. Fish has a fallback implementation in case the
-   implementation is missing altogether.
-*/
-int wcwidth( wchar_t c );
-

 /**
   A wcswidth workalike. Fish uses this since the regular wcswidth seems flaky.
@@ -238,12 +172,12 @@ int my_wcswidth( const wchar_t *c );

 /**
   This functions returns the end of the quoted substring beginning at
-   \c in. It can handle both single and double quotes. Returns 0 on
-   error.
+   \c in. The type of quoting character is detemrined by examining \c
+   in. Returns 0 on error.

   \param in the position of the opening quote
 */
-wchar_t *quote_end( const wchar_t *in );
+const wchar_t *quote_end( const wchar_t *in );

 /**
   A call to this function will reset the error counter. Some
@@ -276,20 +210,18 @@ int contains_str( const wchar_t *needle, ... );
 */
 int read_blocked(int fd, void *buf, size_t count);

-/**
-   This is for writing process notification messages. Has to write to
-   stdout, so clr_eol and such functions will work correctly. Not an
-   issue since this function is only used in interactive mode anyway.
-*/
-int writeb( tputs_arg_t b );
-
 /**
   Exit program at once, leaving an error message about running out of memory
 */
 void die_mem();

 /**
-  Clean up 
+  Create global_context using halloc
+*/
+void common_init();
+
+/**
+   Free global_context using halloc_free
 */
 void common_destroy();

@@ -318,8 +250,7 @@ void debug( int level, const wchar_t *msg, ... );
   \return The escaped string, or 0 if there is not enough memory
 */

-wchar_t *escape( const wchar_t *in, 
-				 int escape_all );
+wchar_t *escape( const wchar_t *in, int escape_all );

 /**
   Expand backslashed escapes and substitute them with their unescaped
@@ -335,16 +266,6 @@ wchar_t *escape( const wchar_t *in,
 wchar_t *unescape( const wchar_t * in, 
 				   int escape_special );

-/**
-   Block SIGCHLD. Calls to block/unblock may be nested, and only once the nest count reaches zero wiull the block be removed.
-*/
-void block();
-
-/**
-   undo call to block().
-*/
-void unblock();
-
 /**
   Attempt to acquire a lock based on a lockfile, waiting LOCKPOLLINTERVAL 
   milliseconds between polls and timing out after timeout seconds, 
--- a/complete.c
+++ b/complete.c
--- a/complete.h
+++ b/complete.h
@@ -33,6 +33,8 @@
 /** Separateor between completion and description*/
 #define COMPLETE_SEP_STR L"\004"

+#define COMPLETE_ITEM_SEP L'\uf500'
+
 /**
   Character that separates the completion and description on programmable completions
 */
@@ -162,6 +164,6 @@ int complete_is_valid_argument( const wchar_t *str,
   \param cmd the command for which to load command-specific completions
   \param reload should the commands completions be reloaded, even if they where previously loaded. (This is set to true on actual completions, so that changed completion are updated in running shells)
 */
-void complete_load( wchar_t *cmd, int reload );
+void complete_load( const wchar_t *cmd, int reload );

 #endif
--- a/config.guess
+++ b/config.guess
--- a/config.sub
+++ b/config.sub
@@ -1,9 +1,10 @@
 #! /bin/sh
 # Configuration validation subroutine script.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003 Free Software Foundation, Inc.
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
+#   Inc.

-timestamp='2003-06-18'
+timestamp='2006-02-27'

 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -21,14 +22,15 @@ timestamp='2003-06-18'
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
-
+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
+# 02110-1301, USA.
+#
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
 # configuration script generated by Autoconf, you may include it under
 # the same distribution terms that you use for the rest of that program.

+
 # Please send patches to <config-patches@gnu.org>.  Submit a context
 # diff and a properly formatted ChangeLog entry.
 #
@@ -70,7 +72,7 @@ Report bugs and patches to <config-patches@gnu.org>."
 version="\
 GNU config.sub ($timestamp)

-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
 Free Software Foundation, Inc.

 This is free software; see the source for copying conditions.  There is NO
@@ -83,11 +85,11 @@ Try \`$me --help' for more information."
 while test $# -gt 0 ; do
  case $1 in
    --time-stamp | --time* | -t )
-       echo "$timestamp" ; exit 0 ;;
+       echo "$timestamp" ; exit ;;
    --version | -v )
-       echo "$version" ; exit 0 ;;
+       echo "$version" ; exit ;;
    --help | --h* | -h )
-       echo "$usage"; exit 0 ;;
+       echo "$usage"; exit ;;
    -- )     # Stop option processing
       shift; break ;;
    - )	# Use stdin as input.
@@ -99,7 +101,7 @@ while test $# -gt 0 ; do
    *local*)
       # First pass through any local machine types.
       echo $1
-       exit 0;;
+       exit ;;

    * )
       break ;;
@@ -118,7 +120,9 @@ esac
 # Here we must recognize all the valid KERNEL-OS combinations.
 maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
 case $maybe_os in
-  nto-qnx* | linux-gnu* | freebsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
+  nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
+  uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
+  storm-chaos* | os2-emx* | rtmk-nova*)
    os=-$maybe_os
    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
    ;;
@@ -144,7 +148,7 @@ case $os in
 	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
 	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
 	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
-	-apple | -axis)
+	-apple | -axis | -knuth | -cray)
 		os=
 		basic_machine=$1
 		;;
@@ -169,6 +173,10 @@ case $os in
 	-hiux*)
 		os=-hiuxwe2
 		;;
+	-sco6)
+		os=-sco5v6
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
 	-sco5)
 		os=-sco3.2v5
 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
@@ -185,6 +193,10 @@ case $os in
 		# Don't forget version if it is 3.2v4 or newer.
 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
 		;;
+	-sco5v6*)
+		# Don't forget version if it is 3.2v4 or newer.
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
 	-sco*)
 		os=-sco3.2v2
 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
@@ -228,14 +240,16 @@ case $basic_machine in
 	| a29k \
 	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
 	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
+	| am33_2.0 \
 	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
+	| bfin \
 	| c4x | clipper \
 	| d10v | d30v | dlx | dsp16xx \
 	| fr30 | frv \
 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
 	| i370 | i860 | i960 | ia64 \
-	| ip2k \
-	| m32r | m68000 | m68k | m88k | mcore \
+	| ip2k | iq2000 \
+	| m32r | m32rle | m68000 | m68k | m88k | maxq | mb | microblaze | mcore \
 	| mips | mipsbe | mipseb | mipsel | mipsle \
 	| mips16 \
 	| mips64 | mips64el \
@@ -244,31 +258,38 @@ case $basic_machine in
 	| mips64vr4100 | mips64vr4100el \
 	| mips64vr4300 | mips64vr4300el \
 	| mips64vr5000 | mips64vr5000el \
+	| mips64vr5900 | mips64vr5900el \
 	| mipsisa32 | mipsisa32el \
 	| mipsisa32r2 | mipsisa32r2el \
 	| mipsisa64 | mipsisa64el \
+	| mipsisa64r2 | mipsisa64r2el \
 	| mipsisa64sb1 | mipsisa64sb1el \
 	| mipsisa64sr71k | mipsisa64sr71kel \
 	| mipstx39 | mipstx39el \
 	| mn10200 | mn10300 \
+	| mt \
 	| msp430 \
+	| nios | nios2 \
 	| ns16k | ns32k \
-	| openrisc | or32 \
+	| or32 \
 	| pdp10 | pdp11 | pj | pjl \
 	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
 	| pyramid \
-	| s390 | s390x \
-	| sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
+	| sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
 	| sh64 | sh64le \
-	| sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | sparcv9b \
+	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
+	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
 	| strongarm \
 	| tahoe | thumb | tic4x | tic80 | tron \
 	| v850 | v850e \
 	| we32k \
-	| x86 | xscale | xstormy16 | xtensa \
+	| x86 | xscale | xscalee[bl] | xstormy16 | xtensa \
 	| z8k)
 		basic_machine=$basic_machine-unknown
 		;;
+	m32c)
+		basic_machine=$basic_machine-unknown
+		;;
 	m6811 | m68hc11 | m6812 | m68hc12)
 		# Motorola 68HC11/12.
 		basic_machine=$basic_machine-unknown
@@ -276,6 +297,9 @@ case $basic_machine in
 		;;
 	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
 		;;
+	ms1)
+		basic_machine=mt-unknown
+		;;

 	# We use `pc' rather than `unknown'
 	# because (1) that's what they normally are, and
@@ -296,19 +320,19 @@ case $basic_machine in
 	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
 	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
 	| avr-* \
-	| bs2000-* \
+	| bfin-* | bs2000-* \
 	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
-	| clipper-* | cydra-* \
+	| clipper-* | craynv-* | cydra-* \
 	| d10v-* | d30v-* | dlx-* \
 	| elxsi-* \
 	| f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
 	| h8300-* | h8500-* \
 	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
 	| i*86-* | i860-* | i960-* | ia64-* \
-	| ip2k-* \
-	| m32r-* \
+	| ip2k-* | iq2000-* \
+	| m32r-* | m32rle-* \
 	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
-	| m88110-* | m88k-* | mcore-* \
+	| m88110-* | m88k-* | maxq-* | mcore-* \
 	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
 	| mips16-* \
 	| mips64-* | mips64el-* \
@@ -317,34 +341,41 @@ case $basic_machine in
 	| mips64vr4100-* | mips64vr4100el-* \
 	| mips64vr4300-* | mips64vr4300el-* \
 	| mips64vr5000-* | mips64vr5000el-* \
+	| mips64vr5900-* | mips64vr5900el-* \
 	| mipsisa32-* | mipsisa32el-* \
 	| mipsisa32r2-* | mipsisa32r2el-* \
 	| mipsisa64-* | mipsisa64el-* \
+	| mipsisa64r2-* | mipsisa64r2el-* \
 	| mipsisa64sb1-* | mipsisa64sb1el-* \
 	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
 	| mipstx39-* | mipstx39el-* \
+	| mmix-* \
+	| mt-* \
 	| msp430-* \
-	| none-* | np1-* | nv1-* | ns16k-* | ns32k-* \
+	| nios-* | nios2-* \
+	| none-* | np1-* | ns16k-* | ns32k-* \
 	| orion-* \
 	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
 	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
 	| pyramid-* \
 	| romp-* | rs6000-* \
-	| s390-* | s390x-* \
-	| sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \
+	| sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | shbe-* \
 	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
-	| sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \
-	| sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
+	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
+	| sparclite-* \
+	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
 	| tahoe-* | thumb-* \
 	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
 	| tron-* \
 	| v850-* | v850e-* | vax-* \
 	| we32k-* \
-	| x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \
-	| xtensa-* \
+	| x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \
+	| xstormy16-* | xtensa-* \
 	| ymp-* \
 	| z8k-*)
 		;;
+	m32c-*)
+		;;
 	# Recognize the various machine names and aliases which stand
 	# for a CPU type and a company and sometimes even an OS.
 	386bsd)
@@ -361,6 +392,9 @@ case $basic_machine in
 		basic_machine=a29k-amd
 		os=-udi
 		;;
+    	abacus)
+		basic_machine=abacus-unknown
+		;;
 	adobe68k)
 		basic_machine=m68010-adobe
 		os=-scout
@@ -378,6 +412,9 @@ case $basic_machine in
 	amd64)
 		basic_machine=x86_64-pc
 		;;
+	amd64-*)
+		basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
 	amdahl)
 		basic_machine=580-amdahl
 		os=-sysv
@@ -437,12 +474,27 @@ case $basic_machine in
 		basic_machine=j90-cray
 		os=-unicos
 		;;
+	craynv)
+		basic_machine=craynv-cray
+		os=-unicosmp
+		;;
+	cr16c)
+		basic_machine=cr16c-unknown
+		os=-elf
+		;;
 	crds | unos)
 		basic_machine=m68k-crds
 		;;
+	crisv32 | crisv32-* | etraxfs*)
+		basic_machine=crisv32-axis
+		;;
 	cris | cris-* | etrax*)
 		basic_machine=cris-axis
 		;;
+	crx)
+		basic_machine=crx-unknown
+		os=-elf
+		;;
 	da30 | da30-*)
 		basic_machine=m68k-da30
 		;;
@@ -465,6 +517,10 @@ case $basic_machine in
 		basic_machine=m88k-motorola
 		os=-sysv3
 		;;
+	djgpp)
+		basic_machine=i586-pc
+		os=-msdosdjgpp
+		;;
 	dpx20 | dpx20-*)
 		basic_machine=rs6000-bull
 		os=-bosx
@@ -643,10 +699,6 @@ case $basic_machine in
 	mips3*)
 		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
 		;;
-	mmix*)
-		basic_machine=mmix-knuth
-		os=-mmixware
-		;;
 	monitor)
 		basic_machine=m68k-rom68k
 		os=-coff
@@ -659,6 +711,9 @@ case $basic_machine in
 		basic_machine=i386-pc
 		os=-msdos
 		;;
+	ms1-*)
+		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
+		;;
 	mvs)
 		basic_machine=i370-ibm
 		os=-mvs
@@ -727,10 +782,6 @@ case $basic_machine in
 	np1)
 		basic_machine=np1-gould
 		;;
-	nv1)
-		basic_machine=nv1-cray
-		os=-unicosmp
-		;;
 	nsr-tandem)
 		basic_machine=nsr-tandem
 		;;
@@ -738,9 +789,12 @@ case $basic_machine in
 		basic_machine=hppa1.1-oki
 		os=-proelf
 		;;
-	or32 | or32-*)
+	openrisc | openrisc-*)
 		basic_machine=or32-unknown
-		os=-coff
+		;;
+	os400)
+		basic_machine=powerpc-ibm
+		os=-os400
 		;;
 	OSE68000 | ose68000)
 		basic_machine=m68000-ericsson
@@ -767,6 +821,12 @@ case $basic_machine in
 	pc532 | pc532-*)
 		basic_machine=ns32k-pc532
 		;;
+	pc98)
+		basic_machine=i386-pc
+		;;
+	pc98-*)
+		basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
 	pentium | p5 | k5 | k6 | nexgen | viac3)
 		basic_machine=i586-pc
 		;;
@@ -823,6 +883,10 @@ case $basic_machine in
 		basic_machine=i586-unknown
 		os=-pw32
 		;;
+	rdos)
+		basic_machine=i386-pc
+		os=-rdos
+		;;
 	rom68k)
 		basic_machine=m68k-rom68k
 		os=-coff
@@ -833,6 +897,12 @@ case $basic_machine in
 	rtpc | rtpc-*)
 		basic_machine=romp-ibm
 		;;
+	s390 | s390-*)
+		basic_machine=s390-ibm
+		;;
+	s390x | s390x-*)
+		basic_machine=s390x-ibm
+		;;
 	sa29200)
 		basic_machine=a29k-amd
 		os=-udi
@@ -956,6 +1026,10 @@ case $basic_machine in
 	tower | tower-32)
 		basic_machine=m68k-ncr
 		;;
+	tpf)
+		basic_machine=s390x-ibm
+		os=-tpf
+		;;
 	udi29k)
 		basic_machine=a29k-amd
 		os=-udi
@@ -999,6 +1073,10 @@ case $basic_machine in
 		basic_machine=hppa1.1-winbond
 		os=-proelf
 		;;
+	xbox)
+		basic_machine=i686-pc
+		os=-mingw32
+		;;
 	xps | xps100)
 		basic_machine=xps100-honeywell
 		;;
@@ -1029,6 +1107,9 @@ case $basic_machine in
 	romp)
 		basic_machine=romp-ibm
 		;;
+	mmix)
+		basic_machine=mmix-knuth
+		;;
 	rs6000)
 		basic_machine=rs6000-ibm
 		;;
@@ -1045,13 +1126,10 @@ case $basic_machine in
 	we32k)
 		basic_machine=we32k-att
 		;;
-	sh3 | sh4 | sh[34]eb | sh[1234]le | sh[23]ele)
+	sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
 		basic_machine=sh-unknown
 		;;
-	sh64)
-		basic_machine=sh64-unknown
-		;;
-	sparc | sparcv9 | sparcv9b)
+	sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
 		basic_machine=sparc-sun
 		;;
 	cydra)
@@ -1124,19 +1202,23 @@ case $os in
 	      | -aos* \
 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
-	      | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \
-	      | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
+	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
+	      | -openbsd* | -solidbsd* \
+	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
+	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
 	      | -chorusos* | -chorusrdb* \
 	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-	      | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
+	      | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
+	      | -uxpv* | -beos* | -mpeix* | -udk* \
 	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
 	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
 	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
-	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei*)
+	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
+	      | -skyos* | -haiku* | -rdos*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
 	-qnx*)
@@ -1154,12 +1236,15 @@ case $os in
 		os=`echo $os | sed -e 's|nto|nto-qnx|'`
 		;;
 	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
-	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* \
+	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \
 	      | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
 		;;
 	-mac*)
 		os=`echo $os | sed -e 's|mac|macos|'`
 		;;
+	-linux-dietlibc)
+		os=-linux-dietlibc
+		;;
 	-linux*)
 		os=`echo $os | sed -e 's|linux|linux-gnu|'`
 		;;
@@ -1172,6 +1257,9 @@ case $os in
 	-opened*)
 		os=-openedition
 		;;
+        -os400*)
+		os=-os400
+		;;
 	-wince*)
 		os=-wince
 		;;
@@ -1193,6 +1281,9 @@ case $os in
 	-atheos*)
 		os=-atheos
 		;;
+	-syllable*)
+		os=-syllable
+		;;
 	-386bsd)
 		os=-bsd
 		;;
@@ -1215,6 +1306,9 @@ case $os in
 	-sinix*)
 		os=-sysv4
 		;;
+        -tpf*)
+		os=-tpf
+		;;
 	-triton*)
 		os=-sysv3
 		;;
@@ -1251,6 +1345,9 @@ case $os in
 	-kaos*)
 		os=-kaos
 		;;
+	-zvmoe)
+		os=-zvmoe
+		;;
 	-none)
 		;;
 	*)
@@ -1282,9 +1379,9 @@ case $basic_machine in
 	arm*-semi)
 		os=-aout
 		;;
-	c4x-* | tic4x-*)
-		os=-coff
-		;;
+    c4x-* | tic4x-*)
+        os=-coff
+        ;;
 	# This must come before the *-dec entry.
 	pdp10-*)
 		os=-tops20
@@ -1328,9 +1425,15 @@ case $basic_machine in
 	*-be)
 		os=-beos
 		;;
+	*-haiku)
+		os=-haiku
+		;;
 	*-ibm)
 		os=-aix
 		;;
+    	*-knuth)
+		os=-mmixware
+		;;
 	*-wec)
 		os=-proelf
 		;;
@@ -1463,9 +1566,15 @@ case $basic_machine in
 			-mvs* | -opened*)
 				vendor=ibm
 				;;
+			-os400*)
+				vendor=ibm
+				;;
 			-ptx*)
 				vendor=sequent
 				;;
+			-tpf*)
+				vendor=ibm
+				;;
 			-vxsim* | -vxworks* | -windiss*)
 				vendor=wrs
 				;;
@@ -1490,7 +1599,7 @@ case $basic_machine in
 esac

 echo $basic_machine$os
-exit 0
+exit

 # Local variables:
 # eval: (add-hook 'write-file-hooks 'time-stamp)
--- a/configure.ac
+++ b/configure.ac
@@ -1,8 +1,78 @@
 # Process this file with autoconf to produce a configure script.
-AC_INIT(fish,1.19.0,fish-users@lists.sf.net)
+AC_INIT(fish,1.21.3,fish-users@lists.sf.net)

-# Run autoheader automatically, it's quick, and saves people the hassle of remembering to run it manually
-autoheader
+# If needed, run autoconf to regenerate the configure file
+AC_MSG_CHECKING([if autoconf needs to be run])
+if test configure -ot configure.ac; then
+	AC_MSG_RESULT([yes])
+	if which autoconf >/dev/null; then
+		# No need to provide any error messages if autoconf fails, the
+		# shell and autconf should take care of that themselves
+		AC_MSG_NOTICE([running autoconf])
+		if autoconf; then
+			./configure "$@"
+		fi
+		exit			
+	else
+		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.])
+	fi
+else
+	AC_MSG_RESULT([no])
+fi
+
+
+# If needed, run autoheader to regenerate config.h.in
+AC_MSG_CHECKING([if autoheader needs to be run])
+if test ! -f ./config.h.in -o config.h.in -ot configure.ac; then
+	AC_MSG_RESULT([yes])
+	if which autoheader >/dev/null; then
+		AC_MSG_NOTICE([running autoheader])
+		autoheader
+	else
+		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.])
+	fi
+else
+	AC_MSG_RESULT([no])
+fi
+
+
+# Detect directories which may contain additional headers, libraries
+# and commands. This needs to be done early - before Autoconf starts
+# to mess with CFLAGS and all the other environemnt variables.
+for i in /usr/pkg /sw /opt /opt/local; do
+
+	AC_MSG_CHECKING([for $i/include include directory])
+	if test -d $i/include; then
+		AC_MSG_RESULT(yes)
+		CPPFLAGS="$CPPFLAGS -I$i/include/"
+		CFLAGS="$CFLAGS -I$i/include/"
+	else
+   	AC_MSG_RESULT(no)
+	fi
+
+	AC_MSG_CHECKING([for $i/lib library directory])
+	if test -d $i/lib; then
+		AC_MSG_RESULT(yes)
+		LDFLAGS="$LDFLAGS -L$i/lib/ -R$i/lib/"
+	else
+    	AC_MSG_RESULT(no)
+	fi
+
+	AC_MSG_CHECKING([for $i/bin command directory])
+	if test -d $i/bin; then
+		AC_MSG_RESULT(yes)
+		optbindirs="$optbindirs $i/bin"
+	else
+    	AC_MSG_RESULT(no)
+	fi
+
+done
+
+AC_SUBST( optbindirs, $optbindirs )

 # Tell autoconf to create config.h header 
 AC_CONFIG_HEADERS(config.h)
@@ -12,17 +82,20 @@ AC_PROG_CC
 AC_PROG_CPP
 AC_PROG_INSTALL

-# Check for doxygen, needed to build
+# Check for doxygen, which is needed to build
 AC_CHECK_PROG( has_doxygen, [doxygen], "true")

 if ! test $has_doxygen = "true"; then
-	echo Could not find the Doxygen program in your path.
-	echo This program is needed to build fish.
-	echo Please install it and try again.
-	exit 1
+	AC_MSG_ERROR( [cannot find the Doxygen program in your path.
+This program is needed to build fish.
+Please install it and try again.])
 fi

-# Optionally drop xsel
+# Check for seq command. If missing, make sure fallback shellscript
+# implementation is installed
+AC_CHECK_PROG( SEQ_FALLBACK, seq, [ ], [seq])
+
+# Optionally drop xsel command
 AC_ARG_WITH( xsel, 
 			 AC_HELP_STRING([--without-xsel],
             [do not build the xsel program needed for X clipboard integration]),
@@ -39,17 +112,114 @@ else
    AC_SUBST( XSEL_MAN_PATH,[ ])
 fi

+#
+# Test if the compiler accepts the -std=c99 flag. If so, using it
+# increases the odds of correct compilation, since we want to use the
+# *wprintf functions, which where defined in C99.
+#
+
+XCFLAGS="$CFLAGS"
+CFLAGS="$CFLAGS -std=c99"
+AC_MSG_CHECKING(if -std=c99 works)
+AC_CACHE_VAL(local_cv_has__std_c99,[
+AC_TRY_RUN([
+#include <stdlib.h>
+#include <stdio.h>
+
+int main() {
+return 0;
+}],
+local_cv_has__std_c99=yes,
+local_cv_has__std_c99=no,
+)])
+AC_MSG_RESULT($local_cv_has__std_c99)
+case x$local_cv_has__std_c99 in
+xno) CFLAGS="$XCFLAGS" ;;
+esac
+
+#
+# If we are using gcc, set some flags that increase the odds of the
+# compiler producing a working binary...
+#
+
+if test "$CC" = gcc; then
+
+	#
+	# -fno-optimize-sibling-calls seems to work around a bug where
+	# sending a SIGWINCH to fish on NetBSD causes fish to exit when
+	# compiled with GCC 3.3.3. This is probably either a compiler bug
+	# or a libc bug, but adding this flag seems to fix things for
+	# now. Long term, the real problem should be tracked down and
+	# truly fixed, at which point we can remove this silly flag. This
+	# bug has been verified to not exist on Linux using GCC 3.3.3.
+	#
+
+	CFLAGS="$CFLAGS -fno-optimize-sibling-calls"
+
+
+	#
+	# -Wall is there to keep me on my toes
+	#
+
+	CFLAGS="$CFLAGS -Wall"
+
+fi
+
+#
+# If we are compiling against glibc, set some flags to work around
+# some rather stupid attempts to hide prototypes for *wprintf
+# functions, as well as prototypes of various gnu extensions.
+#
+
+AC_MSG_CHECKING([if we are compiling against glibc])
+AC_RUN_IFELSE(
+	[AC_LANG_PROGRAM([
+#include <stdlib.h>
+#ifdef __GLIBC__
+#define STATUS 0
+#else
+#define STATUS 1
+#endif],
+		[return STATUS;])], 
+	[glibc=yes], 
+	[glibc=no] )
+
+if test "$glibc" = yes; then
+	AC_MSG_RESULT(yes)
+
+	#
+	# This gives us access to prototypes for gnu extensions and C99
+	# functions if we are compiling agains glibc. All GNU extensions
+	# that are used must have a fallback implementation available in
+	# fallback.h, in order to keep fish working on non-gnu platforms.
+	#
+
+	CFLAGS="$CFLAGS -D _GNU_SOURCE -D _ISOC99_SOURCE"
+
+else
+	AC_MSG_RESULT(no)
+fi
+
 # Test cpu for special handling of ppc
+#
+# This is used to skip use of tputs on ppc systems, since it seemed to
+# be broken, at least on older debin-based systems. This is obviously
+# not the right way to to detect whether this workaround should be
+# used, since it catches far to many systems, but I do not have the
+# hardware available to narrow this problem down, and in practice, it
+# seems that tputs is never really needed.
+#
 AC_CANONICAL_TARGET

 if test $target_cpu = powerpc; then
   AC_DEFINE([TPUTS_KLUDGE],[1],[Evil kludge to get Power based machines to work])
 fi

-AC_DEFINE_UNQUOTED([CPU],[L"$target_cpu"],[CPU type])

-
-# Set up install locations
+# Set up PREFIX and related preprocessor symbols. Fish needs to know
+# where it will be installed. One of the reasons for this is so that
+# it can make sure the fish installation directory is in the path
+# during startup.
 if [[ "$prefix" = NONE ]]; then
 	AC_DEFINE_UNQUOTED( [PREFIX], L"/usr/local", [Installation directory])
 	AC_SUBST( PREFIX, /usr/local)
@@ -58,11 +228,14 @@ else
 	AC_DEFINE_UNQUOTED( [PREFIX], L"$prefix", [Installation directory])
 	AC_SUBST( PREFIX, [$prefix])
 fi
+AC_DEFINE_UNQUOTED( SYSCONFDIR, [L"$(eval echo $sysconfdir)"], [System configuration directory] )
+AC_DEFINE_UNQUOTED( DATADIR, [L"$(eval echo $datadir)"], [System configuration directory] )
+AC_SUBST( SYSCONFDIR, ["$(eval echo $sysconfdir)"] )
+AC_SUBST( DATADIR, ["$(eval echo $datadir)"] )

-AC_SUBST(fishdir,[/fish.d])
-AC_SUBST(fishfile,[/fish])
-AC_SUBST(fishinputfile,[/fish_inputrc])

+# Set up the directory where the documentation files should be
+# installed
 AC_ARG_VAR( [docdir], [Documentation direcotry] )

 if test -z $docdir; then
@@ -70,19 +243,100 @@ if test -z $docdir; then
 fi

 AC_DEFINE_UNQUOTED( DOCDIR, [L"$(eval echo $docdir)"], [Documentation directory] )
-AC_DEFINE_UNQUOTED( SYSCONFDIR, [L"$(eval echo $sysconfdir)"], [System configuration directory] )
-AC_SUBST( SYSCONFDIR, ["$(eval echo $sysconfdir)"] )

-# Set up locale directory
+
+# Set up locale directory. This is where the .po files will be
+# installed.
 AC_DEFINE_UNQUOTED( [LOCALEDIR], "$(eval echo $datadir)/locale", [Locale directory])
 AC_SUBST( [LOCALEDIR], [$datadir/locale])

-# See if Linux procfs is present
+# See if Linux procfs is present. This is used to get extra
+# information about running processes.
 AC_CHECK_FILES([/proc/self/stat])

-# See if NetBSD pkgsrc is installed
-AC_CHECK_FILE([/usr/pkg/lib],[AC_SUBST(LIBDIR,[-L/usr/pkg/lib\ -R/usr/pkg/lib])])
-AC_CHECK_FILE([/usr/pkg/include],[AC_SUBST(INCLUDEDIR,[-I/usr/pkg/include])])
+# This is ued to tell the wgetopt library to translate strings. This
+# way wgetopt can be dropped into any project without requiring i18n.
+
+AC_DEFINE([HAVE_TRANSLATE_H], [1],
+			  [Define to 1 if the wgettext function should be used for translating strings.])
+
+# Check for presense of various libraries
+AC_SEARCH_LIBS( gettext, intl, AC_SUBST( HAVE_GETTEXT, [1] ), AC_SUBST( HAVE_GETTEXT, [0] ) )
+AC_SEARCH_LIBS( connect, socket, , [AC_MSG_ERROR([Cannot find the socket library, needed to build this package.] )] )
+AC_SEARCH_LIBS( nanosleep, rt, , [AC_MSG_ERROR([Cannot find the rt library, needed to build this package.] )] )
+AC_SEARCH_LIBS( setupterm, [ncurses curses], , [AC_MSG_ERROR([Could not find a curses implementation, needed to build fish])] )
+
+# Check for presense of various header files
+AC_CHECK_HEADERS([getopt.h termio.h sys/resource.h term.h ncurses/term.h libintl.h ncurses.h curses.h])
+
+AC_CHECK_HEADER([regex.h],
+				[AC_DEFINE([HAVE_REGEX_H], [1], [Define to 1 if you have the <regex.h> header file.])],
+				[AC_MSG_ERROR([Could not find the header regex.h, needed to build fish])])
+
+# Check for presense of various functions
+AC_CHECK_FUNCS( wcsdup wcsndup wcslen wcscasecmp wcsncasecmp gettext fwprintf )
+AC_CHECK_FUNCS( futimes wcwidth wcswidth getopt_long wcstok fputwc fgetwc )
+AC_CHECK_FUNCS( wcstol dcgettext )
+
+# Here follows a list of small programs used to test for various
+# features that Autoconf doesn't tell us about
+
+# Check if realpath accepts null for its second argument
+AC_MSG_CHECKING([if realpath accepts null for its second argument])
+AC_RUN_IFELSE(
+	[AC_LANG_PROGRAM([
+#include <limits.h>
+#include <errno.h>
+#include <stdlib.h>],
+		[int status; char *res; res = realpath( "somefile", 0 ); status = !(res != 0 || errno == ENOENT); exit( status );])], 
+	[have_realpath_null=yes], 
+	[have_realpath_null=no] )
+
+if test "$have_realpath_null" = yes; then
+	AC_MSG_RESULT(yes)
+	AC_DEFINE([HAVE_REALPATH_NULL], [1],
+		[Define to 1 if realpath accepts null for its second argument.])
+else
+	AC_MSG_RESULT(no)
+fi
+
+# If we have a fwprintf in libc, test that it actually works. As of
+# March 2006, it is broken under Dragonfly BSD.
+if test "$ac_cv_func_fwprintf" = yes; then
+
+	AC_MSG_CHECKING([if fwprintf is broken])
+	AC_RUN_IFELSE(
+		[AC_LANG_PROGRAM([
+#include <stdlib.h>
+#include <stdio.h>
+#include <locale.h>
+#include <wchar.h>
+			],
+			[
+				setlocale( LC_ALL, "" );
+				fwprintf( stderr, L"%ls%ls", L"", L"fish:" );
+			])],
+	    [
+			AC_MSG_RESULT(no)
+		],
+	    [
+			AC_MSG_RESULT([yes])
+			AC_DEFINE([HAVE_BROKEN_FWPRINTF], [1], [Define to 1 one if the implemented fwprintf is broken])
+		] )
+
+fi
+
+# Check for RLIMIT_NPROC in sys/resource.h.
+AC_MSG_CHECKING([for RLIMIT_NPROC in sys/resource.h])
+AC_TRY_COMPILE([#include <sys/resource.h>],
+[int tmp; tmp=RLIMIT_NPROC;], have_rlimit_as=yes, have_rlimit_as=no)
+if test "$have_rlimit_as" = yes; then
+    AC_MSG_RESULT(yes)
+	AC_DEFINE([HAVE_RLIMIT_NPROC], [1],
+			  [Define to 1 if HAVE_RLIMIT_NPROC is defined in <sys/resource.h>.])
+else
+    AC_MSG_RESULT(no)
+fi

 # Check for RLIMIT_AS in sys/resource.h.
 AC_MSG_CHECKING([for RLIMIT_AS in sys/resource.h])
@@ -120,41 +374,24 @@ else
    AC_MSG_RESULT(no)
 fi

-
-# Check for RLIMIT_NPROC in sys/resource.h.
-AC_MSG_CHECKING([for RLIMIT_NPROC in sys/resource.h])
-AC_TRY_COMPILE([#include <sys/resource.h>],
-[int tmp; tmp=RLIMIT_NPROC;], have_rlimit_as=yes, have_rlimit_as=no)
-if test "$have_rlimit_as" = yes; then
-    AC_MSG_RESULT(yes)
-	AC_DEFINE([HAVE_RLIMIT_NPROC], [1],
-			  [Define to 1 if HAVE_RLIMIT_NPROC is defined in <sys/resource.h>.])
+# Check for _nl_msg_cat_cntr symbol
+AC_MSG_CHECKING([for _nl_msg_cat_cntr symbol])
+AC_TRY_LINK([#if HAVE_LIBINTL_H]
+[#include <libintl.h>]
+[#endif],
+[extern int  _nl_msg_cat_cntr;]
+[int tmp = _nl_msg_cat_cntr; exit(tmp);], 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], [1],
+	          [Define to 1 if the _nl_msg_cat_cntr symbol is exported.])	
 else
    AC_MSG_RESULT(no)
 fi

-# Check for libraries
-AC_CHECK_LIB(socket, connect)
-AC_CHECK_LIB(rt, nanosleep)
-
-# Check for various header files
-AC_CHECK_HEADERS([getopt.h termio.h sys/resource.h])
-
-# Check for various function
-AC_CHECK_FUNCS(wcsdup wcsndup wcslen wcscasecmp wcsncasecmp gettext wprintf futimes wcwidth wcswidth getopt_long ) 
-
-# Check again for gettext library, so we can insert information 
-AC_CHECK_FUNC(gettext, AC_SUBST(HAVE_GETTEXT,1), AC_SUBST(HAVE_GETTEXT,0) )
-
-# Check if we have ncurses, and use it rather than curses if possible.
-AC_CHECK_HEADERS([ncurses.h],[AC_SUBST(CURSESLIB,[ncurses]) AC_DEFINE(HAVE_NCURSES_H)],[AC_SUBST(CURSESLIB,[curses])])
-
-# Force use of ncurses if it is avialable via NetBSD pkgsrc. This is an
-# ugly kludge to force NetBSD to use ncurses, since NetBSDs own version
-# does not properly support terminfo.
-AC_CHECK_FILE([/usr/pkg/include/ncurses.h],[AC_SUBST(CURSESLIB,[ncurses]) AC_DEFINE(HAVE_NCURSES_H)])
-
-AC_CONFIG_FILES([Makefile fish.spec doc_src/fish.1 doc_src/Doxyfile init/fish init/fish_interactive.fish init/fish_complete.fish])
+# Tell the world what we know
+AC_CONFIG_FILES([Makefile fish.spec doc_src/fish.1 doc_src/Doxyfile etc/fish etc/fish_interactive.fish share/fish seq])
 AC_OUTPUT

-echo "Now run 'make' and 'make install'"
+echo "fish is now configured."
+echo "Use 'make' and 'make install' to built and install fish."
--- a/doc_src/and.txt
+++ b/doc_src/and.txt
@@ -10,7 +10,7 @@ The \c and builtin is used to execute a command if the current exit status (as s

 \subsection and-example Example

-The following code runs the \c make command to build a program, and if it suceeds, it runs <tt>make install</tt>, which installs the program.
+The following code runs the \c make command to build a program, and if it succeeds, it runs <tt>make install</tt>, which installs the program.
 <pre>
 make; and make install
 </pre>
--- a/doc_src/begin.txt
+++ b/doc_src/begin.txt
@@ -7,10 +7,10 @@
 \subsection begin-description Description

 The \c begin builtin is used to create a new block of code. The block
-is unconditionally erxecuted. Begin is equivalent to <tt>if
+is unconditionally executed. Begin is equivalent to <tt>if
 true</tt>. The begin command is used to group any number of commands
 into a block. The reason for this is usually either to introduce a new
-variable scope or to redirect the input ot output of this set of
+variable scope or to redirect the input to output of this set of
 commands as a group.

 \subsection begin-example Example
--- a/doc_src/break.txt
+++ b/doc_src/break.txt
@@ -8,7 +8,7 @@
 The \c break builtin is used to halt a currently running loop, such as a <a href="#for">for</a> loop or a <a href="#while">while</a> loop. It is usually added inside of a conditional block such as an <a href="#if">if</a> statement or a <a href="#switch">switch</a> statement.

 \subsection break-example Example
-The following code searches all .c files for smurfs, and halts at the first occurance.
+The following code searches all .c files for smurfs, and halts at the first occurrence.
 <p>
 <tt>for i in *.c;
 <br>&nbsp;&nbsp;&nbsp;&nbsp;if grep smurf $i;
--- a/doc_src/case.txt
+++ b/doc_src/case.txt
@@ -23,7 +23,7 @@ switch $animal
        echo evil
    case wolf dog human moose dolphin whale
        echo mammal
-    case duck goose albatros
+    case duck goose albatross
        echo bird
    case shark trout stingray
        echo fish
--- a/doc_src/cd.txt
+++ b/doc_src/cd.txt
@@ -3,10 +3,9 @@
 \subsection cd-synopsis Synopsis
 <tt>cd [DIRECTORY]</tt>

-\subsection cd-description Description
-Changes the current directory. If <tt>DIRECTORY</tt> is supplied it
-will become the new directory. If \c DIRECTORY is a relative path, the
-CDPATH environment variable will be separated using the : as
-separator, and the resulting list will be searched for a suitable new
-current directory. If CDPATH is not set, it is assumed to be '.'. If
-\c DIRECTORY is not specified, \$HOME will be the new directory.
+\subsection cd-description Description Changes the current
+directory. If <tt>DIRECTORY</tt> is supplied it will become the new
+directory. If \c DIRECTORY is a relative path, the paths found in the
+CDPATH environment variable array will be tried as prefixes for the
+specified path. If CDPATH is not set, it is assumed to be '.'. If \c
+DIRECTORY is not specified, \$HOME will be the new directory.
--- a/doc_src/commandline.txt
+++ b/doc_src/commandline.txt
@@ -25,14 +25,14 @@ or updated
 - \c -b or \c --current-buffer select the entire buffer (default)
 - \c -j or \c --current-job select the current job
 - \c -p or \c --current-process select the current process
- \c -t or \c --current_token select the current token. 
+- \c -t or \c --current_token select the current token.

 The following switch changes the way \c commandline prints the current
 commandline

 - \c -c or \c --cut-at-cursor only print selection up until the
  current cursor position
- \c o or \c --tokenize tokenize the selection and print one string-type token per line
+- \c -o or \c --tokenize tokenize the selection and print one string-type token per line

 Other switches

@@ -43,6 +43,10 @@ Other switches
  that they will be returned to the reader before any additional
  actual keypresses are read.

+If commandline is called during a call to complete a given string
+using <code>complete -C STRING</code>, commandline will consider the
+specified string to be the current contents of the commandline.
+
 \subsection commandline-example Example

 <tt>commandline -j $history[3]</tt>
--- a/doc_src/complete.txt
+++ b/doc_src/complete.txt
@@ -1,4 +1,4 @@
-\section complete complete - edit command specific tab-completions. 
+\section complete complete - edit command specific tab-completions.

 \subsection complete-synopsis Synopsis
 <tt>complete (-c|--command|-p|--path) COMMAND [(-s|--short-option) SHORT_OPTION] [(-l|--long-option|-o|--old-option) LONG_OPTION [(-a||--arguments) OPTION_ARGUMENTS] [(-d|--description) DESCRIPTION] </tt>
@@ -14,10 +14,11 @@ the fish manual.
 - <tt>LONG_OPTION</tt> is a multi character option for the command
 - <tt>OPTION_ARGUMENTS</tt> is parameter containing a space-separated list of possible option-arguments, which may contain subshells
 - <tt>DESCRIPTION</tt> is a description of what the option and/or option arguments do
+- <tt>-C STRING</tt> or <tt>--do-complete=STRING</tt> makes complete try to find all possible completions for the specified string
 - <tt>-e</tt> or <tt>--erase</tt> implies that the specified completion should be deleted
 - <tt>-f</tt> or <tt>--no-files</tt> specifies that the option specified by this completion may not be followed by a filename
- <tt>-n</tt> or <tt>--condition</tt> specides a shell command that must return 0 if the completion is to be used. This makes it possible to specify completions that should only be used in some cases.
- <tt>-o</tt> or <tt>--old-option</tt> implies that the command uses old long style options with only one dash 				   
+- <tt>-n</tt> or <tt>--condition</tt> specifies a shell command that must return 0 if the completion is to be used. This makes it possible to specify completions that should only be used in some cases.
+- <tt>-o</tt> or <tt>--old-option</tt> implies that the command uses old long style options with only one dash
 - <tt>-p</tt> or <tt>--path</tt> implies that the string COMMAND is the full path of the command
 - <tt>-r</tt> or <tt>--require-parameter</tt> specifies that the option specified by this completion always must have an option argument, i.e. may not be followed by another option
 - <tt>-u</tt> or <tt>--unauthorative</tt> implies that there may be more options than the ones specified, and that fish should not assume that options not listed are spelling errors
@@ -30,13 +31,14 @@ that do not begin with a hyphen. Fish recognizes three styles of
 options, the same styles as the GNU version of the getopt
 library. These styles are:

- Short options, like '-a'. Short options are a single character long, are preceeded by a single hyphen and may ge grouped together (like '-la', which is equivalent to '-l -a'). Option arguments may be specified in the following parameter ('-w 32') or by appending the option with the value ('-w32').
- Old style long options, like '-Wall'. Old style long options are more than one character long, are preceeded by a single hyphen and may not be grouped together. Option arguments are specified in the following parameter ('-ao null').
- GNU style long options, like '--colors'. GNU style long options are more than one character long, are preceeded by two hyphens, and may not be grouped together. Option arguments may be specified in the following parameter ('--quoting-style shell') or by appending the option with a '=' and the value ('--quoting-style=shell'). GNU style long options may be abbrevated so long as the abbrevation is unique ('--h' is equivalent to '--help' if help is the only long option beginning with an 'h').
+- Short options, like '-a'. Short options are a single character long, are preceded by a single hyphen and may be grouped together (like '-la', which is equivalent to '-l -a'). Option arguments may be specified in the following parameter ('-w 32') or by appending the option with the value ('-w32').
+- Old style long options, like '-Wall'. Old style long options can be more than one character long, are preceded by a single hyphen and may not be grouped together. Option arguments are specified in the following parameter ('-ao null').
+- GNU style long options, like '--colors'. GNU style long options can be more than one character long, are preceded by two hyphens, and may not be grouped together. Option arguments may be specified in the following parameter ('--quoting-style shell') or by appending the option with a '=' and the value ('--quoting-style=shell'). GNU style long options may be abbreviated so long as the abbreviation is unique ('--h' is equivalent to '--help' if help is the only long option beginning with an 'h').

-\c complete only allows one of old style long options and GNU style
-long options to be used on a specific command, but short options can
-always be specified.
+The options for specifying command name, command path, or command
+switches may all be used multiple times to specify multiple commands
+which have the same completion or multiple switches accepted by a
+command.

 When erasing completions, it is possible to either erase all
 completions for a specific command by specifying <tt>complete -e -c
@@ -70,5 +72,5 @@ This can be written as:
 "Don't check dependencies"</tt>

 where \c __fish_contains_opt is a function that checks the commandline
-buffer for the presense of a specified set of options.
+buffer for the presence of a specified set of options.

--- a/doc_src/contains.txt
+++ b/doc_src/contains.txt
@@ -0,0 +1,24 @@
+
+\section contains contains - Test if a word is present in a list
+
+\subsection contains-synopsis Synopsis
+<code>contains [OPTIONS] KEY [VALUES...]</code>
+
+\subsection contains-description Description
+
+- \c -h or \c --help display this message
+
+Test if the set VALUES contains the string KEY. Return status is 0 if
+yes, 1 otherwise
+
+
+\subsection contains-example Example
+<pre>
+for i in ~/bin /usr/local/bin
+	if not contains \$i \$PATH
+		set PATH \$PATH i
+	end
+end
+</pre>
+
+The above code tests if ~/bin and  /usr/local/bin are in the path and if they are not, they are added.
--- a/doc_src/doc.hdr
+++ b/doc_src/doc.hdr
--- a/doc_src/exec.txt
+++ b/doc_src/exec.txt
@@ -7,8 +7,8 @@
 \subsection exec-description Description

 The \c exec builtin is used to replace the currently running shells
-process image with a new command. On sucessfull completion, exec never
-returns. exec can not be used inside a pipeline. 
+process image with a new command. On successful completion, exec never
+returns. exec can not be used inside a pipeline.

 \subsection exec-example Example

--- a/doc_src/fish_pager.txt
+++ b/doc_src/fish_pager.txt
@@ -0,0 +1,9 @@
+
+\section fish_pager fish_pager - Internal command used by fish
+
+\subsection fish_pager-description Description
+
+This command is used internally by fish to display a list of
+completions. It should not be used by other commands, as it's
+interface is liable to change in the future.
+
--- a/doc_src/fishd.txt
+++ b/doc_src/fishd.txt
@@ -2,50 +2,24 @@
 \section fishd fishd - Universal variable daemon

 \subsection fishd-synopsis Synopsis
- <tt>fishd [SECTION]</tt>
+ <tt>fishd [(-h|--help|-v|--version)]</tt>

 \subsection fishd-description Description

 The \c fishd daemon is used to load, save and distribute universal
-variable information. fish automtically connects to fishd via a socket
+variable information. fish automatically connects to fishd via a socket
 on startup. If no instance of fishd is running, fish spawns a new
 fishd instance. fishd will create a socket in /tmp, and wait for
-incoming connections from universal variable clents, such as fish,
+incoming connections from universal variable clients, such as fish,
 When no clients are connected, fishd will automatically shut down.

-\subsection fishd-commands Commands
-
-Fishd works by sending and recieving sommands. Each command is ended
-with a newline. These are the commands supported by fishd:
-
-<pre>set KEY:VALUE
-set_export KEY:VALUE
-</pre>
-
-These commands update the value of a variable. The only difference
-between the two is that <tt>set_export</tt>-variables should be
-exported to children of the process using them. The variable value may
-be escaped using C-style backslash escapes. In fact, this is required
-for newline characters, which would otherwise be interpreted as end of
-command.
-
-<pre>erase KEY
-</pre>
-
-Erase the variable with the specified name.
-
-<pre>barrier
-barrier_reply
-</pre>
-
-A \c barrier command will result in a barrier_reply beeing added to
-the end of the senders queue of unsent messages. These commands are
-used to synchronize clients, since once the reply for a barrier
-message returns, the sender can know that any updates available at the
-time the original barrier request was sent have been recieved.
+- <tt>-h</tt> or <tt>--help</tt> displays this help message and then exits
+- <tt>-v</tt> or <tt>--version</tt> displays the current fish version and then exits

 \subsection fishd-files Files

-~/.fishd.HOSTNAME permenent storage location for universal variale
+~/.fishd.HOSTNAME permanent storage location for universal variable
 data. The data is stored as a set of \c set and \c set_export commands
-such as would be parsed by fishd.
+such as would be parsed by fishd.  If an instance of fishd is running
+(which is generally the case), manual modifications to ~/.fishd.HOSTNAME
+will be lost.
--- a/doc_src/function.txt
+++ b/doc_src/function.txt
@@ -5,22 +5,22 @@

 \subsection function-description Description

- \c -b or \c --key-binding specifies that the function is a key biding. Key binding functions work exactly like regular functions except that they can not be tab-completed, and may contain the '-' character. 
+- \c -b or \c --key-binding specifies that the function is a key biding. Key binding functions work exactly like regular functions except that they can not be tab-completed, and may contain the '-' character.
 - <tt>-d DESCRIPTION</tt> or \c --description=DESCRIPTION is a description of what the function does, suitable as a completion description
 - <tt>-j PID</tt> or <tt> --on-job-exit PID</tt> tells fish to run this function when the job with group id PID exits
 - <tt>-p PID</tt> or <tt> --on-process-exit PID</tt> tells fish to run this function when the fish child process with process id PID exits
- <tt>-s</tt> or <tt>--on-signal SIGSPEC</tt> tells fish to run this function when the signal SIGSPEC is delivered. SIGSPEC can be a singal number, or the signal name, such as SIGHUP (or just HUP)
+- <tt>-s</tt> or <tt>--on-signal SIGSPEC</tt> tells fish to run this function when the signal SIGSPEC is delivered. SIGSPEC can be a signal number, or the signal name, such as SIGHUP (or just HUP)
 - <tt>-v</tt> or <tt>--on-variable VARIABLE_NAME</tt> tells fish to run this function when the variable VARIABLE_NAME changes value

 This builtin command is used to create a new function. A Function is a
 list of commands that will be executed when the name of the function
-is entered. The function 
+is entered. The function

 <pre>
 function hi
 	echo hello
 end
-</pre> 
+</pre>

 will write <tt>hello</tt> whenever the user enters \c hi.

@@ -29,7 +29,7 @@ are inserted into the environment variable <a href="index.html#variables-arrays"

 \subsection function-example Example

-<pre>function ll 
+<pre>function ll
 	ls -l $argv
 end
 </pre>
@@ -39,18 +39,18 @@ will run the \c ls command, using the \c -l option, while passing on any additio
 <pre>
 function mkdir -d "Create a directory and set CWD"
 	mkdir $argv
-	if test $status = 0 
+	if test $status = 0
 		switch $argv[(count $argv)]
 			case '-*'
-				
+
 			case '*'
 				cd $argv[(count $argv)]
 				return
 		end
 	end
 end
-</pre> 
+</pre>

-will run the mkdir command, and if it is succesfull, change the
+will run the mkdir command, and if it is successful, change the
 current working directory to the one just created.

--- a/doc_src/help.txt
+++ b/doc_src/help.txt
@@ -1,5 +1,5 @@

-\section help help - Display fish documantation
+\section help help - Display fish documentation

 \subsection help-synopsis Synopsis
 <tt>help [SECTION]</tt>
--- a/doc_src/jobs.txt
+++ b/doc_src/jobs.txt
@@ -5,14 +5,14 @@

 \subsection jobs-description Description
 The <tt>jobs</tt> builtin causes fish to print a list of the currently
-running jobs and their status. 
+running jobs and their status.

 jobs accepts the following switches:

 - <tt>-c</tt> or <tt>--command</tt> print the command name for each process in jobs
 - <tt>-g</tt> or <tt>--group</tt> only print the group id of each job
 - <tt>-l</tt> or <tt>--last</tt> only the last job to be started is printed
- <tt>-p</tt> or <tt>--process</tt> print the procces id for each process in all jobs
+- <tt>-p</tt> or <tt>--process</tt> print the process id for each process in all jobs

 On systems that supports this feature, jobs will print the CPU usage
 of each job since the last command was executed. The CPU usage is
--- a/doc_src/nextd.txt
+++ b/doc_src/nextd.txt
@@ -1,9 +1,10 @@
 \section nextd nextd

 \subsection nextd-synopsis Synopsis
-<tt>nextd [-l] [pos]</tt>
+<tt>nextd [-l | --list] [pos]</tt>

-\subsection nextd-description Description 
-<tt>nextd</tt> moves forwards <tt>pos</tt> positions in the history of visited directories;
-if the end of the history has been hit, a warning is printed. If the <tt>-l></tt> flag is 
-specified, the current history is also displayed. 
+\subsection nextd-description Description <tt>nextd</tt> moves
+forwards <tt>pos</tt> positions in the history of visited directories;
+if the end of the history has been hit, a warning is printed. If the
+<code>-l></code> or <code>--list</code> flag is specified, the current
+history is also displayed.
--- a/doc_src/prevd.txt
+++ b/doc_src/prevd.txt
@@ -1,9 +1,10 @@
 \section prevd prevd

 \subsection prevd-synopsis Synopsis
-<tt>prevd [-l] [pos]</tt>
+<tt>prevd [-l | --list] [pos]</tt>

-\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, a warning is printed. If the <tt>-l</tt> flag 
-is specified, the current history is also displayed.
+\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, a warning
+is printed. If the <code>-l</code> or <code>--list</code> flag is
+specified, the current history is also displayed.
--- a/doc_src/set.txt
+++ b/doc_src/set.txt
@@ -3,11 +3,11 @@
 \subsection set-synopsis Synopsis
 <code>set [OPTIONS] [VARIABLE_NAME [VALUES...]]</code>

-The <code>set</code> builtin causes fish to assign the variable <code>VARIABLE_NAME</code> the values <code>VALUES...</code>. 
+The <code>set</code> builtin causes fish to assign the variable <code>VARIABLE_NAME</code> the values <code>VALUES...</code>.

 \subsection set-description Description
 - <code>-e</code> or <code>--erase</code> causes the specified environment variable to be erased
- <code>-g</code> or <code>--global</code> causes the specified environment variable to be made global. If this option is not supplied, the specified variable will dissapear when the current block ends
+- <code>-g</code> or <code>--global</code> causes the specified environment variable to be made global. If this option is not supplied, the specified variable will disappear when the current block ends
 - <code>-l</code> or <code>--local</code> forces the specified environment variable to be made local to the current block, even if the variable already exists and is non-local
 - <code>-n</code> or <code>--names</code> List only the names of all defined variables
 - <code>-q</code> or <code>--query</code> test if the specified variable names are defined. Does not output anything, but the builtins exit status is the number of variables specified that were not defined.
@@ -18,7 +18,7 @@ The <code>set</code> builtin causes fish to assign the variable <code>VARIABLE_N
 If set is called with no arguments, the names and values of all
 environment variables are printed. If some of the scope or export
 flags have been given, only the variables matching the specified scope
-are printed. 
+are printed.

 If the \c -e or \c --erase option is specified, the variable
 specified by the following arguments will be erased
@@ -27,8 +27,14 @@ If a variable is set to more than one value, the variable will be an
 array with the specified elements. If a variable is set to zero
 elements, it will become an array with zero elements.

-If the variable name is one or more array elements, such as <code>PATH[1
-3 7]</code>, only those array elements specified will be changed.
+If the variable name is one or more array elements, such as
+<code>PATH[1 3 7]</code>, only those array elements specified will be
+changed.
+
+The set command requires all switch arguments to come before any
+non-switch arguments. For example, <code>set flags -l</code> will have
+the effect of setting the value of the variable <code>flags</code> to
+'-l', not making the variable local.

 \subsection set-example Example

--- a/doc_src/set_color.txt
+++ b/doc_src/set_color.txt
@@ -20,3 +20,8 @@ purple, cyan, white and normal.
 Calling <tt>set_color normal</tt> will set the terminal color to
 whatever is the default color of the terminal.

+Some terminals use the --bold escape sequence to switch to a brighter
+color set. On such terminals, <code>set_color white</code> will result
+in a grey font color, while <code>set_color --bold white</code> will
+result in a white font color.
+
--- a/doc_src/status.txt
+++ b/doc_src/status.txt
@@ -5,7 +5,7 @@
 <tt>status [OPTION]</tt>

 \subsection status-description Description
- <tt>-c</tt> or <tt>--is-command-substitution</tt> returns 0 if fish is currently executing a command usbstitution
+- <tt>-c</tt> or <tt>--is-command-substitution</tt> returns 0 if fish is currently executing a command substitution
 - <tt>-b</tt> or <tt>--is-block</tt> returns 0 if fish is currently executing a block of code
 - <tt>-i</tt> or <tt>--is-interactive</tt> returns 0 if fish is interactive, i.e.connected to a keyboard
- <tt>-l</tt> or <tt>--is-login</tt> returns 0 if fish is a login shell, i.e. if fish should perform login tasks such as setting up the PATH. 
+- <tt>-l</tt> or <tt>--is-login</tt> returns 0 if fish is a login shell, i.e. if fish should perform login tasks such as setting up the PATH.
--- a/doc_src/switch.txt
+++ b/doc_src/switch.txt
@@ -12,7 +12,7 @@ wildcarded values.

 \subsection switch-example Example

-If the variable \$animal contins the name of an animal, the
+If the variable \$animal contains the name of an animal, the
 following code would attempt to classify it:

 <p>
@@ -22,7 +22,7 @@ switch $animal
        echo evil
    case wolf dog human moose dolphin whale
        echo mammal
-    case duck goose albatros
+    case duck goose albatross
        echo bird
    case shark trout stingray
        echo fish
@@ -32,6 +32,6 @@ end
 <p>

 If the above code was run with \$animal set to \c whale, the output
-would be \c mammal.  
+would be \c mammal.

 </p>
--- a/doc_src/trap.txt
+++ b/doc_src/trap.txt
@@ -1,5 +1,5 @@

-\section trap trap - perform an action when the shell recives a signal
+\section trap trap - perform an action when the shell receives a signal

 \subsection trap-synopsis Synopsis
 <tt>trap [OPTIONS] [[ARG] SIGSPEC ... ]</tt>
@@ -8,10 +8,10 @@

 Trap is a shellscript wrapper around the fish event delivery
 framework. IT is defined for backwards compatibility reasons. For
-other uses, it is recomended to define a <a
+other uses, it is recommended to define a <a
 href='index.html#event'>event handler</a>.

- ARG is the command to be executed on signal delivary
+- ARG is the command to be executed on signal delivery
 - SIGSPEC is the name of the signal to trap
 - \c -h or \c --help Display help and exit
 - \c -l or \c --list-signals print a list of signal names
--- a/doc_src/type.txt
+++ b/doc_src/type.txt
@@ -6,11 +6,11 @@

 \subsection type-description Description

-With no options, indicate how each name would be interpreted if used as a command name.  
+With no options, indicate how each name would be interpreted if used as a command name.

 - \c -h or \c --help print this message
 - \c -a or \c --all print all of possible definitions of the specified names
- \c -f or \c --no-functions supresses function and builtin lookup
+- \c -f or \c --no-functions suppresses function and builtin lookup
 - \c -t or \c --type print a string which is one of alias, keyword, function, builtin, or file if name is an alias, shell reserved word, function, builtin, or disk file, respectively
 - \c -p or \c --path either return the name of the disk file that would be executed if name were specified as a command name, or nothing if 'type  -t  name' would  not  return 'file'
 - \c -P or \c --force-path either return the name of the disk file that would be executed if name were specified as a command name, or nothing no file with the specified name could be found in the PATH
--- a/doc_src/ulimit.txt
+++ b/doc_src/ulimit.txt
@@ -1,5 +1,5 @@

-\section ulimit ulimit - Set or get the shells resurce usage limits
+\section ulimit ulimit - Set or get the shells resource usage limits

 \subsection ulimit-synopsis Synopsis
 <tt>ulimit [OPTIONS] [LIMIT]</tt>
@@ -38,7 +38,7 @@ except for -t, which is in seconds and -n and -u, which are unscaled
 values. The return status is 0 unless an invalid option or argument is
 supplied, or an error occurs while setting a new limit.

-The fish implementation of ulimit should behave identically to the implementation in bash, except for these differences: 
+The fish implementation of ulimit should behave identically to the implementation in bash, except for these differences:

 - Fish ulimit supports GNU-style long options for all switches
 - Fish ulimit does not support the -p option for getting the pipe size. The bash implementation consists of a compile-time check that empirically guesses this number by writing to a pipe and waiting for SIGPIPE.
--- a/doc_src/umask.txt
+++ b/doc_src/umask.txt
@@ -1,5 +1,5 @@

-\section umask umask - Set or get the shells resurce usage limits
+\section umask umask - Set or get the shells resource usage limits

 \subsection umask-synopsis Synopsis
 <code>umask [OPTIONS] [MASK]</code>
@@ -10,7 +10,7 @@ With no argument, the current file-creation mask is printed, if an
 argument is specified, it is the new file creation mask. The mask may
 be specified as an octal number, in which case it is interpreted as
 the rights that should be masked away, i.e. it is the inverse of the
-file permissions any new files will have. 
+file permissions any new files will have.

 If a symbolic mask is specified, the actual file permission bits, and
 not the inverse, should be specified. A symbolic mask is a comma
@@ -19,7 +19,7 @@ separated list of rights. Each right consists of three parts:
 - The first part specifies to whom this set of right applies, and can
 be one of \c u, \c g, \c o or \c a, where \c u specifies the user who
 owns the file, \c g specifies the group owner of the file, \c o
-specifiec other users rights and \c a specifies all three should be
+specific other users rights and \c a specifies all three should be
 changed.
 - The second part of a right specifies the mode, and can be one of \c
 =, \c + or \c -, where \c = specifies that the rights should be set to
@@ -27,7 +27,7 @@ the new value, \c + specifies that the specified right should be added
 to those previously specified and \c - specifies that the specified
 rights should be removed from those previously specified.
 - The third part of a right specifies what rights should be changed
-and can be any compination of \c r, \c w and \c x, representing
+and can be any combination of \c r, \c w and \c x, representing
 read, write and execute rights.

 If the first and second parts are skipped, they are assumed to be \c a
--- a/env.c
+++ b/env.c
@@ -25,10 +25,18 @@
 #include <termio.h>
 #endif

+#if HAVE_TERM_H
 #include <term.h>
+#elif HAVE_NCURSES_TERM_H
+#include <ncurses/term.h>
+#endif
+
 #include <errno.h>

+
+#include "fallback.h"
 #include "util.h"
+
 #include "wutil.h"
 #include "proc.h"
 #include "common.h"
@@ -143,19 +151,6 @@ static buffer_t export_buffer;
 */
 static int has_changed = 1;

-/**
-   Free hash key and hash value
-*/
-static void clear_hash_entry( const void *key, const void *data )
-{
-	var_entry_t *entry = (var_entry_t *)data;	
-	if( entry->export )
-		has_changed = 1;
-	
-	free( (void *)key );
-	free( (void *)data );
-}
-
 /**
   This stringbuffer is used to store the value of dynamically
   generated variables, such as history.
@@ -173,6 +168,36 @@ static int get_names_show_exported;
 */
 static int get_names_show_unexported;

+/**
+   List of all locale variable names
+*/
+static const wchar_t *locale_variable[] =
+{
+	L"LANG",
+	L"LC_ALL",
+	L"LC_COLLATE",
+	L"LC_CTYPE",
+	L"LC_MESSAGES",
+	L"LC_MONETARY",
+	L"LC_NUMERIC",
+	L"LC_TIME",
+	(void *)0
+}
+	;
+
+/**
+   Free hash key and hash value
+*/
+static void clear_hash_entry( const void *key, const void *data )
+{
+	var_entry_t *entry = (var_entry_t *)data;	
+	if( entry->export )
+		has_changed = 1;
+	
+	free( (void *)key );
+	free( (void *)data );
+}
+
 /**
   When fishd isn't started, this function is provided to
   env_universal as a callback, it tries to start up fishd. It's
@@ -184,7 +209,7 @@ static void start_fishd()
 {
 	string_buffer_t cmd;
 	struct passwd *pw;
-		
+	
 	sb_init( &cmd );
 	pw = getpwuid(getuid());
 	
@@ -215,15 +240,6 @@ static mode_t get_umask()
 	return res;
 }

-/**
-   List of all locale variable names
-*/
-static const wchar_t *locale_variable[] =
-{
-	L"LANG", L"LC_ALL", L"LC_COLLATE", L"LC_CTYPE", L"LC_MESSAGES", L"LC_MONETARY", L"LC_NUMERIC", L"LC_TIME", (void *)0
-}
-	;
-
 /**
   Checks if the specified variable is a locale variable
 */
@@ -251,7 +267,14 @@ static void handle_locale()
 	*/
 	static const int cat[] = 
 		{
-			0, LC_ALL, LC_COLLATE, LC_CTYPE, LC_MESSAGES, LC_MONETARY, LC_NUMERIC, LC_TIME
+			0, 
+			LC_ALL, 
+			LC_COLLATE,
+			LC_CTYPE,
+			LC_MESSAGES,
+			LC_MONETARY,
+			LC_NUMERIC,
+			LC_TIME
 		}
 	;
 	
@@ -277,18 +300,23 @@ static void handle_locale()
 	
 	if( wcscmp( wsetlocale( LC_MESSAGES, (void *)0 ), old ) != 0 )
 	{
-		/* Make change known to gettext.  */
+
+		/* Try to make change known to gettext.  */
+#ifdef HAVE__NL_MSG_CAT_CNTR
 		{
-			extern int  _nl_msg_cat_cntr;
+			extern int _nl_msg_cat_cntr;
 			++_nl_msg_cat_cntr;
-		}			
-		
+		}
+#elif HAVE_DCGETTEXT
+		dcgettext("fish","Changing language to English",LC_MESSAGES);
+#endif		
+
 		if( is_interactive )
 		{
 			complete_destroy();
 			complete_init();
 			
-			debug( 0, _(L"Changing language to english") );
+			debug( 0, _(L"Changing language to English") );
 		}
 	}
 	free( old );
@@ -339,22 +367,99 @@ static void universal_callback( int type,
 	}
 }

+/**
+   Make sure the PATH variable contains the essaential directories
+*/
+static void setup_path()
+{
+	wchar_t *path;
+	
+	int i, j;
+	array_list_t l;
+
+	const wchar_t *path_el[] = 
+		{
+			L"/bin",
+			L"/usr/bin",
+			PREFIX L"/bin",
+			0
+		}
+	;
+
+	path = env_get( L"PATH" );
+	if( !path )
+	{
+		env_set( L"PATH", 0, ENV_EXPORT | ENV_GLOBAL );
+		path=0;
+	}	
+		
+	al_init( &l );
+	
+	if( path )
+		expand_variable_array( path, &l );
+	
+	for( j=0; path_el[j]; j++ )
+	{
+		int has_el=0;
+		
+		for( i=0; i<al_get_count( &l); i++ )
+		{
+			wchar_t * el = (wchar_t *)al_get( &l, i );
+			size_t len = wcslen( el );
+			while( (len > 0) && (el[len-1]==L'/') )
+				len--;
+			if( (wcslen( path_el[j] ) == len) && (wcsncmp( el, path_el[j], len)==0) )
+			{
+				has_el = 1;
+			}
+		}
+		
+		if( !has_el )
+		{
+			string_buffer_t b;
+
+			debug( 3, L"directory %ls was missing", path_el[j] );
+
+			sb_init( &b );
+			if( path )
+			{
+				sb_append( &b, path );
+			}
+			
+			sb_append2( &b,
+						ARRAY_SEP_STR,
+						path_el[j],
+						(void *)0 );
+			
+			env_set( L"PATH", (wchar_t *)b.buff, ENV_GLOBAL | ENV_EXPORT );
+			
+			sb_destroy( &b );
+			
+			al_foreach( &l, (void (*)(const void *))&free );
+			path = env_get( L"PATH" );
+			al_truncate( &l, 0 );
+			expand_variable_array( path, &l );			
+		}
+	}
+	
+	al_foreach( &l, (void (*)(const void *))&free );
+	al_destroy( &l );
+}
+
 void env_init()
 {
 	char **p;
 	struct passwd *pw;
-	wchar_t *uname, *path;
+	wchar_t *uname;

 	sb_init( &dyn_var );
-
 	b_init( &export_buffer );
 	
-	
 	/*
 	  These variables can not be altered directly by the user
 	*/
 	hash_init( &env_read_only, &hash_wcs_func, &hash_wcs_cmp );
-
+	
 	hash_put( &env_read_only, L"status", L"" );
 	hash_put( &env_read_only, L"history", L"" );
 	hash_put( &env_read_only, L"_", L"" );
@@ -387,6 +492,11 @@ void env_init()
 	hash_init( &top->env, &hash_wcs_func, &hash_wcs_cmp );
 	global_env = top;
 	global = &top->env;	
+
+	/*
+	  Now the environemnt variable handling is set up, the next step
+	  is to insert valid data
+	*/
 	
 	/*
 	  Import environment variables
@@ -424,77 +534,14 @@ void env_init()
 		free(key);
 	}

-	path = env_get( L"PATH" );
-	if( !path )
-	{
-		env_set( L"PATH", L"/bin" ARRAY_SEP_STR L"/usr/bin", ENV_EXPORT | ENV_GLOBAL );
-		path = env_get( L"PATH" );
-	}
-	else
-	{
-		int i, j;
-		array_list_t l;
-		
-		al_init( &l );
-		expand_variable_array( path, &l );
+	/*
+	  Set up the PATH variable
+	*/
+	setup_path();

-		debug( 3, L"PATH is %ls", path );
-		
-		
-		const wchar_t *path_el[] = 
-			{
-				L"/bin",
-				L"/usr/bin",
-				PREFIX L"/bin",
-				0
-			}
-		;
-		
-		for( j=0; path_el[j]; j++ )
-		{
-			int has_el=0;
-
-			debug( 3, L"Check directory %ls", path_el[j] );
-		
-			
-			for( i=0; i<al_get_count( &l); i++ )
-			{
-				wchar_t * el = (wchar_t *)al_get( &l, i );
-				size_t len = wcslen( el );
-				while( (len > 0) && (el[len-1]==L'/') )
-					len--;
-				if( (wcslen( path_el[j] ) == len) && (wcsncmp( el, path_el[j], len)==0) )
-				{
-					has_el = 1;
-				}
-			}
-			
-			if( !has_el )
-			{
-				string_buffer_t b;
-				debug( 3, L"directory %ls was missing", path_el[j] );
-				sb_init( &b );
-				sb_append2( &b, path,
-							ARRAY_SEP_STR,
-							path_el[j],
-							(void *)0 );
-								
-				env_set( L"PATH", (wchar_t *)b.buff, ENV_GLOBAL | ENV_EXPORT );
-				sb_destroy( &b );
-				path = env_get( L"PATH" );
-				
-			}
-		}
-		
-		debug( 3, L"After: PATH is %ls", path );
-
-		al_foreach( &l, (void (*)(const void *))&free );
-		al_destroy( &l );
-		
-	}
-	
-	
-	
+	/*
+	  Set up the USER variable
+	*/
 	pw = getpwuid( getuid() );
 	if( pw )
 	{
@@ -609,7 +656,7 @@ void env_set( const wchar_t *key,
 	/*
 	  Zero element arrays are internaly not coded as null but as this placeholder string
 	*/
-	if( !val && ( var_mode & ENV_USER ) )
+	if( !val )
 	{
 		val = ENV_NULL;
 	}
@@ -696,7 +743,8 @@ void env_set( const wchar_t *key,
 				else
 				{
 					/*
-					  New variable with unspecified scope. The default scope is the innermost scope that is shadowing
+					  New variable with unspecified scope. The default
+					  scope is the innermost scope that is shadowing
 					*/
 					node = top;
 					while( node->next && !node->new_scope )
@@ -765,8 +813,6 @@ void env_set( const wchar_t *key,
 }


-
-
 /**
   Attempt to remove/free the specified key/value pair from the
   specified hash table.
@@ -774,14 +820,19 @@ void env_set( const wchar_t *key,
 static int try_remove( env_node_t *n,
 					   const wchar_t *key )
 {
+	const void *old_key_void, *old_val_void;
 	wchar_t *old_key, *old_val;
 	if( n == 0 )
 		return 0;

 	hash_remove( &n->env, 
 				 key,
-				 (const void **)&old_key, 
-				 (const void **)&old_val );
+				 &old_key_void, 
+				 &old_val_void );
+
+	old_key = (wchar_t *)old_key_void;
+	old_val = (wchar_t *)old_val_void;
+	
 	if( old_key != 0 )
 	{
 		var_entry_t * v = (var_entry_t *)old_val;
@@ -846,7 +897,10 @@ wchar_t *env_get( const wchar_t *key )
 			wchar_t *next = history_get( i-add_current );
 			if( !next )
 			{
-				debug( 1, _( L"No history item at index %d\n" ), i );
+				/*
+				  This is not an error - it simply means the user has
+				  a short history
+				*/
 				break;
 			}
 			
@@ -1038,7 +1092,9 @@ static void add_key_to_hash( const void *key,
 	var_entry_t *e = (var_entry_t *)data;
 	if( ( e->export && get_names_show_exported) || 
 		( !e->export && get_names_show_unexported) )
+	{
 		hash_put( (hash_table_t *)aux, key, 0 );
+	}
 }

 /**
--- a/env_universal.c
+++ b/env_universal.c
@@ -1,5 +1,6 @@
 #include "config.h"

+
 #include <stdlib.h>
 #include <stdio.h>
 #include <wchar.h>
@@ -11,15 +12,24 @@
 #include <pwd.h>
 #include <errno.h>
 #include <fcntl.h>
+
 #if HAVE_NCURSES_H
 #include <ncurses.h>
 #else
 #include <curses.h>
 #endif
+
+#if HAVE_TERM_H
 #include <term.h>
+#elif HAVE_NCURSES_TERM_H
+#include <ncurses/term.h>
+#endif
+
 #include <signal.h>

+#include "fallback.h"
 #include "util.h"
+
 #include "common.h"
 #include "wutil.h"
 #include "env_universal_common.h"
@@ -207,7 +217,7 @@ void env_universal_init( wchar_t * p,
 						 void (*sf)(),
 						 void (*cb)( int type, const wchar_t *name, const wchar_t *val ))
 {
-	debug( 2, L"env_universal_init()" );
+	debug( 3, L"env_universal_init()" );
 	path=p;
 	user=u;
 	start_fishd=sf;	
@@ -226,7 +236,7 @@ void env_universal_init( wchar_t * p,
 	{
 		env_universal_barrier();
 	}
-	debug( 2, L"end env_universal_init()" );
+	debug( 3, L"end env_universal_init()" );
 }

 void env_universal_destroy()
--- a/env_universal_common.c
+++ b/env_universal_common.c
@@ -5,6 +5,9 @@
   client library and by the daemon.

 */
+#include "config.h"
+
+
 #include <stdlib.h>
 #include <stdio.h>
 #include <wchar.h>
@@ -25,7 +28,9 @@
 #include <signal.h>
 #include <sys/stat.h>

+#include "fallback.h"
 #include "util.h"
+
 #include "common.h"
 #include "wutil.h"
 #include "env_universal_common.h"
@@ -103,7 +108,7 @@ static int get_names_show_unexported;

 void env_universal_common_init( void (*cb)(int type, const wchar_t *key, const wchar_t *val ) )
 {
-	debug( 2, L"Init env_universal_common" );
+	debug( 3, L"Init env_universal_common" );
 	callback = cb;
 	hash_init( &env_universal_var, &hash_wcs_func, &hash_wcs_cmp );
 }
@@ -186,7 +191,7 @@ void read_message( connection_t *src )
 			}
 			else
 			{
-				sb_printf( &src->input, L"%lc", res );
+				sb_append_char( &src->input, res );
 			}
 		}
 	}
@@ -227,7 +232,7 @@ static int match( const wchar_t *msg, const wchar_t *cmd )
 static void parse_message( wchar_t *msg, 
 						   connection_t *src )
 {
-	debug( 2, L"parse_message( %ls );", msg );
+	debug( 3, L"parse_message( %ls );", msg );
 	
 	if( msg[0] == L'#' )
 		return;
--- a/etc/fish.in
+++ b/etc/fish.in
@@ -0,0 +1,71 @@
+#
+# Init file for fish
+#
+# @configure_input@
+
+#
+# Set default search paths for completions and shellscript functions
+#
+
+set -g fish_function_path ~/.fish.d/functions    @SYSCONFDIR@/fish.d/functions    @DATADIR@/fish/functions 
+set -g fish_complete_path ~/.fish.d/completions  @SYSCONFDIR@/fish.d/completions  @DATADIR@/fish/completions 
+
+#
+# Set default field separators
+#
+
+set -g IFS \ \t\n
+
+#
+# Some things should only be done for login terminals
+#
+
+if status --is-login
+
+	#
+	# Set some value for LANG if nothing was set before, and this is a
+	# login shell.
+	#
+
+	if not set -q LANG >/dev/null
+		set -gx LANG en_US.UTF-8
+	end
+
+	# Check for i18n information in
+	# /etc/sysconfig/i18n
+
+	if test -f /etc/sysconfig/i18n
+		eval (cat /etc/sysconfig/i18n |sed -ne 's/^\([a-zA-Z]*\)=\(.*\)$/set -gx \1 \2;/p')
+	end
+
+	#
+	# Put linux consoles in unicode mode.
+	#
+
+	if expr "$LANG" : ".*\.[Uu][Tt][Ff].*" >/dev/null
+		if test "$TERM" = linux
+			if which unicode_start >/dev/null
+				unicode_start
+			end
+		end
+	end
+end
+
+#
+# There are variables that contain colons that are not arrays. This 
+# reverts them back to regular strings.
+#
+
+for i in DISPLAY
+	if set -q $i
+		set -- $i (printf ":%s" $$i|cut -c 2-)
+	end
+end
+
+#
+# Load additional initialization files
+#
+
+for i in fish.d/*.fish
+	. $i
+end
--- a/init/fish_inputrc
+++ b/init/fish_inputrc
--- a/etc/fish_interactive.fish.in
+++ b/etc/fish_interactive.fish.in
@@ -0,0 +1,106 @@
+#
+# Initializations that should only be performed when in interactive mode
+#
+# @configure_input@
+
+if not status --is-interactive
+	exit
+end
+
+#
+# Print a greeting 
+#
+
+printf (_ 'Welcome to fish, the friendly interactive shell\n')
+printf (_ 'Type %shelp%s for instructions on how to use fish\n') (set_color green) (set_color normal)
+
+#
+# Set exit message
+#
+
+function fish_on_exit -d (_ "Commands to execute when fish exits") --on-process %self
+	printf (_ "Good bye\n")
+end
+
+#
+# Set INPUTRC to something nice
+#
+# We override INPUTRC if already set, since it may be set by a shell 
+# other than fish, which may use a different file. The new value should
+# be exported, since the fish inputrc file plays nice with other files 
+# by including them when found.
+# Give priority to the default file installed with fish in 
+# @SYSCONFDIR@/fish_inputrc.
+#
+
+for i in ~/.fish_inputrc @SYSCONFDIR@/fish_inputrc ~/.inputrc /etc/inputrc
+	if test -f $i
+		set -xg INPUTRC $i
+		break
+	end
+end
+
+
+#
+# Set various defaults using these throwaway functions
+#
+
+function set_default -d "Set an universal variable, unless it has already been set"
+	if not set -q $argv[1]
+		set -U -- $argv	
+	end
+	if not set -q $argv[1]
+		set -g -- $argv	
+	end
+end
+
+function set_exported_default -d "Set an exported universal variable, unless it has already been set"
+	if not set -q $argv[1]
+		set -Ux -- $argv	
+	end
+	if not set -q $argv[1]
+		set -gx -- $argv	
+	end
+end
+
+
+# Regular syntax highlighting colors
+set_default fish_color_normal normal
+set_default fish_color_command green
+set_default fish_color_redirection normal
+set_default fish_color_comment brown
+set_default fish_color_error red
+
+set_default fish_color_cwd green
+
+# Background color for matching quotes and parenthesis
+set_default fish_color_match cyan
+
+# Background color for search matches
+set_default fish_color_search_match purple
+
+# Pager colors
+set_default fish_pager_color_prefix cyan
+set_default fish_pager_color_completion normal
+set_default fish_pager_color_description normal
+set_default fish_pager_color_progress cyan
+
+#
+# Directory history colors
+#
+
+set_default fish_color_history_current cyan
+
+
+#
+# Setup the CDPATH variable
+#
+
+set_default CDPATH . ~
+
+#
+# Remove temporary functions for setting default variable values
+#
+
+functions -e set_exported_default
+functions -e set_default
--- a/event.c
+++ b/event.c
@@ -12,7 +12,11 @@
 #include <string.h>

 #include "config.h"
+
+#include "fallback.h"
 #include "util.h"
+
+#include "wutil.h"
 #include "function.h"
 #include "proc.h"
 #include "parser.h"
@@ -20,6 +24,7 @@
 #include "event.h"
 #include "signal.h"
 #include "translate.h"
+#include "halloc_util.h"

 /**
   Number of signals that can be queued before an overflow occurs
@@ -73,11 +78,15 @@ static array_list_t *killme;
 */
 static array_list_t *blocked;

+/**
+   String buffer used for formating event descriptions in event_get_desc()
+*/
+static string_buffer_t *get_desc_buff=0;

 /**
   Tests if one event instance matches the definition of a event
-   class. If the class defines a function name, that will also be a
-   match criterion.
+   class. If both the class and the instance name a function,
+   they must name the same function.

 */
 static int event_match( event_t *class, event_t *instance )
@@ -154,7 +163,9 @@ static event_t *event_copy( event_t *event, int copy_arguments )
 	return e;
 }

-
+/**
+   Test if specified event is blocked
+*/
 static int event_is_blocked( event_t *e )
 {
 	block_t *block;
@@ -183,6 +194,60 @@ static int event_is_blocked( event_t *e )
 	return 0;
 }

+const wchar_t *event_get_desc( event_t *e )
+{
+	if( !get_desc_buff )
+	{
+		get_desc_buff=sb_halloc( global_context );
+	}
+	else
+	{
+		sb_clear( get_desc_buff );
+	}
+	
+	switch( e->type )
+	{
+		
+		case EVENT_SIGNAL:
+			sb_printf( get_desc_buff, _(L"signal handler for %ls (%ls)"), sig2wcs(e->param1.signal ), signal_get_desc( e->param1.signal ) );
+			break;
+		
+		case EVENT_VARIABLE:
+			sb_printf( get_desc_buff, _(L"handler for variable '%ls'"), e->param1.variable );
+			break;
+		
+		case EVENT_EXIT:
+			if( e->param1.pid > 0 )
+			{
+				sb_printf( get_desc_buff, _(L"exit handler for process %d"), e->param1.pid );
+			}
+			else
+			{
+				job_t *j = job_get_from_pid( -e->param1.pid );
+				if( j )
+					sb_printf( get_desc_buff, _(L"exit handler for job %d, '%ls'"), j->job_id, j->command );
+				else
+					sb_printf( get_desc_buff, _(L"exit handler for job with process group %d"), -e->param1.pid );
+			}
+			
+			break;
+		
+		case EVENT_JOB_ID:
+		{
+			job_t *j = job_get( e->param1.job_id );
+			if( j )
+				sb_printf( get_desc_buff, _(L"exit handler for job %d, '%ls'"), j->job_id, j->command );
+			else
+				sb_printf( get_desc_buff, _(L"exit handler for job with job id %d"), j->job_id );
+
+			break;
+		}
+		
+	}
+	
+	return (const wchar_t *)get_desc_buff->buff;
+}
+

 void event_add_handler( event_t *event )
 {
@@ -191,7 +256,7 @@ void event_add_handler( event_t *event )
 	e = event_copy( event, 0 );

 	if( !events )
-		events = al_new();	
+		events = al_new();

 	if( e->type == EVENT_SIGNAL )
 	{
@@ -323,9 +388,6 @@ static void event_fire_internal( event_t *event )
 	int i, j;
 	string_buffer_t *b=0;
 	array_list_t *fire=0;
-
-	int was_subshell = is_subshell;
-//	int was_interactive = is_interactive;
 	
 	/*
 	  First we free all events that have been removed
@@ -389,7 +451,7 @@ static void event_fire_internal( event_t *event )
 		
 		for( j=0; j<al_get_count(&event->arguments); j++ )
 		{
-			wchar_t *arg_esc = escape( (wchar_t *)al_get( &event->arguments, j), 0 );		
+			wchar_t *arg_esc = escape( (wchar_t *)al_get( &event->arguments, j), 1 );		
 			sb_append( b, L" " );
 			sb_append( b, arg_esc );
 			free( arg_esc );				
@@ -401,18 +463,14 @@ static void event_fire_internal( event_t *event )
 		  Event handlers are not part of the main flow of code, so
 		  they are marked as non-interactive and as a subshell
 		*/
-		is_subshell=1;
-//		is_interactive=0;		
+		proc_push_interactive(0);
+		parser_push_block( EVENT );
+		current_block->param1.event = event;
 		eval( (wchar_t *)b->buff, 0, TOP );
-		
+		parser_pop_block();
+		proc_pop_interactive();					
 	}

-	/*
-	  Restore interactivity flags
-	*/
-	is_subshell = was_subshell;
-//	is_interactive = was_interactive;
-
 	if( b )
 	{
 		sb_destroy( b );
@@ -531,7 +589,6 @@ void event_fire( event_t *event )
 			sig_list[active_list].signal[sig_list[active_list].count++]=event->param1.signal;
 		else
 			sig_list[active_list].overflow=1;
-		
 	}
 	else
 	{
@@ -565,6 +622,7 @@ void event_init()

 void event_destroy()
 {
+
 	if( events )
 	{
 		al_foreach( events, (void (*)(const void *))&event_free );
@@ -572,6 +630,7 @@ void event_destroy()
 		free( events );		
 		events=0;
 	}
+
 	if( killme )
 	{
 		al_foreach( killme, (void (*)(const void *))&event_free );
--- a/event.h
+++ b/event.h
@@ -112,7 +112,6 @@ int event_get( event_t *criterion, array_list_t *out );
   dispatched.

   \param event the specific event whose handlers should fire
-   \param arguments the argument string to send to the event handler function
 */
 void event_fire( event_t *event );

@@ -131,4 +130,10 @@ void event_destroy();
 */
 void event_free( event_t *e );

+/**
+   Returns a string describing the specified event. The string should
+   not be freed.
+*/
+const wchar_t *event_get_desc( event_t *e );
+
 #endif
--- a/exec.c
+++ b/exec.c
@@ -22,7 +22,10 @@
 #include <dirent.h>

 #include "config.h"
+
+#include "fallback.h"
 #include "util.h"
+
 #include "common.h"
 #include "wutil.h"
 #include "proc.h"
@@ -37,6 +40,9 @@
 #include "signal.h"
 #include "env_universal.h"
 #include "translate.h"
+#include "halloc.h"
+#include "halloc_util.h"
+#include "parse_util.h"

 /**
   Prototype for the getpgid library function. The prototype for this
@@ -67,6 +73,8 @@ pid_t getpgid( pid_t pid );
 */
 static array_list_t *open_fds=0;

+static int set_child_group( job_t *j, process_t *p, int print_errors );
+

 void exec_close( int fd )
 {
@@ -238,7 +246,7 @@ void free_fd( io_data_t *io, int fd )
   \param io the list of IO redirections for the child
   \param exit_on_error whether to call exit() on errors

-   \return 1 on sucess, 0 on failiure
+   \return 0 on sucess, -1 on failiure
 */
 static int handle_child_io( io_data_t *io, int exit_on_error )
 {
@@ -257,7 +265,7 @@ static int handle_child_io( io_data_t *io, int exit_on_error )
 		if( io->fd > 2 )
 		{
 			/*
-			  Make sure the fd used by this redirection is not used by i.e. a pipe. 
+			  Make sure the fd used by this redirection is not used by e.g. a pipe. 
 			*/
 			free_fd( io, io->fd );
 		}
@@ -283,7 +291,7 @@ static int handle_child_io( io_data_t *io, int exit_on_error )
 					}
 					else
 					{
-						return 0;
+						return -1;
 					}					
 				}				
 				else if( tmp != io->fd)
@@ -302,7 +310,7 @@ static int handle_child_io( io_data_t *io, int exit_on_error )
 						}
 						else
 						{
-							return 0;
+							return -1;
 						}
 					}
 					exec_close( tmp );
@@ -326,7 +334,7 @@ static int handle_child_io( io_data_t *io, int exit_on_error )
 					}
 					else
 					{
-						return 0;
+						return -1;
 					}
 				}
 				break;
@@ -349,7 +357,7 @@ static int handle_child_io( io_data_t *io, int exit_on_error )
 					}
 					else
 					{
-						return 0;
+						return -1;
 					}					

 				}
@@ -373,7 +381,7 @@ static int handle_child_io( io_data_t *io, int exit_on_error )
 	if( env_universal_server.fd >= 0 )
 		exec_close( env_universal_server.fd );

-	return 1;
+	return 0;
 	
 }

@@ -385,43 +393,26 @@ static int handle_child_io( io_data_t *io, int exit_on_error )
   IO redirections and other file descriptor actions are performed.

   \param j the job to set up the IO for
-   \param exit_on_error whether to call exit() on errors
+   \param p the child process to set up

-   \return 1 on sucess, 0 on failiure
+   \return 0 on sucess, -1 on failiure
 */
 static int setup_child_process( job_t *j, process_t *p )
 {
-	int res;
+	int res=0;
 	
-	if( is_interactive  && p->type==EXTERNAL )
-    {
-		pid_t pid;
-		/* 
-		   Put the process into the process group and give the process
-		   group the terminal, if appropriate.  This has to be done
-		   both by the shell and in the individual child processes
-		   because of potential race conditions.
-		*/
-		pid = getpid ();
-		if (j->pgid == 0)
-			j->pgid = pid;
-
-		/* Wait till shell puts os in our own group */
-		while( getpgrp() != j->pgid )
-			sleep(0);
-		
-		/* Wait till shell gives us stdin */
-		if ( j->fg )
-		{
-			while( tcgetpgrp( 0 ) != j->pgid )
-				sleep(0);
-		}
+	if( p )
+	{
+		res = set_child_group( j, p, 1 );
+	}
+	
+	if( !res )	
+	{
+		res = handle_child_io( j->io, (p!=0) );
 	}
 	
-	res = handle_child_io( j->io, (p==0) );
-
 	/* Set the handling for job control signals back to the default.  */
-	if( res )
+	if( !res )
 	{
 		signal_reset_handlers();
 	}
@@ -442,6 +433,7 @@ static int setup_child_process( job_t *j, process_t *p )
 */
 static void launch_process( process_t *p )
 {
+//	debug( 1, L"exec '%ls'", p->argv[0] );
 		
 	execve (wcs2str(p->actual_cmd), wcsv2strv( (const wchar_t **) p->argv), env_export_arr( 0 ) );
 	debug( 0, 
@@ -594,14 +586,22 @@ static void internal_exec_helper( const wchar_t *def,
 }

 /**
-   This function should be called by the parent process right after
-   fork() has been called. If job control is enabled, the child is put
-   in the jobs group.
+   This function should be called by both the parent process and the
+   child right after fork() has been called. If job control is
+   enabled, the child is put in the jobs group, and if the child is
+   also in the foreground, it is also given control of the
+   terminal. When called in the parent process, this function may
+   fail, since the child might have already finished and called
+   exit. The parent process may safely ignore the exit status of this
+   call.
+
+   Returns 0 on sucess, -1 on failiure. 
 */
-static int handle_new_child( job_t *j, process_t *p )
+static int set_child_group( job_t *j, process_t *p, int print_errors )
 {
+	int res = 0;
 	
-	if( is_interactive  && p->type==EXTERNAL )
+	if( j->job_control )
 	{
 		int new_pgid=0;
 		
@@ -613,7 +613,7 @@ static int handle_new_child( job_t *j, process_t *p )
 		
 		if( setpgid (p->pid, j->pgid) )
 		{						
-			if( getpgid( p->pid) != j->pgid )
+			if( getpgid( p->pid) != j->pgid && print_errors )
 			{
 				debug( 1, 
 					   _( L"Could not send process %d from group %d to group %d" ),
@@ -621,38 +621,28 @@ static int handle_new_child( job_t *j, process_t *p )
 					   getpgid( p->pid),
 					   j->pgid );
 				wperror( L"setpgid" );
+				res = -1;
 			}
 		}
-
-		if( j->fg )
-		{
-			if( tcsetpgrp (0, j->pgid) )
-			{
-				debug( 1, _( L"Could not send job %d ('%ls') to foreground" ), 
-					   j->job_id, 
-					   j->command );
-				wperror( L"tcsetpgrp" );
-				return -1;
-			}
-		}
-
-		if( j->fg && new_pgid)
-		{
-			if( tcsetpgrp (0, j->pgid) )
-			{
-				debug( 1, _( L"Could not send job %d ('%ls') to foreground" ), 
-					   j->job_id, 
-					   j->command );
-				wperror( L"tcsetpgrp" );
-				return -1;
-			}
-		}		
 	}
 	else
 	{
 		j->pgid = getpid();
 	}
-	return 0;
+
+	if( j->terminal && j->fg )
+	{
+		if( tcsetpgrp (0, j->pgid) && print_errors )
+		{
+			debug( 1, _( L"Could not send job %d ('%ls') to foreground" ), 
+				   j->job_id, 
+				   j->command );
+			wperror( L"tcsetpgrp" );
+			res = -1;
+		}
+	}
+
+	return res;
 }


@@ -663,8 +653,6 @@ void exec( job_t *j )
 	pid_t pid;
 	int mypipe[2];
 	sigset_t chldset; 
-	sigemptyset( &chldset );
-	sigaddset( &chldset, SIGCHLD );
 	int skip_fork;
 	
 	io_data_t pipe_read, pipe_write;
@@ -677,8 +665,13 @@ void exec( job_t *j )
 	*/
 	int exec_error=0;

+	if( no_exec )
+		return;
 	
-	debug( 4, L"Exec job %ls with id %d", j->command, j->job_id );	
+	sigemptyset( &chldset );
+	sigaddset( &chldset, SIGCHLD );
+	
+	debug( 4, L"Exec job '%ls' with id %d", j->command, j->job_id );	
 	
 	if( j->first_process->type==INTERNAL_EXEC )
 	{
@@ -688,9 +681,10 @@ void exec( job_t *j )
 		signal_block();

 		/*
-		  setup_child_process make sure signals are propelry set up
+		  setup_child_process make sure signals are properly set
+		  up. It will also call signal_unblock
 		*/
-		if( setup_child_process( j, 0 ) )
+		if( !setup_child_process( j, 0 ) )
 		{
 			/*
 			  launch_process never returns
@@ -704,8 +698,7 @@ void exec( job_t *j )
 			return;
 		}
 		
-	}
-	
+	}	

 	pipe_read.fd=0;
 	pipe_write.fd=1;
@@ -722,9 +715,9 @@ void exec( job_t *j )
 	if( block_io )
 	{
 		if( j->io )
-			j->io = io_add( io_duplicate(block_io), j->io );
+			j->io = io_add( io_duplicate( j, block_io), j->io );
 		else
-			j->io=io_duplicate(block_io);				
+			j->io=io_duplicate( j, block_io);				
 	}
 	
 	j->io = io_add( j->io, &pipe_write );
@@ -803,33 +796,22 @@ void exec( job_t *j )
 		{
 			case INTERNAL_FUNCTION:
 			{
-				wchar_t **arg;
-				int i;
-				string_buffer_t sb;
-			
-				const wchar_t * def = function_get_definition( p->argv[0] );
-//			fwprintf( stderr, L"run function %ls\n", argv[0] );
+				
+				wchar_t * def = halloc_register( j, wcsdup( function_get_definition( p->argv[0] )));
+				//fwprintf( stderr, L"run function %ls\n", argv[0] );
 				if( def == 0 )
 				{
 					debug( 0, _( L"Unknown function '%ls'" ), p->argv[0] );
 					break;
 				}
+				
 				parser_push_block( FUNCTION_CALL );
 				
-				if( builtin_count_args(p->argv)>1 )
-				{
-					sb_init( &sb );
-				
-					for( i=1, arg=p->argv+1; *arg; i++, arg++ )
-					{
-						if( i != 1 )
-							sb_append( &sb, ARRAY_SEP_STR );
-						sb_append( &sb, *arg );
-					}
-
-					env_set( L"argv", (wchar_t *)sb.buff, ENV_LOCAL );
-					sb_destroy( &sb );
-				}
+				current_block->param2.function_call_process = p;
+				current_block->param1.function_name = halloc_register( current_block, wcsdup( p->argv[0] ) );
+						
+				parse_util_set_argv( p->argv+1 );
+								
 				parser_forbid_function( p->argv[0] );

 				if( p->next )
@@ -996,7 +978,7 @@ void exec( job_t *j )
 				if( !io_buffer )
 				{
 					/*
-					  No buffer, se we exit directly. This means we
+					  No buffer, so we exit directly. This means we
 					  have to manually set the exit status.
 					*/
 					if( p->next == 0 )
@@ -1014,6 +996,7 @@ void exec( job_t *j )
 				if( io_buffer->param2.out_buffer->used != 0 )
 				{
 					pid = fork();
+
 					if( pid == 0 )
 					{
 						/*
@@ -1041,12 +1024,19 @@ void exec( job_t *j )
 						   it control over the terminal.
 						*/
 						p->pid = pid;						
-						if( handle_new_child( j, p ) )
-							exit(1);
-						
+						set_child_group( j, p, 0 );
+												
 					}					
 					
 				}
+				else
+				{
+					if( p->next == 0 )
+					{
+						proc_set_last_status( j->negate?(status?0:1):status);
+					}
+					p->completed = 1;
+				}
 				
 				io_buffer_destroy( io_buffer );
 				
@@ -1133,9 +1123,8 @@ void exec( job_t *j )
 					*/
 					p->pid = pid;
 						
-					if( handle_new_child( j, p ) )
-						exit( 1 );
-					
+					set_child_group( j, p, 0 );
+										
 				}					
 				
 				break;
@@ -1173,20 +1162,16 @@ void exec( job_t *j )
 					*/
 					p->pid = pid;

-					if( handle_new_child( j, p ) )
-						exit( 1 );
-					
-										
+					set_child_group( j, p, 0 );
+															
 				}
 				break;
 			}
 			
 		}

-
 		if( p->type == INTERNAL_BUILTIN )
-			builtin_pop_io();			
-		
+			builtin_pop_io();
 				
 		/* 
 		   Close the pipe the current process uses to read from the previous process_t 
@@ -1281,24 +1266,30 @@ int exec_subshell( const wchar_t *cmd,
 					{
 						wchar_t *el = str2wcs( begin );
 						if( el )
+						{
 							al_push( l, el );
+						}
+						else
+						{
+							debug( 2, L"Got null string on line %d of file %s", __LINE__, __FILE__ );
+						}
 					}				
 					io_buffer_destroy( io_buffer );
-				
+					
 					return status;
 				
 				case '\n':
 				{
 					wchar_t *el;
 					*end=0;
-					el = str2wcs( begin );				
-					if( !el )
+					el = str2wcs( begin );
+					if( el )
 					{
-						debug( 0, _( L"Subshell '%ls' returned illegal string, discarded one entry" ), cmd );
+						al_push( l, el );
 					}
 					else
 					{
-						al_push( l, el );
+						debug( 2, L"Got null string on line %d of file %s", __LINE__, __FILE__ );
 					}
 					begin = end+1;
 					break;
@@ -1309,5 +1300,6 @@ int exec_subshell( const wchar_t *cmd,
 	}
 	
 	io_buffer_destroy( io_buffer );
+
 	return status;	
 }
--- a/expand.c
+++ b/expand.c
--- a/expand.h
+++ b/expand.h
@@ -130,7 +130,7 @@ enum
   \param out The list to which the result will be appended.
   \return One of EXPAND_OK, EXPAND_ERROR, EXPAND_WILDCARD_MATCH and EXPAND_WILDCARD_NO_MATCH
 */
-int expand_string( wchar_t *in, array_list_t *out, int flag );
+int expand_string( void *context, wchar_t *in, array_list_t *out, int flag );

 /**
   expand_one is identical to expand_string, except it will fail if in
@@ -141,39 +141,13 @@ int expand_string( wchar_t *in, array_list_t *out, int flag );
   \param flag Specifies if any expansion pass should be skipped. Legal values are any combination of EXPAND_SKIP_SUBSHELL EXPAND_SKIP_VARIABLES and EXPAND_SKIP_WILDCARDS
   \return The expanded parameter, or 0 on failiure
 */
-wchar_t *expand_one( wchar_t *in, int flag );
-
-/**
-   Expand backslashed escapes and substitute them with their unescaped
-   counterparts. Also optionally change the wildcards, the tilde
-   character and a few more into constants which are defined in a
-   private use area of Unicode. This assumes wchar_t is a unicode
-   character.  character set.
-
-   The result must be free()d. The original string is not modified. If
-   an invalid sequence is specified, 0 is returned.
-
-*/
-wchar_t *expand_unescape( const wchar_t * in, int escape_special );
-
-/**
-   Replace special characters with escape sequences. Newline is
-   replaced with \n, etc. 
-
-   The result must be free()d. The original string is not modified.
-
-   \param in The string to be escaped
-   \param escape_all Whether all characters wich hold special meaning in fish (Pipe, semicolon, etc,) should be escaped, or only unprintable characters
-   \return The escaped string
-*/
-wchar_t *expand_escape( const wchar_t *in, int escape_all );
+wchar_t *expand_one( void *context, wchar_t *in, int flag );

 /**
   Convert the variable value to a human readable form, i.e. escape things, handle arrays, etc. Suitable for pretty-printing.
 */
 wchar_t *expand_escape_variable( const wchar_t *in );

-
 /**
   Perform tilde expansion and nothing else on the specified string.

@@ -182,20 +156,6 @@ wchar_t *expand_escape_variable( const wchar_t *in );
 */
 wchar_t *expand_tilde(wchar_t *in);

-/**
-   Locate the first subshell in the specified string.
-   
-   \param in the string to search for subshells
-   \param begin the starting paranthesis of the subshell
-   \param end the ending paranthesis of the subshell
-   \param flags set this variable to ACCEPT_INCOMPLETE if in tab_completion mode
-   \return -1 on syntax error, 0 if no subshells exist and 1 on sucess
-*/
-int expand_locate_subshell( wchar_t *in, 
-							wchar_t **begin, 
-							wchar_t **end,
-							int flags );
-

 /**
   Tokenize the specified string into the specified array_list_t.
--- a/fallback.c
+++ b/fallback.c
@@ -0,0 +1,893 @@
+/**
+   This file only contains fallback implementations of functions which
+   have been found to be missing or broken by the configuration
+   scripts.
+*/
+
+#include "config.h"
+
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <unistd.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <unistd.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <wchar.h>
+#include <wctype.h>
+#include <string.h>
+#include <dirent.h>
+#include <stdarg.h>
+#include <limits.h>
+
+#if HAVE_NCURSES_H
+#include <ncurses.h>
+#else
+#include <curses.h>
+#endif
+
+#if HAVE_TERMIO_H
+#include <termio.h>
+#endif
+
+#if HAVE_TERM_H
+#include <term.h>
+#elif HAVE_NCURSES_TERM_H
+#include <ncurses/term.h>
+#endif
+
+#include "common.h"
+#include "util.h"
+
+
+#ifdef TPUTS_KLUDGE
+
+int tputs(const char *str, int affcnt, int (*putc)(tputs_arg_t))
+{
+	while( *str )
+	{
+		putc( *str++ );
+	}	
+}
+
+#endif
+
+
+#ifndef HAVE_FWPRINTF
+#define INTERNAL_FWPRINTF 1
+#endif
+
+#ifdef HAVE_BROKEN_FWPRINTF
+#define INTERNAL_FWPRINTF 1
+#endif
+
+#ifdef INTERNAL_FWPRINTF
+
+void pad( void (*writer)(wchar_t), int count)
+{
+	
+	int i;
+	if( count < 0 )
+		return;
+	
+	for( i=0; i<count; i++ )
+	{
+		writer( L' ' );
+	}
+}
+
+/**
+   Generic formatting function. All other string formatting functions
+   are secretly a wrapper around this function. vgprintf does not
+   implement all the filters supported by printf, only those that are
+   currently used by fish. vgprintf internally uses snprintf to
+   implement the number outputs, such as %f and %x.
+
+   Currently supported functionality:
+
+   - precision specification, both through .* and .N
+   - Padding through * and N
+   - Right padding using the - prefix
+   - long versions of all filters thorugh l and ll prefix
+   - Character output using %c
+   - String output through %s
+   - Floating point number output through %f
+   - Integer output through %d, %i, %u, %o, %x and %X
+
+   For a full description on the usage of *printf, see use 'man 3 printf'.
+*/
+static int vgwprintf( void (*writer)(wchar_t), 
+					  const wchar_t *filter, 
+					  va_list va )
+{
+	const wchar_t *filter_org=filter;
+	int count=0;
+	
+	for( ;*filter; filter++)
+	{
+		if(*filter == L'%')
+		{
+			int is_long=0;
+			int width = -1;
+			filter++;
+			int loop=1;
+			int precision=-1;
+			int pad_left = 1;
+			
+			if( iswdigit( *filter ) )
+			{
+				width=0;
+				while( (*filter >= L'0') && (*filter <= L'9'))
+				{
+					width=10*width+(*filter++ - L'0');
+				}				
+			}
+
+			while( loop )
+			{
+				
+				switch(*filter)
+				{
+					case L'l':
+						/* Long variable */
+						is_long++;
+						filter++;
+						break;
+
+					case L'*':
+						/* Set minimum field width */
+						width = va_arg( va, int );
+						filter++;
+						break;
+
+					case L'-':
+						filter++;
+						pad_left=0;
+						break;
+						
+					case L'.':
+						/* 
+						   Set precision.
+						*/
+						filter++;
+						if( *filter == L'*' )
+						{
+							precision = va_arg( va, int );
+						}
+						else
+						{
+							precision=0;
+							while( (*filter >= L'0') && (*filter <= L'9'))
+							{
+								precision=10*precision+(*filter++ - L'0');
+							}							
+						}
+						break;
+						
+					default:
+						loop=0;
+						break;
+				}
+			}
+
+			switch( *filter )
+			{
+				case L'c':
+				{
+					wchar_t c;
+
+					if( (width >= 0) && pad_left )
+					{
+						pad( writer, width-1 );					
+						count += maxi( width-1, 0 );						
+					}
+
+					c = is_long?va_arg(va, wint_t):btowc(va_arg(va, int));
+					if( precision != 0 )
+						writer( c );
+
+
+					if( (width >= 0) && !pad_left )
+					{
+						pad( writer, width-1 );
+						count += maxi( width-1, 0 );		
+					}
+					
+					count++;
+					
+					break;
+				}
+				case L's':
+				{		
+					
+					wchar_t *ss=0;
+					if( is_long )
+					{
+						ss = va_arg(va, wchar_t *);
+					}
+					else
+					{
+						char *ns = va_arg(va, char*);
+
+						if( ns )
+						{
+							ss = str2wcs( ns );
+						}						
+					}
+										
+					if( !ss )
+					{
+						return -1;
+					}
+					
+					if( (width >= 0) && pad_left )
+					{
+						pad( writer, width-wcslen(ss) );					
+						count += maxi(width-wcslen(ss), 0);						
+					}
+					
+					wchar_t *s=ss;
+					int precount = count;
+					
+					while( *s )
+					{
+						if( (precision > 0) && (precision <= (count-precount) ) )
+							break;
+						
+						writer( *(s++) );
+						count++;
+					}
+					
+					if( (width >= 0) && !pad_left )
+					{
+						pad( writer, width-wcslen(ss) );					
+						count += maxi( width-wcslen(ss), 0 );						
+					}
+					
+					if( !is_long )
+						free( ss );
+					
+					break;
+				}
+
+				case L'd':
+				case L'i':
+				case L'o':
+				case L'u':
+				case L'x':
+				case L'X':
+				{
+					char str[33];
+					char *pos;
+					char format[16];
+					int len;
+					
+					format[0]=0;
+					strcat( format, "%");
+					if( precision >= 0 )
+						strcat( format, ".*" );
+					switch( is_long )
+					{
+						case 2:
+							strcat( format, "ll" );
+							break;
+						case 1:
+							strcat( format, "l" );
+							break;
+					}
+					
+					len = strlen(format);
+					format[len++]=(char)*filter;
+					format[len]=0;
+
+					switch( *filter )
+					{
+						case L'd':
+						case L'i':
+						{
+							
+							switch( is_long )
+							{
+								case 0:
+								{
+									int d = va_arg( va, int );
+									if( precision >= 0 )
+										snprintf( str, 32, format, precision, d );
+									else
+										snprintf( str, 32, format, d );
+									
+									break;
+								}
+								
+								case 1:
+								{
+									long d = va_arg( va, long );
+									if( precision >= 0 )
+										snprintf( str, 32, format, precision, d );
+									else
+										snprintf( str, 32, format, d );
+									break;
+								}
+								
+								case 2:
+								{
+									long long d = va_arg( va, long long );
+									if( precision >= 0 )
+										snprintf( str, 32, format, precision, d );
+									else
+										snprintf( str, 32, format, d );
+									break;
+								}
+						
+								default:
+									debug( 0, L"Invalid length modifier in string %ls\n", filter_org );
+									return -1;
+							}
+							break;
+							
+						}
+						
+						case L'u':
+						case L'o':
+						case L'x':
+						case L'X':
+						{
+							
+							switch( is_long )
+							{
+								case 0:
+								{
+									unsigned d = va_arg( va, unsigned );
+									if( precision >= 0 )
+										snprintf( str, 32, format, precision, d );
+									else
+										snprintf( str, 32, format, d );
+									break;
+								}
+								
+								case 1:
+								{
+									unsigned long d = va_arg( va, unsigned long );
+									if( precision >= 0 )
+										snprintf( str, 32, format, precision, d );
+									else
+										snprintf( str, 32, format, d );
+									break;
+								}
+								
+								case 2:
+								{
+									unsigned long long d = va_arg( va, unsigned long long );
+									if( precision >= 0 )
+										snprintf( str, 32, format, precision, d );
+									else
+										snprintf( str, 32, format, d );
+									break;
+								}
+								
+								default:
+									debug( 0, L"Invalid length modifier in string %ls\n", filter_org );
+									return -1;
+							}
+							break;
+							
+						}
+						
+						default:
+							debug( 0, L"Invalid filter %ls in string %ls\n", *filter, filter_org );
+							return -1;
+							
+					}
+					
+					if( (width >= 0) && pad_left )
+					{
+						int l = maxi(width-strlen(str), 0 );
+						pad( writer, l );
+						count += l;
+					}
+					
+					pos = str;
+					
+					while( *pos )
+					{
+						writer( *(pos++) );
+						count++;
+					}
+					
+					if( (width >= 0) && !pad_left )
+					{
+						int l = maxi(width-strlen(str), 0 );
+						pad( writer, l );
+						count += l;
+					}
+					
+					break;
+				}
+
+				case L'f':
+				{
+					char str[32];
+					char *pos;
+					double val = va_arg( va, double );
+					
+					if( precision>= 0 )
+					{
+						if( width>= 0 )
+						{
+							snprintf( str, 32, "%*.*f", width, precision, val );
+						}
+						else
+						{
+							snprintf( str, 32, "%.*f", precision, val );
+						}
+					}
+					else
+					{
+						if( width>= 0 )
+						{
+							snprintf( str, 32, "%*f", width, val );
+						}
+						else
+						{
+							snprintf( str, 32, "%f", val );
+						}
+					}
+
+					pos = str;
+					
+					while( *pos )
+					{
+						writer( *(pos++) );
+						count++;
+					}
+					
+					break;
+				}
+
+				case L'n':
+				{
+					int *n = va_arg( va, int *);
+					
+					*n = count;					
+					break;
+				}
+				case L'%':
+				{
+					writer('%');
+					count++;
+					break;
+				}
+				default:
+					debug( 0, L"Unknown switch %lc in string %ls\n", *filter, filter_org );
+					return -1;
+			}
+		}
+		else
+		{
+			writer( *filter );
+			count++;
+		}
+	}
+
+	return count;
+}
+
+/**
+   Holds data for swprintf writer
+*/
+static struct
+{
+	int count;
+	int max;
+	wchar_t *pos;
+}
+sw_data;
+
+/**
+   Writers for string output
+*/
+static void sw_writer( wchar_t c )
+{
+	if( sw_data.count < sw_data.max )
+		*(sw_data.pos++)=c;	
+	sw_data.count++;
+}
+
+int vswprintf( wchar_t *out, size_t n, const wchar_t *filter, va_list va )
+{
+	int written;
+	
+	sw_data.pos=out;
+	sw_data.max=n;
+	sw_data.count=0;
+	written=vgwprintf( &sw_writer,
+					   filter,
+					   va );
+	if( written < n )
+	{
+		*sw_data.pos = 0;
+	}
+	else
+	{
+		written=-1;
+	}
+	
+	return written;
+}
+
+int swprintf( wchar_t *out, size_t n, const wchar_t *filter, ... )
+{
+	va_list va;
+	int written;
+	
+	va_start( va, filter );
+	written = vswprintf( out, n, filter, va );
+	va_end( va );
+	return written;
+}
+
+/**
+   Holds auxiliary data for fwprintf and wprintf writer
+*/
+static FILE *fw_data;
+
+static void fw_writer( wchar_t c )
+{
+	putwc( c, fw_data );
+}
+
+/*
+   Writers for file output
+*/
+int vfwprintf( FILE *f, const wchar_t *filter, va_list va )
+{
+	fw_data = f;
+	return vgwprintf( &fw_writer, filter, va );
+}
+
+int fwprintf( FILE *f, const wchar_t *filter, ... )
+{
+	va_list va;
+	int written;
+	
+	va_start( va, filter );
+	written = vfwprintf( f, filter, va );
+	va_end( va );
+	return written;
+}
+
+int vwprintf( const wchar_t *filter, va_list va )
+{
+	return vfwprintf( stdout, filter, va );
+}
+
+int wprintf( const wchar_t *filter, ... )
+{
+	va_list va;
+	int written;
+	
+	va_start( va, filter );
+	written=vwprintf( filter, va );
+	va_end( va );
+	return written;
+}
+
+#endif
+
+#ifndef HAVE_FGETWC
+
+wint_t fgetwc(FILE *stream)
+{
+	wchar_t res=0;
+	mbstate_t state;
+	memset (&state, '\0', sizeof (state));
+
+	while(1)
+	{
+		int b = fgetc( stream );
+		char bb;
+			
+		int sz;
+			
+		if( b == EOF )
+			return WEOF;
+
+		bb=b;
+			
+		sz = mbrtowc( &res, &bb, 1, &state );
+			
+		switch( sz )
+		{
+			case -1:
+				memset (&state, '\0', sizeof (state));
+				return WEOF;
+
+			case -2:
+				break;
+			case 0:
+				return 0;
+			default:
+				return res;
+		}
+	}
+
+}
+
+
+wint_t getwc(FILE *stream)
+{
+	return fgetwc( stream );
+}
+
+
+#endif
+
+#ifndef HAVE_FPUTWC
+
+wint_t fputwc(wchar_t wc, FILE *stream)
+{
+	int res;
+	char s[MB_CUR_MAX+1];
+	memset( s, 0, MB_CUR_MAX+1 );
+	wctomb( s, wc );
+	res = fputs( s, stream );
+	return res==EOF?WEOF:wc;
+}
+
+wint_t putwc(wchar_t wc, FILE *stream)
+{
+	return fputwc( wc, stream );
+}
+
+#endif
+
+#ifndef HAVE_WCSTOK
+
+/*
+  Used by fallback wcstok. Borrowed from glibc
+*/
+static size_t fish_wcsspn (const wchar_t *wcs,
+					  const wchar_t *accept )
+{
+	register const wchar_t *p;
+	register const wchar_t *a;
+	register size_t count = 0;
+
+	for (p = wcs; *p != L'\0'; ++p)
+    {
+		for (a = accept; *a != L'\0'; ++a)
+			if (*p == *a)
+				break;
+		
+		if (*a == L'\0')
+			return count;
+		else
+			++count;
+    }
+	return count;	
+}
+
+/*
+  Used by fallback wcstok. Borrowed from glibc
+*/
+static wchar_t *fish_wcspbrk (const wchar_t *wcs, const wchar_t *accept)
+{
+	while (*wcs != L'\0')
+		if (wcschr (accept, *wcs) == NULL)
+			++wcs;
+		else
+			return (wchar_t *) wcs;
+	return NULL;	
+}
+
+/*
+  Fallback wcstok implementation. Borrowed from glibc.
+*/
+wchar_t *wcstok(wchar_t *wcs, const wchar_t *delim, wchar_t **save_ptr)
+{
+	wchar_t *result;
+
+	if (wcs == NULL)
+    {
+		if (*save_ptr == NULL)
+        {
+			errno = EINVAL;
+			return NULL;
+        }
+		else
+			wcs = *save_ptr;
+    }
+
+	/* Scan leading delimiters.  */
+	wcs += fish_wcsspn (wcs, delim);
+	
+	if (*wcs == L'\0')
+    {
+		*save_ptr = NULL;		
+		return NULL;
+    }
+
+	/* Find the end of the token.  */
+	result = wcs;
+	
+	wcs = fish_wcspbrk (result, delim);
+	
+	if (wcs == NULL)
+	{
+		/* This token finishes the string.  */
+		*save_ptr = NULL;
+	}
+	else
+    {
+		/* Terminate the token and make *SAVE_PTR point past it.  */
+		*wcs = L'\0';
+		*save_ptr = wcs + 1;
+    }
+	return result;
+}
+
+#endif
+
+#ifndef HAVE_WCSDUP
+wchar_t *wcsdup( const wchar_t *in )
+{
+	size_t len=wcslen(in);
+	wchar_t *out = malloc( sizeof( wchar_t)*(len+1));
+	if( out == 0 )
+	{
+		return 0;
+	}
+
+	memcpy( out, in, sizeof( wchar_t)*(len+1));
+	return out;
+	
+}
+#endif
+
+#ifndef HAVE_WCSLEN
+size_t wcslen(const wchar_t *in)
+{
+	const wchar_t *end=in;
+	while( *end )
+		end++;
+	return end-in;
+}
+#endif
+
+
+#ifndef HAVE_WCSCASECMP
+int wcscasecmp( const wchar_t *a, const wchar_t *b )
+{
+	if( *a == 0 )
+	{
+		return (*b==0)?0:-1;
+	}
+	else if( *b == 0 )
+	{
+		return 1;
+	}
+	int diff = towlower(*a)-towlower(*b);
+	if( diff != 0 )
+		return diff;
+	else
+		return wcscasecmp( a+1,b+1);
+}
+#endif
+
+
+#ifndef HAVE_WCSNCASECMP
+int wcsncasecmp( const wchar_t *a, const wchar_t *b, int count )
+{
+	if( count == 0 )
+		return 0;
+	
+	if( *a == 0 )
+	{
+		return (*b==0)?0:-1;
+	}
+	else if( *b == 0 )
+	{
+		return 1;
+	}
+	int diff = towlower(*a)-towlower(*b);
+	if( diff != 0 )
+		return diff;
+	else
+		return wcsncasecmp( a+1,b+1, count-1);
+}
+#endif
+
+#ifndef HAVE_WCWIDTH
+int wcwidth( wchar_t c )
+{
+	if( c < 32 )
+		return 0;
+	if ( c == 127 )
+		return 0;
+	return 1;
+}
+#endif
+
+#ifndef HAVE_WCSNDUP
+wchar_t *wcsndup( const wchar_t *in, int c )
+{
+	wchar_t *res = malloc( sizeof(wchar_t)*(c+1) );
+	if( res == 0 )
+	{
+		return 0;
+	}
+	wcsncpy( res, in, c+1 );
+	res[c] = L'\0';	
+	return res;	
+}
+#endif
+
+long convert_digit( wchar_t d, int base )
+{
+	long res=-1;
+	if( (d <= L'9') && (d >= L'0') )
+	{
+		res = d - L'0';
+	}
+	else if( (d <= L'z') && (d >= L'a') )
+	{
+		res = d + 10 - L'a';		
+	}
+	else if( (d <= L'Z') && (d >= L'A') )
+	{
+		res = d + 10 - L'A';		
+	}
+	if( res >= base )
+	{
+		res = -1;
+	}
+	
+	return res;
+}
+
+#ifndef HAVE_WCSTOL
+long wcstol(const wchar_t *nptr, 
+			wchar_t **endptr,
+			int base)
+{
+	long long res=0;
+	int is_set=0;
+	if( base > 36 )
+	{
+		errno = EINVAL;
+		return 0;
+	}
+
+	while( 1 )
+	{
+		long nxt = convert_digit( *nptr, base );
+		if( endptr != 0 )
+			*endptr = (wchar_t *)nptr;
+		if( nxt < 0 )
+		{
+			if( !is_set )
+			{
+				errno = EINVAL;
+			}
+			return res;			
+		}
+		res = (res*base)+nxt;
+		is_set = 1;
+		if( res > LONG_MAX )
+		{
+			errno = ERANGE;
+			return LONG_MAX;
+		}
+		if( res < LONG_MIN )
+		{
+			errno = ERANGE;
+			return LONG_MIN;
+		}
+		nptr++;
+	}
+}
+#endif
+
+
--- a/fallback.h
+++ b/fallback.h
@@ -0,0 +1,236 @@
+
+#ifndef FISH_FALLBACK_H
+#define FISH_FALLBACK_H
+
+#include <stdio.h>
+#include <stdarg.h>
+#include <wctype.h>
+#include <wchar.h>
+#include "common.h"
+
+/**
+   Under curses, tputs expects an int (*func)(char) as its last
+   parameter, but in ncurses, tputs expects a int (*func)(int) as its
+   last parameter. tputs_arg_t is defined to always be what tputs
+   expects. Hopefully.
+*/
+
+#ifdef NCURSES_VERSION
+typedef int tputs_arg_t;
+#else
+typedef char tputs_arg_t;
+#endif
+
+#ifdef TPUTS_KLUDGE
+
+/**
+   Linux on PPC seems to have a tputs implementation that sometimes
+   behaves strangely. This fallback seems to fix things.
+*/
+int tputs(const char *str, int affcnt, int (*putc)(tputs_arg_t));
+
+#endif
+
+#ifndef HAVE_FWPRINTF
+
+/**
+   Print formated string. Some operating systems (Like NetBSD) do not
+   have wide string formating functions.  Therefore we implement our
+   own. Not at all complete. Supports wide and narrow characters,
+   strings and decimal numbers, position (%n), field width and
+   precision.
+*/
+int fwprintf( FILE *f, const wchar_t *format, ... );
+
+
+/**
+   Print formated string. Some operating systems (Like NetBSD) do not
+   have wide string formating functions.  Therefore we define our
+   own. Not at all complete. Supports wide and narrow characters,
+   strings and decimal numbers, position (%n), field width and
+   precision.
+*/
+int swprintf( wchar_t *str, size_t l, const wchar_t *format, ... );
+
+/**
+   Print formated string. Some operating systems (Like NetBSD) do not
+   have wide string formating functions.  Therefore we define our
+   own. Not at all complete. Supports wide and narrow characters,
+   strings and decimal numbers, position (%n), field width and
+   precision.
+*/
+int wprintf( const wchar_t *format, ... );
+
+/**
+   Print formated string. Some operating systems (Like NetBSD) do not
+   have wide string formating functions.  Therefore we define our
+   own. Not at all complete. Supports wide and narrow characters,
+   strings and decimal numbers, position (%n), field width and
+   precision.
+*/
+int vwprintf( const wchar_t *filter, va_list va );
+
+/**
+   Print formated string. Some operating systems (Like NetBSD) do not
+   have wide string formating functions.  Therefore we define our
+   own. Not at all complete. Supports wide and narrow characters,
+   strings and decimal numbers, position (%n), field width and
+   precision.
+*/
+int vfwprintf( FILE *f, const wchar_t *filter, va_list va );
+
+/**
+   Print formated string. Some operating systems (Like NetBSD) do not
+   have wide string formating functions.  Therefore we define our
+   own. Not at all complete. Supports wide and narrow characters,
+   strings and decimal numbers, position (%n), field width and
+   precision.
+*/
+int vswprintf( wchar_t *out, size_t n, const wchar_t *filter, va_list va );
+
+#endif
+
+#ifndef HAVE_FGETWC
+/**
+   Fallback implementation of fgetwc
+*/
+wint_t fgetwc(FILE *stream);
+
+/**
+   Fallback implementation of getwc
+*/
+wint_t getwc(FILE *stream);
+
+#endif
+
+#ifndef HAVE_FPUTWC
+
+/**
+   Fallback implementation of fputwc
+*/
+wint_t fputwc(wchar_t wc, FILE *stream);
+/**
+   Fallback implementation of putwc
+*/
+wint_t putwc(wchar_t wc, FILE *stream);
+
+#endif
+
+#ifndef HAVE_WCSTOK
+
+/**
+   Fallback implementation of wcstok. Uses code borrowed from glibc.
+*/
+wchar_t *wcstok(wchar_t *wcs, const wchar_t *delim, wchar_t **ptr);
+
+#endif
+
+#ifndef HAVE_WCWIDTH
+
+/**
+   Return the number of columns used by a character. This is a libc
+   function, but the prototype for this function is missing in some libc
+   implementations. 
+
+   Fish has a fallback implementation in case the implementation is
+   missing altogether.  In locales without a native wcwidth, Unicode
+   is probably so broken that it isn't worth trying to implement a
+   real wcwidth. Therefore, the fallback wcwidth assumes any printing
+   character takes up one column and anything else uses 0 columns.
+*/
+int wcwidth( wchar_t c );
+
+#endif
+
+#ifndef HAVE_WCSDUP
+
+/**
+   Create a duplicate string. Wide string version of strdup. Will
+   automatically exit if out of memory.
+*/
+wchar_t *wcsdup(const wchar_t *in);
+
+#endif
+
+#ifndef HAVE_WCSLEN
+
+/**
+   Fallback for wcsen. Returns the length of the specified string.
+*/
+size_t wcslen(const wchar_t *in);
+
+#endif
+
+#ifndef HAVE_WCSCASECMP
+/**
+   Case insensitive string compare function. Wide string version of
+   strcasecmp.
+
+   This implementation of wcscasecmp does not take into account
+   esoteric locales where uppercase and lowercase do not cleanly
+   transform between each other. Hopefully this should be fine since
+   fish only uses this function with one of the strings supplied by
+   fish and guaranteed to be a sane, english word. Using wcscasecmp on
+   a user-supplied string should be considered a bug.
+*/
+int wcscasecmp( const wchar_t *a, const wchar_t *b );
+
+#endif
+
+#ifndef HAVE_WCSNCASECMP
+
+/**
+   Case insensitive string compare function. Wide string version of
+   strncasecmp.
+
+   This implementation of wcsncasecmp does not take into account
+   esoteric locales where uppercase and lowercase do not cleanly
+   transform between each other. Hopefully this should be fine since
+   fish only uses this function with one of the strings supplied by
+   fish and guaranteed to be a sane, english word. Using wcsncasecmp on
+   a user-supplied string should be considered a bug.
+*/
+int wcsncasecmp( const wchar_t *a, const wchar_t *b, int count );
+
+/**
+   Returns a newly allocated wide character string wich is a copy of
+   the string in, but of length c or shorter. The returned string is
+   always null terminated, and the null is not included in the string
+   length.
+*/
+
+#endif
+
+#ifndef HAVE_WCSNDUP
+
+/**
+   Fallback for wcsndup function. Returns a copy of \c in, truncated
+   to a maximum length of \c c.
+*/
+wchar_t *wcsndup( const wchar_t *in, int c );
+
+#endif
+
+/**
+   Converts from wide char to digit in the specified base. If d is not
+   a valid digit in the specified base, return -1.
+*/
+long convert_digit( wchar_t d, int base );
+
+#ifndef HAVE_WCSTOL
+
+/**
+   Fallback implementation. Convert a wide character string to a
+   number in the specified base. This functions is the wide character
+   string equivalent of strtol. For bases of 10 or lower, 0..9 are
+   used to represent numbers. For bases below 36, a-z and A-Z are used
+   to represent numbers higher than 9. Higher bases than 36 are not
+   supported.
+*/
+long wcstol(const wchar_t *nptr,
+			wchar_t **endptr,
+			int base);
+
+#endif
+
+#endif
--- a/fish.spec.in
+++ b/fish.spec.in
@@ -1,3 +1,5 @@
+%define xinclude %( if test -d /usr/X11R6/include; then echo /usr/X11R6/include; else echo /usr/include; fi )
+
 Summary:                A friendly interactive shell
 Name:                   @PACKAGE_NAME@

@@ -11,47 +13,76 @@ URL:                    http://roo.no-ip.org/fish/
 Source0:                http://roo.no-ip.org/%{name}/files/%{version}/%{name}-%{version}.tar.bz2

 BuildRoot:              %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:          doxygen ncurses-devel xorg-x11-devel
+BuildRequires:          doxygen ncurses-devel
+BuildRequires:          %{xinclude}/X11/StringDefs.h, %{xinclude}/X11/Xlib.h
+BuildRequires:          %{xinclude}/X11/Intrinsic.h, %{xinclude}/X11/Xatom.h
+
+

 %description 
 fish is a shell geared towards interactive use. It's features are
 focused on user friendlieness and discoverability. The language syntax
 is simple but incompatible with other shell languages.

+
+
+
 %prep
 %setup -q

-%build

+
+
+%build
 %configure docdir=%_datadir/doc/%{name}-%{version}
 make %{?_smp_mflags}

+
+
+
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR="$RPM_BUILD_ROOT" 

+
+
+
 %clean
 rm -rf $RPM_BUILD_ROOT

+
+
+
 %post
 if ! grep %_bindir/fish %_sysconfdir/shells >/dev/null; then
 	echo %_bindir/fish >>%_sysconfdir/shells
 fi

+
+
+
 %postun
 if [ "$1" = 0 ]; then
 	grep -v %_bindir/fish %_sysconfdir/shells >%_sysconfdir/fish.tmp
 	mv %_sysconfdir/fish.tmp %_sysconfdir/shells
 fi

+
+
+
 %files
 %defattr(-,root,root,-)
+
 %doc %_datadir/doc/%{name}-%{version}
+
 %_mandir/man1/fish.1*
 %_mandir/man1/xsel.1x*
 %_mandir/man1/mimedb.1*
 %_mandir/man1/set_color.1*
 %_mandir/man1/count.1*
+%_mandir/man1/fishd.1*
+%_mandir/man1/fish_pager.1*
+
 %attr(0755,root,root) %_bindir/fish
 %attr(0755,root,root) %_bindir/fishd
 %attr(0755,root,root) %_bindir/fish_pager
@@ -59,14 +90,26 @@ fi
 %attr(0755,root,root) %_bindir/set_color
 %attr(0755,root,root) %_bindir/mimedb
 %attr(0755,root,root) %_bindir/count
+
 %config %_sysconfdir/fish
 %config %_sysconfdir/fish_inputrc
 %dir %_sysconfdir/fish.d
 %config %_sysconfdir/fish.d/fish_*.fish
-%dir %_sysconfdir/fish.d/completions
-%config %_sysconfdir/fish.d/completions/*.fish
+
+%dir %_datadir/fish
+%_datadir/fish/fish
+
+%dir %_datadir/fish/completions
+%_datadir/fish/completions/*.fish
+
+%dir %_datadir/fish/functions
+%_datadir/fish/functions/*.fish
+
 %_datadir/locale/*/LC_MESSAGES/fish.mo

+
+
+
 %changelog
 * Tue Nov 29 2005 Axel Liljencrantz <axel@liljencrantz.se> 1.17.0-0
 - 1.17.0
--- a/fish_pager.c
+++ b/fish_pager.c
@@ -27,16 +27,26 @@
 #include <termio.h>
 #endif

+#if HAVE_TERM_H
 #include <term.h>
+#elif HAVE_NCURSES_TERM_H
+#include <ncurses/term.h>
+#endif
+
 #include <signal.h>

+
+#include "fallback.h"
 #include "util.h"
+
 #include "wutil.h"
 #include "common.h"
 #include "complete.h"
 #include "output.h"
 #include "input_common.h"
 #include "env_universal.h"
+#include "halloc.h"
+#include "halloc_util.h"

 enum 
 {
@@ -69,6 +79,7 @@ static struct termios pager_modes;

 static int is_ca_mode = 0;

+static buffer_t *pager_buffer;

 /**
   The environment variables used to specify the color of different
@@ -86,8 +97,18 @@ static wchar_t *hightlight_var[] =
 static string_buffer_t out_buff;
 static FILE *out_file;

+typedef struct 
+{
+	array_list_t *comp;
+	wchar_t *desc;
+	int comp_width;	
+	int desc_width;	
+	int pref_width;
+	int min_width;
+}
+	comp_t;

-int get_color( int highlight )
+static int get_color( int highlight )
 {
 	if( highlight < 0 )
 		return FISH_COLOR_NORMAL;
@@ -96,9 +117,6 @@ int get_color( int highlight )
 	
 	wchar_t *val = env_universal_get( hightlight_var[highlight]);
 	
-	if( val == 0 )
-		return FISH_COLOR_NORMAL;
-	
 	if( val == 0 )
 	{
 		return FISH_COLOR_NORMAL;
@@ -107,7 +125,20 @@ int get_color( int highlight )
 	return output_color_code( val );	
 }

-int try_sequence( char *seq )
+static void recalc_width( array_list_t *l, const wchar_t *prefix )
+{
+	int i;
+	for( i=0; i<al_get_count( l ); i++ )
+	{
+		comp_t *c = (comp_t *)al_get( l, i );
+		
+		c->min_width = mini( c->desc_width, maxi(0,termsize.ws_col/3 - 2)) +
+			mini( c->desc_width, maxi(0,termsize.ws_col/5 - 4)) +4;
+	}
+	
+}
+
+static int try_sequence( char *seq )
 {
 	int j, k;
 	wint_t c=0;
@@ -190,6 +221,110 @@ static wint_t readch()
 }


+static int pager_buffered_writer( char c)
+{
+	b_append( pager_buffer, &c, 1 );
+	return 0;
+}
+
+static void pager_flush()
+{
+	write( 1, pager_buffer->buff, pager_buffer->used );
+	pager_buffer->used = 0;
+}
+
+
+static int print_max( const wchar_t *str, int max, int has_more )
+{
+	int i;
+	int written = 0;
+	for( i=0; str[i]; i++ )
+	{
+		if( written + wcwidth(str[i]) > max )
+			break;
+		if( ( written + wcwidth(str[i]) == max) && (has_more || str[i+1]) )
+		{
+			writech( ellipsis_char );
+			written += wcwidth(ellipsis_char );
+			break;
+		}
+			
+		writech( str[i] );
+		written+= wcwidth( str[i] );
+	}
+	return written;
+}
+
+static void completion_print_item( const wchar_t *prefix, comp_t *c, int width )
+{
+	int comp_width=0, desc_width=0;
+	int i;
+	int written=0;
+	
+	if( c->pref_width <= width )
+	{
+		/*
+		  The entry fits, we give it as much space as it wants
+		*/
+		comp_width = c->comp_width;
+		desc_width = c->desc_width;
+	}
+	else
+	{
+		/*
+		  The completion and description won't fit on the
+		  allocated space. Give a maximum of 2/3 of the
+		  space to the completion, and whatever is left to
+		  the description.
+		*/
+		int desc_all = c->desc_width?c->desc_width+4:0;
+		
+		comp_width = maxi( mini( c->comp_width,
+								 2*(width-4)/3 ),
+						   width - desc_all );
+		if( c->desc_width )
+			desc_width = width-comp_width-4;
+		else
+			c->desc_width=0;
+		
+	}
+	
+	for( i=0; i<al_get_count( c->comp ); i++ )
+	{
+		const wchar_t *comp = (const wchar_t *)al_get( c->comp, i );
+		if( i != 0 )
+			written += print_max( L"  ", comp_width - written, 2 );
+		set_color( get_color(HIGHLIGHT_PAGER_PREFIX),FISH_COLOR_NORMAL );
+		written += print_max( prefix, comp_width - written, comp[0]?1:0 );
+		set_color( get_color(HIGHLIGHT_PAGER_COMPLETION),FISH_COLOR_IGNORE );
+		written += print_max( comp, comp_width - written, i!=(al_get_count(c->comp)-1) );
+	}
+
+
+	if( desc_width )
+	{
+		while( written < (width-desc_width-2))
+		{
+			written++;
+			writech( L' ');
+		}
+		written += print_max( L"(", 1, 0 );
+		set_color( get_color( HIGHLIGHT_PAGER_DESCRIPTION ),
+				   FISH_COLOR_IGNORE );
+		written += print_max( c->desc, desc_width, 0 );
+		written += print_max( L")", 1, 0 );
+	}
+	else
+	{
+		while( written < width )
+		{
+			written++;
+			writech( L' ');
+		}
+	}
+	
+}
+
 /**
   Print the specified part of the completion list, using the
   specified column offsets and quoting style.
@@ -214,277 +349,29 @@ static void completion_print( int cols,

 	int rows = (al_get_count( l )-1)/cols+1;
 	int i, j;
-	int prefix_width= my_wcswidth(prefix);

 	for( i = row_start; i<row_stop; i++ )
 	{
 		for( j = 0; j < cols; j++ )
 		{
-			wchar_t *el, *el_end;
+			comp_t *el;

+			int is_last = (j==(cols-1));
+			
 			if( al_get_count( l ) <= j*rows + i )
 				continue;

-			el = (wchar_t *)al_get( l, j*rows + i );
-			el_end= wcschr( el, COMPLETE_SEP );
-
-			set_color( get_color(HIGHLIGHT_PAGER_PREFIX),FISH_COLOR_NORMAL );
-
-			writestr( prefix );
-
-			set_color( get_color(HIGHLIGHT_PAGER_COMPLETION),FISH_COLOR_IGNORE );
-
-			if( el_end == 0 )
-			{
-				/* We do not have a description for this completion */
-				int written = 0;
-				int max_written = width[j] - prefix_width - (j==cols-1?0:2);
-
-				if( is_quoted )
-				{
-					for( i=0; i<max_written; i++ )
-					{
-						if( !el[i] )
-							break;
-						writech( el[i] );
-						written+= wcwidth( el[i] );
-					}
-				}
-				else
-				{
-					written = write_escaped_str( el, max_written );
-				}
-
-				set_color( get_color( HIGHLIGHT_PAGER_DESCRIPTION ),
-						   FISH_COLOR_IGNORE );
-
-				writespace( width[j]-
-							written-
-							prefix_width );
-			}
-			else
-			{
-				int whole_desc_width = my_wcswidth(el_end+1);
-				int whole_comp_width;
-
-				/*
-				  Temporarily drop the description so that wcswidth et
-				  al only calculate the width of the completion.
-				*/
-				*el_end = L'\0';
-
-				/*
-				  Calculate preferred completion width
-				*/
-				if( is_quoted )
-				{
-					whole_comp_width = my_wcswidth(el);
-				}
-				else
-				{
-					wchar_t *tmp = escape( el, 1 );
-					whole_comp_width = my_wcswidth( tmp );
-					free(tmp);
-				}
-
-				/*
-				  Calculate how wide this entry 'wants' to be
-				*/
-				int pref_width = whole_desc_width + 4 + prefix_width + 2 -
-					(j==cols-1?2:0) + whole_comp_width;
-
-				int comp_width, desc_width;
-
-				if( pref_width <= width[j] )
-				{
-					/*
-					  The entry fits, we give it as much space as it wants
-					*/
-					comp_width = whole_comp_width;
-					desc_width = whole_desc_width;
-				}
-				else
-				{
-					/*
-					  The completion and description won't fit on the
-					  allocated space. Give a maximum of 2/3 of the
-					  space to the completion, and whatever is left to
-					  the description.
-					*/
-					int sum = width[j] - prefix_width - 4 - 2 + (j==cols-1?2:0);
-
-					comp_width = maxi( mini( whole_comp_width,
-											 2*sum/3 ),
-									   sum - whole_desc_width );
-					desc_width = sum-comp_width;
-				}
-
-				/* First we must print the completion. */
-				if( is_quoted )
-				{
-					writestr_ellipsis( el, comp_width);
-				}
-				else
-				{
-					write_escaped_str( el, comp_width );
-				}
-
-				/* Put the description back */
-				*el_end = COMPLETE_SEP;
-
-				/* And print it */
-				set_color( get_color(HIGHLIGHT_PAGER_DESCRIPTION),
-						   FISH_COLOR_IGNORE );
-				writespace( maxi( 2,
-								  width[j]
-								  - comp_width
-								  - desc_width
-								  - 4
-								  - prefix_width
-								  + (j==cols-1?2:0) ) );
-				/* Print description */
-				writestr(L"(");
-				writestr_ellipsis( el_end+1, desc_width);
-				writestr(L")");
-
-				if( j != cols-1)
-					writestr( L"  " );
-
-			}
+			el = (comp_t *)al_get( l, j*rows + i );
+			
+			completion_print_item( prefix, el, width[j] - (is_last?0:2) );
+			
+			if( !is_last)
+				writestr( L"  " );
 		}
 		writech( L'\n' );
 	}
 }

-/**
-   Calculates how long the specified string would be when printed on the command line.
-
-   \param str The string to be printed.
-   \param is_quoted Whether the string would be printed quoted or unquoted
-   \param pref_width the preferred width for this item
-   \param min_width the minimum width for this item
-*/
-static void printed_length( wchar_t *str,
-							int is_quoted,
-							int *pref_width,
-							int *min_width )
-{
-	if( is_quoted )
-	{
-		wchar_t *sep = wcschr(str,COMPLETE_SEP);
-		if( sep )
-		{
-			*sep=0;
-			int cw = my_wcswidth( str );
-			int dw = my_wcswidth(sep+1);
-
-			if( termsize.ws_col > 80 )
-				dw = mini( dw, termsize.ws_col/3 );
-
-
-			*pref_width = cw+dw+4;
-
-			if( dw > termsize.ws_col/3 )
-			{
-				dw = termsize.ws_col/3;
-			}
-
-			*min_width=cw+dw+4;
-
-			*sep= COMPLETE_SEP;
-			return;
-		}
-		else
-		{
-			*pref_width=*min_width= my_wcswidth( str );
-			return;
-		}
-
-	}
-	else
-	{
-		int comp_len=0, desc_len=0;
-		int has_description = 0;
-		while( *str != 0 )
-		{
-			switch( *str )
-			{
-				case L'\n':
-				case L'\b':
-				case L'\r':
-				case L'\e':
-				case L'\t':
-				case L'\\':
-				case L'&':
-				case L'$':
-				case L' ':
-				case L'#':
-				case L'^':
-				case L'<':
-				case L'>':
-				case L'(':
-				case L')':
-				case L'[':
-				case L']':
-				case L'{':
-				case L'}':
-				case L'?':
-				case L'*':
-				case L'|':
-				case L';':
-				case L':':
-				case L'\'':
-				case L'"':
-				case L'%':
-				case L'~':
-					
-					if( has_description )
-						desc_len++;
-					else
-						comp_len+=2;
-					break;
-
-				case COMPLETE_SEP:
-					has_description = 1;
-					break;
-
-				default:
-					if( has_description )
-						desc_len+= wcwidth(*str);
-					else
-						comp_len+= wcwidth(*str);
-					break;
-			}
-			str++;
-		}
-		if( has_description )
-		{
-			/*
-			  Mangle long descriptions to make formating look nicer
-			*/
-			debug( 3, L"Desc, width = %d %d\n", comp_len, desc_len );
-//			if( termsize.ws_col > 80 )
-//				desc_len = mini( desc_len, termsize.ws_col/3 );
-
-			*pref_width = comp_len+ desc_len+4;;
-
-			comp_len = mini( comp_len, maxi(0,termsize.ws_col/3 - 2));
-			desc_len = mini( desc_len, maxi(0,termsize.ws_col/5 - 4));
-
-			*min_width = comp_len+ desc_len+4;
-			return;
-		}
-		else
-		{
-			debug( 3, L"No desc, width = %d\n", comp_len );
-			
-			*pref_width=*min_width= comp_len;
-			return;
-		}
-
-	}
-}
-

 /**
   Try to print the list of completions l with the prefix prefix using
@@ -532,8 +419,6 @@ static int completion_try_print( int cols,
 	
 	int pref_tot_width=0;
 	int min_tot_width = 0;
-	int prefix_width = my_wcswidth( prefix );
-	
 	int res=0;
 	/*
 	  Skip completions on tiny terminals
@@ -541,25 +426,24 @@ static int completion_try_print( int cols,
 	
 	if( termsize.ws_col < 16 )
 		return 1;
-
+	
 	memset( pref_width, 0, sizeof(pref_width) );
 	memset( min_width, 0, sizeof(min_width) );
-
-	/* Calculated how wide the list would be */
+	
+	/* Calculate how wide the list would be */
 	for( j = 0; j < cols; j++ )
 	{
 		for( i = 0; i<rows; i++ )
 		{
 			int pref,min;
-			wchar_t *el;
+			comp_t *c;
 			if( al_get_count( l ) <= j*rows + i )
 				continue;

-			el = (wchar_t *)al_get( l, j*rows + i );
-			printed_length( el, is_quoted, &pref, &min );
-
-			pref += prefix_width;
-			min += prefix_width;
+			c = (comp_t *)al_get( l, j*rows + i );
+			pref = c->pref_width;
+			min = c->min_width;
+			
 			if( j != cols-1 )
 			{
 				pref += 2;
@@ -641,6 +525,7 @@ static int completion_try_print( int cols,
 			}
 			
 			completion_print( cols, width, 0, rows, prefix, is_quoted, l);
+			pager_flush();
 		}
 		else
 		{
@@ -673,6 +558,7 @@ static int completion_try_print( int cols,
 						  percent );
 				writestr(msg);
 				set_color( FISH_COLOR_NORMAL, FISH_COLOR_NORMAL );
+				pager_flush();
 				int c = readch();

 				switch( c )
@@ -734,7 +620,8 @@ static int completion_try_print( int cols,
 						}
 						else
 						{
-							writembs( flash_screen );
+							if( flash_screen )
+								writembs( flash_screen );
 						}

 						break;
@@ -758,7 +645,8 @@ static int completion_try_print( int cols,
 						}
 						else
 						{
-							writembs( flash_screen );
+							if( flash_screen )
+								writembs( flash_screen );
 						}
 						break;
 					}
@@ -786,7 +674,9 @@ static int completion_try_print( int cols,
 }

 /**
-   Substitute any series of tabs, newlines, etc. with a single space character in completion description
+   Substitute any series of whitespace with a single space character
+   inside completion descriptions. Remove all whitespace from
+   beginning/end of completion descriptions.
 */
 static void mangle_descriptions( array_list_t *l )
 {
@@ -795,7 +685,7 @@ static void mangle_descriptions( array_list_t *l )
 	{
 		wchar_t *next = (wchar_t *)al_get(l, i);
 		wchar_t *in, *out;
-		skip=0;
+		skip=1;
 		
 		while( *next != COMPLETE_SEP && *next )
 			next++;
@@ -824,6 +714,125 @@ static void mangle_descriptions( array_list_t *l )
 	}
 }

+/**
+   Merge multiple completions with the same description to the same line
+*/
+static void join_completions( array_list_t *l )
+{
+	int i, in, out;
+	hash_table_t desc_table;
+	
+	hash_init( &desc_table, &hash_wcs_func, &hash_wcs_cmp );
+
+	for( i=0; i<al_get_count(l); i++ )
+	{
+		wchar_t *item = (wchar_t *)al_get( l, i );
+		wchar_t *desc = wcschr( item, COMPLETE_SEP );
+		long prev_idx;
+		
+		if( !desc )
+			continue;
+		desc++;
+		prev_idx = ((long)hash_get( &desc_table, desc) )-1;
+		if( prev_idx == -1 )
+		{
+			hash_put( &desc_table, halloc_wcsdup( global_context, desc), (void *)(i+1));
+		}
+		else
+		{
+			string_buffer_t foo;
+			wchar_t *old = (wchar_t *)al_get( l, prev_idx );
+			wchar_t *old_end = wcschr( old, COMPLETE_SEP );
+			
+			if( old_end )
+			{
+				*old_end = 0;
+				
+				sb_init( &foo );
+				sb_append( &foo, old );
+				sb_append_char( &foo, COMPLETE_ITEM_SEP );
+				sb_append( &foo, item );
+
+				free( (void *)al_get( l, prev_idx ) );
+				al_set( l, prev_idx, foo.buff );
+
+				free( (void *)al_get( l, i ) );
+				al_set( l, i, 0 );
+			}
+			
+//			debug( 1, L"WOOT WOOT %ls är släkt med %ls", item, al_get( l, prev_idx ) );
+			
+		}
+		
+	}	
+	hash_destroy( &desc_table );
+
+	out=0;
+	for( in=0; in < al_get_count(l); in++ )
+	{
+		const void * d =  al_get( l, in );
+		
+		if( d )
+		{
+			al_set( l, out++, d );
+		}
+	}
+	al_truncate( l, out );	
+}
+
+/**
+   Replace completion strings with a comp_t structure
+*/
+static void mangle_completions( array_list_t *l, const wchar_t *prefix )
+{
+	int i;
+	
+	for( i=0; i<al_get_count( l ); i++ )
+	{
+		wchar_t *next = (wchar_t *)al_get( l, i );
+		wchar_t *start, *end;
+		comp_t *comp = halloc( global_context, sizeof( comp_t ) );
+		comp->comp = al_halloc( global_context );
+		
+		for( start=end=next; 1; end++ )
+		{
+			wchar_t c = *end;
+			
+			if( (c == COMPLETE_ITEM_SEP) || (c==COMPLETE_SEP) || !c)
+			{
+				*end = 0;
+				wchar_t * str = escape( start, 1 );
+				comp->comp_width += my_wcswidth( str );
+				halloc_register( global_context, str );
+				al_push( comp->comp, str );
+				start = end+1;
+			}
+
+			if( c == COMPLETE_SEP )
+			{
+				comp->desc = halloc_wcsdup( global_context, start );
+				break;
+			}	
+			
+			if( !c )
+				break;
+			
+		}
+
+		comp->comp_width  += my_wcswidth(prefix)*al_get_count(comp->comp) + 2*(al_get_count(comp->comp)-1);
+		comp->desc_width = comp->desc?my_wcswidth( comp->desc ):0;
+		
+		comp->pref_width = comp->comp_width + comp->desc_width + (comp->desc_width?4:0);
+		
+		free( next );
+		al_set( l, i, comp );
+	}
+	
+	recalc_width( l, prefix );
+}
+
+
+
 /**
   Respond to a winch signal by checking the terminal size
 */
@@ -846,7 +855,11 @@ static void init()
 	struct sigaction act;
 	program_name = L"fish_pager";
 	wsetlocale( LC_ALL, L"" );
-	
+
+	/*
+	  Make fd 1 output to screen, and use some other fd for writing
+	  the resulting output back to the caller
+	*/
 	int out = dup( 1 );
 	close(1);
 	if( open( ttyname(0), O_WRONLY ) != 1 )
@@ -858,11 +871,18 @@ static void init()
 		}
 	}
 	out_file = fdopen( out, "w" );
+
+	/**
+	   Init the stringbuffer used to keep any output in
+	*/
 	sb_init( &out_buff );

-	output_init();
+	halloc_util_init();
 	env_universal_init( 0, 0, 0, 0);
 	input_common_init( &interrupt_handler );
+	output_set_writer( &pager_buffered_writer );
+	pager_buffer = halloc( global_context, sizeof( buffer_t ) );
+	halloc_register_function( global_context, (void (*)(void *))&b_destroy, pager_buffer );
 	
 	sigemptyset( & act.sa_mask );
 	act.sa_flags=0;
@@ -875,33 +895,6 @@ static void init()
 		exit(1);
 	}
 	
-	/* Loop until we are in the foreground.  */
-	while (tcgetpgrp( 0 ) != getpid())
-	{
-		kill (- getpid(), SIGTTIN);
-	}
-
-	/* Put ourselves in our own process group.  */
-	if( getpgrp() != getpid() )
-	{
-		if (setpgid (getpid(), getpid()) < 0)
-		{
-			debug( 1,
-				   L"Couldn't put the shell in its own process group");
-			wperror( L"setpgid" );
-			exit (1);
-		}
-	}
-
-	/* Grab control of the terminal.  */
-	if( tcsetpgrp (STDIN_FILENO, getpid()) )
-	{
-		debug( 1,
-			   L"Couldn't grab control of terminal" );
-		wperror( L"tcsetpgrp" );
-		exit(1);
-	}
-
 	handle_winch( 0 );                /* Set handler for window change events */
 	
 	tcgetattr(0,&pager_modes);        /* get the current terminal modes */
@@ -914,6 +907,9 @@ static void init()
    pager_modes.c_cc[VMIN]=1;
    pager_modes.c_cc[VTIME]=0;

+	/*
+	  
+	*/
    if( tcsetattr(0,TCSANOW,&pager_modes))      /* set the new modes */
    {
        wperror(L"tcsetattr");
@@ -932,45 +928,51 @@ void destroy()
 {
 	env_universal_destroy();
 	input_common_destroy();
-	output_destroy();
+	halloc_util_destroy();
 	del_curterm( cur_term );
 	sb_destroy( &out_buff );
 	fclose( out_file );
-
 }

 int main( int argc, char **argv )
 {
 	int i;
 	int is_quoted=0;	
-	array_list_t comp;
+	array_list_t *comp;
 	wchar_t *prefix;
-
 		
 	init();
+	
 	if( argc < 3 )
 	{
 		debug( 0, L"Insufficient arguments" );
 	}
 	else
 	{
+		comp = al_halloc( global_context );
 		prefix = str2wcs( argv[2] );
 		is_quoted = strcmp( "1", argv[1] )==0;
-	
+		is_quoted = 0;
+		
 		debug( 3, L"prefix is '%ls'", prefix );
-	
-		al_init( &comp );
-	
+		
 		for( i=3; i<argc; i++ )
 		{
-			al_push( &comp, str2wcs( argv[i] ) );
+			wchar_t *wcs = str2wcs( argv[i] );
+			if( wcs )
+			{
+				al_push( comp, wcs );
+			}
 		}
+		
+		mangle_descriptions( comp );
+		if( wcscmp( prefix, L"-" ) == 0 )
+			join_completions( comp );
+		mangle_completions( comp, prefix );
 	
-		mangle_descriptions( &comp );
-
 		for( i = 6; i>0; i-- )
 		{
-			switch( completion_try_print( i, prefix, is_quoted, &comp ) )
+			switch( completion_try_print( i, prefix, is_quoted, comp ) )
 			{
 				case 0:
 					break;
@@ -984,8 +986,6 @@ int main( int argc, char **argv )
 		
 		}
 	
-		al_foreach( &comp, (void(*)(const void *))&free );
-		al_destroy( &comp );	
 		free(prefix );

 		fwprintf( out_file, L"%ls", (wchar_t *)out_buff.buff );
--- a/fish_tests.c
+++ b/fish_tests.c
@@ -4,6 +4,7 @@

 #include "config.h"

+
 #include <stdlib.h>
 #include <stdio.h>
 #include <wchar.h>
@@ -26,7 +27,9 @@
 #include <locale.h>
 #include <dirent.h>

+#include "fallback.h"
 #include "util.h"
+
 #include "common.h"
 #include "proc.h"
 #include "reader.h"
@@ -41,6 +44,7 @@
 #include "output.h"
 #include "exec.h"
 #include "event.h"
+#include "halloc_util.h"

 /**
   Number of laps to run performance testing loop
@@ -327,7 +331,7 @@ static void sb_test()
 	
 	sb_init( &b );
 	
-	if( res=sb_printf( &b, L"%ls%s", L"Testing ", "string_buffer_t " ) == -1 )
+	if( (res=sb_printf( &b, L"%ls%s", L"Testing ", "string_buffer_t " )) == -1 )
 	{
 		err( L"Error %d while testing stringbuffers", res );
 	}
@@ -336,7 +340,22 @@ static void sb_test()
 	{
 		err( L"Error %d while testing stringbuffers", res );
 	}
+
 	say( (wchar_t *)b.buff );
+
+	sb_clear( &b );
+
+#define NUM_ANS L"-7 99999999 1234567 deadbeef DEADBEEFDEADBEEF"
+
+	sb_printf( &b, L"%d %u %o %x %llX", -7, 99999999, 01234567, 0xdeadbeef, 0xdeadbeefdeadbeefll );
+	if( wcscmp( (wchar_t *)b.buff,  NUM_ANS) != 0 )
+	{
+		err( L"numerical formating is broken, '%ls' != '%ls'", (wchar_t *)b.buff, NUM_ANS );
+	}
+	else
+		say( L"numerical formating works" );	
+
+	
 }

 /**
@@ -533,7 +552,7 @@ static int expand_test( const wchar_t *in, int flags, ... )
 	wchar_t *arg;
 	
 	al_init( &out );
-	expand_string( wcsdup(in), &out, flags);
+	expand_string( 0, wcsdup(in), &out, flags);
 	
 	va_start( va, flags );

@@ -669,7 +688,7 @@ int main( int argc, char **argv )
 	say( L"Lines beginning with '(ignore):' are not errors, they are warning messages\ngenerated by the fish parser library when given broken input, and can be\nignored. All actual errors begin with 'Error:'." );

 	proc_init();	
-	output_init();	
+	halloc_util_init();
 	event_init();	
 	exec_init();	
 	parser_init();
@@ -701,7 +720,7 @@ int main( int argc, char **argv )
 	wutil_destroy();
 	exec_destroy();
 	event_destroy();
-	output_destroy();
 	proc_destroy();
+	halloc_util_destroy();
 	
 }
--- a/fishd.c
+++ b/fishd.c
@@ -2,11 +2,46 @@

 The universal variable server. fishd is automatically started by fish
 if a fishd server isn't already running. fishd reads any saved
-variables from ~/.fishd, and takes care of commonication between fish
+variables from ~/.fishd, and takes care of communication between fish
 instances. When no clients are running, fishd will automatically shut
 down and save.

+\subsection fishd-commands Commands
+
+Fishd works by sending and receiving commands. Each command is ended
+with a newline. These are the commands supported by fishd:
+
+<pre>set KEY:VALUE
+set_export KEY:VALUE
+</pre>
+
+These commands update the value of a variable. The only difference
+between the two is that <tt>set_export</tt>-variables should be
+exported to children of the process using them. The variable value may
+be escaped using C-style backslash escapes. In fact, this is required
+for newline characters, which would otherwise be interpreted as end of
+command.
+
+<pre>erase KEY
+</pre>
+
+Erase the variable with the specified name.
+
+<pre>barrier
+barrier_reply
+</pre>
+
+A \c barrier command will result in a barrier_reply being added to
+the end of the senders queue of unsent messages. These commands are
+used to synchronize clients, since once the reply for a barrier
+message returns, the sender can know that any updates available at the
+time the original barrier request was sent have been received.
+
 */
+
+#include "config.h"
+
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <wchar.h>
@@ -19,11 +54,17 @@ down and save.
 #include <pwd.h>
 #include <fcntl.h>

+#ifdef HAVE_GETOPT_H
+#include <getopt.h>
+#endif
+
 #include <errno.h>
 #include <locale.h>
 #include <signal.h>

+#include "fallback.h"
 #include "util.h"
+
 #include "common.h"
 #include "wutil.h"
 #include "env_universal_common.h"
@@ -35,6 +76,15 @@ down and save.
 #define UNIX_PATH_MAX 100
 #endif

+/**
+   Fallback if MSG_DONTWAIT isn't defined. That's actually prerry bad,
+   and may lead to strange fishd behaviour, but at least it should
+   work most of the time.
+*/
+#ifndef MSG_DONTWAIT
+#define MSG_DONTWAIT 0
+#endif
+
 /**
   Small greeting to show that fishd is running
 */
@@ -75,6 +125,11 @@ static int sock;
 */
 static int quit=0;

+/**
+   Dynamically generated function, made from the documentation in doc_src.
+*/
+void print_help();
+
 /**
   Constructs the fish socket filename
 */
@@ -396,11 +451,9 @@ static void save()
 */
 static void init()
 {
-	program_name=L"fishd";

 	sock = get_socket();
 	daemonize();	
-	wsetlocale( LC_ALL, L"" );	
 	env_universal_common_init( &broadcast );
 	
 	load();	
@@ -419,8 +472,68 @@ int main( int argc, char ** argv )
 	
 	fd_set read_fd, write_fd;
 	
-	init();
+	program_name=L"fishd";
+	wsetlocale( LC_ALL, L"" );	
+
+	/*
+	  Parse options
+	*/
+	while( 1 )
+	{
+#ifdef HAVE_GETOPT_LONG
+		static struct option
+			long_options[] =
+			{
+				{
+					"help", no_argument, 0, 'h' 
+				}
+				,
+				{
+					"version", no_argument, 0, 'v' 
+				}
+				,
+				{ 
+					0, 0, 0, 0 
+				}
+			}
+		;
+		
+		int opt_index = 0;
+		
+		int opt = getopt_long( argc,
+							   argv, 
+							   "hv",
+							   long_options, 
+							   &opt_index );
+		
+#else	
+		int opt = getopt( argc,
+						  argv, 
+						  "hv" );
+#endif
+		if( opt == -1 )
+			break;
+		
+		switch( opt )
+		{
+			case 0:
+				break;				
+
+			case 'h':
+				print_help();
+				exit(0);				
+								
+			case 'v':
+				debug( 0, L"%ls, version %s\n", program_name, PACKAGE_VERSION );
+				exit( 0 );				
+				
+			case '?':
+				return 1;
+				
+		}		
+	}
 	
+	init();
 	while(1) 
 	{
 		connection_t *c;
--- a/function.c
+++ b/function.c
@@ -9,13 +9,22 @@
 #include <signal.h>

 #include "config.h"
+
+#include "wutil.h"
+#include "fallback.h"
 #include "util.h"
+
 #include "function.h"
 #include "proc.h"
+#include "translate.h"
 #include "parser.h"
 #include "common.h"
 #include "intern.h"
 #include "event.h"
+#include "reader.h"
+#include "parse_util.h"
+#include "env.h"
+#include "expand.h"


 /**
@@ -27,7 +36,10 @@ typedef struct
 	wchar_t *cmd;
 	/** Function description */
 	wchar_t *desc;	
+	const wchar_t *definition_file;
+	int definition_offset;	
 	int is_binding;
+	int is_autoload;
 }
 	function_data_t;

@@ -35,6 +47,79 @@ typedef struct
   Table containing all functions
 */
 static hash_table_t function;
+static int is_autoload = 0;
+
+/**
+   Make sure that if the specified function is a dynamically loaded
+   function, it has been fully loaded.
+*/
+static int load( const wchar_t *name )
+{
+	int was_autoload = is_autoload;
+	int res;
+	function_data_t *data;
+	data = (function_data_t *)hash_get( &function, name );
+	if( data && !data->is_autoload )
+		return 0;
+	
+	is_autoload = 1;	
+	res = parse_util_load( name,
+						   L"fish_function_path",
+						   &function_remove,
+						   1 );
+	is_autoload = was_autoload;
+	return res;
+}
+
+/**
+   Insert a list of all dynamically loaded functions into the
+   specified list.
+*/
+static void autoload_names( array_list_t *out, int get_hidden )
+{
+	int i;
+	
+	array_list_t path_list;
+	const wchar_t *path_var = env_get( L"fish_function_path" );
+	
+	if( ! path_var )
+		return;
+	
+	al_init( &path_list );
+
+	expand_variable_array( path_var, &path_list );
+	for( i=0; i<al_get_count( &path_list ); i++ )
+	{
+		wchar_t *ndir = (wchar_t *)al_get( &path_list, i );
+		DIR *dir = wopendir( ndir );
+		if( !dir )
+			continue;
+		
+		struct wdirent *next;
+		while( (next=wreaddir(dir))!=0 )
+		{
+			wchar_t *fn = next->d_name;
+			wchar_t *suffix;
+			if( !get_hidden && fn[0] == L'_' )
+				continue;
+			
+			suffix = wcsrchr( fn, L'.' );
+			if( suffix && (wcscmp( suffix, L".fish" ) == 0 ) )
+			{
+				const wchar_t *dup;
+				*suffix = 0;
+				dup = intern( fn );
+				if( !dup )
+					die_mem();
+				al_push( out, dup );
+			}
+		}				
+		closedir(dir);
+	}
+	al_foreach( &path_list, (void (*)(const void *))&free );
+	al_destroy( &path_list );
+}
+

 /**
   Free all contents of an entry to the function hash table
@@ -61,6 +146,7 @@ void function_destroy()
 	hash_destroy( &function );
 }

+
 void function_add( const wchar_t *name, 
 				   const wchar_t *val,
 				   const wchar_t *desc,
@@ -69,23 +155,27 @@ void function_add( const wchar_t *name,
 {
 	int i;
 	wchar_t *cmd_end;
+	function_data_t *d;
 	
-
-	if( function_exists( name ) )
-		function_remove( name );
+	function_remove( name );
 	
-	function_data_t *d = malloc( sizeof( function_data_t ) );
+	d = malloc( sizeof( function_data_t ) );
+	d->definition_offset = parse_util_lineno( parser_get_buffer(), current_block->tok_pos );
 	d->cmd = wcsdup( val );
+	
 	cmd_end = d->cmd + wcslen(d->cmd)-1;
 	while( (cmd_end>d->cmd) && wcschr( L"\n\r\t ", *cmd_end ) )
 	{
-		*cmd_end--=0;
+		*cmd_end-- = 0;
 	}
 	
 	d->desc = desc?wcsdup( desc ):0;
 	d->is_binding = is_binding;
+	d->definition_file = intern(reader_current_filename());
+	d->is_autoload = is_autoload;
+		
 	hash_put( &function, intern(name), d );
-
+	
 	for( i=0; i<al_get_count( events ); i++ )
 	{
 		event_add_handler( (event_t *)al_get( events, i ) );
@@ -95,34 +185,42 @@ void function_add( const wchar_t *name,

 int function_exists( const wchar_t *cmd )
 {
+	if( parser_is_reserved(cmd) )
+		return 0;
+	
+	load( cmd );
 	return (hash_get(&function, cmd) != 0 );
 }

 void function_remove( const wchar_t *name )
 {
 	void *key;
+	const void *dv;
 	function_data_t *d;
-
 	event_t ev;
-	ev.type=EVENT_ANY;
-	ev.function_name=name;	
-	event_remove( &ev );

 	hash_remove( &function,
 				 name,
 				 (const void **) &key,
-				 (const void **)&d );
+				 &dv );

-	if( !d )
+	d=(function_data_t *)dv;
+	
+	if( !key )
 		return;

+	ev.type=EVENT_ANY;
+	ev.function_name=name;	
+	event_remove( &ev );
+
 	clear_function_entry( key, d );
 }
 	
 const wchar_t *function_get_definition( const wchar_t *argv )
 {
-	function_data_t *data = 
-		(function_data_t *)hash_get( &function, argv );
+	function_data_t *data;
+	load( argv );
+	data = (function_data_t *)hash_get( &function, argv );
 	if( data == 0 )
 		return 0;
 	return data->cmd;
@@ -130,18 +228,20 @@ const wchar_t *function_get_definition( const wchar_t *argv )
 	
 const wchar_t *function_get_desc( const wchar_t *argv )
 {
-	function_data_t *data = 
-		(function_data_t *)hash_get( &function, argv );
+	function_data_t *data;
+	load( argv );
+	data = (function_data_t *)hash_get( &function, argv );
 	if( data == 0 )
 		return 0;
 	
-	return data->desc?data->desc:data->cmd;
+	return _(data->desc);
 }

 void function_set_desc( const wchar_t *name, const wchar_t *desc )
 {
-	function_data_t *data = 
-		(function_data_t *)hash_get( &function, name );
+	function_data_t *data;
+	load( name );
+	data = (function_data_t *)hash_get( &function, name );
 	if( data == 0 )
 		return;

@@ -164,6 +264,8 @@ static void get_names_internal( const void *key,

 void function_get_names( array_list_t *list, int get_hidden )
 {
+	autoload_names( list, get_hidden );
+	
 	if( get_hidden )
 		hash_get_keys( &function, list );
 	else
@@ -171,3 +273,26 @@ void function_get_names( array_list_t *list, int get_hidden )
 	
 }

+const wchar_t *function_get_definition_file( const wchar_t *argv )
+{
+	function_data_t *data;
+	load( argv );
+	data = (function_data_t *)hash_get( &function, argv );
+	if( data == 0 )
+		return 0;
+	
+	return data->definition_file;
+}
+
+
+int function_get_definition_offset( const wchar_t *argv )
+{
+	function_data_t *data;
+	load( argv );
+	data = (function_data_t *)hash_get( &function, argv );
+	if( data == 0 )
+		return -1;
+	
+	return data->definition_offset;
+}
+
--- a/function.h
+++ b/function.h
@@ -69,4 +69,15 @@ int function_exists( const wchar_t *name );
 void function_get_names( array_list_t *list, 
 						 int get_hidden );

+/**
+   Returns tha absolute path of the file where the specified function
+   was defined. Returns 0 if the file was defined on the commandline.
+*/
+const wchar_t *function_get_definition_file( const wchar_t *name );
+
+/**
+   Returns the linenumber where the definition of the specified function started
+*/
+int function_get_definition_offset( const wchar_t *name );
+
 #endif
--- a/halloc.c
+++ b/halloc.c
@@ -0,0 +1,173 @@
+/** \file halloc.c
+
+    A hierarchical memory allocation system. Works just like talloc
+	used in Samba, except that an arbitrary block allocated with
+	malloc() can be registered to be freed by halloc_free.
+
+*/
+
+#include "config.h"
+
+
+#include <stdlib.h>
+#include <unistd.h>
+
+#include "fallback.h"
+#include "util.h"
+
+#include "common.h"
+#include "halloc.h"
+
+#define HALLOC_BLOCK_SIZE 128
+#define HALLOC_SCRAP_SIZE 16
+
+#ifdef HALLOC_DEBUG
+static int child_count=0;
+static int child_size=0;
+static int alloc_count =0;
+static int alloc_spill = 0;
+static pid_t pid=0;
+static int parent_count=0;
+#endif
+
+typedef struct halloc
+{
+	array_list_t children;
+	void *scratch;
+	size_t scratch_free;
+	long long data[0];
+}
+	halloc_t;
+
+static halloc_t *halloc_from_data( void *data )
+{
+	return (halloc_t *)(((char *)data) - sizeof( halloc_t ) );
+}
+
+static void late_free( void *data)
+{
+}
+
+#ifdef HALLOC_DEBUG
+static void woot()
+{
+	if( getpid() == pid )
+	{
+		debug( 1, L"%d parents, %d children with average child size of %.2f bytes caused %d allocs, average spill of %.2f bytes", 
+			   parent_count, child_count, (double)child_size/child_count,
+			   parent_count+alloc_count, (double)alloc_spill/(parent_count+alloc_count) );				
+	}
+}
+#endif
+
+void *halloc( void *context, size_t size )
+{	
+	halloc_t *me, *parent;
+	if( context )
+	{
+		void *res;
+		
+#ifdef HALLOC_DEBUG
+			
+		if( !child_count )
+		{
+			pid = getpid();
+			atexit( woot );
+		}
+		
+		child_count++;
+		child_size += size;
+#endif	
+		parent = halloc_from_data( context );
+		if( size <= parent->scratch_free )
+		{
+			res = parent->scratch;
+			parent->scratch_free -= size;
+			parent->scratch = ((char *)parent->scratch)+size;
+		}
+		else
+		{
+
+#ifdef HALLOC_DEBUG
+			alloc_count++;
+#endif	
+		
+			if( parent->scratch_free < HALLOC_SCRAP_SIZE )
+			{
+#ifdef HALLOC_DEBUG
+				alloc_spill += parent->scratch_free;
+#endif
+				res = calloc( 1, size + HALLOC_BLOCK_SIZE );
+				parent->scratch = (char *)res + size;
+				parent->scratch_free = HALLOC_BLOCK_SIZE;
+			}
+			else
+			{
+				res = calloc( 1, size );
+			}
+			al_push( &parent->children, &late_free );
+			al_push( &parent->children, res );
+			
+		}
+		return res;
+	
+	}
+	else
+	{
+		me = (halloc_t *)calloc( 1, sizeof(halloc_t) + size + HALLOC_BLOCK_SIZE );
+		
+		if( !me )
+			return 0;
+#ifdef HALLOC_DEBUG
+		parent_count++;
+#endif		
+		me->scratch = ((char *)me) + sizeof(halloc_t) + size;
+		me->scratch_free = HALLOC_BLOCK_SIZE;
+		
+		al_init( &me->children );
+		return &me->data;
+	}
+}
+
+void halloc_register_function( void *context, void (*func)(void *), void *data )
+{
+	halloc_t *me;
+	if( !context )
+		return;
+	
+	me = halloc_from_data( context );
+	al_push( &me->children, func );
+	al_push( &me->children, data );
+}
+
+void halloc_free( void *context )
+{
+	halloc_t *me;
+	int i;
+	
+	if( !context )
+		return;
+
+	
+	me = halloc_from_data( context );
+
+#ifdef HALLOC_DEBUG
+	alloc_spill += me->scratch_free;
+#endif
+	for( i=0; i<al_get_count(&me->children); i+=2 )
+	{
+		void (*func)(void *) = (void (*)(void *))al_get( &me->children, i );
+		void * data = (void *)al_get( &me->children, i+1 );
+		if( func != &late_free )
+			func( data );
+	}
+	for( i=0; i<al_get_count(&me->children); i+=2 )
+	{
+		void (*func)(void *) = (void (*)(void *))al_get( &me->children, i );
+		void * data = (void *)al_get( &me->children, i+1 );
+		if( func == &late_free )
+			free( data );
+	}
+	al_destroy( &me->children );
+	free(me);
+}
--- a/halloc.h
+++ b/halloc.h
@@ -0,0 +1,48 @@
+/** \file halloc.h 
+
+    A hierarchical memory allocation system. Works mostly like talloc
+	used in Samba, except that an arbitrary block allocated with
+	malloc() can be registered to be freed by halloc_free.
+
+*/
+
+#ifndef FISH_HALLOC_H
+#define FISH_HALLOC_H
+
+/**
+   Allocate new memory using specified parent memory context. Context
+   _must_ be either 0 or the result of a previous call to halloc.
+
+   If \c context is null, the resulting block is a root block, and
+   must be freed with a call to halloc_free().
+
+   If \c context is not null, context must be a halloc root block. the
+   resulting memory block is a child context, and must never be
+   explicitly freed, it will be automatically freed whenever the
+   parent context is freed. Child blocks can also never be used as the
+   context in calls to halloc_register_function, halloc_free, etc.
+*/
+void *halloc( void *context, size_t size );
+
+/**
+   Make the specified function run whenever context is free'd, using data as argument.
+
+   \c context a halloc root block
+*/
+void halloc_register_function( void *context, void (*func)(void *), void *data );
+
+/**
+   Free memory context and all children contexts. Only root contexts
+   may be freed explicitly.
+
+   All functions registered with halloc_register_function are run in
+   the order they where added. Afterwards, all memory allocated using
+   halloc itself is free'd.
+
+   \c context a halloc root block
+*/
+void halloc_free( void *context );
+
+
+#endif
+
--- a/halloc_util.c
+++ b/halloc_util.c
@@ -0,0 +1,97 @@
+/** \file halloc.c
+
+    A hierarchical memory allocation system. Works just like talloc
+	used in Samba, except that an arbitrary block allocated with
+	malloc() can be registered to be freed by halloc_free.
+
+*/
+
+#include "config.h"
+
+
+#include <stdlib.h>
+#include <unistd.h>
+#include <string.h>
+
+#include "fallback.h"
+#include "util.h"
+
+#include "common.h"
+#include "halloc.h"
+
+void *global_context=0;
+
+void halloc_util_init()
+{
+	global_context = halloc( 0, 0 );
+}
+
+void halloc_util_destroy()
+{
+	halloc_free( global_context );
+}
+
+array_list_t *al_halloc( void *context )
+{
+	array_list_t *res = halloc( context, sizeof( array_list_t ) );
+	if( !res )
+		die_mem();
+	al_init( res );
+	halloc_register_function( context, (void (*)(void *)) &al_destroy, res );
+	return res;
+}
+
+string_buffer_t *sb_halloc( void *context )
+{
+	string_buffer_t *res = halloc( context, sizeof( string_buffer_t ) );
+	if( !res )
+		die_mem();
+	sb_init( res );
+	halloc_register_function( context, (void (*)(void *)) &sb_destroy, res );
+	return res;
+}
+
+static void halloc_passthrough( void *f )
+{
+	void (*func)() = (void (*)() )f;
+	func();
+}
+
+void halloc_register_function_void( void *context, void (*func)() )
+{
+	halloc_register_function( context, &halloc_passthrough, (void *)func );
+}
+
+void *halloc_register( void *context, void *data )
+{
+	if( !data )
+		return 0;
+	
+	halloc_register_function( context, &free, data );
+	return data;
+}
+
+wchar_t *halloc_wcsdup( void *context, wchar_t *in )
+{
+	size_t len=wcslen(in);
+	wchar_t *out = halloc( context, sizeof( wchar_t)*(len+1));
+	
+	if( out == 0 )
+	{
+		die_mem();
+	}
+	memcpy( out, in, sizeof( wchar_t)*(len+1));
+	return out;
+}
+
+wchar_t *halloc_wcsndup( void * context, const wchar_t *in, int c )
+{
+	wchar_t *res = halloc( context, sizeof(wchar_t)*(c+1) );
+	if( res == 0 )
+	{
+		die_mem();
+	}
+	wcslcpy( res, in, c+1 );
+	res[c] = L'\0';	
+	return res;	
+}
--- a/halloc_util.h
+++ b/halloc_util.h
@@ -0,0 +1,66 @@
+/**
+   \file halloc_util.h
+
+   Various halloc-related utility functions.
+*/
+
+#ifndef FISH_HALLOC_UTIL_H
+#define FISH_HALLOC_UTIL_H
+
+/**
+   This pointer is a valid halloc context that will be freed right
+   before program shutdown. It may be used to allocate memory that
+   should be freed when the program shuts down.
+*/
+extern void *global_context;
+
+/**
+   Create the global_context halloc object
+*/
+void halloc_util_init();
+
+/**
+   Free the global_context halloc object
+*/
+void halloc_util_destroy();
+
+/**
+   Allocate a array_list_t that will be automatically disposed of when
+   the specified context is free'd
+*/
+array_list_t *al_halloc( void *context );
+
+/**
+   Allocate a string_buffer_t that will be automatically disposed of
+   when the specified context is free'd
+*/
+string_buffer_t *sb_halloc( void *context );
+
+/**
+   Register the specified function to run when the specified context
+   is free'd. This function is related to halloc_register_function,
+   but the specified function dowes not take an argument.
+*/
+void halloc_register_function_void( void *context, void (*func)() );
+
+/**
+   Free the memory pointed to by \c data when the memory pointed to by
+   \c context is free:d. Note that this will _not_ turn the specified
+   memory area into a valid halloc context. Only memory areas created
+   using a call to halloc( 0, size ) can be used as a context.
+*/
+void *halloc_register( void *context, void *data );
+
+/**
+   Make a copy of the specified string using memory allocated using
+   halloc and the specified context
+*/
+wchar_t *halloc_wcsdup( void *context, wchar_t *str );
+
+/**
+   Make a copy of the specified substring using memory allocated using
+   halloc and the specified context
+*/
+wchar_t *halloc_wcsndup( void * context, const wchar_t *in, int c );
+
+#endif
--- a/highlight.c
+++ b/highlight.c
@@ -12,12 +12,16 @@
 #include <signal.h>

 #include "config.h"
+
+#include "fallback.h"
 #include "util.h"
+
 #include "wutil.h"
 #include "highlight.h"
 #include "tokenizer.h"
 #include "proc.h"
 #include "parser.h"
+#include "parse_util.h"
 #include "builtin.h"
 #include "function.h"
 #include "env.h"
@@ -129,10 +133,10 @@ void highlight_shell( wchar_t * buff,
 					/*
 					  Command. First check that the command actually exists.
 					*/
-					wchar_t *cmd = 
-						(last_type == TOK_STRING) ? 
-						expand_one(wcsdup(tok_last( &tok )),EXPAND_SKIP_SUBSHELL | EXPAND_SKIP_VARIABLES) : 
-						wcsdup(tok_last( &tok ));
+					wchar_t *cmd = expand_one( 0, 
+											   wcsdup(tok_last( &tok )),
+											   EXPAND_SKIP_SUBSHELL | EXPAND_SKIP_VARIABLES);
+					
 					if( cmd == 0 )
 					{
 						color[ tok_get_pos( &tok ) ] = HIGHLIGHT_ERROR;
@@ -144,7 +148,6 @@ void highlight_shell( wchar_t * buff,
 						int is_subcommand = 0;
 						int mark = tok_get_pos( &tok );
 						color[ tok_get_pos( &tok ) ] = HIGHLIGHT_COMMAND;
-
 						
 						if( parser_is_subcommand( cmd ) )
 						{
@@ -247,7 +250,7 @@ void highlight_shell( wchar_t * buff,
 				{
 					case TOK_STRING:
 					{
-						target = expand_one( wcsdup( tok_last( &tok ) ), EXPAND_SKIP_SUBSHELL);
+						target = expand_one( 0, wcsdup( tok_last( &tok ) ), EXPAND_SKIP_SUBSHELL);
 						/*
 						  Redirect filename may contain a subshell. 
 						  If so, it will be ignored/not flagged.
@@ -365,11 +368,11 @@ void highlight_shell( wchar_t * buff,
 	while( 1 )
 	{
 		wchar_t *begin, *end;
-		
-		if( expand_locate_subshell( subpos, 
-									&begin, 
-									&end,
-									1) <= 0)
+	
+		if( parse_util_locate_cmdsubst( subpos, 
+										(const wchar_t **)&begin, 
+										(const wchar_t **)&end,
+										1) <= 0)
 		{
 			break;
 		}
--- a/history.c
+++ b/history.c
@@ -12,13 +12,17 @@


 #include "config.h"
+
+#include "fallback.h"
 #include "util.h"
+
 #include "wutil.h"
 #include "history.h"
 #include "common.h"
 #include "reader.h"
 #include "env.h"
 #include "sanity.h"
+#include "signal.h"

 /*
  The history is implemented using a linked list. Searches are done
@@ -45,6 +49,8 @@ typedef struct
 	   The last item loaded from file
 	*/
 	ll_node_t *last_loaded;
+
+	int is_loaded;
 }
 	history_data;

@@ -82,25 +88,31 @@ static wchar_t *mode_name;
 */
 static hash_table_t history_table;

+/**
+   Flag, set to 1 once the history file has been loaded
+*/
+static int is_loaded;

 /**
-   Load history from ~/.fish_history
+   Load history from file
 */
-static void history_load( wchar_t *name )
+static void history_load()
 {
 	wchar_t *fn;
 	wchar_t *buff=0;
 	int buff_len=0;
 	FILE *in_stream;
 	hash_table_t used;
-	
-	block();
+
+	is_loaded = 1;
+		
+	signal_block();
 	hash_init2( &used, 
 				&hash_wcs_func,
 				&hash_wcs_cmp,
 				4096 );

-	fn = wcsdupcat2( env_get(L"HOME"), L"/.", name, L"_history", 0 );
+	fn = wcsdupcat2( env_get(L"HOME"), L"/.", mode_name, L"_history", 0 );
 	
 	in_stream = wfopen( fn, "r" );
 	
@@ -111,12 +123,12 @@ static void history_load( wchar_t *name )
 			int buff_read = fgetws2( &buff, &buff_len, in_stream );
 			if( buff_read == -1 )
 			{
-				debug( 1, L"The following non-fatal error occurred while reading command history from \'%ls\':", name );
+				debug( 1, L"The following non-fatal error occurred while reading command history from \'%ls\':", mode_name );
 				wperror( L"fgetws2" );
 				fclose( in_stream );
 				free( fn );
 				free( buff );
-				unblock();				
+				signal_unblock();				
 				return;
 			}

@@ -161,7 +173,7 @@ static void history_load( wchar_t *name )
 	{
 		if( errno != ENOENT )
 		{
-			debug( 1, L"The following non-fatal error occurred while reading command history from \'%ls\':", name );
+			debug( 1, L"The following non-fatal error occurred while reading command history from \'%ls\':", mode_name );
 			wperror( L"fopen" );
 		}
 		
@@ -173,7 +185,7 @@ static void history_load( wchar_t *name )
 	free( buff );
 	free( fn );
 	last_loaded = history_last;
-	unblock();
+	signal_unblock();
 }

 void history_init()
@@ -198,6 +210,7 @@ static void history_to_hash()
 	d->last=history_last;
 	d->last_loaded=last_loaded;
 	d->count=history_count;
+	d->is_loaded = is_loaded;
 	
 	hash_put( &history_table, 
 			  mode_name,
@@ -223,13 +236,14 @@ void history_set_mode( wchar_t *name )
 		history_current = history_last = curr->last;
 		last_loaded = curr->last_loaded;
 		history_count = curr->count;
+		is_loaded = curr->is_loaded;
 	}
 	else
 	{
 		history_count=0;
 		history_last = history_current = last_loaded=0;
 		mode_name = wcsdup( name );
-		history_load( name );
+		is_loaded = 0;
 	}
 	
 	past_end=1;
@@ -259,6 +273,9 @@ static void history_save()
 	/* First we save this sessions history in local variables */
 	ll_node_t *real_pos = history_last, *real_first = last_loaded;

+	if( !is_loaded )
+		return;
+	
 	if( !real_first )
 	{
 		real_first = history_current;
@@ -274,7 +291,7 @@ static void history_save()
 	history_count=0;
 	past_end=1;

-	history_load( mode_name );
+	history_load();
 	if( real_pos != 0 )
 	{
 		/* 
@@ -390,6 +407,9 @@ void history_destroy()
 */
 static ll_node_t *history_find( ll_node_t *n, const wchar_t *s )
 {
+	if( !is_loaded )
+		history_load();	
+
 	if( n == 0 )
 		return 0;
 	
@@ -406,6 +426,9 @@ void history_add( const wchar_t *str )
 {
 	ll_node_t *old_node;

+	if( !is_loaded )
+		history_load();	
+
 	if( wcslen( str ) == 0 )
 		return;
 	
@@ -460,6 +483,9 @@ static int history_test( const wchar_t *needle, const wchar_t *haystack )

 const wchar_t *history_prev_match( const wchar_t *str )
 {
+	if( !is_loaded )
+		history_load();	
+
 	if( history_current == 0 )
 		return str;
 	
@@ -481,6 +507,9 @@ const wchar_t *history_prev_match( const wchar_t *str )

 const wchar_t *history_next_match( const wchar_t *str)
 {
+	if( !is_loaded )
+		history_load();	
+
 	if( history_current == 0 )
 		return str;

@@ -507,15 +536,21 @@ void history_reset()
 */
 void history_first()
 {
-	while( history_current->prev )
-		history_current = history_current->prev;
+	if( is_loaded )
+		while( history_current->prev )
+			history_current = history_current->prev;
 	
 }

 wchar_t *history_get( int idx )
 {
-	ll_node_t *n=history_last;
+	ll_node_t *n;
 	int i;
+	if( !is_loaded )
+		history_load();	
+
+	n = history_last;
+	
 	if( idx<0)
 	{
 		debug( 1, L"Tried to access negative history index %d", idx );
--- a/history.h
+++ b/history.h
@@ -8,7 +8,8 @@
 #include <wchar.h>

 /**
-   Load history from file.
+   Init history library. The history file won't actually be loaded
+   until the first time a history search is performed.
 */
 void history_init();

--- a/init/completions/apm.fish
+++ b/init/completions/apm.fish
@@ -1,8 +0,0 @@
-#apm
-complete -f -c apm -s V -l version -d (_ "Display version and exit")
-complete -f -c apm -s v -l verbose -d (_ "Print APM info")
-complete -f -c apm -s m -l minutes -d (_ "Print time remaining")
-complete -f -c apm -s M -l monitor -d (_ "Monitor status info")
-complete -f -c apm -s S -l standby -d (_ "Request APM standby mode")
-complete -f -c apm -s s -l suspend -d (_ "Request APM suspend mode")
-complete -f -c apm -s d -l debug -d (_ "APM status debugging info")
--- a/init/completions/apropos.fish
+++ b/init/completions/apropos.fish
@@ -1,21 +0,0 @@
-
-function __fish_complete_apropos
-	if test (commandline -ct)
-		set str (commandline -ct)
-		apropos $str|sed -e "s/^\(.*$str\([^ ]*\).*\)$/$str\2\t\1/"
-	end
-end
-
-complete -xc apropos -a '(__fish_complete_apropos)' -d (_ "whatis entry")
-
-complete -c apropos -s h -l help -d (_ "Display help and exit")
-complete -f -c apropos -s d -l debug -d (_ "Print debugging info")
-complete -f -c apropos -s v -l verbose -d (_ "Verbose mode")
-complete -f -c apropos -s r -l regex -d (_ "Keyword as regex")
-complete -f -c apropos -s w -l wildcard -d (_ "Keyword as wildwards")
-complete -f -c apropos -s e -l exact -d (_ "Keyword as exactly match")
-complete -x -c apropos -s m -l system -d (_ "Search for other system")
-complete -x -c apropos -s M -l manpath -a '(echo $MANPATH)' -d (_ "Specify man path")
-complete -x -c apropos -s C -l config-file -d (_ "Specify a configuration file")
-complete -f -c apropos -s V -l version -d (_ "Display version and exit")
-
--- a/init/completions/apt-build.fish
+++ b/init/completions/apt-build.fish
@@ -1,29 +0,0 @@
-
-#apt-build
-complete -c apt-build -l help -d (_ "Display help and exit")
-complete -f -c apt-build -a update -d (_ "Update list of packages")
-complete -f -c apt-build -a upgrade -d (_ "Upgrade packages")
-complete -f -c apt-bulid -a world -d (_ "Rebuild your system")
-complete -x -c apt-build -a install -d (_ "Build and install a new package")
-complete -x -c apt-build -a source -d (_ "Download and extract a source")
-complete -x -c apt-build -a info -d (_ "Info on a package")
-complete -x -c apt-build -a remove -d (_ "Remove packages")
-complete -x -c apt-build -a clean-build -d (_ "Erase built packages")
-complete -x -c apt-build -a build-source -d (_ "Build source without install")
-complete -x -c apt-build -a clean-sources -d (_ "Clean source directories")
-complete -x -c apt-build -a update-source -d (_ "Update source and rebuild")
-complete -x -c apt-build -a update-repository -d (_ "Update the repository")
-complete -f -c apt-build -l nowrapper -d (_ "Do not use gcc wrapper")
-complete -f -c apt-build -l remove-builddep -d (_ "Remove build-dep")
-complete -f -c apt-build -l no-source -d (_ "Do not download source")
-complete -f -c apt-build -l build-dir -d (_ "Specify build-dir")
-complete -f -c apt-build -l rebuild -d (_ "Rebuild a package")
-complete -f -c apt-build -l reinstall -d (_ "Rebuild and install an installed package")
-complete -r -f -c apt-build -l build-command -d (_ "Use <command> to build")
-complete -r -c apt-build -l patch -d (_ "Apply <file> patch")
-complete -c apt-build -s p -l patch-strip -d (_ "Prefix to strip on patch")
-complete -c apt-build -s y -l yes -d (_ "Assume yes to all questions")
-complete -c apt-build -l purge -d (_ "Use purge instead of remove")
-complete -c apt-build -l noupdate -d (_ "Do not run update")
-complete -r -c apt-build -l source-list -d (_ "Specify sources.list file")
-complete -f -c apt-build -s v -l version -d (_ "Display version and exit")
--- a/init/completions/apt-cache.fish
+++ b/init/completions/apt-cache.fish
@@ -1,31 +0,0 @@
-#apt-cache
-complete -c apt-cache -s h -l help -d (_ "Display help and exit")
-complete -f -c apt-cache -a gencaches -d (_ "Build apt cache")
-complete -x -c apt-cache -a showpkg -d (_ "Show package info")
-complete -f -c apt-cache -a stats -d (_ "Show cache statistics")
-complete -x -c apt-cache -a showsrc -d (_ "Show source package")
-complete -f -c apt-cache -a dump -d (_ "Show packages in cache")
-complete -f -c apt-cache -a dumpavail -d (_ "Print available list")
-complete -f -c apt-cache -a unmet -d (_ "List unmet dependencies in cache")
-complete -x -c apt-cache -a show -d (_ "Display package record")
-complete -x -c apt-cache -a search -d (_ "Search packagename by REGEX")
-complete -c apt-cache -l full -a search -d (_ "Search full package name")
-complete -x -c apt-cache -l names-only -a search -d (_ "Search packagename only")
-complete -x -c apt-cache -a depends -d (_ "List dependencies for the package")
-complete -x -c apt-cache -a rdepends -d (_ "List reverse dependencies for the package")
-complete -x -c apt-cache -a pkgnames -d (_ "Print package name by prefix")
-complete -x -c apt-cache -a dotty -d (_ "Generate dotty output for packages")
-complete -x -c apt-cache -a policy -d (_ "Debug preferences file")
-complete -r -c apt-cache -s p -l pkg-cache -d (_ "Select file to store package cache")
-complete -r -c apt-cache -s s -l src-cache -d (_ "Select file to store source cache")
-complete -f -c apt-cache -s q -l quiet -d (_ "Quiet mode")
-complete -f -c apt-cache -s i -l important -d (_ "Print important dependencies")
-complete -f -c apt-cache -s a -l all-versions -d (_ "Print full records")
-complete -f -c apt-cache -s g -l generate -d (_ "Auto-gen package cache")
-complete -f -c apt-cache -l all-names -d (_ "Print all names")
-complete -f -c apt-cache -l recurse -d (_ "Dep and rdep recursive")
-complete -f -c apt-cache -l installed -d (_ "Limit to installed")
-complete -f -c apt-cache -s v -l version -d (_ "Display version and exit")
-complete -r -c apt-cache -s c -l config-file -d (_ "Specify config file")
-complete -x -c apt-cache -s o -l option -d (_ "Specify options")
-
--- a/init/completions/apt-cdrom.fish
+++ b/init/completions/apt-cdrom.fish
@@ -1,13 +0,0 @@
-#apt-cdrom
-complete -c apt-cdrom -s h -l help -d (_ "Display help and exit")
-complete -r -c apt-cdrom -a add -d (_ "Add new disc to source list")
-complete -x -c apt-cdrom -a ident -d (_ "Report identity of disc")
-complete -r -c apt-cdrom -s d -l cdrom -d (_ "Mount point")
-complete -f -c apt-cdrom -s r -l rename -d (_ "Rename a disc")
-complete -f -c apt-cdrom -s m -l no-mount -d (_ "No mounting")
-complete -f -c apt-cdrom -s f -l fast -d (_ "Fast copy")
-complete -f -c apt-cdrom -s a -l thorough -d (_ "Thorough package scan")
-complete -f -c apt-cdrom -s n -l no-act -d (_ "No changes")
-complete -f -c apt-cdrom -s v -l version -d (_ "Display version and exit")
-complete -r -c apt-cdrom -s c -l config-file -d (_ "Specify config file")
-complete -x -c apt-cdrom -s o -l option -d (_ "Specify options")
--- a/init/completions/apt-config.fish
+++ b/init/completions/apt-config.fish
@@ -1,7 +0,0 @@
-#apt-config
-complete -c apt-config -s h -l help -d (_ "Display help and exit")
-complete -c apt-config -a shell -d (_ "Access config file from shell")
-complete -f -c apt-config -a dump -d (_ "Dump contents of config file")
-complete -f -c apt-config -s v -l version -d (_ "Display version and exit")
-complete -r -c apt-config -s c -l config-file -d (_ "Specify config file")
-complete -x -c apt-config -s o -l option -d (_ "Specify options")
--- a/init/completions/apt-extracttemplates.fish
+++ b/init/completions/apt-extracttemplates.fish
@@ -1,7 +0,0 @@
-
-#apt-extracttemplates
-complete -c apt-extracttemplates -s h -l help -d (_ "Display help and exit")
-complete -r -c apt-extracttemplates -s t -d (_ "Set temp dir")
-complete -r -c apt-extracttemplates -s c -d (_ "Specifiy config file")
-complete -r -c apt-extracttemplates -s o -d (_ "Specify options")
-
--- a/init/completions/apt-file.fish
+++ b/init/completions/apt-file.fish
@@ -1,17 +0,0 @@
-#apt-file
-complete -c apt-file -s h -l help -d (_ "Display help and exit")
-complete -x -c apt-file -a update -d (_ "Resync package contents from source")
-complete -r -c apt-file -a search -d (_ "Search package containing pattern")
-complete -r -c apt-file -a list -d (_ "List contents of a package matching pattern")
-complete -x -c apt-file -a purge -d (_ "Remove all gz files from cache")
-complete -r -c apt-file -s c -l cache -d (_ "Set cache dir")
-complete -f -c apt-file -s v -l verbose -d (_ "Verbose mode")
-complete -c apt-file -s d -l cdrom-mount -d (_ "Use cdrom-mount-point")
-complete -f -c apt-file -s i -l ignore-case -d (_ "Do not expand pattern")
-complete -f -c apt-file -s x -l regexp -d (_ "Pattern is regexp")
-complete -f -c apt-file -s V -l version -d (_ "Display version and exit")
-complete -f -c apt-file -s a -l architecture -d (_ "Set arch")
-complete -r -c apt-file -s s -l sources-list -a "(ls /etc/apt)" -d (_ "Set sources.list file")
-complete -f -c apt-file -s l -l package-only -d (_ "Only display package name")
-complete -f -c apt-file -s F -l fixed-string -d (_ "Do not expand pattern")
-complete -f -c apt-file -s y -l dummy -d (_ "Run in dummy mode")
--- a/init/completions/apt-ftparchive.fish
+++ b/init/completions/apt-ftparchive.fish
@@ -1,17 +0,0 @@
-#apt-ftparchive
-complete -c apt-ftparchive -s h -l help -d (_ "Display help and exit")
-complete -f -c apt-ftparchive -a packages -d (_ "Generate package from source")
-complete -f -c apt-ftparchive -a sources -d (_ "Generate source index file")
-complete -f -c apt-ftparchive -a contents -d (_ "Generate contents file")
-complete -f -c apt-ftparchive -a release -d (_ "Generate release file")
-complete -f -c apt-ftparchive -a clean -d (_ "Remove records")
-complete -f -c apt-ftparchive -l md5 -d (_ "Generate MD5 sums")
-complete -f -c apt-ftparchive -s d -l db -d (_ "Use a binary db")
-complete -f -c apt-ftparchive -s q -l quiet -d (_ "Quiet mode")
-complete -f -c apt-ftparchive -l delink -d (_ "Perform delinking")
-complete -f -c apt-ftparchive -l contents -d (_ "Perform contents generation")
-complete -c apt-ftparchive -s s -l source-override -d (_ "Use source override")
-complete -f -c apt-ftparchive -l readonly -d (_ "Make caching db readonly")
-complete -f -c apt-ftparchive -s v -l version -d (_ "Display version and exit")
-complete -r -c apt-ftparchive -s c -l config-file -d (_ "Use config file")
-complete -r -c apt-ftparchive -s o -l option -d (_ "Set config options")
--- a/init/completions/apt-get.fish
+++ b/init/completions/apt-get.fish
@@ -1,64 +0,0 @@
-#completion for apt-get
-
-function __fish_apt_no_subcommand -d (_ 'Test if apt has yet to be given the subcommand')
-	for i in (commandline -opc)
-		if contains -- $i update upgrade dselect-upgrade dist-upgrade install remove source build-dep check clean autoclean
-			return 1
-		end
-	end
-	return 0
-end
-
-function __fish_apt_use_package -d (_ 'Test if apt command should have packages as potential completion')
-	for i in (commandline -opc)
-		if contains -- $i contains install remove build-dep
-			return 0
-		end
-	end
-	return 1
-end
-
-complete -c apt-get -n '__fish_apt_use_package' -a '(__fish_print_packages)' -d (_ 'Package')
-
-complete -c apt-get -s h -l help -d (_ 'Display help and exit')
-complete -f -n '__fish_apt_no_subcommand' -c apt-get -a 'update' -d (_ 'Update sources')
-complete -f -n '__fish_apt_no_subcommand' -c apt-get -a 'upgrade' -d (_ 'Upgrade or install newest packages')
-complete -f -n '__fish_apt_no_subcommand' -c apt-get -a 'dselect-upgrade' -d (_ 'Use with dselect front-end')
-complete -f -n '__fish_apt_no_subcommand' -c apt-get -a 'dist-upgrade' -d (_ 'Distro upgrade')
-complete -f -n '__fish_apt_no_subcommand' -c apt-get -a 'install' -d (_ 'Install one or more packages')
-complete -f -n '__fish_apt_no_subcommand' -c apt-get -a 'remove' -d (_ 'Remove one or more packages')
-complete -f -n '__fish_apt_no_subcommand' -c apt-get -a 'source' -d (_ 'Fetch source packages')
-complete -f -n '__fish_apt_no_subcommand' -c apt-get -a 'build-dep' -d (_ 'Install/remove packages for dependencies')
-complete -f -n '__fish_apt_no_subcommand' -c apt-get -a 'check' -d (_ 'Update cache and check dependencies')
-complete -f -n '__fish_apt_no_subcommand' -c apt-get -a 'clean' -d (_ 'Clean local caches and packages')
-complete -f -n '__fish_apt_no_subcommand' -c apt-get -a 'autoclean' -d (_ 'Clean packages no longer be downloaded')
-complete -c apt-get -s d -l download-only -d (_ 'Download Only')
-complete -c apt-get -s f -l fix-broken -d (_ 'Correct broken dependencies')
-complete -c apt-get -s m -l fix-missing -d (_ 'Ignore missing packages')
-complete -c apt-get -l no-download -d (_ 'Disable downloading packages')
-complete -c apt-get -s q -l quiet -d (_ 'Quiet mode')
-complete -c apt-get -s s -l simulate -d (_ 'Perform a simulation')
-complete -c apt-get -s y -l assume-yes -d (_ 'Automatic yes to prompts')
-complete -c apt-get -s u -l show-upgraded -d (_ 'Show upgraded packages')
-complete -c apt-get -s V -l verbose-versions -d (_ 'Show full versions for packages')
-complete -c apt-get -s b -l compile -d (_ 'Compile source packages')
-complete -c apt-get -s b -l build -d (_ 'Compile source packages')
-complete -c apt-get -l ignore-hold -d (_ 'Ignore package Holds')
-complete -c apt-get -l no-upgrade -d (_ "Do not upgrade packages")
-complete -c apt-get -l force-yes -d (_ 'Force yes')
-complete -c apt-get -l print-uris -d (_ 'Print the URIs')
-complete -c apt-get -l purge -d (_ 'Use purge instead of remove')
-complete -c apt-get -l reinstall -d (_ 'Reinstall packages')
-complete -c apt-get -l list-cleanup -d (_ 'Erase obsolete files')
-complete -c apt-get -s t -l target-release -d (_ 'Control default input to the policy engine')
-complete -c apt-get -l trivial-only -d (_ 'Only perform operations that are trivial')
-complete -c apt-get -l no-remove -d (_ 'Abort if any packages are to be removed')
-complete -c apt-get -l only-source -d (_ 'Only accept source packages')
-complete -c apt-get -l diff-only -d (_ 'Download only diff file')
-complete -c apt-get -l tar-only -d (_ 'Download only tar file')
-complete -c apt-get -l arch-only -d (_ 'Only process arch-dependant build-dependencies')
-complete -c apt-get -l allow-unauthenticated -d (_ 'Ignore non-authenticated packages')
-complete -c apt-get -s v -l version -d (_ 'Display version and exit')
-complete -r -c apt-get -s c -l config-file -d (_ 'Specify a config file')
-complete -r -c apt-get -s o -l option -d (_ 'Set a config option')
-
--- a/init/completions/apt-key.fish
+++ b/init/completions/apt-key.fish
@@ -1,5 +0,0 @@
-#apt-key
-complete -r -c apt-key -a add -d (_ "Add a new key")
-complete -f -c apt-key -a del -d (_ "Remove a key")
-complete -f -c apt-key -a list -d (_ "List trusted keys")
-
--- a/init/completions/apt-listbugs.fish
+++ b/init/completions/apt-listbugs.fish
@@ -1,25 +0,0 @@
-#apt-listbugs
-complete -c apt-listbugs -s h -l help -d (_ "Display help and exit")
-complete -f -c apt-listbugs -s s -l severity -a "critical grave"  -d (_ "Set severity")
-complete -f -c apt-listbugs -s T -l tag -d (_ "Tags you want to see")
-complete -f -c apt-listbugs -s S -l stats -a "outstanding 'pending upload' resolved done open" -d (_ "Bug-status you want to see")
-complete -f -c apt-listbugs -s l -l showless -d (_ "Ignore bugs in your system")
-complete -f -c apt-listbugs -s g -l showgreater -d (_ "Ignore newer bugs than upgrade packages")
-complete -f -c apt-listbugs -s D -l show-downgrade -d (_ "Bugs for downgrade packages")
-complete -f -c apt-listbugs -s H -l hostname -a "osdn.debian.or.jp" -d (_ "Bug Tracking system")
-complete -f -c apt-listbugs -s p -l port -d (_ "Specify port for web interface")
-complete -f -c apt-listbugs -s R -l release-critical -d (_ "Use daily bug report")
-complete -f -c apt-listbugs -s I -l index -d (_ "Use the raw index.db")
-complete -f -c apt-listbugs -s X -l indexdir -d (_ "Specify index dir")
-complete -f -c apt-listbugs -s P -l pin-priority -d (_ "Specify Pin-Priority value")
-complete -f -c apt-listbugs -l title -d (_ "Specify the title of rss")
-complete -f -c apt-listbugs -s f -l force-download -d (_ "Retrieve fresh bugs")
-complete -f -c apt-listbugs -s q -l quiet -d (_ "Do not display progress bar")
-complete -f -c apt-listbugs -s c -l cache-dir -a "/var/cache/apt-listbugs/" -d (_ "Specify local cache dir")
-complete -f -c apt-listbugs -s t -l timer -d (_ "Specify the expire cache timer")
-complete -c apt-listbugs -s C -l aptconf -d (_ "Specify apt config file")
-complete -f -c apt-listbugs -s y -l force-yes -d (_ "Assume yes to all questions")
-complete -f -c apt-listbugs -s n -l force-no -d (_ "Assume no to all questions")
-complete -c apt-listbugs -a list -d (_ "List bugs from packages")
-complete -c apt-listbugs -a rss -d (_ "List bugs in rss format")
-
--- a/init/completions/apt-listchanges.fish
+++ b/init/completions/apt-listchanges.fish
@@ -1,13 +0,0 @@
-#apt-listchanges
-complete -c apt-listchanges -l help -d (_ "Display help and exit")
-complete -c apt-listchanges -l apt -d (_ "Read filenames from pipe")
-complete -f -c apt-listchanges -s v -l verbose -d (_ "Verbose mode")
-complete -f -c apt-listchanges -s f -l frontend -a "pager browser xterm-pager xterm-browser text mail none" -d (_ "Select fronend interface")
-complete -r -f -c apt-listchanges -l email-address -d (_ "Specify email address")
-complete -f -c apt-listchanges -s c -l confirm -d (_ "Ask confirmation")
-complete -f -c apt-listchanges -s a -l all -d (_ "Display all changelogs")
-complete -r -c apt-listchanges -l save_seen -d (_ "Avoid changelogs from db in named file")
-complete -r -f -c apt-listchanges -l which -a "news changelogs both" -d (_ "Select display")
-complete -f -c apt-listchanges -s h -l headers -d (_ "Insert header")
-complete -f -c apt-listchanges -l debug -d (_ "Display debug info")
-complete -r -c apt-listchanges -l profile -d (_ "Select an option profile")
--- a/init/completions/apt-move.fish
+++ b/init/completions/apt-move.fish
@@ -1,22 +0,0 @@
-#apt-move
-complete -c apt-move -a get -d (_ "Generate master file")
-complete -c apt-move -a getlocal -d (_ "Alias for 'get'")
-complete -f -c apt-move -a move -d (_ "Move packages to local tree")
-complete -f -c apt-move -a delete -d (_ "Delete obsolete package files")
-complete -f -c apt-move -a packages -d (_ "Build new local files")
-complete -f -c apt-move -a fsck -d (_ "Rebuild index files")
-complete -f -c apt-move -a update -d (_ "Move packages from cache to local mirror")
-complete -f -c apt-move -a local -d (_ "Alias for 'move delete packages'")
-complete -f -c apt-move -a localupdate -d (_ "Alias for 'update'")
-complete -f -c apt-move -a mirror -d (_ "Download package missing from mirror")
-complete -f -c apt-move -a sync -d (_ "Sync packages installed")
-complete -f -c apt-move -a exclude -d 'test $LOCALDIR/.exclude file'
-complete -c apt-move -a movefile -d (_ "Move file specified on commandline")
-complete -f -c apt-move -a listbin -d (_ "List packags that may serve as input to mirrorbin or mirrorsource" )
-complete -f -c apt-move -a mirrorbin -d (_ "Fetch package from STDIN")
-complete -f -c apt-move -a mirrorsrc -d (_ "Fetch source package from STDIN")
-complete -f -c apt-move -s a -d (_ "Process all packages")
-complete -c apt-move -s c -d (_ "Use specific conffile")
-complete -f -c apt-move -s f -d (_ "Force deletion")
-complete -f -c apt-move -s q -d (_ "Suppresses normal output")
-complete -f -c apt-move -s t -d (_ "Test run")
--- a/init/completions/apt-proxy-import.fish
+++ b/init/completions/apt-proxy-import.fish
@@ -1,10 +0,0 @@
-#apt-proxy-import
-complete -c apt-proxy-import -s h -l help -d (_ 'Display help and exit')
-complete -f -c apt-proxy-import -s V -l version -d (_ 'Display version and exit')
-complete -f -c apt-proxy-import -s v -l verbose -d (_ 'Verbose mode')
-complete -f -c apt-proxy-import -s q -l quiet -d (_ 'No message to STDOUT')
-complete -f -c apt-proxy-import -s r -l recursive -d (_ 'Recurse into subdir')
-complete -r -c apt-proxy-import -s i -l import-dir -a '(ls -Fp|grep /$)' -d (_ 'Dir to import')
-complete -r -c apt-proxy-import -s u -l user -a '(__fish_complete_users)' -d (_ 'Change to user')
-complete -r -c apt-proxy-import -s d -l debug -d (_ 'Debug level[default 0]')
-
--- a/init/completions/apt-rdepends.fish
+++ b/init/completions/apt-rdepends.fish
@@ -1,13 +0,0 @@
-#apt-rdepends
-complete -c apt-rdepends -l help -d (_ "Display help and exit")
-complete -f -c apt-rdepends -s b -l build-depends -d (_ "Show bulid dependencies")
-complete -f -c apt-rdepends -s d -l dotty -d (_ "Generate a dotty graph")
-complete -f -c apt-rdepends -s p -l print-state -d (_ "Show state of dependencies")
-complete -f -c apt-rdepends -s r -l reverse -d (_ "List packages depending on")
-complete -r -f -c apt-rdepends -s f -l follow -d (_ "Comma-separated list of dependancy types to follow recursively")
-complete -r -f -c apt-rdepends -s s -l show -d (_ "Comma-separated list of dependancy types to show")
-complete -r -f -c apt-rdepends -l state-follow -d (_ "Comma-separated list of package installation states to follow recursively")
-complete -r -f -c apt-rdepends -l state-show -d (_ "Comma-separated list of package installation states to show")
-complete -f -c apt-rdepends -l man -d (_ "Display man page")
-complete -f -c apt-rdepends -l version -d (_ "Display version and exit")
-
--- a/init/completions/apt-setup.fish
+++ b/init/completions/apt-setup.fish
@@ -1,4 +0,0 @@
-#apt-setup
-complete -c apt-setup -a probe -d (_ "Probe a CD")
-complete -c apt-setup -s N -d (_ "Run in noninteractive mode")
-
--- a/init/completions/apt-show-source.fish
+++ b/init/completions/apt-show-source.fish
@@ -1,10 +0,0 @@
-#apt-show-source
-complete -c apt-show-source -s h -l help -d (_ 'Display help and exit')
-complete -r -c apt-show-source -l status-file -d (_ 'Read package from file') -f
-complete -r -c apt-show-source -o stf -d (_ 'Read package from file') -f
-complete -r -c apt-show-source -l list-dir -a '(ls -Fp .|grep /$) /var/lib/apt/lists' -d (_ 'Specify APT list dir')
-complete -r -c apt-show-source -o ld -a '(ls -Fp .|grep /$) /var/lib/apt/lists' -d (_ 'Specify APT list dir')
-complete -r -c apt-show-source -s p -l package -a '(apt-cache pkgnames)' -d (_ 'List PKG info')
-complete -f -c apt-show-source -l version-only -d (_ 'Display version and exit')
-complete -f -c apt-show-source -s a -l all -d (_ 'Print all source packages with version')
-complete -f -c apt-show-source -s v -l verbose -d (_ 'Verbose mode')
--- a/init/completions/apt-show-versions.fish
+++ b/init/completions/apt-show-versions.fish
@@ -1,14 +0,0 @@
-#apt-show-versions
-complete -c apt-show-source -s h -l help -d (_ 'Display help and exit')
-complete -r -c apt-show-versions -s p -l packages -a '(apt-cache pkgnames)' -d (_ 'Print PKG versions')
-complete -f -c apt-show-versions -s r -l regex -d (_ 'Using regex')
-complete -f -c apt-show-versions -s u -l upgradeable -d (_ 'Print only upgradeable packages')
-complete -f -c apt-show-versions -s a -l allversions -d (_ 'Print all versions')
-complete -f -c apt-show-versions -s b -l brief -d (_ 'Print package name/distro')
-complete -f -c apt-show-versions -s v -l verbose -d (_ 'Print verbose info')
-complete -f -c apt-show-versions -s i -l initialize -d (_ 'Init or update cache only')
-complete -r -c apt-show-versions -l status-file -d (_ 'Read package from file')
-complete -r -c apt-show-versions -o stf -d (_ 'Read package from file')
-complete -r -c apt-show-versions -l list-dir -a '(ls -Fp .|grep /$) /var/lib/apt/lists /var/state/apt/lists' -d (_ 'Specify APT list dir')
-complete -r -c apt-show-versions -o ld -a '(ls -Fp .|grep /$) /var/lib/apt/lists /var/state/apt/lists' -d (_ 'Specify APT list dir')
-
--- a/init/completions/apt-sortpkgs.fish
+++ b/init/completions/apt-sortpkgs.fish
@@ -1,7 +0,0 @@
-#apt-sortpkgs
-complete -c apt-sortpkgs -s h -l help -d (_ "Display help and exit")
-complete -f -c apt-sortpkgs -s s -l source -d (_ "Use source index field")
-complete -f -c apt-sortpkgs -s v -l version -d (_ "Display version and exit")
-complete -r -c apt-sortpkgs -s c -l conf-file -d (_ "Specify conffile")
-complete -r -f -c apt-sortpkgs -s o -l option -d (_ "Set config options")
-
--- a/init/completions/apt-spy.fish
+++ b/init/completions/apt-spy.fish
@@ -1,20 +0,0 @@
-#apt-spy
-complete -c apt-spy -s h -d (_ "Display help and exit")
-complete -f -c apt-spy -s d -a "stable testing unstable" -d (_ "Debian distribtion")
-complete -f -c apt-spy -s a -a "Africa Asia Europe North-America Oceania South-America" -d (_ "Servers in the areas")
-complete -c apt-spy -s c -d (_ "Conf file")
-complete -f -c apt-spy -s e -d (_ "Finish after number of servers")
-complete -c apt-spy -s f -d (_ "File to grab servers")
-complete -c apt-spy -s i -d (_ "File as input")
-complete -c apt-spy -s m -d (_ "Mirror-list file")
-complete -c apt-spy -s o -d (_ "Output sources.list file")
-complete -f -c apt-spy -s p -d (_ "Use proxy server")
-complete -f -c apt-spy -s s -d (_ "Comma separated country list")
-complete -f -c apt-spy -s t -d (_ "How long in sec to download")
-complete -f -c apt-spy -s u -d (_ "Custom URL to get mirror list")
-complete -c apt-spy -s w -d (_ "Write top servers to file")
-complete -f -c apt-spy -s n -d (_ "Number of top servers")
-complete -f -c apt-spy -a "update" -d (_ "Update mirror list")
-complete -f -c apt-spy -s v -d (_ "Version number")
-
-
--- a/init/completions/apt-src.fish
+++ b/init/completions/apt-src.fish
@@ -1,24 +0,0 @@
-#apt-src
-complete -c apt-src -s h -l help -d (_ "Display help and exit")
-complete -f -c apt-src -a "update" -d (_ "Update list of source packages")
-complete -f -c apt-src -a "install" -d (_ "Install source packages")
-complete -f -c apt-src -a "upgrade" -d (_ "Upgrade source packages")
-complete -f -c apt-src -a "remove" -d (_ "Remove source packages")
-complete -f -c apt-src -a "build" -d (_ "Build source packages")
-complete -f -c apt-src -a "clean" -d (_ "Clean source packages")
-complete -f -c apt-src -a "import" -d (_ "Detect known source tree")
-complete -f -c apt-src -a "list" -d (_ "List installed source package\(s\)")
-complete -f -c apt-src -a "location" -d (_ "Root source tree")
-complete -f -c apt-src -a "version" -d (_ "Version of source package")
-complete -f -c apt-src -a "name" -d (_ "Name of the source package")
-complete -f -c apt-src -s b -l build -d (_ "Build source packages")
-complete -f -c apt-src -s i -l installdebs -d (_ "Install after build")
-complete -f -c apt-src -s p -l patch -d (_ "Patch local changes")
-complete -r -c apt-src -s l -l location -d (_ "Specify a dir")
-complete -c apt-src -s c -l here -d (_ "Run on current dir")
-complete -f -c apt-src -l upstream-version -d (_ "Omit debian version")
-complete -f -c apt-src -s k -l keep-built -d (_ "Do not del built files")
-complete -f -c apt-src -s n -l no-delete-source -d (_ "Do not del source files")
-complete -f -c apt-src -l version -d (_ "Source tree version")
-complete -f -c apt-src -s q -l quiet -d (_ "Output to /dev/null")
-complete -f -c apt-src -s t -l trace -d (_ "Output trace")
--- a/init/completions/apt-zip-inst.fish
+++ b/init/completions/apt-zip-inst.fish
@@ -1,10 +0,0 @@
-#apt-zip-inst
-complete -c apt-zip-inst -s h -l help -d (_ "Display help and exit")
-complete -f -c apt-zip-inst -s V -l version -d (_ "Display version and exit")
-complete -c apt-zip-inst -s m -l medium -d (_ "Removable medium")
-complete -f -c apt-zip-inst -s a -l aptgetaction -a "dselect-upgrade upgrade dist-upgrade" -d (_ "Select an action")
-complete -c apt-zip-inst -s p -l packages -d (_ "List of packages to install")
-complete -f -c apt-zip-inst -s f -l fix-broken -d (_ "Fix broken option")
-complete -c apt-zip-inst -l skip-mount -d (_ "Specify a non-mountpoint dir")
-
-
--- a/init/completions/apt-zip-list.fish
+++ b/init/completions/apt-zip-list.fish
@@ -1,13 +0,0 @@
-#apt-zip-list
-complete -c apt-zip-list -s h -l help -d (_ "Display help and exit")
-complete -f -c apt-zip-list -s V -l version -d (_ "Display version and exit")
-complete -c apt-zip-list -s m -l medium -d (_ "Removable medium")
-complete -f -c apt-zip-list -s a -l aptgetaction -a "dselect-upgrade upgrade dist-upgrade" -d (_ "Select an action")
-complete -c apt-zip-list -s p -l packages -d (_ "List of packages to install")
-complete -f -c apt-zip-list -s f -l fix-broken -d (_ "Fix broken option")
-complete -c apt-zip-list -l skip-mount -d (_ "Specify a non-mountpoint dir")
-complete -c apt-zip-list -s M -l method -d (_ "Select a method")
-complete -c apt-zip-list -s o -l options -a "tar restart" -d (_ "Specify options")
-complete -c apt-zip-list -s A -l accept -a "http ftp" -d (_ "Accept protocols")
-complete -c apt-zip-list -s R -l reject -a "http ftp" -d (_ "Reject protocols")
-
--- a/init/completions/arp.fish
+++ b/init/completions/arp.fish
@@ -1,11 +0,0 @@
-#completion for arp
-complete -c arp -s v -l verbose -d (_ "Verbose mode")
-complete -c arp -s n -l numeric -d (_ "Numerical address")
-complete -x -c arp -s H -l tw-type -a "ether arcnet pronet ax25 netrom" -d (_ "Class of hw type")
-complete -c arp -s a -l display -x -a "(__fish_print_hostnames)" -d (_ "Show arp entries")
-complete -x -c arp -s d -l delete -a "(__fish_print_hostnames)" -d (_ "Remove an entry for hostname")
-complete -c arp -s D -l use-device -d (_ "Use hardware address")
-complete -x -c arp -s i -l device -a "(__fish_print_interfaces)" -d (_ "Select interface")
-complete -x -c arp -s s -l set -d (_ "Manually create ARP address") -a "(__fish_print_hostnames)"
-complete -f -c arp -s f -l file -d (_ "Take addr from filename, default /etc/ethers") 
-
--- a/init/completions/at.fish
+++ b/init/completions/at.fish
@@ -1,10 +0,0 @@
-#at
-complete -f -c at -s V -d (_ "Display version and exit")
-complete -f -c at -s q -d (_ "Use specified queue")
-complete -f -c at -s m -d (_ "Send mail to user")
-complete -c at -s f -x -a "(__fish_complete_suffix (commandline -ct) '' 'At job')" -d (_ "Read job from file")
-complete -f -c at -s l -d (_ "Alias for atq")
-complete -f -c at -s d -d (_ "Alias for atrm")
-complete -f -c at -s v -d (_ "Show the time")
-complete -f -c at -s c -d (_ "Print the jobs listed")
-
--- a/init/completions/atd.fish
+++ b/init/completions/atd.fish
@@ -1,6 +0,0 @@
-#atd
-complete -f -c atd -s l -d (_ "Limiting load factor")
-complete -f -c atd -s b -d (_ "Minimum interval in seconds")
-complete -f -c atd -s d -d (_ "Debug mode")
-complete -f -c atd -s s -d (_ "Process at queue only once")
-
--- a/init/completions/atq.fish
+++ b/init/completions/atq.fish
@@ -1,4 +0,0 @@
-#atq
-complete -f -c atq -s V -d (_ "Display version and exit")
-complete -f -c atq -s q -d (_ "Use specified queue")
-
--- a/init/completions/atrm.fish
+++ b/init/completions/atrm.fish
@@ -1,2 +0,0 @@
-#atrm
-complete -f -c atrm -s V -d (_ "Display version and exit")
--- a/init/completions/bc.fish
+++ b/init/completions/bc.fish
@@ -1,9 +0,0 @@
-# Completions for the binary calculator
-
-complete -c bc -s i -l interactive -d (_ "Force interactive mode")
-complete -c bc -s l -l math-lib -d (_ "Define math library")
-complete -c bc -s w -l warn -d (_ "Give warnings for extensions to POSIX bc")
-complete -c bc -s s -l standard -d (_ "Process exactly POSIX bc")
-complete -c bc -s q -l quiet -d (_ "Do not print the GNU welcome")
-complete -c bc -s v -l version -d (_ "Display version and exit")
-complete -c bc -s h -l help -d (_ "Display help and exit")
--- a/init/completions/btdownloadcurses.py.fish
+++ b/init/completions/btdownloadcurses.py.fish
@@ -1,2 +0,0 @@
-
-complete -y btdownloadheadless.py
--- a/init/completions/btdownloadheadless.py.fish
+++ b/init/completions/btdownloadheadless.py.fish
@@ -1,33 +0,0 @@
-# Bittorrent commands
-
-for i in btdownloadcurses.py btdownloadheadless.py;
-	complete -c $i -l max_uploads -x -d (_ "Maximum uploads at once")
-	complete -c $i -l keepalive_interval -x -d (_ "Number of seconds between keepalives")
-	complete -c $i -l download_slice_size -x -d (_ "Bytes per request")
-	complete -c $i -l request_backlog -x -d (_ "Requests per pipe")
-	complete -c $i -l max_message_length -x -d (_ "Maximum length prefix encoding")
-	complete -c $i -l ip -d (_ "IP to report to the tracker") -x -a "(__fish_print_addresses)"
-	complete -c $i -l minport -d (_ "Minimum port to listen to")
-	complete -c $i -l maxport -d (_ "Maximum port to listen to")
-	complete -c $i -l responsefile -r -d (_ "File for server response")
-	complete -c $i -l url -x -d (_ "URL to get file from")
-	complete -c $i -l saveas -r -d (_ "Local file target")
-	complete -c $i -l timeout -x -d (_ "Time to close inactive socket")
-	complete -c $i -l timeout_check_interval -x -d (_ "Time between checking timeouts")
-	complete -c $i -l max_slice_length -x -d (_ "Maximum outgoing slice length")
-	complete -c $i -l max_rate_period -x -d (_ "Maximum time to guess rate")
-	complete -c $i -l bind -x -d (_ "IP to bind to locally") -a "(__fish_print_addresses)"
-	complete -c $i -l display_interval -x -d (_ "Time between screen updates")
-	complete -c $i -l rerequest_interval -x -d (_ "Time to wait between requesting more peers")
-	complete -c $i -l min_peers -x -d (_ "Minimum number of peers to not do requesting")
-	complete -c $i -l http_timeout -x -d (_ "Number of seconds before assuming http timeout")
-	complete -c $i -l max_initiate -x -d (_ "Number of peers at which to stop initiating new connections")
-	complete -c $i -l max_allow_in -x -d (_ "Maximum number of connections to allow")
-	complete -c $i -l check_hashes -x -d (_ "Whether to check hashes on disk")
-	complete -c $i -l max_upload_rate -x -d (_ "Maximum kB/s to upload at")
-	complete -c $i -l snub_time -x -d (_ "Seconds to wait for data to come in before assuming choking")
-	complete -c $i -l spew -x -d (_ "Whether to display diagnostic info")
-	complete -c $i -l rarest_first_cutoff -x -d (_ "Number of downloads at which to switch from random to rarest first")
-	complete -c $i -l min_uploads -x -d (_ "Number of uploads to fill out to with optimistic unchokes")
-	complete -c $i -l report_hash_failiures -x -d (_ "Whether to inform the user that hash failures occur")
-end;
--- a/init/completions/bunzip2.fish
+++ b/init/completions/bunzip2.fish
@@ -1,15 +0,0 @@
-complete -c bunzip2 -x -a "(
-	__fish_complete_suffix (commandline -ct) .bz 'Compressed file'
-	__fish_complete_suffix (commandline -ct) .bz2 'Compressed file'
-	__fish_complete_suffix (commandline -ct) .tbz 'Compressed archive'
-	__fish_complete_suffix (commandline -ct) .tbz2 'Compressed archive'
-)
-"
-
-complete -c bunzip2 -s c -l stdout -d (_ "Decompress to stdout")
-complete -c bunzip2 -s f -l force -d (_ "Overwrite")
-complete -c bunzip2 -s k -l keep -d (_ "Do not overwrite")
-complete -c bunzip2 -s s -l small -d (_ "Reduce memory usage")
-complete -c bunzip2 -s v -l verbose -d (_ "Print compression ratios")
-complete -c bunzip2 -s L -l license -d (_ "Print license")
-complete -c bunzip2 -s V -l version -d (_ "Display version and exit")
--- a/init/completions/bzip2.fish
+++ b/init/completions/bzip2.fish
@@ -1,19 +0,0 @@
-complete -c bzip2 -s c -l stdout -d (_ "Compress to stdout")
-complete -c bzip2 -s d -l decompress -x -a "(
-	__fish_complete_suffix (commandline -ct) .bz 'Compressed file'
-	__fish_complete_suffix (commandline -ct) .bz2 'Compressed file'
-	__fish_complete_suffix (commandline -ct) .tbz 'Compressed archive'
-	__fish_complete_suffix (commandline -ct) .tbz2 'Compressed archive'
-)
-"
-complete -c bzip2 -s z -l compress -d (_ "Compress file")
-complete -c bzip2 -s t -l test -d (_ "Check integrity")
-complete -c bzip2 -s f -l force -d (_ "Overwrite")
-complete -c bzip2 -s k -l keep -d (_ "Do not overwrite")
-complete -c bzip2 -s s -l small -d (_ "Reduce memory usage")
-complete -c bzip2 -s q -l quiet -d (_ "Supress errors")
-complete -c bzip2 -s v -l verbose -d (_ "Print compression ratios")
-complete -c bzip2 -s L -l license -d (_ "Print license")
-complete -c bzip2 -s V -l version -d (_ "Display version and exit")
-complete -c bzip2 -s 1 -l fast -d (_ "Small block size")
-complete -c bzip2 -s 9 -l best -d (_ "Large block size")
--- a/Show More
+++ b/Show More