viminfo: Remove old code

2 files changed, 1 insertions, 1539 deletions

diff --git a/src/nvim/mark.c b/src/nvim/mark.c
index 2072483e1d..e88cc11c39 100644
--- a/src/nvim/mark.c
+++ b/src/nvim/mark.c
@@ -1351,7 +1351,7 @@ size_t mark_buffer_amount(const buf_T *const buf)
 void mark_set_global(const char name, const xfmark_T fm, const bool update)
 {
   xfmark_T *fm_tgt = &(namedfm[mark_global_index(name)]);
-  if (fm_tgt == &namedfm[-1]) {
+  if (fm_tgt == &namedfm[0] - 1) {
     return;
   }
   if (update && fm.fmark.timestamp < fm_tgt->fmark.timestamp) {
diff --git a/src/nvim/shada.c b/src/nvim/shada.c
index a7bde92032..a6054db9d0 100644
--- a/src/nvim/shada.c
+++ b/src/nvim/shada.c
@@ -3844,1541 +3844,3 @@ bool shada_removable(const char *name)
   xfree(new_name);
   return retval;
 }
-
-#if 0
-
-static int viminfo_errcnt;
-
-static int no_viminfo(void)
-{
-  /* "vim -i NONE" does not read or write a viminfo file */
-  return use_viminfo != NULL && STRCMP(use_viminfo, "NONE") == 0;
-}
-
-/*
- * Report an error for reading a viminfo file.
- * Count the number of errors.	When there are more than 10, return TRUE.
- */
-int viminfo_error(char *errnum, char *message, char_u *line)
-{
-  vim_snprintf((char *)IObuff, IOSIZE, _("%sviminfo: %s in line: "),
-      errnum, message);
-  STRNCAT(IObuff, line, IOSIZE - STRLEN(IObuff) - 1);
-  if (IObuff[STRLEN(IObuff) - 1] == '\n')
-    IObuff[STRLEN(IObuff) - 1] = NUL;
-  emsg(IObuff);
-  if (++viminfo_errcnt >= 10) {
-    EMSG(_("E136: viminfo: Too many errors, skipping rest of file"));
-    return TRUE;
-  }
-  return FALSE;
-}
-
-/*
- * read_viminfo() -- Read the viminfo file.  Registers etc. which are already
- * set are not over-written unless "flags" includes VIF_FORCEIT. -- webb
- */
-int 
-read_viminfo (
-    char_u *file,          /* file name or NULL to use default name */
-    int flags                  /* VIF_WANT_INFO et al. */
-)
-{
-  FILE        *fp;
-  char_u      *fname;
-
-  if (no_viminfo())
-    return FAIL;
-
-  fname = viminfo_filename(file);       /* get file name in allocated buffer */
-  fp = mch_fopen((char *)fname, READBIN);
-
-  if (p_verbose > 0) {
-    verbose_enter();
-    smsg(_("Reading viminfo file \"%s\"%s%s%s"),
-        fname,
-        (flags & VIF_WANT_INFO) ? _(" info") : "",
-        (flags & VIF_WANT_MARKS) ? _(" marks") : "",
-        (flags & VIF_GET_OLDFILES) ? _(" oldfiles") : "",
-        fp == NULL ? _(" FAILED") : "");
-    verbose_leave();
-  }
-
-  xfree(fname);
-  if (fp == NULL)
-    return FAIL;
-
-  viminfo_errcnt = 0;
-  do_viminfo(fp, NULL, flags);
-
-  fclose(fp);
-  return OK;
-}
-
-/*
- * Write the viminfo file.  The old one is read in first so that effectively a
- * merge of current info and old info is done.  This allows multiple vims to
- * run simultaneously, without losing any marks etc.
- * If "forceit" is TRUE, then the old file is not read in, and only internal
- * info is written to the file.
- */
-void write_viminfo(char_u *file, int forceit)
-{
-  char_u      *fname;
-  FILE        *fp_in = NULL;    /* input viminfo file, if any */
-  FILE        *fp_out = NULL;   /* output viminfo file */
-  char_u      *tempname = NULL;         /* name of temp viminfo file */
-  char_u      *wp;
-#if defined(UNIX)
-  mode_t umask_save;
-#endif
-
-  if (no_viminfo())
-    return;
-
-  fname = viminfo_filename(file);       /* may set to default if NULL */
-
-  fp_in = mch_fopen((char *)fname, READBIN);
-  if (fp_in == NULL) {
-    /* if it does exist, but we can't read it, don't try writing */
-    if (os_file_exists(fname))
-      goto end;
-#if defined(UNIX)
-    /*
-     * For Unix we create the .viminfo non-accessible for others,
-     * because it may contain text from non-accessible documents.
-     */
-    umask_save = umask(077);
-#endif
-    fp_out = mch_fopen((char *)fname, WRITEBIN);
-#if defined(UNIX)
-    (void)umask(umask_save);
-#endif
-  } else {
-    /*
-     * There is an existing viminfo file.  Create a temporary file to
-     * write the new viminfo into, in the same directory as the
-     * existing viminfo file, which will be renamed later.
-     */
-#ifdef UNIX
-    /*
-     * For Unix we check the owner of the file.  It's not very nice to
-     * overwrite a user's viminfo file after a "su root", with a
-     * viminfo file that the user can't read.
-     */
-
-    FileInfo old_info;  // FileInfo of existing viminfo file
-    if (os_fileinfo((char *)fname, &old_info)
-        && getuid() != ROOT_UID
-        && !(old_info.stat.st_uid == getuid()
-             ? (old_info.stat.st_mode & 0200)
-             : (old_info.stat.st_gid == getgid()
-                ? (old_info.stat.st_mode & 0020)
-                : (old_info.stat.st_mode & 0002)))) {
-      int tt = msg_didany;
-
-      /* avoid a wait_return for this message, it's annoying */
-      EMSG2(_("E137: Viminfo file is not writable: %s"), fname);
-      msg_didany = tt;
-      fclose(fp_in);
-      goto end;
-    }
-#endif
-
-    // Make tempname
-    tempname = (char_u *)modname((char *)fname, ".tmp", FALSE);
-    if (tempname != NULL) {
-      /*
-       * Check if tempfile already exists.  Never overwrite an
-       * existing file!
-       */
-      if (os_file_exists(tempname)) {
-        /*
-         * Try another name.  Change one character, just before
-         * the extension.
-         */
-        wp = tempname + STRLEN(tempname) - 5;
-        if (wp < path_tail(tempname))                 /* empty file name? */
-          wp = path_tail(tempname);
-        for (*wp = 'z'; os_file_exists(tempname); --*wp) {
-          /*
-           * They all exist?  Must be something wrong! Don't
-           * write the viminfo file then.
-           */
-          if (*wp == 'a') {
-            xfree(tempname);
-            tempname = NULL;
-            break;
-          }
-        }
-      }
-    }
-
-    if (tempname != NULL) {
-      int fd;
-
-      /* Use os_open() to be able to use O_NOFOLLOW and set file
-       * protection:
-       * Unix: same as original file, but strip s-bit.  Reset umask to
-       * avoid it getting in the way.
-       * Others: r&w for user only. */
-# ifdef UNIX
-      umask_save = umask(0);
-      fd = os_open((char *)tempname,
-          O_CREAT|O_EXCL|O_WRONLY|O_NOFOLLOW,
-          (int)((old_info.stat.st_mode & 0777) | 0600));
-      (void)umask(umask_save);
-# else
-      fd = os_open((char *)tempname,
-          O_CREAT|O_EXCL|O_WRONLY|O_NOFOLLOW, 0600);
-# endif
-      if (fd < 0)
-        fp_out = NULL;
-      else
-        fp_out = fdopen(fd, WRITEBIN);
-
-      /*
-       * If we can't create in the same directory, try creating a
-       * "normal" temp file.
-       */
-      if (fp_out == NULL) {
-        xfree(tempname);
-        if ((tempname = vim_tempname()) != NULL)
-          fp_out = mch_fopen((char *)tempname, WRITEBIN);
-      }
-
-#ifdef UNIX
-      /*
-       * Make sure the owner can read/write it.  This only works for
-       * root.
-       */
-      if (fp_out != NULL) {
-        os_fchown(fileno(fp_out), old_info.stat.st_uid, old_info.stat.st_gid);
-      }
-#endif
-    }
-  }
-
-  /*
-   * Check if the new viminfo file can be written to.
-   */
-  if (fp_out == NULL) {
-    EMSG2(_("E138: Can't write viminfo file %s!"),
-        (fp_in == NULL || tempname == NULL) ? fname : tempname);
-    if (fp_in != NULL)
-      fclose(fp_in);
-    goto end;
-  }
-
-  if (p_verbose > 0) {
-    verbose_enter();
-    smsg(_("Writing viminfo file \"%s\""), fname);
-    verbose_leave();
-  }
-
-  viminfo_errcnt = 0;
-  do_viminfo(fp_in, fp_out, forceit ? 0 : (VIF_WANT_INFO | VIF_WANT_MARKS));
-
-  fclose(fp_out);           /* errors are ignored !? */
-  if (fp_in != NULL) {
-    fclose(fp_in);
-
-    /* In case of an error keep the original viminfo file. Otherwise
-     * rename the newly written file. Give an error if that fails. */
-    if (viminfo_errcnt == 0 && vim_rename(tempname, fname) == -1) {
-      viminfo_errcnt++;
-      EMSG2(_("E886: Can't rename viminfo file to %s!"), fname);
-    }
-    if (viminfo_errcnt > 0) {
-      os_remove((char *)tempname);
-    }
-  }
-
-end:
-  xfree(fname);
-  xfree(tempname);
-}
-
-/*
- * Get the viminfo file name to use.
- * If "file" is given and not empty, use it (has already been expanded by
- * cmdline functions).
- * Otherwise use "-i file_name", value from 'viminfo' or the default, and
- * expand environment variables.
- * Returns an allocated string.
- */
-static char_u *viminfo_filename(char_u *file)
-{
-  if (file == NULL || *file == NUL) {
-    if (use_viminfo != NULL)
-      file = use_viminfo;
-    else if ((file = find_viminfo_parameter('n')) == NULL || *file == NUL) {
-#ifdef VIMINFO_FILE2
-      // don't use $HOME when not defined (turned into "c:/"!).
-      if (!os_env_exists("HOME")) {
-        // don't use $VIM when not available.
-        expand_env((char_u *)"$VIM", NameBuff, MAXPATHL);
-        if (STRCMP("$VIM", NameBuff) != 0)          /* $VIM was expanded */
-          file = (char_u *)VIMINFO_FILE2;
-        else
-          file = (char_u *)VIMINFO_FILE;
-      } else
-#endif
-      file = (char_u *)VIMINFO_FILE;
-    }
-    expand_env(file, NameBuff, MAXPATHL);
-    file = NameBuff;
-  }
-  return vim_strsave(file);
-}
-
-/*
- * do_viminfo() -- Should only be called from read_viminfo() & write_viminfo().
- */
-static void do_viminfo(FILE *fp_in, FILE *fp_out, int flags)
-{
-  int count = 0;
-  int eof = FALSE;
-  vir_T vir;
-  int merge = FALSE;
-
-  vir.vir_line = xmalloc(LSIZE);
-  vir.vir_fd = fp_in;
-  vir.vir_conv.vc_type = CONV_NONE;
-
-  if (fp_in != NULL) {
-    if (flags & VIF_WANT_INFO) {
-      eof = read_viminfo_up_to_marks(&vir,
-          flags & VIF_FORCEIT, fp_out != NULL);
-      merge = TRUE;
-    } else if (flags != 0)
-      /* Skip info, find start of marks */
-      while (!(eof = viminfo_readline(&vir))
-             && vir.vir_line[0] != '>')
-        ;
-  }
-  if (fp_out != NULL) {
-    /* Write the info: */
-    fprintf(fp_out, _("# This viminfo file was generated by Nvim %s.\n"),
-        mediumVersion);
-    fputs(_("# You may edit it if you're careful!\n\n"), fp_out);
-    fputs(_("# Value of 'encoding' when this file was written\n"), fp_out);
-    fprintf(fp_out, "*encoding=%s\n\n", p_enc);
-    write_viminfo_search_pattern(fp_out);
-    write_viminfo_sub_string(fp_out);
-    write_viminfo_history(fp_out, merge);
-    write_viminfo_registers(fp_out);
-    write_viminfo_varlist(fp_out);
-    write_viminfo_filemarks(fp_out);
-    write_viminfo_bufferlist(fp_out);
-    count = write_viminfo_marks(fp_out);
-  }
-  if (fp_in != NULL
-      && (flags & (VIF_WANT_MARKS | VIF_GET_OLDFILES | VIF_FORCEIT)))
-    copy_viminfo_marks(&vir, fp_out, count, eof, flags);
-
-  xfree(vir.vir_line);
-  if (vir.vir_conv.vc_type != CONV_NONE)
-    convert_setup(&vir.vir_conv, NULL, NULL);
-}
-
-/*
- * read_viminfo_up_to_marks() -- Only called from do_viminfo().  Reads in the
- * first part of the viminfo file which contains everything but the marks that
- * are local to a file.  Returns TRUE when end-of-file is reached. -- webb
- */
-static int read_viminfo_up_to_marks(vir_T *virp, int forceit, int writing)
-{
-  int eof;
-
-  prepare_viminfo_history(forceit ? 9999 : 0, writing);
-  eof = viminfo_readline(virp);
-  while (!eof && virp->vir_line[0] != '>') {
-    switch (virp->vir_line[0]) {
-    /* Characters reserved for future expansion, ignored now */
-    case '+':         /* "+40 /path/dir file", for running vim without args */
-    case '|':         /* to be defined */
-    case '^':         /* to be defined */
-    case '<':         /* long line - ignored */
-    /* A comment or empty line. */
-    case NUL:
-    case '\r':
-    case '\n':
-    case '#':
-      eof = viminfo_readline(virp);
-      break;
-    case '*':         /* "*encoding=value" */
-      eof = viminfo_encoding(virp);
-      break;
-    case '!':         /* global variable */
-      eof = read_viminfo_varlist(virp, writing);
-      break;
-    case '%':         /* entry for buffer list */
-      eof = read_viminfo_bufferlist(virp, writing);
-      break;
-    case '"':
-      eof = read_viminfo_register(virp, forceit);
-      break;
-    case '/':               /* Search string */
-    case '&':               /* Substitute search string */
-    case '~':               /* Last search string, followed by '/' or '&' */
-      eof = read_viminfo_search_pattern(virp, forceit);
-      break;
-    case '$':
-      eof = read_viminfo_sub_string(virp, forceit);
-      break;
-    case ':':
-    case '?':
-    case '=':
-    case '@':
-      eof = read_viminfo_history(virp, writing);
-      break;
-    case '-':
-    case '\'':
-      eof = read_viminfo_filemark(virp, forceit);
-      break;
-    default:
-      if (viminfo_error("E575: ", _("Illegal starting char"),
-              virp->vir_line))
-        eof = TRUE;
-      else
-        eof = viminfo_readline(virp);
-      break;
-    }
-  }
-
-  /* Finish reading history items. */
-  if (!writing)
-    finish_viminfo_history();
-
-  /* Change file names to buffer numbers for fmarks. */
-  FOR_ALL_BUFFERS(buf) {
-    fmarks_check_names(buf);
-  }
-
-  return eof;
-}
-
-/*
- * Compare the 'encoding' value in the viminfo file with the current value of
- * 'encoding'.  If different and the 'c' flag is in 'viminfo', setup for
- * conversion of text with iconv() in viminfo_readstring().
- */
-static int viminfo_encoding(vir_T *virp)
-{
-  char_u      *p;
-  int i;
-
-  if (get_viminfo_parameter('c') != 0) {
-    p = vim_strchr(virp->vir_line, '=');
-    if (p != NULL) {
-      /* remove trailing newline */
-      ++p;
-      for (i = 0; vim_isprintc(p[i]); ++i)
-        ;
-      p[i] = NUL;
-
-      convert_setup(&virp->vir_conv, p, p_enc);
-    }
-  }
-  return viminfo_readline(virp);
-}
-
-/*
- * Read a line from the viminfo file.
- * Returns TRUE for end-of-file;
- */
-int viminfo_readline(vir_T *virp)
-{
-  return vim_fgets(virp->vir_line, LSIZE, virp->vir_fd);
-}
-
-/*
- * check string read from viminfo file
- * remove '\n' at the end of the line
- * - replace CTRL-V CTRL-V with CTRL-V
- * - replace CTRL-V 'n'    with '\n'
- *
- * Check for a long line as written by viminfo_writestring().
- *
- * Return the string in allocated memory.
- */
-char_u *
-viminfo_readstring (
-    vir_T *virp,
-    int off,                            /* offset for virp->vir_line */
-    int convert                 /* convert the string */
-)
-  FUNC_ATTR_NONNULL_RET
-{
-  char_u      *retval;
-  char_u      *s, *d;
-
-  if (virp->vir_line[off] == Ctrl_V && ascii_isdigit(virp->vir_line[off + 1])) {
-    ssize_t len = atol((char *)virp->vir_line + off + 1);
-    retval = xmalloc(len);
-    // TODO(philix): change type of vim_fgets() size argument to size_t
-    (void)vim_fgets(retval, (int)len, virp->vir_fd);
-    s = retval + 1;         /* Skip the leading '<' */
-  } else {
-    retval = vim_strsave(virp->vir_line + off);
-    s = retval;
-  }
-
-  /* Change CTRL-V CTRL-V to CTRL-V and CTRL-V n to \n in-place. */
-  d = retval;
-  while (*s != NUL && *s != '\n') {
-    if (s[0] == Ctrl_V && s[1] != NUL) {
-      if (s[1] == 'n')
-        *d++ = '\n';
-      else
-        *d++ = Ctrl_V;
-      s += 2;
-    } else
-      *d++ = *s++;
-  }
-  *d = NUL;
-
-  if (convert && virp->vir_conv.vc_type != CONV_NONE && *retval != NUL) {
-    d = string_convert(&virp->vir_conv, retval, NULL);
-    if (d != NULL) {
-      xfree(retval);
-      retval = d;
-    }
-  }
-
-  return retval;
-}
-
-/*
- * write string to viminfo file
- * - replace CTRL-V with CTRL-V CTRL-V
- * - replace '\n'   with CTRL-V 'n'
- * - add a '\n' at the end
- *
- * For a long line:
- * - write " CTRL-V <length> \n " in first line
- * - write " < <string> \n "	  in second line
- */
-void viminfo_writestring(FILE *fd, char_u *p)
-{
-  int c;
-  char_u      *s;
-  int len = 0;
-
-  for (s = p; *s != NUL; ++s) {
-    if (*s == Ctrl_V || *s == '\n')
-      ++len;
-    ++len;
-  }
-
-  /* If the string will be too long, write its length and put it in the next
-   * line.  Take into account that some room is needed for what comes before
-   * the string (e.g., variable name).  Add something to the length for the
-   * '<', NL and trailing NUL. */
-  if (len > LSIZE / 2)
-    fprintf(fd, "\026%d\n<", len + 3);
-
-  while ((c = *p++) != NUL) {
-    if (c == Ctrl_V || c == '\n') {
-      putc(Ctrl_V, fd);
-      if (c == '\n')
-        c = 'n';
-    }
-    putc(c, fd);
-  }
-  putc('\n', fd);
-}
-
-/*
- * Write all the named marks for all buffers.
- * Return the number of buffers for which marks have been written.
- */
-int write_viminfo_marks(FILE *fp_out)
-{
-  /*
-   * Set b_last_cursor for the all buffers that have a window.
-   */
-  FOR_ALL_TAB_WINDOWS(tp, win) {
-    set_last_cursor(win);
-  }
-
-  fputs(_("\n# History of marks within files (newest to oldest):\n"), fp_out);
-  int count = 0;
-  FOR_ALL_BUFFERS(buf) {
-    /*
-     * Only write something if buffer has been loaded and at least one
-     * mark is set.
-     */
-    if (buf->b_marks_read) {
-      bool is_mark_set = true;
-      if (buf->b_last_cursor.lnum == 0) {
-        is_mark_set = false;
-        for (int i = 0; i < NMARKS; i++) {
-          if (buf->b_namedm[i].lnum != 0) {
-            is_mark_set = true;
-            break;
-          }
-        }
-      }
-      if (is_mark_set && buf->b_ffname != NULL
-          && buf->b_ffname[0] != NUL && !removable(buf->b_ffname)) {
-        home_replace(NULL, buf->b_ffname, IObuff, IOSIZE, TRUE);
-        fprintf(fp_out, "\n> ");
-        viminfo_writestring(fp_out, IObuff);
-        write_one_mark(fp_out, '"', &buf->b_last_cursor);
-        write_one_mark(fp_out, '^', &buf->b_last_insert);
-        write_one_mark(fp_out, '.', &buf->b_last_change);
-        /* changelist positions are stored oldest first */
-        for (int i = 0; i < buf->b_changelistlen; ++i) {
-          write_one_mark(fp_out, '+', &buf->b_changelist[i]);
-        }
-        for (int i = 0; i < NMARKS; i++) {
-          write_one_mark(fp_out, 'a' + i, &buf->b_namedm[i]);
-        }
-        count++;
-      }
-    }
-  }
-
-  return count;
-}
-
-static void write_one_mark(FILE *fp_out, int c, pos_T *pos)
-{
-  if (pos->lnum != 0)
-    fprintf(fp_out, "\t%c\t%" PRId64 "\t%d\n", c,
-            (int64_t)pos->lnum, (int)pos->col);
-}
-
-/*
- * Handle marks in the viminfo file:
- * fp_out != NULL: copy marks for buffers not in buffer list
- * fp_out == NULL && (flags & VIF_WANT_MARKS): read marks for curbuf only
- * fp_out == NULL && (flags & VIF_GET_OLDFILES | VIF_FORCEIT): fill v:oldfiles
- */
-void copy_viminfo_marks(vir_T *virp, FILE *fp_out, int count, int eof, int flags)
-{
-  char_u      *line = virp->vir_line;
-  buf_T       *buf;
-  int num_marked_files;
-  int load_marks;
-  int copy_marks_out;
-  char_u      *str;
-  int i;
-  char_u      *p;
-  char_u      *name_buf;
-  pos_T pos;
-  list_T      *list = NULL;
-
-  name_buf = xmalloc(LSIZE);
-  *name_buf = NUL;
-
-  if (fp_out == NULL && (flags & (VIF_GET_OLDFILES | VIF_FORCEIT))) {
-    list = list_alloc();
-    set_vim_var_list(VV_OLDFILES, list);
-  }
-
-  num_marked_files = get_viminfo_parameter('\'');
-  while (!eof && (count < num_marked_files || fp_out == NULL)) {
-    if (line[0] != '>') {
-      if (line[0] != '\n' && line[0] != '\r' && line[0] != '#') {
-        if (viminfo_error("E576: ", _("Missing '>'"), line))
-          break;                /* too many errors, return now */
-      }
-      eof = vim_fgets(line, LSIZE, virp->vir_fd);
-      continue;                 /* Skip this dud line */
-    }
-
-    /*
-     * Handle long line and translate escaped characters.
-     * Find file name, set str to start.
-     * Ignore leading and trailing white space.
-     */
-    str = skipwhite(line + 1);
-    str = viminfo_readstring(virp, (int)(str - virp->vir_line), FALSE);
-    p = str + STRLEN(str);
-    while (p != str && (*p == NUL || ascii_isspace(*p)))
-      p--;
-    if (*p)
-      p++;
-    *p = NUL;
-
-    if (list != NULL)
-      list_append_string(list, str, -1);
-
-    /*
-     * If fp_out == NULL, load marks for current buffer.
-     * If fp_out != NULL, copy marks for buffers not in buflist.
-     */
-    load_marks = copy_marks_out = FALSE;
-    if (fp_out == NULL) {
-      if ((flags & VIF_WANT_MARKS) && curbuf->b_ffname != NULL) {
-        if (*name_buf == NUL)               /* only need to do this once */
-          home_replace(NULL, curbuf->b_ffname, name_buf, LSIZE, TRUE);
-        if (fnamecmp(str, name_buf) == 0)
-          load_marks = TRUE;
-      }
-    } else { /* fp_out != NULL */
-             /* This is slow if there are many buffers!! */
-      buf = NULL;
-      FOR_ALL_BUFFERS(bp) {
-        if (bp->b_ffname != NULL) {
-          home_replace(NULL, bp->b_ffname, name_buf, LSIZE, TRUE);
-          if (fnamecmp(str, name_buf) == 0) {
-            buf = bp;
-            break;
-          }
-        }
-      }
-
-      /*
-       * copy marks if the buffer has not been loaded
-       */
-      if (buf == NULL || !buf->b_marks_read) {
-        copy_marks_out = TRUE;
-        fputs("\n> ", fp_out);
-        viminfo_writestring(fp_out, str);
-        count++;
-      }
-    }
-    free(str);
-
-    pos.coladd = 0;
-    while (!(eof = viminfo_readline(virp)) && line[0] == TAB) {
-      if (load_marks) {
-        if (line[1] != NUL) {
-          int64_t lnum_64;
-          unsigned int u;
-          sscanf((char *)line + 2, "%" SCNd64 "%u", &lnum_64, &u);
-          // safely downcast to linenr_T (long); remove when linenr_T refactored
-          assert(lnum_64 <= LONG_MAX); 
-          pos.lnum = (linenr_T)lnum_64;
-          assert(u <= INT_MAX);
-          pos.col = (colnr_T)u;
-          switch (line[1]) {
-          case '"': curbuf->b_last_cursor = pos; break;
-          case '^': curbuf->b_last_insert = pos; break;
-          case '.': curbuf->b_last_change = pos; break;
-          case '+':
-            /* changelist positions are stored oldest
-             * first */
-            if (curbuf->b_changelistlen == JUMPLISTSIZE)
-              /* list is full, remove oldest entry */
-              memmove(curbuf->b_changelist,
-                  curbuf->b_changelist + 1,
-                  sizeof(pos_T) * (JUMPLISTSIZE - 1));
-            else
-              ++curbuf->b_changelistlen;
-            curbuf->b_changelist[
-              curbuf->b_changelistlen - 1] = pos;
-            break;
-          default:  if ((i = line[1] - 'a') >= 0 && i < NMARKS)
-              curbuf->b_namedm[i] = pos;
-          }
-        }
-      } else if (copy_marks_out)
-        fputs((char *)line, fp_out);
-    }
-    if (load_marks) {
-      FOR_ALL_WINDOWS_IN_TAB(wp, curtab) {
-        if (wp->w_buffer == curbuf)
-          wp->w_changelistidx = curbuf->b_changelistlen;
-      }
-      break;
-    }
-  }
-  free(name_buf);
-}
-
-int read_viminfo_filemark(vir_T *virp, int force)
-{
-  char_u      *str;
-  xfmark_T    *fm;
-  int i;
-
-  /* We only get here if line[0] == '\'' or '-'.
-   * Illegal mark names are ignored (for future expansion). */
-  str = virp->vir_line + 1;
-  if (
-    *str <= 127 &&
-    ((*virp->vir_line == '\'' && (ascii_isdigit(*str) || isupper(*str)))
-     || (*virp->vir_line == '-' && *str == '\''))) {
-    if (*str == '\'') {
-      /* If the jumplist isn't full insert fmark as oldest entry */
-      if (curwin->w_jumplistlen == JUMPLISTSIZE)
-        fm = NULL;
-      else {
-        for (i = curwin->w_jumplistlen; i > 0; --i)
-          curwin->w_jumplist[i] = curwin->w_jumplist[i - 1];
-        ++curwin->w_jumplistidx;
-        ++curwin->w_jumplistlen;
-        fm = &curwin->w_jumplist[0];
-        fm->fmark.mark.lnum = 0;
-        fm->fname = NULL;
-      }
-    } else if (ascii_isdigit(*str))
-      fm = &namedfm[*str - '0' + NMARKS];
-    else {  // is uppercase
-      assert(*str >= 'A' && *str <= 'Z');
-      fm = &namedfm[*str - 'A'];
-    }
-    if (fm != NULL && (fm->fmark.mark.lnum == 0 || force)) {
-      str = skipwhite(str + 1);
-      fm->fmark.mark.lnum = getdigits_long(&str);
-      str = skipwhite(str);
-      fm->fmark.mark.col = getdigits_int(&str);
-      fm->fmark.mark.coladd = 0;
-      fm->fmark.fnum = 0;
-      str = skipwhite(str);
-      free(fm->fname);
-      fm->fname = viminfo_readstring(virp, (int)(str - virp->vir_line),
-          FALSE);
-    }
-  }
-  return vim_fgets(virp->vir_line, LSIZE, virp->vir_fd);
-}
-
-void write_viminfo_filemarks(FILE *fp)
-{
-  int i;
-  char_u      *name;
-  buf_T       *buf;
-  xfmark_T    *fm;
-
-  if (get_viminfo_parameter('f') == 0)
-    return;
-
-  fputs(_("\n# File marks:\n"), fp);
-
-  /*
-   * Find a mark that is the same file and position as the cursor.
-   * That one, or else the last one is deleted.
-   * Move '0 to '1, '1 to '2, etc. until the matching one or '9
-   * Set '0 mark to current cursor position.
-   */
-  if (curbuf->b_ffname != NULL && !removable(curbuf->b_ffname)) {
-    name = buflist_nr2name(curbuf->b_fnum, TRUE, FALSE);
-    for (i = NMARKS; i < NMARKS + EXTRA_MARKS - 1; ++i)
-      if (namedfm[i].fmark.mark.lnum == curwin->w_cursor.lnum
-          && (namedfm[i].fname == NULL
-              ? namedfm[i].fmark.fnum == curbuf->b_fnum
-              : (name != NULL
-                 && STRCMP(name, namedfm[i].fname) == 0)))
-        break;
-    free(name);
-
-    free(namedfm[i].fname);
-    for (; i > NMARKS; --i)
-      namedfm[i] = namedfm[i - 1];
-    namedfm[NMARKS].fmark.mark = curwin->w_cursor;
-    namedfm[NMARKS].fmark.fnum = curbuf->b_fnum;
-    namedfm[NMARKS].fname = NULL;
-  }
-
-  /* Write the filemarks '0 - '9 and 'A - 'Z */
-  for (i = 0; i < NMARKS + EXTRA_MARKS; i++)
-    write_one_filemark(fp, &namedfm[i], '\'',
-        i < NMARKS ? i + 'A' : i - NMARKS + '0');
-
-  /* Write the jumplist with -' */
-  fputs(_("\n# Jumplist (newest first):\n"), fp);
-  setpcmark();          /* add current cursor position */
-  cleanup_jumplist();
-  for (fm = &curwin->w_jumplist[curwin->w_jumplistlen - 1];
-       fm >= &curwin->w_jumplist[0]; --fm) {
-    if (fm->fmark.fnum == 0
-        || ((buf = buflist_findnr(fm->fmark.fnum)) != NULL
-            && !removable(buf->b_ffname)))
-      write_one_filemark(fp, fm, '-', '\'');
-  }
-}
-
-int read_viminfo_search_pattern(vir_T *virp, int force)
-{
-  char_u      *lp;
-  int idx = -1;
-  int magic = FALSE;
-  int no_scs = FALSE;
-  int off_line = FALSE;
-  int off_end = 0;
-  long off = 0;
-  int setlast = FALSE;
-  static int hlsearch_on = FALSE;
-  char_u      *val;
-
-  /*
-   * Old line types:
-   * "/pat", "&pat": search/subst. pat
-   * "~/pat", "~&pat": last used search/subst. pat
-   * New line types:
-   * "~h", "~H": hlsearch highlighting off/on
-   * "~<magic><smartcase><line><end><off><last><which>pat"
-   * <magic>: 'm' off, 'M' on
-   * <smartcase>: 's' off, 'S' on
-   * <line>: 'L' line offset, 'l' char offset
-   * <end>: 'E' from end, 'e' from start
-   * <off>: decimal, offset
-   * <last>: '~' last used pattern
-   * <which>: '/' search pat, '&' subst. pat
-   */
-  lp = virp->vir_line;
-  if (lp[0] == '~' && (lp[1] == 'm' || lp[1] == 'M')) { /* new line type */
-    if (lp[1] == 'M')                   /* magic on */
-      magic = TRUE;
-    if (lp[2] == 's')
-      no_scs = TRUE;
-    if (lp[3] == 'L')
-      off_line = TRUE;
-    if (lp[4] == 'E')
-      off_end = SEARCH_END;
-    lp += 5;
-    off = getdigits_long(&lp);
-  }
-  if (lp[0] == '~') {           /* use this pattern for last-used pattern */
-    setlast = TRUE;
-    lp++;
-  }
-  if (lp[0] == '/')
-    idx = RE_SEARCH;
-  else if (lp[0] == '&')
-    idx = RE_SUBST;
-  else if (lp[0] == 'h')        /* ~h: 'hlsearch' highlighting off */
-    hlsearch_on = FALSE;
-  else if (lp[0] == 'H')        /* ~H: 'hlsearch' highlighting on */
-    hlsearch_on = TRUE;
-  if (idx >= 0) {
-    if (force || spats[idx].pat == NULL) {
-      val = viminfo_readstring(virp, (int)(lp - virp->vir_line + 1), TRUE);
-      set_last_search_pat(val, idx, magic, setlast);
-      xfree(val);
-      spats[idx].no_scs = no_scs;
-      spats[idx].off.line = off_line;
-      spats[idx].off.end = off_end;
-      spats[idx].off.off = off;
-      if (setlast) {
-        SET_NO_HLSEARCH(!hlsearch_on);
-      }
-    }
-  }
-  return viminfo_readline(virp);
-}
-
-void write_viminfo_search_pattern(FILE *fp)
-{
-  if (get_viminfo_parameter('/') != 0) {
-    fprintf(fp, "\n# hlsearch on (H) or off (h):\n~%c",
-        (no_hlsearch || find_viminfo_parameter('h') != NULL) ? 'h' : 'H');
-    wvsp_one(fp, RE_SEARCH, "", '/');
-    wvsp_one(fp, RE_SUBST, _("Substitute "), '&');
-  }
-}
-
-static void 
-wvsp_one (
-    FILE *fp,        /* file to write to */
-    int idx,                /* spats[] index */
-    char *s,         /* search pat */
-    int sc                 /* dir char */
-)
-{
-  if (spats[idx].pat != NULL) {
-    fprintf(fp, _("\n# Last %sSearch Pattern:\n~"), s);
-    /* off.dir is not stored, it's reset to forward */
-    fprintf(fp, "%c%c%c%c%" PRId64 "%s%c",
-        spats[idx].magic    ? 'M' : 'm',                /* magic */
-        spats[idx].no_scs   ? 's' : 'S',                /* smartcase */
-        spats[idx].off.line ? 'L' : 'l',                /* line offset */
-        spats[idx].off.end  ? 'E' : 'e',                /* offset from end */
-        (int64_t)spats[idx].off.off,                    /* offset */
-        last_idx == idx     ? "~" : "",                 /* last used pat */
-        sc);
-    viminfo_writestring(fp, spats[idx].pat);
-  }
-}
-
-/*
- * Prepare for reading the history from the viminfo file.
- * This allocates history arrays to store the read history lines.
- */
-void prepare_viminfo_history(int asklen, int writing)
-{
-  int i;
-  int num;
-
-  init_history();
-  viminfo_add_at_front = (asklen != 0 && !writing);
-  if (asklen > hislen)
-    asklen = hislen;
-
-  for (int type = 0; type < HIST_COUNT; ++type) {
-    /* Count the number of empty spaces in the history list.  Entries read
-     * from viminfo previously are also considered empty.  If there are
-     * more spaces available than we request, then fill them up. */
-    for (i = 0, num = 0; i < hislen; i++)
-      if (history[type][i].hisstr == NULL || history[type][i].viminfo)
-        num++;
-    int len = asklen;
-    if (num > len)
-      len = num;
-    if (len <= 0)
-      viminfo_history[type] = NULL;
-    else
-      viminfo_history[type] = xmalloc(len * sizeof(char_u *));
-    if (viminfo_history[type] == NULL)
-      len = 0;
-    viminfo_hislen[type] = len;
-    viminfo_hisidx[type] = 0;
-  }
-}
-
-/*
- * Accept a line from the viminfo, store it in the history array when it's
- * new.
- */
-int read_viminfo_history(vir_T *virp, int writing)
-{
-  int type;
-  char_u      *val;
-
-  type = hist_char2type(virp->vir_line[0]);
-  if (viminfo_hisidx[type] < viminfo_hislen[type]) {
-    val = viminfo_readstring(virp, 1, TRUE);
-    if (val != NULL && *val != NUL) {
-      int sep = (*val == ' ' ? NUL : *val);
-
-      if (!in_history(type, val + (type == HIST_SEARCH),
-              viminfo_add_at_front, sep, writing)) {
-        /* Need to re-allocate to append the separator byte. */
-        size_t len = STRLEN(val);
-        char_u *p = xmalloc(len + 2);
-        if (type == HIST_SEARCH) {
-          /* Search entry: Move the separator from the first
-           * column to after the NUL. */
-          memmove(p, val + 1, len);
-          p[len] = sep;
-        } else {
-          /* Not a search entry: No separator in the viminfo
-           * file, add a NUL separator. */
-          memmove(p, val, len + 1);
-          p[len + 1] = NUL;
-        }
-        viminfo_history[type][viminfo_hisidx[type]++] = p;
-      }
-    }
-    xfree(val);
-  }
-  return viminfo_readline(virp);
-}
-
-/*
- * Finish reading history lines from viminfo.  Not used when writing viminfo.
- */
-void finish_viminfo_history(void)
-{
-  int idx;
-  int i;
-  int type;
-
-  for (type = 0; type < HIST_COUNT; ++type) {
-    if (history[type] == NULL)
-      continue;
-    idx = hisidx[type] + viminfo_hisidx[type];
-    if (idx >= hislen)
-      idx -= hislen;
-    else if (idx < 0)
-      idx = hislen - 1;
-    if (viminfo_add_at_front)
-      hisidx[type] = idx;
-    else {
-      if (hisidx[type] == -1)
-        hisidx[type] = hislen - 1;
-      do {
-        if (history[type][idx].hisstr != NULL
-            || history[type][idx].viminfo)
-          break;
-        if (++idx == hislen)
-          idx = 0;
-      } while (idx != hisidx[type]);
-      if (idx != hisidx[type] && --idx < 0)
-        idx = hislen - 1;
-    }
-    for (i = 0; i < viminfo_hisidx[type]; i++) {
-      xfree(history[type][idx].hisstr);
-      history[type][idx].hisstr = viminfo_history[type][i];
-      history[type][idx].viminfo = TRUE;
-      if (--idx < 0)
-        idx = hislen - 1;
-    }
-    idx += 1;
-    idx %= hislen;
-    for (i = 0; i < viminfo_hisidx[type]; i++) {
-      history[type][idx++].hisnum = ++hisnum[type];
-      idx %= hislen;
-    }
-    xfree(viminfo_history[type]);
-    viminfo_history[type] = NULL;
-    viminfo_hisidx[type] = 0;
-  }
-}
-
-/*
- * Write history to viminfo file in "fp".
- * When "merge" is TRUE merge history lines with a previously read viminfo
- * file, data is in viminfo_history[].
- * When "merge" is FALSE just write all history lines.  Used for ":wviminfo!".
- */
-void write_viminfo_history(FILE *fp, int merge)
-{
-  int i;
-  int type;
-  int num_saved;
-  char_u  *p;
-  int c;
-  int round;
-
-  init_history();
-  if (hislen == 0)
-    return;
-  for (type = 0; type < HIST_COUNT; ++type) {
-    num_saved = get_viminfo_parameter(hist_type2char(type, FALSE));
-    if (num_saved == 0)
-      continue;
-    if (num_saved < 0)      /* Use default */
-      num_saved = hislen;
-    fprintf(fp, _("\n# %s History (newest to oldest):\n"),
-        type == HIST_CMD ? _("Command Line") :
-        type == HIST_SEARCH ? _("Search String") :
-        type == HIST_EXPR ?  _("Expression") :
-        _("Input Line"));
-    if (num_saved > hislen)
-      num_saved = hislen;
-
-    /*
-     * Merge typed and viminfo history:
-     * round 1: history of typed commands.
-     * round 2: history from recently read viminfo.
-     */
-    for (round = 1; round <= 2; ++round) {
-      if (round == 1)
-        /* start at newest entry, somewhere in the list */
-        i = hisidx[type];
-      else if (viminfo_hisidx[type] > 0)
-        /* start at newest entry, first in the list */
-        i = 0;
-      else
-        /* empty list */
-        i = -1;
-      if (i >= 0)
-        while (num_saved > 0
-               && !(round == 2 && i >= viminfo_hisidx[type])) {
-          p = round == 1 ? history[type][i].hisstr
-              : viminfo_history[type] == NULL ? NULL
-              : viminfo_history[type][i];
-          if (p != NULL && (round == 2
-                            || !merge
-                            || !history[type][i].viminfo)) {
-            --num_saved;
-            fputc(hist_type2char(type, TRUE), fp);
-            /* For the search history: put the separator in the
-            * second column; use a space if there isn't one. */
-            if (type == HIST_SEARCH) {
-              c = p[STRLEN(p) + 1];
-              putc(c == NUL ? ' ' : c, fp);
-            }
-            viminfo_writestring(fp, p);
-          }
-          if (round == 1) {
-            /* Decrement index, loop around and stop when back at
-             * the start. */
-            if (--i < 0)
-              i = hislen - 1;
-            if (i == hisidx[type])
-              break;
-          } else {
-            /* Increment index. Stop at the end in the while. */
-            ++i;
-          }
-        }
-    }
-    for (i = 0; i < viminfo_hisidx[type]; ++i)
-      if (viminfo_history[type] != NULL)
-        xfree(viminfo_history[type][i]);
-    xfree(viminfo_history[type]);
-    viminfo_history[type] = NULL;
-    viminfo_hisidx[type] = 0;
-  }
-}
-
-int read_viminfo_register(vir_T *virp, int force)
-{
-  int eof;
-  int do_it = TRUE;
-  int size;
-  int limit;
-  int set_prev = FALSE;
-  char_u      *str;
-  char_u      **array = NULL;
-
-  /* We only get here (hopefully) if line[0] == '"' */
-  str = virp->vir_line + 1;
-
-  /* If the line starts with "" this is the y_previous register. */
-  if (*str == '"') {
-    set_prev = TRUE;
-    str++;
-  }
-
-  if (!ASCII_ISALNUM(*str) && *str != '-') {
-    if (viminfo_error("E577: ", _("Illegal register name"), virp->vir_line))
-      return TRUE;              /* too many errors, pretend end-of-file */
-    do_it = FALSE;
-  }
-  yankreg_T *reg = get_yank_register(*str++, YREG_PUT);
-  if (!force && reg->y_array != NULL)
-    do_it = FALSE;
-
-  if (*str == '@') {
-    /* "x@: register x used for @@ */
-    if (force || execreg_lastc == NUL)
-      execreg_lastc = str[-1];
-  }
-
-  size = 0;
-  limit = 100;          /* Optimized for registers containing <= 100 lines */
-  if (do_it) {
-    if (set_prev) {
-      y_previous = reg;
-    }
-
-    free_register(reg);
-    array = xmalloc(limit * sizeof(char_u *));
-
-    str = skipwhite(skiptowhite(str));
-    if (STRNCMP(str, "CHAR", 4) == 0) {
-      reg->y_type = MCHAR;
-    } else if (STRNCMP(str, "BLOCK", 5) == 0) {
-      reg->y_type = MBLOCK;
-    } else {
-      reg->y_type = MLINE;
-    }
-    /* get the block width; if it's missing we get a zero, which is OK */
-    str = skipwhite(skiptowhite(str));
-    reg->y_width = getdigits_int(&str);
-  }
-
-  while (!(eof = viminfo_readline(virp))
-         && (virp->vir_line[0] == TAB || virp->vir_line[0] == '<')) {
-    if (do_it) {
-      if (size >= limit) {
-        limit *= 2;
-        array = xrealloc(array, limit * sizeof(char_u *));
-      }
-      array[size++] = viminfo_readstring(virp, 1, TRUE);
-    }
-  }
-
-  if (do_it) {
-    if (size == 0) {
-      xfree(array);
-    } else if (size < limit) {
-      reg->y_array = xrealloc(array, size * sizeof(char_u *));
-    } else {
-      reg->y_array = array;
-    }
-    reg->y_size = size;
-  }
-  return eof;
-}
-
-void write_viminfo_registers(FILE *fp)
-{
-  int i, j;
-  char_u  *type;
-  char_u c;
-  int num_lines;
-  int max_num_lines;
-  int max_kbyte;
-  long len;
-
-  fputs(_("\n# Registers:\n"), fp);
-
-  /* Get '<' value, use old '"' value if '<' is not found. */
-  max_num_lines = get_viminfo_parameter('<');
-  if (max_num_lines < 0)
-    max_num_lines = get_viminfo_parameter('"');
-  if (max_num_lines == 0)
-    return;
-  max_kbyte = get_viminfo_parameter('s');
-  if (max_kbyte == 0)
-    return;
-
-  // don't include clipboard registers '*'/'+'
-  for (i = 0; i < NUM_SAVED_REGISTERS; i++) {
-    if (y_regs[i].y_array == NULL)
-      continue;
-
-    /* Skip empty registers. */
-    num_lines = y_regs[i].y_size;
-    if (num_lines == 0
-        || (num_lines == 1 && y_regs[i].y_type == MCHAR
-            && *y_regs[i].y_array[0] == NUL))
-      continue;
-
-    if (max_kbyte > 0) {
-      /* Skip register if there is more text than the maximum size. */
-      len = 0;
-      for (j = 0; j < num_lines; j++)
-        len += (long)STRLEN(y_regs[i].y_array[j]) + 1L;
-      if (len > (long)max_kbyte * 1024L)
-        continue;
-    }
-
-    switch (y_regs[i].y_type) {
-    case MLINE:
-      type = (char_u *)"LINE";
-      break;
-    case MCHAR:
-      type = (char_u *)"CHAR";
-      break;
-    case MBLOCK:
-      type = (char_u *)"BLOCK";
-      break;
-    default:
-      sprintf((char *)IObuff, _("E574: Unknown register type %d"),
-          y_regs[i].y_type);
-      emsg(IObuff);
-      type = (char_u *)"LINE";
-      break;
-    }
-    if (y_previous == &y_regs[i])
-      fprintf(fp, "\"");
-    c = get_register_name(i);
-    fprintf(fp, "\"%c", c);
-    if (c == execreg_lastc)
-      fprintf(fp, "@");
-    fprintf(fp, "\t%s\t%d\n", type,
-        (int)y_regs[i].y_width
-        );
-
-    /* If max_num_lines < 0, then we save ALL the lines in the register */
-    if (max_num_lines > 0 && num_lines > max_num_lines)
-      num_lines = max_num_lines;
-    for (j = 0; j < num_lines; j++) {
-      putc('\t', fp);
-      viminfo_writestring(fp, y_regs[i].y_array[j]);
-    }
-  }
-}
-
-/*
- * Restore global vars that start with a capital from the viminfo file
- */
-int read_viminfo_varlist(vir_T *virp, int writing)
-{
-  char_u      *tab;
-  int type = VAR_NUMBER;
-  typval_T tv;
-
-  if (!writing && (find_viminfo_parameter('!') != NULL)) {
-    tab = vim_strchr(virp->vir_line + 1, '\t');
-    if (tab != NULL) {
-      *tab++ = NUL;            /* isolate the variable name */
-      switch (*tab) {
-      case 'S': type = VAR_STRING; break;
-      case 'F': type = VAR_FLOAT; break;
-      case 'D': type = VAR_DICT; break;
-      case 'L': type = VAR_LIST; break;
-      }
-
-      tab = vim_strchr(tab, '\t');
-      if (tab != NULL) {
-        tv.v_type = type;
-        if (type == VAR_STRING || type == VAR_DICT || type == VAR_LIST)
-          tv.vval.v_string = viminfo_readstring(virp,
-              (int)(tab - virp->vir_line + 1), TRUE);
-        else if (type == VAR_FLOAT)
-          (void)string2float(tab + 1, &tv.vval.v_float);
-        else
-          tv.vval.v_number = atol((char *)tab + 1);
-        if (type == VAR_DICT || type == VAR_LIST) {
-          typval_T *etv = eval_expr(tv.vval.v_string, NULL);
-
-          if (etv == NULL)
-            /* Failed to parse back the dict or list, use it as a
-             * string. */
-            tv.v_type = VAR_STRING;
-          else {
-            free(tv.vval.v_string);
-            tv = *etv;
-            free(etv);
-          }
-        }
-
-        set_var(virp->vir_line + 1, &tv, FALSE);
-
-        if (tv.v_type == VAR_STRING)
-          free(tv.vval.v_string);
-        else if (tv.v_type == VAR_DICT || tv.v_type == VAR_LIST)
-          clear_tv(&tv);
-      }
-    }
-  }
-
-  return viminfo_readline(virp);
-}
-
-/*
- * Write global vars that start with a capital to the viminfo file
- */
-void write_viminfo_varlist(FILE *fp)
-{
-  hashitem_T  *hi;
-  dictitem_T  *this_var;
-  int todo;
-  char        *s;
-  char_u      *p;
-  char_u      *tofree;
-  char_u numbuf[NUMBUFLEN];
-
-  if (find_viminfo_parameter('!') == NULL)
-    return;
-
-  fputs(_("\n# global variables:\n"), fp);
-
-  todo = (int)globvarht.ht_used;
-  for (hi = globvarht.ht_array; todo > 0; ++hi) {
-    if (!HASHITEM_EMPTY(hi)) {
-      --todo;
-      this_var = HI2DI(hi);
-      if (var_flavour(this_var->di_key) == VAR_FLAVOUR_VIMINFO) {
-        switch (this_var->di_tv.v_type) {
-        case VAR_STRING: s = "STR"; break;
-        case VAR_NUMBER: s = "NUM"; break;
-        case VAR_FLOAT:  s = "FLO"; break;
-        case VAR_DICT:   s = "DIC"; break;
-        case VAR_LIST:   s = "LIS"; break;
-        default: continue;
-        }
-        fprintf(fp, "!%s\t%s\t", this_var->di_key, s);
-        p = echo_string(&this_var->di_tv, &tofree, numbuf, 0);
-        if (p != NULL)
-          viminfo_writestring(fp, p);
-        free(tofree);
-      }
-    }
-  }
-}
-
-int read_viminfo_bufferlist(vir_T *virp, int writing)
-{
-  char_u      *tab;
-  linenr_T lnum;
-  colnr_T col;
-  buf_T       *buf;
-  char_u      *sfname;
-  char_u      *xline;
-
-  /* Handle long line and escaped characters. */
-  xline = viminfo_readstring(virp, 1, FALSE);
-
-  /* don't read in if there are files on the command-line or if writing: */
-  if (xline != NULL && !writing && ARGCOUNT == 0
-      && find_viminfo_parameter('%') != NULL) {
-    /* Format is: <fname> Tab <lnum> Tab <col>.
-     * Watch out for a Tab in the file name, work from the end. */
-    lnum = 0;
-    col = 0;
-    tab = vim_strrchr(xline, '\t');
-    if (tab != NULL) {
-      *tab++ = '\0';
-      col = (colnr_T)atoi((char *)tab);
-      tab = vim_strrchr(xline, '\t');
-      if (tab != NULL) {
-        *tab++ = '\0';
-        lnum = atol((char *)tab);
-      }
-    }
-
-    /* Expand "~/" in the file name at "line + 1" to a full path.
-     * Then try shortening it by comparing with the current directory */
-    expand_env(xline, NameBuff, MAXPATHL);
-    sfname = path_shorten_fname_if_possible(NameBuff);
-
-    buf = buflist_new(NameBuff, sfname, (linenr_T)0, BLN_LISTED);
-    if (buf != NULL) {          /* just in case... */
-      buf->b_last_cursor.lnum = lnum;
-      buf->b_last_cursor.col = col;
-      buflist_setfpos(buf, curwin, lnum, col, FALSE);
-    }
-  }
-  xfree(xline);
-
-  return viminfo_readline(virp);
-}
-
-void write_viminfo_bufferlist(FILE *fp)
-{
-  char_u      *line;
-  int max_buffers;
-
-  if (find_viminfo_parameter('%') == NULL)
-    return;
-
-  /* Without a number -1 is returned: do all buffers. */
-  max_buffers = get_viminfo_parameter('%');
-
-  /* Allocate room for the file name, lnum and col. */
-#define LINE_BUF_LEN (MAXPATHL + 40)
-  line = xmalloc(LINE_BUF_LEN);
-
-  FOR_ALL_TAB_WINDOWS(tp, win) {
-    set_last_cursor(win);
-  }
-
-  fputs(_("\n# Buffer list:\n"), fp);
-  FOR_ALL_BUFFERS(buf) {
-    if (buf->b_fname == NULL
-        || !buf->b_p_bl
-        || bt_quickfix(buf)
-        || removable(buf->b_ffname))
-      continue;
-
-    if (max_buffers-- == 0)
-      break;
-    putc('%', fp);
-    home_replace(NULL, buf->b_ffname, line, MAXPATHL, TRUE);
-    vim_snprintf_add((char *)line, LINE_BUF_LEN, "\t%" PRId64 "\t%d",
-        (int64_t)buf->b_last_cursor.lnum,
-        buf->b_last_cursor.col);
-    viminfo_writestring(fp, line);
-  }
-  xfree(line);
-}
-
-int read_viminfo_sub_string(vir_T *virp, int force)
-{
-  if (force)
-    xfree(old_sub);
-  if (force || old_sub == NULL)
-    old_sub = viminfo_readstring(virp, 1, TRUE);
-  return viminfo_readline(virp);
-}
-
-void write_viminfo_sub_string(FILE *fp)
-{
-  if (get_viminfo_parameter('/') != 0 && old_sub != NULL) {
-    fputs(_("\n# Last Substitute String:\n$"), fp);
-    viminfo_writestring(fp, old_sub);
-  }
-}
-
-/*
- * Structure used for reading from the viminfo file.
- */
-typedef struct {
-  char_u      *vir_line;        /* text of the current line */
-  FILE        *vir_fd;          /* file descriptor */
-  vimconv_T vir_conv;           /* encoding conversion */
-} vir_T;
-#endif