updated for version 7.0-125

diff --git a/src/normal.c b/src/normal.c
index d1dc05f145c89b6382971b045471f0c1b7f25a0e..174570cc533b573d7ad33fab4f7af472f125e72c 100644 (file)
--- 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 f148a358eb80b76dffe1f154e7793f29d938bd99..6ff099e9f547809b0d0f9e5c37f9dd8e920b9dd5 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -666,6 +666,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    125,
 /**/
     124,
 /**/