Bump version number

darcs-hash:20060729173243-ac50b-641e89defc78e0660cac6601acfb22c73c1cd32e.gz

Makefile.in

@@ -36,10 +36,6 @@
 CC := @CC@
 INSTALL:=@INSTALL@
 
-CFLAGS:=@CFLAGS@
-CPPFLAGS=@CPPFLAGS@
-LDFLAGS:= @LIBS@ @LDFLAGS@ 
-
 # Installation directories
 prefix = @prefix@
 exec_prefix = @exec_prefix@
@@ -47,8 +43,17 @@ datadir = @datadir@
 bindir = @bindir@
 mandir = @mandir@
 sysconfdir = @sysconfdir@
-fishinputfile = @fishinputfile@
 docdir = @docdir@
+localedir = @localedir@
+prefix = @prefix@
+optbindirs = @optbindirs@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+
+MACROS=-DLOCALEDIR=\"$(localedir)\" -DPREFIX=L\"$(prefix)\" -DDATADIR=L\"$(datadir)\" -DSYSCONFDIR=L\"$(sysconfdir)\"
+CFLAGS=@CFLAGS@ $(MACROS)
+CPPFLAGS=@CPPFLAGS@
+LDFLAGS= @LIBS@ @LDFLAGS@ 
+
 
 #etc files to install
 ETC_DIR_INSTALL = etc/fish_interactive.fish 
@@ -65,7 +70,7 @@ FISH_OBJS := function.o builtin.o complete.o env.o exec.o	\
 	expand.o highlight.o history.o kill.o parser.o proc.o reader.o		\
 	sanity.o tokenizer.o wildcard.o wgetopt.o wutil.o input.o	\
 	output.o intern.o env_universal.o env_universal_common.o			\
-	input_common.o event.o signal.o io.o translate.o parse_util.o common.o \
+	input_common.o event.o signal.o io.o parse_util.o common.o \
 
 # Additional files used by builtin.o
 BUILTIN_FILES := builtin_help.c builtin_set.c builtin_commandline.c	\
@@ -74,7 +79,7 @@ BUILTIN_FILES := builtin_help.c builtin_set.c builtin_commandline.c	\
 # All objects that the system needs to build fish_pager
 FISH_PAGER_OBJS := fish_pager.o output.o wutil.o		\
 	tokenizer.o input_common.o env_universal.o env_universal_common.o	\
-	translate.o common.o
+	common.o
 
 # All objects that the system needs to build fish_tests
 FISH_TESTS_OBJS := $(FISH_OBJS) fish_tests.o
@@ -88,9 +93,7 @@ MIME_OBJS := mimedb.o xdgmimealias.o xdgmime.o xdgmimeglob.o		\
 	xdgmimeint.o xdgmimemagic.o xdgmimeparent.o wutil.o common.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.
+# Files containing documentation for builtins. 
 #
 BUILTIN_DOC_SRC := doc_src/source.txt doc_src/and.txt					\
 	doc_src/begin.txt doc_src/bg.txt doc_src/bind.txt					\
@@ -111,9 +114,7 @@ BUILTIN_DOC_SRC := doc_src/source.txt doc_src/and.txt					\
 BUILTIN_DOC_HDR := $(BUILTIN_DOC_SRC:.txt=.doxygen)
 
 #
-# Files containing documentation for external commands. Should be listed
-# alphabetically, since this is the order in which they will be written
-# in the help file.
+# Files containing documentation for external commands. 
 #
 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			\
@@ -184,7 +185,7 @@ TRANSLATIONS_SRC := $(wildcard po/*.po)
 TRANSLATIONS := $(TRANSLATIONS_SRC:.po=.gmo)
 
 #Make everything needed for installing fish
-all: $(PROGRAMS) user_doc
+all: $(PROGRAMS) user_doc etc/fish share/fish etc/fish_interactive.fish $(TRANSLATIONS)
 	@echo fish has now been built. 
 	@echo Use \'make install\' to install fish.
 .PHONY: all
@@ -196,7 +197,7 @@ Makefile: Makefile.in configure
 	./config.status
 
 debug:
-	make fish CFLAGS="@CFLAGS@ -O0 -Wno-unused -Werror -g"
+	make fish CFLAGS="@CFLAGS@ $(MACROS) -O0 -Wno-unused -Werror -g"
 .PHONY: debug
 
 # User documentation, describing the features of the fish shell.
@@ -234,11 +235,11 @@ xsel-0.9.6/xsel: xsel-0.9.6
 doc.h:$(BUILTIN_DOC_SRC) $(CMD_DOC_SRC) doc_src/doc.hdr
 	cat doc_src/doc.hdr >doc.h; 
 	echo "/** \page builtins Builtin commands" >>doc.h; 
-	cat $(BUILTIN_DOC_SRC) >>doc.h; 
+	cat `printf "%s\n" $(BUILTIN_DOC_SRC)|sort` >>doc.h; 
 	echo "*/" >>doc.h
 	echo "/** \page commands External commands" >>doc.h; 
 	echo "\c fish is shipped with commands which do not use any internal parts of the shell, and are therefore not written as builtins, but separate commands." >>doc.h
-	cat $(CMD_DOC_SRC) >>doc.h; 
+	cat `printf "%s\n" $(CMD_DOC_SRC)|sort` >>doc.h; 
 	echo "*/" >>doc.h
 
 # This rule creates complete doxygen headers from each of the various
@@ -250,10 +251,14 @@ doc.h:$(BUILTIN_DOC_SRC) $(CMD_DOC_SRC) doc_src/doc.hdr
 	cat $*.txt >>$@; 
 	echo "*/" >>$@
 
+%: %.in Makefile
+	sed <$@.in >$@ -e "s,@sysconfdir\@,$(sysconfdir)," -e "s,@datadir\@,$(datadir)," -e "s,@docdir\@,$(docdir)," -e "s|@configure_input\@|$@, generated from $@.in by the Makefile. DO NOT MANUALLY EDIT THIS FILE!|" -e "s,@prefix\@,$(prefix)," -e "s,@optbindirs\@,$(optbindirs)," 
+#-e "s,@\@,$()," 
+
 # Compile translation file
 %.gmo:
 	if test $(HAVE_GETTEXT) = 1; then \
-		msgfmt $*.po -o $*.gmo; \
+		msgfmt -o $*.gmo $*.po; \
 	fi
 
 # Update existing po file or copy messages.pot
@@ -500,18 +505,18 @@ fish_tests: $(FISH_TESTS_OBJS)
 
 # mimedb does not need any libraries, so we don't use LDFLAGS here
 mimedb: $(MIME_OBJS) doc_src/mimedb.o
-	$(CC) $(MIME_OBJS) doc_src/mimedb.o -o $@
+	$(CC) $(MIME_OBJS) doc_src/mimedb.o $(LDFLAGS) -o $@
 
 # count does not need any libraries, so we don't use LDFLAGS here
 count: count.o
 	$(CC) count.o -o $@
 
-set_color: set_color.o doc_src/set_color.o fallback.o
-	$(CC) set_color.o doc_src/set_color.o fallback.o $(LDFLAGS) -o $@
+set_color: set_color.o doc_src/set_color.o common.o
+	$(CC) set_color.o doc_src/set_color.o common.o $(LDFLAGS) -o $@
 
 # Test program for the tokenizer library
 tokenizer_test: tokenizer.c tokenizer.h wutil.o common.o
-	$(CC) ${CFLAGS} tokenizer.c wutil.o common.o -D TOKENIZER_TEST $(LDFLAGS) -o $@
+	$(CC) $(CFLAGS) tokenizer.c 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 wutil.o
@@ -614,47 +619,45 @@ clean:
 builtin.o: config.h fallback.h util.h wutil.h builtin.h function.h complete.h
 builtin.o: proc.h io.h parser.h event.h reader.h env.h common.h wgetopt.h
 builtin.o: sanity.h tokenizer.h wildcard.h input_common.h input.h intern.h
-builtin.o: signal.h translate.h halloc.h halloc_util.h parse_util.h expand.h
+builtin.o: signal.h halloc.h halloc_util.h parse_util.h expand.h
 builtin.o: builtin_help.c builtin_set.c builtin_commandline.c
 builtin.o: builtin_complete.c builtin_ulimit.c builtin_jobs.c
 builtin_commandline.o: signal.h config.h fallback.h util.h wutil.h builtin.h
 builtin_commandline.o: common.h wgetopt.h reader.h proc.h io.h parser.h
-builtin_commandline.o: event.h tokenizer.h input_common.h input.h translate.h
+builtin_commandline.o: event.h tokenizer.h input_common.h input.h
 builtin_commandline.o: parse_util.h
 builtin_complete.o: signal.h config.h fallback.h util.h wutil.h builtin.h
 builtin_complete.o: common.h complete.h wgetopt.h parser.h proc.h io.h
-builtin_complete.o: event.h reader.h translate.h
+builtin_complete.o: event.h reader.h
 builtin_help.o: config.h util.h common.h halloc_util.h
 builtin_jobs.o: config.h fallback.h util.h wutil.h builtin.h proc.h io.h
-builtin_jobs.o: parser.h event.h common.h wgetopt.h translate.h
+builtin_jobs.o: parser.h event.h common.h wgetopt.h
 builtin_set.o: signal.h config.h fallback.h util.h wutil.h builtin.h env.h
 builtin_set.o: expand.h common.h wgetopt.h proc.h io.h parser.h event.h
-builtin_set.o: translate.h
 builtin_ulimit.o: config.h fallback.h util.h builtin.h common.h wgetopt.h
-builtin_ulimit.o: translate.h
 common.o: config.h fallback.h util.h wutil.h common.h expand.h proc.h io.h
 common.o: wildcard.h parser.h event.h util.c halloc.c halloc.h halloc_util.c
 common.o: fallback.c
 complete.o: signal.h config.h fallback.h util.h tokenizer.h wildcard.h proc.h
 complete.o: io.h parser.h event.h function.h complete.h builtin.h env.h
-complete.o: exec.h expand.h common.h reader.h history.h intern.h translate.h
-complete.o: parse_util.h halloc.h halloc_util.h wutil.h
+complete.o: exec.h expand.h common.h reader.h history.h intern.h parse_util.h
+complete.o: halloc.h halloc_util.h wutil.h
 env.o: config.h signal.h fallback.h util.h wutil.h proc.h io.h common.h env.h
 env.o: sanity.h expand.h history.h reader.h parser.h event.h env_universal.h
-env.o: env_universal_common.h input_common.h translate.h complete.h
+env.o: env_universal_common.h input_common.h complete.h
 env_universal.o: config.h signal.h fallback.h util.h common.h wutil.h
 env_universal.o: env_universal_common.h env_universal.h
 env_universal_common.o: config.h signal.h fallback.h util.h common.h wutil.h
 env_universal_common.o: env_universal_common.h
 event.o: signal.h config.h fallback.h util.h wutil.h function.h proc.h io.h
-event.o: parser.h event.h common.h translate.h halloc_util.h
+event.o: parser.h event.h common.h halloc_util.h
 exec.o: signal.h config.h fallback.h util.h common.h wutil.h proc.h io.h
 exec.o: exec.h parser.h event.h builtin.h function.h env.h wildcard.h
-exec.o: sanity.h expand.h env_universal.h env_universal_common.h translate.h
-exec.o: halloc.h halloc_util.h parse_util.h
+exec.o: sanity.h expand.h env_universal.h env_universal_common.h halloc.h
+exec.o: halloc_util.h parse_util.h
 expand.o: signal.h config.h fallback.h util.h common.h wutil.h env.h proc.h
 expand.o: io.h parser.h event.h expand.h wildcard.h exec.h tokenizer.h
-expand.o: complete.h translate.h parse_util.h halloc_util.h
+expand.o: complete.h parse_util.h halloc_util.h
 fallback.o: config.h fallback.h util.h
 fishd.o: config.h signal.h fallback.h util.h common.h wutil.h
 fishd.o: env_universal_common.h
@@ -665,8 +668,8 @@ fish_tests.o: config.h signal.h fallback.h util.h common.h proc.h io.h
 fish_tests.o: reader.h builtin.h function.h complete.h wutil.h env.h expand.h
 fish_tests.o: parser.h event.h tokenizer.h output.h exec.h halloc_util.h
 function.o: signal.h config.h wutil.h fallback.h util.h function.h proc.h
-function.o: io.h translate.h parser.h event.h common.h intern.h reader.h
-function.o: parse_util.h env.h expand.h
+function.o: io.h parser.h event.h common.h intern.h reader.h parse_util.h
+function.o: env.h expand.h
 halloc.o: config.h fallback.h util.h common.h halloc.h
 halloc_util.o: config.h fallback.h util.h common.h halloc.h
 highlight.o: signal.h config.h fallback.h util.h wutil.h highlight.h
@@ -677,50 +680,47 @@ history.o: config.h fallback.h util.h wutil.h history.h common.h reader.h
 history.o: env.h sanity.h signal.h
 input.o: config.h signal.h fallback.h util.h wutil.h reader.h proc.h io.h
 input.o: common.h sanity.h input_common.h input.h parser.h event.h env.h
-input.o: expand.h translate.h output.h
+input.o: expand.h output.h intern.h
 input_common.o: config.h fallback.h util.h common.h wutil.h input_common.h
 input_common.o: env_universal.h env_universal_common.h
 intern.o: config.h fallback.h util.h wutil.h common.h intern.h
-io.o: config.h fallback.h util.h wutil.h exec.h proc.h io.h common.h
-io.o: translate.h halloc.h
+io.o: config.h fallback.h util.h wutil.h exec.h proc.h io.h common.h halloc.h
 key_reader.o: config.h fallback.h input_common.h
 kill.o: signal.h config.h fallback.h util.h wutil.h kill.h proc.h io.h
 kill.o: sanity.h common.h env.h exec.h parser.h event.h halloc.h
 main.o: config.h signal.h fallback.h util.h common.h reader.h builtin.h
 main.o: function.h complete.h wutil.h env.h sanity.h proc.h io.h parser.h
-main.o: event.h expand.h intern.h exec.h output.h translate.h halloc_util.h
-main.o: history.h
+main.o: event.h expand.h intern.h exec.h output.h halloc_util.h history.h
 mimedb.o: config.h xdgmime.h fallback.h util.h
 output.o: config.h signal.h fallback.h util.h wutil.h expand.h common.h
 output.o: output.h halloc_util.h highlight.h
 parser.o: signal.h config.h fallback.h util.h common.h wutil.h proc.h io.h
 parser.o: parser.h event.h tokenizer.h exec.h wildcard.h function.h builtin.h
 parser.o: env.h expand.h reader.h sanity.h env_universal.h
-parser.o: env_universal_common.h translate.h intern.h parse_util.h halloc.h
-parser.o: halloc_util.h
+parser.o: env_universal_common.h intern.h parse_util.h halloc.h halloc_util.h
 parse_util.o: config.h fallback.h util.h wutil.h common.h tokenizer.h
 parse_util.o: parse_util.h expand.h intern.h exec.h proc.h io.h env.h
 parse_util.o: wildcard.h halloc_util.h
 proc.o: config.h signal.h fallback.h util.h wutil.h proc.h io.h common.h
-proc.o: reader.h sanity.h env.h parser.h event.h translate.h halloc.h
-proc.o: halloc_util.h output.h
+proc.o: reader.h sanity.h env.h parser.h event.h halloc.h halloc_util.h
+proc.o: output.h
 reader.o: config.h signal.h fallback.h util.h wutil.h highlight.h reader.h
 reader.o: proc.h io.h parser.h event.h complete.h history.h common.h sanity.h
 reader.o: env.h exec.h expand.h tokenizer.h kill.h input_common.h input.h
-reader.o: function.h output.h translate.h parse_util.h
+reader.o: function.h output.h parse_util.h
 sanity.o: signal.h config.h fallback.h util.h common.h sanity.h proc.h io.h
-sanity.o: history.h reader.h kill.h wutil.h translate.h
-set_color.o: config.h
+sanity.o: history.h reader.h kill.h wutil.h
+set_color.o: config.h fallback.h
 signal.o: config.h signal.h common.h util.h fallback.h wutil.h event.h
-signal.o: reader.h proc.h io.h translate.h
+signal.o: reader.h proc.h io.h
+test.o: stringtab.h
 tokenizer.o: config.h fallback.h util.h wutil.h tokenizer.h common.h
-tokenizer.o: wildcard.h translate.h
-translate.o: config.h common.h util.h fallback.h halloc_util.h
+tokenizer.o: wildcard.h
 util.o: config.h fallback.h util.h common.h wutil.h
-wgetopt.o: config.h wgetopt.h wutil.h fallback.h translate.h
+wgetopt.o: config.h wgetopt.h wutil.h fallback.h
 wildcard.o: config.h fallback.h util.h wutil.h complete.h common.h wildcard.h
-wildcard.o: reader.h expand.h translate.h
-wutil.o: config.h fallback.h util.h common.h wutil.h
+wildcard.o: reader.h expand.h
+wutil.o: config.h fallback.h util.h common.h wutil.h halloc.h halloc_util.h
 xdgmimealias.o: xdgmimealias.h xdgmime.h xdgmimeint.h
 xdgmime.o: xdgmime.h xdgmimeint.h xdgmimeglob.h xdgmimemagic.h xdgmimealias.h
 xdgmime.o: xdgmimeparent.h

builtin.c

@@ -60,7 +60,7 @@
 #include "intern.h"
 #include "event.h"
 #include "signal.h"
-#include "translate.h"
+
 #include "halloc.h"
 #include "halloc_util.h"
 #include "parse_util.h"

builtin_commandline.c

@@ -26,7 +26,7 @@ Functions used for implementing the commandline builtin.
 #include "tokenizer.h"
 #include "input_common.h"
 #include "input.h"
-#include "translate.h"
+
 #include "parse_util.h"
 
 /**

builtin_complete.c

@@ -23,7 +23,7 @@ Functions used for implementing the complete builtin.
 #include "wgetopt.h"
 #include "parser.h"
 #include "reader.h"
-#include "translate.h"
+
 
 /**
    Internal storage for the builtin_get_temporary_buffer() function.

builtin_jobs.c

@@ -24,7 +24,7 @@
 #include "parser.h"
 #include "common.h"
 #include "wgetopt.h"
-#include "translate.h"
+
 
 /**
    Print modes for the jobs builtin

builtin_set.c

@@ -24,7 +24,7 @@ Functions used for implementing the set builtin.
 #include "wgetopt.h"
 #include "proc.h"
 #include "parser.h"
-#include "translate.h"
+
 
 /**
    Error message for invalid path operations

builtin_ulimit.c

@@ -20,7 +20,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

common.c

@@ -7,6 +7,12 @@ parts of fish.
 #include "config.h"
 
 
+#include <unistd.h>
+
+#ifdef HAVE_STROPTS
+#include <stropts.h>
+#endif
+
 #include <stdlib.h>
 #include <termios.h>
 #include <wchar.h>

common.h

@@ -96,6 +96,16 @@ extern wchar_t *program_name;
 		exit(1);														\
 	}																	\
 		
+/**
+   Shorthand for wgettext call
+*/
+#define _(wstr) wgettext(wstr)
+
+/**
+   Noop, used to tell xgettext that a string should be translated, even though it is not directly sent to wgettext.
+*/
+#define N_(wstr) wstr
+
 /**
    Take an array_list_t containing wide strings and converts them to a
    single null-terminated wchar_t **. The array is allocated using

complete.c

@@ -39,7 +39,7 @@
 #include "reader.h"
 #include "history.h"
 #include "intern.h"
-#include "translate.h"
+
 #include "parse_util.h"
 #include "halloc.h"
 #include "halloc_util.h"
@@ -233,6 +233,51 @@ static hash_table_t *condition_cache=0;
 */
 static string_buffer_t *get_desc_buff=0;
 
+
+static void complete_free_entry( complete_entry *c );
+static void clear_hash_entry( void *key, void *data );
+
+
+/**
+   Destroys various structures used for tab-completion and free()s the memory used by them.
+*/
+static void complete_destroy()
+{
+	complete_entry *i=first_entry, *prev;
+	
+	while( i )
+	{
+		prev = i;
+		i=i->next;
+		complete_free_entry( prev );
+	}
+	first_entry = 0;
+	
+	if( suffix_hash )
+	{
+		hash_foreach( suffix_hash, &clear_hash_entry );
+		hash_destroy( suffix_hash );
+		free( suffix_hash );
+		suffix_hash=0;
+	}
+	
+	parse_util_load_reset( L"fish_complete_path", 0 );
+	
+}
+
+/**
+   Make sure complete_destroy is called on exit
+*/
+static void complete_init()
+{
+	static int is_init = 0;
+	if( !is_init )
+	{
+		is_init = 1;
+		halloc_register_function_void( global_context, &complete_destroy );
+	}
+}
+
 /**
    This command clears the cache of condition tests created by \c condition_test().
 */
@@ -329,34 +374,6 @@ static void clear_hash_entry( void *key, void *data )
 	free( (void *)data );
 }
 
-void complete_init()
-{
-}
-
-void complete_destroy()
-{
-	complete_entry *i=first_entry, *prev;
-	
-	while( i )
-	{
-		prev = i;
-		i=i->next;
-		complete_free_entry( prev );
-	}
-	first_entry = 0;
-	
-	if( suffix_hash )
-	{
-		hash_foreach( suffix_hash, &clear_hash_entry );
-		hash_destroy( suffix_hash );
-		free( suffix_hash );
-		suffix_hash=0;
-	}
-	
-	parse_util_load_reset( L"fish_complete_path", 0 );
-	
-}
-
 /**
    Search for an exactly matching completion entry
 */
@@ -390,6 +407,8 @@ void complete_add( const wchar_t *cmd,
 
 	CHECK( cmd, );
 	
+	complete_init();
+
 	c = complete_find_exact_entry( cmd, cmd_type );
 
 	if( c == 0 )
@@ -934,6 +953,7 @@ const wchar_t *complete_get_desc( const wchar_t *filename )
 		
 	if( !get_desc_buff )
 	{
+		complete_init();
 		get_desc_buff = sb_halloc( global_context);
 	}
 	else
@@ -1965,6 +1985,8 @@ void complete( const wchar_t *cmd,
 	CHECK( cmd, );
 	CHECK( comp, );
 
+	complete_init();
+
 //	debug( 1, L"Complete '%ls'", cmd );
 
 	cursor_pos = wcslen(cmd );

complete.h

@@ -66,15 +66,6 @@
 */
 #define PROG_COMPLETE_SEP L'\t'
 
-/**
-  Initializes various structures used for tab-completion.
-*/
-void complete_init();
-
-/**
-   Destroys various structures used for tab-completion and free()s the memory used by them.
-*/
-void complete_destroy();
 
 /**
 

configure.ac

@@ -1,5 +1,5 @@
 # Process this file with autoconf to produce a configure script.
-AC_INIT(fish,1.21.9,fish-users@lists.sf.net)
+AC_INIT(fish,1.21.10,fish-users@lists.sf.net)
 
 # If needed, run autoconf to regenerate the configure file
 AC_MSG_CHECKING([if autoconf needs to be run])
@@ -82,15 +82,6 @@ AC_PROG_CC
 AC_PROG_CPP
 AC_PROG_INSTALL
 
-# 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 command. If missing, make sure fallback shellscript
 # implementation is installed
 AC_CHECK_PROG( SEQ_FALLBACK, seq, [ ], [seq])
@@ -221,17 +212,11 @@ fi
 # it can make sure the fish installation directory is in the path
 # during startup.
 if [[ "$prefix" = NONE ]]; then
-	AC_DEFINE_UNQUOTED( [PREFIX], L"/usr/local", [Installation directory])
-	AC_SUBST( PREFIX, /usr/local)
 	export prefix=/usr/local
+	AC_SUBST( prefix, /usr/local)
 else
-	AC_DEFINE_UNQUOTED( [PREFIX], L"$prefix", [Installation directory])
-	AC_SUBST( PREFIX, [$prefix])
+	AC_SUBST( prefix, [$prefix])
 fi
-AC_DEFINE_UNQUOTED( SYSCONFDIR, [L"$(eval echo $sysconfdir)"], [System configuration directory] )
-AC_DEFINE_UNQUOTED( DATADIR, [L"$(eval echo $datadir)"], [System configuration directory] )
-AC_SUBST( SYSCONFDIR, ["$(eval echo $sysconfdir)"] )
-AC_SUBST( DATADIR, ["$(eval echo $datadir)"] )
 
 
 # Set up the directory where the documentation files should be
@@ -239,16 +224,14 @@ AC_SUBST( DATADIR, ["$(eval echo $datadir)"] )
 AC_ARG_VAR( [docdir], [Documentation direcotry] )
 
 if test -z $docdir; then
-   AC_SUBST(docdir,[$datadir/doc/fish])
+   AC_SUBST(docdir, [$datadir/doc/fish] )
+else
+   AC_SUBST(docdir, [$docdir])
 fi
 
-AC_DEFINE_UNQUOTED( DOCDIR, [L"$(eval echo $docdir)"], [Documentation directory] )
-
-
 # Set up locale directory. This is where the .po files will be
 # installed.
-AC_DEFINE_UNQUOTED( [LOCALEDIR], "$(eval echo $datadir)/locale", [Locale directory])
-AC_SUBST( [LOCALEDIR], [$datadir/locale])
+AC_SUBST( [localedir], [$datadir/locale])
 
 # See if Linux procfs is present. This is used to get extra
 # information about running processes.
@@ -261,23 +244,26 @@ AC_DEFINE([HAVE_TRANSLATE_H], [1],
 			  [Define to 1 if the wgettext function should be used for translating strings.])
 
 # Check for presense of various libraries
-AC_SEARCH_LIBS( gettext, intl, AC_SUBST( HAVE_GETTEXT, [1] ), AC_SUBST( HAVE_GETTEXT, [0] ) )
+AC_SEARCH_LIBS( gettext, intl,,)
 AC_SEARCH_LIBS( connect, socket, , [AC_MSG_ERROR([Cannot find the socket library, needed to build this package.] )] )
 AC_SEARCH_LIBS( nanosleep, rt, , [AC_MSG_ERROR([Cannot find the rt library, needed to build this package.] )] )
 AC_SEARCH_LIBS( setupterm, [ncurses curses], , [AC_MSG_ERROR([Could not find a curses implementation, needed to build fish])] )
 
 # Check for presense of various header files
-AC_CHECK_HEADERS([getopt.h termio.h sys/resource.h term.h ncurses/term.h libintl.h ncurses.h curses.h])
+AC_CHECK_HEADERS([getopt.h termio.h sys/resource.h term.h ncurses/term.h libintl.h ncurses.h curses.h stropts.h])
 
 AC_CHECK_HEADER([regex.h],
 				[AC_DEFINE([HAVE_REGEX_H], [1], [Define to 1 if you have the <regex.h> header file.])],
 				[AC_MSG_ERROR([Could not find the header regex.h, needed to build fish])])
 
 # Check for presense of various functions
-AC_CHECK_FUNCS( wcsdup wcsndup wcslen wcscasecmp wcsncasecmp gettext fwprintf )
+AC_CHECK_FUNCS( gettext wcsdup wcsndup wcslen wcscasecmp wcsncasecmp fwprintf )
 AC_CHECK_FUNCS( futimes wcwidth wcswidth getopt_long wcstok fputwc fgetwc )
 AC_CHECK_FUNCS( wcstol dcgettext wcslcat wcslcpy lrand48_r)
 
+# The Makefile also needs to know if we have gettext, so it knows if the translations should be installed.
+AC_CHECK_FUNC( gettext, AC_SUBST( HAVE_GETTEXT, 1 ), AC_SUBST( HAVE_GETTEXT, 0 ) )
+
 # Here follows a list of small programs used to test for various
 # features that Autoconf doesn't tell us about
 
@@ -357,7 +343,7 @@ case $target_os in
 esac
 
 # Tell the world what we know
-AC_CONFIG_FILES([Makefile fish.spec doc_src/fish.1 doc_src/Doxyfile etc/fish etc/fish_interactive.fish share/fish seq])
+AC_CONFIG_FILES([Makefile fish.spec doc_src/fish.1 doc_src/Doxyfile seq])
 AC_OUTPUT
 
 echo "fish is now configured."

doc_src/begin.txt

@@ -7,11 +7,12 @@
 \subsection begin-description Description
 
 The \c begin builtin is used to create a new block of code. The block
-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 to output of this set of
-commands as a group.
+is unconditionally executed. <code>begin; ...; end</tt> is equivalent
+to <tt>if true; ...; end</tt>. The begin command is used to group any
+number of commands into a block. The reason for doing so is usually
+either to introduce a new variable scope, to redirect the input or
+output of a set of commands as a group, or to specify precedence when
+using the conditional commands like \c and.
 
 The \c begin command does not change the current exit status.
 
@@ -30,3 +31,17 @@ end
 # the block and was killed
 echo $PIRATE
 </pre>
+
+In the following code, all output is redirected to the file out.html.
+
+<pre>
+begin
+	echo $xml_header
+	echo $html_header
+	if test -e $file 
+		...
+	end
+	...
+
+end &gt; out.html
+</pre>

doc_src/doc.hdr

@@ -261,20 +261,36 @@ the example above, these are simply passed on to the ls command. For
 more information on functions, see the documentation for the <a
 href='builtin.html#function'>function</a> builtin.
 
+\subsubsection Autoloading functions
+
 Functions can be defined on the commandline or in a configuration
-file, but they can also be automatically loaded. Fish automatically
-searches through any directories in the array variable
-\$fish_function_path, and any functions defined are automatically
-loaded when needed. A function definition file must have a filename
-consisting of the name of the function plus the suffix '.fish'.  
+file, but they can also be automatically loaded. This method of
+defining functions has several advantages. An autoloaded function
+becomes avaialble automatically to all running shells, if the function
+definition is changed, all running shells will automatically reload
+the altered version, startup time and memory usage is improved, etc.
+
+Fish automatically searches through any directories in the array
+variable \$fish_function_path, and any functions defined are
+automatically loaded when needed. A function definition file must have
+a filename consisting of the name of the function plus the suffix
+'.fish'.
 
 The default value for \$fish_function_path is \c ~/.fish.d/functions
-\c /etc/fish.d/functions \c /usr/share/fish/functions. The exact path to the
-last two of these may be slighly different depending on what install
-path prefix was chosen at configuration time. The rationale behind
-having three different directories is that the first one is for user
-specific functions, the second one is for system-wide additional
-functions and the last one is for default fish functions.
+\c /etc/fish.d/functions \c /usr/share/fish/functions. The exact path
+to the last two of these may be slighly different depending on what
+install path prefix was chosen at configuration time. The rationale
+behind having three different directories is that the first one is for
+user specific functions, the second one is for system-wide additional
+functions and the last one is for default fish functions. The path
+list is searched in order, meaning that by default, the system
+administrator can override default fish functions, and the user can
+override functions defined by the system administrator.
+
+It is very important that function definition files only contain the
+definition for the specified function and nothing else, otherwise it
+is possible that autoloading a function files requires that the
+function already be loaded, i.e. a circular dependency.
 
 \subsection syntax-words Some common words
 

doc_src/end.txt

@@ -10,7 +10,7 @@ begin; [COMMANDS...] end
 
 \subsection end-description Description
 <tt>end</tt> ends a block of commands. For more information, read the
-documentation for the block constructs, such as \c if, \c for and \
+documentation for the block constructs, such as \c if, \c for and \c
 while.
 
 The \c end command does not change the current exit status.

doc_src/function.txt

@@ -12,7 +12,7 @@
 - <code>-s</code> or <code>--on-signal SIGSPEC</code> 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)
 - <code>-v</code> or <code>--on-variable VARIABLE_NAME</code> 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
+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
 
@@ -25,7 +25,7 @@ end
 will write <code>hello</code> whenever the user enters \c hi.
 
 If the user enters any additional arguments after the function, they
-are inserted into the environment variable <a href="index.html#variables-arrays">array</a> argv.
+are inserted into the environment <a href="index.html#variables-arrays">variable array</a> argv.
 
 \subsection function-example Example
 

env.c

@@ -31,6 +31,10 @@
 #include <ncurses/term.h>
 #endif
 
+#if HAVE_LIBINTL_H
+#include <libintl.h>
+#endif
+
 #include <errno.h>
 
 
@@ -49,13 +53,13 @@
 #include "env_universal.h"
 #include "input_common.h"
 #include "event.h"
-#include "translate.h"
+
 #include "complete.h"
 
 /**
    Command used to start fishd
 */
-#define FISHD_CMD L"if which fishd >/dev/null; fishd ^/tmp/fishd.log.%s; end"
+#define FISHD_CMD L"if which fishd 2>/dev/null >/dev/null; fishd ^/tmp/fishd.log.%s; end"
 
 /**
    Value denoting a null string
@@ -305,16 +309,17 @@ static void handle_locale()
 	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		
-
+		/* 
+		   Try to make change known to gettext. Both changing
+		   _nl_msg_cat_cntr and calling dcgettext might potentially
+		   tell some gettext implementation that the translation
+		   strings should be reloaded. We do both and hope for the
+		   best.
+		*/
+		extern int _nl_msg_cat_cntr;
+		++_nl_msg_cat_cntr;
+		dcgettext( "fish", "Changing language to English", LC_MESSAGES );
+		
 		if( is_interactive )
 		{
 			debug( 0, _(L"Changing language to English") );

env_universal.c

@@ -256,11 +256,11 @@ void env_universal_destroy()
 			wperror( L"fcntl" );
 		}
 		try_send_all( &env_universal_server );	
-	}
-
-	if( close( env_universal_server.fd ) )
-	{
-		wperror( L"close" );
+		
+		if( close( env_universal_server.fd ) )
+		{
+			wperror( L"close" );
+		}
 	}
 	
 	env_universal_server.fd =-1;

etc/fish.in

@@ -7,8 +7,8 @@
 # Set default search paths for completions and shellscript functions
 #
 
-set -g fish_function_path ~/.fish.d/functions    @SYSCONFDIR@/fish.d/functions    @DATADIR@/fish/functions 
-set -g fish_complete_path ~/.fish.d/completions  @SYSCONFDIR@/fish.d/completions  @DATADIR@/fish/completions 
+set -g fish_function_path ~/.fish.d/functions    @sysconfdir@/fish.d/functions    @datadir@/fish/functions 
+set -g fish_complete_path ~/.fish.d/completions  @sysconfdir@/fish.d/completions  @datadir@/fish/completions 
 
 #
 # Set default field separators

etc/fish_interactive.fish.in

@@ -30,10 +30,10 @@ end
 # be exported, since the fish inputrc file plays nice with other files 
 # by including them when found.
 # Give priority to the default file installed with fish in 
-# @SYSCONFDIR@/fish_inputrc.
+# @sysconfdir@/fish_inputrc.
 #
 
-for i in ~/.fish_inputrc @SYSCONFDIR@/fish_inputrc ~/.inputrc /etc/inputrc
+for i in ~/.fish_inputrc @sysconfdir@/fish_inputrc ~/.inputrc /etc/inputrc
 	if test -f $i
 		set -xg INPUTRC $i
 		break

event.c

@@ -23,7 +23,7 @@
 #include "common.h"
 #include "event.h"
 #include "signal.h"
-#include "translate.h"
+
 #include "halloc_util.h"
 
 /**
@@ -391,9 +391,9 @@ static int event_is_killed( event_t *e )
 
 /**
    Perform the specified event. Since almost all event firings will
-   not match a single event handler, we make sureto optimize the 'no
-   matches' path. This means that nothing is allocated/initialized
-   unless that is needed.
+   not be matched by even a single event handler, we make sure to
+   optimize the 'no matches' path. This means that nothing is
+   allocated/initialized unless needed.
 */
 static void event_fire_internal( event_t *event )
 {
@@ -473,7 +473,7 @@ static void event_fire_internal( event_t *event )
 		
 		/*
 		  Event handlers are not part of the main flow of code, so
-		  they are marked as non-interactive and as a subshell
+		  they are marked as non-interactive
 		*/
 		proc_push_interactive(0);
 		parser_push_block( EVENT );
@@ -510,6 +510,13 @@ static void event_fire_delayed()
 
 	int i;
 
+	/*
+	  If is_event is one, we are running the event-handler non-recursively. 
+
+	  When the event handler has called a piece of code that triggers
+	  another event, we do not want to fire delayed events because of
+	  concurrency problems.
+	*/
 	if( blocked && is_event==1)
 	{
 		array_list_t *new_blocked = 0;
@@ -594,7 +601,7 @@ void event_fire( event_t *event )
 		/*
 		  This means we are in a signal handler. We must be very
 		  careful not do do anything that could cause a memory
-		  allocation or something else that might be illegal in a
+		  allocation or something else that might be bad when in a
 		  signal handler.
 		*/
 		if( sig_list[active_list].count < SIG_UNHANDLED_MAX )

exec.c

@@ -39,7 +39,7 @@
 #include "expand.h"
 #include "signal.h"
 #include "env_universal.h"
-#include "translate.h"
+
 #include "halloc.h"
 #include "halloc_util.h"
 #include "parse_util.h"

expand.c

@@ -42,10 +42,30 @@ parameter expansion.
 #include "signal.h"
 #include "tokenizer.h"
 #include "complete.h"
-#include "translate.h"
+
 #include "parse_util.h"
 #include "halloc_util.h"
 
+/**
+   Error issued on invalid variable name
+*/
+#define COMPLETE_VAR_DESC _( L"The '$' character begins a variable name. The character '%lc', which directly followed a '$', is not allowed as a part of a variable name, and variable names may not be zero characters long. To learn more about variable expansion in fish, type 'help expand-variable'.")
+
+/**
+   Error issued on invalid variable name
+*/
+#define COMPLETE_VAR_NULL_DESC _( L"The '$' begins a variable name. It was given at the end of an argument. Variable names may not be zero characters long. To learn more about variable expansion in fish, type 'help expand-variable'.")
+
+/**
+   Error issued on invalid variable name
+*/
+#define COMPLETE_VAR_BRACKET_DESC _( L"Did you mean %ls{$%ls}%ls? The '$' character begins a variable name. A bracket, which directly followed a '$', is not allowed as a part of a variable name, and variable names may not be zero characters long. To learn more about variable expansion in fish, type 'help expand-variable'." )
+
+/**
+   Error issued on invalid variable name
+*/
+#define COMPLETE_VAR_PARAN_DESC _( L"Did you mean (COMMAND)? In fish, the '$' character is only used for accessing variables. To learn more about command substitution in fish, type 'help expand-command-substitution'.")
+
 /**
    Description for child process
 */
@@ -575,12 +595,9 @@ static int expand_pid( wchar_t *in,
 					   array_list_t *out )
 {
 
-	if( !in || !out)
-	{
-		debug( 2, L"Got null string on line %d of file %s", __LINE__, __FILE__ );
-		return 0;		
-	}
-
+	CHECK( in, 0 );
+	CHECK( out, 0 );
+	
 	if( *in != PROCESS_EXPAND )
 	{
 		al_push( out, in );
@@ -649,6 +666,83 @@ static int expand_pid( wchar_t *in,
 	return 1;
 }
 
+
+void expand_variable_error( const wchar_t *token, int token_pos, int error_pos )
+{
+	int stop_pos = token_pos+1;
+	
+	switch( token[stop_pos] )
+	{
+		case BRACKET_BEGIN:
+		{
+			wchar_t *cpy = wcsdup( token );
+			*(cpy+token_pos)=0;
+			wchar_t *name = &cpy[stop_pos+1];
+			wchar_t *end = wcschr( name, BRACKET_END );
+			wchar_t *post;
+			int is_var=0;
+			if( end )
+			{
+				post = end+1;
+				*end = 0;
+				
+				if( !wcsvarname( name ) )
+				{
+					is_var = 1;
+				}
+			}
+			
+			if( is_var )
+			{
+				error( SYNTAX_ERROR,
+					   error_pos,
+					   COMPLETE_VAR_BRACKET_DESC,
+					   cpy,
+					   name,
+					   post );				
+			}
+			else
+			{
+				error( SYNTAX_ERROR,
+					   error_pos,
+					   COMPLETE_VAR_BRACKET_DESC,
+					   L"",
+					   L"VARIABLE",
+					   L"" );
+			}
+			free( cpy );
+			
+			break;
+		}
+		
+		case INTERNAL_SEPARATOR:
+		{
+			error( SYNTAX_ERROR,
+				   error_pos,
+				   COMPLETE_VAR_PARAN_DESC );	
+			break;
+		}
+		
+		case 0:
+		{
+			error( SYNTAX_ERROR,
+				   error_pos,
+				   COMPLETE_VAR_NULL_DESC );
+			break;
+		}
+		
+		default:
+		{
+			error( SYNTAX_ERROR,
+				   error_pos,
+				   COMPLETE_VAR_DESC,
+				   token[stop_pos] );
+			break;
+		}
+	}
+}
+
+
 /**
    Expand all environment variables in the string *ptr.
 
@@ -674,12 +768,9 @@ static int expand_variables( wchar_t *in, array_list_t *out, int last_idx )
 	static string_buffer_t *var_tmp = 0;
 	static array_list_t *var_idx_list = 0;
 
-	if( !in || !out)
-	{
-		debug( 2, L"Got null string on line %d of file %s", __LINE__, __FILE__ );
-		return 0;		
-	}
-
+	CHECK( in, 0 );
+	CHECK( out, 0 );
+	
 	if( !var_tmp )
 	{
 		var_tmp = sb_halloc( global_context );
@@ -735,43 +826,8 @@ static int expand_variables( wchar_t *in, array_list_t *out, int last_idx )
 
 			if( var_len == 0 )
 			{
-				switch( in[stop_pos] )
-				{
-					case BRACKET_BEGIN:
-					{
-						error( SYNTAX_ERROR,
-							   -1,
-							   COMPLETE_VAR_BRACKET_DESC );
-						break;
-					}
-
-					case INTERNAL_SEPARATOR:
-					{
-						error( SYNTAX_ERROR,
-							   -1,
-							   COMPLETE_VAR_PARAN_DESC );
-						break;
-					}
-
-					case 0:
-					{
-						error( SYNTAX_ERROR,
-							   -1,
-							   COMPLETE_VAR_NULL_DESC );
-						break;
-					}
-
-					default:
-					{
-						error( SYNTAX_ERROR,
-							   -1,
-							   COMPLETE_VAR_DESC,
-							   in[stop_pos] );
-						break;
-					}
-				}
-
-
+				expand_variable_error( in, stop_pos-1, -1 );				
+				
 				is_ok = 0;
 				break;
 			}
@@ -1002,13 +1058,10 @@ static int expand_brackets( wchar_t *in, int flags, array_list_t *out )
 
 	wchar_t *item_begin;
 	int len1, len2, tot_len;
-	
-	if( !in || !out)
-	{
-		debug( 2, L"Got null string on line %d of file %s", __LINE__, __FILE__ );
-		return 0;		
-	}
 
+	CHECK( in, 0 );
+	CHECK( out, 0 );
+	
 	for( pos=in;
 		 (*pos) && !syntax_error;
 		 pos++ )
@@ -1139,12 +1192,9 @@ static int expand_subshell( wchar_t *in, array_list_t *out )
 	int i, j;
 	const wchar_t *item_begin;
 
-	if( !in || !out)
-	{
-		debug( 2, L"Got null string on line %d of file %s", __LINE__, __FILE__ );
-		return 0;		
-	}
-
+	CHECK( in, 0 );
+	CHECK( out, 0 );
+	
 	switch( parse_util_locate_cmdsubst(in,
 									   &paran_begin,
 									   &paran_end,
@@ -1246,6 +1296,8 @@ static wchar_t *expand_unescape( const wchar_t * in, int escape_special )
 static wchar_t * expand_tilde_internal( wchar_t *in )
 {
 
+	CHECK( in, 0 );
+
 	if( in[0] == HOME_DIRECTORY )
 	{
 		int tilde_error = 0;
@@ -1332,12 +1384,14 @@ wchar_t *expand_tilde( wchar_t *in)
 
 /**
    Remove any internal separators. Also optionally convert wildcard characters to
-   regular equivalents. This is done to support EXPAN_SKIP_WILDCARDS.
+   regular equivalents. This is done to support EXPAND_SKIP_WILDCARDS.
 */
 static void remove_internal_separator( const void *s, int conv )
 {
 	wchar_t *in = (wchar_t *)s;
 	wchar_t *out=in;
+	
+	CHECK( s, );
 
 	while( *in )
 	{

expand.h

@@ -112,26 +112,6 @@ enum
 /** String containing the character for separating two array elements */
 #define ARRAY_SEP_STR L"\x1e"
 
-/**
-   Error issued on invalid variable name
-*/
-#define COMPLETE_VAR_DESC _( L"The '$' character begins a variable name. The character '%lc', which directly followed a '$', is not allowed as a part of a variable name, and variable names may not be zero characters long. To learn more about variable expansion in fish, type 'help expand-variable'.")
-
-/**
-   Error issued on invalid variable name
-*/
-#define COMPLETE_VAR_NULL_DESC _( L"The '$' begins a variable name. It was given at the end of an argument. Variable names may not be zero characters long. To learn more about variable expansion in fish, type 'help expand-variable'.")
-
-/**
-   Error issued on invalid variable name
-*/
-#define COMPLETE_VAR_BRACKET_DESC _( L"Did you mean {$VARIABLE}? The '$' character begins a variable name. A bracket, which directly followed a '$', is not allowed as a part of a variable name, and variable names may not be zero characters long. To learn more about variable expansion in fish, type 'help expand-variable'." )
-
-/**
-   Error issued on invalid variable name
-*/
-#define COMPLETE_VAR_PARAN_DESC _( L"Did you mean (COMMAND)? In fish, the '$' character is only used for accessing variables. To learn more about command substitution in fish, type 'help expand-command-substitution'.")
-
 /**
    Error issued on array out of bounds
 */
@@ -207,4 +187,17 @@ wchar_t *expand_tilde(wchar_t *in);
 */
 int expand_is_clean( const wchar_t *in );
 
+/**
+   Perform error reporting for a syntax error related to the variable
+   expansion beginning at the specified character of the specified
+   token. This function will call the error function with an
+   explanatory string about what is wrong with the specified token.
+
+   \param token The token containing the error
+   \param token_pos The position where the expansion begins
+   \param error_pos The position on the line to report to the error function.
+*/
+void expand_variable_error( const wchar_t *token, int token_pos, int error_pos );
+
+
 #endif

fallback.c

@@ -2,6 +2,10 @@
    This file only contains fallback implementations of functions which
    have been found to be missing or broken by the configuration
    scripts.
+
+   Many of these functions are more or less broken and
+   incomplete. lrand28_r internally uses the regular (bad) rand_r
+   function, the gettext function doesn't actually do anything, etc.
 */
 
 #include "config.h"
@@ -65,7 +69,11 @@ int tputs(const char *str, int affcnt, int (*fish_putc)(tputs_arg_t))
 
 #ifdef INTERNAL_FWPRINTF
 
-void pad( void (*writer)(wchar_t), int count)
+/**
+   Internal function for the wprintf fallbacks. USed to write the
+   specified number of spaces.
+*/
+static void pad( void (*writer)(wchar_t), int count)
 {
 	
 	int i;
@@ -1029,6 +1037,42 @@ int futimes(int fd, const struct timeval *times)
 	return -1;
 }
 
+#endif
+
+#ifndef HAVE_GETTEXT
+
+char * gettext (const char * msgid)
+{
+	return (char *)msgid;
+}
+
+char * bindtextdomain (const char * domainname, const char * dirname)
+{
+	return 0;
+}
+
+char * textdomain (const char * domainname)
+{
+	return 0;
+}
+
+#endif
+
+#ifndef HAVE_DCGETTEXT
+
+char * dcgettext ( const char * domainname,
+				   const char * msgid,
+				   int category)
+{
+	return (char *)msgid;
+}
+
+
+#endif
+
+#ifndef HAVE__NL_MSG_CAT_CNTR
+
+int _nl_msg_cat_cntr=0;
 
 #endif
 

fallback.h

@@ -310,18 +310,59 @@ struct drand48_data
 /**
    Fallback implementation of lrand48_r. Internally uses rand_r, so it is pretty weak.
 */
-int lrand48_r(struct drand48_data *buffer, long int *result);
+int lrand48_r( struct drand48_data *buffer, long int *result );
 
 /**
    Fallback implementation of srand48_r, the seed function for lrand48_r.
 */
-int srand48_r(long int seedval, struct drand48_data *buffer);
+int srand48_r( long int seedval, struct drand48_data *buffer );
 
 #endif
 
 #ifndef HAVE_FUTIMES
 
-int futimes(int fd, const struct timeval *times);
+int futimes( int fd, const struct timeval *times );
+
+#endif
+
+#ifndef HAVE_GETTEXT
+
+/**
+   Fallback implementation of gettext. Just returns the original string.
+*/
+char * gettext( const char * msgid );
+
+/**
+   Fallback implementation of bindtextdomain. Does nothing.
+*/
+char * bindtextdomain( const char * domainname, const char * dirname );
+
+/**
+   Fallback implementation of textdomain. Does nothing.
+*/
+char * textdomain( const char * domainname );
+
+#endif
+
+#ifndef HAVE_DCGETTEXT
+
+/**
+   Fallback implementation of dcgettext. Just returns the original string.
+*/
+char * dcgettext ( const char * domainname, 
+				   const char * msgid,
+				   int category );
+
+#endif
+
+#ifndef HAVE__NL_MSG_CAT_CNTR
+
+/**
+   Some gettext implementation use have this variable, and by
+   increasing it, one can tell the system that the translations need
+   to be reloaded.
+*/
+extern int _nl_msg_cat_cntr;
 
 #endif
 

fish_tests.c

@@ -198,7 +198,7 @@ static int stack_test( int elements )
 /**
    Hash function for pointers
 */
-static int hash_func( const void *data )
+static int hash_func( void *data )
 {
 /*	srand( (int)data );
 	return rand();
@@ -210,7 +210,7 @@ static int hash_func( const void *data )
 /**
    Pointer hash comparison function
 */
-static int compare_func( const void *key1, const void *key2 )
+static int compare_func( void *key1, void *key2 )
 {
 	return key1==key2;
 }
@@ -577,7 +577,7 @@ static int expand_test( const wchar_t *in, int flags, ... )
 	}
 	va_end( va );
 	
-	al_foreach( &out, (void (*)(const void *))&free );
+	al_foreach( &out, &free );
 	return res;
 		
 }
@@ -642,7 +642,7 @@ void perf_complete()
 	
 		matches += al_get_count( &out );
 		
-		al_foreach( &out, (void (*)(const void *))&free );
+		al_foreach( &out, &free );
 		al_truncate( &out, 0 );
 	}
 	t2=get_time();
@@ -664,7 +664,7 @@ void perf_complete()
 	
 		matches += al_get_count( &out );
 		
-		al_foreach( &out, (void (*)(const void *))&free );
+		al_foreach( &out, &free );
 		al_truncate( &out, 0 );
 	}
 	t2=get_time();
@@ -696,7 +696,6 @@ int main( int argc, char **argv )
 	parser_init();
 	function_init();
 	builtin_init();
-	complete_init();
 	reader_init();
 	env_init();
 
@@ -718,7 +717,6 @@ int main( int argc, char **argv )
 	parser_destroy();
 	function_destroy();
 	builtin_destroy();
-	complete_destroy();
 	wutil_destroy();
 	event_destroy();
 	proc_destroy();

function.c

@@ -16,7 +16,6 @@
 
 #include "function.h"
 #include "proc.h"
-#include "translate.h"
 #include "parser.h"
 #include "common.h"
 #include "intern.h"

highlight.c

@@ -32,6 +32,7 @@
 #include "output.h"
 #include "halloc.h"
 #include "halloc_util.h"
+#include "wildcard.h"
 
 /**
    Number of elements in the highlight_var array
@@ -102,6 +103,9 @@ static int is_potential_path( const wchar_t *path )
 					case BRACKET_BEGIN:
 					case BRACKET_END:
 					case BRACKET_SEP:
+					case ANY_CHAR:
+					case ANY_STRING:
+					case ANY_STRING_RECURSIVE:
 					{
 						has_magic = 1;
 						break;		

input.c

@@ -59,7 +59,7 @@ implementation in fish is as of yet incomplete.
 #include "expand.h"
 #include "event.h"
 #include "signal.h"
-#include "translate.h"
+
 #include "output.h"
 #include "intern.h"
 
@@ -121,7 +121,8 @@ static const wchar_t *name_arr[] =
 	L"history-token-search-forward",
 	L"self-insert",
 	L"null",
-	L"eof"
+	L"eof",
+	L"vi-arg-digit"
 }
 	;
 
@@ -159,7 +160,8 @@ static const wchar_t *desc_arr[] =
 	L"Search forward through list of previous commands for matching token",
 	L"Insert the pressed key",
 	L"Do nothing",
-	L"End of file"
+	L"End of file",
+	L"Repeat command"
 }
 	;
 */
@@ -196,7 +198,8 @@ static const wchar_t code_arr[] =
 	R_HISTORY_TOKEN_SEARCH_FORWARD,
 	R_SELF_INSERT,
 	R_NULL,
-	R_EOF
+	R_EOF,
+	R_VI_ARG_DIGIT
 }
 	;
 
@@ -238,6 +241,19 @@ static int inputrc_error = 0;
 */
 static int is_init = 0;
 
+
+/**
+   This is the variable telling us how many timew the next command
+   should bne repeated. Only actually used in vi-mode.
+*/
+static int repeat_count = 1;
+
+/**
+   This is the type of the first command in a vi-mode two-part combo
+   like 'dw' or '3d3l'.
+*/
+static wint_t first_command = 0;
+
 wchar_t input_get_code( const wchar_t *name )
 {
 
@@ -255,7 +271,7 @@ wchar_t input_get_code( const wchar_t *name )
 /**
    Returns the function name for the given function code.
 */
-/*
+
 static const wchar_t *input_get_name( wchar_t c )
 {
 
@@ -269,7 +285,7 @@ static const wchar_t *input_get_name( wchar_t c )
 	}
 	return 0;		
 }
-*/
+
 /**
    Returns the function description for the given function code.
 */
@@ -998,7 +1014,7 @@ void input_parse_inputrc_line( wchar_t *cmd )
 		{
 			if( wcscmp( key, L"editing-mode" ) == 0 )
 			{
-//				current_mode_mappings = get_mapping( value );
+				current_mode_mappings = get_mapping( value );
 			}
 		}
 		
@@ -1305,12 +1321,29 @@ static void add_vi_bindings()
 	add_mapping( L"vi-command", L"$", L"$", L"end-of-line" );
 	add_mapping( L"vi-command", L"^", L"^", L"beginning-of-line" );
 	add_mapping( L"vi-command", L"0", L"0", L"beginning-of-line" );
+
 	add_mapping( L"vi-command", L"b", L"b", L"backward-word" );
 	add_mapping( L"vi-command", L"B", L"B", L"backward-word" );
 	add_mapping( L"vi-command", L"w", L"w", L"forward-word" );
 	add_mapping( L"vi-command", L"W", L"W", L"forward-word" );
+
 	add_mapping( L"vi-command", L"x", L"x", L"delete-char" );
-	
+
+	add_mapping( L"vi-command", L"1", L"1", L"vi-arg-digit" );
+	add_mapping( L"vi-command", L"2", L"2", L"vi-arg-digit" );
+	add_mapping( L"vi-command", L"3", L"3", L"vi-arg-digit" );
+	add_mapping( L"vi-command", L"4", L"4", L"vi-arg-digit" );
+	add_mapping( L"vi-command", L"5", L"5", L"vi-arg-digit" );
+	add_mapping( L"vi-command", L"6", L"6", L"vi-arg-digit" );
+	add_mapping( L"vi-command", L"7", L"7", L"vi-arg-digit" );
+	add_mapping( L"vi-command", L"8", L"8", L"vi-arg-digit" );
+	add_mapping( L"vi-command", L"9", L"9", L"vi-arg-digit" );
+
+
+	add_mapping( L"vi-command", L"d", L"d", L"vi-delete-to" );
+	add_mapping( L"vi-command", L"D", L"D", L"vi-delete-to" );
+
+
 /*
   movement ("h", "l"), word movement
   ("b", "B", "w", "W", "e", "E"), moving to beginning and end of line
@@ -1456,6 +1489,8 @@ void input_destroy()
 */
 static wint_t input_exec_binding( mapping *m, const wchar_t *seq )
 {
+	int i;
+	
 //	fwprintf( stderr, L"Binding %ls\n", m->command );
 	wchar_t code = input_get_code( m->command );
 	if( code != -1 )
@@ -1464,15 +1499,63 @@ static wint_t input_exec_binding( mapping *m, const wchar_t *seq )
 		{
 			case R_DUMP_FUNCTIONS:
 			{
-				dump_functions();
+				for( i=0; i<repeat_count; i++ )
+					dump_functions();
+				repeat_count = 1;				
 				return R_NULL;							
 			}
+
 			case R_SELF_INSERT:
 			{
+				for( i=1; i<repeat_count; i++ )
+					input_unreadch( seq[0] );							
+				repeat_count = 1;				
 				return seq[0];							
 			}
+
+			case R_VI_ARG_DIGIT:
+			{
+				int repeat = seq[0]-L'0';
+				if( repeat > 0 && repeat <= 9 )
+					repeat_count *= repeat;
+				
+				return R_NULL;
+			}
+			
+			case R_VI_DELETE_TO:
+			{
+				first_command = R_VI_DELETE_TO;
+				return R_NULL;
+			}
+
 			default:
+			{
+				
+				if( first_command )
+				{
+					switch( first_command )
+					{
+						case R_VI_DELETE_TO:
+						{
+						
+							break;
+							
+						}
+					}
+				}
+				else
+				{
+					for( i=1; i<repeat_count; i++ )
+					{
+						input_unreadch( code );							
+					}
+				}
+				
+				repeat_count = 1;				
+				first_command = 0;
 				return code;
+			}
+			
 		}	
 	}
 	else
@@ -1511,6 +1594,13 @@ static wint_t input_try_mapping( mapping *m)
 {
 	int j, k;
 	wint_t c=0;
+
+	c = input_common_readch( 0 );
+	if( c == input_get_code( m->command ) )
+	{
+		return input_exec_binding( m, m->seq );
+	}
+	input_unreadch( c );
 	
 	if( m->seq != 0 )
 	{
@@ -1524,9 +1614,14 @@ static wint_t input_try_mapping( mapping *m)
 		}
 		else
 		{
+			/*
+			  Return the read characters
+			*/
 			input_unreadch(c);
-			for(k=j-1; k>=0; k--)
-				input_unreadch(m->seq[k]);
+			for( k=j-1; k>=0; k-- )
+			{
+				input_unreadch( m->seq[k] );
+			}
 		}
 	}		
 	return 0;

input.h

@@ -44,6 +44,8 @@ enum
 	R_HISTORY_TOKEN_SEARCH_BACKWARD,
 	R_HISTORY_TOKEN_SEARCH_FORWARD,
 	R_SELF_INSERT,
+	R_VI_ARG_DIGIT,
+	R_VI_DELETE_TO
 }
 ;
 

io.c

@@ -39,7 +39,7 @@ Utilities for io redirection.
 #include "exec.h"
 #include "common.h"
 #include "io.h"
-#include "translate.h"
+
 #include "halloc.h"
 
 

main.c

@@ -58,7 +58,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "exec.h"
 #include "event.h"
 #include "output.h"
-#include "translate.h"
+
 #include "halloc_util.h"
 #include "history.h"
 
@@ -81,11 +81,9 @@ static int read_init()
 		return 0;
 	}
 
-	env_set( L"__fish_help_dir", DOCDIR, 0);	
-
-	eval( L"builtin cd " DATADIR L"/fish 2>/dev/null; and . fish 2>/dev/null", 0, TOP );
-	eval( L"builtin cd " SYSCONFDIR L" 2>/dev/null; and . fish 2>/dev/null", 0, TOP );
-	eval( L"builtin cd 2>/dev/null; and . .fish 2>/dev/null", 0, TOP );
+	eval( L"builtin cd " DATADIR L"/fish 2>/dev/null; and builtin . fish 2>/dev/null", 0, TOP );
+	eval( L"builtin cd " SYSCONFDIR L" 2>/dev/null; and builtin . fish 2>/dev/null", 0, TOP );
+	eval( L"builtin cd 2>/dev/null; and builtin . .fish 2>/dev/null", 0, TOP );
 
 	if( chdir( cwd ) == -1 )
 	{
@@ -186,13 +184,17 @@ int main( int argc, char **argv )
 		switch( opt )
 		{
 			case 0:
+			{
 				break;
-				
+			}
+			
 			case 'c':		
+			{
 				cmd = optarg;				
 				is_interactive_session = 0;
 				break;
-
+			}
+			
 			case 'd':		
 			{
 				char *end;
@@ -210,35 +212,49 @@ int main( int argc, char **argv )
 			}
 			
 			case 'h':
+			{
 				cmd = "help";
 				break;
-
+			}
+			
 			case 'i':
+			{
 				force_interactive = 1;
 				break;				
-				
+			}
+			
 			case 'l':
+			{
 				is_login=1;
 				break;				
-				
+			}
+			
 			case 'n':
+			{
 				no_exec=1;
 				break;				
-				
+			}
+			
 			case 'p':
+			{
 				profile = optarg;
 				break;				
-				
+			}
+			
 			case 'v':
+			{
 				fwprintf( stderr, 
 						  _(L"%s, version %s\n"), 
 						  PACKAGE_NAME,
 						  PACKAGE_VERSION );
 				exit( 0 );				
-
+			}
+			
 			case '?':
+			{
 				return 1;
-				
+			}
+			
 		}		
 	}
 
@@ -268,7 +284,6 @@ int main( int argc, char **argv )
 	builtin_init();
 	function_init();
 	env_init();
-	complete_init();
 	reader_init();
 	history_init();
 
@@ -342,10 +357,9 @@ int main( int argc, char **argv )
 
 	proc_fire_event( L"PROCESS_EXIT", EVENT_EXIT, getpid(), res );
 	
+
 	history_destroy();
-	complete_destroy();
 	proc_destroy();
-	env_destroy();
 	builtin_destroy();
 	function_destroy();
 	reader_destroy();
@@ -354,6 +368,9 @@ int main( int argc, char **argv )
 	event_destroy();
 
 	halloc_util_destroy();
+
+	env_destroy();
+
 	intern_free_all();
 
 

parse_util.c

@@ -29,7 +29,7 @@
 #include "intern.h"
 #include "exec.h"
 #include "env.h"
-#include "translate.h"
+
 #include "wildcard.h"
 #include "halloc_util.h"
 
@@ -376,7 +376,6 @@ void parse_util_token_extent( const wchar_t *buff,
 	CHECK( buff, );
 		
 	assert( cursor_pos >= 0 );
-	
 
 	a = b = pa = pb = 0;
 	
@@ -432,11 +431,11 @@ void parse_util_token_extent( const wchar_t *buff,
 		  If cursor is inside the token, this is the token we are
 		  looking for. If so, set a and b and break
 		*/
-		if( tok_end >= pos )
-		{
+		if( (tok_last_type( &tok ) == TOK_STRING) && (tok_end >= pos ) )
+		{			
 			a = begin + tok_get_pos( &tok );
 			b = a + wcslen(tok_last(&tok));
-
+			
 //			fwprintf( stderr, L"Whee %ls\n", *a );
 
 			break;
@@ -499,6 +498,7 @@ static void clear_loaded_entry( void *key,
 				   &clear_hash_value,
 				   handler );
 	hash_destroy( &loaded->load_time );
+	hash_destroy( &loaded->is_loading );
 
 	free( loaded->old_path );
 	free( loaded );	

parser.c

@@ -37,7 +37,7 @@ The fish parser. Contains functions for parsing code.
 #include "sanity.h"
 #include "env_universal.h"
 #include "event.h"
-#include "translate.h"
+
 #include "intern.h"
 #include "parse_util.h"
 #include "halloc.h"
@@ -140,7 +140,7 @@ The fish parser. Contains functions for parsing code.
 /**
    Error message for Posix-style assignment
 */
-#define COMMAND_ASSIGN_ERR_MSG _( L"Unknown command '%ls'. Did you mean 'set VARIABLE VALUE'? For information on setting variable values, see the help section on the set command by typing 'help set'.")
+#define COMMAND_ASSIGN_ERR_MSG _( L"Unknown command '%ls'. Did you mean 'set %ls %ls'? For information on assigning values to variables, see the help section on the set command by typing 'help set'.")
 
 /**
    Error for invalid redirection token
@@ -1372,7 +1372,8 @@ wchar_t *parser_current_line()
 //	lineno = current_tokenizer_pos;
 	
 
-	current_line_width=printed_width(whole_str+current_line_start, current_tokenizer_pos-current_line_start );
+	current_line_width=printed_width( whole_str+current_line_start,
+									  current_tokenizer_pos-current_line_start );
 
 	if( (function_name = is_function()) )
 	{
@@ -1467,8 +1468,10 @@ int parser_is_help( wchar_t *s, int min_match )
 {
 	int len = wcslen(s);
 
+	min_match = maxi( min_match, 3 );
+		
 	return ( wcscmp( L"-h", s ) == 0 ) ||
-		( len >= 3 && (wcsncmp( L"--help", s, len ) == 0) );
+		( len >= min_match && (wcsncmp( L"--help", s, len ) == 0) );
 }
 
 /**
@@ -1696,8 +1699,9 @@ static void parse_job_main_loop( process_t *p,
 								   tok_last( tok ) );
 
 						}
+						break;
 					}
-					break;
+
 					default:
 						error( SYNTAX_ERROR,
 							   tok_get_pos( tok ),
@@ -1738,6 +1742,7 @@ static void parse_job_main_loop( process_t *p,
 							break;
 
 						case TOK_REDIRECT_FD:
+						{
 							if( wcscmp( target, L"-" ) == 0 )
 							{
 								new_io->io_mode = IO_CLOSE;
@@ -1760,6 +1765,8 @@ static void parse_job_main_loop( process_t *p,
 								}
 							}
 							break;
+						}
+
 					}
 				}
 
@@ -1820,6 +1827,7 @@ static void parse_job_main_loop( process_t *p,
 }
 
 
+	
 /**
    Fully parse a single job. Does not call exec on it, but any command substitutions in the job will be executed.
 
@@ -2065,7 +2073,7 @@ static int parse_job( process_t *p,
 			*/
 			continue;
 		}
-
+		
 		if( use_function && !current_block->skip )
 		{
 			int nxt_forbidden;
@@ -2161,7 +2169,7 @@ static int parse_job( process_t *p,
 						wchar_t *cmd = (wchar_t *)al_get( args, 0 );
 						
 						/* 
-						   We couln't find the specified command.
+						   We couldn't find the specified command.
 						   
 						   What we want to happen now is that the
 						   specified job won't get executed, and an
@@ -2176,9 +2184,16 @@ static int parse_job( process_t *p,
 						*/
 						if( wcschr( cmd, L'=' ) )
 						{
+							wchar_t *cpy = halloc_wcsdup( j, cmd );
+							wchar_t *valpart = wcschr( cpy, L'=' );
+							*valpart++=0;
+							
 							debug( 0,
 								   COMMAND_ASSIGN_ERR_MSG,
-								   (wchar_t *)al_get( args, 0 ) );
+								   cmd,
+								   cpy,
+								   valpart);
+							
 						}
 						else if(cmd[0]==L'$')
 						{
@@ -2750,7 +2765,7 @@ static const wchar_t *parser_get_block_command( int type )
 
 /**
    Test if this argument contains any errors. Detected errors include
-   syntax errors in command substitutions, imporoper escaped
+   syntax errors in command substitutions, improperly escaped
    characters and improper use of the variable expansion operator.
 */
 static int parser_test_argument( const wchar_t *arg, string_buffer_t *out, const wchar_t *prefix, int offset )
@@ -2843,70 +2858,18 @@ static int parser_test_argument( const wchar_t *arg, string_buffer_t *out, const
 				case VARIABLE_EXPAND:
 				case VARIABLE_EXPAND_SINGLE:
 				{
-					switch( *(pos+1))
+					wchar_t n = *(pos+1);
+						
+					if( n != VARIABLE_EXPAND &&
+						n != VARIABLE_EXPAND_SINGLE &&
+						!wcsvarchr(n) )
 					{
-						case BRACKET_BEGIN:
+						err=1;
+						if( out )
 						{
-							err=1;
-							if( out )
-							{
-								error( SYNTAX_ERROR,
-									   offset,
-									   COMPLETE_VAR_BRACKET_DESC );
-
-								print_errors( out, prefix);
-							}
-							break;
+							expand_variable_error( unesc, pos-unesc, offset );
+							print_errors( out, prefix);
 						}
-
-						case INTERNAL_SEPARATOR:
-						{
-							err=1;
-							if( out )
-							{
-								error( SYNTAX_ERROR,
-									   offset,
-									   COMPLETE_VAR_PARAN_DESC );
-								print_errors( out, prefix);
-							}
-							break;
-						}
-
-						case 0:
-						{
-							err=1;
-							if( out )
-							{
-								error( SYNTAX_ERROR,
-									   offset,
-									   COMPLETE_VAR_NULL_DESC );
-								print_errors( out, prefix);
-							}
-							break;
-						}
-
-						default:
-						{
-							wchar_t n = *(pos+1);
-						
-							if( n != VARIABLE_EXPAND &&
-								n != VARIABLE_EXPAND_SINGLE &&
-								!wcsvarchr(n) )
-							{
-								err=1;
-								if( out )
-								{
-									error( SYNTAX_ERROR,
-										   offset,
-										   COMPLETE_VAR_DESC,
-										   *(pos+1) );
-									print_errors( out, prefix);
-								}
-							}
-						
-							break;
-						}
-					
 					}
 				
 					break;
@@ -3012,17 +2975,39 @@ int parser_test( const  wchar_t * buff,
 	int previous_pos=current_tokenizer_pos;
 	static int block_pos[BLOCK_MAX_COUNT];
 	static int block_type[BLOCK_MAX_COUNT];
+
+	/*
+	  Set to 1 if the current command is inside a pipeline
+	*/
 	int is_pipeline = 0;
+
 	/*
 	  Set to one if the currently specified process can not be used inside a pipeline
 	*/
 	int forbid_pipeline = 0;
+
 	/* 
 	   Set to one if an additional process specification is needed 
 	*/
 	int needs_cmd=0; 
+
+	/*
+	  halloc context used for calls to expand() and other memory
+	  allocations. Free'd at end of this function.
+	*/
 	void *context;
+
+	/*
+	  Counter on the number of arguments this function has encountered
+	  so far. Is set to -1 when the count is unknown, i.e. after
+	  encountering an argument that contains substitutions that can
+	  expand to more/less arguemtns then 1.
+	*/
 	int arg_count=0;
+	
+	/*
+	  The currently validated command.
+	*/
 	wchar_t *cmd=0;
 		
 	CHECK( buff, 1 );
@@ -3046,7 +3031,7 @@ int parser_test( const  wchar_t * buff,
 					int mark = tok_get_pos( &tok );
 					had_cmd = 1;
 					arg_count=0;
-							
+					
 					if( !(cmd = expand_one( context, 
 											wcsdup( tok_last( &tok ) ), 
 											EXPAND_SKIP_SUBSHELL | EXPAND_SKIP_VARIABLES ) ) )
@@ -3191,11 +3176,16 @@ int parser_test( const  wchar_t * buff,
 
 							if( out )
 							{
+								char *h;
+
 								error( SYNTAX_ERROR,
 									   tok_get_pos( &tok ),
 									   INVALID_CASE_ERR_MSG );
 
 								print_errors( out, prefix);
+								h = builtin_help_get( L"case" );
+								if( h )
+									sb_printf( out, L"%s", h );
 							}
 						}
 					}

proc.c

@@ -55,7 +55,7 @@ Some of the code in this file is based on code from the Glibc manual.
 #include "parser.h"
 #include "signal.h"
 #include "event.h"
-#include "translate.h"
+
 #include "halloc.h"
 #include "halloc_util.h"
 #include "output.h"

reader.c

@@ -82,7 +82,7 @@ commence.
 #include "function.h"
 #include "output.h"
 #include "signal.h"
-#include "translate.h"
+
 #include "parse_util.h"
 
 /**

sanity.c

@@ -25,7 +25,7 @@
 #include "reader.h"
 #include "kill.h"
 #include "wutil.h"
-#include "translate.h"
+
 
 /**
    Status from earlier sanity checks

share/fish.in

@@ -3,12 +3,14 @@
 # common helper functions for the command completions. All actual
 # completions are located in the completions subdirectory.
 #
+# @configure_input@
 
-#
-# Assign a temporary value here for performance reasons. The real value should be set in /etc/fish.
-#
+# Assign a temporary value here for performance reasons. The real
+# value should be set in /etc/fish.
+
+set -g fish_function_path @datadir@/fish/functions/
+set __fish_help_dir @docdir@
 
-set -g fish_function_path $PWD/functions/
 
 #
 # Make sure there are no invalid entries in the PATH
@@ -33,7 +35,7 @@ end
 # want this even for text-only terminals.
 #
 
-set -l path_list /bin /usr/bin /usr/X11R6/bin @PREFIX@/bin @optbindirs@
+set -l path_list /bin /usr/bin /usr/X11R6/bin @prefix@/bin @optbindirs@
 
 # Root should also have the sbin directories in the path
 if test "$USER" = root

share/functions/__fish_complete_ls.fish

@@ -7,7 +7,7 @@
 function __fish_complete_ls -d "Compleletions for ls and it's aliases"
 	
 	set -l is_gnu 
-	ls --version >/dev/null ^/dev/null; and set is_gnu --is-gnu
+	command ls --version >/dev/null ^/dev/null; and set is_gnu --is-gnu
 	
 	set -l cmds -c $argv
 	

signal.c

@@ -24,7 +24,7 @@ The library for various signal related issues
 #include "event.h"
 #include "reader.h"
 #include "proc.h"
-#include "translate.h"
+
 
 /**
    Struct describing an entry for the lookup table used to convert

tests/test3.in

@@ -127,15 +127,3 @@ else
 end
 
 
-# Test universal variable erasing
-
-set -e foo
-../fish -c "set -U foo bar"
-
-if set -q foo
-	echo Test 11 pass
-else
-	echo Test 11 fail
-end
-
-set -eU foo

tests/test3.out

@@ -8,4 +8,3 @@ Test 7 pass
 Test 8 pass
 Test 9 pass
 Test 10 pass
-Test 11 pass

tokenizer.c

@@ -23,7 +23,7 @@
 #include "tokenizer.h"
 #include "common.h"
 #include "wildcard.h"
-#include "translate.h"
+
 
 /**
    Error string for unexpected end of string

translate.c

@@ -1,144 +0,0 @@
-/** \file translate.c
-
-Translation library, internally uses catgets
-
-*/
-
-#include "config.h"
-
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <wchar.h>
-
-#if HAVE_LIBINTL_H
-#include <libintl.h>
-#endif
-
-#include "common.h"
-#include "fallback.h"
-#include "util.h"
-
-#include "halloc_util.h"
-
-#if HAVE_GETTEXT
-
-/**
-   Number of string_buffer_t in the ring of buffers
-*/
-#define BUFF_COUNT 64
-
-/**
-   The ring of string_buffer_t
-*/
-static string_buffer_t buff[BUFF_COUNT];
-/**
-   Current position in the ring
-*/
-static int curr_buff=0;
-
-/**
-   Buffer used by translate_wcs2str
-*/
-static char *wcs2str_buff=0;
-/**
-   Size of buffer used by translate_wcs2str
-*/
-static size_t wcs2str_buff_count=0;
-
-/**
-   Flag to tell whether the translation library has been initialized
-*/
-static int is_init = 0;
-
-/**
-   Internal shutdown function. Automatically called on shutdown if the library has been initialized.
-*/
-static void internal_destroy()
-{
-	int i;
-
-	if( !is_init )
-		return;
-	
-	is_init = 0;
-	
-	for(i=0; i<BUFF_COUNT; i++ )
-		sb_destroy( &buff[i] );
-
-	free( wcs2str_buff );
-}
-
-/**
-   Internal init function. Automatically called when a translation is first requested.
-*/
-static void internal_init()
-{
-	int i;
-
-	is_init = 1;
-	
-	for(i=0; i<BUFF_COUNT; i++ )
-	{
-		sb_init( &buff[i] );
-	}
-	halloc_register_function_void( global_context, &internal_destroy );
-	
-	bindtextdomain( PACKAGE_NAME, LOCALEDIR );
-	textdomain( PACKAGE_NAME );
-}
-
-
-/**
-   Wide to narrow character conversion. Internal implementation that
-   avoids exessive calls to malloc
-*/
-static char *translate_wcs2str( const wchar_t *in )
-{
-	size_t len = MAX_UTF8_BYTES*wcslen(in)+1;
-	if( len > wcs2str_buff_count )
-	{
-		wcs2str_buff = realloc( wcs2str_buff, len );
-		if( wcs2str_buff == 0 )
-		{
-			DIE_MEM();
-		}
-	}
-	
-	wcstombs( wcs2str_buff, 
-			  in,
-			  MAX_UTF8_BYTES*wcslen(in)+1 );
-	
-	return wcs2str_buff;
-}
-
-const wchar_t *wgettext( const wchar_t *in )
-{
-	if( !in )
-		return in;
-
-	if( !is_init )
-		internal_init();
-		
-	char *mbs_in = translate_wcs2str( in );	
-	char *out = gettext( mbs_in );
-	wchar_t *wres=0;
-
-	sb_clear( &buff[curr_buff] );
-	
-	sb_printf( &buff[curr_buff], L"%s", out );
-	wres = (wchar_t *)buff[curr_buff].buff;
-	curr_buff = (curr_buff+1)%BUFF_COUNT;
-
-	return wres;
-}
-
-#else
-
-const wchar_t *wgettext( const wchar_t *in )
-{
-	return in;
-}
-
-#endif

translate.h

@@ -1,21 +0,0 @@
-/** \file translate.h
-
-Translation library, internally uses catgets
-
-*/
-
-/**
-   Shorthand for wgettext call
-*/
-#define _(wstr) wgettext(wstr)
-
-/**
-   Noop, used to tell xgettext that a string should be translated, even though it is not directly sent to wgettext.
-*/
-#define N_(wstr) wstr
-
-/**
-   Wide character wwrapper around the gettext function
-*/
-const wchar_t *wgettext( const wchar_t *in );
-

util.c

@@ -480,9 +480,9 @@ int hash_str_cmp( void *a, void *b )
 /**
    Helper function for hash_wcs_func
 */
-static uint rotl5( uint in )
+static unsigned long rotl5( unsigned long in )
 {
-	return (in<<5|in>>27);
+	return ((in<<5|in>>27))&0xffffffff;
 }
 
 

wgetopt.c

@@ -180,7 +180,7 @@ static char *posixly_correct;
    Use translation functions if available
 */
 #ifdef HAVE_TRANSLATE_H
-#include "translate.h"
+
 #define _(wstr) wgettext(wstr)
 #else
 #define _(wstr) wstr

wildcard.c

@@ -29,7 +29,7 @@ wildcards using **.
 #include "complete.h"
 #include "reader.h"
 #include "expand.h"
-#include "translate.h"
+
 
 /**
    This flag is set in the flags parameter of wildcard_expand if the

wutil.c

@@ -20,6 +20,9 @@
 #include <limits.h>
 #include <libgen.h>
 
+#if HAVE_LIBINTL_H
+#include <libintl.h>
+#endif
 
 #include "fallback.h"
 #include "util.h"
@@ -76,6 +79,38 @@ static int wutil_calls = 0;
 */
 static struct wdirent my_wdirent;
 
+
+/**
+   For wgettext: Number of string_buffer_t in the ring of buffers
+*/
+#define BUFF_COUNT 64
+
+/**
+   For wgettext: The ring of string_buffer_t
+*/
+static string_buffer_t buff[BUFF_COUNT];
+/**
+   For wgettext: Current position in the ring
+*/
+static int curr_buff=0;
+
+/**
+   For wgettext: Buffer used by translate_wcs2str
+*/
+static char *wcs2str_buff=0;
+/**
+   For wgettext: Size of buffer used by translate_wcs2str
+*/
+static size_t wcs2str_buff_count=0;
+
+/**
+   For wgettext: Flag to tell whether the translation library has been initialized
+*/
+static int wgettext_is_init = 0;
+
+
+
+
 void wutil_init()
 {
 }
@@ -343,9 +378,9 @@ wchar_t *wrealpath(const wchar_t *pathname, wchar_t *resolved_path)
 
 wchar_t *wrealpath(const wchar_t *pathname, wchar_t *resolved_path)
 {
-	char *tmp =wutil_wcs2str(pathname);
-	char narrow[PATH_MAX];
-	char *narrow_res = realpath( tmp, narrow );
+	char *tmp = wutil_wcs2str(pathname);
+	char narrow_buff[PATH_MAX];
+	char *narrow_res = realpath( tmp, narrow_buff );
 	wchar_t *res;	
 
 	if( !narrow_res )
@@ -404,3 +439,82 @@ wchar_t *wbasename( const wchar_t *path )
 
 
 
+/**
+   For wgettext: Internal shutdown function. Automatically called on shutdown if the library has been initialized.
+*/
+static void wgettext_destroy()
+{
+	int i;
+
+	if( !wgettext_is_init )
+		return;
+	
+	wgettext_is_init = 0;
+	
+	for(i=0; i<BUFF_COUNT; i++ )
+		sb_destroy( &buff[i] );
+
+	free( wcs2str_buff );
+}
+
+/**
+   For wgettext: Internal init function. Automatically called when a translation is first requested.
+*/
+static void wgettext_init()
+{
+	int i;
+	
+	wgettext_is_init = 1;
+	
+	for( i=0; i<BUFF_COUNT; i++ )
+	{
+		sb_init( &buff[i] );
+	}
+	
+	halloc_register_function_void( global_context, &wgettext_destroy );
+	
+	bindtextdomain( PACKAGE_NAME, LOCALEDIR );
+	textdomain( PACKAGE_NAME );
+}
+
+
+/**
+   For wgettext: Wide to narrow character conversion. Internal implementation that
+   avoids exessive calls to malloc
+*/
+static char *wgettext_wcs2str( const wchar_t *in )
+{
+	size_t len = MAX_UTF8_BYTES*wcslen(in)+1;
+	if( len > wcs2str_buff_count )
+	{
+		wcs2str_buff = realloc( wcs2str_buff, len );
+		if( !wcs2str_buff )
+		{
+			DIE_MEM();
+		}
+	}
+	
+	return wcs2str_internal( in, wcs2str_buff);
+}
+
+const wchar_t *wgettext( const wchar_t *in )
+{
+	if( !in )
+		return in;
+	
+	if( !wgettext_is_init )
+		wgettext_init();
+	
+	char *mbs_in = wgettext_wcs2str( in );	
+	char *out = gettext( mbs_in );
+	wchar_t *wres=0;
+	
+	sb_clear( &buff[curr_buff] );
+	
+	sb_printf( &buff[curr_buff], L"%s", out );
+	wres = (wchar_t *)buff[curr_buff].buff;
+	curr_buff = (curr_buff+1)%BUFF_COUNT;
+	
+	return wres;
+}
+

wutil.h

@@ -118,5 +118,14 @@ wchar_t *wdirname( const wchar_t *path );
 */
 wchar_t *wbasename( const wchar_t *path );
 
+/**
+   Wide character wrapper around the gettext function. For historic
+   reasons, unlike the real gettext function, wgettext takes care of
+   setting the correct domain, etc. using the textdomain and
+   bindtextdomain functions. This should probably be moved out of
+   wgettext, so that wgettext will be nothing more than a wrapper
+   around gettext, like all other functions in this file.
+*/
+const wchar_t *wgettext( const wchar_t *in );
 
 #endif