jkunstle / rpms / vim

Forked from rpms/vim 3 years ago
Clone

Blame SOURCES/7.4.592

073263
To: vim_dev@googlegroups.com
073263
Subject: Patch 7.4.592
073263
Fcc: outbox
073263
From: Bram Moolenaar <Bram@moolenaar.net>
073263
Mime-Version: 1.0
073263
Content-Type: text/plain; charset=UTF-8
073263
Content-Transfer-Encoding: 8bit
073263
------------
073263
073263
Patch 7.4.592
073263
Problem:    When doing ":e foobar" when already editing "foobar" and 'buftype'
073263
	    is "nofile" the buffer is cleared. (Xavier de Gaye)
073263
Solution:   Do no clear the buffer.
073263
Files:	    src/ex_cmds.c
073263
073263
073263
*** ../vim-7.4.591/src/ex_cmds.c	2014-12-13 03:17:07.461046575 +0100
073263
--- src/ex_cmds.c	2015-01-27 11:21:14.752434647 +0100
073263
***************
073263
*** 3529,3534 ****
073263
--- 3529,3541 ----
073263
  #endif
073263
  		check_fname() == FAIL)
073263
  	    goto theend;
073263
+ 
073263
+ 	/* ":e foobar" when already editing "foobar" will reload the file.
073263
+ 	 * But when 'buftype' is "nofile" there is no file to load, so don't
073263
+ 	 * do anything. */
073263
+ 	if (curbuf->b_p_bt[0] == 'n' && curbuf->b_p_bt[2] == 'f')
073263
+ 	    goto theend;
073263
+ 
073263
  	oldbuf = (flags & ECMD_OLDBUF);
073263
      }
073263
  
073263
*** ../vim-7.4.591/src/version.c	2015-01-22 22:41:51.864583029 +0100
073263
--- src/version.c	2015-01-27 11:24:32.466265106 +0100
073263
***************
073263
*** 743,744 ****
073263
--- 743,746 ----
073263
  {   /* Add new patch number below this line */
073263
+ /**/
073263
+     592,
073263
  /**/
073263
073263
-- 
073263
hundred-and-one symptoms of being an internet addict:
073263
120. You ask a friend, "What's that big shiny thing?" He says, "It's the sun."
073263
073263
 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
073263
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
073263
\\\  an exciting new programming language -- http://www.Zimbu.org        ///
073263
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///