1.20.2

darcs-hash:20060207115300-ac50b-036d087b1f3493d9ecd7fd1c31d31be5c77c26b6.gz

INSTALL

@@ -2,41 +2,43 @@
 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 currently requires a semi-modern GCC version to
+compile. Specifically, GCC 2.95.* won't compile fish, but GCC 3.23
+should work. Fish has not been coded with an C99- or GNU-specific
+features in mind, so it is hoped that it should be possible to make
+fish work with other compilers. Patches 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
+the autoconf command first. Then use the following commands to compile
+fish:
+
  % ./configure
- % make                                  #Compile fish
- % make install                          #Install fish
- % echo /usr/local/bin/fish >>/etc/shells #Add fish to list of shells
+ % make                                   # Compile fish
+ % make install                           # Install fish
+ % echo /usr/local/bin/fish >>/etc/shells # Add fish to list of shells
 
 If you wish to use fish as your default shell, use the following
 command:
@@ -49,6 +51,9 @@ chsh will prompt you for your password, and change your default shell.
 Local install procedure
 =======================
 
+If you have downloaded the darcs repository of fish, you need to run
+autoconf first.
+
 To install fish in your own home directory (typically as non-root),
 type:
 
@@ -57,6 +62,6 @@ type:
  % make install			# Install fish
 
 You will not be able to use fish as the default shell unless you also
-add the corresponding line to /etc/shells, which kind of defeats the
-point of a local install. But you can at least build and run fish.
-
+add the corresponding line to /etc/shells, which mostly defeats the
+point of a local install. As a workaround, you can add fish as the
+last command of the init files for your regular shell.

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,16 +32,19 @@
 # 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@
 
+# Compiler flags
+CFLAGS:=@CFLAGS@ -Wall -std=gnu99 -fno-strict-aliasing
+CPPFLAGS=@CPPFLAGS@
+LDFLAGS:= @LIBS@ @LDFLAGS@ 
+
+# Installation directories
 prefix = @prefix@
 exec_prefix = @exec_prefix@
+datadir = @datadir@
 bindir = @bindir@
 mandir = @mandir@
 sysconfdir = @sysconfdir@
@@ -46,46 +53,63 @@ fishfile = @fishfile@
 fishinputfile = @fishinputfile@
 docdir = @docdir@
 
+#Init files to install
+INIT_DIR_INSTALL = init/fish_interactive.fish init/fish_function.fish init/fish_complete.fish 
+
+# Set to 1 if we have gettext
+HAVE_GETTEXT=@HAVE_GETTEXT@
+
 # 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	\
 	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	\
 	output.o intern.o env_universal.o env_universal_common.o			\
-	input_common.o event.o signal.o io.o
+	input_common.o event.o signal.o io.o translate.o parse_util.o		\
+	halloc.o
 
 # 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.c 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
-FISH_TESTS_OBJS := $(COMMON_OBJS) $(COMMON_OBJS_WITH_CODE) $(COMMON_OBJS_WITH_HEADER) fish_tests.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 common.o output.o util.o wutil.o		\
+	tokenizer.o input_common.o env_universal.o env_universal_common.o	\
+	translate.o halloc.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 common.o util.o wutil.o	\
+	doc_src/fishd.o halloc.o
 
-
-#All objects that the system needs to build mimedb
+# All objects needed to build mimedb
 MIME_OBJS := mimedb.o xdgmimealias.o xdgmime.o xdgmimeglob.o	\
-	xdgmimeint.o xdgmimemagic.o xdgmimeparent.o wutil.o
+	xdgmimeint.o xdgmimemagic.o xdgmimeparent.o wutil.o halloc.o
 
 #
 # 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/break.txt doc_src/builtin.txt doc_src/case.txt				\
-	doc_src/cd.txt doc_src/command.txt doc_src/commandline.txt			\
-	doc_src/complete.txt doc_src/continue.txt doc_src/else.txt			\
-	doc_src/end.txt doc_src/eval.txt doc_src/exec.txt doc_src/exit.txt	\
-	doc_src/fg.txt doc_src/for.txt doc_src/function.txt					\
-	doc_src/functions.txt doc_src/if.txt doc_src/jobs.txt				\
-	doc_src/not.txt doc_src/or.txt doc_src/random.txt					\
+	doc_src/block.txt doc_src/break.txt doc_src/builtin.txt				\
+	doc_src/case.txt doc_src/cd.txt doc_src/command.txt					\
+	doc_src/commandline.txt doc_src/complete.txt doc_src/continue.txt	\
+	doc_src/else.txt doc_src/end.txt doc_src/eval.txt doc_src/exec.txt	\
+	doc_src/exit.txt doc_src/fg.txt doc_src/for.txt						\
+	doc_src/function.txt doc_src/functions.txt doc_src/if.txt			\
+	doc_src/jobs.txt doc_src/not.txt doc_src/or.txt doc_src/random.txt	\
 	doc_src/return.txt doc_src/read.txt doc_src/set.txt					\
 	doc_src/status.txt doc_src/switch.txt doc_src/ulimit.txt			\
 	doc_src/while.txt
@@ -100,19 +124,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/tokenize.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)
 
 #
@@ -126,12 +153,12 @@ DOC_SRC_DIR_FILES := doc_src/Doxyfile.in doc_src/doc.hdr	\
 # Files in ./
 MAIN_DIR_FILES := Doxyfile Doxyfile.user Makefile.in configure			\
     configure.ac config.h.in install-sh set_color.c count.c				\
-    key_reader.c tokenize.c gen_hdr.sh gen_hdr2.c $(MIME_OBJS:.o=.h)	\
+    key_reader.c gen_hdr.sh gen_hdr2.c $(MIME_OBJS:.o=.h)				\
     $(MIME_OBJS:.o=.c) $(COMMON_OBJS_WITH_HEADER:.o=.h)					\
     $(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	\
@@ -145,23 +172,35 @@ TESTS_DIR_FILES := $(TEST_IN) $(TEST_IN:.in=.out) $(TEST_IN:.in=.err)	\
 COMPLETIONS_DIR_FILES := $(wildcard init/completions/*.fish)
 
 # Programs to build
-PROGRAMS:=fish set_color tokenize @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/tokenize.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)
+TRANSLATIONS := $(TRANSLATIONS_SRC:.po=.gmo)
 
 #Make everything needed for installing fish
-all: $(PROGRAMS) user_doc 
+all: $(PROGRAMS) user_doc
+	@echo fish has now been built. 
+	@echo Use \'make install\' to install fish.
+.PHONY: all
+
+debug:
+	make fish CFLAGS="-O0 -Wno-unused -Werror -g -Wall -std=gnu99 -fno-strict-aliasing"
+.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; 
 
@@ -175,6 +214,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
@@ -205,6 +245,33 @@ doc.h:$(BUILTIN_DOC_SRC) $(CMD_DOC_SRC) doc_src/doc.hdr
 	cat $*.txt >>$@; 
 	echo "*/" >>$@
 
+# Compile translation file
+%.gmo:
+	if test $(HAVE_GETTEXT) = 1; then \
+		msgfmt $*.po -o $*.gmo; \
+	fi
+
+# Update existing po file or copy messages.pot
+%.po:messages.pot
+	if test $(HAVE_GETTEXT) = 1;then \
+		if test -f $*.po; then \
+			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 seq
+	if test $(HAVE_GETTEXT) = 1;then \
+		xgettext -k_ -kN_ -kcomplete_desc *.c *.h -o messages.pot; \
+		if ! xgettext -j -k_ -LShell init/*.in init/*.fish init/completions/*.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
 # man-pages which are then converted into C code. The convertion path
 # looks like this: 
@@ -240,6 +307,7 @@ doc.h:$(BUILTIN_DOC_SRC) $(CMD_DOC_SRC) doc_src/doc.hdr
 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 >>$@; \
@@ -261,12 +329,17 @@ 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 
+#
+# The build rules for installing/uninstalling
+#
+
+install: all install-translations
 	$(INSTALL) -m 755 -d $(DESTDIR)$(bindir) 
 	for i in $(PROGRAMS); do\
 		$(INSTALL) -m 755 $$i $(DESTDIR)$(bindir) ; \
@@ -274,7 +347,7 @@ install: all
 	$(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 \
+	for i in $(INIT_DIR_INSTALL); do \
 		$(INSTALL) -m 644 $$i $(DESTDIR)$(sysconfdir)$(fishdir); \
 	done;
 	for i in $(COMPLETIONS_DIR_FILES); do \
@@ -283,16 +356,25 @@ install: all
 	$(INSTALL) -m 644 init/fish_inputrc $(DESTDIR)$(sysconfdir)$(fishinputfile);
 	$(INSTALL) -m 755 -d $(DESTDIR)$(docdir)
 	for i in user_doc/html/* ChangeLog; do \
-		$(INSTALL) -m 644 $$i $(DESTDIR)$(docdir); \
+		if test -f $$i; then \
+			$(INSTALL) -m 644 $$i $(DESTDIR)$(docdir); \
+		fi; \
 	done;
 	$(INSTALL) -m 755 -d $(DESTDIR)$(mandir)/man1
 	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: install
 
-uninstall:
+uninstall: uninstall-translations
 	for i in $(PROGRAMS); do \
 		rm -f $(DESTDIR)$(bindir)/$$i; \
 	done;
@@ -301,18 +383,40 @@ uninstall:
 	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* tokenize.1* count.1*; do \
+	for i in fish.1* @XSEL_MAN@ mimedb.1* fishd.1* set_color.1* count.1*; do \
 		rm $(DESTDIR)$(mandir)/man1/$$i; \
 	done;
+.PHONY: uninstall
+
+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;\
+		done; \
+	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; \
+		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)
@@ -325,18 +429,20 @@ mimedb: $(MIME_OBJS) util.o common.o doc_src/mimedb.c
 set_color: set_color.o doc_src/set_color.c 
 	$(CC) set_color.o doc_src/set_color.c $(LDFLAGS) -o $@
 
-tokenize: tokenize.o doc_src/tokenize.c 
-	$(CC) tokenize.o doc_src/tokenize.c $(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 $@
 
+# Neat little program to show output from terminal
 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 $@
 
+#
+# Update dependencies
+#
 depend:
 	makedepend -fMakefile.in -Y *.c 
+.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
@@ -344,18 +450,20 @@ 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
+fish-@PACKAGE_VERSION@.tar: $(DOC_SRC_DIR_FILES) $(MAIN_DIR_FILES) $(INIT_DIR_FILES) $(TEST_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@/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 $(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@
 
@@ -373,16 +481,22 @@ rpm: fish-@PACKAGE_VERSION@.tar.bz2
 	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 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 tokenize gen_hdr2 mimedb
+	rm -f tokenizer_test fish key_reader set_color gen_hdr2 mimedb
 	rm -f fishd fish_pager count 
 	rm -f fish-@PACKAGE_VERSION@.tar 
 	rm -f fish-@PACKAGE_VERSION@.tar.gz 
@@ -392,70 +506,91 @@ clean:
 	rm -rf doc_src/builtin_doc
 	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: parser.h reader.h env.h expand.h common.h wgetopt.h sanity.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
-builtin_commandline.o: config.h util.h builtin.h common.h wgetopt.h reader.h
-builtin_commandline.o: proc.h parser.h tokenizer.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_help.o: config.h util.h common.h builtin_help.h
-builtin_set.o: config.h util.h builtin.h env.h expand.h common.h wgetopt.h
-builtin_set.o: proc.h parser.h
-common.o: config.h util.h wutil.h common.h expand.h proc.h wildcard.h
-common.o: parser.h
-complete.o: config.h util.h tokenizer.h wildcard.h proc.h parser.h function.h
-complete.o: complete.h builtin.h env.h exec.h expand.h common.h reader.h
-complete.o: history.h intern.h wutil.h
-env.o: config.h util.h wutil.h proc.h common.h env.h sanity.h expand.h
-env.o: history.h reader.h parser.h env_universal.h env_universal_common.h
-env_universal.o: util.h common.h wutil.h env_universal_common.h
-env_universal.o: env_universal.h
-env_universal_common.o: util.h common.h wutil.h env_universal_common.h
-exec.o: config.h util.h common.h wutil.h proc.h exec.h parser.h builtin.h
-exec.o: function.h env.h wildcard.h sanity.h expand.h env_universal.h
-exec.o: env_universal_common.h
-expand.o: config.h util.h common.h wutil.h env.h proc.h parser.h expand.h
-expand.o: wildcard.h exec.h tokenizer.h complete.h
-fishd.o: util.h common.h wutil.h env_universal_common.h
-fish_pager.o: config.h util.h wutil.h common.h complete.h output.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
+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: 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 util.h common.h proc.h reader.h builtin.h function.h
-fish_tests.o: complete.h wutil.h env.h expand.h parser.h tokenizer.h
-function.o: config.h util.h function.h proc.h parser.h common.h intern.h
-highlight.o: config.h util.h wutil.h highlight.h tokenizer.h proc.h parser.h
-highlight.o: builtin.h function.h env.h expand.h sanity.h common.h complete.h
-highlight.o: output.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 util.h wutil.h reader.h proc.h common.h sanity.h
-input.o: input_common.h input.h parser.h env.h expand.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
 input_common.o: env_universal.h env_universal_common.h
 intern.o: config.h util.h common.h intern.h
-kill.o: config.h util.h wutil.h kill.h proc.h sanity.h common.h env.h
-kill.o: expand.h exec.h parser.h
-main.o: config.h util.h common.h reader.h builtin.h function.h complete.h
-main.o: wutil.h env.h sanity.h proc.h parser.h expand.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 util.h wutil.h expand.h common.h output.h highlight.h
-parser.o: config.h util.h common.h wutil.h proc.h parser.h tokenizer.h exec.h
-parser.o: wildcard.h function.h builtin.h builtin_help.h env.h expand.h
-parser.o: reader.h sanity.h env_universal.h env_universal_common.h
-proc.o: config.h util.h wutil.h proc.h common.h reader.h sanity.h env.h
-reader.o: config.h util.h wutil.h highlight.h reader.h proc.h parser.h
-reader.o: complete.h history.h common.h sanity.h env.h exec.h expand.h
-reader.o: tokenizer.h kill.h input_common.h input.h function.h output.h
-sanity.o: config.h util.h common.h sanity.h proc.h history.h reader.h kill.h
-sanity.o: wutil.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
 set_color.o: config.h
-tokenize.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
+wildcard.o: expand.h translate.h
 wutil.o: config.h util.h common.h wutil.h
 xdgmimealias.o: xdgmimealias.h xdgmime.h xdgmimeint.h
 xdgmime.o: xdgmime.h xdgmimeint.h xdgmimeglob.h xdgmimemagic.h xdgmimealias.h

builtin.h

@@ -20,31 +20,42 @@ enum
 /**
    Error message on missing argument
 */
-#define BUILTIN_ERR_MISSING L": Expected argument"
+#define BUILTIN_ERR_MISSING _( L"%ls: Expected argument\n" )
 
 /**
    Error message on invalid combination of options
 */
-#define BUILTIN_ERR_COMBO L": Invalid combination of options"
+#define BUILTIN_ERR_COMBO _( L"%ls: Invalid combination of options\n" )
+
+/**
+   Error message on invalid combination of options
+*/
+#define BUILTIN_ERR_COMBO2 _( L"%ls: Invalid combination of options,\n%ls\n" )
 
 /**
    Error message on multiple scope levels for variables
 */
-#define BUILTIN_ERR_GLOCAL L": Variable can only be one of universal, global and local"
+#define BUILTIN_ERR_GLOCAL _( L"%ls: Variable scope can only be one of universal, global and local\n%ls\n" )
 
 /**
    Error message for specifying both export and unexport to set/read
 */
-#define BUILTIN_ERR_EXPUNEXP L": Variable can't be both exported and unexported"
+#define BUILTIN_ERR_EXPUNEXP _( L"%ls: Variable can't be both exported and unexported\n%ls\n" )
 
 /**
    Error message for unknown switch
 */
-#define BUILTIN_ERR_UNKNOWN	L": Unknown option"
+#define BUILTIN_ERR_UNKNOWN	_( L"%ls: Unknown option '%ls'\n" )
 
-#define BUILTIN_ERR_VARCHAR L"%ls: Invalid character in variable name: '%lc'. Only alphanumerical characters and underscores are valid in a variable name.\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" )
 
-#define BUILTIN_ERR_VARNAME_ZERO L"%ls: Variable name can not be the empty string\n"
+/**
+   Error message for invalid (empty) variable name
+*/
+#define BUILTIN_ERR_VARNAME_ZERO _( L"%ls: Variable name can not be the empty string\n" )
 
 /**
    Stringbuffer used to represent standard output
@@ -141,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

builtin_commandline.c

@@ -13,6 +13,7 @@ Functions used for implementing the commandline builtin.
 
 #include "config.h"
 #include "util.h"
+#include "wutil.h"
 #include "builtin.h"
 #include "common.h"
 #include "wgetopt.h"
@@ -22,16 +23,18 @@ Functions used for implementing the commandline builtin.
 #include "tokenizer.h"
 #include "input_common.h"
 #include "input.h"
+#include "translate.h"
+#include "parse_util.h"
 
 /**
    Which part of the comandbuffer are we operating on
 */
 enum
 {
-	STRING_MODE=1, // Operate on entire buffer
-	JOB_MODE, // Operate on job under cursor
-	PROCESS_MODE, // Operate on process under cursor
-	TOKEN_MODE // Operate on token under cursor
+	STRING_MODE=1, /**< Operate on entire buffer */
+	JOB_MODE, /**< Operate on job under cursor */
+	PROCESS_MODE, /**< Operate on process under cursor */
+	TOKEN_MODE /**< Operate on token under cursor */
 }
 	;
 
@@ -40,12 +43,32 @@ enum
 */
 enum
 {
-	REPLACE_MODE=1, // Replace current text
-	INSERT_MODE, // Insert at cursor position
-	APPEND_MODE // Insert at end of current token/command/buffer
+	REPLACE_MODE=1, /**< Replace current text */
+	INSERT_MODE, /**< Insert at cursor position */
+	APPEND_MODE /**< Insert at end of current token/command/buffer */
 }
 	;
 
+/**
+   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.
@@ -55,21 +78,17 @@ 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 );
 
-//					wchar_t *tmp = wcsndup( begin, end-begin );
-					
-//					fwprintf( stderr, L"Commandline '%ls', current command '%ls'\n", reader_get_buffer(), tmp );
-					
 	sb_append_substring( &out, buff, begin-buff );
 					
 	switch( append_mode)
@@ -90,7 +109,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 );
@@ -111,8 +130,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 )
 {	
@@ -121,7 +140,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 )
 	{
@@ -186,7 +205,7 @@ int builtin_commandline( wchar_t **argv )
 	
 	int tokenize = 0;	
 
-	if( !reader_get_buffer() )
+	if( !get_buffer() )
 	{
 		sb_append2( sb_err,
 					argv[0],
@@ -253,7 +272,7 @@ int builtin_commandline( wchar_t **argv )
 		
 		int opt = wgetopt_long( argc,
 								argv, 
-								L"aijpctwfo", 
+								L"aijpctwfor", 
 								long_options, 
 								&opt_index );
 		if( opt == -1 )
@@ -264,13 +283,10 @@ int builtin_commandline( wchar_t **argv )
 			case 0:
 				if(long_options[opt_index].flag != 0)
 					break;
-				sb_append2( sb_err, 
-							argv[0],
-							BUILTIN_ERR_UNKNOWN,
-							L" ",
-							long_options[opt_index].name,
-							L"\n",
-							(void *)0 );
+                sb_printf( sb_err,
+                           BUILTIN_ERR_UNKNOWN,
+                           argv[0],
+                           long_options[opt_index].name );
 				builtin_print_help( argv[0], sb_err );
 
 				return 1;
@@ -282,7 +298,11 @@ int builtin_commandline( wchar_t **argv )
 			case L'i':
 				append_mode = INSERT_MODE;
 				break;
-				
+
+			case L'r':
+				append_mode = REPLACE_MODE;
+				break;
+								
 			case 'c':
 				cut_at_cursor=1;
 				break;
@@ -322,10 +342,11 @@ int builtin_commandline( wchar_t **argv )
 		*/
 		if( buffer_part || cut_at_cursor || append_mode || tokenize )
 		{
+			sb_printf(sb_err,
+					  BUILTIN_ERR_COMBO,
+					  argv[0] );
+			
 			sb_append2(sb_err,
-					   argv[0],
-					   BUILTIN_ERR_COMBO,
-					   L"\n",
 					   parser_current_line(),
 					   L"\n",
 					   (void *)0);
@@ -335,10 +356,11 @@ int builtin_commandline( wchar_t **argv )
 
 		if( argc == woptind )
 		{
+			sb_printf( sb_err,
+					   BUILTIN_ERR_MISSING,
+					   argv[0] );
+			
 			sb_append2( sb_err,
-						argv[0],
-						BUILTIN_ERR_MISSING,
-						L"\n",
 						parser_current_line(),
 						L"\n",
 						(void *)0 );
@@ -394,22 +416,23 @@ int builtin_commandline( wchar_t **argv )
 	if( (tokenize || cut_at_cursor) && (argc-woptind) )
 	{
 		
-		sb_append2( sb_err,
-					argv[0],
-					BUILTIN_ERR_COMBO,
-					L",\n --cut-at-cursor and --tokenize can not be used when setting the commandline",
-					(void *)0 );
+		sb_printf( sb_err,
+				   BUILTIN_ERR_COMBO2,
+				   argv[0],
+				   L"--cut-at-cursor and --tokenize can not be used when setting the commandline" );
+		
+
 		builtin_print_help( argv[0], sb_err );
 		return 1;
 	}
 
 	if( append_mode && !(argc-woptind) )
 	{
-		sb_append2( sb_err,
+		sb_printf( sb_err,
+                    BUILTIN_ERR_COMBO2,
                     argv[0],
-                    BUILTIN_ERR_COMBO,
-                    L",\n insertion mode switches can not be used when not in insertion mode",
-                    (void *)0 );
+				   L"insertion mode switches can not be used when not in insertion mode" );
+
         builtin_print_help( argv[0], sb_err );		
         return 1;
 	}
@@ -427,32 +450,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;			
 		}
 				

builtin_complete.c

@@ -0,0 +1,543 @@
+/** \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 "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"", *load=0;
+
+	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"load", required_argument, 0, 'y'
+				}
+				,
+				{
+					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:y: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 'y':
+				load = woptarg;
+				break;
+
+			case 'C':
+				do_complete = woptarg?woptarg:reader_get_buffer();
+				break;
+				
+			case '?':
+				//	builtin_print_help( argv[0], sb_err );
+				
+				res = 1;
+				break;
+				
+		}
+		
+	}
+
+	if( res != 0 )
+	{
+	}
+	else 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( load )
+	{
+		complete_load( load, 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;
+}

builtin_help.hdr

@@ -9,6 +9,7 @@
 #include <stdio.h>
 #include <strings.h>
 #include <wchar.h>
+#include <sys/types.h>
 
 #include "config.h"
 #include "util.h"

builtin_set.c

@@ -13,6 +13,7 @@ Functions used for implementing the set builtin.
 
 #include "config.h"
 #include "util.h"
+#include "wutil.h"
 #include "builtin.h"
 #include "env.h"
 #include "expand.h"
@@ -20,6 +21,7 @@ Functions used for implementing the set builtin.
 #include "wgetopt.h"
 #include "proc.h"
 #include "parser.h"
+#include "translate.h"
 
 /** 
 	Extract the name from a destination argument of the form name[index1 index2...]
@@ -92,9 +94,7 @@ static int parse_fill_indexes( array_list_t *indexes,
 		long l_ind = wcstol(src, &end, 10);
 		if (end == src) 
 		{
-			wchar_t sbuf[256];
-			swprintf(sbuf, 255, L"Invalid index starting at %ls\n", src);
-			sb_append(sb_err, sbuf);
+			sb_printf(sb_err, _(L"%ls: Invalid index starting at '%ls'\n"), L"set", src);
 			return -1;
 		}
 
@@ -290,7 +290,7 @@ int builtin_set( wchar_t **argv )
 		}
 	;
 	
-	wchar_t short_options[] = L"xglenuUq";
+	wchar_t short_options[] = L"+xglenuUq";
 
 	int argc = builtin_count_args(argv);
 
@@ -362,13 +362,11 @@ int builtin_set( wchar_t **argv )
 
 	if( query && (erase || list || global || local || universal || export || unexport ) )
 	{
-		sb_append2(sb_err,
+		sb_printf(sb_err,
+				  BUILTIN_ERR_COMBO2,
 				  argv[0],
-				  BUILTIN_ERR_COMBO,
-				  L"\n",
-				  parser_current_line(),
-				  L"\n",
-				  (void *)0);
+				  parser_current_line() );
+		
 		builtin_print_help( argv[0], sb_err );
 		return 1;
 	}
@@ -377,13 +375,11 @@ int builtin_set( wchar_t **argv )
 	/* Check operation and modifiers sanity */
 	if( erase && list ) 
 	{
-		sb_append2(sb_err,
+		sb_printf(sb_err,
+				  BUILTIN_ERR_COMBO2,
 				  argv[0],
-				  BUILTIN_ERR_COMBO,
-				  L"\n",
-				  parser_current_line(),
-				  L"\n",
-				  (void *)0);
+				  parser_current_line() );		
+
 		builtin_print_help( argv[0], sb_err );
 		return 1;
 	}
@@ -391,9 +387,8 @@ int builtin_set( wchar_t **argv )
 	if( local + global + universal > 1 ) 
 	{
 		sb_printf( sb_err,
-				   L"%ls%ls\n%ls\n",
-				   argv[0],
 				   BUILTIN_ERR_GLOCAL,
+				   argv[0],
 				   parser_current_line() );
 		builtin_print_help( argv[0], sb_err );
 		return 1;
@@ -401,13 +396,10 @@ int builtin_set( wchar_t **argv )
 
 	if( export && unexport ) 
 	{
-		sb_append2(sb_err,
-				   argv[0],
+		sb_printf( sb_err,
 				   BUILTIN_ERR_EXPUNEXP,
-				   L"\n",
-				   parser_current_line(),
-				   L"\n", 
-				   (void *)0);
+				   argv[0],
+				   parser_current_line() );
 		builtin_print_help( argv[0], sb_err );
 		return 1;
 	}
@@ -493,12 +485,11 @@ int builtin_set( wchar_t **argv )
 			/* No arguments -- display name & value for all variables in scope */
 			if( erase ) 
 			{
-				sb_append2( sb_err,
-							argv[0],
-							L": Erase needs a variable name\n", 
-							parser_current_line(), 
-							L"\n",
-							(void *)0 );
+				sb_printf( sb_err,
+						   _(L"%ls: Erase needs a variable name\n%ls\n"), 
+						   argv[0],
+						   parser_current_line() );
+				
 				builtin_print_help( argv[0], sb_err );
 				retcode = 1;
 			}
@@ -518,9 +509,6 @@ int builtin_set( wchar_t **argv )
 				!erase &&
 				!list )
 			{
-				/*
-				  Only update the variable scope
-				*/
 				env_set( name, 0, scope );
 				finished = 1;
 			}
@@ -531,12 +519,11 @@ int builtin_set( wchar_t **argv )
 			/* There are some arguments, we have at least a variable name */
 			if( erase && al_get_count(&values) != 0 ) 
 			{
-				sb_append2( sb_err, 
-							argv[0],
-							L": Values cannot be specfied with erase\n",
-							parser_current_line(),
-							L"\n",
-							(void *)0 );
+				sb_printf( sb_err, 
+						   _(L"%ls: Values cannot be specfied with erase\n%ls\n"),
+						   argv[0],
+						   parser_current_line() );
+				
 				builtin_print_help( argv[0], sb_err );
 				retcode = 1;
 			} 

builtin_ulimit.c

@@ -17,6 +17,7 @@ Functions used for implementing the ulimit builtin.
 #include "builtin.h"
 #include "common.h"
 #include "wgetopt.h"
+#include "translate.h"
 
 /**
    Struct describing a resource limit
@@ -344,13 +345,10 @@ int builtin_ulimit( wchar_t ** argv )
 			case 0:
 				if(long_options[opt_index].flag != 0)
 					break;
-				sb_append2( sb_err, 
-							argv[0],
-							BUILTIN_ERR_UNKNOWN,
-							L" ",
-							long_options[opt_index].name,
-							L"\n",
-							(void *)0 );
+                sb_printf( sb_err,
+                           BUILTIN_ERR_UNKNOWN,
+                           argv[0],
+                           long_options[opt_index].name );
 				builtin_print_help( argv[0], sb_err );
 
 				return 1;

common.c

@@ -45,8 +45,11 @@ 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 "util.h"
 #include "wutil.h"
@@ -55,11 +58,7 @@ parts of fish.
 #include "proc.h"
 #include "wildcard.h"
 #include "parser.h"
-
-/**
-   Error message to show on string convertion error
-*/
-#define STR2WCS_MSG "fish: Invalid multibyte sequence \'"
+#include "halloc.h"
 
 /**
    The maximum number of minor errors to report. Further errors will be omitted.
@@ -85,8 +84,6 @@ 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;
@@ -104,23 +101,35 @@ static struct winsize termsize;
 */
 static int block_count=0;
 
+/**
+   String buffer used by the wsetlocale function
+*/
+static string_buffer_t *setlocale_buff=0;
+
+
 void common_destroy()
 {
-	debug( 3, L"Calls: wcsdupcat %d, wcsdupcat2 %d, wcsndup %d, str2wcs %d, wcs2str %d", c1, c2, c3, c4, c5 );
+	if( setlocale_buff )
+	{
+		sb_destroy( setlocale_buff );
+		free( setlocale_buff );
+	}
 }
 
-
-
-wchar_t **list_to_char_arr( array_list_t *l )
+wchar_t **list_to_char_arr( void *context, array_list_t *l )
 {
-	wchar_t ** res = malloc( sizeof(wchar_t *)*(al_get_count( l )+1) );
+	wchar_t ** res = halloc( context, sizeof(wchar_t *)*(al_get_count( l )+1) );
 	int i;
 	if( res == 0 )
 	{
 		die_mem();
 	}
 	for( i=0; i<al_get_count( l ); i++ )
+	{		
 		res[i] = (wchar_t *)al_get(l,i);
+		if( context )
+			halloc_register( context, res[i] );
+	}
 	res[i]='\0';
 	return res;	
 }
@@ -244,41 +253,51 @@ void sort_list( array_list_t *comp )
 
 wchar_t *str2wcs( const char *in )
 {
-	c4++;
+	wchar_t *out;
+	size_t res=0;
+	int in_pos=0;
+	int out_pos = 0;
+	size_t len = strlen(in);
+	mbstate_t state;
 	
-	wchar_t *res;
+	out = malloc( sizeof(wchar_t)*(len+1) );
+	memset( &state, 0, sizeof(state) );
 	
-	res = malloc( sizeof(wchar_t)*(strlen(in)+1) );
-	
-	if( !res )
+	if( !out )
 	{
 		die_mem();
-		
 	}
-	
-	if( (size_t)-1 == mbstowcs( res, in, sizeof(wchar_t)*(strlen(in)) +1) )
+
+	while( in[in_pos] )
 	{
-		error_count++;
-		if( error_count <=error_max )
+		res = mbrtowc( &out[out_pos], &in[in_pos], len-in_pos, &state );
+
+		switch( res )
 		{
-			fflush( stderr );			
-			write( 2,
-				   STR2WCS_MSG,
-				   strlen(STR2WCS_MSG) );
-			write( 2,
-				   in,
-				   strlen(in ));
-			write( 2, 
-				   "\'\n",
-				   2 );
+			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;
+			}
 		}
-		
-		free(res);
-		return 0;
-	}	
-	
-	return res;
+		out_pos++;
+	}
+	out[out_pos] = 0;
 	
+	return out;	
 }
 
 void error_reset()
@@ -288,21 +307,51 @@ void error_reset()
 
 char *wcs2str( const wchar_t *in )
 {
-	c5++;
+	char *out;	
+	size_t res=0;
+	int in_pos=0;
+	int out_pos = 0;
+	mbstate_t state;
+	
+	out = malloc( MAX_UTF8_BYTES*wcslen(in)+1 );
+	memset( &state, 0, sizeof(state) );
 
-	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 );
-
-//	res = realloc( res, strlen( res )+1 );
-
-	return res;
+	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 );
+			
+			switch( res )
+			{
+				case (size_t)(-1):
+					{
+						debug( 1, L"Wide character has no narrow representation" );
+						memset( &state, 0, sizeof(state) );
+						break;
+					}
+				default:
+				{
+					out_pos += res;
+					break;
+				}
+			}
+		}
+		in_pos++;
+	}
+	out[out_pos] = 0;
+	
+	return out;	
 }
 
 char **wcsv2strv( const wchar_t **in )
@@ -329,15 +378,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;
@@ -393,86 +438,6 @@ wchar_t **strv2wcsv( const char **in )
 }
 
 
-
-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;	
-}
-
-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 $*/
 
 /*
@@ -574,63 +539,6 @@ wcslcpy(wchar_t *dst, const wchar_t *src, size_t siz)
 	/* count does not include NUL */
 }
 
-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;
-	
-}
-
-/**
-   Fallback implementation if missing from libc
-*/
-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);
-}
-
-/**
-   Fallback implementation if missing from libc
-*/
-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);
-}
-
 int wcsvarname( wchar_t *str )
 {
 	while( *str )
@@ -646,23 +554,6 @@ int wcsvarname( wchar_t *str )
 	
 }
 
-#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.
@@ -685,48 +576,37 @@ int my_wcswidth( const wchar_t *c )
 
 wchar_t *quote_end( const wchar_t *in )
 {
-	switch( *in )
-	{
-		case '"':
-		{
-			while(1)
-			{
-				in = wcschr( in+1, L'"' );
-				if( !in )
-					return 0;
-				if( *(in-1) != L'\\' )
-					return (wchar_t *)in;
-			}
-		}
-		case '\'':
-		{
-			return wcschr( in+1, L'\'' );
-		}
-	}
-	return 0;
+	return wcschr( in+1, *in );
 }
 
 
-void fish_setlocale(int category, const wchar_t *locale)
+const wchar_t *wsetlocale(int category, const wchar_t *locale)
 {
-	char *lang = wcs2str( locale );
-	setlocale(category,lang);
+
+	char *lang = locale?wcs2str( locale ):0;
+	char * res = setlocale(category,lang);
+	
 	free( lang );
+
 	/*
 	  Use ellipsis if on known unicode system, otherwise use $
 	*/
-	if( wcslen( locale ) )
+	char *ctype = setlocale( LC_CTYPE, (void *)0 );
+	ellipsis_char = (strstr( ctype, ".UTF")||strstr( ctype, ".utf") )?L'\u2026':L'$';	
+		
+	if( !res )
+		return 0;
+	
+	if( !setlocale_buff )
 	{
-		ellipsis_char = wcsstr( locale, L".UTF")?L'\u2026':L'$';	
-	}
-	else
-	{
-		char *lang = getenv( "LANG" );
-		if( lang )
-			ellipsis_char = strstr( lang, ".UTF")?L'\u2026':L'$';	
-		else
-			ellipsis_char = L'$';
+		setlocale_buff = malloc( sizeof(string_buffer_t) );
+		sb_init( setlocale_buff);
 	}
+	
+	sb_clear( setlocale_buff );
+	sb_printf( setlocale_buff, L"%s", res );
+	
+	return (wchar_t *)setlocale_buff->buff;	
 }
 
 int contains_str( const wchar_t *a, ... )
@@ -771,18 +651,19 @@ int writeb( tputs_arg_t b )
 
 void die_mem()
 {
-	debug( 0, L"Out of memory, shutting down fish." );
+	/*
+	  Do not translate this message, and do not send it through the
+	  usual channels. This increases the odds that the message gets
+	  through correctly, even if we are out of memory.
+	*/
+	fwprintf( stderr, L"Out of memory, shutting down fish.\n" );
 	exit(1);
 }
 
-void debug( int level, wchar_t *msg, ... )
+void debug( int level, const wchar_t *msg, ... )
 {
 	va_list va;
 	string_buffer_t sb;
-	wchar_t *start, *pos;
-	int line_width = 0;
-	int tok_width = 0;
-	int screen_width = common_get_width();
 	
 	if( level > debug_level )
 		return;
@@ -793,10 +674,22 @@ void debug( int level, wchar_t *msg, ... )
 	sb_printf( &sb, L"%ls: ", program_name );
 	sb_vprintf( &sb, msg, va );
 	va_end( va );	
+
+	write_screen( (wchar_t *)sb.buff );
+
+	sb_destroy( &sb );	
+}
+
+void write_screen( const wchar_t *msg )
+{
+	const wchar_t *start, *pos;
+	int line_width = 0;
+	int tok_width = 0;
+	int screen_width = common_get_width();
 	
 	if( screen_width )
 	{
-		start = pos = (wchar_t *)sb.buff;
+		start = pos = msg;
 		while( 1 )
 		{
 			int overflow = 0;
@@ -868,11 +761,9 @@ void debug( int level, wchar_t *msg, ... )
 	}
 	else
 	{
-		fwprintf( stderr, L"%ls", sb.buff );
-		
+		fwprintf( stderr, L"%ls", msg );
 	}
 	putwc( L'\n', stderr );
-	sb_destroy( &sb );
 }
 
 wchar_t *escape( const wchar_t *in, 
@@ -885,6 +776,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':
@@ -920,9 +831,10 @@ wchar_t *escape( const wchar_t *in,
 			case L'^':
 			case L'<':
 			case L'>':
-			case L'@':
 			case L'(':
 			case L')':
+			case L'[':
+			case L']':
 			case L'{':
 			case L'}':
 			case L'?':
@@ -931,8 +843,9 @@ wchar_t *escape( const wchar_t *in,
 			case L';':
 			case L':':
 			case L'\'':
-			case L'\"':
+			case L'"':
 			case L'%':
+			case L'~':
 				if( escape_all )
 					*pos++ = L'\\';
 				*pos++ = *in;
@@ -951,6 +864,8 @@ wchar_t *escape( const wchar_t *in,
 					*pos++ = *in;
 				break;
 		}
+		}
+		
 		in++;
 	}
 	*pos = 0;
@@ -1023,6 +938,7 @@ wchar_t *unescape( const wchar_t * orig, int unescape_special )
 							break;
 						}
 						
+						case L'X':
 						case L'u':
 						case L'U':
 						case L'x':
@@ -1032,7 +948,9 @@ wchar_t *unescape( const wchar_t * orig, int unescape_special )
 							wchar_t res=0;
 							int chars=2;
 							int base=16;
-					
+							
+							int byte = 0;
+							
 							switch( in[in_pos] )
 							{
 								case L'u':
@@ -1056,6 +974,14 @@ wchar_t *unescape( const wchar_t * orig, int unescape_special )
 									break;
 								}
 								
+								case L'X':
+								{
+									byte=1;
+									base=16;
+									chars=2;
+									break;
+								}
+								
 								case L'o':
 								{
 									base=8;
@@ -1078,7 +1004,7 @@ wchar_t *unescape( const wchar_t * orig, int unescape_special )
 						
 							}
 					
-							in[out_pos] = res;
+							in[out_pos] = (byte?ENCODE_DIRECT_BASE:0)+res;
 					
 							break;
 						}

common.h

@@ -8,6 +8,8 @@
 */
 #define FISH_COMMON_H
 
+#include <stdlib.h>
+#include <stdio.h>
 #include <wchar.h>
 #include <termios.h>
 
@@ -42,6 +44,11 @@ typedef char tputs_arg_t;
 */
 #define FISH_COLOR_RESET -2
 
+/**
+   This is in the unicode private use area.
+*/
+#define ENCODE_DIRECT_BASE 0xf000
+
 /** 
 	Save the shell mode on startup so we can restore them on exit
 */
@@ -76,9 +83,12 @@ 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 );
+wchar_t **list_to_char_arr( void *context, array_list_t *l );
 
 /**
    Read a line from the stream f into the buffer buff of length len. If
@@ -134,31 +144,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,51 +168,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 dublicate string. Wide string version of strdup. Will
-   automatically exit if out of memory.
-*/
-wchar_t *wcsdup(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.
@@ -236,8 +182,8 @@ 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
 */
@@ -254,9 +200,12 @@ wchar_t *quote_end( const wchar_t *in );
 void error_reset();
 
 /**
-   Set the locale, also change the ellipsis character
+   This function behaves exactly like a wide character equivalent of
+   the C function setlocale, except that it will also try to detect if
+   the user is using a Unicode character set, and if so, use the
+   unicode ellipsis character as ellipsis, instead of '$'.      
 */
-void fish_setlocale( int category, const wchar_t *locale );
+const wchar_t *wsetlocale( int category, const wchar_t *locale );
 
 /**
    Checks if \c needle is included in the list of strings specified
@@ -302,7 +251,7 @@ void common_destroy();
 
    will print the string 'fish: Pi = 3.141', given that debug_level is 1 or higher, and that program_name is 'fish'.
 */
-void debug( int level, wchar_t *msg, ... );
+void debug( int level, const wchar_t *msg, ... );
 
 /**
    Replace special characters with backslash escape sequences. Newline is
@@ -375,5 +324,12 @@ int common_get_height();
 */
 void common_handle_winch( int signal );
 
+/**
+   Write paragraph of output to screen. Ignore newlines in message and
+   perform internal line-breaking.
+*/
+void write_screen( const wchar_t *msg );
+
+
 #endif
 

configure.ac

@@ -1,22 +1,71 @@
 # Process this file with autoconf to produce a configure script.
-AC_INIT(fish,1.18.0,fish-users@lists.sf.net)
+AC_INIT(fish,1.20.2,fish-users@lists.sf.net)
 
-AC_CANONICAL_TARGET
+for i in /usr/pkg /sw /opt /opt/local; do
 
-if test $target_cpu = powerpc; then
-   AC_DEFINE([TPUTS_KLUDGE],[1],[Evil kludge to get Power based machines to work])
+	AC_MSG_CHECKING([for $i/include include directory])
+	if test -d $i/include; then
+		AC_MSG_RESULT(yes)
+		CPPFLAGS="$CPPFLAGS -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 )
+
+# If needed, run autoheader automatically
+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 is needed because the configure.ac file has been modified.
+Please install it and try again.])
+	fi
+else
+	AC_MSG_RESULT([no])
 fi
 
-AC_DEFINE_UNQUOTED([CPU],[L"$target_cpu"],[CPU type])
-
+# Tell autoconf to create config.h header 
 AC_CONFIG_HEADERS(config.h)
 
-# Checks for programs.
+# Set up various programs needed for install
 AC_PROG_CC
 AC_PROG_CPP
 AC_PROG_INSTALL
-#AC_ISC_POSIX
-#AC_PROG_MAKE_SET
+
+# Check for doxygen, which is needed to build
+AC_CHECK_PROG( has_doxygen, [doxygen], "true")
+
+if ! test $has_doxygen = "true"; then
+	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
+
+# Check for seq program. If missing, install fallback shellscript implementation
+AC_CHECK_PROG( SEQ_FALLBACK, seq, [ ], [seq])
 
 # Optionally drop xsel
 AC_ARG_WITH( xsel, 
@@ -35,6 +84,17 @@ else
     AC_SUBST( XSEL_MAN_PATH,[ ])
 fi
 
+# Test cpu for special handling of ppc
+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 installation directories
 if [[ "$prefix" = NONE ]]; then
 	AC_DEFINE_UNQUOTED( [PREFIX], L"/usr/local", [Installation directory])
 	AC_SUBST( PREFIX, /usr/local)
@@ -58,16 +118,13 @@ 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
+AC_DEFINE_UNQUOTED( [LOCALEDIR], "$(eval echo $datadir)/locale", [Locale directory])
+AC_SUBST( [LOCALEDIR], [$datadir/locale])
+
 # See if Linux procfs is present
 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])])
-
-AC_CHECK_FUNCS( [wprintf futimes wcwidth wcswidth getopt_long] ) 
-AC_CHECK_HEADERS([getopt.h termio.h sys/resource.h])
-
 # Check for RLIMIT_AS in sys/resource.h.
 AC_MSG_CHECKING([for RLIMIT_AS in sys/resource.h])
 AC_TRY_COMPILE([#include <sys/resource.h>],
@@ -104,6 +161,7 @@ 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>],
@@ -116,17 +174,69 @@ else
     AC_MSG_RESULT(no)
 fi
 
+# 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
+
+
+# Check for libraries
 AC_CHECK_LIB(socket, connect)
 AC_CHECK_LIB(rt, nanosleep)
+AC_CHECK_LIB(intl, gettext)
+
+# Check for various header files
+AC_CHECK_HEADERS([getopt.h termio.h sys/resource.h term.h ncurses/term.h libintl.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 various functions, and insert results into config.h
+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 )
+
+AC_DEFINE([HAVE_TRANSLATE_H], [1],
+			  [Define to 1 if the wgettext function should be used for translating strings.])
+
+# Check again for gettext library, and insert results into the Makefile
+AC_CHECK_FUNC(gettext, AC_SUBST(HAVE_GETTEXT,1), AC_SUBST(HAVE_GETTEXT,0) )
+
+# 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 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])])
+AC_SEARCH_LIBS( setupterm, [ncurses curses], [ AC_MSG_NOTICE([Found curses implementation])], [AC_MSG_ERROR([Could not find a curses implementation, needed to build fish])] )
 
-#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])
+AC_CONFIG_FILES([Makefile fish.spec doc_src/fish.1 doc_src/Doxyfile init/fish init/fish_interactive.fish init/fish_complete.fish seq])
 AC_OUTPUT
+
+echo "Now run 'make' and 'make install' to built and install fish."
+echo "Good luck!"

doc_src/and.txt

@@ -2,22 +2,16 @@
 \section and and - Conditionally execute a command
 
 \subsection and-synopsis Synopsis
- <tt>and COMMAND1; COMMAND2</tt>
+ <tt>COMMAND1; and COMMAND2</tt>
 
 \subsection and-description Description
 
-The \c and builtin is used to execute one command, and if it returns
-zero status, also execute a second command. 
+The \c and builtin is used to execute a command if the current exit status (as set by the last previous command) is zero
 
 \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>
-and make; make install
+make; and make install
 </pre>
 
-\c or and \c and can be nested, as in this example, that attempts to build and install a program, and removed the files created by the build process on failiure
-
-<pre>
-or and make; make install; make clean
-</pre>

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

doc_src/block.txt

@@ -0,0 +1,19 @@
+
+\section block block - Temporarily block delivery of events
+
+\subsection block-synopsis Synopsis
+ <tt>block [OPTIONS...]</tt>
+
+\subsection block-description Description
+
+- <tt>-l</tt> or <tt>--local</tt> Release the block at the end of the currently innermost block scope
+- <tt>-g</tt> or <tt>--global</tt> Never automatically release the lock
+- <tt>-e</tt> or <tt>--erase</tt> Release global block
+
+\subsection block-example Example
+
+<pre>block -g
+\#Do something that should not be interrupted
+block -e
+</pre>
+

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;

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

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>

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.
 

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.

doc_src/doc.hdr

@@ -3,10 +3,10 @@
 \section introduction The friendly interactive shell
 
 This is the documentation for \c fish, the friendly interactive
-shell. \c fish is a user friendly commandline shell shell intended
+shell. \c fish is a user friendly commandline shell intended
 mostly for interactive use. A shell is a program used to execute other
 programs. For the latest information on \c fish, please visit the <a
-href="http://roo.no-ip.org/fish/"><tt>fish</tt> homepage</a>.
+href="http://roo.no-ip.org/fish/"><code>fish</code> homepage</a>.
 
 \section syntax Syntax overview
 
@@ -18,12 +18,12 @@ any arguments.
 
 Example:
 
-<tt>echo hello world</tt>
+<code>echo hello world</code>
 
 calls the \c echo command. \c echo is a command which will write its
 arguments to the screen. In the example above, the output will be
 'hello world'. Everything in fish is done with commands. There are
-commonds for performing a set of command multiple times, commands for
+commands for performing a set of commands multiple times, commands for
 assigning variables, commands for treating a group of commands as a
 single command, etc.. And every single command follows the same simple
 syntax.
@@ -31,14 +31,14 @@ syntax.
 If you wish to find out more about the echo command used above, read
 the manual page for the echo command by writing:
 
-<tt>man echo</tt>
+<code>man echo</code>
 
 \c man is a command for displaying a manual page on a given
 topic. There are manual pages for almost every command on most
 computers. There are also manual pages for many other things, such as
 system libraries and important files.
 
-Every program on a computer can be used as a command in \c fish. If
+Every program on your computer can be used as a command in \c fish. If
 the program file is located in one of the directories in the <a
 href="#variables-special">PATH</a>, it is sufficient to type the name
 of the program to use it. Otherwise the whole filename, including the
@@ -76,40 +76,45 @@ and vice versa.
 
 Example:
 
-<tt>rm "cumbersome filename.txt"</tt>
+<code>rm "cumbersome filename.txt"</code>
 
-Will remove the file 'cumbersome filename.txt'.
+Will remove the file 'cumbersome filename.txt', while
+
+<code>rm cumbersome filename.txt</code>
+
+would remove the two files 'cumbersome' and 'filenmae.txt'.
 
 \subsection escapes Escaping characters
 
 Some characters can not be written directly on the command line. For
 these characters, so called escape sequences are provided. These are:
 
-- <tt>'\\n'</tt>, escapes a newline character
-- <tt>'\\t'</tt>, escapes the tab character
-- <tt>'\\b'</tt>, escapes the backspace character
-- <tt>'\\r'</tt>, escapes the carriage return character
-- <tt>'\\e'</tt>, escapes the escape character
-- <tt>'\\ '</tt>, escapes the space character
-- <tt>'\\$'</tt>, escapes the dollar character
-- <tt>'\\\\'</tt>, escapes the backslash character
-- <tt>'\\*'</tt>, escapes the star character
-- <tt>'\\?'</tt>, escapes the question mark character
-- <tt>'\\~'</tt>, escapes the tilde character
-- <tt>'\\#'</tt>, escapes the hash character
-- <tt>'\\('</tt>, escapes the left parenthesis character
-- <tt>'\\)'</tt>, escapes the right parenthesis character
-- <tt>'\\{'</tt>, escapes the left curly bracket character
-- <tt>'\\}'</tt>, escapes the right curly bracket character
-- <tt>'\\['</tt>, escapes the left bracket character
-- <tt>'\\]'</tt>, escapes the right bracket character
-- <tt>'\\\<'</tt>, escapes the less than character
-- <tt>'\\\>'</tt>, escapes the more than character
-- <tt>'\\^'</tt>, escapes the circumflex character
-- <tt>'\\x<i>xx</i>'</tt>, where <tt><i>xx</i></tt> is a hexadecimal number, escapes the ascii character with the specified value
-- <tt>'\\o<i>ooo</i>'</tt>, where <tt><i>ooo</i></tt> is an octal number, escapes the ascii character with the specified value
-- <tt>'\\u<i>xxxx</i>'</tt>, where <tt><i>xxxx</i></tt> is a hexadecimal number, escapes the 16-bit unicode character with the specified value
-- <tt>'\\U<i>xxxxxxxx</i>'</tt>, where <tt><i>xxxxxxxx</i></tt> is a hexadecimal number, escapes the 32-bit unicode character with the specified value
+- <code>'\\n'</code>, escapes a newline character
+- <code>'\\t'</code>, escapes the tab character
+- <code>'\\b'</code>, escapes the backspace character
+- <code>'\\r'</code>, escapes the carriage return character
+- <code>'\\e'</code>, escapes the escape character
+- <code>'\\ '</code>, escapes the space character
+- <code>'\\$'</code>, escapes the dollar character
+- <code>'\\\\'</code>, escapes the backslash character
+- <code>'\\*'</code>, escapes the star character
+- <code>'\\?'</code>, escapes the question mark character
+- <code>'\\~'</code>, escapes the tilde character
+- <code>'\\#'</code>, escapes the hash character
+- <code>'\\('</code>, escapes the left parenthesis character
+- <code>'\\)'</code>, escapes the right parenthesis character
+- <code>'\\{'</code>, escapes the left curly bracket character
+- <code>'\\}'</code>, escapes the right curly bracket character
+- <code>'\\['</code>, escapes the left bracket character
+- <code>'\\]'</code>, escapes the right bracket character
+- <code>'\\\<'</code>, escapes the less than character
+- <code>'\\\>'</code>, escapes the more than character
+- <code>'\\^'</code>, escapes the circumflex character
+- <code>'\\x<i>xx</i>'</code>, where <code><i>xx</i></code> is a hexadecimal number, escapes the ascii character with the specified value
+- <code>'\\X<i>xx</i>'</code>, where <code><i>xx</i></code> is a hexadecimal number, escapes a byte of data with the specified value. If you are using a mutibyte encoding, this can be used to enter invalid strings. Only use this if you know what you are doing.
+- <code>'\\o<i>ooo</i>'</code>, where <code><i>ooo</i></code> is an octal number, escapes the ascii character with the specified value
+- <code>'\\u<i>xxxx</i>'</code>, where <code><i>xxxx</i></code> is a hexadecimal number, escapes the 16-bit unicode character with the specified value
+- <code>'\\U<i>xxxxxxxx</i>'</code>, where <code><i>xxxxxxxx</i></code> is a hexadecimal number, escapes the 32-bit unicode character with the specified value
 
 \subsection redirects IO redirection
 
@@ -120,41 +125,41 @@ a number called a file descriptor (FD). These are:
 - Standard output, FD 1, for writing, defaults to writing to the screen.
 - Standard error, FD 2, for writing errors and warnings, defaults to writing to the screen.
 
-The reason for providing for two methods of output is so errors and
-warnings can be separated from regular program output.
+The reason for providing for two output file descriptors is to allow
+separation of errors and warnings from regular program output.
 
 Any file descriptor can be directed to a different output than it's
-default through a simple mechanism called a redirecton.
+default through a simple mechanism called a redirection.
 
-An example of a file redirection is <tt> echo hello \>output.txt</tt>,
+An example of a file redirection is <code> echo hello \>output.txt</code>,
 which directs the output of the echo command to the file error.txt.
 
-- To redirect standard input, write <tt>\<SOURCE_FILE</tt> 
-- To redirect standard output, write <tt>\>DESTINATION</tt> 
-- To redirect standard error, write <tt>^DESTINATION</tt> 
-- To redirect standard output to a file which will be appended, write <tt>\>\>DESTINATION_FILE</tt>
-- To redirect standard error to a file which will be appended, write <tt>^^DESTINATION_FILE</tt> 
+- To redirect standard input, write <code>\<SOURCE_FILE</code> 
+- To redirect standard output, write <code>\>DESTINATION</code> 
+- To redirect standard error, write <code>^DESTINATION</code> 
+- To redirect standard output to a file which will be appended, write <code>\>\>DESTINATION_FILE</code>
+- To redirect standard error to a file which will be appended, write <code>^^DESTINATION_FILE</code> 
 
-<tt>DESTINATION</tt> can be one of the following: 
+<code>DESTINATION</code> can be one of the following: 
 
 - A filename. The output will be written to the specified file.
-- An ampersand (\&) followed by the number of a file descriptor. The file descriptor will be a duplicate of the specified file descriptor.
-- A minus sign (-). The FD will be closed.
+- An ampersand (\&) followed by the number of another file descriptor. The file descriptor will be a duplicate of the specified file descriptor.
+- An ampersand followed by a minus sign (\&-). The file descriptor will be closed.
 
 Example:
 
 To redirect both standard output and standard error to the file
-all_output.txt, you can write <tt>echo Hello \>all_output.txt
-^\&1</tt>.
+all_output.txt, you can write <code>echo Hello \>all_output.txt
+^\&1</code>.
 
 Any FD can be redirected in an arbitrary way by prefixing the
 redirection with the number of the FD.
 
-- To redirect input of FD number N, write <tt>N\<DESTINATION</tt>
-- To redirect output of FD number N, write <tt>N\>DESTINATION</tt> 
-- To redirect output of FD number N to a file which will be appended, write <tt>N\>\>DESTINATION_FILE</tt>
+- To redirect input of FD number N, write <code>N\<DESTINATION</code>
+- To redirect output of FD number N, write <code>N\>DESTINATION</code> 
+- To redirect output of FD number N to a file which will be appended, write <code>N\>\>DESTINATION_FILE</code>
 
-Example: <tt>echo Hello 2\>-</tt> and <tt>echo Hello ^-</tt> are
+Example: <code>echo Hello 2\>-</code> and <code>echo Hello ^-</code> are
 equivalent.
 
 \subsection piping Piping
@@ -164,7 +169,7 @@ pipeline. This means that the standard output of one command will be read
 in as standard input into the next command. This is done by separating
 the commands by the pipe character (|). For example
 
-<tt>cat foo.txt | head</tt>
+<code>cat foo.txt | head</code>
 
 will call the 'cat' program with the parameter 'foo.txt', which will
 print the contents of the file 'foo.txt'. The contents of foo.txt will
@@ -172,7 +177,7 @@ then be filtered through the program 'head', which will pass on the
 first ten lines of the file to the screen. For more information on how
 to combine commands through pipes, read the manual pages of the
 commands you want to use using the 'man' command. If you want to find
-out more about the 'cat' program, type <tt>man cat</tt>.
+out more about the 'cat' program, type <code>man cat</code>.
 
 Pipes usually connect file descriptor 1 (standard output) of the first
 process to file descriptor 0 (standard input) of the second
@@ -180,7 +185,7 @@ process. It is possible use a different output file descriptor by
 prepending the desired FD number and then output redirect symbol to
 the pipe. For example:
 
-<tt>make fish 2>|less</tt>
+<code>make fish 2>|less</code>
 
 will attempt to build the fish program, and any errors will be shown
 using the less pager.
@@ -195,7 +200,6 @@ your command. This will tell fish to run the job in the background.
 
 \subsection syntax-job-control Job control
 
-
 Most programs allow you to suspend the programs execution and return
 control to \c fish by Pressing ^Z (Press and hold the Control key and
 press 'z'). Once back at the \c fish commandline, you can start other
@@ -215,7 +219,7 @@ href="builtins.html#jobs">jobs</a> command.
 This is a short explanation of some of the commonly used words in fish.
 
 - argument, a parameter given to a command
-- builtin, a command that is implemented as part of the shell
+- builtin, a command that is implemented in the shell
 - command, a program
 - function, a block of one or more fish commands that can be called as a single command. By using functions, it is possible to string together multiple smaller commands into one more advanced command.
 - job, a running pipeline or command
@@ -225,29 +229,30 @@ This is a short explanation of some of the commonly used words in fish.
 \section help Help
 
 \c fish has an extensive help system. Use the <a
-href="commands.html#help"><tt>help</tt></a> command to obtain help on
-a specific subject or command. For instance, writing <tt>help
-syntax</tt> displays the <a href="#syntax">syntax section</a> of this
+href="commands.html#help"><code>help</code></a> command to obtain help on
+a specific subject or command. For instance, writing <code>help
+syntax</code> displays the <a href="#syntax">syntax section</a> of this
 documentation.
 
-Help on a specific builtin can also be obtained with the <tt>-h</tt>
+Help on a specific builtin can also be obtained with the <code>-h</code>
 parameter. For instance, to obtain help on the \c fg builtin, either
-type <tt>fg -h</tt> or <tt>help fg</tt>.
+type <code>fg -h</code> or <code>help fg</code>.
 
 
 \section completion Tab completion
 
 Tab completion is one of the most time saving features of any modern
 shell. By tapping the tab key, the user asks \c fish to guess the rest
-of the command or parameter that the user is currently typing. If
-there is only one possible completion, \c fish will write it out. If
-there is more than one completion, \c fish will write out the longest
-common prefix that all completions have in common. If all completions
-differ on the first character, a list of all possible completions is
-printed. The list features descriptions of the completions and if the
-list doesn't fit the screen, it is scrollable by using the arrow keys,
-the page up/page down keys or the space bar. Press any other key will
-exit the list and insert the presssed key into the command line.
+of the command or parameter that the user is currently typing. If \c
+fish can only find one possible completion, \c fish will write it
+out. If there is more than one completion, \c fish will write out the
+longest common prefix that all completions have in common. If all
+completions differ on the first character, a list of all possible
+completions is printed. The list features descriptions of the
+completions and if the list doesn't fit the screen, it is scrollable
+by using the arrow keys, the page up/page down keys or the space
+bar. Press any other key will exit the list and insert the pressed key
+into the command line.
 
 These are the general purpose tab completions that \c fish provides:
 
@@ -261,27 +266,27 @@ These are the general purpose tab completions that \c fish provides:
 of these completions are simple options like the \c -l option for \c
 ls, but some are more advanced. The latter include:
 
-- The programs 'man' and 'whatis' complete using all installed 
-manual pages.
-- The 'make' program complete using all targets in the Makefile in 
-the current directory.
-- The 'mount' command complete using all mount points specified in fstab.
-- The 'ssh' command complete using all hosts in that are stored 
-in the known_hosts file. (see the ssh documentation for more information) 
-- The 'su' command complete using all users on the system
-- The \c apt-get, \c rpm and \c tym commands complete using all installed packages.
+- The programs 'man' and 'whatis' show all installed 
+manual pages as completions.
+- The 'make' program uses all targets in the Makefile in 
+the current directory as completions.
+- The 'mount' command uses all mount points specified in fstab as completions.
+- The 'ssh' command uses all hosts in that are stored 
+in the known_hosts file as completions. (see the ssh documentation for more information) 
+- The 'su' command uses all users on the system as completions.
+- The \c apt-get, \c rpm and \c yum commands use all installed packages as completions.
 
 \subsection completion-own Writing your own completions
 
 Specifying your own completions is not complicated. To specify a
-completion, one simply uses the \c complete command. \c complete takes
+completion, use the \c complete command. \c complete takes
 as a parameter the name of the command to specify a completion
 for. For example, to add a completion for the program \c myprog, one
-would start the completion command with <tt>complete -c myprog
-...</tt>. To provide a list of possible completions for myprog, use
+would start the completion command with <code>complete -c myprog
+...</code>. To provide a list of possible completions for myprog, use
 the \c -a switch. If \c myprog accepts the arguments start and stop,
-this can be specified as <tt>complete -c myprog -a 'start
-stop'</tt>. The argument to the \c -a switch is always a single
+this can be specified as <code>complete -c myprog -a 'start
+stop'</code>. The argument to the \c -a switch is always a single
 string. At completion time, it will be tokenized on spaces and tabs,
 and variable expansion, command substitution and other forms of
 parameter expansion will take place. 
@@ -294,7 +299,7 @@ respectively. If the command 'myprog' has an option '-o' which can
 also be written as '--output', and which can take an additional value
 of either 'yes' or 'no', this can be specified by writing:
 
-<tt>complete -c myprog -s o -l output -a "yes no"</tt>
+<code>complete -c myprog -s o -l output -a "yes no"</code>
 
 There are also special switches for specifying that a switch requires
 an argument, to disable filename completion, to create completions
@@ -326,7 +331,7 @@ parameter to be expanded. These include:
 \subsection expand-wildcard Wildcards 
 
 If a star (*) or a question mark (?) is present in the parameter, \c
-fish attempts to mach the given parameter to any files in such a
+fish attempts to match the given parameter to any files in such a
 way that '?' can match any character except '/' and '*' can match any
 string of characters not containing '/'.
 
@@ -335,7 +340,7 @@ Example:
 
 <code>???</code> matches any file in the current directory whose name is exactly three characters long.
 
-If no matches are founf for a specific wildcard, it will expand intto
+If no matches are found for a specific wildcard, it will expand into
 zero arguments, i.e. to nothing. If none of the wildcarded arguments
 sent to a command result in any matches, the command will not be
 executed. If this happens when using the shell interactively, a
@@ -344,7 +349,7 @@ warning will also be printed.
 \subsection expand-command-substitution Command substitution
 
 If a parameter contains a set of parenthesis, the text enclosed by the
-parentesis will be interpreted as a list of commands. Om expansion,
+parenthesis will be interpreted as a list of commands. Om expansion,
 this list is executed, and substituted by the output. If the output is
 more than one line long, each line will be expanded to a new
 parameter.
@@ -354,21 +359,21 @@ Example:
 The command <code>echo (basename image.jpg .jpg).png</code> will
 output 'image.png'.
 
-The command <tt>for i in *.jpg; convert $i (basename $i .jpg).png;
-end</tt> will convert all Jpeg files in the current directory to the
+The command <code>for i in *.jpg; convert $i (basename $i .jpg).png;
+end</code> will convert all Jpeg files in the current directory to the
 PNG format.
 
 
 \subsection expand-brace Brace expansion
 
-A comma separated list of characters enclosed en curly braces will be
+A comma separated list of characters enclosed in curly braces will be
 expanded so each element of the list becomes a new parameter.
 
 Example:
 
-<tt>echo input.{c,h,txt}</tt> outputs 'input.c input.h input.txt'
+<code>echo input.{c,h,txt}</code> outputs 'input.c input.h input.txt'
 
-The command <tt>mv *.{c,h} src/</tt> moves all files with the suffix
+The command <code>mv *.{c,h} src/</code> moves all files with the suffix
 '.c' or '.h' to the subdirectory src.
 
 \subsection expand-variable Variable expansion
@@ -380,12 +385,12 @@ href="#variables"> Environment variables</a> section.
 
 Example:
 
-<tt> echo \$HOME</tt> prints the home directory of the current
+<code> echo \$HOME</code> prints the home directory of the current
 user. 
 
 If you wish to combine environment variables with text, you can
 encase the variables within braces to embed a variable inside running
-text like <tt>echo Konnichiwa {$USER}san</tt>, which will print a
+text like <code>echo Konnichiwa {$USER}san</code>, which will print a
 personalized Japanese greeting.
 
 The {$USER}san syntax might need a bit of an elaboration.  Posix
@@ -403,8 +408,9 @@ there once along the way was a '}' in there somewhere, and } is not a
 valid character in a variable name.  So anything after the otherwise
 pointless bracket expansion becomes NOT a part of the variable name,
 even if it happens to be a legal variable name character. That's why
-'{$USER}san' works. A case of one syntax just lending itself so nicely
-to solving an unrelated problem in it's spare time.
+'{$USER}san' looks for the variable '$USER' and not for the variable
+'$USERsan'. It's a case of one syntax lending itself nicely to
+solving an unrelated problem in it's spare time.
 
 Variable expansion is the only type of expansion performed on double
 quoted strings. There is, however, an important difference in how
@@ -445,11 +451,11 @@ take the process ids as an argument.
 
 Example:
 
-<tt>fg \%ema</tt> will search for a process whose command line begins
+<code>fg \%ema</code> will search for a process whose command line begins
 with the letters 'ema', such as emacs, and if found, put it in the
 foreground.
 
-<tt>kill -s SIGINT \%3</tt> will send the SIGINT signal to the job
+<code>kill -s SIGINT \%3</code> will send the SIGINT signal to the job
 with job id 3.
 
 \subsection  combine Combining different expansions
@@ -461,7 +467,7 @@ created.
 Example:
 
 If the current directory contains the files 'foo' and 'bar', the command
-<tt>echo a(ls){1,2,3} </tt>
+<code>echo a(ls){1,2,3} </code>
 will output 'abar1 abar2 abar3 afoo1 afoo2 afoo3'.
 
 
@@ -479,16 +485,16 @@ command</a>.
 Example: 
 
 To set the variable \c smurf to the value \c blue, use the command
-<tt>set smurf blue</tt>.
+<code>set smurf blue</code>.
 
 After a variable has been set, you can use the value of a variable in
 the shell through <a href="expand-variable">variable expansion</a>.
 
 Example:
 
-To use the value of a the variable \c smurf, write $ (dollar synbol)
-followed by the name of the variable, like <tt>echo Smurfs are
-$smurf</tt>, which would print the result 'Smurfs are blue'.
+To use the value of a the variable \c smurf, write $ (dollar symbol)
+followed by the name of the variable, like <code>echo Smurfs are
+$smurf</code>, which would print the result 'Smurfs are blue'.
 
 \subsection variables-scope Variable scope
 
@@ -496,8 +502,8 @@ There are three kinds of variables in fish, universal, global and
 local variables. Universal variables are shared between all fish
 sessions a user is running on one computer. Global variables are
 specific to the current fish session, but are not associated with any
-soecific block scope, and will never be erased unless the user
-explicitly requests it using <tt>set -e</tt>. Local variables are
+specific block scope, and will never be erased unless the user
+explicitly requests it using <code>set -e</code>. Local variables are
 specific to the current fish session, and associated with a specific
 block of commands, and is automatically erased when a specific block
 goes out of scope. A block of commands is a series of commands that
@@ -513,7 +519,7 @@ creating or updating a variable are:
 
 -# If a variable is explicitly set to either universal, global or local, that setting will be honored
 -# If a variable is not explicitly set to be either universal, global or local, but has been previously defined, the variable scope is not changed
--# If a variable is not explicitly set to be either universal, global or local and has never befor been defined, the variable will be local to the currently executing functions. If no function is executing, the variable will be global.
+-# If a variable is not explicitly set to be either universal, global or local and has never before been defined, the variable will be local to the currently executing functions. If no function is executing, the variable will be global.
 
 There may be many variables with the same name, but different scopes.
 When using a variable, the variable scope will be searched from the
@@ -544,17 +550,17 @@ value once, and it will be automatically updated for all sessions, and
 preserved across computer reboots and login/logout.
 
 To see universal variables in action, start two fish sessions side by
-side, and issue the following command in one of them <tt>set
-fish_color_cwd blue</tt>. Since \c fish_color_cwd is a universal
+side, and issue the following command in one of them <code>set
+fish_color_cwd blue</code>. Since \c fish_color_cwd is a universal
 variable, the color of the current working directory listing in the
 prompt will instantly change to blue on both terminals.
 
 \subsection variables-functions Variable scope for functions
 
 When calling a function, all non-global variables temporarily
-dissapear. This shadowing of the local scope is needed since the
+disappear. This shadowing of the local scope is needed since the
 variable namespace would become cluttered, making it very easy to
-accidentaly overwrite variables from another function.
+accidentally overwrite variables from another function.
 
 For example, the following code will output 'Avast, mateys':
 
@@ -590,7 +596,7 @@ identical to the scoping rules for variables:
 
 -# If a variable is explicitly set to either be exported or not exported, that setting will be honored
 -# If a variable is not explicitly set to be exported or not exported, but has been previously defined, the previous exporting rule for the variable is kept
--# If a variable is not explicitly set to be either global or local and has never befor been defined, the variable will not be exported
+-# If a variable is not explicitly set to be either global or local and has never before been defined, the variable will not be exported
 
 
 \subsection variables-arrays Arrays
@@ -637,13 +643,13 @@ echo $smurf
 \subsection variables-special Special variables
 
 The user can change the settings of \c fish by changing the values of
-certain environment variables. 
+certain environment variables.
 
 - \c BROWSER, which is the users preferred web browser. If this variable is set, fish will use the specified browser instead of the system default browser to display the fish documentation.
 - \c CDPATH, which is an array of directories in which to search for the new directory for the \c cd builtin.
 - \c fish_color_normal, \c fish_color_command, \c fish_color_substitution, \c fish_color_redirection, \c fish_color_end, \c fish_color_error, \c fish_color_param, \c fish_color_comment, \c fish_color_match, \c fish_color_search_match, \c fish_color_cwd, \c fish_pager_color_prefix, \c fish_pager_color_completion, \c fish_pager_color_description and \c fish_pager_color_progress are used to change the color of various elements in \c fish. These variables are universal, i.e. when changing them, their new value will be used by all running fish sessions. The new value will also be retained when restarting fish.
 - \c PATH, which is an array of directories in which to search for commands
-- \c umask, which is the current file creation mask. The prefered way to change the umask variable is through the <a href="commands.html#umask">umask shellscript function</a>. An attempt to set umask to an invalid value will always fail.
+- \c umask, which is the current file creation mask. The preferred way to change the umask variable is through the <a href="commands.html#umask">umask shellscript function</a>. An attempt to set umask to an invalid value will always fail.
 
 \c fish also sends additional information to the user through the
 values of certain environment variables. The user can not change the
@@ -655,14 +661,31 @@ values of these variables. They are:
 - \c PWD, which is the current working directory. 
 - \c status, which is the exit status of the last foreground job to exit. If a job contains pipelines, the status of the last command in the pipeline is the status for the job.
 - \c USER, which is the username. This variable can only be changed by the root user.
+- \c LANG, \c LC_ALL, \c LC_COLLATE, \c LC_CTYPE, \c LC_MESSAGES, \c LC_MONETARY, \c LC_NUMERIC and \c LC_TIME set the language option for the shell and subprograms. See the section <a href='#variables-locale'>Locale variables</a> for more information.
 
 Variables whose name are in uppercase are exported to the commands
-started by fish. This rule is not enfored by fish, but it is good
+started by fish. This rule is not enforced by fish, but it is good
 coding practice to use casing to distinguish between exported and
 unexported variables. \c fish also uses several variables
 internally. Such variables are prefixed with the string __FISH or
 __fish. These should be ignored by the user.
 
+\subsection variables-locale Locale variables
+
+The most common way to set the locale to use a command like 'set -x
+LANG en_GB.utf8', which sets the current locale to be the english
+language, as used in Great Britain, using the UTF-8 character set. For
+a list of available locales, use 'locale -a'.
+
+\c LANG, \c LC_ALL, \c LC_COLLATE, \c LC_CTYPE, \c LC_MESSAGES, \c
+LC_MONETARY, \c LC_NUMERIC and LC_TIME set the language option for the
+shell and subprograms. These variables work as follows: \c LC_ALL
+forces all the aspects of the locale to the specified value. If LC_ALL
+is set, all other locale variables will be ignored. The other LC_
+variables set the specified aspect of the locale information. LANG
+is a fallback value, it will be used if none of the LC_ variables are
+specified.
+
 \section builtin-overview Builtins 
 
 Many other shells have a large library of builtin commands. Most of
@@ -678,10 +701,12 @@ The following commands are distributed with fish. Many of them are
 builtins or shellscript functions, and can only be used inside fish.
 
 - <a href="builtins.html#source">.</a>, read and execute the commands in a file 
+- <a href="builtins.html#and">and</a>, execute command if previous command suceeded
 - <a href="builtins.html#bg">bg</a>, set a command to the background
 - <a href="builtins.html#begin">begin</a>, execute a block of commands
 - <a href="builtins.html#bind">bind</a>, change keyboard bindings
 - <a href="builtins.html#break">break</a>, stop the execution of a loop
+- <a href="builtins.html#block">block</a>, Temporarily block delivery of events
 - <a href="builtins.html#builtin">builtin</a>, execute a builtin command
 - <a href="builtins.html#case">case</a>, conditionally execute a block of commands
 - <a href="builtins.html#cd">cd</a>, change the current directory
@@ -708,6 +733,7 @@ builtins or shellscript functions, and can only be used inside fish.
 - <a href="commands.html#mimedb">mimedb</a>, view mimedata about a file
 - <a href="commands.html#nextd">nextd</a>, move forward in the directory history
 - <a href="builtins.html#not">not</a>, negates the exit status of any command
+- <a href="builtins.html#or">or</a>, execute a command if previous command failed
 - <a href="commands.html#popd">popd</a>, move to the topmost directory on the directory stack
 - <a href="commands.html#prevd">prevd</a>, move backwards in the direcotry stack
 - <a href="commands.html#pushd">pushd</a>, push the surrent directory onto the directory stack
@@ -719,10 +745,10 @@ builtins or shellscript functions, and can only be used inside fish.
 - <a href="builtins.html#switch">switch</a>, conditionally execute a block of commands
 - <a href="commands.html#tokenize">tokenize</a>, split a string up into multiple tokens
 - <a href="builtins.html#ulimit">ulimit</a>, set or get the shells resurce usage limits
-- <a href="commandss.html#umask">umask</a>, set or get the file creation mask
+- <a href="commands.html#umask">umask</a>, set or get the file creation mask
 - <a href="builtins.html#while">while</a>, perform a block of commands while a condition is met
 
-For more information about these commands, use the <tt>--help</tt>
+For more information about these commands, use the <code>--help</code>
 option of the command to display a longer explanation.
 
 \section editor Command Line editor
@@ -737,24 +763,26 @@ Here are some of the commands available in the editor:
 - End or Ctrl-e moves to the end of line
 - Left and right moves one character left or right
 - Alt-left and Alt-right moves one word left or right, or moves forward/backward in the directory history if the commandline is empty
+- Up and down search the command history for the previous/next command containing the string that was specified on the commandline before the search was started. If the commandline was empty when the search started, all commands match. See the <a href='#history'>history </a>section for more information on history searching.
+- Alt-up and Alt-down search the command history for the previous/next token containing the token under the cursor before the search was started. If the commandline was not on a token when the search started, all tokens match. See the <a href='#history'>history </a>section for more information on history searching.
 - Delete and backspace removes one character forwards or backwards
 - Ctrl-c delete entire line
 - Ctrl-d delete one character to the right of the cursor, unless the buffer is empty, in which case the shell will exit
-- Ctrl-k move contents from cursor to end of line to <a href="#killring">killring</a>
-- Ctrl-u move contents from beginning of line to cursor <a href="#killring">killring</a>
+- Ctrl-k move contents from the cursor to the end of line to the <a href="#killring">killring</a>
+- Ctrl-u move contents from the beginning of line to the cursor to the <a href="#killring">killring</a>
 - Ctrl-l clear and repaint screen
-- Ctrl-w move previous word to <a href="#killring">killring</a>
-- Alt-d move next word to <a href="#killring">killring</a>
+- Ctrl-w move previous word to the <a href="#killring">killring</a>
+- Alt-d move next word to the <a href="#killring">killring</a>
 - Alt-w prints a short description of the command under the cursor 
 - Alt-l lists the contents of the current directory, unless the cursor is over a directory argument, in which case the contents of that directory will be listed 
-- Alt-k prints a list of all key bindings
+- Alt-p adds the string '| less;' to the end of the job under the cursor. The result is that the output of the command will be paged.
 
 You can change these key bindings by making an inputrc file. To do
 this, copy the file /etc/fish_inputrc to your home directory and
 rename it to '.fish_inputrc'. Now you can edit the file .fish_inputrc,
 to change your key bindings. The fileformat of this file is described
-in the manual page for readline. Use the command <tt>man readline</tt>
-to read up on this syntax. Please note thet the list of key binding
+in the manual page for readline. Use the command <code>man readline</code>
+to read up on this syntax. Please note that the list of key binding
 functions in fish is different to that offered by readline. Currently,
 the following functions are available:
 
@@ -783,7 +811,11 @@ the following functions are available:
 - \c yank, insert the latest entry of the killring into the buffer
 - \c yank-pop, rotate to the previous entry of the killring
 
+You can also bind a pice of shellscript to a key using the same
+syntax. For example, the Alt-p functionality described above is
+implemented using the following keybinding.
 
+<pre>"\M-p": if commandline -j|grep -v 'less *$' &gt;/dev/null; commandline -aj "|less;"; end</pre>
 
 \subsection killring Copy and paste (Kill Ring) 
 
@@ -807,6 +839,14 @@ forwards and backwards in the history. If the current command line is
 not empty when starting a history search, only the commands containing
 the string entered into the command line are shown.
 
+By pressing Alt-up and Alt-down, a history search is also performed,
+but instead of searching for a complete commandline, each commandline
+is tokenized into separate elements just like it would be before
+execution, and each such token is matched agains the token under the
+cursor when the search began.
+
+History searches can be aborted by pressing the escape key.
+
 The history is stored in the file '.fish_history'. It is automatically
 read on startup and merged on program exit.
 
@@ -823,7 +863,7 @@ fish will be stopped until the program finishes. Sometimes this is not
 desirable. For example, you may wish to start an application with a
 graphical user interface from the terminal, and then be able to
 continue using the shell. In such cases, there are several ways in
-which the user can change <tt>fish</tt>'s behaviour.
+which the user can change <code>fish</code>'s behaviour.
 
 -# By ending a command with the \& (ampersand) symbol, the user tells \c fish to put the specified command into the background. A background process will be run simultaneous with \c fish. \c fish will retain control of the terminal, so the program will not be able to read from the keyboard. 
 -# By pressing ^Z, the user stops a currently running foreground  program and returns control to \c fish. Some programs do not support this feature, or remap it to another key. Gnu emacs uses ^X z to stop running.
@@ -835,13 +875,13 @@ On startup, \c fish evaluates the file /etc/fish (Or ~/etc/fish if you
 installed fish in your home directory) and ~/.fish, in that order. If
 you want to run a command only on starting an interactive shell, use
 the exit status of the command 'status --is-interactive' to determine
-if the shell is interactive. If you want to run a command only on
-starting a login shell, use 'status --is-login' instead.
+if the shell is interactive. If you want to run a command only when
+using a login shell, use 'status --is-login' instead.
 
-Example:
+Examples:
 
 If you want to add the directory ~/linux/bin to your PATH variable
-when loging in, add the following to your ~/.fish file:
+when using a login shell, add the following to your ~/.fish file:
 
 <pre>if status --is-login
 	set PATH $PATH ~/linux/bin
@@ -851,7 +891,7 @@ If you want to run a set of commands when \c fish exits, use an <a
 href='#event'>event handler</a> that is triggered by the exit of the
 shell:
 
-<pre>function on_exit --on-process %self
+<pre>function on_exit --on-process \%self
 	echo fish is now exiting
 end</pre>
 
@@ -885,11 +925,15 @@ fish_color_substitution, \c fish_color_redirection, \c fish_color_end,
 \c fish_color_error, \c fish_color_param, \c fish_color_comment, \c
 fish_color_match, \c fish_color_search_match, \c fish_color_cwd, \c
 fish_pager_color_prefix, \c fish_pager_color_completion, \c
-fish_pager_color_description and \c fish_pager_color_progress. Valid
-values are \c black, \c red, \c green, \c brown, \c yellow, \c blue,
-\c magenta, \c purple, \c cyan, \c white or \c normal. Setting one of
-the above variables to normal will mean that the text color will be
-set to the default foreground color for the terminal.
+fish_pager_color_description and \c
+fish_pager_color_progress. Usually, the value of these variables will
+be one of \c black, \c red, \c green, \c brown, \c yellow, \c blue, \c
+magenta, \c purple, \c cyan, \c white or \c normal, but they can be an
+array containing any color options for the set_color command.
+
+Issuing <code>set fish_color_error black --background=red
+--bold</code> will make all commandline errors be written in a black,
+bold font, with a red background.
 
 \subsection prompt Programmable prompt
 
@@ -904,17 +948,14 @@ The default \c fish prompt is
 <p>
 <pre>
 function fish_prompt -d "Write out the prompt"
-	printf '\%s\@\%s\%s\\n\%s\%s\\n> ' (whoami) (hostname|cut -d . -f 1) (set_color \$fish_color_cwd) (prompt_pwd) (set_color normal)
+	printf '\%s\@\%s\%s\%s\%s> ' (whoami) (hostname|cut -d . -f 1) (set_color \$fish_color_cwd) (prompt_pwd) (set_color normal)
 end
 </pre>
+
+where \c prompt_pwd is a shellscript function that displays a condensed version of the current working direcotry.
+
 </p>
 
-If you are using \c set_color or other commands that output escape
-codes to change the font settings of the terminal, you must always and
-every such sequence with a newline. This is needed since fish needs to
-know that exact length of the prompt in order to tetect when the
-cursor reaches the end of the line. Any newlines in the output of the
-\c fish_prompt command are ignored.
 
 \subsection title Programmable title
 
@@ -966,7 +1007,68 @@ it's initalization files to function properly. To solve this
 problem, either copy the initialization files to each fish users home
 directory, or install them in /etc.
 
+\section i18n Translating fish to other languages
 
+Fish uses the GNU gettext library to implement translation to multiple
+languages. If fish is not available in your language, please consider
+making a translation. Currently, only the shell itself can be
+translated, a future version of fish should also include translated
+manuals.
+
+To make a translation of fish, you will first need the sourcecode,
+available from the <a href='http://roo.no-ip.org/fish'>fish
+homepage</a>. Download the latest version, and then extract it using a
+command like <code>tar -zxf fish-VERSION.tar.gz</code>.
+
+Next, cd into the newly created fish directory using <code>cd
+fish-VERSION</code>.
+
+You will now need to configure the sourcecode using the command
+<code>./configure</code>. This step might take a while.
+
+Before you continue, you will need to know the ISO 639 language code
+of the language you are translating to. These codes can be found <a
+href='http://www.w3.org/WAI/ER/IG/ert/iso639.htm'>here</a>. For
+example, the language code for Uighur is ug.
+
+Now you have the sourcecode and it is properly configured. Lets start
+translating. To do this, first create an empty translation table for
+the language you wish to translate to by writing <code>make
+po/[LANGUAGE CODE].po</code> in the fish terminal. For example, if you
+are translating to Uighur, you should write <code>make
+po/ug.po</code>. This should create the file po/ug.po, a template
+translation table containing all the strings that need to be
+translated.
+
+Now you are all set up to translate fish to a new language. Open the
+newly created .po file in your editor of choice, and start
+translating. The .po file format is rather simple. It contains pairs
+of string in a format like:
+
+<pre>
+msgid "%ls: No suitable job\n"
+msgstr ""
+</pre>
+
+The first line is the english string to translate, the second line
+should contain your translation. For example, in swedish the above
+might become:
+
+<pre>
+msgid "%ls: No suitable job\n"
+msgstr "%ls: Inget passande jobb\n"
+</pre>
+
+\%s, \%ls, \%d and other tokens beginning with a '\%' are
+placeholders. These will be replaced by a value by fish at
+runtime. You must always take care to use exactly the same
+placeholders in the same order in your translation. (Actually, there
+are ways to avoid this, but they are to complicated for this short
+introduction. See the full manual for the printf C function for more
+information.)
+
+Once you have provided a translation for fish, please send it to <a
+href='fish-users@lists.sf.net'>fish-users@lists.sf.net</a>.
 
 \section todo Missing features and bugs
 
@@ -974,17 +1076,18 @@ directory, or install them in /etc.
 
 - Complete vi-mode key bindings
 - next-history-complete
-- builtin wait command
 - More completions (for example xterm, vim, 
 konsole, gnome-terminal, dcop, cdrecord, cron, xargs
 rlogin, telnet, rsync, arch, finger, nice, locate, 
 bibtex, patch, aspell, xpdf,
-zip, compress, wine, xmms, dig, wine, batch, cron, 
+compress, wine, xmms, dig, wine, batch, cron, 
 g++, javac, java, gcj, lpr, doxygen, whois, find)
 - Undo support
-- Check keybinding commands for output - if non has happened, don't repaint to reduce flicker
+- Check keybinding commands for output - if nothing has happened, don't repaint to reduce flicker
 - The jobs builtin should be able to give information on a specific job, such as the pids of the processes in the job
 - Syntax highlighting should mark cd to non-existing directories as an error
+- wait shellscript
+- Signal handler to save the history file before exiting from a signal
 
 
 \subsection todo-possible Possible features
@@ -997,7 +1100,6 @@ g++, javac, java, gcj, lpr, doxygen, whois, find)
 - mouse support like zsh has with http://stchaz.free.fr/mouse.zsh 
   installed would be awesome
 - suggest a completion on unique matches by writing it out in an understated color
-- Maybe some functions should only be available from key-bindings. That way one could implement a large part of all the key-binding functions as regular fish functions without worrying about cluttering up the function name space.
 - With a bit of tweakage, quite a few of the readline key-binding functions could be implemented in shellscript.
 - Highlight beginning/end of block when moving over a block command
 - Inclusion guards for the init files to make them evaluate only once, even if the user has installed fish both in /etc and in $HOME
@@ -1007,20 +1109,22 @@ g++, javac, java, gcj, lpr, doxygen, whois, find)
 - show the whole list of commands on using tab on an empty commandline
 - Automatically move cursor to the end of the current token before completing
 - Map variables. (export only the values. When expanding with no key specified, expand to all values.)
+- Descriptions for variables using 'set -d'.
+- Parse errors should when possible honor IO redirections
+
 
 \subsection bugs Known bugs
 
 - Completion for gcc -\#\#\# option doesn't work.
-- Many completions are made specifically for the GNU 
-version of a POSIX command
 - Yanking weird characters from clipboard prints Unicode escapes
-
+- Suspending and then resuming pipelines containing a builtin is broken. How should this be handled?
 
 If you think you have found a bug not described here, please send a
 report to <a href="mailto:axel@liljencrantz.se"> axel@liljencrantz.se
 </a>.
 
-\subsection Known issues
+
+\subsection issues 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
@@ -1034,6 +1138,7 @@ changes when upgrading from pre1.9.2 to 1.9.2 or later.  You may also
 run into such problems when switching between using a package and
 personal builds.
 
+
 */
 /** \page design Design document
 
@@ -1306,7 +1411,7 @@ between different shell sessions and applications.
 
 The open command uses the mimetype database (Also used by both Gnome
 or KDE) to launch the default application for a file. Just type
-<tt>open *.html</tt> and all the HTML files in your current directory
+<code>open *.html</code> and all the HTML files in your current directory
 will be opened in your default browser. No longer will you have to
 convert your filenames to URLS, remember clunky Open Office command
 names, worry about absolute paths or any the other common pitfalls when
@@ -1316,10 +1421,10 @@ opening files from the commandline.
 
 \c fish is heavily commented. Both the source code and the
 program in general features a great deal of easily accessible
-documentation. The <tt>help</tt> command is used to display HTML-based
-help files. Just type <tt>help</tt> and a subject, and the help system
+documentation. The <code>help</code> command is used to display HTML-based
+help files. Just type <code>help</code> and a subject, and the help system
 will try to fill your needs. To view the page you are reading right
-now, you could simply type <tt>help difference</tt>. <tt>help</tt>
+now, you could simply type <code>help difference</code>. <code>help</code>
 also works great together with tab completion. Write \c help and
 double tap on tab, a list of all help sections will be displayed, with
 a description of the content of each section.
@@ -1370,9 +1475,9 @@ information.
 \subsection difference-simple Simplicity
 
 \c fish has a simple syntax. There is only one form of
-alias/function/whatever, accessed through the <tt>function</tt>
+alias/function/whatever, accessed through the <code>function</code>
 builtin. The are very few builtins, \c fish relies on normal commands
-like <tt>echo</tt>, <tt>kill</tt>, <tt>printf</tt> and <tt>time</tt>
+like <code>echo</code>, <code>kill</code>, <code>printf</code> and <code>time</code>
 instead of reimplementing them as builtins.
 
 Token separation is performed before variable expansion. This means
@@ -1380,13 +1485,13 @@ that even if a variable contains spaces, it will never be separated
 into multiple arguments. If you want to tokenize a string, you can use
 the <a href="commands.html#tokenize">tokenize</a> command.
 
-Command substitution is specified using parenthesis, as in <tt>set name (whoami)</tt>. 
+Command substitution is specified using parenthesis, as in <code>set name (whoami)</code>. 
 
 There is no math mode, use bc.
 
 The POSIX way of setting variables is <i>lame</i>. Whitespace
 sensitive languages are awful. "foo=bar" and "foo = bar" should not
-mean different things. \c fish uses a builtin, <tt>set</tt> to set and
+mean different things. \c fish uses a builtin, <code>set</code> to set and
 remove environment variables. While this may seem a bit obscure, this
 makes for a very consistent language. In fish, everything, including
 the loops, assignments and switch/case statements is a command.

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
 

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.

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.
 

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>

doc_src/jobs.txt

@@ -1,13 +1,20 @@
 \section jobs jobs - print currently running jobs
 
 \subsection jobs-synopsis
-<tt>jobs</tt>
+<tt>jobs [OPTIONS] [PID]</tt>
 
 \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.
 
-On systems that supports this feature, jobs will also print the CPU
-usage of each job since the last command was executed. The CPU usage
-is expressed as a percentage of full CPU activity. Note that on
+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 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
+expressed as a percentage of full CPU activity. Note that on
 multiprocessor systems, the total activity may be more than 100\%.

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.

doc_src/or.txt

@@ -2,22 +2,16 @@
 \section or or - Conditionally execute a command
 
 \subsection or-synopsis Synopsis
- <tt>or COMMAND1; COMMAND2</tt>
+ <tt>COMMAND1; or COMMAND2</tt>
 
 \subsection or-description Description
 
-The \c or builtin is used to execute one command, and if it returns
-non-zero status, also execute a second command. 
+The \c or builtin is used to execute a command if the current exit status (as set by the last previous command) is non-zero
 
 \subsection or-example Example
 
 The following code runs the \c make command to build a program, or if it fails, it runs <tt>make clean</tt>, which removes the files created by the build process
 <pre>
-or make; make clean
+make; or make clean
 </pre>
 
-\c or and \c and can be nested, as in this example, that attempts to build and install a program, and removed the files created by the build process on failiure
-
-<pre>
-or and make; make install; make clean
-</pre>

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.

doc_src/set.txt

@@ -1,22 +1,24 @@
 \section set set - Handle environment variables.
 
 \subsection set-synopsis Synopsis
-<tt>set [OPTIONS] VARIABLE_NAME [VALUES...]</tt>
+<code>set [OPTIONS] [VARIABLE_NAME [VALUES...]]</code>
 
-The <tt>set</tt> builtin causes fish to assign the variable <tt>VARIABLE_NAME</tt> the values <tt>VALUES...</tt>. 
+The <code>set</code> builtin causes fish to assign the variable <code>VARIABLE_NAME</code> the values <code>VALUES...</code>.
 
 \subsection set-description Description
-- <tt>-e</tt> or <tt>--erase</tt> causes the specified environment variable to be erased
-- <tt>-g</tt> or <tt>--global</tt> 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
-- <tt>-l</tt> or <tt>--local</tt> forces the specified environment variable to be made local to the current block, even if the variable already exists and is non-local
-- <tt>-n</tt> or <tt>--names</tt> List only the names of all defined variables
-- <tt>-q</tt> or <tt>--query</tt> 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.
-- <tt>-u</tt> or <tt>--unexport</tt> causes the specified environment not to be exported to child processes
-- <tt>-U</tt> or <tt>--universal</tt> causes the specified environment variable to be made universal. If this option is supplied, the variable will be shared between all the current users fish instances on the current computer, and will be preserved across restarts of the shell.
-- <tt>-x</tt> or <tt>--export</tt> causes the specified environment variable to be exported to child processes
+- <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 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.
+- <code>-u</code> or <code>--unexport</code> causes the specified environment not to be exported to child processes
+- <code>-U</code> or <code>--universal</code> causes the specified environment variable to be made universal. If this option is supplied, the variable will be shared between all the current users fish instances on the current computer, and will be preserved across restarts of the shell.
+- <code>-x</code> or <code>--export</code> causes the specified environment variable to be exported to child processes
 
 If set is called with no arguments, the names and values of all
-environment variables are printed.
+environment variables are printed. If some of the scope or export
+flags have been given, only the variables matching the specified scope
+are printed.
 
 If the \c -e or \c --erase option is specified, the variable
 specified by the following arguments will be erased
@@ -25,13 +27,21 @@ 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 <tt>PATH[1
-3 7]</tt>, 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
 
-<tt>set foo hi</tt> sets the value of the variable foo to be hi.
+<code>set -xg</code> will print all global, exported variables.
 
-<tt>set -e smurf</tt> removes the variable \c smurf.
+<code>set foo hi</code> sets the value of the variable foo to be hi.
 
-<tt>set PATH[4] ~/bin</tt> changes the fourth element of the \c PATH array to \c ~/bin
+<code>set -e smurf</code> removes the variable \c smurf.
+
+<code>set PATH[4] ~/bin</code> changes the fourth element of the \c PATH array to \c ~/bin

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

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.

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>

doc_src/tokenize.txt

@@ -1,14 +0,0 @@
-
-\section tokenize tokenize - tokenize a string
-
-\subsection tokenize-synopsis Synopsis
- <tt>tokenize [STRING...]</tt>
-
-\subsection tokenize-description Description
-- STRING is the string or list of strings to tokenize. Each token will be printed on a line by itself
-- \c -e, \c --with-empty allow empty tokens
-- \c -n, \c --no-empty ignore empty tokens (Default)
-- <tt>-d DELIMITER</tt>,  <tt>--delimiter=DELIMITER</tt> is the list of characters that will be used as delimiters. If unspecified, the IFS environment variable will be used as the delimiter string,
-- \c -h, \c --help Display help message and exit
-- \c -v, \c --version Display version and exit
-

doc_src/trap.txt

@@ -0,0 +1,37 @@
+
+\section trap trap - perform an action when the shell receives a signal
+
+\subsection trap-synopsis Synopsis
+<tt>trap [OPTIONS] [[ARG] SIGSPEC ... ]</tt>
+
+\subsection trap-description Description
+
+Trap is a shellscript wrapper around the fish event delivery
+framework. IT is defined for backwards compatibility reasons. For
+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 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
+- \c -p or \c --print print all defined signal handlers
+
+If ARG and SIGSPEC are both specified, ARG is the command to be
+executed when the signal specified by SIGSPEC is delivered.
+
+If ARG is absent (and there is a single SIGSPEC) or -, each specified
+signal is reset to its original disposition (the value it had upon
+entrance to the shell).  If ARG is the null string the signal
+specified by each SIGSPEC is ignored by the shell and by the commands
+it invokes.
+
+If ARG is not present and -p has been supplied, then the trap commands
+associated with each SIGSPEC are displayed. If no arguments are
+supplied or if only -p is given, trap prints the list of commands
+associated with each signal.
+
+Signal names are case insensitive and the SIG prefix is optional.
+
+The return status is 1 if any SIGSPEC is invalid; otherwise trap
+returns 0.

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

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.

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

env.c

@@ -25,7 +25,12 @@
 #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 "util.h"
@@ -41,6 +46,8 @@
 #include "env_universal.h"
 #include "input_common.h"
 #include "event.h"
+#include "translate.h"
+#include "complete.h"
 
 /**
    Command used to start fishd
@@ -141,19 +148,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.
@@ -171,6 +165,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
@@ -182,7 +206,7 @@ static void start_fishd()
 {
 	string_buffer_t cmd;
 	struct passwd *pw;
-		
+	
 	sb_init( &cmd );
 	pw = getpwuid(getuid());
 	
@@ -190,7 +214,7 @@ static void start_fishd()
 	
 	if( !pw )
 	{
-		debug( 0, L"Could not get user information" );
+		debug( 0, _( L"Could not get user information" ) );
 		return;
 	}
 	
@@ -213,6 +237,90 @@ static mode_t get_umask()
 	return res;
 }
 
+/**
+   Checks if the specified variable is a locale variable
+*/
+static int is_locale( const wchar_t *key )
+{
+	int i;
+	for( i=0; locale_variable[i]; i++ )
+		if( wcscmp(locale_variable[i], key ) == 0 )
+			return 1;
+	return 0;
+}
+
+/**
+  Properly sets all locale information
+*/
+static void handle_locale()
+{
+	const wchar_t *lc_all = env_get( L"LC_ALL" );
+	const wchar_t *lang;
+	int i;
+	wchar_t *old = wcsdup(wsetlocale( LC_MESSAGES, (void *)0 ));
+
+	/*
+	  Array of locale constants corresponding to the local variable names defined in locale_variable
+	*/
+	static const int cat[] = 
+		{
+			0, 
+			LC_ALL, 
+			LC_COLLATE,
+			LC_CTYPE,
+			LC_MESSAGES,
+			LC_MONETARY,
+			LC_NUMERIC,
+			LC_TIME
+		}
+	;
+	
+	if( lc_all )
+	{
+		wsetlocale( LC_ALL, lc_all );
+	}
+	else
+	{
+		lang = env_get( L"LANG" );
+		if( lang )
+		{
+			wsetlocale( LC_ALL, lang );
+		}
+		
+		for( i=2; locale_variable[i]; i++ )
+		{
+			const wchar_t *val = env_get( locale_variable[i] );
+			if( val )
+				wsetlocale(  cat[i], val );
+		}
+	}
+	
+	if( wcscmp( wsetlocale( LC_MESSAGES, (void *)0 ), old ) != 0 )
+	{
+
+		/* Try to make change known to gettext.  */
+#ifdef HAVE__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") );
+		}
+	}
+	free( old );
+		
+}
+
+
 /**
    Universal variable callback function. This function makes sure the
    proper events are triggered when an event occurs.
@@ -223,6 +331,9 @@ static void universal_callback( int type,
 {
 	wchar_t *str=0;
 	
+	if( is_locale( name ) )
+		handle_locale();
+	
 	switch( type )
 	{
 		case SET:
@@ -236,7 +347,6 @@ static void universal_callback( int type,
 	
 	if( str )
 	{
-		array_list_t arg;
 		event_t ev;
 		
 		has_changed=1;
@@ -245,31 +355,108 @@ static void universal_callback( int type,
 		ev.param1.variable=name;
 		ev.function_name=0;
 		
-		al_init( &arg );
-		al_push( &arg, L"VARIABLE" );
-		al_push( &arg, str );
-		al_push( &arg, name );
-		event_fire( &ev, &arg );		
-		al_destroy( &arg );
+		al_init( &ev.arguments );
+		al_push( &ev.arguments, L"VARIABLE" );
+		al_push( &ev.arguments, str );
+		al_push( &ev.arguments, name );
+		event_fire( &ev );		
+		al_destroy( &ev.arguments );
 	}
 }
 
+/**
+   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"" );
@@ -302,6 +489,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
@@ -339,77 +531,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 )
 	{
@@ -418,7 +547,7 @@ void env_init()
 		free( uname );
 	}
 	
-	env_universal_init( env_get( L"FISHD_SOKET_DIR"), 
+	env_universal_init( env_get( L"FISHD_SOCKET_DIR"), 
 						env_get( L"USER" ),
 						&start_fishd,
 						&universal_callback );
@@ -475,7 +604,7 @@ static env_node_t *env_get_node( const wchar_t *key )
 	
 	return 0;
 }
-	
+
 void env_set( const wchar_t *key, 
 			  const wchar_t *val, 
 			  int var_mode )
@@ -489,20 +618,14 @@ void env_set( const wchar_t *key,
 	int done=0;
 
 	event_t ev;
-	array_list_t ev_list;
 	int is_universal = 0;	
-	
+
 	if( (var_mode & ENV_USER ) && 
 		hash_get( &env_read_only, key ) )
 	{
 		return;
 	}
 	
-	if( wcscmp(key, L"LANG" )==0 )
-	{
-		fish_setlocale(LC_ALL,val);
-	}
-
 	if( wcscmp( key, L"umask" ) == 0)
 	{
 		wchar_t *end;
@@ -526,12 +649,11 @@ void env_set( const wchar_t *key,
 		*/
 		return;
 	}
-	
 
 	/*
 	  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;
 	}
@@ -618,7 +740,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 )
@@ -669,18 +792,24 @@ void env_set( const wchar_t *key,
 		ev.param1.variable = key;
 		ev.function_name = 0;
 		
-		al_init( &ev_list );
-		al_push( &ev_list, L"VARIABLE" );
-		al_push( &ev_list, key );
+		al_init( &ev.arguments );
+		al_push( &ev.arguments, L"VARIABLE" );
+		al_push( &ev.arguments, key );
 		
 //	debug( 1, L"env_set: fire events on variable %ls", key );	
-		event_fire( &ev, &ev_list );
+		event_fire( &ev );
 //	debug( 1, L"env_set: return from event firing" );	
-		al_destroy( &ev_list );	
+		al_destroy( &ev.arguments );	
 	}
-	
+
+	if( is_locale( key ) )
+	{
+		handle_locale();
+	}
+		
 }
 
+
 /**
    Attempt to remove/free the specified key/value pair from the
    specified hash table.
@@ -728,6 +857,10 @@ void env_remove( const wchar_t *key, int var_mode )
 	{
 		env_universal_remove( key );
 	}
+
+	if( is_locale( key ) )
+		handle_locale();
+			
 }
 
 
@@ -756,7 +889,7 @@ wchar_t *env_get( const wchar_t *key )
 			wchar_t *next = history_get( i-add_current );
 			if( !next )
 			{
-				debug( 1, L"No history at idx %d\n", i );
+				debug( 1, _( L"No history item at index %d\n" ), i );
 				break;
 			}
 			
@@ -900,8 +1033,20 @@ void env_pop()
 {
 	if( &top->env != global )
 	{
+		int i;
+		int locale_changed = 0;
+		
 		env_node_t *killme = top;
 
+		for( i=0; locale_variable[i]; i++ )
+		{
+			if( hash_get( &killme->env, locale_variable[i] ) )
+			{
+				locale_changed = 1;
+				break;
+			}
+		}
+
 		if( killme->new_scope )
 		{
 			has_changed |= killme->export || local_scope_exports( killme->next );
@@ -911,12 +1056,15 @@ void env_pop()
 		hash_foreach( &killme->env, &clear_hash_entry );
 		hash_destroy( &killme->env );
 		free( killme );
+
+		if( locale_changed )
+			handle_locale();
 		
 	}
 	else
 	{
 		debug( 0,
-			   L"Tried to pop empty environment stack." );
+			   _( L"Tried to pop empty environment stack." ) );
 		sanity_lose();
 	}	
 }
@@ -933,7 +1081,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 );
+	}
 }
 
 /**

env_universal.c

@@ -11,12 +11,19 @@
 #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 "util.h"
@@ -112,7 +119,7 @@ static int get_socket( int fork_ok )
 	local.sun_family = AF_UNIX;
 	strcpy(local.sun_path, name );
 	free( name );
-	len = strlen(local.sun_path) + sizeof(local.sun_family);
+	len = sizeof(local);
 	
 	if( connect( s, (struct sockaddr *)&local, len) == -1 ) 
 	{

env_universal_common.c

@@ -5,6 +5,8 @@
    client library and by the daemon.
 
 */
+#include "config.h"
+
 #include <stdlib.h>
 #include <stdio.h>
 #include <wchar.h>
@@ -186,7 +188,7 @@ void read_message( connection_t *src )
 			}
 			else
 			{
-				sb_printf( &src->input, L"%lc", res );
+				sb_append_char( &src->input, res );
 			}
 		}
 	}

event.c

@@ -13,12 +13,14 @@
 
 #include "config.h"
 #include "util.h"
+#include "wutil.h"
 #include "function.h"
 #include "proc.h"
 #include "parser.h"
 #include "common.h"
 #include "event.h"
 #include "signal.h"
+#include "translate.h"
 
 /**
    Number of signals that can be queued before an overflow occurs
@@ -67,10 +69,20 @@ static array_list_t *events;
 */
 static array_list_t *killme;
 
+/**
+   List of events that have been sent but have not yet been delivered because they are blocked.
+*/
+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 )
@@ -120,7 +132,7 @@ static int event_match( event_t *class, event_t *instance )
    Create an identical copy of an event. Use deep copying, i.e. make
    duplicates of any strings used as well.
 */
-static event_t *event_copy( event_t *event )
+static event_t *event_copy( event_t *event, int copy_arguments )
 {
 	event_t *e = malloc( sizeof( event_t ) );
 	if( !e )
@@ -133,12 +145,114 @@ static event_t *event_copy( event_t *event )
 	if( e->type == EVENT_VARIABLE )
 		e->param1.variable = wcsdup( e->param1.variable );
 		
+	al_init( &e->arguments );
+	if( copy_arguments )
+	{
+		int i;
+		for( i=0; i<al_get_count( &event->arguments ); i++ )
+		{
+			al_push( &e->arguments, wcsdup( (wchar_t *)al_get( &event->arguments, i ) ) );
+		}
+				
+	}
+	
 	return e;
 }
 
+/**
+   Test if specified event is blocked
+*/
+static int event_is_blocked( event_t *e )
+{
+	block_t *block;
+	event_block_t *eb;
+	
+	for( block = current_block; block; block = block->outer )
+	{
+		for( eb = block->first_event_block; eb; eb=eb->next )
+		{
+			if( eb->type & (1<<EVENT_ANY ) )
+				return 1;
+			if( eb->type & (1<<e->type) )
+				return 1;
+		}
+	}
+	for( eb = global_event_block; eb; eb=eb->next )
+	{
+		if( eb->type & (1<<EVENT_ANY ) )
+			return 1;
+		if( eb->type & (1<<e->type) )
+			return 1;
+		return 1;
+		
+	}
+	
+	return 0;
+}
+
+const wchar_t *event_get_desc( event_t *e )
+{
+	if( !get_desc_buff )
+	{
+		get_desc_buff=malloc(sizeof(string_buffer_t) );
+		if( !get_desc_buff )
+			die_mem();
+		sb_init( get_desc_buff );
+	}
+	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 )
 {
-	event_t *e = event_copy( event );
+	event_t *e;
+
+	e = event_copy( event, 0 );
 
 	if( !events )
 		events = al_new();	
@@ -268,13 +382,12 @@ static int event_is_killed( event_t *e )
    matches' path. This means that nothing is allocated/initialized
    unless that is needed.
 */
-static void event_fire_internal( event_t *event, array_list_t *arguments )
+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;
 	
 	/*
@@ -337,9 +450,9 @@ static void event_fire_internal( event_t *event, array_list_t *arguments )
 		
 		sb_append( b, criterion->function_name );
 		
-		for( j=0; j<al_get_count(arguments); j++ )
+		for( j=0; j<al_get_count(&event->arguments); j++ )
 		{
-			wchar_t *arg_esc = escape( (wchar_t *)al_get( arguments, j), 0 );		
+			wchar_t *arg_esc = escape( (wchar_t *)al_get( &event->arguments, j), 0 );		
 			sb_append( b, L" " );
 			sb_append( b, arg_esc );
 			free( arg_esc );				
@@ -351,16 +464,17 @@ static void event_fire_internal( event_t *event, array_list_t *arguments )
 		  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;		
+		is_interactive=0;
+		parser_push_block( EVENT );
+		current_block->param1.event = event;
 		eval( (wchar_t *)b->buff, 0, TOP );
-		
+		parser_pop_block();
+				
 	}
 
 	/*
 	  Restore interactivity flags
 	*/
-	is_subshell = was_subshell;
 	is_interactive = was_interactive;
 
 	if( b )
@@ -385,15 +499,40 @@ static void event_fire_internal( event_t *event, array_list_t *arguments )
 /**
    Handle all pending signal events
 */
-static void event_fire_signal_events()
+static void event_fire_delayed()
 {
+
+	int i;
+
+	if( blocked && is_event==1)
+	{
+		array_list_t *new_blocked = 0;
+		
+		for( i=0; i<al_get_count( blocked ); i++ )
+		{
+			event_t *e = (event_t *)al_get( blocked, i );
+			if( event_is_blocked( e ) )
+			{
+				if( !new_blocked )
+					new_blocked = al_new();
+				al_push( new_blocked, e );			
+			}
+			else
+			{
+				event_fire_internal( e );
+				event_free( e );
+			}
+		}		
+		al_destroy( blocked );
+		free( blocked );
+		blocked = new_blocked;
+	}
+
 	while( sig_list[active_list].count > 0 )
 	{
-		int i;
 		signal_list_t *lst;
 		event_t e;
-		array_list_t a;
-		al_init( &a );		
+		al_init( &e.arguments );		
 
 		/*
 		  Switch signal lists
@@ -412,7 +551,7 @@ static void event_fire_signal_events()
 		
 		if( lst->overflow )
 		{
-			debug( 0, L"Signal list overflow. Signals have been ignored" );
+			debug( 0, _( L"Signal list overflow. Signals have been ignored." ) );
 		}
 		
 		/*
@@ -421,19 +560,27 @@ static void event_fire_signal_events()
 		for( i=0; i<lst->count; i++ )
 		{
 			e.param1.signal = lst->signal[i];
-			al_set( &a, 0, sig2wcs( e.param1.signal ) );			
-			event_fire_internal( &e, &a );
+			al_set( &e.arguments, 0, sig2wcs( e.param1.signal ) );			
+			if( event_is_blocked( &e ) )
+			{
+				if( !blocked )
+					blocked = al_new();
+				al_push( blocked, event_copy(&e, 1) );			
+			}
+			else
+			{
+				event_fire_internal( &e );
+			}
 		}
 		
-		al_destroy( &a );
+		al_destroy( &e.arguments );
 		
 	}	
 }
 
 
-void event_fire( event_t *event, array_list_t *arguments )
+void event_fire( event_t *event )
 {
-	//int is_event_old = is_event;
 	is_event++;
 	
 	if( event && (event->type == EVENT_SIGNAL) )
@@ -448,17 +595,29 @@ void event_fire( event_t *event, array_list_t *arguments )
 			sig_list[active_list].signal[sig_list[active_list].count++]=event->param1.signal;
 		else
 			sig_list[active_list].overflow=1;
-		
 	}
 	else
 	{
-		event_fire_signal_events();
 		
+		event_fire_delayed();
+			
 		if( event )
-			event_fire_internal( event, arguments );
+		{
+			if( event_is_blocked( event ) )
+			{
+				if( !blocked )
+					blocked = al_new();
+				
+				al_push( blocked, event_copy(event, 1) );
+			}
+			else
+			{
+				event_fire_internal( event );
+			}
+		}
 		
 	}	
-	is_event--;// = is_event_old;	
+	is_event--;
 }
 
 
@@ -469,6 +628,7 @@ void event_init()
 
 void event_destroy()
 {
+
 	if( events )
 	{
 		al_foreach( events, (void (*)(const void *))&event_free );
@@ -476,6 +636,7 @@ void event_destroy()
 		free( events );		
 		events=0;
 	}
+
 	if( killme )
 	{
 		al_foreach( killme, (void (*)(const void *))&event_free );
@@ -483,13 +644,25 @@ void event_destroy()
 		free( killme );		
 		killme=0;		
 	}	
+
+	if( get_desc_buff )
+	{
+		sb_destroy( get_desc_buff );
+		free( get_desc_buff );
+	}
+	
 }
 
 void event_free( event_t *e )
 {
+	/*
+	  When apropriate, we clear the argument vector
+	*/
+	al_foreach( &e->arguments, (void (*)(const void *))&free );
+	al_destroy( &e->arguments );
+
 	free( (void *)e->function_name );
 	if( e->type == EVENT_VARIABLE )
 		free( (void *)e->param1.variable );
 	free( e );
 }
-		

event.h

@@ -17,6 +17,9 @@
 */
 #define EVENT_ANY_PID 0
 
+/**
+   Enumeration of event types
+*/
 enum
 {
 	EVENT_ANY, /**< Matches any event type (Not always any event, as the function name may limit the choice as well */
@@ -40,18 +43,24 @@ typedef struct
 	   Type of event
 	*/
 	int type;
+
+	/**
+	   The type-specific parameter
+	*/
 	union
 	{
 		/**
-		   Signal number for signal-type events.Use EVENT_ANY_SIGNAL to match any signal
+		   Signal number for signal-type events.Use EVENT_ANY_SIGNAL
+		   to match any signal
 		*/
 		int signal;
 		/**
-		   Variable name for variable-type events. 
+		   Variable name for variable-type events.
 		*/
 		const wchar_t *variable;
 		/**
-		   Process id for process-type events. Use EVENT_ANY_PID to match any pid.
+		   Process id for process-type events. Use EVENT_ANY_PID to
+		   match any pid.
 		*/
 		pid_t pid;
 		/**
@@ -65,6 +74,13 @@ typedef struct
 	   The name of the event handler function
 	*/
 	const wchar_t *function_name;	
+
+	/**
+	   The argument list. Only used when sending a new event using
+	   event_fire. In all other situations, the value of this variable
+	   is ignored.
+	*/
+	array_list_t arguments;
 }
 	event_t;
 
@@ -96,9 +112,8 @@ 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, array_list_t *arguments );
+void event_fire( event_t *event );
 
 /**
    Initialize the event-handling library
@@ -115,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

exec.c

@@ -36,6 +36,8 @@
 #include "expand.h"
 #include "signal.h"
 #include "env_universal.h"
+#include "translate.h"
+#include "halloc.h"
 
 /**
    Prototype for the getpgid library function. The prototype for this
@@ -48,15 +50,15 @@ pid_t getpgid( pid_t pid );
 /**
    file descriptor redirection error message
 */
-#define FD_ERROR   L"An error occurred while redirecting file descriptor %d"
+#define FD_ERROR   _( L"An error occurred while redirecting file descriptor %d" )
 /**
    file redirection error message
 */
-#define FILE_ERROR L"An error occurred while redirecting file '%ls'"
+#define FILE_ERROR _( L"An error occurred while redirecting file '%ls'" )
 /**
    fork error message
 */
-#define FORK_ERROR L"Could not create child process - exiting"
+#define FORK_ERROR _( L"Could not create child process - exiting" )
 
 
 /**
@@ -66,6 +68,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 )
 {
@@ -235,14 +239,14 @@ void free_fd( io_data_t *io, int fd )
    redirections described by \c io.
 
    \param io the list of IO redirections for the child
+   \param exit_on_error whether to call exit() on errors
+
+   \return 0 on sucess, -1 on failiure
 */
-static void handle_child_io( io_data_t *io )
+static int handle_child_io( io_data_t *io, int exit_on_error )
 {
 
 	close_unused_internal_pipes( io );
-	
-	if( env_universal_server.fd >= 0 )
-		exec_close( env_universal_server.fd );
 
 	for( ; io; io=io->next )
 	{
@@ -276,7 +280,14 @@ static void handle_child_io( io_data_t *io )
 						   io->param1.filename );
 					
 					wperror( L"open" );
-					exit(1);
+					if( exit_on_error )
+					{
+						exit(1);
+					}
+					else
+					{
+						return -1;
+					}					
 				}				
 				else if( tmp != io->fd)
 				{
@@ -288,7 +299,14 @@ static void handle_child_io( io_data_t *io )
 							   FD_ERROR,
 							   io->fd );
 						wperror( L"dup2" );
-						exit(1);
+						if( exit_on_error )
+						{
+							exit(1);
+						}
+						else
+						{
+							return -1;
+						}
 					}
 					exec_close( tmp );
 				}				
@@ -298,19 +316,21 @@ static void handle_child_io( io_data_t *io )
 			case IO_FD:
 			{
 				close(io->fd);
-/*				debug( 3, L"Redirect fd %d in process %ls (%d) from fd %d",
-  io->fd,
-  p->actual_cmd,
-  p->pid,
-  io->old_fd );
-*/			
+
 				if( dup2( io->param1.old_fd, io->fd ) == -1 )
 				{
 					debug( 1, 
 						   FD_ERROR,
 						   io->fd );
 					wperror( L"dup2" );
-					exit(1);					
+					if( exit_on_error )
+					{
+						exit(1);
+					}
+					else
+					{
+						return -1;
+					}
 				}
 				break;
 			}
@@ -318,21 +338,23 @@ static void handle_child_io( io_data_t *io )
 			case IO_BUFFER:
 			case IO_PIPE:
 			{
-				close(io->fd);
-				
-/*				debug( 3, L"Pipe fd %d in process %ls (%d) (Through fd %d)", 
-  io->fd, 
-  p->actual_cmd,
-  p->pid,
-  io->pipe_fd[io->fd] );
-*/
 				int fd_to_dup = io->fd;
+
+				close(io->fd);
 				
 				if( dup2( io->param1.pipe_fd[fd_to_dup?1:0], io->fd ) == -1 )
 				{
 					debug( 1, PIPE_ERROR );
 					wperror( L"dup2" );
-					exit(1);
+					if( exit_on_error )
+					{
+						exit(1);
+					}
+					else
+					{
+						return -1;
+					}					
+
 				}
 
 				if( fd_to_dup != 0 )
@@ -341,28 +363,21 @@ static void handle_child_io( io_data_t *io )
 					exec_close( io->param1.pipe_fd[1]);
 				}
 				else
+				{
 					exec_close( io->param1.pipe_fd[0] );
+				}
 				
-/*				
-  if( close( io[i].pipe_fd[ io->fd ] ) == -1 )
-  {
-  wperror( L"close" );
-  exit(1);
-  }
-*/			
-/*				if( close( io[i].pipe_fd[1] ) == -1 )
-  {
-  wperror( L"close" );
-  exit(1);
-  }
-*/
-		
-/*		    fprintf( stderr, "fd %d points to fd %d\n", i, io[i].fd[i>0?1:0] );*/
 				break;
 			}
 			
 		}
 	}
+
+	if( env_universal_server.fd >= 0 )
+		exec_close( env_universal_server.fd );
+
+	return 0;
+	
 }
 
 /**
@@ -371,42 +386,37 @@ static void handle_child_io( io_data_t *io )
    process is put in the jobs group, all signal handlers are reset,
    SIGCHLD is unblocked (the exec call blocks blocks SIGCHLD), and all
    IO redirections and other file descriptor actions are performed.
-*/
-static void setup_child_process( job_t *j )
-{
-	if( is_interactive && !is_subshell && !is_block)
-    {
-		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);
-		}
+   \param j the job to set up the IO for
+   \param p the child process to set up
+
+   \return 0 on sucess, -1 on failiure
+*/
+static int setup_child_process( job_t *j, process_t *p )
+{
+	int res=0;
+	
+	if( p )
+	{
+		res = set_child_group( j, p, 1 );
+	}
+	
+	if( !res )	
+	{
+		res = handle_child_io( j->io, (p==0) );
 	}
 	
 	/* Set the handling for job control signals back to the default.  */
-	signal_reset_handlers();
-
-	handle_child_io( j->io );
-
+	if( !res )
+	{
+		signal_reset_handlers();
+	}
+	
 	/* Remove all signal blocks */
 	signal_unblock();	
 	
+	return res;
+	
 }
 								 
 								 
@@ -418,10 +428,11 @@ static void setup_child_process( job_t *j )
 */
 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, 
-		   L"Failed to execute process %ls",
+		   _( L"Failed to execute process '%ls'" ),
 		   p->actual_cmd );
 	wperror( L"execve" );
 	exit(1);
@@ -438,11 +449,33 @@ static int has_fd( io_data_t *d, int fd )
 }
 
 
+/**
+   Free a transmogrified io chain. Only the chain itself and resources
+   used by a transmogrified IO_FILE redirection are freed, since the
+   original chain may still be needed.
+*/
+static void io_untransmogrify( io_data_t * in, io_data_t *out )
+{
+	if( !out )
+		return;
+	io_untransmogrify( in->next, out->next );
+	switch( in->io_mode )
+	{
+		case IO_FILE:
+			exec_close( out->param1.old_fd );
+			break;
+	}	
+	free(out);
+}
+
+
 /**
    Make a copy of the specified io redirection chain, but change file
    redirection into fd redirection. This makes the redirection chain
    suitable for use as block-level io, since the file won't be
    repeatedly reopened for every command in the block.
+
+   \return the transmogrified chain on sucess, or 0 on failiure
 */
 static io_data_t *io_transmogrify( io_data_t * in )
 {
@@ -458,7 +491,8 @@ static io_data_t *io_transmogrify( io_data_t * in )
 	out->fd = in->fd;
 	out->io_mode = IO_FD;
 	out->param2.close_old = 1;
-	
+	out->next=0;
+		
 	switch( in->io_mode )
 	{
 		/*
@@ -487,7 +521,8 @@ static io_data_t *io_transmogrify( io_data_t * in )
 					   in->param1.filename );
 								
 				wperror( L"open" );
-				exit(1);
+				free( out );
+				return 0;
 			}	
 
 			out->param1.old_fd = fd;
@@ -495,31 +530,19 @@ static io_data_t *io_transmogrify( io_data_t * in )
 		}
 	}
 	
-	out->next = io_transmogrify( in->next );
+	if( in->next)
+	{
+		out->next = io_transmogrify( in->next );
+		if( !out->next )
+		{
+			io_untransmogrify( in, out );
+			return 0;
+		}
+	}
 	
 	return out;
 }
 
-/**
-   Free a transmogrified io chain. Only the chain itself and resources
-   used by a transmogrified IO_FILE redirection are freed, since the
-   original chain may still be needed.
-*/
-static void io_untransmogrify( io_data_t * in, io_data_t *out )
-{
-	if( !in )
-		return;
-	io_untransmogrify( in->next, out->next );
-	switch( in->io_mode )
-	{
-		case IO_FILE:
-			exec_close( out->param1.old_fd );
-			break;
-	}	
-	free(out);
-}
-
-
 /**
    Morph an io redirection chain into redirections suitable for
    passing to eval, call eval, and clean up morphed redirections.
@@ -529,43 +552,51 @@ static void io_untransmogrify( io_data_t * in, io_data_t *out )
    \param io the io redirections to be performed on this block
 */
 
-static int internal_exec_helper( const wchar_t *def, 
+static void internal_exec_helper( const wchar_t *def, 
 								 int block_type,
 								 io_data_t *io )
 {
-	int res=0;
 	io_data_t *io_internal = io_transmogrify( io );
 	int is_block_old=is_block;
 	is_block=1;
 
-	signal_unblock();
+	/*
+	  Did the transmogrification fail - if so, set error status and return
+	*/
+	if( io && !io_internal )
+	{
+		proc_set_last_status( 1 );
+		return;
+	}
 	
+	signal_unblock();
+		
 	eval( def, io_internal, block_type );		
-
+	
 	signal_block();
-
-/*
-	io_data_t *buff = io_get( io, 1 );
-	if( buff && buff->io_mode == IO_BUFFER )
-	fwprintf( stderr, L"block %ls produced %d bytes of output\n", 
-	def,
-	buff->out_buffer->used );
-*/
+	
 	io_untransmogrify( io, io_internal );
 	job_reap( 0 );
 	is_block=is_block_old;
-	return res;
 }
 
 /**
-   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  && !is_subshell && !is_block)
+	if( j->job_control )
 	{
 		int new_pgid=0;
 		
@@ -577,46 +608,36 @@ 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",
+					   _( L"Could not send process %d from group %d to group %d" ),
 					   p->pid, 
 					   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;
 }
 
 
@@ -642,7 +663,7 @@ void exec( job_t *j )
 	int exec_error=0;
 
 	
-	debug( 4, L"Exec job %ls with id %d", j->command, j->job_id );	
+	debug( 4, L"Exec job '%ls' with id %d", j->command, j->job_id );	
 	
 	if( j->first_process->type==INTERNAL_EXEC )
 	{
@@ -652,15 +673,24 @@ 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
 		*/
-		setup_child_process( j );
-		launch_process( j->first_process );
-		/*
-		  launch_process _never_ returns...
-		*/
-	}
-	
+		if( !setup_child_process( j, 0 ) )
+		{
+			/*
+			  launch_process never returns
+			*/
+			launch_process( j->first_process );
+		}
+		else
+		{
+			j->constructed=1;
+			j->first_process->completed=1;
+			return;
+		}
+		
+	}	
 
 	pipe_read.fd=0;
 	pipe_write.fd=1;
@@ -677,9 +707,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 );
@@ -761,16 +791,20 @@ void exec( job_t *j )
 				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] );
+					debug( 0, _( L"Unknown function '%ls'" ), p->argv[0] );
 					break;
 				}
+				
 				parser_push_block( FUNCTION_CALL );
 				
+				current_block->param2.function_call_process = p;
+				current_block->param1.function_name = halloc_register( current_block, wcsdup( p->argv[0] ) );
+												
 				if( builtin_count_args(p->argv)>1 )
 				{
 					sb_init( &sb );
@@ -785,6 +819,11 @@ void exec( job_t *j )
 					env_set( L"argv", (wchar_t *)sb.buff, ENV_LOCAL );
 					sb_destroy( &sb );
 				}
+				else
+				{
+					env_set( L"argv", 0, ENV_LOCAL );
+				}
+				
 				parser_forbid_function( p->argv[0] );
 
 				if( p->next )
@@ -874,7 +913,7 @@ void exec( job_t *j )
 							{
 								builtin_stdin=-1;
 								debug( 1, 
-									   L"Unknown input redirection type %d",
+									   _( L"Unknown input redirection type %d" ),
 									   in->io_mode);
 								break;
 							}
@@ -951,7 +990,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 )
@@ -969,13 +1008,14 @@ void exec( job_t *j )
 				if( io_buffer->param2.out_buffer->used != 0 )
 				{
 					pid = fork();
+
 					if( pid == 0 )
 					{
 						/*
 						  This is the child process. Write out the contents of the pipeline.
 						*/
 						p->pid = getpid();
-						setup_child_process( j );
+						setup_child_process( j, p );
 						write( io_buffer->fd, 
 							   io_buffer->param2.out_buffer->buff, 
 							   io_buffer->param2.out_buffer->used );
@@ -996,12 +1036,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 );
 				
@@ -1063,7 +1110,7 @@ void exec( job_t *j )
 					  This is the child process. 
 					*/
 					p->pid = getpid();
-					setup_child_process( j );
+					setup_child_process( j, p );
 					if( sb_out->used )
 						fwprintf( stdout, L"%ls", sb_out->buff );
 					if( sb_err->used )
@@ -1088,9 +1135,8 @@ void exec( job_t *j )
 					*/
 					p->pid = pid;
 						
-					if( handle_new_child( j, p ) )
-						exit( 1 );
-					
+					set_child_group( j, p, 0 );
+										
 				}					
 				
 				break;
@@ -1105,7 +1151,7 @@ void exec( job_t *j )
 					  This is the child process. 
 					*/
 					p->pid = getpid();
-					setup_child_process( j );
+					setup_child_process( j, p );
 					launch_process( p );
 
 					/*
@@ -1128,20 +1174,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 
@@ -1201,7 +1243,7 @@ int exec_subshell( const wchar_t *cmd,
 	if( !cmd )
 	{
 		debug( 1, 
-			   L"Sent null command to subshell. This is a fish bug. If it can be reproduced, please send a bug report to %s", 
+			   _( L"Sent null command to subshell. This is a fish bug. If it can be reproduced, please send a bug report to %s." ), 
 			   PACKAGE_BUGREPORT );		
 		return 0;		
 	}
@@ -1246,7 +1288,7 @@ int exec_subshell( const wchar_t *cmd,
 				{
 					wchar_t *el;
 					*end=0;
-					el = str2wcs( begin );				
+					el = str2wcs( begin );
 					al_push( l, el );
 					begin = end+1;
 					break;
@@ -1257,5 +1299,6 @@ int exec_subshell( const wchar_t *cmd,
 	}
 	
 	io_buffer_destroy( io_buffer );
+
 	return status;	
 }

exec.h

@@ -16,7 +16,7 @@
 /**
    pipe redirection error message
 */
-#define PIPE_ERROR L"An error occurred while setting up pipe"
+#define PIPE_ERROR _(L"An error occurred while setting up pipe")
 
 /**
    Initialize the exec library

expand.h

@@ -143,31 +143,6 @@ int expand_string( wchar_t *in, array_list_t *out, int flag );
 */
 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 );
-
 /**
    Convert the variable value to a human readable form, i.e. escape things, handle arrays, etc. Suitable for pretty-printing.
 */
@@ -182,20 +157,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.

fish.spec.in

@@ -51,14 +51,14 @@ fi
 %_mandir/man1/xsel.1x*
 %_mandir/man1/mimedb.1*
 %_mandir/man1/set_color.1*
-%_mandir/man1/tokenize.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
 %attr(0755,root,root) %_bindir/xsel
 %attr(0755,root,root) %_bindir/set_color
-%attr(0755,root,root) %_bindir/tokenize
 %attr(0755,root,root) %_bindir/mimedb
 %attr(0755,root,root) %_bindir/count
 %config %_sysconfdir/fish
@@ -67,6 +67,7 @@ fi
 %config %_sysconfdir/fish.d/fish_*.fish
 %dir %_sysconfdir/fish.d/completions
 %config %_sysconfdir/fish.d/completions/*.fish
+%_datadir/locale/*/LC_MESSAGES/fish.mo
 
 %changelog
 * Tue Nov 29 2005 Axel Liljencrantz <axel@liljencrantz.se> 1.17.0-0

fish_pager.c

@@ -27,7 +27,12 @@
 #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 "util.h"
@@ -407,48 +412,68 @@ static void printed_length( wchar_t *str,
 		int has_description = 0;
 		while( *str != 0 )
 		{
-			switch( *str )
+			if( ( *str >= ENCODE_DIRECT_BASE) &&
+				( *str < ENCODE_DIRECT_BASE+256) )
 			{
-				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':':
-					if( has_description )
-						desc_len++;
-					else
-						comp_len+=2;
-					break;
+				if( has_description )
+					desc_len+=4;
+				else
+					comp_len+=4;
 
-				case COMPLETE_SEP:
-					has_description = 1;
-					break;
-
-				default:
-					if( has_description )
-						desc_len+= wcwidth(*str);
-					else
-						comp_len+= wcwidth(*str);
-					break;
 			}
+			else
+			{
+				
+				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 )
@@ -539,7 +564,7 @@ static int completion_try_print( int cols,
 	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++ )
@@ -789,7 +814,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++;
@@ -839,9 +864,12 @@ static void init()
 {
 	struct sigaction act;
 	program_name = L"fish_pager";
-	fish_setlocale( LC_ALL, L"" );
-	
-	
+	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 )
@@ -853,6 +881,10 @@ static void init()
 		}
 	}
 	out_file = fdopen( out, "w" );
+
+	/**
+	   Init the stringbuffer used to keep any output in
+	*/
 	sb_init( &out_buff );
 
 	output_init();
@@ -870,33 +902,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 */
@@ -958,7 +963,11 @@ int main( int argc, char **argv )
 	
 		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 );

fishd.c

@@ -2,11 +2,45 @@
 
 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,6 +53,10 @@ 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>
@@ -35,6 +73,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 +122,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
 */
@@ -174,8 +226,8 @@ static int get_socket()
 	
 	local.sun_family = AF_UNIX;
 	strcpy( local.sun_path, sock_name );
-	len = strlen( local.sun_path ) + sizeof( local.sun_family );
-
+	len = sizeof(local);
+	
 	debug(1, L"Connect to socket at %s", sock_name);
 	
 	if( ( s = socket( AF_UNIX, SOCK_STREAM, 0 ) ) == -1 )
@@ -396,11 +448,9 @@ static void save()
 */
 static void init()
 {
-	program_name=L"fishd";
 
 	sock = get_socket();
 	daemonize();	
-	fish_setlocale( LC_ALL, L"" );	
 	env_universal_common_init( &broadcast );
 	
 	load();	
@@ -419,8 +469,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;

function.c

@@ -9,6 +9,7 @@
 #include <signal.h>
 
 #include "config.h"
+#include "wutil.h"
 #include "util.h"
 #include "function.h"
 #include "proc.h"
@@ -16,6 +17,8 @@
 #include "common.h"
 #include "intern.h"
 #include "event.h"
+#include "reader.h"
+#include "parse_util.h"
 
 
 /**
@@ -27,6 +30,8 @@ typedef struct
 	wchar_t *cmd;
 	/** Function description */
 	wchar_t *desc;	
+	const wchar_t *definition_file;
+	int definition_offset;	
 	int is_binding;
 }
 	function_data_t;
@@ -61,6 +66,7 @@ void function_destroy()
 	hash_destroy( &function );
 }
 
+
 void function_add( const wchar_t *name, 
 				   const wchar_t *val,
 				   const wchar_t *desc,
@@ -68,16 +74,27 @@ void function_add( const wchar_t *name,
 				   int is_binding )
 {
 	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;
+	}
+	
 	d->desc = desc?wcsdup( desc ):0;
 	d->is_binding = is_binding;
+	d->definition_file = intern(reader_current_filename());
+	
 	hash_put( &function, intern(name), d );
-
+	
 	for( i=0; i<al_get_count( events ); i++ )
 	{
 		event_add_handler( (event_t *)al_get( events, i ) );
@@ -94,20 +111,20 @@ void function_remove( const wchar_t *name )
 {
 	void *key;
 	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 );
 
-	if( !d )
+	if( !key )
 		return;
 
+	ev.type=EVENT_ANY;
+	ev.function_name=name;	
+	event_remove( &ev );
+
 	clear_function_entry( key, d );
 }
 	
@@ -127,7 +144,7 @@ const wchar_t *function_get_desc( const wchar_t *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 )
@@ -163,3 +180,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 = 
+		(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 = 
+		(function_data_t *)hash_get( &function, argv );
+	if( data == 0 )
+		return -1;
+	
+	return data->definition_offset;
+}
+
+
+

function.h

@@ -69,4 +69,8 @@ int function_exists( const wchar_t *name );
 void function_get_names( array_list_t *list, 
 						 int get_hidden );
 
+const wchar_t *function_get_definition_file( const wchar_t *name );
+
+int function_get_definition_offset( const wchar_t *name );
+
 #endif

halloc.c

@@ -0,0 +1,78 @@
+/** \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 "util.h"
+#include "common.h"
+#include "halloc.h"
+
+typedef struct halloc
+{
+	array_list_t children;
+	array_list_t hchildren;
+	long long data[0];
+}
+	halloc_t;
+
+static halloc_t *halloc_from_data( void *data )
+{
+	return (halloc_t *)(data - sizeof( halloc_t ) );
+}
+
+
+void *halloc( void *context, size_t size )
+{
+	
+	halloc_t *me, *parent;
+	
+	me = (halloc_t *)calloc( 1, sizeof(halloc_t) + size );
+
+	if( !me )
+		return 0;
+
+	al_init( &me->children );
+
+	if( context )
+	{		
+		parent = halloc_from_data( context );
+		al_push( &parent->hchildren, &me->data );
+	}
+		
+	return &me->data;
+}
+
+void *halloc_register( void *context, void *data )
+{
+	halloc_t *me;
+	if( !context )
+		return data;
+	
+	me = halloc_from_data( context );
+	al_push( &me->children, data );
+	return data;
+}
+
+
+void halloc_free( void *context )
+{
+	halloc_t *me;
+	if( !context )
+		return;
+
+	me = halloc_from_data( context );
+	al_foreach( &me->hchildren, (void (*)(const void *))&halloc_free );
+	al_foreach( &me->children, (void (*)(const void *))&free );
+	al_destroy( &me->children );
+	al_destroy( &me->hchildren );
+	free(me);
+}
+

halloc.h

@@ -0,0 +1,35 @@
+/** \file halloc.h 
+
+    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.
+
+*/
+
+/**
+   Allocate new memory using specified parent memory context. If \c
+   context is null, a new root context is created. Context _must_ be
+   either 0 or the result of a previous call to halloc.
+
+   If \c context is null, the resulting block must be freed with a
+   call to halloc_free().
+
+   If \c context is not null, the resulting memory block must never be
+   explicitly freed, it will be automatically freed whenever the
+   parent context is freed.
+*/
+void *halloc( void *context, size_t size );
+
+/**
+   Free memory context and all children contexts. Only root contexts
+   may be freed explicitly.
+*/
+void halloc_free( void *context );
+
+/**
+   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() can be used as a context.
+*/
+void *halloc_register( void *context, void *data );

highlight.c

@@ -18,6 +18,7 @@
 #include "tokenizer.h"
 #include "proc.h"
 #include "parser.h"
+#include "parse_util.h"
 #include "builtin.h"
 #include "function.h"
 #include "env.h"
@@ -365,11 +366,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;
 		}

history.c

@@ -45,6 +45,8 @@ typedef struct
 	   The last item loaded from file
 	*/
 	ll_node_t *last_loaded;
+
+	int is_loaded;
 }
 	history_data;
 
@@ -82,25 +84,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;
-	
+
+	is_loaded = 1;
+		
 	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,7 +119,7 @@ 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 );
@@ -127,8 +135,8 @@ static void history_load( wchar_t *name )
 
 			  Use a hashtable to check for duplicates instead.
 			*/
-			if( !hash_get( &used,
-						   buff ) )
+			if( wcslen(buff) && !hash_get( &used,
+										   buff ) )
 			{
 				history_count++;		
 				
@@ -161,7 +169,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" );
 		}
 		
@@ -198,6 +206,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 +232,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 +269,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;
@@ -390,6 +403,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 +422,9 @@ void history_add( const wchar_t *str )
 {
 	ll_node_t *old_node;
 
+	if( !is_loaded )
+		history_load();	
+
 	if( wcslen( str ) == 0 )
 		return;
 	
@@ -460,15 +479,15 @@ 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;
 	
 	if( history_current->prev == 0 )
 	{
-		if( history_test( str, history_current->data ) )
-			return (wchar_t *)history_current->data;
-		else
-			return str;
+		return str;
 	}
 	if( past_end )
 		past_end = 0;
@@ -484,6 +503,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;
 
@@ -510,15 +532,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 );

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

init/completions/apm.fish

@@ -1,8 +1,8 @@
 #apm
-complete -f -c apm -s V -l version -d "print version"
-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 debuggin info"
+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")

init/completions/apropos.fish

@@ -6,16 +6,16 @@ function __fish_complete_apropos
 	end
 end
 
-complete -xc apropos -a '(__fish_complete_apropos)' -d "Whatis entry"
+complete -xc apropos -a '(__fish_complete_apropos)' -d (_ "whatis entry")
 
-complete -c apropos -s h -l help -d "apropos command help"
-complete -f -c apropos -s d -l debug -d "print debugging info"
-complete -f -c apropos -s v -l verbose -d "print verbose warning"
-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 conf file"
-complete -f -c apropos -s V -l version -d "Display version"
+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")
 

init/completions/apt-build.fish

@@ -1,29 +1,29 @@
 
 #apt-build
-complete -c apt-build -l help -d "apt-build command help"
-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 pkg"
-complete -x -c apt-build -a source -d "download and extract a src"
-complete -x -c apt-build -a info -d "info on a pkg"
-complete -x -c apt-build -a remove -d "remove packages"
-complete -x -c apt-build -a clean-build -d "erase built pkgs"
-complete -x -c apt-build -a build-source -d "build src without install"
-complete -x -c apt-build -a clean-sources -d "clean src dirs"
-complete -x -c apt-build -a update-source -d "update src and rebuild them"
-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 pkg"
-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"
-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 "show version"
+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")

init/completions/apt-cache.fish

@@ -1,33 +1,31 @@
 #apt-cache
-complete -c apt-cache -s h -l help -d "apt-cache command help"
-complete -c apt-cache -a add -d "add index files Debug only"
-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 dep in cache"
-complete -x -c apt-cache -a show -d "display package record"
-complete -x -c apt-cache -a search -d "search pkgname 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 pkgname only"
-complete -x -c apt-cache -a depends -d "list dep for the package"
-complete -x -c apt-cache -a rdepends -d "list reverse dep 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 -x -c apt-cache -a madison -d "mimic madison"
-complete -r -c apt-cache -s p -l pkg-cache -d "select file to store pkg cache"
-complete -r -c apt-cache -s s -l src-cache -d "select file to store src cache"
-complete -f -c apt-cache -s q -l quiet -d "quiet output"
-complete -f -c apt-cache -s i -l important -d "print important deps"
-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 "show version"
-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"
+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")
 

init/completions/apt-cdrom.fish

@@ -1,13 +1,13 @@
 #apt-cdrom
-complete -c apt-cdrom -s h -l help -d "apt-cdrom command help"
-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 pkg scan"
-complete -f -c apt-cdrom -s n -l no-act -d "no changes"
-complete -f -c apt-cdrom -s v -l version -d "show version"
-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"
+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")

init/completions/apt-config.fish

@@ -1,7 +1,7 @@
 #apt-config
-complete -c apt-config -s h -l help -d "apt-config command help"
-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 "show version"
-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"
+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")

init/completions/apt-extracttemplates.fish

@@ -1,7 +1,7 @@
 
 #apt-extracttemplates
-complete -c apt-extracttemplates -s h -l help -d "apt-extracttemplates command help"
-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"
+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")
 

init/completions/apt-file.fish

@@ -1,17 +1,17 @@
 #apt-file
-complete -c apt-file -s h -l help -d "apt-file command help"
-complete -x -c apt-file -a update -d "resync pkg contents from source"
-complete -r -c apt-file -a search -d "search pkg containing pattern"
-complete -r -c apt-file -a list -d "list contents of a pkg 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 "run in verbose"
-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 "show version"
-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 pkg 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"
+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")

init/completions/apt-ftparchive.fish

@@ -1,17 +1,17 @@
 #apt-ftparchive
-complete -c apt-ftparchive -s h -l help -d "apt-ftparchive command help"
-complete -f -c apt-ftparchive -a packages -d "generate pkg 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 "show version"
-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"
+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")

init/completions/apt-get.fish

@@ -1,6 +1,6 @@
 #completion for apt-get
 
-function __fish_apt_no_subcommand -d 'test if apt has yet to be given the subcommand'
+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
@@ -9,7 +9,7 @@ function __fish_apt_no_subcommand -d 'test if apt has yet to be given the subcom
 	return 0
 end
 
-function __fish_apt_use_package -d 'Test if apt command should have packages as potential completion'
+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
@@ -18,47 +18,47 @@ function __fish_apt_use_package -d 'Test if apt command should have packages as
 	return 1
 end
 
-complete -c apt-get -n '__fish_apt_use_package' -a '(__fish_print_packages)' -d 'Package'
+complete -c apt-get -n '__fish_apt_use_package' -a '(__fish_print_packages)' -d (_ 'Package')
 
-complete -c apt-get -s h -l help -d 'apt-get command help'
-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 dep'
-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 deps'
-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 output'
-complete -c apt-get -s s -l simulate -d 'perform a siulation'
-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-dep build-deps'
-complete -c apt-get -l allow-unauthenticated -d 'ignore non-authenticated packages'
-complete -c apt-get -s v -l version -d 'show program version'
-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'
+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')
 

init/completions/apt-key.fish

@@ -1,5 +1,5 @@
 #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"
+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")
 

init/completions/apt-listbugs.fish

@@ -1,25 +1,25 @@
 #apt-listbugs
-complete -c apt-listbugs -s h -l help -d "apt-listbugs command help"
-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 "Targs you want to see"
-complete -f -c apt-listbugs -s S -l stats -d "outstanding 'pending upload' resolved done open" -d "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 pkgs"
-complete -f -c apt-listbugs -s D -l show-downgrade -d "bugs for downgrade pkgs"
-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 all yes"
-complete -f -c apt-listbugs -s n -l force-no -d "assume all no"
-complete -c apt-listbugs -a list -d "list bugs from pkgs"
-complete -c apt-listbugs -a rss -d "list bugs in rss format"
+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")
 

init/completions/apt-listchanges.fish

@@ -1,13 +1,13 @@
 #apt-listchanges
-complete -c apt-listchanges -l help -d "apt-listchanges command help"
-complete -c apt-listchanges -l apt -d "read filenames from pipe"
-complete -f -c apt-listchanges -s v -l verbose -d "verbose info"
-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"
+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 frontend 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")

init/completions/apt-move.fish

@@ -1,23 +1,22 @@
 #apt-move
-complete -c apt-move -a get -d "generate master file"
-complete -c apt-move -a getlocal -d "alias of get"
-complete -f -c apt-move -a move -d "move pkgs to local tree"
-complete -f -c apt-move -a delete -d "delete obsolete pkg 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 pkgs from cache to local mirror"
-complete -f -c apt-move -a local -d "alias to move delete packages"
-complete -f -c apt-move -a localupdate -d "alias for update"
-complete -f -c apt-move -a mirror -d "download pkg missing from mirror"
-complete -f -c apt-move -a sync -d "sync pkgs installed"
+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 from CLI"
-complete -f -c apt-move -a listbin -d "mirror|sync|repo"
-complete -f -c apt-move -a mirrorbin -d "fetch pkg from STDIN"
-complete -f -c apt-move -a mirrorsrc -d "fetch src pkg from STDIN"
-complete -f -c apt-move -s a -d "process all pkgs"
-complete -c apt-move -s c -d "use specific conffile"
-complete -f -c apt-move -s d -d "use specific dist"
-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"
+complete -c apt-move -a movefile -d (_ "Move file specified on commandline")
+complete -f -c apt-move -a listbin -d (_ "List packages 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")

init/completions/apt-proxy-import.fish

@@ -1,10 +1,10 @@
 #apt-proxy-import
-complete -c apt-proxy-import -s h -l help -d 'apt-proxy-import command help'
-complete -f -c apt-proxy-import -s V -l version -d 'print version'
-complete -f -c apt-proxy-import -s v -l verbose -d 'verbose info'
-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]'
+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]')
 

init/completions/apt-rdepends.fish

@@ -1,13 +1,13 @@
 #apt-rdepends
-complete -c apt-rdepends -l help -d "apt-rdepends command help"
-complete -f -c apt-rdepends -s b -l build-depends -d "show bulid deps"
-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 deps"
-complete -f -c apt-rdepends -s r -l reverse -d "list pkgs depending on"
-complete -r -f -c apt-rdepends -s f -l follow -d "only follow DEPENDS recursively"
-complete -r -f -c apt-rdepends -s s -l show -d "only show DEPENDS"
-complete -r -f -c apt-rdepends -l state-follow -d "only follow STATES recursively"
-complete -r -f -c apt-rdepends -l state-show -d "only show STATES"
-complete -f -c apt-rdepends -l man -d "display man page"
-complete -f -c apt-rdepends -l version -d "print version"
+complete -c apt-rdepends -l help -d (_ "Display help and exit")
+complete -f -c apt-rdepends -s b -l build-depends -d (_ "Show build 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")
 

init/completions/apt-setup.fish

@@ -1,4 +1,4 @@
 #apt-setup
-complete -c apt-setup -a probe -d "probe a CD"
-complete -c apt-setup -s N -d "run in noninteractive mode"
+complete -c apt-setup -a probe -d (_ "Probe a CD")
+complete -c apt-setup -s N -d (_ "Run in noninteractive mode")
 

init/completions/apt-show-source.fish

@@ -1,10 +1,10 @@
 #apt-show-source
-complete -c apt-show-source -s h -l help -d 'apt-show-source command help'
-complete -r -c apt-show-source -l status-file -d 'read pkg from FILE' -f
-complete -r -c apt-show-source -o stf -d 'read pkg 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 'print version only'
-complete -f -c apt-show-source -s a -l all -d 'print all src pkgs with version'
-complete -f -c apt-show-source -s v -l verbose -d 'verbose message'
+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')

init/completions/apt-show-versions.fish

@@ -1,14 +1,14 @@
 #apt-show-versions
-complete -c apt-show-source -s h -l help -d 'apt-show-versions command help'
-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 pkgs'
-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 pkg 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 pkg from FILE'
-complete -r -c apt-show-versions -o stf -d 'read pkg 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'
+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')
 

init/completions/apt-sortpkgs.fish

@@ -1,7 +1,7 @@
 #apt-sortpkgs
-complete -c apt-sortpkgs -s h -l help -d "apt-sortpkgs command help"
-complete -f -c apt-sortpkgs -s s -l source -d "use source index field"
-complete -f -c apt-sortpkgs -s v -l version -d "show version"
-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"
+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")
 

init/completions/apt-spy.fish

@@ -1,20 +1,20 @@
 #apt-spy
-complete -c apt-spy -s h -d "apt-spy command help"
-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"
+complete -c apt-spy -s h -d (_ "Display help and exit")
+complete -f -c apt-spy -s d -a "stable testing unstable" -d (_ "Debian distribution")
+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")
 
 

init/completions/apt-src.fish

@@ -1,24 +1,24 @@
 #apt-src
-complete -c apt-src -s h -l help -d "apt-src command help"
-complete -f -c apt-src -a "update" -d "update list of src pkgs"
-complete -f -c apt-src -a "install" -d "install src pkgs"
-complete -f -c apt-src -a "upgrade" -d "upgrade src pkgs"
-complete -f -c apt-src -a "remove" -d "remove src pkgs"
-complete -f -c apt-src -a "build" -d "build src pkgs"
-complete -f -c apt-src -a "clean" -d "clean src pkgs"
-complete -f -c apt-src -a "import" -d "detect known src tree"
-complete -f -c apt-src -a "list" -d "list installed src pkg\(s\)"
-complete -f -c apt-src -a "location" -d "root src tree"
-complete -f -c apt-src -a "version" -d "version of src pkg"
-complete -f -c apt-src -a "name" -d "name of the src pkg"
-complete -f -c apt-src -s b -l build -d "build src pkgs"
-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"
+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")

init/completions/apt-zip-inst.fish

@@ -1,10 +1,10 @@
 #apt-zip-inst
-complete -c apt-zip-inst -s h -l help -d "apt-zip-inst command help"
-complete -f -c apt-zip-inst -s V -l version -d "show version"
-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 pkgs 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"
+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")
 
 

init/completions/apt-zip-list.fish

@@ -1,13 +1,13 @@
 #apt-zip-list
-complete -c apt-zip-list -s h -l help -d "apt-zip-list command help"
-complete -f -c apt-zip-list -s V -l version -d "show version"
-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 pkgs 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"
+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")
 

init/completions/arp.fish

@@ -1,11 +1,11 @@
 #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 "taken addr from filename, default /etc/ethers" 
+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") 
 

init/completions/at.fish

@@ -1,10 +1,10 @@
 #at
-complete -f -c at -s V -d "print version"
-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 "cat the jobs listed"
+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")
 

init/completions/atd.fish

@@ -1,6 +1,6 @@
 #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"
+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")
 

init/completions/atq.fish

@@ -1,4 +1,4 @@
 #atq
-complete -f -c atq -s V -d "print version"
-complete -f -c atq -s q -d "use specified queue"
+complete -f -c atq -s V -d (_ "Display version and exit")
+complete -f -c atq -s q -d (_ "Use specified queue")
 

init/completions/atrm.fish

@@ -1,2 +1,2 @@
 #atrm
-complete -f -c atrm -s V -d "print version"
+complete -f -c atrm -s V -d (_ "Display version and exit")

init/completions/bc.fish

@@ -1,9 +1,9 @@
 # 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"
+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")

init/completions/btdownloadheadless.py.fish

@@ -1,34 +1,33 @@
 # 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 upload_rate_fudge -x -d "time equivalent of writing to kernel-level TCP buffer"
-	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"
+	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;

init/completions/bunzip2.fish

@@ -6,10 +6,10 @@ complete -c bunzip2 -x -a "(
 )
 "
 
-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 "Print version"
+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")

init/completions/bzcat.fish

@@ -5,4 +5,4 @@ complete -c bzcat -x -a "(
 	__fish_complete_suffix (commandline -ct) .tbz2 'Compressed archive'
 )
 "
-complete -c bzcat -s s -l small -d "Reduce memory usage"
+complete -c bzcat -s s -l small -d (_ "Reduce memory usage")

init/completions/bzip2.fish

@@ -1,4 +1,4 @@
-complete -c bzip2 -s c -l stdout -d "Compress to stdout"
+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'
@@ -6,14 +6,14 @@ complete -c bzip2 -s d -l decompress -x -a "(
 	__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 "Print version"
-complete -c bzip2 -s 1 -l fast -d "Small block size"
-complete -c bzip2 -s 9 -l best -d "Large block size"
+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")

init/completions/cat.fish

@@ -1,12 +1,12 @@
-complete -c cat -s A -l show-all -d 'Escape all non-printing characters'
-complete -c cat -s b -l number-nonblank -d 'Number nonblank lines'
-complete -c cat -s e -d 'Escape non-printing characters except tab'
-complete -c cat -s E -l show-ends -d 'Display $ at end of line'
-complete -c cat -s n -l number -d 'Number all lines'
-complete -c cat -s s -l squeeze-blank -d 'Never more than single blank line'
-complete -c cat -s t -d 'Escape non-printing characters except newline'
-complete -c cat -s T -l show-tabs -d 'Escape tab'
-complete -c cat -s v -d 'Escape non-printing except newline and tab'
-complete -c cat -l help -d 'Display help and exit'
-complete -c cat -l version -d 'Display version and exit'
+complete -c cat -s A -l show-all -d (_ "Escape all non-printing characters")
+complete -c cat -s b -l number-nonblank -d (_ "Number nonblank lines")
+complete -c cat -s e -d (_ "Escape non-printing characters except tab")
+complete -c cat -s E -l show-ends -d (_ "Display \$ at end of line")
+complete -c cat -s n -l number -d (_ "Number all lines")
+complete -c cat -s s -l squeeze-blank -d (_ "Never more than single blank line")
+complete -c cat -s t -d (_ "Escape non-printing characters except newline")
+complete -c cat -s T -l show-tabs -d (_ "Escape tab")
+complete -c cat -s v -d (_ "Escape non-printing except newline and tab")
+complete -c cat -l help -d (_ "Display help and exit")
+complete -c cat -l version -d (_ "Display version and exit")
 

init/completions/chgrp.fish

@@ -1,12 +1,12 @@
 
-complete -c chgrp -s c -l changes -d "Output diagnostic for changed files"
-complete -c chgrp -l dereference -d "Dereferense symbolic links"
-complete -c chgrp -s h -l no-dereference -d "Do not dereference symbolic links"
-complete -c chgrp -l from -d "Change from owner/group"
-complete -c chgrp -s f -l silent -d "Supress errors"
-complete -c chgrp -l reference -d "Use same owner/group as file" -r
-complete -c chgrp -s R -l recursive -d "Operate recursively"
-complete -c chgrp -s v -l verbose -d "Output diagnostic for every file"
-complete -c chgrp -s h -l help -d "Display help and exit"
-complete -c chgrp -l version -d "Display version and exit"
+complete -c chgrp -s c -l changes -d (_ "Output diagnostic for changed files")
+complete -c chgrp -l dereference -d (_ "Dereferense symbolic links")
+complete -c chgrp -s h -l no-dereference -d (_ "Do not dereference symbolic links")
+complete -c chgrp -l from -d (_ "Change from owner/group")
+complete -c chgrp -s f -l silent -d (_ "Supress errors")
+complete -c chgrp -l reference -d (_ "Use same owner/group as file") -r
+complete -c chgrp -s R -l recursive -d (_ "Operate recursively")
+complete -c chgrp -s v -l verbose -d (_ "Output diagnostic for every file")
+complete -c chgrp -s h -l help -d (_ "Display help and exit")
+complete -c chgrp -l version -d (_ "Display version and exit")
 complete -c chgrp -d Group -a "(__fish_complete_groups)"

init/completions/chown.fish

@@ -1,12 +1,12 @@
-complete -c chown -s c -l changes -d "Output diagnostic for changed files"
-complete -c chown -l dereference -d "Dereferense symbolic links"
-complete -c chown -s h -l no-dereference -d "Do not dereference symbolic links"
-complete -c chown -l from -d "Change from owner/group"
-complete -c chown -s f -l silent -d "Supress errors"
-complete -c chown -l reference -d "Use same owner/group as file" -r
-complete -c chown -s R -l recursive -d "Operate recursively"
-complete -c chown -s v -l verbose -d "Output diagnostic for every file"
-complete -c chown -s h -l help -d "Display help and exit"
-complete -c chown -l version -d "Display version and exit"
-complete -c chown -d "Username" -a "(__fish_print_users):"
-complete -c chown -d "Username" -a "(echo (commandline -ct)|grep -o '.*:')(cat /etc/group |cut -d : -f 1)"
+complete -c chown -s c -l changes -d (_ "Output diagnostic for changed files")
+complete -c chown -l dereference -d (_ "Dereferense symbolic links")
+complete -c chown -s h -l no-dereference -d (_ "Do not dereference symbolic links")
+complete -c chown -l from -d (_ "Change from owner/group")
+complete -c chown -s f -l silent -d (_ "Supress errors")
+complete -c chown -l reference -d (_ "Use same owner/group as file") -r
+complete -c chown -s R -l recursive -d (_ "Operate recursively")
+complete -c chown -s v -l verbose -d (_ "Output diagnostic for every file")
+complete -c chown -s h -l help -d (_ "Display help and exit")
+complete -c chown -l version -d (_ "Display version and exit")
+complete -c chown -d (_ "Username") -a "(__fish_print_users):"
+complete -c chown -d (_ "Username") -a "(echo (commandline -ct)|grep -o '.*:')(cat /etc/group |cut -d : -f 1)"

init/completions/chsh.fish

@@ -0,0 +1,10 @@
+#
+# Completions for the chsh command
+#
+
+complete -c chsh -s s -l shell -x -a "(chsh -l)" -d "Specify your login shell"
+complete -c chsh -s l -l list-shells -d "Display the list of shells listed in /etc/shells and exit"
+complete -c chsh -s u -l help -d "Display help and exit"
+complete -c chsh -s v -l version -d "Display version and exit"
+complete -x -c chsh -a "(__fish_complete_users)"
+

init/completions/commandline.fish

@@ -1,12 +1,12 @@
-complete -c commandline -s a -l append -d "Add text to the end of commandline"
-complete -c commandline -s i -l insert -d "Add text at cursor"
-complete -c commandline -s r -l replace -d "Replace selected part of buffer (replace)"
+complete -c commandline -s a -l append -d (_ "Add text to the end of the selected area")
+complete -c commandline -s i -l insert -d (_ "Add text at cursor")
+complete -c commandline -s r -l replace -d (_ "Replace selected part")
 
-complete -c commandline -s j -l current-job  -d "Operate only on job under cursor"
-complete -c commandline -s p -l current-process  -d "Operate only on process under cursor"
-complete -c commandline -s t -l current-token -d "Operate only on tokenizer token under cursor"
-complete -c commandline -s b -l current-buffer -d "Operate on entire buffer (default)"
+complete -c commandline -s j -l current-job  -d (_ "Select job under cursor")
+complete -c commandline -s p -l current-process  -d (_ "Select process under cursor")
+complete -c commandline -s t -l current-token -d (_ "Select token under cursor")
+complete -c commandline -s b -l current-buffer -d (_ "Select entire command line (default)")
 
-complete -c commandline -s c -l cut-at-cursor -d "Only return part of commandline before the cursor"
-complete -c commandline -s f -l function -d "Inject readline functions to reader"
+complete -c commandline -s c -l cut-at-cursor -d (_ "Only return that part of the command line before the cursor")
+complete -c commandline -s f -l function -d (_ "Inject readline functions to reader")
 

init/completions/complete.fish

@@ -1,13 +1,14 @@
-complete -c complete -s c -l command -d "Command to add completion to" -r
-complete -c complete -s p -l path -d "Path to add completion to"
-complete -c complete -s s -l short-option -d "Posix-style option to complete"
-complete -c complete -s l -l long-option -d "GNU-style option to complete"
-complete -c complete -s o -l old-option -d "Old style long option to complete"
-complete -c complete -s f -l no-files -d "Do not use file completion"
-complete -c complete -s r -l require-parameter -d "Require parameter"
-complete -c complete -s x -l exclusive -d "Require parameter and do not use file completion"
-complete -c complete -s a -l arguments -d "A list of possible arguments"
-complete -c complete -s d -l description -d "Description of this completions"
-complete -c complete -s u -l unauthorative -d "Option list is not complete"
-complete -c complete -s e -l erase -d "Remove completion"
-complete -c complete -s h -l help -d "Display help and exit"
+complete -c complete -s c -l command -d (_ "Command to add completion to") -r
+complete -c complete -s p -l path -d (_ "Path to add completion to")
+complete -c complete -s s -l short-option -d (_ "Posix-style option to complete")
+complete -c complete -s l -l long-option -d (_ "GNU-style option to complete")
+complete -c complete -s o -l old-option -d (_ "Old style long option to complete")
+complete -c complete -s f -l no-files -d (_ "Do not use file completion")
+complete -c complete -s r -l require-parameter -d (_ "Require parameter")
+complete -c complete -s x -l exclusive -d (_ "Require parameter and do not use file completion")
+complete -c complete -s a -l arguments -d (_ "A list of possible arguments")
+complete -c complete -s d -l description -d (_ "Description of this completions")
+complete -c complete -s u -l unauthorative -d (_ "Option list is not complete")
+complete -c complete -s e -l erase -d (_ "Remove completion")
+complete -c complete -s h -l help -d (_ "Display help and exit")
+complete -c complete -s C -l do-complete -d (_ "Print all completions for the specified commandline")

init/completions/configure.fish

@@ -1,12 +1,12 @@
-complete -c configure -s h -l help -x -a "short recursive" -d "Display help and exit"
-complete -c configure -s V -l version -d "Display version and exit"
-complete -c configure -s q -l quiet -d "Be less verbose"
-complete -c configure -l cache-file -f -d "Cache test results in specified file"
-complete -c configure -s C -l config-cache -d "Cache test results in file config.cache"
-complete -c configure -s n -l no-create -d "Do not create output files"
-complete -c configure -l srcdir -d "Set source directory" -a "__fish_complete_directory (commandline -ct)" -x
-complete -c configure -l prefix -d "Architecture-independent install directory" -a "__fish_complete_directory (commandline -ct)" -x
-complete -c configure -l exec-prefix -d "Architecture-dependent install directory" -a "__fish_complete_directory (commandline -ct)" -x
-complete -c configure -l build -d "configure for building on BUILD" -x
-complete -c configure -l host -d "cross-compile to build programs to run on HOST" -x
-complete -c configure -l target -d "configure for building compilers for TARGET" -x -u
+complete -c configure -s h -l help -x -a "short recursive" -d (_ "Display help and exit")
+complete -c configure -s V -l version -d (_ "Display version and exit")
+complete -c configure -s q -l quiet -d (_ "Quiet mode")
+complete -c configure -l cache-file -f -d (_ "Cache test results in specified file")
+complete -c configure -s C -l config-cache -d (_ "Cache test results in file config.cache")
+complete -c configure -s n -l no-create -d (_ "Do not create output files")
+complete -c configure -l srcdir -d (_ "Set source directory") -a "__fish_complete_directory (commandline -ct)" -x
+complete -c configure -l prefix -d (_ "Architecture-independent install directory") -a "__fish_complete_directory (commandline -ct)" -x
+complete -c configure -l exec-prefix -d (_ "Architecture-dependent install directory") -a "__fish_complete_directory (commandline -ct)" -x
+complete -c configure -l build -d (_ "Configure for building on BUILD") -x
+complete -c configure -l host -d (_ "Cross-compile to build programs to run on HOST") -x
+complete -c configure -l target -d (_ "Configure for building compilers for TARGET") -x -u

init/completions/cut.fish

@@ -1,10 +1,10 @@
-complete -c cut -s b -l bytes -x -d "Ouput byte range"
-complete -c cut -s c -l characters -x -d "Output character range"
-complete -c cut -s d -l delimiter -x -d "Select field delimiter"
-complete -c cut -s d -l fields -x -d "Select fields"
-complete -c cut -s n -d "Dont split mutibyte characters"
-complete -c cut -s s -l only-delimited -d "Do not print lines without delimiter"
-complete -c cut -l output-delimiter -d "Select output delimiter"
-complete -c cut -l help -d "Display help and exit"
-complete -c cut -l version -d "Display version and exit"
+complete -c cut -s b -l bytes -x -d (_ "Output byte range")
+complete -c cut -s c -l characters -x -d (_ "Output character range")
+complete -c cut -s d -l delimiter -x -d (_ "Select field delimiter")
+complete -c cut -s d -l fields -x -d (_ "Select fields")
+complete -c cut -s n -d (_ "Dont split mutibyte characters")
+complete -c cut -s s -l only-delimited -d (_ "Do not print lines without delimiter")
+complete -c cut -l output-delimiter -d (_ "Select output delimiter")
+complete -c cut -l help -d (_ "Display help and exit")
+complete -c cut -l version -d (_ "Display version and exit")