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/[email protected]
Discussion: https://postgr.es/m/[email protected]

1 files changed, 5 insertions, 5 deletions

diff --git a/src/backend/main/main.c b/src/backend/main/main.c
index 7c7cddbdb15..09f99486e01 100644
--- a/src/backend/main/main.c
+++ b/src/backend/main/main.c
@@ -375,7 +375,7 @@ help(const char *progname)
 	printf(_("  -x NUM             internal use\n"));
 
 	printf(_("\nPlease read the documentation for the complete list of run-time\n"
-	 "configuration settings and how to set them on the command line or in\n"
+			 "configuration settings and how to set them on the command line or in\n"
 			 "the configuration file.\n\n"
 			 "Report bugs to <[email protected]>.\n"));
 }
@@ -390,8 +390,8 @@ check_root(const char *progname)
 	{
 		write_stderr("\"root\" execution of the PostgreSQL server is not permitted.\n"
 					 "The server must be started under an unprivileged user ID to prevent\n"
-		  "possible system security compromise.  See the documentation for\n"
-				  "more information on how to properly start the server.\n");
+					 "possible system security compromise.  See the documentation for\n"
+					 "more information on how to properly start the server.\n");
 		exit(1);
 	}
 
@@ -415,8 +415,8 @@ check_root(const char *progname)
 		write_stderr("Execution of PostgreSQL by a user with administrative permissions is not\n"
 					 "permitted.\n"
 					 "The server must be started under an unprivileged user ID to prevent\n"
-		 "possible system security compromises.  See the documentation for\n"
-				  "more information on how to properly start the server.\n");
+					 "possible system security compromises.  See the documentation for\n"
+					 "more information on how to properly start the server.\n");
 		exit(1);
 	}
 #endif							/* WIN32 */