summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2011-07-07 16:44:37 +0200
committerBram Moolenaar <Bram@vim.org>2011-07-07 16:44:37 +0200
commit80ae7b2287d712069243d8ebe2e4a39bd79737a4 (patch)
tree697683b02fd66317faf9137f9d75c4f45f4b3121
parent4b9669f1dc0b1f30a378624810ca144b9ca49a8e (diff)
updated for version 7.3.241v7.3.241
Problem: Using CTRL-R CTRL-W on the command line may insert only part of the word. Solution: Use the cursor position instead of assuming it is at the end of the command. (Tyru)
-rw-r--r--src/ex_getln.c4
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 2 deletions
diff --git a/src/ex_getln.c b/src/ex_getln.c
index 561ab970ee..913d9830ed 100644
--- a/src/ex_getln.c
+++ b/src/ex_getln.c
@@ -3046,7 +3046,7 @@ cmdline_paste(regname, literally, remcr)
int len;
/* Locate start of last word in the cmd buffer. */
- for (w = ccline.cmdbuff + ccline.cmdlen; w > ccline.cmdbuff; )
+ for (w = ccline.cmdbuff + ccline.cmdpos; w > ccline.cmdbuff; )
{
#ifdef FEAT_MBYTE
if (has_mbyte)
@@ -3064,7 +3064,7 @@ cmdline_paste(regname, literally, remcr)
--w;
}
}
- len = (int)((ccline.cmdbuff + ccline.cmdlen) - w);
+ len = (int)((ccline.cmdbuff + ccline.cmdpos) - w);
if (p_ic ? STRNICMP(w, arg, len) == 0 : STRNCMP(w, arg, len) == 0)
p += len;
}
diff --git a/src/version.c b/src/version.c
index 2104c0f6a0..d9b50a6500 100644
--- a/src/version.c
+++ b/src/version.c
@@ -710,6 +710,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 241,
+/**/
240,
/**/
239,