mirror of
https://github.com/vim/vim.git
synced 2025-07-26 11:04:33 -04:00
patch 8.1.0904: USE_LONG_FNAME never defined
Problem: USE_LONG_FNAME never defined. Solution: Remove using USE_LONG_FNAME. (Ken Takata, closes #3938)
This commit is contained in:
parent
beb7574d6b
commit
00f148d2f2
14
src/buffer.c
14
src/buffer.c
@ -3168,10 +3168,7 @@ setfname(
|
||||
return FAIL;
|
||||
}
|
||||
#ifdef USE_FNAME_CASE
|
||||
# ifdef USE_LONG_FNAME
|
||||
if (USE_LONG_FNAME)
|
||||
# endif
|
||||
fname_case(sfname, 0); /* set correct case for short file name */
|
||||
fname_case(sfname, 0); /* set correct case for short file name */
|
||||
#endif
|
||||
if (buf->b_sfname != buf->b_ffname)
|
||||
vim_free(buf->b_sfname);
|
||||
@ -4808,13 +4805,8 @@ fix_fname(char_u *fname)
|
||||
fname = vim_strsave(fname);
|
||||
|
||||
# ifdef USE_FNAME_CASE
|
||||
# ifdef USE_LONG_FNAME
|
||||
if (USE_LONG_FNAME)
|
||||
# endif
|
||||
{
|
||||
if (fname != NULL)
|
||||
fname_case(fname, 0); /* set correct case for file name */
|
||||
}
|
||||
if (fname != NULL)
|
||||
fname_case(fname, 0); /* set correct case for file name */
|
||||
# endif
|
||||
|
||||
return fname;
|
||||
|
@ -3826,11 +3826,8 @@ do_ecmd(
|
||||
if (sfname == NULL)
|
||||
sfname = ffname;
|
||||
#ifdef USE_FNAME_CASE
|
||||
# ifdef USE_LONG_FNAME
|
||||
if (USE_LONG_FNAME)
|
||||
# endif
|
||||
if (sfname != NULL)
|
||||
fname_case(sfname, 0); /* set correct case for sfname */
|
||||
if (sfname != NULL)
|
||||
fname_case(sfname, 0); /* set correct case for sfname */
|
||||
#endif
|
||||
|
||||
if ((flags & ECMD_ADDBUF) && (ffname == NULL || *ffname == NUL))
|
||||
|
20
src/fileio.c
20
src/fileio.c
@ -6224,13 +6224,7 @@ buf_modname(
|
||||
*/
|
||||
for (ptr = retval + fnamelen; ptr > retval; MB_PTR_BACK(retval, ptr))
|
||||
{
|
||||
if (*ext == '.'
|
||||
#ifdef USE_LONG_FNAME
|
||||
&& (!USE_LONG_FNAME || shortname)
|
||||
#else
|
||||
&& shortname
|
||||
#endif
|
||||
)
|
||||
if (*ext == '.' && shortname)
|
||||
if (*ptr == '.') /* replace '.' by '_' */
|
||||
*ptr = '_';
|
||||
if (vim_ispathsep(*ptr))
|
||||
@ -6249,11 +6243,7 @@ buf_modname(
|
||||
/*
|
||||
* For 8.3 file names we may have to reduce the length.
|
||||
*/
|
||||
#ifdef USE_LONG_FNAME
|
||||
if (!USE_LONG_FNAME || shortname)
|
||||
#else
|
||||
if (shortname)
|
||||
#endif
|
||||
{
|
||||
/*
|
||||
* 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)
|
||||
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
|
||||
* '_' before the dot, because just ".ext" may be invalid if it's on a
|
||||
@ -6310,11 +6300,7 @@ buf_modname(
|
||||
/*
|
||||
* Prepend the dot.
|
||||
*/
|
||||
if (prepend_dot && !shortname && *(e = gettail(retval)) != '.'
|
||||
#ifdef USE_LONG_FNAME
|
||||
&& USE_LONG_FNAME
|
||||
#endif
|
||||
)
|
||||
if (prepend_dot && !shortname && *(e = gettail(retval)) != '.')
|
||||
{
|
||||
STRMOVE(e + 1, e);
|
||||
*e = '.';
|
||||
|
@ -783,6 +783,8 @@ static char *(features[]) =
|
||||
|
||||
static int included_patches[] =
|
||||
{ /* Add new patch number below this line */
|
||||
/**/
|
||||
904,
|
||||
/**/
|
||||
903,
|
||||
/**/
|
||||
|
Loading…
x
Reference in New Issue
Block a user