===================================================================
RCS file: /cvs/mandoc/man_macro.c,v
retrieving revision 1.109
retrieving revision 1.112
diff -u -p -r1.109 -r1.112
--- mandoc/man_macro.c	2015/04/23 15:35:59	1.109
+++ mandoc/man_macro.c	2015/10/06 18:32:19	1.112
@@ -1,4 +1,4 @@
-/*	$Id: man_macro.c,v 1.109 2015/04/23 15:35:59 schwarze Exp $ */
+/*	$Id: man_macro.c,v 1.112 2015/10/06 18:32:19 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2012, 2013, 2014, 2015 Ingo Schwarze <schwarze@openbsd.org>
@@ -63,8 +63,8 @@ const	struct man_macro __man_macros[MAN_MAX] = {
 	{ in_line_eoln, 0 }, /* IR */
 	{ in_line_eoln, 0 }, /* RI */
 	{ in_line_eoln, MAN_NSCOPED }, /* sp */
-	{ in_line_eoln, MAN_BSCOPE }, /* nf */
-	{ in_line_eoln, MAN_BSCOPE }, /* fi */
+	{ in_line_eoln, MAN_NSCOPED }, /* nf */
+	{ in_line_eoln, MAN_NSCOPED }, /* fi */
 	{ blk_close, MAN_BSCOPE }, /* RE */
 	{ blk_exp, MAN_BSCOPE }, /* RS */
 	{ in_line_eoln, 0 }, /* DT */
@@ -225,7 +225,6 @@ blk_close(MACRO_PROT_ARGS)
 		break;
 	default:
 		abort();
-		/* NOTREACHED */
 	}
 
 	for (nn = man->last->parent; nn; nn = nn->parent)
@@ -421,8 +420,8 @@ man_args(struct roff_man *man, int line, int *pos, cha
 	assert(' ' != *start);
 
 	if ('\0' == *start)
-		return(0);
+		return 0;
 
 	*v = mandoc_getarg(man->parse, v, line, pos);
-	return(1);
+	return 1;
 }