===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mandoc/mdoc_term.c,v
retrieving revision 1.272
retrieving revision 1.273
diff -c -r1.272 -r1.273
*** src/usr.bin/mandoc/mdoc_term.c	2019/06/03 19:50:31	1.272
--- src/usr.bin/mandoc/mdoc_term.c	2019/06/27 12:19:39	1.273
***************
*** 1,4 ****
! /*	$OpenBSD: mdoc_term.c,v 1.272 2019/06/03 19:50:31 schwarze Exp $ */
  /*
   * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
   * Copyright (c) 2010, 2012-2019 Ingo Schwarze <schwarze@openbsd.org>
--- 1,4 ----
! /*	$OpenBSD: mdoc_term.c,v 1.273 2019/06/27 12:19:39 schwarze Exp $ */
  /*
   * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
   * Copyright (c) 2010, 2012-2019 Ingo Schwarze <schwarze@openbsd.org>
***************
*** 251,257 ****
  void
  terminal_mdoc(void *arg, const struct roff_meta *mdoc)
  {
! 	struct roff_node	*n;
  	struct termp		*p;
  	size_t			 save_defindent;
  
--- 251,257 ----
  void
  terminal_mdoc(void *arg, const struct roff_meta *mdoc)
  {
! 	struct roff_node	*n, *nn;
  	struct termp		*p;
  	size_t			 save_defindent;
  
***************
*** 263,278 ****
  
  	n = mdoc->first->child;
  	if (p->synopsisonly) {
! 		while (n != NULL) {
! 			if (n->tok == MDOC_Sh && n->sec == SEC_SYNOPSIS) {
! 				if (n->child->next->child != NULL)
! 					print_mdoc_nodelist(p, NULL,
! 					    mdoc, n->child->next->child);
! 				term_newln(p);
  				break;
! 			}
! 			n = n->next;
  		}
  	} else {
  		save_defindent = p->defindent;
  		if (p->defindent == 0)
--- 263,282 ----
  
  	n = mdoc->first->child;
  	if (p->synopsisonly) {
! 		for (nn = NULL; n != NULL; n = n->next) {
! 			if (n->tok != MDOC_Sh)
! 				continue;
! 			if (n->sec == SEC_SYNOPSIS)
  				break;
! 			if (nn == NULL && n->sec == SEC_NAME)
! 				nn = n;
  		}
+ 		if (n == NULL)
+ 			n = nn;
+ 		p->flags |= TERMP_NOSPACE;
+ 		if (n != NULL && (n = n->child->next->child) != NULL)
+ 			print_mdoc_nodelist(p, NULL, mdoc, n);
+ 		term_newln(p);
  	} else {
  		save_defindent = p->defindent;
  		if (p->defindent == 0)