diff --git a/src/tools/pgindent/pgindent b/src/tools/pgindent/pgindent
index d6a38c12932efe4cc99ae3d4a85d822e184cd4f7..28d7646b3c42f275944ab7c5b2ed043f01730154 100755
--- a/src/tools/pgindent/pgindent
+++ b/src/tools/pgindent/pgindent
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# $PostgreSQL: pgsql/src/tools/pgindent/pgindent,v 1.87 2006/03/11 04:38:42 momjian Exp $
+# $PostgreSQL: pgsql/src/tools/pgindent/pgindent,v 1.88 2006/10/03 22:09:42 momjian Exp $
 
 # Known bugs:
 #
@@ -199,6 +199,7 @@ do
 -TAnlIndexData \
 -TAppend \
 -TAppendPath \
+-TAppendRelInfo \
 -TAppendState \
 -TArchive \
 -TArchiveEntryPtr \
@@ -207,7 +208,9 @@ do
 -TArchiveMode \
 -TArchiverStage \
 -TArrayBuildState \
+-TArrayConstIterState \
 -TArrayExpr \
+-TArrayExprIterState \
 -TArrayExprState \
 -TArrayMapState \
 -TArrayMetaState \
@@ -237,21 +240,27 @@ do
 -TBN_RECP_CTX \
 -TBOX \
 -TBTBuildState \
--TBTItem \
--TBTItemData \
+-TBTCycleId \
 -TBTMetaPageData \
+-TBTOneVacInfo \
 -TBTPageOpaque \
 -TBTPageOpaqueData \
 -TBTPageState \
 -TBTScanOpaque \
 -TBTScanOpaqueData \
+-TBTScanPos \
+-TBTScanPosData \
+-TBTScanPosItem \
 -TBTSpool \
 -TBTStack \
 -TBTStackData \
+-TBTVacInfo \
+-TBTVacState \
 -TBTWriteState \
 -TBUF_MEM \
 -TBackend \
 -TBackendId \
+-TBackslashQuoteType \
 -TBgWriterRequest \
 -TBgWriterShmemStruct \
 -TBitmapAnd \
@@ -288,6 +297,7 @@ do
 -TBufferLookupEnt \
 -TBufferStrategyControl \
 -TBufferTag \
+-TBuildAccumulator \
 -TByte \
 -TBytef \
 -TCAC_state \
@@ -360,7 +370,7 @@ do
 -TConstraintCategory \
 -TConstraintInfo \
 -TConstraintsSetStmt \
--TContainsOids \
+-TContextNode \
 -TControlFileData \
 -TConvInfo \
 -TConvertRowtypeExpr \
@@ -385,6 +395,7 @@ do
 -TCreateSeqStmt \
 -TCreateStmt \
 -TCreateStmtContext \
+-TCreateStmtLikeOption \
 -TCreateTableSpaceStmt \
 -TCreateTrigStmt \
 -TCreatedbStmt \
@@ -400,15 +411,17 @@ do
 -TDH \
 -TDH_METHOD \
 -TDIR \
+-TDR_copy \
+-TDR_intorel \
 -TDR_printtup \
 -TDSA \
 -TDSA_METHOD \
 -TDSA_SIG \
 -TDataDumperPtr \
+-TDataPageDeleteStack \
 -TDateADT \
 -TDatum \
 -TDatumPtr \
--TDatumTuple \
 -TDatumTupleFields \
 -TDeallocateStmt \
 -TDeclareCursorStmt \
@@ -423,8 +436,10 @@ do
 -TDllist \
 -TDomainConstraintState \
 -TDomainConstraintType \
+-TDomainIOData \
 -TDropBehavior \
 -TDropCastStmt \
+-TDropOwnedStmt \
 -TDropPLangStmt \
 -TDropPropertyStmt \
 -TDropRoleStmt \
@@ -453,13 +468,14 @@ do
 -TEndBlobPtr \
 -TEndBlobsPtr \
 -TEndDataPtr \
--TEntryUpdateRecord \
+-TEntryAccumulator \
 -TEolType \
 -TErrorContextCallback \
 -TErrorData \
 -TExceptionLabelMap \
 -TExecContext \
 -TExecContextData \
+-TExecRowMark \
 -TExecScanAccessMtd \
 -TExecStatus \
 -TExecStatusType \
@@ -520,6 +536,7 @@ do
 -TFormData_pg_rewrite \
 -TFormData_pg_sequence \
 -TFormData_pg_shdepend \
+-TFormData_pg_shdescription \
 -TFormData_pg_statistic \
 -TFormData_pg_tablespace \
 -TFormData_pg_trigger \
@@ -553,6 +570,7 @@ do
 -TForm_pg_rewrite \
 -TForm_pg_sequence \
 -TForm_pg_shdepend \
+-TForm_pg_shdescription \
 -TForm_pg_statistic \
 -TForm_pg_tablespace \
 -TForm_pg_trigger \
@@ -584,23 +602,38 @@ do
 -TGISTPageOpaque \
 -TGISTPageOpaqueData \
 -TGISTSTATE \
--TGISTScanList \
--TGISTScanListData \
 -TGISTScanOpaque \
 -TGISTScanOpaqueData \
 -TGISTSearchStack \
 -TGIST_SPLITVEC \
 -TGP \
--TGUC_yy_size_t \
--TGUC_yy_state_type \
 -TGV \
 -TGVOP \
 -TGene \
 -TGenericExprState \
 -TGeqoEvalData \
+-TGinBtree \
+-TGinBtreeData \
+-TGinBtreeStack \
+-TGinBuildState \
+-TGinNSN \
+-TGinPageOpaque \
+-TGinPageOpaqueData \
+-TGinPostingTreeScan \
+-TGinScanEntry \
+-TGinScanEntryData \
+-TGinScanKey \
+-TGinScanKeyData \
+-TGinScanOpaque \
+-TGinScanOpaqueData \
+-TGinState \
+-TGinVacuumState \
 -TGistBDItem \
+-TGistBulkDeleteResult \
 -TGistEntryVector \
 -TGistNSN \
+-TGistSplitUnion \
+-TGistSplitVector \
 -TGistVacuum \
 -TGlobalTransaction \
 -TGlobalTransactionData \
@@ -639,8 +672,6 @@ do
 -THashBuildState \
 -THashCompareFunc \
 -THashCopyFunc \
--THashItem \
--THashItemData \
 -THashJoin \
 -THashJoinState \
 -THashJoinTable \
@@ -665,6 +696,7 @@ do
 -THeapTupleFields \
 -THeapTupleHeader \
 -THeapTupleHeaderData \
+-THistControl \
 -TI16 \
 -TI32 \
 -TI8 \
@@ -672,13 +704,14 @@ do
 -TIOFuncSelector \
 -TIV \
 -TIV64 \
--TIdList \
 -TInClauseInfo \
 -TIncrementVarSublevelsUp_context \
 -TIndex \
+-TIndexArrayKeyInfo \
 -TIndexAttributeBitMap \
 -TIndexAttributeBitMapData \
 -TIndexBuildCallback \
+-TIndexBuildResult \
 -TIndexBulkDeleteCallback \
 -TIndexBulkDeleteResult \
 -TIndexElem \
@@ -687,6 +720,7 @@ do
 -TIndexList \
 -TIndexOptInfo \
 -TIndexPath \
+-TIndexRuntimeKeyInfo \
 -TIndexScan \
 -TIndexScanDesc \
 -TIndexScanDescData \
@@ -694,7 +728,7 @@ do
 -TIndexStmt \
 -TIndexTuple \
 -TIndexTupleData \
--TIndexVacuumCleanupInfo \
+-TIndexVacuumInfo \
 -TIndirectBlock \
 -TIndxInfo \
 -TInfoItem \
@@ -707,9 +741,7 @@ do
 -TInstrumentation \
 -TInt8TransTypeData \
 -TIntArray \
--TInt_yy_size_t \
--TInt_yy_state_type \
--TInt_yysigned_char \
+-TInternalGrant \
 -TInterval \
 -TInvalidationChunk \
 -TInvalidationListHeader \
@@ -762,6 +794,7 @@ do
 -TLWLock \
 -TLWLockId \
 -TLWLockMode \
+-TLWLockNode \
 -TLWLockPadded \
 -TLargeObjectDesc \
 -TLimit \
@@ -810,6 +843,8 @@ do
 -TMinMaxExpr \
 -TMinMaxExprState \
 -TMinMaxOp \
+-TMinimalTuple \
+-TMinimalTupleData \
 -TMsgType \
 -TMultiXactId \
 -TMultiXactOffset \
@@ -836,6 +871,7 @@ do
 -TNotifyStmt \
 -TNullIfExpr \
 -TNullTest \
+-TNullTestState \
 -TNullTestType \
 -TNumeric \
 -TNumericData \
@@ -858,10 +894,10 @@ do
 -TOpClassCacheEnt \
 -TOpClassMember \
 -TOpExpr \
--TOpclassCandidateList \
 -TOpclassInfo \
 -TOperator \
 -TOprInfo \
+-TOuterJoinInfo \
 -TOutputContext \
 -TOutrec \
 -TPADOFFSET \
@@ -883,6 +919,7 @@ do
 -TPGLZ_HistEntry \
 -TPGLZ_Strategy \
 -TPGMessageField \
+-TPGModuleMagicFunction \
 -TPGNoticeHooks \
 -TPGPROC \
 -TPGQueryClass \
@@ -894,12 +931,15 @@ do
 -TPGTransactionStatusType \
 -TPGVerbosity \
 -TPG_Lock_Status \
+-TPG_fini_t \
+-TPG_init_t \
 -TPGcancel \
 -TPGconn \
 -TPGlobjfuncs \
 -TPGnotify \
 -TPGresAttDesc \
 -TPGresAttValue \
+-TPGresParamDesc \
 -TPGresult \
 -TPGresult_data \
 -TPKCS7 \
@@ -913,7 +953,6 @@ do
 -TPKCS7_SIGNER_INFO \
 -TPKCS7_SIGN_ENVELOPE \
 -TPKCS8_PRIV_KEY_INFO \
--TPLPGSQL_YYSTYPE \
 -TPLTemplate \
 -TPLpgSQL_arrayelem \
 -TPLpgSQL_condition \
@@ -928,6 +967,7 @@ do
 -TPLpgSQL_function \
 -TPLpgSQL_ns \
 -TPLpgSQL_nsitem \
+-TPLpgSQL_plugin \
 -TPLpgSQL_rec \
 -TPLpgSQL_recfield \
 -TPLpgSQL_row \
@@ -950,7 +990,6 @@ do
 -TPLpgSQL_stmt_raise \
 -TPLpgSQL_stmt_return \
 -TPLpgSQL_stmt_return_next \
--TPLpgSQL_stmt_select \
 -TPLpgSQL_stmt_while \
 -TPLpgSQL_trigarg \
 -TPLpgSQL_type \
@@ -971,6 +1010,9 @@ do
 -TPROCLOCKTAG \
 -TPROC_HDR \
 -TPROC_QUEUE \
+-TPSQL_ECHO \
+-TPSQL_ECHO_HIDDEN \
+-TPSQL_ERROR_ROLLBACK \
 -TPV \
 -TPVOP \
 -TPacketLen \
@@ -979,9 +1021,12 @@ do
 -TPageHeader \
 -TPageHeaderData \
 -TPageSplitRecord \
+-TPageUpdateRecord \
 -TPagetableEntry \
 -TParam \
 -TParamExecData \
+-TParamExternData \
+-TParamKind \
 -TParamListInfo \
 -TParamListInfoData \
 -TParamRef \
@@ -995,14 +1040,12 @@ do
 -TPendingRelDelete \
 -TPerlExitListEntry \
 -TPerlInterpreter \
+-TPgBackendStatus \
 -TPgStat_Counter \
 -TPgStat_Info \
 -TPgStat_Msg \
--TPgStat_MsgActivity \
 -TPgStat_MsgAnalyze \
 -TPgStat_MsgAutovacStart \
--TPgStat_MsgBestart \
--TPgStat_MsgBeterm \
 -TPgStat_MsgDropdb \
 -TPgStat_MsgDummy \
 -TPgStat_MsgHdr \
@@ -1010,12 +1053,11 @@ do
 -TPgStat_MsgTabpurge \
 -TPgStat_MsgTabstat \
 -TPgStat_MsgVacuum \
--TPgStat_StatBeDead \
--TPgStat_StatBeEntry \
 -TPgStat_StatDBEntry \
 -TPgStat_StatTabEntry \
 -TPgStat_TableEntry \
 -TPg_finfo_record \
+-TPg_magic_struct \
 -TPlan \
 -TPlanState \
 -TPlannerInfo \
@@ -1030,10 +1072,17 @@ do
 -TPortalStatus \
 -TPortalStrategy \
 -TPostgresPollingStatusType \
+-TPostingItem \
+-TPredClass \
+-TPredIterInfo \
+-TPredIterInfoData \
 -TPrepareStmt \
 -TPreparedStatement \
 -TPrintExtraTocPtr \
 -TPrintTocDataPtr \
+-TPrintfArgType \
+-TPrintfArgValue \
+-TPrintfTarget \
 -TPrinttupAttrInfo \
 -TPrivGrantee \
 -TPrivTarget \
@@ -1059,16 +1108,7 @@ do
 -TRI_QueryKey \
 -TRSA \
 -TRSA_METHOD \
--TRTBuildState \
 -TRTEKind \
--TRTSTACK \
--TRTSTATE \
--TRTScanList \
--TRTScanListData \
--TRTreePageOpaque \
--TRTreePageOpaqueData \
--TRTreeScanOpaque \
--TRTreeScanOpaqueData \
 -TRangeFunction \
 -TRangeQueryClause \
 -TRangeSubselect \
@@ -1079,6 +1119,7 @@ do
 -TReadBufPtr \
 -TReadBytePtr \
 -TReadExtraTocPtr \
+-TReassignOwnedStmt \
 -TRecordCacheEntry \
 -TRecordIOData \
 -TRegProcedure \
@@ -1096,10 +1137,8 @@ do
 -TRelationPtr \
 -TRelativeTime \
 -TRelids \
--TRemoveAggrStmt \
 -TRemoveFuncStmt \
 -TRemoveOpClassStmt \
--TRemoveOperStmt \
 -TRenameStmt \
 -TResTarget \
 -TResolveNew_context \
@@ -1119,8 +1158,12 @@ do
 -TRmgrData \
 -TRmgrId \
 -TRoleStmtType \
+-TRowCompareExpr \
+-TRowCompareExprState \
+-TRowCompareType \
 -TRowExpr \
 -TRowExprState \
+-TRowMarkClause \
 -TRuleInfo \
 -TRuleLock \
 -TRuleStmt \
@@ -1131,8 +1174,6 @@ do
 -TSMgrRelation \
 -TSMgrRelationData \
 -TSPITupleTable \
--TSPLITCOST \
--TSPLITVEC \
 -TSQLFunctionCache \
 -TSQLFunctionCachePtr \
 -TSSL \
@@ -1150,6 +1191,7 @@ do
 -TSUBLEXINFO \
 -TSV \
 -TSVOP \
+-TSaOpControl \
 -TSaveArchivePtr \
 -TScalarArrayOpExpr \
 -TScalarArrayOpExprState \
@@ -1184,6 +1226,7 @@ do
 -TSharedInvalRelcacheMsg \
 -TSharedInvalSmgrMsg \
 -TSharedInvalidationMessage \
+-TShellTypeInfo \
 -TShmemIndexEnt \
 -TShutdownMode \
 -TSigHandler \
@@ -1206,6 +1249,7 @@ do
 -TSortClause \
 -TSortFunctionKind \
 -TSortState \
+-TSortTuple \
 -TSplitedPageLayout \
 -TStackElem \
 -TStandardChunkHeader \
@@ -1215,6 +1259,7 @@ do
 -TStartupPacket \
 -TStatMsgType \
 -TStdAnalyzeData \
+-TStdRdOptions \
 -TStrategyNumber \
 -TStringInfo \
 -TStringInfoData \
@@ -1420,9 +1465,12 @@ do
 -TVacPageListData \
 -TVacuumStmt \
 -TValue \
+-TValuesScan \
+-TValuesScanState \
 -TVar \
 -TVarBit \
 -TVarChar \
+-TVariableAssignHook \
 -TVariableCache \
 -TVariableCacheData \
 -TVariableResetStmt \
@@ -1510,7 +1558,6 @@ do
 -T_ossl_old_des_cblock \
 -T_ossl_old_des_key_schedule \
 -Taclitem \
--Tadjust_inherited_attrs_context \
 -Talc_extra \
 -Talloc_func \
 -Tanyarray \
@@ -1547,6 +1594,7 @@ do
 -Tcomment_t \
 -Tconst_DES_cblock \
 -Tcontain_var_reference_context \
+-Tconvert_testexpr_context \
 -Tcv_flags_t \
 -Tdaddr_t \
 -Tdatetkn \
@@ -1559,7 +1607,6 @@ do
 -Tdouble \
 -TevalPlanQual \
 -Teval_const_expressions_context \
--TexecRowMark \
 -Texecution_state \
 -Texpectation \
 -Tf_smgr \
@@ -1579,6 +1626,7 @@ do
 -Tfloat64data \
 -Tfloat8 \
 -TfmNodePtr \
+-TfmStringInfo \
 -Tfp_except \
 -Tfp_rnd \
 -Tfpclass_t \
@@ -1588,11 +1636,18 @@ do
 -Tfunc_ptr \
 -Tgenerate_series_fctx \
 -Tgid_t \
+-TginIncompleteSplit \
+-TginxlogCreatePostingTree \
+-TginxlogDeletePage \
+-TginxlogInsert \
+-TginxlogSplit \
+-TginxlogVacuumPage \
 -TgistIncompleteInsert \
--TgistxlogEntryUpdate \
 -TgistxlogInsertComplete \
 -TgistxlogPage \
+-TgistxlogPageDelete \
 -TgistxlogPageSplit \
+-TgistxlogPageUpdate \
 -TgzFile \
 -Thashnode \
 -ThbaPort \
@@ -1635,12 +1690,14 @@ do
 -Tmb2wchar_with_len_converter \
 -Tmbdisplaylen_converter \
 -Tmblen_converter \
+-Tmbverifier \
 -TmixedStruct \
 -Tmode_t \
 -Tnlink_t \
 -Tnls_uint32 \
 -Tnumeric \
 -TobjectType \
+-TobjnameArg \
 -Toff_t \
 -Toidvector \
 -Top_tr_array \
@@ -1658,6 +1715,7 @@ do
 -Tpg_local_to_utf \
 -Tpg_time_t \
 -Tpg_tz \
+-Tpg_tzenum \
 -Tpg_utf_to_local \
 -Tpg_wchar \
 -Tpg_wchar_tbl \
@@ -1665,9 +1723,10 @@ do
 -Tpgsql_thing_t \
 -Tpgthreadlock_t \
 -Tpid_t \
+-Tplperl_call_data \
 -Tplperl_proc_desc \
+-Tplperl_query_desc \
 -Tplpgsql_HashEnt \
--Tplpgsql_yysigned_char \
 -Tpltcl_proc_desc \
 -Tpltcl_query_desc \
 -Tpqbool \
@@ -1702,6 +1761,7 @@ do
 -Tregoff_t \
 -Tregproc \
 -TremoteDep \
+-TrendezvousHashEntry \
 -Treplace_vars_with_subplan_refs_context \
 -Trewrite_event \
 -Trm_detail_t \
@@ -1738,6 +1798,7 @@ do
 -Ttime_t \
 -Ttlist_vinfo \
 -Tts_db_fctx \
+-TtzEntry \
 -TuInt \
 -TuIntf \
 -TuLong \
@@ -1764,6 +1825,7 @@ do
 -Tuint8 \
 -Tunknown \
 -Tushort \
+-Tv_i_state \
 -Tva_list \
 -Tvarattrib \
 -Tvm_offset_t \
@@ -1778,7 +1840,6 @@ do
 -Txl_btree_delete_page \
 -Txl_btree_insert \
 -Txl_btree_metadata \
--Txl_btree_newmeta \
 -Txl_btree_newroot \
 -Txl_btree_split \
 -Txl_btreetid \
@@ -1789,11 +1850,14 @@ do
 -Txl_heap_clean \
 -Txl_heap_delete \
 -Txl_heap_header \
+-Txl_heap_inplace \
 -Txl_heap_insert \
 -Txl_heap_lock \
 -Txl_heap_newpage \
 -Txl_heap_update \
 -Txl_heaptid \
+-Txl_invalid_page \
+-Txl_invalid_page_key \
 -Txl_multixact_create \
 -Txl_seq_rec \
 -Txl_smgr_create \