From owner-svn-src-head@freebsd.org  Sun Jul 23 14:33:05 2017
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id BB379D7F73B;
 Sun, 23 Jul 2017 14:33:05 +0000 (UTC)
 (envelope-from pstef@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 8A1BA3F05;
 Sun, 23 Jul 2017 14:33:05 +0000 (UTC)
 (envelope-from pstef@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v6NEX4XJ045806;
 Sun, 23 Jul 2017 14:33:04 GMT (envelope-from pstef@FreeBSD.org)
Received: (from pstef@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v6NEX4E2045804;
 Sun, 23 Jul 2017 14:33:04 GMT (envelope-from pstef@FreeBSD.org)
Message-Id: <201707231433.v6NEX4E2045804@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: pstef set sender to
 pstef@FreeBSD.org using -f
From: Piotr Pawel Stefaniak <pstef@FreeBSD.org>
Date: Sun, 23 Jul 2017 14:33:04 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r321382 - in head/usr.bin/indent: . tests
X-SVN-Group: head
X-SVN-Commit-Author: pstef
X-SVN-Commit-Paths: in head/usr.bin/indent: . tests
X-SVN-Commit-Revision: 321382
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 23 Jul 2017 14:33:05 -0000

Author: pstef
Date: Sun Jul 23 14:33:04 2017
New Revision: 321382
URL: https://svnweb.freebsd.org/changeset/base/321382

Log:
  indent(1): don't produce unnecessary blank lines.
  
  Don't force a blank line between an opening brace and a block comment -- not
  even if -bbb (blank lines before block comments) is on.

Added:
  head/usr.bin/indent/tests/comments.pro   (contents, props changed)
Modified:
  head/usr.bin/indent/pr_comment.c

Modified: head/usr.bin/indent/pr_comment.c
==============================================================================
--- head/usr.bin/indent/pr_comment.c	Sun Jul 23 14:04:45 2017	(r321381)
+++ head/usr.bin/indent/pr_comment.c	Sun Jul 23 14:33:04 2017	(r321382)
@@ -47,6 +47,7 @@ __FBSDID("$FreeBSD$");
 #include <stdlib.h>
 #include <string.h>
 #include "indent_globs.h"
+#include "indent_codes.h"
 #include "indent.h"
 /*
  * NAME:
@@ -187,7 +188,7 @@ pr_comment(void)
 	char       *t = e_com;
 	e_com = s_com + 2;
 	*e_com = 0;
-	if (blanklines_before_blockcomments)
+	if (blanklines_before_blockcomments && ps.last_token != lbrace)
 	    prefix_blankline_requested = 1;
 	dump_line();
 	e_com = s_com = t;

Added: head/usr.bin/indent/tests/comments.pro
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/usr.bin/indent/tests/comments.pro	Sun Jul 23 14:33:04 2017	(r321382)
@@ -0,0 +1,2 @@
+/* $FreeBSD$ */
+-bbb