thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

updated for version 7.3.574

Browse Source 
Problem:    When pasting a register in the search command line a CTRL-L
            character is not pasted. (Dominique Pelle)
Solution:   Escape the CTRL-L. (Christian Brabandt)
This commit is contained in:
Bram Moolenaar
2012-06-29 13:44:41 +02:00
parent 88b1ba151a
commit e79abddb2f
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/ex_getln.c
View File

@@ -3133,7 +3133,8 @@ cmdline_paste_str(s, literally)
else else
#endif #endif
c = *s++; c = *s++;
if (cv == Ctrl_V || c == ESC || c == Ctrl_C || c == CAR || c == NL if (cv == Ctrl_V || c == ESC || c == Ctrl_C
|| c == CAR || c == NL || c == Ctrl_L
#ifdef UNIX #ifdef UNIX
|| c == intr_char || c == intr_char
#endif #endif
@@ -4692,7 +4693,7 @@ ExpandFromContext(xp, pat, num_file, file, options)
if (tab[i].ic) if (tab[i].ic)
regmatch.rm_ic = TRUE; regmatch.rm_ic = TRUE;
ret = ExpandGeneric(xp, &regmatch, num_file, file, ret = ExpandGeneric(xp, &regmatch, num_file, file,
tab[i].func, tab[i].escaped); tab[i].func, tab[i].escaped);
break; break;
} }
} }
@@ -5125,7 +5126,7 @@ ExpandRTDir(pat, num_file, file, dirnames)
vim_free(matches); vim_free(matches);
} }
if (ga.ga_len == 0) if (ga.ga_len == 0)
return FAIL; return FAIL;
/* Sort and remove duplicates which can happen when specifying multiple /* Sort and remove duplicates which can happen when specifying multiple
* directories in dirnames. */ * directories in dirnames. */

2
src/version.c
View File

@@ -714,6 +714,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
574,
/**/ /**/
573, 573,
/**/ /**/