]> granicus.if.org Git - vim/commitdiff
updated for version 7.0-142 v7.0.142
authorBram Moolenaar <Bram@vim.org>
Tue, 17 Oct 2006 14:54:03 +0000 (14:54 +0000)
committerBram Moolenaar <Bram@vim.org>
Tue, 17 Oct 2006 14:54:03 +0000 (14:54 +0000)
src/normal.c
src/version.c

index 174570cc533b573d7ad33fab4f7af472f125e72c..dd2e0b36aa835e698ef3eb11a94bae0a33fabd49 100644 (file)
@@ -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;
            }
index ff01a2b589eadcca149de14415ac5823649b6f1b..3bd726ddd4b38054b69ff230635e43e831cd21e6 100644 (file)
@@ -666,6 +666,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    142,
 /**/
     141,
 /**/