socsvn commit: r237526 - in soc2012/jhagewood: diff3 mdocml
mdocml/mdocml-1.12.1
jhagewood at FreeBSD.org
jhagewood at FreeBSD.org
Tue Jun 12 03:43:20 UTC 2012
Author: jhagewood
Date: Tue Jun 12 03:43:17 2012
New Revision: 237526
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=237526
Log:
Modified:
soc2012/jhagewood/diff3/hagewood-diff3.patch
soc2012/jhagewood/mdocml/hagewood-mdocml-ti.patch
soc2012/jhagewood/mdocml/mdocml-1.12.1/mdoc_term.c
Modified: soc2012/jhagewood/diff3/hagewood-diff3.patch
==============================================================================
--- soc2012/jhagewood/diff3/hagewood-diff3.patch Tue Jun 12 01:13:59 2012 (r237525)
+++ soc2012/jhagewood/diff3/hagewood-diff3.patch Tue Jun 12 03:43:17 2012 (r237526)
@@ -11,7 +11,7 @@
.include <bsd.prog.mk>
diff -rupN jhagewood/diff3/diff3-orig/diff3prog.c jhagewood/diff3/diff3/diff3prog.c
--- jhagewood/diff3/diff3-orig/diff3prog.c 2012-06-10 03:31:05.000000000 -0400
-+++ jhagewood/diff3/diff3/diff3prog.c 2012-06-11 21:26:48.000000000 -0400
++++ jhagewood/diff3/diff3/diff3prog.c 2012-06-12 01:22:51.000000000 -0400
@@ -64,24 +64,34 @@
* @(#)diff3.c 8.1 (Berkeley) 6/6/93
*/
@@ -25,7 +25,7 @@
#endif
+#endif /* not lint */
+#include <sys/cdefs.h>
-+__FBSDID("$FreeBSD$");
++__FBSDID("$FreeBSD: soc2012/jhagewood/diff3/diff3/diff3prog.c 237524 2012-06-12 01:22:49Z jhagewood $");
+#include <ctype.h>
+#include <err.h>
Modified: soc2012/jhagewood/mdocml/hagewood-mdocml-ti.patch
==============================================================================
--- soc2012/jhagewood/mdocml/hagewood-mdocml-ti.patch Tue Jun 12 01:13:59 2012 (r237525)
+++ soc2012/jhagewood/mdocml/hagewood-mdocml-ti.patch Tue Jun 12 03:43:17 2012 (r237526)
@@ -45,7 +45,7 @@
{ in_line_eoln, 0 }, /* %U */
diff -rupN jhagewood/mdocml/mdocml-1.12.1-orig/mdoc_term.c jhagewood/mdocml/mdocml-1.12.1/mdoc_term.c
--- jhagewood/mdocml/mdocml-1.12.1-orig/mdoc_term.c 2012-06-10 03:31:06.000000000 -0400
-+++ jhagewood/mdocml/mdocml-1.12.1/mdoc_term.c 2012-06-10 03:31:06.000000000 -0400
++++ jhagewood/mdocml/mdocml-1.12.1/mdoc_term.c 2012-06-12 03:42:29.000000000 -0400
@@ -115,6 +115,7 @@ static int termp_sh_pre(DECL_ARGS);
static int termp_sm_pre(DECL_ARGS);
static int termp_sp_pre(DECL_ARGS);
@@ -58,17 +58,18 @@
{ NULL, NULL }, /* En */ /* TODO */
{ termp_xx_pre, NULL }, /* Dx */
{ NULL, termp____post }, /* %Q */
-+ { termp_ti_pre, NULL } /* ti */
++ { termp_ti_pre, NULL }, /* ti */
{ termp_sp_pre, NULL }, /* br */
{ termp_sp_pre, NULL }, /* sp */
{ termp_under_pre, termp____post }, /* %U */
-@@ -1816,6 +1818,10 @@ termp_ss_post(DECL_ARGS)
+@@ -1816,6 +1818,11 @@ termp_ss_post(DECL_ARGS)
term_newln(p);
}
+static int
+termp_ti_pre(DECL_ARGS) {
+
++ p->offset = term_len(p, p->defindent);
+}
/* ARGSUSED */
Modified: soc2012/jhagewood/mdocml/mdocml-1.12.1/mdoc_term.c
==============================================================================
--- soc2012/jhagewood/mdocml/mdocml-1.12.1/mdoc_term.c Tue Jun 12 01:13:59 2012 (r237525)
+++ soc2012/jhagewood/mdocml/mdocml-1.12.1/mdoc_term.c Tue Jun 12 03:43:17 2012 (r237526)
@@ -241,7 +241,7 @@
{ NULL, NULL }, /* En */ /* TODO */
{ termp_xx_pre, NULL }, /* Dx */
{ NULL, termp____post }, /* %Q */
- { termp_ti_pre, NULL } /* ti */
+ { termp_ti_pre, NULL }, /* ti */
{ termp_sp_pre, NULL }, /* br */
{ termp_sp_pre, NULL }, /* sp */
{ termp_under_pre, termp____post }, /* %U */
@@ -1821,6 +1821,7 @@
static int
termp_ti_pre(DECL_ARGS) {
+ p->offset = term_len(p, p->defindent);
}
/* ARGSUSED */
More information about the svn-soc-all
mailing list