Revert patch so .psqlrc can suppress startup banner:

  In psql, run .psqlrc _after_ printing warnings and banner.

1 files changed, 3 insertions, 5 deletions

diff --git a/src/bin/psql/startup.c b/src/bin/psql/startup.c
index f7b75de8ef..fdf65a55fc 100644
--- a/src/bin/psql/startup.c
+++ b/src/bin/psql/startup.c
@@ -281,14 +281,12 @@ main(int argc, char *argv[])
 	 */
 	else
 	{
-		connection_warnings();
-		if (!pset.quiet && !pset.notty)
-			printf(_("Type \"help\" for help.\n"));
 		if (!options.no_psqlrc)
 			process_psqlrc(argv[0]);
-		/* output newline here because .psqlrc might output something */
+
+		connection_warnings();
 		if (!pset.quiet && !pset.notty)
-			printf("\n");
+			printf(_("Type \"help\" for help.\n\n"));
 		if (!pset.notty)
 			initializeInput(options.no_readline ? 0 : 1);
 		if (options.action_string)		/* -f - was used */