From 90e7f317735159116fdc3f90e287dd688b18a353 Mon Sep 17 00:00:00 2001
From: Noah Misch <noah@leadboat.com>
Date: Sun, 28 Apr 2019 12:56:53 -0700
Subject: [PATCH] Use preprocessor conditions compatible with Emacs indent.

Emacs wrongly indented hundreds of subsequent lines.
---
 src/backend/postmaster/postmaster.c | 4 ++++
 src/bin/pg_upgrade/controldata.c    | 5 ++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c
index 0edd7f1dc7..71ffb1345b 100644
--- a/src/backend/postmaster/postmaster.c
+++ b/src/backend/postmaster/postmaster.c
@@ -2371,7 +2371,11 @@ processCancelRequest(Port *port, void *pkt)
 								backendPID)));
 			return;
 		}
+#ifndef EXEC_BACKEND			/* make GNU Emacs 26.1 see brace balance */
 	}
+#else
+	}
+#endif
 
 	/* No matching backend */
 	ereport(LOG,
diff --git a/src/bin/pg_upgrade/controldata.c b/src/bin/pg_upgrade/controldata.c
index fa43db4019..bbeba673d4 100644
--- a/src/bin/pg_upgrade/controldata.c
+++ b/src/bin/pg_upgrade/controldata.c
@@ -102,12 +102,11 @@ get_control_data(ClusterInfo *cluster, bool live_check)
 	pg_putenv("LC_MONETARY", NULL);
 	pg_putenv("LC_NUMERIC", NULL);
 	pg_putenv("LC_TIME", NULL);
-	pg_putenv("LANG",
 #ifndef WIN32
-			  NULL);
+	pg_putenv("LANG", NULL);
 #else
 	/* On Windows the default locale cannot be English, so force it */
-			  "en");
+	pg_putenv("LANG", "en");
 #endif
 	pg_putenv("LANGUAGE", NULL);
 	pg_putenv("LC_ALL", NULL);