Module Name:    src
Committed By:   joerg
Date:           Thu Jun 17 00:56:03 UTC 2010

Modified Files:
        src/external/bsd/mdocml/dist: man_term.c mdoc_term.c

Log Message:
Move the character table initialisation a bit earlier for man pages that
contain special characters in the header. From upstream.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.8 -r1.2 src/external/bsd/mdocml/dist/man_term.c
cvs rdiff -u -r1.1.1.9 -r1.2 src/external/bsd/mdocml/dist/mdoc_term.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/mdocml/dist/man_term.c
diff -u src/external/bsd/mdocml/dist/man_term.c:1.1.1.8 src/external/bsd/mdocml/dist/man_term.c:1.2
--- src/external/bsd/mdocml/dist/man_term.c:1.1.1.8	Wed Jun 16 18:09:47 2010
+++ src/external/bsd/mdocml/dist/man_term.c	Thu Jun 17 00:56:03 2010
@@ -159,8 +159,6 @@
 	p->overstep = 0;
 	p->maxrmargin = p->defrmargin;
 
-	term_begin(p, print_man_head, print_man_foot, man_meta(man));
-
 	if (NULL == p->symtab)
 		switch (p->enc) {
 		case (TERMENC_ASCII):
@@ -174,6 +172,7 @@
 	n = man_node(man);
 	m = man_meta(man);
 
+	term_begin(p, print_man_head, print_man_foot, man_meta(man));
 	p->flags |= TERMP_NOSPACE;
 
 	mt.fl = 0;

Index: src/external/bsd/mdocml/dist/mdoc_term.c
diff -u src/external/bsd/mdocml/dist/mdoc_term.c:1.1.1.9 src/external/bsd/mdocml/dist/mdoc_term.c:1.2
--- src/external/bsd/mdocml/dist/mdoc_term.c:1.1.1.9	Wed Jun 16 18:09:49 2010
+++ src/external/bsd/mdocml/dist/mdoc_term.c	Thu Jun 17 00:56:03 2010
@@ -276,8 +276,6 @@
 	p->maxrmargin = p->defrmargin;
 	p->tabwidth = 5;
 
-	term_begin(p, print_mdoc_head, print_foot, mdoc_meta(mdoc));
-
 	if (NULL == p->symtab)
 		switch (p->enc) {
 		case (TERMENC_ASCII):
@@ -291,6 +289,8 @@
 	n = mdoc_node(mdoc);
 	m = mdoc_meta(mdoc);
 
+	term_begin(p, print_mdoc_head, print_foot, mdoc_meta(mdoc));
+
 	if (n->child)
 		print_mdoc_nodelist(p, NULL, m, n->child);
 

Reply via email to