Move shorten_filenames back to fileio.c

src/fileio.c

@@ -4702,6 +4702,48 @@ static int make_bom(char_u *buf, char_u *name)
   return (int)(p - buf);
 }
 
+/*
+ * Shorten filenames for all buffers.
+ * When "force" is TRUE: Use full path from now on for files currently being
+ * edited, both for file name and swap file name.  Try to shorten the file
+ * names a bit, if safe to do so.
+ * When "force" is FALSE: Only try to shorten absolute file names.
+ * For buffers that have buftype "nofile" or "scratch": never change the file
+ * name.
+ */
+void shorten_fnames(int force)
+{
+  char_u dirname[MAXPATHL];
+  buf_T       *buf;
+  char_u      *p;
+
+  os_dirname(dirname, MAXPATHL);
+  for (buf = firstbuf; buf != NULL; buf = buf->b_next) {
+    if (buf->b_fname != NULL
+        && !bt_nofile(buf)
+        && !path_with_url(buf->b_fname)
+        && (force
+            || buf->b_sfname == NULL
+            || os_is_absolute_path(buf->b_sfname))) {
+      vim_free(buf->b_sfname);
+      buf->b_sfname = NULL;
+      p = shorten_fname(buf->b_ffname, dirname);
+      if (p != NULL) {
+        buf->b_sfname = vim_strsave(p);
+        buf->b_fname = buf->b_sfname;
+      }
+      if (p == NULL || buf->b_fname == NULL)
+        buf->b_fname = buf->b_ffname;
+    }
+
+    /* Always make the swap file name a full path, a "nofile" buffer may
+     * also have a swap file. */
+    mf_fullname(buf->b_ml.ml_mfp);
+  }
+  status_redraw_all();
+  redraw_tabline = TRUE;
+}
+
 /*
  * add extension to file name - change path/fo.o.h to path/fo.o.h.ext or
  * fo_o_h.ext for MSDOS or when shortname option set.

src/fileio.h

@@ -33,6 +33,7 @@ int buf_write(buf_T *buf, char_u *fname, char_u *sfname, linenr_T start,
               int filtering);
 void msg_add_fname(buf_T *buf, char_u *fname);
 void msg_add_lines(int insert_space, long lnum, off_t nchars);
+void shorten_fnames(int force);
 char_u *modname(char_u *fname, char_u *ext, int prepend_dot);
 char_u *buf_modname(int shortname, char_u *fname, char_u *ext,
                     int prepend_dot);

src/path.c

@@ -1833,48 +1833,6 @@ char_u *shorten_fname(char_u *full_path, char_u *dir_name)
   return p;
 }
 
-/*
- * Shorten filenames for all buffers.
- * When "force" is TRUE: Use full path from now on for files currently being
- * edited, both for file name and swap file name.  Try to shorten the file
- * names a bit, if safe to do so.
- * When "force" is FALSE: Only try to shorten absolute file names.
- * For buffers that have buftype "nofile" or "scratch": never change the file
- * name.
- */
-void shorten_fnames(int force)
-{
-  char_u dirname[MAXPATHL];
-  buf_T       *buf;
-  char_u      *p;
-
-  os_dirname(dirname, MAXPATHL);
-  for (buf = firstbuf; buf != NULL; buf = buf->b_next) {
-    if (buf->b_fname != NULL
-        && !bt_nofile(buf)
-        && !path_with_url(buf->b_fname)
-        && (force
-            || buf->b_sfname == NULL
-            || os_is_absolute_path(buf->b_sfname))) {
-      vim_free(buf->b_sfname);
-      buf->b_sfname = NULL;
-      p = shorten_fname(buf->b_ffname, dirname);
-      if (p != NULL) {
-        buf->b_sfname = vim_strsave(p);
-        buf->b_fname = buf->b_sfname;
-      }
-      if (p == NULL || buf->b_fname == NULL)
-        buf->b_fname = buf->b_ffname;
-    }
-
-    /* Always make the swap file name a full path, a "nofile" buffer may
-     * also have a swap file. */
-    mf_fullname(buf->b_ml.ml_mfp);
-  }
-  status_redraw_all();
-  redraw_tabline = TRUE;
-}
-
 #if (defined(FEAT_DND) && defined(FEAT_GUI_GTK)) \
   || defined(FEAT_GUI_MSWIN) \
   || defined(FEAT_GUI_MAC) \

src/path.h

@@ -37,7 +37,6 @@ int pathcmp(const char *p, const char *q, int maxlen);
 int mch_expandpath(garray_T *gap, char_u *path, int flags);
 char_u *shorten_fname1(char_u *full_path);
 char_u *shorten_fname(char_u *full_path, char_u *dir_name);
-void shorten_fnames(int force);
 void shorten_filenames(char_u **fnames, int count);
 int expand_wildcards_eval(char_u **pat, int *num_file, char_u ***file,
                           int flags);