diff options
| author | Bram Moolenaar <Bram@vim.org> | 2014-03-23 15:13:05 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2014-03-23 15:13:05 +0100 |
| commit | f7ff6e85e8a4e84cff023f5db4b66ef85986605a (patch) | |
| tree | 813913a9c1d1418b5b85e3a4bc414dbeb2b3f6a3 /src/main.c | |
| parent | a68783751647e3243ca6f22df62907efbdbccb02 (diff) | |
| download | vim-f7ff6e85e8a4e84cff023f5db4b66ef85986605a.zip | |
updated for version 7.4.212
Problem: Now that the +visual feature is always enabled the #ifdefs for it
are not useful.
Solution: Remove the checks for FEAT_VISUAL.
Diffstat (limited to 'src/main.c')
| -rw-r--r-- | src/main.c | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/src/main.c b/src/main.c index 79521ef46..f9bd8732e 100644 --- a/src/main.c +++ b/src/main.c @@ -1057,9 +1057,7 @@ main_loop(cmdwin, noexmode) if (!cmdwin && !noexmode && SETJMP(x_jump_env)) { State = NORMAL; -# ifdef FEAT_VISUAL VIsual_active = FALSE; -# endif got_int = TRUE; need_wait_return = FALSE; global_busy = FALSE; @@ -1096,11 +1094,7 @@ main_loop(cmdwin, noexmode) check_timestamps(FALSE); if (need_wait_return) /* if wait_return still needed ... */ wait_return(FALSE); /* ... call it now */ - if (need_start_insertmode && goto_im() -#ifdef FEAT_VISUAL - && !VIsual_active -#endif - ) + if (need_start_insertmode && goto_im() && !VIsual_active) { need_start_insertmode = FALSE; stuffReadbuff((char_u *)"i"); /* start insert mode next */ @@ -1202,7 +1196,7 @@ main_loop(cmdwin, noexmode) diff_need_scrollbind = FALSE; } #endif -#if defined(FEAT_FOLDING) && defined(FEAT_VISUAL) +#if defined(FEAT_FOLDING) /* Include a closed fold completely in the Visual area. */ foldAdjustVisual(); #endif @@ -1228,12 +1222,9 @@ main_loop(cmdwin, noexmode) update_topline(); validate_cursor(); -#ifdef FEAT_VISUAL if (VIsual_active) update_curbuf(INVERTED);/* update inverted part */ - else -#endif - if (must_redraw) + else if (must_redraw) update_screen(0); else if (redraw_cmdline || clear_cmdline) showmode(); |