lauchmelder/vim-sussify
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Proper filename escaping

Browse source 
A glob() is effectively undoing a fnameescape().

References #160.
This commit is contained in:
Marco Hinz 2015-05-18 20:59:18 +02:00
parent 1f42935fd6
commit d7adb1709f
1 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
autoload/startify.vim
View file

@ -392,7 +392,7 @@ function! s:display_by_path(path_prefix, path_format) abort
for [absolute_path, entry_path] in oldfiles for [absolute_path, entry_path] in oldfiles
let index = s:get_index_as_string(s:entry_number) let index = s:get_index_as_string(s:entry_number)
call append('$', ' ['. index .']'. repeat(' ', (3 - strlen(index))) . entry_path) call append('$', ' ['. index .']'. repeat(' ', (3 - strlen(index))) . entry_path)
execute 'nnoremap <buffer><silent>' index ':edit' escape(absolute_path, ' ') '<bar> call <sid>check_user_options()<cr>' execute 'nnoremap <buffer><silent>' index ':edit' absolute_path '<bar> call <sid>check_user_options()<cr>'
let s:entry_number += 1 let s:entry_number += 1
endfor endfor
@ -412,7 +412,7 @@ function! s:filter_oldfiles(path_prefix, path_format) abort
break break
endif endif
let absolute_path = glob(fnameescape(fnamemodify(resolve(fname), ":p"))) let absolute_path = glob(fnamemodify(resolve(fname), ":p"))
" filter duplicates, bookmarks and entries from the skiplist " filter duplicates, bookmarks and entries from the skiplist
if has_key(entries, absolute_path) if has_key(entries, absolute_path)
@ -426,7 +426,7 @@ function! s:filter_oldfiles(path_prefix, path_format) abort
let entry_path = fnamemodify(absolute_path, a:path_format) let entry_path = fnamemodify(absolute_path, a:path_format)
let entries[absolute_path] = 1 let entries[absolute_path] = 1
let counter -= 1 let counter -= 1
let oldfiles += [[absolute_path, entry_path]] let oldfiles += [[fnameescape(absolute_path), entry_path]]
endfor endfor
return oldfiles return oldfiles
@ -444,7 +444,7 @@ function! s:filter_oldfiles_unsafe(path_prefix, path_format) abort
break break
endif endif
let absolute_path = glob(fnameescape(fnamemodify(fname, ":p"))) let absolute_path = glob(fnamemodify(fname, ":p"))
if empty(absolute_path) if empty(absolute_path)
\ || has_key(entries, absolute_path) \ || has_key(entries, absolute_path)
\ || s:is_in_skiplist(absolute_path) \ || s:is_in_skiplist(absolute_path)
@ -455,7 +455,7 @@ function! s:filter_oldfiles_unsafe(path_prefix, path_format) abort
let entry_path = fnamemodify(absolute_path, a:path_format) let entry_path = fnamemodify(absolute_path, a:path_format)
let entries[absolute_path] = 1 let entries[absolute_path] = 1
let counter -= 1 let counter -= 1
let oldfiles += [[absolute_path, entry_path]] let oldfiles += [[fnameescape(absolute_path), entry_path]]
endfor endfor
return oldfiles return oldfiles
@ -463,7 +463,6 @@ endfun
" Function: s:show_dir {{{1 " Function: s:show_dir {{{1
function! s:show_dir() abort function! s:show_dir() abort
" let cwd = escape(getcwd(), '\')
return s:display_by_path(getcwd(), ':.') return s:display_by_path(getcwd(), ':.')
endfunction endfunction