pgindent: preserve blank lines around #else/#endif

This requires a new version of pg_bsd_indent, version 1.3, to be
downloaded.

diff --git a/src/tools/pgindent/pgindent b/src/tools/pgindent/pgindent
index bc83c1a95c03d0f51b327a1c63c13f9c6c92c6fd..8e45b18a9ab961072dc9633f1e007b375159d392 100755 (executable)
--- a/src/tools/pgindent/pgindent
+++ b/src/tools/pgindent/pgindent
@@ -12,7 +12,7 @@ use IO::Handle;
 use Getopt::Long;
 
 # Update for pg_bsd_indent version
-my $INDENT_VERSION = "1.2";
+my $INDENT_VERSION = "1.3";
 my $devnull        = File::Spec->devnull;
 
 # Common indent settings
@@ -286,12 +286,6 @@ sub post_indent
    # Reduce whitespace between #endif and comments to one tab
    $source =~ s!^\#endif[ \t]+/\*!#endif   /*!gm;
 
-   # Remove blank line(s) before #else, #elif, and #endif
-   $source =~ s!\n\n+(\#else|\#elif|\#endif)!\n$1!g;
-
-   # Add blank line before #endif if it is the last line in the file
-   $source =~ s!\n(#endif.*)\n\z!\n\n$1\n!;
-
    ## Functions
 
    # Work around misindenting of function with no variables defined.