23d22ea
To: vim_dev@googlegroups.com
23d22ea
Subject: Patch 7.3.241
23d22ea
Fcc: outbox
23d22ea
From: Bram Moolenaar <Bram@moolenaar.net>
23d22ea
Mime-Version: 1.0
23d22ea
Content-Type: text/plain; charset=UTF-8
23d22ea
Content-Transfer-Encoding: 8bit
23d22ea
------------
23d22ea
23d22ea
Patch 7.3.241
23d22ea
Problem:    Using CTRL-R CTRL-W on the command line may insert only part of
23d22ea
	    the word.
23d22ea
Solution:   Use the cursor position instead of assuming it is at the end of
23d22ea
	    the command. (Tyru)
23d22ea
Files:	    src/ex_getln.c
23d22ea
23d22ea
23d22ea
*** ../vim-7.3.240/src/ex_getln.c	2011-07-07 15:04:38.000000000 +0200
23d22ea
--- src/ex_getln.c	2011-07-07 16:38:50.000000000 +0200
23d22ea
***************
23d22ea
*** 3046,3052 ****
23d22ea
  	    int	    len;
23d22ea
  
23d22ea
  	    /* Locate start of last word in the cmd buffer. */
23d22ea
! 	    for (w = ccline.cmdbuff + ccline.cmdlen; w > ccline.cmdbuff; )
23d22ea
  	    {
23d22ea
  #ifdef FEAT_MBYTE
23d22ea
  		if (has_mbyte)
23d22ea
--- 3046,3052 ----
23d22ea
  	    int	    len;
23d22ea
  
23d22ea
  	    /* Locate start of last word in the cmd buffer. */
23d22ea
! 	    for (w = ccline.cmdbuff + ccline.cmdpos; w > ccline.cmdbuff; )
23d22ea
  	    {
23d22ea
  #ifdef FEAT_MBYTE
23d22ea
  		if (has_mbyte)
23d22ea
***************
23d22ea
*** 3064,3070 ****
23d22ea
  		    --w;
23d22ea
  		}
23d22ea
  	    }
23d22ea
! 	    len = (int)((ccline.cmdbuff + ccline.cmdlen) - w);
23d22ea
  	    if (p_ic ? STRNICMP(w, arg, len) == 0 : STRNCMP(w, arg, len) == 0)
23d22ea
  		p += len;
23d22ea
  	}
23d22ea
--- 3064,3070 ----
23d22ea
  		    --w;
23d22ea
  		}
23d22ea
  	    }
23d22ea
! 	    len = (int)((ccline.cmdbuff + ccline.cmdpos) - w);
23d22ea
  	    if (p_ic ? STRNICMP(w, arg, len) == 0 : STRNCMP(w, arg, len) == 0)
23d22ea
  		p += len;
23d22ea
  	}
23d22ea
*** ../vim-7.3.240/src/version.c	2011-07-07 16:20:45.000000000 +0200
23d22ea
--- src/version.c	2011-07-07 16:41:29.000000000 +0200
23d22ea
***************
23d22ea
*** 711,712 ****
23d22ea
--- 711,714 ----
23d22ea
  {   /* Add new patch number below this line */
23d22ea
+ /**/
23d22ea
+     241,
23d22ea
  /**/
23d22ea
23d22ea
-- 
23d22ea
hundred-and-one symptoms of being an internet addict:
23d22ea
258. When you want to see your girlfriend, you surf to her homepage.
23d22ea
23d22ea
 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
23d22ea
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
23d22ea
\\\  an exciting new programming language -- http://www.Zimbu.org        ///
23d22ea
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///