Index: src/tools/pgindent/pgindent
===================================================================
RCS file: /cvsroot/pgsql/src/tools/pgindent/pgindent,v
retrieving revision 1.75
diff -c -c -r1.75 pgindent
*** src/tools/pgindent/pgindent	28 Jun 2005 23:55:30 -0000	1.75
--- src/tools/pgindent/pgindent	13 Jul 2005 03:53:46 -0000
***************
*** 56,62 ****
  			    line1 !~ /^typedef/ &&
  			    line1 !~ /^extern[ 	][ 	]*"C"/ &&
  			    line1 !~ /=/ &&
! 			    line1 ~ /)/)
  				print "int	pgindent_func_no_var_fix;";
  			line1 = line2;
  		}
--- 56,62 ----
  			    line1 !~ /^typedef/ &&
  			    line1 !~ /^extern[ 	][ 	]*"C"/ &&
  			    line1 !~ /=/ &&
! 			    line1 ~ /\)/)
  				print "int	pgindent_func_no_var_fix;";
  			line1 = line2;
  		}
***************
*** 1688,1703 ****
  #  like real functions.
  	awk '	BEGIN	{paren_level = 0}  
  	{
! 		if ($0 ~ /^[a-zA-Z_][a-zA-Z_0-9]*[^(]*$/)
  		{
  			saved_len = 0;
  			saved_lines[++saved_len] = $0;
  			if ((getline saved_lines[++saved_len]) == 0)
  				print saved_lines[1];
  			else
! 			if (saved_lines[saved_len] !~ /^[a-zA-Z_][a-zA-Z_0-9]*(/ ||
! 			    saved_lines[saved_len] ~  /^[a-zA-Z_][a-zA-Z_0-9]*(.*)$/ ||
! 			    saved_lines[saved_len] ~  /^[a-zA-Z_][a-zA-Z_0-9]*(.*);$/)
  			{
  				print saved_lines[1];
  				print saved_lines[2];
--- 1688,1703 ----
  #  like real functions.
  	awk '	BEGIN	{paren_level = 0}  
  	{
! 		if ($0 ~ /^[a-zA-Z_][a-zA-Z_0-9]*[^\(]*$/)
  		{
  			saved_len = 0;
  			saved_lines[++saved_len] = $0;
  			if ((getline saved_lines[++saved_len]) == 0)
  				print saved_lines[1];
  			else
! 			if (saved_lines[saved_len] !~ /^[a-zA-Z_][a-zA-Z_0-9]*\(/ ||
! 			    saved_lines[saved_len] ~  /^[a-zA-Z_][a-zA-Z_0-9]*\(.*\)$/ ||
! 			    saved_lines[saved_len] ~  /^[a-zA-Z_][a-zA-Z_0-9]*\(.*\);$/)
  			{
  				print saved_lines[1];
  				print saved_lines[2];
***************
*** 1714,1720 ****
  				}
  				for (i=1; i <= saved_len; i++)
  				{
! 					if (i == 1 && saved_lines[saved_len] ~ /);$/)
  					{
  						printf "%s", saved_lines[i];
  						if (substr(saved_lines[i], length(saved_lines[i]),1) != "*")
--- 1714,1720 ----
  				}
  				for (i=1; i <= saved_len; i++)
  				{
! 					if (i == 1 && saved_lines[saved_len] ~ /\);$/)
  					{
  						printf "%s", saved_lines[i];
  						if (substr(saved_lines[i], length(saved_lines[i]),1) != "*")