Permalink
Browse files

patch 8.0.0689: ~ character not escaped when extending search pattern

Problem:    The ~ character is not escaped when adding to the search pattern
            with CTRL-L. (Ramel Eshed)
Solution:   Escape the character. (Christian Brabandt)
  • Loading branch information...
brammool committed Jun 29, 2017
1 parent 9c4feff commit a693d0584b9a7ccce98813dda3a6badb209904c7
Showing with 23 additions and 1 deletion.
  1. +1 −1 src/ex_getln.c
  2. +20 −0 src/testdir/test_search.vim
  3. +2 −0 src/version.c
View
@@ -1492,7 +1492,7 @@ getcmdline(
if (c != NUL)
{
if (c == firstc || vim_strchr((char_u *)(
p_magic ? "\\^$.*[" : "\\^$"), c)
p_magic ? "\\~^$.*[" : "\\^$"), c)
!= NULL)
{
/* put a backslash before special
@@ -302,3 +302,23 @@ func Test_searchc()
exe "norm 0t\u93cf"
bw!
endfunc
func Test_search_cmdline3()
if !exists('+incsearch')
return
endif
" need to disable char_avail,
" so that expansion of commandline works
call test_override("char_avail", 1)
new
call setline(1, [' 1', ' 2 the~e', ' 3 the theother'])
set incsearch
1
" first match
call feedkeys("/the\<c-l>\<cr>", 'tx')
call assert_equal(' 2 the~e', getline('.'))
" clean up
set noincsearch
call test_override("char_avail", 0)
bw!
endfunc
View
@@ -764,6 +764,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
689,
/**/
688,
/**/

0 comments on commit a693d05

Please sign in to comment.