patch 8.2.1743: cannot build without the eval feature

Problem:    Cannot build without the eval feature.
Solution:   Move shorten_dir outside of #ifdef.

diff --git a/src/filepath.c b/src/filepath.c
index 197825db36a47ea91c4924bf652519fd7d078b87..e2131a4b7000a2ece8ebc4fff9e61f225cd9ff91 100644 (file)
--- a/src/filepath.c
+++ b/src/filepath.c
@@ -710,6 +710,69 @@ repeat:
     return valid;
 }
 
+/*
+ * Shorten the path of a file from "~/foo/../.bar/fname" to "~/f/../.b/fname"
+ * "trim_len" specifies how many characters to keep for each directory.
+ * Must be 1 or more.
+ * It's done in-place.
+ */
+    static void
+shorten_dir_len(char_u *str, int trim_len)
+{
+    char_u     *tail, *s, *d;
+    int                skip = FALSE;
+    int                dirchunk_len = 0;
+
+    tail = gettail(str);
+    d = str;
+    for (s = str; ; ++s)
+    {
+       if (s >= tail)              // copy the whole tail
+       {
+           *d++ = *s;
+           if (*s == NUL)
+               break;
+       }
+       else if (vim_ispathsep(*s))         // copy '/' and next char
+       {
+           *d++ = *s;
+           skip = FALSE;
+           dirchunk_len = 0;
+       }
+       else if (!skip)
+       {
+           *d++ = *s;                  // copy next char
+           if (*s != '~' && *s != '.') // and leading "~" and "."
+           {
+               ++dirchunk_len; // only count word chars for the size
+
+               // keep copying chars until we have our preferred length (or
+               // until the above if/else branches move us along)
+               if (dirchunk_len >= trim_len)
+                   skip = TRUE;
+           }
+
+           if (has_mbyte)
+           {
+               int l = mb_ptr2len(s);
+
+               while (--l > 0)
+                   *d++ = *++s;
+           }
+       }
+    }
+}
+
+/*
+ * Shorten the path of a file from "~/foo/../.bar/fname" to "~/f/../.b/fname"
+ * It's done in-place.
+ */
+    void
+shorten_dir(char_u *str)
+{
+    shorten_dir_len(str, 1);
+}
+
 #if defined(FEAT_EVAL) || defined(PROTO)
 
 /*
@@ -1351,69 +1414,6 @@ f_mkdir(typval_T *argvars, typval_T *rettv)
     rettv->vval.v_number = vim_mkdir_emsg(dir, prot);
 }
 
-/*
- * Shorten the path of a file from "~/foo/../.bar/fname" to "~/f/../.b/fname"
- * "trim_len" specifies how many characters to keep for each directory.
- * Must be 1 or more.
- * It's done in-place.
- */
-    static void
-shorten_dir_len(char_u *str, int trim_len)
-{
-    char_u     *tail, *s, *d;
-    int                skip = FALSE;
-    int                dirchunk_len = 0;
-
-    tail = gettail(str);
-    d = str;
-    for (s = str; ; ++s)
-    {
-       if (s >= tail)              // copy the whole tail
-       {
-           *d++ = *s;
-           if (*s == NUL)
-               break;
-       }
-       else if (vim_ispathsep(*s))         // copy '/' and next char
-       {
-           *d++ = *s;
-           skip = FALSE;
-           dirchunk_len = 0;
-       }
-       else if (!skip)
-       {
-           *d++ = *s;                  // copy next char
-           if (*s != '~' && *s != '.') // and leading "~" and "."
-           {
-               ++dirchunk_len; // only count word chars for the size
-
-               // keep copying chars until we have our preferred length (or
-               // until the above if/else branches move us along)
-               if (dirchunk_len >= trim_len)
-                   skip = TRUE;
-           }
-
-           if (has_mbyte)
-           {
-               int l = mb_ptr2len(s);
-
-               while (--l > 0)
-                   *d++ = *++s;
-           }
-       }
-    }
-}
-
-/*
- * Shorten the path of a file from "~/foo/../.bar/fname" to "~/f/../.b/fname"
- * It's done in-place.
- */
-    void
-shorten_dir(char_u *str)
-{
-    shorten_dir_len(str, 1);
-}
-
 /*
  * "pathshorten()" function
  */

diff --git a/src/version.c b/src/version.c
index 4983b1b6bfea2002a2d7ca89878e0177e537a319..282c04ef94041b5da98366789a4f47e80169528a 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -750,6 +750,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1743,
 /**/
     1742,
 /**/