From 602eb74de6245dcad1ec77e919a7597789ef1c0e Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <Bram@vim.org>
Date: Tue, 20 Feb 2007 03:43:38 +0000
Subject: [PATCH] updated for version 7.0-201
---
src/diff.c | 17 ++++++++++++-----
src/version.c | 2 ++
2 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/src/diff.c b/src/diff.c
index daa1f19c2d..b6f3354154 100644
--- a/src/diff.c
+++ b/src/diff.c
@@ -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;
}
diff --git a/src/version.c b/src/version.c
index c8c8834f43..ce13924175 100644
--- a/src/version.c
+++ b/src/version.c
@@ -666,6 +666,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
+/**/
+ 201,
/**/
200,
/**/
--
GitLab