Merge remote-tracking branch 'vim/master'

Author: splhack

src/edit.c

@@ -7343,7 +7343,9 @@ oneleft(void)
 #ifdef FEAT_VIRTUALEDIT
     if (virtual_active())
     {
+# ifdef FEAT_LINEBREAK
 	int width;
+# endif
 	int v = getviscol();
 
 	if (v == 0)

src/ex_getln.c

@@ -1500,7 +1500,7 @@ getcmdline(
 			    if (c != NUL)
 			    {
 				if (c == firstc || vim_strchr((char_u *)(
-					      p_magic ? "\\^$.*[" : "\\^$"), c)
+					      p_magic ? "\\~^$.*[" : "\\^$"), c)
 								       != NULL)
 				{
 				    /* put a backslash before special

src/term.c

@@ -2530,7 +2530,9 @@ out_str_cf(char_u *s)
 {
     if (s != NULL && *s)
     {
+#ifdef HAVE_TGETENT
 	char_u *p;
+#endif
 
 #ifdef FEAT_GUI
 	/* Don't use tputs() when GUI is used, ncurses crashes. */
@@ -2555,7 +2557,7 @@ out_str_cf(char_u *s)
 		tputs((char *)p, 1, TPUTSFUNCAST out_char_nf);
 		*s = save_c;
 		out_flush();
-#ifdef ELAPSED_FUNC
+# ifdef ELAPSED_FUNC
 		/* Only sleep here if we can limit this happening in
 		 * vim_beep(). */
 		p = vim_strchr(s, '>');
@@ -2569,10 +2571,10 @@ out_str_cf(char_u *s)
 		    ++p;
 		    do_sleep(duration);
 		}
-#else
+# else
 		/* Rely on the terminal library to sleep. */
 		p = s;
-#endif
+# endif
 		break;
 	    }
 	}

src/testdir/test_search.vim

@@ -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

src/version.c

@@ -779,6 +779,12 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    691,
+/**/
+    690,
+/**/
+    689,
 /**/
     688,
 /**/