diff options
| author | Thiago de Arruda <tpadilha84@gmail.com> | 2015-03-25 22:08:14 -0300 |
|---|---|---|
| committer | Thiago de Arruda <tpadilha84@gmail.com> | 2015-03-25 22:08:14 -0300 |
| commit | a6e53a3797a93fe060f807fe2e4c6361854b6c97 (patch) | |
| tree | b684785ba9c769491e6ebdac8e21495cf22dbdd3 /src/nvim/diff.c | |
| parent | d2d99454e63c0e6649fddd52bbd9a10d27c2e347 (diff) | |
| parent | 2aa2513b8e023a0d7bd2071299f0ea59a4d4ce25 (diff) | |
| download | rneovim-a6e53a3797a93fe060f807fe2e4c6361854b6c97.tar.gz rneovim-a6e53a3797a93fe060f807fe2e4c6361854b6c97.tar.bz2 rneovim-a6e53a3797a93fe060f807fe2e4c6361854b6c97.zip | |
Merge PR #2076 'Builtin terminal emulation'
Diffstat (limited to 'src/nvim/diff.c')
| -rw-r--r-- | src/nvim/diff.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/nvim/diff.c b/src/nvim/diff.c index 63b0eaf4f6..e50b096270 100644 --- a/src/nvim/diff.c +++ b/src/nvim/diff.c @@ -2078,7 +2078,7 @@ void ex_diffgetput(exarg_T *eap) if ((curtab->tp_diffbuf[idx_other] != curbuf) && (curtab->tp_diffbuf[idx_other] != NULL)) { if ((eap->cmdidx != CMD_diffput) - || curtab->tp_diffbuf[idx_other]->b_p_ma) { + || MODIFIABLE(curtab->tp_diffbuf[idx_other])) { break; } found_not_ma = TRUE; @@ -2098,7 +2098,8 @@ void ex_diffgetput(exarg_T *eap) for (i = idx_other + 1; i < DB_COUNT; ++i) { if ((curtab->tp_diffbuf[i] != curbuf) && (curtab->tp_diffbuf[i] != NULL) - && ((eap->cmdidx != CMD_diffput) || curtab->tp_diffbuf[i]->b_p_ma)) { + && ((eap->cmdidx != CMD_diffput) + || MODIFIABLE(curtab->tp_diffbuf[i]))) { EMSG(_("E101: More than two buffers in diff mode, don't know " "which one to use")); return; |