From 60f3ca299cfdd742129822cb1c94240fd2b245d8 Mon Sep 17 00:00:00 2001 From: Ingo Schwarze Date: Mon, 7 Jul 2014 21:36:20 +0000 Subject: Clean up ERROR messages related to document structure and macros: Hierarchical naming and mention macro names in messages. --- man_macro.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'man_macro.c') diff --git a/man_macro.c b/man_macro.c index 51e91608..bf45641a 100644 --- a/man_macro.c +++ b/man_macro.c @@ -1,4 +1,4 @@ -/* $Id: man_macro.c,v 1.83 2014/07/07 19:18:15 schwarze Exp $ */ +/* $Id: man_macro.c,v 1.84 2014/07/07 21:36:20 schwarze Exp $ */ /* * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons * Copyright (c) 2012, 2013 Ingo Schwarze @@ -110,7 +110,7 @@ man_unscope(struct man *man, const struct man_node *to) MAN_BLOCK == n->type && 0 == (MAN_VALID & n->flags) && MAN_EXPLICIT & man_macros[n->tok].flags) - mandoc_msg(MANDOCERR_SCOPEEXIT, + mandoc_msg(MANDOCERR_BLK_NOEND, man->parse, n->line, n->pos, man_macronames[n->tok]); /* @@ -270,7 +270,8 @@ blk_close(MACRO_PROT_ARGS) break; if (NULL == nn) { - man_pmsg(man, line, ppos, MANDOCERR_NOSCOPE); + mandoc_msg(MANDOCERR_BLK_NOTOPEN, man->parse, + line, ppos, man_macronames[tok]); if ( ! rew_scope(MAN_BLOCK, man, MAN_PP)) return(0); } else -- cgit v1.2.3-56-ge451