aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

patch 8.1.0904: USE_LONG_FNAME never defined

Browse Source 
Problem:    USE_LONG_FNAME never defined.
Solution:   Remove using USE_LONG_FNAME. (Ken Takata, closes #3938)
This commit is contained in:
Bram Moolenaar 2019-02-12 22:37:27 +01:00
parent beb7574d6b
commit 00f148d2f2
4 changed files with 10 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/buffer.c
View File

@ -3168,10 +3168,7 @@ setfname(
return FAIL; return FAIL;
} }
#ifdef USE_FNAME_CASE #ifdef USE_FNAME_CASE
# ifdef USE_LONG_FNAME fname_case(sfname, 0); /* set correct case for short file name */
if (USE_LONG_FNAME)
# endif
fname_case(sfname, 0); /* set correct case for short file name */
#endif #endif
if (buf->b_sfname != buf->b_ffname) if (buf->b_sfname != buf->b_ffname)
vim_free(buf->b_sfname); vim_free(buf->b_sfname);
@ -4808,13 +4805,8 @@ fix_fname(char_u *fname)
fname = vim_strsave(fname); fname = vim_strsave(fname);
# ifdef USE_FNAME_CASE # ifdef USE_FNAME_CASE
# ifdef USE_LONG_FNAME if (fname != NULL)
if (USE_LONG_FNAME) fname_case(fname, 0); /* set correct case for file name */
# endif
{
if (fname != NULL)
fname_case(fname, 0); /* set correct case for file name */
}
# endif # endif
return fname; return fname;

7
src/ex_cmds.c
View File

@ -3826,11 +3826,8 @@ do_ecmd(
if (sfname == NULL) if (sfname == NULL)
sfname = ffname; sfname = ffname;
#ifdef USE_FNAME_CASE #ifdef USE_FNAME_CASE
# ifdef USE_LONG_FNAME if (sfname != NULL)
if (USE_LONG_FNAME) fname_case(sfname, 0); /* set correct case for sfname */
# endif
if (sfname != NULL)
fname_case(sfname, 0); /* set correct case for sfname */
#endif #endif
if ((flags & ECMD_ADDBUF) && (ffname == NULL || *ffname == NUL)) if ((flags & ECMD_ADDBUF) && (ffname == NULL || *ffname == NUL))

20
src/fileio.c
View File

@ -6224,13 +6224,7 @@ buf_modname(
*/ */
for (ptr = retval + fnamelen; ptr > retval; MB_PTR_BACK(retval, ptr)) for (ptr = retval + fnamelen; ptr > retval; MB_PTR_BACK(retval, ptr))
{ {
if (*ext == '.' if (*ext == '.' && shortname)
#ifdef USE_LONG_FNAME
&& (!USE_LONG_FNAME || shortname)
#else
&& shortname
#endif
)
if (*ptr == '.') /* replace '.' by '_' */ if (*ptr == '.') /* replace '.' by '_' */
*ptr = '_'; *ptr = '_';
if (vim_ispathsep(*ptr)) if (vim_ispathsep(*ptr))
@ -6249,11 +6243,7 @@ buf_modname(
/* /*
* For 8.3 file names we may have to reduce the length. * For 8.3 file names we may have to reduce the length.
*/ */
#ifdef USE_LONG_FNAME
if (!USE_LONG_FNAME || shortname)
#else
if (shortname) if (shortname)
#endif
{ {
/* /*
* If there is no file name, or the file name ends in '/', and the * If there is no file name, or the file name ends in '/', and the
@ -6291,7 +6281,7 @@ buf_modname(
else if ((int)STRLEN(e) + extlen > 4) else if ((int)STRLEN(e) + extlen > 4)
s = e + 4 - extlen; s = e + 4 - extlen;
} }
#if defined(USE_LONG_FNAME) || defined(WIN3264) #ifdef WIN3264
/* /*
* If there is no file name, and the extension starts with '.', put a * If there is no file name, and the extension starts with '.', put a
* '_' before the dot, because just ".ext" may be invalid if it's on a * '_' before the dot, because just ".ext" may be invalid if it's on a
@ -6310,11 +6300,7 @@ buf_modname(
/* /*
* Prepend the dot. * Prepend the dot.
*/ */
if (prepend_dot && !shortname && *(e = gettail(retval)) != '.' if (prepend_dot && !shortname && *(e = gettail(retval)) != '.')
#ifdef USE_LONG_FNAME
&& USE_LONG_FNAME
#endif
)
{ {
STRMOVE(e + 1, e); STRMOVE(e + 1, e);
*e = '.'; *e = '.';

2
src/version.c
View File

@ -783,6 +783,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 */
/**/
904,
/**/ /**/
903, 903,
/**/ /**/