To: vim-dev@vim.org
Subject: Patch 6.1.321
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 6.1.321
Problem:    When 'mouse' includes 'n' but not 'v', don't allow starting Visual
	    mode with the mouse.
Solution:   Don't use MOUSE_MAY_VIS when there is no 'v' in 'mouse'. (Flemming
	    Madsen)
Files:	    src/normal.c


*** ../vim61.320/src/normal.c	Tue Jan 28 22:17:41 2003
--- src/normal.c	Sun Feb 16 17:10:13 2003
***************
*** 2374,2380 ****
  		if (VIsual_active)
  		    jump_flags |= MOUSE_MAY_STOP_VIS;
  	    }
! 	    else
  		jump_flags |= MOUSE_MAY_VIS;
  	}
  	else if (which_button == MOUSE_RIGHT)
--- 2380,2386 ----
  		if (VIsual_active)
  		    jump_flags |= MOUSE_MAY_STOP_VIS;
  	    }
! 	    else if (mouse_has(MOUSE_VISUAL))
  		jump_flags |= MOUSE_MAY_VIS;
  	}
  	else if (which_button == MOUSE_RIGHT)
***************
*** 2396,2402 ****
  		    end_visual = curwin->w_cursor;
  		}
  	    }
! 	    jump_flags |= MOUSE_MAY_VIS | MOUSE_FOCUS;
  	}
      }
  #endif
--- 2402,2410 ----
  		    end_visual = curwin->w_cursor;
  		}
  	    }
! 	    jump_flags |= MOUSE_FOCUS;
! 	    if (mouse_has(MOUSE_VISUAL))
! 		jump_flags |= MOUSE_MAY_VIS;
  	}
      }
  #endif
***************
*** 2658,2664 ****
      }
  #endif
  #ifdef FEAT_VISUAL
!     else if ((mod_mask & MOD_MASK_MULTI_CLICK) && (State & (NORMAL | INSERT)))
      {
  	if (is_click || !VIsual_active)
  	{
--- 2670,2677 ----
      }
  #endif
  #ifdef FEAT_VISUAL
!     else if ((mod_mask & MOD_MASK_MULTI_CLICK) && (State & (NORMAL | INSERT))
! 	     && mouse_has(MOUSE_VISUAL))
      {
  	if (is_click || !VIsual_active)
  	{
*** ../vim61.320/src/version.c	Tue Feb  4 22:33:39 2003
--- src/version.c	Sun Feb 16 19:38:00 2003
***************
*** 608,609 ****
--- 608,611 ----
  {   /* Add new patch number below this line */
+ /**/
+     321,
  /**/

-- 
hundred-and-one symptoms of being an internet addict:
259. When you enter your name in the AltaVista search engine, the top ten
     matches do indeed refer to you.

 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
///          Creator of Vim - Vi IMproved -- http://www.Vim.org          \\\
\\\              Project leader for A-A-P -- http://www.A-A-P.org        ///
 \\\     Help AIDS victims, buy at Amazon -- http://ICCF.nl/click1.html ///