*** Shell.pm	Sat Sep  1 16:47:37 2001
--- /usr/lib/perl5/site_perl/5.005/i386-linux/DBI/Shell.pm	Sat Sep  1 16:48:01 2001
***************
*** 156,162 ****
  	 [ 'rhistory_tail=i'	=>  5 ],
  	 [ 'editor|ed=s'	=> ($ENV{VISUAL} || $ENV{EDITOR} || 'vi') ],
  	 [ 'batch'		=> 0 ],
! 	 [ 'displaymode|display'=> 'neat' ],
  	 [ 'columnseparator=s' => ',' ],
  	# defaults for each new database connect:
  	 [ 'init_trace|trace=i' => 0 ],
--- 156,162 ----
  	 [ 'rhistory_tail=i'	=>  5 ],
  	 [ 'editor|ed=s'	=> ($ENV{VISUAL} || $ENV{EDITOR} || 'vi') ],
  	 [ 'batch'		=> 0 ],
! 	 [ 'format=s'           => 'neat' ],
  	 [ 'columnseparator=s' => ',' ],
  	# defaults for each new database connect:
  	 [ 'init_trace|trace=i' => 0 ],
***************
*** 296,302 ****
  	}
      }
  
!     $sh->do_format($sh->{displaymode});
  
      $sh->{data_source}	= shift(@args) || $ENV{DBI_DSN}  || '';
      $sh->{user}		= shift(@args) || $ENV{DBI_USER} || '';
--- 296,302 ----
  	}
      }
  
!     $sh->do_format($sh->{format});
  
      $sh->{data_source}	= shift(@args) || $ENV{DBI_DSN}  || '';
      $sh->{user}		= shift(@args) || $ENV{DBI_USER} || '';