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