===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/vim/Attic/cmdline.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -c -r1.2 -r1.3
*** src/usr.bin/vim/Attic/cmdline.c	1996/09/21 06:22:54	1.2
--- src/usr.bin/vim/Attic/cmdline.c	1996/09/21 23:23:28	1.3
***************
*** 1,4 ****
! /*	$OpenBSD: cmdline.c,v 1.2 1996/09/21 06:22:54 downsj Exp $	*/
  /* vi:set ts=4 sw=4:
   *
   * VIM - Vi IMproved		by Bram Moolenaar
--- 1,4 ----
! /*	$OpenBSD: cmdline.c,v 1.3 1996/09/21 23:23:28 downsj Exp $	*/
  /* vi:set ts=4 sw=4:
   *
   * VIM - Vi IMproved		by Bram Moolenaar
***************
*** 4727,4732 ****
--- 4727,4742 ----
  						lnum = fp->lnum;
  						break;
  
+ 			case '{':
+ 			case '}':
+ 						c = *cmd++;
+ 						pos = curwin->w_cursor;
+ 						curwin->w_cursor.col = -1;
+ 						if(findpar((c=='}')?FORWARD:BACKWARD, 1, NUL, FALSE))
+ 							lnum = curwin->w_cursor.lnum;
+ 						curwin->w_cursor = pos;
+ 						break;
+ 
  			case '/':
  			case '?':						/* '/' or '?' - search */
  						c = *cmd++;
***************
*** 4925,4931 ****
  	 * not be expanded between /'s and ?'s or after "'". -- webb
  	 */
  	while (*cmd != NUL && (vim_isspace(*cmd) || isdigit(*cmd) ||
! 							vim_strchr((char_u *)".$%'/?-+,;", *cmd) != NULL))
  	{
  		if (*cmd == '\'')
  		{
--- 4935,4941 ----
  	 * not be expanded between /'s and ?'s or after "'". -- webb
  	 */
  	while (*cmd != NUL && (vim_isspace(*cmd) || isdigit(*cmd) ||
! 							vim_strchr((char_u *)".$%'/?-+,;{}", *cmd) != NULL))
  	{
  		if (*cmd == '\'')
  		{
***************
*** 5125,5148 ****
  		/*
  		 * Allow spaces within back-quotes to count as part of the argument
  		 * being expanded.
  		 */
  		expand_pattern = skipwhite(arg);
  		for (p = expand_pattern; *p; ++p)
  		{
  			if (*p == '\\' && p[1])
  				++p;
  #ifdef SPACE_IN_FILENAME
! 			else if (vim_iswhite(*p) && (!(argt & NOSPC) || usefilter))
! #else
! 			else if (vim_iswhite(*p))
  #endif
  			{
! 				p = skipwhite(p);
  				if (in_quote)
! 					bow = p;
  				else
! 					expand_pattern = p;
! 				--p;
  			}
  			else if (*p == '`')
  			{
--- 5135,5161 ----
  		/*
  		 * Allow spaces within back-quotes to count as part of the argument
  		 * being expanded.
+ 		 * Never accept '<' or '>' inside a file name.
  		 */
  		expand_pattern = skipwhite(arg);
  		for (p = expand_pattern; *p; ++p)
  		{
  			if (*p == '\\' && p[1])
  				++p;
+ 			else if ((vim_iswhite(*p)
  #ifdef SPACE_IN_FILENAME
! 					&& (!(argt & NOSPC) || usefilter)
  #endif
+ 					 ) || *p == '<' || *p == '>')
  			{
! 				if (p[1] == '&')		/* skip ">&" */
! 					++p;
! 				if (p[1] == '!')		/* skip ">&!" */
! 					++p;
  				if (in_quote)
! 					bow = p + 1;
  				else
! 					expand_pattern = p + 1;
  			}
  			else if (*p == '`')
  			{