0
0
mirror of https://github.com/vim/vim.git synced 2025-07-04 23:07:33 -04:00

updated for version 7.2-178

This commit is contained in:
Bram Moolenaar 2009-05-16 19:07:03 +00:00
parent af0167fa39
commit e1fbddcd62
2 changed files with 11 additions and 10 deletions

View File

@ -2841,7 +2841,7 @@ get_special_key_code(name)
get_key_name(i) get_key_name(i)
int i; int i;
{ {
if (i >= KEY_NAMES_TABLE_LEN) if (i >= (int)KEY_NAMES_TABLE_LEN)
return NULL; return NULL;
return key_names_table[i].name; return key_names_table[i].name;
} }
@ -3869,7 +3869,8 @@ typedef struct ff_visited
* use filename. * use filename.
*/ */
#ifdef UNIX #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 */ ino_t ffv_ino; /* inode number */
#endif #endif
/* The memory for this struct is allocated according to the length of /* The memory for this struct is allocated according to the length of
@ -4059,13 +4060,12 @@ vim_findnext()
* This function silently ignores a few errors, vim_findfile() will have * This function silently ignores a few errors, vim_findfile() will have
* limited functionality then. * limited functionality then.
*/ */
/*ARGSUSED*/
void * void *
vim_findfile_init(path, filename, stopdirs, level, free_visited, find_what, vim_findfile_init(path, filename, stopdirs, level, free_visited, find_what,
search_ctx_arg, tagfile, rel_fname) search_ctx_arg, tagfile, rel_fname)
char_u *path; char_u *path;
char_u *filename; char_u *filename;
char_u *stopdirs; char_u *stopdirs UNUSED;
int level; int level;
int free_visited; int free_visited;
int find_what; int find_what;
@ -5063,10 +5063,9 @@ ff_check_visited(visited_list, fname
{ {
if ( if (
#ifdef UNIX #ifdef UNIX
!url !url ? (vp->ffv_dev_valid && vp->ffv_dev == st.st_dev
? (vp->ffv_dev == st.st_dev && vp->ffv_ino == st.st_ino)
&& vp->ffv_ino == st.st_ino) :
:
#endif #endif
fnamecmp(vp->ffv_fname, ff_expand_buffer) == 0 fnamecmp(vp->ffv_fname, ff_expand_buffer) == 0
) )
@ -5091,14 +5090,14 @@ ff_check_visited(visited_list, fname
#ifdef UNIX #ifdef UNIX
if (!url) if (!url)
{ {
vp->ffv_dev_valid = TRUE;
vp->ffv_ino = st.st_ino; vp->ffv_ino = st.st_ino;
vp->ffv_dev = st.st_dev; vp->ffv_dev = st.st_dev;
vp->ffv_fname[0] = NUL; vp->ffv_fname[0] = NUL;
} }
else else
{ {
vp->ffv_ino = 0; vp->ffv_dev_valid = FALSE;
vp->ffv_dev = -1;
#endif #endif
STRCPY(vp->ffv_fname, ff_expand_buffer); STRCPY(vp->ffv_fname, ff_expand_buffer);
#ifdef UNIX #ifdef UNIX

View File

@ -676,6 +676,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
178,
/**/ /**/
177, 177,
/**/ /**/