forked from aniani/vim
updated for version 7.0-201
This commit is contained in:
parent
fa3491a0e0
commit
602eb74de6
13
src/diff.c
13
src/diff.c
@ -2014,6 +2014,7 @@ ex_diffgetput(eap)
|
|||||||
int start_skip, end_skip;
|
int start_skip, end_skip;
|
||||||
int new_count;
|
int new_count;
|
||||||
int buf_empty;
|
int buf_empty;
|
||||||
|
int found_not_ma = FALSE;
|
||||||
|
|
||||||
/* Find the current buffer in the list of diff buffers. */
|
/* Find the current buffer in the list of diff buffers. */
|
||||||
idx_cur = diff_buf_idx(curbuf);
|
idx_cur = diff_buf_idx(curbuf);
|
||||||
@ -2028,12 +2029,18 @@ ex_diffgetput(eap)
|
|||||||
/* No argument: Find the other buffer in the list of diff buffers. */
|
/* No argument: Find the other buffer in the list of diff buffers. */
|
||||||
for (idx_other = 0; idx_other < DB_COUNT; ++idx_other)
|
for (idx_other = 0; idx_other < DB_COUNT; ++idx_other)
|
||||||
if (curtab->tp_diffbuf[idx_other] != curbuf
|
if (curtab->tp_diffbuf[idx_other] != curbuf
|
||||||
&& curtab->tp_diffbuf[idx_other] != NULL
|
&& curtab->tp_diffbuf[idx_other] != NULL)
|
||||||
&& (eap->cmdidx != CMD_diffput
|
{
|
||||||
|| curtab->tp_diffbuf[idx_other]->b_p_ma))
|
if (eap->cmdidx != CMD_diffput
|
||||||
|
|| curtab->tp_diffbuf[idx_other]->b_p_ma)
|
||||||
break;
|
break;
|
||||||
|
found_not_ma = TRUE;
|
||||||
|
}
|
||||||
if (idx_other == DB_COUNT)
|
if (idx_other == DB_COUNT)
|
||||||
{
|
{
|
||||||
|
if (found_not_ma)
|
||||||
|
EMSG(_("E793: No other buffer in diff mode is modifiable"));
|
||||||
|
else
|
||||||
EMSG(_("E100: No other buffer in diff mode"));
|
EMSG(_("E100: No other buffer in diff mode"));
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -666,6 +666,8 @@ static char *(features[]) =
|
|||||||
|
|
||||||
static int included_patches[] =
|
static int included_patches[] =
|
||||||
{ /* Add new patch number below this line */
|
{ /* Add new patch number below this line */
|
||||||
|
/**/
|
||||||
|
201,
|
||||||
/**/
|
/**/
|
||||||
200,
|
200,
|
||||||
/**/
|
/**/
|
||||||
|
Loading…
x
Reference in New Issue
Block a user