1 files changed, 9 insertions, 0 deletions
diff --git a/src/nvim/option.c b/src/nvim/option.c
index c109e4e521..fae4507f1e 100644
--- a/src/nvim/option.c
+++ b/src/nvim/option.c
@@ -4643,6 +4643,15 @@ int findoption_len(const char *const arg, const size_t len)
   }
   if (s == NULL) {
     opt_idx = -1;
+  } else {
+    // Nvim: handle option aliases.
+    if (STRNCMP(options[opt_idx].fullname, "viminfo", 7) == 0) {
+      if (STRLEN(options[opt_idx].fullname) == 7) {
+        return findoption_len("shada", 5);
+      }
+      assert(STRCMP(options[opt_idx].fullname, "viminfofile") == 0);
+      return findoption_len("shadafile", 9);
+    }
   }
   return opt_idx;
 }