summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2019-05-04 14:05:08 +0200
committerBram Moolenaar <Bram@vim.org>2019-05-04 14:05:08 +0200
commite4f5f3aa3d597ec9188e01b004013a02bceb4026 (patch)
tree1712c0473d4fdf3947a533b2e1945684979141e8
parente5c83286bb9a72cc686f2826e605eddebe3c730c (diff)
patch 8.1.1260: comparing with pointer instead of valuev8.1.1260
Problem: Comparing with pointer instead of value. Solution: Add a "*". (Ken Takata, closes #4336)
-rw-r--r--src/usercmd.c6
-rw-r--r--src/version.c2
2 files changed, 5 insertions, 3 deletions
diff --git a/src/usercmd.c b/src/usercmd.c
index ca01a3ca39..45d7ea052b 100644
--- a/src/usercmd.c
+++ b/src/usercmd.c
@@ -824,10 +824,10 @@ invalid_count:
emsg(_("E179: argument required for -addr"));
return FAIL;
}
- if (parse_addr_type_arg(val, (int)vallen, addr_type_arg) == FAIL)
+ if (parse_addr_type_arg(val, (int)vallen, addr_type_arg) == FAIL)
return FAIL;
- if (addr_type_arg != ADDR_LINES)
- *argt |= (ZEROR) ;
+ if (*addr_type_arg != ADDR_LINES)
+ *argt |= ZEROR;
}
else
{
diff --git a/src/version.c b/src/version.c
index c8bcdecf02..5941c6e6fa 100644
--- a/src/version.c
+++ b/src/version.c
@@ -768,6 +768,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1260,
+/**/
1259,
/**/
1258,