New pgindent run with fixes suggested by Tom. Patch manually reviewed,

initdb/regression tests pass.

contrib/tsearch/gistidx.h

@@ -46,7 +46,7 @@ typedef struct
 	int4		len;
 	int4		flag;
 	char		data[1];
-}			GISTTYPE;
+}	GISTTYPE;
 
 #define ARRKEY		0x01
 #define SIGNKEY		0x02

contrib/tsearch/morph.c

@@ -34,7 +34,7 @@ typedef struct
 	char	   *(*lemmatize) (void *, char *, int *);
 	int			(*is_stoplemm) (void *, char *, int);
 	int			(*is_stemstoplemm) (void *, char *, int);
-}			DICT;
+}	DICT;
 
 /* insert all dictionaries */
 #define DICT_BODY

contrib/tsearch/query.c

@@ -72,7 +72,7 @@ typedef struct NODE
 	int2		distance;
 	int2		length;
 	struct NODE *next;
-}			NODE;
+}	NODE;
 
 typedef struct
 {
@@ -92,7 +92,7 @@ typedef struct
 
 	/* state for value's parser */
 	TI_IN_STATE valstate;
-}			QPRS_STATE;
+}	QPRS_STATE;
 
 /*
  * get token from query string
@@ -322,7 +322,7 @@ typedef struct
 	WordEntry  *arre;
 	char	   *values;
 	char	   *operand;
-}			CHKVAL;
+}	CHKVAL;
 
 /*
  * compare 2 string values
@@ -626,7 +626,7 @@ typedef struct
 	char	   *cur;
 	char	   *op;
 	int4		buflen;
-}			INFIX;
+}	INFIX;
 
 #define RESIZEBUF(inf,addsize) \
 while( ( inf->cur - inf->buf ) + addsize + 1 >= inf->buflen ) \

contrib/tsearch/query.h

@@ -17,7 +17,7 @@ typedef struct ITEM
 	/* user-friendly value */
 	uint16		distance;
 	uint16		length;
-}			ITEM;
+}	ITEM;
 
 /*
  *Storage:
@@ -28,7 +28,7 @@ typedef struct
 	int4		len;
 	int4		size;
 	char		data[1];
-}			QUERYTYPE;
+}	QUERYTYPE;
 
 #define HDRSIZEQT	( 2*sizeof(int4) )
 #define COMPUTESIZE(size,lenofoperand)	( HDRSIZEQT + size * sizeof(ITEM) + lenofoperand )

contrib/tsearch/rewrite.c

@@ -24,7 +24,7 @@ typedef struct NODE
 	struct NODE *left;
 	struct NODE *right;
 	ITEM	   *valnode;
-}			NODE;
+}	NODE;
 
 /*
  * make query tree from plain view of query
@@ -50,7 +50,7 @@ typedef struct
 	ITEM	   *ptr;
 	int4		len;
 	int4		cur;
-}			PLAINTREE;
+}	PLAINTREE;
 
 static void
 plainnode(PLAINTREE * state, NODE * node)

contrib/tsearch/txtidx.c

@@ -334,7 +334,7 @@ typedef struct
 	WORD	   *words;
 	int4		lenwords;
 	int4		curwords;
-}			PRSTEXT;
+}	PRSTEXT;
 
 /*
  * Parse text to lexems

contrib/tsearch/txtidx.h

@@ -18,14 +18,14 @@ typedef struct
 {
 	uint16		len;
 	uint16		pos;
-}			WordEntry;
+}	WordEntry;
 
 typedef struct
 {
 	int4		len;
 	int4		size;
 	char		data[1];
-}			txtidx;
+}	txtidx;
 
 #define DATAHDRSIZE (sizeof(int4)*2)
 #define CALCDATASIZE(x, lenstr) ( x * sizeof(WordEntry) + DATAHDRSIZE + lenstr )
@@ -41,7 +41,7 @@ typedef struct
 	int4		len;
 	int4		state;
 	bool		oprisdelim;
-}			TI_IN_STATE;
+}	TI_IN_STATE;
 
 int4		gettoken_txtidx(TI_IN_STATE * state);