thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

updated for version 7.0150

Browse Source
This commit is contained in:
Bram Moolenaar
2005-09-25 22:16:38 +00:00
parent bfd8fc0529
commit 1e01546026
38 changed files with 1826 additions and 1496 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/diff.c
View File

@@ -1905,7 +1905,10 @@ ex_diffgetput(eap)
{
/* No argument: Find the other buffer in the list of diff buffers. */
for (idx_other = 0; idx_other < DB_COUNT; ++idx_other)
if (diffbuf[idx_other] != curbuf && diffbuf[idx_other] != NULL)
if (diffbuf[idx_other] != curbuf
&& diffbuf[idx_other] != NULL
&& (eap->cmdidx != CMD_diffput
|| diffbuf[idx_other]->b_p_ma))
break;
if (idx_other == DB_COUNT)
{
@@ -1915,7 +1918,9 @@ ex_diffgetput(eap)
/* Check that there isn't a third buffer in the list */
for (i = idx_other + 1; i < DB_COUNT; ++i)
if (diffbuf[i] != curbuf && diffbuf[i] != NULL)
if (diffbuf[i] != curbuf
&& diffbuf[i] != NULL
&& (eap->cmdidx != CMD_diffput || diffbuf[i]->b_p_ma))
{
EMSG(_("E101: More than two buffers in diff mode, don't know which one to use"));
return;