diff options
| author | Chris McCuller <cmcculler@salesforce.com> | 2015-09-21 22:19:15 -0400 |
|---|---|---|
| committer | Chris McCuller <cmcculler@salesforce.com> | 2015-09-21 22:19:15 -0400 |
| commit | e6ccd37b0563b4e7b34c41034766b9789e43ee5c (patch) | |
| tree | c12c8c2c6437fd7d5d3ec5bff27634a80759b808 /plugins/vim-interaction/vim-interaction.plugin.zsh | |
| parent | 30ef85664822595e29acdbc840c45d5772d84b5d (diff) | |
| parent | 76a26a2a59d8c6d0f65a4426cdb93920e255aea7 (diff) | |
| download | zsh-e6ccd37b0563b4e7b34c41034766b9789e43ee5c.tar.gz zsh-e6ccd37b0563b4e7b34c41034766b9789e43ee5c.tar.bz2 zsh-e6ccd37b0563b4e7b34c41034766b9789e43ee5c.zip | |
Merge master (rebase being super annoying). Fix conflicts
Diffstat (limited to 'plugins/vim-interaction/vim-interaction.plugin.zsh')
| -rw-r--r-- | plugins/vim-interaction/vim-interaction.plugin.zsh | 22 |
1 files changed, 4 insertions, 18 deletions
diff --git a/plugins/vim-interaction/vim-interaction.plugin.zsh b/plugins/vim-interaction/vim-interaction.plugin.zsh index b0b9414cd..b774be342 100644 --- a/plugins/vim-interaction/vim-interaction.plugin.zsh +++ b/plugins/vim-interaction/vim-interaction.plugin.zsh @@ -4,17 +4,6 @@ # Derek Wyatt (derek@{myfirstnamemylastname}.org # -function resolveFile -{ - if [ -f "$1" ]; then - echo $(readlink -f "$1") - elif [[ "${1#/}" == "$1" ]]; then - echo "$PWD/$1" - else - echo $1 - fi -} - function callvim { if [[ $# == 0 ]]; then @@ -48,13 +37,10 @@ EOH if [[ ${before#:} != $before && ${before%<cr>} == $before ]]; then before="$before<cr>" fi - local files="" - for f in $@ - do - files="$files $(resolveFile $f)" - done - if [[ -n $files ]]; then - files=':args! '"$files<cr>" + local files + if [[ $# -gt 0 ]]; then + # absolute path of files resolving symlinks (:A) and quoting special chars (:q) + files=':args! '"${@:A:q}<cr>" fi cmd="$before$files$after" gvim --remote-send "$cmd" |