summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorvimboss <devnull@localhost>2006-10-10 11:26:53 +0000
committervimboss <devnull@localhost>2006-10-10 11:26:53 +0000
commit57585797e2ce6b241752a6989e6a7d03c1270ab0 (patch)
tree9efa115359bdfe899793c65d0b96ac66d0db39a4
parent82cf5248ec9b958351905fe75931e724e54d78b2 (diff)
downloadvim-57585797e2ce6b241752a6989e6a7d03c1270ab0.tar.gz
updated for version 7.0-125v7.0.125v7-0-125
-rw-r--r--src/normal.c15
-rw-r--r--src/version.c2
2 files changed, 11 insertions, 6 deletions
diff --git a/src/normal.c b/src/normal.c
index d1dc05f1..174570cc 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 f148a358..6ff099e9 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,