aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-24 03:44:06 -04:00
Code Activity

updated for version 7.1-135

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

20
src/buffer.c
View File

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

2
src/version.c
View File

@@ -666,6 +666,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 */
/**/
135,
/**/ /**/
134, 134,
/**/ /**/