Index: src/bin/psql/common.c
===================================================================
RCS file: /cvsroot/pgsql/src/bin/psql/common.c,v
retrieving revision 1.108
diff -c -c -r1.108 common.c
*** src/bin/psql/common.c	15 Oct 2005 02:49:40 -0000	1.108
--- src/bin/psql/common.c	27 Oct 2005 05:03:11 -0000
***************
*** 795,802 ****
  {
  	printQueryOpt my_popt = pset.popt;
  
- 	my_popt.topt.normal_query = true;
- 
  	/* write output to \g argument, if any */
  	if (pset.gfname)
  	{
--- 795,800 ----
Index: src/bin/psql/describe.c
===================================================================
RCS file: /cvsroot/pgsql/src/bin/psql/describe.c,v
retrieving revision 1.128
diff -c -c -r1.128 describe.c
*** src/bin/psql/describe.c	20 Oct 2005 05:15:09 -0000	1.128
--- src/bin/psql/describe.c	27 Oct 2005 05:03:12 -0000
***************
*** 703,708 ****
--- 703,711 ----
  
  	retval = false;
  
+ 	/* This output looks confusing in expanded mode. */
+ 	myopt.disableExpanded = true;
+ 
  	initPQExpBuffer(&buf);
  	initPQExpBuffer(&title);
  	initPQExpBuffer(&tmpbuf);
Index: src/bin/psql/print.c
===================================================================
RCS file: /cvsroot/pgsql/src/bin/psql/print.c,v
retrieving revision 1.78
diff -c -c -r1.78 print.c
*** src/bin/psql/print.c	15 Oct 2005 02:49:40 -0000	1.78
--- src/bin/psql/print.c	27 Oct 2005 05:03:12 -0000
***************
*** 1491,1497 ****
  	 * normal (user-submitted) query, not a table we're printing for a slash
  	 * command.
  	 */
! 	if (opt->expanded && opt->normal_query)
  		use_expanded = true;
  	else
  		use_expanded = false;
--- 1491,1497 ----
  	 * normal (user-submitted) query, not a table we're printing for a slash
  	 * command.
  	 */
! 	if (opt->expanded && !opt->disableExpanded)
  		use_expanded = true;
  	else
  		use_expanded = false;
Index: src/bin/psql/print.h
===================================================================
RCS file: /cvsroot/pgsql/src/bin/psql/print.h,v
retrieving revision 1.29
diff -c -c -r1.29 print.h
*** src/bin/psql/print.h	15 Oct 2005 02:49:40 -0000	1.29
--- src/bin/psql/print.h	27 Oct 2005 05:03:12 -0000
***************
*** 43,50 ****
  								 * decimal marker */
  	char	   *tableAttr;		/* attributes for HTML <table ...> */
  	int			encoding;		/* character encoding */
! 	bool		normal_query;	/* are we presenting the results of a "normal"
! 								 * query, or a slash command? */
  } printTableOpt;
  
  
--- 43,49 ----
  								 * decimal marker */
  	char	   *tableAttr;		/* attributes for HTML <table ...> */
  	int			encoding;		/* character encoding */
! 	bool		disableExpanded;/* Should we honor \x?  Not for \d. */
  } printTableOpt;
  
  
Index: src/bin/psql/startup.c
===================================================================
RCS file: /cvsroot/pgsql/src/bin/psql/startup.c,v
retrieving revision 1.125
diff -c -c -r1.125 startup.c
*** src/bin/psql/startup.c	15 Oct 2005 02:49:40 -0000	1.125
--- src/bin/psql/startup.c	27 Oct 2005 05:03:12 -0000
***************
*** 147,153 ****
  	pset.queryFout = stdout;
  	pset.popt.topt.border = 1;
  	pset.popt.topt.pager = 1;
! 	pset.popt.topt.normal_query = false;
  	pset.popt.default_footer = true;
  
  	SetVariable(pset.vars, "VERSION", PG_VERSION_STR);
--- 147,153 ----
  	pset.queryFout = stdout;
  	pset.popt.topt.border = 1;
  	pset.popt.topt.pager = 1;
! 	pset.popt.topt.disableExpanded = false;
  	pset.popt.default_footer = true;
  
  	SetVariable(pset.vars, "VERSION", PG_VERSION_STR);