Prevent forced blank line before comment block in pgindent.

diff --git a/src/backend/access/heap/heapam.c b/src/backend/access/heap/heapam.c
index a2440f8ed681892e54d54483d2f9386ad1c68147..fb36736838a13d361f4b2996d202250c96ec0487 100644 (file)
--- a/src/backend/access/heap/heapam.c
+++ b/src/backend/access/heap/heapam.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *       $Header: /cvsroot/pgsql/src/backend/access/heap/heapam.c,v 1.116 2001/05/17 15:22:12 momjian Exp $
+ *       $Header: /cvsroot/pgsql/src/backend/access/heap/heapam.c,v 1.117 2001/05/17 15:55:23 momjian Exp $
  *
  *
  * INTERFACE ROUTINES
@@ -1111,7 +1111,7 @@ heap_fetch(Relation relation,
        IncrHeapAccessStat(global_fetch);
 
        /*
-        * get the buffer from the relation descriptor Note that this does a
+        * get the buffer from the relation descriptor. Note that this does a
         * buffer pin.
         */
 

diff --git a/src/backend/commands/vacuum.c b/src/backend/commands/vacuum.c
index 3e04dd7df90f754f35b74d033f813d3210267697..afb7851af3e8e5a987f66d3ec85c8897065dbc45 100644 (file)
--- a/src/backend/commands/vacuum.c
+++ b/src/backend/commands/vacuum.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *       $Header: /cvsroot/pgsql/src/backend/commands/vacuum.c,v 1.191 2001/05/17 01:28:50 tgl Exp $
+ *       $Header: /cvsroot/pgsql/src/backend/commands/vacuum.c,v 1.192 2001/05/17 15:55:24 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -762,7 +762,6 @@ scan_heap(VRelStats *vacrelstats, Relation onerel,
                                        }
                                        else if (!TransactionIdIsInProgress(tuple.t_data->t_xmin))
                                        {
-
                                                /*
                                                 * Not Aborted, Not Committed, Not in Progress -
                                                 * so it's from crashed process. - vadim 11/26/96
@@ -817,7 +816,6 @@ scan_heap(VRelStats *vacrelstats, Relation onerel,
                                }
                                else if (!TransactionIdIsInProgress(tuple.t_data->t_xmax))
                                {
-
                                        /*
                                         * Not Aborted, Not Committed, Not in Progress - so it
                                         * from crashed process. - vadim 06/02/97

diff --git a/src/tools/pgindent/pgindent b/src/tools/pgindent/pgindent
index 74f1b310ed7e8f2eeccc68b56b8a664250b3f46c..3318b3fb8fd47a257313de91a2a14d0e3a5a0d71 100755 (executable)
--- a/src/tools/pgindent/pgindent
+++ b/src/tools/pgindent/pgindent
@@ -19,7 +19,7 @@ then  echo "You appear to have GNU indent rather than BSD indent." >&2
        echo "See the pgindent/README file for a description of its problems." >&2
        EXTRA_OPTS="-ncdb -bli0 -npcs -cli4"
 else   echo "Hope you installed /src/tools/pgindent/indent.bsd.patch." >&2
-       EXTRA_OPTS="-bbb -cli1"
+       EXTRA_OPTS="-cli1"
 fi
 
 for FILE