updated for version 7.2-178
diff --git a/src/misc2.c b/src/misc2.c
index 9fda8d5..0537993 100644
--- a/src/misc2.c
+++ b/src/misc2.c
@@ -2841,7 +2841,7 @@
get_key_name(i)
int i;
{
- if (i >= KEY_NAMES_TABLE_LEN)
+ if (i >= (int)KEY_NAMES_TABLE_LEN)
return NULL;
return key_names_table[i].name;
}
@@ -3869,7 +3869,8 @@
* use filename.
*/
#ifdef UNIX
- int ffv_dev; /* device number (-1 if not set) */
+ int ffv_dev_valid; /* ffv_dev and ffv_ino were set */
+ dev_t ffv_dev; /* device number */
ino_t ffv_ino; /* inode number */
#endif
/* The memory for this struct is allocated according to the length of
@@ -4059,13 +4060,12 @@
* This function silently ignores a few errors, vim_findfile() will have
* limited functionality then.
*/
-/*ARGSUSED*/
void *
vim_findfile_init(path, filename, stopdirs, level, free_visited, find_what,
search_ctx_arg, tagfile, rel_fname)
char_u *path;
char_u *filename;
- char_u *stopdirs;
+ char_u *stopdirs UNUSED;
int level;
int free_visited;
int find_what;
@@ -5063,10 +5063,9 @@
{
if (
#ifdef UNIX
- !url
- ? (vp->ffv_dev == st.st_dev
- && vp->ffv_ino == st.st_ino)
- :
+ !url ? (vp->ffv_dev_valid && vp->ffv_dev == st.st_dev
+ && vp->ffv_ino == st.st_ino)
+ :
#endif
fnamecmp(vp->ffv_fname, ff_expand_buffer) == 0
)
@@ -5091,14 +5090,14 @@
#ifdef UNIX
if (!url)
{
+ vp->ffv_dev_valid = TRUE;
vp->ffv_ino = st.st_ino;
vp->ffv_dev = st.st_dev;
vp->ffv_fname[0] = NUL;
}
else
{
- vp->ffv_ino = 0;
- vp->ffv_dev = -1;
+ vp->ffv_dev_valid = FALSE;
#endif
STRCPY(vp->ffv_fname, ff_expand_buffer);
#ifdef UNIX
diff --git a/src/version.c b/src/version.c
index 258fc64..1a7c803 100644
--- a/src/version.c
+++ b/src/version.c
@@ -677,6 +677,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 178,
+/**/
177,
/**/
176,