Revert pgindent length back to 79 because we are going to fix the BSD

indent bug.

diff --git a/src/tools/pgindent/README b/src/tools/pgindent/README
index ce64a263b06d4fa9c5d5f2977b996142b16b9601..a4cd2fc2fcfc996825a328a052112a04a900d603 100644 (file)
--- a/src/tools/pgindent/README
+++ b/src/tools/pgindent/README
@@ -4,7 +4,7 @@ files.
 Get the list of typedef's included in pgindent by running this on the
 pgsql/bin and pgsql/lib directories:
 
-       /src/tools/find_typedef
+       /src/tools/find_typedef /usr/local/pgsql/bin /usr/local/pgsql/lib
 
 and update the list in pgindent.  This requires the binaries have debug 
 symbols.

diff --git a/src/tools/pgindent/pgindent b/src/tools/pgindent/pgindent
index c743751bf1447dff4d13d4ecc90b509a4f45b3b3..c4f24a24f889f6b741a3991cff88a7a8480b5d97 100755 (executable)
--- a/src/tools/pgindent/pgindent
+++ b/src/tools/pgindent/pgindent
@@ -104,9 +104,7 @@ do
        sed 's;^CATALOG(.*$;/*&*/;' >/tmp/$$a
 
 # We get the list of typedef's from /src/tools/find_typedef
-# BSD indent sometimes goes 1-3 characters after the -l length
-# so we have to set it a little lower than the value we want
-       indent -bad -bap -bc -bl -d0 -cdb -nce -nfc1 -di12 -i4 -l77 \
+       indent -bad -bap -bc -bl -d0 -cdb -nce -nfc1 -di12 -i4 -l79 \
                -lp -nip -npro -bbb $EXTRA_OPTS \
 -TAES_KEY \
 -TASN1_BIT_STRING \