|
 |
3ef2ca |
To: vim_dev@googlegroups.com
|
|
|
3ef2ca |
Subject: Patch 7.4.477
|
|
|
3ef2ca |
Fcc: outbox
|
|
|
3ef2ca |
From: Bram Moolenaar <Bram@moolenaar.net>
|
|
|
3ef2ca |
Mime-Version: 1.0
|
|
|
3ef2ca |
Content-Type: text/plain; charset=UTF-8
|
|
|
3ef2ca |
Content-Transfer-Encoding: 8bit
|
|
|
3ef2ca |
------------
|
|
|
3ef2ca |
|
|
|
3ef2ca |
Patch 7.4.477
|
|
|
3ef2ca |
Problem: When using ":%diffput" and the other file is empty an extra empty
|
|
|
3ef2ca |
line remains.
|
|
|
3ef2ca |
Solution: Set the buf_empty flag.
|
|
|
3ef2ca |
Files: src/diff.c
|
|
|
3ef2ca |
|
|
|
3ef2ca |
|
|
|
3ef2ca |
*** ../vim-7.4.476/src/diff.c 2014-05-28 11:35:33.424011248 +0200
|
|
|
3ef2ca |
--- src/diff.c 2014-10-15 12:54:45.778015697 +0200
|
|
|
3ef2ca |
***************
|
|
|
3ef2ca |
*** 2325,2331 ****
|
|
|
3ef2ca |
end_skip = 0;
|
|
|
3ef2ca |
}
|
|
|
3ef2ca |
|
|
|
3ef2ca |
! buf_empty = FALSE;
|
|
|
3ef2ca |
added = 0;
|
|
|
3ef2ca |
for (i = 0; i < count; ++i)
|
|
|
3ef2ca |
{
|
|
|
3ef2ca |
--- 2325,2331 ----
|
|
|
3ef2ca |
end_skip = 0;
|
|
|
3ef2ca |
}
|
|
|
3ef2ca |
|
|
|
3ef2ca |
! buf_empty = bufempty();
|
|
|
3ef2ca |
added = 0;
|
|
|
3ef2ca |
for (i = 0; i < count; ++i)
|
|
|
3ef2ca |
{
|
|
|
3ef2ca |
*** ../vim-7.4.476/src/version.c 2014-10-15 12:07:07.610009454 +0200
|
|
|
3ef2ca |
--- src/version.c 2014-10-15 12:37:54.338013488 +0200
|
|
|
3ef2ca |
***************
|
|
|
3ef2ca |
*** 743,744 ****
|
|
|
3ef2ca |
--- 743,746 ----
|
|
|
3ef2ca |
{ /* Add new patch number below this line */
|
|
|
3ef2ca |
+ /**/
|
|
|
3ef2ca |
+ 477,
|
|
|
3ef2ca |
/**/
|
|
|
3ef2ca |
|
|
|
3ef2ca |
--
|
|
|
3ef2ca |
We're knights of the round table
|
|
|
3ef2ca |
We dance whene'er we're able
|
|
|
3ef2ca |
We do routines and chorus scenes
|
|
|
3ef2ca |
With footwork impeccable.
|
|
|
3ef2ca |
We dine well here in Camelot
|
|
|
3ef2ca |
We eat ham and jam and spam a lot.
|
|
|
3ef2ca |
"Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD
|
|
|
3ef2ca |
|
|
|
3ef2ca |
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
|
|
|
3ef2ca |
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
|
|
|
3ef2ca |
\\\ an exciting new programming language -- http://www.Zimbu.org ///
|
|
|
3ef2ca |
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
|