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)

diff --git a/src/buffer.c b/src/buffer.c
index 7dd4d34e281296891931bc5aaa1afd46f303f4e6..db0c591613d9f5987d8deb710966eff0bb5aaaf7 100644 (file)
--- a/src/buffer.c
+++ b/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;

diff --git a/src/ex_cmds.c b/src/ex_cmds.c
index abb5f7096f983d2d806bb32fead1eb141750907f..e9fa94f67851284696c71db412ca288a3c5a85b7 100644 (file)
--- a/src/ex_cmds.c
+++ b/src/ex_cmds.c
@@ -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))

diff --git a/src/fileio.c b/src/fileio.c
index 9ab90eb39b6730a5d64e2dcdb09390a9c4f3859b..c7f3ad1768dec1ba7fb33f884520cabe62420284 100644 (file)
--- a/src/fileio.c
+++ b/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 = '.';

diff --git a/src/version.c b/src/version.c
index a6101b57a8c414b23dc3ce22f3c7214e54b78101..20fdcba9983b1802dd8e56ce28321f6a2e5e11af 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -783,6 +783,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    904,
 /**/
     903,
 /**/