summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/textprop.c2
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/textprop.c b/src/textprop.c
index d2536ce77..ba21e751b 100644
--- a/src/textprop.c
+++ b/src/textprop.c
@@ -2289,7 +2289,7 @@ adjust_props_for_split(
*p = prop;
++prevprop.ga_len;
- if (p->tp_col + p->tp_len >= kept)
+ if (p->tp_col != MAXCOL && p->tp_col + p->tp_len >= kept)
p->tp_len = kept - p->tp_col;
if (cont_next)
p->tp_flags |= TP_FLAG_CONT_NEXT;
diff --git a/src/version.c b/src/version.c
index 62a43a708..f1805666c 100644
--- a/src/version.c
+++ b/src/version.c
@@ -704,6 +704,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 462,
+/**/
461,
/**/
460,