From: Unknown <esr@thyrsus.com>
Date: Mon, 7 Oct 2013 17:09:25 +0000 (+0000)
Subject: Problems with muttrc.5:
X-Git-Tag: neomutt-20160307~137^2~13
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d919a86b3ef32bfdd72b3aa81f72bda99d0b829b;p=neomutt

Problems with muttrc.5:

Ambiguous or invalid backslash.  This doesn't cause groff a problem.
but it confuses doclifter and may confuse older troff implementations.

Unknown or invalid macro.  That is, one that does not fit in the
macro set that the man page seems to be using.  This is a serious
error; it often means part of your text is being lost or rendered
incorrectly.

Use local definitions of .EX/.EE or .DS/.DE to avoid low-level troff
requests in the page body.  There are plans to add these to groff man;
in the interim, this patch adds a compatible definition to your page.
---

diff --git a/doc/makedoc.c b/doc/makedoc.c
index 9d1d3b7c0..1fcbc2402 100644
--- a/doc/makedoc.c
+++ b/doc/makedoc.c
@@ -976,13 +976,13 @@ static int print_it (int special, char *str, FILE *out, int docstat)
 	}
 	case SP_START_TAB:
 	{
-	  fputs ("\n.IP\n.DS\n.sp\n.ft CR\n.nf\n", out);
+	  fputs ("\n.IP\n.EX\n", out);
 	  docstat |= D_TAB | D_NL;
 	  break;
 	}
 	case SP_END_TAB:
 	{
-	  fputs ("\n.fi\n.ec\n.ft P\n.sp\n", out);
+	  fputs ("\n.EE\n", out);
 	  docstat &= ~D_TAB;
 	  docstat |= D_NL;
 	  break;
diff --git a/doc/muttrc.man.head b/doc/muttrc.man.head
index e5db1fd8a..30b96a23d 100644
--- a/doc/muttrc.man.head
+++ b/doc/muttrc.man.head
@@ -18,6 +18,14 @@
 .\"     along with this program; if not, write to the Free Software
 .\"     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 .\"
+.de EX
+.nf
+.ft CW
+..
+.de EE
+.ft
+.fi
+..
 .TH muttrc 5 "September 2002" Unix "User Manuals"
 .SH NAME
 muttrc \- Configuration file for the Mutt Mail User Agent
@@ -270,7 +278,7 @@ known mailing lists.  The \fBunlists\fP command removes a mailing
 list from the lists of known and subscribed mailing lists.  The
 \fBsubscribe\fP command adds a mailing list to the lists of known
 and subscribed mailing lists.  The \fBunsubscribe\fP command removes
-it from the list of subscribed mailing lists. The \fb-group\fP flag
+it from the list of subscribed mailing lists. The \fB-group\fP flag
 adds all of the subsequent regular expressions to the named group.
 .TP
 \fBmbox-hook\fP [\fB!\fP]\fIpattern\fP \fImailbox\fP
@@ -385,11 +393,12 @@ variables will reset to their compile time defaults.
 .TP
 \fBsource\fP \fIfilename\fP
 The given file will be evaluated as a configuration file.
-.TP
+.PP
 .nf
 \fBspam\fP \fIpattern\fP \fIformat\fP
 \fBnospam\fP \fIpattern\fP
 .fi
+.IP
 These commands define spam-detection patterns from external spam
 filters, so that mutt can sort, limit, and search on
 ``spam tags'' or ``spam attributes'', or display them