diff options
| author | Ramses Ladlani <ramses.ladlani@fishingcactus.com> | 2015-09-21 08:49:18 +0200 |
|---|---|---|
| committer | Ramses Ladlani <ramses.ladlani@fishingcactus.com> | 2015-09-21 08:49:18 +0200 |
| commit | 7576f856b915e6e02c5990cd7e221d7b9efbe44a (patch) | |
| tree | be3fe162edbc04946eea014a3612280d4909dc1e /plugins/vim-interaction/vim-interaction.plugin.zsh | |
| parent | 6e0fcf803fe00445c97861360d1b0806d8cc56b8 (diff) | |
| parent | 918d26e7dbcb907e673df24242c9688cd89019b9 (diff) | |
| download | zsh-7576f856b915e6e02c5990cd7e221d7b9efbe44a.tar.gz zsh-7576f856b915e6e02c5990cd7e221d7b9efbe44a.tar.bz2 zsh-7576f856b915e6e02c5990cd7e221d7b9efbe44a.zip | |
Merge remote-tracking branch 'robyrussel/master' into fix-atom_plugin_for_cygwin
Discarded all previous changes to atom plugin for easier review in next commit.
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" |