Index: src/bin/psql/print.c
===================================================================
RCS file: /cvsroot/pgsql/src/bin/psql/print.c,v
retrieving revision 1.59
diff -c -c -r1.59 print.c
*** src/bin/psql/print.c	14 Jun 2005 02:57:41 -0000	1.59
--- src/bin/psql/print.c	14 Jun 2005 22:14:20 -0000
***************
*** 595,602 ****
  html_escaped_print(const char *in, FILE *fout)
  {
  	const char *p;
! 
  	for (p = in; *p; p++)
  		switch (*p)
  		{
  			case '&':
--- 595,604 ----
  html_escaped_print(const char *in, FILE *fout)
  {
  	const char *p;
! 	bool	leading_space = true;
! 	
  	for (p = in; *p; p++)
+ 	{
  		switch (*p)
  		{
  			case '&':
***************
*** 617,625 ****
--- 619,637 ----
  			case '\'':
  				fputs("'", fout);
  				break;
+ 			case ' ':
+ 				/* protect leading space, for EXPLAIN output */
+ 				if (leading_space)
+ 					fputs(" ", fout);
+ 				else
+ 					fputs(" ", fout);
+ 				break;
  			default:
  				fputc(*p, fout);
  		}
+ 		if (*p != ' ')
+ 			leading_space = false;
+ 	}
  }