diff options
author | Bram Moolenaar <Bram@vim.org> | 2006-10-17 14:54:03 +0000 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2006-10-17 14:54:03 +0000 |
commit | a350f4a54f90dec5b710fd83941b00e13a55ecc5 (patch) | |
tree | f49c6843cbbbc1f97b9982cc70c885b8c04768ff | |
parent | 1769d5a8c9209f77e4cff8e28a3883c0904d23fb (diff) | |
download | vim-git-a350f4a54f90dec5b710fd83941b00e13a55ecc5.tar.gz |
updated for version 7.0-142v7.0.142
-rw-r--r-- | src/normal.c | 13 | ||||
-rw-r--r-- | src/version.c | 2 |
2 files changed, 13 insertions, 2 deletions
diff --git a/src/normal.c b/src/normal.c index 174570cc5..dd2e0b36a 100644 --- a/src/normal.c +++ b/src/normal.c @@ -2380,11 +2380,20 @@ do_mouse(oap, c, dir, count, fixindent) /* * If visual was active, yank the highlighted text and put it * before the mouse pointer position. + * In Select mode replace the highlighted text with the clipboard. */ if (VIsual_active) { - stuffcharReadbuff('y'); - stuffcharReadbuff(K_MIDDLEMOUSE); + if (VIsual_select) + { + stuffcharReadbuff(Ctrl_G); + stuffReadbuff("\"+p"); + } + else + { + stuffcharReadbuff('y'); + stuffcharReadbuff(K_MIDDLEMOUSE); + } do_always = TRUE; /* ignore 'mouse' setting next time */ return FALSE; } diff --git a/src/version.c b/src/version.c index ff01a2b58..3bd726ddd 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 */ /**/ + 142, +/**/ 141, /**/ 140, |