Bump version number

darcs-hash:20060422101024-ac50b-8cfc71d94572187d8d3a6ce890beee0a0225a09a.gz

Makefile.in

@@ -344,7 +344,6 @@ builtin_help.c: $(BUILTIN_DOC_HDR) doc_src/count.doxygen gen_hdr2 gen_hdr.sh bui
 	./gen_hdr.sh $*.doxygen >>$@
 	echo ");" >>$@
 	echo "}" >>$@
-#man -- doc_src/builtin_doc/man/man1/`basename $@ .c`.1 | cat -s | ./gen_hdr2 >>$@
 
 #
 # The build rules for installing/uninstalling fish
@@ -413,7 +412,7 @@ install-force: all install-translations
 	@echo \* use the command \'chsh -s $(DESTDIR)$(bindir)/fish\'.
 	@echo
 	@echo Have fun!
-.PHONY: force-install
+.PHONY: install-force
 
 
 # Uninstall this fish version
@@ -455,6 +454,7 @@ uninstall-legacy: uninstall
 	rmdir $(DESTDIR)$(sysconfdir)/fish.d/completions; true
 	rmdir $(DESTDIR)$(sysconfdir)/fish.d; true
 	@echo The previous fish installation has been removed. 
+.PHONY: uninstall-legacy
 
 install-translations: $(TRANSLATIONS)
 	if test $(HAVE_GETTEXT) = 1; then \
@@ -579,7 +579,7 @@ distclean: clean
 .PHONY: distclean
 
 clean:
-	rm -f *.o doc.h doc_src/*.doxygen doc_src/*.c builtin_help.c 
+	rm -f *.o doc.h doc_src/*.doxygen doc_src/*.c builtin_help.c doc_src/*.o
 	rm -f tests/tmp.err tests/tmp.out tests/tmp.status tests/foo.txt
 	rm -f tokenizer_test fish key_reader set_color gen_hdr2 mimedb
 	rm -f fishd fish_pager count fish_tests 
@@ -620,7 +620,6 @@ complete.o: signal.h config.h fallback.h common.h util.h tokenizer.h
 complete.o: wildcard.h proc.h io.h parser.h event.h function.h complete.h
 complete.o: builtin.h env.h exec.h expand.h reader.h history.h intern.h
 complete.o: translate.h parse_util.h halloc_util.h wutil.h
-dragon.o: signal.h
 env.o: config.h signal.h fallback.h common.h util.h wutil.h proc.h io.h env.h
 env.o: sanity.h expand.h history.h reader.h parser.h event.h env_universal.h
 env.o: env_universal_common.h input_common.h translate.h complete.h
@@ -637,7 +636,7 @@ exec.o: halloc.h halloc_util.h parse_util.h
 expand.o: signal.h config.h fallback.h common.h util.h wutil.h env.h proc.h
 expand.o: io.h parser.h event.h expand.h wildcard.h exec.h tokenizer.h
 expand.o: complete.h translate.h parse_util.h halloc_util.h
-fallback.o: config.h common.h util.h
+fallback.o: config.h fallback.h common.h util.h
 fishd.o: config.h signal.h fallback.h common.h util.h wutil.h
 fishd.o: env_universal_common.h
 fish_pager.o: config.h signal.h fallback.h common.h util.h wutil.h complete.h
@@ -670,6 +669,7 @@ kill.o: io.h sanity.h env.h exec.h parser.h event.h
 main.o: config.h signal.h fallback.h common.h util.h reader.h builtin.h
 main.o: function.h complete.h wutil.h env.h sanity.h proc.h io.h parser.h
 main.o: event.h expand.h intern.h exec.h output.h translate.h halloc_util.h
+main.o: history.h
 mimedb.o: config.h xdgmime.h fallback.h common.h util.h
 output.o: config.h signal.h fallback.h common.h util.h wutil.h expand.h
 output.o: output.h halloc_util.h highlight.h

builtin.c

@@ -1029,7 +1029,7 @@ static int builtin_function( wchar_t **argv )
 			{
 				event_t *e;
 
-				if( !wcsvarname( woptarg ) )
+				if( wcsvarname( woptarg ) )
 				{
 					sb_printf( sb_err,
 							   _( L"%ls: Invalid variable name '%ls'\n" ),
@@ -1145,7 +1145,7 @@ static int builtin_function( wchar_t **argv )
 					   argc-woptind );
 			res=1;
 		}
-		else if( !(is_binding?wcsbindingname( argv[woptind] ) : wcsvarname( argv[woptind] ) ))
+		else if( !(is_binding?wcsbindingname( argv[woptind] ) : !wcsvarname( argv[woptind] ) ))
 		{
 			sb_printf( sb_err,
 					   _( L"%ls: Illegal function name '%ls'\n" ),
@@ -2584,7 +2584,7 @@ static int builtin_for( wchar_t **argv )
 				   argv[0] );
 		builtin_print_help( argv[0], sb_err );
 	}
-	else if ( !wcsvarname(argv[1]) )
+	else if ( wcsvarname(argv[1]) )
 	{
 		sb_printf( sb_err,
 				   _( L"%ls: '%ls' is not a valid variable name\n" ),

builtin_set.c

@@ -26,12 +26,16 @@ Functions used for implementing the set builtin.
 #include "parser.h"
 #include "translate.h"
 
+#define BUILTIN_SET_PATH_ERROR L"%ls: Could not add component %ls to %ls.\n"
+#define BUILTIN_SET_PATH_HINT L"%ls: Did you mean 'set %ls $%ls %ls'?\n"
+
 /**
    Call env_set. On error, print a description of the problem to
    stderr.
 */
 static void my_env_set( const wchar_t *key, const wchar_t *val, int scope )
 {
+
 	switch( env_set( key, val, scope | ENV_USER ) )
 	{
 		case ENV_PERM:
@@ -265,6 +269,15 @@ static void print_variables(int include_values, int esc, int scope)
   	al_destroy(&names);
 }
 
+static int is_path_variable( const wchar_t *env )
+{
+	return contains_str( env,
+						 L"PATH",
+						 L"CDPATH",
+						 (void *)0 );
+}
+
+
 /**
    The set builtin. Creates, updates and erases environment variables and environemnt variable arrays. 
 */
@@ -478,6 +491,80 @@ int builtin_set( wchar_t **argv )
 		al_push(&values, argv[woptind++]);
 	}
 
+	if( is_path_variable( dest ) )
+	{
+		int i;
+		int error = 0;
+		
+		for( i=0; i<al_get_count( &values ); i++ )
+		{
+			int show_perror = 0;
+			int show_hint = 0;
+			
+			struct stat buff;
+			wchar_t *dir = (wchar_t *)al_get( &values, i );
+			
+			if( wstat( dir, &buff ) )
+			{
+				error = 1;
+				show_perror = 1;
+			}
+
+			if( !( S_IFDIR & buff.st_mode ) )
+			{
+				error = 1;
+				
+			}
+			
+			if( error )
+			{
+				wchar_t *colon;
+				
+				sb_printf( sb_err, 
+						   _(BUILTIN_SET_PATH_ERROR),
+						   argv[0], 
+						   dir, 
+						   dest );
+				colon = wcschr( dir, L':' );
+				
+				if( colon && *(colon+1) ) 
+				{
+					show_hint = 1;
+				}
+
+			}
+			
+			if( show_perror )
+			{
+				builtin_wperror( argv[0] );
+			}
+			
+			if( show_hint )
+			{
+				sb_printf( sb_err, 
+						   _(BUILTIN_SET_PATH_HINT),
+						   argv[0],
+						   dest,
+						   dest,
+						   wcschr( dir, L':' )+1);
+			}
+			
+			if( error )
+			{
+				break;
+			}
+			
+		}
+
+		if( error )
+		{
+			al_destroy(&values);
+			return 1;
+		}
+		
+	}
+
+
 	/* Extract variable name and indexes */
 
 	sb_init(&name_sb);
@@ -507,7 +594,7 @@ int builtin_set( wchar_t **argv )
 		int scope = (local ? ENV_LOCAL : 0) | (global ? ENV_GLOBAL : 0) | (export ? ENV_EXPORT : 0) | (unexport ? ENV_UNEXPORT : 0) | (universal ? ENV_UNIVERSAL:0) | ENV_USER; 
 		if( list ) 
 		{
-			/* Maybe we should issue an error if there are any other arguments */
+			/* Maybe we should issue an error if there are any other arguments? */
 			print_variables(0, 0, scope);
 			finished=1;			
 		} 
@@ -602,6 +689,7 @@ int builtin_set( wchar_t **argv )
 					else 
 					{
 						fill_buffer_from_list(&result_sb, &val_l);
+
 						my_env_set(name, (wchar_t *) result_sb.buff, scope);
 					}     
 				}

common.c

@@ -400,17 +400,17 @@ wchar_t **strv2wcsv( const char **in )
 
 }
 
-int wcsvarname( wchar_t *str )
+wchar_t *wcsvarname( wchar_t *str )
 {
 	while( *str )
 	{
 		if( (!iswalnum(*str)) && (*str != L'_' ) )
 		{
-			return 0;
+			return str;
 		}
 		str++;
 	}
-	return 1;
+	return 0;
 }
 
 

common.h

@@ -138,7 +138,14 @@ wchar_t *wcsdupcat2( const wchar_t *a, ... );
    Test if the given string is a valid variable name
 */
 
-int wcsvarname( wchar_t *str );
+
+/**
+   Test if the given string is a valid variable name. 
+
+   \return null if this is a valid name, and a pointer to the first invalid character otherwise
+*/
+
+wchar_t *wcsvarname( wchar_t *str );
 
 
 /**

configure.ac

@@ -1,5 +1,5 @@
 # Process this file with autoconf to produce a configure script.
-AC_INIT(fish,1.21.5,fish-users@lists.sf.net)
+AC_INIT(fish,1.21.6,fish-users@lists.sf.net)
 
 # If needed, run autoconf to regenerate the configure file
 AC_MSG_CHECKING([if autoconf needs to be run])
@@ -12,7 +12,7 @@ if test configure -ot configure.ac; then
 		if autoconf; then
 			./configure "$@"
 		fi
-		exit			
+		exit	
 	else
 		AC_MSG_ERROR( [cannot find the autoconf program in your path.
 This program needs to be run whenever the configure.ac file is modified.

doc_src/case.txt

@@ -11,6 +11,22 @@ wildcarded values. The \c case statement is used together with the \c
 switch statement in order to determine which block should be
 performed.
 
+Each \c case command is given one or more parameter. The first \c case
+command with a parameter that matches the string specified in the
+switch command will be evaluated. \c case parameters may contain
+wildcards. These need to be escaped or quoted in order to avoid
+regular wildcard expansion using filenames.
+
+Note that fish does not fall through on case statements. Though the
+syntax may look a bit like C switch statements, it behaves more like
+the case stamantes of traditional shells.
+
+Also note that command substitutions in a case statement will be
+evaluated even if it's body is not taken. This may seem
+counterintuitive at first, but it is unavoidable, since it would be
+impossible to know if a case command will evaluate to true before all
+forms of parameter expansion have been performed for the case command.
+
 \subsection case-example Example
 
 If the variable \$animal contains the name of an animal, the following
@@ -27,9 +43,11 @@ switch $animal
         echo bird
     case shark trout stingray
         echo fish
+    case '*'
+        echo I have no idea what a $animal is
 end
 </pre>
 </p>
 <p>
-If the above code was run with \$animal set to \c whale, the output would be \c mammal.
+If the above code was run with \c \$animal set to \c whale, the output would be \c mammal.
 </p>

doc_src/doc.hdr

@@ -1284,7 +1284,7 @@ Examples:
 
 - Here documents are too similar to using echo inside of a pipeline.
 - Subshells, command substitution and process substitution are strongly related. \c fish only supports command substitution, the others can be achived either using a block or the psub shellscript function. 
-- Having both aliases and functions is confusing, especially since both of them have limitations and problems. \c fish sunctions have none of the drawbacks of either syntax.
+- Having both aliases and functions is confusing, especially since both of them have limitations and problems. \c fish functions have none of the drawbacks of either syntax.
 - The many Posix quoting styles are silly, especially \$''.
 
 
@@ -1377,14 +1377,14 @@ Examples:
 
 \subsection disc The law of discoverability
 
-The shell should implement it's features in a way that makes them as
-easy as possible for the user to discover for her/himself.
+A program should be designed to make its features as
+easy as possible to discover for the user.
 
 Rationale:
 
-A program whose features are discoverable makes a new user into an
-expert in a shorter span of time, since the user will learn how to use
-the program simply by using it. 
+A program whose features are discoverable turns a new user into an
+expert in a shorter span of time, since the user will become an expert
+on the program simply by using it.
 
 The main benefit of a graphical program over a command line-based
 program is discoverability. In a graphical program, one can discover

doc_src/read.txt

@@ -8,10 +8,13 @@
 The <tt>read</tt> builtin causes fish to read one line from standard
 input and store the result in one or more environment variables. 
 
+- <tt>-c CMD</tt> or <tt>--command=CMD</tt> specifies that the initial string in the interactive mode command buffer should be CMD.
 - <tt>-e</tt> or <tt>--export</tt> specifies that the variables will be exported to subshells.
 - <tt>-g</tt> or <tt>--global</tt> specifies that the variables will be made global.
-- <tt>-pPROMPT_CMD</tt> or <tt>--prompt=PROMPT_CMD</tt> specifies that the output of the shell command PROMPT_CMD should be used as the prompt for the interactive mode prompt. The default prompt command is <tt>set_color green; echo read; set_color normal; echo "> "</tt>.
-- <tt>-cCMD</tt> or <tt>--command=CMD</tt> specifies that the initial string in the interactive mode command buffer should be CMD.
+- <tt>-p PROMPT_CMD</tt> or <tt>--prompt=PROMPT_CMD</tt> specifies that the output of the shell command PROMPT_CMD should be used as the prompt for the interactive mode prompt. The default prompt command is <tt>set_color green; echo read; set_color normal; echo "> "</tt>.
+- <code>-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
 
 Read starts by reading a single line of input from stdin, the line is
 then tokenized using the <tt>IFS</tt> environment variable. Each variable

doc_src/switch.txt

@@ -8,7 +8,19 @@
 
 The \c switch statement is used to perform one of several blocks of
 commands depending on whether a specified value equals one of several
-wildcarded values.
+wildcarded values. The \c case statement is used together with the \c
+switch statement in order to determine which block should be
+performed.
+
+Each \c case command is given one or more parameter. The first \c case
+command with a parameter that matches the string specified in the
+switch command will be evaluated. \c case parameters may contain
+wildcards. These need to be escaped or quoted in order to avoid
+regular wildcard expansion using filenames.
+
+Note that fish does not fall through on case statements. Though the
+syntax may look a bit like C switch statements, it behaves more like
+the case stamantes of traditional shells.
 
 \subsection switch-example Example
 
@@ -26,12 +38,14 @@ switch $animal
         echo bird
     case shark trout stingray
         echo fish
+    case '*'
+        echo I have no idea what a $animal is
 end
 </pre>
 </p>
 <p>
 
-If the above code was run with \$animal set to \c whale, the output
+If the above code was run with \c \$animal set to \c whale, the output
 would be \c mammal.
 
 </p>

history.c

@@ -202,6 +202,10 @@ static void history_to_hash()
 {
 	history_data *d;
 	
+	if( !history_last )
+		return;
+	
+
 	d = (history_data *)hash_get( &history_table, 
 								  mode_name );
 	

main.c

@@ -61,6 +61,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "output.h"
 #include "translate.h"
 #include "halloc_util.h"
+#include "history.h"
 
 
 /**

parser.c

@@ -101,12 +101,12 @@ The fish parser. Contains functions for parsing code.
 /**
    Error message when a non-string token is found when expecting a command name
 */
-#define CMD_OR_ERR_MSG _( L"Expected a command name, got token of type '%ls'. Did you mean 'COMMAND; or COMMAND'? For more information on the 'or' builtin command, see the help section for 'or' by typing 'help or'.")
+#define CMD_OR_ERR_MSG _( L"Expected a command name, got token of type '%ls'. Did you mean 'COMMAND; or COMMAND'? See the help section for the 'or' builtin command by typing 'help or'.")
 
 /**
    Error message when a non-string token is found when expecting a command name
 */
-#define CMD_AND_ERR_MSG _( L"Expected a command name, got token of type '%ls'. Did you mean 'COMMAND; and COMMAND'? For more information on the 'and' builtin command, see the help section for 'and' by typing 'help and'.")
+#define CMD_AND_ERR_MSG _( L"Expected a command name, got token of type '%ls'. Did you mean 'COMMAND; and COMMAND'? See the help section for the 'and' builtin command by typing 'help and'.")
 
 /**
    Error message when encountering an illegal command name
@@ -165,7 +165,7 @@ The fish parser. Contains functions for parsing code.
 
 
 /**
-	Error for wrong token type
+   Error for wrong token type
 */
 #define UNEXPECTED_TOKEN_ERR_MSG _( L"Unexpected token of type '%ls'")
 
@@ -176,78 +176,78 @@ The fish parser. Contains functions for parsing code.
 
 
 /**
-	While block description
+   While block description
 */
 #define WHILE_BLOCK _( L"'while' block" )
 
 
 /**
-	For block description
+   For block description
 */
 #define FOR_BLOCK _( L"'for' block" )
 
 
 /**
-	If block description
+   If block description
 */
 #define IF_BLOCK _( L"'if' conditional block" )
 
 
 /**
-	function definition block description
+   Function definition block description
 */
 #define FUNCTION_DEF_BLOCK _( L"function definition block" )
 
 
 /**
-	Function invocation block description
+   Function invocation block description
 */
 #define FUNCTION_CALL_BLOCK _( L"function invocation block" )
 
 
 /**
-	Switch block description
+   Switch block description
 */
 #define SWITCH_BLOCK _( L"'switch' block" )
 
 
 /**
-	Fake block description
+   Fake block description
 */
 #define FAKE_BLOCK _( L"unexecutable block" )
 
 
 /**
-	Top block description
+   Top block description
 */
 #define TOP_BLOCK _( L"global root block" )
 
 
 /**
-	Command substitution block description
+   Command substitution block description
 */
 #define SUBST_BLOCK _( L"command substitution block" )
 
 
 /**
-	Begin block description
+   Begin block description
 */
 #define BEGIN_BLOCK _( L"'begin' unconditional block" )
 
 
 /**
-	Source block description
+   Source block description
 */
 #define SOURCE_BLOCK _( L"Block created by the . builtin" )
 
 /**
-	Source block description
+   Source block description
 */
 #define EVENT_BLOCK _( L"event handler block" )
 
 
 /**
-	Unknown block description
+   Unknown block description
 */
 #define UNKNOWN_BLOCK _( L"unknown/invalid block" )
 
@@ -724,75 +724,85 @@ wchar_t *get_filename( const wchar_t *cmd )
 	else
 	{
 		path = env_get(L"PATH");
-		if( path != 0 )
+		if( path == 0 )
 		{
-			/*
-			  Allocate string long enough to hold the whole command
-			*/
-			wchar_t *new_cmd = malloc( sizeof(wchar_t)*(wcslen(cmd)+wcslen(path)+2) );
-			/*
-			   We tokenize a copy of the path, since strtok modifies
-			   its arguments
-			*/
-			wchar_t *path_cpy = wcsdup( path );
-			wchar_t *nxt_path = path;
-			wchar_t *state;
-			
-			if( (new_cmd==0) || (path_cpy==0) )
+			if( contains_str( PREFIX L"/bin", L"/bin", L"/usr/bin", (void *)0 ) )
 			{
-				die_mem();
+				path = L"/bin" ARRAY_SEP_STR L"/usr/bin";
 			}
-
-			for( nxt_path = wcstok( path_cpy, ARRAY_SEP_STR, &state );
-				 nxt_path != 0;
-				 nxt_path = wcstok( 0, ARRAY_SEP_STR, &state) )
+			else
 			{
-				int path_len = wcslen( nxt_path );
-				wcscpy( new_cmd, nxt_path );
-				if( new_cmd[path_len-1] != L'/' )
-				{
-					new_cmd[path_len++]=L'/';
-				}
-				wcscpy( &new_cmd[path_len], cmd );
-				if( waccess( new_cmd, X_OK )==0 )
-				{
-					struct stat buff;
-					if( wstat( new_cmd, &buff )==-1 )
-					{
-						if( errno != EACCES )
-						{
-							wperror( L"stat" );
-						}
-						continue;
-					}
-					if( S_ISREG(buff.st_mode) )
-					{
-						free( path_cpy );
-						return new_cmd;
-					}
-				}
-				else
-				{
-					switch( errno )
-					{
-						case ENOENT:
-						case ENAMETOOLONG:
-						case EACCES:
-						case ENOTDIR:
-							break;
-						default:
-						{
-							debug( 1,
-								   MISSING_COMMAND_ERR_MSG,
-								   new_cmd );
-							wperror( L"access" );
-						}
-					}
-				}
+				path = L"/bin" ARRAY_SEP_STR L"/usr/bin" ARRAY_SEP_STR PREFIX L"/bin";
 			}
-			free( path_cpy );
-			free( new_cmd );
 		}
+		
+		/*
+		  Allocate string long enough to hold the whole command
+		*/
+		wchar_t *new_cmd = malloc( sizeof(wchar_t)*(wcslen(cmd)+wcslen(path)+2) );
+		/*
+		  We tokenize a copy of the path, since strtok modifies
+		  its arguments
+		*/
+		wchar_t *path_cpy = wcsdup( path );
+		wchar_t *nxt_path = path;
+		wchar_t *state;
+			
+		if( (new_cmd==0) || (path_cpy==0) )
+		{
+			die_mem();
+		}
+
+		for( nxt_path = wcstok( path_cpy, ARRAY_SEP_STR, &state );
+			 nxt_path != 0;
+			 nxt_path = wcstok( 0, ARRAY_SEP_STR, &state) )
+		{
+			int path_len = wcslen( nxt_path );
+			wcscpy( new_cmd, nxt_path );
+			if( new_cmd[path_len-1] != L'/' )
+			{
+				new_cmd[path_len++]=L'/';
+			}
+			wcscpy( &new_cmd[path_len], cmd );
+			if( waccess( new_cmd, X_OK )==0 )
+			{
+				struct stat buff;
+				if( wstat( new_cmd, &buff )==-1 )
+				{
+					if( errno != EACCES )
+					{
+						wperror( L"stat" );
+					}
+					continue;
+				}
+				if( S_ISREG(buff.st_mode) )
+				{
+					free( path_cpy );
+					return new_cmd;
+				}
+			}
+			else
+			{
+				switch( errno )
+				{
+					case ENOENT:
+					case ENAMETOOLONG:
+					case EACCES:
+					case ENOTDIR:
+						break;
+					default:
+					{
+						debug( 1,
+							   MISSING_COMMAND_ERR_MSG,
+							   new_cmd );
+						wperror( L"access" );
+					}
+				}
+			}
+		}
+		free( path_cpy );
+		free( new_cmd );
+
 	}
 	return 0;
 }
@@ -1101,8 +1111,8 @@ int parser_get_lineno()
 	int lineno;
 	
 /*	static const wchar_t *prev_str = 0;
-	static int i=0;
-	static int lineno=1;
+  static int i=0;
+  static int lineno=1;
 */
 	if( !current_tokenizer )
 		return -1;
@@ -1241,8 +1251,8 @@ wchar_t *parser_current_line()
 
 //	debug( 1, L"Current pos %d, line pos %d, file_length %d, is_interactive %d, offset %d\n", current_tokenizer_pos,  current_line_pos, wcslen(whole_str), is_interactive, offset);
 	/*
-	   Skip printing character position if we are in interactive mode
-	   and the error was on the first character of the line.
+	  Skip printing character position if we are in interactive mode
+	  and the error was on the first character of the line.
 	*/
 	if( !is_interactive || is_function() || (current_line_width!=0) )
 	{
@@ -1716,8 +1726,8 @@ static int parse_job( process_t *p,
 				else
 				{
 					error( SYNTAX_ERROR,
-					   tok_get_pos( tok ),
-					   CMD_ERR_MSG,
+						   tok_get_pos( tok ),
+						   CMD_ERR_MSG,
 						   tok_get_desc( tok_last_type(tok) ) );
 				}
 
@@ -1926,8 +1936,8 @@ static int parse_job( process_t *p,
 		if( !p->type || (p->type == INTERNAL_EXEC) )
 		{
 			/*
-			   If we are not executing the current block, allow
-			   non-existent commands.
+			  If we are not executing the current block, allow
+			  non-existent commands.
 			*/
 			if( current_block->skip )
 			{
@@ -1971,7 +1981,8 @@ static int parse_job( process_t *p,
 					else
 					{
 						int tmp;
-
+						wchar_t *cmd = (wchar_t *)al_get( args, 0 );
+						
 						/* 
 						   We couln't find the specified command.
 
@@ -1986,19 +1997,42 @@ static int parse_job( process_t *p,
 						   cause the job to silently not execute. We
 						   also print an error message.
 						*/
-						if( wcschr( (wchar_t *)al_get( args, 0 ), L'=' ) )
+						if( wcschr( cmd, L'=' ) )
 						{
 							debug( 0,
 								   COMMAND_ASSIGN_ERR_MSG,
 								   (wchar_t *)al_get( args, 0 ) );
-							
-
 						}
-						else
+						else if(cmd[0]==L'$')
+						{
+							wchar_t *val = env_get( cmd+1 );
+							if( val )
+							{
+								debug( 0,
+									   _(L"Variables may not be used as commands. Instead, define a function like 'function %ls; %ls $argv; end'. See the help section for the function command by typing 'help function'." ),
+									   cmd+1,
+									   val,
+									   cmd );
+							}
+							else
+							{
+								debug( 0,
+									   _(L"Variables may not be used as commands. Instead, define a function. See the help section for the function command by typing 'help function'." ),
+									   cmd );
+							}			
+						}
+						else if(wcschr( cmd, L'$' ))
 						{
+							debug( 0,
+								   _(L"Commands may not contain variables. Use the eval builtin instead, like 'eval %ls'. See the help section for the eval command by typing 'help eval'." ),
+								   cmd,
+								   cmd );
+						}
+						else
+						{			
 							debug( 0,
 								   _(L"Unknown command '%ls'"),
-								   (wchar_t *)al_get( args, 0 ) );
+								   cmd );
 						}
 						
 						tmp = current_tokenizer_pos;
@@ -2482,7 +2516,7 @@ int eval( const wchar_t *cmd, io_data_t *io, int block_type )
 	}
 
 	/*
-	   Restore previous eval state
+	  Restore previous eval state
 	*/
 	forbidden_function = prev_forbidden;
 	current_tokenizer=previous_tokenizer;

share/fish.in

@@ -18,7 +18,7 @@ if test "$USER" = root
 end
 
 for i in $path_list
-	if not expr "$PATH" : .\*$i.\* >/dev/null
+	if not expr "$PATH" : "$i/*" >/dev/null
 		if test -d $i
 			set PATH $PATH $i
 		end
@@ -43,8 +43,8 @@ end
 # Convenience functions
 #
 # The naming heuristic is that __fish_complete_* prints completions
-# and descriptions, while __fish_print_* only prints the completion,
-# without the description
+# and descriptions, while __fish_print_* only prints the completions
+# and no descriptions
 #
 
 function __fish_complete_users -d "Print a list of local users, with the real user name as a description"

share/functions/contains.fish

@@ -1,9 +1,3 @@
-#
-# This file defines various shellscript functions. Most of them are
-# meant to be used directly by the user, but some of them, typically
-# the ones whose name start with '__fish_', are only meant to be used
-# internally by fish.
-#
 
 function contains -d (N_ "Test if a key is contained in a set of values")
 	while set -q argv