From 3e0159b3c5c8356f8f638c2f678db0ac2b739f42 Mon Sep 17 00:00:00 2001
From: Ian Fijolek <ifij@lvpx9v92dj.thefij>
Date: Wed, 28 Jun 2023 13:32:54 -0700
Subject: [PATCH] Move filename escaping to just before execution

This resolves the issue with passing escaped paths into functions that
don't support escaped paths. Eg. isdirectory()

Fixes #454
---
 autoload/startify.vim | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/autoload/startify.vim b/autoload/startify.vim
index 3b9867a..ee09d59 100644
--- a/autoload/startify.vim
+++ b/autoload/startify.vim
@@ -531,12 +531,12 @@ function! s:open_buffer(entry)
     execute a:entry.cmd a:entry.path
   elseif a:entry.type == 'file'
     if line2byte('$') == -1
-      execute 'edit' a:entry.path
+      execute 'edit' fnameescape(a:entry.path)
     else
       if a:entry.cmd == 'tabnew'
         wincmd =
       endif
-      execute a:entry.cmd a:entry.path
+      execute a:entry.cmd fnameescape(a:entry.path)
     endif
     call s:check_user_options(a:entry.path)
   endif
@@ -770,7 +770,7 @@ function! s:show_bookmarks() abort
     if has('win32')
       let path = substitute(path, '\[', '\[[]', 'g')
     endif
-    call s:register(line('$'), index, 'file', 'edit', fnameescape(expand(path)))
+    call s:register(line('$'), index, 'file', 'edit', expand(path))
 
     unlet bookmark  " avoid type mismatch for heterogeneous lists
   endfor
@@ -968,11 +968,13 @@ function! s:check_user_options(path) abort
 
   if get(g:, 'startify_change_to_dir', 1)
     if isdirectory(a:path)
-      execute s:cd_cmd() a:path
+      echom 'path is a dir: ' .. s:cd_cmd() .. ' ' .. a:path
+      execute s:cd_cmd() fnameescape(a:path)
     else
+      echom 'path is not a dir: ' .. s:cd_cmd() .. ' ' .. a:path
       let dir = fnamemodify(a:path, ':h')
       if isdirectory(dir)
-        execute s:cd_cmd() dir
+        execute s:cd_cmd() fnameescape(dir)
       else
         " Do nothing. E.g. a:path == `scp://foo/bar`
       endif