From ddb8c20e76ca162b2fbfbf7131f5b2a6ee36eea5 Mon Sep 17 00:00:00 2001 From: Ingo Schwarze Date: Mon, 27 Sep 2010 23:03:44 +0000 Subject: Merge from OpenBSD right after 1.10.6; now back to full sync. * mdoc.c: blank lines outside literal mode are more similar to .sp than .Pp * backslashes do not terminate macros; partial revert of mdoc.c 1.164; the intention of that commit is fully achieved in roff.c * mdoc_term.c: no need to list the same prototype twice * mdoc_validate.c: drop .Pp before .sp just like .Pp before .Pp * fix off-by-one found by jsg@ with parfait, OpenBSD term_ps.c 1.12 ok kristaps@ --- mdoc_term.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'mdoc_term.c') diff --git a/mdoc_term.c b/mdoc_term.c index d57eacd9..2bdb85a0 100644 --- a/mdoc_term.c +++ b/mdoc_term.c @@ -1,4 +1,4 @@ -/* $Id: mdoc_term.c,v 1.190 2010/09/27 11:21:39 kristaps Exp $ */ +/* $Id: mdoc_term.c,v 1.191 2010/09/27 23:03:44 schwarze Exp $ */ /* * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons * Copyright (c) 2010 Ingo Schwarze @@ -81,7 +81,6 @@ static void termp_lb_post(DECL_ARGS); static void termp_nm_post(DECL_ARGS); static void termp_pf_post(DECL_ARGS); static void termp_quote_post(DECL_ARGS); -static void termp_quote_post(DECL_ARGS); static void termp_sh_post(DECL_ARGS); static void termp_ss_post(DECL_ARGS); -- cgit v1.2.3