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/ui.c | |
| parent | a68783751647e3243ca6f22df62907efbdbccb02 (diff) | |
| download | vim-git-f7ff6e85e8a4e84cff023f5db4b66ef85986605a.tar.gz | |
updated for version 7.4.212v7.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/ui.c')
| -rw-r--r-- | src/ui.c | 24 |
1 files changed, 8 insertions, 16 deletions
@@ -2610,13 +2610,11 @@ retnomove: if (on_sep_line) return IN_SEP_LINE; #endif -#ifdef FEAT_VISUAL if (flags & MOUSE_MAY_STOP_VIS) { end_visual_mode(); redraw_curbuf_later(INVERTED); /* delete the inversion */ } -#endif #if defined(FEAT_CMDWIN) && defined(FEAT_CLIPBOARD) /* Continue a modeless selection in another window. */ if (cmdwin_type != 0 && row < W_WINROW(curwin)) @@ -2686,32 +2684,30 @@ retnomove: } #endif -#ifdef FEAT_VISUAL /* Before jumping to another buffer, or moving the cursor for a left * click, stop Visual mode. */ if (VIsual_active && (wp->w_buffer != curwin->w_buffer || (!on_status_line -# ifdef FEAT_VERTSPLIT +#ifdef FEAT_VERTSPLIT && !on_sep_line -# endif -# ifdef FEAT_FOLDING +#endif +#ifdef FEAT_FOLDING && ( -# ifdef FEAT_RIGHTLEFT +# ifdef FEAT_RIGHTLEFT wp->w_p_rl ? col < W_WIDTH(wp) - wp->w_p_fdc : -# endif +# endif col >= wp->w_p_fdc -# ifdef FEAT_CMDWIN +# ifdef FEAT_CMDWIN + (cmdwin_type == 0 && wp == curwin ? 0 : 1) -# endif - ) # endif + ) +#endif && (flags & MOUSE_MAY_STOP_VIS)))) { end_visual_mode(); redraw_curbuf_later(INVERTED); /* delete the inversion */ } -#endif #ifdef FEAT_CMDWIN if (cmdwin_type != 0 && wp != curwin) { @@ -2801,14 +2797,12 @@ retnomove: #endif else /* keep_window_focus must be TRUE */ { -#ifdef FEAT_VISUAL /* before moving the cursor for a left click, stop Visual mode */ if (flags & MOUSE_MAY_STOP_VIS) { end_visual_mode(); redraw_curbuf_later(INVERTED); /* delete the inversion */ } -#endif #if defined(FEAT_CMDWIN) && defined(FEAT_CLIPBOARD) /* Continue a modeless selection in another window. */ @@ -2933,7 +2927,6 @@ retnomove: if (mouse_comp_pos(curwin, &row, &col, &curwin->w_cursor.lnum)) mouse_past_bottom = TRUE; -#ifdef FEAT_VISUAL /* Start Visual mode before coladvance(), for when 'sel' != "old" */ if ((flags & MOUSE_MAY_VIS) && !VIsual_active) { @@ -2947,7 +2940,6 @@ retnomove: if (p_smd && msg_silent == 0) redraw_cmdline = TRUE; /* show visual mode later */ } -#endif curwin->w_curswant = col; curwin->w_set_curswant = FALSE; /* May still have been TRUE */ |