updated for version 7.0167

2 files changed, 105 insertions, 0 deletions

diff --git a/runtime/macros/README.txt b/runtime/macros/README.txt
index 61066c5a56..ce61cd361a 100644
--- a/runtime/macros/README.txt
+++ b/runtime/macros/README.txt
@@ -12,11 +12,19 @@ The other files contain some handy utilities.  They also serve as examples for
 how to use Vi and Vim functionality.
 
 dvorak			for when you use a Dvorak keyboard
+
 justify.vim		user function for justifying text
+
 matchit.vim + matchit.txt  make % match if-fi, HTML tags, and much more
+
 less.sh + less.vim	make Vim work like less (or more)
+
 shellmenu.vim		menus for editing shell scripts in the GUI version
+
 swapmous.vim		swap left and right mouse buttons
 
+editexisting.vim	when editing a file that is already edited with
+			another Vim instance
+
 This one is only for Unix.  It can be found in the extra archive:
 file_select.vim		macros that make a handy file selector
diff --git a/runtime/macros/editexisting.vim b/runtime/macros/editexisting.vim
new file mode 100644
index 0000000000..2f28874aa6
--- /dev/null
+++ b/runtime/macros/editexisting.vim
@@ -0,0 +1,97 @@
+" Vim Plugin: 	Edit the file with an existing Vim if possible
+" Maintainer:	Bram Moolenaar
+" Last Change:	2005 Dec 11
+
+" This is a plugin, drop it in your (Unix) ~/.vim/plugin or (Win32)
+" $VIM/vimfiles/plugin directory.
+
+" This plugin serves two purposes:
+" 1. On startup, if we were invoked with one file name argument and the file
+"    is not modified then try to find another Vim instance that is editing
+"    this file.  If there is one then bring it to the foreground and exit.
+" 2. When a file is edited and a swap file exists for it, try finding that
+"    other Vim and bring it to the foreground.  Requires Vim 7, because it
+"    uses the SwapExists autocommand event.
+
+" Function that finds the Vim instance that is editing "filename" and brings
+" it to the foreground.
+func s:EditElsewhere(filename)
+  let fname_esc = substitute(a:filename, "'", "''", "g")
+
+  let servers = serverlist()
+  while servers != ''
+    " Get next server name in "servername"; remove it from "servers".
+    let i = match(servers, "\n")
+    if i == -1
+      let servername = servers
+      let servers = ''
+    else
+      let servername = strpart(servers, 0, i)
+      let servers = strpart(servers, i + 1)
+    endif
+
+    " Skip ourselves.
+    if servername ==? v:servername
+      continue
+    endif
+   
+    " Check if this server is editing our file.
+    if remote_expr(servername, "bufloaded('" . fname_esc . "')")
+      " Yes, bring it to the foreground.
+      if has("win32")
+	call remote_foreground(servername)
+      endif
+      call remote_expr(servername, "foreground()")
+
+      " Make sure the file is visible in a window (not hidden).
+      " If v:swapcommand exists and is set, send it to the server.
+      if exists("v:swapcommand")
+	let c = substitute(v:swapcommand, "'", "''", "g")
+	call remote_expr(servername, "EditExisting('" . fname_esc . "', '" . c . "')")
+      else
+	call remote_expr(servername, "EditExisting('" . fname_esc . "', '')")
+      endif
+
+      if !(has('vim_starting') && has('gui_running') && has('gui_win32'))
+	" Tell the user what is happening.  Not when the GUI is starting
+	" though, it would result in a message box.
+	echomsg "File is being edited by " . servername
+	sleep 2
+      endif
+      return 'q'
+    endif
+  endwhile
+  return ''
+endfunc
+
+" When the plugin is loaded and there is one file name argument: Find another
+" Vim server that is editing this file right now.
+if argc() == 1 && !&modified
+  if s:EditElsewhere(expand("%:p")) == 'q'
+    quit
+  endif
+endif
+
+" Setup for handling the situation that an existing swap file is found.
+try
+  au! SwapExists * let v:swapchoice = s:EditElsewhere(expand("<afile>:p"))
+catch
+  " Without SwapExists we don't do anything for ":edit" commands
+endtry
+
+" Function used on the server to make the file visible and possibly execute a
+" command.
+func! EditExisting(fname, command)
+  let n = bufwinnr(a:fname)
+  if n > 0
+    exe n . "wincmd w"
+  else
+    exe "split " . escape(a:fname, ' #%"|')
+  endif
+
+  if a:command != ''
+    exe "normal " . a:command
+  endif
+
+  redraw
+endfunc