0
0
mirror of https://github.com/vim/vim.git synced 2025-09-23 03:43:49 -04:00

updated for version 7.1-135

This commit is contained in:
Bram Moolenaar
2007-10-03 12:31:33 +00:00
parent f22129b5c5
commit 9b9422097c
2 changed files with 15 additions and 7 deletions

View File

@@ -4175,21 +4175,27 @@ fix_fname(fname)
* mess up the full path name, even though it starts with a '/'.
* Also expand when there is ".." in the file name, try to remove it,
* because "c:/src/../README" is equal to "c:/README".
* Similarly "c:/src//file" is equal to "c:/src/file".
* For MS-Windows also expand names like "longna~1" to "longname".
*/
#ifdef UNIX
return FullName_save(fname, TRUE);
#else
if (!vim_isAbsName(fname) || strstr((char *)fname, "..") != NULL
#if defined(MSWIN) || defined(DJGPP)
if (!vim_isAbsName(fname)
|| strstr((char *)fname, "..") != NULL
|| strstr((char *)fname, "//") != NULL
# ifdef BACKSLASH_IN_FILENAME
|| strstr((char *)fname, "\\\\") != NULL
# endif
# if defined(MSWIN) || defined(DJGPP)
|| vim_strchr(fname, '~') != NULL
#endif
# endif
)
return FullName_save(fname, FALSE);
fname = vim_strsave(fname);
#ifdef USE_FNAME_CASE
# ifdef USE_FNAME_CASE
# ifdef USE_LONG_FNAME
if (USE_LONG_FNAME)
# endif
@@ -4197,7 +4203,7 @@ fix_fname(fname)
if (fname != NULL)
fname_case(fname, 0); /* set correct case for file name */
}
#endif
# endif
return fname;
#endif

View File

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