summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2012-05-25 11:02:41 +0200
committerBram Moolenaar <Bram@vim.org>2012-05-25 11:02:41 +0200
commit17bd9dc2bd5621f1a6dbbfccca79b7e4ccf010c5 (patch)
tree085ac48974b42e055996805b35b0424625a8e84a
parent1763969e5cffc506a4966de9082eb0d7864c6427 (diff)
downloadvim-git-17bd9dc2bd5621f1a6dbbfccca79b7e4ccf010c5.tar.gz
updated for version 7.3.525v7.3.525
Problem: Compiler warning on 64 bit MS-Windows. Solution: Add type cast. (Mike Williams)
-rw-r--r--src/ex_getln.c2
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/ex_getln.c b/src/ex_getln.c
index 3d0c26f05..a3a9c7b91 100644
--- a/src/ex_getln.c
+++ b/src/ex_getln.c
@@ -5263,7 +5263,7 @@ get_history_arg(xp, idx)
{
static char_u compl[2] = { NUL, NUL };
char *short_names = ":=@>?/";
- int short_names_count = STRLEN(short_names);
+ int short_names_count = (int)STRLEN(short_names);
int history_name_count = sizeof(history_names) / sizeof(char *) - 1;
if (idx < short_names_count)
diff --git a/src/version.c b/src/version.c
index 6878ef2a1..50c3d03d4 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 */
/**/
+ 525,
+/**/
524,
/**/
523,