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

updated for version 7.0-201

Browse Source
This commit is contained in:
Bram Moolenaar 2007-02-20 03:43:38 +00:00
parent fa3491a0e0
commit 602eb74de6
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/diff.c
View File

@ -2014,6 +2014,7 @@ ex_diffgetput(eap)
int start_skip, end_skip;
int new_count;
int buf_empty;
int found_not_ma = FALSE;
/* Find the current buffer in the list of diff buffers. */
idx_cur = diff_buf_idx(curbuf);
@ -2028,13 +2029,19 @@ 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 (curtab->tp_diffbuf[idx_other] != curbuf
&& curtab->tp_diffbuf[idx_other] != NULL
&& (eap->cmdidx != CMD_diffput
|| curtab->tp_diffbuf[idx_other]->b_p_ma))
break;
&& curtab->tp_diffbuf[idx_other] != NULL)
{
if (eap->cmdidx != CMD_diffput
|| curtab->tp_diffbuf[idx_other]->b_p_ma)
break;
found_not_ma = TRUE;
}
if (idx_other == DB_COUNT)
{
EMSG(_("E100: No other buffer in diff mode"));
if (found_not_ma)
EMSG(_("E793: No other buffer in diff mode is modifiable"));
else
EMSG(_("E100: No other buffer in diff mode"));
return;
}

2
src/version.c
View File

@ -666,6 +666,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
201,
/**/
200,
/**/