===================================================================
RCS file: /cvs/mandoc/man.c,v
retrieving revision 1.170
retrieving revision 1.172
diff -u -p -r1.170 -r1.172
--- mandoc/man.c	2017/04/29 12:45:41	1.170
+++ mandoc/man.c	2017/05/05 15:17:32	1.172
@@ -1,7 +1,7 @@
-/*	$Id: man.c,v 1.170 2017/04/29 12:45:41 schwarze Exp $ */
+/*	$Id: man.c,v 1.172 2017/05/05 15:17:32 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
- * Copyright (c) 2013, 2014, 2015 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2013, 2014, 2015, 2017 Ingo Schwarze <schwarze@openbsd.org>
  * Copyright (c) 2011 Joerg Sonnenberger <joerg@netbsd.org>
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -97,7 +97,7 @@ man_ptext(struct roff_man *man, int line, char *buf, i
 		/* Allocate a blank entry. */
 		if (man->last->tok != MAN_SH &&
 		    man->last->tok != MAN_SS) {
-			roff_elem_alloc(man, line, offs, MAN_sp);
+			roff_elem_alloc(man, line, offs, ROFF_sp);
 			man->next = ROFF_NEXT_SIBLING;
 		}
 		return 1;
@@ -200,6 +200,20 @@ man_pmacro(struct roff_man *man, int ln, char *buf, in
 
 	man_breakscope(man, tok);
 	bline = man->flags & MAN_BLINE;
+
+	/*
+	 * If the line in next-line scope ends with \c, keep the
+	 * next-line scope open for the subsequent input line.
+	 * That is not at all portable, only groff >= 1.22.4
+	 * does it, but *if* this weird idiom occurs in a manual
+	 * page, that's very likely what the author intended.
+	 */
+
+	if (bline) {
+		cp = strchr(buf + offs, '\0') - 2;
+		if (cp >= buf && cp[0] == '\\' && cp[1] == 'c')
+			bline = 0;
+	}
 
 	/* Call to handler... */