summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2006-08-22 17:55:55 +0000
committerBram Moolenaar <Bram@vim.org>2006-08-22 17:55:55 +0000
commitd7fd0c4a372e6798ff02c73aefd55ec04643b429 (patch)
tree9cfbdb408be3d83072cd906d0d470a0aaa37f09b
parent0a5fd8badcb6afd6daf4cf1df9394bda07d5c42f (diff)
downloadvim-d7fd0c4a372e6798ff02c73aefd55ec04643b429.zip
updated for version 7.0-064
-rw-r--r--src/edit.c3
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 1 deletions
diff --git a/src/edit.c b/src/edit.c
index a8044151b..fb347b85d 100644
--- a/src/edit.c
+++ b/src/edit.c
@@ -2760,6 +2760,7 @@ ins_compl_dictionaries(dict_start, pat, flags, thesaurus)
}
else
# endif
+ if (count > 0) /* avoid warning for using "files" uninit */
{
ins_compl_files(count, files, thesaurus, flags,
&regmatch, buf, &dir);
@@ -3222,7 +3223,6 @@ ins_compl_prep(c)
int c;
{
char_u *ptr;
- int temp;
int want_cindent;
int retval = FALSE;
@@ -3378,6 +3378,7 @@ ins_compl_prep(c)
if (compl_curr_match != NULL || compl_leader != NULL || c == Ctrl_E)
{
char_u *p;
+ int temp = 0;
/*
* If any of the original typed text has been changed, eg when
diff --git a/src/version.c b/src/version.c
index 4851f8974..a708d3073 100644
--- a/src/version.c
+++ b/src/version.c
@@ -667,6 +667,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 64,
+/**/
63,
/**/
62,