From 27b9aed87f2c05e0c7e18716741ec3381e27f889 Mon Sep 17 00:00:00 2001
From: Pierre Barbier de Reuille <pierre.barbierdereuille@gmail.com>
Date: Sun, 1 Jul 2018 20:48:53 +0200
Subject: [PATCH] Added "-n name" option to vim-interaction plugin (#4522)

---
 plugins/vim-interaction/vim-interaction.plugin.zsh | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/plugins/vim-interaction/vim-interaction.plugin.zsh b/plugins/vim-interaction/vim-interaction.plugin.zsh
index b774be342..010f998d3 100644
--- a/plugins/vim-interaction/vim-interaction.plugin.zsh
+++ b/plugins/vim-interaction/vim-interaction.plugin.zsh
@@ -8,10 +8,11 @@ function callvim
 {
   if [[ $# == 0 ]]; then
     cat <<EOH
-usage: callvim [-b cmd] [-a cmd] [file ... fileN]
+usage: callvim [-b cmd] [-a cmd] [-n name] [file ... fileN]
 
   -b cmd     Run this command in GVIM before editing the first file
   -a cmd     Run this command in GVIM after editing the first file
+  -n name    Name of the GVIM server to connect to
   file       The file to edit
   ... fileN  The other files to add to the argslist
 EOH
@@ -21,13 +22,16 @@ EOH
   local cmd=""
   local before="<esc>"
   local after=""
-  while getopts ":b:a:" option
+  local name="GVIM"
+  while getopts ":b:a:n:" option
   do
     case $option in
       a) after="$OPTARG"
          ;;
       b) before="$OPTARG"
          ;;
+      n) name="$OPTARG"
+         ;;
     esac
   done
   shift $((OPTIND-1))
@@ -43,7 +47,7 @@ EOH
     files=':args! '"${@:A:q}<cr>"
   fi
   cmd="$before$files$after"
-  gvim --remote-send "$cmd"
+  gvim --servername "$name" --remote-send "$cmd"
   if typeset -f postCallVim > /dev/null; then
     postCallVim
   fi