Blame SOURCES/7.4.215

22c937
To: vim_dev@googlegroups.com
22c937
Subject: Patch 7.4.215
22c937
Fcc: outbox
22c937
From: Bram Moolenaar <Bram@moolenaar.net>
22c937
Mime-Version: 1.0
22c937
Content-Type: text/plain; charset=UTF-8
22c937
Content-Transfer-Encoding: 8bit
22c937
------------
22c937
22c937
Patch 7.4.215
22c937
Problem:    Inconsistency: ":sp foo" does not reload "foo", unless "foo" is
22c937
	    the current buffer. (Liang Li)
22c937
Solution:   Do not reload the current buffer on a split command.
22c937
Files:	    runtime/doc/windows.txt, src/ex_docmd.c
22c937
22c937
22c937
*** ../vim-7.4.214/runtime/doc/windows.txt	2013-08-10 13:25:08.000000000 +0200
22c937
--- runtime/doc/windows.txt	2014-03-25 12:34:51.989767212 +0100
22c937
***************
22c937
*** 132,144 ****
22c937
  CTRL-W s						*CTRL-W_s*
22c937
  CTRL-W S						*CTRL-W_S*
22c937
  CTRL-W CTRL-S						*CTRL-W_CTRL-S*
22c937
! :[N]sp[lit] [++opt] [+cmd]				*:sp* *:split*
22c937
  		Split current window in two.  The result is two viewports on
22c937
! 		the same file.  Make new window N high (default is to use half
22c937
! 		the height of the current window).  Reduces the current window
22c937
! 		height to create room (and others, if the 'equalalways' option
22c937
! 		is set, 'eadirection' isn't "hor", and one of them is higher
22c937
! 		than the current or the new window).
22c937
  		Note: CTRL-S does not work on all terminals and might block
22c937
  		further input, use CTRL-Q to get going again.
22c937
  		Also see |++opt| and |+cmd|.
22c937
--- 132,151 ----
22c937
  CTRL-W s						*CTRL-W_s*
22c937
  CTRL-W S						*CTRL-W_S*
22c937
  CTRL-W CTRL-S						*CTRL-W_CTRL-S*
22c937
! :[N]sp[lit] [++opt] [+cmd] [file]			*:sp* *:split*
22c937
  		Split current window in two.  The result is two viewports on
22c937
! 		the same file.
22c937
! 		
22c937
! 		Make the new window N high (default is to use half the height
22c937
! 		of the current window).  Reduces the current window height to
22c937
! 		create room (and others, if the 'equalalways' option is set,
22c937
! 		'eadirection' isn't "hor", and one of them is higher than the
22c937
! 		current or the new window).
22c937
! 
22c937
! 		If [file] is given it will be edited in the new window.  If it
22c937
! 		is not loaded in any buffer, it will be read.  Else the new
22c937
! 		window will use the already loaded buffer.
22c937
! 
22c937
  		Note: CTRL-S does not work on all terminals and might block
22c937
  		further input, use CTRL-Q to get going again.
22c937
  		Also see |++opt| and |+cmd|.
22c937
*** ../vim-7.4.214/src/ex_docmd.c	2014-03-23 16:03:56.167311626 +0100
22c937
--- src/ex_docmd.c	2014-03-25 12:57:13.737787771 +0100
22c937
***************
22c937
*** 7938,7943 ****
22c937
--- 7938,7945 ----
22c937
  					       ? ECMD_ONE : eap->do_ecmd_lnum,
22c937
  		    (P_HID(curbuf) ? ECMD_HIDE : 0)
22c937
  		    + (eap->forceit ? ECMD_FORCEIT : 0)
22c937
+ 		      /* after a split we can use an existing buffer */
22c937
+ 		    + (old_curwin != NULL ? ECMD_OLDBUF : 0)
22c937
  #ifdef FEAT_LISTCMDS
22c937
  		    + (eap->cmdidx == CMD_badd ? ECMD_ADDBUF : 0 )
22c937
  #endif
22c937
*** ../vim-7.4.214/src/version.c	2014-03-24 19:43:56.604837795 +0100
22c937
--- src/version.c	2014-03-25 12:30:13.137762939 +0100
22c937
***************
22c937
*** 736,737 ****
22c937
--- 736,739 ----
22c937
  {   /* Add new patch number below this line */
22c937
+ /**/
22c937
+     215,
22c937
  /**/
22c937
22c937
-- 
22c937
BLACK KNIGHT: The Black Knight always triumphs. Have at you!
22c937
   ARTHUR takes his last leg off.  The BLACK KNIGHT's body lands upright.
22c937
BLACK KNIGHT: All right, we'll call it a draw.
22c937
                 "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD
22c937
22c937
 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
22c937
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
22c937
\\\  an exciting new programming language -- http://www.Zimbu.org        ///
22c937
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///