diff options
| author | Bram Moolenaar <Bram@vim.org> | 2006-01-22 23:30:12 +0000 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2006-01-22 23:30:12 +0000 |
| commit | 33aec765bdc2096f123c5a4c61f8948a61aa9ef5 (patch) | |
| tree | 858b75b899a2ed6cf6e5543a1f29201c04650bd4 /src/main.c | |
| parent | 71fe80dddd436b36de5d814c1165a3e56b1f0974 (diff) | |
| download | vim-git-33aec765bdc2096f123c5a4c61f8948a61aa9ef5.tar.gz | |
updated for version 7.0185v7.0185
Diffstat (limited to 'src/main.c')
| -rw-r--r-- | src/main.c | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/src/main.c b/src/main.c index fd85ea89d..561d6ae4b 100644 --- a/src/main.c +++ b/src/main.c @@ -988,6 +988,15 @@ main_loop(cmdwin, noexmode) skip_redraw = FALSE; else if (do_redraw || stuff_empty()) { +#if defined(FEAT_DIFF) && defined(FEAT_SCROLLBIND) + /* Scroll-binding for diff mode may have been postponed until + * here. Avoids doing it for every change. */ + if (diff_need_scrollbind) + { + check_scrollbind((linenr_T)0, 0L); + diff_need_scrollbind = FALSE; + } +#endif #if defined(FEAT_FOLDING) && defined(FEAT_VISUAL) /* Include a closed fold completely in the Visual area. */ foldAdjustVisual(); @@ -1153,9 +1162,14 @@ getout(exitval) buf->b_changedtick = -1; /* note that we did it already */ wp = firstwin; /* restart, window may be closed */ } +# ifdef FEAT_WINDOWS else wp = wp->w_next; +# else + break; +# endif } + /* Trigger BufUnload for buffers that are loaded */ for (buf = firstbuf; buf != NULL; buf = buf->b_next) if (buf->b_ml.ml_mfp != NULL) |