diff options
| author | Bram Moolenaar <Bram@vim.org> | 2006-10-10 11:26:53 +0000 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2006-10-10 11:26:53 +0000 |
| commit | 6179c6182793e87e11d4844e4a7942be08376baf (patch) | |
| tree | 9efa115359bdfe899793c65d0b96ac66d0db39a4 | |
| parent | 69a7e430289835c443ba963b25e385ca1519745e (diff) | |
updated for version 7.0-125v7.0.125
| -rw-r--r-- | src/normal.c | 15 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 11 insertions, 6 deletions
diff --git a/src/normal.c b/src/normal.c index d1dc05f145..174570cc53 100644 --- a/src/normal.c +++ b/src/normal.c @@ -1477,14 +1477,17 @@ do_pending_operator(cap, old_col, gui_yank) } else if (VIsual_active) { - /* Save the current VIsual area for '< and '> marks, and "gv" */ - curbuf->b_visual.vi_start = VIsual; - curbuf->b_visual.vi_end = curwin->w_cursor; - curbuf->b_visual.vi_mode = VIsual_mode; - curbuf->b_visual.vi_curswant = curwin->w_curswant; + if (!gui_yank) + { + /* Save the current VIsual area for '< and '> marks, and "gv" */ + curbuf->b_visual.vi_start = VIsual; + curbuf->b_visual.vi_end = curwin->w_cursor; + curbuf->b_visual.vi_mode = VIsual_mode; + curbuf->b_visual.vi_curswant = curwin->w_curswant; # ifdef FEAT_EVAL - curbuf->b_visual_mode_eval = VIsual_mode; + curbuf->b_visual_mode_eval = VIsual_mode; # endif + } /* In Select mode, a linewise selection is operated upon like a * characterwise selection. */ diff --git a/src/version.c b/src/version.c index f148a358eb..6ff099e9f5 100644 --- a/src/version.c +++ b/src/version.c @@ -667,6 +667,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 125, +/**/ 124, /**/ 123, |