patch 7.4.1674

Problem:    The editexisting plugin has to be copied or sourced to be used.
Solution:   Turn it into a package.

diff --git a/Filelist b/Filelist
index cd55fe158411dac796fcb17cf8684395a41165a6..b64658edde15ed61db495bf09273ac4968b11dd7 100644 (file)
--- a/Filelist
+++ b/Filelist
@@ -526,6 +526,7 @@ RT_ALL =    \
                runtime/pack/dist/opt/dvorak/plugin/dvorak.vim \
                runtime/pack/dist/opt/dvorak/dvorak/enable.vim \
                runtime/pack/dist/opt/dvorak/dvorak/disable.vim \
+               runtime/pack/dist/opt/editexisting/plugin/editexisting.vim \
                runtime/pack/dist/opt/justify/plugin/justify.vim \
                runtime/pack/dist/opt/matchit/plugin/matchit.vim \
                runtime/pack/dist/opt/matchit/doc/matchit.txt \

diff --git a/runtime/macros/README.txt b/runtime/macros/README.txt
index 884fe535104c796d16372287ced0e0a9dfa2a9cc..a80500784624a992eede7f5a47b005fea2b2ab8e 100644 (file)
--- a/runtime/macros/README.txt
+++ b/runtime/macros/README.txt
@@ -17,20 +17,20 @@ 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
+editexisting.vim       
 
 This one is only for Unix.
 file_select.vim                macros that make a handy file selector
 
-The Dvorak support has been moved to an optional package.  To load it put this
-line in your vimrc file:
-       packadd! dvorak
 
-The support for justifying test has been moved to an optional package.  To
-load it put this line in your vimrc file:
-       packadd! justify
+The following have been moved to an optional package.  Add the command to your
+vimrc file to use the package:
 
-The matchit plugin has been moved to an optional package.  To load it put this
-line in your vimrc file:
-       packadd! matchit
+packadd! dvorak                Dvorak keyboard support; adds mappings
+
+packadd! editexisting  when editing a file that is already edited with
+                       another Vim instance, go to that Vim instance
+
+packadd! justify       justifying text.
+
+packadd! matchit       makes the % command work better

diff --git a/runtime/pack/dist/opt/editexisting/plugin/editexisting.vim b/runtime/pack/dist/opt/editexisting/plugin/editexisting.vim
new file mode 100644 (file)
index 0000000..d9877a0
--- /dev/null
+++ b/runtime/pack/dist/opt/editexisting/plugin/editexisting.vim
@@ -0,0 +1,114 @@
+" Vim Plugin:  Edit the file with an existing Vim if possible
+" Maintainer:  Bram Moolenaar
+" Last Change: 2016 Mar 28
+
+" To use add ":packadd! editexisting" in your vimrc file.
+
+" 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()")
+
+      if remote_expr(servername, "exists('*EditExisting')")
+       " 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
+      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)
+  " Get the window number of the file in the current tab page.
+  let winnr = bufwinnr(a:fname)
+  if winnr <= 0
+    " Not found, look in other tab pages.
+    let bufnr = bufnr(a:fname)
+    for i in range(tabpagenr('$'))
+      if index(tabpagebuflist(i + 1), bufnr) >= 0
+       " Make this tab page the current one and find the window number.
+       exe 'tabnext ' . (i + 1)
+       let winnr = bufwinnr(a:fname)
+       break
+      endif
+    endfor
+  endif
+
+  if winnr > 0
+    exe winnr . "wincmd w"
+  elseif exists('*fnameescape')
+    exe "split " . fnameescape(a:fname)
+  else
+    exe "split " . escape(a:fname, " \t\n*?[{`$\\%#'\"|!<")
+  endif
+
+  if a:command != ''
+    exe "normal! " . a:command
+  endif
+
+  redraw
+endfunc

diff --git a/src/version.c b/src/version.c
index 36cfa653f69ab66c8109c347d74744c85d72ace9..68991898d3964d28f543d174f1ba3b311f115f1b 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -748,6 +748,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1674,
 /**/
     1673,
 /**/