*** pgsql/src/bin/psql/print.c	2009/11/22 05:20:41	1.118
--- pgsql/src/bin/psql/print.c	2009/11/25 20:26:31	1.119
***************
*** 3,9 ****
   *
   * Copyright (c) 2000-2009, PostgreSQL Global Development Group
   *
!  * $PostgreSQL: pgsql/src/bin/psql/print.c,v 1.117 2009/10/13 21:04:01 tgl Exp $
   */
  #include "postgres_fe.h"
  
--- 3,9 ----
   *
   * Copyright (c) 2000-2009, PostgreSQL Global Development Group
   *
!  * $PostgreSQL: pgsql/src/bin/psql/print.c,v 1.118 2009/11/22 05:20:41 tgl Exp $
   */
  #include "postgres_fe.h"
  
*************** setDecimalLocale(void)
*** 2550,2559 ****
  const printTextFormat *
  get_line_style(const printTableOpt *opt)
  {
  	if (opt->line_style != NULL)
  		return opt->line_style;
- 	else if (opt->encoding == pg_get_utf8_id())
- 		return &pg_utf8format;
  	else
  		return &pg_asciiformat;
  }
--- 2550,2562 ----
  const printTextFormat *
  get_line_style(const printTableOpt *opt)
  {
+ 	/*
+ 	 * Note: this function mainly exists to preserve the convention that
+ 	 * a printTableOpt struct can be initialized to zeroes to get default
+ 	 * behavior.
+ 	 */
  	if (opt->line_style != NULL)
  		return opt->line_style;
  	else
  		return &pg_asciiformat;
  }