updated for version 7.4.215

Problem:    Inconsistency: ":sp foo" does not reload "foo", unless "foo" is
            the current buffer. (Liang Li)
Solution:   Do not reload the current buffer on a split command.

diff --git a/runtime/doc/windows.txt b/runtime/doc/windows.txt
index d1561a0a2e48866808e1bafbcd4ee3a6e8449e22..3bc47499ceec2363ee8b31a86120bbd9c004b125 100644 (file)
--- a/runtime/doc/windows.txt
+++ b/runtime/doc/windows.txt
@@ -132,13 +132,20 @@ that have termcap codes for italics.
 CTRL-W s                                               *CTRL-W_s*
 CTRL-W S                                               *CTRL-W_S*
 CTRL-W CTRL-S                                          *CTRL-W_CTRL-S*
-:[N]sp[lit] [++opt] [+cmd]                             *:sp* *:split*
+:[N]sp[lit] [++opt] [+cmd] [file]                      *:sp* *:split*
                Split current window in two.  The result is two viewports on
-               the same file.  Make new window N high (default is to use half
-               the height of the current window).  Reduces the current window
-               height to create room (and others, if the 'equalalways' option
-               is set, 'eadirection' isn't "hor", and one of them is higher
-               than the current or the new window).
+               the same file.
+               
+               Make the new window N high (default is to use half the height
+               of the current window).  Reduces the current window height to
+               create room (and others, if the 'equalalways' option is set,
+               'eadirection' isn't "hor", and one of them is higher than the
+               current or the new window).
+
+               If [file] is given it will be edited in the new window.  If it
+               is not loaded in any buffer, it will be read.  Else the new
+               window will use the already loaded buffer.
+
                Note: CTRL-S does not work on all terminals and might block
                further input, use CTRL-Q to get going again.
                Also see |++opt| and |+cmd|.

diff --git a/src/ex_docmd.c b/src/ex_docmd.c
index 95c699d9891f4b1b7b32c36f4141f6303bcac5fa..a63f8f66b24140ab14b17fb82b5dfd96c15f89b3 100644 (file)
--- a/src/ex_docmd.c
+++ b/src/ex_docmd.c
@@ -7938,6 +7938,8 @@ do_exedit(eap, old_curwin)
                                               ? ECMD_ONE : eap->do_ecmd_lnum,
                    (P_HID(curbuf) ? ECMD_HIDE : 0)
                    + (eap->forceit ? ECMD_FORCEIT : 0)
+                     /* after a split we can use an existing buffer */
+                   + (old_curwin != NULL ? ECMD_OLDBUF : 0)
 #ifdef FEAT_LISTCMDS
                    + (eap->cmdidx == CMD_badd ? ECMD_ADDBUF : 0 )
 #endif

diff --git a/src/version.c b/src/version.c
index 43b921a126e8591d38eb8101f36e9b027d617914..bf33f2d4018e4c73e5c3c3923b5495d2569df3a4 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -734,6 +734,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    215,
 /**/
     214,
 /**/