Phase 3 of pgindent updates.

Don't move parenthesized lines to the left, even if that means they
flow past the right margin.

By default, BSD indent lines up statement continuation lines that are
within parentheses so that they start just to the right of the preceding
left parenthesis.  However, traditionally, if that resulted in the
continuation line extending to the right of the desired right margin,
then indent would push it left just far enough to not overrun the margin,
if it could do so without making the continuation line start to the left of
the current statement indent.  That makes for a weird mix of indentations
unless one has been completely rigid about never violating the 80-column
limit.

This behavior has been pretty universally panned by Postgres developers.
Hence, disable it with indent's new -lpl switch, so that parenthesized
lines are always lined up with the preceding left paren.

This patch is much less interesting than the first round of indent
changes, but also bulkier, so I thought it best to separate the effects.

Discussion: https://postgr.es/m/E1dAmxK-0006EE-1r@gemulon.postgresql.org
Discussion: https://postgr.es/m/30527.1495162840@sss.pgh.pa.us

1 files changed, 10 insertions, 10 deletions

diff --git a/src/backend/utils/adt/mac8.c b/src/backend/utils/adt/mac8.c
index 1ed4183be7f..482d1fb5bf3 100644
--- a/src/backend/utils/adt/mac8.c
+++ b/src/backend/utils/adt/mac8.c
@@ -163,8 +163,8 @@ macaddr8_in(PG_FUNCTION_ARGS)
 				/* must be trailing garbage... */
 				ereport(ERROR,
 						(errcode(ERRCODE_INVALID_TEXT_REPRESENTATION),
-				errmsg("invalid input syntax for type %s: \"%s\"", "macaddr8",
-					   str)));
+						 errmsg("invalid input syntax for type %s: \"%s\"", "macaddr8",
+								str)));
 		}
 
 		/* Move forward to where the next byte should be */
@@ -181,8 +181,8 @@ macaddr8_in(PG_FUNCTION_ARGS)
 			else if (spacer != *ptr)
 				ereport(ERROR,
 						(errcode(ERRCODE_INVALID_TEXT_REPRESENTATION),
-				errmsg("invalid input syntax for type %s: \"%s\"", "macaddr8",
-					   str)));
+						 errmsg("invalid input syntax for type %s: \"%s\"", "macaddr8",
+								str)));
 
 			/* move past the spacer */
 			ptr++;
@@ -218,8 +218,8 @@ macaddr8_in(PG_FUNCTION_ARGS)
 	else if (count != 8)
 		ereport(ERROR,
 				(errcode(ERRCODE_INVALID_TEXT_REPRESENTATION),
-			   errmsg("invalid input syntax for type %s: \"%s\"", "macaddr8",
-					  str)));
+				 errmsg("invalid input syntax for type %s: \"%s\"", "macaddr8",
+						str)));
 
 	result = (macaddr8 *) palloc0(sizeof(macaddr8));
 
@@ -552,10 +552,10 @@ macaddr8tomacaddr(PG_FUNCTION_ARGS)
 		ereport(ERROR,
 				(errcode(ERRCODE_NUMERIC_VALUE_OUT_OF_RANGE),
 				 errmsg("macaddr8 data out of range to convert to macaddr"),
-			   errhint("Only addresses that have FF and FE as values in the "
-					   "4th and 5th bytes, from the left, for example: "
-					 "XX-XX-XX-FF-FE-XX-XX-XX, are eligible to be converted "
-					   "from macaddr8 to macaddr.")));
+				 errhint("Only addresses that have FF and FE as values in the "
+						 "4th and 5th bytes, from the left, for example: "
+						 "XX-XX-XX-FF-FE-XX-XX-XX, are eligible to be converted "
+						 "from macaddr8 to macaddr.")));
 
 	result->a = addr->a;
 	result->b = addr->b;