Karsten Hopp 5b10cb
To: vim-dev@vim.org
Karsten Hopp 5b10cb
Subject: Patch 7.2.412
Karsten Hopp 5b10cb
Fcc: outbox
Karsten Hopp 5b10cb
From: Bram Moolenaar <Bram@moolenaar.net>
Karsten Hopp 5b10cb
Mime-Version: 1.0
Karsten Hopp 5b10cb
Content-Type: text/plain; charset=UTF-8
Karsten Hopp 5b10cb
Content-Transfer-Encoding: 8bit
Karsten Hopp 5b10cb
------------
Karsten Hopp 5b10cb
Karsten Hopp 5b10cb
Patch 7.2.412
Karsten Hopp 5b10cb
Problem:    [ or ] followed by mouse click doesn't work.
Karsten Hopp 5b10cb
Solution:   Reverse check for key being a mouse event. (Dominique Pelle)
Karsten Hopp 5b10cb
Files:	    src/normal.c
Karsten Hopp 5b10cb
Karsten Hopp 5b10cb
Karsten Hopp 5b10cb
*** ../vim-7.2.411/src/normal.c	2010-03-17 13:07:01.000000000 +0100
Karsten Hopp 5b10cb
--- src/normal.c	2010-05-07 15:46:54.000000000 +0200
Karsten Hopp 5b10cb
***************
Karsten Hopp 5b10cb
*** 3196,3202 ****
Karsten Hopp 5b10cb
       * There are a few special cases where we want certain combinations of
Karsten Hopp 5b10cb
       * characters to be considered as a single word.  These are things like
Karsten Hopp 5b10cb
       * "->", "/ *", "*=", "+=", "&=", "<=", ">=", "!=" etc.  Otherwise, each
Karsten Hopp 5b10cb
!      * character is in it's own class.
Karsten Hopp 5b10cb
       */
Karsten Hopp 5b10cb
      if (c != NUL && vim_strchr((char_u *)"-+*/%<>&|^!=", c) != NULL)
Karsten Hopp 5b10cb
  	return 1;
Karsten Hopp 5b10cb
--- 3196,3202 ----
Karsten Hopp 5b10cb
       * There are a few special cases where we want certain combinations of
Karsten Hopp 5b10cb
       * characters to be considered as a single word.  These are things like
Karsten Hopp 5b10cb
       * "->", "/ *", "*=", "+=", "&=", "<=", ">=", "!=" etc.  Otherwise, each
Karsten Hopp 5b10cb
!      * character is in its own class.
Karsten Hopp 5b10cb
       */
Karsten Hopp 5b10cb
      if (c != NUL && vim_strchr((char_u *)"-+*/%<>&|^!=", c) != NULL)
Karsten Hopp 5b10cb
  	return 1;
Karsten Hopp 5b10cb
***************
Karsten Hopp 5b10cb
*** 4085,4091 ****
Karsten Hopp 5b10cb
  /*
Karsten Hopp 5b10cb
   * Command character that's ignored.
Karsten Hopp 5b10cb
   * Used for CTRL-Q and CTRL-S to avoid problems with terminals that use
Karsten Hopp 5b10cb
!  * xon/xoff
Karsten Hopp 5b10cb
   */
Karsten Hopp 5b10cb
      static void
Karsten Hopp 5b10cb
  nv_ignore(cap)
Karsten Hopp 5b10cb
--- 4085,4091 ----
Karsten Hopp 5b10cb
  /*
Karsten Hopp 5b10cb
   * Command character that's ignored.
Karsten Hopp 5b10cb
   * Used for CTRL-Q and CTRL-S to avoid problems with terminals that use
Karsten Hopp 5b10cb
!  * xon/xoff.
Karsten Hopp 5b10cb
   */
Karsten Hopp 5b10cb
      static void
Karsten Hopp 5b10cb
  nv_ignore(cap)
Karsten Hopp 5b10cb
***************
Karsten Hopp 5b10cb
*** 6523,6529 ****
Karsten Hopp 5b10cb
       * [ or ] followed by a middle mouse click: put selected text with
Karsten Hopp 5b10cb
       * indent adjustment.  Any other button just does as usual.
Karsten Hopp 5b10cb
       */
Karsten Hopp 5b10cb
!     else if (cap->nchar >= K_LEFTMOUSE && cap->nchar <= K_RIGHTRELEASE)
Karsten Hopp 5b10cb
      {
Karsten Hopp 5b10cb
  	(void)do_mouse(cap->oap, cap->nchar,
Karsten Hopp 5b10cb
  		       (cap->cmdchar == ']') ? FORWARD : BACKWARD,
Karsten Hopp 5b10cb
--- 6523,6529 ----
Karsten Hopp 5b10cb
       * [ or ] followed by a middle mouse click: put selected text with
Karsten Hopp 5b10cb
       * indent adjustment.  Any other button just does as usual.
Karsten Hopp 5b10cb
       */
Karsten Hopp 5b10cb
!     else if (cap->nchar >= K_RIGHTRELEASE && cap->nchar <= K_LEFTMOUSE)
Karsten Hopp 5b10cb
      {
Karsten Hopp 5b10cb
  	(void)do_mouse(cap->oap, cap->nchar,
Karsten Hopp 5b10cb
  		       (cap->cmdchar == ']') ? FORWARD : BACKWARD,
Karsten Hopp 5b10cb
*** ../vim-7.2.411/src/version.c	2010-03-23 18:22:40.000000000 +0100
Karsten Hopp 5b10cb
--- src/version.c	2010-05-07 15:51:35.000000000 +0200
Karsten Hopp 5b10cb
***************
Karsten Hopp 5b10cb
*** 683,684 ****
Karsten Hopp 5b10cb
--- 683,686 ----
Karsten Hopp 5b10cb
  {   /* Add new patch number below this line */
Karsten Hopp 5b10cb
+ /**/
Karsten Hopp 5b10cb
+     412,
Karsten Hopp 5b10cb
  /**/
Karsten Hopp 5b10cb
Karsten Hopp 5b10cb
-- 
Karsten Hopp 5b10cb
I have a drinking problem -- I don't have a drink!
Karsten Hopp 5b10cb
Karsten Hopp 5b10cb
 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
Karsten Hopp 5b10cb
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
Karsten Hopp 5b10cb
\\\        download, build and distribute -- http://www.A-A-P.org        ///
Karsten Hopp 5b10cb
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///