*** indent-2.2.10-orig/src/indent.c	Tue Dec 09 22:08:00 2014
--- indent-2.2.10/src/indent.c	Tue Dec 09 22:46:09 2014
***************
*** 47,52 ****
--- 47,54 ----
   * - 28 Sep 2003 Geoffrey Lee <address@hidden>
   *             Fixed Bug#205692: indent: [patch] fix garble shown in locale(fwd)
   * - 2008-03-08 DI Re-baselined on the more acceptable (license-wise) OpenBSD release 3.4.
+  * - 2014-12-09: M. Allison
+  *             The 2003 fix for -bap broke -bad. Make both work. 
   */
  
  #include "sys.h"
***************
*** 1600,1606 ****
              }
          }
          
! #if 0
          /* Erik de Castro Lopo Sun, 28 Sep 2003:
           * I don't know what this is supposed to do, but I do know that it 
           * breaks the operation of the blanklines_after_procs setting in 
--- 1602,1608 ----
              }
          }
          
! #if 1
          /* Erik de Castro Lopo Sun, 28 Sep 2003:
           * I don't know what this is supposed to do, but I do know that it 
           * breaks the operation of the blanklines_after_procs setting in 
***************
*** 1622,1627 ****
--- 1624,1630 ----
           */
  
          if (prefix_blankline_requested &&
+             prefix_blankline_requested_code != rbrace &&
              ((parser_state_tos->block_init != 0) ||
               (parser_state_tos->block_init_level != -1) ||
               (parser_state_tos->last_token != rbrace) ||