updated for version 7.0-219

diff --git a/runtime/macros/editexisting.vim b/runtime/macros/editexisting.vim
index f0feed08f879a338d920e75b27d26517298c0c3a..fb6b9193fe1e57619fab3a4b0bf0d98c0a63326c 100644 (file)
--- a/runtime/macros/editexisting.vim
+++ b/runtime/macros/editexisting.vim
@@ -1,6 +1,6 @@
 " Vim Plugin:  Edit the file with an existing Vim if possible
 " Maintainer:  Bram Moolenaar
-" Last Change: 2006 Apr 30
+" Last Change: 2007 Mar 17
 
 " This is a plugin, drop it in your (Unix) ~/.vim/plugin or (Win32)
 " $VIM/vimfiles/plugin directory.  Or make a symbolic link, so that you
@@ -85,9 +85,23 @@ 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"
+  " 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"
   else
     exe "split " . escape(a:fname, ' #%"|')
   endif

diff --git a/src/main.c b/src/main.c
index 3c37698df8f29705e0dcfd6661a117a685e6e78d..c0b8b25b937c1670fe1ffb27c015546fb165645b 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -798,6 +798,11 @@ main
     create_windows(&params);
     TIME_MSG("opening buffers");
 
+#ifdef FEAT_EVAL
+    /* clear v:swapcommand */
+    set_vim_var_string(VV_SWAPCOMMAND, NULL, -1);
+#endif
+
     /* Ex starts at last line of the file */
     if (exmode_active)
        curwin->w_cursor.lnum = curbuf->b_ml.ml_line_count;
@@ -2202,6 +2207,21 @@ scripterror:
            argv_idx = 1;
        }
     }
+
+#ifdef FEAT_EVAL
+    /* If there is a "+123" or "-c" command, set v:swapcommand to the first
+     * one. */
+    if (parmp->n_commands > 0)
+    {
+       p = alloc((unsigned)STRLEN(parmp->commands[0]) + 3);
+       if (p != NULL)
+       {
+           sprintf((char *)p, ":%s\r", parmp->commands[0]);
+           set_vim_var_string(VV_SWAPCOMMAND, p, -1);
+           vim_free(p);
+       }
+    }
+#endif
 }
 
 /*

diff --git a/src/version.c b/src/version.c
index 84450a85ca8141102d9101c3e3e0a9f457638ee8..d58ae293b6a2273f5d66ff0e7934cfd4cc493732 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -666,6 +666,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    219,
 /**/
     218,
 /**/