diff options
| author | Bram Moolenaar <Bram@vim.org> | 2010-07-31 16:44:19 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2010-07-31 16:44:19 +0200 |
| commit | a9d52e3b7925ef119b5d0d9fca14faac634effb0 (patch) | |
| tree | 151c52ad2e282b8e264aee2fc7af3db76d8c2071 /src/diff.c | |
| parent | a26559b553079c3959ee142a010b2e000c180323 (diff) | |
| download | vim-git-a9d52e3b7925ef119b5d0d9fca14faac634effb0.tar.gz | |
Fixes for coverity warnings.
Diffstat (limited to 'src/diff.c')
| -rw-r--r-- | src/diff.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/diff.c b/src/diff.c index e733ccd45..9b6d2791f 100644 --- a/src/diff.c +++ b/src/diff.c @@ -1177,6 +1177,9 @@ ex_diffoff(eap) { /* Set 'diff', 'scrollbind' off and 'wrap' on. */ wp->w_p_diff = FALSE; +#ifdef FEAT_CURSORBIND + wp->w_p_crb = FALSE; +#endif wp->w_p_scb = FALSE; wp->w_p_wrap = TRUE; #ifdef FEAT_FOLDING @@ -2360,7 +2363,7 @@ ex_diffgetput(eap) } /* restore curwin/curbuf and a few other things */ - if (idx_other == idx_to) + if (eap->cmdidx != CMD_diffget) { /* Syncing undo only works for the current buffer, but we change * another buffer. Sync undo if the command was typed. This isn't |