Use preprocessor conditions compatible with Emacs indent.

nmisch · nmisch · commit 90e7f3177351 · 2019-04-28T12:56:53.000-07:00
Emacs wrongly indented hundreds of subsequent lines.
diff --git 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
@@ -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);

Original file line number	Diff line number	Diff line change
`@@ -2371,7 +2371,11 @@ processCancelRequest(Port port, void pkt)`
`2371`	`2371`	`backendPID)));`
`2372`	`2372`	`return;`
`2373`	`2373`	`}`
	`2374`	`+#ifndef EXEC_BACKEND /* make GNU Emacs 26.1 see brace balance */`
`2374`	`2375`	`}`
	`2376`	`+#else`
	`2377`	`+ }`
	`2378`	`+#endif`
`2375`	`2379`
`2376`	`2380`	`/* No matching backend */`
`2377`	`2381`	`ereport(LOG,`