summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/mark.c5
-rw-r--r--src/version.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/src/mark.c b/src/mark.c
index 2669cb14c..f8b4c576f 100644
--- a/src/mark.c
+++ b/src/mark.c
@@ -1750,7 +1750,10 @@ copy_viminfo_marks(virp, fp_out, count, eof, flags)
{
if (line[1] != NUL)
{
- sscanf((char *)line + 2, "%ld %u", &pos.lnum, &pos.col);
+ unsigned u;
+
+ sscanf((char *)line + 2, "%ld %u", &pos.lnum, &u);
+ pos.col = u;
switch (line[1])
{
case '"': curbuf->b_last_cursor = pos; break;
diff --git a/src/version.c b/src/version.c
index e72af8e7d..7e6af4e7d 100644
--- a/src/version.c
+++ b/src/version.c
@@ -715,6 +715,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 128,
+/**/
127,
/**/
126,